细节完善项，标书要点

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxInsideInspectionBiddingDocPointDao.java

@@ -2,6 +2,10 @@ package com.rongwei.bscommon.sys.dao;
 
 import com.rongwei.bsentity.domain.ZhcxInsideInspectionBiddingDocPointDo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +17,23 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ZhcxInsideInspectionBiddingDocPointDao extends BaseMapper<ZhcxInsideInspectionBiddingDocPointDo> {
 
+    @Insert("INSERT INTO INCONTROL.ZHCX_INSIDE_INSPECTION_BIDDING_DOC_POINT(ID,TENANTID,ROPTION,DELETED,REMARK,CREATEUSERID,CREATEUSERNAME,CREATEDATE,MODIFYUSERID,MODIFYUSERNAME,MODIFYDATE,INSIDEID,POINTID,POINTCODE,POINTNAME,INSPECTON_ITEMS,RECEIVING_CONDITIONS,ACCORDING_TO_STANDARDS,ACCORDING_TO_FILES,SELFACTUALRECORD,SELFRESULT,SELFFILES,SELFREMARK,CHECKACTUALRECORD,CHECKRESULT,CHECKFILES,CHECKREMARK,SORT) " +
+            "select guid(),TENANTID,ROPTION,DELETED,REMARK,CREATEUSERID,CREATEUSERNAME,CREATEDATE,MODIFYUSERID,MODIFYUSERNAME,MODIFYDATE,#{newItpId},POINTID,POINTCODE,POINTNAME,INSPECTON_ITEMS,RECEIVING_CONDITIONS,ACCORDING_TO_STANDARDS,ACCORDING_TO_FILES,SELFACTUALRECORD,SELFRESULT,SELFFILES,SELFREMARK,CHECKACTUALRECORD,CHECKRESULT,CHECKFILES,CHECKREMARK,SORT FROM INCONTROL.ZHCX_INSIDE_INSPECTION_BIDDING_DOC_POINT WHERE INSIDEID = #{itpId}")
+    int insertBySelect(Map<String, String> map);
+
+    /**
+     * 清空
+     *
+     * @param entity
+     */
+    @Update("UPDATE  " +
+            " ZHCX_INSIDE_INSPECTION_DETAIL_IMPROVEMENT_ITEM  " +
+            "SET  " +
+            " CHECKACTUALRECORD = NULL,  " +
+            " CHECKRESULT = NULL,  " +
+            " CHECKFILES = NULL,  " +
+            " CHECKREMARK = NULL  " +
+            "WHERE  " +
+            " INSIDEID = #{insideid}")
+    void reInspection(ZhcxInsideInspectionBiddingDocPointDo entity);
 }

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxInsideInspectionDetailImprovementItemDao.java

@@ -2,6 +2,10 @@ package com.rongwei.bscommon.sys.dao;
 
 import com.rongwei.bsentity.domain.ZhcxInsideInspectionDetailImprovementItemDo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +17,23 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ZhcxInsideInspectionDetailImprovementItemDao extends BaseMapper<ZhcxInsideInspectionDetailImprovementItemDo> {
 
+    @Insert("INSERT INTO INCONTROL.ZHCX_INSIDE_INSPECTION_DETAIL_IMPROVEMENT_ITEM(ID,TENANTID,ROPTION,DELETED,REMARK,CREATEUSERID,CREATEUSERNAME,CREATEDATE,MODIFYUSERID,MODIFYUSERNAME,MODIFYDATE,INSIDEID,ITEMID,ITEMCODE,ITEMNAME,INSPECTON_ITEMS,RECEIVING_CONDITIONS,ACCORDING_TO_STANDARDS,ACCORDING_TO_FILES,SELFACTUALRECORD,SELFRESULT,SELFFILES,SELFREMARK,CHECKACTUALRECORD,CHECKRESULT,CHECKFILES,CHECKREMARK,SORT) " +
+            "select guid(),TENANTID,ROPTION,DELETED,REMARK,CREATEUSERID,CREATEUSERNAME,CREATEDATE,MODIFYUSERID,MODIFYUSERNAME,MODIFYDATE,#{newItpId},ITEMID,ITEMCODE,ITEMNAME,INSPECTON_ITEMS,RECEIVING_CONDITIONS,ACCORDING_TO_STANDARDS,ACCORDING_TO_FILES,SELFACTUALRECORD,SELFRESULT,SELFFILES,SELFREMARK,CHECKACTUALRECORD,CHECKRESULT,CHECKFILES,CHECKREMARK,SORT FROM INCONTROL.ZHCX_INSIDE_INSPECTION_DETAIL_IMPROVEMENT_ITEM WHERE INSIDEID = #{itpId}")
+    int insertBySelect(Map<String, String> map);
+
+    /**
+     * 清空
+     *
+     * @param entity
+     */
+    @Update("UPDATE  " +
+            " ZHCX_INSIDE_INSPECTION_DETAIL_IMPROVEMENT_ITEM  " +
+            "SET  " +
+            " CHECKACTUALRECORD = NULL,  " +
+            " CHECKRESULT = NULL,  " +
+            " CHECKFILES = NULL,  " +
+            " CHECKREMARK = NULL  " +
+            "WHERE  " +
+            " INSIDEID = #{insideid}")
+    void reInspection(ZhcxInsideInspectionDetailImprovementItemDo entity);
 }

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

