内部报验单拆单

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

@@ -17,8 +17,8 @@ import java.util.Map;
  */
 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}")
+    @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, INSPECTIONID, INSPECTIONCONTENT) " +
+            "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, INSPECTIONID, INSPECTIONCONTENT FROM INCONTROL.ZHCX_INSIDE_INSPECTION_BIDDING_DOC_POINT WHERE INSIDEID = #{itpId}")
     int insertBySelect(Map<String, String> map);
 
     /**

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

@@ -35,8 +35,8 @@ public interface ZhcxInsideInspectionCoreIndicatorsDao extends BaseMapper<ZhcxIn
     void reInspection(ZhcxInsideInspectionCoreIndicatorsDo entity);
 
 
-    @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}")
+    @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, INSPECTIONID, INSPECTIONCONTENT) " +
+            "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, INSPECTIONID, INSPECTIONCONTENT FROM INCONTROL.ZHCX_INSIDE_INSPECTION_CORE_INDICATORS WHERE INSIDEID = #{itpId}")
     int insertBySelect(Map<String, String> map);
 
     /**

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

@@ -18,8 +18,8 @@ import java.util.Map;
  */
 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}")
+    @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, INSPECTIONID, INSPECTIONCONTENT) " +
+            "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, INSPECTIONID, INSPECTIONCONTENT FROM INCONTROL.ZHCX_INSIDE_INSPECTION_DETAIL_IMPROVEMENT_ITEM WHERE INSIDEID = #{itpId}")
     int insertBySelect(Map<String, String> map);
 
     /**

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

@@ -2507,7 +2507,7 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
                     stateDo.setId(SecurityUtil.getUUID());
                     stateDo.setMathinecode(mn);
                     stateDo.setPrjid(itpDo.getProjectid());
-                    stateDo.setNodeid(itpDo.getInspectioncontentid());
+                    stateDo.setNodeid(inspectionId);
                     stateDo.setDeleted("0");
 
                     stateDo.setCreatedate(inOper.getOperTime());