fix(jg):BUG 25436 使用登记、施工告知中筛选条件缺少属地监管部门筛选条件

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

@@ -183,4 +183,7 @@ public class JgUseRegistrationDto extends BaseDto {
     @ApiModelProperty(value = " 监察处置机构代码")
     private String supervisionOrgCode;
 
+    @ApiModelProperty(value = "属地监管机构代码")
+    private String orgBranchCode;
+
 }

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

@@ -274,4 +274,16 @@ public class JgUseRegistration extends BaseEntity {
     @TableField("origin_project_contraption_ids")
     private String originProjectContraptionIds;
 
+    /**
+     * 属地监管部门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-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml

@@ -73,6 +73,9 @@
                 <if test="param.useUnitCreditCode != null and param.useUnitCreditCode != ''">
                     AND isn.use_unit_credit_code = #{param.useUnitCreditCode}
                 </if>
+                <if test="param.orgBranchCode != null and param.orgBranchCode != ''">
+                    AND isn.org_branch_code LIKE concat(#{param.orgBranchCode},'%')
+                </if>
             </if>
             <if test="type == 'supervision'">
                 <choose>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -55,6 +55,7 @@
             ur.audit_status as auditStatus,
             date_format(ur.reg_date,'%Y-%m-%d') as regDate,
             ur.use_unit_name as useUnitName,
+            ur.org_branch_code as orgBranchCode,
             ur.status,
             ur.receive_org_name as receiveOrgName,
             ur.use_address as place,
@@ -181,6 +182,9 @@
             <if test="dto.useUnitCode != null and dto.useUnitCode != ''">
                 and use_unit_credit_code = #{dto.useUnitCode}
             </if>
+            <if test="dto.orgBranchCode != null and dto.orgBranchCode != ''">
+                and orgBranchCode like concat(#{dto.orgBranchCode},'%')
+            </if>
             <if test="dto.auditPassDateStart != null and dto.auditPassDateEnd != null">
                 AND auditPassDate BETWEEN #{dto.auditPassDateStart} AND #{dto.auditPassDateEnd}
             </if>

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/DataDockServiceImpl.java

@@ -1863,6 +1863,8 @@ public class DataDockServiceImpl {
                 .setCreateUserName(paramsDto.getExecUserName())
                 .setProjectContraptionId(String.valueOf(proCon.getSequenceNbr()))
                 .setProjectContraption(paramsDto.getProjectContraption())
+                .setOrgBranchCode(paramsDto.getOrgBranchCode())
+                .setOrgBranchName(paramsDto.getOrgBranchName())
                 .setRegDate(new Date());
         useReg.setSequenceNbr(useRegseq);
         jgUseRegistrationServiceImpl.save(useReg);

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/JgUseRegistrationServiceImpl.java

@@ -606,6 +606,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     }
                 });
             }
+            // 属地监管部门
+            Optional.ofNullable(map.get("orgBranchCode").toString())
+                    .filter(code -> code.contains("_"))
+                    .map(code -> code.split("_"))
+                    .ifPresent(splitOrgBranchCode -> {
+                        jgUseRegistration.setOrgBranchCode(splitOrgBranchCode[0]);
+                        jgUseRegistration.setOrgBranchName(splitOrgBranchCode[1]);
+                    });
             jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + map.get("address"));
             if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
                 jgUseRegistration.setUseUnitCreditCode(null);
@@ -829,6 +837,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                         useRegistration.setReceiveCompanyCode(result.getCompanyCode());
                         useRegistration.setReceiveOrgName(splitReceiveOrgCode[1]);
                     });
+            // 属地监管部门
+            Optional.ofNullable(useRegistration.getOrgBranchCode())
+                    .filter(code -> code.contains("_"))
+                    .map(code -> code.split("_"))
+                    .ifPresent(splitOrgBranchCode -> {
+                        useRegistration.setOrgBranchCode(splitOrgBranchCode[0]);
+                        useRegistration.setOrgBranchName(splitOrgBranchCode[1]);
+                    });
 
             // 安全管理员
             Optional.ofNullable(map.getString("safetyManager"))
@@ -3591,6 +3607,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 });
                 useStreetName = atomicUseStreet.get();
             }
+            // 属地监管部门
+            Optional.ofNullable(map.get("orgBranchCode").toString())
+                    .filter(code -> code.contains("_"))
+                    .map(code -> code.split("_"))
+                    .ifPresent(splitOrgBranchCode -> {
+                        jgUseRegistration.setOrgBranchCode(splitOrgBranchCode[0]);
+                        jgUseRegistration.setOrgBranchName(splitOrgBranchCode[1]);
+                    });
             jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + map.get("address"));
 
             if (map.containsKey("edit") && "1".equals(String.valueOf(map.get("edit")))) {