@@ -4,6 +4,7 @@ import com.rongwei.bsentity.domain.ZhcxInsideInspectionBiddingDocPointDo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.dto.inside.InsideInspectionExecuteRequest;
 import com.rongwei.rwcommon.vo.generalsql.GeneralUpdateVo;
+import com.rongwei.rwcommon.vo.generalsql.SlaveDMLVo;
 
 import java.util.List;
 import java.util.Map;
@@ -35,4 +36,29 @@ public interface ZhcxInsideInspectionBiddingDocPointService extends IService<Zhc
      * @param descMap
      */
     void saveAndLog(String insideId, InsideInspectionExecuteRequest req, Map<String, String> descMap);
+
+    /**
+     * 内部报验单id复制
+     *
+     * @param insideId
+     * @param newIinsideIdList
+     */
+    void copyByInsideId(String insideId, List<String> newIinsideIdList);
+
+    /**
+     * 重新报验
+     * 清空用户填写数据
+     *
+     * @param insideId
+     */
+    void reInspection(String insideId);
+
+    /**
+     * 自检员更改记录
+     *
+     * @param insideId
+     * @param update
+     * @return
+     */
+    List<String> editSelfColsHistory(String insideId, SlaveDMLVo update);
 }

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

@@ -4,6 +4,7 @@ import com.rongwei.bsentity.domain.ZhcxInsideInspectionDetailImprovementItemDo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.dto.inside.InsideInspectionExecuteRequest;
 import com.rongwei.rwcommon.vo.generalsql.GeneralUpdateVo;
+import com.rongwei.rwcommon.vo.generalsql.SlaveDMLVo;
 
 import java.util.List;
 import java.util.Map;
@@ -36,4 +37,29 @@ public interface ZhcxInsideInspectionDetailImprovementItemService extends IServi
      */
     void saveAndLog(String insideId, InsideInspectionExecuteRequest req, Map<String, String> descMap);
 
+    /**
+     * 根据内部报验id复制
+     *
+     * @param insideId
+     * @param newIinsideIdList
+     */
+    void copyByInsideId(String insideId, List<String> newIinsideIdList);
+
+    /**
+     * 重新报验
+     * 清空用户填写数据
+     *
+     * @param insideId
+     */
+    void reInspection(String insideId);
+
+    /**
+     * 自检员更改记录
+     *
+     * @param insideId
+     * @param update
+     * @return
+     */
+    List<String> editSelfColsHistory(String insideId, SlaveDMLVo update);
+
 }

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

@@ -15,6 +15,7 @@ import com.rongwei.rwadmincommon.system.service.SysGeneralCRUDService;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommon.vo.generalsql.GeneralUpdateVo;
+import com.rongwei.rwcommon.vo.generalsql.SlaveDMLVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,6 +35,9 @@ public class ZhcxInsideInspectionBiddingDocPointServiceImpl extends ServiceImpl<
     @Autowired
     private SysGeneralCRUDService generalCRUDService;
 
