feat：审批时间

web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java

@@ -6,6 +6,7 @@ import com.jjb.saas.framework.auth.model.SSOUser;
 import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.zcloud.gbscommon.todolistmq.TodoListEventPusherUtil;
 import com.zcloud.gbscommon.todolistmq.event.TodoListAddEvent;
+import com.zcloud.gbscommon.utils.DateUtil;
 import com.zcloud.primeport.domain.enums.AuditEnum;
 import com.zcloud.primeport.domain.enums.VehicleBelongTypeEnum;
 import com.zcloud.primeport.domain.gateway.VehicleApplyGateway;
@@ -20,6 +21,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
+
 
 /**
  * web-app
@@ -42,6 +45,7 @@ public class VehicleApplyAddExe {
         examTypeE.setStatusFlag(2);
         examTypeE.setBlockedFlag(2);
         examTypeE.setAuditFlag(AuditEnum.WAITING.getCode());
+        examTypeE.setApplyTime(DateUtil.date2Str(new Date()));
         // 股份、分公司个人车辆
         if (cmd.getVehicleBelongType().equals(VehicleBelongTypeEnum.JGD_PRI_VEHICLES.getCode())
                 || cmd.getVehicleBelongType().equals(VehicleBelongTypeEnum.FGS_PRI_VEHICLES.getCode())) {

web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyUpdateExe.java

@@ -3,6 +3,7 @@ package com.zcloud.primeport.command;
 import com.alibaba.cola.exception.BizException;
 import com.alibaba.fastjson.JSON;
 import com.zcloud.gbscommon.todolistmq.TodoListEventPusherUtil;
+import com.zcloud.gbscommon.utils.DateUtil;
 import com.zcloud.primeport.domain.enums.AuditEnum;
 import com.zcloud.primeport.domain.gateway.VehicleApplyGateway;
 import com.zcloud.primeport.domain.gateway.VehicleAuditGateway;
@@ -15,6 +16,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
+
 
 /**
  * web-app
@@ -35,7 +38,7 @@ public class VehicleApplyUpdateExe {
         VehicleApplyE oldV = vehicleApplyGateway.getById(vehicleApplyE.getId());
         BeanUtils.copyProperties(vehicleApplyUpdateCmd, vehicleApplyE);
         vehicleApplyE.setAuditFlag(AuditEnum.WAITING.getCode());
-
+        vehicleApplyE.setApplyTime(DateUtil.date2Str(new Date()));
         boolean res = vehicleApplyGateway.update(vehicleApplyE);
         VehicleAuditE build = VehicleAuditE.builder().vehicleApplyId(vehicleApplyE.getId()).batchState(1).batchType(2).auditUserId(vehicleApplyE.getAuditUserId()).auditUserName(vehicleApplyE.getAuditUserName()).auditDeptId(vehicleApplyE.getAuditDeptId()).auditDeptName(vehicleApplyE.getAuditDeptName()).auditCorpId(vehicleApplyE.getAuditCorpId()).auditCorpName(vehicleApplyE.getAuditCorpName()).auditStatus(AuditEnum.WAITING.getCode()).changeAfter(JSON.toJSONString(oldV)).changeBefore(JSON.toJSONString(vehicleApplyE)).build();
         // 添加审批信息

web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java

@@ -1,6 +1,7 @@
 package com.zcloud.primeport.command;
 
 import com.alibaba.cola.exception.BizException;
+import com.zcloud.gbscommon.utils.DateUtil;
 import com.zcloud.primeport.domain.gateway.VehicleApplyGateway;
 import com.zcloud.primeport.domain.gateway.VehicleAuditGateway;
 import com.zcloud.primeport.domain.model.VehicleApplyE;
@@ -11,6 +12,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
+
 
 /**
  * web-app
@@ -40,6 +43,7 @@ public class VehicleAuditUpdateExe {
         }
         VehicleAuditE vehicleAuditE = new VehicleAuditE();
         BeanUtils.copyProperties(cmd, vehicleAuditE);
+        vehicleAuditE.setAuditTime(DateUtil.date2Str(new Date()));
         VehicleApplyE vehicleApplyE = new VehicleApplyE();
         vehicleApplyE.setId(cmd.getVehicleApplyId());
         vehicleApplyE.setAuditFlag(cmd.getAuditStatus());

web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java

@@ -3,6 +3,7 @@ package com.zcloud.primeport.service;
 import com.alibaba.cola.dto.PageResponse;
 import com.alibaba.cola.dto.SingleResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zcloud.gbscommon.utils.DateUtil;
 import com.zcloud.primeport.api.VehicleApplyServiceI;
 import com.zcloud.primeport.command.VehicleApplyAddExe;
 import com.zcloud.primeport.command.VehicleApplyRemoveExe;
@@ -19,6 +20,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -92,6 +94,7 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI {
             vehicleApplyDO.setMkmjPermission(1);
             vehicleApplyDO.setRemarks(cmd.getRemarks());
             vehicleApplyDO.setVehicleBelongType(cmd.getVehicleBelongType());
+            vehicleApplyDO.setApplyTime(DateUtil.date2Str(new Date()));
             BeanUtils.copyProperties(item, vehicleApplyDO);
             objects.add(vehicleApplyDO);
         });

web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java

@@ -109,29 +109,31 @@ public class VehicleApplyCO extends ClientObject {
 
     // 当前审批人
     //审批状态(1,申请;2.更新)
-    @ApiModelProperty(value = "审批状态(1,申请;2.更新)", name = "batchState")
+    @ApiModelProperty(value = "当前审批状态(1,申请;2.更新)", name = "currentBatchState")
     private Integer currentBatchState;
     //审批人id
-    @ApiModelProperty(value = "审批人id", name = "auditUserId")
+    @ApiModelProperty(value = "当前审批人id", name = "currentAuditUserId")
     private Long currentAuditUserId;
     //审批人姓名
-    @ApiModelProperty(value = "审批人姓名", name = "auditUserName")
+    @ApiModelProperty(value = "当前审批人姓名", name = "currentAuditUserName")
     private String currentAuditUserName;
     //审批部门id
-    @ApiModelProperty(value = "审批部门id", name = "auditDeptId")
+    @ApiModelProperty(value = "当前审批部门id", name = "currentAuditDeptId")
     private Long currentAuditDeptId;
     //审批部门名称
-    @ApiModelProperty(value = "审批部门名称", name = "auditDeptName")
+    @ApiModelProperty(value = "当前审批部门名称", name = "currentAuditDeptName")
     private String currentAuditDeptName;
     //审批人企业id
-    @ApiModelProperty(value = "审批人企业id", name = "auditCorpId")
+    @ApiModelProperty(value = "当前审批人企业id", name = "currentAuditCorpId")
     private Long currentAuditCorpId;
     //审批人企业名称
-    @ApiModelProperty(value = "审批人企业名称", name = "auditCorpName")
+    @ApiModelProperty(value = "当前审批人企业名称", name = "currentAuditCorpName")
     private String currentAuditCorpName;
     //审批状态(1,未开始,2通过,3不通过)
-    @ApiModelProperty(value = "审批状态(1,未开始,2通过,3不通过)", name = "auditStatus")
+    @ApiModelProperty(value = "当前审批状态(1,未开始,2通过,3不通过)", name = "currentAuditStatus")
     private Integer currentAuditStatus;
+    @ApiModelProperty(value = "当前审批时间", name = "currentAuditTime")
+    private String currentAuditTime;
     //审批意见
     @ApiModelProperty(value = "审批意见(驳回原因)", name = "remarks")
     private String currentRemarks;
@@ -184,6 +186,8 @@ public class VehicleApplyCO extends ClientObject {
         //审批状态(1,未开始,2通过,3不通过)
         @ApiModelProperty(value = "审批状态(1,未开始,2通过,3不通过)", name = "auditStatus")
         private Integer auditStatus;
+        @ApiModelProperty(value = "审批时间", name = "auditTime")
+        private String auditTime;
         //审批意见
         @ApiModelProperty(value = "审批意见(驳回原因)", name = "remarks")
         private String remarks;

web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditCO.java

@@ -27,6 +27,8 @@ public class VehicleAuditCO extends ClientObject {
     //审批状态(1,申请;2.更新)
     @ApiModelProperty(value = "审批状态(1,申请;2.更新)", name = "batchState")
     private Integer batchState;
+    @ApiModelProperty(value = "审批时间", name = "auditTime")
+    private String auditTime;
     //审批人id
     @ApiModelProperty(value = "审批人id", name = "auditUserId")
     private Long auditUserId;

web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java

@@ -75,6 +75,7 @@ public class VehicleApplyE extends BaseE {
     private Long mkmjId;
     private String lsUserPhone;
     private String lsUserIdcard;
+    private String applyTime;
 
 
     private Long auditCorpId;

web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleAuditE.java

@@ -30,6 +30,7 @@ public class VehicleAuditE extends BaseE {
     private Long auditUserId;
     //审批人姓名
     private String auditUserName;
+    private String auditTime;
     //审批部门id
     private Long auditDeptId;
     //审批部门名称

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java

@@ -60,6 +60,9 @@ public class VehicleApplyDO extends BaseDO {
     //车辆所属企业ID
     @ApiModelProperty(value = "车辆所属企业ID")
     private Long vehicleCorpId;
+    @ApiModelProperty(value = "申请时间")
+    private String applyTime;
+
     //车辆所属企业名称
     @ApiModelProperty(value = "车辆所属企业名称")
     private String vehicleCorpName;

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditDO.java

@@ -43,6 +43,8 @@ public class VehicleAuditDO extends BaseDO {
     //审批部门名称
     @ApiModelProperty(value = "审批部门名称")
     private String auditDeptName;
+    @ApiModelProperty(value = "审批时间")
+    private String auditTime;
     //审批人企业id
     @ApiModelProperty(value = "审批人企业id")
     private Long auditCorpId;