途宝报单新需求

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

@@ -63,13 +63,14 @@ public class AttachmngsController {
         // 水印
 //         String watermark = longitude + "," + latitude + "-" + date;
         SysUser user = SecurityUtils.getLoginUser().getUser();
-        String watermark = longitude + "," + latitude + "-" + date + "-" + user.getNickName();
+//        String watermark = longitude + "," + latitude + "-" + date + "-" + user.getNickName();
+        String watermark = date;
         File file2 = AddWatermarkUtil.transferToFile(file);
         // addWaterMark(file2, file2, watermark);
 
 
         // 如果图片大于一兆压缩
-        while (AddWatermarkUtil.fileToTransfer(file2).getBytes().length > 1048576) {
+        while (AddWatermarkUtil.fileToTransfer(file2).getBytes().length > 240800) {
             // 压缩
             Thumbnails.of(file2)
                     .scale(1f) //图片大小（长宽）压缩比例 从0-1，1表示原图
@@ -78,8 +79,8 @@ public class AttachmngsController {
         }
 
 
-        // AddWatermarkUtil.waterPress(file2, file2, Color.DARK_GRAY, 48, watermark);
-        AddWatermarkUtil.addWaterMark(file2, file2, Color.DARK_GRAY, 48, watermark);
+         AddWatermarkUtil.waterPress(file2, file2, Color.DARK_GRAY, 48, watermark);
+//        AddWatermarkUtil.addWaterMark(file2, file2, Color.DARK_GRAY, 48, watermark);
 
         // 转二进制
         byte[] bytes = AddWatermarkUtil.fileToTransfer(file2).getBytes();

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

@@ -40,12 +40,9 @@ public class OrderBillsPlansController {
             dataEnd = range.get(1);
         }
 
-        String orderNo = orderBillsPlansVo.getOrderNo();
-        Integer head = orderBillsPlansVo.getHead();
-        Integer tail = orderBillsPlansVo.getTail();
-        String type = orderBillsPlansVo.getType();
 
-        return AjaxResult.success(orderBillsPlansService.getOrderBillsPlansList(dataStart, dataEnd, orderNo, head, tail, type));
+
+        return AjaxResult.success(orderBillsPlansService.getOrderBillsPlansList(dataStart, dataEnd, orderBillsPlansVo));
     }
 
     /**

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

@@ -55,4 +55,9 @@ public class OrderBillsPlansVo extends OrderBillsPlans {
      */
     private String auditType;
 
+    /**
+     * 流程状态
+     */
+    private String flowType;
+
 }

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

@@ -18,6 +18,8 @@ public interface OrderBillsPlansMapper {
      * @param emplId
      * @param dataStart
      * @param dataEnd
+     *
+     *     and (p.ifStarted = 'F' or p.ifStarted = 'S' or p.ifStarted = 'A' or p.ifStarted = 'B')
      * @return
      */
     List<WfTaskList> getOrderBillsPlansLsit(Map map);
@@ -43,6 +45,23 @@ public interface OrderBillsPlansMapper {
      *
      * @param orderBillsPlans
      * @return
+     *
+     *
+     * <if test="loadDate = null">
+     *             LoadDate = null,
+     *         </if>
+     *
+     *         <if test="loadDate != null and loadDate != ''">
+     *             LoadDate = #{loadDate},
+     *         </if>
+     *         UnLoadQty = #{unLoadQty},
+     *         <if test="unLoadDate = null">
+     *             UnLoadDate = null,
+     *         </if>
+     *
+     *         <if test="unLoadDate != null and unLoadDate != ''">
+     *             UnLoadDate = #{unLoadDate},
+     *         </if>
      */
     Integer updateOrderBillsPlansByid(OrderBillsPlans orderBillsPlans);
 

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

@@ -20,7 +20,7 @@ public interface IOrderBillsPlansService {
      * @param pageSize
      * @return
      */
-    List<WfTaskList> getOrderBillsPlansList(String dataStart, String dataEnd, String orderNo, Integer head, Integer tail, String type);
+    List<WfTaskList> getOrderBillsPlansList(String dataStart, String dataEnd, OrderBillsPlansVo orderBillsPlansVo);
 
     /**
      * 根据orderNo查询

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

@@ -59,7 +59,14 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
      * @return
      */
     @Override
-    public List<WfTaskList> getOrderBillsPlansList(String dataStart, String dataEnd, String orderNo, Integer head, Integer tail, String type) {
+    public List<WfTaskList> getOrderBillsPlansList(String dataStart, String dataEnd, OrderBillsPlansVo orderBillsPlansVo) {
+
+
+        String orderNo = orderBillsPlansVo.getOrderNo();
+        Integer head = orderBillsPlansVo.getHead();
+        Integer tail = orderBillsPlansVo.getTail();
+        String type = orderBillsPlansVo.getType();
+        String flowType = orderBillsPlansVo.getFlowType();
 
         // 根据登录名去匹配EMPLS 里面的EMPL  找到 EMPLID
         SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -87,6 +94,7 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
         map.put("head", head);
         map.put("tail", tail);
         map.put("type", type);
+        map.put("flowType", flowType);
 
         // 获取角色区分队长与驾驶员
         for (SysRole role : user.getRoles()) {
@@ -137,21 +145,30 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
 //                } else {
 //                    wfTaskList.setBillStatusName("里程待提交");
 //                }
-                if ("T".equals(wfTaskList.getIfLoaded()) && "T".equals(wfTaskList.getIfUnLoaded())) {
-                    wfTaskList.setBillStatusName("里程已提交");
-                } else {
-                    wfTaskList.setBillStatusName("里程待提交");
+
+//                if ("T".equals(wfTaskList.getIfLoaded()) && "T".equals(wfTaskList.getIfUnLoaded())) {
+//                    wfTaskList.setBillStatusName("里程已提交");
+//                } else {
+//                    wfTaskList.setBillStatusName("里程待提交");
+//                }
+
+                if ("F".equals(wfTaskList.getIfLoaded()) && "F".equals(wfTaskList.getIfUnLoaded())) {
+                    wfTaskList.setBillStatusName("未装车");
+                } else if ("T".equals(wfTaskList.getIfLoaded()) && "F".equals(wfTaskList.getIfUnLoaded())) {
+                    wfTaskList.setBillStatusName("未卸车");
+                } else if ("T".equals(wfTaskList.getIfLoaded()) && "T".equals(wfTaskList.getIfUnLoaded())) {
+                    wfTaskList.setBillStatusName("已卸车");
                 }
             } else if ("BX".equals(type)) {
 
                 if ("S".equals(wfTaskList.getIfStarted())) {
-                    wfTaskList.setBillStatusName("费用已提交");
+                    wfTaskList.setBillStatusName("已提交");
                 } else if ("A".equals(wfTaskList.getIfStarted())) {
-                    wfTaskList.setBillStatusName("审核通过");
+                    wfTaskList.setBillStatusName("已通过");
                 } else if ("B".equals(wfTaskList.getIfStarted())) {
-                    wfTaskList.setBillStatusName("审核驳回");
+                    wfTaskList.setBillStatusName("已退回");
                 } else if ("F".equals(wfTaskList.getIfStarted())) {
-                    wfTaskList.setBillStatusName("费用待提交");
+                    wfTaskList.setBillStatusName("未提交");
                 }
             }
         }

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

@@ -17,18 +17,19 @@
 
     <update id="updateOrderBillsPlansByid">
         update OrderBillsPlans
-        set LoadQty       = #{loadQty},
-            LoadDate      = #{loadDate},
-            UnLoadQty     = #{unLoadQty},
-            UnLoadDate    = #{unLoadDate},
-            <if test="ifDetour != null and ifDetour != ''">
-                ifDetour      = #{ifDetour},
-                detourMile      = #{detourMile},
-                detourDesc      = #{detourDesc},
-            </if>
-            driverassdesc = #{driverassdesc}
+        set LoadQty = #{loadQty},
+        LoadDate = #{loadDate},
+        UnLoadQty = #{unLoadQty},
+        UnLoadDate = #{unLoadDate},
+
+        <if test="ifDetour != null and ifDetour != ''">
+            ifDetour = #{ifDetour},
+            detourMile = #{detourMile},
+            detourDesc = #{detourDesc},
+        </if>
+        driverassdesc = #{driverassdesc}
         where sysId = '1'
-          and OrderNo = #{orderNo}
+        and OrderNo = #{orderNo}
     </update>
     <update id="updateOrderBillsPlansByOrderNo">
         update OrderBillsPlans
@@ -140,9 +141,9 @@
         , p.rightqty
         , b.billStatus
 
-        , p.ifLoaded      ifLoaded
-        , p.ifUnLoaded    ifUnLoaded
-        , p.ifStarted     ifStarted
+        , p.ifLoaded ifLoaded
+        , p.ifUnLoaded ifUnLoaded
+        , p.ifStarted ifStarted
         from wf_TaskList t
         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)
@@ -159,10 +160,30 @@
             t.SysID=1
             <if test="type == 'BD'">
                 and t.ActID=317
+                <if test="flowType == '未装车'">
+                    and p.ifLoaded = 'F' and p.ifUnLoaded = 'F'
+                </if>
+                <if test="flowType == '未卸车'">
+                    and p.ifLoaded = 'T' and p.ifUnLoaded = 'F'
+                </if>
+                <if test="flowType == '已卸车'">
+                    and p.ifLoaded = 'T' and p.ifUnLoaded = 'T'
+                </if>
             </if>
             <if test="type == 'BX'">
                 and t.ActID = #{actId, jdbcType=VARCHAR}
-                and (p.ifStarted = 'F' or p.ifStarted = 'S' or p.ifStarted = 'A' or p.ifStarted = 'B')
+                <if test="flowType == '未提交'">
+                    and p.ifStarted = 'F'
+                </if>
+                <if test="flowType == '已提交'">
+                    and p.ifStarted = 'S'
+                </if>
+                <if test="flowType == '已通过'">
+                    and p.ifStarted = 'A'
+                </if>
+                <if test="flowType == '已退回'">
+                    and p.ifStarted = 'B'
+                </if>
             </if>
             and ((b.CarID=-1) or ((b.CarID &lt;&gt; -1)))
             <if test="dataStart != null and dataStart != '' and dataEnd != null and dataEnd != ''">
@@ -291,6 +312,11 @@
              , o.loadAddr   loadAddr
              , o.unLoadAddr unLoadAddr
              , g.CName goodsCName
+
+             , o.loadQty loadQty
+             , o.loadDate loadDate
+             , o.unLoadQty unLoadQty
+             , o.unLoadDate unLoadDate
         FROM OrderBillsPlans o
                  INNER JOIN LoadBills b
                             ON