功能完善

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

@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -64,6 +63,7 @@ public class DepartmentAllocationController {
 		if (StringUtils.isNotEmpty(chargePersonName)) {
 			qw.lambda().like(EvaluationDept::getChargePersonName, chargePersonName);
 		}
+		qw.lambda().eq(EvaluationDept::getDelFlag, "1");
 		qw.lambda().orderByAsc(EvaluationDept::getSerialNumber);
 		Page<EvaluationDept> page = new Page<>(pageNum, pageSize);
 		IPage<EvaluationDept> list = evaluationDeptService.page(page, qw);
@@ -79,6 +79,7 @@ public class DepartmentAllocationController {
 	public R listAll() {
 		QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
 		qw.lambda().eq(EvaluationDept::getJxjgkhsbType, "1");
+		qw.lambda().eq(EvaluationDept::getDelFlag, "1");
 		qw.lambda().orderByAsc(EvaluationDept::getSerialNumber);
 		List<EvaluationDept> list = evaluationDeptService.list(qw);
 		return R.ok().data(list);
@@ -106,6 +107,7 @@ public class DepartmentAllocationController {
 					return R.error("部门重复，请重新添加！");
 				}
 			}
+			evaluationDept.setDelFlag("1");
 			boolean b = evaluationDeptService.saveOrUpdate(evaluationDept);
 			if (b) {
 				return R.ok().data(b);
@@ -132,7 +134,7 @@ public class DepartmentAllocationController {
 	}
 
 	/**
-	 * 批量删除考评部门配置信息
+	 * 批量删除考评部门配置信息（假删除）
 	 *
 	 * @param ids 主键s
 	 * @return 结果
@@ -141,9 +143,13 @@ public class DepartmentAllocationController {
 	public R deleteAll(@PathVariable("ids") String ids) {
 		try {
 			String[] strings = ids.split(",");
-			boolean b = evaluationDeptService.removeByIds(Arrays.asList(strings));
-			if (b) {
-				return R.ok().data(b);
+			for (String str : strings){
+				EvaluationDept evaluationDept = evaluationDeptService.getById(str);
+				evaluationDept.setDelFlag("0");
+				evaluationDeptService.updateById(evaluationDept);
+			}
+			if (true) {
+				return R.ok();
 			} else {
 				return R.error("删除失败！");
 			}

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

@@ -181,6 +181,7 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 		if (null == evaluationDeptBusinessAssessment.getDeptId() && null == evaluationDeptBusinessAssessment.getDeptName()) {
 			QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
 			qw.lambda().eq(EvaluationDept::getYjzbjhType, "1");
+			qw.lambda().eq(EvaluationDept::getDelFlag, "1");
 			qw.lambda().orderByAsc(EvaluationDept::getSerialNumber);
 			List<EvaluationDept> evaluationDeptList = evaluationDeptService.list(qw);
 			for (EvaluationDept evaluationDept : evaluationDeptList) {
@@ -219,6 +220,7 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 		if (evaluationDeptBusinessAssessmentList.size() == 1) {
 			QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
 			qw.lambda().eq(EvaluationDept::getYjzbjhType, "1");
+			qw.lambda().eq(EvaluationDept::getDelFlag, "1");
 			qw.lambda().orderByAsc(EvaluationDept::getSerialNumber);
 			List<EvaluationDept> evaluationDeptList = evaluationDeptService.list(qw);
 			for (EvaluationDept evaluationDept : evaluationDeptList) {
@@ -273,6 +275,7 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 		if (evaluationDeptBusinessAssessmentList.size() == 1) {
 			QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
 			qw.lambda().eq(EvaluationDept::getYjzbjhType, "1");
+			qw.lambda().eq(EvaluationDept::getDelFlag, "1");
 			qw.lambda().orderByAsc(EvaluationDept::getSerialNumber);
 			List<EvaluationDept> evaluationDeptList = evaluationDeptService.list(qw);
 			for (EvaluationDept evaluationDept : evaluationDeptList) {

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

@@ -109,6 +109,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 			int x = evaluationDeptBusinessPlanService.count(qw1);
 			QueryWrapper<EvaluationDept> qw2 = new QueryWrapper<>();
 			qw2.lambda().eq(EvaluationDept::getYjzbjhType, "1");
+			qw2.lambda().eq(EvaluationDept::getDelFlag, "1");
 			int count = evaluationDeptService.count(qw2);
 			if (x >= count) {
 				return R.error(evaluationDeptBusinessPlan.getAppraisalYear() + "年度业绩指标已下达完成！");
@@ -133,6 +134,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	public R verifyDept() {
 		QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
 		qw.lambda().eq(EvaluationDept::getYjzbjhType, "1");
+		qw.lambda().eq(EvaluationDept::getDelFlag, "1");
 		List<EvaluationDept> list = evaluationDeptService.list(qw);
 		int count = list.size();
 		return R.ok().data(count);
@@ -283,6 +285,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 		List<DeptDTO> deptList = new ArrayList<>();
 		QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
 		qw.lambda().eq(EvaluationDept::getYjzbjhType, "1");
+		qw.lambda().eq(EvaluationDept::getDelFlag, "1");
 		qw.lambda().orderByAsc(EvaluationDept::getSerialNumber);
 		List<EvaluationDept> evaluationDeptList = evaluationDeptService.list(qw);
 		for (EvaluationDept evaluationDept : evaluationDeptList) {
@@ -403,6 +406,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 		if (null == evaluationDeptBusinessPlan.getDeptId() && null == evaluationDeptBusinessPlan.getDeptName()) {
 			QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
 			qw.lambda().eq(EvaluationDept::getYjzbjhType, "1");
+			qw.lambda().eq(EvaluationDept::getDelFlag, "1");
 			qw.lambda().orderByAsc(EvaluationDept::getSerialNumber);
 			List<EvaluationDept> evaluationDeptList = evaluationDeptService.list(qw);
 			for (EvaluationDept evaluationDept : evaluationDeptList) {
@@ -453,6 +457,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 		if (evaluationDeptBusinessPlanList.size() == 1) {
 			QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
 			qw.lambda().eq(EvaluationDept::getYjzbjhType, "1");
+			qw.lambda().eq(EvaluationDept::getDelFlag, "1");
 			qw.lambda().orderByAsc(EvaluationDept::getSerialNumber);
 			List<EvaluationDept> evaluationDeptList = evaluationDeptService.list(qw);
 			for (EvaluationDept evaluationDept : evaluationDeptList) {
@@ -501,6 +506,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 		if (evaluationDeptBusinessPlanList.size() == 1) {
 			QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
 			qw.lambda().eq(EvaluationDept::getYjzbjhType, "1");
+			qw.lambda().eq(EvaluationDept::getDelFlag, "1");
 			qw.lambda().orderByAsc(EvaluationDept::getSerialNumber);
 			List<EvaluationDept> evaluationDeptList = evaluationDeptService.list(qw);
 			for (EvaluationDept evaluationDept : evaluationDeptList) {

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

@@ -42,4 +42,9 @@ public class EvaluationDept extends Model {
 	//绩效结果考核申报(1是 0否)
 	private String jxjgkhsbType;
 
+	/**
+	 * 删除标志(1存在 0删除)
+	 */
+	private String delFlag;
+
 }

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

@@ -136,6 +136,7 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 				if (StringUtils.isNotEmpty(evaluationDept.getDeptId())) {
 					secondaryDeptQw.lambda().eq(EvaluationDept::getParentId, evaluationDept.getDeptId());
 				}
+				secondaryDeptQw.lambda().eq(EvaluationDept::getDelFlag, "1");
 				List<EvaluationDept> evaluationDeptList = evaluationDeptService.list(secondaryDeptQw);
 				for (EvaluationDept obj : evaluationDeptList) {
 					JSONObject jsonArr = userService.pageList(1, 500, obj.getDeptId(), "", "", "", "", "", request);

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

@@ -345,7 +345,7 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 				}else {
 					//保存到考评报告
 					List<EvaluationScoreCount> scjyScoreCount = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, rule.getId(), null, Arrays.asList("SCJY".split(",")),tag ? bi.getId() :bi.getMemo3());
-					scjyScore = scjyScoreCount.stream().mapToDouble(EvaluationScoreCount::getScore).sum();
+					scjyScore = scjyScoreCount.stream().mapToDouble(EvaluationScoreCount::getScore).sum() / 1.2;
 					reportInfo.setScjyScore(DoubleUtils.keepPrecision(scjyScore, 2));
 
 					//基准风

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

@@ -57,6 +57,7 @@ public class EvaluationDeptBusinessAssessmentServiceImpl extends ServiceImpl<Eva
 		} else {
 			QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
 			qw.lambda().eq(EvaluationDept::getYjzbjhType, "1");
+			qw.lambda().eq(EvaluationDept::getDelFlag, "1");
 			List<EvaluationDept> evaluationDeptList = evaluationDeptService.list(qw);
 			String finalDeptId = deptId;
 			EvaluationDept evaluationDept = evaluationDeptList.stream().filter(item -> item.getDeptId().equals(finalDeptId)).findFirst().orElse(null);

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

@@ -68,6 +68,7 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 		} else {
 			QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
 			qw.lambda().eq(EvaluationDept::getYjzbjhType, "1");
+			qw.lambda().eq(EvaluationDept::getDelFlag, "1");
 			List<EvaluationDept> evaluationDeptList = evaluationDeptService.list(qw);
 			String finalDeptId = deptId;
 			EvaluationDept evaluationDept = evaluationDeptList.stream().filter(item -> item.getDeptId().equals(finalDeptId)).findFirst().orElse(null);
@@ -83,6 +84,7 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 		List<EvaluationDeptBusinessPlan> list = new ArrayList<>();
 		QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
 		qw.lambda().eq(EvaluationDept::getYjzbjhType, "1");
+		qw.lambda().eq(EvaluationDept::getDelFlag, "1");
 		List<EvaluationDept> evaluationDeptList = evaluationDeptService.list(qw);
 		for (EvaluationDept dept : evaluationDeptList) {
 			QueryWrapper<EvaluationDeptBusinessPlan> qw1 = new QueryWrapper<>();