Merge remote-tracking branch 'origin/master'

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

@@ -90,6 +90,26 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	}
 
 	/**
+	 * 修改部门考评业务信息
+	 *
+	 * @param evaluationDeptBusinessPlan 部门考评业务实体
+	 * @return 结果
+	 */
+	@PostMapping(value = "/modify")
+	public R modify(@RequestBody EvaluationDeptBusinessPlan evaluationDeptBusinessPlan) {
+		try {
+			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("失败！");
+		}
+	}
+
+	/**
 	 * 批量删除部门考评业务信息
 	 *
 	 * @param ids

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

@@ -21,4 +21,6 @@ public interface IEvaluationDeptBusinessPlanService extends IService<EvaluationD
 	boolean editState(String id, String state, String instId);
 
 	boolean removeByIds(List<String> ids);
+
+	boolean updateById(EvaluationDeptBusinessPlan evaluationDeptBusinessPlan);
 }

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

@@ -134,4 +134,13 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 		}
 		return super.removeByIds(ids);
 	}
+
+	@Override
+	public boolean updateById(EvaluationDeptBusinessPlan evaluationDeptBusinessPlan) {
+		EvaluationDeptBusinessAssessment evaluationDeptBusinessAssessment = new EvaluationDeptBusinessAssessment();
+		evaluationDeptBusinessAssessment.setId(evaluationDeptBusinessPlan.getId());
+		evaluationDeptBusinessAssessment.setDes(evaluationDeptBusinessPlan.getDes());
+		evaluationDeptBusinessAssessmentService.updateById(evaluationDeptBusinessAssessment);
+		return super.updateById(evaluationDeptBusinessPlan);
+	}
 }

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

@@ -56,7 +56,7 @@
                update_time,
                update_by,
                remark
-        from evaluation_dept_business_plan
+        from evaluation_dept_business_assessment
     </sql>
 
     <select id="selectListPage" resultType="com.ims.eval.entity.EvaluationDeptBusinessAssessment">

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

@@ -52,6 +52,7 @@
                inst_id,
                create_time,
                create_by,
+               create_name,
                update_time,
                update_by,
                remark