diff --git a/src/main/java/com/qs/serve/modules/bms/controller/api/BmsSupplierAddressApi.java b/src/main/java/com/qs/serve/modules/bms/controller/api/BmsSupplierAddressApi.java index 7849677a..a6566b60 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/api/BmsSupplierAddressApi.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/api/BmsSupplierAddressApi.java @@ -70,7 +70,6 @@ public class BmsSupplierAddressApi { } - /** * 根据ID更新 * @param param diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java index d75ea1ae..ed0b2ecb 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java @@ -3,7 +3,9 @@ package com.qs.serve.modules.vtb.controller; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; import com.qs.serve.modules.vtb.entity.dto.VtbActivityCheckDTO; +import com.qs.serve.modules.vtb.entity.dto.VtbVerificationDTO; import com.qs.serve.modules.vtb.entity.so.VtbActivityCheckSo; +import com.qs.serve.modules.vtb.entity.so.VtbVerificationCheckSo; import com.qs.serve.modules.vtb.mapper.VtbVerReportMapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; /** + * 核销数据 * @author YenHex * @since 2023/9/4 */ @@ -25,8 +28,13 @@ public class VtbVerificationDataController { private final VtbVerReportMapper verReportMapper; + /** + * 获取活动的核销情况 + * @param query + * @return + */ @GetMapping("pageActivityCheck") - public R getActivityData(VtbActivityCheckSo query){ + public R> getActivityData(VtbActivityCheckSo query){ Long count = verReportMapper.countActivityCheck(query); if(count>0){ List list = verReportMapper.pageActivityCheck(query); @@ -38,6 +46,23 @@ public class VtbVerificationDataController { return R.byEmptyList(); } + /** + * 获取核销的支付信息 + * @param query + * @return + */ + @GetMapping("pageVerificationCheck") + public R getVerificationData(VtbVerificationCheckSo query){ + Long count = verReportMapper.countVerificationCheck(query); + if(count>0){ + List list = verReportMapper.pageVerificationCheck(query); + PageVo page = new PageVo<>(); + page.initPageByTotal(count); + page.setList(list); + return R.ok(page); + } + return R.byEmptyList(); + } } diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/dto/VtbVerificationDTO.java b/src/main/java/com/qs/serve/modules/vtb/entity/dto/VtbVerificationDTO.java index fb8dba2e..f2cbbc8c 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/dto/VtbVerificationDTO.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/dto/VtbVerificationDTO.java @@ -15,54 +15,29 @@ import java.time.LocalDateTime; @Data public class VtbVerificationDTO { - private String costApplyId; - - /** 费用编码 */ - private String costApplyCode; - - private String costTitle; - - /** 客户id */ - private String supplierId; - + /** 核销编码 */ + private String verificationCode; + /** 供应商编码 */ private String supplierCode; - + /** 供应商 */ private String supplierName; - - /** 提交实际 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private LocalDateTime submitTime; - + /** 支付方式 */ + private String wayTitle; + /** 核销金额 */ + private String amount; + /** 支付金额 */ + private String payAmt; + /** 不再支付金额 */ + private String notPayAmt; + /** 费用编码 */ + private String costApplyCode; + /** 费用主题 */ + private String chargeTheme; + /** 费用申请时间 */ + private String submitTime; /** 活动编码 */ private String activityCode; + /** 活动内容 */ + private String actTitle; - private String activityTitle; - - private String activityAmount; - - /** 核销金额 */ - private String checkAmount; - - /** 核销完成 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private LocalDateTime checkFinishedDate; - - /** 释放标识 */ - private Integer releaseFlag; - - /** 释放金额 */ - private BigDecimal releaseAmount; - - /** 释放时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private LocalDateTime releaseTime; - - /** 释放人员id */ - private String releaseUserId; - - /** 释放人员 */ - private String releaseUserName; } diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationCheckSo.java b/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationCheckSo.java index 7c16452a..633fc80f 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationCheckSo.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationCheckSo.java @@ -1,8 +1,46 @@ package com.qs.serve.modules.vtb.entity.so; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + /** * @author YenHex * @since 2023/9/4 */ +@Data public class VtbVerificationCheckSo { + /** 核销编码 */ + private String verificationCode; + /** 供应商编码 */ + private String supplierCode; + /** 供应商 */ + private String supplierName; + /** 费用编码 */ + private String costApplyCode; + /** 费用主题 */ + private String chargeTheme; + /** 活动编码 */ + private String activityCode; + /** 活动内容 */ + private String actTitle; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime startCheckTime; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime endCheckTime; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime startPayTime; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime endPayTime; + } diff --git a/src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml b/src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml index df7a203c..60076124 100644 --- a/src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml +++ b/src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml @@ -133,7 +133,7 @@ - select bir_activity_center_goods.* from bir_activity_center_goods diff --git a/src/main/resources/mapper/vtb/VtbVerReportMapper.xml b/src/main/resources/mapper/vtb/VtbVerReportMapper.xml index 2a6ab24c..5682a1f4 100644 --- a/src/main/resources/mapper/vtb/VtbVerReportMapper.xml +++ b/src/main/resources/mapper/vtb/VtbVerReportMapper.xml @@ -81,11 +81,65 @@