1.部分接口添加分页查询功能

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("修改成功");
     }

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，无法解除绑定！");
                     }
             }
         }

api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemPDFModuleController.java

@@ -95,7 +95,11 @@ public class SystemPDFModuleController {
 
             List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceEntityList =
                     systemPDFTemplateRelevanceService.filterList(systemPDFModuleRequest);
-            return ResultVOUtils.success(systemPDFTemplateRelevanceEntityList);
+            PageInfo<SystemPDFTemplateRelevanceResponse> pageInfo = new PageInfo<>(systemPDFTemplateRelevanceEntityList);
+            PageSimpleResponse<SystemPDFTemplateRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
+            pageSimpleResponse.setList(pageInfo.getList());
+            pageSimpleResponse.setTotal(pageInfo.getTotal());
+            return ResultVOUtils.success(pageSimpleResponse);
         }
         return ResultVOUtils.success(null);
 

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;
 
 }

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;

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<SystemPDFTemplateRelevanceResponse> filterList(SystemPDFTemplateRelevanceRequest systemPDFModuleRequest) {
+        if (systemPDFModuleRequest.getPage() != null) {
+            int offset = (systemPDFModuleRequest.getPage() - 1) * systemPDFModuleRequest.getLimit();
+            PageHelper.offsetPage(offset, systemPDFModuleRequest.getLimit());
+        }
         return systemPDFTemplateRelevanceDao.filterList(systemPDFModuleRequest);
     }