update

mec-workflow/src/main/java/com/ym/mec/workfow/controller/flow/FlowController.java → mec-workflow/src/main/java/com/ym/mec/workfow/controller/flow/OrderController.java

@@ -15,8 +15,8 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.common.controller.BaseController;
 
 @RestController
-@RequestMapping(value = "/snaker/flow")
-public class FlowController extends BaseController {
+@RequestMapping(value = "/snaker/order")
+public class OrderController extends BaseController {
 
 	@Autowired
 	private SnakerEngine snakerEngine;
@@ -30,22 +30,22 @@ public class FlowController extends BaseController {
 	 * @param page
 	 * @return
 	 */
-	@GetMapping(value = "order")
+	@GetMapping(value = "list")
 	public Object order(Page<HistoryOrder> page) {
 		return succeed(snakerEngine.query().getHistoryOrders(page, new QueryFilter()));
 	}
 
 	/**
 	 * 抄送实例已读
-	 * @param id
+	 * @param orderId
 	 * @param url
 	 * @return
 	 */
-	@PostMapping(value = "ccread")
-	public Object ccread(String id) {
+	@PostMapping(value = "setCcread")
+	public Object ccread(String orderId) {
 		SysUser user = SysUserFeignService.queryUserInfo();
 
-		snakerEngine.order().updateCCStatus(id, new String[] { user.getId() + "" });
+		snakerEngine.order().updateCCStatus(orderId, new String[] { user.getId() + "" });
 		return succeed();
 	}
 

mec-workflow/src/main/java/com/ym/mec/workfow/controller/flow/ProcessController.java

@@ -31,7 +31,6 @@ import org.snaker.engine.helper.AssertHelper;
 import org.snaker.engine.helper.StringHelper;
 import org.snaker.engine.model.ProcessModel;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -126,19 +125,4 @@ public class ProcessController extends BaseController {
 		return jsonMap;
 	}
 
-	@GetMapping(value = "display")
-	public Object display(String orderId) {
-		List<HistoryTask> tasks = snakerEngine.query().getHistoryTasks(new QueryFilter().setOrderId(orderId));
-		return succeed(tasks);
-	}
-
-	/**
-	 * 显示独立的流程图
-	 */
-	@GetMapping(value = "diagram")
-	public String diagram(Model model, String processId, String orderId) {
-		model.addAttribute("processId", processId);
-		model.addAttribute("orderId", orderId);
-		return "snaker/diagram";
-	}
 }

mec-workflow/src/main/java/com/ym/mec/workfow/controller/flow/SurrogateController.java

@@ -17,6 +17,7 @@ package com.ym.mec.workfow.controller.flow;
 import org.snaker.engine.SnakerEngine;
 import org.snaker.engine.access.Page;
 import org.snaker.engine.access.QueryFilter;
+import org.snaker.engine.core.AccessService;
 import org.snaker.engine.entity.Surrogate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -54,7 +55,7 @@ public class SurrogateController extends BaseController {
 		surrogate.setSdate(surrogate.getSdate() + " 00:00:00");
 		surrogate.setEdate(surrogate.getEdate() + " 23:59:59");
 		if (surrogate.getState() == null) {
-			surrogate.setState(1);
+			surrogate.setState(AccessService.STATE_ACTIVE);
 		}
 		snakerEngine.manager().saveOrUpdate(surrogate);
 		return succeed();

mec-workflow/src/main/java/com/ym/mec/workfow/controller/flow/TaskController.java

@@ -9,12 +9,13 @@ import org.apache.commons.lang.StringUtils;
 import org.snaker.engine.SnakerEngine;
 import org.snaker.engine.access.Page;
 import org.snaker.engine.access.QueryFilter;
+import org.snaker.engine.core.AccessService;
 import org.snaker.engine.entity.HistoryOrder;
 import org.snaker.engine.entity.Task;
 import org.snaker.engine.entity.WorkItem;
 import org.snaker.engine.model.TaskModel.TaskType;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.ui.Model;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,8 +40,8 @@ public class TaskController extends BaseController {
 	@Autowired
 	private SysUserFeignService SysUserFeignService;
 
-	@GetMapping(value = "active")
-	public Object homeTaskList(Model model) {
+	@GetMapping(value = "home")
+	public Object homeTaskList() {
 
 		SysUser user = SysUserFeignService.queryUserInfo();
 
@@ -59,6 +60,8 @@ public class TaskController extends BaseController {
 				new QueryFilter().setOperators(assignees).setTaskType(TaskType.Aidant.ordinal()));
 		List<HistoryOrder> ccWorks = snakerEngine.query().getCCWorks(ccorderPage, new QueryFilter().setOperators(assignees).setState(1));
 
+		ModelMap model = new ModelMap();
+		
 		model.addAttribute("majorWorks", majorWorks);
 		model.addAttribute("majorTotal", majorPage.getTotalCount());
 		model.addAttribute("aidantWorks", aidantWorks);
@@ -73,8 +76,8 @@ public class TaskController extends BaseController {
 	 * @param model
 	 * @return
 	 */
-	@GetMapping(value = "user")
-	public Object userTaskList(Page<WorkItem> page) {
+	@GetMapping(value = "queryWaitList")
+	public Object queryWaitList(Page<WorkItem> page) {
 		SysUser user = SysUserFeignService.queryUserInfo();
 
 		snakerEngine.query().getWorkItems(page, new QueryFilter().setOperator(user.getUsername()));
@@ -147,7 +150,7 @@ public class TaskController extends BaseController {
 
 		String[] assignees = new String[list.size()];
 		list.toArray(assignees);
-		snakerEngine.query().getCCWorks(page, new QueryFilter().setOperators(assignees).setState(1));
+		snakerEngine.query().getCCWorks(page, new QueryFilter().setOperators(assignees).setState(AccessService.STATE_ACTIVE));
 		return succeed(page);
 	}
 

mec-workflow/src/main/java/com/ym/mec/workfow/controller/web/LeaveController.java

@@ -60,7 +60,7 @@ public class LeaveController extends BaseController {
 		if (tasks.size() == 0) {
 			System.out.println("**********流程已结束*********");
 		} else {
-			System.out.println("**********流程未结束*********");
+			System.out.println("**********审批中*********");
 		}
 
 		return succeed();