fix(jg):属地监管部门筛选

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

@@ -273,17 +273,4 @@ 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/JgUseRegistrationMapper.xml

@@ -55,7 +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.supervision_org_code as supervisionOrgCode,
             ur.status,
             ur.receive_org_name as receiveOrgName,
             ur.use_address as place,
@@ -183,7 +183,7 @@
                 and use_unit_credit_code = #{dto.useUnitCode}
             </if>
             <if test="dto.orgBranchCode != null and dto.orgBranchCode != ''">
-                and orgBranchCode like concat(#{dto.orgBranchCode},'%')
+                and supervisionOrgCode like concat(#{dto.orgBranchCode},'%')
             </if>
             <if test="dto.auditPassDateStart != null and dto.auditPassDateEnd != null">
                 AND auditPassDate BETWEEN #{dto.auditPassDateStart} AND #{dto.auditPassDateEnd}

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

@@ -27,6 +27,9 @@
             <if test="dto.auditPassDate != null and dto.auditPassDate != ''">
                 and tjvi.audit_pass_date like concat('%',DATE_FORMAT(#{dto.auditPassDate},'%Y-%m-%d'),'%')
             </if>
+            <if test="dto.orgBranchCode != null and dto.orgBranchCode != ''">
+                and tjvi.org_branch_code like concat(#{dto.orgBranchCode},'%')
+            </if>
             <if test="roleIds != null and dto.dataType == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
                     instance_status like concat('%',#{role},'%')
@@ -98,7 +101,8 @@
                tjvi.gas_num as gasNum,
                date_format(tjvi.create_date,'%Y-%m-%d')  as createDate,
                tjvi.cancel_reason as cancelReason,
-               tjvi.reg_type as regType
+               tjvi.reg_type        as regType,
+               tjvi.org_branch_code as orgBranchCode
         from tzs_jg_vehicle_information tjvi
     </sql>
 

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,8 +1863,6 @@ 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,14 +606,6 @@ 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);
@@ -837,14 +829,6 @@ 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"))
@@ -3607,14 +3591,6 @@ 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")))) {