Merge branch 'develop_master' into FOTON

adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java

@@ -216,6 +216,7 @@ public class SendStandMQService {
                 saveMap.put(field+"Name",fieldValue);
             }catch (Exception e){
                 logger.info("国内外标准 消息队列: "+addOrUpdate+", 标准ID:"+infoEO.getId()+",问题字段:"+field);
+                logger.error(e.getMessage(),e);
                 saveMap.put(field+"Name",fieldValue);
             }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java

@@ -7,6 +7,7 @@ import com.adc.da.http.Result;
 import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -44,6 +45,16 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
     @PostMapping("queryAllPlans")
     public ResponseMessage<Object> queryAllPlans(EsRevisePlan esRevisePlan){
         List<EsRevisePlan> esRevisePlans = iEsRevisePlanService.queryAllPlans(esRevisePlan);
+        for (EsRevisePlan revisePlan : esRevisePlans){
+            String area = revisePlan.getArea();
+            if (StringUtils.isNotBlank(area)){
+                if (area.startsWith("[") && area.endsWith("]")){
+                    area = area.substring(1,area.length() - 1);
+                    area = area.replace("\"","");
+                }
+            }
+            revisePlan.setArea(area);
+        }
         PageInfo<EsRevisePlan> pageInfo = getPageInfo(esRevisePlan.getPager(),esRevisePlans);
         return Result.success(pageInfo);
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -738,12 +738,20 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         map.put("standNature",verifyObj(sarStandardsInfoEO.getStandNature()));
         map.put("standState",verifyObj(sarStandardsInfoEO.getStandStatus()));
         if (sarStandardsInfoEO.getIssueTime() != null) {
-            map.put("issueTime",sarStandardsInfoEO.getPutTime());
+            String issueTime = sarStandardsInfoEO.getIssueTime();
+            if (null != issueTime && issueTime.length() > 10){
+                issueTime = issueTime.substring(0,10);
+            }
+            map.put("issueTime",issueTime);
         }else{
             map.put("issueTime", "");
         }
         if (sarStandardsInfoEO.getPutTime() != null) {
-            map.put("putTime",sarStandardsInfoEO.getPutTime());
+            String putTime = sarStandardsInfoEO.getPutTime();
+            if (null != putTime && putTime.length() > 10){
+                putTime = putTime.substring(0,10);
+            }
+            map.put("putTime",putTime);
         }else {
             map.put("putTime", "");
         }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java

@@ -465,7 +465,34 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
                         " where STAND_ID = r.stand_id and CLOSE_STATE = '2' ) as counts ",
                 "(select GROUP_CONCAT( DISTINCT DATE_FORMAT( PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY PLAN_CLOSE_TIME )  from sar_stand_unqualified where " +
                 " STAND_ID = r.stand_id and CLOSE_STATE = '1' AND PLAN_CLOSE_TIME is NOT NULL ) as endTimes ");
-        wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'");
+        wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'" +
+                "union all " +
+                "SELECT " +
+                "ID," +
+                "STAND_NUMBER," +
+                "STAND_SORT," +
+                "STAND_YEAR," +
+                "STAND_NAME," +
+                "STAND_EN_NAME," +
+                "'' as TEXT_STATUS," +
+                "'' as STAND_TYPE," +
+                "( SELECT count( * ) FROM sar_stand_unqualified WHERE STAND_ID = r.stand_id AND CLOSE_STATE = '1' ) AS unCount," +
+                "( SELECT count( * ) FROM sar_stand_unqualified WHERE STAND_ID = r.stand_id AND CLOSE_STATE = '2' ) AS counts," +
+                "(" +
+                "SELECT " +
+                "GROUP_CONCAT( DISTINCT DATE_FORMAT( PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY PLAN_CLOSE_TIME ) " +
+                "FROM " +
+                "sar_stand_unqualified " +
+                "WHERE " +
+                "STAND_ID = r.stand_id " +
+                "AND CLOSE_STATE = '1' " +
+                "AND PLAN_CLOSE_TIME IS NOT NULL " +
+                ") AS endTimes " +
+                "FROM " +
+                "sar_bussioness_stand " +
+                "INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_bussioness_stand.ID " +
+                "WHERE " +
+                "r.project_id = '" + standId + "'");
         Page<SarStandardsInfo> page1 = new Page<>(current, pageSize);
         IPage<SarStandardsInfo> userIPage1 = SarStandardsInfoDao.selectPage(page1, wrapper1);
         System.out.println("总条数"+userIPage1.getTotal());
