Browse Source

入库质押申请相关接口

master
dimengzhe 2 years ago
parent
commit
344635e458
  1. 2
      yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/warehousingpledge/WarehousingPledgeDetailsVo.java
  2. 5
      yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeMapper.xml
  3. 7
      yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeRest.java
  4. 4
      yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeService.java

2
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;
}

5
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>

7
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 {
}
}

4
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());

Loading…
Cancel
Save