Forráskód Böngészése

feat(task): 添加指标类型颜色属性并优化任务类型设置

- 在 TaskTypeSettingBean 中添加 typeColor 字段,用于存储指标类型颜色
- 优化任务类型设置的查询逻辑,提高代码可读性和性能
- 在任务分析结果中添加 color 属性,用于展示指标类型颜色
- 标记 saveCaseProportion 方法为 @Deprecated,准备移除案件比相关功能
wanyuan 3 hónapja
szülő
commit
be6c4326ff

+ 1 - 0
tc-service/tap-task/src/main/java/com/minto/app/task/manager/TaskAnalysisManagerImpl.java

@@ -1652,6 +1652,7 @@ public class TaskAnalysisManagerImpl implements ITaskAnalysisManager{
             result.put("value", tipEnum.getValue());
             result.put("status", tipEnum.getStatus());
             result.put("isParent", true);
+            result.put("color",tipEnum.getColor());
             result.put("createDate", tipEnum.getCreateDate());
             result.put("updateDate", tipEnum.getUpdateDate());
             result.put("sort", tipEnum.getSort());

+ 18 - 23
tc-service/tap-task/src/main/java/com/minto/app/task/manager/TaskTypeSettingManagerImpl.java

@@ -52,7 +52,9 @@ public class TaskTypeSettingManagerImpl implements ITaskTypeSettingManager{
         Criterion c = Restrictions.eq("reference_id",taskId);
         taskTypeSettingDao.delete(TaskTypeSettingBean.class,c);
 
-        if (StringUtil.isEmpty(typeSettingStr)) return;
+        if (StringUtil.isEmpty(typeSettingStr)){
+            return;
+        }
         List<TaskTypeSettingBean> taskTypeSettingBeanList = new ArrayList<>();
         Arrays.stream(typeSettingStr.split(",")).forEach(e -> {
             TaskTypeSettingBean bean = new TaskTypeSettingBean();
@@ -81,31 +83,24 @@ public class TaskTypeSettingManagerImpl implements ITaskTypeSettingManager{
         TipEnumManager tipEnumManager = AppContext.getBean(TipEnumManager.class);
         TipEnumBean tipEnum = tipEnumManager.getTipEnumByTypeAndKey("0", "matter_type_settings");
         List<TipEnumBean> matterTypeSettingsList =tipEnumManager.findTipEnumsByType(String.valueOf(tipEnum.getId()));
-        Map<Long, String> matterTypeSettingsMap = matterTypeSettingsList.stream().collect(Collectors.toMap(TipEnumBean::getId, TipEnumBean::getValue));
+        Map<Long, TipEnumBean> matterTypeSettingsMap =
+                matterTypeSettingsList.stream().collect(Collectors.toMap(TipEnumBean::getId, e->e));
 
         //如果该事项类型配置了指标类型字段信息,则查询相关信息后返回
-        cols.stream().forEach(e -> {
-            if ("type_setting".equals(e.get("fieldName").toString())){
-                result.put("isShowTaskTypeSetting",true);
-                Criterion c = Restrictions.eq("referenceId",taskId);
-                List<TaskTypeSettingBean> taskTypeSettingList = taskTypeSettingDao.findBy(TaskTypeSettingBean.class, c);
-                Iterator<TaskTypeSettingBean> iterator = taskTypeSettingList.iterator();
-                //列表中删除案件比信息
-                while (iterator.hasNext()){
-                    TaskTypeSettingBean next = iterator.next();
-                    if (next.getTypeId().longValue() == -1){
-                        result.put("caseProportion",next);
-                        iterator.remove();
-                    }else {
-                        next.setTypeName(matterTypeSettingsMap.get(next.getTypeId()));
-                    }
-                }
-
-                result.put("taskTypeSettingList",taskTypeSettingList);
-                return ;
+        Map<String, Object> map = cols.stream().filter(e -> "type_setting".equals(e.get("fieldName").toString()))
+                .findFirst().orElse(null);
+        if(map!=null){
+            result.put("isShowTaskTypeSetting", true);
+            Criterion c = Restrictions.eq("referenceId", taskId);
+            List<TaskTypeSettingBean> taskTypeSettingList = taskTypeSettingDao.findBy(TaskTypeSettingBean.class, c);
+            //列表中删除案件比信息
+            for(TaskTypeSettingBean next : taskTypeSettingList){
+                TipEnumBean tipEnumBean = matterTypeSettingsMap.get(next.getTypeId());
+                next.setTypeName(tipEnumBean.getValue());
+                next.setTypeColor(tipEnumBean.getColor());
             }
-        });
-
+            result.put("taskTypeSettingList", taskTypeSettingList);
+        }
         return result;
     }
 

+ 3 - 0
tip-api/src/main/java/com/minto/app/task/beans/TaskTypeSettingBean.java

@@ -58,4 +58,7 @@ public class TaskTypeSettingBean extends BasePO{
 
     //指标类型名称
     private String typeName;
+
+    //指标类型
+    private String typeColor;
 }

+ 1 - 0
tip-api/src/main/java/com/minto/app/task/manager/ITaskTypeSettingManager.java

@@ -26,6 +26,7 @@ public interface ITaskTypeSettingManager {
     void updateTaskTypeSetting(Long userId, Long id, Integer typeState);
 
     //案件比保存
+    @Deprecated
     void saveCaseProportion(Long userId, Long taskId, Integer typeState);
 
     //获取各指标类型满足率和案件比

+ 1 - 0
tip-front/src/main/java/com/minto/app/task/service/impl/TaskListWebServiceImpl.java

@@ -95,6 +95,7 @@ public class TaskListWebServiceImpl implements TaskListWebService {
     }
     @AjaxSupport
     @Override
+    @Deprecated
     public void saveCaseProportion(Long taskId, Integer typeState) {
         Long userId = AppContext.currentUserId();
         taskTypeSettingManager.saveCaseProportion(userId,taskId,typeState);