1、无法将人员打回bug修复

2、form表单校验后无法重新提交bug修复
3、页面丢失信息bug修复
4、导出excel格式修改

src/main/java/com/zcloud/controller/xgf/FlowTrainController.java

@@ -100,7 +100,7 @@ public class FlowTrainController extends BaseController {
     @RequestMapping(value = "/approveUser")
     @ResponseBody
     public Object approveUser() throws Exception {
-        Map<String,Object> map = new HashMap<String,Object>();
+        Map<String, Object> map = new HashMap<String, Object>();
         PageData pd = this.getPageData();
         trainUsersService.approveUser(pd);
         map.put("result", "success");
@@ -142,7 +142,7 @@ public class FlowTrainController extends BaseController {
     @RequestMapping(value = "/endApproval")
     @ResponseBody
     public Object endApproval() throws Exception {
-        Map<String,Object> map = new HashMap<String,Object>();
+        Map<String, Object> map = new HashMap<String, Object>();
         PageData pd = this.getPageData();
         trainUsersService.endApproval(pd);
         map.put("result", "success");
@@ -164,8 +164,10 @@ public class FlowTrainController extends BaseController {
         map.put("result", "success");
         return map;
     }
+
     /**
      * 获取流程节点名称
+     *
      * @date 2024-02-23
      * @author liu jun
      */
@@ -197,7 +199,11 @@ public class FlowTrainController extends BaseController {
                 default:
                     throw new Exception("FLOWS_STEP不合法");
             }
-        } else{
+        } else if ("2".equals(request.getString("FLOWS_TYPE"))) {
+            request.getString("FLOWS_STEP");
+            map.put("Department", "指定监管部门");
+            map.put("User", "指定监管部门审批人");
+        } else {
             if (request.getString("FLOWS_STEP").equals("0")) {
                 map.put("Department", "监管部门");
                 map.put("User", "监管部门审批人");

src/main/java/com/zcloud/flow/xgf/GuFen/GuFenWeiTuoCharge.java

@@ -116,7 +116,7 @@ public class GuFenWeiTuoCharge extends NodeComponent {
     @Override
     public boolean isEnd() {
         XgfFlowDto info = this.getRequestData();
-        if ("0".equals(info.getSTATUS())) {
+        if ("0".equals(info.getSTATUS()) && "1".equals(info.getIterator())) {
             return true;
         }
         return super.isEnd();

src/main/java/com/zcloud/flow/xgf/GuFen/GuFenWeiTuoSupervise.java

@@ -32,6 +32,7 @@ public class GuFenWeiTuoSupervise extends NodeComponent {
 
     @Override
     public boolean isAccess() {
+        System.out.println("2???????");
         XgfFlowDto info = this.getRequestData();
         // 如果指针没有数据，赋值后自动结束
         if (StringUtils.isBlank(info.getIterator())) {
@@ -95,7 +96,7 @@ public class GuFenWeiTuoSupervise extends NodeComponent {
     @Override
     public boolean isEnd() {
         XgfFlowDto info = this.getRequestData();
-        if ("0".equals(info.getSTATUS())) {
+        if ("0".equals(info.getSTATUS()) && "2".equals(info.getIterator())) {
             return true;
         }
         return super.isEnd();

src/main/resources/application-master.properties

@@ -99,3 +99,6 @@ http.file.url=http://192.168.192.201:8991/file/
 
 #河北秦安文件服务器前缀
 heBeiQinAnFile=https://file.zcloudchina.com/YTHFile
+
+liteflow.rule-source=flow.xml
+liteflow.print-execution-log=false