Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/BuildingController.java

@@ -167,9 +167,10 @@ public class BuildingController extends AbstractBaseController {
     @ApiOperation(value = "通用保存")
     public Object save(
             @RequestParam(value = "groupCode") String groupCode,
+            @RequestParam(value = "instanceId", required = false) String instanceId,
             @RequestBody Map<String, Object> map) {
         String orgCode = getOrgCode();
-        return buildService.saveForm(groupCode, orgCode, map);
+        return buildService.saveForm(groupCode, orgCode, map, instanceId);
     }
 
     @GetMapping(value = "/pointTree")

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/operation/SyncRiskOperator.java

@@ -53,7 +53,7 @@ public enum SyncRiskOperator {
                         newMap.put("parentId", item.get("parentId"));
                         RiskSource riskSource1 = new RiskSource();
                         Map<String, Object> createMap = formInstanceService.createByMap(String.valueOf(item.get("groupCode")),
-                                String.valueOf(map.get("companyCode")), newMap);
+                                String.valueOf(map.get("companyCode")), newMap, null);
                         riskSource1.setParentId(Long.parseLong(String.valueOf(map.get("riskPointId"))));
                         riskSource1.setName(String.valueOf(item.get("buildName")));
                         riskSource1.setId(Long.parseLong(String.valueOf(createMap.get("instanceId"))));

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

@@ -98,7 +98,7 @@ public interface IBuilldService extends IService<Building> {
      * @param map         form
      * @return Object
      */
-    Object saveForm(String groupCode, String companyCode, Map<String, Object> map);
+    Object saveForm(String groupCode, String companyCode, Map<String, Object> map, String caseId);
 
     /**
      * 通用表单更新

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

@@ -35,7 +35,7 @@ public interface IFormInstanceService extends IService<FormInstance> {
      * @param map         字段值对象
      * @return Map<String, Object>
      */
-    Map<String, Object> createByMap(String groupCode, String companyCode, Map<String, Object> map);
+    Map<String, Object> createByMap(String groupCode, String companyCode, Map<String, Object> map, String caseId);
 
     /**
      * 更新

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

@@ -298,7 +298,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     }
 
     @Override
-    public Object saveForm(String groupCode, String companyCode, Map<String, Object> map) {
+    public Object saveForm(String groupCode, String companyCode, Map<String, Object> map, String caseId) {
         final String instanceId = "instanceId";
         //1.保存表单数据
         //前端的address中携带了经纬度,后台切割保存
@@ -324,7 +324,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
 //            }
         }
 
-        Map<String, Object> formKeyMap = iFormInstanceService.createByMap(groupCode, companyCode, map);
+        Map<String, Object> formKeyMap = iFormInstanceService.createByMap(groupCode, companyCode, map, caseId);
         if (formKeyMap.get(instanceId) != null) {
             //2.保存图片
             this.saveFiles(Long.parseLong(formKeyMap.get("instanceId").toString()), map);

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

@@ -83,12 +83,14 @@ public class FormInstanceServiceImpl extends ServiceImpl<FormInstanceMapper, For
 
     private final String ORGCODE = "orgCode";
 
+    final static String[] list = {"92031900", "92011000", "92010700"};
+
     @Value("${systemctl.sync.switch}")
     private Boolean syncSwitch;
 
     @Override
     @Transactional(rollbackFor = {BaseException.class, Exception.class})
-    public Map<String, Object> createByMap(String groupCode, String companyCode, Map<String, Object> map) {
+    public Map<String, Object> createByMap(String groupCode, String companyCode, Map<String, Object> map, String caseId) {
         //1.查询分组表数据，数据准备用
         Map<String, Object> returnMap = new HashMap<>();
         FormGroup formGroup = iFormGroupService.getByUniqueKey(groupCode);
@@ -98,6 +100,11 @@ 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())) {
+            instanceId = Long.valueOf(caseId);
+            map.put("code", sequence.nextId());
+            map.put("name", "");
+        }
         String groupType = formGroup.getGroupType();
         List<FormInstance> entities = new ArrayList<>();
         //3.以数据库现在配置的动态表单字段为准，进行数据插入的准备