Merge branch 'nt-by-master' of http://192.168.0.43:8086/zh_bs/quality-inspection into nt-by-master

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

@@ -36,4 +36,25 @@ public interface ZhcxInsideInspectionBiddingDocPointDao extends BaseMapper<ZhcxI
             "WHERE  " +
             " INSIDEID = #{insideid}")
     void reInspection(ZhcxInsideInspectionBiddingDocPointDo entity);
+
+    /**
+     * 根据报验单id和报验点id更新报验单下标书要点
+     * 适用于拆单时
+     *
+     * @param map
+     */
+    @Update("<script>" +
+            "UPDATE " +
+            " ZHCX_INSIDE_INSPECTION_BIDDING_DOC_POINT p " +
+            "JOIN ZHCX_SUPERVISION_CUSTOM_REQUIREMENTS cr ON " +
+            " cr.ID = p.POINTID SET p.INSIDEID = #{newInsideId} " +
+            " WHERE p.INSIDEID = #{oldInsideId} AND cr.INSPECTIONID like '%${nodeId}%' " +
+            "<if test='roleIdList != null'> " +
+            " AND " +
+            "<foreach item='item' index='index' collection='roleIds' open='(' separator=' OR ' close=')'>" +
+            "cr.INSPECTIONROLEID LIKE #{item}" +
+            "</foreach>" +
+            "</if>" +
+            "</script>")
+    void updateInsideIdByInsideId(Map<String, Object> map);
 }

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

@@ -3,6 +3,7 @@ package com.rongwei.bscommon.sys.dao;
 import com.rongwei.bsentity.domain.ZhcxInsideInspectionCoreIndicatorsDo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.Map;
@@ -37,4 +38,22 @@ public interface ZhcxInsideInspectionCoreIndicatorsDao extends BaseMapper<ZhcxIn
     @Insert("INSERT INTO INCONTROL.ZHCX_INSIDE_INSPECTION_CORE_INDICATORS(ID,TENANTID,ROPTION,DELETED,REMARK,CREATEUSERID,CREATEUSERNAME,CREATEDATE,MODIFYUSERID,MODIFYUSERNAME,MODIFYDATE,INSIDEID,COREID,CORECODE,CORENAME,COREITEMID,INSPECTON_ITEMS,RECEIVING_CONDITIONS,ACCORDING_TO_STANDARDS,SELFACTUALRECORD,SELFRESULT,SELFFILES,SELFREMARK,CHECKACTUALRECORD,CHECKRESULT,CHECKFILES,CHECKREMARK,SORT, ACCORDING_TO_FILES) " +
             "select guid(),TENANTID,ROPTION,DELETED,REMARK,CREATEUSERID,CREATEUSERNAME,CREATEDATE,MODIFYUSERID,MODIFYUSERNAME,MODIFYDATE,#{newItpId},COREID,CORECODE,CORENAME,COREITEMID,INSPECTON_ITEMS,RECEIVING_CONDITIONS,ACCORDING_TO_STANDARDS,SELFACTUALRECORD,SELFRESULT,SELFFILES,SELFREMARK,CHECKACTUALRECORD,CHECKRESULT,CHECKFILES,CHECKREMARK,SORT, ACCORDING_TO_FILES FROM INCONTROL.ZHCX_INSIDE_INSPECTION_CORE_INDICATORS WHERE INSIDEID = #{itpId}")
     int insertBySelect(Map<String, String> map);
