From 72de65be8e6c29b3f90e98b11f843ff57d8090f2 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 20 Sep 2022 11:08:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=82=E5=AE=B6=E9=87=87=E8=B4=AD=E4=BD=9C?= =?UTF-8?q?=E5=BA=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/busvehicleapply/BusVehicleApplyFeign.java | 4 ++-- .../BusVehicleApplyFeignFallback.java | 2 +- .../biz/busvehicleapply/BusVehicleApplyMapper.java | 5 ++++- .../biz/busvehicleapply/BusVehicleApplyMapper.xml | 12 +++++++++++- .../biz/busvehicleapply/BusVehicleApplyRest.java | 4 ++-- .../biz/busvehicleapply/BusVehicleApplyService.java | 12 ++++++++++-- 6 files changed, 30 insertions(+), 9 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java index 04ad5db1a9..b3d33ad13b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java @@ -91,6 +91,6 @@ public interface BusVehicleApplyFeign { ResultBean getVehicleApplyTopInfo(@PathVariable("sid") String sid); @ApiOperation(value = "采购申请作废") - @PutMapping(value = "/abandonApply/{sid}") - ResultBean abandonApply(@PathVariable("sid") String sid); + @PostMapping(value = "/abandonApply") + ResultBean abandonApply(@RequestBody String[] sids); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java index 6437a1f634..5280d86110 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java @@ -103,7 +103,7 @@ public class BusVehicleApplyFeignFallback implements BusVehicleApplyFeign { } @Override - public ResultBean abandonApply(String sid) { + public ResultBean abandonApply(String[] sids) { return null; } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java index c37289538c..0adec1b570 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java @@ -11,6 +11,7 @@ import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; import java.util.Map; /** @@ -41,5 +42,7 @@ public interface BusVehicleApplyMapper extends BaseMapper { AppVehicleApplyVo getVehicleApply(String sid); - ResultBean abandonApply(String sid); + int abandonApply(@Param("sidsList") List sidsList); + + int selectByNodeState(String join); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml index 7d60a36328..ed118cd389 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml @@ -82,6 +82,16 @@ update bus_vehicle_apply set nodeState = '作废' - where sid = #{sid} + where sid in + + #{sid} + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java index 8c1d9740a5..d23ee91157 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java @@ -114,8 +114,8 @@ public class BusVehicleApplyRest implements BusVehicleApplyFeign { } @Override - public ResultBean abandonApply(String sid) { - return busVehicleApplyService.abandonApply(sid); + public ResultBean abandonApply(String[] sids) { + return busVehicleApplyService.abandonApply(sids); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index 7367f2f525..632fb0a95f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -826,7 +826,15 @@ public class BusVehicleApplyService extends MybatisBaseService 0) { + return rb.setMsg("作废的数据中包含流程未完结的数据，不允许作废"); + } + List sidsList = Arrays.asList(sids); + int i = baseMapper.abandonApply(sidsList); + return rb.success(); } } \ No newline at end of file