zgty/zt-base
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
潘荣晟
2025-10-24 17:14:12 +08:00
parent 1427e5a55b 4d654d9774
commit 57a6ed53eb
7 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/BaseApi.java
View File

@@ -28,5 +28,5 @@ public interface BaseApi {
@GetMapping(PREFIX + "/getElementNoPage")
@Operation(summary = "金属元素数据不分页查询")
CommonResult<List<ElementDTO>> getElementNoPage(ElementDTO respVO);
CommonResult<List<ElementDTO>> getElementNoPage();
}

4
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/api/BaseApiImpl.java
View File

@@ -54,8 +54,8 @@ public class BaseApiImpl implements BaseApi {
return materialOtherService.getMaterialOtherNoPage(respVO);
}
public CommonResult<List<ElementDTO>> getElementNoPage(ElementDTO respVO) {
List<ElementDO> list = elementService.getElementNoPage(respVO);
public CommonResult<List<ElementDTO>> getElementNoPage() {
List<ElementDO> list = elementService.getElementNoPage();
return success(BeanUtils.toBean(list, ElementDTO.class));
}
}

7
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java
View File

@@ -31,13 +31,8 @@ public interface ElementMapper extends BaseMapperX<ElementDO> {
String selectMaxCode();
default List<ElementDO> getElementNoPage(ElementDTO dto) {
default List<ElementDO> getElementNoPage() {
return selectList(new LambdaQueryWrapperX<ElementDO>()
.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));
}
}

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementService.java
View File

@@ -64,5 +64,5 @@ public interface ElementService {
void enableElementList(List<ElementRespVO> saveReqVOS);
List<ElementDO> getElementNoPage(ElementDTO respVO);
List<ElementDO> getElementNoPage();
}

4
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java
View File

@@ -109,8 +109,8 @@ public class ElementServiceImpl implements ElementService {
}
@Override
public List<ElementDO> getElementNoPage(ElementDTO respVO) {
return elementMapper.getElementNoPage(respVO);
public List<ElementDO> getElementNoPage() {
return elementMapper.getElementNoPage();
}
}

3
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java
View File

@@ -73,8 +73,7 @@ public class ContractApiImpl implements ContractApi {
reqVO.getContractPaperNumber()
+ "-"
+ LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmSSS")),
reqVO)
;
reqVO);
return success(true);
}
}

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCompanyServiceImpl.java
View File

@@ -290,7 +290,7 @@ public class ErpCompanyServiceImpl implements ErpCompanyService {
@Override
public String test2() {
ElementDTO respVO = new ElementDTO();
CommonResult<List<ElementDTO>> dtos = baseApi.getElementNoPage(respVO);
CommonResult<List<ElementDTO>> dtos = baseApi.getElementNoPage();
return dtos.toString();
}
}