1.新增监管端使用登记证功能

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

@@ -122,4 +122,6 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
     Integer countUseTimesForInvalid(@Param("code") Object code);
 
     List<JgUseRegistrationDto> getListOfPass();
+
+    List<JgUseRegistrationDto> selectMissingSupOrgCodeUseList();
 }

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

@@ -149,6 +149,6 @@
         where
             u.status='已完成'
           and u.apply_no = h.current_document_id
-
+         ORDER BY u.audit_pass_date
     </select>
 </mapper>

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

@@ -137,7 +137,7 @@
             "tzs_jg_change_vehicle_registration_unit" u
         where
             u.status='已完成'
-
+            ORDER BY u.audit_pass_date
     </select>
 
 </mapper>

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

@@ -1481,5 +1481,21 @@
           and u.is_delete = '0'
           AND c.is_deleted = FALSE
           and u.status='已完成'
+          ORDER BY u.audit_pass_date
+    </select>
+    <select id="selectMissingSupOrgCodeUseList"
+            resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto">
+        SELECT
+            u.sequence_nbr,
+            h.change_data::json->>'orgBranchCode' as supervisionOrgCode
+        FROM
+            "amos_tzs_biz"."tzs_jg_use_registration"  u,
+            "tzs_jg_registration_history" h
+        WHERE
+            u."status" = '已完成'
+          AND ( u."supervision_org_code" IS NULL or u."supervision_org_code" = '')
+          and u.sequence_nbr = h.current_document_id
+          AND u."project_contraption_id" IS NOT NULL ORDER BY u.audit_pass_date
+
     </select>
 </mapper>

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

@@ -333,6 +333,6 @@
         where
             u.is_delete = '0'
           and u.status='已完成'
-
+         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

@@ -197,8 +197,10 @@ public class DataHandlerController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "PUT", value = "存量数据刷属地监管部门到证管理表", notes = "存量数据刷属地监管部门到证管理表")
-    @PutMapping(value = "supervise2UseRegManage")
+    @PutMapping(value = "/supervise2UseRegManage")
     public ResponseModel<Long> saveSupervise2UseRegManage(){
         return ResponseHelper.buildResponse(dataHandlerService.saveSupervise2UseRegManage());
     }
+
+
 }

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

@@ -1552,6 +1552,18 @@ public class DataDockServiceImpl {
                 JgUseRegistrationManage regManage = this.saveUseRegManage(paramsDto, useReg);
                 // 流水表
                 this.saveCertChangeRecord(useReg, regManage, records, paramsDto);
+            } else {
+                // 1.更新使用登记证信息
+                JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.lambdaQuery()
+                        .eq(JgUseRegistrationManage::getUseRegistrationCode, paramsDto.getUseOrgCode())
+                        .eq(JgUseRegistrationManage::getIsDelete, 0)
+                        .one();
+                if(jgUseRegistrationManage != null) {
+                    jgUseRegistrationManage.setSuperviseOrgCode(paramsDto.getOrgBranchCode());
+                    jgUseRegistrationManage.setSuperviseOrgName(paramsDto.getOrgBranchName());
+                    jgUseRegistrationManage.setRecDate(new Date());
+                    jgUseRegistrationManageService.updateById(jgUseRegistrationManage);
+                }
             }
         }
         return Boolean.TRUE;
