From c82931dcb8408b2955677d03c138f9b43d051204 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 29 Jul 2022 17:59:35 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/basic/BasicUnitMaintainController.java | 4 ++-- .../api/admin/controller/basic/UdiRelevanceController.java | 2 +- .../admin/controller/info/SystemPDFModuleController.java | 6 +++++- .../api/admin/entity/basic/BasicUnitMaintainEntity.java | 6 ++++++ .../req/itextpdf/SystemPDFTemplateRelevanceRequest.java | 3 ++- .../info/impl/SystemPDFTemplateRelevanceServiceImpl.java | 5 +++++ 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java index 4121471c..3d4125ba 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java @@ -119,7 +119,7 @@ public class BasicUnitMaintainController { @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/unit/maintain/save") - public BaseResponse save(@RequestBody @Valid BasicUnitMaintainEntity basicUnitMaintainSaveRequest, + public BaseResponse save(@RequestBody BasicUnitMaintainEntity basicUnitMaintainSaveRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -141,7 +141,7 @@ public class BasicUnitMaintainController { @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/unit/maintain/update") - public BaseResponse update(@RequestBody BasicUnitMaintainEntity basicUnitMaintainSaveRequest) { + public BaseResponse update(@RequestBody @Valid BasicUnitMaintainEntity basicUnitMaintainSaveRequest) { basicUnitMaintainService.updateById(basicUnitMaintainSaveRequest); return ResultVOUtils.success("修改成功"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java index acb46b6b..0a021076 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java @@ -643,7 +643,7 @@ public class UdiRelevanceController { for (UdiRelevanceResponse temp : temps) { if (temp.getMainId() != null) if (temp.getNameCode().equals(temp.getMainId())) { - return ResultVOUtils.error(500, "已存在未关联的第三方产品ID，无法接触绑定！"); + return ResultVOUtils.error(500, "已存在未关联的第三方产品ID，无法解除绑定！"); } } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemPDFModuleController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemPDFModuleController.java index bf94ef42..cc45cdf1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemPDFModuleController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemPDFModuleController.java @@ -95,7 +95,11 @@ public class SystemPDFModuleController { List systemPDFTemplateRelevanceEntityList = systemPDFTemplateRelevanceService.filterList(systemPDFModuleRequest); - return ResultVOUtils.success(systemPDFTemplateRelevanceEntityList); + PageInfo pageInfo = new PageInfo<>(systemPDFTemplateRelevanceEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setList(pageInfo.getList()); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + return ResultVOUtils.success(pageSimpleResponse); } return ResultVOUtils.success(null); diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java index d338ecc3..fb8e283d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java @@ -2,6 +2,7 @@ package com.glxp.api.admin.entity.basic; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.util.Date; @Data @@ -9,11 +10,15 @@ public class BasicUnitMaintainEntity { private Integer id; private String erpId; + + @NotEmpty(message = "往来单位名称不能为空！") private String name; private String spell; private String addr; private String status; private String type; + + @NotEmpty(message = "社会信用号不能为空！") private String creditNo; private String contact; private String mobile; @@ -32,6 +37,7 @@ public class BasicUnitMaintainEntity { private Date updateTime; private int corpType; + private int outType; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/SystemPDFTemplateRelevanceRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/SystemPDFTemplateRelevanceRequest.java index 3f9c4226..3c254787 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/SystemPDFTemplateRelevanceRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/SystemPDFTemplateRelevanceRequest.java @@ -1,9 +1,10 @@ package com.glxp.api.admin.req.itextpdf; +import com.glxp.api.admin.req.ListPageRequest; import lombok.Data; @Data -public class SystemPDFTemplateRelevanceRequest { +public class SystemPDFTemplateRelevanceRequest extends ListPageRequest { private Integer moduleId; private Integer templateType; private String localAction; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemPDFTemplateRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemPDFTemplateRelevanceServiceImpl.java index 983bed98..e7041703 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemPDFTemplateRelevanceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemPDFTemplateRelevanceServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.service.info.impl; +import com.github.pagehelper.PageHelper; import com.glxp.api.admin.dao.info.SystemPDFTemplateRelevanceDao; import com.glxp.api.admin.entity.info.SystemPDFTemplateRelevanceEntity; import com.glxp.api.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest; @@ -20,6 +21,10 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR @Override public List filterList(SystemPDFTemplateRelevanceRequest systemPDFModuleRequest) { + if (systemPDFModuleRequest.getPage() != null) { + int offset = (systemPDFModuleRequest.getPage() - 1) * systemPDFModuleRequest.getLimit(); + PageHelper.offsetPage(offset, systemPDFModuleRequest.getLimit()); + } return systemPDFTemplateRelevanceDao.filterList(systemPDFModuleRequest); }