评级处理

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

@@ -50,7 +50,7 @@ public class BinSectionController {
 				  @RequestParam(value = "type", required = false) String type) {
 		List<BinSection> list =CacheContext.bsnList;
 		if(StringUtils.isNotEmpty(type)){
-			list = list.stream().filter(s -> !s.getType().equals(type)).collect(Collectors.toList());
+			list = list.stream().filter(s -> !type.contains(s.getType())).collect(Collectors.toList());
 		}
 
 		if(StringUtils.isNotEmpty(sectionName)){

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

@@ -72,7 +72,10 @@ public class OrganizationRatingController {
 		}
 	}
 
+	public R generateRating(){
 
+		return  null;
+	}
 
 	/**
 	 * 批量删除

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

@@ -50,11 +50,29 @@ public class OrganizationYearRatingController {
 	}
 
 
+	/**
+	 * 按照id查询
+	 * @param id
+	 * @return
+	 */
+	@GetMapping(value = "getId")
+	public R getId(@RequestParam(value = "id") String id) {
+		OrganizationYearRating organizationYearRatin = organizationYearRatingService.getById(id);
+		return R.ok().data(organizationYearRatin);
+	}
+
 	@PostMapping(value = "/save")
 	@ApiOperation(value = "新增(修改)", notes = "新增（修改）")
 	public R addAll(@RequestBody OrganizationYearRating organizationYearRating) {
 
 		try {
+			StringBuilder sbcode = new StringBuilder("ndpj_").append(organizationYearRating.getYear());
+			if(null !=organizationYearRating && null == organizationYearRating.getId()){
+				sbcode.append("_001");
+				organizationYearRating.setStage("流程未启动");
+				organizationYearRating.setYearRatingCode(sbcode.toString());
+			}
+
 			boolean b = organizationYearRatingService.saveOrUpdate(organizationYearRating);
 			if (b) {
 				return R.ok().data(b);

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

@@ -17,4 +17,6 @@ public interface IOrganizationYearRatingService extends IService<OrganizationYea
 
 	IPage<OrganizationYearRating> list(Integer pageNum, Integer pageSize, String yearRatingCode, String year, String des);
 
+	boolean editState(String id, String state, String instId, String destination);
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/custom/impl/WorkflowServiceImpl.java

@@ -72,6 +72,10 @@ public class WorkflowServiceImpl {
 	@Autowired
 	private WorkflowYearsServiceImpl workflowYearsService;
 
+
+	@Autowired
+	private IOrganizationYearRatingService organizationYearRatingService;
+
 	/**
 	 * 发起流程
 	 *
@@ -325,6 +329,9 @@ public class WorkflowServiceImpl {
 			case "jxjgkhsb"://绩效结果考核申报
 				deptAssessmentDeclarationService.editState(bizKey, taskName, instId, destination);
 				break;
+			case "nddwpj"://年度单位评级
+				organizationYearRatingService.editState(bizKey, taskName, instId, destination);
+				break;
 		}
 		return true;
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.DeptResponsibility;
 import com.ims.eval.entity.OrganizationYearRating;
 import com.ims.eval.dao.OrganizationYearRatingMapper;
 import com.ims.eval.service.IOrganizationYearRatingService;
@@ -45,4 +46,20 @@ public class OrganizationYearRatingServiceImpl extends ServiceImpl<OrganizationY
 		IPage<OrganizationYearRating> list = baseMapper.selectPage(page, qw);
 		return list;
 	}
+
+	@Override
+	public boolean editState(String id, String state, String instId, String destination) {
+		OrganizationYearRating yearRating = baseMapper.selectById(id);
+		if (StringUtils.isNotEmpty(state)) {
+			if ("评审委员会审核".equals(state)) {
+				state = "流程已结束";
+			}
+			yearRating.setStage(state);
+		}
+		if (StringUtils.isNotEmpty(instId)) {
+			yearRating.setInstId(instId);
+		}
+		boolean b = super.saveOrUpdate(yearRating);
+		return b;
+	}
 }