@@ -473,7 +500,14 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
 
         QueryWrapper<SarStandAttrInfo> wrapper2 = new QueryWrapper<>();
         wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQ","ZCCSSRQ","ZRBM","KCCVPPSBM","KCCVPPSCN","CYCVPPSBM","CYCVPPSCN");
-            wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID WHERE r.project_id ='"+ standId+"'");
+            wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID " +
+                    "WHERE r.project_id ='"+ standId+"'" +
+                    "union all " +
+                    "SELECT r.STAND_ID,'' as SSRQ,'' as XCXSSRQ,'' as ZCCSSRQ,'' as ZRBM,KCVPPSBMBUSS as KCCVPPSBM," +
+                    "KCVPPSCNBUSS as KCCVPPSCN, CYCVPPSBMBUSS as CYCVPPSBM,CYCVPPSCNBUSS as CYCVPPSCN " +
+                    "FROM sar_buss_stand_attr_info " +
+                    "INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_buss_stand_attr_info.STAND_ID " +
+                    "WHERE r.project_id ='" + standId + "'");
 
         Page<SarStandAttrInfo> page2 = new Page<>(current, pageSize);
         IPage<SarStandAttrInfo> userIPage2 = sarStandAttrInfoDao.selectPage(page2, wrapper2);
@@ -569,11 +603,43 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         System.out.println(idmis);
         QueryWrapper<SarStandardsInfo> wrapper1 = new QueryWrapper<>();
         wrapper1.select("ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME","STAND_TYPE","STAND_YEAR","STAND_SORT");
-        wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'");
+//        wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'");
+        wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'" +
+                        "union all " +
+                        "SELECT " +
+                        "ID, " +
+                        "STAND_NUMBER, " +
+                        "STAND_NAME, " +
+                        "STAND_EN_NAME, " +
+                        "'' as STAND_TYPE, " +
+                        "STAND_YEAR, " +
+                        "STAND_SORT " +
+                        "FROM " +
+                        "sar_bussioness_stand " +
+                        "INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_bussioness_stand.ID " +
+                        "WHERE " +
+                        "r.stand_id IN ( '5iy8azycsw8vl5tfqckk', 'x0ncqakb4kajf9zdhg2p' ) " +
+                        "AND r.project_id = '5DYWDVEQTNH5PXSP6LWQ'"
+//                "union all " +
+//                "SELECT " +
+//                "ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME","STAND_TYPE","STAND_YEAR","STAND_SORT" +
+//                "FROM " +
+//                "sar_bussioness_stand " +
+//                "INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_bussioness_stand.ID " +
+//                "WHERE " +
+//                "r.project_id = '" + standId + "'"
+                );
         List<SarStandardsInfo> userList1 = SarStandardsInfoDao.selectList(wrapper1);
         QueryWrapper<SarStandAttrInfo> wrapper2 = new QueryWrapper<>();
         wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQ","ZCCSSRQ","ZRBM","KCCVPPSBM","KCCVPPSCN","CYCVPPSBM","CYCVPPSCN");
-        wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'");
+        wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID " +
+                "WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'" +
+                "union all " +
+                "SELECT r.STAND_ID,'' as SSRQ,'' as XCXSSRQ,'' as ZCCSSRQ,'' as ZRBM,KCVPPSBMBUSS as KCCVPPSBM," +
+                "KCVPPSCNBUSS as KCCVPPSCN, CYCVPPSBMBUSS as CYCVPPSBM,CYCVPPSCNBUSS as CYCVPPSCN " +
+                "FROM sar_buss_stand_attr_info " +
+                "INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_buss_stand_attr_info.STAND_ID " +
+                "WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'");
         List<SarStandAttrInfo> userList2 = sarStandAttrInfoDao.selectList(wrapper2);
 
         Map<String,Object> map= iDicTypeEOService.getDicTypeListCode();

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java

