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/dto/JgChangeRegistrationUnitDto.java

@@ -219,4 +219,19 @@ public class JgChangeRegistrationUnitDto extends BaseDto {
 
     @ApiModelProperty(value = "属地监管部门")
     private String orgBranchName;
+
+    @ApiModelProperty(value = "设备类别代码")
+    private String equCategoryCode;
+
+    @ApiModelProperty(value = "安全管理员")
+    private String safetyManager;
+
+    @ApiModelProperty(value = "安全管理员电话")
+    private String phone;
+
+    @ApiModelProperty(value = "产权单位seq")
+    private String estateUnitSeq;
+
+    @ApiModelProperty(value = "投用日期")
+    private String useDate;
 }

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

@@ -331,4 +331,34 @@ public class JgChangeRegistrationUnit extends BaseEntity {
      */
     @TableField(value = "org_branch_name")
     private String orgBranchName;
+
+    /**
+     * 设备类别编码
+     */
+    @TableField("equ_category_code")
+    private String equCategoryCode;
+
+    /**
+     * 安全管理员
+     */
+    @TableField("safety_manager")
+    private String safetyManager;
+
+    /**
+     * 安全管理员电话
+     */
+    @TableField("phone")
+    private String phone;
+
+    /**
+     * 产权单位seq
+     */
+    @TableField("estate_unit_seq")
+    private String estateUnitSeq;
+
+    /**
+     * 投用日期
+     */
+    @TableField("use_date")
+    private String useDate;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationMapper.java

@@ -147,6 +147,7 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
     Page<JgNoticeToBeSubmitDto> queryRegistrationToBeSubmitPage(@Param("page") Page<JgNoticeToBeSubmitDto> page, @Param("companyCode")String companyCode);
 
     List<XianElevatorVo> queryXianElevatorData(@Param("beginDate")String beginDate, @Param("endDate") String endDate);
+
     List<JgUseRegistrationEq> selectListForInstallNoticeDiscard(@Param("records") List<String> records);
 
     List<JgUseRegistrationEq> selectListForSelfDiscard(@Param("records") List<String> records);

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

@@ -662,6 +662,9 @@
             <if test="dto.whetherVehicleCylinder != null and dto.whetherVehicleCylinder == 1 ">
                 AND tjurm.reg_type = '车用气瓶登记'
             </if>
+            <if test="dto.whetherVehicleCylinder != null and dto.whetherVehicleCylinder == 0 ">
+                AND tjurm.reg_type != '车用气瓶登记'
+            </if>
             <if test="dto.isScrap != null and dto.isScrap != ''">
                 and tjurm.is_scrap = #{dto.isScrap}
             </if>

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

@@ -1982,8 +1982,8 @@
             tjur.SUPERVISION_ORG_CODE as supervisionOrgCode,
             ibjui.DATA_SOURCE as dataSource
         FROM
-            tzs_jg_use_registration_eq tjure
-            LEFT JOIN tzs_jg_use_registration tjur ON tjur.sequence_nbr = tjure.equip_transfer_id
+            tzs_jg_use_registration_manage tjurm
+            LEFT JOIN idx_biz_jg_register_info ibjri on ibjri."RECORD" = tjurm.equ_id
             LEFT JOIN idx_biz_jg_use_info ibjui ON tjure.equ_id = ibjui."RECORD"
             LEFT JOIN idx_biz_jg_register_info ibjri on ibjri."RECORD" = tjure.equ_id
             LEFT JOIN idx_biz_jg_factory_info ibjfi on ibjfi."RECORD" = tjure.equ_id

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJqEquipmentRegisterController.java

@@ -246,12 +246,12 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/equip/page")
     @ApiOperation(httpMethod = "GET", value = "单位办理设备列表查询", notes = "单位办理设备列表查询")
+    @FieldMapping({@FieldMapping.FieldMap(sourceField = "useUnitSeq", targetField = "useUnitCreditCode", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitCreditInfoBySeq"),})
     public ResponseModel<Page<JSONObject>> queryEquipPage(@RequestParam Map<String, Object> queryMap) {
         JSONObject jsonObject = new JSONObject(queryMap);
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryForUnitEquipmentPage(jsonObject));
     }
 
-
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/equipCanUsedByVessel/page")
     @ApiOperation(httpMethod = "GET", value = "查询车用气瓶可进行选择的设备列表", notes = "查询车用气瓶可进行选择的设备列表")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationUnitController.java

@@ -20,7 +20,6 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import javax.servlet.http.HttpServletResponse;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -53,7 +52,6 @@ public class JgChangeRegistrationUnitController extends BaseController {
     @ApiOperation(httpMethod = "POST", value = "新增单位变更", notes = "新增单位变更")
     public ResponseModel<String> save(@RequestParam String submitType, @RequestBody JSONObject model) {
         ReginParams reginParams = getSelectedOrgInfo();
-
         jgChangeRegistrationUnitServiceImpl.saveNotice(submitType, model, reginParams);
         return ResponseHelper.buildResponse("");
     }
@@ -115,12 +113,10 @@ public class JgChangeRegistrationUnitController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/details")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个单位变更", notes = "根据sequenceNbr查询单个单位变更")
-    public ResponseModel<Map<String,
-            Map<String, Object>>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
+    public ResponseModel<Map<String, Map<String, Object>>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryBySequenceNbr(sequenceNbr, getSelectedOrgInfo()));
     }
 
-
     /**
      * 根据sequenceNbr查询详情
      *

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeVehicleRegistrationUnitController.java

@@ -23,7 +23,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
@@ -132,11 +131,11 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
 			@RequestParam(value = "useUnitCreditCode", required = false) String useUnitCreditCode,
 			@RequestParam(value = "whetherVehicleCylinder") String whetherVehicleCylinder,
 			@RequestParam(value = "certificateStatus", required = false) String certificateStatus,
+			@RequestParam(value = "equCategoryCode", required = false) String equCategoryCode,
 			@RequestParam(value = "useRegistrationCode", required = false) String useRegistrationCode) {
-		if (ValidationUtil.isEmpty(useUnitCreditCode))
-			throw new BadRequest("请先选择原使用单位");
+		if (ValidationUtil.isEmpty(useUnitCreditCode)) throw new BadRequest("请先选择原使用单位");
 		JgUseRegistrationManageDto dto = new JgUseRegistrationManageDto();
-		Page<JgUseRegistrationManageDto> page = new Page<JgUseRegistrationManageDto>();
+		Page<JgUseRegistrationManageDto> page = new Page<>();
 		page.setCurrent(current);
 		page.setSize(size);
 		if (!ValidationUtil.isEmpty(useUnitCreditCode)){
@@ -149,6 +148,9 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
 		if (!ValidationUtil.isEmpty(certificateStatus)){
 			dto.setCertificateStatus(certificateStatus);
 		}
+        if (!ValidationUtil.isEmpty(equCategoryCode)){
+            dto.setEquCategoryCode(equCategoryCode);
+        }
 		if (!ObjectUtils.isEmpty(useRegistrationCode)){
 			dto.setUseRegistrationCode(useRegistrationCode);
 		}

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

@@ -163,6 +163,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     public static final String PROJECT_CONTRAPTION = "PROJECT_CONTRAPTION";// 工程装置名称
     public static final String CREATE_DATE_RANGE = "CREATE_DATE_RANGE";// 创建时间范围查询
     public static final String CREATE_DATE = "CREATE_DATE";// 创建时间范围查询
+    public static final String USE_UNIT_CREDIT_CODE = "useUnitCreditCode";// 创建时间范围查询
     /**
      * 业务类型 0：单个新增 1:批量导入
      */
@@ -4063,13 +4064,21 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
     @Override
     public Page<JSONObject> queryForUnitEquipmentPage(JSONObject jsonObject) {
-        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        String useUnitCreditCode = reginParams.getCompany().getCompanyCode();
-        // 使用单位为个人时候 特殊处理
-        if (useUnitCreditCode.split("_").length > 1) {
-            useUnitCreditCode = useUnitCreditCode.split("_")[1];
+        String useUnitCreditCode = Objects.toString(jsonObject.get(USE_UNIT_CREDIT_CODE), "");
+        if (ValidationUtil.isEmpty(useUnitCreditCode)) {
+            String redisVal = String.valueOf(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())));
+            if (StringUtils.isNotEmpty(redisVal)) {
+                ReginParams params = JSON.parseObject(redisVal, ReginParams.class);
+                useUnitCreditCode = Optional.ofNullable(params)
+                        .map(ReginParams::getCompany)
+                        .map(CompanyBo::getCompanyCode)
+                        .orElse("");
+                useUnitCreditCode = useUnitCreditCode.contains("_") ? useUnitCreditCode.split("_")[1] : useUnitCreditCode;
+            }
+        } else {
+            useUnitCreditCode = useUnitCreditCode.contains("_") ? useUnitCreditCode.split("_")[0] : useUnitCreditCode;
         }
-        jsonObject.put("useUnitCreditCode", useUnitCreditCode);
+        jsonObject.put(USE_UNIT_CREDIT_CODE, useUnitCreditCode);
         Page<JSONObject> page = new Page<>(jsonObject.getLong("number"), jsonObject.getLong("size"));
         Set<String> records = EquipUsedCheckStrategyContext.getUsedStrategy("useRegistration").getEquipInFlow(useUnitCreditCode);
         String[] recordList = ValidationUtil.isEmpty(records) ? null : records.toArray(new String[records.size()]);