更新

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/UseStatusEnum.java

@@ -13,11 +13,10 @@ import java.util.Map;
 @AllArgsConstructor
 public enum UseStatusEnum {
 
-    SUBMIT("使用单位提交", "submit", "使用单位待提交"),
-    RECEIVE("一级受理", "receive", "一级待受理"),
-    PRELIMINARY("二级受理", "preliminary", "二级待受理"),
-    REEXAMINE("三级受理", "reexamine", "三级待受理");
-
+    SUBMIT("使用单位提交", "submit", "使用单位待提交", "一级受理已驳回", "使用单位提交已撤回"),
+    RECEIVE("一级受理", "receive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
+    PRELIMINARY("二级受理", "preliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
+    REEXAMINE("三级受理", "reexamine", "三级待受理","","");
 
 
     private final String name;
@@ -26,6 +25,10 @@ public enum UseStatusEnum {
 
     private final String pass;
 
+    private final String reject;
+
+    private final String rollBack;
+
 
 
     public static UseStatusEnum getMessage(String name){

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java

@@ -47,7 +47,7 @@ public class JgUseRegistrationController extends BaseController {
     @PostMapping(value = "/flowExecute")
     @ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
     public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
-        jgUseRegistrationServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),String.valueOf(map.get("instanceId")), String.valueOf(map.get("operate")), String.valueOf(map.get("comment")), true);
+        jgUseRegistrationServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),String.valueOf(map.get("instanceId")), String.valueOf(map.get("operate")), String.valueOf(map.get("comment")));
         return ResponseHelper.buildResponse("ok");
     }