安装告知添加字段、 业务不完整，补充业务

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgInstallationNoticeDto.java

@@ -266,4 +266,14 @@ public class JgInstallationNoticeDto extends BaseDto {
 
 
     private String transferToUserIds;
+
+    /**
+     * 属地监管部门code
+     */
+    private String orgBranchCode;
+
+    /**
+     * '属地监管部门name'
+     */
+    private String orgBranchName;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgInstallationNotice.java

@@ -429,4 +429,16 @@ public class JgInstallationNotice extends BaseEntity {
 
     @TableField(value = "transfer_to_user_ids")
     private String transferToUserIds;
+
+    /**
+     * 属地监管部门code
+     */
+    @TableField(value = "org_branch_code")
+    private String orgBranchCode;
+
+    /**
+     * 属地监管部门name
+     */
+    @TableField(value = "org_branch_name")
+    private String orgBranchName;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
@@ -124,6 +125,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     SupervisoryCodeInfoMapper supervisoryCodeInfoMapper;
 
     @Autowired
+    SuperviseInfoMapper superviseInfoMapper;
+
+    @Autowired
     IIdxBizJgConstructionInfoService constructionInfoService;
 
     @Autowired
@@ -184,6 +188,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         if(!ValidationUtil.isEmpty(notice.getFactoryUseSiteStreet()) && !ValidationUtil.isEmpty(notice.getStreetName())) {
             installationInfo.put("factoryUseSiteStreet", notice.getFactoryUseSiteStreet() + "_" + notice.getStreetName());
         }
+        if(!ValidationUtil.isEmpty(notice.getOrgBranchCode()) && !ValidationUtil.isEmpty(notice.getOrgBranchName())) {
+            installationInfo.put("orgBranchCode", notice.getOrgBranchCode() + "_" + notice.getOrgBranchName());
+        }
 
         String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
                 "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
@@ -703,6 +710,15 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             }
         }
 
+        String branchCodeString = model.getOrgBranchCode();
+        if (!ObjectUtils.isEmpty(branchCodeString)) {
+            String[] branchCodeStringList = branchCodeString.split("_");
+            if (branchCodeStringList.length > 1) {
+                model.setOrgBranchCode(branchCodeStringList[0]);
+                model.setOrgBranchName(branchCodeStringList[1]);
+            }
+        }
+
         // 分割单位
         String useUnitId = model.getUseUnitCreditCode();
         if (!ObjectUtils.isEmpty(useUnitId)) {
@@ -860,6 +876,19 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     useInfo.setIsNotXiXian(jgInstallationNotice.getIsXixian() == null ? "0" : jgInstallationNotice.getIsXixian());
                     useInfoService.saveOrUpdateData(useInfo);
                 }
+                // 修改属地
+                LambdaUpdateWrapper<SuperviseInfo> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+                lambdaUpdateWrapper.eq(SuperviseInfo::getRecord, jgRelationEquip.getEquId());
+                SuperviseInfo superviseInfo = new SuperviseInfo();
+                superviseInfo.setOrgBranchName(jgInstallationNotice.getOrgBranchName());
+                superviseInfo.setOrgBranchCode(jgInstallationNotice.getOrgBranchCode());
+                superviseInfoMapper.update(superviseInfo, lambdaUpdateWrapper);
+                HashMap<String, Object> hashMap = new HashMap<>();
+                Map<String,Map<String,Object>> superMap = new HashMap<>();
+                hashMap.put("ORG_BRANCH_CODE",jgInstallationNotice.getOrgBranchCode());
+                hashMap.put("ORG_BRANCH_NAME",jgInstallationNotice.getOrgBranchCode());
+                superMap.put(jgRelationEquip.getEquId(), hashMap);
+                tzsServiceFeignClient.commonUpdateEsDataByIds(superMap);
                 // 上个代办改为已办
                 HashMap<String, Object> taskMap = new HashMap<>();
                 taskMap.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());