Merge branch 'develop_tzs_register_1114' into develop_tzs_register

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

@@ -234,4 +234,7 @@ public class JgChangeRegistrationUnitDto extends BaseDto {
 
     @ApiModelProperty(value = "投用日期")
     private String useDate;
+
+    @ApiModelProperty(value = "设备使用场所")
+    private String usePlace;
 }

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
-import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -151,4 +150,7 @@ public class JgUseRegistrationManageDto extends BaseDto {
 
     @ApiModelProperty("证书打印标记")
     private String certificatePrintTag;
+
+    @ApiModelProperty("登记证号类型：0-系统生成，1-手动录入")
+    private String registrationType;
 }

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

@@ -372,4 +372,10 @@ public class JgChangeRegistrationUnit extends BaseEntity {
      */
     @TableField("use_date")
     private String useDate;
+
+    /**
+     * 设备使用场所
+     */
+    @TableField("use_place")
+    private String usePlace;
 }

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

 package com.yeejoin.amos.boot.module.jg.api.entity;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.*;
 import lombok.experimental.Accessors;
+
 import java.util.Date;
 
 /**
@@ -247,4 +247,10 @@ public class JgUseRegistrationManage extends BaseEntity {
      */
     @TableField("certificate_print_tag")
     private String certificatePrintTag;
+
+    /**
+     * 登记证号类型：0-系统生成，1-手动录入
+     */
+    @TableField("registration_type")
+    private String registrationType;
 }

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

@@ -22,6 +22,65 @@
         </if>
     </select>
 
+    <select id="countEquipInUseTimesWithOutZFBatch" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
+        select
+        sum(inUseNumber) longValue,
+        record as keyStr
+        from (
+        select
+        count(1) as inUseNumber,
+        b.equ_id AS record
+        from
+        tzs_jg_use_registration a,
+        tzs_jg_use_registration_eq b
+        where
+        a.sequence_nbr = b.equip_transfer_id
+        and b.equ_id = ANY(ARRAY[
+        <foreach collection="records" item="record" separator=",">
+            #{record}
+        </foreach>
+        ])
+        and a.is_delete = 0
+        and ( a.status <![CDATA[ <> ]]> '已作废')
+        GROUP BY b.equ_id
+        UNION ALL
+        select
+        count(1) as inUseNumber,
+        b.equ_id  AS record
+        from
+        tzs_jg_installation_notice a,
+        tzs_jg_installation_notice_eq b
+        where
+        a.sequence_nbr = b.equip_transfer_id
+        and b.equ_id = ANY(ARRAY[
+        <foreach collection="records" item="record" separator=",">
+            #{record}
+        </foreach>
+        ])
+        and a.is_delete = 0
+        and (a.notice_status <![CDATA[ <> ]]> '6617')
+        GROUP BY b.equ_id
+        UNION ALL
+        select
+        count(1) as inUseNumber,
+        b.equ_id  AS record
+        from
+        tzs_jg_vehicle_information a,
+        tzs_jg_vehicle_information_eq b
+        where
+        a.sequence_nbr = b.vehicle_id
+        and b.equ_id = ANY(ARRAY[
+        <foreach collection="records" item="record" separator=",">
+            #{record}
+        </foreach>
+        ])
+        and a.is_delete = 0
+        and (a.status <![CDATA[ <> ]]> '已作废')
+        GROUP BY b.equ_id
+        )
+        GROUP BY record
+    </select>
+
     <select id="getUnitInfoListByType" resultType="java.util.Map">
         SELECT sequence_nbr AS useCode,
         CASE

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

@@ -67,12 +67,14 @@
             <if test="dto.isDoBusiness != null and dto.isDoBusiness != ''">
                 and tjurm.is_do_business = #{dto.isDoBusiness}
             </if>
+            <!--登记证号类型：0-系统生成，1-手动录入-->
+            <if test="dto.registrationType != null and dto.registrationType != ''">
+                and tjurm.registration_type = #{dto.registrationType}
+            </if>
+            <!--系统数据刷库后，regType可以不用-->
             <if test="dto.regType != null and dto.regType != '' ">
                 AND EXISTS (
-                SELECT 1
-                FROM tzs_jg_use_registration ur
-                WHERE ur.use_registration_code = tjurm.use_registration_code
-                AND ur.reg_type IN (0, 2)
+                SELECT 1 FROM tzs_jg_use_registration ur WHERE ur.use_registration_code = tjurm.use_registration_code AND ur.reg_type IN (0, 2)
                 )
             </if>
             ORDER BY tjurm.create_date DESC

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

