From c0486f8c4b0d372bcf99732bc87924e8a7ed0f1a Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Wed, 1 Sep 2021 09:37:59 +0800 Subject: [PATCH] =?UTF-8?q?bug:=E5=88=86=E6=A0=87=E5=A7=94=E6=90=9C?= =?UTF-8?q?=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayCaseCommitteeSubitemController.java | 13 ++++---- ...indByName.java => ChildrenFindByName.java} | 2 +- .../{findByName.java => FindByName.java} | 4 +-- ...VO.java => PayCaseCommitteeSubitemVO.java} | 2 +- .../mapper/PayCaseCommitteeSubitemMapper.java | 9 +++--- .../xml/PayCaseCommitteeSubitemMapper.xml | 6 ++-- .../entity/DTO/PayDataDirectoryDTO.java | 30 +++++++++++++++++++ .../entity/DirectoryToTree.java | 13 ++++++++ 8 files changed, 59 insertions(+), 20 deletions(-) rename jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/{childrenFindByName.java => ChildrenFindByName.java} (89%) rename jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/{findByName.java => FindByName.java} (81%) rename jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/VO/{payCaseCommitteeSubitemVO.java => PayCaseCommitteeSubitemVO.java} (94%) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/entity/DTO/PayDataDirectoryDTO.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/entity/DirectoryToTree.java 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 bfc6059d..9ef823bc 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 @@ -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 find(@RequestParam(name="name",required =false) String name, @RequestParam(name="companyName",required =false) String companyName, @@ -68,7 +65,7 @@ public class PayCaseCommitteeSubitemController extends JeroController page = new Page<>(pageNo, pageSize); - IPage pageList = payCaseCommitteeSubitemMapper.list(page,queryWrapper); + IPage pageList = payCaseCommitteeSubitemMapper.list(page,queryWrapper); return Result.OK(pageList); } @@ -82,7 +79,7 @@ public class PayCaseCommitteeSubitemController extends JeroController queryPageList(@RequestParam(name="id",required =true) String id) { QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.eq("pm.committee_id",id); - List list = payCaseCommitteeSubitemMapper.list2(queryWrapper); + List list = payCaseCommitteeSubitemMapper.list2(queryWrapper); return Result.OK(list); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/childrenFindByName.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/ChildrenFindByName.java similarity index 89% rename from jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/childrenFindByName.java rename to jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/ChildrenFindByName.java index 8202a8f7..49e76e03 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/childrenFindByName.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/ChildrenFindByName.java @@ -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; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/findByName.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/FindByName.java similarity index 81% rename from jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/findByName.java rename to jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/FindByName.java index fcfb599c..7f99dc49 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/findByName.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/FindByName.java @@ -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 list; + private List list; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/VO/payCaseCommitteeSubitemVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/VO/PayCaseCommitteeSubitemVO.java similarity index 94% rename from jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/VO/payCaseCommitteeSubitemVO.java rename to jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/VO/PayCaseCommitteeSubitemVO.java index 567f0bb2..c5c86062 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/VO/payCaseCommitteeSubitemVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/VO/PayCaseCommitteeSubitemVO.java @@ -6,7 +6,7 @@ import lombok.Data; @Data @ApiModel(value="payCaseCommitteeSubitemVO对象", description="分标委成员返回对象") -public class payCaseCommitteeSubitemVO { +public class PayCaseCommitteeSubitemVO { @ApiModelProperty(value = "分标委成员主键") 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 d12853e5..0ee2c496 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 @@ -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 { - Page list (IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); + Page list (IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); - List list2 (@Param(Constants.WRAPPER) Wrapper wrapper); + List list2 (@Param(Constants.WRAPPER) Wrapper wrapper); } 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 717cd59d..bc4e16de 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,10 +1,10 @@ - + - + @@ -21,7 +21,7 @@ - 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 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/entity/DTO/PayDataDirectoryDTO.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/entity/DTO/PayDataDirectoryDTO.java new file mode 100644 index 00000000..8a993af3 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/entity/DTO/PayDataDirectoryDTO.java @@ -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; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/entity/DirectoryToTree.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/entity/DirectoryToTree.java new file mode 100644 index 00000000..221639b4 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/entity/DirectoryToTree.java @@ -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 children; +}