From dcc26239e0d27d4c26c5fed85a5eab8cad4db667 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 11 May 2022 14:32:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-=E8=99=9A?= =?UTF-8?q?=E6=8B=9F=E8=AE=A2=E5=8D=95=E8=AE=A2=E9=87=91=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=B7=B2?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=AE=A2=E9=87=91=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/busmaindeposit/pc/PcMainDepositVo.java | 18 ------------------ .../busmaindeposit/BusMainDepositMapper.xml | 1 + .../busmaindeposit/BusMainDepositService.java | 2 +- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcMainDepositVo.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcMainDepositVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcMainDepositVo.java deleted file mode 100644 index 9ece948cc3..0000000000 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcMainDepositVo.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.yxt.anrui.buscenter.api.busmaindeposit.pc; - -import com.yxt.common.core.vo.Vo; -import lombok.Data; - -/** - * @Author dimengzhe - * @Date 2022/5/10 16:21 - * @Description - */ -@Data -public class PcMainDepositVo implements Vo { - private static final long serialVersionUID = 3373549091778464382L; - - - - -} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml index dc618a3bc7..d892b9fb83 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml @@ -12,6 +12,7 @@ bmd.createDate, bmd.staffName, bd.deposit, + bd.usedDeposit, IF(bd.id IS NOT NULL, bd.draweeName, bdvc.customerName) name, IF(bd.id IS NOT NULL, bd.draweeMobile, bdvc.customerMobile) mobile, IF(COUNT(bdv.id) = 0, '', COUNT(bdv.id)) depositVehicle diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index 8dc67abc61..ade0f2a983 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -187,7 +187,7 @@ public class BusMainDepositService extends MybatisBaseService pagging = baseMapper.selectPageVo(page, qw); List list = pagging.getRecords(); for (BusMainDepositListVo vo : list) { - ResultBean resultBean = sysFormLinkFeign.selectStateByBusinessSid(vo.getSid()); + ResultBean resultBean = sysFormLinkFeign.selectStateByBusinessSid(vo.getSid()); if (resultBean.getSuccess() && resultBean.getData() != null) { SysFormStateVo formState = resultBean.getData(); vo.setNodeState(formState.getNodeState());