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 @@
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> listPage(PagerQuery pagerQuery) {
+ ResultBean> listPage(@RequestBody PagerQuery pagerQuery) {
ResultBean rb = ResultBean.fireFail();
PagerVo pv = warehousingPledgeService.listPageVo(pagerQuery);
return rb.success().setData(pv);
@@ -84,16 +84,19 @@ public class WarehousingPledgeRest {
ResultBean> 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 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());