fetch: add payment export data object and api and views eairps#245

Jzow · Jzow · commit 9e34c3982f84 · 2023-12-03T17:42:18.000+08:00
diff --git a/core/api/src/main/java/com/wansenai/api/financial/PaymentReceiptController.java b/core/api/src/main/java/com/wansenai/api/financial/PaymentReceiptController.java
@@ -19,7 +19,16 @@
 import com.wansenai.utils.response.Response;
 import com.wansenai.vo.financial.PaymentDetailVO;
 import com.wansenai.vo.financial.PaymentVO;
-import org.springframework.web.bind.annotation.*;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 
 import java.util.List;
 
@@ -57,4 +66,9 @@ public Response<String> deletePaymentReceiptByIds(@RequestParam("ids") List<Long
     public Response<String> updatePaymentReceiptStatusByIds(@RequestParam("ids") List<Long> ids, @RequestParam("status") Integer status) {
         return paymentReceiptService.updatePaymentReceiptStatus(ids, status);
     }
+
+    @GetMapping("export")
+    public void exportPaymentReceipt(@ModelAttribute QueryPaymentDTO queryPaymentDTO, HttpServletResponse response) {
+        paymentReceiptService.exportPaymentReceipt(queryPaymentDTO, response);
+    }
 }
diff --git a/core/domain/src/main/java/com/wansenai/dto/financial/QueryPaymentDTO.java b/core/domain/src/main/java/com/wansenai/dto/financial/QueryPaymentDTO.java
@@ -38,4 +38,6 @@ public class QueryPaymentDTO {
     private Integer page;
 
     private Integer pageSize;
+
+    private Boolean isExportDetail;
 }
diff --git a/core/domain/src/main/java/com/wansenai/vo/financial/PaymentVO.java b/core/domain/src/main/java/com/wansenai/vo/financial/PaymentVO.java
@@ -15,6 +15,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.wansenai.bo.BigDecimalSerializerBO;
+import com.wansenai.utils.excel.ExcelExport;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -32,27 +33,37 @@ public class PaymentVO {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
 
+    @ExcelExport(value = "供应商")
     private String supplierName;
 
+    @ExcelExport(value = "单据编号")
     private String receiptNumber;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ExcelExport(value = "单据日期")
     private LocalDateTime receiptDate;
 
+    @ExcelExport(value = "财务人员")
     private String financialPerson;
 
+    @ExcelExport(value = "付款账户")
     private String paymentAccountName;
 
     @JsonSerialize(using = BigDecimalSerializerBO.class)
+    @ExcelExport(value = "合计付款")
     private BigDecimal totalPaymentAmount;
 
     @JsonSerialize(using = BigDecimalSerializerBO.class)
+    @ExcelExport(value = "优惠金额")
     private BigDecimal discountAmount;
 
     @JsonSerialize(using = BigDecimalSerializerBO.class)
+    @ExcelExport(value = "实际付款")
     private BigDecimal actualPaymentAmount;
 
+    @ExcelExport(value = "备注")
     private String remark;
 
+    @ExcelExport(value = "状态", kv = "0:未审核;1:已审核")
     private Integer status;
 }
diff --git a/core/service/src/main/java/com/wansenai/service/financial/PaymentReceiptService.java b/core/service/src/main/java/com/wansenai/service/financial/PaymentReceiptService.java
@@ -20,6 +20,7 @@
 import com.wansenai.utils.response.Response;
 import com.wansenai.vo.financial.PaymentDetailVO;
 import com.wansenai.vo.financial.PaymentVO;
+import jakarta.servlet.http.HttpServletResponse;
 
 import java.util.List;
 
@@ -34,4 +35,6 @@ public interface PaymentReceiptService extends IService<FinancialMain> {
     Response<String> deleteBatchPaymentReceipt(List<Long> ids);
 
     Response<String> updatePaymentReceiptStatus(List<Long> ids, Integer status);
+
+    void exportPaymentReceipt(QueryPaymentDTO queryPaymentDTO, HttpServletResponse response);
 }
