From 03df72155ccd47912384b3e5f3fceb7331e377de Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期五, 13 九月 2024 14:48:49 +0800 Subject: [PATCH] 2024-09-13 朱宝民 优化获取交易明细记录,余额改为操作表余额,返回字段增加收银员姓名及分页参数 --- pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java index fe3ca1a..8bc4a6b 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java @@ -104,6 +104,7 @@ prController.setRtuAddr(prControllerTramp.getRtuAddr()); prController.setProtocol(prControllerTramp.getProtocol()); prController.setFindDt(prControllerTramp.getFindDt()); + prController.setOrgTag(prControllerTramp.getOrgTag()); prController.setAddWays((byte) 1); prController.setOperator(operator); Date operateTime = new Date(); @@ -188,6 +189,7 @@ prControllerTramp.setRtuAddr(ControllerList.getRtuAddr()); prControllerTramp.setProtocol(ControllerList.getProtocol()); prControllerTramp.setFindDt(new Date()); + prControllerTramp.setOrgTag(ControllerList.getOrgTag()); Integer rec_addControllerTramp = Optional.ofNullable(intakeControllerSv.addTrampController(prControllerTramp)).orElse(0); if (rec_addControllerTramp == 0) { return BaseResponseUtils.buildFail(ProjectResultCode.ADD_TRAMP_CONTROLLER_FAIL.getMessage()); -- Gitblit v1.8.0