From 344635e4586825b32603ec823c228fa6dde09e93 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 22 Nov 2023 09:52:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E8=B4=A8=E6=8A=BC=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/warehousingpledge/WarehousingPledgeDetailsVo.java  | 2 ++
 .../biz/warehousingpledge/WarehousingPledgeMapper.xml      | 5 +++--
 .../biz/warehousingpledge/WarehousingPledgeRest.java       | 7 ++++---
 .../biz/warehousingpledge/WarehousingPledgeService.java    | 4 +---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/warehousingpledge/WarehousingPledgeDetailsVo.java b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/warehousingpledge/WarehousingPledgeDetailsVo.java
index bd0290cb..22825f2b 100644
--- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/warehousingpledge/WarehousingPledgeDetailsVo.java
+++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/warehousingpledge/WarehousingPledgeDetailsVo.java
@@ -30,4 +30,6 @@ public class WarehousingPledgeDetailsVo implements Vo {
     private String procInstId;
     @ApiModelProperty("任务id")
     private String taskId;
+
+    private String createTime;
 }
diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeMapper.xml b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeMapper.xml
index 1622d7e4..853689cd 100644
--- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeMapper.xml
+++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeMapper.xml
@@ -18,7 +18,7 @@
     <select id="details"
             resultType="com.yxt.supervise.enterprisecentre.api.warehousingpledge.WarehousingPledgeDetailsVo">
         select sid,
-               createBySid as userSid,
+               createBySid                         as userSid,
                projectName,
                projectSid,
                warehouseName,
@@ -26,7 +26,8 @@
                procInstId,
                taskId,
                createByName,
-               goodsValue
+               goodsValue,
+               DATE_FORMAT(createTime, '%Y-%m-%d') as createTime
         from warehousing_pledge
         where sid = #{sid}
     </select>
diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeRest.java b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeRest.java
index 0b7e3b4b..ff03eda4 100644
--- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeRest.java
+++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeRest.java
@@ -41,7 +41,7 @@ public class WarehousingPledgeRest {
 
     @ApiOperation("分页列表")
     @PostMapping("/listPage")
-    ResultBean<PagerVo<WarehousingPledgeVo>> listPage(PagerQuery<WarehousingPledgeQuery> pagerQuery) {
+    ResultBean<PagerVo<WarehousingPledgeVo>> listPage(@RequestBody PagerQuery<WarehousingPledgeQuery> pagerQuery) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<WarehousingPledgeVo> pv = warehousingPledgeService.listPageVo(pagerQuery);
         return rb.success().setData(pv);
@@ -84,16 +84,19 @@ public class WarehousingPledgeRest {
     ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@SpringQueryMap GetNodeQuery query) {
         return warehousingPledgeService.getNextNodesForSubmit(query);
     }
+
     @ApiOperation("驳回")
     @PostMapping(value = "/taskReject")
     public ResultBean taskReject(PledgeTaskQuery query) {
         return warehousingPledgeService.taskReject(query);
     }
+
     @ApiOperation("撤回")
     @PostMapping(value = "/revokeProcess")
     public ResultBean revokeProcess(PledgeTaskQuery query) {
         return warehousingPledgeService.revokeProcess(query);
     }
+
     @ApiOperation("终止")
     @PostMapping(value = "/breakProcess")
     public ResultBean breakProcess(PledgeTaskQuery query) {
@@ -101,6 +104,4 @@ public class WarehousingPledgeRest {
     }
 
 
-
-
 }
diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeService.java b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeService.java
index 9fad2b1e..cd37b2ad 100644
--- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeService.java
+++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeService.java
@@ -85,9 +85,7 @@ public class WarehousingPledgeService extends MybatisBaseService<WarehousingPled
         WarehousingPledgeQuery query = pagerQuery.getParams();
         QueryWrapper<WarehousingPledge> qw = new QueryWrapper<>();
         if (query != null) {
-            if (StringUtils.isNotBlank(query.getUserSid())) {
-                qw.eq("createBySid", query.getUserSid());
-            }
+            qw.eq("createBySid", query.getUserSid());
             //仓库名称
             if (StringUtils.isNotBlank(query.getWarehouseName())) {
                 qw.like("warehouseName", query.getWarehouseName());