请款改用新重新发起

hx-account/src/main/java/com/fjhx/account/flow/AccountRequestFundsFlow.java

@@ -20,7 +20,6 @@ import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.flow.core.FlowThreadLocalUtil;
 import com.fjhx.flow.enums.FlowStatusEnum;
-import com.fjhx.flow.enums.HandleTypeEnum;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -128,21 +127,27 @@ public class AccountRequestFundsFlow extends FlowDelegate {
 
     }
 
+    /**
+     * 重新发起
+     */
     @Override
-    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
-        //重新发起
-        if (FlowStatusEnum.READY_START.equals(flowStatusEnum)) {
-           reStart();
-        }
-        //驳回
-        if (FlowStatusEnum.REJECT.equals(flowStatusEnum)) {
-            accountRequestFundsService.update(q -> q
-                    .eq(AccountRequestFunds::getId, businessId)
-                    .set(AccountRequestFunds::getStatus, FlowStatusEnum1.REJECT.getKey())//20为驳回
-                    .set(BasePo::getUpdateTime, new Date())
-                    .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
-            );
-        }
+    public void relaunch(Long flowId, Long businessId, FlowStatusEnum flowStatus, JSONObject submitData) {
+        super.relaunch(flowId, businessId, flowStatus, submitData);
+        reStart();
+    }
+
+    /**
+     * 驳回
+     */
+    @Override
+    public void reject(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        super.reject(flowId, businessId, flowStatus);
+        accountRequestFundsService.update(q -> q
+                .eq(AccountRequestFunds::getId, businessId)
+                .set(AccountRequestFunds::getStatus, FlowStatusEnum1.REJECT.getKey())//20为驳回
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
     }
 
     /**
@@ -223,10 +228,10 @@ public class AccountRequestFundsFlow extends FlowDelegate {
      * 重新发起
      */
     public void reStart() {
-            JSONObject submitData = FlowThreadLocalUtil.getCurrentData();
-            // 获取提交数据
-            AccountRequestFundsDto accountRequestFundsDto = submitData.toJavaObject(AccountRequestFundsDto.class);
-            commStart(accountRequestFundsDto, 1);
+        JSONObject submitData = FlowThreadLocalUtil.getCurrentData();
+        // 获取提交数据
+        AccountRequestFundsDto accountRequestFundsDto = submitData.toJavaObject(AccountRequestFundsDto.class);
+        commStart(accountRequestFundsDto, 1);
     }
 
 }