Merge remote-tracking branch 'origin/develop_master' into develop_master

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<SarStandardsInfo> standlist = sarStandardsInfoEOService.selectStandardsByStandnumber(standnumber, sarStandardsInfoEO.getStandType());
+            List<SarStandardsInfo> standlist = sarStandardsInfoEOService.selectStandardsByStandnumber(queryPage, sarStandardsInfoEO.getStandType());
             if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) {
                 sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2");
                 sarStandardsInfoEO.setMenuIds("64df1d5522bb49c09af2,"+sarStandardsInfoEO.getMenuIds());

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java

@@ -525,13 +525,19 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
     //@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<SarStandardsInfo> standlist = sarStandardsInfoEOService.selectStandardsByStandnumber(standnumber, page.getStandType());
+            List<SarStandardsInfo> 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<SarStandardsInfo>
 //                page.setStandNumber("UN(ECE)" + number);
 //            }
         }
-        List<SarStandardsInfo> 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<SarStandardsInfo> getList = sarStandardsInfoEOService.selectStandardsByStandnumber(newQueryPage,page.getStandType());
         SarBussionessStandEOPage sarBussionessStandEOPage = new SarBussionessStandEOPage();
         sarBussionessStandEOPage.setStandCode(page.getStandNumber());
         List<SarBussionessStand> list = iSarBussionessStandService.queryByList(sarBussionessStandEOPage);

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<DicTypeEO> 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;
+    }
 }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java

@@ -42,7 +42,8 @@ public interface ISarStandardsInfoService extends IService<SarStandardsInfo> {
 
     ResponseMessage<SarStandardsInfo> importSarStandardsInfoData(List<Map<String,String>> dataList, String standType, String menuId, String filepath);
 
-    List<SarStandardsInfo> selectStandardsByStandnumber(String replaceStandNum, String standType);
+    List<SarStandardsInfo> selectStandardsByStandnumber(SarStandardsInfoEOPage queryPahe, String standType);
+
 
     List<SarStandardsInfo> getStandInfoByList(String limit);
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -2998,10 +2998,23 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
      * @author gaoyan
      * date 2018-11-13
      */
-    public List<SarStandardsInfo> selectStandardsByStandnumber(String replaceStandNum, String standType) {
+    public List<SarStandardsInfo> selectStandardsByStandnumber(SarStandardsInfoEOPage queryPage , String standType) {
         SarStandardsInfo sarStandardsInfoEO = new SarStandardsInfo();
-        sarStandardsInfoEO.setStandNumber(replaceStandNum);
+        if(StringUtils.isNotBlank(queryPage.getStandSort())){
-        sarStandardsInfoEO.setStandType(standType);
+            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);
     }
 

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml

@@ -1543,7 +1543,7 @@
         <if test="standType != null">
             and stand_type = #{standType}
         </if>
-        <if test="standNumber != null">
+        <if test="standNumber != null and standSort == null">
             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 = ''
             ) -->
+        </if>
+          <if test="standCode != null">
+              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}),'%'),' ',''))
+              )
+              <!-- and SAR_STANDARDS_INFO.STAND_YEAR = '' -->
+              or (stand_name like concat(concat('%',#{standNumber}),'%'))
+              )
+          </if>
+          <if test="standSort !=null and standNumber !=null and standYear !=null">
+                and (
+                    SAR_STANDARDS_INFO.STAND_SORT = #{standSort} and SAR_STANDARDS_INFO.STAND_NUMBER = #{standNumber} and SAR_STANDARDS_INFO.STAND_YEAR = #{standYear}
+                 )
+          </if>
+        <if test="standSort !=null and standNumber !=null and standYear ==null">
+            and (
+            SAR_STANDARDS_INFO.STAND_SORT = #{standSort} and SAR_STANDARDS_INFO.STAND_NUMBER = #{standNumber}
+            )
         </if>
         <if test="sychronId != null">
             and id != #{sychronId}