导出

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

@@ -26,8 +26,9 @@ public interface PayPaymentRecordMapper extends BaseMapper<PayPaymentRecord> {
 
     /**
      * 到账开票导出
-     * @param payCommonProject
      * @return
      */
-    List<PayCommonProject> mainListExportXls(@Param("payCommonProject")PayCommonProject payCommonProject);
+    List<PayCommonProject> mainListExportXls(@Param("principalId")String principalId,
+                                             @Param("chargeProject")String chargeProject,
+                                             @Param("chargeCompanyTemporaryName")String chargeCompanyTemporaryName);
 }

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

@@ -96,14 +96,14 @@
         where
         (c.receivable_amount <![CDATA[>]]> c.paid_amount
         or (c.receivable_amount is not null and c.paid_amount is null))
-        <if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
-            AND c.principal_id = #{payCommonProject.principalId}
+        <if test="principalId != null and principalId != ''">
+            AND c.principal_id = #{principalId}
         </if>
-        <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
-            AND c.charge_project = #{payCommonProject.chargeProject}
+        <if test="chargeProject != null and chargeProject != ''">
+            AND c.charge_project = #{chargeProject}
         </if>
-        <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
-            AND c.charge_company_temporary_name = #{payCommonProject.chargeCompanyTemporaryName}
+        <if test="chargeCompanyTemporaryName != null and chargeCompanyTemporaryName != ''">
+            AND c.charge_company_temporary_name = #{chargeCompanyTemporaryName}
         </if>
         <!--工作组项目-->
         UNION ALL
@@ -113,14 +113,14 @@
         where
         (gsub.receivable_amount <![CDATA[>]]> gsub.paid_amount
         or (gsub.receivable_amount is not null and gsub.paid_amount is null))
-        <if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
-            AND g.principal_id_a = #{payCommonProject.principalId}
+        <if test="principalId != null and principalId != ''">
+            AND g.principal_id_a = #{principalId}
         </if>
-        <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
-            AND g.working_group_project = #{payCommonProject.chargeProject}
+        <if test="chargeProject != null and chargeProject != ''">
+            AND g.working_group_project = #{chargeProject}
         </if>
-        <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
-            AND gsub.charge_company_temporary_name = #{payCommonProject.chargeCompanyTemporaryName}
+        <if test="chargeCompanyTemporaryName != null and chargeCompanyTemporaryName != ''">
+            AND gsub.charge_company_temporary_name = #{chargeCompanyTemporaryName}
         </if>
         <!-- 会议项目-->
         UNION ALL
@@ -130,14 +130,14 @@
         where
         (sit.amount_receivable <![CDATA[>]]> sit.paid_amount
         or (sit.amount_receivable is not null and sit.paid_amount is null))
-        <if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
-            AND meeting.director_id = #{payCommonProject.principalId}
+        <if test="principalId != null and principalId != ''">
+            AND meeting.director_id = #{principalId}
         </if>
-        <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
-            AND meeting.meeting_name = #{payCommonProject.chargeProject}
+        <if test="chargeProject != null and chargeProject != ''">
+            AND meeting.meeting_name = #{chargeProject}
         </if>
-        <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
-            AND sit.company_name = #{payCommonProject.chargeCompanyTemporaryName}
+        <if test="chargeCompanyTemporaryName != null and chargeCompanyTemporaryName != ''">
+            AND sit.company_name = #{chargeCompanyTemporaryName}
         </if>
         <!-- 会员项目-->
         UNION ALL
@@ -147,14 +147,14 @@
         where
         (msub.amount_receivable <![CDATA[>]]> msub.paid_amount
         or (msub.amount_receivable is not null and msub.paid_amount is null))
-        <if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
-            AND member.director_id = #{payCommonProject.principalId}
+        <if test="principalId != null and principalId != ''">
+            AND member.director_id = #{principalId}
         </if>
-        <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
-            AND member.project_name = #{payCommonProject.chargeProject}
+        <if test="chargeProject != null and chargeProject != ''">
+            AND member.project_name = #{chargeProject}
         </if>
-        <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
-            AND msub.company_name = #{payCommonProject.chargeCompanyTemporaryName}
+        <if test="chargeCompanyTemporaryName != null and chargeCompanyTemporaryName != ''">
+            AND msub.company_name = #{chargeCompanyTemporaryName}
         </if>
         <!-- 标协会员项目-->
         UNION ALL
@@ -164,11 +164,11 @@
         where
         (tmsub.amount_receivable <![CDATA[>]]> tmsub.paid_amount
         or (tmsub.amount_receivable is not null and tmsub.paid_amount))
-        <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
-            AND tmember.project_name = #{payCommonProject.chargeProject}
+        <if test="chargeProject != null and chargeProject != ''">
+            AND tmember.project_name = #{chargeProject}
         </if>
-        <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
-            AND tmsub.company_name = #{payCommonProject.chargeCompanyTemporaryName}
+        <if test="chargeCompanyTemporaryName != null and chargeCompanyTemporaryName != ''">
+            AND tmsub.company_name = #{chargeCompanyTemporaryName}
         </if>
         order by create_time DESC
 

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

@@ -27,6 +27,7 @@ import com.jero.project.entity.PayWorkingGroup;
 import com.jero.project.entity.PayWorkingGroupSubItem;
 import com.jero.project.mapper.PayCommonProjectMapper;
 import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
+import io.lettuce.core.dynamic.annotation.Param;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -80,7 +81,6 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
      * @return
      */
     public List<PayCommonProject> mainList(Page page, PayCommonProject payCommonProject){
-//        List<PayCommonProject> list=payPaymentRecordMapper.mainListExportXls(page, payCommonProject);
         return payPaymentRecordMapper.mainList(page, payCommonProject);
     }
 
@@ -327,8 +327,11 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
      */
     public ModelAndView exportXls(HttpServletRequest request, PayCommonProject payCommonProject, Class<PayCommonProject> clazz, String title) {
 
+
         // Step.2 获取导出数据
-        List<PayCommonProject> pageList=payPaymentRecordMapper.mainListExportXls(payCommonProject);
+        List<PayCommonProject> pageList=payPaymentRecordMapper.mainListExportXls(payCommonProject.getPrincipalId(),
+                payCommonProject.getChargeProject(),
+                payCommonProject.getChargeCompanyTemporaryName());
         List<PayCommonProject> exportList = null;
 
         // 过滤选中数据