记录运单磅单审核日志

performance-web/src/main/java/com/clx/performance/model/OrderChildPoundAudit.java

@@ -32,7 +32,7 @@ public class OrderChildPoundAudit implements HasKey<Integer> {
     private String childNo;                         //运单编号
     private BigDecimal loadNet;                     //装货净重（单位吨）
     private BigDecimal unloadNet;                   //卸货净重（单位吨）
-    private Integer status;                         //审核状态 0-待审核，1-审核失败， 2-审核成功
+    private Integer status;                         //审核状态  0 待审核 1 审核通过 2 审核驳回
     private Integer rejectType;                     //审核驳回类型：1装车 2卸车 3装车+卸车
     private String remark;                          //备注
     private String createTime;                      //创建时间
@@ -45,23 +45,6 @@ public class OrderChildPoundAudit implements HasKey<Integer> {
     }
 
 
-    @Getter
-    @AllArgsConstructor
-    public enum AuditStatus {
-
-        AUDIT(0, "待审核"),
-        FAIL(1, "审核失败"),
-        SUCCESS(2, "审核成功")
-
-        ;
-
-        private final Integer code;
-        private final String msg;
-
-        public static Optional<OrderChildPoundAudit.AuditStatus> getByCode(int code) {
-            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
-        }
-    }
 
 
     @Getter

performance-web/src/main/java/com/clx/performance/model/OrderChildPoundLog.java

@@ -8,9 +8,6 @@ import com.msl.common.model.HasKey;
 import lombok.*;
 import lombok.experimental.Accessors;
 
-import java.util.Arrays;
-import java.util.Optional;
-
 /**
 * @Author: aiqinguo
 * @Description: 磅单日志表
@@ -45,23 +42,4 @@ public class OrderChildPoundLog implements HasKey<Integer> {
     }
 
 
-    @Getter
-    @AllArgsConstructor
-    public enum CreateType {
-
-
-        OWNER(1, "货主"),
-        CARRIER(2, "承运端"),
-        DRIVER(3, "司机"),
-
-        ;
-
-        private final Integer code;
-        private final String msg;
-
-        public static Optional<CreateType> getByCode(int code) {
-            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
-        }
-    }
-
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildPoundAuditServiceImpl.java

@@ -5,12 +5,12 @@ import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderChildImageDao;
 import com.clx.performance.dao.OrderChildPoundAuditDao;
 import com.clx.performance.dao.OrderChildPoundLogDao;
+import com.clx.performance.enums.OrderChildLogEnum;
+import com.clx.performance.enums.OrderChildPoundAuditEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
-import com.clx.performance.model.OrderChild;
-import com.clx.performance.model.OrderChildImage;
-import com.clx.performance.model.OrderChildPoundAudit;
-import com.clx.performance.model.OrderChildPoundLog;
+import com.clx.performance.model.*;
 import com.clx.performance.param.pc.PoundAuditParam;
+import com.clx.performance.service.OrderChildLogService;
 import com.clx.performance.service.OrderChildPoundAuditService;
 import com.clx.performance.vo.pc.OrderChildPoundAuditDetailVO;
 import com.msl.user.data.UserSessionData;
@@ -42,6 +42,8 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
 
     private final OrderChildDao orderChildDao;
 
+    private final OrderChildLogService orderChildLogService;
+
 
     @Override
     public OrderChildPoundAuditDetailVO getPoundAuditDetail(String childNo) {
@@ -73,9 +75,11 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
         poundAuditDetail.setRemark(param.getRemark());
         poundAuditDetail.setId(null);
 
-        if(Objects.equals(param.getStatus(),OrderChildPoundAudit.AuditStatus.FAIL.getCode())){
+        Integer type = OrderChildLogEnum.Type.POUND_AUDIT.getCode();
+        if(Objects.equals(param.getStatus(), OrderChildPoundAuditEnum.Status.REJECT.getCode())){
             poundAuditDetail.setLoadNet(orderChild.getLoadNet());
             poundAuditDetail.setUnloadNet(orderChild.getUnloadNet());
+            type = OrderChildLogEnum.Type.POUND_AUDIT_REJECT.getCode();
         }else{
             if(Objects.nonNull(param.getLoadNet())){
                 poundAuditDetail.setLoadNet(param.getLoadNet());
@@ -94,8 +98,8 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
         orderChildPoundAuditDao.saveEntity(poundAuditDetail);
 
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
-        OrderChildPoundLog poundLog = OrderChildPoundLog.builder().childNo(param.getChildNo()).status(param.getStatus()).createType(OrderChildPoundLog.CreateType.CARRIER.getCode())
-                .remark(OrderChildPoundAudit.AuditStatus.getByCode(param.getStatus()).get().getMsg()).createBy(loginUserInfo.getUserNo()).createName(loginUserInfo.getUserName()).build();
+        OrderChildPoundLog poundLog = OrderChildPoundLog.builder().childNo(param.getChildNo()).status(param.getStatus()).createType(OrderChildLogEnum.CreateType.PLATFORM.getCode())
+                .remark(OrderChildPoundAuditEnum.Status.getByCode(param.getStatus()).get().getMsg()).createBy(loginUserInfo.getUserNo()).createName(loginUserInfo.getUserName()).build();
 
         orderChildPoundLogDao.saveEntity(poundLog);
 
@@ -108,5 +112,8 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
         orderChild.setPoundStatus(param.getStatus());
         orderChildDao.updatePoundAuditStatus(orderChild);
 
+        orderChildLogService.saveOrderChildLog(param.getChildNo(),type,OrderChildLogEnum.Type.getByCode(type).get().getMsg(),
+                OrderChildLogEnum.CreateType.PLATFORM.getCode(), loginUserInfo.getUserNo(),loginUserInfo.getUserName());
+
     }
 }