From 491ddefcce75fde2de19ecd3bb2cc3bc3d98eb4d Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Tue, 18 Jun 2024 08:43:39 +0800 Subject: [PATCH] '123' --- .../web/controller/quot/QuotController.java | 16 ++- .../com/ruoyi/quot/mapper/QuotMapper.java | 8 ++ .../com/ruoyi/quot/service/IQuotService.java | 8 ++ .../quot/service/impl/QuotServiceImpl.java | 11 ++ .../main/resources/mapper/quot/QuotMapper.xml | 16 +++ ruoyi-ui/src/api/quot/quot.js | 9 ++ .../statisticsQuot/statisticsQuot/index.vue | 134 ++++++++++++++++++ 7 files changed, 199 insertions(+), 3 deletions(-) create mode 100644 ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java index 5b1adc9..5fce405 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java @@ -144,15 +144,13 @@ public class QuotController extends BaseController public AjaxResult getReturnUpdateInfo(@PathVariable("quotId") String quotId) { Quot quot = quotService.selectQuotByQuotId(quotId); - if("2".equals(quot.getQuotApprovalStatus())){ + if("2".equals(quot.getQuotApprovalStatus()) || "3".equals(quot.getQuotApprovalStatus())){ quot.setQuotApprovalStatus("1");// 提交状态设置为 协助中 quotService.updateQuot(quot); }else if("0".equals(quot.getQuotApprovalStatus())){ return error("该报价单当前状态为【待提交】状态,无法修改"); }else if("1".equals(quot.getQuotApprovalStatus())){ return error("该报价单当前状态为【协助中】状态,无法修改"); - }else if("3".equals(quot.getQuotApprovalStatus())){ - return error("该报价单当前状态为【已驳回】状态,无法修改"); } return success(quot); @@ -833,4 +831,16 @@ public class QuotController extends BaseController quotService.updateQuot(quot); return success(); } + + /** + * 统计有效报价单模块-获取报价单数据 + */ + @PreAuthorize("@ss.hasPermi('quot:quot:listStatisticsQuotQuot')") + @GetMapping("/listStatisticsQuotQuot") + public TableDataInfo listStatisticsQuotQuot(Quot quot) + { + startPage(); + List list = quotService.selectStatisticsQuotList(quot); + return getDataTable(list); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java b/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java index 7014cd7..db66ce5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java @@ -147,4 +147,12 @@ public interface QuotMapper * @return */ String getCode(String type); + + + /** + * 统计有效报价单模块-获取报价单数据 + * @param quot + * @return + */ + List selectStatisticsQuotList(Quot quot); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java b/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java index 083ed73..5a24511 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java @@ -130,4 +130,12 @@ public interface IQuotService * @param quot */ void updateQuotAllPassInfo(Quot quot); + + + /** + * 统计有效报价单模块-获取报价单数据 + * @param quot + * @return + */ + List selectStatisticsQuotList(Quot quot); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java index 13bc1ee..279cd87 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java @@ -278,4 +278,15 @@ public class QuotServiceImpl implements IQuotService public void updateQuotAllPassInfo(Quot quot) { quotMapper.updateQuot(quot); } + + + /** + * 统计有效报价单模块-获取报价单数据 + * @param quot + * @return + */ + @Override + public List selectStatisticsQuotList(Quot quot) { + return quotMapper.selectStatisticsQuotList(quot); + } } diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml index a81044d..43b5a4c 100644 --- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml @@ -499,4 +499,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + diff --git a/ruoyi-ui/src/api/quot/quot.js b/ruoyi-ui/src/api/quot/quot.js index 1babb54..e09e114 100644 --- a/ruoyi-ui/src/api/quot/quot.js +++ b/ruoyi-ui/src/api/quot/quot.js @@ -178,3 +178,12 @@ export function rejectQuot(data) { +//统计有效报价单模块-获取报价单数据 +export function listStatisticsQuotQuot(query) { + return request({ + url: '/quot/quot/listStatisticsQuotQuot', + method: 'get', + params: query + }) +} + diff --git a/ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue b/ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue new file mode 100644 index 0000000..631e208 --- /dev/null +++ b/ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue @@ -0,0 +1,134 @@ + +