@@ -9,7 +9,6 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit;
-import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationUnitServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -39,8 +38,6 @@ public class JgChangeRegistrationUnitController extends BaseController {
 
     @Autowired
     JgChangeRegistrationUnitServiceImpl jgChangeRegistrationUnitServiceImpl;
-    @Autowired
-    CommonServiceImpl commonService;
 
     /**
      * 新增
@@ -174,7 +171,6 @@ public class JgChangeRegistrationUnitController extends BaseController {
         if (Objects.isNull(installationInfo)) {
             throw new IllegalArgumentException("参数installationInfo不能为空");
         }
-        ReginParams reginParams = getSelectedOrgInfo();
         jgChangeRegistrationUnitServiceImpl.cancel(installationInfo);
         return ResponseHelper.buildResponse(installationInfo);
     }
@@ -198,8 +194,7 @@ public class JgChangeRegistrationUnitController extends BaseController {
         }
         JgChangeRegistrationUnitDto changeRegistrationUnitDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgChangeRegistrationUnitDto.class);
         changeRegistrationUnitDto.setProcessAdvice(opinion);
-        ReginParams reginParams = getSelectedOrgInfo();
-        jgChangeRegistrationUnitServiceImpl.accept(changeRegistrationUnitDto, op, reginParams);
+        jgChangeRegistrationUnitServiceImpl.accept(changeRegistrationUnitDto, op);
         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/edit/process/equip/CommonEquipDataProcessService.java

@@ -76,6 +76,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.yeejoin.amos.boot.module.jg.api.enums.CertificateStatusEnum.YIDENGJI;
 import static com.yeejoin.amos.boot.module.jg.biz.edit.core.SubClassFinder.getAllSubClasses;
 import static com.yeejoin.amos.boot.module.jg.biz.edit.utils.ReflectiveFieldAccessor.getAllFields;
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgProjectContraptionServiceImplService.PROJECT_CONTRAPTION;
@@ -827,6 +828,7 @@ public class CommonEquipDataProcessService {
             JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.lambdaQuery()
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, registerInfo.getUseOrgCode())
                     .eq(JgUseRegistrationManage::getIsDelete, 0)
+                    .eq(JgUseRegistrationManage::getCertificateStatus,YIDENGJI.getName())
                     .select(JgUseRegistrationManage::getSequenceNbr, JgUseRegistrationManage::getReceiveCompanyCode).one();
             result.put("receiveCompanyCode", jgUseRegistrationManage.getReceiveCompanyCode());
         }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/SingleEquipChangeProcess.java

@@ -39,6 +39,8 @@ import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.yeejoin.amos.boot.module.jg.api.enums.CertificateStatusEnum.YIDENGJI;
+
 /**
  * 单个维护设备-策略实现类
  */
@@ -77,6 +79,8 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
         if (!ValidationUtil.isEmpty(registerInfoOld.getUseOrgCode())) {
             JgUseRegistrationManage jgUseRegistrationManage = commonEquipDataProcessService.getJgUseRegistrationManageService().lambdaQuery()
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, registerInfoOld.getUseOrgCode())
+                    .eq(JgUseRegistrationManage::getIsDelete,0)
+                    .eq(JgUseRegistrationManage::getCertificateStatus,YIDENGJI.getName())
                     .select(JgUseRegistrationManage::getSequenceNbr, JgUseRegistrationManage::getReceiveCompanyCode).one();
             useInfoOld.setReceiveCompanyCode(jgUseRegistrationManage.getReceiveCompanyCode());
         }

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

