修改优化

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

@@ -145,6 +145,20 @@ public class DeptResponsibilityController {
 	}
 
 
+	/**
+	 *
+	 * @param id 目标责任书id
+	 * @return
+	 */
+	//@ImsPreAuth("eval:responsibilityIndicatorInfo:view")
+	@GetMapping(value = "getDeptResponsibility")
+	public R getDeptResponsibility(
+		@RequestParam(value = "id", required = false) String  id) {
+		DeptResponsibility  resDTO = deptResponsibilityService.getDeptResponsibility(id);
+		return R.ok().data(resDTO);
+	}
+
+
 
 	/**
 	 * 批量删除

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

@@ -133,7 +133,7 @@ public class OrganizationEvaluationController {
 	 */
 	//@ImsPreAuth("eval:organizationEvaluation:edit")
 	@PostMapping(value = "/generateUnitMonthEvaluation")
-	@ApiOperation(value = "生成部门考评明细", notes = "生成部门考评明细")
+	@ApiOperation(value = "生成月度单位考评明细", notes = "生成月度单位考评明细")
 	public R generateUnitMonthEvaluation(@RequestParam(value = "evaluationIds", required = true) String evaluationIds) {
 
 		try {
@@ -213,6 +213,20 @@ public class OrganizationEvaluationController {
 	}
 
 
+	/**
+	 *
+	 * @param id 目标责任书id
+	 * @return
+	 */
+	//@ImsPreAuth("eval:organizationEvaluation:view")
+	@GetMapping(value = "getOrganizationEvaluation")
+	public R getOrganizationEvaluation(
+		@RequestParam(value = "id", required = false) String  id) {
+		OrganizationEvaluation res = organizationEvaluationService.getOrganizationEvaluation(id);
+		return R.ok().data(res);
+	}
+
+
 
 	@GetMapping(value = "/getEvalScoreInfo")
 	@ApiOperation(value = "考核打分表", notes = "考核打分表")

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

@@ -34,6 +34,10 @@ public interface IDeptResponsibilityService extends IService<DeptResponsibility>
 
 	boolean editState(String id,String state,String instId);
 
+	DeptResponsibility getDeptResponsibility(String id);
+
+
+
 
 
 

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

@@ -50,4 +50,8 @@ public interface IOrganizationEvaluationService extends IService<OrganizationEva
 	List<Map<String, Object>> getCompanyWarning(String evaluationType);
 
 	Map getEvaluationScoreInfo(String id,String  binSection,String indicatorId,String  organizationEvaluationRuleId);
+
+
+
+	OrganizationEvaluation getOrganizationEvaluation(String id);
 }

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

@@ -359,4 +359,12 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 	}
 
 
+	@Override
+	public DeptResponsibility getDeptResponsibility(String id) {
+		if(StringUtils.isEmpty(id)){
+			return null;
+		}
+		DeptResponsibility res = this.getById(id);
+		return res;
+	}
 }

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

@@ -407,6 +407,8 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 					throw new CustomException("初始化目标责任书明细失败");
 				}
 			}
+			organizationEvaluation.setStage("流程启动");
+			baseMapper.updateById(organizationEvaluation);
 		}
 		return true;
 	}
@@ -773,4 +775,14 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 		}
 		return map;
 	}
+
+
+	@Override
+	public OrganizationEvaluation getOrganizationEvaluation(String id) {
+		if(StringUtils.isEmpty(id)){
+			return null;
+		}
+		OrganizationEvaluation res = this.getById(id);
+		return res;
+	}
 }