审核图片

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/entity/OrderInfoEntity.java

@@ -110,6 +110,11 @@ public class OrderInfoEntity {
      * 审核时间
      */
     private LocalDateTime auditTime;
+    /**
+     * 审核图片
+     */
+    private String quAuditPicture;
+    private String shiAuditPicture;
 
     /**
      * 区审核人

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/param/AuditOrderParam.java

@@ -25,4 +25,8 @@ public class AuditOrderParam {
      * 审核备注
      */
     private String auditMemo;
+    /**
+     * 审核图片
+     */
+    private String auditPicture;
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java

@@ -51,6 +51,8 @@ public class OrderPagingResult {
     private LocalDateTime assignmentTransTime;
     private LocalDateTime assignmentDriverTime;
     private LocalDateTime driverConfirmTime;
+    private String quAuditPicture;
+    private String shiAuditPicture;
     /**
      * 站点 Id
      */

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java

@@ -545,10 +545,12 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
 
         Long quAuditUserId = null;
         Long shiAuditUserId = null;
+        String quAuditPicture = null;
+        String shiAuditPicture = null;
         if (auditStatus == AuditStatus.QuDaiShenHe) {
             if (StrUtil.isNotBlank(areaRole) && roles.contains(areaRole)) {
                 quAuditUserId = SecurityUtil.currentUserId();
-
+                quAuditPicture = auditOrderParam.getAuditPicture();
                 auditStatus = newAuditStatus == AuditStatus.TongGuo ? AuditStatus.ShiDaiShenHe : newAuditStatus;
             } else {
                 throw Exceptions.clierr("您没有权限审核该订单");
@@ -556,6 +558,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         } else if (auditStatus == AuditStatus.ShiDaiShenHe) {
             if (StrUtil.isNotBlank(cityRole) && roles.contains(cityRole)) {
                 shiAuditUserId = SecurityUtil.currentUserId();
+                shiAuditPicture = auditOrderParam.getAuditPicture();
                 auditStatus = newAuditStatus;
             } else {
                 throw Exceptions.clierr("您没有权限审核该订单");
@@ -563,6 +566,8 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         } else if (auditStatus == AuditStatus.DaiShenHe) {
             quAuditUserId = SecurityUtil.currentUserId();
             shiAuditUserId = SecurityUtil.currentUserId();
+            quAuditPicture = auditOrderParam.getAuditPicture();
+            shiAuditPicture = auditOrderParam.getAuditPicture();
             auditStatus = newAuditStatus;
         }
 
@@ -579,6 +584,8 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
                 .setAuditStatus(auditStatus)
                 .setQuAuditUserId(quAuditUserId)
                 .setShiAuditUserId(shiAuditUserId)
+                .setQuAuditPicture(quAuditPicture)
+                .setShiAuditPicture(shiAuditPicture)
                 .setCertificateSn(certificateSn)
                 .setAuditTime(LocalDateTime.now())
                 .setCheckStatus(checkStatus)
@@ -1092,7 +1099,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
      * 3. 合并集合，计算金额（total_money=quantity*unit_price，settle_money=total_money+discount_money+revise_money），批量入库
      */
     @Transactional(rollbackFor = Exception.class)
-    public void settleForTransCompany(OrderInfoEntity orderInfoEntity, OrderGoodsEntity orderGoods,  Integer settleWeight) {
+    public void settleForTransCompany(OrderInfoEntity orderInfoEntity, OrderGoodsEntity orderGoods, Integer settleWeight) {
         Long orderId = orderInfoEntity.getId();
 
         // 数量口径：计费策略=按车(Che) 时数量=1，否则数量=settleWeight

njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -13,6 +13,8 @@
                a.trans_company_id,
                a.user_id,
                a.audit_status,
+               a.qu_audit_picture,
+               a.shi_audit_picture,
                a.audit_memo,
                a.audit_time,
                a.qu_audit_user_id,