1

science-admin/src/main/java/com/yiboshi/science/dao/SystemParameterDAO.java

@@ -19,5 +19,5 @@ import java.util.List;
 public interface SystemParameterDAO extends BaseMapper<SystemParameter>, BaseDAO<SystemParameterQueryVO, SystemParameterDTO,SystemParameter> {
      List<SystemParameter> getList(@Param("ew") Wrapper<SystemParameter> queryWrapper);
      List<SystemParameter>  getParentParameterList();
-     List<SpecDTO> getSpecArray();
+     List<SpecDTO> getParameterArray(Integer typeId);
 }
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/entity/ComTalentApply.java

@@ -50,6 +50,9 @@ public class ComTalentApply extends BaseEntity {
     @Length(max=350, message = "人才类型不能大于350")
     private String talentType;
 
+    @ApiModelProperty(value = "是否是省级或省级以上人才")
+    private Integer isProvincialTalent;
+    
     /** 荣誉称号 */
     @ApiModelProperty(value = "荣誉称号", position = 3)
     @Length(max=1000, message = "荣誉称号不能大于1000")

science-admin/src/main/java/com/yiboshi/science/param/dto/ComTalentApplyDTO.java

@@ -47,6 +47,9 @@ public class ComTalentApplyDTO extends BaseDTO {
     @ApiModelProperty(value = "人才类别名称")
     private String talentCategoryName;
 
+    @ApiModelProperty(value = "是否是省级或省级以上人才")
+    private Integer isProvincialTalent;
+    
     @ApiModelProperty(value = "人才类型")
     private String talentType;
     

science-admin/src/main/java/com/yiboshi/science/param/query/ComTalentApplyQueryVO.java

@@ -62,6 +62,9 @@ public class ComTalentApplyQueryVO extends PaginationVO {
     @ApiModelProperty(value = "人才类别")
     private String talentCategory;
 
+    @ApiModelProperty(value = "是否是省级或省级以上人才")
+    private Integer isProvincialTalent;
+
     @ApiModelProperty(value = "人才类型")
     private String talentType;
 

science-admin/src/main/java/com/yiboshi/science/rest/v1/SystemParameterController.java

@@ -164,16 +164,16 @@ public class SystemParameterController extends BaseController<SystemParameterSer
     @ApiOperation(value = "获取学科代码树列表", httpMethod = "GET", notes = "获取学科代码树列表")
     @GetMapping
     @RequestMapping("/getKnowledgeInfoList2")
-    public ResponseDataModel<List<SelectListItem>> getKnowledgeInfoList2() {
-        List<SelectListItem> list = systemParameterService.getKnowledgeInfoList2();
+    public ResponseDataModel<List<SelectListItem>> getKnowledgeInfoList2(Integer typeId) {
+        List<SelectListItem> list = systemParameterService.getKnowledgeInfoList2(typeId);
         return ResponseDataModel.ok(list);
     }
 
     @ApiOperation(value = "专业数组代码列表", httpMethod = "GET", notes = "专业数组代码列表")
     @GetMapping
     @RequestMapping("/getSpecArray")
-    public ResponseDataModel<List<SpecDTO>> getSpecArray() {
-        List<SpecDTO> list = systemParameterService.getSpecArray();
+    public ResponseDataModel<List<SpecDTO>> getSpecArray(Integer typeId) {
+        List<SpecDTO> list = systemParameterService.getParameterArray(typeId);
         return ResponseDataModel.ok(list);
     }
 }

science-admin/src/main/java/com/yiboshi/science/service/SystemParameterService.java

@@ -108,11 +108,11 @@ public interface SystemParameterService extends BaseService<SystemParameterQuery
      * 获取学科代码树列表1
      * @return
      */
-    List<SelectListItem> getKnowledgeInfoList2();
+    List<SelectListItem> getKnowledgeInfoList2(Integer typeId);
 
     /**
      * 专业数组代码列表
      * @return
      */
-    List<SpecDTO> getSpecArray();
+    List<SpecDTO> getParameterArray(Integer typeId);
 }

science-admin/src/main/java/com/yiboshi/science/service/impl/SystemParameterServiceImpl.java

@@ -230,7 +230,7 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD
         if (null != obj)
             list = (List<SystemParameter>) redisUtils.get(RedisKey.ParameterList + "all");
         else {
-            QueryWrapper w= new QueryWrapper();
+            QueryWrapper w = new QueryWrapper();
             w.orderByAsc("display_order");
             list = systemParameterDAO.getList(new QueryWrapper());
             redisUtils.set(RedisKey.ParameterList + "all", list, 7, TimeUnit.DAYS);
@@ -276,7 +276,7 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD
     public String insert(SystemParameterDTO dto) {
         SystemParameter parameter = this.convert2Entity(dto);
         parameter.setNoteState(1);
-        String id= this.insert(parameter);
+        String id = this.insert(parameter);
         refreshSystemParameter();
         return id;
     }
@@ -285,7 +285,7 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD
         SystemParameter parameter = this.entityById(dto.getId());
         if (null == parameter)
             throw new BusinessException("参数不存在或已删除!");
-        String id= this.update(this.convert2Entity(dto));
+        String id = this.update(this.convert2Entity(dto));
         refreshSystemParameter();
         return id;
     }
@@ -350,14 +350,14 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD
         return list;
     }
 
-    public List<SelectListItem> getKnowledgeInfoList2() {
+    public List<SelectListItem> getKnowledgeInfoList2(Integer typeId) {
         List<SelectListItem> list = null;
-        Object obj = redisUtils.get(RedisKey.KnowledgeCodeList2);
+        Object obj = redisUtils.get(RedisKey.KnowledgeCodeList2 + typeId);
         if (null != obj)
-            list = (List<SelectListItem>) redisUtils.get(RedisKey.KnowledgeCodeList2);
+            list = (List<SelectListItem>) redisUtils.get(RedisKey.KnowledgeCodeList2 + typeId);
         if (null == list || list.size() == 0) {
-            list = getKnowledgeParameterTreeList2();
-            redisUtils.set(RedisKey.KnowledgeCodeList2, list, 7, TimeUnit.DAYS);
+            list = getKnowledgeParameterTreeList2(typeId);
+            redisUtils.set(RedisKey.KnowledgeCodeList2 + typeId, list, 7, TimeUnit.DAYS);
         }
         return list;
     }
@@ -385,16 +385,30 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD
     }
 
 
-    private List<SelectListItem> getKnowledgeParameterTreeList2() {
-        List<SystemParameter> parentList = this.getListByType(68);
-
+    private List<SelectListItem> getKnowledgeParameterTreeList2(Integer typeId) {
+        List<SystemParameter> parentList = this.getListByType(typeId);
+        List<SystemParameter> FirstList = new ArrayList<>();
         List<SelectListItem> list = new ArrayList<>();
-        List<SystemParameter> FirstList = parentList.stream().filter(e -> e.getSystemCode().equals("C") || e.getSystemCode().equals("G") || e.getSystemCode().equals("H") || e.getSystemCode().equals("F")).collect(Collectors.toList());
+        if (typeId.equals(69)) {
+            FirstList = parentList.stream().filter(e -> e.getParentId() == null).collect(Collectors.toList());
+            FirstList.forEach(e -> {
+                SelectListItem treeListItem = new SelectListItem(e.getName(), e.getId(), e.getSystemCode(), false, false, new ArrayList<>());
+                list.add(treeListItem);
+            });
+            list.forEach(e -> {
+                List<SelectListItem> SecondList = addChildList(parentList, e);
+                e.setChildren(SecondList);
+                SecondList.forEach(f -> {
+                    List<SelectListItem> ThirdList = addChildList(parentList, f);
+                    f.setChildren(ThirdList);
+                });
+            });
+        } else {
+            FirstList = parentList.stream().filter(e -> e.getSystemCode().equals("C") || e.getSystemCode().equals("G") || e.getSystemCode().equals("H") || e.getSystemCode().equals("F")).collect(Collectors.toList());
             FirstList.forEach(e -> {
                 SelectListItem treeListItem = new SelectListItem(e.getName(), e.getId(), e.getSystemCode(), false, false, new ArrayList<>());
                 list.add(treeListItem);
             });
-
             list.forEach(e -> {
                 List<SelectListItem> SecondList = AddChildList(parentList, e, 3);
                 e.setChildren(SecondList);
@@ -403,7 +417,7 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD
                     f.setChildren(ThirdList);
                 });
             });
-
+        }
         return list;
     }
 
@@ -417,14 +431,24 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD
         return SelectList;
     }
 
