From 051b0365d04bec1edc0a4d5b32293b56bd2702ab Mon Sep 17 00:00:00 2001 From: lst Date: Mon, 15 Jul 2024 17:21:14 +0800 Subject: [PATCH] 活期账户明细导出开发、收支明细导出更改 --- backend/chkpower/src/main/java/com/hotent/chkpower/controller/WCurrentController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ backend/chkpower/src/main/java/com/hotent/chkpower/controller/WFinanceController.java | 9 +++++++++ backend/chkpower/src/main/java/com/hotent/chkpower/dao/WCurrentDao.java | 2 +- backend/chkpower/src/main/java/com/hotent/chkpower/dao/WFinanceDetailDao.java | 4 ++++ backend/chkpower/src/main/java/com/hotent/chkpower/manager/WCurrentManager.java | 2 +- backend/chkpower/src/main/java/com/hotent/chkpower/manager/WFinanceDetailManager.java | 4 ++++ backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentManagerImpl.java | 5 +++++ backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WFinanceDetailManagerImpl.java | 10 ++++++++++ backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WProjectOperationRecordManagerImpl.java | 3 --- backend/chkpower/src/main/resources/doc/current_account_detail.xls | Bin 0 -> 19456 bytes backend/chkpower/src/main/resources/mapper/WCurrentMapper.xml | 19 +++++++++++++++++++ backend/chkpower/src/main/resources/mapper/WFinanceDetailMapper.xml | 30 ++++++++++++++++++++++++++++++ 12 files changed, 131 insertions(+), 5 deletions(-) create mode 100644 backend/chkpower/src/main/resources/doc/current_account_detail.xls diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WCurrentController.java b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WCurrentController.java index 6c458da..93455f6 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WCurrentController.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WCurrentController.java @@ -3,6 +3,7 @@ package com.hotent.chkpower.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -134,4 +135,51 @@ public class WCurrentController extends BaseController gslxList = baseService.getCurrentOrgTypeList(); + List> list = new ArrayList>(); + BigDecimal hz = new BigDecimal(0.00); + int index = 1; + for (String orgType : gslxList) { + List> wCurrents = baseService.listByOrgTypeAndDate(orgType, date); + if (ObjectUtils.isNotEmpty(wCurrents)) { + for (HashMap wCurrent : wCurrents) { + wCurrent.put("index", index); + index++; + } + } + list.addAll(wCurrents); + } + map.put("list", list); + TemplateExportParams params = new TemplateExportParams("doc/current_account_detail.xls"); + params.setColForEach(true); + Workbook workbook = ExcelExportUtil.exportExcel(params, map); + String filedisplay = "活期账户余额明细.xls"; + response.setContentType("APPLICATION/OCTET-STREAM"); + response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); + response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(filedisplay, "utf-8")); + OutputStream os = null; + try { + os = response.getOutputStream(); + workbook.write(os); + os.flush(); + os.close(); + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (os != null) + os.close(); + } + } } diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WFinanceController.java b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WFinanceController.java index 79a1141..9ad69cb 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WFinanceController.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WFinanceController.java @@ -8,6 +8,7 @@ import com.hotent.base.query.QueryFilter; import com.hotent.base.query.QueryOP; import com.hotent.bo.model.BoDef; import com.hotent.chkpower.manager.WCurrentManager; +import com.hotent.chkpower.manager.WFinanceDetailManager; import com.hotent.runtime.model.BpmAutoStartConf; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.web.bind.annotation.GetMapping; @@ -46,6 +47,8 @@ import java.util.Objects; public class WFinanceController extends BaseController { @Resource private WCurrentManager wCurrentManager; + @Resource + private WFinanceDetailManager wFinanceDetailManager; /** * 根据id获取运营公司收支数据详情 @@ -121,6 +124,12 @@ public class WFinanceController extends BaseController datum : listData) { + String mattersIncomer = wFinanceDetailManager.mattersIncomerByOrgIdAndDate(datum.get("F_org_id"),date); + String matterDisbursement = wFinanceDetailManager.matterDisbursementByOrgIdAndDate(datum.get("F_org_id"),date); + datum.put("F_total_income",mattersIncomer); + datum.put("F_total_disbursement",matterDisbursement); + } listData.add(hzMap); list.addAll(listData); } diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WCurrentDao.java b/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WCurrentDao.java index 73189ef..e3326cb 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WCurrentDao.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WCurrentDao.java @@ -26,5 +26,5 @@ public interface WCurrentDao extends BaseMapper { List getCurrentOrgTypeList(); - + List> listByOrgTypeAndDate(@Param("fOrgType")String orgType, @Param("fDate")String date); } diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WFinanceDetailDao.java b/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WFinanceDetailDao.java index 8f80ac2..7d64018 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WFinanceDetailDao.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WFinanceDetailDao.java @@ -2,6 +2,7 @@ package com.hotent.chkpower.dao; import com.hotent.chkpower.model.WFinanceDetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** * 运营公司收支明细 Mapper 接口 @@ -12,4 +13,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface WFinanceDetailDao extends BaseMapper { + String mattersIncomerByOrgIdAndDate(@Param("orgId") String orgId, @Param("date")String date); + + String matterDisbursementByOrgIdAndDate(@Param("orgId") String orgId, @Param("date")String date); } diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WCurrentManager.java b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WCurrentManager.java index d4f6d13..3dfa217 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WCurrentManager.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WCurrentManager.java @@ -40,5 +40,5 @@ public interface WCurrentManager extends BaseManager { List getCurrentOrgTypeList(); - + List> listByOrgTypeAndDate(String orgType, String date); } diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WFinanceDetailManager.java b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WFinanceDetailManager.java index b94da3c..965ae00 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WFinanceDetailManager.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WFinanceDetailManager.java @@ -23,4 +23,8 @@ public interface WFinanceDetailManager extends BaseManager { * @return */ void createOrUpdate(WFinanceDetail wFinanceDetail); + + String mattersIncomerByOrgIdAndDate(String f_org_id, String date); + + String matterDisbursementByOrgIdAndDate(String f_org_id, String date); } diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentManagerImpl.java b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentManagerImpl.java index 2951ce2..ffc7113 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentManagerImpl.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentManagerImpl.java @@ -58,4 +58,9 @@ public class WCurrentManagerImpl extends BaseManagerImpl public List getCurrentOrgTypeList() { return baseMapper.getCurrentOrgTypeList(); } + + @Override + public List> listByOrgTypeAndDate(String orgType, String date) { + return baseMapper.listByOrgTypeAndDate(orgType,date); + } } diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WFinanceDetailManagerImpl.java b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WFinanceDetailManagerImpl.java index 190616d..afb5e29 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WFinanceDetailManagerImpl.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WFinanceDetailManagerImpl.java @@ -35,4 +35,14 @@ public class WFinanceDetailManagerImpl extends BaseManagerImpl + + diff --git a/backend/chkpower/src/main/resources/mapper/WFinanceDetailMapper.xml b/backend/chkpower/src/main/resources/mapper/WFinanceDetailMapper.xml index 6d507d8..ea85b9e 100644 --- a/backend/chkpower/src/main/resources/mapper/WFinanceDetailMapper.xml +++ b/backend/chkpower/src/main/resources/mapper/WFinanceDetailMapper.xml @@ -46,4 +46,34 @@ where ID_ = #{id} + + + + -- libgit2 0.21.2