From 991c299c1051ef217858fafc09217289d61e9f97 Mon Sep 17 00:00:00 2001 From: zyd Date: Mon, 24 Oct 2022 16:10:01 +0800 Subject: [PATCH] =?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}