+
+    /**
+     * 根据报验单id和报验点id更新报验单下核心检验指标
+     *
+     * @param newInsideId
+     * @param nodeId
+     * @param oldInsideId
+     */
+    @Update("UPDATE ZHCX_CORE_INSPECTION_DETAIL cid " +
+            "JOIN ZHCX_CORE_INSPECTION_INDICATORS_TEMPLATE zciit ON zciit.ID = cid.PID AND zciit.DELETED = '0' " +
+            "JOIN ZHCX_ITP_PROJECT_NODES zipn ON zipn.CHECKTMPID = zciit.ID " +
+            "JOIN ZHCX_INSIDE_INSPECTION_CORE_INDICATORS iici ON iici.COREITEMID = cid.ID  " +
+            "SET iici.INSIDEID = #{newInsideId}  " +
+            "WHERE " +
+            " zipn.ID = #{nodeId}  " +
+            " AND cid.DELETED = '0'  " +
+            " AND iici.INSIDEID = #{oldInsideId}")
+    void updateInsideIdByInsideId(@Param("newInsideId") String newInsideId,@Param("nodeId") String nodeId,@Param("oldInsideId") String oldInsideId);
 }

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

@@ -3,6 +3,7 @@ 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.Param;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.Map;
@@ -36,4 +37,52 @@ public interface ZhcxInsideInspectionDetailImprovementItemDao extends BaseMapper
             "WHERE  " +
             " INSIDEID = #{insideid}")
     void reInspection(ZhcxInsideInspectionDetailImprovementItemDo entity);
+
+    /**
+     * 修改报验单细节完善项所属报验单
+     * 适用于拆单
+     *
+     * @param newInsideId
+     * @param nodeId
+     * @param nodeName
+     * @param oldInsideId
+     */
+    @Update("UPDATE ZHCX_INSIDE_INSPECTION_BIDDING_DOC_POINT p set p.INSIDEID = #{newInsideId} " +
+            "(SELECT " +
+            "    ID " +
+            "  FROM " +
+            "    ZHCX_ITP_TEMPLATE_NODES_EXT " +
+            "  WHERE " +
+            "    deleted = '0' " +
+            "    AND NODEID = #{nodeId} " +
+            "  UNION " +
+            "  SELECT " +
+            "    e.ID " +
+            "  FROM " +
+            "    ZHCX_ITP_TEMPLATE_NODES a " +
+            "  JOIN ZHCX_ITP_TEMPLATE_NODES c ON " +
+            "    a.PID = c.ID " +
+            "    AND c.LEVEL = 2 " +
+            "  LEFT JOIN ZHCX_ITP_TEMPLATE_NODES_EXT e ON " +
+            "    a.ID = e.NODEID " +
+            "  WHERE " +
+            "    a.DELETED = '0' " +
+            "    AND e.DELETED = '0' " +
+            "    AND a.LEVEL = 3 " +
+            "    AND e.NODETYPE = 'itp' " +
+            "    AND a.NODENAME = #{nodeName} " +
+            "    AND c.NODENAME =( " +
+            "    SELECT " +
+            "      NODENAME " +
+            "    FROM " +
+            "      ZHCX_ITP_PROJECT_NODES " +
+            "    WHERE " +
+            "      ID =( " +
+            "      SELECT " +
+            "        PID " +
+            "      FROM " +
+            "        ZHCX_ITP_PROJECT_NODES " +
+            "      WHERE " +
+            "        ID = #{oldInsideId}))) t on t.ID where p.INSIDEID = #{oldInsideId}")
+    void updateInsideIdByInsideId(@Param("newInsideId") String newInsideId, @Param("nodeId") String nodeId, @Param("nodeName") String nodeName, @Param("oldInsideId") String oldInsideId);
 }

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

@@ -61,4 +61,14 @@ public interface ZhcxInsideInspectionBiddingDocPointService extends IService<Zhc
      * @return
      */
     List<String> editSelfColsHistory(String insideId, SlaveDMLVo update);
+
+    /**
+     * 根据报验单id和报验点id更新报验单下标书要点
+     * 适用于拆单时
+     *
+     * @param newInsideId
+     * @param nodeId
+     * @param oldInsideId
+     */
+    void updateInsideIdByInsideId(String newInsideId, String nodeId, String oldInsideId);
 }

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

@@ -5,6 +5,7 @@ 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 org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -61,4 +62,14 @@ public interface ZhcxInsideInspectionCoreIndicatorsService extends IService<Zhcx
      * @param descList
      */
     void saveAndLog(String insideId, InsideInspectionExecuteRequest req, List<String> descList);
