流程生僻修改

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

@@ -4,7 +4,7 @@ package com.ims.eval.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.ims.eval.entity.custom.Menu;
 import com.ims.eval.entity.dto.result.R;
-import com.ims.eval.service.custom.MenuOperationService;
+import com.ims.eval.service.custom.impl.MenuOperationService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

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

@@ -2,14 +2,13 @@ package com.ims.eval.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.ims.eval.entity.IndicatorDictionary;
+import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.custom.DoAction;
-import com.ims.eval.entity.custom.GetInstance;
 import com.ims.eval.entity.custom.IsOkAction;
 import com.ims.eval.entity.custom.TodoTask;
 import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.entity.flow.FlowResult;
-import com.ims.eval.service.custom.WorkflowService;
+import com.ims.eval.service.custom.impl.WorkflowServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -30,7 +29,7 @@ import javax.servlet.http.HttpServletRequest;
 public class WorkflowController {
 
 	@Autowired
-	private WorkflowService workflowService;
+	private WorkflowServiceImpl workflowServiceImpl;
 
 	@Autowired
 	private HttpServletRequest request;
@@ -46,7 +45,7 @@ public class WorkflowController {
 	public R doAction(@RequestBody DoAction doAction) {
 		JSONObject json = null;
 		try {
-			json = workflowService.doAction(doAction,request);
+			json = workflowServiceImpl.doAction(doAction,request);
 		} catch (Exception e) {
 			log.error("错误",e);
 			return R.error().customError("流程发起任务失败");
@@ -66,7 +65,7 @@ public class WorkflowController {
 	public R todoTaskList(@RequestBody TodoTask todoTask) {
 		FlowResult json = null;
 		try {
-			json = workflowService.todoTaskList(todoTask,request);
+			json = workflowServiceImpl.todoTaskList(todoTask,request);
 		} catch (Exception e) {
 			log.error("错误",e);
 			return R.error().customError("获取待办任务失败");
@@ -84,10 +83,14 @@ public class WorkflowController {
 	public R isOkAction(@RequestBody IsOkAction isOkAction) {
 		JSONObject json = null;
 		try {
-			json = workflowService.isOkAction(isOkAction,request);
-		} catch (Exception e) {
+			json = workflowServiceImpl.isOkAction(isOkAction,request);
+		} catch (CustomException ce) {
+			log.error("错误",ce);
+			return R.ok().data(R.customError(ce.getMessage()));
+		}catch (Exception e){
 			log.error("错误",e);
 			return R.error().customError("流程发送失败");
+
 		}
 		return R.ok().data(json);
 	}
@@ -104,7 +107,7 @@ public class WorkflowController {
 									@RequestParam(value = "iamCode", required = false) String iamCode) {
 		JSONObject json = null;
 		try {
-			json = workflowService.getInstanceAndChildren(id,iamCode,request);
+			json = workflowServiceImpl.getInstanceAndChildren(id,iamCode,request);
 		} catch (Exception e) {
 			log.error("错误",e);
 			return R.error().customError("流程发送失败");
@@ -124,7 +127,7 @@ public class WorkflowController {
 									@RequestParam(value = "iamCode", required = false) String iamCode) {
 		JSONObject json = null;
 		try {
-			json = workflowService.getOpinion(instId,iamCode,request);
+			json = workflowServiceImpl.getOpinion(instId,iamCode,request);
 		} catch (Exception e) {
 			log.error("错误",e);
 			return R.error().customError("获取流程审批意见失败");

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/result/R.java

@@ -17,6 +17,9 @@ public class R {
     private Integer code;
     @ApiModelProperty(value = "返回消息")
     private String message;
+
+	@ApiModelProperty(value = "返回消息")
+	private String msg;
     @ApiModelProperty(value = "总数量")
     private Integer count;
     @ApiModelProperty(value = "返回数据")
@@ -46,9 +49,10 @@ public class R {
     }
 	public static R customError(String msg){
 		R r = new R();
-		r.setSuccess(false);
+		r.setSuccess(true);
 		r.setCode(ResultCode.CUSTOMERROR);
 		r.setMessage(msg);
+		r.setMsg(msg);
 		return r;
 	}
     public R success(Boolean success){

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

@@ -58,4 +58,14 @@ public interface IOrganizationEvaluationInfoService extends IService<Organizatio
 	 */
 	List<OrganizationEvaluationInfo> getEvaluationInfoByOptionCodeList(String organizationEvaluationId, String indicatorId, String organizationId, String childOptionCode);
 
+
+	/**
+	 * 获取条数
+	 * @param organizationEvaluationId
+	 * @param deptId
+	 * @param state
+	 * @return
+	 */
+	int getEvaluationInfoByStateCount(String organizationEvaluationId, String deptId, List<String> state);
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/custom/WorkflowService.java

@@ -1,316 +1,55 @@
 package com.ims.eval.service.custom;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.ims.eval.config.ImaConfig;
-import com.ims.eval.entity.custom.DoAction;
-import com.ims.eval.entity.custom.IsOkAction;
-import com.ims.eval.entity.custom.TodoTask;
-import com.ims.eval.entity.flow.FlowResult;
-import com.ims.eval.schedule.ScoreCalculationSchedule;
-import com.ims.eval.service.*;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.*;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 
 
 /**
- * <p>
- * 工作流 服务实现类
- * </p>
- *
- * @author wang
- * @since 2023-03-12
+ * 工作流业务类
  */
-@Service
-@Slf4j
-public class WorkflowService {
-
-	@Autowired
-	private RestTemplate restTemplate;
-
-	@Autowired
-	private ImaConfig imaConfig;
-
-	@Autowired
-	private IDeptResponsibilityService deptResponsibilityService;
-
-	@Autowired
-	private IOrganizationEvaluationService organizationEvaluationService;
-
-	@Autowired
-	private ScoreCalculationSchedule scoreCalculationSchedule;
-
-	@Autowired
-	private IEvaluationDeptBusinessPlanService evaluationDeptBusinessPlanService;
-
-	@Autowired
-	private IEvaluationDeptBusinessAssessmentService evaluationDeptBusinessAssessmentService;
-
-	@Autowired
-	private IEvaluationRevisionService evaluationRevisionService;
+public interface WorkflowService {
 
-	@Autowired
-	private IDeptAssessmentDeclarationService deptAssessmentDeclarationService;
-
-	/**
-	 * 发起流程
-	 *
-	 * @param doAction
-	 * @return
-	 */
-	public JSONObject doAction(DoAction doAction, HttpServletRequest request) {
-		HttpHeaders headers = new HttpHeaders();
-		headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		headers.add("Blade-Auth", request.getHeader("Blade-Auth"));
-		headers.add("code", request.getHeader("code"));
-		Map<String, String> map = new LinkedHashMap<>();
-		map.put("iamCode", doAction.getIamCode());
-		map.put("defKey", doAction.getDefKey());
-		map.put("businessKey", doAction.getBusinessKey());
-		map.put("action", doAction.getAction());
-		map.put("opinion", doAction.getOpinion());
-
-		HttpEntity<Map> param = new HttpEntity<>(map, headers);
-		ResponseEntity<String> responseEntity2 = restTemplate.exchange("http://10.65.78.23:8080/bpm/instance/doAction", HttpMethod.POST, param, String.class);
-		log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
-		if (200 == responseEntity2.getStatusCodeValue()) {
-			FlowResult result = JSON.parseObject(responseEntity2.getBody()).toJavaObject(FlowResult.class);
-
-			if (result.getIsOk()) {
-				boolean biz = updateWorkflowState(result.getData(), doAction.getDefKey(), doAction.getBusinessKey(), "");
-				if (biz) {
-					log.info("保存流程实例id成功");
-				}
-			}
-			return JSON.parseObject(responseEntity2.getBody());
-		}
-		return null;
-	}
-
-	/**
-	 * 获取待办任务
-	 *
-	 * @param todoTask
-	 * @return
-	 */
-	public FlowResult todoTaskList(TodoTask todoTask, HttpServletRequest request) {
-		HttpHeaders headers = new HttpHeaders();
-		headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		headers.add("Blade-Auth", request.getHeader("Blade-Auth"));
-		headers.add("code", request.getHeader("code"));
-//		MultiValueMap<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(todoTask), LinkedMultiValueMap.class);
-		Map<String, String> map = new LinkedHashMap<>();
-		map.put("iamCode", todoTask.getIamCode());
-		map.put("order", todoTask.getOrder());
-		map.put("sort", todoTask.getSort());
-		map.put("offset", todoTask.getOffset());
-		map.put("limit", todoTask.getLimit());
-		HttpEntity<Map> param = new HttpEntity<>(map, headers);
-		ResponseEntity<String> responseEntity2 = restTemplate.exchange("http://10.65.78.23:8080/bpm/my/todoTaskList", HttpMethod.POST, param, String.class);
-		log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
-		//
-		if (200 == responseEntity2.getStatusCodeValue()) {
-			FlowResult result = JSON.parseObject(responseEntity2.getBody()).toJavaObject(FlowResult.class);
-			if (result.getIsOk()) {
-				List<JSONObject> ds = new ArrayList<>();
-				for (int i = 0; i < result.getRows().size(); i++) {
-					String typeId = result.getRows().getJSONObject(i).get("typeId").toString();
-					if(!"440219646351376385".equals(typeId)){
-						ds.add(result.getRows().getJSONObject(i));
-						continue;
-					}
-				}
-				result.getRows().removeAll(ds);
-			}
-				return result;
-			}
-			return null;
-		}
 
 
 	/**
-	 * 检查当前数据（对应的用户）是或否存在代办
-	 * @param instId
-	 * @param request
+	 *  流程启动前
+	 * @param instId 业务类
+	 * @param defKey 流程key
+	 * @param bizKey  自定义key(一般存主数据id)
+	 * @param taskName 流程节点名称
 	 * @return
 	 */
-	public boolean todoTaskList2(String instId,HttpServletRequest request) {
-		try {
-			HttpHeaders headers = new HttpHeaders();
-			headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
-			headers.add("Blade-Auth", request.getHeader("Blade-Auth"));
-			headers.add("code", request.getHeader("code"));
-			Map<String, String> map = new LinkedHashMap<>();
-			map.put("iamCode", request.getHeader("code"));
-			map.put("order", "ASC");
-			map.put("sort", "");
-			map.put("offset", "");
-			map.put("limit", "99999");
-			HttpEntity<Map> param = new HttpEntity<>(map, headers);
-			ResponseEntity<String> responseEntity2 = restTemplate.exchange("http://10.65.78.23:8080/bpm/my/todoTaskList", HttpMethod.POST, param, String.class);
-			log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
-			//
-			if (200 == responseEntity2.getStatusCodeValue()) {
-				FlowResult result = JSON.parseObject(responseEntity2.getBody()).toJavaObject(FlowResult.class);
-				if (result.getIsOk()) {
-					List<JSONObject> ds = new ArrayList<>();
-					for (int i = 0; i < result.getRows().size(); i++) {
-						String typeId = result.getRows().getJSONObject(i).get("typeId").toString();
-						if(!"440219646351376385".equals(typeId)){
-							ds.add(result.getRows().getJSONObject(i));
-							continue;
-						}
-						String resinstId = result.getRows().getJSONObject(i).get("instId").toString();
-						if(instId.equals(resinstId)){
-							return true;
-						}
-					}
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-		return false;
-	}
-
-
+	boolean beforeStartAction(String instId, String defKey, String bizKey,String taskName);
 
 	/**
-	 * 流程审批
-	 * @param isOkAction
+	 * 流程启动后
+	 * @param instId 业务类
+	 * @param defKey 流程key
+	 * @param bizKey  自定义key(一般存主数据id)
+	 * @param taskName 流程节点名称
 	 * @return
 	 */
-	public JSONObject isOkAction(IsOkAction isOkAction, HttpServletRequest request){
-		HttpHeaders headers = new HttpHeaders();
-		headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		headers.add("Blade-Auth", request.getHeader("Blade-Auth"));
-		headers.add("code", request.getHeader("code"));
-		Map<String, String> map = new LinkedHashMap<>();
-
-		map.put("taskId",isOkAction.getTaskId());
-		map.put("nodeId",isOkAction.getNodeId());
-		map.put("action",isOkAction.getAction());
-		//发起提条件不是同意
-		if(!"agree".equals(isOkAction.getAction())){
-			map.put("destination",isOkAction.getDestination());
-		}
-		map.put("instanceId",isOkAction.getInstanceId());
-		map.put("opinion",isOkAction.getOpinion());
-		map.put("iamCode",isOkAction.getIamCode());
-		HttpEntity<Map> param = new HttpEntity<>(map, headers);
-		ResponseEntity<String> responseEntity2 = restTemplate.exchange("http://10.65.78.23:8080/bpm/task/doAction", HttpMethod.POST,param,String.class);
-		log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
-		if(200== responseEntity2.getStatusCodeValue()){
-
-			FlowResult result = JSON.parseObject(responseEntity2.getBody()).toJavaObject(FlowResult.class);
-			if(result.getIsOk()){
-				boolean biz = updateWorkflowState("",isOkAction.getDefKey(),isOkAction.getBizKey(),isOkAction.getTaskName());
-				if(biz){
-					log.info("状态修改成功");
-				}
-			}
-
-			return JSON.parseObject(responseEntity2.getBody());
-		}
-		return null;
-	}
+	boolean afterStartAction(String instId, String defKey, String bizKey,String taskName);
 
 
 	/**
-	 * 获取业务id
-	 * @param id
-	 * @param iamCode
-	 * @param request
+	 *  流程审批前
+	 * @param instId 业务类
+	 * @param defKey 流程key
+	 * @param bizKey  自定义key(一般存主数据id)
+	 * @param taskName 流程节点名称
 	 * @return
 	 */
-	public JSONObject getInstanceAndChildren(String id,String iamCode, HttpServletRequest request){
-		HttpHeaders headers = new HttpHeaders();
-		headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		headers.add("Blade-Auth", request.getHeader("Blade-Auth"));
-		headers.add("code", request.getHeader("code"));
-
-		HttpEntity<Map> param = new HttpEntity<>(null, headers);
-		ResponseEntity<String> responseEntity2 = restTemplate.postForEntity("http://10.65.78.23:8080/bpm/instance/getInstanceAndChildren?id={1}&iamCode={2}",
-			param, String.class, id, iamCode);
-
-		log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
-		if(200== responseEntity2.getStatusCodeValue()){
-			return JSON.parseObject(responseEntity2.getBody());
-		}
-		return null;
-	}
+	boolean beforeCheckAction(String instId, String defKey, String bizKey, String taskName);
 
 
 	/**
-	 * 获取流程审批意见
-	 * @param instId
-	 * @param iamCode
-	 * @param request
+	 * 流程审批后
+	 * @param instId 业务类
+	 * @param defKey 流程key
+	 * @param bizKey  自定义key(一般存主数据id)
+	 * @param taskName 流程节点名称
 	 * @return
 	 */
-	public JSONObject getOpinion(String instId,String iamCode, HttpServletRequest request){
-		HttpHeaders headers = new HttpHeaders();
-		headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		headers.add("Blade-Auth", request.getHeader("Blade-Auth"));
-		headers.add("code", request.getHeader("code"));
-
-		HttpEntity<Map> param = new HttpEntity<>(null, headers);
-		ResponseEntity<String> responseEntity2 = restTemplate.postForEntity("http://10.65.78.23:8080/bpm/instance/getOpinion?instId={1}&iamCode={2}",
-			param, String.class, instId, iamCode);
-
-		log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
-		if(200== responseEntity2.getStatusCodeValue()){
-			return JSON.parseObject(responseEntity2.getBody());
-		}
-		return null;
-	}
-
-
-
-
-
-
-	private boolean updateWorkflowState(String instId, String defKey, String bizKey,String taskName) {
-
-		switch (defKey) {
-			case "dwkpmbqd"://单位考评目标启动
-				deptResponsibilityService.editState(bizKey,taskName,instId);
-				break;
-			case "yddwkplc"://月度单位考评流程
-				organizationEvaluationService.editState(bizKey, taskName,instId);
-				break;
-			case "jddwkplc"://季度单位考评流程
-				 organizationEvaluationService.editState(bizKey, taskName,instId);
-				break;
-			case "nddwkplc"://年度单位考评流程
-				organizationEvaluationService.editState(bizKey, taskName,instId);
-				break;
-			case "dwkpmbxd"://单位考评目标修订
-				evaluationRevisionService.editState(bizKey,taskName,instId);
-				break;
-			case "bbbmyjzbjh"://本部部门业绩指标计划
-				evaluationDeptBusinessPlanService.editState(bizKey,taskName,instId);
-				break;
-			case "bbbmyjzbkh"://本部部门业绩指标考核
-				evaluationDeptBusinessAssessmentService.editState(bizKey,taskName,instId);
-				break;
-			case "jxjgkhsb"://绩效结果考核申报
-				deptAssessmentDeclarationService.editState(bizKey,taskName,instId);
-				break;
-		}
-		return true;
-
-	}
+	boolean afterCheckAction(String instId, String defKey, String bizKey, String taskName);
 
 
 

ims-service/ims-eval/src/main/java/com/ims/eval/service/custom/enums/WorkflowEnum.java

@@ -0,0 +1,51 @@
+package com.ims.eval.service.custom.enums;
+
+/**
+ * 通用枚举值
+ *
+ * @author bool
+ */
+public interface WorkflowEnum {
+
+	/**
+	 * 单位考评目标启动
+	 */
+	String DWKPMBQD = "dwkpmbqd";
+
+	/**
+	 * 月度单位考评流程
+	 */
+	String YDDWKPLC = "yddwkplc";
+
+	/**
+	 * 季度单位考评流程
+	 */
+	String JDDWKPLC = "jddwkplc";
+
+	/**
+	 * 年度单位考评流程
+	 */
+	String NDDWKPLC = "nddwkplc";
+
+	/**
+	 * 单位考评目标修订
+	 */
+	String DWKPMBXD = "dwkpmbxd";
+
+	/**
+	 * 本部部门业绩指标计划
+	 */
+	String BBBMYJZBJH = "bbbmyjzbjh";
+
+	/**
+	 * 本部部门业绩指标考核
+	 */
+	String BBBMYJZBKH = "bbbmyjzbkh";
+
+	/**
+	 * 绩效结果考核申报
+	 */
+	String JXJGKHSB = "jxjgkhsb";
+
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/custom/MenuOperationService.java

@@ -1,4 +1,4 @@
-package com.ims.eval.service.custom;
+package com.ims.eval.service.custom.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;

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

@@ -0,0 +1,64 @@
+package com.ims.eval.service.custom.impl;
+
+
+import com.ims.eval.config.CustomException;
+import com.ims.eval.service.IOrganizationEvaluationInfoService;
+import com.ims.eval.service.IOrganizationEvaluationService;
+import com.ims.eval.service.custom.WorkflowService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.swing.undo.CannotUndoException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * <p>
+ * 工作流 月度流程服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-12
+ */
+@Service
+@Slf4j
+public class WorkflowMonthServiceImpl  implements WorkflowService {
+
+	@Autowired
+	private IOrganizationEvaluationService organizationEvaluationService;
+
+	@Autowired
+	private IOrganizationEvaluationInfoService organizationEvaluationInfoService;
+
+
+	@Override
+	public boolean beforeStartAction(String instId, String defKey, String bizKey, String taskName) {
+		return false;
+	}
+
+	@Override
+	public boolean afterStartAction(String instId, String defKey, String bizKey, String taskName) {
+		return false;
+	}
+
+	@Override
+	public boolean beforeCheckAction(String instId, String defKey, String bizKey, String taskName) {
+
+		if("各部门填报".equals(taskName)){
+			List<String> stateList = Arrays.asList("-1", "0"); // 要查询的id列表
+			Integer count = organizationEvaluationInfoService.getEvaluationInfoByStateCount(bizKey,"",stateList);
+			if(null!=count && count>0){
+				throw new CustomException("当前填报有未审批完的记录！");
+			}
+		}
+
+		return true;
+	}
+
+	@Override
+	public boolean afterCheckAction(String instId, String defKey, String bizKey, String taskName) {
+		return false;
+	}
+}

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

@@ -0,0 +1,59 @@
+package com.ims.eval.service.custom.impl;
+
+import com.ims.eval.config.CustomException;
+import com.ims.eval.service.IOrganizationEvaluationInfoService;
+import com.ims.eval.service.IOrganizationEvaluationService;
+import com.ims.eval.service.custom.WorkflowService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * <p>
+ * 工作流 季度流程服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-12
+ */
+@Service
+@Slf4j
+public class WorkflowSeasonServiceImpl  implements WorkflowService {
+
+	@Autowired
+	private IOrganizationEvaluationService organizationEvaluationService;
+
+	@Autowired
+	private IOrganizationEvaluationInfoService organizationEvaluationInfoService;
+
+	@Override
+	public boolean beforeStartAction(String instId, String defKey, String bizKey, String taskName) {
+		return false;
+	}
+
+	@Override
+	public boolean afterStartAction(String instId, String defKey, String bizKey, String taskName) {
+		return false;
+	}
+
+	@Override
+	public boolean beforeCheckAction(String instId, String defKey, String bizKey, String taskName) {
+		if("各部门填报".equals(taskName)){
+			List<String> stateList = Arrays.asList("-1", "0"); // 要查询的id列表
+			Integer count = organizationEvaluationInfoService.getEvaluationInfoByStateCount(bizKey,"",stateList);
+			if(null!=count && count>0){
+				throw new CustomException("当前填报有未审批完的记录！");
+			}
+		}
+
+		return true;
+	}
+
+	@Override
+	public boolean afterCheckAction(String instId, String defKey, String bizKey, String taskName) {
+		return false;
+	}
+}

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

@@ -0,0 +1,357 @@
+package com.ims.eval.service.custom.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.ims.eval.config.ImaConfig;
+import com.ims.eval.entity.custom.DoAction;
+import com.ims.eval.entity.custom.IsOkAction;
+import com.ims.eval.entity.custom.TodoTask;
+import com.ims.eval.entity.flow.FlowResult;
+import com.ims.eval.schedule.ScoreCalculationSchedule;
+import com.ims.eval.service.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.*;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * <p>
+ * 工作流 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-12
+ */
+@Service
+@Slf4j
+public class WorkflowServiceImpl {
+
+	@Autowired
+	private RestTemplate restTemplate;
+
+	@Autowired
+	private ImaConfig imaConfig;
+
+	@Autowired
+	private IDeptResponsibilityService deptResponsibilityService;
+
+	@Autowired
+	private IOrganizationEvaluationService organizationEvaluationService;
+
+	@Autowired
+	private ScoreCalculationSchedule scoreCalculationSchedule;
+
+	@Autowired
+	private IEvaluationDeptBusinessPlanService evaluationDeptBusinessPlanService;
+
+	@Autowired
+	private IEvaluationDeptBusinessAssessmentService evaluationDeptBusinessAssessmentService;
+
+	@Autowired
+	private IEvaluationRevisionService evaluationRevisionService;
+
+	@Autowired
+	private IDeptAssessmentDeclarationService deptAssessmentDeclarationService;
+
+	@Autowired
+	private WorkflowMonthServiceImpl workflowMonthService;
+
+	@Autowired
+	private WorkflowSeasonServiceImpl workflowSeasonService;
+
+	@Autowired
+	private  WorkflowYearsServiceImpl workflowYearsService;
+
+	/**
+	 * 发起流程
+	 *
+	 * @param doAction
+	 * @return
+	 */
+	public JSONObject doAction(DoAction doAction, HttpServletRequest request) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+		headers.add("Blade-Auth", request.getHeader("Blade-Auth"));
+		headers.add("code", request.getHeader("code"));
+		Map<String, String> map = new LinkedHashMap<>();
+		map.put("iamCode", doAction.getIamCode());
+		map.put("defKey", doAction.getDefKey());
+		map.put("businessKey", doAction.getBusinessKey());
+		map.put("action", doAction.getAction());
+		map.put("opinion", doAction.getOpinion());
+
+		HttpEntity<Map> param = new HttpEntity<>(map, headers);
+		ResponseEntity<String> responseEntity2 = restTemplate.exchange("http://10.65.78.23:8080/bpm/instance/doAction", HttpMethod.POST, param, String.class);
+		log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
+		if (200 == responseEntity2.getStatusCodeValue()) {
+			FlowResult result = JSON.parseObject(responseEntity2.getBody()).toJavaObject(FlowResult.class);
+
+			if (result.getIsOk()) {
+				boolean biz = updateWorkflowState(result.getData(), doAction.getDefKey(), doAction.getBusinessKey(), "");
+				if (biz) {
+					log.info("保存流程实例id成功");
+				}
+			}
+			return JSON.parseObject(responseEntity2.getBody());
+		}
+		return null;
+	}
+
+	/**
+	 * 获取待办任务
+	 *
+	 * @param todoTask
+	 * @return
+	 */
+	public FlowResult todoTaskList(TodoTask todoTask, HttpServletRequest request) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+		headers.add("Blade-Auth", request.getHeader("Blade-Auth"));
+		headers.add("code", request.getHeader("code"));
+//		MultiValueMap<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(todoTask), LinkedMultiValueMap.class);
+		Map<String, String> map = new LinkedHashMap<>();
+		map.put("iamCode", todoTask.getIamCode());
+		map.put("order", todoTask.getOrder());
+		map.put("sort", todoTask.getSort());
+		map.put("offset", todoTask.getOffset());
+		map.put("limit", todoTask.getLimit());
+		HttpEntity<Map> param = new HttpEntity<>(map, headers);
+		ResponseEntity<String> responseEntity2 = restTemplate.exchange("http://10.65.78.23:8080/bpm/my/todoTaskList", HttpMethod.POST, param, String.class);
+		log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
+		//
+		if (200 == responseEntity2.getStatusCodeValue()) {
+			FlowResult result = JSON.parseObject(responseEntity2.getBody()).toJavaObject(FlowResult.class);
+			if (result.getIsOk()) {
+				List<JSONObject> ds = new ArrayList<>();
+				for (int i = 0; i < result.getRows().size(); i++) {
+					String typeId = result.getRows().getJSONObject(i).get("typeId").toString();
+					if(!"440219646351376385".equals(typeId)){
+						ds.add(result.getRows().getJSONObject(i));
+						continue;
+					}
+				}
+				result.getRows().removeAll(ds);
+			}
+				return result;
+			}
+			return null;
+		}
+
+
+	/**
+	 * 检查当前数据（对应的用户）是或否存在代办
+	 * @param instId
+	 * @param request
+	 * @return
+	 */
+	public boolean todoTaskList2(String instId,HttpServletRequest request) {
+		try {
+			HttpHeaders headers = new HttpHeaders();
+			headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+			headers.add("Blade-Auth", request.getHeader("Blade-Auth"));
+			headers.add("code", request.getHeader("code"));
+			Map<String, String> map = new LinkedHashMap<>();
+			map.put("iamCode", request.getHeader("code"));
+			map.put("order", "ASC");
+			map.put("sort", "");
+			map.put("offset", "");
+			map.put("limit", "99999");
+			HttpEntity<Map> param = new HttpEntity<>(map, headers);
+			ResponseEntity<String> responseEntity2 = restTemplate.exchange("http://10.65.78.23:8080/bpm/my/todoTaskList", HttpMethod.POST, param, String.class);
+			log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
+			//
+			if (200 == responseEntity2.getStatusCodeValue()) {
+				FlowResult result = JSON.parseObject(responseEntity2.getBody()).toJavaObject(FlowResult.class);
+				if (result.getIsOk()) {
+					List<JSONObject> ds = new ArrayList<>();
+					for (int i = 0; i < result.getRows().size(); i++) {
+						String typeId = result.getRows().getJSONObject(i).get("typeId").toString();
+						if(!"440219646351376385".equals(typeId)){
+							ds.add(result.getRows().getJSONObject(i));
+							continue;
+						}
+						String resinstId = result.getRows().getJSONObject(i).get("instId").toString();
+						if(instId.equals(resinstId)){
+							return true;
+						}
+					}
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+		return false;
+	}
+
+
+
+	/**
+	 * 流程审批
+	 * @param isOkAction
+	 * @return
+	 */
+	public JSONObject isOkAction(IsOkAction isOkAction, HttpServletRequest request){
+		HttpHeaders headers = new HttpHeaders();
+		headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+		headers.add("Blade-Auth", request.getHeader("Blade-Auth"));
+		headers.add("code", request.getHeader("code"));
+
+		//流程开始前的动作
+		if(!"reject".equals(isOkAction.getAction())){
+			beforeCheckAction("",isOkAction.getDefKey(),isOkAction.getBizKey(),isOkAction.getTaskName());
+		}
+
+		Map<String, String> map = new LinkedHashMap<>();
+
+		map.put("taskId",isOkAction.getTaskId());
+		map.put("nodeId",isOkAction.getNodeId());
+		map.put("action",isOkAction.getAction());
+		//发起提条件不是同意
+		if(!"agree".equals(isOkAction.getAction())){
+			map.put("destination",isOkAction.getDestination());
+		}
+		map.put("instanceId",isOkAction.getInstanceId());
+		map.put("opinion",isOkAction.getOpinion());
+		map.put("iamCode",isOkAction.getIamCode());
+		HttpEntity<Map> param = new HttpEntity<>(map, headers);
+		ResponseEntity<String> responseEntity2 = restTemplate.exchange("http://10.65.78.23:8080/bpm/task/doAction", HttpMethod.POST,param,String.class);
+		log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
+		if(200== responseEntity2.getStatusCodeValue()){
+
+			FlowResult result = JSON.parseObject(responseEntity2.getBody()).toJavaObject(FlowResult.class);
+			if(result.getIsOk()){
+				boolean biz = updateWorkflowState("",isOkAction.getDefKey(),isOkAction.getBizKey(),isOkAction.getTaskName());
+				if(biz){
+					log.info("状态修改成功");
+				}
+			}
+
+			return JSON.parseObject(responseEntity2.getBody());
+		}
+		return null;
+	}
+
+
+	/**
+	 * 获取业务id
+	 * @param id
+	 * @param iamCode
+	 * @param request
+	 * @return
+	 */
+	public JSONObject getInstanceAndChildren(String id,String iamCode, HttpServletRequest request){
+		HttpHeaders headers = new HttpHeaders();
+		headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+		headers.add("Blade-Auth", request.getHeader("Blade-Auth"));
+		headers.add("code", request.getHeader("code"));
+
+		HttpEntity<Map> param = new HttpEntity<>(null, headers);
+		ResponseEntity<String> responseEntity2 = restTemplate.postForEntity("http://10.65.78.23:8080/bpm/instance/getInstanceAndChildren?id={1}&iamCode={2}",
+			param, String.class, id, iamCode);
+
+		log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
+		if(200== responseEntity2.getStatusCodeValue()){
+			return JSON.parseObject(responseEntity2.getBody());
+		}
+		return null;
+	}
+
+
+	/**
+	 * 获取流程审批意见
+	 * @param instId
+	 * @param iamCode
+	 * @param request
+	 * @return
+	 */
+	public JSONObject getOpinion(String instId,String iamCode, HttpServletRequest request){
+		HttpHeaders headers = new HttpHeaders();
+		headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+		headers.add("Blade-Auth", request.getHeader("Blade-Auth"));
+		headers.add("code", request.getHeader("code"));
+
+		HttpEntity<Map> param = new HttpEntity<>(null, headers);
+		ResponseEntity<String> responseEntity2 = restTemplate.postForEntity("http://10.65.78.23:8080/bpm/instance/getOpinion?instId={1}&iamCode={2}",
+			param, String.class, instId, iamCode);
+
+		log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
+		if(200== responseEntity2.getStatusCodeValue()){
+			return JSON.parseObject(responseEntity2.getBody());
+		}
+		return null;
+	}
+
+
+
+
+	private boolean updateWorkflowState(String instId, String defKey, String bizKey,String taskName) {
+
+		switch (defKey) {
+			case "dwkpmbqd"://单位考评目标启动
+				deptResponsibilityService.editState(bizKey,taskName,instId);
+				break;
+			case "yddwkplc"://月度单位考评流程
+				organizationEvaluationService.editState(bizKey, taskName,instId);
+				break;
+			case "jddwkplc"://季度单位考评流程
+				 organizationEvaluationService.editState(bizKey, taskName,instId);
+				break;
+			case "nddwkplc"://年度单位考评流程
+				organizationEvaluationService.editState(bizKey, taskName,instId);
+				break;
+			case "dwkpmbxd"://单位考评目标修订
+				evaluationRevisionService.editState(bizKey,taskName,instId);
+				break;
+			case "bbbmyjzbjh"://本部部门业绩指标计划
+				evaluationDeptBusinessPlanService.editState(bizKey,taskName,instId);
+				break;
+			case "bbbmyjzbkh"://本部部门业绩指标考核
+				evaluationDeptBusinessAssessmentService.editState(bizKey,taskName,instId);
+				break;
+			case "jxjgkhsb"://绩效结果考核申报
+				deptAssessmentDeclarationService.editState(bizKey,taskName,instId);
+				break;
+		}
+		return true;
+
+	}
+
+
+	public boolean beforeCheckAction(String instId, String defKey, String bizKey, String taskName) {
+		switch (defKey) {
+			case "dwkpmbqd"://单位考评目标启动
+				break;
+			case "yddwkplc"://月度单位考评流程
+				workflowMonthService.beforeCheckAction(instId,defKey,bizKey,taskName);
+				break;
+			case "jddwkplc"://季度单位考评流程
+				workflowSeasonService.beforeCheckAction(instId,defKey,bizKey,taskName);
+				break;
+			case "nddwkplc"://年度单位考评流程
+				workflowYearsService.beforeCheckAction(instId,defKey,bizKey,taskName);
+				break;
+			case "dwkpmbxd"://单位考评目标修订
+				break;
+			case "bbbmyjzbjh"://本部部门业绩指标计划
+				break;
+			case "bbbmyjzbkh"://本部部门业绩指标考核
+				break;
+			case "jxjgkhsb"://绩效结果考核申报
+				break;
+		}
+		return true;
+
+
+	}
+
+
+}

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

@@ -0,0 +1,63 @@
+package com.ims.eval.service.custom.impl;
+
+
+import com.ims.eval.config.CustomException;
+import com.ims.eval.service.IOrganizationEvaluationInfoService;
+import com.ims.eval.service.IOrganizationEvaluationService;
+import com.ims.eval.service.custom.WorkflowService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * <p>
+ * 工作流 月度流程服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-12
+ */
+@Service
+@Slf4j
+public class WorkflowYearsServiceImpl implements WorkflowService {
+
+	@Autowired
+	private IOrganizationEvaluationService organizationEvaluationService;
+
+	@Autowired
+	private IOrganizationEvaluationInfoService organizationEvaluationInfoService;
+
+
+	@Override
+	public boolean beforeStartAction(String instId, String defKey, String bizKey, String taskName) {
+		return false;
+	}
+
+	@Override
+	public boolean afterStartAction(String instId, String defKey, String bizKey, String taskName) {
+		return false;
+	}
+
+	@Override
+	public boolean beforeCheckAction(String instId, String defKey, String bizKey, String taskName) {
+
+		if("各部门填报".equals(taskName)){
+			List<String> stateList = Arrays.asList("-1", "0"); // 要查询的id列表
+			Integer count = organizationEvaluationInfoService.getEvaluationInfoByStateCount(bizKey,"",stateList);
+			if(null!=count && count>0){
+				throw new CustomException("当前填报有未审批完的记录！");
+			}
+		}
+
+		return true;
+	}
+
+	@Override
+	public boolean afterCheckAction(String instId, String defKey, String bizKey, String taskName) {
+		return false;
+	}
+}

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

@@ -14,7 +14,7 @@ import com.ims.eval.entity.dto.response.IndicatorResDTO;
 import com.ims.eval.entity.dto.response.OrganizationEvaluationInfoResDTO;
 import com.ims.eval.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ims.eval.service.custom.WorkflowService;
+import com.ims.eval.service.custom.impl.WorkflowServiceImpl;
 import com.ims.eval.util.MathCalculatorUtil;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.io.output.ByteArrayOutputStream;
@@ -80,7 +80,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 	private  IOrganizationEvaluationRuleService organizationEvaluationRuleService;
 
 	@Autowired
-	private WorkflowService workflowService;
+	private WorkflowServiceImpl workflowService;
 
 
 
@@ -1064,6 +1064,27 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 		return list;
 	}
 
+	@Override
+	public int getEvaluationInfoByStateCount(String organizationEvaluationId, String deptId, List<String> state) {
+		QueryWrapper<OrganizationEvaluationInfo> qw = new QueryWrapper<>();
+
+		if (StringUtils.isNotEmpty(organizationEvaluationId)) {
+			qw.lambda().eq(OrganizationEvaluationInfo::getOrganizationEvaluationId, organizationEvaluationId);
+		}
+
+		if (StringUtils.isNotEmpty(deptId)) {
+			qw.lambda().eq(OrganizationEvaluationInfo::getDeptId, deptId);
+		}
+
+		if (StringUtils.isNotEmpty(state)) {
+			qw.lambda().in(OrganizationEvaluationInfo::getState, state);
+		}
+
+		Integer count = baseMapper.selectCount(qw);
+		return count;
+
+	}
+
 	/**
 	 * 状态抓换 (-1:不合格；0:待确认；1:已确认)
 	 * @return