构件跟踪改造

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

@@ -54,10 +54,17 @@ public class ZhcxOutsideInspectionComponentTrackServiceImpl extends ServiceImpl<
         } else { //存在的话更新总装和结构机号所对应分包商关系
             final ZhcxOutsideInspectionComponentTrackDo trackDo = trackDoList.get(0);
 
+            //分包商
+            final String subIds = StrUtils.addIdAndDeduplicate(trackDo.getSubcontractorid(), itpDo.getSubcontractorid());
+            final String strctSubIds = StrUtils.addIdAndDeduplicate(trackDo.getStructsubcontractorid(), itpDo.getSubcontractorid());
+
+            //挂靠分包商
             final String unitIds = StrUtils.addIdAndDeduplicate(trackDo.getSubcontractorunitid(), itpDo.getSubcontractorunitid());
             final String strctUnitIds = StrUtils.addIdAndDeduplicate(trackDo.getStructsubcontractorunitid(), itpDo.getSubcontractorunitid());
             final LambdaUpdateWrapper<ZhcxOutsideInspectionComponentTrackDo> updateWrapper = Wrappers.lambdaUpdate();
             updateWrapper.eq(ZhcxOutsideInspectionComponentTrackDo::getId, trackDo.getId())
+                    .set(ZhcxOutsideInspectionComponentTrackDo::getSubcontractorid, subIds)
+                    .set(ZhcxOutsideInspectionComponentTrackDo::getStructsubcontractorid, strctSubIds)
                     .set(ZhcxOutsideInspectionComponentTrackDo::getStructsubcontractorunitid, unitIds)
                     .set(ZhcxOutsideInspectionComponentTrackDo::getSubcontractorunitid, strctUnitIds);
             update(updateWrapper);
@@ -122,6 +129,7 @@ public class ZhcxOutsideInspectionComponentTrackServiceImpl extends ServiceImpl<
 
         //分包商id
         entity.setSubcontractorid(itpDo.getSubcontractorid());
+        entity.setStructsubcontractorid(itpDo.getSubcontractorid());
 
         //分包商挂靠单位id
         entity.setSubcontractorunitid(itpDo.getSubcontractorunitid());

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

@@ -943,11 +943,17 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
                         } else { //存在的话更新总装和结构机号所对应分包商关系
                             final ZhcxOutsideInspectionComponentTrackDo trackEntity = trackDoList.get(0);
 
+                            //分包商
+                            final String subIds = StrUtils.addIdAndDeduplicate(trackDo.getSubcontractorid(), itpDo.getSubcontractorid());
+                            final String strctSubIds = StrUtils.addIdAndDeduplicate(trackDo.getStructsubcontractorid(), itpDo.getSubcontractorid());
+
                             final String unitIds = StrUtils.addIdAndDeduplicate(trackEntity.getSubcontractorunitid(), itpDo.getSubcontractorunitid());
                             final String strctUnitIds = StrUtils.addIdAndDeduplicate(trackEntity.getStructsubcontractorunitid(), itpDo.getSubcontractorunitid());
 
                             trackDo = new ZhcxOutsideInspectionComponentTrackDo();
                             trackDo.setId(trackEntity.getId());
+                            trackDo.setSubcontractorid(subIds);
+                            trackDo.setStructsubcontractorid(strctSubIds);
                             trackDo.setSubcontractorunitid(unitIds);
                             trackDo.setStructsubcontractorunitid(strctUnitIds);
                             updateTrackDos.add(trackDo);
@@ -1002,11 +1008,17 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
                     } else { //存在的话更新总装和结构机号所对应分包商关系
                         final ZhcxOutsideInspectionComponentTrackDo trackEntity = trackDoList.get(0);
 
+                        //分包商
+                        final String subIds = StrUtils.addIdAndDeduplicate(trackDo.getSubcontractorid(), itpDo.getSubcontractorid());
+                        final String strctSubIds = StrUtils.addIdAndDeduplicate(trackDo.getStructsubcontractorid(), itpDo.getSubcontractorid());
+
                         final String unitIds = StrUtils.addIdAndDeduplicate(trackEntity.getSubcontractorunitid(), itpDo.getSubcontractorunitid());
                         final String strctUnitIds = StrUtils.addIdAndDeduplicate(trackEntity.getStructsubcontractorunitid(), itpDo.getSubcontractorunitid());
 
                         trackDo = new ZhcxOutsideInspectionComponentTrackDo();
                         trackDo.setId(trackEntity.getId());
+                        trackDo.setSubcontractorid(subIds);
+                        trackDo.setStructsubcontractorid(strctSubIds);
                         trackDo.setSubcontractorunitid(unitIds);
                         trackDo.setStructsubcontractorunitid(strctUnitIds);
                         updateTrackDos.add(trackDo);

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

@@ -114,6 +114,12 @@ public class ZhcxOutsideInspectionComponentTrackDo extends BaseDo {
     @TableField("SUBCONTRACTORUNITNAME")
     private String subcontractorunitname;
 
+    /**
+     * 结构分包商
+     */
+    @TableField("STRUCTSUBCONTRACTORID")
+    private String structsubcontractorid;
+
     /**
      * 结构分包商挂靠单位id
      */