绩效结果考核申报添加审批领导

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

@@ -645,8 +645,23 @@ public class DeptAssessmentDeclarationController {
 	@PostMapping(value = "/addApprovalLeader")
 	public R addApprovalLeader(@RequestParam(value = "id") String id,
 							   @RequestParam(value = "employeeNo") String employeeNo) {
-		List<UserDTO> list = new ArrayList<>();
-		return R.ok().data(list);
+		boolean b = false;
+		JSONObject jsonArr = userService.pageList(1, 500, "", "", "", employeeNo, "", "", request);
+		JSONObject jsonArr1 = (JSONObject) jsonArr.get("data");
+		JSONArray array = JSONUtil.parseArray(jsonArr1.get("records"));
+		List<UserDTO> userList = JSONUtil.toList(array, UserDTO.class);
+		if (userList.size() > 0) {
+			DeptAssessmentDeclaration deptAssessmentDeclaration = deptAssessmentDeclarationService.getById(id);
+			deptAssessmentDeclaration.setDeptLeaderId(userList.get(0).getId());
+			deptAssessmentDeclaration.setDeptLeaderNo(userList.get(0).getNo());
+			deptAssessmentDeclaration.setDeptLeaderName(userList.get(0).getName());
+			b = deptAssessmentDeclarationService.updateById(deptAssessmentDeclaration);
+		}
+		if (b) {
+			return R.ok().data(b);
+		} else {
+			return R.error("添加审批领导失败！");
+		}
 	}
 
 	/**

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

@@ -38,6 +38,8 @@ public class DeptAssessmentDeclaration extends Model {
 	private String ratingGrade;
 	//部门领导主键
 	private String deptLeaderId;
+	//部门领导编号
+	private String deptLeaderNo;
 	//部门领导名称
 	private String deptLeaderName;
 	//申报理由

ims-service/ims-eval/src/main/resources/mappers/DeptAssessmentDeclarationMapper.xml

@@ -13,6 +13,7 @@
         <result column="declaration_level" property="declarationLevel" />
         <result column="rating_grade" property="ratingGrade" />
         <result column="dept_leader_id" property="deptLeaderId" />
+        <result column="dept_leader_no" property="deptLeaderNo" />
         <result column="dept_leader_name" property="deptLeaderName" />
         <result column="declaration_reason" property="declarationReason" />
         <result column="applicant_id" property="applicantId" />
@@ -39,6 +40,7 @@
                declaration_level,
                rating_grade,
                dept_leader_id,
+               dept_leader_no,
                dept_leader_name,
                declaration_reason,
                applicant_id,