From df237e1a444f63451cd343ee8c2ad067dbd8698a Mon Sep 17 00:00:00 2001 From: guojunyun Date: Fri, 24 Oct 2025 11:47:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E5=8F=B7=E9=94=99=E4=BD=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zt/plat/module/contractorder/api/ContractApiImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java index f7cc8be..5f44aee 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java @@ -73,8 +73,7 @@ public class ContractApiImpl implements ContractApi { reqVO.getContractPaperNumber() + "-" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmSSS")), - reqVO) - ; + reqVO); return success(true); } } From 4d654d977439501e05a4a560049cb62283f4fa89 Mon Sep 17 00:00:00 2001 From: liss <1780094091@qq.com> Date: Fri, 24 Oct 2025 16:59:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=91=E5=B1=9E=E5=85=83=E7=B4=A0?= =?UTF-8?q?=E5=A4=96=E9=83=A8=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/zt/plat/module/api/BaseApi.java | 2 +- .../main/java/com/zt/plat/module/base/api/BaseApiImpl.java | 4 ++-- .../zt/plat/module/base/dal/mysql/base/ElementMapper.java | 7 +------ .../zt/plat/module/base/service/base/ElementService.java | 2 +- .../plat/module/base/service/base/ElementServiceImpl.java | 4 ++-- .../plat/module/erp/service/erp/ErpCompanyServiceImpl.java | 2 +- 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/BaseApi.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/BaseApi.java index 3ae12b4..ffd776e 100644 --- a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/BaseApi.java +++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/BaseApi.java @@ -28,5 +28,5 @@ public interface BaseApi { @GetMapping(PREFIX + "/getElementNoPage") @Operation(summary = "金属元素数据不分页查询") - CommonResult> getElementNoPage(ElementDTO respVO); + CommonResult> getElementNoPage(); } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/api/BaseApiImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/api/BaseApiImpl.java index 96aa19a..a568c09 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/api/BaseApiImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/api/BaseApiImpl.java @@ -54,8 +54,8 @@ public class BaseApiImpl implements BaseApi { return materialOtherService.getMaterialOtherNoPage(respVO); } - public CommonResult> getElementNoPage(ElementDTO respVO) { - List list = elementService.getElementNoPage(respVO); + public CommonResult> getElementNoPage() { + List list = elementService.getElementNoPage(); return success(BeanUtils.toBean(list, ElementDTO.class)); } } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java index caf489a..8e91114 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java @@ -31,13 +31,8 @@ public interface ElementMapper extends BaseMapperX { String selectMaxCode(); - default List getElementNoPage(ElementDTO dto) { + default List getElementNoPage() { return selectList(new LambdaQueryWrapperX() - .eqIfPresent(ElementDO::getAbbreviation, dto.getAbbreviation()) - .likeIfPresent(ElementDO::getName, dto.getName()) - .eqIfPresent(ElementDO::getDecimalValue, dto.getDecimalValue()) - .eqIfPresent(ElementDO::getCoding, dto.getCoding()) - .eqIfPresent(ElementDO::getGradeUnit, dto.getGradeUnit()) .orderByDesc(ElementDO::getId)); } } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementService.java index 3b06b2f..d93a7d5 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementService.java @@ -64,5 +64,5 @@ public interface ElementService { void enableElementList(List saveReqVOS); - List getElementNoPage(ElementDTO respVO); + List getElementNoPage(); } \ No newline at end of file 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 e4ef507..79290b0 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 @@ -109,8 +109,8 @@ public class ElementServiceImpl implements ElementService { } @Override - public List getElementNoPage(ElementDTO respVO) { - return elementMapper.getElementNoPage(respVO); + public List getElementNoPage() { + return elementMapper.getElementNoPage(); } } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCompanyServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCompanyServiceImpl.java index 8997eb2..d2fcf07 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCompanyServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCompanyServiceImpl.java @@ -290,7 +290,7 @@ public class ErpCompanyServiceImpl implements ErpCompanyService { @Override public String test2() { ElementDTO respVO = new ElementDTO(); - CommonResult> dtos = baseApi.getElementNoPage(respVO); + CommonResult> dtos = baseApi.getElementNoPage(); return dtos.toString(); } } \ No newline at end of file