diff --git a/core/service/src/main/java/com/wansenai/service/financial/impl/PaymentReceiptServiceImpl.java b/core/service/src/main/java/com/wansenai/service/financial/impl/PaymentReceiptServiceImpl.java
@@ -14,9 +14,9 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wansenai.bo.CollectionBO;
 import com.wansenai.bo.FileDataBO;
 import com.wansenai.bo.PaymentBO;
+import com.wansenai.bo.PaymentDataExportBO;
 import com.wansenai.dto.financial.AddOrUpdatePaymentDTO;
 import com.wansenai.dto.financial.QueryPaymentDTO;
 import com.wansenai.entities.financial.FinancialMain;
@@ -34,11 +34,11 @@
 import com.wansenai.utils.constants.CommonConstants;
 import com.wansenai.utils.enums.BaseCodeEnum;
 import com.wansenai.utils.enums.CollectionPaymentCodeEnum;
+import com.wansenai.utils.excel.ExcelUtils;
 import com.wansenai.utils.response.Response;
-import com.wansenai.vo.financial.CollectionDetailVO;
-import com.wansenai.vo.financial.CollectionVO;
 import com.wansenai.vo.financial.PaymentDetailVO;
 import com.wansenai.vo.financial.PaymentVO;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -48,6 +48,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 @Service
@@ -141,6 +142,41 @@ public Response<Page<PaymentVO>> getPaymentReceiptPageList(QueryPaymentDTO query
         return Response.responseData(result);
     }
 
+    private List<PaymentVO> getPaymentReceiptList(QueryPaymentDTO queryPaymentDTO) {
+        var financialMainList = lambdaQuery()
+                .eq(queryPaymentDTO.getFinancialPersonId() != null, FinancialMain::getOperatorId, queryPaymentDTO.getFinancialPersonId())
+                .eq(queryPaymentDTO.getAccountId() != null, FinancialMain::getAccountId, queryPaymentDTO.getAccountId())
+                .eq(queryPaymentDTO.getStatus() != null, FinancialMain::getStatus, queryPaymentDTO.getStatus())
+                .eq(queryPaymentDTO.getSupplierId() != null, FinancialMain::getRelatedPersonId, queryPaymentDTO.getSupplierId())
+                .eq(StringUtils.hasLength(queryPaymentDTO.getReceiptNumber()), FinancialMain::getReceiptNumber, queryPaymentDTO.getReceiptNumber())
+                .like(StringUtils.hasLength(queryPaymentDTO.getRemark()), FinancialMain::getRemark, queryPaymentDTO.getRemark())
+                .ge(StringUtils.hasLength(queryPaymentDTO.getStartDate()), FinancialMain::getReceiptDate, queryPaymentDTO.getStartDate())
+                .le(StringUtils.hasLength(queryPaymentDTO.getEndDate()), FinancialMain::getReceiptDate, queryPaymentDTO.getEndDate())
+                .eq(FinancialMain::getType, "付款")
+                .eq(FinancialMain::getDeleteFlag, CommonConstants.NOT_DELETED)
+                .list();
+
+        var paymentVOList = new ArrayList<PaymentVO>(financialMainList.size() + 1);
+        financialMainList.forEach(item -> {
+            var paymentVo = PaymentVO.builder()
+                    .id(item.getId())
+                    .receiptNumber(item.getReceiptNumber())
+                    .supplierName(commonService.getSupplierName(item.getRelatedPersonId()))
+                    .receiptDate(item.getReceiptDate())
+                    .financialPerson(commonService.getOperatorName(item.getOperatorId()))
+                    .paymentAccountName(commonService.getAccountName(item.getAccountId()))
+                    .totalPaymentAmount(item.getTotalAmount())
+                    .discountAmount(item.getDiscountAmount())
+                    .actualPaymentAmount(item.getChangeAmount())
+                    .status(item.getStatus())
+                    .remark(item.getRemark())
+                    .build();
+
+            paymentVOList.add(paymentVo);
+        });
+        return paymentVOList;
+    }
+
     @Override
     public Response<PaymentDetailVO> getPaymentReceiptDetail(Long id) {
         if (id == null) {
@@ -354,4 +390,35 @@ public Response<String> updatePaymentReceiptStatus(List<Long> ids, Integer statu
         }
         return Response.responseMsg(CollectionPaymentCodeEnum.UPDATE_PAYMENT_RECEIPT_SUCCESS);
     }
+
+    @Override
+    public void exportPaymentReceipt(QueryPaymentDTO queryPaymentDTO, HttpServletResponse response) {
+        var exportMap = new ConcurrentHashMap<String, List<List<Object>>>();
+        var mainData = getPaymentReceiptList(queryPaymentDTO);
+        if (!mainData.isEmpty()) {
+            exportMap.put("付款单", ExcelUtils.getSheetData(mainData));
+            if (queryPaymentDTO.getIsExportDetail()) {
+                var subData = new ArrayList<PaymentDataExportBO>();
+                for (PaymentVO paymentVO : mainData) {
+                    var detail = getPaymentReceiptDetail(paymentVO.getId()).getData().getTableData();
+                    if (!detail.isEmpty()) {
+                        detail.forEach(item -> {
+                            var data = PaymentDataExportBO.builder()
+                                    .supplierName(paymentVO.getSupplierName())
+                                    .receiptNumber(paymentVO.getReceiptNumber())
+                                    .purchaseReceiptNumber(item.getPurchaseReceiptNumber())
+                                    .paymentArrears(item.getPaymentArrears())
+                                    .prepaidArrears(item.getPrepaidArrears())
+                                    .thisPaymentAmount(item.getThisPaymentAmount())
+                                    .remark(item.getRemark())
+                                    .build();
+                            subData.add(data);
+                        });
+                    }
+                }
+                exportMap.put("付款单明细", ExcelUtils.getSheetData(subData));
+            }
+            ExcelUtils.exportManySheet(response, "付款单", exportMap);
+        }
+    }
 }
