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

@@ -138,4 +138,7 @@ public class JgUseRegistrationManageDto extends BaseDto {
 
     @ApiModelProperty("是否可以做业务-西安电梯导入用（0-否，1-是）")
     private String isDoBusiness;
+
+    @ApiModelProperty("产权单位code_name")
+    private String estateUnitName;
 }

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

@@ -50,4 +50,6 @@ public interface JgVehicleInformationMapper extends BaseMapper<JgVehicleInformat
     Integer countUseTimesForInvalid(@Param("code") Object code);
 
     List<JgVehicleInformation> getListOfPass();
+
+    List<Map<String, Object>> getVehicleInfoOfPassWithEquId();
 }

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

@@ -25,7 +25,8 @@
         pv."NOMINAL_WORKING_PRESSURE" nominalWorkingPressure,
         pv."SINGLE_BOTTLE_VOLUME" singleBottleVolume,
         to_char((select INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ri.RECORD ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') inspectDate,
-        to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ri.RECORD ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') nextInspectDate
+        to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ri.RECORD ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') nextInspectDate,
+        CONCAT(jui.ESTATE_UNIT_CREDIT_CODE, '_', jui.ESTATE_UNIT_NAME) AS estateUnitName
         FROM
         idx_biz_jg_register_info ri
         LEFT JOIN idx_biz_jg_use_info jui on ri.RECORD = jui.RECORD

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

@@ -78,8 +78,11 @@
         </where>
     </select>
     <select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto">
-        <include refid="page_list"/>
-        from tzs_jg_use_registration_manage tjurm
+        <include refid="page_list"/>,
+        (SELECT CONCAT(ESTATE_UNIT_CREDIT_CODE, '_', ESTATE_UNIT_NAME) from idx_biz_jg_use_info ui
+        LEFT JOIN idx_biz_jg_register_info ri ON ri.record = ui.record
+        WHERE ri.USE_ORG_CODE = tjurm.use_registration_code ORDER BY ui.REC_DATE DESC limit 1) AS estateUnitName
+        FROM tzs_jg_use_registration_manage tjurm
         <where>
             tjurm.is_delete = 0
             <if test="dto.equList != null and dto.equList != ''">
@@ -408,10 +411,12 @@
     <select id="queryForUnitByProjectContraptionPage"
             resultType="com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption">
         SELECT distinct
-        ibjpc.*
+        ibjpc.*,
+        (SELECT CONCAT(ESTATE_UNIT_CREDIT_CODE, '_', ESTATE_UNIT_NAME) FROM idx_biz_jg_use_info
+        WHERE "PROJECT_CONTRAPTION_ID" = ibjpc."sequence_nbr" ORDER BY REC_DATE DESC LIMIT 1) AS estateUnitName
         FROM
         idx_biz_jg_project_contraption ibjpc
-        left join tzs_jg_use_registration_manage tjurm ON ibjpc.use_registration_code = tjurm.use_registration_code
+        LEFT JOIN tzs_jg_use_registration_manage tjurm ON ibjpc.use_registration_code = tjurm.use_registration_code
         WHERE
         EXISTS (
         SELECT

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

@@ -335,4 +335,17 @@
           and u.status='已完成'
          ORDER BY u.audit_pass_date
     </select>
+
+    <select id="getVehicleInfoOfPassWithEquId" resultType="java.util.Map">
+        SELECT
+            u.estate_unit_name as estateUnitName,
+            u.estate_unit_credit_code as estateUnitCreditCode,
+            tjvie.equ_id as equId
+        FROM tzs_jg_vehicle_information u
+        LEFT JOIN tzs_jg_vehicle_information_eq tjvie ON tjvie.vehicle_id = u.sequence_nbr
+        WHERE u.is_delete = '0'
+          AND u.status = '已完成'
+          AND u.estate_unit_credit_code is not null
+        ORDER BY u.audit_pass_date
+    </select>
 </mapper>

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

@@ -210,5 +210,13 @@ public class DataHandlerController extends BaseController {
         return ResponseHelper.buildResponse(dataHandlerService.safeTraceabilityClosedLoop());
     }
 
-
+    /**
+     * 车用气瓶登记产权单位信息刷入useInfo表
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "车用气瓶登记产权单位信息刷入useInfo表", notes = "车用气瓶登记产权单位信息刷入useInfo表")
+    @GetMapping(value = "/writeEstateUnitInfoInUseInfo")
+    public ResponseModel<String> writeEstateUnitInfoInUseInfo() {
+        return ResponseHelper.buildResponse(dataHandlerService.writeEstateUnitInfoInUseInfo());
+    }
 }

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

@@ -193,10 +193,11 @@ public class JgChangeRegistrationUnitController extends BaseController {
         LinkedHashMap model1 = (LinkedHashMap) model.get("changeRegisInfo");
         String opinion = (String) model.get("opinion");
         LinkedHashMap installationInfo = (LinkedHashMap) model1.get("changeRegisInfo");
-        JgChangeRegistrationUnitDto jgInstallationNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgChangeRegistrationUnitDto.class);
-        jgInstallationNoticeDto.setProcessAdvice(opinion);
+        installationInfo.put("registrationList", model.get("newCarNumberList"));
+        JgChangeRegistrationUnitDto changeRegistrationUnitDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgChangeRegistrationUnitDto.class);
+        changeRegistrationUnitDto.setProcessAdvice(opinion);
         ReginParams reginParams = getSelectedOrgInfo();
-        jgChangeRegistrationUnitServiceImpl.accept(jgInstallationNoticeDto, op, reginParams);
+        jgChangeRegistrationUnitServiceImpl.accept(changeRegistrationUnitDto, op, reginParams);
         return ResponseHelper.buildResponse(null);
     }
 

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

@@ -1255,4 +1255,16 @@ public class DataHandlerServiceImpl {
         equipmentStrategy.handleProblem(inspectJsonArr, SafetyProblemTypeEnum.JYBJ);
         return String.format("修正历史维保超期未闭环数:%s起,检验超期未闭环数：%s起。总数：%s起", mainJsonArr.size(), inspectJsonArr.size(), mainJsonArr.size() + inspectJsonArr.size());
     }
+
+    public String writeEstateUnitInfoInUseInfo() {
+        List<Map<String, Object>> vehicleUseRegs = jgVehicleInformationService.getBaseMapper().getVehicleInfoOfPassWithEquId();
+        vehicleUseRegs.parallelStream().forEach(u->{
+            LambdaUpdateWrapper<IdxBizJgUseInfo> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(IdxBizJgUseInfo::getRecord,u.get("equId"));
+            updateWrapper.set(IdxBizJgUseInfo::getEstateUnitName,u.get("estateUnitName"));
+            updateWrapper.set(IdxBizJgUseInfo::getEstateUnitCreditCode,u.get("estateUnitCreditCode"));
+            useInfoService.update(updateWrapper);
+        });
+        return String.format("修正车用气瓶登记未更新产权信息数据:%s条。", vehicleUseRegs.size());
+    }
 }

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

@@ -46,6 +46,7 @@ import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import io.seata.spring.annotation.GlobalTransactional;
+import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.BeanUtils;
@@ -109,6 +110,8 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
     private IdxBizJgUseInfoMapper jgUseInfoMapper;
 
     private volatile Map<String, Object> fillingMediumMap;
+    @Autowired
+    private IdxBizJgUseInfoServiceImpl idxBizJgUseInfoServiceImpl;
 
 
     public void changeData(JgChangeVehicleRegistrationUnit dto, CompanyBo company) {
@@ -531,6 +534,19 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
             // 更新es数据
             updateEsData(collect, jgChangeVehicleRegistrationUnit, code);
         }
+
+        // 产权单位信息
+        if (!StringUtils.isEmpty(jsonObject.getString("estateUnitName"))) {
+            String[] data = String.valueOf(jsonObject.getString("estateUnitName")).split("_");
+            // 更新产权单位
+            LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
+            lambda.in(IdxBizJgUseInfo::getRecord, collect);
+            IdxBizJgUseInfo useInfo = new IdxBizJgUseInfo();
+            useInfo.setEstateUnitName(data[1]);
+            useInfo.setEstateUnitCreditCode(data[0]);
+            idxBizJgUseInfoServiceImpl.update(useInfo, lambda);
+        }
+
         // 区内变更
         if ("1".equals(jgChangeVehicleRegistrationUnit.getChangeType()) && !ObjectUtils.isEmpty(collect)) {
             updateEsData(collect, jgChangeVehicleRegistrationUnit, null);
@@ -765,10 +781,15 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
                 if (!ObjectUtils.isEmpty(registrationManage) && !ObjectUtils.isEmpty(registrationManage.getCarNumber())) {
                     a.put("carNumber", registrationManage.getCarNumber());
                 }
-                if(!ObjectUtils.isEmpty(registrationManage.getCarNumber())){
+                if (!ObjectUtils.isEmpty(a.get("chargingMedium"))) {
                     a.put("chargingMedium", getFillingMediumMap().get(a.getOrDefault("chargingMedium", "") + ""));
                 }
             });
+            map.put("estateUnitName", equList.stream()
+                    .map(e -> e.get("estateUnitName"))
+                    .filter(Objects::nonNull)
+                    .findFirst()
+                    .orElse(null));
             map.put("dataList", equList);
             // 组件回显
             if (!ObjectUtils.isEmpty(registrationManage) && !ObjectUtils.isEmpty(registrationManage.getCarNumber())) {

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

@@ -1061,6 +1061,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         useInfo.setIsIntoManagement(Boolean.TRUE);
         useInfo.setAddress(jgVehicleInformation.getUseUnitAddress());
         useInfo.setUseDate(jgVehicleInformation.getUseDate());
+        useInfo.setEstateUnitCreditCode(jgVehicleInformation.getEstateUnitCreditCode());
+        useInfo.setEstateUnitName(jgVehicleInformation.getEstateUnitName());
         LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
         lambda.eq(IdxBizJgUseInfo::getRecord, map.get("record"));
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgProjectContraption.java

@@ -288,4 +288,10 @@ public class IdxBizJgProjectContraption extends BaseEntity {
     @TableField(exist = false)
     private Boolean disableBasicButton;
 
+    /**
+     * 产权单位code_name
+     */
+    @TableField(exist = false)
+    private String estateUnitName;
+
 }