From adaaa23c789be3313a0e554fbf7beaa8ab261e68 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期四, 16 五月 2024 18:07:01 +0800 Subject: [PATCH] zjh 2024/05/16-1 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java index 1e978da..fb2a09c 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java @@ -64,6 +64,15 @@ } + @GetMapping("/getNewDateList") + @ApiOperation(value = "鑾峰彇鏈嶅姟鍣ㄥ綋鏃堕棿娈�") + public AjaxResult getNewDateList() { + + Date date = DateUtil.parse(DateUtil.format(DateUtil.date(),"yyyy-MM-dd"),"yyyy-MM-dd"); + return AjaxResult.success(date); + } + + @GetMapping("/getFlowingWaterList") @@ -132,7 +141,7 @@ if (null != project) { return AjaxResult.success(project.getProPrice()); } - return AjaxResult.error("娌℃壘鍒板搴旈」鐩� 璇疯嚜瀹氫箟璐圭敤"); + return AjaxResult.success("娌℃壘鍒板搴旈」鐩� 璇疯嚜瀹氫箟璐圭敤"); } @@ -181,7 +190,6 @@ }else { detail.setProId(vo.getTjPro()); } - detail.setProId(vo.getTjPro()); detail.setProType("0"); detailService.save(detail); @@ -252,6 +260,7 @@ tjFlowingWater.setPaidIn(BigDecimal.valueOf(0.00).subtract(tjFlowingWater.getRefundPrice())); tjFlowingWater.setCopeWith(flowingWater.getCopeWith()); tjFlowingWater.setRemarks("宸查��璐�"); + tjFlowingWater.setPayType(flowingWater.getPayType()); if (flowingWaterService.save(tjFlowingWater)) { flowingWater.setRemarks("宸查��璐�"); flowingWaterService.updateById(flowingWater); -- Gitblit v1.8.0