问题修改去掉updateMake

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

@@ -1,9 +1,11 @@
 package com.ims.eval.controller;
 
 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.EvaluationDeptBusinessPlan;
 import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.service.IEvaluationDeptBusinessAssessmentService;
 import com.ims.eval.service.IEvaluationDeptBusinessContentService;
@@ -147,4 +149,28 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 			if (outputStream != null) outputStream.close();
 		}
 	}
+
+	/**
+	 * 修改状态
+	 *
+	 * @param id 主键
+	 * @param stage 状态
+	 * @return 结果
+	 */
+	@PostMapping(value = "/targetStart")
+	public R targetStart(@RequestParam(value = "id") String id,
+						 @RequestParam(value = "stage") String stage) {
+		try {
+			EvaluationDeptBusinessAssessment evaluationDeptBusinessAssessment = evaluationDeptBusinessAssessmentService.getById(id);
+			evaluationDeptBusinessAssessment.setStage(stage);
+			boolean b = evaluationDeptBusinessAssessmentService.updateById(evaluationDeptBusinessAssessment);
+			if (b) {
+				return R.ok().data(b);
+			} else {
+				return R.error().data("失败！");
+			}
+		} catch (CustomException e) {
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
 }

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

@@ -192,4 +192,28 @@ public class DepartmentalPerformanceIndicatorPlanController {
 		}
 		return R.customError("上传文件为空！");
 	}
+
+	/**
+	 * 修改状态
+	 *
+	 * @param id 主键
+	 * @param stage 状态
+	 * @return 结果
+	 */
+	@PostMapping(value = "/targetStart")
+	public R targetStart(@RequestParam(value = "id") String id,
+						 @RequestParam(value = "stage") String stage) {
+		try {
+			EvaluationDeptBusinessPlan evaluationDeptBusinessPlan = evaluationDeptBusinessPlanService.getById(id);
+			evaluationDeptBusinessPlan.setStage(stage);
+			boolean b = evaluationDeptBusinessPlanService.updateById(evaluationDeptBusinessPlan);
+			if (b) {
+				return R.ok().data(b);
+			} else {
+				return R.error().data("失败！");
+			}
+		} catch (CustomException e) {
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
 }

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

@@ -105,10 +105,4 @@ public class EvaluationDeptBusinessContent extends Model {
 	 * 备注
 	 */
 	private String remark;
-
-	/**
-	 * 修改标记
-	 */
-	@TableField(exist = false)
-	private Boolean updateMark;
 }

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

@@ -33,29 +33,7 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 
 	@Override
 	public List<EvaluationDeptBusinessContent> detailsList(String businessPlanId, HttpServletRequest request) {
-		List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = baseMapper.detailsList(businessPlanId);
-		Myuser myuser = userService.getSysUser(request);
-		if (null != myuser) {
-			throw new CustomException("暂无权限");
-		} else {
-			for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
-				boolean updateMark = false;
-				if (!"".equals(myuser.getDeptId())) {
-					if (myuser.getDeptId().equals(evaluationDeptBusinessContent.getDeptId())) {
-						updateMark = true;
-					} else if (myuser.getLoginName().equals("admin")) {
-						updateMark = true;
-					} else {
-						throw new CustomException("暂无权限");
-					}
-				}
-				evaluationDeptBusinessContent.setUpdateMark(updateMark);
-			}
-		}
-		/*evaluationDeptBusinessContentList.stream().forEach(i -> {
-			i.setUpdateMark(true);
-		});*/
-		return evaluationDeptBusinessContentList;
+		return baseMapper.detailsList(businessPlanId);
 	}
 
 	@Override