修改考评部门配置问题

ims-service/ims-eval/src/main/java/com/ims/eval/api/HomeController.java

@@ -33,9 +33,9 @@ public class HomeController {
 	 * @param year       年度
 	 * @return 结果
 	 */
-	@GetMapping(value = "/list")
-	public R listAll(@RequestParam(value = "binSection") String binSection,
-					 @RequestParam(value = "year") String year) {
+	@GetMapping(value = "/annualRankingData")
+	public R annualRankingData(@RequestParam(value = "binSection") String binSection,
+							   @RequestParam(value = "year") String year) {
 		Map<String, Object> data = portalService.selectPortalList(binSection, year, null);
 		return R.ok().data(data);
 	}

ims-service/ims-eval/src/main/java/com/ims/eval/controller/DepartmentAllocationController.java

@@ -1,19 +1,29 @@
 package com.ims.eval.controller;
 
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.EvaluationDept;
+import com.ims.eval.entity.dto.request.PostDTO;
+import com.ims.eval.entity.dto.request.PostUserDTO;
 import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.service.IEvaluationDeptService;
+import com.ims.eval.service.custom.PostService;
+import com.ims.eval.service.custom.PostUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 考评部门配置
@@ -30,6 +40,15 @@ public class DepartmentAllocationController {
 	@Autowired
 	private IEvaluationDeptService evaluationDeptService;
 
+	@Autowired
+	private PostService postService;
+
+	@Autowired
+	private PostUserService postUserService;
+
+	@Autowired
+	private HttpServletRequest request;
+
 	/**
 	 * 考评部门配置列表信息（分页）
 	 *
@@ -64,6 +83,8 @@ public class DepartmentAllocationController {
 	 */
 	@GetMapping(value = "/listAll")
 	public R listAll() {
+		QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
+		qw.lambda().eq(EvaluationDept::getJxjgkhsbType, "1");
 		List<EvaluationDept> list = evaluationDeptService.list();
 		return R.ok().data(list);
 	}
@@ -77,6 +98,14 @@ public class DepartmentAllocationController {
 	@PostMapping(value = "/save")
 	public R addAll(@RequestBody EvaluationDept evaluationDept) {
 		try {
+			QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
+			if (StringUtils.isNotEmpty(evaluationDept.getDeptId())) {
+				qw.lambda().eq(EvaluationDept::getDeptId, evaluationDept.getDeptId());
+			}
+			EvaluationDept obj = evaluationDeptService.getOne(qw);
+			if (obj != null) {
+				return R.customError("部门重复，请重新添加！");
+			}
 			boolean b = evaluationDeptService.saveOrUpdate(evaluationDept);
 			if (b) {
 				return R.ok().data(b);
@@ -89,6 +118,39 @@ public class DepartmentAllocationController {
 	}
 
 	/**
+	 * 获取部门领导
+	 *
+	 * @return 结果
+	 */
+	@GetMapping(value = "/getDepartmentLeader/{id}")
+	public R getDepartmentLeader(@PathVariable String id) {
+		List<PostUserDTO> list = new ArrayList<>();
+		Object postList = postService.getPostList(1, 500, "23031005", request);
+		if (null != postList) {
+			JSONObject postJsonArr = (JSONObject) postList;
+			JSONObject postDataJsonArr = (JSONObject) postJsonArr.get("data");
+			JSONArray postArray = JSONUtil.parseArray(postDataJsonArr.get("records"));
+			List<PostDTO> postArrList = JSONUtil.toList(postArray, PostDTO.class);
+			List<PostDTO> postDeptList = postArrList.stream().filter(item -> item.getDeptId().equals(id)).collect(Collectors.toList());
+			for (PostDTO post : postDeptList) {
+				if (post.getName().contains("主任")) {
+					Object postPersonnelList = postUserService.getPostUserList(1, 500, post.getId(), request);
+					if (null != postPersonnelList) {
+						JSONObject postPersonnelJsonArr = (JSONObject) postPersonnelList;
+						JSONObject postPersonnelDataJsonArr = (JSONObject) postPersonnelJsonArr.get("data");
+						JSONArray postPersonnelArray = JSONUtil.parseArray(postPersonnelDataJsonArr.get("records"));
+						List<PostUserDTO> userArrList = JSONUtil.toList(postPersonnelArray, PostUserDTO.class);
+						if (userArrList.size() > 0) {
+							list.addAll(userArrList);
+						}
+					}
+				}
+			}
+		}
+		return R.ok().data(list);
+	}
+
+	/**
 	 * 批量删除考评部门配置信息
 	 *
 	 * @param ids 主键s

ims-service/ims-eval/src/main/java/com/ims/eval/controller/DeptAssessmentDeclarationController.java

@@ -11,11 +11,13 @@ import com.ims.common.utils.StringUtils;
 import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.DeptAssessmentDeclaration;
 import com.ims.eval.entity.DeptAssessmentDeclarationContent;
+import com.ims.eval.entity.EvaluationDept;
 import com.ims.eval.entity.dto.request.EmployeeDTO;
 import com.ims.eval.entity.dto.request.UserDTO;
 import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.service.IDeptAssessmentDeclarationContentService;
 import com.ims.eval.service.IDeptAssessmentDeclarationService;
+import com.ims.eval.service.IEvaluationDeptService;
 import com.ims.eval.service.IUserService;
 import com.ims.eval.util.ExcelUtil;
 import com.ims.eval.util.ExcelUtils;
@@ -51,6 +53,9 @@ public class DeptAssessmentDeclarationController {
 	private IDeptAssessmentDeclarationContentService deptAssessmentDeclarationContentService;
 
 	@Autowired
+	private IEvaluationDeptService evaluationDeptService;
+
+	@Autowired
 	private IUserService userService;
 
 	@Autowired
@@ -111,6 +116,21 @@ public class DeptAssessmentDeclarationController {
 	}
 
 	/**
+	 * 获取部门领导
+	 *
+	 * @return 结果
+	 */
+	@GetMapping(value = "/getDepartmentLeader/{id}")
+	public R getDepartmentLeader(@PathVariable String id) {
+		QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
+		if (StringUtils.isNotEmpty(id)) {
+			qw.lambda().like(EvaluationDept::getDeptId, id);
+		}
+		EvaluationDept evaluationDept = evaluationDeptService.getOne(qw);
+		return R.ok().data(evaluationDept);
+	}
+
+	/**
 	 * 修改绩效结果考核申报信息
 	 *
 	 * @param deptAssessmentDeclaration 绩效结果考核申报实体

ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluationDept.java

@@ -30,4 +30,10 @@ public class EvaluationDept extends Model {
 	//部门领导名称
 	private String chargePersonName;
 
+	//业绩指标计划(1是 0否)
+	private String yjzbjhType;
+
+	//绩效结果考核申报(1是 0否)
+	private String jxjgkhsbType;
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/request/PostDTO.java

@@ -0,0 +1,19 @@
+package com.ims.eval.entity.dto.request;
+
+import lombok.Data;
+
+/**
+ * @author hlf
+ * @date 2023/7/20 11:09
+ * 文件说明：岗位
+ */
+@Data
+public class PostDTO {
+
+	private String id;
+
+	private String deptId;
+
+	private String name;
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/request/PostUserDTO.java

@@ -0,0 +1,21 @@
+package com.ims.eval.entity.dto.request;
+
+import lombok.Data;
+
+/**
+ * @author hlf
+ * @date 2023/7/20 14:22
+ * 文件说明：岗位人员
+ */
+@Data
+public class PostUserDTO {
+
+	private String id;
+
+	private String no;
+
+	private String userName;
+
+	private String posName;
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/request/UserDTO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 /**
  * @author hlf
  * @date 2023/6/26 10:46
- * 文件说明：
+ * 文件说明：用户
  */
 @Data
 public class UserDTO {

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluationDeptBusinessPlanServiceImpl.java

@@ -3,6 +3,7 @@ package com.ims.eval.service.impl;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -57,7 +58,9 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 		evaluationDeptBusinessPlan.setDocumentStatus("有效");
 		evaluationDeptBusinessPlan.setStage("流程未启动");
 		evaluationDeptBusinessPlan.setCreateTime(DateUtil.date());
-		List<EvaluationDept> evaluationDeptList = evaluationDeptService.list();
+		QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
+		qw.lambda().like(EvaluationDept::getYjzbjhType, "1");
+		List<EvaluationDept> evaluationDeptList = evaluationDeptService.list(qw);
 		if (evaluationDeptList.size() > 0) {
 			StringBuilder deptIds = new StringBuilder();
 			StringBuilder deptNames = new StringBuilder();