From 814c3ef48886219bb32a727539c94d737404fa2f Mon Sep 17 00:00:00 2001 From: baozhipeng <961815525@qq.com> Date: Fri, 17 Dec 2021 17:45:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayPaymentRecordController.java | 9 +- .../jero/payment/entity/PayPaymentRecord.java | 2 + .../payment/entity/PayPaymentRecordSub.java | 2 + .../mapper/PayPaymentRecordMapper.java | 8 +- .../mapper/xml/PayPaymentRecordMapper.xml | 152 +++++++++++++++++- .../service/IPayPaymentRecordService.java | 4 +- .../impl/PayPaymentRecordServiceImpl.java | 8 +- 7 files changed, 172 insertions(+), 13 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java index a5f8f501..486d58ea 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java @@ -70,9 +70,10 @@ public class PayPaymentRecordController extends JeroController page = new Page(pageNo, pageSize); - List pageList = payPaymentRecordService.mainList(page, payCommonProject,projectType,paymentDate); + List pageList = payPaymentRecordService.mainList(page, payCommonProject,projectType,paymentDate, paidInvoicStatus); page.setRecords(pageList); return Result.OK(page); } @@ -225,8 +226,8 @@ public class PayPaymentRecordController extends JeroController { * 到账开票主列表 * @param page * @param payCommonProject + * @param paidInvoicStatus 来款开票状态 * @return */ List mainList(Page page, @Param("payCommonProject")PayCommonProject payCommonProject, @Param("projectType") String projectType, - @Param("paymentDate") String paymentDate); + @Param("paymentDate") String paymentDate, + @Param("paidInvoicStatus") String paidInvoicStatus); /** * 到账开票导出 * @return + * @param paidInvoicStatus 来款开票状态 */ List mainListExportXls( @Param("payCommonProject")PayCommonProject payCommonProject, @Param("projectType") String projectType, - @Param("paymentDate") String paymentDate); + @Param("paymentDate") String paymentDate, + @Param("paidInvoicStatus") String paidInvoicStatus); /** * @Description 查询月份应收总额 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml index c81c6ddc..a45cdd4b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml @@ -22,7 +22,18 @@ AND c.charge_company_temporary_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%')) - + + AND c.payment_status = #{payCommonProject.paymentStatus} + + + + AND c.paid_amount ]]> c.invoice_amount + + + + AND c.paid_amount c.invoice_amount + + UNION ALL select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,gsub.charge_company_id,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,gsub.invoice_amount,gsub.mail_contacts_id,'' as register_check_result,gsub.contacts_temporary_name_one,gsub.payment_status from pay_working_group g @@ -40,6 +51,17 @@ AND gsub.charge_company_temporary_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%')) + + AND gsub.payment_status = #{payCommonProject.paymentStatus} + + + + AND gsub.paid_amount ]]> gsub.invoice_amount + + + + AND gsub.paid_amount gsub.invoice_amount + UNION ALL select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, su.realname,sit.company_id,sit.company_name,sit.amount_receivable,sit.paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,sit.invoice_amount,sit.post_contact_id,sit.register_check_result,sit.company_contact_name,sit.payment_status @@ -58,6 +80,17 @@ AND sit.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%')) + + AND sit.payment_status = #{payCommonProject.paymentStatus} + + + + AND sit.paid_amount ]]> sit.invoice_amount + + + + AND sit.paid_amount sit.invoice_amount + UNION ALL select msub.id,pmp.project_name,msub.charge_use,pmp.director_id,su.realname,msub.company_id,msub.company_name,msub.amount_receivable,msub.paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,msub.invoice_amount,msub.post_contact_id,'' as register_check_result,msub.company_contact_name,msub.payment_status @@ -76,6 +109,17 @@ AND msub.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%')) + + AND msub.payment_status = #{payCommonProject.paymentStatus} + + + + AND msub.paid_amount ]]> msub.invoice_amount + + + + AND msub.paid_amount msub.invoice_amount + UNION ALL select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,su.realname,tmsub.company_id,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.invoice_amount,tmsub.liaison_man_id,'' as register_check_result,tmsub.liaison_man,tmsub.payment_status @@ -94,6 +138,17 @@ AND tmsub.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%')) + + AND tmsub.payment_status = #{payCommonProject.paymentStatus} + + + + AND tmsub.paid_amount ]]> tmsub.invoice_amount + + + + AND tmsub.paid_amount tmsub.invoice_amount + UNION ALL select tcp.id,tmember.project_name,tcp.charge_use,tmember.director_id,su.realname,tcp.company_id,tcp.company_name,tcp.amount_receivable,tcp.paid_amount,tcp.invoice_requirements,tcp.pack,tcp.in_account,tcp.make_invoice,tcp.mail,tcp.create_time,6,tcp.invoice_amount,tcp.liaison_man_id,'' as register_check_result,tcp.liaison_man,tcp.payment_status @@ -112,6 +167,17 @@ AND tcp.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%')) + + AND tcp.payment_status = #{payCommonProject.paymentStatus} + + + + AND tcp.paid_amount ]]> tcp.invoice_amount + + + + AND tcp.paid_amount tcp.invoice_amount + )p LEFT JOIN pay_payment_record ppr ON ppr.project_id = p.id where @@ -145,6 +211,17 @@ AND c.charge_company_temporary_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%')) + + AND c.payment_status = #{payCommonProject.paymentStatus} + + + + AND c.paid_amount ]]> c.invoice_amount + + + + AND c.paid_amount c.invoice_amount + UNION ALL select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2 @@ -163,6 +240,17 @@ AND gsub.charge_company_temporary_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%')) + + AND gsub.payment_status = #{payCommonProject.paymentStatus} + + + + AND gsub.paid_amount ]]> gsub.invoice_amount + + + + AND gsub.paid_amount gsub.invoice_amount + UNION ALL select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, su.realname,sit.company_name,sit.amount_receivable,sit.paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3 @@ -181,6 +269,17 @@ AND sit.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%')) + + AND sit.payment_status = #{payCommonProject.paymentStatus} + + + + AND sit.paid_amount ]]> sit.invoice_amount + + + + AND sit.paid_amount sit.invoice_amount + UNION ALL select msub.id,member.project_name,msub.charge_use,member.director_id,su.realname,msub.company_name,msub.amount_receivable,msub.paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4 @@ -199,6 +298,17 @@ AND msub.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%')) + + AND msub.payment_status = #{payCommonProject.paymentStatus} + + + + AND msub.paid_amount ]]> msub.invoice_amount + + + + AND msub.paid_amount msub.invoice_amount + UNION ALL select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,su.realname,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5 @@ -217,6 +327,46 @@ AND tmsub.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%')) + + AND tmsub.payment_status = #{payCommonProject.paymentStatus} + + + + AND tmsub.paid_amount ]]> tmsub.invoice_amount + + + + AND tmsub.paid_amount tmsub.invoice_amount + + + UNION ALL + select tcp.id,tmember.project_name,tcp.charge_use,tmember.director_id,su.realname,tcp.company_name,tcp.amount_receivable,tcp.paid_amount,tcp.invoice_requirements,tcp.pack,tcp.in_account,tcp.make_invoice,tcp.mail,tcp.create_time,6 + from tb_member_project tmember + inner join tb_certificate_payment tcp on tmember.id=tcp.project_id + left join sys_user su on su.id = tmember.director_id + where + tcp.amount_receivable ]]> 0 + and tcp.amount_receivable is not null + + AND 1=2 + + + AND tmember.project_name like concat('%',concat(#{payCommonProject.chargeProject},'%')) + + + AND tcp.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%')) + + + AND tcp.payment_status = #{payCommonProject.paymentStatus} + + + + AND tcp.paid_amount ]]> tcp.invoice_amount + + + + AND tcp.paid_amount tcp.invoice_amount + )p LEFT JOIN pay_payment_record ppr ON ppr.project_id = p.id where diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java index cc5ed3e0..bb6cea18 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java @@ -27,7 +27,7 @@ public interface IPayPaymentRecordService extends IService { * @param payCommonProject * @return */ - List mainList(Page page, PayCommonProject payCommonProject,String projectType,String paymentDate); + List mainList(Page page, PayCommonProject payCommonProject,String projectType,String paymentDate,String paidInvoicStatus); /** * 添加来款 @@ -98,7 +98,7 @@ public interface IPayPaymentRecordService extends IService { * @param title * @return */ - public ModelAndView exportXls(HttpServletRequest request, PayCommonProject payCommonProject,String projectType, String paymentDate, Class clazz, String title); + public ModelAndView exportXls(HttpServletRequest request, PayCommonProject payCommonProject,String projectType, String paymentDate,String paidInvoicStatus, Class clazz, String title); /** * @Description 查询月份应收总额 * @Author lqt diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java index 1b4cf433..23398b82 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java @@ -120,7 +120,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl mainList(Page page, PayCommonProject payCommonProject,String projectType,String paymentDate){ + public List mainList(Page page, PayCommonProject payCommonProject,String projectType,String paymentDate,String paidInvoicStatus){ //如果前端传来模糊查询的字段有%，就替换掉它 if(!StringUtils.isBlank(payCommonProject.getChargeProject())){ @@ -129,7 +129,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl list = payPaymentRecordMapper.mainList(page, payCommonProject,projectType, paymentDate); + List list = payPaymentRecordMapper.mainList(page, payCommonProject,projectType, paymentDate,paidInvoicStatus); return list; } @@ -864,7 +864,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl clazz, String title) { + public ModelAndView exportXls(HttpServletRequest request, PayCommonProject payCommonProject,String projectType,String paymentDate ,String paidInvoicStatus,Class clazz, String title) { // Step.2 获取导出数据 //如果前端传来模糊查询的字段有%，就替换掉它 @@ -874,7 +874,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl pageList=payPaymentRecordMapper.mainListExportXls(payCommonProject, projectType,paymentDate); + List pageList=payPaymentRecordMapper.mainListExportXls(payCommonProject, projectType,paymentDate,paidInvoicStatus); pageList.forEach(p-> { if (!Objects.isNull(p.getChargeUse())) { p.setChargeUse_dictText(sysBaseAPI.translateDict("payment_charge_use", String.valueOf(p.getChargeUse())));