diff --git a/web/src/api/financial/payment.ts b/web/src/api/financial/payment.ts
@@ -17,6 +17,7 @@ enum API {
     UpdateStatus = '/financial/payment/updateStatusByIds',
     GetDetail = '/financial/payment/getDetailById',
     GetArrearsPage = '/purchase/arrears/pageList',
+    Export = '/financial/payment/export',
 }
 
 export function getPaymentPageList(params: QueryPaymentReq) {
@@ -77,4 +78,14 @@ export function getArrearsPageList(params: QueryPaymentArrearsReq) {
             params,
         }
     );
+}
+
+export function exportPayment(params: QueryPaymentReq) {
+    return defHttp.get<BaseDataResp<Blob>>(
+        {
+            url: `${API.Export}`,
+            params,
+            responseType: "blob"
+        }
+    );
 }
diff --git a/web/src/views/financial/payment/index.vue b/web/src/views/financial/payment/index.vue
@@ -40,6 +40,14 @@
         </template>
       </template>
     </BasicTable>
+    <a-modal v-model:open="openExportData" title="确认导出" :confirm-loading="confirmLoading"
+             @ok="handleExportOk" @cancel="handleExportCancel" okText="导出">
+      <div style="text-align: center">
+        <p>即将导出{{dataSum}}条数据，请耐心等待。</p>
+        <p>如需导出明细数据（可能耗时较长），请勾选下方复选框。</p>
+        <a-checkbox v-model:checked="exportDetailData">需要导出明细数据</a-checkbox>
+      </div>
+    </a-modal>
     <AddEditPaymentModal ref="addEditModalRef" @cancel="handleCancel"/>
     <ViewPaymentModal @register="receiptViewModal" />
   </div>
