diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayCommonProjectController.java index 877c4714..f2125808 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayCommonProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayCommonProjectController.java @@ -15,6 +15,8 @@ import com.jero.commonProject.entity.PayCommonProject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.company.entity.PayContactsManagement; +import com.jero.company.service.IPayContactsManagementService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -37,6 +39,8 @@ import io.swagger.annotations.ApiOperation; public class PayCommonProjectController extends JeroController { @Autowired private IPayCommonProjectService payCommonProjectService; + @Autowired + private IPayContactsManagementService payContactsManagementService; /** * 分页列表查询 @@ -49,23 +53,20 @@ public class PayCommonProjectController extends JeroController> queryPageList(PayCommonProject payCommonProject, + public Result queryPageList(PayCommonProject payCommonProject, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="paymentDate",required = false) String paymentDate, HttpServletRequest req) { -// if(!StringUtils.isBlank(payCommonProject.getChargeProject()) && payCommonProject.getChargeProject().length() > 100){ -// return Result.error("来款项目长度应小于100个字符"); -// } -// if(!StringUtils.isBlank(payCommonProject.getChargeCompanyName()) && payCommonProject.getChargeCompanyName().length() > 50){ -// return Result.error("来款单位长度应小于50个字符"); -// } - Result> result = new Result<>(); + if(!StringUtils.isBlank(payCommonProject.getChargeProject()) && payCommonProject.getChargeProject().length() > 100){ + return Result.error("来款项目长度应小于100个字符"); + } + if(!StringUtils.isBlank(payCommonProject.getChargeCompanyName()) && payCommonProject.getChargeCompanyName().length() > 50){ + return Result.error("来款单位长度应小于50个字符"); + } Page page = new Page(pageNo, pageSize); IPage pageList = payCommonProjectService.queryPageList(page, payCommonProject, paymentDate); - result.setSuccess(true); - result.setResult(pageList); - return result; + return Result.OK(pageList); } /** @@ -94,6 +95,16 @@ public class PayCommonProjectController extends JeroController