条件筛选

jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java

@@ -70,9 +70,10 @@ public class PayPaymentRecordController extends JeroController<PayPaymentRecord,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize
 									,String projectType
-									,String paymentDate) {
+									,String paymentDate
+									,String paidInvoicStatus) {
 		Page<PayCommonProject> page = new Page<PayCommonProject>(pageNo, pageSize);
-		List<PayCommonProject> pageList = payPaymentRecordService.mainList(page, payCommonProject,projectType,paymentDate);
+		List<PayCommonProject> pageList = payPaymentRecordService.mainList(page, payCommonProject,projectType,paymentDate, paidInvoicStatus);
 		page.setRecords(pageList);
 		return Result.OK(page);
 	}
@@ -225,8 +226,8 @@ public class PayPaymentRecordController extends JeroController<PayPaymentRecord,
 	@AutoLog(value = "到账开票-导出excel",operateType = 6)
 	@RequiresPermissions("incomePaymentAndInvoiving:export")
     public ModelAndView exportXls(HttpServletRequest request, PayCommonProject payCommonProject,
-								  String projectType, String paymentDate) {
+								  String projectType, String paymentDate,String paidInvoicStatus) {
-        return payPaymentRecordService.exportXls(request, payCommonProject,projectType, paymentDate, PayCommonProjectOutput.class, "到账开票");
+        return payPaymentRecordService.exportXls(request, payCommonProject,projectType, paymentDate,paidInvoicStatus, PayCommonProjectOutput.class, "到账开票");
     }
 
 

jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java

@@ -102,6 +102,8 @@ public class PayPaymentRecord implements Serializable {
     @ApiModelProperty(value = "审核人姓名")
     private String reviewerName;
 
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "审核时间")
     private Date reviewTime;
 

jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java

@@ -103,6 +103,8 @@ public class PayPaymentRecordSub implements Serializable {
     @ApiModelProperty(value = "审核人姓名")
     private String reviewerName;
 
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "审核时间")
     private Date reviewTime;
 

jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java

