审核备注

njzscloud-svr/src/main/java/com/njzscloud/supervisory/hsoa/service/HsoaService.java

@@ -160,8 +160,8 @@ public class HsoaService {
                 )
                 .setReviewInfo(new PushProvincialSaveParam.ReviewInfo()
                                 .setCgAreaName(detail.getProvinceName() + detail.getCityName() + detail.getAreaName())
-                                .setCgReviewOpinion(StrUtil.isBlank(detail.getAuditMemo()) ? "同意" : detail.getAuditMemo())
+                                .setCgReviewOpinion(StrUtil.isBlank(detail.getShiAuditMemo()) ? "同意" : detail.getShiAuditMemo())
-                                .setCgReviewTime(detail.getAuditTime())
+                                .setCgReviewTime(detail.getShiAuditTime())
                                 // .setCgUnitCode("")
                                 .setCgUnitName(detail.getAreaName() + "城管")
                                 .setCgUserId(detail.getQuAuditUserId() == null ? (detail.getShiAuditUserId() == null ? null : detail.getShiAuditUserId().toString()) : detail.getQuAuditUserId().toString())
@@ -228,9 +228,9 @@ public class HsoaService {
                         // .setTRANS_LICENSE_FILE("")
                         .setGarbageLoadBeforeFile(upload(detail.getCargoPhoto(), GARBAGE_LOAD_BEFORE_FILE))
                         .setGarbageLoadAfterFile(upload(detail.getCargoPhoto(), GARBAGE_LOAD_AFTER_FILE))
-                        .setLicenseValidityPeriodDateRange(detail.getAuditTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + "-" + detail.getAuditTime().plusHours(24).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
+                        .setLicenseValidityPeriodDateRange(detail.getShiAuditTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + "-" + detail.getShiAuditTime().plusHours(24).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
-                        .setLicenseValidityPeriodStartDate(detail.getAuditTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
+                        .setLicenseValidityPeriodStartDate(detail.getShiAuditTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
-                        .setLicenseValidityPeriodEndDate(detail.getAuditTime().plusHours(24).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
+                        .setLicenseValidityPeriodEndDate(detail.getShiAuditTime().plusHours(24).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
                         // .setRoute("")
                         .setSuperviseUnitName(detail.getAreaName())
                         .setTransportDateRange(detail.getTransTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + "-" + detail.getOutTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))

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

@@ -104,12 +104,22 @@ public class OrderInfoEntity {
     /**
      * 审核备注
      */
-    private String auditMemo;
+    private String shiAuditMemo;
 
     /**
      * 审核时间
      */
-    private LocalDateTime auditTime;
+    private LocalDateTime shiAuditTime;
+
+    /**
+     * 审核备注
+     */
+    private String quAuditMemo;
+
+    /**
+     * 审核时间
+     */
+    private LocalDateTime quAuditTime;
     /**
      * 审核图片
      */

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

@@ -113,7 +113,8 @@ public class OrderPagingResult {
     /**
      * 审核时间
      */
-    private LocalDateTime auditTime;
+    private LocalDateTime shiAuditTime;
+    private LocalDateTime quAuditTime;
     /**
      * 区审核人
      */
@@ -144,7 +145,8 @@ public class OrderPagingResult {
     /**
      * 审核备注
      */
-    private String auditMemo;
+    private String shiAuditMemo;
+    private String quAuditMemo;
     private String checkerName;
     private String checkerPhone;
 

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

@@ -602,10 +602,16 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         Long shiAuditUserId = null;
         String quAuditPicture = null;
         String shiAuditPicture = null;
+        String shiAuditMemo = null;
+        LocalDateTime shiAuditTime = null;
+        String quAuditMemo = null;
+        LocalDateTime quAuditTime = null;
         if (auditStatus == AuditStatus.QuDaiShenHe) {
             if (StrUtil.isNotBlank(areaRole) && roles.contains(areaRole)) {
                 quAuditUserId = SecurityUtil.currentUserId();
                 quAuditPicture = auditOrderParam.getAuditPicture();
+                quAuditMemo = auditOrderParam.getAuditMemo();
+                quAuditTime = LocalDateTime.now();
                 auditStatus = newAuditStatus == AuditStatus.TongGuo ? AuditStatus.ShiDaiShenHe : newAuditStatus;
             } else {
                 throw Exceptions.clierr("您没有权限审核该订单");
@@ -614,6 +620,8 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
             if (StrUtil.isNotBlank(cityRole) && roles.contains(cityRole)) {
                 shiAuditUserId = SecurityUtil.currentUserId();
                 shiAuditPicture = auditOrderParam.getAuditPicture();
+                shiAuditMemo = auditOrderParam.getAuditMemo();
+                shiAuditTime = LocalDateTime.now();
                 auditStatus = newAuditStatus;
             } else {
                 throw Exceptions.clierr("您没有权限审核该订单");
@@ -623,6 +631,10 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
             shiAuditUserId = SecurityUtil.currentUserId();
             quAuditPicture = auditOrderParam.getAuditPicture();
             shiAuditPicture = auditOrderParam.getAuditPicture();
+            quAuditMemo = auditOrderParam.getAuditMemo();
+            quAuditTime = LocalDateTime.now();
+            shiAuditMemo = auditOrderParam.getAuditMemo();
+            shiAuditTime = LocalDateTime.now();
             auditStatus = newAuditStatus;
         }
 
@@ -642,10 +654,12 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
                 .setShiAuditUserId(shiAuditUserId)
                 .setQuAuditPicture(quAuditPicture)
                 .setShiAuditPicture(shiAuditPicture)
+                .setShiAuditTime(shiAuditTime)
+                .setShiAuditMemo(shiAuditMemo)
+                .setQuAuditTime(quAuditTime)
+                .setQuAuditMemo(quAuditMemo)
                 .setCertificateSn(certificateSn)
-                .setAuditTime(LocalDateTime.now())
                 .setCheckStatus(checkStatus)
-                .setAuditMemo(auditOrderParam.getAuditMemo())
         );
         OrderCategory orderCategory = detail.getOrderCategory();
         if (orderCategory == OrderCategory.DuanBoRu) return;
@@ -1029,8 +1043,8 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
     public void orderTimeOut() {
         log.info("检查超时订单");
         List<OrderInfoEntity> timeOutOrderList = this.list(Wrappers.<OrderInfoEntity>lambdaQuery()
-                .isNotNull(OrderInfoEntity::getAuditTime)
+                .isNotNull(OrderInfoEntity::getShiAuditTime)
-                .le(OrderInfoEntity::getAuditTime, LocalDateTime.now().minusHours(12))
+                .le(OrderInfoEntity::getShiAuditTime, LocalDateTime.now().minusHours(12))
                 .notIn(OrderInfoEntity::getOrderStatus, OrderStatus.YiJinChang, OrderStatus.YiChuChang, OrderStatus.YiWanCheng)
         );
         if (CollUtil.isEmpty(timeOutOrderList)) return;
@@ -1268,10 +1282,12 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
                         .setShiAuditUserId(orderInfoEntity.getShiAuditUserId())
                         .setQuAuditPicture(orderInfoEntity.getQuAuditPicture())
                         .setShiAuditPicture(orderInfoEntity.getShiAuditPicture())
+                        .setShiAuditTime(orderInfoEntity.getShiAuditTime())
+                        .setShiAuditMemo(orderInfoEntity.getShiAuditMemo())
+                        .setQuAuditTime(orderInfoEntity.getQuAuditTime())
+                        .setQuAuditMemo(orderInfoEntity.getQuAuditMemo())
                         .setCertificateSn(orderInfoEntity.getCertificateSn())
-                        .setAuditTime(orderInfoEntity.getAuditTime())
                         .setCheckStatus(CheckStatus.WeiKanLiao)
-                        .setAuditMemo(orderInfoEntity.getAuditMemo())
                         // 开始清运
                         .setCargoPhoto(orderInfoEntity.getCargoPhoto())
                         .setOrderStatus(OrderStatus.QingYunZhong)

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

@@ -24,8 +24,10 @@
                a.audit_status,
                a.qu_audit_picture,
                a.shi_audit_picture,
-               a.audit_memo,
+               a.shi_audit_memo,
-               a.audit_time,
+               a.shi_audit_time,
+               a.qu_audit_memo,
+               a.qu_audit_time,
                a.qu_audit_user_id,
                a.shi_audit_user_id,
                n.nickname           qu_audit_user_name,