From 47c7500dc03627def56fe8e2556098f64df23bee Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Fri, 19 Apr 2024 16:47:54 +0800 Subject: [PATCH] '123' --- .../web/controller/quot/QuotController.java | 4 +- .../service/impl/QuotJsqrServiceImpl.java | 2 + .../mapper/priceVerification/QuotHjMapper.xml | 2 + .../technicalConfirm/QuotJsqrMapper.xml | 2 + .../priceVerification/hjInfo.vue | 215 +++++++++--------- .../priceVerification/index.vue | 8 +- .../technicalConfirm/jsxzInfo.vue | 3 +- 7 files changed, 118 insertions(+), 118 deletions(-) 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 e905f2a..50c95f5 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 @@ -133,7 +133,7 @@ public class QuotController extends BaseController * @return * @throws Exception */ - @PreAuthorize("@ss.hasAnyPermi('quot:quot:list,jsqr:jsqr:list')") + @PreAuthorize("@ss.hasAnyPermi('quot:quot:list,jsqr:jsqr:list,priceVerification:priceVerification:list')") @Log(title = "上传报价附件", businessType = BusinessType.INSERT) @PostMapping("/quotFile") public AjaxResult quotFile(@RequestParam("quotFile") MultipartFile file,@RequestParam("relation_id") String relation_id,@RequestParam("file_type") String file_type) throws Exception @@ -169,7 +169,7 @@ public class QuotController extends BaseController /** * 查询附件列表 */ - @PreAuthorize("@ss.hasAnyPermi('quot:quot:list,jsqr:jsqr:list')") + @PreAuthorize("@ss.hasAnyPermi('quot:quot:list,jsqr:jsqr:list,priceVerification:priceVerification:list')") @GetMapping("/quotFileList") public TableDataInfo quotFileList(QuotFile quotFile) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/service/impl/QuotJsqrServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/service/impl/QuotJsqrServiceImpl.java index 42fec6e..60bde56 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/service/impl/QuotJsqrServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/service/impl/QuotJsqrServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.technicalConfirm.service.impl; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.technicalConfirm.domain.QuotJsqr; import com.ruoyi.technicalConfirm.mapper.QuotJsqrMapper; @@ -41,6 +42,7 @@ public class QuotJsqrServiceImpl implements IQuotJsqrService * @return 报价单-技术确认单 */ @Override + @DataScope(deptAlias = "d", userAlias = "u") public List selectQuotJsqrList(QuotJsqr quotJsqr) { return quotJsqrMapper.selectQuotJsqrList(quotJsqr); diff --git a/ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml b/ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml index 62b8e82..c3742a5 100644 --- a/ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml @@ -44,6 +44,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and quot_hj_code like concat('%', #{quotHjCode}, '%') and quot_hj_pricing_date between #{params.beginQuotHjPricingDate} and #{params.endQuotHjPricingDate} + + diff --git a/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml b/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml index 729481c..1fd64db 100644 --- a/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml @@ -111,6 +111,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and quot_jsqr_code like concat('%', #{quotJsqrCode}, '%') and q.quot_jsxz_approval_status = #{quotJsxzApprovalStatus} and q.quot_code like concat('%', #{quotCode}, '%') + + order by a.update_time desc diff --git a/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue b/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue index d64e934..1bc32e9 100644 --- a/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue +++ b/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue @@ -1,112 +1,112 @@