diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/controller/PayCaseCommitteeSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/controller/PayCaseCommitteeSubitemController.java index 60c3bb83..6c9629a5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/controller/PayCaseCommitteeSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/controller/PayCaseCommitteeSubitemController.java @@ -1,8 +1,9 @@ package com.jero.dataMangement.payCaseCommitteeSubitem.controller; import java.util.Arrays; -import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; @@ -10,6 +11,8 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.dataMangement.payCaseCommitteeSubitem.entity.DTO.PayCaseCommitteeSubitemDTO; import com.jero.dataMangement.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem; +import com.jero.dataMangement.payCaseCommitteeSubitem.entity.findByName; +import com.jero.dataMangement.payCaseCommitteeSubitem.mapper.PayCaseCommitteeSubitemMapper; import com.jero.dataMangement.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -18,8 +21,10 @@ import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import javax.servlet.http.HttpServletRequest; - /** + +/** * @Description: 分标委成员表 * @Author: jeecg-boot * @Date: 2021-08-27 @@ -32,7 +37,36 @@ import io.swagger.annotations.ApiOperation; public class PayCaseCommitteeSubitemController extends JeroController { @Autowired private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService; + + @Autowired + private PayCaseCommitteeSubitemMapper payCaseCommitteeSubitemMapper; + /** + * 分页列表查询 + * @param pageNo + * @param pageSize + + * @return + */ + @AutoLog(value = "分标委成员表-搜索") + @ApiOperation(value="分标委成员表-搜索", notes="分标委成员表-搜索") + @GetMapping(value = "/find") + public Result find(@RequestParam(name="name",required =false) String name, + @RequestParam(name="companyName",required =false) String companyName, + @RequestParam(name="fenbiaoweiName",required =false) String fenbiaoweiName, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize + ) { + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper + .like(StringUtils.isNotBlank(name), "pt.name", name).or() + .like(StringUtils.isNotBlank(companyName), "pm.company_name", companyName) + .like(StringUtils.isNotBlank(fenbiaoweiName), "pe.name", fenbiaoweiName); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payCaseCommitteeSubitemMapper.list(page,queryWrapper); + return Result.OK(pageList); + } + /** * 分页列表查询 * @param payCaseCommitteeSubitem @@ -53,7 +87,10 @@ public class PayCaseCommitteeSubitemController extends JeroController pageList = payCaseCommitteeSubitemService.page(page, queryWrapper); return Result.OK(pageList); } - + + + + /** * 添加 * @param payCaseCommitteeSubitemDTO diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/PayCaseCommitteeSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/PayCaseCommitteeSubitemMapper.java index 1e723c10..63514d19 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/PayCaseCommitteeSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/PayCaseCommitteeSubitemMapper.java @@ -1,8 +1,14 @@ package com.jero.dataMangement.payCaseCommitteeSubitem.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.dataMangement.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.dataMangement.payCaseCommitteeSubitem.entity.findByName; +import org.springframework.data.repository.query.Param; /** * @Description: pay_case_committee_subitem @@ -12,4 +18,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface PayCaseCommitteeSubitemMapper extends BaseMapper { + Page list (IPage page, @Param(Constants.WRAPPER) Wrapper ew); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/xml/PayCaseCommitteeSubitemMapper.xml index d5cbc84b..f0e6e4ce 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/xml/PayCaseCommitteeSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/xml/PayCaseCommitteeSubitemMapper.xml @@ -1,5 +1,22 @@ - - + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/service/IPayCaseCommitteeSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/service/IPayCaseCommitteeSubitemService.java index 712b7d98..da1a9bcd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/service/IPayCaseCommitteeSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/service/IPayCaseCommitteeSubitemService.java @@ -1,6 +1,9 @@ package com.jero.dataMangement.payCaseCommitteeSubitem.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.dataMangement.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem; @@ -13,4 +16,5 @@ import com.jero.dataMangement.payCaseCommitteeSubitem.entity.PayCaseCommitteeSub public interface IPayCaseCommitteeSubitemService extends IService { + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/controller/PayDataDirectoryController.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/controller/PayDataDirectoryController.java index ce28ab16..590d51bb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/controller/PayDataDirectoryController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/controller/PayDataDirectoryController.java @@ -26,7 +26,7 @@ import io.swagger.annotations.ApiOperation; * @Date: 2021-08-30 * @Version: V1.0 */ -@Api(tags="pay_data_directory") +@Api(tags="资料目录管理") @RestController @RequestMapping("/payDataDirectory/payDataDirectory") @Slf4j @@ -43,8 +43,8 @@ public class PayDataDirectoryController extends JeroController queryPageList(PayDataDirectory payDataDirectory, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -62,8 +62,8 @@ public class PayDataDirectoryController extends JeroController add(@RequestBody PayDataDirectory payDataDirectory) { payDataDirectoryService.save(payDataDirectory); @@ -76,8 +76,8 @@ public class PayDataDirectoryController extends JeroController edit(@RequestBody PayDataDirectory payDataDirectory) { payDataDirectoryService.updateById(payDataDirectory); @@ -90,8 +90,8 @@ public class PayDataDirectoryController extends JeroController delete(@RequestParam(name="id",required=true) String id) { payDataDirectoryService.removeById(id); @@ -104,8 +104,8 @@ public class PayDataDirectoryController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.payDataDirectoryService.removeByIds(Arrays.asList(ids.split(","))); @@ -118,8 +118,8 @@ public class PayDataDirectoryController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { PayDataDirectory payDataDirectory = payDataDirectoryService.getById(id);