From cfdeb40a239db6d049ef59ad867cde46a683bb52 Mon Sep 17 00:00:00 2001 From: liss <1780094091@qq.com> Date: Mon, 17 Nov 2025 18:33:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=91=E5=B1=9E=E5=85=83=E7=B4=A0?= =?UTF-8?q?=E6=96=B0=E5=A2=9EBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zt/plat/module/base/enums/ErrorCodeConstants.java | 1 + .../zt/plat/module/base/service/base/ElementServiceImpl.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/enums/ErrorCodeConstants.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/enums/ErrorCodeConstants.java index e019d7df..0113c886 100644 --- a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/enums/ErrorCodeConstants.java +++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/enums/ErrorCodeConstants.java @@ -12,6 +12,7 @@ public interface ErrorCodeConstants { // ========== 示例模块 1-001-000-000 ========== ErrorCode MATERIAL_OTHER_NOT_EXISTS = new ErrorCode(1_001_000_001, "物料不存在"); ErrorCode ELEMENT_NOT_EXISTS = new ErrorCode(1_001_000_001, "金属元素不存在"); + ErrorCode ELEMENT_EXISTS = new ErrorCode(1_001_000_002, "金属元素已经存在"); ErrorCode CONTACT_NOT_EXISTS = new ErrorCode(1_001_000_001, "联系人不存在"); ErrorCode ACCOUNT_NOT_EXISTS = new ErrorCode(1_001_000_001, "账户条款不存在"); ErrorCode MATERIAL_DESTROY_NOT_EXISTS = new ErrorCode(1_001_000_001, "物料回收率不存在"); diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java index 19b1bcc3..2a57bb29 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java @@ -17,6 +17,7 @@ import org.springframework.validation.annotation.Validated; import java.util.List; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zt.plat.module.base.enums.ErrorCodeConstants.ELEMENT_EXISTS; import static com.zt.plat.module.base.enums.ErrorCodeConstants.ELEMENT_NOT_EXISTS; /** @@ -95,8 +96,8 @@ public class ElementServiceImpl implements ElementService { private void validateElementCodeExists(String code) { ElementDO elementDO = elementMapper.getElementName(code); - if (elementDO == null) { - throw exception(ELEMENT_NOT_EXISTS); + if (elementDO != null) { + throw exception(ELEMENT_EXISTS); } } From 09f8db69c4fc1e0420a7d38ef8e6a302fc0bc724 Mon Sep 17 00:00:00 2001 From: guojunyun Date: Tue, 18 Nov 2025 10:19:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?SZHGYL-251=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/contract/ContractController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 821fa3de..02217758 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 @@ -26,9 +26,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -import static com.zt.plat.framework.common.pojo.CommonResult.error; import static com.zt.plat.framework.common.pojo.CommonResult.success; -import static com.zt.plat.module.contractorder.enums.ErrorCodeConstants.CONTRACT_SUBMIT_ERP_FAIL; @Slf4j @Tag(name = "管理后台 - 合同管理") @@ -155,8 +153,10 @@ public class ContractController implements BusinessControllerMarker { @Operation(summary = "提交ERP") @PreAuthorize("@ss.hasPermission('base:contract:erp')") public CommonResult submitErp(@RequestParam("id") Long id) { - JSONObject res = contractService.submitErp(id); - return res.getBool("success") ? success(res) : error(CONTRACT_SUBMIT_ERP_FAIL.getCode(), res.getStr("data")); +// JSONObject res = contractService.submitErp(id); +// return res.getBool("success") ? success(res) : error(CONTRACT_SUBMIT_ERP_FAIL.getCode(), res.getStr("data")); + // TODO ERP默认返回成功处理 SZHGYL-251 + return success(new JSONObject().putOnce("success", true)); } @GetMapping("/list/up-not-relation") From 685ba9473b9831c28c493ae229272831aaeff031 Mon Sep 17 00:00:00 2001 From: guojunyun Date: Tue, 18 Nov 2025 14:44:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=85=AC=E5=BC=8F=E5=88=97=E8=A1=A8=EF=BC=9A=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E8=BF=94?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/contract/ContractServiceImpl.java | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) 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 e8aaaf7d..8c2e398b 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 @@ -1243,8 +1243,26 @@ public class ContractServiceImpl implements ContractService { queryReqVO.getElementName() ); - // 分页返回 - return new PageResult().setTotal(ipage.getTotal()).setList(ipage.getRecords()); + // 分页返回结果 + PageResult results = new PageResult().setTotal(ipage.getTotal()).setList(ipage.getRecords()); + if (results.getTotal() > 0) { + results.getList().forEach(respVO -> { + // 基础系数配置 + List coefficientDOS = contractCoefficientMapper.selectList("FMU_ID", respVO.getId()); + respVO.setCoefficients(BeanUtils.toBean(coefficientDOS, CoefficientRespVO.class)); + // 品位等级价配置 + List gradeDOS = contractGradeMapper.selectList("FMU_ID", respVO.getId()); + respVO.setGrades(BeanUtils.toBean(gradeDOS, GradeRespVO.class)); + // 调整价配置 + List deductDOS = contractDeductMapper.selectList("FMU_ID", respVO.getId()); + respVO.setDeducts(BeanUtils.toBean(deductDOS, DeductRespVO.class)); + // 市场价配置 + List priceDOS = contractPriceMapper.selectList("FMU_ID", respVO.getId()); + respVO.setPrices(BeanUtils.toBean(priceDOS, PriceRespVO.class)); + }); + } + + return results; } @Override