From 79c4e0a00321ae918feb2b017c059d5bd4fada3b Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Wed, 15 Sep 2021 13:44:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayMailBillController.java | 35 +++++++++++++---- .../com/jero/mail/entity/PayMailBill.java | 6 +++ .../jero/mail/entity/PayMailBillSearch.java | 39 +++++++++++++++++++ .../jero/mail/mapper/PayMailBillMapper.java | 6 +++ .../mail/mapper/xml/PayMailBillMapper.xml | 1 + .../mail/service/IPayMailBillService.java | 7 ++++ .../service/impl/PayMailBillServiceImpl.java | 4 ++ .../entity/PayWorkGroupSubletStatistics.java | 4 +- .../entity/PayWorkingGroupSubletSearch.java | 4 +- .../xml/PayWorkingGroupSubItemMapper.xml | 2 +- 10 files changed, 96 insertions(+), 12 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillSearch.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java index 64ddf8d3..5aef4eda 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java @@ -7,6 +7,7 @@ import java.util.Date; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -22,6 +23,7 @@ import com.jero.company.mapper.PayContactsManagementMapper; import com.jero.company.service.IPayContactsManagementService; import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; +import com.jero.mail.entity.PayMailBillSearch; import com.jero.mail.service.IPayMailBillProjectService; import com.jero.mail.service.IPayMailBillService; import com.jero.member.entity.PayMemberProjectSubitem; @@ -59,21 +61,40 @@ public class PayMailBillController extends JeroController queryPageList(PayMailBill payMailBill, + public Result queryPageList(PayMailBillSearch payMailBillSearch, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMailBill, req.getParameterMap()); - queryWrapper.orderByAsc("post_status","create_time"); + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize + ) { + QueryWrapper queryWrapper = new QueryWrapper<>(); Page page = new Page<>(pageNo, pageSize); + if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime()) && ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())) { + queryWrapper.gt("send_date", payMailBillSearch.getStartTime()); + queryWrapper.lt("send_date", payMailBillSearch.getEndTime()); + + }else if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime())){ + queryWrapper.gt("send_date", payMailBillSearch.getStartTime()); + + }else if (ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())){ + queryWrapper.lt("send_date", payMailBillSearch.getEndTime()); + + } + if (ObjectUtil.isNotEmpty(payMailBillSearch.getChargeCompanyName())){ + queryWrapper.like("charge_company_name",payMailBillSearch.getChargeCompanyName()); + } + if (ObjectUtil.isNotEmpty(payMailBillSearch.getPrincipalName())){ + queryWrapper.like("principal_name",payMailBillSearch.getPrincipalName()); + } + if (ObjectUtil.isNotEmpty(payMailBillSearch.getProjectName())){ + queryWrapper.like("project_name",payMailBillSearch.getProjectName()); + } IPage pageList = payMailBillService.page(page, queryWrapper); return Result.OK(pageList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java index c4ae8d4d..37072d35 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java @@ -112,4 +112,10 @@ public class PayMailBill implements Serializable { @ApiModelProperty(value = "来款单位") @NotNull(message = "来款单位不能为空") private java.lang.String chargeCompanyName; + + @Excel(name = "项目负责人", width = 15) + @ApiModelProperty(value = "项目负责人") + @NotNull(message = "项目负责人不能为空") + private java.lang.String principalName; + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillSearch.java new file mode 100644 index 00000000..b7ae4fc3 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillSearch.java @@ -0,0 +1,39 @@ +package com.jero.mail.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; + +/** + * @author zql + * @date 2021/9/15 11:47 + */ +@Data +public class PayMailBillSearch { + + + @ApiModelProperty(value = "来款单位") + private java.lang.String chargeCompanyName; + + + @ApiModelProperty(value = "项目负责人") + private java.lang.String principalName; + + + @ApiModelProperty(value = "项目名称") + private java.lang.String projectName; + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "开始时间") + private java.util.Date startTime; + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "结束时间") + private java.util.Date endTime; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java index e43d5d48..68bfda20 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java @@ -1,8 +1,12 @@ package com.jero.mail.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.mail.entity.PayMailBill; +import com.jero.mail.entity.PayMailBillSearch; import io.lettuce.core.dynamic.annotation.Param; import java.math.BigDecimal; @@ -27,4 +31,6 @@ public interface PayMailBillMapper extends BaseMapper { // 开票总额 BigDecimal sumInvoiceAmount(@Param("projectId") String projectId); + + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml index acd3b37c..66630768 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml @@ -49,4 +49,5 @@ left join pay_mail_bill_project bp on b.id = bp.bill_id where bp.project_id= #{projectId} + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java index 896b8b6c..78bc02b5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java @@ -1,8 +1,12 @@ package com.jero.mail.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.common.api.vo.Result; import com.jero.mail.entity.PayMailBill; +import com.jero.mail.entity.PayMailBillSearch; import java.util.List; @@ -30,4 +34,7 @@ public interface IPayMailBillService extends IService { * @return */ Result addPayBill(PayMailBill payMailBill,String projectIds,String projectTypes); + + + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index a7f191e2..177038a1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -2,6 +2,8 @@ package com.jero.mail.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.impl.ServiceImpl; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; @@ -11,6 +13,7 @@ import com.jero.common.util.oConvertUtils; import com.jero.contract.common.PayIncomeContractCommon; import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; +import com.jero.mail.entity.PayMailBillSearch; import com.jero.mail.mapper.PayMailBillMapper; import com.jero.mail.service.IPayMailBillProjectService; import com.jero.mail.service.IPayMailBillService; @@ -136,6 +139,7 @@ public class PayMailBillServiceImpl extends ServiceImpl AND date_format(ppr.payment_date,'%Y-%m-%d') LIKE concat('%',concat(#{payWorkingGroupSubletSearch.year},'%')) - + AND pwg.principal_id_a=#{payWorkingGroupSubletSearch.principalNameId}