dongyongwei преди 4 години
родител
ревизия
24d675dfa7

+ 18 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/orderPlan/ftmsorderbillsfeesController.java

@@ -106,6 +106,24 @@ public class ftmsorderbillsfeesController extends BaseController {
     }
 
     /**
+     * 多条条费用提交(暂存)
+     */
+    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:add')")
+    @Log(title = "费用补充", businessType = BusinessType.INSERT)
+    @PostMapping("/addModifyList")
+    @RepeatSubmit
+    public AjaxResult insertFTmsorderbillsfeesAddTemporaryStorageList(@RequestParam("cars") String cars,
+                                                                  @RequestParam("ftmsorderbillsfees") String ftmsorderbillsfees) {
+        if (StringUtils.isEmpty(cars) || "{}".equals(cars)) {
+            return AjaxResult.error("未找到主表数据,请确认");
+        }
+        if (StringUtils.isEmpty(ftmsorderbillsfees) || "{}".equals(ftmsorderbillsfees)) {
+            return AjaxResult.error("未找到费用数据,请确认");
+        }
+        return iftmsorderbillsfeesService.insertFTmsorderbillsfeesAddTemporaryStorageList(cars, ftmsorderbillsfees);
+    }
+
+    /**
      * 单条费用提交(暂存)提交审批
      * 2021-07-19 dongyongwei
      */

+ 2 - 0
ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/IftmsorderbillsfeesService.java

@@ -38,6 +38,8 @@ public interface IftmsorderbillsfeesService {
      */
     public AjaxResult insertFTmsorderbillsfeesAddTemporaryStorage(String cars, String fees);
 
+    public AjaxResult insertFTmsorderbillsfeesAddTemporaryStorageList(String cars, String fees);
+
     /**
      * 查询车队费用列表
      *

+ 13 - 0
ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillsfeesServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.orderPlan.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.basicData.mapper.TCorpsMapper;
@@ -158,6 +159,16 @@ public class FtmsorderbillsfeesServiceImpl implements IftmsorderbillsfeesService
         return AjaxResult.success();
     }
 
+    /** 多条 */
+    @Override
+    public AjaxResult insertFTmsorderbillsfeesAddTemporaryStorageList(String cars, String fees) {
+        List<Ftmsorderbillsfees> ftmsorderbillscarsList = JSONArray.parseArray(fees,Ftmsorderbillsfees.class);
+        for (int i = 0; i < ftmsorderbillscarsList.size(); i++) {
+            this.insertFTmsorderbillsfeesAddTemporaryStorage(cars, JSON.toJSONString(ftmsorderbillscarsList.get(i)));
+        }
+        return AjaxResult.success();
+    }
+
     /**
      * 查询车队费用列表
      *
@@ -283,8 +294,10 @@ public class FtmsorderbillsfeesServiceImpl implements IftmsorderbillsfeesService
         //先获取审批数据行
         Ftmsorderbillsfees ftmsorderbillsfees = fTmsorderbillsfeesMapper.selectFTmsorderbillsfeesModifyById(fId);
         ftmsorderbillsfees.setfBillstatus(6L);
+        fTmsorderbillsfeesMapper.updateFTmsorderbillsfeesModify(ftmsorderbillsfees);
         //回写逻辑,srcMId返回给pId,进行绑定
         ftmsorderbillsfees.setfPid(ftmsorderbillsfees.getSrcId());
+        ftmsorderbillsfees.setfId(null);
         fTmsorderbillsfeesMapper.insertFTmsorderbillsfees(ftmsorderbillsfees);
         return AjaxResult.success();
         /*