删除通过信息先删除上传的文档

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

@@ -160,28 +160,24 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 
 	@Override
 	public boolean removeByIds(List<String> ids) {
-		boolean b = false;
 		for (String id : ids) {
 			DeptAssessmentDeclaration deptAssessmentDeclaration = super.getById(id);
-			if ("流程未启动".equals(deptAssessmentDeclaration.getStage()) || "流程已结束".equals(deptAssessmentDeclaration.getStage())) {
+			if ("流程未启动".equals(deptAssessmentDeclaration.getStage())) {
 				deptAssessmentDeclarationContentService.removeByAssessmentDeclarationId(id);
 				deptAssessmentDeclarationCompleteService.removeByAssessmentDeclarationId(id);
 				super.removeById(id);
-				b = true;
-			} else {
-				return b;
 			}
 		}
-		return b;
+		return true;
 	}
 
 	@Override
 	public boolean editState(String id, String state, String instId) {
 		DeptAssessmentDeclaration deptAssessmentDeclaration = baseMapper.selectById(id);
 		if (StringUtils.isNotEmpty(state)) {
-			/*if ("组织人事部审批".equals(state)){
+			if ("组织人事部审核".equals(state)) {
 				state = "流程已结束";
-			}*/
+			}
 			deptAssessmentDeclaration.setStage(state);
 		}
 		if (StringUtils.isNotEmpty(instId)) {
@@ -194,7 +190,7 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 				qw.lambda().eq(EvaluationDeptRating::getDeptId, deptAssessmentDeclaration.getDeptId());
 			}
 			if (null != deptAssessmentDeclaration.getAnnual()) {
-				qw.lambda().eq(EvaluationDeptRating::getAnnual, deptAssessmentDeclaration.getAnnual());
+				qw.lambda().eq(EvaluationDeptRating::getAnnual, String.valueOf(deptAssessmentDeclaration.getAnnual()));
 			}
 			EvaluationDeptRating evaluationDeptRating = evaluationDeptRatingService.getOne(qw);
 			if (null != evaluationDeptRating) {
@@ -227,48 +223,37 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 		if (1 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setJan(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setJanContent(deptAssessmentDeclaration.getDeclarationReason());
-		}
-		if (2 == deptAssessmentDeclaration.getDeclarationMonth()) {
+		} else if (2 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setFeb(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setFebContent(deptAssessmentDeclaration.getDeclarationReason());
-		}
-		if (3 == deptAssessmentDeclaration.getDeclarationMonth()) {
+		} else if (3 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setMar(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setMarContent(deptAssessmentDeclaration.getDeclarationReason());
-		}
-		if (4 == deptAssessmentDeclaration.getDeclarationMonth()) {
+		} else if (4 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setApr(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setAprContent(deptAssessmentDeclaration.getDeclarationReason());
-		}
-		if (5 == deptAssessmentDeclaration.getDeclarationMonth()) {
+		} else if (5 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setMay(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setMayContent(deptAssessmentDeclaration.getDeclarationReason());
-		}
-		if (6 == deptAssessmentDeclaration.getDeclarationMonth()) {
+		} else if (6 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setJun(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setJunContent(deptAssessmentDeclaration.getDeclarationReason());
-		}
-		if (7 == deptAssessmentDeclaration.getDeclarationMonth()) {
+		} else if (7 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setJul(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setJulContent(deptAssessmentDeclaration.getDeclarationReason());
-		}
-		if (8 == deptAssessmentDeclaration.getDeclarationMonth()) {
+		} else if (8 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setAug(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setAugContent(deptAssessmentDeclaration.getDeclarationReason());
-		}
-		if (9 == deptAssessmentDeclaration.getDeclarationMonth()) {
+		} else if (9 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setSep(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setSepContent(deptAssessmentDeclaration.getDeclarationReason());
-		}
-		if (10 == deptAssessmentDeclaration.getDeclarationMonth()) {
+		} else if (10 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setOct(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setOctContent(deptAssessmentDeclaration.getDeclarationReason());
-		}
-		if (11 == deptAssessmentDeclaration.getDeclarationMonth()) {
+		} else if (11 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setNov(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setNovContent(deptAssessmentDeclaration.getDeclarationReason());
-		}
-		if (12 == deptAssessmentDeclaration.getDeclarationMonth()) {
+		} else if (12 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setDece(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setDeceContent(deptAssessmentDeclaration.getDeclarationReason());
 		}

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

@@ -105,20 +105,17 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 
 	@Override
 	public boolean removeByIds(List<String> ids) {
-		boolean b = false;
 		for (String id : ids) {
 			EvaluationDeptBusinessPlan evaluationDeptBusinessPlan = super.getById(id);
-			if ("流程未启动".equals(evaluationDeptBusinessPlan.getStage()) || "流程已结束".equals(evaluationDeptBusinessPlan.getStage())) {
-				b = super.removeById(id);
+			if ("流程未启动".equals(evaluationDeptBusinessPlan.getStage())) {
+				boolean b = super.removeById(id);
 				if (b) {
 					evaluationDeptBusinessAssessmentService.removeById(id);
 					evaluationDeptBusinessContentService.removeByBusinessPlanId(id);
 				}
-			} else {
-				return b;
 			}
 		}
-		return b;
+		return true;
 	}
 
 	@Override