+
+    /**
+     * 根据报验单id和报验点id更新报验单下核心检验指标
+     * 适用于拆单时
+     *
+     * @param newInsideId
+     * @param nodeId
+     * @param oldInsideId
+     */
+    void updateInsideIdByInsideId(String newInsideId, String nodeId, String oldInsideId);
 }

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

@@ -5,6 +5,7 @@ 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 org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -62,4 +63,14 @@ public interface ZhcxInsideInspectionDetailImprovementItemService extends IServi
      */
     List<String> editSelfColsHistory(String insideId, SlaveDMLVo update);
 
+    /**
+     * 更改标书要点所属报验单
+     *
+     * @param newInsideId
+     * @param nodeId
+     * @param nodeName
+     * @param oldInsideId
+     */
+    void updateInsideIdByInsideId(String newInsideId, String nodeId, String nodeName, String oldInsideId);
+
 }

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

@@ -21,7 +21,7 @@ public interface ZhcxInsideInspectionDispatchService extends IService<ZhcxInside
      *
      * @param inspectionDo
      */
-    void genDispatch(ZhcxInsideInspectionDo inspectionDo);
+    ZhcxInsideInspectionDispatchDo genDispatch(ZhcxInsideInspectionDo inspectionDo);
 
     /**
      * 获取执行派单信息

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

@@ -4,12 +4,14 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.rongwei.bscommon.sys.service.ZhcxItpProjectNodesService;
 import com.rongwei.bsentity.domain.ZhcxInsideInspectionBiddingDocPointDo;
 import com.rongwei.bscommon.sys.dao.ZhcxInsideInspectionBiddingDocPointDao;
 import com.rongwei.bscommon.sys.service.ZhcxInsideInspectionBiddingDocPointService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bsentity.domain.ZhcxInsideInspectionCoreIndicatorsDo;
 import com.rongwei.bsentity.domain.ZhcxInsideInspectionDetailImprovementItemDo;
+import com.rongwei.bsentity.domain.ZhcxItpProjectNodesDo;
 import com.rongwei.bsentity.dto.inside.InsideInspectionExecuteRequest;
 import com.rongwei.rwadmincommon.system.service.SysGeneralCRUDService;
 import com.rongwei.rwcommon.base.exception.CustomException;
@@ -38,6 +40,9 @@ public class ZhcxInsideInspectionBiddingDocPointServiceImpl extends ServiceImpl<
     @Autowired
     private ZhcxInsideInspectionBiddingDocPointDao dao;
 
+    @Autowired
+    private ZhcxItpProjectNodesService zhcxItpProjectNodesService;
+
     /**
      * 检验员更改记录
      *
@@ -136,6 +141,39 @@ public class ZhcxInsideInspectionBiddingDocPointServiceImpl extends ServiceImpl<
         return editSelfCosHistory(list, update.getSlaveUpdate());
     }
 
+    /**
+     * 根据报验单id和报验点id更新报验单下标书要点
+     * 适用于拆单时
+     *
+     * @param newInsideId
+     * @param nodeId
+     * @param oldInsideId
+     */
+    @Override
+    public void updateInsideIdByInsideId(String newInsideId, String nodeId, String oldInsideId) {
+
+        //项目报验点
+        final ZhcxItpProjectNodesDo itpProjectNodes = zhcxItpProjectNodesService.getById(nodeId);
+
+        if(ObjectUtil.isEmpty(itpProjectNodes)) {
+            return ;
+        }
+
+        List<String> roleIdList = null;
+        if(ObjectUtil.isNotEmpty(itpProjectNodes.getCheckroleid())) {
+            roleIdList = new ArrayList<>();
+            for(String roleId : itpProjectNodes.getCheckroleid().split(",")) {
+                roleIdList.add(roleId);
+            }
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("newInsideId", newInsideId);
+        map.put("nodeId", nodeId);
+        map.put("oldInsideId", oldInsideId);
+        map.put("roleIds", roleIdList);
+        dao.updateInsideIdByInsideId(map);
+    }
+
     /**
      * 检验员修改记录
      *

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

@@ -136,6 +136,19 @@ public class ZhcxInsideInspectionCoreIndicatorsServiceImpl extends ServiceImpl<Z
         }
     }
 
+    /**
+     * 根据报验单id和报验点id更新报验单下核心检验指标
+     * 适用于拆单时
+     *
+     * @param newInsideId
+     * @param nodeId
+     * @param oldInsideId
+     */
+    @Override
+    public void updateInsideIdByInsideId(String newInsideId, String nodeId, String oldInsideId) {
+        dao.updateInsideIdByInsideId(newInsideId, nodeId, oldInsideId);
+    }
+
     /**
      * 检验员修改记录
      *

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

@@ -135,6 +135,19 @@ public class ZhcxInsideInspectionDetailImprovementItemServiceImpl extends Servic
         return editSelfCosHistory(list, update.getSlaveUpdate());
     }
 
+    /**
+     * 更改细节完善项所属报验单
+     *
+     * @param newInsideId
+     * @param nodeId
+     * @param nodeName
+     * @param oldInsideId
+     */
+    @Override
+    public void updateInsideIdByInsideId(String newInsideId, String nodeId, String nodeName, String oldInsideId) {
+        dao.updateInsideIdByInsideId(newInsideId, nodeId, nodeName, oldInsideId);
+    }
+
     /**
      * 检验员修改记录
      *

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

@@ -35,7 +35,7 @@ public class ZhcxInsideInspectionDispatchServiceImpl extends ServiceImpl<ZhcxIns
      * @param inspectionDo
      */
     @Override
-    public void genDispatch(ZhcxInsideInspectionDo inspectionDo) {
+    public ZhcxInsideInspectionDispatchDo genDispatch(ZhcxInsideInspectionDo inspectionDo) {
 
         //已经存在不重复生成
         LambdaQueryWrapper<ZhcxInsideInspectionDispatchDo> queryWrapper = Wrappers.lambdaQuery();
@@ -60,7 +60,7 @@ public class ZhcxInsideInspectionDispatchServiceImpl extends ServiceImpl<ZhcxIns
         if(ObjectUtil.isNotNull(dispatch)) {
             dispatchDo.setId(dispatch.getId());
             updateById(dispatchDo);
-            return ;
+            return getById(dispatch.getId());
         } else {
             dispatchDo.setDispatchstatus("10");
         }
@@ -70,8 +70,9 @@ public class ZhcxInsideInspectionDispatchServiceImpl extends ServiceImpl<ZhcxIns
         dispatchDo.setDeleted("0");
         dispatchDo.setInsideid(inspectionDo.getId());
 
-
         save(dispatchDo);
+
+        return dispatchDo;
     }
 
     /**

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

@@ -200,7 +200,10 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
                 inspection.setCheckercontact(StringUtils.toString(updateColsMap.get("CHECKERCONTACT"), ""));
             }
             //生成空派单信息
-            dispatchService.genDispatch(inspection);
+            final ZhcxInsideInspectionDispatchDo dispatch = dispatchService.genDispatch(inspection);
+
+            //拆单
+            splitOrderByPoint(inspection, dispatch);
         }
         //重新报验
         else if("reInspection".equals(req.getOperType())) {
@@ -361,7 +364,10 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
         //生成报验单号
         updateInspection(inspectionDo, req);
         //生成空派单信息
-        dispatchService.genDispatch(inspectionDo);
+        final ZhcxInsideInspectionDispatchDo dispatch = dispatchService.genDispatch(inspectionDo);
+
+        //拆单
+        splitOrderByPoint(inspectionDo, dispatch);
     }
 
     /**
@@ -446,9 +452,6 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
             ZhcxInsideInspectionDo inside = new ZhcxInsideInspectionDo();
             inside.setId(insideId);
             inside.setInspectionstatus("40");
-            //取消的时候清空
-            inside.setCheckername("");
-
             inspectionList.add(inside);
 
             NotifyDto notify = getMailInfo4Cancel(inOper, req);
@@ -1131,6 +1134,73 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
         doDeletedPoint(project.getId());
     }
 
+    /**
+     * 通过报验点拆单
+     *
+     * @param inside
+     * @param dispatch
+     */
+    private void splitOrderByPoint(ZhcxInsideInspectionDo inside, ZhcxInsideInspectionDispatchDo dispatch) {
+        if(inside.getSplitflag() == 2) { //不拆单
+            return ;
+        }
+
+        final String[] inspectionContents = inside.getInspectioncontent().split(","); // 报验点
+        if(inspectionContents.length <= 1) { //只选择了一个报验点不需要拆单
+            return;
+        }
+
+        final String[] inspectionContentIds = inside.getInspectioncontentid().split(","); // 报验点
+
+        //第一个单据
+        ZhcxInsideInspectionDo source = new ZhcxInsideInspectionDo();
+        source.setInspectioncontent(inspectionContents[0]);
+        source.setInspectioncontentid(inspectionContentIds[0]);
+        String inspectionPoint = inspectionContents[0].replace(inside.getStructurename().concat("-"), "");
+        source.setInspectionpoint(inspectionPoint);
+
+        source.setId(inside.getId());
+        updateById(source);
+
+        //其他单据 复制第一个单据
+        List<ZhcxInsideInspectionDo> insertInsideList = new ArrayList<>(inspectionContents.length - 1);
+        List<ZhcxInsideInspectionDispatchDo> insertDispatchList = new ArrayList<>(inspectionContents.length - 1);
+        for(int m = 1, n = inspectionContents.length; m < n; m++) {
+
+            inspectionPoint = inspectionContents[m].replace(inside.getStructurename().concat("-"), "");
+            //报验单
+            ZhcxInsideInspectionDo insideEntity = new ZhcxInsideInspectionDo();
+            BeanUtil.copyProperties(inside, insideEntity);
+            insideEntity.setId(SecurityUtil.getUUID());
+            insideEntity.setInspectioncode(genCode());
+            insideEntity.setInspectioncontent(inspectionContents[m]);
+            insideEntity.setInspectioncontentid(inspectionContentIds[m]);
+            insideEntity.setInspectionpoint(inspectionPoint);
+            insertInsideList.add(insideEntity);
+
+            //派单明细
+            ZhcxInsideInspectionDispatchDo dispatchEntity = new ZhcxInsideInspectionDispatchDo();
+            BeanUtil.copyProperties(dispatch, dispatchEntity);
+            dispatchEntity.setId(SecurityUtil.getUUID());
+            dispatchEntity.setInsideid(insideEntity.getId());
+            insertDispatchList.add(dispatchEntity);
+
+            // 核心检验
+            insideInspectionCoreIndicatorsService.updateInsideIdByInsideId(insideEntity.getId(), inspectionContentIds[m], inside.getId());
+            //细节完善项目
+            insideInspectionDetailImprovementItemService.updateInsideIdByInsideId(insideEntity.getId(), inspectionContentIds[m], inspectionPoint, inside.getId());
+            //标书要点
+            insideInspectionBiddingDocPointService.updateInsideIdByInsideId(insideEntity.getId(), inspectionContentIds[m], inside.getId());
+
+            //操作日志
+            operLogService.copyByInsideId(inside.getId(), Arrays.asList(new String[] {insideEntity.getId()}));
+
+        }
+
+        saveBatch(insertInsideList);
+        dispatchService.saveBatch(insertDispatchList);
+    }
+
     /**
      * 报验单list转map
      *
@@ -2285,6 +2355,7 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
         ZhcxInsideInspectionDo entity = new ZhcxInsideInspectionDo();
         entity.setId(inspectionDo.getId());
         entity.setInspectioncode(genCode());
+        entity.setInspectionpoint(inspectionDo.getInspectioncontent().replace(inspectionDo.getStructurename().concat("-"), ""));
         updateById(entity);
 
         //生成操作记录
@@ -2357,26 +2428,25 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
             return ;
         }
 
-        ZhcxInsideInspectionDo inside = inOper.getInspection();
+        ZhcxInsideInspectionDo itpDo = inOper.getInspection();
         String machineNo = inOper.getInspection().getMachineno();
         if (StringUtils.isBlank(machineNo)) {
             machineNo = inOper.getInspection().getStructuremachineno();
         }
         if (StringUtils.isBlank(machineNo)) {
-            log.error("{}-{}:总装机号和结构机号都没有", inside.getId(), inside.getInspectioncode());
+            log.error("{}-{}:总装机号和结构机号都没有", itpDo.getId(), itpDo.getInspectioncode());
             return;
         }
-        String[] machinenos = machineNo.split(","); //机号
-        final String[] nodeIds = inside.getInspectioncontentid().split(","); //报验点id
+        String[] machinenos = machineNo.split(",");
+        for (String mn : machinenos) {
 
-        for(String nodeId : nodeIds) { // 报验点
-            for (String mn : machinenos) { // 机号
+            final String[] inspectionIds = itpDo.getInspectioncontentid().split(",");
 
-                //查询报验点状态表中
+            for(String inspectionId : inspectionIds) {
                 LambdaQueryWrapper<ZhcxItpProjectNodeStateDo> queryWrapper = Wrappers.lambdaQuery();
-                queryWrapper.eq(ZhcxItpProjectNodeStateDo::getPrjid, inside.getProjectid())
+                queryWrapper.eq(ZhcxItpProjectNodeStateDo::getPrjid, itpDo.getProjectid())
                         .eq(ZhcxItpProjectNodeStateDo::getMathinecode, mn)
-                        .eq(ZhcxItpProjectNodeStateDo::getNodeid, nodeId);
+                        .eq(ZhcxItpProjectNodeStateDo::getNodeid, inspectionId);
                 List<ZhcxItpProjectNodeStateDo> stateList = itpProjectNodeStateService.list(queryWrapper);
                 ZhcxItpProjectNodeStateDo stateDo = BusinessFunUtils.getPrjNodeState(stateList);
 
@@ -2384,8 +2454,8 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
                     stateDo = new ZhcxItpProjectNodeStateDo();
                     stateDo.setId(SecurityUtil.getUUID());
                     stateDo.setMathinecode(mn);
-                    stateDo.setPrjid(inside.getProjectid());
-                    stateDo.setNodeid(nodeId);
+                    stateDo.setPrjid(itpDo.getProjectid());
+                    stateDo.setNodeid(itpDo.getInspectioncontentid());
                     stateDo.setDeleted("0");
 
                     stateDo.setCreatedate(inOper.getOperTime());
@@ -2406,10 +2476,10 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
                 ZhcxItpProjectNodeStateInsideDo stateInside = new ZhcxItpProjectNodeStateInsideDo();
                 stateInside.setId(SecurityUtil.getUUID());
                 stateInside.setDeleted("0");
-                stateInside.setInsideid(inside.getId());
+                stateInside.setInsideid(itpDo.getId());
                 stateInside.setStateid(stateDo.getId());
-                stateInside.setInspectioncode(inside.getInspectioncode());
-                stateInside.setLaunchtype(inside.getLaunchtype());
+                stateInside.setInspectioncode(itpDo.getInspectioncode());
+                stateInside.setLaunchtype(itpDo.getLaunchtype());
                 stateInside.setStateid(stateDo.getId());
                 nodeStateBo.getInsideStateList().add(stateInside);
             }

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxInsideInspectionDo.java

@@ -328,5 +328,10 @@ public class ZhcxInsideInspectionDo extends BaseDo {
     @TableField("DEPARTNAME")
     private String departname;
 
+    /**
+     * 部门名称
+     */
+    @TableField("SPLITFLAG")
+    private Integer splitflag;
 
 }