l1450637472/dzpt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix：对账完成

Browse Source
This commit is contained in:
Yuan
2025-12-07 11:46:49 +08:00
parent 3f931c2e29
commit 66620d51ae
23 changed files with 664 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/main/java/com/saye/hospitalgd/controller/PaymentStatisticsController.java
View File

@@ -9,6 +9,7 @@ import com.saye.hospitalgd.service.BankbillHistoryService;
import com.saye.hospitalgd.service.TransactionDetailService;
import com.saye.hospitalgd.service.system.DicinfoService;
import com.saye.hospitalgd.service.system.ServiceParamsService;
import com.saye.hospitalgd.service.FinancialReconciliation.TenpaySummaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -49,6 +50,9 @@ public class PaymentStatisticsController {
@Autowired
private ServiceParamsService serviceParamsService;
@Autowired
private TenpaySummaryService tenpaySummaryService;
@RequestMapping("/toPaymentStatistics")
public String toPaymentStatistics(ModelMap modelMap) {
return "paymentStatistics/paymentStatistics";
@@ -259,6 +263,27 @@ public class PaymentStatisticsController {
return "paymentStatistics/summary";
}
@RequestMapping("/toTenpaySummary")
@ApiOperation("财付通汇款汇总表")
public String toTenpaySummary(HttpServletRequest request, ModelMap modelMap) {
String trade_date = StringDUtil.changeNullToEmpty(request.getParameter("trade_date"));
if ("".equals(trade_date)) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date());
calendar.add(Calendar.DATE, -1);
Date startDate = calendar.getTime();
String startTime = DateDUtil.DateToStr(DateDUtil.yyyy_MM_dd, startDate);
String endTime = DateDUtil.getCurrentDate(DateDUtil.yyyy_MM_dd);
modelMap.addAttribute("startTime", startTime);
modelMap.addAttribute("endTime", endTime);
} else {
modelMap.addAttribute("startTime", trade_date);
modelMap.addAttribute("endTime", trade_date);
modelMap.addAttribute("isClick", "1");
}
return "paymentStatistics/tenpaySummary";
}
/**
* @description: 查询汇总表数据
* @author thuang
@@ -421,4 +446,26 @@ public class PaymentStatisticsController {
return resultMap;
}
@RequestMapping("/findTenpaySummary")
@ResponseBody
@ApiOperation("查询财付通汇款汇总数据")
public HashMap<Object, Object> findTenpaySummary(String startTime, String endTime) {
HashMap<Object, Object> response = new HashMap<>();
try {
HashMap<Object, Object> map = new HashMap<>();
map.put("startTime", startTime);
map.put("endTime", endTime);
List<HashMap<Object, Object>> bankList = tenpaySummaryService.findTenpayBankSummary(map);
List<HashMap<Object, Object>> hisList = tenpaySummaryService.findTenpayHisSummary(map);
response.put("code", 0);
response.put("msg", "OK");
response.put("bankData", bankList);
response.put("hisData", hisList);
} catch (Exception e) {
response.put("code", 1);
response.put("msg", e.getMessage());
}
return response;
}
}