更新

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/GroupCodeEnum.java

@@ -24,7 +24,10 @@ public enum GroupCodeEnum {
     R_RAIN_ROOM("雨淋阀间","r_rainRoom","YLFJ"),
     R_FIRE_FOAM_ROOM("消防泡沫间","r_fireFoamRoom","PMJ"),
     R_FIRE_CONTROL_ROOM("消防控制室","r_fireControlRoom","XKS"),
-    FLOOR("楼层","floor","LC");
+    FLOOR("楼层","floor","LC"),
+    PMYG("泡沫液罐","92031900","PMYG"),
+    GWYLTCQ("管网压力探测器","92011000","GWYLTCQ"),
+    XFSCZZ("消防水池装置","92010700","XFSCZZ");
 
     private String groupName;
     private String groupCode;

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/GroupColumnDataType.java

@@ -5,5 +5,5 @@ package com.yeejoin.equipmanage.common.enums;
  * @author DELL
  */
 public enum GroupColumnDataType {
-    String, Integer,datetime, Enum,Double,Date,Boolean,Array,File,InstanceId
+    String, Integer,datetime, Enum,Double,Date,Boolean,Array,File,InstanceId,inputNumber
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FormInstanceServiceImpl.java

@@ -100,10 +100,9 @@ public class FormInstanceServiceImpl extends ServiceImpl<FormInstanceMapper, For
             return returnMap;
         }
         Long instanceId = sequence.nextId();
-        if (com.yeejoin.equipmanage.common.utils.StringUtil.isNotEmpty(Arrays.stream(list).filter(x -> x == groupCode).findFirst())) {
+        if (!ValidationUtil.isEmpty(Arrays.stream(list).filter(x -> x.equals(groupCode)).findFirst())) {
             instanceId = Long.valueOf(caseId);
-            map.put("code", sequence.nextId());
-            map.put("name", "");
+            returnMap.put("code", sequence.nextId());
         }
         String groupType = formGroup.getGroupType();
         List<FormInstance> entities = new ArrayList<>();