LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug:分标委搜索

Browse Source
This commit is contained in:
zhangqinlin
2021-08-31 10:51:11 +08:00
parent 44bfce02df
commit e53e83de88
5 changed files with 84 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/controller/PayCaseCommitteeSubitemController.java
+40 -3
View File
@@ -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<PayCaseCommitteeSubitem, IPayCaseCommitteeSubitemService> {
@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<PayCaseCommitteeSubitem> 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<PayCaseCommitteeSubitem> page = new Page<>(pageNo, pageSize);
IPage<findByName> pageList = payCaseCommitteeSubitemMapper.list(page,queryWrapper);
return Result.OK(pageList);
}
/**
* 分页列表查询
* @param payCaseCommitteeSubitem
@@ -53,7 +87,10 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
IPage<PayCaseCommitteeSubitem> pageList = payCaseCommitteeSubitemService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
* @param payCaseCommitteeSubitemDTO
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/PayCaseCommitteeSubitemMapper.java
+8
View File
@@ -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<PayCaseCommitteeSubitem> {
Page<findByName> list (IPage<PayCaseCommitteeSubitem> page, @Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> ew);
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+19 -2
View File
@@ -1,5 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.demo.payCaseCommitteeSubitem.mapper.PayCaseCommitteeSubitemMapper">
<mapper namespace="com.jero.dataMangement.payCaseCommitteeSubitem.mapper.PayCaseCommitteeSubitemMapper">
<resultMap id="people" type="com.jero.dataMangement.payCaseCommitteeSubitem.entity.findByName">
<id property="id" column="id"></id>
<result property="name" column="name"></result>
<collection property="list" ofType="com.jero.dataMangement.payCaseCommitteeSubitem.entity.childrenFindByName" javaType="java.util.List">
<result property="companyName" column="companyName"></result>
<result property="post" column="post"></result>
<result property="phone" column="phone"></result>
<result property="peopleName" column="peopleName"></result>
</collection>
</resultMap>
<select id="list" resultMap="people">
SELECT pe.id as id,pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone ,pe.name as name
from
pay_case_committee pe
left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
${ew.customSqlSegment}
</select>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/service/IPayCaseCommitteeSubitemService.java
+4
View File
@@ -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<PayCaseCommitteeSubitem> {
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/controller/PayDataDirectoryController.java
+13 -13
View File
@@ -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<PayDataDirectory,
* @param req
* @return
*/
@AutoLog(value = "pay_data_directory-分页列表查询")
@ApiOperation(value="pay_data_directory-分页列表查询", notes="pay_data_directory-分页列表查询")
@AutoLog(value = "资料目录管理-分页列表查询")
@ApiOperation(value="资料目录管理-分页列表查询", notes="资料目录管理-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(PayDataDirectory payDataDirectory,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -62,8 +62,8 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
* @param payDataDirectory
* @return
*/
@AutoLog(value = "pay_data_directory-添加")
@ApiOperation(value="pay_data_directory-添加", notes="pay_data_directory-添加")
@AutoLog(value = "资料目录管理-添加")
@ApiOperation(value="资料目录管理-添加", notes="资料目录管理-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody PayDataDirectory payDataDirectory) {
payDataDirectoryService.save(payDataDirectory);
@@ -76,8 +76,8 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
* @param payDataDirectory
* @return
*/
@AutoLog(value = "pay_data_directory-编辑")
@ApiOperation(value="pay_data_directory-编辑", notes="pay_data_directory-编辑")
@AutoLog(value = "资料目录管理-编辑")
@ApiOperation(value="资料目录管理-编辑", notes="资料目录管理-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody PayDataDirectory payDataDirectory) {
payDataDirectoryService.updateById(payDataDirectory);
@@ -90,8 +90,8 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
* @param id
* @return
*/
@AutoLog(value = "pay_data_directory-通过id删除")
@ApiOperation(value="pay_data_directory-通过id删除", notes="pay_data_directory-通过id删除")
@AutoLog(value = "资料目录管理-通过id删除")
@ApiOperation(value="资料目录管理-通过id删除", notes="资料目录管理-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
payDataDirectoryService.removeById(id);
@@ -104,8 +104,8 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
* @param ids
* @return
*/
@AutoLog(value = "pay_data_directory-批量删除")
@ApiOperation(value="pay_data_directory-批量删除", notes="pay_data_directory-批量删除")
@AutoLog(value = "资料目录管理-批量删除")
@ApiOperation(value="资料目录管理-批量删除", notes="资料目录管理-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.payDataDirectoryService.removeByIds(Arrays.asList(ids.split(",")));
@@ -118,8 +118,8 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
* @param id
* @return
*/
@AutoLog(value = "pay_data_directory-通过id查询")
@ApiOperation(value="pay_data_directory-通过id查询", notes="pay_data_directory-通过id查询")
@AutoLog(value = "资料目录管理-通过id查询")
@ApiOperation(value="资料目录管理-通过id查询", notes="资料目录管理-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
PayDataDirectory payDataDirectory = payDataDirectoryService.getById(id);