工作台

platform-dao/src/main/java/com/platform/dao/util/TreeUtil.java

@@ -3,15 +3,12 @@ package com.platform.dao.util;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.platform.common.cache.DictCache;
-import com.platform.common.util.ListUtils;
 import com.platform.common.util.MapUtils;
 import com.platform.common.util.StringUtils;
 import com.platform.dao.entity.custom.CustomForm;
-import com.platform.dao.entity.repair.ErrorType;
 import com.platform.dao.entity.part.PartType;
+import com.platform.dao.entity.repair.ErrorType;
 import com.platform.dao.entity.sb.SbInfo;
-import com.platform.dao.entity.sb.SbPosition;
-import com.platform.dao.entity.sb.SbType;
 import com.platform.dao.entity.spareAdd.LongYanInventoryCode;
 import com.platform.dao.entity.sqarepartmanage.SpareType;
 import com.platform.dao.entity.store.Store;
@@ -25,14 +22,12 @@ import com.platform.dao.vo.query.qykh.HotspotVO;
 import com.platform.dao.vo.query.qykh.InformationVO;
 import com.platform.dao.vo.query.qykh.PlanVO;
 import com.platform.dao.vo.query.qykh.ProductVO;
-import com.platform.dao.vo.query.store.StoreVO;
 import com.platform.dao.vo.remote.RemotePositionVO;
 import com.platform.dao.vo.sb.SbPositionVO;
 import com.platform.dao.vo.sb.SbTypeVO;
 import lombok.experimental.UtilityClass;
 
 import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
 

platform-rest/src/main/java/com/platform/rest/controller/custom/CustomRelationController.java

@@ -133,4 +133,8 @@ public class CustomRelationController {
         ExcelUtil.exportResponseDict(response, ExportCustomRelationVO.class, BeanConverterUtil.copyListProperties(list, ExportCustomRelationVO.class), "默认关联");
     }
 
+    @GetMapping("/{category}/{type}")
+    public R<CustomRelation> getItemByCategory(@PathVariable("category") String category, @PathVariable("type") String type) {
+        return new R<>(customRelationService.getItemByCategory(category, type));
+    }
 }

platform-service/src/main/java/com/platform/service/custom/CustomRelationService.java

@@ -37,4 +37,6 @@ public interface CustomRelationService extends IBaseService<CustomRelation, Cust
     CustomRelation saveByDTO(CustomRelationDTO record);
 
     void modByDTO(CustomRelationDTO record);
+
+    CustomRelation getItemByCategory(String category,String type);
 }

platform-service/src/main/java/com/platform/service/custom/impl/CustomRelationServiceImpl.java

@@ -82,6 +82,14 @@ public class CustomRelationServiceImpl extends BaseServiceImpl<CustomRelationMap
         mapper.updateByPrimaryKey(updInfo);
     }
 
+    @Override
+    public CustomRelation getItemByCategory(String category, String type) {
+        CustomRelation query = new CustomRelation();
+        query.setCategory(category);
+        query.setType(type);
+        return mapper.selectOne(query);
+    }
+
     private void checkExists(String type, String category,String msg) {
         CustomRelation query = new CustomRelation();
         query.setCategory(category);

platform-service/src/main/java/com/platform/service/workflow/impl/WorkflowServiceImpl.java

@@ -122,6 +122,7 @@ public class WorkflowServiceImpl extends BaseServiceImpl<WorkflowMapper, Workflo
                         JSONObject condition = new JSONObject();
                         condition.put("value", jsonObject.getString("handleConditionValue"));
                         condition.put("symbol", jsonObject.getString("handleConditionType"));
+                        condition.put("fieldName",jsonObject.getString("titleColumnCode"));
                         node.setSwitchJson(condition.toJSONString());
                         node.setSwitchHandleId(jsonObject.getString("handleNameId"));
                         break;