修改业绩指标计划问题

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

@@ -84,7 +84,7 @@ public class DepartmentAllocationController {
 	public R listAll() {
 		QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
 		qw.lambda().eq(EvaluationDept::getJxjgkhsbType, "1");
-		List<EvaluationDept> list = evaluationDeptService.list();
+		List<EvaluationDept> list = evaluationDeptService.list(qw);
 		return R.ok().data(list);
 	}
 

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

@@ -1,7 +1,9 @@
 package com.ims.eval.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.EvaluationDept;
 import com.ims.eval.entity.EvaluationDeptBusinessAssessment;
 import com.ims.eval.entity.EvaluationDeptBusinessContent;
 import com.ims.eval.entity.custom.Path;
@@ -9,6 +11,7 @@ import com.ims.eval.entity.dto.request.DeptDTO;
 import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.service.IEvaluationDeptBusinessAssessmentService;
 import com.ims.eval.service.IEvaluationDeptBusinessContentService;
+import com.ims.eval.service.IEvaluationDeptService;
 import com.ims.eval.util.ExcelUtil;
 import com.ims.eval.util.WordUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -43,6 +46,9 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 	@Autowired
 	private IEvaluationDeptBusinessContentService evaluationDeptBusinessContentService;
 
+	@Autowired
+	private IEvaluationDeptService evaluationDeptService;
+
 	/**
 	 * 部门考评业务列表信息（分页）
 	 *
@@ -87,14 +93,15 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 	public R generateReport(@PathVariable("id") String id) throws Exception {
 		Map<String, Object> dataMap = new HashMap<>();
 		EvaluationDeptBusinessAssessment evaluationDeptBusinessAssessment = evaluationDeptBusinessAssessmentService.getById(id);
-		String[] deptIds = evaluationDeptBusinessAssessment.getDeptId().split(",");
-		String[] deptNames = evaluationDeptBusinessAssessment.getDeptName().split(",");
 		List<DeptDTO> deptList = new ArrayList<>();
-		for (int i = 0; i < deptIds.length; i++) {
+		QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
+		qw.lambda().eq(EvaluationDept::getYjzbjhType, "1");
+		List<EvaluationDept> evaluationDeptList = evaluationDeptService.list(qw);
+		for (EvaluationDept evaluationDept : evaluationDeptList) {
 			DeptDTO dept = new DeptDTO();
-			dept.setDeptId(deptIds[i]);
-			dept.setDeptName(deptNames[i]);
-			List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = evaluationDeptBusinessContentService.selectEvaluationDeptBusinessContentListByBusinessPlanId(id, deptIds[i]);
+			dept.setDeptId(evaluationDept.getDeptId());
+			dept.setDeptName(evaluationDept.getDeptName());
+			List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = evaluationDeptBusinessContentService.selectEvaluationDeptBusinessContentListByBusinessPlanId(id, evaluationDept.getDeptId());
 			dept.setList(evaluationDeptBusinessContentList);
 			deptList.add(dept);
 		}

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

@@ -115,7 +115,9 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	 */
 	@GetMapping(value = "/verifyDept")
 	public R verifyDept() {
-		List<EvaluationDept> list = evaluationDeptService.list();
+		QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
+		qw.lambda().eq(EvaluationDept::getYjzbjhType, "1");
+		List<EvaluationDept> list = evaluationDeptService.list(qw);
 		int count = list.size();
 		return R.ok().data(count);
 	}
@@ -222,13 +224,15 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	 * @param id 主键
 	 * @return 结果
 	 */
-	@GetMapping(value = "/delete/{id}")
-	public R delete(@PathVariable String id) {
+	@GetMapping(value = "/delete/{id}/{deptId}")
+	public R delete(@PathVariable String id, @PathVariable String deptId) {
 		try {
 			EvaluationDeptBusinessContent evaluationDeptBusinessContent = evaluationDeptBusinessContentService.getById(id);
 			if (null != evaluationDeptBusinessContent) {
-				if ("23031009".equals(evaluationDeptBusinessContent.getCreateDept())) {
-					return R.customError("没有删除权限，删除失败！");
+				if ("23031009".equals(evaluationDeptBusinessContent.getCreateDept())) {//组织人事部添加
+					if (!"23031009".equals(deptId)) {//非组织人事部
+						return R.customError("没有删除权限，删除失败！");
+					}
 				}
 			}
 			boolean b = evaluationDeptBusinessContentService.removeById(id);
@@ -245,33 +249,21 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	/**
 	 * 详情-部门数据
 	 *
-	 * @param id     业务主键
 	 * @param deptId 当前登录人部门主键
 	 * @return 结果
 	 */
 	@GetMapping(value = "/detailDeptData")
-	public R detailDeptData(@RequestParam(value = "id") String id,
-							@RequestParam(value = "deptId") String deptId) {
+	public R detailDeptData(@RequestParam(value = "deptId") String deptId) {
 		Map<String, String> map = new HashMap<>();
-		EvaluationDeptBusinessPlan evaluationDeptBusinessPlan = evaluationDeptBusinessPlanService.getById(id);
-		if (null != evaluationDeptBusinessPlan) {
-			if (!"".equals(evaluationDeptBusinessPlan.getDeptId()) && !"".equals(evaluationDeptBusinessPlan.getDeptName())) {
-				String[] deptIds = evaluationDeptBusinessPlan.getDeptId().split(",");
-				String[] deptNames = evaluationDeptBusinessPlan.getDeptName().split(",");
-				if ("23031009".equals(deptId)) {//组织人事部
-					if (deptIds.length == deptNames.length) {
-						for (int i = 0; i < deptIds.length; i++) {
-							map.put(deptIds[i], deptNames[i]);
-						}
-					}
-				} else {
-					if (deptIds.length == deptNames.length) {
-						for (int i = 0; i < deptIds.length; i++) {
-							if (deptId.equals(deptIds[i])) {
-								map.put(deptIds[i], deptNames[i]);
-							}
-						}
-					}
+		QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
+		qw.lambda().eq(EvaluationDept::getYjzbjhType, "1");
+		List<EvaluationDept> evaluationDeptList = evaluationDeptService.list(qw);
+		for (EvaluationDept evaluationDept : evaluationDeptList) {
+			if ("23031009".equals(deptId)) {//组织人事部
+				map.put(evaluationDept.getDeptId(), evaluationDept.getDeptName());
+			} else {
+				if (deptId.equals(evaluationDept.getDeptId())) {
+					map.put(evaluationDept.getDeptId(), evaluationDept.getDeptName());
 				}
 			}
 		}
@@ -359,14 +351,15 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	public R generateReport(@PathVariable("id") String id) throws Exception {
 		Map<String, Object> dataMap = new HashMap<>();
 		EvaluationDeptBusinessPlan evaluationDeptBusinessPlan = evaluationDeptBusinessPlanService.getById(id);
-		String[] deptIds = evaluationDeptBusinessPlan.getDeptId().split(",");
-		String[] deptNames = evaluationDeptBusinessPlan.getDeptName().split(",");
 		List<DeptDTO> deptList = new ArrayList<>();
-		for (int i = 0; i < deptIds.length; i++) {
+		QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
+		qw.lambda().eq(EvaluationDept::getYjzbjhType, "1");
+		List<EvaluationDept> evaluationDeptList = evaluationDeptService.list(qw);
+		for (EvaluationDept evaluationDept : evaluationDeptList) {
 			DeptDTO dept = new DeptDTO();
-			dept.setDeptId(deptIds[i]);
-			dept.setDeptName(deptNames[i]);
-			List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = evaluationDeptBusinessContentService.selectEvaluationDeptBusinessContentListByBusinessPlanId(id, deptIds[i]);
+			dept.setDeptId(evaluationDept.getDeptId());
+			dept.setDeptName(evaluationDept.getDeptName());
+			List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = evaluationDeptBusinessContentService.selectEvaluationDeptBusinessContentListByBusinessPlanId(id, evaluationDept.getDeptId());
 			if (evaluationDeptBusinessContentList.size() > 0) {
 				dept.setEvaluationDeptBusinessContent(evaluationDeptBusinessContentList.get(0));
 				if (evaluationDeptBusinessContentList.size() > 1) {

ims-service/ims-eval/src/main/java/com/ims/eval/dao/EvaluationDeptBusinessAssessmentMapper.java

@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface EvaluationDeptBusinessAssessmentMapper extends BaseMapper<EvaluationDeptBusinessAssessment> {
 
-	IPage<EvaluationDeptBusinessAssessment> selectListPage(Page<EvaluationDeptBusinessAssessment> page, @Param("deptId") String deptId, @Param("responsibilityCode") String responsibilityCode, @Param("des") String des, @Param("appraisalYear") String appraisalYear, @Param("stage") String stage);
+	IPage<EvaluationDeptBusinessAssessment> selectListPage(Page<EvaluationDeptBusinessAssessment> page, @Param("responsibilityCode") String responsibilityCode, @Param("des") String des, @Param("appraisalYear") String appraisalYear, @Param("stage") String stage);
 
 }

ims-service/ims-eval/src/main/java/com/ims/eval/dao/EvaluationDeptBusinessPlanMapper.java

@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface EvaluationDeptBusinessPlanMapper extends BaseMapper<EvaluationDeptBusinessPlan> {
 
-	IPage<EvaluationDeptBusinessPlan> selectListPage(Page<EvaluationDeptBusinessPlan> page, @Param("deptId") String deptId, @Param("responsibilityCode") String responsibilityCode, @Param("des") String des, @Param("appraisalYear") String appraisalYear, @Param("stage") String stage);
+	IPage<EvaluationDeptBusinessPlan> selectListPage(Page<EvaluationDeptBusinessPlan> page, @Param("responsibilityCode") String responsibilityCode, @Param("des") String des, @Param("appraisalYear") String appraisalYear, @Param("stage") String stage);
 
 }

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

@@ -28,16 +28,6 @@ public class EvaluationDeptBusinessAssessment extends Model {
 	private String responsibilityCode;
 
 	/**
-	 * 考评部门主键
-	 */
-	private String deptId;
-
-	/**
-	 * 考评部门名称
-	 */
-	private String deptName;
-
-	/**
 	 * 考评年度
 	 */
 	private String appraisalYear;

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

@@ -29,16 +29,6 @@ public class EvaluationDeptBusinessPlan extends Model {
 	private String responsibilityCode;
 
 	/**
-	 * 考评部门主键
-	 */
-	private String deptId;
-
-	/**
-	 * 考评部门名称
-	 */
-	private String deptName;
-
-	/**
 	 * 考评年度
 	 */
 	private String appraisalYear;

ims-service/ims-eval/src/main/java/com/ims/eval/schedule/EvaluationWarningSchedule.java

@@ -1,17 +1,11 @@
 package com.ims.eval.schedule;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ims.common.utils.DateUtils;
 import com.ims.common.utils.FormulaUtils;
 import com.ims.common.utils.StringUtils;
-import com.ims.eval.entity.EvaluationDeptBusinessAssessment;
-import com.ims.eval.entity.EvaluationWarningInfo;
-import com.ims.eval.entity.EvaluationWarningRule;
-import com.ims.eval.entity.OrganizationEvaluation;
-import com.ims.eval.service.IEvaluationDeptBusinessAssessmentService;
-import com.ims.eval.service.IEvaluationWarningInfoService;
-import com.ims.eval.service.IEvaluationWarningRuleService;
-import com.ims.eval.service.IOrganizationEvaluationService;
+import com.ims.eval.entity.*;
+import com.ims.eval.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -36,6 +30,9 @@ public class EvaluationWarningSchedule {
 	@Autowired
 	private IEvaluationDeptBusinessAssessmentService assessmentService;
 
+	@Autowired
+	private IEvaluationDeptService deptService;
+
 
 	//年度考评
 	private final String TYPE_NDKP = "NDKP";
@@ -44,7 +41,7 @@ public class EvaluationWarningSchedule {
 	//月度考评
 	private final String TYPE_YDKP = "YDKP";
 	//触发时间属于当前季度的第几个月，1,4,7,10表示每个季度的第一个月，2,5,8,11表示每个季度的第2个月，3,6,9,12表示每个季度的第三个月
-	private final int[][] SEASON = new int[][]{{1,4,7,10},{2,5,8,11},{3,6,9,12}};
+	private final int[][] SEASON = new int[][]{{1, 4, 7, 10}, {2, 5, 8, 11}, {3, 6, 9, 12}};
 
 
 	/**
@@ -52,7 +49,7 @@ public class EvaluationWarningSchedule {
 	 */
 	@Scheduled(cron = "0 0 23 * * ?") // cron表达式： 每天23点触发
 //	@Scheduled(cron="0/50 * * * * ?")
-	public void warningRuleResolveNDKP(){
+	public void warningRuleResolveNDKP() {
 		List<EvaluationWarningRule> list = warningRuleService.warningRuleList(null, null, TYPE_NDKP, true);
 		List<Map<String, Object>> companys = evaluationService.getCompanyWarning(TYPE_NDKP);
 		if (list == null || list.size() == 0 || companys == null || companys.size() == 0) {
@@ -67,7 +64,7 @@ public class EvaluationWarningSchedule {
 	 */
 	@Scheduled(cron = "0 0 23 * * ?") // cron表达式： 每天23点触发
 //	@Scheduled(cron="0/50 * * * * ?")
-	public void warningRuleResolveJDKP(){
+	public void warningRuleResolveJDKP() {
 		List<EvaluationWarningRule> list = warningRuleService.warningRuleList(null, null, TYPE_JDKP, true);
 		List<Map<String, Object>> companys = evaluationService.getCompanyWarning(TYPE_JDKP);
 		if (list == null || list.size() == 0) {
@@ -82,7 +79,7 @@ public class EvaluationWarningSchedule {
 	 */
 	@Scheduled(cron = "0 0 23 * * ?") // cron表达式： 每天23点触发
 //	@Scheduled(cron="0/50 * * * * ?")
-	public void warningRuleResolveYDKP(){
+	public void warningRuleResolveYDKP() {
 		List<EvaluationWarningRule> list = warningRuleService.warningRuleList(null, null, TYPE_YDKP, true);
 		List<Map<String, Object>> companys = evaluationService.getCompanyWarning(TYPE_YDKP);
 		if (list == null || list.size() == 0) {
@@ -93,13 +90,12 @@ public class EvaluationWarningSchedule {
 	}
 
 
-
 	/**
 	 * 单位年度考评
 	 */
 	@Scheduled(cron = "0 0 0 1 4 ?") // cron表达式： 每年4月1号0点触发
 //	@Scheduled(cron="0/50 * * * * ?")
-	public void warningEvaluationNDKP(){
+	public void warningEvaluationNDKP() {
 		Calendar cal = Calendar.getInstance();
 		String year = String.valueOf(cal.get(Calendar.YEAR));
 		List<OrganizationEvaluation> list = evaluationService.list(null, TYPE_NDKP, year, null);
@@ -112,7 +108,7 @@ public class EvaluationWarningSchedule {
 			saveWarningInfo(null, null, title, content, null, null, null, company);
 		}
 		Optional<OrganizationEvaluation> optional = list.stream().filter(item -> item.getStage().contains("未启动")).findFirst();
-		if (optional.isPresent()){
+		if (optional.isPresent()) {
 			content = "单位年度考评流程未启动";
 			company = StringUtils.isNotEmpty(optional.get().getCreateOrgName()) ? optional.get().getCreateOrgName() : company;
 			saveWarningInfo(null, null, title, content, null, null, null, company);
@@ -124,7 +120,7 @@ public class EvaluationWarningSchedule {
 	 */
 	@Scheduled(cron = "0 5 20 1 1,4,7,10 ?") // cron表达式： 每个季度的第一个月的20号的5执行一次
 //	@Scheduled(cron="0/50 * * * * ?")
-	public void warningEvaluationJDKP(){
+	public void warningEvaluationJDKP() {
 		Calendar cal = Calendar.getInstance();
 		String year = String.valueOf(cal.get(Calendar.YEAR));
 		String season = String.valueOf(DateUtils.getSeason(cal.getTime()));
@@ -138,7 +134,7 @@ public class EvaluationWarningSchedule {
 			saveWarningInfo(null, null, title, content, null, null, null, company);
 		}
 		Optional<OrganizationEvaluation> optional = list.stream().filter(item -> item.getStage().contains("未启动")).findFirst();
-		if (optional.isPresent()){
+		if (optional.isPresent()) {
 			content = "单位季度考评流程未启动";
 			company = StringUtils.isNotEmpty(optional.get().getCreateOrgName()) ? optional.get().getCreateOrgName() : company;
 			saveWarningInfo(null, null, title, content, null, null, null, company);
@@ -150,7 +146,7 @@ public class EvaluationWarningSchedule {
 	 */
 	@Scheduled(cron = "0 0 7 5 * ?") // cron表达式： 每月5日上午7点触发
 //	@Scheduled(cron="0/50 * * * * ?")
-	public void warningEvaluationYDKP(){
+	public void warningEvaluationYDKP() {
 		Calendar cal = Calendar.getInstance();
 		String year = String.valueOf(cal.get(Calendar.YEAR));
 		String month = String.valueOf(cal.get(Calendar.MONTH) + 1);
@@ -164,7 +160,7 @@ public class EvaluationWarningSchedule {
 			saveWarningInfo(null, null, title, content, null, null, null, company);
 		}
 		Optional<OrganizationEvaluation> optional = list.stream().filter(item -> item.getStage().contains("未启动")).findFirst();
-		if (optional.isPresent()){
+		if (optional.isPresent()) {
 			content = "单位季度考评流程未启动";
 			company = StringUtils.isNotEmpty(optional.get().getCreateOrgName()) ? optional.get().getCreateOrgName() : company;
 			saveWarningInfo(null, null, title, content, null, null, null, company);
@@ -177,7 +173,7 @@ public class EvaluationWarningSchedule {
 	 */
 	@Scheduled(cron = "0 0 0 1 4 ?") // cron表达式： 每年4月1号0点触发
 //	@Scheduled(cron="0/50 * * * * ?")
-	public void warningEvaluationDeptYDKP(){
+	public void warningEvaluationDeptYDKP() {
 		Calendar cal = Calendar.getInstance();
 		String year = String.valueOf(cal.get(Calendar.YEAR));
 		List<EvaluationDeptBusinessAssessment> list = assessmentService.list(year);
@@ -190,19 +186,25 @@ public class EvaluationWarningSchedule {
 			saveWarningInfo(null, null, title, content, null, null, null, company);
 		}
 		Optional<EvaluationDeptBusinessAssessment> optional = list.stream().filter(item -> item.getStage().contains("未启动")).findFirst();
-		if (optional.isPresent()){
+		if (optional.isPresent()) {
 			content = "部门年度考评计划流程未启动";
-			company = optional.isPresent() ? optional.get().getDeptName() : company;
+			QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
+			qw.lambda().eq(EvaluationDept::getYjzbjhType, "1");
+			List<EvaluationDept> evaluationDeptList = deptService.list(qw);
+			StringBuilder deptName = new StringBuilder();
+			for (EvaluationDept evaluationDept : evaluationDeptList) {
+				deptName.append(evaluationDept.getDeptName()).append(",");
+			}
+			company = optional.isPresent() ? deptName.toString().substring(0, deptName.toString().length() - 1) : company;
 			saveWarningInfo(null, null, title, content, null, null, null, company);
 		}
 	}
 
 
-
-	private void calculate(List<EvaluationWarningRule> rules, List<Map<String, Object>> companys, String type){
+	private void calculate(List<EvaluationWarningRule> rules, List<Map<String, Object>> companys, String type) {
 		Map<Object, List<Map<String, Object>>> collect = companys.stream().collect(Collectors.groupingBy(m -> m.get("indicator_id")));
-		for (EvaluationWarningRule rule : rules){
-			if (!isFocus(rule, type)){
+		for (EvaluationWarningRule rule : rules) {
+			if (!isFocus(rule, type)) {
 				continue;
 			}
 			String company = "";
@@ -210,8 +212,8 @@ public class EvaluationWarningSchedule {
 			String completeValue = null;
 			String expression = rule.getExpression();
 			List<Map<String, Object>> list = collect.get(rule.getIndicatorId());
-			for (Map<String, Object> mp : list){
-				if (expression.contains("[" + mp.get("option_code") + "]")){
+			for (Map<String, Object> mp : list) {
+				if (expression.contains("[" + mp.get("option_code") + "]")) {
 					//替换表达式数值
 					expression.replace("[" + mp.get("option_code") + "]", String.valueOf(mp.get("quantified_value")));
 				}
@@ -223,14 +225,14 @@ public class EvaluationWarningSchedule {
 			 * 0：未报警  1：报警
 			 */
 			double v = FormulaUtils.calculateFormula(expression);
-			if (v >= 1){
+			if (v >= 1) {
 				saveWarningInfo(rule.getBinSection(), rule.getIndicatorId(), rule.getRuleName(), rule.getRuleDes(), rule.getId(), targetValue, completeValue, company);
 			}
 		}
 	}
 
-	private void saveWarningInfo(String binSection, String indicatorId, String title,  String content,
-								 String ruleId, String targetValue, String completeValue, String company){
+	private void saveWarningInfo(String binSection, String indicatorId, String title, String content,
+								 String ruleId, String targetValue, String completeValue, String company) {
 		EvaluationWarningInfo info = new EvaluationWarningInfo();
 		info.setBinSection(binSection);
 		info.setIndicatorId(indicatorId);
@@ -245,16 +247,16 @@ public class EvaluationWarningSchedule {
 	}
 
 
-	private boolean isFocus(EvaluationWarningRule rule, String type){
+	private boolean isFocus(EvaluationWarningRule rule, String type) {
 		Calendar cal = Calendar.getInstance();
 		int nowMonth = cal.get(Calendar.MONTH) + 1;
 		int nowDay = cal.get(Calendar.DAY_OF_MONTH);
 		cal.setTime(rule.getCronTime());
-		switch (type){
+		switch (type) {
 			case TYPE_NDKP:
 				int month = cal.get(Calendar.MONTH) + 1;
 				int day = cal.get(Calendar.DAY_OF_MONTH);
-				if (nowMonth == month && nowDay == day){
+				if (nowMonth == month && nowDay == day) {
 					return true;
 				}
 				break;
@@ -262,16 +264,16 @@ public class EvaluationWarningSchedule {
 				int day2 = cal.get(Calendar.DAY_OF_MONTH);
 				int season = DateUtils.getSeason(cal.getTime());
 				int index = season % 3;
-				int[] arr = SEASON[index-1];
-				for (int i = 0; i < arr.length; i++){
-					if (nowMonth == arr[i] && nowDay == day2){
+				int[] arr = SEASON[index - 1];
+				for (int i = 0; i < arr.length; i++) {
+					if (nowMonth == arr[i] && nowDay == day2) {
 						return true;
 					}
 				}
 				break;
 			case TYPE_YDKP:
 				int day3 = cal.get(Calendar.DAY_OF_MONTH);
-				if (nowDay == day3){
+				if (nowDay == day3) {
 					return true;
 				}
 				break;

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

@@ -6,8 +6,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.service.IEvaluationDeptBusinessAssessmentService;
+import com.ims.eval.service.IEvaluationDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -20,17 +23,29 @@ import java.util.List;
 @Service
 public class EvaluationDeptBusinessAssessmentServiceImpl extends ServiceImpl<EvaluationDeptBusinessAssessmentMapper, EvaluationDeptBusinessAssessment> implements IEvaluationDeptBusinessAssessmentService {
 
+	@Autowired
+	private IEvaluationDeptService evaluationDeptService;
+
 	@Override
 	public IPage<EvaluationDeptBusinessAssessment> listPage(Integer pageNum, Integer pageSize, String deptId, String responsibilityCode, String des, String appraisalYear, String stage) {
-		if ("23031009".equals(deptId)){//组织人事部
-			deptId = "";
-		}
 		if (null == pageNum || null == pageSize) {
 			throw new RuntimeException("分页参数为空");
 		}
 		//构造分页构造器
 		Page<EvaluationDeptBusinessAssessment> page = new Page<>(pageNum, pageSize);
-		return baseMapper.selectListPage(page, deptId, responsibilityCode, des, appraisalYear, stage);
+		IPage<EvaluationDeptBusinessAssessment> list = null;
+		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);
+			if (evaluationDept != null) {
+				list = baseMapper.selectListPage(page, responsibilityCode, des, appraisalYear, stage);
+			}
+		}
+		return list;
 	}
 
 	@Override

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

@@ -40,15 +40,24 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 
 	@Override
 	public IPage<EvaluationDeptBusinessPlan> listPage(Integer pageNum, Integer pageSize, String deptId, String responsibilityCode, String des, String appraisalYear, String stage) {
-		if ("23031009".equals(deptId)) {//组织人事部
-			deptId = "";
-		}
 		if (null == pageNum || null == pageSize) {
 			throw new RuntimeException("分页参数为空");
 		}
 		//构造分页构造器
 		Page<EvaluationDeptBusinessPlan> page = new Page<>(pageNum, pageSize);
-		return baseMapper.selectListPage(page, deptId, responsibilityCode, des, appraisalYear, stage);
+		IPage<EvaluationDeptBusinessPlan> list = null;
+		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);
+			if (evaluationDept != null) {
+				list = baseMapper.selectListPage(page, responsibilityCode, des, appraisalYear, stage);
+			}
+		}
+		return list;
 	}
 
 	@Override
@@ -58,21 +67,6 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 		evaluationDeptBusinessPlan.setDocumentStatus("有效");
 		evaluationDeptBusinessPlan.setStage("流程未启动");
 		evaluationDeptBusinessPlan.setCreateTime(DateUtil.date());
-		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();
-			for (EvaluationDept evaluationDept : evaluationDeptList) {
-				deptIds.append(evaluationDept.getDeptId()).append(",");
-				deptNames.append(evaluationDept.getDeptName()).append(",");
-			}
-			evaluationDeptBusinessPlan.setDeptId(deptIds.substring(0, deptIds.toString().length() - 1));
-			evaluationDeptBusinessPlan.setDeptName(deptNames.substring(0, deptNames.toString().length() - 1));
-		} else {
-			return false;
-		}
 		return super.save(evaluationDeptBusinessPlan);
 	}
 
@@ -85,8 +79,6 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 				EvaluationDeptBusinessAssessment evaluationDeptBusinessAssessment = new EvaluationDeptBusinessAssessment();
 				evaluationDeptBusinessAssessment.setId(evaluationDeptBusinessPlan.getId());
 				evaluationDeptBusinessAssessment.setResponsibilityCode(evaluationDeptBusinessPlan.getResponsibilityCode());
-				evaluationDeptBusinessAssessment.setDeptId(evaluationDeptBusinessPlan.getDeptId());
-				evaluationDeptBusinessAssessment.setDeptName(evaluationDeptBusinessPlan.getDeptName());
 				evaluationDeptBusinessAssessment.setAppraisalYear(evaluationDeptBusinessPlan.getAppraisalYear());
 				evaluationDeptBusinessAssessment.setEvaluationCategory(evaluationDeptBusinessPlan.getEvaluationCategory());
 				evaluationDeptBusinessAssessment.setBusinessClass(evaluationDeptBusinessPlan.getBusinessClass());
@@ -100,9 +92,6 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 				evaluationDeptBusinessAssessment.setFinalReviewPeopleTime(evaluationDeptBusinessPlan.getFinalReviewPeopleTime());
 				evaluationDeptBusinessAssessment.setFinalReviewOpinion(evaluationDeptBusinessPlan.getFinalReviewOpinion());
 				evaluationDeptBusinessAssessment.setCreateTime(DateUtil.date());
-				//evaluationDeptBusinessAssessment.setCreateBy(evaluationDeptBusinessPlan.getCreateBy());
-				//evaluationDeptBusinessAssessment.setUpdateTime(evaluationDeptBusinessPlan.getUpdateTime());
-				//evaluationDeptBusinessAssessment.setUpdateBy(evaluationDeptBusinessPlan.getUpdateBy());
 				evaluationDeptBusinessAssessment.setRemark(evaluationDeptBusinessPlan.getRemark());
 				evaluationDeptBusinessAssessmentService.save(evaluationDeptBusinessAssessment);
 			}

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

@@ -6,8 +6,6 @@
     <resultMap id="BaseResultMap" type="com.ims.eval.entity.EvaluationDeptBusinessAssessment">
         <id column="id" property="id"/>
         <result column="responsibility_code" property="responsibilityCode"/>
-        <result column="dept_id" property="deptId"/>
-        <result column="dept_name" property="deptName"/>
         <result column="appraisal_year" property="appraisalYear"/>
         <result column="evaluation_category" property="evaluationCategory"/>
         <result column="business_class" property="businessClass"/>
@@ -33,8 +31,6 @@
     <sql id="selectEvaluationDeptBusinessAssessmentVo">
         select id,
                responsibility_code,
-               dept_id,
-               dept_name,
                appraisal_year,
                evaluation_category,
                business_class,
@@ -60,9 +56,6 @@
     <select id="selectListPage" resultType="com.ims.eval.entity.EvaluationDeptBusinessAssessment">
         <include refid="selectEvaluationDeptBusinessAssessmentVo"/>
         <where>
-            <if test="deptId != null and deptId != ''">
-                AND dept_id like CONCAT('%',#{deptId},'%')
-            </if>
             <if test="responsibilityCode != null and responsibilityCode != ''">
                 AND responsibility_code like CONCAT('%',#{responsibilityCode},'%')
             </if>

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

@@ -6,8 +6,6 @@
     <resultMap id="BaseResultMap" type="com.ims.eval.entity.EvaluationDeptBusinessPlan">
         <id column="id" property="id"/>
         <result column="responsibility_code" property="responsibilityCode"/>
-        <result column="dept_id" property="deptId"/>
-        <result column="dept_name" property="deptName"/>
         <result column="appraisal_year" property="appraisalYear"/>
         <result column="evaluation_category" property="evaluationCategory"/>
         <result column="business_class" property="businessClass"/>
@@ -33,8 +31,6 @@
     <sql id="selectEvaluationDeptBusinessPlanVo">
         select id,
                responsibility_code,
-               dept_id,
-               dept_name,
                appraisal_year,
                evaluation_category,
                business_class,
@@ -60,9 +56,6 @@
     <select id="selectListPage" resultType="com.ims.eval.entity.EvaluationDeptBusinessPlan">
         <include refid="selectEvaluationDeptBusinessPlanVo"/>
         <where>
-            <if test="deptId != null and deptId != ''">
-                AND dept_id like CONCAT('%',#{deptId},'%')
-            </if>
             <if test="responsibilityCode != null and responsibilityCode != ''">
                 AND responsibility_code like CONCAT('%',#{responsibilityCode},'%')
             </if>