From e461be3a1fcd828a9b0b1969ea52a30238f5822c Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 17 May 2024 15:33:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E3=80=81=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E9=80=80=E8=B4=A7=E5=8D=95=E5=88=97=E8=A1=A8=E9=99=8D?= =?UTF-8?q?=E5=BA=8F=E6=8E=92=E5=BA=8F=EF=BC=8C=E5=B7=B2=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E7=9A=84=E5=AE=A1=E6=89=B9=E4=B8=8D=E8=83=BD=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java | 4 +--- .../yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java | 4 +--- .../pmspurchasebackbill/PmsPurchasebackBillMapper.java | 2 ++ .../pmspurchasebackbill/PmsPurchasebackBillMapper.xml | 7 +++++++ .../PmsPurchasebackBillService.java | 10 +++++++++- .../biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java | 2 ++ .../biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml | 7 +++++++ .../pms/pmspurchasebill/PmsPurchaseBillService.java | 10 +++++++++- 8 files changed, 38 insertions(+), 8 deletions(-) diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java index e93fe3ddcc..1c29f463cf 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java @@ -94,9 +94,7 @@ public class PmsPurchaseBillRest { @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - pmsPurchaseBillService.delAll(sids); - return rb.success(); + return pmsPurchaseBillService.delAll(sids); } @ApiOperation("根据SID获取一条记录") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java index 4ffbecf8ca..2fcc5e44fc 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java @@ -87,9 +87,7 @@ public class PmsPurchasebackBillRest { @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - pmsPurchasebackBillService.delAll(sids); - return rb.success(); + return pmsPurchasebackBillService.delAll(sids); } @ApiOperation("根据SID获取一条记录") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java index 0abf2e3370..31c1cd608c 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java @@ -63,4 +63,6 @@ public interface PmsPurchasebackBillMapper extends BaseMapper + + \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java index b1bdcbe61a..0be271bba5 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java @@ -140,6 +140,7 @@ public class PmsPurchasebackBillService extends MybatisBaseService= date_format('" + finishStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(finishEndTime), "date_format (ppb.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')" ); + qw.orderByDesc("ppb.createTime"); qw.groupBy("ppb.sid"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); @@ -225,11 +226,18 @@ public class PmsPurchasebackBillService extends MybatisBaseService 0) { + return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败"); + } delBySids(sids); for (String sid : sids) { pmsPurchasebackDetailService.delByMainSid(sid); } + return rb.success(); } public ResultBean submit(SubmitPmsPurchasebackBillDto dto) { diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java index 0a6cfc8441..9d8faa2a35 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java @@ -61,4 +61,6 @@ public interface PmsPurchaseBillMapper extends BaseMapper { String selectNum(String billNo); int updateFlowFiled(Map map); + + int selectBySid(String join); } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml index 6a968e6057..09f5e02245 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml @@ -86,4 +86,11 @@ WHERE sid=#{sid} + + \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java index 0efdba588c..3ed865520d 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java @@ -157,6 +157,7 @@ public class PmsPurchaseBillService extends MybatisBaseService= date_format('" + finishStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(finishEndTime), "date_format (ppb.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')" ); + qw.orderByDesc("ppb.createTime"); qw.groupBy("ppb.sid"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); @@ -307,13 +308,20 @@ public class PmsPurchaseBillService extends MybatisBaseService 0) { + return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败"); + } delBySids(sids); for (String sid : sids) { pmsPurchaseBillDetailService.delByMainSid(sid); pmsPurchasePayService.delByMainSid(sid); pmsPurchaseBillInvoiceService.delByMainSid(sid); } + return rb.success(); } public ResultBean submit(SubmitPmsPurchaseBillDto dto) {