管控bug

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/EMUseCarInfo.java

@@ -55,5 +55,8 @@ public class EMUseCarInfo extends BaseEntity {
     @ApiModelProperty(value = "暂存草稿数据 0=暂存 1=提交")
     private Integer isTemp;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
 
 }

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/AttendanceTripInfoVO.java

@@ -1,9 +1,12 @@
 package org.springblade.control.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springblade.control.entity.AttendanceTripInfo;
 
+import java.util.Date;
+
 @Data
 public class AttendanceTripInfoVO extends AttendanceTripInfo {
 
@@ -22,4 +25,8 @@ public class AttendanceTripInfoVO extends AttendanceTripInfo {
     @ApiModelProperty(value = "审批结果")
     private String approvalResultName;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
 }

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/EMFinancialReimbursementInfoVO.java

@@ -1,9 +1,12 @@
 package org.springblade.control.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springblade.control.entity.EMFinancialReimbursementInfo;
 
+import java.util.Date;
+
 @Data
 public class EMFinancialReimbursementInfoVO extends EMFinancialReimbursementInfo {
 
@@ -34,4 +37,8 @@ public class EMFinancialReimbursementInfoVO extends EMFinancialReimbursementInfo
     @ApiModelProperty(value = "附件url地址名称")
     private String frAttachmentUrlName;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
 }

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/EMInvoiceInfoVO.java

@@ -1,9 +1,12 @@
 package org.springblade.control.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springblade.control.entity.EMInvoiceInfo;
 
+import java.util.Date;
+
 @Data
 public class EMInvoiceInfoVO extends EMInvoiceInfo {
 
@@ -31,4 +34,8 @@ public class EMInvoiceInfoVO extends EMInvoiceInfo {
     @ApiModelProperty(value = "发票pdf名称")
     private String invoicePdfUrlName;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
 }

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/EMLoanInfoVO.java

@@ -1,9 +1,12 @@
 package org.springblade.control.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springblade.control.entity.EMLoanInfo;
 
+import java.util.Date;
+
 @Data
 public class EMLoanInfoVO extends EMLoanInfo {
 
@@ -22,4 +25,8 @@ public class EMLoanInfoVO extends EMLoanInfo {
     @ApiModelProperty(value = "使用期-归还期")
     private String useReturnDate;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
 }

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/EMOutsourcingPayInfoVO.java

@@ -1,9 +1,12 @@
 package org.springblade.control.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springblade.control.entity.EMOutsourcingPayInfo;
 
+import java.util.Date;
+
 @Data
 public class EMOutsourcingPayInfoVO extends EMOutsourcingPayInfo {
 
@@ -22,5 +25,8 @@ public class EMOutsourcingPayInfoVO extends EMOutsourcingPayInfo {
     @ApiModelProperty(value = "审批结果")
     private String approvalResultName;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
 
 }

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/EMPayInfoVO.java

@@ -1,9 +1,12 @@
 package org.springblade.control.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springblade.control.entity.EMPayInfo;
 
+import java.util.Date;
+
 @Data
 public class EMPayInfoVO extends EMPayInfo {
 
@@ -22,4 +25,8 @@ public class EMPayInfoVO extends EMPayInfo {
     @ApiModelProperty(value = "申请人名称")
     private String afUserName;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
 }

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/EMPurchaseInfoVO.java

@@ -1,9 +1,12 @@
 package org.springblade.control.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springblade.control.entity.EMPurchaseInfo;
 
+import java.util.Date;
+
 @Data
 public class EMPurchaseInfoVO extends EMPurchaseInfo {
 
@@ -19,4 +22,8 @@ public class EMPurchaseInfoVO extends EMPurchaseInfo {
     @ApiModelProperty(value = "审批结果")
     private String approvalResultName;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
 }

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/LogHistoryInfoVO.java

@@ -1,9 +1,11 @@
 package org.springblade.control.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springblade.control.entity.LogHistoryInfo;
 
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -27,6 +29,10 @@ public class LogHistoryInfoVO extends LogHistoryInfo {
     @ApiModelProperty(value = "当前日志所有已读人")
     private List<ReadUser> readUsers;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
     @Data
     public static class ReadUser {
         private String headPicture;

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/TaskProcessServiceImpl.java

@@ -80,14 +80,14 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
                 queryWrapper.lambda().eq(TaskProcessInfo::getStatus, 1);
                 break;
             case "2":  //已审核、已驳回为已办任务
-                if (ObjectUtil.isNotEmpty(dto.getSelectStatus()) && (dto.getSelectStatus().equals("0") || dto.getSelectStatus().equals("1"))) {
+                if (ObjectUtil.isNotEmpty(dto.getSelectStatus()) && (dto.getSelectStatus().equals("0"))) {
                     var = false;
                     break;
                 }
                 if (ObjectUtil.isNotEmpty(dto.getSelectStatus())) {
                     queryWrapper.lambda().apply("(audit_user_ids_complete LIKE '%" + SecureUtil.getUserId() + "%' OR audit_user_ids LIKE '%" + SecureUtil.getUserId() + "%') AND STATUS =" + dto.getSelectStatus());
                 } else {
-                    queryWrapper.lambda().apply("(audit_user_ids_complete LIKE '%" + SecureUtil.getUserId() + "%' OR audit_user_ids LIKE '%" + SecureUtil.getUserId() + "%') AND STATUS IN(2,3)");
+                    queryWrapper.lambda().apply("(audit_user_ids_complete LIKE '%" + SecureUtil.getUserId() + "%' OR audit_user_ids LIKE '%" + SecureUtil.getUserId() + "%') AND STATUS IN(1,2,3)");
                 }
                 break;
             case "3":  //我发起的任务
@@ -432,6 +432,12 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
                 if (!taskProcessInfo.getAuditUserIds().contains(SecureUtil.getUserId() + "")) {
                     throw new ServiceException("当前用户不属于当前审批任务的审批人员，操作失败");
                 }
+                String[] split = taskProcessInfo.getAuditUserIds().split(",");
+                if (!split[0].equals(SecureUtil.getUserId() + "")) {
+                    //如果第一位不是自己，那么不允许驳回，只能按照顺序驳回
+                    User user = iUserClient.userInfoById(Long.parseLong(split[0])).getData();
+                    throw new ServiceException("当前任务的审批人【" + user.getRealName() + "】还未完成审批，请稍后再试");
+                }
                 //修改审批任务状态 =3 已驳回
                 if (this.update(Wrappers.<TaskProcessInfo>lambdaUpdate()
                         .set(TaskProcessInfo::getStatus, 3)