危险品订单

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -62,6 +62,7 @@ public class SysLoginController {
      */
     @RequestMapping("/wx/login")
     public AjaxResult wxLogin(@RequestBody LoginBody loginBody) {
+        System.out.println("微信登录");
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wx/OrderBillsPlansController.java

@@ -32,7 +32,7 @@ public class OrderBillsPlansController {
         String dataStart = null;
         String dataEnd = null;
         List<String> range = orderBillsPlansVo.getRange();
-        if (range != null && range.size() > 2) {
+        if (range != null && range.size() >= 2) {
             dataStart = range.get(0);
             dataEnd = range.get(1);
         }
@@ -54,12 +54,12 @@ public class OrderBillsPlansController {
 
     /**
      * 保存保单信息
-     * @param orderBillsPlans
+     * @param orderBillsPlansVo
      * @return
      */
     @PostMapping("/put")
-    public AjaxResult putOrderBillsPlansByid(@RequestBody OrderBillsPlans orderBillsPlans) {
-        return orderBillsPlansService.putOrderBillsPlansByid(orderBillsPlans);
+    public AjaxResult putOrderBillsPlansByid(@RequestBody OrderBillsPlansVo orderBillsPlansVo) {
+        return orderBillsPlansService.putOrderBillsPlansByid(orderBillsPlansVo);
     }
 
     /**
@@ -67,19 +67,29 @@ public class OrderBillsPlansController {
      *
      * @return
      */
-    @GetMapping("/items/list/{entityId}")
-    private AjaxResult getItemsList(@PathVariable(value = "entityId") Long entityId) {
-        return AjaxResult.success(orderBillsPlansService.getItemsList(entityId));
+    @GetMapping("/items")
+    private AjaxResult getItemsList() {
+        return AjaxResult.success(orderBillsPlansService.getItemsList());
+    }
+
+    /**
+     * 查询报销信息
+     * @param
+     * @return 数据
+     */
+    @GetMapping("/load-fee-items/{orderNo}")
+    public AjaxResult getLoadFeeItems(@PathVariable(value = "orderNo") Long orderNo) {
+        return AjaxResult.success(orderBillsPlansService.getLoadFeeItems(orderNo));
     }
 
     /**
      * 报销
-     * @param loadFeeItemsVo
+     * @param orderBillsPlansVo
      * @return 操作结果
      */
     @PostMapping("/load-fee-items")
-    public AjaxResult insertLoadFeeItems(LoadFeeItemsVo loadFeeItemsVo) {
-        return orderBillsPlansService.insertLoadFeeItems(loadFeeItemsVo);
+    public AjaxResult insertLoadFeeItems(@RequestBody OrderBillsPlansVo orderBillsPlansVo) {
+        return orderBillsPlansService.insertLoadFeeItems(orderBillsPlansVo);
     }
 
     /**

ruoyi-admin/src/main/resources/logback.xml

@@ -2,6 +2,7 @@
 <configuration>
     <!-- 日志存放路径 -->
 	<property name="log.path" value="/home/ruoyi/logs" />
+<!--    <property name="log.path" value="/Users/longyufei/dev/WarehouseManagement" />-->
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/Empls.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
 
 @Data
 public class Empls {
@@ -9,8 +11,10 @@ public class Empls {
      */
     private Long SysId;
 
+    @TableField(jdbcType = JdbcType.VARCHAR)
     private String Empl;
 
+    @TableField(jdbcType = JdbcType.INTEGER)
     private Long EmplId;
 
     private Long entityId;

ruoyi-system/src/main/java/com/ruoyi/system/domain/Items.java

@@ -1,10 +1,18 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
 
 @Data
 public class Items {
 
+
+    @TableField(jdbcType = JdbcType.INTEGER)
     private Long itemId;
     private String cName;
+    @TableField(jdbcType = JdbcType.VARCHAR)
+    private String itemProp;
+    @TableField(jdbcType = JdbcType.CHAR)
+    private String auditType;
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/LoadFeeItems.java

@@ -1,8 +1,9 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
@@ -17,10 +18,43 @@ public class LoadFeeItems {
     private Date itemDate;
     private String itemAuditType;
 
-    private BigDecimal atm1;
+    private Double amt;
 
     private Long entityId;
 
     private Long lineNo;
 
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double loadetc;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double loadtoll;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double oilhomeQty;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double oilhomeAmt;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double oilappoint1Qty;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double oilappoint1Amt;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double oilappoint2Qty;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double oilappoint2Amt;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double oilcash1Qty;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double oilcash1Amt;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double oilcardQty;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double oilcardAmt;
+    // @TableField(jdbcType = JdbcType.DOUBLE)
+    // private Double oilcardQty;
+    // @TableField(jdbcType = JdbcType.DOUBLE)
+    // private Double oilcardAmt;
+    @TableField(jdbcType = JdbcType.VARCHAR)
+    private String gasstation1;
+    @TableField(jdbcType = JdbcType.VARCHAR)
+    private String gasstation2;
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderBillsPlans.java

@@ -1,48 +1,48 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
 
-import java.math.BigDecimal;
+import java.lang.Double;
 import java.util.Date;
 
 @Data
 public class OrderBillsPlans {
-
-    private String OrderNo;
+    @TableField(jdbcType = JdbcType.VARCHAR)
+    private String orderNo;
     /**
      * id
      */
+    @TableField(jdbcType = JdbcType.INTEGER)
     private Long entityId;
 
     /**
      * 保存订单
      */
-    private BigDecimal LoadQty;
-    private Date LoadDate;
-    private BigDecimal UnLoadQty;
-    private Date UnLoadDate;
-    private String EMPTYADDR1;
-    private Integer ODOMETERSTART;
-    private String EMPTYADDR2;
-    private BigDecimal ODOMETEREND;
-    private BigDecimal LOADMILE;
-    private String Remarks;
-
-
-    private BigDecimal LOADETC;
-    private BigDecimal LOADTOLL;
-    private BigDecimal OILHOMEQTY;
-    private BigDecimal OILHOMEAmt;
-
-    private BigDecimal OILAPPOINT1QTY;
-
-    private BigDecimal OILAPPOINT1Amt;
-
-    private BigDecimal OILAPPOINT2QTY;
-
-    private BigDecimal OILAPPOINT2Amt;
-    private BigDecimal OILCASH1QTY;
-    private BigDecimal OILCASH1AMT;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double loadQty;
+    @TableField(jdbcType = JdbcType.TIMESTAMP)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date loadDate;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double unLoadQty;
+    @TableField(jdbcType = JdbcType.TIMESTAMP)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date unLoadDate;
+    @TableField(jdbcType = JdbcType.VARCHAR)
+    private String emptyaddr1;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double odometerstart;
+    @TableField(jdbcType = JdbcType.VARCHAR)
+    private String emptyaddr2;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private String odometerend;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double loadmile;
+    @TableField(jdbcType = JdbcType.VARCHAR)
+    private String remarks;
 
     private String goodsCName;
     private String loadAddr;
@@ -55,8 +55,50 @@ public class OrderBillsPlans {
     private String unLoadAttnTel;
     private String planRemarks;
 
+    @TableField(jdbcType = JdbcType.INTEGER)
     private Long actId;
+    @TableField(jdbcType = JdbcType.INTEGER)
     private Long lineNo;
+    @TableField(jdbcType = JdbcType.INTEGER)
     private Long carId;
 
+
+    /**
+     * 报销
+     */
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double loadetc;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double loadtoll;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double oilhomeQty;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double oilhomeAmt;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double oilappoint1Qty;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double oilappoint1Amt;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double oilappoint2Qty;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double oilappoint2Amt;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double oilcash1Qty;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double oilcash1Amt;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double oilcardQty;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double oilcardAmt;
+    // @TableField(jdbcType = JdbcType.DOUBLE)
+    // private Double oilcardQty;
+    // @TableField(jdbcType = JdbcType.DOUBLE)
+    // private Double oilcardAmt;
+    @TableField(jdbcType = JdbcType.VARCHAR)
+    private String gasstation1;
+    @TableField(jdbcType = JdbcType.VARCHAR)
+    private String gasstation2;
+
+
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ItemsVo.java

@@ -1,12 +1,20 @@
 package com.ruoyi.system.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.ruoyi.system.domain.Items;
 import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
 
 import java.math.BigDecimal;
 
 @Data
 public class ItemsVo extends Items {
 
-    private BigDecimal atm1;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double amt;
+
+    @TableField(jdbcType = JdbcType.INTEGER)
+    private Long lineNo;
+
+    private Integer[] choice = new Integer[0];
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/LoadFeeItemsVo.java

@@ -1,11 +1,12 @@
 package com.ruoyi.system.domain.vo;
 
+import com.ruoyi.system.domain.LoadFeeItems;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
-public class LoadFeeItemsVo {
+public class LoadFeeItemsVo extends LoadFeeItems {
 
     private List<ItemsVo> itemsVoList;
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/OrderBillsPlansVo.java

@@ -1,14 +1,19 @@
 package com.ruoyi.system.domain.vo;
 
+import com.ruoyi.system.domain.LoadFeeItems;
 import com.ruoyi.system.domain.OrderBillsPlans;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
 @Data
-public class OrderBillsPlansVo {
+public class OrderBillsPlansVo extends OrderBillsPlans {
 
     private List<String> range;
-    private String orderNo;
+
+    private String loadDateString;
+    private String unLoadDateString;
+
+    private List<ItemsVo> itemsVoList;
+    private List<LoadFeeItems> loadFeeItemsList;
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/OrderBillsPlansMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.mapper;
 
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.domain.vo.ItemsVo;
+import com.ruoyi.system.domain.vo.OrderBillsPlansVo;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -35,6 +36,41 @@ public interface OrderBillsPlansMapper {
      * @param orderBillsPlans
      * @return
      */
+
+    /*
+    <set>
+            <if test="loadQty != null and loadQty != ''">
+                LoadQty = #{loadQty},
+            </if>
+            <if test="loadDate != null">
+                LoadDate = #{loadDate},
+            </if>
+            <if test="unLoadQty != null and unLoadQty != ''">
+                UnLoadQty = #{unLoadQty},
+            </if>
+            <if test="unLoadDate != null">
+                UnLoadDate = #{unLoadDate},
+            </if>
+            <if test="emptyaddr1 != null and emptyaddr1 != ''">
+                EMPTYADDR1 = #{emptyaddr1},
+            </if>
+            <if test="odometerstart != null and odometerstart != ''">
+                ODOMETERSTART = #{odometerstart},
+            </if>
+            <if test="emptyaddr2 != null and emptyaddr2 != ''">
+                EMPTYADDR2 = #{emptyaddr2},
+            </if>
+            <if test="odometerend != null and odometerend != ''">
+                ODOMETEREND = #{odometerend},
+            </if>
+            <if test="loadmile != null and loadmile != ''">
+                LOADMILE = #{loadmile},
+            </if>
+            <if test="remarks != null and remarks != ''">
+                Remarks = #{remarks},
+            </if>
+        </set>
+     */
     Integer updateOrderBillsPlansByid(OrderBillsPlans orderBillsPlans);
 
     /**
@@ -44,7 +80,7 @@ public interface OrderBillsPlansMapper {
      */
     List<ItemsVo> getItemsList();
 
-    Integer insertLoadFeeItems(@Param("l") LoadFeeItems loadFeeItems, @Param("o") OrderBillsPlans orderBillsPlans, @Param("e") Empls empls);
+    Integer insertLoadFeeItems(@Param("o") OrderBillsPlansVo orderBillsPlansVo, @Param("i") ItemsVo itemsVo, @Param("e") Empls empls);
 
     @MapKey("itemId")
     Map<String, LoadFeeItems> getLoadFeeitemsMapByentityIdKeyItemId(Long entityId);
@@ -55,11 +91,34 @@ public interface OrderBillsPlansMapper {
      * @param loadFeeItems
      * @return
      */
-    Integer updateLoadFeeItems(LoadFeeItems loadFeeItems);
 
     /**
      * 查询报销费用报销金额下拉选
+     *
      * @return
      */
     List<GasStations> getGasStations();
+
+    /**
+     * 报销
+     * @param orderBillsPlansVo
+     * @return
+     */
+    Integer reimbursement(OrderBillsPlansVo orderBillsPlansVo);
+
+    /**
+     * 删除
+     * @param carId
+     * @return
+     */
+    Integer deleteLoadFeeItemsByCarId(Long carId);
+
+    /**
+     * 查询报销信息
+     * @param
+     * @return 数据
+     */
+    OrderBillsPlansVo getOrderBillsPlansByOrder(Long orderNo);
+
+    List<LoadFeeItems> getLoadFeeItemsByOrder(Long entityid);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IOrderBillsPlansService.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.service;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.Items;
+import com.ruoyi.system.domain.LoadFeeItems;
 import com.ruoyi.system.domain.OrderBillsPlans;
 import com.ruoyi.system.domain.WfTaskList;
 import com.ruoyi.system.domain.vo.ItemsVo;
@@ -27,32 +28,39 @@ public interface IOrderBillsPlansService {
      * @param orderNo orderNo
      * @return 详情
      */
-    OrderBillsPlans getOrderBillsPlansByid(Long orderNo);
+    OrderBillsPlansVo getOrderBillsPlansByid(Long orderNo);
 
 
     /**
      * 保存保单信息
-     * @param orderBillsPlans
+     * @param orderBillsPlansVo
      * @return
      */
-    AjaxResult putOrderBillsPlansByid(OrderBillsPlans orderBillsPlans);
+    AjaxResult putOrderBillsPlansByid(OrderBillsPlansVo orderBillsPlansVo);
 
     /**
      *  获取报销费用list
      * @return
      */
-    List<ItemsVo> getItemsList(Long entityId);
+    List<ItemsVo> getItemsList();
 
     /**
      * 报销
-     * @param loadFeeItemsVo
+     * @param orderBillsPlansVo
      * @return 操作结果
      */
-    AjaxResult insertLoadFeeItems(LoadFeeItemsVo loadFeeItemsVo);
+    AjaxResult insertLoadFeeItems(OrderBillsPlansVo orderBillsPlansVo);
 
     /**
      * 查询报销费用报销金额下拉选
      * @return
      */
     AjaxResult getGasStations();
+
+    /**
+     * 查询报销信息
+     * @param
+     * @return 数据
+     */
+    OrderBillsPlansVo getLoadFeeItems(Long orderNo);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderBillsPlansServiceImpl.java

@@ -12,14 +12,13 @@ import com.ruoyi.system.domain.vo.OrderBillsPlansVo;
 import com.ruoyi.system.mapper.EmplsMapper;
 import com.ruoyi.system.mapper.OrderBillsPlansMapper;
 import com.ruoyi.system.service.IOrderBillsPlansService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.beans.Transient;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * 火烈鸟数据库
@@ -52,15 +51,20 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
 
         // 根据登录名去匹配EMPLS 里面的EMPL  找到 EMPLID
         String userName = SecurityUtils.getLoginUser().getUsername();
-        // Long emplId = emplsMapper.getByEmpl(userName);
+        Long emplId = emplsMapper.getByEmpl(userName);
 
-        Long emplId = 0L;
+        // Long emplId = 0L;
 
         Map<String, Object> map = new HashMap<>();
         if (dataEnd != null && !"".equals(dataEnd)) {
             dataStart += " 00:00:00";
             dataEnd += " 23:59:59";
         }
+
+        if (orderNo != null && !"".equals(orderNo)) {
+            orderNo = "%" + orderNo + "%";
+        }
+
         map.put("emplId", emplId);
         map.put("dataStart", dataStart);
         map.put("dataEnd", dataEnd);
@@ -77,21 +81,58 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
      * @return 详情
      */
     @Override
-    public OrderBillsPlans getOrderBillsPlansByid(Long orderNo) {
-        return orderBillsPlansMapper.getOrderBillsPlansByid(orderNo);
+    public OrderBillsPlansVo getOrderBillsPlansByid(Long orderNo) {
+        OrderBillsPlans orderBillsPlans = orderBillsPlansMapper.getOrderBillsPlansByid(orderNo);
+        OrderBillsPlansVo vo = new OrderBillsPlansVo();
+        BeanUtils.copyProperties(orderBillsPlans, vo);
+
+        SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        Date loadDate = orderBillsPlans.getLoadDate();
+        if (loadDate != null) {
+            vo.setLoadDateString(ft.format(loadDate));
+        }
+        Date unLoadDate = orderBillsPlans.getUnLoadDate();
+        if (unLoadDate != null) {
+            vo.setUnLoadDateString(ft.format(unLoadDate));
+        }
+        return vo;
     }
 
 
     /**
      * 保存保单信息
      *
-     * @param orderBillsPlans
+     * @param orderBillsPlansVo
      * @return
      */
     @Override
-    public AjaxResult putOrderBillsPlansByid(OrderBillsPlans orderBillsPlans) {
+    public AjaxResult putOrderBillsPlansByid(OrderBillsPlansVo orderBillsPlansVo) {
+        OrderBillsPlans orderBillsPlans = new OrderBillsPlans();
+        BeanUtils.copyProperties(orderBillsPlansVo, orderBillsPlans);
+
+        // 日期转换
+        SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            String loadDateString = orderBillsPlansVo.getLoadDateString();
+            String unLoadDateString = orderBillsPlansVo.getUnLoadDateString();
+            if (loadDateString != null && !"".equals(loadDateString)) {
+                orderBillsPlans.setLoadDate(ft.parse(loadDateString));
+            }
+            if (unLoadDateString != null && !"".equals(unLoadDateString)) {
+                orderBillsPlans.setUnLoadDate(ft.parse(unLoadDateString));
+            }
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+        }
+
         Integer i = orderBillsPlansMapper.updateOrderBillsPlansByid(orderBillsPlans);
-        return null;
+
+        if (i == 1) {
+            return AjaxResult.success();
+        } else {
+            return AjaxResult.error();
+        }
     }
 
     /**
@@ -100,67 +141,70 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
      * @return
      */
     @Override
-    public List<ItemsVo> getItemsList(Long entityId) {
-
-        List<ItemsVo> itemsList = orderBillsPlansMapper.getItemsList();
-
-        Map<String, LoadFeeItems> loadFeeItemsMap = orderBillsPlansMapper.getLoadFeeitemsMapByentityIdKeyItemId(entityId);
+    public List<ItemsVo> getItemsList() {
 
-        for (ItemsVo itemsVo : itemsList) {
-            itemsVo.setAtm1(loadFeeItemsMap.get(itemsVo.getItemId()).getAtm1());
-        }
-
-        return itemsList;
+        return orderBillsPlansMapper.getItemsList();
     }
 
     /**
      * 报销
      *
-     * @param loadFeeItemsVo
+     * @param orderBillsPlansVo
      * @return 操作结果
      */
     @Transient
     @Override
-    public AjaxResult insertLoadFeeItems(LoadFeeItemsVo loadFeeItemsVo) {
-        Long entityid = loadFeeItemsVo.getEntityid();
+    public AjaxResult insertLoadFeeItems(OrderBillsPlansVo orderBillsPlansVo) {
 
-        Map<String, LoadFeeItems> map = new HashMap<>();
+        // 更新业务表
+        Integer i = orderBillsPlansMapper.reimbursement(orderBillsPlansVo);
 
-        // 查询数据
-        map = orderBillsPlansMapper.getLoadFeeitemsMapByentityIdKeyItemId(entityid);
-        // 修改为订单号
-        OrderBillsPlans orderBillsPlans = orderBillsPlansMapper.getOrderBillsPlansByid(entityid);
         // 根据登录名去匹配EMPLS 里面的EMPL  找到 EMPLID
         String userName = SecurityUtils.getLoginUser().getUsername();
         Empls empls = emplsMapper.getEmplsByEmpl(userName);
 
 
-        // 更新数据
-        for (ItemsVo itemsVo : loadFeeItemsVo.getItemsVoList()) {
-            //  获取当前类型
-            LoadFeeItems loadFeeItems = map.get(itemsVo.getItemId());
-
-            if (loadFeeItems != null) {
-                // 修改值
-                loadFeeItems.setAtm1(itemsVo.getAtm1());
-                Integer y = orderBillsPlansMapper.updateLoadFeeItems(loadFeeItems);
-            } else {
-                // 雪花id
-                SnowFlakeUtil snowFlakeUtil = new SnowFlakeUtil(12, 13);
-                long nextId = snowFlakeUtil.getNextId();
-                loadFeeItems.setLineNo(nextId);
-                Integer i = orderBillsPlansMapper.insertLoadFeeItems(loadFeeItems, orderBillsPlans, empls);
-            }
+        // 更新明细
+        List<ItemsVo> itemsVoList = orderBillsPlansVo.getItemsVoList();
+
+        // if (itemsVoList == null || itemsVoList.size() == 0) {
+        //     return AjaxResult.success();
+        // }
+
+        // 删除所有明细
+        Integer t = orderBillsPlansMapper.deleteLoadFeeItemsByCarId(orderBillsPlansVo.getCarId());
+
+        Long lineNo = 1L;
+        for (ItemsVo itemsVo : itemsVoList) {
+            itemsVo.setLineNo(lineNo);
+            Integer x = orderBillsPlansMapper.insertLoadFeeItems(orderBillsPlansVo, itemsVo, empls);
+            lineNo ++;
         }
+
+
         return AjaxResult.success();
     }
 
     /**
      * 查询报销费用报销金额下拉选
+     *
      * @return
      */
     @Override
     public AjaxResult getGasStations() {
         return AjaxResult.success(orderBillsPlansMapper.getGasStations());
     }
+
+    /**
+     * 查询报销信息
+     * @param
+     * @return 数据
+     */
+    @Override
+    public OrderBillsPlansVo getLoadFeeItems(Long orderNo) {
+        OrderBillsPlansVo data = orderBillsPlansMapper.getOrderBillsPlansByOrder(orderNo);
+        List<LoadFeeItems> loadFeeItemsList = orderBillsPlansMapper.getLoadFeeItemsByOrder(data.getEntityId());
+        data.setLoadFeeItemsList(loadFeeItemsList);
+        return data;
+    }
 }

ruoyi-system/src/main/resources/mapper/system/EmplsMapper.xml

@@ -8,6 +8,6 @@
         select emplId from EMPLS where EMPL = #{userName}
     </select>
     <select id="getEmplsByEmpl" resultType="com.ruoyi.system.domain.Empls">
-        select empl from empls where EMPL = #{userName}
+        select empl, EmplId from empls where EMPL = #{userName}
     </select>
 </mapper>

ruoyi-system/src/main/resources/mapper/system/OrderBillsPlansMapper.xml

@@ -6,32 +6,47 @@
     <insert id="insertLoadFeeItems">
         Insert Into LoadFeeItems (SysID, EntityID, LineNo, CarID, ItemID, ItemProp, ItemAuditType, Dc, Qty, Price, Amt,
                                   OpUserID, OpUserName, SrcActID, SrcEntityID, SrcLineNo)
-        values (1, #{o.entityId}, #{l.lineNo}, #{o.carId}, #{l.itemId}, #{l.itemProp}, #{l.itemAuditType}, 'C', 1,
-                '录入', '录入',
-                #{e.}, #{e.empl}, #{o.actId}, #{o.entityId}, #{o.lineNo})
+        values (1, #{o.entityId}, #{i.lineNo}, #{o.carId}, #{i.itemId}, #{i.itemProp}, #{i.auditType}, 'C', 1,
+                #{i.amt}, #{i.amt},
+                #{e.EmplId}, #{e.empl}, #{o.actId}, #{o.entityId}, #{o.lineNo})
     </insert>
 
     <update id="updateOrderBillsPlansByid">
         update OrderBillsPlans
-        set LoadQty       = #{LoadQty},
-            LoadDate      = #{LoadDate},
-            UnLoadQty     = #{UnLoadQty},
-            UnLoadDate    = #{UnLoadDate},
-            EMPTYADDR1    = #{EMPTYADDR1},
-            ODOMETERSTART = #{ODOMETERSTART},
-            EMPTYADDR2    = #{EMPTYADDR2},
-            ODOMETEREND   = #{ODOMETEREND},
-            LOADMILE      = #{LOADMILE},
-            Remarks       = #{Remarks}
+        set LoadQty       = #{loadQty},
+            LoadDate      = #{loadDate},
+            UnLoadQty     = #{unLoadQty},
+            UnLoadDate    = #{unLoadDate},
+            EMPTYADDR1    = #{emptyaddr1},
+            ODOMETERSTART = #{odometerstart},
+            EMPTYADDR2    = #{emptyaddr2},
+            ODOMETEREND   = #{odometerend},
+            LOADMILE      = #{loadmile},
+            Remarks       = #{remarks}
         where sysId = '1'
-          and OrderNo = #{OrderNo}
+          and OrderNo = #{orderNo}
     </update>
-    <update id="updateLoadFeeItems">
-        update LoadFeeItems
-        set atm1 = #{atm1}
-        where itemId = #{itemId}
-          and entityId = #{entityId}
+    <update id="reimbursement">
+        update OrderBillsPlans
+        set loadetc        = #{loadetc},
+            loadtoll       = #{loadtoll},
+            oilhomeQty     = #{oilhomeQty},
+            oilhomeAmt     = #{oilhomeAmt},
+            oilappoint1Qty = #{oilappoint1Qty},
+            oilappoint1Amt = #{oilappoint1Amt},
+            oilappoint2Qty = #{oilappoint2Qty},
+            oilappoint2Amt = #{oilappoint2Amt},
+            oilcash1Qty    = #{oilcash1Qty},
+            oilcash1Amt    = #{oilcash1Amt},
+            oilcardQty     = #{oilcardQty},
+            oilcardAmt     = #{oilcardAmt},
+            gasstation1    = #{gasstation1},
+            gasstation2    = #{gasstation2}
+        where orderNo = #{orderNo}
     </update>
+    <delete id="deleteLoadFeeItemsByCarId">
+        delete from LoadFeeItems where CarId = #{carId}
+    </delete>
 
 
     <select id="getOrderBillsPlansLsit" parameterType="Map" resultType="com.ruoyi.system.domain.WfTaskList">
@@ -86,7 +101,7 @@
             and ((p.DRIVER1ID=#{emplId, jdbcType=VARCHAR}) or (p.SUPERCARGOID=#{emplId, jdbcType=VARCHAR}))
 
             <if test="orderNo != null and orderNo != ''">
---                 and p.orderNo like concat('%', #{orderNo}, '%')
+                and p.orderNo like #{orderNo}
             </if>
         </where>
 
@@ -94,16 +109,27 @@
     </select>
 
     <select id="getOrderBillsPlansByid" resultType="com.ruoyi.system.domain.OrderBillsPlans">
-        Select g.CName  goodsCName
-             , p.LoadAddr loadAddr
-             , l.SName  loadFactory
-             , p.LoadAttn loadAttn
-             , p.LoadAttnTel loadAttnTel
-             , p.UnLoadAddr unLoadAddr
-             , ul.SName unLoadFactory
-             , p.UnLoadAttn unLoadAttn
+        Select g.CName         goodsCName
+             , p.LoadAddr      loadAddr
+             , l.SName         loadFactory
+             , p.LoadAttn      loadAttn
+             , p.LoadAttnTel   loadAttnTel
+             , p.UnLoadAddr    unLoadAddr
+             , ul.SName        unLoadFactory
+             , p.UnLoadAttn    unLoadAttn
              , p.UNLoadAttnTel unLoadAttnTel
              , p.planRemarks
+             , p.orderNo
+             , p.loadQty
+             , p.loadDate
+             , p.unLoadQty
+             , p.unLoadDate
+             , p.emptyaddr1
+             , p.odometerstart
+             , p.emptyaddr2
+             , p.odometerend
+             , p.loadmile
+             , p.remarks
         from OrderBillsPlans p
                  Left join Empls e on (e.SysID = p.SysID and e.EmplID = p.TransactID)
                  Left join Empls dr1 on (dr1.SysID = p.SysID and dr1.EmplID = p.DRIVER1ID)
@@ -118,7 +144,7 @@
 
 
     <select id="getItemsList" resultType="com.ruoyi.system.domain.vo.ItemsVo">
-        select itemId, cName from  Items where SysID=1 and  itemProp='F'
+        select itemId, cName, itemProp, auditType from Items where SysID=1 and  itemProp='F'
     </select>
     <select id="getLoadFeeitemsMapByentityIdKeyItemId" resultType="java.util.Map">
         select itemId, atm1, entityId from LoadFeeItems where entityId = #{entityId}
@@ -126,4 +152,30 @@
     <select id="getGasStations" resultType="com.ruoyi.system.domain.GasStations">
         select gasStationId, cName from GasStations
     </select>
+    <select id="getOrderBillsPlansByOrder" resultType="com.ruoyi.system.domain.vo.OrderBillsPlansVo">
+        select loadetc
+             , loadtoll
+             , oilhomeQty
+             , oilhomeAmt
+             , oilappoint1Qty
+             , oilappoint1Amt
+             , oilappoint2Qty
+             , oilappoint2Amt
+             , oilcash1Qty
+             , oilcash1Amt
+             , oilcardQty
+             , oilcardAmt
+             , gasstation1
+             , gasstation2
+             , entityid
+             , orderNo
+             , carId
+             , lineNo
+             , actId
+        from OrderBillsPlans
+        where orderNo = #{orderNo}
+    </select>
+    <select id="getLoadFeeItemsByOrder" resultType="com.ruoyi.system.domain.LoadFeeItems">
+        select itemid, amt from LoadFeeItems where sysid = 1 and entityid = #{entityid}
+    </select>
 </mapper>