使用登记表生成代码修改 增加枚举值

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

@@ -43,5 +43,12 @@ public enum JYJCBusinessTypeEnum {
         }
         return list;
     }
-
+    public static JYJCBusinessTypeEnum getNameByCode(String code){
+        for (JYJCBusinessTypeEnum value : JYJCBusinessTypeEnum.values()) {
+            if (value.getCode().equals(code)){
+                return value;
+            }
+        }
+        return null;
+    }
 }

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

@@ -94,4 +94,12 @@ public enum JYJCResultEnum {
         return searchMap;
     }
 
+    public static JYJCResultEnum getNameByCode(String code){
+        for (JYJCResultEnum value : JYJCResultEnum.values()) {
+            if (value.getCode().equals(code)){
+                return value;
+            }
+        }
+        return null;
+    }
 }

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

@@ -29,6 +29,8 @@ import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.crypto.AESUtil;
+import com.yeejoin.amos.boot.module.common.api.enums.JYJCBusinessTypeEnum;
+import com.yeejoin.amos.boot.module.common.api.enums.JYJCResultEnum;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
@@ -53,6 +55,7 @@ import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -2236,6 +2239,27 @@ public class CommonServiceImpl implements ICommonService {
                 formData.put("estatePhone",contactPhone);
             }
         }
+        if (formData.containsKey("equList") ){
+            formData.put("equList", EquipmentClassifityEnum.getNameByCode(formData.getString("equList")));
+        }
+        if (formData.containsKey("equDefine") ){
+            EquipmentCategory define = equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>()
+                    .eq(EquipmentCategory::getCode, formData.getString("equDefine")));
+            formData.put("equCategory",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")));
+        }
+        if (formData.containsKey("inspectConclusion") ){
+            formData.put("inspectConclusion",JYJCResultEnum.getNameByCode(formData.getString("inspectConclusion")));
+        }
         if (formData.containsKey("equipId")  ){
             //施工单位名称
             LambdaQueryWrapper<ConstructionInfo> wrapper = new LambdaQueryWrapper<>();