@@ -23,21 +23,25 @@ public interface PayPaymentRecordMapper extends BaseMapper<PayPaymentRecord> {
      * 到账开票主列表
      * @param page
      * @param payCommonProject
+     * @param paidInvoicStatus  来款开票状态
      * @return
      */
     List<PayCommonProject> 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<PayCommonProjectOutput> mainListExportXls(
             @Param("payCommonProject")PayCommonProject payCommonProject,
             @Param("projectType") String projectType,
-            @Param("paymentDate") String paymentDate);
+            @Param("paymentDate") String paymentDate,
+            @Param("paidInvoicStatus") String paidInvoicStatus);
 
     /**
      * @Description 查询月份应收总额

jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml

@@ -22,6 +22,17 @@
         <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
             AND c.charge_company_temporary_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
         </if>
+        <if test="payCommonProject.paymentStatus != null and payCommonProject.paymentStatus != ''">
+            AND c.payment_status = #{payCommonProject.paymentStatus}
+        </if>
+        <!-- 来款未开票 -->
+          <if test='paidInvoicStatus != null and paidInvoicStatus == "1"'>
+              AND c.paid_amount <![CDATA[>]]> c.invoice_amount
+          </if>
+        <!-- 开票未来款 -->
+          <if test='paidInvoicStatus != null and paidInvoicStatus == "2"'>
+              AND c.paid_amount <![CDATA[<]]> c.invoice_amount
+          </if>
       <!--工作组项目-->
         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
@@ -40,6 +51,17 @@
         <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
             AND gsub.charge_company_temporary_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
         </if>
+        <if test="payCommonProject.paymentStatus != null and payCommonProject.paymentStatus != ''">
+            AND gsub.payment_status = #{payCommonProject.paymentStatus}
+        </if>
+        <!-- 来款未开票 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "1"'>
+            AND gsub.paid_amount <![CDATA[>]]> gsub.invoice_amount
+        </if>
+        <!-- 开票未来款 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "2"'>
+            AND gsub.paid_amount <![CDATA[<]]> gsub.invoice_amount
+        </if>
         <!-- 会议项目-->
         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 @@
         <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
             AND sit.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
         </if>
+        <if test="payCommonProject.paymentStatus != null and payCommonProject.paymentStatus != ''">
+            AND sit.payment_status = #{payCommonProject.paymentStatus}
+        </if>
+        <!-- 来款未开票 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "1"'>
+            AND sit.paid_amount <![CDATA[>]]> sit.invoice_amount
+        </if>
+        <!-- 开票未来款 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "2"'>
+            AND sit.paid_amount <![CDATA[<]]> sit.invoice_amount
+        </if>
         <!-- 会员项目-->
         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 @@
         <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
             AND msub.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
         </if>
+        <if test="payCommonProject.paymentStatus != null and payCommonProject.paymentStatus != ''">
+            AND msub.payment_status = #{payCommonProject.paymentStatus}
+        </if>
+        <!-- 来款未开票 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "1"'>
+            AND msub.paid_amount <![CDATA[>]]> msub.invoice_amount
+        </if>
+        <!-- 开票未来款 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "2"'>
+            AND msub.paid_amount <![CDATA[<]]> msub.invoice_amount
+        </if>
         <!-- 标协会员项目-->
         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 @@
         <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
             AND tmsub.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
         </if>
+        <if test="payCommonProject.paymentStatus != null and payCommonProject.paymentStatus != ''">
+            AND tmsub.payment_status = #{payCommonProject.paymentStatus}
+        </if>
+        <!-- 来款未开票 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "1"'>
+            AND tmsub.paid_amount <![CDATA[>]]> tmsub.invoice_amount
+        </if>
+        <!-- 开票未来款 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "2"'>
+            AND tmsub.paid_amount <![CDATA[<]]> tmsub.invoice_amount
+        </if>
         <!-- 标协证书项目-->
         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 @@
         <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
             AND tcp.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
         </if>
+        <if test="payCommonProject.paymentStatus != null and payCommonProject.paymentStatus != ''">
+            AND tcp.payment_status = #{payCommonProject.paymentStatus}
+        </if>
+        <!-- 来款未开票 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "1"'>
+            AND tcp.paid_amount <![CDATA[>]]> tcp.invoice_amount
+        </if>
+        <!-- 开票未来款 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "2"'>
+            AND tcp.paid_amount <![CDATA[<]]> tcp.invoice_amount
+        </if>
         )p
         LEFT JOIN pay_payment_record ppr ON ppr.project_id = p.id
         where
@@ -145,6 +211,17 @@
         <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
             AND c.charge_company_temporary_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
         </if>
+        <if test="payCommonProject.paymentStatus != null and payCommonProject.paymentStatus != ''">
+            AND c.payment_status = #{payCommonProject.paymentStatus}
+        </if>
+        <!-- 来款未开票 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "1"'>
+            AND c.paid_amount <![CDATA[>]]> c.invoice_amount
+        </if>
+        <!-- 开票未来款 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "2"'>
+            AND c.paid_amount <![CDATA[<]]> c.invoice_amount
+        </if>
         <!--工作组项目-->
         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 @@
         <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
             AND gsub.charge_company_temporary_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
         </if>
+        <if test="payCommonProject.paymentStatus != null and payCommonProject.paymentStatus != ''">
+            AND gsub.payment_status = #{payCommonProject.paymentStatus}
+        </if>
+        <!-- 来款未开票 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "1"'>
+            AND gsub.paid_amount <![CDATA[>]]> gsub.invoice_amount
+        </if>
+        <!-- 开票未来款 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "2"'>
+            AND gsub.paid_amount <![CDATA[<]]> gsub.invoice_amount
+        </if>
         <!-- 会议项目-->
         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 @@
         <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
             AND sit.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
         </if>
+        <if test="payCommonProject.paymentStatus != null and payCommonProject.paymentStatus != ''">
+            AND sit.payment_status = #{payCommonProject.paymentStatus}
+        </if>
+        <!-- 来款未开票 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "1"'>
+            AND sit.paid_amount <![CDATA[>]]> sit.invoice_amount
+        </if>
+        <!-- 开票未来款 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "2"'>
+            AND sit.paid_amount <![CDATA[<]]> sit.invoice_amount
+        </if>
         <!-- 会员项目-->
         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 @@
         <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
             AND msub.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
         </if>
+        <if test="payCommonProject.paymentStatus != null and payCommonProject.paymentStatus != ''">
+            AND msub.payment_status = #{payCommonProject.paymentStatus}
+        </if>
+        <!-- 来款未开票 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "1"'>
+            AND msub.paid_amount <![CDATA[>]]> msub.invoice_amount
+        </if>
+        <!-- 开票未来款 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "2"'>
+            AND msub.paid_amount <![CDATA[<]]> msub.invoice_amount
+        </if>
         <!-- 标协会员项目-->
         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 @@
         <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
             AND tmsub.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
         </if>
+        <if test="payCommonProject.paymentStatus != null and payCommonProject.paymentStatus != ''">
+            AND tmsub.payment_status = #{payCommonProject.paymentStatus}
+        </if>
+        <!-- 来款未开票 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "1"'>
+            AND tmsub.paid_amount <![CDATA[>]]> tmsub.invoice_amount
+        </if>
+        <!-- 开票未来款 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "2"'>
+            AND tmsub.paid_amount <![CDATA[<]]> tmsub.invoice_amount
+        </if>
+        <!-- 标协证书项目-->
+        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 <![CDATA[<>]]> 0
+        and tcp.amount_receivable is not null
+        <if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
+            AND 1=2
+        </if>
+        <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
+            AND tmember.project_name like concat('%',concat(#{payCommonProject.chargeProject},'%'))
+        </if>
+        <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
+            AND tcp.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
+        </if>
+        <if test="payCommonProject.paymentStatus != null and payCommonProject.paymentStatus != ''">
+            AND tcp.payment_status = #{payCommonProject.paymentStatus}
+        </if>
+        <!-- 来款未开票 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "1"'>
+            AND tcp.paid_amount <![CDATA[>]]> tcp.invoice_amount
+        </if>
+        <!-- 开票未来款 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "2"'>
+            AND tcp.paid_amount <![CDATA[<]]> tcp.invoice_amount
+        </if>
         )p
         LEFT JOIN pay_payment_record ppr ON ppr.project_id = p.id
         where

jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java

@@ -27,7 +27,7 @@ public interface IPayPaymentRecordService extends IService<PayPaymentRecord> {
      * @param payCommonProject
      * @return
      */
