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 95f2e30..3ae12b4 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 @@ -1,6 +1,8 @@ package com.zt.plat.module.api; +import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.module.api.dto.AccountDTO; +import com.zt.plat.module.api.dto.ElementDTO; import com.zt.plat.module.api.dto.MaterialOtherDTO; import com.zt.plat.module.base.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; @@ -23,4 +25,8 @@ public interface BaseApi { @GetMapping(PREFIX + "/getMaterialOtherNoPage") @Operation(summary = "物料拓展关系数据不分页查询") List getMaterialOtherNoPage(MaterialOtherDTO respVO); + + @GetMapping(PREFIX + "/getElementNoPage") + @Operation(summary = "金属元素数据不分页查询") + CommonResult> getElementNoPage(ElementDTO respVO); } diff --git a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/dto/ElementDTO.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/dto/ElementDTO.java new file mode 100644 index 0000000..69a2e08 --- /dev/null +++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/dto/ElementDTO.java @@ -0,0 +1,33 @@ +package com.zt.plat.module.api.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 金属元素 Response VO") +@Data +public class ElementDTO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "21884") + private Long id; + + @Schema(description = "金属元素缩写", requiredMode = Schema.RequiredMode.REQUIRED) + private String abbreviation; + + @Schema(description = "金属元素名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + private String name; + + @Schema(description = "金属元素编码", requiredMode = Schema.RequiredMode.REQUIRED) + private String coding; + + @Schema(description = "小数位数", requiredMode = Schema.RequiredMode.REQUIRED) + private Long decimalValue; + + @Schema(description = "品位单位", requiredMode = Schema.RequiredMode.REQUIRED) + private String gradeUnit; + +} \ No newline at end of file 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 62591c3..96aa19a 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 @@ -1,16 +1,30 @@ package com.zt.plat.module.base.api; +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; import com.zt.plat.module.api.BaseApi; import com.zt.plat.module.api.dto.AccountDTO; +import com.zt.plat.module.api.dto.ElementDTO; import com.zt.plat.module.api.dto.MaterialOtherDTO; +import com.zt.plat.module.base.controller.admin.base.vo.ElementPageReqVO; +import com.zt.plat.module.base.controller.admin.base.vo.ElementRespVO; +import com.zt.plat.module.base.dal.dataobject.base.ElementDO; import com.zt.plat.module.base.service.base.AccountService; +import com.zt.plat.module.base.service.base.ElementService; import com.zt.plat.module.base.service.base.MaterialOtherService; +import io.swagger.v3.oas.annotations.Operation; import jakarta.annotation.Resource; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import static com.zt.plat.framework.common.pojo.CommonResult.success; + /** * ERP Api 实现类 * @@ -27,6 +41,9 @@ public class BaseApiImpl implements BaseApi { @Resource private MaterialOtherService materialOtherService; + @Resource + private ElementService elementService; + @Override public List getAccountNoPage(AccountDTO respVO) { return accountService.getAccountNoPage(respVO); @@ -36,4 +53,9 @@ public class BaseApiImpl implements BaseApi { public List getMaterialOtherNoPage(MaterialOtherDTO respVO) { return materialOtherService.getMaterialOtherNoPage(respVO); } + + public CommonResult> getElementNoPage(ElementDTO respVO) { + List list = elementService.getElementNoPage(respVO); + 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 24b5a91..caf489a 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 @@ -3,10 +3,13 @@ package com.zt.plat.module.base.dal.mysql.base; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zt.plat.module.api.dto.ElementDTO; import com.zt.plat.module.base.controller.admin.base.vo.ElementPageReqVO; import com.zt.plat.module.base.dal.dataobject.base.ElementDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 金属元素 Mapper * @@ -27,4 +30,14 @@ public interface ElementMapper extends BaseMapperX { } String selectMaxCode(); + + default List getElementNoPage(ElementDTO dto) { + 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 9dc95a9..3b06b2f 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 @@ -1,6 +1,7 @@ package com.zt.plat.module.base.service.base; import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.module.api.dto.ElementDTO; import com.zt.plat.module.base.controller.admin.base.vo.ElementPageReqVO; import com.zt.plat.module.base.controller.admin.base.vo.ElementRespVO; import com.zt.plat.module.base.controller.admin.base.vo.ElementSaveReqVO; @@ -62,4 +63,6 @@ public interface ElementService { PageResult getElementPage(ElementPageReqVO pageReqVO); void enableElementList(List saveReqVOS); + + List getElementNoPage(ElementDTO respVO); } \ 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 753ff5d..e4ef507 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 @@ -3,6 +3,7 @@ package com.zt.plat.module.base.service.base; import cn.hutool.core.collection.CollUtil; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.module.api.dto.ElementDTO; import com.zt.plat.module.base.controller.admin.base.vo.ElementPageReqVO; import com.zt.plat.module.base.controller.admin.base.vo.ElementRespVO; import com.zt.plat.module.base.controller.admin.base.vo.ElementSaveReqVO; @@ -107,4 +108,9 @@ public class ElementServiceImpl implements ElementService { } } + @Override + public List getElementNoPage(ElementDTO respVO) { + return elementMapper.getElementNoPage(respVO); + } + } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpCompanyController.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpCompanyController.java index 91ddd40..63629bd 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpCompanyController.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpCompanyController.java @@ -126,7 +126,7 @@ public class ErpCompanyController { } @PostMapping("/test2") - @Operation(summary = "获取base的账户条款") + @Operation(summary = "获取base的金属元素") @PreAuthorize("@ss.hasPermission('sply:erp-company:get')") public CommonResult test2() { String TEST = erpCompanyService.test2(); 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 aa0237f..8997eb2 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 @@ -4,11 +4,13 @@ import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.xxl.job.core.handler.annotation.XxlJob; +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; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.module.api.BaseApi; import com.zt.plat.module.api.dto.AccountDTO; +import com.zt.plat.module.api.dto.ElementDTO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpCompanyPageReqVO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpCompanyRespVO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpCompanySaveReqVO; @@ -287,9 +289,8 @@ public class ErpCompanyServiceImpl implements ErpCompanyService { @Override public String test2() { - AccountDTO respVO = new AccountDTO(); - respVO.setCustomerNumber("50000760"); - List dtos = baseApi.getAccountNoPage(respVO); + ElementDTO respVO = new ElementDTO(); + CommonResult> dtos = baseApi.getElementNoPage(respVO); return dtos.toString(); } } \ No newline at end of file