登记表生产接口细节补全

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/JYJCBusinessTypeEnum.java

@@ -13,6 +13,7 @@ public enum JYJCBusinessTypeEnum {
 
     GZJDJY("GZJDJY","改造监督检验"),
     WXJDJY("WXJDJY","维修监督检验"),
+    ZZJDJY("ZZJDJY","制造监督检验"),
     DTJC("DTJC","电梯检测");
 
 

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

@@ -2222,49 +2222,97 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
-    public Map<String, Object> getRegistrationFormUrl(String manageType, JSONObject formData) {
+    public Map<String, Object> getRegistrationFormUrl(String manageType, JSONObject jsonObject) {
+        JSONObject formData = new JSONObject();
+
+        formData.putAll(jsonObject);
         String wordPath ;
         String fileName ;
         if (formData.containsKey("safetyManager") && formData.getString("safetyManager").contains("_")){
             formData.put("safetyManagerName",formData.getString("safetyManager").split("_")[1]);
         }
-        if (formData.containsKey("estateUnitName") && formData.getString("safetyManager").contains("_")){
-            formData.put("estateUnitName",formData.getString("estateUnitName").split("_")[1]);
-            formData.put("CQUnitCode",formData.getString("estateUnitName").split("_")[0]);
+        if (formData.containsKey("installUnitCode") && formData.getString("installUnitCode").contains("_")){
+            formData.put("installUnitName",formData.getString("installUnitCode").split("_")[0]);
+        }
+        if (formData.containsKey("inspectUnitCreditCode") && formData.getString("inspectUnitCreditCode").contains("_")){
+            formData.put("inspectUnitName",formData.getString("inspectUnitCreditCode").split("_")[0]);
+        }
+        if (formData.containsKey("safetyManagerId") && formData.getString("safetyManagerId").contains("_")){
+            formData.put("safetyManagerName",formData.getString("safetyManagerId").split("_")[1]);
+        }
+        if (formData.containsKey("estateUnitName") && formData.getString("estateUnitName").contains("_")){
+
             LambdaQueryWrapper<TzBaseEnterpriseInfo> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(TzBaseEnterpriseInfo::getUseUnitCode,formData.getString("estateUnitName").split("_")[0]);
             //产权单位联系电话
-            String contactPhone = enterpriseInfoMapper.selectOne(wrapper).getContactPhone();
+            TzBaseEnterpriseInfo tzBaseEnterpriseInfo = enterpriseInfoMapper.selectOne(wrapper);
+            String contactPhone = tzBaseEnterpriseInfo.getContactPhone();
             if (StringUtils.isNotEmpty(contactPhone)){
                 formData.put("estatePhone",contactPhone);
             }
+            formData.put("CQUnitCode",formData.getString("estateUnitName").split("_")[0]);
+            formData.put("estateUnitName",formData.getString("estateUnitName").split("_")[1]);
         }
         if (formData.containsKey("equList") ){
             formData.put("equList", EquipmentClassifityEnum.getNameByCode(formData.getString("equList")));
         }
-        if (formData.containsKey("equDefine") ){
+
+        if (formData.containsKey("projectContraption") ){
+            formData.put("productName", formData.getString("projectContraption"));
+        }
+        if (formData.containsKey("equipmentLists") && manageType.equals(UNIT) ){
+            JSONArray equipmentLists = formData.getJSONArray("equipmentLists");
+            formData.put("equNum",equipmentLists.size());
+
+            List<JSONObject> equips = equipmentLists.stream()
+                    .filter(JSONObject.class::isInstance) // 确保是 JSONObject 类型
+                    .map(JSONObject.class::cast) // 转换为 JSONObject 类型
+                    .collect(Collectors.toList());
+            formData.put("equDefine",equips.get(0).getString("equDefineName"));
+
+        }
+        if (formData.containsKey("equipmentLists") && manageType.equals(VEHICLE) ){
+            JSONArray equipmentLists = formData.getJSONArray("equipmentLists");
+            List<JSONObject> equips = equipmentLists.stream()
+                    .filter(JSONObject.class::isInstance) // 确保是 JSONObject 类型
+                    .map(JSONObject.class::cast) // 转换为 JSONObject 类型
+                    .collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(equips)){
+             formData.put("gasNum",equips.size());
+             formData.put("equDefineName",equips.get(0).getString("equDefineName"));
+             formData.put("workPressure", equips.stream().mapToDouble(e -> Double.valueOf(e.get("nominalWorkingPressure").toString())).sum());
+             formData.put("volume", equips.stream().mapToDouble(e -> Double.valueOf(e.get("singleBottleVolume").toString())).sum());
+             Set<String> chargingMedium = equips.stream().map(e -> e.getString("chargingMedium")).collect(Collectors.toSet());
+             if (chargingMedium.size()>1){
+                 throw new BadRequest("充装介质仅可选择同一类型");
+             }else {
+                 formData.put("chargingMedium",equips.get(0).getString("chargingMedium"));
+             }
+            }
+        }
+        if (formData.containsKey("equDefine") &&  !manageType.equals(UNIT) ){
             EquipmentCategory define = equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>()
                     .eq(EquipmentCategory::getCode, formData.getString("equDefine")));
-            formData.put("equCategory",define != null ? define.getName() : null);
-
+            formData.put("equDefine",define != null ? define.getName() : null);
         }
         if (formData.containsKey("equCategory") ){
             EquipmentCategory category = equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>()
                     .eq(EquipmentCategory::getCode, formData.getString("equCategory")));
             formData.put("equCategory",category != null ? category.getName() : null);
-
         }
+
         if (formData.containsKey("inspectType") ){
-            formData.put("inspectType", JYJCBusinessTypeEnum.getNameByCode(formData.getString("inspectType")));
+            formData.put("inspectType", JYJCBusinessTypeEnum.getNameByCode(formData.getString("inspectType")).getName());
         }
         if (formData.containsKey("inspectConclusion") ){
-            formData.put("inspectConclusion",JYJCResultEnum.getNameByCode(formData.getString("inspectConclusion")));
+            formData.put("inspectConclusion",JYJCResultEnum.getNameByCode(formData.getString("inspectConclusion")).getName());
         }
         if (formData.containsKey("equipId")  ){
             //施工单位名称
             LambdaQueryWrapper<ConstructionInfo> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(AbstractEquipBaseEntity::getRecord,formData.getString("equipId"));
             wrapper.orderByDesc(AbstractEquipBaseEntity::getRecDate);
+            wrapper.last("limit 1");
             String uscUnitName = constructionInfoMapper.selectOne(wrapper).getUscUnitName();
             if (StringUtils.isNotEmpty(uscUnitName)){
                 formData.put("uscUnitName",uscUnitName);
@@ -2313,28 +2361,96 @@ public class CommonServiceImpl implements ICommonService {
     @Override
     public void getRegistrationFormStream(JSONObject map, HttpServletResponse response){
         JSONObject formData = JSONObject.parseObject(JSONObject.toJSONString(map.get("formData")));
+        String manageType =   String.valueOf(map.get("manageType"));
+
         if (formData.containsKey("safetyManager") && formData.getString("safetyManager").contains("_")){
-           map.put("safetyManagerName",formData.getString("safetyManager").split("_")[1]);
+            formData.put("safetyManagerName",formData.getString("safetyManager").split("_")[1]);
+        }
+        if (formData.containsKey("installUnitCode") && formData.getString("installUnitCode").contains("_")){
+            formData.put("installUnitName",formData.getString("installUnitCode").split("_")[0]);
+        }
+        if (formData.containsKey("inspectUnitCreditCode") && formData.getString("inspectUnitCreditCode").contains("_")){
+            formData.put("inspectUnitName",formData.getString("inspectUnitCreditCode").split("_")[0]);
+        }
+        if (formData.containsKey("safetyManagerId") && formData.getString("safetyManagerId").contains("_")){
+            formData.put("safetyManagerName",formData.getString("safetyManagerId").split("_")[1]);
         }
-        if (formData.containsKey("estateUnitName") && formData.getString("safetyManager").contains("_")){
-           map.put("estateUnitName",formData.getString("estateUnitName").split("_")[1]);
-           map.put("CQUnitCode",formData.getString("estateUnitName").split("_")[0]);
+        if (formData.containsKey("estateUnitName") && formData.getString("estateUnitName").contains("_")){
+
             LambdaQueryWrapper<TzBaseEnterpriseInfo> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(TzBaseEnterpriseInfo::getUseUnitCode,formData.getString("estateUnitName").split("_")[0]);
             //产权单位联系电话
-            String contactPhone = enterpriseInfoMapper.selectOne(wrapper).getContactPhone();
+            TzBaseEnterpriseInfo tzBaseEnterpriseInfo = enterpriseInfoMapper.selectOne(wrapper);
+            String contactPhone = tzBaseEnterpriseInfo.getContactPhone();
             if (StringUtils.isNotEmpty(contactPhone)){
-                map.put("estatePhone",contactPhone);
+                formData.put("estatePhone",contactPhone);
+            }
+            formData.put("CQUnitCode",formData.getString("estateUnitName").split("_")[0]);
+            formData.put("estateUnitName",formData.getString("estateUnitName").split("_")[1]);
+        }
+        if (formData.containsKey("equList") ){
+            formData.put("equList", EquipmentClassifityEnum.getNameByCode(formData.getString("equList")));
+        }
+
+        if (formData.containsKey("projectContraption") ){
+            formData.put("productName", formData.getString("projectContraption"));
+        }
+        if (formData.containsKey("equipmentLists") && manageType.equals(UNIT) ){
+            JSONArray equipmentLists = formData.getJSONArray("equipmentLists");
+            formData.put("equNum",equipmentLists.size());
+
+            List<JSONObject> equips = equipmentLists.stream()
+                    .filter(JSONObject.class::isInstance) // 确保是 JSONObject 类型
+                    .map(JSONObject.class::cast) // 转换为 JSONObject 类型
+                    .collect(Collectors.toList());
+            formData.put("equDefine",equips.get(0).getString("equDefineName"));
+
+        }
+        if (formData.containsKey("equipmentLists") && manageType.equals(VEHICLE) ){
+            JSONArray equipmentLists = formData.getJSONArray("equipmentLists");
+            List<JSONObject> equips = equipmentLists.stream()
+                    .filter(JSONObject.class::isInstance) // 确保是 JSONObject 类型
+                    .map(JSONObject.class::cast) // 转换为 JSONObject 类型
+                    .collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(equips)){
+                formData.put("gasNum",equips.size());
+                formData.put("equDefineName",equips.get(0).getString("equDefineName"));
+                formData.put("workPressure", equips.stream().mapToDouble(e -> Double.valueOf(e.get("nominalWorkingPressure").toString())).sum());
+                formData.put("volume", equips.stream().mapToDouble(e -> Double.valueOf(e.get("singleBottleVolume").toString())).sum());
+                Set<String> chargingMedium = equips.stream().map(e -> e.getString("chargingMedium")).collect(Collectors.toSet());
+                if (chargingMedium.size()>1){
+                    throw new BadRequest("充装介质仅可选择同一类型");
+                }else {
+                    formData.put("chargingMedium",equips.get(0).getString("chargingMedium"));
+                }
+            }
+        }
+        if (formData.containsKey("equDefine") &&  !manageType.equals(UNIT) ){
+            EquipmentCategory define = equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>()
+                    .eq(EquipmentCategory::getCode, formData.getString("equDefine")));
+            formData.put("equDefine",define != null ? define.getName() : null);
+        }
+        if (formData.containsKey("equCategory") ){
+            EquipmentCategory category = equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>()
+                    .eq(EquipmentCategory::getCode, formData.getString("equCategory")));
+            formData.put("equCategory",category != null ? category.getName() : null);
+        }
+
+        if (formData.containsKey("inspectType") ){
+            formData.put("inspectType", JYJCBusinessTypeEnum.getNameByCode(formData.getString("inspectType")).getName());
         }
+        if (formData.containsKey("inspectConclusion") ){
+            formData.put("inspectConclusion",JYJCResultEnum.getNameByCode(formData.getString("inspectConclusion")).getName());
         }
         if (formData.containsKey("equipId")  ){
             //施工单位名称
             LambdaQueryWrapper<ConstructionInfo> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(AbstractEquipBaseEntity::getRecord,formData.getString("equipId"));
             wrapper.orderByDesc(AbstractEquipBaseEntity::getRecDate);
+            wrapper.last("limit 1");
             String uscUnitName = constructionInfoMapper.selectOne(wrapper).getUscUnitName();
             if (StringUtils.isNotEmpty(uscUnitName)){
-                map.put("uscUnitName",uscUnitName);
+                formData.put("uscUnitName",uscUnitName);
             }
         }
         if (formData.containsKey("useUnitCreditCode")  ){
@@ -2344,13 +2460,11 @@ public class CommonServiceImpl implements ICommonService {
             //产权单位联系电话
             String address = enterpriseInfoMapper.selectOne(wrapper).getAddress();
             if (StringUtils.isNotEmpty(address)){
-                map.put("useUnitAddress",address);
+                formData.put("useUnitAddress",address);
             }
         }
-        //右下角日期
-        map.put("cruDate",DateUtils.convertDateToString(new Date(), DateUtils.CHN_DATE_PATTERN));
 
-        String manageType = JSONObject.toJSONString(map.get("manageType"));
+
         String wordPath ;
         String fileName ;
         if (UNIT.equals(manageType)){
@@ -2361,6 +2475,7 @@ public class CommonServiceImpl implements ICommonService {
             fileName = "单位使用登记表_";
         }else {
             wordPath = "use-registration-form-vehicle.ftl";
+            formData.put("equipBasicInfoList",formData.get("equipmentLists"));
             fileName = "车用气瓶使用登记表_";
         }
         // word转pdf

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/use-registration-form-set.ftl

@@ -1602,7 +1602,7 @@
                                             <w:spacing w:val="-1"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>${(useUnitPhone)!''}</w:t>
+                                        <w:t>${(useUnitPhone)!'—'}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>