1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -166,7 +166,6 @@ public enum StatusEnum {
     TRACK_END("3", "已结束", "track_end"),
     REQUESTED("4", "已申请", "requested"),
     TRACK_REIMBURSEMENT("5", "已报销", "track_reimbursement"),
-    TRACK_SUCCESST("6", "已通过", "track_success"),
 
     //申请状态
     APPLY_ING("1", "已申请", "apply_ing"),

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/workflow/FuelFingListener.java

@@ -38,8 +38,8 @@ public class FuelFingListener extends AbstractWorkflowTaskListener {
             }
         }
         if (processIsEnd) {
-            fuelFillingInfo.setTravelStatus(StatusEnum.TRACK_SUCCESST.getName());
-            fuelFillingInfo.setTravelStatusFlag(StatusEnum.TRACK_SUCCESST.getFlag());
+            fuelFillingInfo.setStatusFlag(StatusEnum.ORDER_PASSED.getFlag());
+            fuelFillingInfo.setStatus(StatusEnum.ORDER_PASSED.getName());
             fuelFillingInfo.setWorkflowId(null);
             fuelFillingInfo.setApproveStatus(null);
         } else {

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/FuelFillingInfoMapper.xml

@@ -145,6 +145,7 @@
         ff.total_cost as totalCost,
         ff.tfc,
         ff.remark,
+        ff.status,
         ff.travel_status as travelStatus,
         ff.travel_status_flag as travelStatusFlag,
         fd.oil_consumption as oilConsumption,