本部考评调整

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

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -39,6 +40,9 @@ public class DepartmentPerformanceAppraisalRatingController {
 	@Autowired
 	private IOrganizationStructureService organizationStructureService;
 
+	@Autowired
+	private HttpServletRequest request;
+
 	/**
 	 * 部门绩效考核评级列表信息（分页）
 	 *
@@ -68,7 +72,7 @@ public class DepartmentPerformanceAppraisalRatingController {
 	public R listAll(@RequestParam(value = "deptId") String deptId,
 					 @RequestParam(value = "deptName", required = false) String deptName,
 					 @RequestParam(value = "annual", required = false) String annual) {
-		List<EvaluationDeptRating> list = evaluationDeptRatingService.list(deptId, deptName, annual);
+		List<EvaluationDeptRating> list = evaluationDeptRatingService.list(deptId, deptName, annual,request);
 		return R.ok().data(list);
 	}
 

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

@@ -50,6 +50,9 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 	@Autowired
 	private IEvaluationDeptService evaluationDeptService;
 
+	@Autowired
+	private HttpServletRequest request;
+
 	/**
 	 * 部门考评业务列表信息（分页）
 	 *
@@ -70,7 +73,7 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 		@RequestParam(value = "des", required = false) String des,
 		@RequestParam(value = "appraisalYear", required = false) String appraisalYear,
 		@RequestParam(value = "stage", required = false) String stage) {
-		IPage<EvaluationDeptBusinessAssessment> list = evaluationDeptBusinessAssessmentService.listPage(pageNum, pageSize, deptId, responsibilityCode, des, appraisalYear, stage);
+		IPage<EvaluationDeptBusinessAssessment> list = evaluationDeptBusinessAssessmentService.listPage(pageNum, pageSize, deptId, responsibilityCode, des, appraisalYear, stage,request);
 		return R.ok().data(list);
 	}
 

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

@@ -17,11 +17,11 @@ import com.ims.eval.service.IEvaluationDeptService;
 import com.ims.eval.util.ExcelUtil;
 import com.ims.eval.util.WordUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.map.LinkedMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.InputStream;
 import java.util.*;
 
@@ -46,6 +46,9 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	@Autowired
 	private IEvaluationDeptService evaluationDeptService;
 
+	@Autowired
+	private HttpServletRequest request;
+
 	/**
 	 * 部门考评业务列表信息（分页）
 	 *
@@ -66,7 +69,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 		@RequestParam(value = "des", required = false) String des,
 		@RequestParam(value = "appraisalYear", required = false) String appraisalYear,
 		@RequestParam(value = "stage", required = false) String stage) {
-		IPage<EvaluationDeptBusinessPlan> list = evaluationDeptBusinessPlanService.listPage(pageNum, pageSize, deptId, responsibilityCode, des, appraisalYear, stage);
+		IPage<EvaluationDeptBusinessPlan> list = evaluationDeptBusinessPlanService.listPage(pageNum, pageSize, deptId, responsibilityCode, des, appraisalYear, stage,request);
 		return R.ok().data(list);
 	}
 

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

@@ -88,7 +88,7 @@ public class DeptAssessmentDeclarationController {
 		@RequestParam(value = "deptName", required = false) String deptName,
 		@RequestParam(value = "annual", required = false) Integer annual,
 		@RequestParam(value = "declarationMonth", required = false) Integer declarationMonth) {
-		IPage<DeptAssessmentDeclaration> list = deptAssessmentDeclarationService.listPage(pageNum, pageSize, deptId, orderNumber, deptName, annual, declarationMonth);
+		IPage<DeptAssessmentDeclaration> list = deptAssessmentDeclarationService.listPage(pageNum, pageSize, deptId, orderNumber, deptName, annual, declarationMonth,request);
 		return R.ok().data(list);
 	}
 
@@ -646,7 +646,7 @@ public class DeptAssessmentDeclarationController {
 		boolean b = false;
 		JSONObject jsonArr = userService.getLoginNameByUserInfo(employeeNo, request);
 		JSONObject data = (JSONObject) jsonArr.get("data");
-		if ("操作成功".equals(String.valueOf(data.get("msg")))){
+		if (data.toJSONString().length()>0){
 			DeptAssessmentDeclaration deptAssessmentDeclaration = deptAssessmentDeclarationService.getById(id);
 			if (null != deptAssessmentDeclaration) {
 				deptAssessmentDeclaration.setDeptLeaderId(String.valueOf(data.get("id")));

ims-service/ims-eval/src/main/java/com/ims/eval/service/IDeptAssessmentDeclarationService.java

@@ -15,7 +15,7 @@ import java.util.List;
  */
 public interface IDeptAssessmentDeclarationService extends IService<DeptAssessmentDeclaration> {
 
-	IPage<DeptAssessmentDeclaration> listPage(Integer pageNum, Integer pageSize, String deptId, String orderNumber, String deptName, Integer annual, Integer declarationMonth);
+	IPage<DeptAssessmentDeclaration> listPage(Integer pageNum, Integer pageSize, String deptId, String orderNumber, String deptName, Integer annual, Integer declarationMonth,HttpServletRequest request);
 
 	boolean save(DeptAssessmentDeclaration deptAssessmentDeclaration, HttpServletRequest request);
 

ims-service/ims-eval/src/main/java/com/ims/eval/service/IEvaluationDeptBusinessAssessmentService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ims.eval.entity.EvaluationDeptBusinessAssessment;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -13,7 +14,7 @@ import java.util.List;
  */
 public interface IEvaluationDeptBusinessAssessmentService extends IService<EvaluationDeptBusinessAssessment> {
 
-	IPage<EvaluationDeptBusinessAssessment> listPage(Integer pageNum, Integer pageSize, String deptId, String responsibilityCode, String des, String appraisalYear, String stage);
+	IPage<EvaluationDeptBusinessAssessment> listPage(Integer pageNum, Integer pageSize, String deptId, String responsibilityCode, String des, String appraisalYear, String stage, HttpServletRequest request);
 
 	boolean editState(String id, String state, String instId);
 

ims-service/ims-eval/src/main/java/com/ims/eval/service/IEvaluationDeptBusinessPlanService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ims.eval.entity.EvaluationDeptBusinessPlan;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -13,7 +14,7 @@ import java.util.List;
  */
 public interface IEvaluationDeptBusinessPlanService extends IService<EvaluationDeptBusinessPlan> {
 
-	IPage<EvaluationDeptBusinessPlan> listPage(Integer pageNum, Integer pageSize, String deptId, String responsibilityCode, String des, String appraisalYear, String stage);
+	IPage<EvaluationDeptBusinessPlan> listPage(Integer pageNum, Integer pageSize, String deptId, String responsibilityCode, String des, String appraisalYear, String stage, HttpServletRequest request);
 
 	boolean save(EvaluationDeptBusinessPlan evaluationDeptBusinessPlan);
 

ims-service/ims-eval/src/main/java/com/ims/eval/service/IEvaluationDeptRatingService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ims.eval.entity.EvaluationDeptRating;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -17,5 +18,5 @@ public interface IEvaluationDeptRatingService extends IService<EvaluationDeptRat
 
 	boolean saveOrUpdate(EvaluationDeptRating evaluationDeptRating);
 
-	List<EvaluationDeptRating> list(String deptId, String deptName, String annual);
+	List<EvaluationDeptRating> list(String deptId, String deptName, String annual, HttpServletRequest request);
 }

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

@@ -19,7 +19,9 @@ import com.ims.eval.entity.DeptAssessmentDeclarationContent;
 import com.ims.eval.entity.EvaluationDept;
 import com.ims.eval.entity.EvaluationDeptRating;
 import com.ims.eval.entity.dto.request.UserDTO;
+import com.ims.eval.entity.dto.response.MyuserResDTO;
 import com.ims.eval.entity.dto.result.ResultInfo;
+import com.ims.eval.feign.RemoteServiceBuilder;
 import com.ims.eval.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,11 +67,27 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 	@Autowired
 	private ImaConfig imaConfig;
 
+	@Autowired
+	private RemoteServiceBuilder remoteServiceBuilder;
+
 	@Override
-	public IPage<DeptAssessmentDeclaration> listPage(Integer pageNum, Integer pageSize, String deptId, String orderNumber, String deptName, Integer annual, Integer declarationMonth) {
+	public IPage<DeptAssessmentDeclaration> listPage(Integer pageNum, Integer pageSize, String deptId, String orderNumber, String deptName, Integer annual, Integer declarationMonth,HttpServletRequest request) {
+
+
+		String code = request.getHeader("code");
+		JSONObject json = remoteServiceBuilder.getGatewayUrl().getSysUser(code);
+		MyuserResDTO user = JSONObject.parseObject(json.getJSONObject("data").toJSONString(), MyuserResDTO.class);
+
+		user.getDeptOrg().getType();
+
+		if("150".equals(user.getDeptOrg().getType())){
+			deptId = user.getDeptOrg().getParentId();
+		}
 		if ("23031009".equals(deptId)) {//组织人事部
 			deptId = "";
 		}
+
+
 		if (null == pageNum || null == pageSize) {
 			throw new RuntimeException("分页参数为空");
 		}

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

@@ -1,5 +1,6 @@
 package com.ims.eval.service.impl;
 
+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;
@@ -8,11 +9,14 @@ import com.ims.common.utils.StringUtils;
 import com.ims.eval.dao.EvaluationDeptBusinessAssessmentMapper;
 import com.ims.eval.entity.EvaluationDept;
 import com.ims.eval.entity.EvaluationDeptBusinessAssessment;
+import com.ims.eval.entity.dto.response.MyuserResDTO;
+import com.ims.eval.feign.RemoteServiceBuilder;
 import com.ims.eval.service.IEvaluationDeptBusinessAssessmentService;
 import com.ims.eval.service.IEvaluationDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -25,22 +29,36 @@ public class EvaluationDeptBusinessAssessmentServiceImpl extends ServiceImpl<Eva
 
 	@Autowired
 	private IEvaluationDeptService evaluationDeptService;
+	@Autowired
+	private RemoteServiceBuilder remoteServiceBuilder;
 
 	@Override
-	public IPage<EvaluationDeptBusinessAssessment> listPage(Integer pageNum, Integer pageSize, String deptId, String responsibilityCode, String des, String appraisalYear, String stage) {
+	public IPage<EvaluationDeptBusinessAssessment> listPage(Integer pageNum, Integer pageSize, String deptId, String responsibilityCode, String des, String appraisalYear, String stage, HttpServletRequest request) {
 		if (null == pageNum || null == pageSize) {
 			throw new RuntimeException("分页参数为空");
 		}
 		//构造分页构造器
 		Page<EvaluationDeptBusinessAssessment> page = new Page<>(pageNum, pageSize);
 		IPage<EvaluationDeptBusinessAssessment> list = null;
+
+		String code = request.getHeader("code");
+		JSONObject json = remoteServiceBuilder.getGatewayUrl().getSysUser(code);
+		MyuserResDTO user = JSONObject.parseObject(json.getJSONObject("data").toJSONString(), MyuserResDTO.class);
+
+		user.getDeptOrg().getType();
+
+		if("150".equals(user.getDeptOrg().getType())){
+			deptId = user.getDeptOrg().getParentId();
+		}
+
 		if ("23031009".equals(deptId)) {//组织人事部
 			list = baseMapper.selectListPage(page, responsibilityCode, des, appraisalYear, stage);
 		} else {
 			QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
 			qw.lambda().eq(EvaluationDept::getYjzbjhType, "1");
 			List<EvaluationDept> evaluationDeptList = evaluationDeptService.list(qw);
-			EvaluationDept evaluationDept = evaluationDeptList.stream().filter(item -> item.getDeptId().equals(deptId)).findFirst().orElse(null);
+			String finalDeptId = deptId;
+			EvaluationDept evaluationDept = evaluationDeptList.stream().filter(item -> item.getDeptId().equals(finalDeptId)).findFirst().orElse(null);
 			if (evaluationDept != null) {
 				list = baseMapper.selectListPage(page, responsibilityCode, des, appraisalYear, stage);
 			}

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.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;
@@ -12,6 +13,8 @@ import com.ims.eval.dao.EvaluationDeptBusinessPlanMapper;
 import com.ims.eval.entity.EvaluationDept;
 import com.ims.eval.entity.EvaluationDeptBusinessAssessment;
 import com.ims.eval.entity.EvaluationDeptBusinessPlan;
+import com.ims.eval.entity.dto.response.MyuserResDTO;
+import com.ims.eval.feign.RemoteServiceBuilder;
 import com.ims.eval.service.IEvaluationDeptBusinessAssessmentService;
 import com.ims.eval.service.IEvaluationDeptBusinessContentService;
 import com.ims.eval.service.IEvaluationDeptBusinessPlanService;
@@ -19,6 +22,7 @@ import com.ims.eval.service.IEvaluationDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -38,21 +42,38 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 	@Autowired
 	private IEvaluationDeptService evaluationDeptService;
 
+	@Autowired
+	private RemoteServiceBuilder remoteServiceBuilder;
+
 	@Override
-	public IPage<EvaluationDeptBusinessPlan> listPage(Integer pageNum, Integer pageSize, String deptId, String responsibilityCode, String des, String appraisalYear, String stage) {
+	public IPage<EvaluationDeptBusinessPlan> listPage(Integer pageNum, Integer pageSize, String deptId, String responsibilityCode, String des, String appraisalYear, String stage, HttpServletRequest request) {
 		if (null == pageNum || null == pageSize) {
 			throw new RuntimeException("分页参数为空");
 		}
 		//构造分页构造器
 		Page<EvaluationDeptBusinessPlan> page = new Page<>(pageNum, pageSize);
 		IPage<EvaluationDeptBusinessPlan> list = null;
+
+		String code = request.getHeader("code");
+		JSONObject json = remoteServiceBuilder.getGatewayUrl().getSysUser(code);
+		MyuserResDTO user = JSONObject.parseObject(json.getJSONObject("data").toJSONString(), MyuserResDTO.class);
+
+		user.getDeptOrg().getType();
+
+		if("150".equals(user.getDeptOrg().getType())){
+			deptId = user.getDeptOrg().getParentId();
+		}
+
+
+
 		if ("23031009".equals(deptId)) {//组织人事部
 			list = baseMapper.selectListPage(page, responsibilityCode, des, appraisalYear, stage);
 		} else {
 			QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
 			qw.lambda().eq(EvaluationDept::getYjzbjhType, "1");
 			List<EvaluationDept> evaluationDeptList = evaluationDeptService.list(qw);
-			EvaluationDept evaluationDept = evaluationDeptList.stream().filter(item -> item.getDeptId().equals(deptId)).findFirst().orElse(null);
+			String finalDeptId = deptId;
+			EvaluationDept evaluationDept = evaluationDeptList.stream().filter(item -> item.getDeptId().equals(finalDeptId)).findFirst().orElse(null);
 			if (evaluationDept != null) {
 				list = baseMapper.selectListPage(page, responsibilityCode, des, appraisalYear, stage);
 			}

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

@@ -2,6 +2,7 @@ package com.ims.eval.service.impl;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
+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;
@@ -9,9 +10,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.dao.EvaluationDeptRatingMapper;
 import com.ims.eval.entity.EvaluationDeptRating;
+import com.ims.eval.entity.dto.response.MyuserResDTO;
+import com.ims.eval.feign.RemoteServiceBuilder;
 import com.ims.eval.service.IEvaluationDeptRatingService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -22,6 +27,10 @@ import java.util.List;
 @Service
 public class EvaluationDeptRatingServiceImpl extends ServiceImpl<EvaluationDeptRatingMapper, EvaluationDeptRating> implements IEvaluationDeptRatingService {
 
+
+	@Autowired
+	private RemoteServiceBuilder remoteServiceBuilder;
+
 	@Override
 	public IPage<EvaluationDeptRating> listPage(Integer pageNum, Integer pageSize, String deptId, String deptName, String annual) {
 		if ("23031009".equals(deptId)) {//组织人事部
@@ -130,7 +139,18 @@ public class EvaluationDeptRatingServiceImpl extends ServiceImpl<EvaluationDeptR
 	}
 
 	@Override
-	public List<EvaluationDeptRating> list(String deptId, String deptName, String annual) {
+	public List<EvaluationDeptRating> list(String deptId, String deptName, String annual, HttpServletRequest request) {
+
+		String code = request.getHeader("code");
+		JSONObject json = remoteServiceBuilder.getGatewayUrl().getSysUser(code);
+		MyuserResDTO user = JSONObject.parseObject(json.getJSONObject("data").toJSONString(), MyuserResDTO.class);
+
+		user.getDeptOrg().getType();
+
+		if("150".equals(user.getDeptOrg().getType())){
+			deptId = user.getDeptOrg().getParentId();
+		}
+
 		if ("23031009".equals(deptId)) {//组织人事部
 			deptId = "";
 		}