wangming пре 9 месеци
родитељ
комит
474e92ac29

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

@@ -845,7 +845,29 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
                     .filter(item -> "ZHCX_INSIDE_INSPECTION_CORE_INDICATORS".equals(item.getTableName())).findFirst();
             if(first.isPresent()) {
                 final List<String> list = insideInspectionCoreIndicatorsService.editSelfColsHistory(inspection.getId(), first.get());
-                editList.addAll(list);
+                if(ObjectUtil.isNotEmpty(list)) {
+                    editList.add("核心检验指标:".concat(StringUtils.join(list, ",")));
+                }
+            }
+        }
+
+        // 细节完善项
+        final Optional<SlaveDMLVo> detail = req.getUpdate().getSlaveUpdate().stream()
+                .filter(item -> "ZHCX_INSIDE_INSPECTION_DETAIL_IMPROVEMENT_ITEM".equals(item.getTableName())).findFirst();
+        if(detail.isPresent()) {
+            final List<String> list = insideInspectionDetailImprovementItemService.editSelfColsHistory(inspection.getId(), detail.get());
+            if(ObjectUtil.isNotEmpty(list)) {
+                editList.add("细节完善项:".concat(StringUtils.join(list, ",")));
+            }
+        }
+
+        // 标书要点
+        final Optional<SlaveDMLVo> point = req.getUpdate().getSlaveUpdate().stream()
+                .filter(item -> "ZHCX_INSIDE_INSPECTION_BIDDING_DOC_POINT".equals(item.getTableName())).findFirst();
+        if(point.isPresent()) {
+            final List<String> list = insideInspectionBiddingDocPointService.editSelfColsHistory(inspection.getId(), point.get());
+            if(ObjectUtil.isNotEmpty(list)) {
+                editList.add("标书要点:".concat(StringUtils.join(list, ",")));
             }
         }