@@ -2545,7 +2545,7 @@ public class DataDockServiceImpl {
                 .auditPassDate(new Date())
                 .useRegistrationCode(paramsDto.getUseOrgCode())
                 .certificateNo(commonService.generateCertificateNo(equType, new Date(), paramsDto.getReceiveOrgCode()))
-                .regType(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName())
+                .regType("1".equals(useReg.getRegType())? BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName():BusinessTypeEnum.JG_USAGE_REGISTRATION.getName())
                 .certificateStatus("已登记")
                 .regDate(new Date())
                 // .equUseAddress()
@@ -2555,6 +2555,7 @@ public class DataDockServiceImpl {
                 .manageType("unit")
                 .isScrap("0")
                 .version(1)
+                .registrationType("1".equals(useReg.getRegType()) ? "1" : "0")
                 .superviseOrgCode(paramsDto.getOrgBranchCode())
                 .superviseOrgName(paramsDto.getOrgBranchName())
                 .build();
@@ -3234,6 +3235,7 @@ public class DataDockServiceImpl {
         // 查询企业地址
         manage.setUseUnitAddress(this.queryUseUnitAddress(map));
         manage.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());
+        manage.setRegistrationType("1".equals(jgUseRegistration.getRegType()) ? "1" : "0");
         manage.setUseUnitCreditCode(jgUseRegistration.getUseUnitCreditCode());
         manage.setReceiveCompanyCode(jgUseRegistration.getReceiveCompanyCode());
         manage.setManageType(jgUseRegistration.getManageType());

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

@@ -1164,6 +1164,7 @@ public class EquipClaimServiceImpl {
                 .certificateNo(commonService.generateCertificateNo(equType, new Date(), useReg.getReceiveOrgCode()))
                 .regType(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName())
                 .certificateStatus("已登记")
+                .registrationType("1")
                 .regDate(new Date())
                 .createDate(new Date())
                 .createUserId(userModel.getUserId())

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

@@ -5005,6 +5005,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 company.getCompanyCode().split("_")[1] : company.getCompanyCode());
         jgUseRegistrationManage.setReceiveCompanyCode(equipInfoDto.getReceiveOrgCode());
         jgUseRegistrationManage.setCertificateNo(generateCertificateNo(equipInfoDto, new Date(), equipInfoDto.getReceiveOrgCode()));
+        jgUseRegistrationManage.setRegistrationType("1");
         jgUseRegistrationManageService.save(jgUseRegistrationManage);
         return jgUseRegistrationManage;
     }

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

@@ -1160,6 +1160,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                         registrationManageNew.setSuperviseOrgCode(orgBranchArray[0]);
                         registrationManageNew.setSuperviseOrgName(StringUtil.isNotEmpty(orgBranchName) ? orgBranchName : orgBranchArray[1]);
                     }
+                    registrationManageNew.setRegistrationType("0");
                     // 添加到新列表中
                     newRegistrationList.add(registrationManageNew);
 

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

@@ -565,6 +565,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
             // 生成新的使用登记证编号
             String code = this.generateVehicleUseRegistrationCode(receiveCompanyCode, manage.getEquDefineCode());
             manage.setUseRegistrationCode(code);
+            manage.setRegistrationType("0");
             // 更新设备使用登记证信息
             LambdaQueryWrapper<IdxBizJgRegisterInfo> lambda = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
             lambda.in(IdxBizJgRegisterInfo::getRecord, collect);

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

@@ -840,6 +840,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         resultMap.put("sequenceNbr", enableDisable.getSequenceNbr());
         resultMap.put("applyNo", enableDisable.getApplyNo());
         resultMap.put("auditStatus", enableDisable.getAuditStatus());
+        resultMap.put("useUnitCreditCode", enableDisable.getUseUnitCreditCode());
         commonService.convertStringToJsonobject(resultMap, new String[]{"otherAccessories"});
         new FillingEditPermForCurrentUser(new JSONObject(resultMap), company, BusinessTypeEnum.JG_EQUIPMENT_START_STOP).getData();
         return resultMap;

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

@@ -900,6 +900,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     }
 
     @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 6000000)
     public JgMaintenanceContract cancelApplication(Long sequenceNbr, String cancelReason) {
         JgMaintenanceContract maintenanceContract = this.getById(sequenceNbr);
         // 1.更新为已作废

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

@@ -242,6 +242,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
                 jgUseRegistrationManage.setManageType(useRegistration.getManageType());
                 jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : "");
                 jgUseRegistrationManage.setUseRegistrationCode(useRegistration.getUseRegistrationCode());
