소스 검색

修改bug

wangchangsheng 1 년 전
부모
커밋
984630b88e

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

@@ -214,7 +214,7 @@ public class OrganizationEvaluationController {
 
 
 
-	@PostMapping(value = "/getEvalScoreInfo")
+	@GetMapping(value = "/getEvalScoreInfo")
 	@ApiOperation(value = "考核打分表", notes = "考核打分表")
 	public R getEvaluationScoreInfo(@RequestParam(value = "id", required = false)String id,
 									@RequestParam(value = "indicatorId", required = false) String indicatorId,

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

@@ -170,11 +170,11 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 		}
 		if ("JDKP".equals(entity.getCheckCycle())) {
 			Date newDate = DateUtils.toDate(entity.getYear() + "-" + entity.getMonth() + "-01");
-			String season = String.valueOf(DateUtils.getSeason(newDate));//获取季度
-			String month = String.valueOf(Integer.valueOf(entity.getMonth()) * Integer.valueOf(season));//季度考评
-			oriList = list("", entity.getCheckCycle(), entity.getYear(), month);
+//			String season = String.valueOf(DateUtils.getSeason(newDate));//获取季度
+//			String month = String.valueOf(Integer.valueOf(entity.getMonth()) * Integer.valueOf(season));//季度考评
+			oriList = list("", entity.getCheckCycle(), entity.getYear(), entity.getMonth());
 			List<OrganizationEvaluation> count = list("", entity.getCheckCycle(), entity.getYear(), "");
-			responsibilityCode.append(entity.getYear()).append("_").append(month).append("_");
+			responsibilityCode.append(entity.getYear()).append("_").append(entity.getMonth()).append("_");
 			responsibilityCode.append(StringUtils.addZeroForStr(String.valueOf(count.size() + 1), 4, "l"));
 		}
 		if ("YDKP".equals(entity.getCheckCycle())) {
@@ -187,7 +187,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 
 		if (null != entity && (null == entity.getId() || "".equals(entity.getId().trim()))) {
 			if (null != oriList && oriList.size() > 0) {
-				throw new CustomException("此单位在该阶段已存在目标责任书");
+				throw new CustomException("此单位在该阶段已存在考评记录");
 			}
 			//保存目标责任书
 			entity.setOrganizationEvaluationCode(responsibilityCode.toString().toLowerCase());