Browse Source

Merge remote-tracking branch 'origin/master'

sola 1 year ago
parent
commit
25391d2ba7

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

@@ -77,7 +77,7 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
             return ;
         }
 
-        String[] structureIds = itpDo.getStructureid().split(",");
+//        String[] structureIds = itpDo.getStructureid().split(",");
 
         List<ZhcxOutsideInspectionItpDo> insertList = new ArrayList<>();
         List<ZhcxOutsideInspectionItpDo> updateList = new ArrayList<>();
@@ -98,7 +98,7 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
                     itpDo.setStructurename(structurNames[m]);
                     itpDo.setInspectioncontent(inspectionContent);
                     itpDo.setInspectioncode(code);
-                    itpDo.setStructureid(structureIds[m]);
+//                    itpDo.setStructureid(structureIds[m]);
                     updateList.add(itpDo);
                     continue;
                 }
@@ -109,7 +109,7 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
                 entity.setInspectioncontent(inspectionContent);
                 entity.setId(SecurityUtil.getUUID());
                 entity.setInspectioncode(code);
-                entity.setStructureid(structureIds[m]);
+//                entity.setStructureid(structureIds[m]);
                 insertList.add(entity);
                 newItpIdList.add(entity.getId());
 

+ 5 - 2
business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxOutsideInspectionItpDo.java

@@ -231,6 +231,9 @@ public class ZhcxOutsideInspectionItpDo extends BaseDo {
      */
     @TableField("FILES")
     private String files;
-
-
+    /**
+     * 检查地点补充
+     */
+    @TableField("INSPECTIONLOCATIONSUPPLEMENT")
+    private String inspectionlocationsupplement;
 }