From 320913a6268c8af76bdee60033cbd392cfe8ba1c Mon Sep 17 00:00:00 2001 From: guojunyun Date: Tue, 4 Nov 2025 17:24:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9&sql?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=AA=E5=88=A0=E9=99=A4=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=EF=BC=9A=E6=9F=A5=E8=AF=A2=E4=B8=8D=E8=AE=A1=E4=BB=B7=E8=A7=84?= =?UTF-8?q?=E5=88=99=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E3=80=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0=E9=99=8D=E7=BA=A7=E8=A7=84=E5=88=99?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E3=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=85=AC=E5=BC=8F=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/vo/contract/DemotesQueryReqVO.java | 3 +- .../api/vo/contract/FormulasQueryReqVO.java | 3 +- .../api/vo/contract/NotsQueryReqVO.java | 3 +- .../admin/contract/ContractController.java | 6 +-- .../mysql/contract/ContractDemoteMapper.java | 5 +- .../mysql/contract/ContractFormulaMapper.java | 5 +- .../dal/mysql/contract/ContractNotMapper.java | 5 +- .../service/contract/ContractService.java | 6 +-- .../service/contract/ContractServiceImpl.java | 50 ++++++++++++++++--- 9 files changed, 64 insertions(+), 22 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DemotesQueryReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DemotesQueryReqVO.java index ad5c2d0..f19447b 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DemotesQueryReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DemotesQueryReqVO.java @@ -1,11 +1,12 @@ package com.zt.plat.module.contractorder.api.vo.contract; +import com.zt.plat.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Schema(description = "管理后台 - 查询参数降级规则列表 Request VO") @Data -public class DemotesQueryReqVO { +public class DemotesQueryReqVO extends PageParam { @Schema(description = "合同名称") private String contractName; diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/FormulasQueryReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/FormulasQueryReqVO.java index e1e6176..b5664ed 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/FormulasQueryReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/FormulasQueryReqVO.java @@ -1,11 +1,12 @@ package com.zt.plat.module.contractorder.api.vo.contract; +import com.zt.plat.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Schema(description = "管理后台 - 查询结算公式列表 Request VO") @Data -public class FormulasQueryReqVO { +public class FormulasQueryReqVO extends PageParam { @Schema(description = "合同名称") private String contractName; diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/NotsQueryReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/NotsQueryReqVO.java index 1748592..7e69149 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/NotsQueryReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/NotsQueryReqVO.java @@ -1,11 +1,12 @@ package com.zt.plat.module.contractorder.api.vo.contract; +import com.zt.plat.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Schema(description = "管理后台 - 查询不计价规则列表 Request VO") @Data -public class NotsQueryReqVO { +public class NotsQueryReqVO extends PageParam { @Schema(description = "合同名称") private String contractName; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java index 4d1f09d..7373558 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java @@ -51,21 +51,21 @@ public class ContractController implements BusinessControllerMarker { @GetMapping("/nots") @Operation(summary = "查询不计价规则列表") @PreAuthorize("@ss.hasPermission('base:contract:query')") - public CommonResult> getNots(NotsQueryReqVO queryReqVO) { + public CommonResult> getNots(NotsQueryReqVO queryReqVO) { return success(contractService.getNots(queryReqVO)); } @GetMapping("/demotes") @Operation(summary = "查询参数降级规则列表") @PreAuthorize("@ss.hasPermission('base:contract:query')") - public CommonResult> getDemotes(DemotesQueryReqVO queryReqVO) { + public CommonResult> getDemotes(DemotesQueryReqVO queryReqVO) { return success(contractService.getDemotes(queryReqVO)); } @GetMapping("/formulas") @Operation(summary = "查询结算公式列表") @PreAuthorize("@ss.hasPermission('base:contract:query')") - public CommonResult> getFormulas(FormulasQueryReqVO queryReqVO) { + public CommonResult> getFormulas(FormulasQueryReqVO queryReqVO) { return success(contractService.getFormulas(queryReqVO)); } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java index b961ee9..f95b610 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java @@ -1,5 +1,6 @@ package com.zt.plat.module.contractorder.dal.mysql.contract; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import com.zt.plat.module.contractorder.api.vo.contract.DemoteRespVO; import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractDemoteDO; @@ -22,7 +23,7 @@ public interface ContractDemoteMapper extends BaseMapperX { ", (select ctrt_name from BSE_CTRT_MAIN where id = ctrt_id) contractName", ", (select ctrt_ppr_num from BSE_CTRT_MAIN where id = ctrt_id) contractPaperNumber", "from bse_ctrt_dmot", - "where 1 = 1", + "where DELETED = 0", " 0\">", "and ctrt_id in", "", @@ -37,5 +38,5 @@ public interface ContractDemoteMapper extends BaseMapperX { "", "" }) - List selectDemotes(List contractIds, String materialName, String elementName); + IPage selectDemotes(IPage page, List contractIds, String materialName, String elementName); } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractFormulaMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractFormulaMapper.java index 968260a..0833950 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractFormulaMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractFormulaMapper.java @@ -1,5 +1,6 @@ package com.zt.plat.module.contractorder.dal.mysql.contract; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import com.zt.plat.module.contractorder.api.vo.contract.FormulaRespVO; import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractFormulaDO; @@ -22,7 +23,7 @@ public interface ContractFormulaMapper extends BaseMapperX { ", (select ctrt_name from BSE_CTRT_MAIN where id = ctrt_id) contractName", ", (select ctrt_ppr_num from BSE_CTRT_MAIN where id = ctrt_id) contractPaperNumber", "from bse_ctrt_fmu", - "where 1 = 1", + "where DELETED = 0", " 0\">", "and ctrt_id in", "", @@ -37,5 +38,5 @@ public interface ContractFormulaMapper extends BaseMapperX { "", "" }) - List selectFormulas(List contractIds, String materialName, String elementName); + IPage selectFormulas(IPage page, List contractIds, String materialName, String elementName); } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractNotMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractNotMapper.java index 8f10f5c..f3bc060 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractNotMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractNotMapper.java @@ -1,5 +1,6 @@ package com.zt.plat.module.contractorder.dal.mysql.contract; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import com.zt.plat.module.contractorder.api.vo.contract.NotRespVO; import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractNotDO; @@ -22,7 +23,7 @@ public interface ContractNotMapper extends BaseMapperX { ", (select ctrt_name from BSE_CTRT_MAIN where id = ctrt_id) contractName", ", (select ctrt_ppr_num from BSE_CTRT_MAIN where id = ctrt_id) contractPaperNumber", "from bse_ctrt_nt", - "where 1 = 1", + "where DELETED = 0", " 0\">", "and ctrt_id in", "", @@ -37,5 +38,5 @@ public interface ContractNotMapper extends BaseMapperX { "", "" }) - List selectNots(List contractIds, String materialName, String elementName); + IPage selectNots(IPage page, List contractIds, String materialName, String elementName); } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java index 6228688..7e1899f 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java @@ -73,7 +73,7 @@ public interface ContractService { * @param queryReqVO 查询参数 * @return 不计价规则列表 */ - List getNots(NotsQueryReqVO queryReqVO); + PageResult getNots(NotsQueryReqVO queryReqVO); /** * 查询参数降级规则列表 @@ -81,7 +81,7 @@ public interface ContractService { * @param queryReqVO 查询参数 * @return 参数降级规则列表 */ - List getDemotes(DemotesQueryReqVO queryReqVO); + PageResult getDemotes(DemotesQueryReqVO queryReqVO); /** * 查询结算公式列表 @@ -89,7 +89,7 @@ public interface ContractService { * @param queryReqVO 查询参数 * @return 结算公式列表 */ - List getFormulas(FormulasQueryReqVO queryReqVO); + PageResult getFormulas(FormulasQueryReqVO queryReqVO); /** * 通过合同编号获取对应的合同信息 diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java index 07abdea..c8700ae 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java @@ -4,6 +4,8 @@ import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; @@ -1185,33 +1187,67 @@ public class ContractServiceImpl implements ContractService { } @Override - public List getNots(NotsQueryReqVO queryReqVO) { + public PageResult getNots(NotsQueryReqVO queryReqVO) { + // 查合同ID集合 List contractIds = new ArrayList<>(); - if (StringUtils.isNotEmpty(queryReqVO.getContractName()) || StringUtils.isNotEmpty(queryReqVO.getContractPaperNumber())) { + if (StringUtils.isNotEmpty(queryReqVO.getContractName()) + || StringUtils.isNotEmpty(queryReqVO.getContractPaperNumber())) { contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber()); } - return contractNotMapper.selectNots(contractIds, queryReqVO.getMaterialName(), queryReqVO.getElementName()); + + // 分页查询 + IPage ipage = contractNotMapper.selectNots( + new Page().setCurrent(queryReqVO.getPageNo()).setSize(queryReqVO.getPageSize()), + contractIds, + queryReqVO.getMaterialName(), + queryReqVO.getElementName() + ); + + // 分页返回 + return new PageResult().setTotal(ipage.getTotal()).setList(ipage.getRecords()); } @Override - public List getDemotes(DemotesQueryReqVO queryReqVO) { + public PageResult getDemotes(DemotesQueryReqVO queryReqVO) { + // 查合同ID集合 List contractIds = new ArrayList<>(); if (StringUtils.isNotEmpty(queryReqVO.getContractName()) || StringUtils.isNotEmpty(queryReqVO.getContractPaperNumber())) { contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber()); } - return contractDemoteMapper.selectDemotes(contractIds, queryReqVO.getMaterialName(), queryReqVO.getElementName()); + + // 分页查询 + IPage ipage = contractDemoteMapper.selectDemotes( + new Page<>().setCurrent(queryReqVO.getPageNo()).setSize(queryReqVO.getPageSize()), + contractIds, + queryReqVO.getMaterialName(), + queryReqVO.getElementName() + ); + + // 分页返回 + return new PageResult().setTotal(ipage.getTotal()).setList(ipage.getRecords()); } @Override - public List getFormulas(FormulasQueryReqVO queryReqVO) { + public PageResult getFormulas(FormulasQueryReqVO queryReqVO) { + // 查合同ID集合 List contractIds = new ArrayList<>(); if (StringUtils.isNotEmpty(queryReqVO.getContractName()) || StringUtils.isNotEmpty(queryReqVO.getContractPaperNumber())) { contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber()); } - return contractFormulaMapper.selectFormulas(contractIds, queryReqVO.getMaterialName(), queryReqVO.getElementName()); + + // 分页查询 + IPage ipage = contractFormulaMapper.selectFormulas( + new Page<>().setCurrent(queryReqVO.getPageNo()).setSize(queryReqVO.getPageSize()), + contractIds, + queryReqVO.getMaterialName(), + queryReqVO.getElementName() + ); + + // 分页返回 + return new PageResult().setTotal(ipage.getTotal()).setList(ipage.getRecords()); } @Override