From 596dfb6875beb95e4dca301af8f2141cad92cc9d Mon Sep 17 00:00:00 2001
From: ilal <lalqqhy@163.com>
Date: Mon, 27 Jul 2020 19:17:49 +0800
Subject: [PATCH] 提交
---
src/main/java/cn/timer/api/bean/spmk/SpmkApproveSummary.java | 2 +-
src/main/java/cn/timer/api/controller/spmk/SpmkController.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cn/timer/api/bean/spmk/SpmkApproveSummary.java b/src/main/java/cn/timer/api/bean/spmk/SpmkApproveSummary.java
index 677e7be..9ec3b11 100644
--- a/src/main/java/cn/timer/api/bean/spmk/SpmkApproveSummary.java
+++ b/src/main/java/cn/timer/api/bean/spmk/SpmkApproveSummary.java
@@ -65,7 +65,7 @@ public class SpmkApproveSummary extends Model<SpmkApproveSummary> {
private String approveName;
@TableField(fill = FieldFill.INSERT)
- @ApiModelProperty(value = "状态 0审批中 1审批撤销 2审批通过/审批完成 3审批拒绝", example = "101")
+ @ApiModelProperty(value = "状态 0审批中 1审批撤销 2审批通过/审批完成 3审批拒绝 4:已审批 5：全部", example = "101")
private Integer sts;
@ApiModelProperty(value = "当前审批人 ", example = "当前审批人")
diff --git a/src/main/java/cn/timer/api/controller/spmk/SpmkController.java b/src/main/java/cn/timer/api/controller/spmk/SpmkController.java
index 58d2637..679e2e5 100644
--- a/src/main/java/cn/timer/api/controller/spmk/SpmkController.java
+++ b/src/main/java/cn/timer/api/controller/spmk/SpmkController.java
@@ -1,8 +1,9 @@
package cn.timer.api.controller.spmk;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -378,6 +379,7 @@ public class SpmkController {
ca.setOrgCode(userBean.getOrgCode());
ca.setFroms(ObjectUtil.serialize(spmkCustomApprovalDto.getFroms()));
ca.setRouter(ObjectUtil.serialize(spmkCustomApprovalDto.getRouter()));
+ ca.setUpdateTime(new Date());
//1.新增 SpmkCustomApproval-自定义审批
if (!ca.insertOrUpdate())
--
libgit2 0.26.0