Merge branch 'develop_tzs_register_to_0715' of…

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

@@ -512,18 +512,30 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         exportParamsMap.put("equList", manage.getEquList());
         exportParamsMap.put("equCategory", manage.getEquCategory());
         exportParamsMap.put("equDefine", manage.getEquDefine());
-        exportParamsMap.put("equCode", deviceList.get(0).get("EQU_CODE"));
         exportParamsMap.put("manageType", manage.getManageType());
         if (BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName().equals(manage.getRegType())){
             exportParamsMap.put("fullAddress", manage.getUseUnitAddress());
             exportParamsMap.put("manageType", "");
             exportParamsMap.put("equDefineCode", "23T0");
+            exportParamsMap.put("equCode", deviceList.stream()
+                    .map(equ -> String.valueOf(equ.get("EQU_CODE")))
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.joining(", ")));
+            exportParamsMap.put("factoryNum", deviceList.stream()
+                    .map(equ -> String.valueOf(equ.get("FACTORY_NUM")))
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.joining(", ")));
+            exportParamsMap.put("useInnerCode", deviceList.stream()
+                    .map(equ -> String.valueOf(equ.get("USE_INNER_CODE")))
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.joining(", ")));
         }else{
             exportParamsMap.put("fullAddress", manage.getEquUseAddress());
-        }
-        exportParamsMap.put("applyNo", manage.getApplyNo());
+            exportParamsMap.put("equCode", deviceList.get(0).get("EQU_CODE"));
             exportParamsMap.put("factoryNum", deviceList.get(0).get("FACTORY_NUM"));
             exportParamsMap.put("useInnerCode", deviceList.get(0).get("USE_INNER_CODE"));
+        }
+        exportParamsMap.put("applyNo", manage.getApplyNo());
         exportParamsMap.put("carNumber", manage.getCarNumber());
 
         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

@@ -1578,6 +1578,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         jgUseRegistrationManage.setUseUnitCreditCode(jgVehicleInformation.getUseUnitCreditCode());
         jgUseRegistrationManage.setReceiveCompanyCode(jgVehicleInformation.getReceiveCompanyCode());
         jgUseRegistrationManage.setCarNumber(jgVehicleInformation.getCarNumber());
+        jgUseRegistrationManage.setVolume(jgVehicleInformation.getVolume());
+        jgUseRegistrationManage.setFillingMedium(jgVehicleInformation.getFillingMedium());
+        jgUseRegistrationManage.setGasNum(jgVehicleInformation.getGasNum());
+        jgUseRegistrationManage.setCarNumber(jgVehicleInformation.getCarNumber());
         jgUseRegistrationManage.setCertificateNo(commonService.generateCertificateNo(equType, new Date(), jgVehicleInformation.getReceiveCompanyCode()));
         jgUseRegistrationManageService.save(jgUseRegistrationManage);
     }