|
@@ -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;
|
|
|
}
|
|
|
|