@@ -57,8 +57,8 @@ public class SarStandardComplianceAssessResultController {
             QueryWrapper<SarStandardComplianceProductAssess> queryWrapper = new QueryWrapper<>();
             IPage<SarStandardComplianceProductAssess> iPage = new Page<>(eo.getCurrent(), eo.getSize());
             queryWrapper.select(" STAND_ID,ANY_VALUE(STAND_NUMBER) as STAND_NUMBER, STAND_NAME, STAND_TYPE");
-            if (eo.getStandName() != null ) {
+            if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
-                queryWrapper.like("STAND_NAME", eo.getStandName().replace(" ",""));
+                queryWrapper.like("STAND_NAME", eo.getStandName().trim());
             }
             if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) {
                 queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim());

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java

@@ -193,7 +193,10 @@ public class SarUpdLogServiceImpl extends ServiceImpl<SarUpdLogDao, SarUpdLog> i
                 }
                 return value;
             default:
-                value = sysInfoEOService.getDicNamesByCodes(value,"");
+                String name = sysInfoEOService.getDicNamesByCodes(value,"");
+                if (StringUtils.isNotEmpty(name)){
+                    value = name;
+                }
                 return value;
         }
     }

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml

@@ -420,7 +420,9 @@
     </select>
     <select id="queryProjectGroup"
             resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
-        select distinct sar_stand_project_library.project_group,sar_stand_project_library.management_host_name,sar_stand_project_library.category_name,sar_stand_project_library.development_host_name from sar_stand_project_library
+        select distinct sar_stand_project_library.project_group,ANY_VALUE(sar_stand_project_library.management_host_name),
+        ANY_VALUE(sar_stand_project_library.category_name),ANY_VALUE(sar_stand_project_library.development_host_name)
+        from sar_stand_project_library
         where 1=1
         <if test="sarStandProjectLibrary.managementHostName != null and sarStandProjectLibrary.managementHostName != ''">
           and  sar_stand_project_library.management_host_name=#{sarStandProjectLibrary.managementHostName}
@@ -431,6 +433,7 @@
         <if test="sarStandProjectLibrary.categoryName != null and sarStandProjectLibrary.categoryName != ''">
           and  sar_stand_project_library.category_name=#{sarStandProjectLibrary.categoryName}
         </if>
+        GROUP BY sar_stand_project_library.project_group
         limit  ${(current-1) * size},${size}
     </select>
     <select id="queryProjectGroupCount"

adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml

@@ -67,6 +67,7 @@
                 #{id}
             </foreach>
         </if>
+        order by u.CREATION_TIME desc,u.USID
         limit #{start},#{end}
     </select>
 

adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java

@@ -340,15 +340,17 @@ public class AttFileEOServiceImpl extends ServiceImpl<AttFileEODao, AttFileEO> i
          */
         AttFileEO attFileEO = new AttFileEO();
         AttFileEO attFileInfo=null;
-        Integer flag=0;
         try {
             attFileEO.setId(attId);
             attFileInfo = this.baseMapper.selectFileInfoById(attFileEO);
             if (name.contains(".")) {
-                if (name.split("\\.")[1].equals(attFileInfo.getFileSuffix())) {
+                int suffixIndex = name.lastIndexOf(".");
+                String newSuffix = name.substring(suffixIndex+1).trim();
+                if (StringUtils.equals(newSuffix.toUpperCase(),attFileInfo.getFileSuffix().toUpperCase())) {
                     attFileInfo.setOldFileName(name);
                 }else {
-                    attFileInfo.setOldFileName(name.split("\\.")[0].trim()+"."+attFileInfo.getFileSuffix());
+                    String filename = name.substring(0,suffixIndex).trim();
+                    attFileInfo.setOldFileName(filename+"."+attFileInfo.getFileSuffix());
                 }
             }else {
                 attFileInfo.setOldFileName(name.trim()+"."+attFileEO.getFileSuffix());
@@ -361,6 +363,7 @@ public class AttFileEOServiceImpl extends ServiceImpl<AttFileEODao, AttFileEO> i
         return attFileInfo;
     }
 
+
     /**
      * @Author super_liu
      * @Description 多文件查询