From 8068fc13a59d966bd318450ad70ddab4f105891b Mon Sep 17 00:00:00 2001 From: chenwei Date: Thu, 18 Jul 2024 10:45:43 +0800 Subject: [PATCH] 每日资金复核 --- backend/chkpower/src/main/java/com/hotent/chkpower/controller/WDailyFundsController.java | 206 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------- backend/chkpower/src/main/java/com/hotent/chkpower/dao/WDailyFundsDao.java | 2 +- backend/chkpower/src/main/java/com/hotent/chkpower/manager/WDailyFundsManager.java | 9 ++++++++- backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WDailyFundsManagerImpl.java | 36 ++++++++++++++++++++++++++++++++++-- backend/chkpower/src/main/java/com/hotent/chkpower/model/WDailyFunds.java | 51 ++++++++++++++++++++++++++------------------------- backend/chkpower/src/main/resources/doc/dailyFundsByDateExport.xls | Bin 22528 -> 0 bytes backend/chkpower/src/main/resources/mapper/WDailyFundsMapper.xml | 10 +++++----- frontend/front/src/api/service/dailyFunds.js | 16 ++++++++++++++++ frontend/front/src/views/pages/reviewOfFinancialDailyReport/index.vue | 489 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 9 files changed, 504 insertions(+), 315 deletions(-) diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WDailyFundsController.java b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WDailyFundsController.java index 6f0ed43..b5edb6a 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WDailyFundsController.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WDailyFundsController.java @@ -82,14 +82,85 @@ public class WDailyFundsController extends BaseController data, String key, BigDecimal aggregate) { - // 直接检查值是否存在并为非空，避免了额外的containsKey调用 - Object value = data.get(key); - if (value != null && !value.equals("")) { - return aggregate.add(new BigDecimal(((Number) value).doubleValue())); - } else { - return BigDecimal.ZERO; + @PostMapping(value = "/updateInsps") + public CommonResult updateInsps(@RequestBody WDailyFundsInspDto wDailyFundsInspDto) throws Exception { + baseService.updateInsps(wDailyFundsInspDto.getwDailyFundsList()); + return CommonResult.ok().message("成功"); + } + + + /** + * 按日期查询复核列表 + * + * @param date + * @return + * @throws Exception + */ + @GetMapping(value = "/getInspList") + public CommonResult getInspList(@RequestParam String date) throws Exception { + HashMap map = new HashMap(); + map.put("date", date); + List gslxList = wCurrentManager.getCurrentOrgTypeList(); + BigDecimal F_yesterday_account_balance_zs = BigDecimal.ZERO; + BigDecimal F_today_account_balance_zs = BigDecimal.ZERO; + BigDecimal F_account_balance_difference_zs = BigDecimal.ZERO; + BigDecimal F_today_net_cash_flow_zs = BigDecimal.ZERO; + BigDecimal F_today_freeze_amount_zs = BigDecimal.ZERO; + BigDecimal F_today_freezing_zs = BigDecimal.ZERO; + List list = new ArrayList(); + for (String orgType : gslxList) { + List listDataBean = baseService.getDailyFundsByDateList(orgType, date); + if (listDataBean == null || listDataBean.size() == 0) { + break; + } + List> listData = convertToMapList(listDataBean); + BigDecimal F_yesterday_account_balance = BigDecimal.ZERO; + BigDecimal F_today_account_balance = BigDecimal.ZERO; + BigDecimal F_account_balance_difference = BigDecimal.ZERO; + BigDecimal F_today_net_cash_flow = BigDecimal.ZERO; + BigDecimal F_today_freeze_amount = BigDecimal.ZERO; + BigDecimal F_today_freezing = BigDecimal.ZERO; + for (Map data : listData) { + F_yesterday_account_balance = aggregateBalance(data, "fYesterdayAccountBalance", F_yesterday_account_balance); + F_today_account_balance = aggregateBalance(data, "fTodayAccountBalance", F_today_account_balance); + F_account_balance_difference = aggregateBalance(data, "fAccountBalanceDifference", F_account_balance_difference); + F_today_net_cash_flow = aggregateBalance(data, "fTodayNetCashFlow", F_today_net_cash_flow); + F_today_freeze_amount = aggregateBalance(data, "fTodayFreezeAmount", F_today_freeze_amount); + F_today_freezing = aggregateBalance(data, "fTodayFreezing", F_today_freezing); + } + Map xjMap = new HashMap<>(); + xjMap.put("fOrgType", "小计（" + orgType + "）"); + xjMap.put("fDate", "小计（" + orgType + "）"); + xjMap.put("fOrgName", "小计（" + orgType + "）"); + xjMap.put("fYesterdayAccountBalance", F_yesterday_account_balance.setScale(2, RoundingMode.HALF_UP).toString()); + xjMap.put("fTodayAccountBalance", F_today_account_balance.setScale(2, RoundingMode.HALF_UP).toString()); + xjMap.put("fAccountBalanceDifference", F_account_balance_difference.setScale(2, RoundingMode.HALF_UP).toString()); + xjMap.put("fTodayNetCashFlow", F_today_net_cash_flow.setScale(2, RoundingMode.HALF_UP).toString()); + xjMap.put("fTodayFreezeAmount", F_today_freeze_amount.setScale(2, RoundingMode.HALF_UP).toString()); + xjMap.put("fTodayFreezing", F_today_freezing.setScale(2, RoundingMode.HALF_UP).toString()); + listData.add(xjMap); + list.addAll(listData); + F_yesterday_account_balance_zs = F_yesterday_account_balance_zs.add(F_yesterday_account_balance); + F_today_account_balance_zs = F_today_account_balance_zs.add(F_today_account_balance); + F_account_balance_difference_zs = F_account_balance_difference_zs.add(F_account_balance_difference); + F_today_net_cash_flow_zs = F_today_net_cash_flow_zs.add(F_today_net_cash_flow); + F_today_freeze_amount_zs = F_today_freeze_amount_zs.add(F_today_freeze_amount); + F_today_freezing_zs = F_today_freezing_zs.add(F_today_freezing); } + HashMap hzMap = new HashMap<>(); + hzMap.put("fOrgType", "汇总"); + hzMap.put("fDate", "汇总"); + hzMap.put("fOrgName", "汇总"); + hzMap.put("fYesterdayAccountBalance", F_yesterday_account_balance_zs.setScale(2, RoundingMode.HALF_UP).toString()); + hzMap.put("fTodayAccountBalance", F_today_account_balance_zs.setScale(2, RoundingMode.HALF_UP).toString()); + hzMap.put("fAccountBalanceDifference", F_account_balance_difference_zs.setScale(2, RoundingMode.HALF_UP).toString()); + hzMap.put("fTodayNetCashFlow", F_today_net_cash_flow_zs.setScale(2, RoundingMode.HALF_UP).toString()); + hzMap.put("fTodayFreezeAmount", F_today_freeze_amount_zs.setScale(2, RoundingMode.HALF_UP).toString()); + hzMap.put("fTodayFreezing", F_today_freezing_zs.setScale(2, RoundingMode.HALF_UP).toString()); + list.add(hzMap); + map.put("list", list); + return CommonResult.ok().value(list); + } /** @@ -104,60 +175,58 @@ public class WDailyFundsController extends BaseController gslxList = wCurrentManager.getCurrentOrgTypeList(); - - BigDecimal F_yesterday_account_balance_zs = BigDecimal.ZERO; BigDecimal F_today_account_balance_zs = BigDecimal.ZERO; BigDecimal F_account_balance_difference_zs = BigDecimal.ZERO; BigDecimal F_today_net_cash_flow_zs = BigDecimal.ZERO; BigDecimal F_today_freeze_amount_zs = BigDecimal.ZERO; BigDecimal F_today_freezing_zs = BigDecimal.ZERO; - - List> list = new ArrayList>(); + List list = new ArrayList(); for (String orgType : gslxList) { - List> listData = baseService.getDailyFundsByDateList(orgType, date); - if (listData == null || listData.size() == 0) { + List listDataBean = baseService.getDailyFundsByDateList(orgType, date); + if (listDataBean == null || listDataBean.size() == 0) { break; } + List> listData = convertToMapList(listDataBean); BigDecimal F_yesterday_account_balance = BigDecimal.ZERO; BigDecimal F_today_account_balance = BigDecimal.ZERO; BigDecimal F_account_balance_difference = BigDecimal.ZERO; BigDecimal F_today_net_cash_flow = BigDecimal.ZERO; BigDecimal F_today_freeze_amount = BigDecimal.ZERO; BigDecimal F_today_freezing = BigDecimal.ZERO; - for (HashMap data : listData) { - F_yesterday_account_balance = aggregateBalance(data, "F_yesterday_account_balance", F_yesterday_account_balance); - F_today_account_balance = aggregateBalance(data, "F_today_account_balance", F_today_account_balance); - F_account_balance_difference = aggregateBalance(data, "F_account_balance_difference", F_account_balance_difference); - F_today_net_cash_flow = aggregateBalance(data, "F_today_net_cash_flow", F_today_net_cash_flow); - F_today_freeze_amount = aggregateBalance(data, "F_today_freeze_amount", F_today_freeze_amount); - F_today_freezing = aggregateBalance(data, "F_today_freezing", F_today_freezing); + for (Map data : listData) { + F_yesterday_account_balance = aggregateBalance(data, "fYesterdayAccountBalance", F_yesterday_account_balance); + F_today_account_balance = aggregateBalance(data, "fTodayAccountBalance", F_today_account_balance); + F_account_balance_difference = aggregateBalance(data, "fAccountBalanceDifference", F_account_balance_difference); + F_today_net_cash_flow = aggregateBalance(data, "fTodayNetCashFlow", F_today_net_cash_flow); + F_today_freeze_amount = aggregateBalance(data, "fTodayFreezeAmount", F_today_freeze_amount); + F_today_freezing = aggregateBalance(data, "fTodayFreezing", F_today_freezing); } - HashMap xjMap = new HashMap<>(); - xjMap.put("F_org_type", "小计（" + orgType + "）"); - xjMap.put("F_yesterday_account_balance", F_yesterday_account_balance.setScale(2, RoundingMode.HALF_UP).toString()); - xjMap.put("F_today_account_balance", F_today_account_balance.setScale(2, RoundingMode.HALF_UP).toString()); - xjMap.put("F_account_balance_difference", F_account_balance_difference.setScale(2, RoundingMode.HALF_UP).toString()); - xjMap.put("F_today_net_cash_flow", F_today_net_cash_flow.setScale(2, RoundingMode.HALF_UP).toString()); - xjMap.put("F_today_freeze_amount", F_today_freeze_amount.setScale(2, RoundingMode.HALF_UP).toString()); - xjMap.put("F_today_freezing", F_today_freezing.setScale(2, RoundingMode.HALF_UP).toString()); + Map xjMap = new HashMap<>(); + xjMap.put("fOrgType", "小计（" + orgType + "）"); + xjMap.put("fYesterdayAccountBalance", F_yesterday_account_balance.setScale(2, RoundingMode.HALF_UP).toString()); + xjMap.put("fTodayAccountBalance", F_today_account_balance.setScale(2, RoundingMode.HALF_UP).toString()); + xjMap.put("fAccountBalanceDifference", F_account_balance_difference.setScale(2, RoundingMode.HALF_UP).toString()); + xjMap.put("fTodayNetCashFlow", F_today_net_cash_flow.setScale(2, RoundingMode.HALF_UP).toString()); + xjMap.put("fTodayFreezeAmount", F_today_freeze_amount.setScale(2, RoundingMode.HALF_UP).toString()); + xjMap.put("fTodayFreezing", F_today_freezing.setScale(2, RoundingMode.HALF_UP).toString()); listData.add(xjMap); list.addAll(listData); F_yesterday_account_balance_zs = F_yesterday_account_balance_zs.add(F_yesterday_account_balance); - F_today_account_balance_zs= F_today_account_balance_zs.add(F_today_account_balance); - F_account_balance_difference_zs=F_account_balance_difference_zs.add(F_account_balance_difference); - F_today_net_cash_flow_zs=F_today_net_cash_flow_zs.add(F_today_net_cash_flow); - F_today_freeze_amount_zs=F_today_freeze_amount_zs.add(F_today_freeze_amount); - F_today_freezing_zs=F_today_freezing_zs.add(F_today_freezing); + F_today_account_balance_zs = F_today_account_balance_zs.add(F_today_account_balance); + F_account_balance_difference_zs = F_account_balance_difference_zs.add(F_account_balance_difference); + F_today_net_cash_flow_zs = F_today_net_cash_flow_zs.add(F_today_net_cash_flow); + F_today_freeze_amount_zs = F_today_freeze_amount_zs.add(F_today_freeze_amount); + F_today_freezing_zs = F_today_freezing_zs.add(F_today_freezing); } HashMap hzMap = new HashMap<>(); - hzMap.put("F_org_type", "汇总"); - hzMap.put("F_yesterday_account_balance", F_yesterday_account_balance_zs.setScale(2, RoundingMode.HALF_UP).toString()); - hzMap.put("F_today_account_balance", F_today_account_balance_zs.setScale(2, RoundingMode.HALF_UP).toString()); - hzMap.put("F_account_balance_difference", F_account_balance_difference_zs.setScale(2, RoundingMode.HALF_UP).toString()); - hzMap.put("F_today_net_cash_flow", F_today_net_cash_flow_zs.setScale(2, RoundingMode.HALF_UP).toString()); - hzMap.put("F_today_freeze_amount", F_today_freeze_amount_zs.setScale(2, RoundingMode.HALF_UP).toString()); - hzMap.put("F_today_freezing", F_today_freezing_zs.setScale(2, RoundingMode.HALF_UP).toString()); + hzMap.put("fOrgType", "汇总"); + hzMap.put("fYesterdayAccountBalance", F_yesterday_account_balance_zs.setScale(2, RoundingMode.HALF_UP).toString()); + hzMap.put("fTodayAccountBalance", F_today_account_balance_zs.setScale(2, RoundingMode.HALF_UP).toString()); + hzMap.put("fAccountBalanceDifference", F_account_balance_difference_zs.setScale(2, RoundingMode.HALF_UP).toString()); + hzMap.put("fTodayNetCashFlow", F_today_net_cash_flow_zs.setScale(2, RoundingMode.HALF_UP).toString()); + hzMap.put("fTodayFreezeAmount", F_today_freeze_amount_zs.setScale(2, RoundingMode.HALF_UP).toString()); + hzMap.put("fTodayFreezing", F_today_freezing_zs.setScale(2, RoundingMode.HALF_UP).toString()); list.add(hzMap); map.put("list", list); TemplateExportParams params = new TemplateExportParams("doc/dailyFundsByDateExport.xls"); @@ -181,5 +250,62 @@ public class WDailyFundsController extends BaseController data, String key, BigDecimal aggregate) { + Object value = data.get(key); + if (value != null) { + if (value instanceof Number) { + // 如果 value 是 Number 的实例，则安全地转换并添加到累加器中 + return aggregate.add(new BigDecimal(((Number) value).doubleValue())); + } else if (value instanceof String) { + // 如果 value 是 String，则尝试将其解析为 BigDecimal + try { + BigDecimal number = new BigDecimal((String) value); + return aggregate.add(number); + } catch (NumberFormatException e) { + // 如果解析失败，返回原来的累加器值 + return aggregate; + } + } + } + // 如果 value 为 null 或者既不是 Number 也不是 String，返回原来的累加器值 + return aggregate; + } + + //类中转换 + private static List> convertToMapList(List fundsList) { + List> resultList = new ArrayList<>(); + for (WDailyFunds dailyFunds : fundsList) { + Map map = new HashMap<>(); + map.put("id", dailyFunds.getId()); + map.put("refId", dailyFunds.getRefId()); + map.put("fDate", dailyFunds.getFDate() != null ? dailyFunds.getFDate().toLocalDate() : null); + map.put("fOrgName", dailyFunds.getFOrgName()); + map.put("fOrgId", dailyFunds.getFOrgId()); + map.put("fOrgType", dailyFunds.getFOrgType()); + map.put("fYesterdayAccountBalance", dailyFunds.getFYesterdayAccountBalance()==null?null:dailyFunds.getFYesterdayAccountBalance().setScale(2, RoundingMode.HALF_UP).toString()); + map.put("fTodayAccountBalance", dailyFunds.getFTodayAccountBalance()==null?null:dailyFunds.getFTodayAccountBalance().setScale(2, RoundingMode.HALF_UP).toString()); + map.put("fAccountBalanceDifference", dailyFunds.getFAccountBalanceDifference()==null?null:dailyFunds.getFAccountBalanceDifference().setScale(2, RoundingMode.HALF_UP).toString()); + map.put("fTodayNetCashFlow", dailyFunds.getFTodayNetCashFlow()==null?null:dailyFunds.getFTodayNetCashFlow().setScale(2, RoundingMode.HALF_UP).toString()); + map.put("fTodayFreezeAmount", dailyFunds.getFTodayFreezeAmount()==null?null:dailyFunds.getFTodayFreezeAmount().setScale(2, RoundingMode.HALF_UP).toString()); + map.put("fTodayFreezing", dailyFunds.getFTodayFreezing()==null?null:dailyFunds.getFTodayFreezing().setScale(2, RoundingMode.HALF_UP).toString()); + map.put("fInspStatusName", dailyFunds.getFInspStatusName()); + map.put("fInspTime", dailyFunds.getFInspTime()); + map.put("fInspNotes", dailyFunds.getFInspNotes()); + map.put("fInspBy", dailyFunds.getFInspBy()); + map.put("fInspId", dailyFunds.getFInspId()); + map.put("fCreateBy", dailyFunds.getFCreateBy()); + map.put("fCreateId", dailyFunds.getFCreateId()); + map.put("fCreateTime", dailyFunds.getFCreateTime()); + map.put("fUpdateBy", dailyFunds.getFUpdateBy()); + map.put("fUpdateId", dailyFunds.getFUpdateId()); + map.put("fUpdateTime", dailyFunds.getFUpdateTime()); + map.put("fFormDataRev", dailyFunds.getFFormDataRev()); + map.put("fOrderNo", dailyFunds.getFOrderNo()); + resultList.add(map); + } + return resultList; + } + } diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WDailyFundsDao.java b/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WDailyFundsDao.java index 59bdf92..9d50266 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WDailyFundsDao.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WDailyFundsDao.java @@ -27,6 +27,6 @@ public interface WDailyFundsDao extends BaseMapper { List selectWDailyFundsNews(@Param("wCurrentList") List> wCurrentList, @Param("fDate") LocalDateTime fDate); - List> getDailyFundsByDateList(@Param("fOrgType") String fOrgType, @Param("fDate") String fDate); +// List> getDailyFundsByDateList(@Param("fOrgType") String fOrgType, @Param("fDate") String fDate); } diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WDailyFundsManager.java b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WDailyFundsManager.java index 776635e..ddd5951 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WDailyFundsManager.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WDailyFundsManager.java @@ -38,8 +38,15 @@ public interface WDailyFundsManager extends BaseManager { void updateInsp(WDailyFundsInspDto wDailyFundsInspDto); - List> getDailyFundsByDateList(String orgType, String date); + List getDailyFundsByDateList(String orgType, String date); void verifyInitWDailyFunds(LocalDateTime fDate); + /** + * 批量复核，每条状态不一致 + * @param wDailyFunds + */ + void updateInsps( List wDailyFunds); + + } diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WDailyFundsManagerImpl.java b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WDailyFundsManagerImpl.java index 426565b..7010b09 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WDailyFundsManagerImpl.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WDailyFundsManagerImpl.java @@ -99,6 +99,7 @@ public class WDailyFundsManagerImpl extends BaseManagerImpl wDailyFunds = wDailyFundsInspDto.getwDailyFundsList(); @@ -128,8 +129,13 @@ public class WDailyFundsManagerImpl extends BaseManagerImpl> getDailyFundsByDateList(String orgType, String date) { - return baseMapper.getDailyFundsByDateList(orgType,date); + public List getDailyFundsByDateList(String orgType, String date) { + List wDailyFunds = baseMapper.selectList(Wrappers.lambdaQuery() + .eq(WDailyFunds::getFOrgType, orgType) + .eq(WDailyFunds::getFDate, date) + .orderByAsc(WDailyFunds::getFOrderNo) + ); + return wDailyFunds; } @Override @@ -140,4 +146,30 @@ public class WDailyFundsManagerImpl extends BaseManagerImpl wDailyFunds) { + for (WDailyFunds wDailyFund : wDailyFunds) { + baseMapper.update(null,Wrappers.lambdaUpdate() + .set(WDailyFunds::getFUpdateBy, scriptImpl.getCurrentUserName()) + .set(WDailyFunds::getFUpdateId, scriptImpl.getCurrentUserId()) + .set(WDailyFunds::getFInspStatusName, wDailyFund.getFInspStatusName()) + .set(WDailyFunds::getFInspTime, LocalDateTime.now()) + .set(WDailyFunds::getFInspNotes, wDailyFund.getFInspNotes()) + .eq(WDailyFunds::getId, wDailyFund.getId()) + ); + + WFinance wFinance = new WFinance(); + wFinance.setFUpdateBy(scriptImpl.getCurrentUserName()); + wFinance.setFUpdateId(scriptImpl.getCurrentUserId()); + wFinance.setFInspStatusName(wDailyFund.getFInspStatusName()); + wFinance.setFInspTime(LocalDateTime.now()); + wFinance.setFInspNotes(wDailyFund.getFInspNotes()); + wFinance.setFDate(wDailyFund.getFDate()); + wFinance.setFOrgId(wDailyFund.getFOrgId()); + wFinanceDao.updateInsp(wFinance); + wCurrentReportManager.updateInsp(wDailyFund.getFDate(),wDailyFund.getFOrgId(),wDailyFund.getFInspStatusName(),wDailyFund.getFInspNotes()); + } + } + } diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/model/WDailyFunds.java b/backend/chkpower/src/main/java/com/hotent/chkpower/model/WDailyFunds.java index 2e6cab4..e3c43a9 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/model/WDailyFunds.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/model/WDailyFunds.java @@ -2,6 +2,7 @@ package com.hotent.chkpower.model; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.fasterxml.jackson.annotation.JsonFormat; import com.hotent.base.entity.BaseModel; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.annotation.TableId; @@ -26,127 +27,127 @@ public class WDailyFunds extends BaseModel { @TableId(value = "ID_", type = IdType.ASSIGN_ID) @JsonProperty("id") private String id; - + @ApiModelProperty(value = "外键") @TableField("REF_ID_") @JsonProperty("refId") private String refId; - + @ApiModelProperty(value = "日期") @TableField("F_date") @JsonProperty("fDate") private LocalDateTime fDate; - + @ApiModelProperty(value = "公司") @TableField("F_org_name") @JsonProperty("fOrgName") private String fOrgName; - + @ApiModelProperty(value = "公司id") @TableField("F_org_id") @JsonProperty("fOrgId") private String fOrgId; - + @ApiModelProperty(value = "公司类型") @TableField("F_org_type") @JsonProperty("fOrgType") private String fOrgType; - + @ApiModelProperty(value = "昨日余额") @TableField("F_yesterday_account_balance") @JsonProperty("fYesterdayAccountBalance") private BigDecimal fYesterdayAccountBalance; - + @ApiModelProperty(value = "今日余额") @TableField("F_today_account_balance") @JsonProperty("fTodayAccountBalance") private BigDecimal fTodayAccountBalance; - + @ApiModelProperty(value = "余额差额") @TableField("F_account_balance_difference") @JsonProperty("fAccountBalanceDifference") private BigDecimal fAccountBalanceDifference; - + @ApiModelProperty(value = "今日净现金流") @TableField("F_today_net_cash_flow") @JsonProperty("fTodayNetCashFlow") private BigDecimal fTodayNetCashFlow; - + @ApiModelProperty(value = "今日被冻结金额") @TableField("F_today_freeze_amount") @JsonProperty("fTodayFreezeAmount") private BigDecimal fTodayFreezeAmount; - + @ApiModelProperty(value = "今日冻结上限") @TableField("F_today_freezing") @JsonProperty("fTodayFreezing") private BigDecimal fTodayFreezing; - + @ApiModelProperty(value = "复核状态") @TableField("F_insp_status_name") @JsonProperty("fInspStatusName") private String fInspStatusName; - + @ApiModelProperty(value = "复核时间") @TableField("F_insp_time") @JsonProperty("fInspTime") private LocalDateTime fInspTime; - + @ApiModelProperty(value = "复核备注") @TableField("F_insp_notes") @JsonProperty("fInspNotes") private String fInspNotes; - + @ApiModelProperty(value = "复核人") @TableField("F_insp_by") @JsonProperty("fInspBy") private String fInspBy; - + @ApiModelProperty(value = "复核人id") @TableField("F_insp_id") @JsonProperty("fInspId") private String fInspId; - + @ApiModelProperty(value = "创建人") @TableField("F_create_by") @JsonProperty("fCreateBy") private String fCreateBy; - + @ApiModelProperty(value = "创建人id") @TableField("F_create_id") @JsonProperty("fCreateId") private String fCreateId; - + @ApiModelProperty(value = "创建时间") @TableField("F_create_time") @JsonProperty("fCreateTime") private LocalDateTime fCreateTime; - + @ApiModelProperty(value = "修改人") @TableField("F_update_by") @JsonProperty("fUpdateBy") private String fUpdateBy; - + @ApiModelProperty(value = "修改人id") @TableField("F_update_id") @JsonProperty("fUpdateId") private String fUpdateId; - + @ApiModelProperty(value = "修改时间") @TableField("F_update_time") @JsonProperty("fUpdateTime") private LocalDateTime fUpdateTime; - + @ApiModelProperty(value = "表单数据版本") @TableField("F_form_data_rev_") @JsonProperty("fFormDataRev") private Long fFormDataRev; - + @ApiModelProperty(value = "排序") @TableField("F_order_no") @JsonProperty("fOrderNo") private BigDecimal fOrderNo; - + public String getId() { return id; diff --git a/backend/chkpower/src/main/resources/doc/dailyFundsByDateExport.xls b/backend/chkpower/src/main/resources/doc/dailyFundsByDateExport.xls index dec4f41..777e9a0 100644 Binary files a/backend/chkpower/src/main/resources/doc/dailyFundsByDateExport.xls and b/backend/chkpower/src/main/resources/doc/dailyFundsByDateExport.xls differ diff --git a/backend/chkpower/src/main/resources/mapper/WDailyFundsMapper.xml b/backend/chkpower/src/main/resources/mapper/WDailyFundsMapper.xml index b629674..707b8b3 100644 --- a/backend/chkpower/src/main/resources/mapper/WDailyFundsMapper.xml +++ b/backend/chkpower/src/main/resources/mapper/WDailyFundsMapper.xml @@ -103,9 +103,9 @@ - + + + + + diff --git a/frontend/front/src/api/service/dailyFunds.js b/frontend/front/src/api/service/dailyFunds.js index 42acb6c..cb39070 100644 --- a/frontend/front/src/api/service/dailyFunds.js +++ b/frontend/front/src/api/service/dailyFunds.js @@ -9,6 +9,22 @@ export function updateInsp(data) { }) } +export function updateInsps(data) { + return request({ + url: `${context.portal}/wDailyFunds/v1/updateInsps`, + method: 'post', + data, + }) +} + +export function getInspList(date) { + return request({ + url: `${context.portal}/wDailyFunds/v1/getInspList?date=` + date, + method: 'get', + }) +} + + export function dailyFundsByDateExport(date) { return request({ url: `${context.portal}/wDailyFunds/v1/dailyFundsByDateExport?date=${date}`, diff --git a/frontend/front/src/views/pages/reviewOfFinancialDailyReport/index.vue b/frontend/front/src/views/pages/reviewOfFinancialDailyReport/index.vue index 96f3ff9..c34b9b0 100644 --- a/frontend/front/src/views/pages/reviewOfFinancialDailyReport/index.vue +++ b/frontend/front/src/views/pages/reviewOfFinancialDailyReport/index.vue @@ -1,269 +1,276 @@ - \ No newline at end of file + -- libgit2 0.21.2