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

Jzow · Jzow · commit 0e158685ba5e · 2023-12-03T17:42:50.000+08:00
diff --git a/core/api/src/main/java/com/wansenai/api/financial/CollectionReceiptController.java b/core/api/src/main/java/com/wansenai/api/financial/CollectionReceiptController.java
@@ -19,6 +19,7 @@
 import com.wansenai.utils.response.Response;
 import com.wansenai.vo.financial.CollectionDetailVO;
 import com.wansenai.vo.financial.CollectionVO;
+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;
@@ -27,6 +28,7 @@
 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;
 
@@ -64,4 +66,9 @@ public Response<String> deleteCollectionReceiptByIds(@RequestParam("ids") List<L
     public Response<String> updateCollectionReceiptStatusByIds(@RequestParam("ids") List<Long> ids, @RequestParam("status") Integer status) {
         return collectionReceiptService.updateCollectionReceiptStatus(ids, status);
     }
+
+    @GetMapping("export")
+    public void exportCollectionReceipt(@ModelAttribute QueryCollectionDTO queryCollectionDTO, HttpServletResponse response) {
+        collectionReceiptService.exportCollectionReceipt(queryCollectionDTO, response);
+    }
 }
diff --git a/core/domain/src/main/java/com/wansenai/dto/financial/QueryCollectionDTO.java b/core/domain/src/main/java/com/wansenai/dto/financial/QueryCollectionDTO.java
@@ -38,4 +38,6 @@ public class QueryCollectionDTO {
     private Integer page;
 
     private Integer pageSize;
+
+    private Boolean isExportDetail;
 }
