diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java index aceac835..1e54fc64 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java @@ -26,8 +26,9 @@ public interface PayPaymentRecordMapper extends BaseMapper { /** * 到账开票导出 - * @param payCommonProject * @return */ - List mainListExportXls(@Param("payCommonProject")PayCommonProject payCommonProject); + List mainListExportXls(@Param("principalId")String principalId, + @Param("chargeProject")String chargeProject, + @Param("chargeCompanyTemporaryName")String chargeCompanyTemporaryName); } 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 3e834551..ca7be706 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 @@ -96,14 +96,14 @@ where (c.receivable_amount ]]> c.paid_amount or (c.receivable_amount is not null and c.paid_amount is null)) - - AND c.principal_id = #{payCommonProject.principalId} + + AND c.principal_id = #{principalId} - - AND c.charge_project = #{payCommonProject.chargeProject} + + AND c.charge_project = #{chargeProject} - - AND c.charge_company_temporary_name = #{payCommonProject.chargeCompanyTemporaryName} + + AND c.charge_company_temporary_name = #{chargeCompanyTemporaryName} UNION ALL @@ -113,14 +113,14 @@ where (gsub.receivable_amount ]]> gsub.paid_amount or (gsub.receivable_amount is not null and gsub.paid_amount is null)) - - AND g.principal_id_a = #{payCommonProject.principalId} + + AND g.principal_id_a = #{principalId} - - AND g.working_group_project = #{payCommonProject.chargeProject} + + AND g.working_group_project = #{chargeProject} - - AND gsub.charge_company_temporary_name = #{payCommonProject.chargeCompanyTemporaryName} + + AND gsub.charge_company_temporary_name = #{chargeCompanyTemporaryName} UNION ALL @@ -130,14 +130,14 @@ where (sit.amount_receivable ]]> sit.paid_amount or (sit.amount_receivable is not null and sit.paid_amount is null)) - - AND meeting.director_id = #{payCommonProject.principalId} + + AND meeting.director_id = #{principalId} - - AND meeting.meeting_name = #{payCommonProject.chargeProject} + + AND meeting.meeting_name = #{chargeProject} - - AND sit.company_name = #{payCommonProject.chargeCompanyTemporaryName} + + AND sit.company_name = #{chargeCompanyTemporaryName} UNION ALL @@ -147,14 +147,14 @@ where (msub.amount_receivable ]]> msub.paid_amount or (msub.amount_receivable is not null and msub.paid_amount is null)) - - AND member.director_id = #{payCommonProject.principalId} + + AND member.director_id = #{principalId} - - AND member.project_name = #{payCommonProject.chargeProject} + + AND member.project_name = #{chargeProject} - - AND msub.company_name = #{payCommonProject.chargeCompanyTemporaryName} + + AND msub.company_name = #{chargeCompanyTemporaryName} UNION ALL @@ -164,11 +164,11 @@ where (tmsub.amount_receivable ]]> tmsub.paid_amount or (tmsub.amount_receivable is not null and tmsub.paid_amount)) - - AND tmember.project_name = #{payCommonProject.chargeProject} + + AND tmember.project_name = #{chargeProject} - - AND tmsub.company_name = #{payCommonProject.chargeCompanyTemporaryName} + + AND tmsub.company_name = #{chargeCompanyTemporaryName} order by create_time DESC 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 0fc470d1..2f0c3622 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 @@ -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 mainList(Page page, PayCommonProject payCommonProject){ -// List list=payPaymentRecordMapper.mainListExportXls(page, payCommonProject); return payPaymentRecordMapper.mainList(page, payCommonProject); } @@ -327,8 +327,11 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl clazz, String title) { + // Step.2 获取导出数据 - List pageList=payPaymentRecordMapper.mainListExportXls(payCommonProject); + List pageList=payPaymentRecordMapper.mainListExportXls(payCommonProject.getPrincipalId(), + payCommonProject.getChargeProject(), + payCommonProject.getChargeCompanyTemporaryName()); List exportList = null; // 过滤选中数据