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());