+    private List<SelectListItem> addChildList(List<SystemParameter> parentList, SelectListItem s) {
+        List<SelectListItem> SelectList = new ArrayList<>();
+        List<SystemParameter> itemList = parentList.stream().filter(f -> f.getParentId() != null && f.getParentId().equals(s.getKey())).collect(Collectors.toList());
+        itemList.forEach(e -> {
+            SelectListItem treeListItem = new SelectListItem(e.getName(), e.getId(), e.getSystemCode(), false, false, new ArrayList<>());
+            SelectList.add(treeListItem);
+        });
+        return SelectList;
+    }
+
 
-    public List<SpecDTO> getSpecArray() {
+    public List<SpecDTO> getParameterArray(Integer typeId) {
         List<SpecDTO> list = null;
         Object obj = redisUtils.get(RedisKey.SpecArrayList);
         if (null != obj)
             list = (List<SpecDTO>) redisUtils.get(RedisKey.SpecArrayList);
         if (null == list || list.size() == 0) {
-            list = systemParameterDAO.getSpecArray();
+            list = systemParameterDAO.getParameterArray(typeId);
             redisUtils.set(RedisKey.SpecArrayList, list, 7, TimeUnit.DAYS);
         }
         return list;

science-admin/src/main/resources/mapper/SystemParameterDAO.xml

@@ -32,11 +32,11 @@
         where type_id in (select a.parent_id from system_parameter_type a where a.parent_id is not null)
         order by a.type_id,a.display_order asc
     </select>
-    <select id="getSpecArray" resultType="com.yiboshi.science.param.dto.SpecDTO">
+    <select id="getParameterArray" parameterType="java.lang.Integer" resultType="com.yiboshi.science.param.dto.SpecDTO">
         select a.id as `key`, b.id as pkey, c.id as ppkey
         from system_parameter a
                  left join system_parameter b on a.parent_id = b.id
                  left join system_parameter c on b.parent_id = c.id
-        where a.type_id = 68 and b.id is not null and c.id is not null
+        where a.type_id = #{typeId} and b.id is not null and c.id is not null
     </select>
 </mapper>
\ No newline at end of file