diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailQuery.java index 003beb5365..d30ffc78f9 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailQuery.java @@ -4,9 +4,6 @@ import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.ArrayList; -import java.util.List; - /** * @Author dimengzhe * @Date 2022/4/24 15:04 @@ -17,10 +14,4 @@ public class BusDeliveredApplyDetailQuery implements Query { private static final long serialVersionUID = 1182664979141877875L; @ApiModelProperty(value = "出库申请sid") private String sid; - - @ApiModelProperty(value = "车辆申请集合") - private BusDeliveredApplyDetailVo detailVo; - - @ApiModelProperty(value = "勾选的合同编号集合") - private List stringList = new ArrayList<>(); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java index 2cc8713f97..e3a0b0e6a1 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java @@ -113,6 +113,11 @@ public interface BusDeliveredApplyFeign { @ResponseBody public ResultBean fetchDetailsBySid(@RequestBody BusDeliveredApplyDetailQuery query); + @ApiOperation("验证是否可出库") + @PostMapping("/checkingApply") + @ResponseBody + public ResultBean checkingApply(@RequestBody CheckingApplyQuery query); + @ApiOperation("审批") @ResponseBody @PostMapping(value = "examine") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java index e5d99c2908..25edd78af8 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java @@ -78,6 +78,11 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign { return rb.setMsg("接口anrui-buscenter/busdeliveredapply/fetchDetailsBySid无法访问"); } + @Override + public ResultBean checkingApply(CheckingApplyQuery query) { + return null; + } + @Override public ResultBean examine(BusDeExamineQuery busDeExamineQuery) { return null; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/CheckingApplyQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/CheckingApplyQuery.java new file mode 100644 index 0000000000..0f1b120305 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/CheckingApplyQuery.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.buscenter.api.busdeliveredapply; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/5/5 11:20 + * @Description + */ +@Data +public class CheckingApplyQuery implements Query { + private static final long serialVersionUID = -2617877355863699165L; + + @ApiModelProperty(value = "车辆申请集合") + private BusDeliveredApplyDetailVo detailVo; + + @ApiModelProperty(value = "勾选的合同编号集合") + private List stringList = new ArrayList<>(); +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java index d51cc392e6..55b759df52 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java @@ -128,6 +128,11 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign { return vo; } + @Override + public ResultBean checkingApply(CheckingApplyQuery query) { + return busDeliveredApplyService.checkingApply(query); + } + @Override public ResultBean examine(BusDeExamineQuery busDeExamineQuery) { return busDeliveredApplyService.examine(busDeExamineQuery); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 7c5129d010..52518ecca7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -170,41 +170,23 @@ public class BusDeliveredApplyService extends MybatisBaseService rb = ResultBean.fireFail(); BusDeliveredApplyDetailVo vo = new BusDeliveredApplyDetailVo(); String sid = query.getSid(); - if (StringUtils.isBlank(sid)) { - //待出库车辆点击出库申请 - BusDeliveredApplyDetailVo busDeliveredApplyDetailVo = query.getDetailVo(); - if (busDeliveredApplyDetailVo == null) { - return rb.setMsg("请选择要出库的车辆"); - } - //查询是否是同一个合同编号 - List stringList = query.getStringList(); - if (stringList.size() > 0) { - stringList = query.getStringList().stream().distinct().collect(Collectors.toList()); - } - if (stringList.size() != 1) { - return rb.setMsg("选择的必须为同一合同编号的车辆"); - } - BeanUtil.copyProperties(busDeliveredApplyDetailVo, vo); - } else { - //出库申请点击办理 - BusDeliveredApply entity = fetchBySid(sid); - if (entity == null) { - return rb.setMsg("该申请不存在"); - } - BeanUtil.copyProperties(entity, vo); - String format = DateUtil.format(entity.getApplyDate(), "yyyy-MM-dd"); - vo.setApplyDate(format); - //根据出库申请单的sid查询需要出库的车辆信息 - List voList = busDeliveredApplyDetailsService.detailsList(sid); - for (int i = 0; i < voList.size(); i++) { - BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(voList.get(i).getUseMessageSid()); - BusDeliveredUseMessageVo busDeliveredUseMessageVo = new BusDeliveredUseMessageVo(); - BeanUtil.copyProperties(busDeliveredUseMessage, busDeliveredUseMessageVo); - voList.get(i).setUseMessage(busDeliveredUseMessageVo); - } - vo.setListVo(voList); - + //出库申请点击办理 + BusDeliveredApply entity = fetchBySid(sid); + if (entity == null) { + return rb.setMsg("该申请不存在"); } + BeanUtil.copyProperties(entity, vo); + String format = DateUtil.format(entity.getApplyDate(), "yyyy-MM-dd"); + vo.setApplyDate(format); + //根据出库申请单的sid查询需要出库的车辆信息 + List voList = busDeliveredApplyDetailsService.detailsList(sid); + for (int i = 0; i < voList.size(); i++) { + BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(voList.get(i).getUseMessageSid()); + BusDeliveredUseMessageVo busDeliveredUseMessageVo = new BusDeliveredUseMessageVo(); + BeanUtil.copyProperties(busDeliveredUseMessage, busDeliveredUseMessageVo); + voList.get(i).setUseMessage(busDeliveredUseMessageVo); + } + vo.setListVo(voList); return rb.success().setData(vo); } @@ -339,4 +321,22 @@ public class BusDeliveredApplyService extends MybatisBaseService stringList = query.getStringList(); + if (stringList.size() > 0) { + stringList = query.getStringList().stream().distinct().collect(Collectors.toList()); + } + if (stringList.size() != 1) { + return rb.setMsg("选择的必须为同一合同编号的车辆"); + } + return rb.success(); + } } \ No newline at end of file