+                jgUseRegistrationManage.setRegistrationType("1".equals(useRegistration.getRegType()) ? "1" : "0");
                 jgUseRegistrationManage.setUseUnitCreditCode(useRegistration.getUseUnitCreditCode());
                 jgUseRegistrationManage.setReceiveCompanyCode(useRegistration.getReceiveCompanyCode());
                 jgUseRegistrationManage.setCertificateNo(commonServiceImpl.generateCertificateNo(equType, useRegistration.getAuditPassDate(), useRegistration.getReceiveCompanyCode()));
@@ -285,6 +286,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
                 jgUseRegistrationManage.setCarNumber(vehicleInformation.getCarNumber());
                 jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : "");
                 jgUseRegistrationManage.setUseRegistrationCode(vehicleInformation.getUseRegistrationCode());
+                jgUseRegistrationManage.setRegistrationType("1".equals(vehicleInformation.getRegType()) ? "1" : "0");
                 jgUseRegistrationManage.setUseUnitCreditCode(vehicleInformation.getUseUnitCreditCode());
                 jgUseRegistrationManage.setReceiveCompanyCode(vehicleInformation.getReceiveCompanyCode());
                 jgUseRegistrationManage.setGasNum(vehicleInformation.getGasNum());
@@ -736,7 +738,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         }
         List<JSONObject> deviceList = this.queryEquByCertificate(manage);
         if (ValidationUtil.isEmpty(deviceList)) {
-            throw new BadRequest("设备信息为空，导出失败！");
+            throw new BadRequest("使用登记证下无设备，导出失败！");
         }
         Map<String, Object> params = buildExportParams(manage, deviceList);
         JSONObject tagJson = Optional.ofNullable(manage.getCertificatePrintTag())

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

@@ -1709,6 +1709,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistrationManage.setUseUnitCreditCode(jgUseRegistration.getUseUnitCreditCode());
         jgUseRegistrationManage.setReceiveCompanyCode(jgUseRegistration.getReceiveCompanyCode());
         jgUseRegistrationManage.setManageType(jgUseRegistration.getManageType());
+        jgUseRegistrationManage.setRegistrationType("1".equals(jgUseRegistration.getRegType()) ? "1" : "0");
         jgUseRegistrationManage.setCertificateNo(commonServiceImpl.generateCertificateNo(equType, new Date(), jgUseRegistration.getReceiveCompanyCode()));
         this.setSuperviseOrgInfo(jgUseRegistrationManage, jgUseRegistration);
         jgUseRegistrationManageService.save(jgUseRegistrationManage);

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

@@ -1542,7 +1542,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
     }
 
     @Transactional(rollbackFor = Exception.class)
-    @GlobalTransactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 6000000)
     public JgVehicleInformation cancelApplication(Long sequenceNbr, String cancelReason) {
         JgVehicleInformation vehicleInformation = this.getById(sequenceNbr);
         // 0.作废校验
@@ -1839,6 +1839,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         jgUseRegistrationManage.setCertificateNo(commonService.generateCertificateNo(equType, new Date(), jgVehicleInformation.getReceiveCompanyCode()));
         jgUseRegistrationManage.setSuperviseOrgName(jgVehicleInformation.getOrgBranchName());
         jgUseRegistrationManage.setSuperviseOrgCode(jgVehicleInformation.getOrgBranchCode());
+        jgUseRegistrationManage.setRegistrationType("1".equals(jgVehicleInformation.getRegType())? "1": "0");
         jgUseRegistrationManageService.save(jgUseRegistrationManage);
     }
 

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

@@ -402,6 +402,7 @@ public class ShCarServiceImpl extends BaseService<ShCar, ShCar, ShCarMapper> imp
                 .carNumber(jgVehicleInformation.getCarNumber())
                 .createDate(new Date())
                 .gasNum(equList.size())
+                .registrationType("1".equals(jgVehicleInformation.getRegType()) ? "1" : "0")
                 .useUnitAddress(jgVehicleInformation.getUseUnitAddress())
                 .manageType("unit")
                 .isScrap("0")