工作流 修改接口传参

report-activity/src/main/java/com/adc/da/wkflow/business_activiti/model/ActivitiModelController.java

@@ -55,7 +55,7 @@ public class ActivitiModelController {
 	@ApiOperation(value = "新建模板")
 	@SuppressWarnings("deprecation")
 	@GetMapping("/createModel")
-	public Model createModel(String name, String desc, String category){
+	public Model createModel(String name, String desc){
 		try {
 			ObjectNode editorNode = objectMapper.createObjectNode();
 			editorNode.put("id", "canvas");
@@ -72,7 +72,6 @@ public class ActivitiModelController {
 			model.setTenantId("子系统1");
 			model.setKey(key);
 			model.setName(name);
-			model.setCategory(category);
 			model.setVersion(Integer.parseInt(
 					String.valueOf(repositoryService.createModelQuery()
 							.modelKey(model.getKey()).count() + 1)));

report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java

@@ -59,7 +59,7 @@ public class TaskController {
 	@GetMapping("/get_list_by_instance")
 	public List<Map<String, Object>> get_list_by_instance(String prcNum,String sortWord,String shunxu) {
 		QueryWrapper queryWrapper = new QueryWrapper();
-
+		queryWrapper.eq("PRC_NUM",prcNum);
 		BusProcessName one = iBusProcessNameService.getOne(queryWrapper);
 		// 缺了PRCID导致的BUg
 		if (one == null || StringUtils.isEmpty(one.getPrcId())){

report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java

@@ -232,8 +232,9 @@ public class TodoTaskController {
     @ApiImplicitParams({@ApiImplicitParam(name = "taskId", value = "任务id"),
             @ApiImplicitParam(name = "userId", value = "完成任务用户Id")})
     @PostMapping("/completeTask")
-    public Wrapper<String> completeTaskByUserId(@RequestBody ApproveDataVO busMes,@RequestBody String dateJson) {
+    public Wrapper<String> completeTaskByUserId(@RequestBody ApproveDataVO busMes) {
         log.info("!!!!!!!!!!!!!TaskId!!!!!!!!!!!!!!!"+busMes.getTaskId());
+        String dataJson = busMes.getDataJson();
         if (busMes.getTaskId() != null && !busMes.getTaskId().equals("")) {
             Task task = taskService.createTaskQuery().taskId(busMes.getTaskId()).singleResult();
             if(task!=null){
@@ -247,9 +248,9 @@ public class TodoTaskController {
                 busProcessApprove.setCreateDate(new Date());
                 busProcessApprove.setFromValsJson(busMes.getSubmitJson());
                 iBusProcessApproveService.save(busProcessApprove);
-                if (StringUtils.isNotEmpty(dateJson)){
+                if (StringUtils.isNotEmpty(dataJson)){
                     //根据业务情况 对业务数据进行saveOrupdate
-                    activitDefineService.saveOrUpdateDate(busMes.getPrcType(),dateJson);
+                    activitDefineService.saveOrUpdateDate(busMes.getPrcType(),dataJson);
                 }
                 taskService.complete(busMes.getTaskId());
             }
@@ -383,7 +384,8 @@ public class TodoTaskController {
      */
     @ApiOperation(value = "保存任务第一步")
     @PostMapping("/saveTaskFirst")
-    public Wrapper<String> saveTaskFirst(@RequestBody ApproveDataVO approveDataVO,@RequestBody String dataJson) {
+    public Wrapper<String> saveTaskFirst(@RequestBody ApproveDataVO approveDataVO) {
+        String dataJson = approveDataVO.getDataJson();
         String saveId = null;
         if (approveDataVO.getId() != null && !approveDataVO.getId().equals("")) {
             saveId = approveDataVO.getId();

report-activity/src/main/java/com/adc/da/wkflow/business_main/vo/ApproveDataVO.java

@@ -14,7 +14,15 @@ public class ApproveDataVO {
 
     private String taskId;
 
-    private String submitJson; // 提交的数据
+    /**
+     * 提交的审核数据
+     */
+    private String submitJson;
+
+    /**
+     * 提交的业务数据
+     */
+    private String dataJson;
 
     private String prcType;