@@ -1627,7 +1639,7 @@ public class DataDockServiceImpl {
     public EquipRequestParamsDto extractCommonData(String dataSource, ReginParams reginParams, JSONObject equipInfo, List<PipingExcelDto> equLists) {
         AgencyUserModel userModel = reginParams.getUserModel();
         CompanyBo company = reginParams.getCompany();
-        String orgBranchCode = String.valueOf(equipInfo.get("orgBranchCode"));
+        String orgBranchCode = equipInfo.getString("orgBranchCode");
         String equListCode = String.valueOf(equipInfo.get("EQU_LIST"));
         String equCategoryCode = String.valueOf(equipInfo.get("EQU_CATEGORY"));
         String equDefineCode = String.valueOf(equipInfo.get("EQU_DEFINE"));
@@ -1939,6 +1951,7 @@ public class DataDockServiceImpl {
                 .setCreateUserName(paramsDto.getExecUserName())
                 .setProjectContraptionId(String.valueOf(proCon.getSequenceNbr()))
                 .setProjectContraption(paramsDto.getProjectContraption())
+                .setSupervisionOrgCode(paramsDto.getOrgBranchCode())
                 .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/DataHandlerServiceImpl.java

@@ -98,6 +98,9 @@ public class DataHandlerServiceImpl {
     private final JgChangeRegistrationTransferMapper jgChangeRegistrationTransferMapper;
     private final JgUseRegistrationManageServiceImpl jgUseRegistrationManageServiceImpl;
 
+    // 组织机构跟节点
+    private  static final String ROOT_ORG_CODE = "50";
+
     /**
      * 安装告知压力管道历史数据修复-详情中的设备列表修改为汇总表格式
      *
@@ -1125,6 +1128,31 @@ public class DataHandlerServiceImpl {
     public Long saveSupervise2UseRegManage() {
 
         log.info("存量数据刷属地监管部门到证管理表处理开始--->");
+        // 1|5|6 预处理，存量数据导入时缺少记录到tzs_jg_use_registration->supervision_org_code，先补充supervision_org_code到tzs_jg_use_registration
+        List<JgUseRegistrationDto> missingSupOrgCodeUses =  useRegistrationService.getBaseMapper().selectMissingSupOrgCodeUseList();
+        missingSupOrgCodeUses.forEach(u->{
+            // TODO 历史存量数据里有：610422_三原县市场监督管理局，需要转换为：50*73*123_三原县市场监督管理局, null则挂到根节点省上
+            if(StringUtils.isNotEmpty(u.getSupervisoryCode()) && u.getSupervisoryCode().split("_").length > 1){
+                String[] orgCodeNameArray = u.getSupervisoryCode().split("_");
+                String orgCodeOrCompanyCode = orgCodeNameArray[0];
+                LambdaUpdateWrapper<JgUseRegistration> updateWrapper = new LambdaUpdateWrapper<>();
+                if(orgCodeOrCompanyCode.contains("*") || ROOT_ORG_CODE.equals(orgCodeOrCompanyCode)){
+                    updateWrapper.set(JgUseRegistration::getSupervisionOrgCode, orgCodeNameArray[0]);
+                } else {
+                    // 把companyCode换成orgCode
+                    String orgCode = commonMapper.getOrgCodeByCompanyCode(orgCodeOrCompanyCode);
+                    updateWrapper.set(JgUseRegistration::getSupervisionOrgCode, orgCode == null ? ROOT_ORG_CODE: orgCode);
+                }
+                updateWrapper.eq(JgUseRegistration::getSequenceNbr, u.getSequenceNbr());
+                useRegistrationService.update(updateWrapper);
+            } else {
+                // 没有的挂到根节点省
+                LambdaUpdateWrapper<JgUseRegistration> updateWrapper = new LambdaUpdateWrapper<>();
+                updateWrapper.eq(JgUseRegistration::getSequenceNbr, u.getSequenceNbr());
+                updateWrapper.set(JgUseRegistration::getSupervisionOrgCode, ROOT_ORG_CODE);
+                useRegistrationService.update(updateWrapper);
+            }
+        });
         // 1|5|6 处理
         AtomicReference<Long> dealNum = new AtomicReference<>(0L);
         List<JgUseRegistrationDto> useRegistrations = useRegistrationService.getBaseMapper().getListOfPass();

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

@@ -4039,6 +4039,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             jgUseRegistration.setUseRegistrationCode(jgUseRegistrationManage.getUseRegistrationCode());
             jgUseRegistration.setRegType("1");//历史登记
             jgUseRegistration.setSupervisionOrgCode(orgBranchCode);
+            jgUseRegistration.setCreateDate(new Date());
             jgUseRegistrationService.save(jgUseRegistration);
             jgRelationEquipMapper.batchInsert(String.valueOf(jgUseRegistration.getSequenceNbr()), jgRelationEquipList);