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-09-01 09:37:59 +08:00
parent 30c9d09090
commit c0486f8c4b
8 changed files with 59 additions and 20 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
+5 -8
View File
@@ -11,11 +11,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
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.VO.payCaseCommitteeSubitemVO;
import com.jero.dataMangement.payCaseCommitteeSubitem.entity.findByName;
import com.jero.dataMangement.payCaseCommitteeSubitem.entity.VO.PayCaseCommitteeSubitemVO;
import com.jero.dataMangement.payCaseCommitteeSubitem.entity.FindByName;
import com.jero.dataMangement.payCaseCommitteeSubitem.mapper.PayCaseCommitteeSubitemMapper;
import com.jero.dataMangement.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService;
import io.swagger.annotations.ApiImplicitParam;
@@ -26,8 +25,6 @@ import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.servlet.http.HttpServletRequest;
/**
* @Description: 分标委成员表
@@ -54,7 +51,7 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
* @return
*/
@AutoLog(value = "分标委成员表-搜索")
@ApiOperation(value="分标委成员表-搜索", notes="分标委成员表-搜索",response = findByName.class)
@ApiOperation(value="分标委成员表-搜索", notes="分标委成员表-搜索",response = FindByName.class)
@GetMapping(value = "/find")
public Result<?> find(@RequestParam(name="name",required =false) String name,
@RequestParam(name="companyName",required =false) String companyName,
@@ -68,7 +65,7 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
.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);
IPage<FindByName> pageList = payCaseCommitteeSubitemMapper.list(page,queryWrapper);
return Result.OK(pageList);
}
@@ -82,7 +79,7 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
public Result<?> queryPageList(@RequestParam(name="id",required =true) String id) {
QueryWrapper<PayCaseCommitteeSubitem> queryWrapper = Wrappers.query();
queryWrapper.eq("pm.committee_id",id);
List<payCaseCommitteeSubitemVO> list = payCaseCommitteeSubitemMapper.list2(queryWrapper);
List<PayCaseCommitteeSubitemVO> list = payCaseCommitteeSubitemMapper.list2(queryWrapper);
return Result.OK(list);
}
/**
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/childrenFindByName.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/ChildrenFindByName.java
+1 -1
View File
@@ -5,7 +5,7 @@ import lombok.Data;
import java.io.Serializable;
@Data
public class childrenFindByName implements Serializable {
public class ChildrenFindByName implements Serializable {
@ApiModelProperty(value = "企业名称")
private java.lang.String companyName;
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/findByName.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/FindByName.java
+2 -2
View File
@@ -7,7 +7,7 @@ import java.io.Serializable;
import java.util.List;
@Data
public class findByName implements Serializable {
public class FindByName implements Serializable {
@ApiModelProperty(value = "主键")
private java.lang.String id;
@@ -16,7 +16,7 @@ public class findByName implements Serializable {
private java.lang.String name;
@ApiModelProperty(value = "子目录分标委成员")
private List<childrenFindByName> list;
private List<ChildrenFindByName> list;
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/VO/payCaseCommitteeSubitemVO.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/VO/PayCaseCommitteeSubitemVO.java
+1 -1
View File
@@ -6,7 +6,7 @@ import lombok.Data;
@Data
@ApiModel(value="payCaseCommitteeSubitemVO对象", description="分标委成员返回对象")
public class payCaseCommitteeSubitemVO {
public class PayCaseCommitteeSubitemVO {
@ApiModelProperty(value = "分标委成员主键")
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/PayCaseCommitteeSubitemMapper.java
+4 -5
View File
@@ -2,14 +2,13 @@ package com.jero.dataMangement.payCaseCommitteeSubitem.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.VO.payCaseCommitteeSubitemVO;
import com.jero.dataMangement.payCaseCommitteeSubitem.entity.findByName;
import com.jero.dataMangement.payCaseCommitteeSubitem.entity.VO.PayCaseCommitteeSubitemVO;
import com.jero.dataMangement.payCaseCommitteeSubitem.entity.FindByName;
import org.apache.ibatis.annotations.Param;
@@ -23,8 +22,8 @@ import java.util.List;
*/
public interface PayCaseCommitteeSubitemMapper extends BaseMapper<PayCaseCommitteeSubitem> {
Page<findByName> list (IPage<PayCaseCommitteeSubitem> page, @Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
Page<FindByName> list (IPage<PayCaseCommitteeSubitem> page, @Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
List<payCaseCommitteeSubitemVO> list2 (@Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
List<PayCaseCommitteeSubitemVO> list2 (@Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+3 -3
View File
@@ -1,10 +1,10 @@
<?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="com.jero.dataMangement.payCaseCommitteeSubitem.mapper.PayCaseCommitteeSubitemMapper">
<resultMap id="people" type="com.jero.dataMangement.payCaseCommitteeSubitem.entity.findByName">
<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">
<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>
@@ -21,7 +21,7 @@
</select>
<select id="list2" resultType="com.jero.dataMangement.payCaseCommitteeSubitem.entity.VO.payCaseCommitteeSubitemVO">
<select id="list2" resultType="com.jero.dataMangement.payCaseCommitteeSubitem.entity.VO.PayCaseCommitteeSubitemVO">
SELECT pm.id as id,pt.name as contactsName,pm.company_name as companyName,pt.post as post,pt.phone as PhoneNamber
from
pay_case_committee pe
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/entity/DTO/PayDataDirectoryDTO.java
+30
View File
@@ -0,0 +1,30 @@
package com.jero.dataMangement.payDataDirectory.entity.DTO;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import javax.validation.constraints.NotBlank;
@Data
public class PayDataDirectoryDTO {
@NotBlank(message = "父id不能为空")
@ApiModelProperty(value = "父id")
private java.lang.String parentId;
@NotBlank(message = "父id不能为空")
@ApiModelProperty(value = "名称")
private java.lang.String name;
@ApiModelProperty(value = "排序号")
private java.lang.String sort;
@ApiModelProperty(value = "备注")
private java.lang.String remarks;
// @ApiModelProperty(value = "类型(1：分标委，2：会议)")
// private java.lang.Integer type;
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/entity/DirectoryToTree.java
+13
View File
@@ -0,0 +1,13 @@
package com.jero.dataMangement.payDataDirectory.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class DirectoryToTree extends PayDataDirectory{
@ApiModelProperty(value = "子集")
private List<PayDataDirectory> children;
}