From 4520e571bbb5f70c2e93b02fd8e6f969d9276277 Mon Sep 17 00:00:00 2001 From: zhouhaibin Date: Thu, 8 May 2025 13:33:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=96=E6=B6=88=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/application-dev.yml | 4 ++-- .../controller/ContractualInfoController.java | 14 +++++++------- .../ContractualProductInfoController.java | 14 +++++++------- .../JyjContractualTaskBatchController.java | 12 ++++++------ .../ContractualProductInfoMapper.xml | 4 ++-- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 24d3f7c..0735e3a 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -52,8 +52,8 @@ spring: # url: jdbc:mysql://localhost:3306/jyjtable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # username: root # password: root - url: jdbc:mysql://10.1.21.250:3306/jyjtable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true -# url: jdbc:mysql://218.0.1.42:53306/jyjtable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true +# url: jdbc:mysql://10.1.21.250:3306/jyjtable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://218.0.1.42:53306/jyjtable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # url: jdbc:mysql://10.1.21.251:3306/jyjtable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # url: jdbc:mysql://222.75.18.225:2881/jyjtable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true username: root diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualInfoController.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualInfoController.java index f1a9d4e..756e775 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualInfoController.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualInfoController.java @@ -40,7 +40,7 @@ public class ContractualInfoController extends BaseController { /** * 查询合同信息保存列表 */ - @SaCheckPermission("productManagement:ContractualInfo:list") +// @SaCheckPermission("productManagement:ContractualInfo:list") @GetMapping("/list") public TableDataInfo list(ContractualInfoBo bo, PageQuery pageQuery) { return ContractualInfoService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class ContractualInfoController extends BaseController { /** * 导出合同信息保存列表 */ - @SaCheckPermission("productManagement:ContractualInfo:export") +// @SaCheckPermission("productManagement:ContractualInfo:export") @Log(title = "合同信息保存", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(ContractualInfoBo bo, HttpServletResponse response) { @@ -62,13 +62,13 @@ public class ContractualInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("productManagement:ContractualInfo:query") +// @SaCheckPermission("productManagement:ContractualInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(ContractualInfoService.queryById(id)); } - @SaCheckPermission("productManagement:ContractualInfo:query") +// @SaCheckPermission("productManagement:ContractualInfo:query") @GetMapping("/getInfoByTaskid/{id}") public R getInfoByTaskid(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -77,7 +77,7 @@ public class ContractualInfoController extends BaseController { /** * 新增合同信息保存 */ - @SaCheckPermission("productManagement:ContractualInfo:add") +// @SaCheckPermission("productManagement:ContractualInfo:add") @Log(title = "合同信息保存", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -88,7 +88,7 @@ public class ContractualInfoController extends BaseController { /** * 修改合同信息保存 */ - @SaCheckPermission("productManagement:ContractualInfo:edit") +// @SaCheckPermission("productManagement:ContractualInfo:edit") @Log(title = "合同信息保存", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -101,7 +101,7 @@ public class ContractualInfoController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("productManagement:ContractualInfo:remove") +// @SaCheckPermission("productManagement:ContractualInfo:remove") @Log(title = "合同信息保存", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualProductInfoController.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualProductInfoController.java index ff03306..295502b 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualProductInfoController.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualProductInfoController.java @@ -43,7 +43,7 @@ public class ContractualProductInfoController extends BaseController { /** * 查询合同产品信息列表 */ - @SaCheckPermission("productManagement:ContractualProductInfo:list") +// @SaCheckPermission("productManagement:ContractualProductInfo:list") @GetMapping("/list") public TableDataInfo list(ContractualProductInfoBo bo, PageQuery pageQuery) { return contractualProductInfoService.queryPageList(bo, pageQuery); @@ -52,7 +52,7 @@ public class ContractualProductInfoController extends BaseController { /** * 导出合同产品信息列表 */ - @SaCheckPermission("productManagement:ContractualProductInfo:export") +// @SaCheckPermission("productManagement:ContractualProductInfo:export") @Log(title = "合同产品信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(ContractualProductInfoBo bo, HttpServletResponse response) { @@ -78,7 +78,7 @@ public class ContractualProductInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("productManagement:ContractualProductInfo:query") +// @SaCheckPermission("productManagement:ContractualProductInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -89,7 +89,7 @@ public class ContractualProductInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("productManagement:ContractualProductInfo:query") +// @SaCheckPermission("productManagement:ContractualProductInfo:query") @GetMapping("/getInfoByTaskid/{id}") public R> getInfoByTaskid(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -98,7 +98,7 @@ public class ContractualProductInfoController extends BaseController { /** * 新增合同产品信息 */ - @SaCheckPermission("productManagement:ContractualProductInfo:add") +// @SaCheckPermission("productManagement:ContractualProductInfo:add") @Log(title = "合同产品信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -109,7 +109,7 @@ public class ContractualProductInfoController extends BaseController { /** * 修改合同产品信息 */ - @SaCheckPermission("productManagement:ContractualProductInfo:edit") +// @SaCheckPermission("productManagement:ContractualProductInfo:edit") @Log(title = "合同产品信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -122,7 +122,7 @@ public class ContractualProductInfoController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("productManagement:ContractualProductInfo:remove") +// @SaCheckPermission("productManagement:ContractualProductInfo:remove") @Log(title = "合同产品信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/JyjContractualTaskBatchController.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/JyjContractualTaskBatchController.java index 87428af..7c47818 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/JyjContractualTaskBatchController.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/JyjContractualTaskBatchController.java @@ -51,7 +51,7 @@ public class JyjContractualTaskBatchController extends BaseController { /** * 查询合同批处理记录列表 */ - @SaCheckPermission("productManagement:JyjcontractualTaskBatch:list") +// @SaCheckPermission("productManagement:JyjcontractualTaskBatch:list") @GetMapping("/list") public TableDataInfo list(JyjContractualTaskBatchBo bo, PageQuery pageQuery) { return jyjContractualTaskBatchService.queryPageList(bo, pageQuery); @@ -73,7 +73,7 @@ public class JyjContractualTaskBatchController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("productManagement:JyjcontractualTaskBatch:query") +// @SaCheckPermission("productManagement:JyjcontractualTaskBatch:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -83,7 +83,7 @@ public class JyjContractualTaskBatchController extends BaseController { /** * 新增合同批处理记录 */ - @SaCheckPermission("productManagement:JyjcontractualTaskBatch:add") +// @SaCheckPermission("productManagement:JyjcontractualTaskBatch:add") @Log(title = "合同批处理记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -94,7 +94,7 @@ public class JyjContractualTaskBatchController extends BaseController { /** * 修改合同批处理记录 */ - @SaCheckPermission("productManagement:JyjcontractualTaskBatch:edit") +// @SaCheckPermission("productManagement:JyjcontractualTaskBatch:edit") @Log(title = "合同批处理记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -107,7 +107,7 @@ public class JyjContractualTaskBatchController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("productManagement:JyjcontractualTaskBatch:remove") +// @SaCheckPermission("productManagement:JyjcontractualTaskBatch:remove") @Log(title = "合同批处理记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -144,7 +144,7 @@ public class JyjContractualTaskBatchController extends BaseController { * @param batchName 批次名称 * @param resultType 结果类型 */ - @SaCheckPermission("productManagement:JyjcontractualTaskBatch:export") +// @SaCheckPermission("productManagement:JyjcontractualTaskBatch:export") @Log(title = "合同批处理结果", businessType = BusinessType.EXPORT) @PostMapping("/export") public void exportResult( diff --git a/zaojiaManagement/zaojia-productManagement/src/main/resources/mapper/productManagement/ContractualProductInfoMapper.xml b/zaojiaManagement/zaojia-productManagement/src/main/resources/mapper/productManagement/ContractualProductInfoMapper.xml index 369a586..00e3a85 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/resources/mapper/productManagement/ContractualProductInfoMapper.xml +++ b/zaojiaManagement/zaojia-productManagement/src/main/resources/mapper/productManagement/ContractualProductInfoMapper.xml @@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND p.unit_price = #{queryParam.unitPrice} - AND i.purchaser_name = LIKE CONCAT('%', #{queryParam.purchaser_name}, '%') + AND i.purchaser_name LIKE CONCAT('%', #{queryParam.purchaserName}, '%') AND p.del_flag = '0' AND dt.result_type = 'reviewSuccess' @@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND p.cpu_model LIKE CONCAT('%', #{bo.cpuModel}, '%') - AND dt.result_type = 'reviewSuccess' AND dt.del_flag = '0' + AND dt.result_type = 'reviewSuccess' AND dt.del_flag = '0' and p.del_flag = '0' AND CASE WHEN #{bo.type} = '终端' THEN p.type IN ('台式计算机', '便携式计算机')