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 de69aaef..b2a78826 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 @@ -30,7 +30,7 @@ import io.swagger.annotations.ApiOperation; * @Date: 2021-08-31 * @Version: V1.0 */ -@Api(tags="pay_payment_record") +@Api(tags="到账开票") @RestController @RequestMapping("/paymentRecord/payPaymentRecord") @Slf4j @@ -145,7 +145,8 @@ public class PayPaymentRecordController extends JeroController { List mainList(Page page, @Param("payCommonProject")PayCommonProject payCommonProject); /** - * 到账开票主列表 + * 到账开票导出 * @param payCommonProject * @return */ - List mainList(@Param("payCommonProject")PayCommonProject payCommonProject); + List mainListExportXls(@Param("payCommonProject")PayCommonProject payCommonProject); } 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 2d604ac7..3e834551 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 @@ -87,4 +87,90 @@ order by create_time DESC + + + \ No newline at end of file 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 191d4396..0fc470d1 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 @@ -80,6 +80,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl mainList(Page page, PayCommonProject payCommonProject){ +// List list=payPaymentRecordMapper.mainListExportXls(page, payCommonProject); return payPaymentRecordMapper.mainList(page, payCommonProject); } @@ -327,7 +328,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl clazz, String title) { // Step.2 获取导出数据 - List pageList=payPaymentRecordMapper.mainList(payCommonProject); + List pageList=payPaymentRecordMapper.mainListExportXls(payCommonProject); List exportList = null; // 过滤选中数据 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java index 6ab5da85..f27a51b4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java @@ -32,7 +32,7 @@ import javax.validation.constraints.*; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="pay_common_project对象", description="pay_common_project") -public class PayCommonProject extends PayPaymentRecord implements Serializable { +public class PayCommonProject implements Serializable { private static final long serialVersionUID = 1L; /**主键*/