修改查询责任部门接口

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java

@@ -853,4 +853,31 @@ public class SysDictController {
 		return result;
 	}
 
+	/**
+	 * 获取责任部门列表Responsible Department
+	 */
+	@ApiOperation(value = "字典控制器-获取责任部门列表", notes = "字典控制器-获取责任部门列表")
+	@RequestMapping(value = "/getDutyDepart", method = RequestMethod.GET)
+	public Result<List<SysDictItem>> getDutyDeparts() {
+		Result<List<SysDictItem>> result = new Result<>();
+		List<SysDictItem> ls = sysDictItemService.getDutyDeparts("duty_territory");
+		result.setSuccess(true);
+		result.setResult(ls);
+		return result;
+	}
+
+	/**
+	 * 根据责任部门获取责任领域
+	 * @return
+	 */
+	@ApiOperation(value = "字典控制器-根据责任部门获取责任领域", notes = "字典控制器-根据责任部门获取责任领域")
+	@GetMapping(value = "/getDutyTeryByDD")
+	public Result<List<SysDictItem>> getDutyTeryByDD(@RequestParam String ddStrs) {
+		Result<List<SysDictItem>> result = new Result<>();
+		List<SysDictItem> ls = sysDictItemService.getDutyTeryByDD("duty_territory",ddStrs);
+		result.setSuccess(true);
+		result.setResult(ls);
+		return result;
+	}
+
 }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java

@@ -1,5 +1,6 @@
 package com.jero.modules.system.service;
 
+import com.jero.common.system.vo.DictModel;
 import com.jero.modules.system.entity.SysDictItem;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -19,6 +20,19 @@ public interface ISysDictItemService extends IService<SysDictItem> {
 
     public List<SysDictItem> selectItemsByDictCode(String dictCode);
 
+    /**
+     * 获取责任部门，去重
+     * @param code
+     * @return
+     */
+    public List<SysDictItem> getDutyDeparts(String code);
+
+    /**
+     * 根据责任部门获取责任领域
+     * @param ddStrs
+     * @return
+     */
+    public List<SysDictItem> getDutyTeryByDD(String code,String ddStrs);
     /**
      * 查询所有数据字典信息
      * @return

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java

@@ -2,8 +2,10 @@ package com.jero.modules.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.constant.CacheConstant;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.system.vo.DictModel;
 import com.jero.modules.enums.DictCodeEnum;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.mapper.SysDictItemMapper;
@@ -11,12 +13,10 @@ import com.jero.modules.system.service.ISysDictItemService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -44,6 +44,37 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
     }
 
 
+    @Override
+    public List<SysDictItem> getDutyDeparts(String code) {
+        List<SysDictItem> ddList = this.selectItemsByDictCode(code);
+        Map<String,SysDictItem> ddMap = new HashMap<>();
+        for (SysDictItem dd: ddList) {
+            if(!ddMap.containsKey(dd.getStatNode())){
+                ddMap.put(dd.getStatNode(),dd);
+            }
+        }
+        List<SysDictItem> res = (List<SysDictItem>) ddMap.values();
+        Collections.sort(res, Comparator.comparingInt(SysDictItem::getSortOrder));
+        return res;
+    }
+
+    @Override
+    public List<SysDictItem> getDutyTeryByDD(String code, String ddStrs) {
+        List<SysDictItem> res = new ArrayList<>();
+        List<SysDictItem> ddList = this.selectItemsByDictCode(code);
+        List<String> list = new ArrayList<>();
+        if (StringUtils.isNotEmpty(ddStrs)) {
+            list = Arrays.asList(ddStrs.split(","));
+        }
+        for (SysDictItem dd : ddList) {
+            if (list.contains(dd.getStatNode())) {
+                res.add(dd);
+            }
+        }
+        Collections.sort(res, Comparator.comparingInt(SysDictItem::getSortOrder));
+        return res;
+    }
+
     /**
      * 查询所有数据字典信息
      * @return

jero-web/src/common/lang/en-us.js

@@ -1828,7 +1828,7 @@ module.exports = {
   proportion:'Proportion',
   projectProgressStatistics:'Project Progress Statistics',
   GRPSystemProjectProgressStatistics:'GRP system project progress statistics',
-  statisticalNodes:'Responsible Department',
+  statisticalNodes:'Duty Department',
   proportionWithInTheAreaOfResponsibility:'Proportion within the area of responsibility',
   contentsearch:'Content Search',
   masterProject:'Master Project',

jero-web/src/common/lang/zh-cn.js

@@ -3833,7 +3833,6 @@ module.exports = {
   proportion:'占比',
   projectProgressStatistics:'项目进度统计',
   GRPSystemProjectProgressStatistics:'GRP系统项目进度统计',
-  statisticalNodes:'责任部门',
   proportionWithInTheAreaOfResponsibility:'责任领域内占比',
   contentsearch:'内容搜索',
   masterProject:'主项目',