diff --git a/core/domain/src/main/java/com/wansenai/vo/financial/CollectionVO.java b/core/domain/src/main/java/com/wansenai/vo/financial/CollectionVO.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 CollectionVO {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
 
+    @ExcelExport(value = "客户")
     private String customerName;
 
+    @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 collectionAccountName;
 
     @JsonSerialize(using = BigDecimalSerializerBO.class)
+    @ExcelExport(value = "合计收款")
     private BigDecimal totalCollectionAmount;
 
     @JsonSerialize(using = BigDecimalSerializerBO.class)
+    @ExcelExport(value = "优惠金额")
     private BigDecimal discountAmount;
 
     @JsonSerialize(using = BigDecimalSerializerBO.class)
+    @ExcelExport(value = "实际收款")
     private BigDecimal actualCollectionAmount;
 
+    @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/CollectionReceiptService.java b/core/service/src/main/java/com/wansenai/service/financial/CollectionReceiptService.java
@@ -20,6 +20,7 @@
 import com.wansenai.utils.response.Response;
 import com.wansenai.vo.financial.CollectionDetailVO;
 import com.wansenai.vo.financial.CollectionVO;
+import jakarta.servlet.http.HttpServletResponse;
 
 import java.util.List;
 
@@ -34,4 +35,6 @@ public interface CollectionReceiptService extends IService<FinancialMain> {
     Response<String> deleteBatchCollectionReceipt(List<Long> ids);
 
     Response<String> updateCollectionReceiptStatus(List<Long> ids, Integer status);
+
+    void exportCollectionReceipt(QueryCollectionDTO queryCollectionDTO, HttpServletResponse response);
 }
diff --git a/core/service/src/main/java/com/wansenai/service/financial/impl/CollectionReceiptServiceImpl.java b/core/service/src/main/java/com/wansenai/service/financial/impl/CollectionReceiptServiceImpl.java
@@ -15,6 +15,7 @@
 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.CollectionDataExportBO;
 import com.wansenai.bo.FileDataBO;
 import com.wansenai.dto.financial.AddOrUpdateCollectionDTO;
 import com.wansenai.dto.financial.QueryCollectionDTO;
@@ -33,10 +34,11 @@
 import com.wansenai.utils.constants.CommonConstants;
 import com.wansenai.utils.enums.BaseCodeEnum;
 import com.wansenai.utils.enums.CollectionPaymentCodeEnum;
-import com.wansenai.utils.enums.IncomeExpenseCodeEnum;
+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 jakarta.servlet.http.HttpServletResponse;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -46,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
@@ -139,6 +142,41 @@ public Response<Page<CollectionVO>> getCollectionReceiptPageList(QueryCollection
         return Response.responseData(result);
     }
 
+    private List<CollectionVO> getCollectionReceiptList(QueryCollectionDTO queryCollectionDTO) {
+        var financialMainList = lambdaQuery()
+                .eq(queryCollectionDTO.getFinancialPersonId() != null, FinancialMain::getOperatorId, queryCollectionDTO.getFinancialPersonId())
+                .eq(queryCollectionDTO.getAccountId() != null, FinancialMain::getAccountId, queryCollectionDTO.getAccountId())
+                .eq(queryCollectionDTO.getStatus() != null, FinancialMain::getStatus, queryCollectionDTO.getStatus())
+                .eq(queryCollectionDTO.getCustomerId() != null, FinancialMain::getRelatedPersonId, queryCollectionDTO.getCustomerId())
+                .eq(StringUtils.hasLength(queryCollectionDTO.getReceiptNumber()), FinancialMain::getReceiptNumber, queryCollectionDTO.getReceiptNumber())
+                .like(StringUtils.hasLength(queryCollectionDTO.getRemark()), FinancialMain::getRemark, queryCollectionDTO.getRemark())
+                .ge(StringUtils.hasLength(queryCollectionDTO.getStartDate()), FinancialMain::getReceiptDate, queryCollectionDTO.getStartDate())
+                .le(StringUtils.hasLength(queryCollectionDTO.getEndDate()), FinancialMain::getReceiptDate, queryCollectionDTO.getEndDate())
+                .eq(FinancialMain::getType, "收款")
+                .eq(FinancialMain::getDeleteFlag, CommonConstants.NOT_DELETED)
+                .list();
+
+        var collectionVOList = new ArrayList<CollectionVO>(financialMainList.size() + 1);
+        financialMainList.forEach(item -> {
+            var collectionVo = CollectionVO.builder()
+                    .id(item.getId())
+                    .receiptNumber(item.getReceiptNumber())
+                    .customerName(commonService.getCustomerName(item.getRelatedPersonId()))
+                    .receiptDate(item.getReceiptDate())
+                    .financialPerson(commonService.getOperatorName(item.getOperatorId()))
+                    .collectionAccountName(commonService.getAccountName(item.getAccountId()))
+                    .totalCollectionAmount(item.getTotalAmount())
+                    .discountAmount(item.getDiscountAmount())
+                    .actualCollectionAmount(item.getChangeAmount())
+                    .status(item.getStatus())
+                    .remark(item.getRemark())
+                    .build();
+
+            collectionVOList.add(collectionVo);
+        });
+        return collectionVOList;
+    }
+
     @Override
     public Response<CollectionDetailVO> getCollectionReceiptDetail(Long id) {
         if (id == null) {
@@ -352,4 +390,35 @@ public Response<String> updateCollectionReceiptStatus(List<Long> ids, Integer st
         }
         return Response.responseMsg(CollectionPaymentCodeEnum.UPDATE_COLLECTION_RECEIPT_SUCCESS);
     }
+
+    @Override
+    public void exportCollectionReceipt(QueryCollectionDTO queryCollectionDTO, HttpServletResponse response) {
+        var exportMap = new ConcurrentHashMap<String, List<List<Object>>>();
+        var mainData = getCollectionReceiptList(queryCollectionDTO);
+        if (!mainData.isEmpty()) {
+            exportMap.put("收款单", ExcelUtils.getSheetData(mainData));
+            if (queryCollectionDTO.getIsExportDetail()) {
+                var subData = new ArrayList<CollectionDataExportBO>();
+                for (CollectionVO collectionVO : mainData) {
+                    var detail = getCollectionReceiptDetail(collectionVO.getId()).getData().getTableData();
+                    if (!detail.isEmpty()) {
+                        detail.forEach(item -> {
+                            var data = CollectionDataExportBO.builder()
+                                    .customerName(collectionVO.getCustomerName())
+                                    .receiptNumber(collectionVO.getReceiptNumber())
+                                    .saleReceiptNumber(item.getSaleReceiptNumber())
+                                    .receivableArrears(item.getReceivableArrears())
+                                    .receivedArrears(item.getReceivedArrears())
+                                    .thisCollectionAmount(item.getThisCollectionAmount())
+                                    .remark(item.getRemark())
+                                    .build();
+                            subData.add(data);
+                        });
+                    }
+                }
+                exportMap.put("收款单明细", ExcelUtils.getSheetData(subData));
+            }
+            ExcelUtils.exportManySheet(response, "收款单", exportMap);
+        }
+    }
 }
diff --git a/web/src/api/financial/collection.ts b/web/src/api/financial/collection.ts
@@ -15,6 +15,7 @@ enum API {
     UpdateStatus = '/financial/collection/updateStatusByIds',
     GetDetail = '/financial/collection/getDetailById',
     GetArrearsPage = '/sale/arrears/pageList',
+    Export = '/financial/collection/export',
 }
 
 export function getCollectionPageList(params: QueryCollectionReq) {
@@ -75,4 +76,14 @@ export function getArrearsPageList(params: QuerySaleArrearsReq) {
             params,
         }
     );
+}
+
+export function exportCollection(params: QueryCollectionReq) {
+    return defHttp.get<BaseDataResp<Blob>>(
+        {
+            url: `${API.Export}`,
+            params,
+            responseType: "blob"
+        }
+    );
 }

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