+    @Autowired
+    private ZhcxInsideInspectionBiddingDocPointDao dao;
+
     /**
      * 检验员更改记录
      *
@@ -82,6 +86,56 @@ public class ZhcxInsideInspectionBiddingDocPointServiceImpl extends ServiceImpl<
         }
     }
 
+    /**
+     * 内部报验单id复制
+     *
+     * @param insideId
+     * @param newIinsideIdList
+     */
+    @Override
+    public void copyByInsideId(String insideId, List<String> newIinsideIdList) {
+        if(ObjectUtil.isEmpty(newIinsideIdList)) {
+            return ;
+        }
+
+        for(String newItpId : newIinsideIdList) {
+            Map<String, String> map = new HashMap<>();
+            map.put("itpId", insideId);
+            map.put("newItpId", newItpId);
+            dao.insertBySelect(map);
+        }
+    }
+
+    /**
+     * 重新报验
+     * 清空用户填写数据
+     *
+     * @param insideId
+     */
+    @Override
+    public void reInspection(String insideId) {
+        ZhcxInsideInspectionBiddingDocPointDo entity = new ZhcxInsideInspectionBiddingDocPointDo();
+        entity.setInsideid(insideId);
+        dao.reInspection(entity);
+    }
+
+    /**
+     * 自检员更改记录
+     *
+     * @param insideId
+     * @param update
+     * @return
+     */
+    @Override
+    public List<String> editSelfColsHistory(String insideId, SlaveDMLVo update) {
+        final LambdaQueryWrapper<ZhcxInsideInspectionBiddingDocPointDo> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(ZhcxInsideInspectionBiddingDocPointDo::getInsideid, insideId)
+                .eq(ZhcxInsideInspectionBiddingDocPointDo::getDeleted, "0");
+        final List<ZhcxInsideInspectionBiddingDocPointDo> list = list(queryWrapper);
+
+        return editSelfCosHistory(list, update.getSlaveUpdate());
+    }
+
     /**
      * 检验员修改记录
      *
@@ -280,7 +334,7 @@ public class ZhcxInsideInspectionBiddingDocPointServiceImpl extends ServiceImpl<
      * @param slaveUpdate
      * @return
      */
