更新

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

@@ -218,9 +218,10 @@ public class BuildingController extends AbstractBaseController {
     @PutMapping(value = "/commonUpdate")
     public Object update(
             @RequestParam Long instanceId,
+            @RequestParam(value = "groupCode", required = false) String groupCode,
             @RequestBody Map<String, Object> map) {
         String orgCode = getOrgCode();
-        return buildService.updateForm(instanceId, orgCode, map);
+        return buildService.updateForm(instanceId, orgCode, map, groupCode);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FormInstanceMapper.java

@@ -212,4 +212,6 @@ public interface FormInstanceMapper extends BaseMapper<FormInstance> {
      * @return
      */
     List<String> selectChildListdate(@Param("id")Long id);
+
+    int updateFormFieldValue(@Param("id") Long id, @Param("name") String name, @Param("value") String value);
 }

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

@@ -108,7 +108,7 @@ public interface IBuilldService extends IService<Building> {
      * @param map         form
      * @return Object
      */
-    Object updateForm(Long instanceId, String companyCode, Map<String, Object> map);
+    Object updateForm(Long instanceId, String companyCode, Map<String, Object> map, String groupCode);
 
     /**
      * 获取 建筑装备树

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

@@ -19,6 +19,7 @@ import com.yeejoin.equipmanage.common.entity.dto.BuildIsRiskDTO;
 import com.yeejoin.equipmanage.common.entity.dto.BuildSearchDTO;
 import com.yeejoin.equipmanage.common.entity.vo.*;
 import com.yeejoin.equipmanage.common.enums.*;
+import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
 import com.yeejoin.equipmanage.common.utils.EnumsUtils;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.vo.AlarmDataVO;
@@ -45,6 +46,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.CommonUtil;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
@@ -164,6 +166,8 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
 
     final String ALL_BUILDING = "allBuilding";
 
+    final static String[] list = {"92031900", "92011000", "92010700"};
+
     /**
      * @param groupCode
      * @Description 根据groupCode查询allowOperation对应的操作菜单
@@ -325,6 +329,9 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         }
 
         Map<String, Object> formKeyMap = iFormInstanceService.createByMap(groupCode, companyCode, map, caseId);
+        if (StringUtil.isNotEmpty(caseId)) {
+            return CommonResponseUtil.success(formKeyMap);
+        }
         if (formKeyMap.get(instanceId) != null) {
             //2.保存图片
             this.saveFiles(Long.parseLong(formKeyMap.get("instanceId").toString()), map);
@@ -356,7 +363,13 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
 
     @Override
     @Transactional(rollbackFor = {Exception.class, BaseException.class})
-    public Object updateForm(Long instanceId, String orgCode, Map<String, Object> map) {
+    public Object updateForm(Long instanceId, String orgCode, Map<String, Object> map, String groupCode) {
+        if (StringUtil.isNotEmpty(groupCode)) {
+            map.keySet().forEach(x -> {
+                formInstanceMapper.updateFormFieldValue(instanceId, x, String.valueOf(map.get(x)));
+            });
+            return CommonResponseUtil.success();
+        }
         Long id = formInstanceMapper.getStructureParentId(String.valueOf(instanceId));
         //1.保存图片
         this.saveFiles(instanceId, map);
@@ -680,6 +693,15 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     @Override
     @Transactional
     public Boolean deleteBuilding(Long instanceId) {
+        List<FormInstance> lists = formInstanceMapper.selectList(new QueryWrapper<FormInstance>().eq("instance_id", instanceId));
+        if (0 < lists.size()) {
+            String groupCode = lists.get(0).getGroupCode();
+            if (!ValidationUtil.isEmpty(Arrays.stream(list).filter(x -> x.equals(groupCode)).collect(Collectors.toList()))) {
+                formInstanceMapper.delete(new QueryWrapper<FormInstance>().eq("group_code", groupCode).eq("instance_id", instanceId));
+                return true;
+            }
+        }
+
         List<StockDetail> list = stockDetailMapper.selectList(new QueryWrapper<StockDetail>().eq("warehouse_structure_id", instanceId));
         if (list != null && list.size() > 0) {
             throw new BadRequest("该建筑存在入库装备，无法直接删除");

amos-boot-system-equip/src/main/resources/mapper/FormInstanceMapper.xml

@@ -456,6 +456,12 @@
              biz_org_name= #{bizOrgName}
         where id = #{id}
     </update>
+    <update id="updateFormFieldValue">
+        update wl_form_instance
+            set
+            field_value = #{value}
+            where instance_id = #{id} AND field_name = #{name}
+    </update>
     <update id="updateStrFullName">
          update wl_warehouse_structure
          set full_name=replace(full_name,#{name},#{fullName})