From 73945de1cfde9944a0bce557f13211a8c9868419 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Thu, 20 Oct 2022 21:27:01 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E9=80=82=E7=94=A8=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E4=BC=9A=E5=87=BA=E7=8E=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/workFlow/service/ActSarItemsBussEOService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index 2572f6d4..a4f2e0f9 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -48,6 +48,7 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ObjectUtils; import org.json.JSONTokener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -168,7 +169,7 @@ public class ActSarItemsBussEOService { String releaseTime = String.valueOf(standMap.get("releaseTime")); String YYBZ = String.valueOf(standMap.get("YYBZ")); String CYBZ = String.valueOf(standMap.get("CYBZ")); - String SYCXCLASS = getFieldsValue(standMap,"SYCXCLASS"); + String SYCXCLASS = ObjectUtils.isEmpty(standMap.get("SYCXCLASS")) ? "" : getFieldsValue(standMap, "SYCXCLASS"); String DTQBBHBUSS = String.valueOf(standMap.get("DTQBBHBUSS")); String LXD = String.valueOf(standMap.get("LXD")); From 9542200d13507decc3aaf00d511a16ea5b4daab6 Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Fri, 21 Oct 2022 09:47:06 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/search/conf/SchedulerConf.java | 25 ++++++++++++++++++- .../tsTask/controller/TbTaskController.java | 17 +++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java b/adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java index c78760f0..f17c5c7b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java @@ -9,6 +9,7 @@ package com.adc.da.search.conf; import com.adc.da.slrs.tsTask.dao.TbTaskDao; import com.adc.da.slrs.tsTask.entity.TbTask; import com.adc.da.slrs.tsTask.service.ITbTaskService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -95,7 +96,7 @@ public class SchedulerConf { log.info("{}，任务启动！", taskId); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) { log.error("{}，任务启动失败...", taskId); - e.printStackTrace(); + log.error(e.getMessage(),e); } } @@ -113,6 +114,28 @@ public class SchedulerConf { log.info("{}，任务停止...", taskId); } + public TbTask manualRunTask(String taskId){ + TbTask task = iTbTaskService.getById(taskId); + if(task!=null){ + try { + //获取并实例化Runnable任务类 + Class clazz = Class.forName(task.getTaskClass()); + Runnable runnable = (Runnable) clazz.newInstance(); + Thread runTaskThread = new Thread(runnable); + runTaskThread.start(); + log.info("{}，任务开始启动执行！", task.getTaskName()); + } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) { + log.error("{}，任务启动失败...", task.getTaskName()); + log.error(e.getMessage(),e); + + } + return task; + }else{ + return null; + } + } + + /** * 根据ip开启定时任务 */ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/controller/TbTaskController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/controller/TbTaskController.java index cd31f36c..af60d66c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/controller/TbTaskController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/controller/TbTaskController.java @@ -1,8 +1,11 @@ package com.adc.da.slrs.tsTask.controller; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; import com.adc.da.search.conf.SchedulerConf; import com.adc.da.slrs.tsTask.service.ITbTaskService; +import io.swagger.annotations.ApiOperation; import oracle.ucp.proxy.annotation.Post; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -55,6 +58,20 @@ public class TbTaskController extends BaseController { return "操作成功"; } + + @ApiOperation(value = "手动启动定时任务") + @GetMapping("/manualRunTask/{taskId}") + public ResponseMessage manualRunTask(@PathVariable("taskId") String taskId) { + TbTask tbTask = schedulerConf.manualRunTask(taskId); + if(tbTask!=null){ + return Result.success("开始启动定时任务：《"+tbTask.getTaskName()+"》"); + }else{ + return Result.error("定时任务未找到："+taskId); + } + + } + + /** * 根据ip开启定时任务 * http://localhost:10085/tbTask From 5f1b4909541b2fbd9a5214d8b47ed2b2e645d763 Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Fri, 21 Oct 2022 10:20:06 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E4=BB=A5=E5=8F=8A=E8=BE=93=E5=87=BA=E7=9A=84?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/login/rest/LoginRestController.java | 1 + .../src/main/java/com/adc/da/search/conf/SchedulerConf.java | 4 ++-- .../com/adc/da/slrs/tsTask/controller/TbTaskController.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java index c5481e35..bb8e2292 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java @@ -176,6 +176,7 @@ public class LoginRestController { } String token = jwtUtils.generateToken(userEO.getUsid()); + log.info(token); // 加密重要信息 BASE64Encoder encoder = new BASE64Encoder(); userEO.setToken(token); diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java b/adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java index f17c5c7b..648dc42d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java @@ -123,9 +123,9 @@ public class SchedulerConf { Runnable runnable = (Runnable) clazz.newInstance(); Thread runTaskThread = new Thread(runnable); runTaskThread.start(); - log.info("{}，任务开始启动执行！", task.getTaskName()); + log.info("{}，任务开始启动执行！", task.getTaskDesc()); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) { - log.error("{}，任务启动失败...", task.getTaskName()); + log.error("{}，任务启动失败...", task.getTaskDesc()); log.error(e.getMessage(),e); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/controller/TbTaskController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/controller/TbTaskController.java index af60d66c..62f7ce02 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/controller/TbTaskController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/controller/TbTaskController.java @@ -58,13 +58,13 @@ public class TbTaskController extends BaseController { return "操作成功"; } - + @ApiOperation(value = "手动启动定时任务") @GetMapping("/manualRunTask/{taskId}") public ResponseMessage manualRunTask(@PathVariable("taskId") String taskId) { TbTask tbTask = schedulerConf.manualRunTask(taskId); if(tbTask!=null){ - return Result.success("开始启动定时任务：《"+tbTask.getTaskName()+"》"); + return Result.success("开始启动定时任务：《"+tbTask.getTaskDesc()+"》"); }else{ return Result.error("定时任务未找到："+taskId); } From 8c01b11d18e207ab58eda396fe92f00aaed27186 Mon Sep 17 00:00:00 2001 From: zyd Date: Mon, 24 Oct 2022 11:04:46 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=86=8D=E5=A4=84?= =?UTF-8?q?=E7=90=86=E8=A2=AB=E4=BB=A3=E6=9B=BF=E6=A0=87=E5=87=86=E5=8F=B7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A5=E5=85=A8=E6=97=B6=EF=BC=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A1=A5=E5=85=85=E9=94=99=E8=AF=AF=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81=E7=9A=84?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataSyncServiceImpl.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java index a65524ea..d6eeb052 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java @@ -213,10 +213,20 @@ public class DataSyncServiceImpl implements IDataSyncService { // 1.1.1.1.2.1 拼接 被代替标准号 String btd = bdtList.stream().map(info1 -> { String addStrandNumber = ""; - if (StringUtils.isNotEmpty(info1.getStandYear())) { - addStrandNumber = info1.getStandSort() + " " + info1.getStandNumber() + "-" + info1.getStandYear(); - } else { - addStrandNumber = info1.getStandSort() + " " + info1.getStandNumber(); + //var judgeFn = new RegExp(/\s+/g); + //if(judgeFn.test(nowstandinfo.standSort)){ + // nowstandinfo.standCode = nowstandinfo.standSort + "" + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + //}else if(nowstandinfo.standSort === 'Q/QCBFC'){ + // nowstandinfo.standCode = nowstandinfo.standSort + "" + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + //}else { + // nowstandinfo.standCode = nowstandinfo.standSort + " " + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + //} + if(StringUtils.isNotBlank(info1.getStandSort()) && info1.getStandSort().indexOf(" ")>0){ + addStrandNumber = info1.getStandSort() + info1.getStandNumber() +(StringUtils.isNotBlank(info1.getStandYear())?("-" + info1.getStandYear()):""); + }else if(StringUtils.isNotBlank(info1.getStandSort()) && info1.getStandSort() =="Q/QCBFC"){ + addStrandNumber = info1.getStandSort() + info1.getStandNumber() +(StringUtils.isNotBlank(info1.getStandYear())?("-" + info1.getStandYear()):""); + }else{ + addStrandNumber = info1.getStandSort()+" "+ info1.getStandNumber() +(StringUtils.isNotBlank(info1.getStandYear())?("-" + info1.getStandYear()):""); } return addStrandNumber; }).collect(Collectors.joining(",")); From 991c299c1051ef217858fafc09217289d61e9f97 Mon Sep 17 00:00:00 2001 From: zyd Date: Mon, 24 Oct 2022 16:10:01 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ActSarItemsEOService.java | 9 +++++- .../SarStandardsInfoController.java | 30 +++++++++++++++++-- .../entity/SarStandardsInfo.java | 11 +++++++ .../service/ISarStandardsInfoService.java | 3 +- .../impl/SarStandardsInfoServiceImpl.java | 19 ++++++++++-- .../SarStandardsInfoMapper.xml | 22 +++++++++++++- 6 files changed, 86 insertions(+), 8 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index 6839bfd9..4b2c708d 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -19,6 +19,7 @@ import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandVal.entity.SarStandVal; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; @@ -191,12 +192,18 @@ public class ActSarItemsEOService { // 根据标准号判断数据是否已存在 //2021年4月9日 此处检查当前是否存在standId String standnumber = ""; + SarStandardsInfoEOPage queryPage = new SarStandardsInfoEOPage(); if(StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear()) && !"null".equals(sarStandardsInfoEO.getStandYear())){ standnumber = sarStandardsInfoEO.getStandSort() + " " + sarStandardsInfoEO.getStandNumber() + "-" + sarStandardsInfoEO.getStandYear(); + queryPage.setStandSort(sarStandardsInfoEO.getStandSort()); + queryPage.setStandNumber(sarStandardsInfoEO.getStandNumber()); + queryPage.setStandYear(sarStandardsInfoEO.getStandYear()); } else { standnumber = sarStandardsInfoEO.getStandSort() + " " + sarStandardsInfoEO.getStandNumber(); + queryPage.setStandSort(sarStandardsInfoEO.getStandSort()); + queryPage.setStandNumber(sarStandardsInfoEO.getStandNumber()); } - List standlist = sarStandardsInfoEOService.selectStandardsByStandnumber(standnumber, sarStandardsInfoEO.getStandType()); + List standlist = sarStandardsInfoEOService.selectStandardsByStandnumber(queryPage, sarStandardsInfoEO.getStandType()); if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) { sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2"); sarStandardsInfoEO.setMenuIds("64df1d5522bb49c09af2,"+sarStandardsInfoEO.getMenuIds()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 945da70f..10f8c222 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -525,13 +525,19 @@ public class SarStandardsInfoController extends BaseController //@RequiresPermissions("lawss:sarStandardsInfo:selectReplaceStandNum") public ResponseMessage validateStandNumber(SarStandardsInfoEOPage page) throws Exception { if (StringUtils.isNotEmpty(page.getStandNumber()) && StringUtils.isNotEmpty(page.getStandSort())) { + SarStandardsInfoEOPage newQueryPage = new SarStandardsInfoEOPage(); String standnumber = ""; if(StringUtils.isNotEmpty(page.getStandYear()) && !"null".equals(page.getStandYear())){ standnumber = page.getStandSort() + " " + page.getStandNumber() + "-" + page.getStandYear(); + newQueryPage.setStandSort(page.getStandSort()); + newQueryPage.setStandNumber(page.getStandNumber()); + newQueryPage.setStandYear(page.getStandYear()); } else { standnumber = page.getStandSort() + " " + page.getStandNumber(); + newQueryPage.setStandSort(page.getStandSort()); + newQueryPage.setStandNumber(page.getStandNumber()); } - List standlist = sarStandardsInfoEOService.selectStandardsByStandnumber(standnumber, page.getStandType()); + List standlist = sarStandardsInfoEOService.selectStandardsByStandnumber(newQueryPage, page.getStandType()); if (standlist.size() > 0) { if (StringUtils.isNotEmpty(page.getId())) { // 如果是修改，判断id是否一样 @@ -778,7 +784,27 @@ public class SarStandardsInfoController extends BaseController // page.setStandNumber("UN(ECE)" + number); // } } - List getList = sarStandardsInfoEOService.selectStandardsByStandnumber(page.getStandNumber(),page.getStandType()); + /** + * 此处需要拆分输入的标准编号 + * 只需要拆分国内、海外标准 + */ + SarStandardsInfoEOPage newQueryPage = new SarStandardsInfoEOPage(); + String standNumber = page.getStandNumber(); + String[] numberArray = standNumber.split(" "); + if(numberArray.length==2){ + newQueryPage.setStandSort(numberArray[0]); + String numLastStr = numberArray[1]; + String[] yearArray = numLastStr.split("-"); + if(yearArray.length==2){ + newQueryPage.setStandNumber(yearArray[0]); + newQueryPage.setStandYear(yearArray[1]); + }else{ + newQueryPage.setStandNumber(numLastStr); + } + }else{ + newQueryPage.setStandCode(page.getStandNumber()); + } + List getList = sarStandardsInfoEOService.selectStandardsByStandnumber(newQueryPage,page.getStandType()); SarBussionessStandEOPage sarBussionessStandEOPage = new SarBussionessStandEOPage(); sarBussionessStandEOPage.setStandCode(page.getStandNumber()); List list = iSarBussionessStandService.queryByList(sarBussionessStandEOPage); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index 80492274..2ba4759f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -182,6 +182,9 @@ public class SarStandardsInfo extends BaseEntity { private String standTextStatusShow; // 标准文本状态显示名称 @TableField(exist = false) private String sychronId; // 同步数据ID + + @TableField(exist = false) + private String standCode;//标准编号 @TableField(exist = false) private List dicTypeList = new ArrayList(); // 记录标准涉及到的所有数据字典数据 @TableField(exist = false) @@ -652,5 +655,13 @@ public class SarStandardsInfo extends BaseEntity { public void setStandTextStatusShow(String standTextStatusShow) { this.standTextStatusShow = standTextStatusShow; } + + public String getStandCode() { + return standCode; + } + + public void setStandCode(String standCode) { + this.standCode = standCode; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java index bb5f2df4..a5162260 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java @@ -42,7 +42,8 @@ public interface ISarStandardsInfoService extends IService { ResponseMessage importSarStandardsInfoData(List> dataList, String standType, String menuId, String filepath); - List selectStandardsByStandnumber(String replaceStandNum, String standType); + List selectStandardsByStandnumber(SarStandardsInfoEOPage queryPahe, String standType); + List getStandInfoByList(String limit); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 5971e64b..455a0079 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -2998,10 +2998,23 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl selectStandardsByStandnumber(String replaceStandNum, String standType) { + public List selectStandardsByStandnumber(SarStandardsInfoEOPage queryPage , String standType) { SarStandardsInfo sarStandardsInfoEO = new SarStandardsInfo(); - sarStandardsInfoEO.setStandNumber(replaceStandNum); - sarStandardsInfoEO.setStandType(standType); + if(StringUtils.isNotBlank(queryPage.getStandSort())){ + sarStandardsInfoEO.setStandSort(queryPage.getStandSort()); + } + if(StringUtils.isNotBlank(queryPage.getStandNumber())){ + sarStandardsInfoEO.setStandNumber(queryPage.getStandNumber()); + } + if(StringUtils.isNotBlank(queryPage.getStandYear())){ + sarStandardsInfoEO.setStandYear(queryPage.getStandYear()); + } + if(StringUtils.isNotBlank(queryPage.getStandCode())){ + sarStandardsInfoEO.setStandCode(queryPage.getStandCode()); + } + if(StringUtils.isNotBlank(standType)){ + sarStandardsInfoEO.setStandType(standType); + } return dao.selectStandardsByStandnumber(sarStandardsInfoEO); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 353fcf07..620dbeb5 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -1543,7 +1543,7 @@ and stand_type = #{standType} - + and ( (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '') @@ -1567,6 +1567,26 @@ ) and SAR_STANDARDS_INFO.STAND_YEAR = '' ) --> + + + and ( + (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', + SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '') + or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ','')) + ) + + or (stand_name like concat(concat('%',#{standNumber}),'%')) + ) + + + and ( + SAR_STANDARDS_INFO.STAND_SORT = #{standSort} and SAR_STANDARDS_INFO.STAND_NUMBER = #{standNumber} and SAR_STANDARDS_INFO.STAND_YEAR = #{standYear} + ) + + + and ( + SAR_STANDARDS_INFO.STAND_SORT = #{standSort} and SAR_STANDARDS_INFO.STAND_NUMBER = #{standNumber} + ) and id != #{sychronId} From b20d14a5623dc1b201ce697d17c6112f7d7c91cf Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 24 Oct 2022 17:48:05 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=EF=BC=9A?= =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E6=97=B6=E6=89=8D=E7=94=9F=E6=88=90=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/workFlow/service/ActSarItemsBussEOService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index a4f2e0f9..6f2b5d73 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -208,7 +208,9 @@ public class ActSarItemsBussEOService { +"创建了《"+ esName +"》,其计划结果为复审"; esRevisePlanLogDao.insert(new EsRevisePlanLog(null,id,msg,date)); }else{ - iEsRevisePlanService.addPlan(esRevisePlanDTO); + if("1".equals(reviewResults)) { // 修订时才生成企标计划 + iEsRevisePlanService.addPlan(esRevisePlanDTO); + } } } From 9e60b22671ae95cac9464abd1d9a49707fd15f8e Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 24 Oct 2022 20:19:09 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=EF=BC=9A?= =?UTF-8?q?=E9=9D=9E=E4=BF=AE=E8=AE=A2=E6=97=B6=E6=89=8D=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/workFlow/service/ActSarItemsBussEOService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index 6f2b5d73..21373804 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -132,7 +132,9 @@ public class ActSarItemsBussEOService { String sarStandAttrInfo = JSONObject.toJSONString(attrInfoMap); SarBussionessStand bussionessStand = new SarBussionessStand(); bussionessStand.setId(standId); - bussionessStand.setTextStatusBuss(textStatus); + if("2".equals(reviewResults) || "3".equals(reviewResults)) { // 废止，有效时才修改文本状态 + bussionessStand.setTextStatusBuss(textStatus); + } bussionessStand.setSarStandAttrEOStr(sarStandAttrInfo); iSarBussionessStandService.updateSarBussionessStand(bussionessStand);