-    private List<String> editSelfCosHistory(List<ZhcxInsideInspectionCoreIndicatorsDo> coreList, List<GeneralUpdateVo> slaveUpdate) {
+    private List<String> editSelfCosHistory(List<ZhcxInsideInspectionBiddingDocPointDo> coreList, List<GeneralUpdateVo> slaveUpdate) {
         if(ObjectUtil.isEmpty(coreList) && ObjectUtil.isEmpty(slaveUpdate)) {
             return Collections.emptyList();
         }
@@ -301,12 +355,12 @@ public class ZhcxInsideInspectionBiddingDocPointServiceImpl extends ServiceImpl<
             return result;
         }
 
-        Map<String, ZhcxInsideInspectionCoreIndicatorsDo> coreMap = new HashMap<>(coreList.size());
+        Map<String, ZhcxInsideInspectionBiddingDocPointDo> coreMap = new HashMap<>(coreList.size());
         coreList.stream().forEach(item -> coreMap.put(item.getId(), item));
 
         for(GeneralUpdateVo update : slaveUpdate) {
             String id = update.getUpdatecolumns().get("ID").toString();
-            ZhcxInsideInspectionCoreIndicatorsDo indicators = coreMap.get(id);
+            ZhcxInsideInspectionBiddingDocPointDo indicators = coreMap.get(id);
 
             if(ObjectUtil.isNull(indicators)) {
                 difSelfCoreIndicatorCoreNull4Update(update.getUpdatecolumns(), result);
@@ -326,7 +380,7 @@ public class ZhcxInsideInspectionBiddingDocPointServiceImpl extends ServiceImpl<
      * @param updatecolumns
      * @param result
      */
-    private void diffSelfActualRecord(ZhcxInsideInspectionCoreIndicatorsDo core, Map<String,Object> updatecolumns, List<String> result) {
+    private void diffSelfActualRecord(ZhcxInsideInspectionBiddingDocPointDo core, Map<String,Object> updatecolumns, List<String> result) {
         if(ObjectUtil.isEmpty(core.getSelfactualrecord()) && ObjectUtil.isEmpty(updatecolumns.get("SELFACTUALRECORD"))) {
             return ;
         }
@@ -368,7 +422,7 @@ public class ZhcxInsideInspectionBiddingDocPointServiceImpl extends ServiceImpl<
      * @param updatecolumns
      * @param result
      */
-    private void diffSelfResult(ZhcxInsideInspectionCoreIndicatorsDo core, Map<String,Object> updatecolumns, List<String> result) {
+    private void diffSelfResult(ZhcxInsideInspectionBiddingDocPointDo core, Map<String,Object> updatecolumns, List<String> result) {
         if(ObjectUtil.isEmpty(core.getSelfresult()) && ObjectUtil.isEmpty(updatecolumns.get("SELFRESULT"))) {
             return ;
         }
@@ -410,7 +464,7 @@ public class ZhcxInsideInspectionBiddingDocPointServiceImpl extends ServiceImpl<
      * @param updatecolumns
      * @param result
      */
-    private void diffSelfRemark(ZhcxInsideInspectionCoreIndicatorsDo core, Map<String,Object> updatecolumns, List<String> result) {
+    private void diffSelfRemark(ZhcxInsideInspectionBiddingDocPointDo core, Map<String,Object> updatecolumns, List<String> result) {
         if(ObjectUtil.isEmpty(core.getSelfremark()) && ObjectUtil.isEmpty(updatecolumns.get("SELFREMARK"))) {
             return ;
         }
@@ -452,7 +506,7 @@ public class ZhcxInsideInspectionBiddingDocPointServiceImpl extends ServiceImpl<
      * @param updatecolumns
      * @param result
      */
-    private void difSelfCoreIndicator(ZhcxInsideInspectionCoreIndicatorsDo core, Map<String,Object> updatecolumns, List<String> result) {
+    private void difSelfCoreIndicator(ZhcxInsideInspectionBiddingDocPointDo core, Map<String,Object> updatecolumns, List<String> result) {
 
         List<String> updateCols = new ArrayList<>();
         StringBuilder editRow = new StringBuilder("检查项：");
@@ -489,7 +543,7 @@ public class ZhcxInsideInspectionBiddingDocPointServiceImpl extends ServiceImpl<
             return ;
         }
 
-        ZhcxInsideInspectionCoreIndicatorsDo empty = new ZhcxInsideInspectionCoreIndicatorsDo();
+        ZhcxInsideInspectionBiddingDocPointDo empty = new ZhcxInsideInspectionBiddingDocPointDo();
 
         //修改记录
         difSelfCoreIndicator(empty, updateRow, result);
@@ -501,7 +555,7 @@ public class ZhcxInsideInspectionBiddingDocPointServiceImpl extends ServiceImpl<
      * @param core
      * @param result
      */
-    private void difSelfCoreIndicatorUpdateNull4Entity(ZhcxInsideInspectionCoreIndicatorsDo core, List<String> result) {
+    private void difSelfCoreIndicatorUpdateNull4Entity(ZhcxInsideInspectionBiddingDocPointDo core, List<String> result) {
 
         if(ObjectUtil.isNull(core)) {
             return ;

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

@@ -14,6 +14,7 @@ import com.rongwei.rwadmincommon.system.service.SysGeneralCRUDService;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommon.vo.generalsql.GeneralUpdateVo;
+import com.rongwei.rwcommon.vo.generalsql.SlaveDMLVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -33,6 +34,9 @@ public class ZhcxInsideInspectionDetailImprovementItemServiceImpl extends Servic
     @Autowired
     private SysGeneralCRUDService generalCRUDService;
 
+    @Autowired
+    private ZhcxInsideInspectionDetailImprovementItemDao dao;
+
     /**
      * 检验员更改记录
      *
@@ -81,6 +85,56 @@ public class ZhcxInsideInspectionDetailImprovementItemServiceImpl extends Servic
         }
     }
 
+    /**
+     * 根据内部报验id复制
+     *
+     * @param insideId
+     * @param newIinsideIdList
+     */
+    @Override
+    public void copyByInsideId(String insideId, List<String> newIinsideIdList) {
+        if(ObjectUtil.isEmpty(newIinsideIdList)) {
+            return ;
+        }
+
+        for(String newItpId : newIinsideIdList) {
+            Map<String, String> map = new HashMap<>();
+            map.put("itpId", insideId);
+            map.put("newItpId", newItpId);
+            dao.insertBySelect(map);
+        }
+    }
+
+    /**
+     * 重新报验
+     * 清空用户填写数据
+     *
+     * @param insideId
+     */
+    @Override
+    public void reInspection(String insideId) {
+        ZhcxInsideInspectionDetailImprovementItemDo entity  = new ZhcxInsideInspectionDetailImprovementItemDo();
+        entity.setInsideid(insideId);
+        dao.reInspection(entity);
+    }
+
+    /**
+     * 自检员更改记录
+     *
+     * @param insideId
+     * @param update
+     * @return
+     */
+    @Override
+    public List<String> editSelfColsHistory(String insideId, SlaveDMLVo update) {
+        final LambdaQueryWrapper<ZhcxInsideInspectionDetailImprovementItemDo> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(ZhcxInsideInspectionDetailImprovementItemDo::getInsideid, insideId)
+                .eq(ZhcxInsideInspectionDetailImprovementItemDo::getDeleted, "0");
+        final List<ZhcxInsideInspectionDetailImprovementItemDo> list = list(queryWrapper);
+
+        return editSelfCosHistory(list, update.getSlaveUpdate());
+    }
+
     /**
      * 检验员修改记录
      *
@@ -279,7 +333,7 @@ public class ZhcxInsideInspectionDetailImprovementItemServiceImpl extends Servic
      * @param slaveUpdate
      * @return
      */
-    private List<String> editSelfCosHistory(List<ZhcxInsideInspectionCoreIndicatorsDo> coreList, List<GeneralUpdateVo> slaveUpdate) {
+    private List<String> editSelfCosHistory(List<ZhcxInsideInspectionDetailImprovementItemDo> coreList, List<GeneralUpdateVo> slaveUpdate) {
         if(ObjectUtil.isEmpty(coreList) && ObjectUtil.isEmpty(slaveUpdate)) {
             return Collections.emptyList();
         }
@@ -300,12 +354,12 @@ public class ZhcxInsideInspectionDetailImprovementItemServiceImpl extends Servic
             return result;
         }
 
-        Map<String, ZhcxInsideInspectionCoreIndicatorsDo> coreMap = new HashMap<>(coreList.size());
+        Map<String, ZhcxInsideInspectionDetailImprovementItemDo> coreMap = new HashMap<>(coreList.size());
         coreList.stream().forEach(item -> coreMap.put(item.getId(), item));
 
         for(GeneralUpdateVo update : slaveUpdate) {
             String id = update.getUpdatecolumns().get("ID").toString();
-            ZhcxInsideInspectionCoreIndicatorsDo indicators = coreMap.get(id);
+            ZhcxInsideInspectionDetailImprovementItemDo indicators = coreMap.get(id);
 
             if(ObjectUtil.isNull(indicators)) {
                 difSelfCoreIndicatorCoreNull4Update(update.getUpdatecolumns(), result);
@@ -325,7 +379,7 @@ public class ZhcxInsideInspectionDetailImprovementItemServiceImpl extends Servic
      * @param updatecolumns
      * @param result
      */
-    private void diffSelfActualRecord(ZhcxInsideInspectionCoreIndicatorsDo core, Map<String,Object> updatecolumns, List<String> result) {
+    private void diffSelfActualRecord(ZhcxInsideInspectionDetailImprovementItemDo core, Map<String,Object> updatecolumns, List<String> result) {
         if(ObjectUtil.isEmpty(core.getSelfactualrecord()) && ObjectUtil.isEmpty(updatecolumns.get("SELFACTUALRECORD"))) {
             return ;
         }
@@ -367,7 +421,7 @@ public class ZhcxInsideInspectionDetailImprovementItemServiceImpl extends Servic
      * @param updatecolumns
      * @param result
      */
-    private void diffSelfResult(ZhcxInsideInspectionCoreIndicatorsDo core, Map<String,Object> updatecolumns, List<String> result) {
+    private void diffSelfResult(ZhcxInsideInspectionDetailImprovementItemDo core, Map<String,Object> updatecolumns, List<String> result) {
         if(ObjectUtil.isEmpty(core.getSelfresult()) && ObjectUtil.isEmpty(updatecolumns.get("SELFRESULT"))) {
             return ;
         }
@@ -409,7 +463,7 @@ public class ZhcxInsideInspectionDetailImprovementItemServiceImpl extends Servic
      * @param updatecolumns
      * @param result
      */
-    private void diffSelfRemark(ZhcxInsideInspectionCoreIndicatorsDo core, Map<String,Object> updatecolumns, List<String> result) {
+    private void diffSelfRemark(ZhcxInsideInspectionDetailImprovementItemDo core, Map<String,Object> updatecolumns, List<String> result) {
         if(ObjectUtil.isEmpty(core.getSelfremark()) && ObjectUtil.isEmpty(updatecolumns.get("SELFREMARK"))) {
             return ;
         }
@@ -451,7 +505,7 @@ public class ZhcxInsideInspectionDetailImprovementItemServiceImpl extends Servic
      * @param updatecolumns
      * @param result
      */
-    private void difSelfCoreIndicator(ZhcxInsideInspectionCoreIndicatorsDo core, Map<String,Object> updatecolumns, List<String> result) {
+    private void difSelfCoreIndicator(ZhcxInsideInspectionDetailImprovementItemDo core, Map<String,Object> updatecolumns, List<String> result) {
 
         List<String> updateCols = new ArrayList<>();
         StringBuilder editRow = new StringBuilder("检查项：");
@@ -488,7 +542,7 @@ public class ZhcxInsideInspectionDetailImprovementItemServiceImpl extends Servic
             return ;
         }
 
-        ZhcxInsideInspectionCoreIndicatorsDo empty = new ZhcxInsideInspectionCoreIndicatorsDo();
+        ZhcxInsideInspectionDetailImprovementItemDo empty = new ZhcxInsideInspectionDetailImprovementItemDo();
 
         //修改记录
         difSelfCoreIndicator(empty, updateRow, result);
@@ -500,7 +554,7 @@ public class ZhcxInsideInspectionDetailImprovementItemServiceImpl extends Servic
      * @param core
      * @param result
      */
-    private void difSelfCoreIndicatorUpdateNull4Entity(ZhcxInsideInspectionCoreIndicatorsDo core, List<String> result) {
+    private void difSelfCoreIndicatorUpdateNull4Entity(ZhcxInsideInspectionDetailImprovementItemDo core, List<String> result) {
 
         if(ObjectUtil.isNull(core)) {
             return ;

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

@@ -1244,13 +1244,30 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
 
         //操作日志
         List<String> editList = editColsHistory(inside, masterSlaveUpdate.getMasterUpdate().getUpdatecolumns());
-        //核心检验指标
+
         if(ObjectUtil.isNotEmpty(masterSlaveUpdate.getSlaveUpdate())) {
+            //核心检验指标
             final Optional<SlaveDMLVo> first = masterSlaveUpdate.getSlaveUpdate().stream()
                     .filter(item -> "ZHCX_INSIDE_INSPECTION_CORE_INDICATORS".equals(item.getTableName())).findFirst();
             if(first.isPresent()) {
                 final List<String> list = insideInspectionCoreIndicatorsService.editSelfColsHistory(id, first.get());
-                editList.addAll(list);
+                editList.add("核心检验指标：".concat(StringUtils.join(list, ",")));
+            }
+
+            // 细节完善项
+            final Optional<SlaveDMLVo> detail = masterSlaveUpdate.getSlaveUpdate().stream()
+                    .filter(item -> "ZHCX_INSIDE_INSPECTION_DETAIL_IMPROVEMENT_ITEM".equals(item.getTableName())).findFirst();
+            if(detail.isPresent()) {
+                final List<String> list = insideInspectionDetailImprovementItemService.editSelfColsHistory(id, detail.get());
+                editList.add("细节完善项：".concat(StringUtils.join(list, ",")));
+            }
+
+            // 标书要点
+            final Optional<SlaveDMLVo> point = masterSlaveUpdate.getSlaveUpdate().stream()
+                    .filter(item -> "ZHCX_INSIDE_INSPECTION_BIDDING_DOC_POINT".equals(item.getTableName())).findFirst();
+            if(point.isPresent()) {
+                final List<String> list = insideInspectionBiddingDocPointService.editSelfColsHistory(id, point.get());
+                editList.add("标书要点：".concat(StringUtils.join(list, ",")));
             }
         }
 
@@ -1299,6 +1316,10 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
         }
 
         insideInspectionCoreIndicatorsService.reInspection(inside.getId());
+
+        insideInspectionDetailImprovementItemService.reInspection(inside.getId());
+
+        insideInspectionBiddingDocPointService.reInspection(inside.getId());
     }
 
     /**
@@ -1636,6 +1657,12 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
         //保存核心检验指标
         insideInspectionCoreIndicatorsService.copyByInsideId(inside.getId(), newItpIdList);
 
+        //细节完善项
+        insideInspectionDetailImprovementItemService.copyByInsideId(inside.getId(), newItpIdList);
+
+        //标书要点
+        insideInspectionBiddingDocPointService.copyByInsideId(inside.getId(), newItpIdList);
+
         //保存操作记录
         operLogService.copyByInsideId(inside.getId(), newItpIdList);
     }