@@ -52,22 +60,25 @@ import {defineComponent, ref} from "vue";
 import {BasicTable, TableAction, useTable} from "@/components/Table";
 import {useMessage} from "@/hooks/web/useMessage";
 import {columns, searchFormSchema} from "@/views/financial/payment/payment.data";
-import {exportXlsx} from "@/api/basic/common";
 import {useI18n} from "vue-i18n";
-import {getPaymentPageList, deleteBatchPayment, updatePaymentStatus} from "@/api/financial/payment";
-import {Tag} from "ant-design-vue";
+import {getPaymentPageList, deleteBatchPayment, updatePaymentStatus, exportPayment} from "@/api/financial/payment";
+import {Checkbox, Modal, Tag} from "ant-design-vue";
 import {useModal} from "@/components/Modal";
 import ViewPaymentModal from "@/views/financial/payment/components/ViewPaymentModal.vue";
 import AddEditPaymentModal from "@/views/financial/payment/components/AddEditPaymentModal.vue";
 export default defineComponent({
   name: 'PaymentReceipt',
-  components: {ViewPaymentModal, Tag, TableAction, BasicTable, AddEditPaymentModal},
+  components: {'a-modal': Modal, 'a-checkbox': Checkbox, ViewPaymentModal, Tag, TableAction, BasicTable, AddEditPaymentModal},
   setup() {
     const { t } = useI18n();
     const { createMessage } = useMessage();
     const addEditModalRef = ref(null);
+    const exportDetailData = ref<boolean>(false);
+    const openExportData = ref<boolean>(false);
+    const confirmLoading = ref<boolean>(false);
+    const dataSum = ref<number>(0);
     const [receiptViewModal, {openModal: openReceiptViewModal}] = useModal();
-    const [registerTable, { reload, getSelectRows }] = useTable({
+    const [registerTable, { reload, getSelectRows, getForm, getDataSource }] = useTable({
       title: '付款单列表',
       rowKey: 'id',
       api: getPaymentPageList,
@@ -169,16 +180,38 @@ export default defineComponent({
     }
 
     async function handleExport() {
-      const file = await exportXlsx("付款单列表")
-      const blob = new Blob([file]);
-      const link = document.createElement("a");
-      link.href = URL.createObjectURL(blob);
-      const timestamp = getTimestamp(new Date());
-      link.download = "付款单数据" + timestamp + ".xlsx";
-      link.target = "_blank";
-      link.click();
+      dataSum.value = getDataSource().length;
+      if (dataSum.value === 0) {
+        createMessage.warn('当前查询条件下无数据可导出');
+        return;
+      }
+      openExportData.value = true;
     }
 
+    const handleExportCancel = () => {
+      confirmLoading.value = false;
+      openExportData.value = false;
+      exportDetailData.value = false;
+    };
+
+    const handleExportOk = async () => {
+      confirmLoading.value = true;
+      const data: any = getForm().getFieldsValue();
+      data.isExportDetail = exportDetailData.value;
+      const file: any = await exportPayment(data)
+      if (file.size > 0) {
+        const blob = new Blob([file]);
+        const link = document.createElement("a");
+        link.href = URL.createObjectURL(blob);
+        const timestamp = getTimestamp(new Date());
+        link.download = "付款单数据" + timestamp + ".xlsx";
+        link.target = "_blank";
+        link.click();
+      }
+      confirmLoading.value = false;
+      openExportData.value = false;
+      exportDetailData.value = false;
+    }
 
     return {
       t,
@@ -195,6 +228,12 @@ export default defineComponent({
       handleView,
       handleOk,
       handleExport,
+      openExportData,
+      confirmLoading,
+      exportDetailData,
+      dataSum,
+      handleExportOk,
+      handleExportCancel
     }
   }
 })

Original file line number	Diff line number	Diff line change
`@@ -38,4 +38,6 @@ public class QueryPaymentDTO {`
`38`	`38`	`private Integer page;`
`39`	`39`
`40`	`40`	`private Integer pageSize;`
	`41`	`+`
	`42`	`+ private Boolean isExportDetail;`
`41`	`43`	`}`