-    List<PayCommonProject> mainList(Page page, PayCommonProject payCommonProject,String projectType,String paymentDate);
+    List<PayCommonProject> mainList(Page page, PayCommonProject payCommonProject,String projectType,String paymentDate,String paidInvoicStatus);
 
     /**
      * 添加来款
@@ -98,7 +98,7 @@ public interface IPayPaymentRecordService extends IService<PayPaymentRecord> {
      * @param title
      * @return
      */
-    public ModelAndView exportXls(HttpServletRequest request, PayCommonProject payCommonProject,String projectType, String paymentDate, Class<PayCommonProjectOutput> clazz, String title);
+    public ModelAndView exportXls(HttpServletRequest request, PayCommonProject payCommonProject,String projectType, String paymentDate,String paidInvoicStatus, Class<PayCommonProjectOutput> clazz, String title);
     /**
     * @Description 查询月份应收总额
     * @Author  lqt

jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java

@@ -120,7 +120,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
      * @return
      */
     @Override
-    public List<PayCommonProject> mainList(Page page, PayCommonProject payCommonProject,String projectType,String paymentDate){
+    public List<PayCommonProject> 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<PayPaymentRecordMap
         if(!StringUtils.isBlank(payCommonProject.getChargeCompanyTemporaryName())){
             payCommonProject.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payCommonProject.getChargeCompanyTemporaryName()));
         }
-        List<PayCommonProject> list = payPaymentRecordMapper.mainList(page, payCommonProject,projectType, paymentDate);
+        List<PayCommonProject> list = payPaymentRecordMapper.mainList(page, payCommonProject,projectType, paymentDate,paidInvoicStatus);
         return list;
     }
 
@@ -864,7 +864,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
      * @return
      */
     @Override
-    public ModelAndView exportXls(HttpServletRequest request, PayCommonProject payCommonProject,String projectType,String paymentDate, Class<PayCommonProjectOutput> clazz, String title) {
+    public ModelAndView exportXls(HttpServletRequest request, PayCommonProject payCommonProject,String projectType,String paymentDate ,String paidInvoicStatus,Class<PayCommonProjectOutput> clazz, String title) {
 
         // Step.2 获取导出数据
         //如果前端传来模糊查询的字段有%，就替换掉它
@@ -874,7 +874,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
         if(!StringUtils.isBlank(payCommonProject.getChargeCompanyTemporaryName())){
             payCommonProject.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payCommonProject.getChargeCompanyTemporaryName()));
         }
-        List<PayCommonProjectOutput> pageList=payPaymentRecordMapper.mainListExportXls(payCommonProject, projectType,paymentDate);
+        List<PayCommonProjectOutput> 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())));