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

@@ -88,6 +88,9 @@ public class JgUseRegistrationManageDto extends BaseDto {
     @ApiModelProperty(value = "使用单位地址")
     private String useUnitAddress;
 
+    @ApiModelProperty("使用登记办理类型，unit单位, set台套")
+    private String manageType;
+
     @ApiModelProperty(value = "使用单位统一信用代码-搜索使用")
     private String useUnitCreditCodeForSearch;
 

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

@@ -156,4 +156,10 @@ public class JgUseRegistrationManage extends BaseEntity {
     @TableField("use_unit_address")
     private String useUnitAddress;
 
+    /**
+     * 使用登记办理类型，unit单位, set台套
+     */
+    @TableField("manage_type")
+    private String manageType;
+
 }

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

@@ -29,7 +29,8 @@
             tjurm.equ_category                                                  AS equCategory,
             tjurm.equ_category_code                                             AS equCategoryCode,
             tjurm.equ_use_address                                               AS equUseAddress,
-            tjurm.use_unit_address                                              AS useUnitAddress
+            tjurm.use_unit_address                                              AS useUnitAddress,
+            tjurm.manage_type                                                   AS manageType
     </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/JgUseRegistrationManageServiceImpl.java

@@ -142,6 +142,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
             jgUseRegistrationManage.setCreateUserId(useRegistration.getCreateUserId());
             jgUseRegistrationManage.setCreateDate(useRegistration.getRecDate());
             jgUseRegistrationManage.setEquUseAddress(fullAddress);
+            jgUseRegistrationManage.setManageType(useRegistration.getManageType());
             jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : "");
             jgUseRegistrationManage.setUseRegistrationCode(useRegistration.getUseRegistrationCode());
             jgUseRegistrationManage.setUseUnitCreditCode(useRegistration.getUseUnitCreditCode());
@@ -182,6 +183,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
             jgUseRegistrationManage.setCreateUserId(vehicleInformation.getCreateUserId());
             jgUseRegistrationManage.setCreateDate(vehicleInformation.getRecDate());
             jgUseRegistrationManage.setEquUseAddress("");
+            jgUseRegistrationManage.setManageType("unit");
             jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : "");
             jgUseRegistrationManage.setUseRegistrationCode(vehicleInformation.getUseRegistrationCode());
             jgUseRegistrationManage.setUseUnitCreditCode(vehicleInformation.getUseUnitCreditCode());

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

@@ -905,7 +905,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, String.valueOf(mapData.get("equipId")));
             IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
 
-            // 生成证书管理表记录
+            // 生成证书管理表
             generateRegistrationManage(jgUseRegistration,registerInfo);
 
             // 生成一条tzs_jg_certificate_change_record记录
@@ -990,6 +990,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistrationManage.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());
         jgUseRegistrationManage.setUseUnitCreditCode(jgUseRegistration.getUseUnitCreditCode());
         jgUseRegistrationManage.setReceiveCompanyCode(jgUseRegistration.getReceiveCompanyCode());
+        jgUseRegistrationManage.setManageType(jgUseRegistration.getManageType());
         jgUseRegistrationManage.setCertificateNo(commonServiceImpl.generateCertificateNo(equType,new Date(),jgUseRegistration.getReceiveCompanyCode()));
         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

@@ -1459,6 +1459,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         jgUseRegistrationManage.setCreateUserId(jgVehicleInformation.getCreateUserId());
         jgUseRegistrationManage.setCreateDate(jgVehicleInformation.getRecDate());
         jgUseRegistrationManage.setEquUseAddress("");
+        jgUseRegistrationManage.setManageType("unit");
         jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : "");
         jgUseRegistrationManage.setUseRegistrationCode(jgVehicleInformation.getUseRegistrationCode());
         jgUseRegistrationManage.setUseUnitCreditCode(jgVehicleInformation.getUseUnitCreditCode());