fix(jg)：历史设备添加联想，使用单位

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

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -97,7 +98,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
     @Autowired
     private IdxBizJgOtherInfoMapper otherInfoMapper;
 
-    public void changeData(JgChangeVehicleRegistrationUnit dto) {
+    public void changeData(JgChangeVehicleRegistrationUnit dto, CompanyBo company) {
         if (!ObjectUtils.isEmpty(dto.getReceiveCompanyCode())) {
             // 接收单位信息
             String[] splitMaintenanceUnitCode = dto.getReceiveCompanyCode().split("_");
@@ -114,9 +115,9 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         }
         if (!ObjectUtils.isEmpty(dto.getNewUseUnitCreditCode())) {
             // 新使用单位
-            String[] splitMaintenanceUnitCode = dto.getNewUseUnitCreditCode().split("_");
-            dto.setNewUseUnitCreditCode(splitMaintenanceUnitCode[0]);
-            dto.setNewUseUnitName(splitMaintenanceUnitCode[1]);
+            //String[] splitMaintenanceUnitCode = dto.getNewUseUnitCreditCode().split("_");
+            dto.setNewUseUnitCreditCode(company.getCompanyCode().split("_")[1]);
+            dto.setNewUseUnitName(company.getCompanyName().split("_")[1]);
         }
         if (!ObjectUtils.isEmpty(dto.getOrgBranchCode())) {
             // 属地监管部门
@@ -154,7 +155,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
                 dto.setCreateUserName(reginParams.getUserModel().getRealName());
                 dto.setRecDate(new Date());
                 dto.setRecUserId(reginParams.getUserModel().getUserId());
-                changeData(dto);
+                changeData(dto, reginParams.getCompany());
                 if (map.containsKey("useRegistrationCode") && !ObjectUtils.isEmpty(map.get("useRegistrationCode"))) {
                     dto.setUseRegistCode(map.get("useRegistrationCode").toString());
                 }
@@ -169,7 +170,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
                 // 更新
                 JgChangeVehicleRegistrationUnit updateDto = this.getById(Long.parseLong(map.get("sequenceNbr").toString()));
                 BeanUtil.copyProperties(map, updateDto);
-                changeData(updateDto);
+                changeData(updateDto, reginParams.getCompany());
                 this.updateById(updateDto);
                 BeanUtil.copyProperties(updateDto, dto);
             }

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

@@ -443,15 +443,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
             case "certificateNestedPrint":// 使用登记证 套打
             case "useFlagNormalPrint":// 使用标志 普打
             case "useFlagNestedPrint":// 使用标志 套打
-                if (BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName().equals(regType)) {
-                    JgVehicleInformation vehicleInformation = jgVehicleInformationService.getOne(
-                            new LambdaQueryWrapper<JgVehicleInformation>()
-                                    .eq(JgVehicleInformation::getUseRegistrationCode, useRegistrationCode));
-                    sequenceNbr = String.valueOf(vehicleInformation.getSequenceNbr());
-                    jgVehicleInformationService.exportVehicleUseRegistrationCertificate(sequenceNbr, response, getPrintTypeCode(printType));
-                } else if (BusinessTypeEnum.JG_USAGE_REGISTRATION.getName().equals(regType)) {
                 this.exportUseRegistrationCertificate(manage, response, getPrintTypeCode(printType));
-                }
                 break;
             case "exportSummaryTable":// 工业管道和气瓶 汇总表下载
                 List<JgUseRegistration> jgUseRegistrations = jgUseRegistrationService.getBaseMapper().selectList(new LambdaQueryWrapper<JgUseRegistration>()
@@ -514,11 +506,17 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         exportParamsMap.put("equCategory", manage.getEquCategory());
         exportParamsMap.put("equDefine", manage.getEquDefine());
         exportParamsMap.put("equCode", deviceList.get(0).get("EQU_CODE"));
+        if (BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName().equals(manage.getRegType())){
+            exportParamsMap.put("fullAddress", manage.getUseUnitAddress());
+        }else{
+            exportParamsMap.put("fullAddress", manage.getEquUseAddress());
+        }
         exportParamsMap.put("fullAddress", manage.getEquUseAddress());
         exportParamsMap.put("applyNo", manage.getApplyNo());
         exportParamsMap.put("factoryNum", deviceList.get(0).get("FACTORY_NUM"));
         exportParamsMap.put("useInnerCode", deviceList.get(0).get("USE_INNER_CODE"));
         exportParamsMap.put("carNumber", manage.getCarNumber());
+        exportParamsMap.put("equDefineCode", "23T0");
 
         if ("0".equals(printType)) {
             // 调用生成使用登记证

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

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