途宝报单

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

@@ -45,6 +45,9 @@ public class AttachmngsController {
             return AjaxResult.error("上传失败请重试2");
         }
 
+        // String fileName = file.getOriginalFilename();
+        // String suffixName = fileName.substring(fileName.lastIndexOf("."));
+
         // 拼接url
         String serverName = request.getServerName();
         int serverPort = request.getServerPort();
@@ -74,11 +77,10 @@ public class AttachmngsController {
         return bytes;
     }
 
-    private byte[] toPrimitives(Byte[] oBytes)
-    {
+    private byte[] toPrimitives(Byte[] oBytes) {
         byte[] bytes = new byte[oBytes.length];
 
-        for(int i = 0; i < oBytes.length; i++) {
+        for (int i = 0; i < oBytes.length; i++) {
             bytes[i] = oBytes[i];
         }
 

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

@@ -83,8 +83,9 @@ public class OrderBillsPlansController {
      * @return 数据
      */
     @GetMapping("/load-fee-items/{orderNo}")
-    public AjaxResult getLoadFeeItems(@PathVariable(value = "orderNo") Long orderNo) {
-        return AjaxResult.success(orderBillsPlansService.getLoadFeeItems(orderNo));
+    public AjaxResult getLoadFeeItems(@PathVariable(value = "orderNo") Long orderNo,
+                                      HttpServletRequest request) {
+        return AjaxResult.success(orderBillsPlansService.getLoadFeeItems(orderNo, request));
     }
 
     /**

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

@@ -103,6 +103,10 @@ public class OrderBillsPlans {
     private String gasstation2;
 
 
+    @TableField(jdbcType = JdbcType.INTEGER)
+    private Long srcEntityId;
+
+
     private String driver1Name;
     private String driver1mobile;
 

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

@@ -27,4 +27,6 @@ public class TmsAttachMngs {
 
     @TableField(jdbcType = JdbcType.INTEGER)
     private Long loadBillsSysId;
+
+    private String suffixName;
 }

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

@@ -44,4 +44,7 @@ public class WfTaskList {
     private Long billStatus;
     private String billStatusName;
 
+    private Long status317;
+    private Long status376;
+
 }

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

@@ -140,4 +140,11 @@ public interface OrderBillsPlansMapper {
      * @return
      */
     Integer deleteTmsAttachMngsByAttachId(Long attachId);
+
+    /**
+     * 根据EntityId更新
+     * @param srcEntityId
+     * @return
+     */
+    Integer updateLoadBillsByEntityID(OrderBillsPlansVo srcEntityId);
 }

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

@@ -67,4 +67,11 @@ public interface SysConfigMapper {
      * @return 结果
      */
     public int deleteConfigByIds(Long[] configIds);
+
+    /**
+     * 根据key查询value
+     * @param configKey
+     * @return
+     */
+    String getByConfigKey(String configKey);
 }

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

@@ -60,7 +60,7 @@ public interface IOrderBillsPlansService {
      * @param
      * @return 数据
      */
-    OrderBillsPlansVo getLoadFeeItems(Long orderNo);
+    OrderBillsPlansVo getLoadFeeItems(Long orderNo, HttpServletRequest request);
 
     /**
      * 插入主库图片数据

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

@@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.SnowFlakeUtil;
@@ -12,6 +13,7 @@ import com.ruoyi.system.domain.vo.LoadFeeItemsVo;
 import com.ruoyi.system.domain.vo.OrderBillsPlansVo;
 import com.ruoyi.system.mapper.EmplsMapper;
 import com.ruoyi.system.mapper.OrderBillsPlansMapper;
+import com.ruoyi.system.mapper.SysConfigMapper;
 import com.ruoyi.system.service.IOrderBillsPlansService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +43,10 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
     @Autowired
     private EmplsMapper emplsMapper;
 
+
+    @Autowired
+    private RedisCache redisCache;
+
     /**
      * 查询业务表数据List
      *
@@ -67,17 +73,28 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
             orderNo = "%" + orderNo + "%";
         }
 
+        Object actId = redisCache.getCacheObject("sys_config:risk.actId");
+
         map.put("emplId", emplId);
         map.put("dataStart", dataStart);
         map.put("dataEnd", dataEnd);
         map.put("orderNo", orderNo);
+        map.put("actId", actId.toString());
 
         List<WfTaskList> orderBillsPlansList = orderBillsPlansMapper.getOrderBillsPlansLsit(map);
         for (WfTaskList wfTaskList : orderBillsPlansList) {
-            if (wfTaskList.getBillStatus() == 6) {
-                wfTaskList.setBillStatusName("禁止修改");
-            } else if (wfTaskList.getBillStatus() == 2) {
-                wfTaskList.setBillStatusName("允许修改");
+            Long status317 = wfTaskList.getStatus317();
+            Long status376 = wfTaskList.getStatus376();
+            if (status317 == null || status376 == null) {
+                break;
+            }
+
+            if (status317 == 2) {
+                wfTaskList.setBillStatusName("里程待提交");
+            } else if (status376 == 2 || status376 == 0) {
+                wfTaskList.setBillStatusName("费用待提交");
+            } else if (status376 == 6) {
+                wfTaskList.setBillStatusName("报单完成");
             }
         }
         return orderBillsPlansList;
@@ -106,6 +123,10 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
             vo.setUnLoadDateString(ft.format(unLoadDate));
         }
 
+        Object actId = redisCache.getCacheObject("sys_config:risk.actId");
+
+        orderBillsPlans.setActId(Long.valueOf(actId.toString()));
+
         // 查找照片List
         List<Long> attachIdList = orderBillsPlansMapper.getAttachMngsAttachIdBySysIdAndEntityIdAndActId(orderBillsPlans);
 
@@ -144,9 +165,13 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
             String unLoadDateString = orderBillsPlansVo.getUnLoadDateString();
             if (loadDateString != null && !"".equals(loadDateString)) {
                 orderBillsPlans.setLoadDate(ft.parse(loadDateString));
+            } else {
+                orderBillsPlans.setLoadDate(null);
             }
             if (unLoadDateString != null && !"".equals(unLoadDateString)) {
                 orderBillsPlans.setUnLoadDate(ft.parse(unLoadDateString));
+            } else {
+                orderBillsPlans.setUnLoadDate(null);
             }
         } catch (Exception e) {
             System.out.println(e.getMessage());
@@ -184,6 +209,8 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
 
         // 更新业务表
         Integer i = orderBillsPlansMapper.updateOrderBillsPlansByOrderNo(orderBillsPlansVo);
+        // 更新LoadBills
+        Integer y = orderBillsPlansMapper.updateLoadBillsByEntityID(orderBillsPlansVo);
 
         // 根据登录名去匹配EMPLS 里面的EMPL  找到 EMPLID
         String userName = SecurityUtils.getLoginUser().getUsername();
@@ -237,8 +264,29 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
      * @return 数据
      */
     @Override
-    public OrderBillsPlansVo getLoadFeeItems(Long orderNo) {
+    public OrderBillsPlansVo getLoadFeeItems(Long orderNo, HttpServletRequest request) {
         OrderBillsPlansVo data = orderBillsPlansMapper.getOrderBillsPlansByOrder(orderNo);
+        // 图片
+        Object actId = redisCache.getCacheObject("sys_config:risk.actId");
+        data.setActId(Long.valueOf(actId.toString()));
+        // 查找照片List
+        List<Long> attachIdList = orderBillsPlansMapper.getAttachMngsAttachIdBySysIdAndEntityIdAndActId(data);
+
+        List<ImgVo> fileList1 = new ArrayList<>();
+        for (Long attachId : attachIdList) {
+            ImgVo imgVo = new ImgVo();
+
+            String serverName = request.getServerName();
+            int serverPort = request.getServerPort();
+            String url = "http://" + serverName + ":" + serverPort + "/attachmngs/img/" + attachId;
+            imgVo.setUrl(url);
+
+            fileList1.add(imgVo);
+        }
+
+        data.setFileList1(fileList1);
+
+
         List<LoadFeeItems> loadFeeItemsList = orderBillsPlansMapper.getLoadFeeItemsByEntityId(data.getLoadBillsEntityId());
         data.setLoadFeeItemsList(loadFeeItemsList);
         return data;
@@ -246,6 +294,7 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
 
     /**
      * 插入主库图片数据
+     *
      * @param tmsAttachMngs
      * @return
      */
@@ -257,7 +306,8 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
 
         String username = SecurityUtils.getLoginUser().getUsername();
         tmsAttachMngs.setActId(375L);
-        tmsAttachMngs.setAttachName(UUID.randomUUID().toString().replace("-", ""));
+        String replace = UUID.randomUUID().toString().replace("-", "");
+        tmsAttachMngs.setAttachName(replace + ".jpg");
         tmsAttachMngs.setLineNo(lineNo == null ? 1L : lineNo + 1);
         tmsAttachMngs.setUserName(username);
 
@@ -270,6 +320,7 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
 
     /**
      * 根据attachId在Tms库的AttachMngs表删除数据
+     *
      * @param attachId
      * @return
      */

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

@@ -44,8 +44,9 @@
             oilcash1Amt    = #{oilcash1Amt},
             oilcardQty     = #{oilcardQty},
             oilcardAmt     = #{oilcardAmt},
-            gasstation1    = #{gasstation1},
-            gasstation2    = #{gasstation2}
+            oilcard1Qty     = #{oilcardQty},
+            oilcard1Amt     = #{oilcardAmt},
+            driverassdesc = #{driverassdesc}
         where orderNo = #{orderNo}
     </update>
     <update id="updateOrderBillsPlansBySysidEntityidLineno">
@@ -60,6 +61,13 @@
         where sysId = '1'
           AND entityid = #{entityId} and lineno = #{lineNo}
     </update>
+    <update id="updateLoadBillsByEntityID">
+        update LoadBills
+        set gasstation1 = #{gasstation1},
+            gasstation2 = #{gasstation2}
+        where SrcEntityID = #{entityId}
+    </update>
+
     <delete id="deleteLoadFeeItemsByEntityId">
         delete from LoadFeeItems where sysid = 1 and entityid = #{entityId}
     </delete>
@@ -102,7 +110,10 @@
         , p.rightqty
 
         , b.billStatus
+        ,t.Status status317
+        , tt.Status status376
         from wf_TaskList t
+        Left join wf_TaskList tt on (tt.SysID=t.SysID and tt.ActID=#{actId, jdbcType=VARCHAR} and tt.EntityID=t.EntityID)
         Left join LoadBills b on (b.SysID=t.SysID and b.EntityID=t.EntityID)
         Left join OrderBillsPlans p on (p.SysID=b.SysID and p.EntityID=b.SrcEntityID and p.LineNo=b.SrcLineNo)
         Left join Empls e on (e.SysID=b.SysID and e.EmplID=b.TransactID)
@@ -202,8 +213,8 @@
              , o.oilcash1Amt
              , o.oilcardQty
              , o.oilcardAmt
-             , o.gasstation1
-             , o.gasstation2
+             , b.gasstation1
+             , b.gasstation2
              , o.entityId
              , o.orderNo
              , o.carId
@@ -211,7 +222,11 @@
              , o.actId
              , b.entityID loadBillsEntityId
              , dr1.Empl   driver1Name
-             ,dr1.mobile driver1mobile
+             , dr1.mobile driver1mobile
+             , b.billStatus
+             , b.entityId      loadBillsEntityId
+             , b.sysId         loadBillsSysId
+             , o.driverassdesc
         FROM OrderBillsPlans o
                  INNER JOIN LoadBills b
                             ON
@@ -220,7 +235,8 @@
                                     AND o.LineNo = b.SrcLineNo
 
                  Left join Empls dr1 on dr1.EmplID = o.DRIVER1ID
-        where o.orderNo = #{orderNo} and dr1.SysID = 1
+        where o.orderNo = #{orderNo}
+          and dr1.SysID = 1
     </select>
     <select id="getLoadFeeItemsByEntityId" resultType="com.ruoyi.system.domain.LoadFeeItems">
         select l.itemid, l.amt, i.cName, i.itemProp, i.auditType, l.lineNo, l.entityid
@@ -236,6 +252,15 @@
         select attachId from AttachMngs where SysId = #{loadBillsSysId} and EntityId = #{loadBillsEntityId} and LineNo = #{lineNo}
     </select>
     <select id="getAttachMngsAttachIdBySysIdAndEntityIdAndActId" resultType="java.lang.Long">
-        select attachId from AttachMngs where SysId = #{loadBillsSysId} and EntityId = #{loadBillsEntityId} and ActID = 375
+        select attachId from AttachMngs where SysId = #{loadBillsSysId} and EntityId = #{loadBillsEntityId} and ActID = #{actId}
+    </select>
+    <select id="getLoadBillsByOrderNo">
+        select *
+        FROM OrderBillsPlans o
+                 INNER JOIN LoadBills b
+                            ON
+                                        o.SysID = b.SysID
+                                    AND o.EntityID = b.SrcEntityID
+                                    AND o.LineNo = b.SrcLineNo
     </select>
 </mapper>

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

@@ -63,6 +63,9 @@
         <include refid="selectConfigVo"/>
         where config_key = #{configKey} limit 1
     </select>
+    <select id="getByConfigKey" resultType="java.lang.String">
+        select config_value from sys_config where config_key = #{configKey}
+    </select>
 
     <insert id="insertConfig" parameterType="SysConfig">
         insert into sys_config (