From 94c6ac95a6f7d46d8a196eedead8a87ab8a81152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Wed, 1 Sep 2021 14:39:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E4=BD=9C=E7=BB=84?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/mail/vo/MailBillVO.java | 4 +- .../jero/project/VO/PayWorkingGroupVO.java | 21 ++++++ .../controller/PayWorkingGroupController.java | 43 ++++++----- ... => PayWorkingGroupSubItemController.java} | 28 +++---- .../jero/project/entity/PayWorkingGroup.java | 14 +--- ...bitem.java => PayWorkingGroupSubItem.java} | 74 ++++++++++++------- .../project/mapper/PayWorkingGroupMapper.java | 10 +++ ...java => PayWorkingGroupSubItemMapper.java} | 4 +- .../mapper/xml/PayWorkingGroupMapper.xml | 37 ++++++++++ ...r.xml => PayWorkingGroupSubItemMapper.xml} | 2 +- .../service/IPayWorkingGroupService.java | 13 +++- ...va => IPayWorkingGroupSubItemService.java} | 4 +- .../impl/PayWorkingGroupServiceImpl.java | 12 +++ .../PayWorkingGroupSubItemServiceImpl.java | 19 +++++ .../PayWorkingGroupSubitemServiceImpl.java | 19 ----- 15 files changed, 209 insertions(+), 95 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/VO/PayWorkingGroupVO.java rename jero-boot-incoming-payment/src/main/java/com/jero/project/controller/{PayWorkingGroupSubitemController.java => PayWorkingGroupSubItemController.java} (82%) rename jero-boot-incoming-payment/src/main/java/com/jero/project/entity/{PayWorkingGroupSubitem.java => PayWorkingGroupSubItem.java} (70%) rename jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/{PayWorkingGroupSubitemMapper.java => PayWorkingGroupSubItemMapper.java} (58%) rename jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/{PayWorkingGroupSubitemMapper.xml => PayWorkingGroupSubItemMapper.xml} (72%) rename jero-boot-incoming-payment/src/main/java/com/jero/project/service/{IPayWorkingGroupSubitemService.java => IPayWorkingGroupSubItemService.java} (59%) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubitemServiceImpl.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/MailBillVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/MailBillVO.java index 532f8696..fe8cd40f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/MailBillVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/MailBillVO.java @@ -1,9 +1,11 @@ package com.jero.mail.vo; import com.jero.mail.entity.PayMailBill; +import lombok.Data; + import java.io.Serializable; import java.util.List; - +@Data public class MailBillVO extends PayMailBill implements Serializable{ /** * 项目名称 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/VO/PayWorkingGroupVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/VO/PayWorkingGroupVO.java new file mode 100644 index 00000000..4d3e6728 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/VO/PayWorkingGroupVO.java @@ -0,0 +1,21 @@ +package com.jero.project.VO; + +import com.jero.project.entity.PayWorkingGroup; +import lombok.Data; + +import java.io.Serializable; +@Data +public class PayWorkingGroupVO extends PayWorkingGroup implements Serializable { + /** + * 已付全款 + */ + private Integer allPayment; + /** + * 部分付款 + */ + private Integer partPayment; + /** + * 未付款 + */ + private Integer notPayment; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java index 1f8df91c..ab472c84 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -7,13 +7,16 @@ import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.ValidUtil; -import com.jero.project.entity.PayWorkingGroupSubitem; +import com.jero.project.VO.PayWorkingGroupVO; +import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.service.IPayWorkingGroupService; import com.jero.project.entity.PayWorkingGroup; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -21,7 +24,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; -import com.jero.project.service.IPayWorkingGroupSubitemService; +import com.jero.project.service.IPayWorkingGroupSubItemService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -47,7 +50,7 @@ public class PayWorkingGroupController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroup, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = payWorkingGroupService.page(page, queryWrapper); + if(!StringUtils.isBlank(payWorkingGroup.getWorkingGroupProject()) && payWorkingGroup.getWorkingGroupProject().length() > 50){ + return Result.error("工作组项目长度应小于50个字符"); + } + Page page = new Page(pageNo, pageSize); + IPage pageList = payWorkingGroupService.queryPageList(page, payWorkingGroup); if(!Objects.isNull(pageList)){ - List listPayWorkingGroup = pageList.getRecords(); - if(!CollectionUtils.isEmpty(listPayWorkingGroup)){ - listPayWorkingGroup.forEach(p->{ - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.eq(PayWorkingGroupSubitem::getWorkingGroupId,p.getId()); - List listPayWorkingGroupSubitem = payWorkingGroupSubitemService.list(query); - if(!CollectionUtils.isEmpty(listPayWorkingGroupSubitem)){ + List listPayWorkingGroupVO = pageList.getRecords(); + if(!CollectionUtils.isEmpty(listPayWorkingGroupVO)){ + listPayWorkingGroupVO.forEach(p->{ + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(PayWorkingGroupSubItem::getWorkingGroupId,p.getId()); + List listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(query); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){ // 已付全款 - List listAllPayment = listPayWorkingGroupSubitem.stream() + List listAllPayment = listPayWorkingGroupSubItem.stream() .filter(p1->p1.getPaidAmount() == p1.getReceivableAmount()).collect(Collectors.toList()); p.setAllPayment(listAllPayment.size()); // 部分付款 - List listPartPayment = listPayWorkingGroupSubitem.stream() + List listPartPayment = listPayWorkingGroupSubItem.stream() .filter(p1->p1.getPaidAmount() < p1.getReceivableAmount()).collect(Collectors.toList()); p.setPartPayment(listPartPayment.size()); // 未付款 - List listNotPayment = listPayWorkingGroupSubitem.stream() + List listNotPayment = listPayWorkingGroupSubItem.stream() .filter(p1->p1.getPaidAmount() == 0 && p1.getReceivableAmount() != 0 ) .collect(Collectors.toList()); p.setNotPayment(listNotPayment.size()); + }else{ + p.setAllPayment(0); + p.setPartPayment(0); + p.setNotPayment(0); } }); + pageList.setRecords(listPayWorkingGroupVO); } } return Result.OK(pageList); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java similarity index 82% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubitemController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 99bd8190..983d728e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -7,8 +7,8 @@ import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; -import com.jero.project.entity.PayWorkingGroupSubitem; -import com.jero.project.service.IPayWorkingGroupSubitemService; +import com.jero.project.entity.PayWorkingGroupSubItem; +import com.jero.project.service.IPayWorkingGroupSubItemService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -28,9 +28,9 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("/project/payWorkingGroupSubitem") @Slf4j -public class PayWorkingGroupSubitemController extends JeroController { +public class PayWorkingGroupSubItemController extends JeroController { @Autowired - private IPayWorkingGroupSubitemService payWorkingGroupSubitemService; + private IPayWorkingGroupSubItemService payWorkingGroupSubitemService; /** * 分页列表查询 @@ -43,13 +43,13 @@ public class PayWorkingGroupSubitemController extends JeroController queryPageList(PayWorkingGroupSubitem payWorkingGroupSubitem, + public Result queryPageList(PayWorkingGroupSubItem payWorkingGroupSubitem, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroupSubitem, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = payWorkingGroupSubitemService.page(page, queryWrapper); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroupSubitem, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = payWorkingGroupSubitemService.page(page, queryWrapper); return Result.OK(pageList); } @@ -61,7 +61,7 @@ public class PayWorkingGroupSubitemController extends JeroController add(@RequestBody PayWorkingGroupSubitem payWorkingGroupSubitem) { + public Result add(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubitem) { payWorkingGroupSubitemService.save(payWorkingGroupSubitem); return Result.OK("添加成功！"); } @@ -74,7 +74,7 @@ public class PayWorkingGroupSubitemController extends JeroController edit(@RequestBody PayWorkingGroupSubitem payWorkingGroupSubitem) { + public Result edit(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubitem) { payWorkingGroupSubitemService.updateById(payWorkingGroupSubitem); return Result.OK("编辑成功!"); } @@ -114,7 +114,7 @@ public class PayWorkingGroupSubitemController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { - PayWorkingGroupSubitem payWorkingGroupSubitem = payWorkingGroupSubitemService.getById(id); + PayWorkingGroupSubItem payWorkingGroupSubitem = payWorkingGroupSubitemService.getById(id); if(payWorkingGroupSubitem==null) { return Result.error("未找到对应数据"); } @@ -129,8 +129,8 @@ public class PayWorkingGroupSubitemController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, PayWorkingGroupSubitem.class); + return super.importExcel(request, response, PayWorkingGroupSubItem.class); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java index 48219390..f721ec92 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java @@ -1,7 +1,7 @@ package com.jero.project.entity; import java.io.Serializable; -import java.sql.Date; +import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -113,16 +113,4 @@ public class PayWorkingGroup implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") private Date updateTime; - /** - * 已付全款 - */ - private Integer allPayment; - /** - * 部分付款 - */ - private Integer partPayment; - /** - * 未付款 - */ - private Integer notPayment; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java similarity index 70% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubitem.java rename to jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java index 1021309c..551871a1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java @@ -24,7 +24,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="pay_working_group_subitem对象", description="pay_working_group_subitem") -public class PayWorkingGroupSubitem implements Serializable { +public class PayWorkingGroupSubItem implements Serializable { private static final long serialVersionUID = 1L; /**主键*/ @@ -39,38 +39,54 @@ public class PayWorkingGroupSubitem implements Serializable { @Excel(name = "工作组id", width = 15) @ApiModelProperty(value = "工作组id") private java.lang.String workingGroupId; - /**成员单位id*/ - @Excel(name = "成员单位id", width = 15) + /**成员单位id*/ + @Excel(name = "成员单位id", width = 15) @ApiModelProperty(value = "成员单位id") private java.lang.String chargeCompanyId; - /**成员单位*/ - @Excel(name = "成员单位", width = 15) - @ApiModelProperty(value = "成员单位") - private java.lang.String chargeCompanyName; - /**企业联系人一id*/ - @Excel(name = "企业联系人一id", width = 15) + /**临时成员单位id*/ + @Excel(name = "临时成员单位id", width = 15) + @ApiModelProperty(value = "临时成员单位id") + private java.lang.String chargeCompanyTemporaryId; + /**临时成员单位*/ + @Excel(name = "临时成员单位", width = 15) + @ApiModelProperty(value = "临时成员单位") + private java.lang.String chargeCompanyTemporaryName; + /**企业联系人一id*/ + @Excel(name = "企业联系人一id", width = 15) @ApiModelProperty(value = "企业联系人一id") private java.lang.String contactsIdOne; - /**企业联系人一名称*/ - @Excel(name = "企业联系人一名称", width = 15) - @ApiModelProperty(value = "企业联系人一名称") - private java.lang.String contactsNameOne; - /**企业联系人二id*/ - @Excel(name = "企业联系人二id", width = 15) + /**临时企业联系人一id*/ + @Excel(name = "临时企业联系人一id", width = 15) + @ApiModelProperty(value = "临时企业联系人一id") + private java.lang.String contactsTemporaryIdOne; + /**临时企业联系人一名称*/ + @Excel(name = "临时企业联系人一名称", width = 15) + @ApiModelProperty(value = "临时企业联系人一名称") + private java.lang.String contactsTemporaryNameOne; + /**企业联系人二id*/ + @Excel(name = "企业联系人二id", width = 15) @ApiModelProperty(value = "企业联系人二id") private java.lang.String contactsIdTwo; - /**企业联系人二名称*/ - @Excel(name = "企业联系人二名称", width = 15) - @ApiModelProperty(value = "企业联系人二名称") - private java.lang.String contactsNameTwo; - /**企业联系人三id*/ - @Excel(name = "企业联系人三id", width = 15) + /**临时企业联系人二id*/ + @Excel(name = "临时企业联系人二id", width = 15) + @ApiModelProperty(value = "临时企业联系人二id") + private java.lang.String contactsTemporaryIdTwo; + /**临时企业联系人二名称*/ + @Excel(name = "临时企业联系人二名称", width = 15) + @ApiModelProperty(value = "临时企业联系人二名称") + private java.lang.String contactsTemporaryNameTwo; + /**企业联系人三id*/ + @Excel(name = "企业联系人三id", width = 15) @ApiModelProperty(value = "企业联系人三id") private java.lang.String contactsIdThree; - /**企业联系人三名称*/ - @Excel(name = "企业联系人三名称", width = 15) - @ApiModelProperty(value = "企业联系人三名称") - private java.lang.String contactsNameThree; + /**临时企业联系人三id*/ + @Excel(name = "临时企业联系人三id", width = 15) + @ApiModelProperty(value = "临时企业联系人三id") + private java.lang.String contactsTemporaryIdThree; + /**临时企业联系人三名称*/ + @Excel(name = "临时企业联系人三名称", width = 15) + @ApiModelProperty(value = "临时企业联系人三名称") + private java.lang.String contactsTemporaryNameThree; /**应收金额（元）*/ @Excel(name = "应收金额（元）", width = 15) @ApiModelProperty(value = "应收金额（元）") @@ -83,6 +99,14 @@ public class PayWorkingGroupSubitem implements Serializable { @Excel(name = "邮寄联系人id", width = 15) @ApiModelProperty(value = "邮寄联系人id") private java.lang.String mailContactsId; + /**临时邮寄联系人id*/ + @Excel(name = "临时邮寄联系人id", width = 15) + @ApiModelProperty(value = "临时邮寄联系人id") + private java.lang.String mailContactsTemporaryId; + /**临时邮寄联系人名称*/ + @Excel(name = "临时邮寄联系人名称", width = 15) + @ApiModelProperty(value = "临时邮寄联系人名称") + private java.lang.String mailContactsTemporaryName; /**来款方式（1：无，2：合同，3：收费通知）*/ @Excel(name = "来款方式（1：无，2：合同，3：收费通知）", width = 15) @ApiModelProperty(value = "来款方式（1：无，2：合同，3：收费通知）") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java index 5aa09cca..8ae42ba3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java @@ -2,6 +2,7 @@ package com.jero.project.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.project.VO.PayWorkingGroupVO; import com.jero.project.entity.PayWorkingGroup; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -13,5 +14,14 @@ import org.apache.ibatis.annotations.Param; * @Version: V1.0 */ public interface PayWorkingGroupMapper extends BaseMapper { + /** + * @Description 分页查询 + * @Author lqt + * @Date 2021/9/1 + * @Param payWorkingGroup + * @Return + * @Exception + */ + IPage queryPageList(Page page, @Param("payWorkingGroup") PayWorkingGroup payWorkingGroup); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java similarity index 58% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubitemMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java index a4c7667d..29780937 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java @@ -1,6 +1,6 @@ package com.jero.project.mapper; -import com.jero.project.entity.PayWorkingGroupSubitem; +import com.jero.project.entity.PayWorkingGroupSubItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Date: 2021-08-27 * @Version: V1.0 */ -public interface PayWorkingGroupSubitemMapper extends BaseMapper { +public interface PayWorkingGroupSubItemMapper extends BaseMapper { } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index eb501170..8e22e1ac 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -1,4 +1,41 @@ + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml similarity index 72% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubitemMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index e917253c..5dd9ff5b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java index 5f66fab8..ddfd7655 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java @@ -1,5 +1,8 @@ package com.jero.project.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.project.VO.PayWorkingGroupVO; import com.jero.project.entity.PayWorkingGroup; import com.baomidou.mybatisplus.extension.service.IService; @@ -10,5 +13,13 @@ import com.baomidou.mybatisplus.extension.service.IService; * @Version: V1.0 */ public interface IPayWorkingGroupService extends IService { - + /** + * @Description 分页查询 + * @Author lqt + * @Date 2021/9/1 + * @Param payWorkingGroup + * @Return + * @Exception + */ + IPage queryPageList(Page page,PayWorkingGroup payWorkingGroup); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java similarity index 59% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubitemService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java index 98e8c4d7..5a6147ea 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java @@ -1,6 +1,6 @@ package com.jero.project.service; -import com.jero.project.entity.PayWorkingGroupSubitem; +import com.jero.project.entity.PayWorkingGroupSubItem; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @Date: 2021-08-27 * @Version: V1.0 */ -public interface IPayWorkingGroupSubitemService extends IService { +public interface IPayWorkingGroupSubItemService extends IService { } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index 6f05ce11..5e132a34 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -1,5 +1,8 @@ package com.jero.project.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.project.VO.PayWorkingGroupVO; import com.jero.project.service.IPayWorkingGroupService; import com.jero.project.entity.PayWorkingGroup; import com.jero.project.mapper.PayWorkingGroupMapper; @@ -7,6 +10,8 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import javax.annotation.Resource; + /** * @Description: pay_working_group @@ -16,4 +21,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; */ @Service public class PayWorkingGroupServiceImpl extends ServiceImpl implements IPayWorkingGroupService { + + @Resource + private PayWorkingGroupMapper payWorkingGroupMapper; + @Override + public IPage queryPageList(Page page, PayWorkingGroup payWorkingGroup) { + return payWorkingGroupMapper.queryPageList(page,payWorkingGroup); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java new file mode 100644 index 00000000..29ae7a3b --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -0,0 +1,19 @@ +package com.jero.project.service.impl; + +import com.jero.project.service.IPayWorkingGroupSubItemService; +import com.jero.project.entity.PayWorkingGroupSubItem; +import com.jero.project.mapper.PayWorkingGroupSubItemMapper; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: pay_working_group_subitem + * @Author: jeecg-boot + * @Date: 2021-08-27 + * @Version: V1.0 + */ +@Service +public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl implements IPayWorkingGroupSubItemService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubitemServiceImpl.java deleted file mode 100644 index 7bfcd137..00000000 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubitemServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.jero.project.service.impl; - -import com.jero.project.service.IPayWorkingGroupSubitemService; -import com.jero.project.entity.PayWorkingGroupSubitem; -import com.jero.project.mapper.PayWorkingGroupSubitemMapper; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: pay_working_group_subitem - * @Author: jeecg-boot - * @Date: 2021-08-27 - * @Version: V1.0 - */ -@Service -public class PayWorkingGroupSubitemServiceImpl extends ServiceImpl implements IPayWorkingGroupSubitemService { - -}