内部报验问题修复

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxInsideInspectionBiddingDocPointService.java

@@ -33,9 +33,9 @@ public interface ZhcxInsideInspectionBiddingDocPointService extends IService<Zhc
      *
      * @param insideId
      * @param req
-     * @param descMap
+     * @param descList
      */
-    void saveAndLog(String insideId, InsideInspectionExecuteRequest req, Map<String, String> descMap);
+    void saveAndLog(String insideId, InsideInspectionExecuteRequest req, List<String> descList);
 
     /**
      * 内部报验单id复制

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxInsideInspectionCoreIndicatorsService.java

@@ -58,7 +58,7 @@ public interface ZhcxInsideInspectionCoreIndicatorsService extends IService<Zhcx
      *
      * @param insideId
      * @param req
-     * @param descMap
+     * @param descList
      */
-    void saveAndLog(String insideId, InsideInspectionExecuteRequest req, Map<String, String> descMap);
+    void saveAndLog(String insideId, InsideInspectionExecuteRequest req, List<String> descList);
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxInsideInspectionDetailImprovementItemService.java

@@ -33,9 +33,9 @@ public interface ZhcxInsideInspectionDetailImprovementItemService extends IServi
      *
      * @param insideId
      * @param req
-     * @param descMap
+     * @param descList
      */
-    void saveAndLog(String insideId, InsideInspectionExecuteRequest req, Map<String, String> descMap);
+    void saveAndLog(String insideId, InsideInspectionExecuteRequest req, List<String> descList);
 
     /**
      * 根据内部报验id复制

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxInsideInspectionBiddingDocPointServiceImpl.java

@@ -60,10 +60,10 @@ public class ZhcxInsideInspectionBiddingDocPointServiceImpl extends ServiceImpl<
      *
      * @param insideId
      * @param req
-     * @param descMap
+     * @param descList
      */
     @Override
-    public void saveAndLog(String insideId, InsideInspectionExecuteRequest req, Map<String, String> descMap) {
+    public void saveAndLog(String insideId, InsideInspectionExecuteRequest req, List<String> descList) {
         if(ObjectUtil.isNull(req.getPointMap()) || ObjectUtil.isEmpty(req.getPointMap().get(insideId))) {
             return ;
         }
@@ -72,7 +72,7 @@ public class ZhcxInsideInspectionBiddingDocPointServiceImpl extends ServiceImpl<
         if(ObjectUtil.isNotEmpty(generalUpdateVoList)) {
             List<String> editList = editCheckerColsHistory(insideId, generalUpdateVoList);
             if(ObjectUtil.isNotEmpty(editList)) {
-                descMap.put(insideId, StringUtils.join(editList, ","));
+                descList.add("标书要点：".concat(StringUtils.join(editList, ",")));
             }
         }
 

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxInsideInspectionCoreIndicatorsServiceImpl.java

@@ -109,10 +109,10 @@ public class ZhcxInsideInspectionCoreIndicatorsServiceImpl extends ServiceImpl<Z
      *
      * @param insideId
      * @param req
-     * @param descMap
+     * @param descList
      */
     @Override
-    public void saveAndLog(String insideId, InsideInspectionExecuteRequest req, Map<String, String> descMap) {
+    public void saveAndLog(String insideId, InsideInspectionExecuteRequest req, List<String> descList) {
         //核心检验指标修改记录
         if(ObjectUtil.isNull(req.getCoreMap()) || ObjectUtil.isEmpty(req.getCoreMap().get(insideId))) {
             return ;
@@ -122,7 +122,7 @@ public class ZhcxInsideInspectionCoreIndicatorsServiceImpl extends ServiceImpl<Z
         if(ObjectUtil.isNotEmpty(generalUpdateVoList)) {
             List<String> editList = editCheckerColsHistory(insideId, generalUpdateVoList);
             if(ObjectUtil.isNotEmpty(editList)) {
-                descMap.put(insideId, StringUtils.join(editList, ","));
+                descList.add("核心检验指标：".concat(StringUtils.join(editList, ",")));
             }
         }
 

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxInsideInspectionDetailImprovementItemServiceImpl.java

@@ -59,10 +59,10 @@ public class ZhcxInsideInspectionDetailImprovementItemServiceImpl extends Servic
      *
      * @param insideId
      * @param req
-     * @param descMap
+     * @param descList
      */
     @Override
-    public void saveAndLog(String insideId, InsideInspectionExecuteRequest req, Map<String, String> descMap) {
+    public void saveAndLog(String insideId, InsideInspectionExecuteRequest req, List<String> descList) {
         if(ObjectUtil.isNull(req.getItemMap()) || ObjectUtil.isEmpty(req.getItemMap().get(insideId))) {
             return ;
         }
@@ -71,7 +71,7 @@ public class ZhcxInsideInspectionDetailImprovementItemServiceImpl extends Servic
         if(ObjectUtil.isNotEmpty(generalUpdateVoList)) {
             List<String> editList = editCheckerColsHistory(insideId, generalUpdateVoList);
             if(ObjectUtil.isNotEmpty(editList)) {
-                descMap.put(insideId, StringUtils.join(editList, ","));
+                descList.add("细节完善项：".concat(StringUtils.join(editList, ",")));
             }
         }
 

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxInsideInspectionServiceImpl.java

@@ -962,14 +962,17 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
             //获取执行派单对象
             ZhcxInsideInspectionDispatchDo dispatch = dispatchService.getExecute(inOper, req);
 
+            List<String> descList = new ArrayList();
             //核心检验指标
-            insideInspectionCoreIndicatorsService.saveAndLog(insideId, req, descMap);
-
+            insideInspectionCoreIndicatorsService.saveAndLog(insideId, req, descList);
             //细节完善项
-            insideInspectionDetailImprovementItemService.saveAndLog(insideId, req, descMap);
-
+            insideInspectionDetailImprovementItemService.saveAndLog(insideId, req, descList);
             //标书要点
-            insideInspectionBiddingDocPointService.saveAndLog(insideId, req, descMap);
+            insideInspectionBiddingDocPointService.saveAndLog(insideId, req, descList);
+
+            if(ObjectUtil.isNotEmpty(descList)) {
+                descMap.put(insideId, StringUtils.join(descList, ";"));
+            }
 
             //报验完成，只能修改时间
             if("30".equals(inOper.getInspection().getInspectionstatus())) {