From 4b0ca1f930de4567aab1d6e8f1b07ff26862d305 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 8 Jun 2023 16:15:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=86=85=E9=83=A8=E6=8E=A5?= =?UTF-8?q?=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusRecordsInvoiceVo.java | 27 ++-- .../BusTransferRecordsFeign.java | 4 + .../BusTransferRecordsQuery.java | 2 - .../BusTransferRecordsVo.java | 19 +++ .../ConfirmRecordsQuery.java | 29 ++++ .../BusHandoverPrepareRest.java | 5 - .../BusHandoverPrepareService.java | 61 +++++---- .../bussalesorder/BusSalesOrderMapper.java | 2 + .../biz/bussalesorder/BusSalesOrderMapper.xml | 4 + .../bussalesorder/BusSalesOrderService.java | 4 + .../BusTransferRecordsMapper.java | 4 +- .../BusTransferRecordsMapper.xml | 14 +- .../BusTransferRecordsRest.java | 5 + .../BusTransferRecordsService.java | 127 +++++++++++++++++- .../BusVehicleInformationMapper.java | 2 + .../BusVehicleInformationMapper.xml | 6 +- .../BusVehicleInformationService.java | 4 + .../FinVehicleInvoiceFeign.java | 7 +- .../FinVehicleInvoiceFeignFallback.java | 5 + .../finvehicleinvoice/StateUpdateQuery.java | 5 + .../FinVehicleInvoiceMapper.java | 2 + .../FinVehicleInvoiceMapper.xml | 4 + .../FinVehicleInvoiceRest.java | 5 + .../FinVehicleInvoiceService.java | 17 ++- .../api/sysuserrole/SysUserRoleFeign.java | 4 + .../sysuserrole/SysUserRoleFeignFallback.java | 5 + .../biz/sysuserrole/SysUserRoleMapper.java | 2 + .../biz/sysuserrole/SysUserRoleMapper.xml | 4 + .../biz/sysuserrole/SysUserRoleRest.java | 5 + .../biz/sysuserrole/SysUserRoleService.java | 6 + .../AppBusHandoverPrepareService.java | 11 +- 31 files changed, 347 insertions(+), 54 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/ConfirmRecordsQuery.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusRecordsInvoiceVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusRecordsInvoiceVo.java index f08566c615..305b9194d1 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusRecordsInvoiceVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusRecordsInvoiceVo.java @@ -1,6 +1,7 @@ package com.yxt.anrui.buscenter.api.bustransferrecords; import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.ArrayList; @@ -15,29 +16,31 @@ import java.util.List; public class BusRecordsInvoiceVo implements Vo { private static final long serialVersionUID = 5607692895870869172L; private String vinSid; - //车架号 + @ApiModelProperty("车架号") private String vinNo; - //开票单位 + @ApiModelProperty("开票单位") private String invoiceTitle; - //开票类型 + @ApiModelProperty("开票类型") private String invoiceType; - //开票名称 + @ApiModelProperty("开票名称") private String invoicingName; - //开票金额 + @ApiModelProperty("开票金额") private String invoiceAmount; - //发票号 + @ApiModelProperty("发票号") private String invoiceNo; - //移交部门 + @ApiModelProperty("移交部门") private String transferDept; - //移交人 + @ApiModelProperty("移交人") private String transferName; - //移交备注 + @ApiModelProperty("移交备注") private String transferRemarks; - //发票图片 + @ApiModelProperty("发票图片") private List filePathList = new ArrayList<>(); - //接收说明 + @ApiModelProperty("接收说明") private String receiveRemarks; - //接收附件 + @ApiModelProperty("接收附件") private List receiveFilesList = new ArrayList<>(); + private String sid; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java index 55ee06cce3..be995a0a62 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java @@ -43,4 +43,8 @@ public interface BusTransferRecordsFeign { @ApiOperation("根据来源sid删除") @PostMapping("/delBySourceSid") ResultBean delBySourceSid(@RequestParam("sourceSid") String sourceSid); + + @ApiOperation("移交记录确认") + @PostMapping("/confirmRecords") + ResultBean confirmRecords(@RequestBody ConfirmRecordsQuery query); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsQuery.java index 713d50e15f..5b3bbbef98 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsQuery.java @@ -18,8 +18,6 @@ public class BusTransferRecordsQuery implements Query { private String userSid; @ApiModelProperty("组织全路径") private String orgPath; - @ApiModelProperty("角色sid") - private String roleSid; @ApiModelProperty("类型：0待接收，1已接收") private int type; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsVo.java index 4d78a8107c..d29ec74e90 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsVo.java @@ -1,9 +1,12 @@ package com.yxt.anrui.buscenter.api.bustransferrecords; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @description: * @author: dimengzhe @@ -39,4 +42,20 @@ public class BusTransferRecordsVo implements Vo { private String transferRemarks; @ApiModelProperty("sid") private String sid; + @ApiModelProperty("接收部门") + private String receiveDept; + @ApiModelProperty("接收人") + private String receiveName; + @JsonIgnore + private String receiveSid; + @ApiModelProperty("接收电话") + private String receiveMobile; + @ApiModelProperty("接收时间") + private String receiveTime; + @ApiModelProperty("接收备注") + private String receiveRemarks; + @JsonIgnore + private String receiveFiles; + @ApiModelProperty("接收附件") + private List receiveFilesList; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/ConfirmRecordsQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/ConfirmRecordsQuery.java new file mode 100644 index 0000000000..6a0308aeb7 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/ConfirmRecordsQuery.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.buscenter.api.bustransferrecords; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: 移交记录确认 + * @author: dimengzhe + * @date: 2023/6/8 + **/ +@Data +public class ConfirmRecordsQuery implements Query { + private static final long serialVersionUID = 7963240175962200277L; + + @ApiModelProperty("sid") + private List sidsList = new ArrayList<>(); + @ApiModelProperty("接收说明") + private String receiveRemarks; + @ApiModelProperty("接收附件") + private List receiveFilesList = new ArrayList<>(); + @ApiModelProperty("当前登录人sid") + private String userSid; + @ApiModelProperty("全组织sid") + private String orgPath; +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java index 3757930986..ab0b06ded8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java @@ -120,11 +120,6 @@ public class BusHandoverPrepareRest implements BusHandoverPrepareFeign { return busHandoverPrepareService.saveState(dto); } - /* @Override - public ResultBean saveState(AppStateDateDto dto) { - return busHandoverPrepareService.saveState(dto); - }*/ - @Override public ResultBean getInvoiceInfo(AppInvoicingInfoQuery query) { return busHandoverPrepareService.getInvoiceInfo(query); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java index 9665f85f6f..67fc755dc8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java @@ -45,6 +45,7 @@ import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareV import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitDto; import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordEnum; import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecords; +import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation; import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandover; import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService; import com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleService; @@ -287,18 +288,6 @@ public class BusHandoverPrepareService extends MybatisBaseService list = busVehicleInformationService.selectByMainSid(busVehicleInformationHandover.getSid()); - list.removeAll(Collections.singleton(null)); - handoverInformationVo.setRecordList(list); + List busVehicleInformationList = busVehicleInformationService.selectByMainSids(busVehicleInformationHandover.getSid()); + busVehicleInformationList.removeAll(Collections.singleton(null)); + if(busVehicleInformationList.isEmpty()){ + return rb.setMsg("该交车准备的车辆信息的随车资料未准备好"); + }else{ + //根据随车资料主表sid查询随车资料的记录 + List list = busVehicleInformationService.selectByMainSid(busVehicleInformationHandover.getSid()); + list.removeAll(Collections.singleton(null)); + for (int i = 0; i < list.size(); i++) { + HandoverInformationIntemVo handoverInformationIntemVo = list.get(i); + if(StringUtils.isNotBlank(handoverInformationIntemVo.getRecTime())){ + handoverInformationIntemVo.setShowBtn(false); + }else{ + handoverInformationIntemVo.setShowBtn(true); + } + } + handoverInformationVo.setRecordList(list); + } } return rb.success().setData(handoverInformationVo); } @@ -657,12 +658,24 @@ public class BusHandoverPrepareService extends MybatisBaseService resultBean = finVehicleInvoiceFeign.selectByVinAndContractNo(busHandoverPrepareVehicle.getVinSid(), busHandoverPrepare.getContractNo()); + if (resultBean.getData() != null) { + FinVehicleInvoice finVehicleInvoice = resultBean.getData(); + if (CertificState.TransferState.TRANSTATE_YJZ.getCode().equals(finVehicleInvoice.getTransferStateKey())) { + //修改发票中的接收人、接收时间以及移交状态为已移交 + StateUpdateQuery stateUpdateQuery = new StateUpdateQuery(); + stateUpdateQuery.setVinSid(busHandoverPrepareVehicle.getVinSid()); + stateUpdateQuery.setTransferState(CertificState.TransferState.TRANSTATE_YYJ.getRemarks()); + stateUpdateQuery.setTransferStateKey(CertificState.TransferState.TRANSTATE_YYJ.getCode()); + if (busTransferRecordsResultBean.getData() != null) { + BusTransferRecords busTransferRecords = busTransferRecordsResultBean.getData(); + stateUpdateQuery.setReceiveName(busTransferRecords.getReceiveName()); + stateUpdateQuery.setReceiveSid(busTransferRecords.getReceiveSid()); + } + ResultBean resultBean1 = finVehicleInvoiceFeign.updateYjState(stateUpdateQuery); + } + } } else if ("02".equals(dto.getKey())) { //合格证确认：确认接收后，修改合格证的移交状态为已移交。 diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index 594392eb16..8e58856946 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -213,4 +213,6 @@ public interface BusSalesOrderMapper extends BaseMapper { BusSalesOrder selectDetailsByContractNo(String contractId); BusSalesOrderDetailsVo selNewComSaleByVehSid(String vehSid); + + BusSalesOrder selectByContractNos(String contractNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 8f3a8d7d98..ec9bfb1b3d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -441,4 +441,8 @@ AND bsov.`linkSid` = #{vehSid} ORDER BY bso.`createTime` DESC LIMIT 1 + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 2629f57cd6..d81a6ce795 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -6585,4 +6585,8 @@ public class BusSalesOrderService extends MybatisBaseService { - IPage pagerList(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); + IPage pagerList(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw, @Param("list") List roleSidList); BusTransferRecords selectByVinSid(@Param("vinSid") String vinSid, @Param("userSid") String receiveUserSid,@Param("typeKey") String typeKey); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml index 275c71a996..24aeb63fea 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml @@ -9,10 +9,22 @@ transferDept, transferName, transferRemarks, - DATE_FORMAT(createTime, '%Y-%m-%d') as createTime + DATE_FORMAT(createTime, '%Y-%m-%d') as createTime, + receiveSid, + receiveDept, + receiveName, + receiveFiles, + receiveRemarks, + DATE_FORMAT(receiveTime, '%Y-%m-%d') as receiveTime from bus_transfer_records ${ew.sqlSegment} + + and receiveRoleSid in + + #{item} + + diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java index 7bddbdd8f1..1cea939c31 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java @@ -48,4 +48,9 @@ public class BusTransferRecordsRest implements BusTransferRecordsFeign { public ResultBean delBySourceSid(String sourceSid) { return busTransferRecordsService.delBySourceSid(sourceSid); } + + @Override + public ResultBean confirmRecords(ConfirmRecordsQuery query) { + return busTransferRecordsService.confirmRecords(query); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java index 57474045c1..7c6458826b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java @@ -3,10 +3,20 @@ package com.yxt.anrui.buscenter.biz.bustransferrecords; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.common.enums.CertificState; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bustransferrecords.*; +import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign; +import com.yxt.anrui.fin.api.finvehicleinvoice.StateUpdateQuery; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.SysUser; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; +import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -17,7 +27,9 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -35,19 +47,30 @@ public class BusTransferRecordsService extends MybatisBaseService pagerList(PagerQuery pq) { QueryWrapper qw = new QueryWrapper<>(); BusTransferRecordsQuery pagerQuery = pq.getParams(); + List roleSidList = new ArrayList<>(); if (pagerQuery != null) { if (pagerQuery.getType() == 0) { qw.eq("receiveState", 0); + qw.isNull("receiveSid"); } else if (pagerQuery.getType() == 1) { qw.eq("receiveState", 1); //接收开始时间-接收结束时间 qw.apply(StringUtils.isNotBlank(pagerQuery.getReceiveTimeStart()), "date_format (receiveTime,'%Y-%m-%d') >= date_format('" + pagerQuery.getReceiveTimeStart() + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(pagerQuery.getReceiveTimeEnd()), "date_format (receiveTime,'%Y-%m-%d') <= date_format('" + pagerQuery.getReceiveTimeEnd() + "','%Y-%m-%d')" ); + qw.eq("receiveSid", pagerQuery.getUserSid()); } qw.eq("goodsTypeKey", BusTransferRecordEnum.FP.getCode()); //合同编号 @@ -76,13 +99,16 @@ public class BusTransferRecordsService extends MybatisBaseService> listResultBean = sysUserRoleFeign.selectByUserSid(pagerQuery.getUserSid()); + if (!listResultBean.getData().isEmpty()) { + roleSidList = listResultBean.getData(); + } } } IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.pagerList(page, qw); + IPage pagging = baseMapper.pagerList(page, qw, roleSidList); for (BusTransferRecordsVo record : pagging.getRecords()) { String vinSid = record.getVinSid(); //根据合同编号和车辆sid查询开票相关 @@ -95,6 +121,16 @@ public class BusTransferRecordsService extends MybatisBaseService sysUserInfoVoResultBean = sysUserFeign.selectBySid(record.getReceiveSid()); + if(sysUserInfoVoResultBean.getData() != null){ + record.setReceiveMobile(sysUserInfoVoResultBean.getData().getMobile()); + } + String receiveFile = record.getReceiveFiles(); + if(StringUtils.isNotBlank(receiveFile)){ + List receiveFileList = Arrays.asList(receiveFile.split(",")).stream().map(v->fileUploadComponent.getUrlPrefix()+v).collect(Collectors.toList()); + record.setReceiveFilesList(receiveFileList); + } } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; @@ -135,9 +171,9 @@ public class BusTransferRecordsService extends MybatisBaseService selectByVinSid(String vinSid, String receiveUserSid,String type) { + public ResultBean selectByVinSid(String vinSid, String receiveUserSid, String type) { ResultBean rb = ResultBean.fireFail(); - BusTransferRecords BusTransferRecords = baseMapper.selectByVinSid(vinSid,receiveUserSid,type); + BusTransferRecords BusTransferRecords = baseMapper.selectByVinSid(vinSid, receiveUserSid, type); return rb.success().setData(BusTransferRecords); } @@ -146,4 +182,85 @@ public class BusTransferRecordsService extends MybatisBaseService sidsList = query.getSidsList(); + if (!sidsList.isEmpty()) { + //更新对应发票移交状态为已移交-查询发票的是否已移交 + for (int i = 0; i < sidsList.size(); i++) { + BusTransferRecords busTransferRecordss = new BusTransferRecords(); + BusTransferRecords busTransferRecords = fetchBySid(sidsList.get(i)); + BeanUtil.copyProperties(busTransferRecords, busTransferRecordss, "sid"); + String receiveName = ""; + //将移交状态修改为已移交，并修改接收人和接收日期为当前确认人 + busTransferRecords.setReceiveSid(query.getUserSid()); + ResultBean sysResultBean = sysUserFeign.selectUserInfoByUserSid(query.getUserSid()); + if (sysResultBean.getData() != null) { + SysUserInfoVo sysUserInfoVo = sysResultBean.getData(); + busTransferRecords.setReceiveName(sysUserInfoVo.getStaffName()); + busTransferRecords.setReceiveTime(new Date()); + receiveName = sysUserInfoVo.getStaffName(); + } + List orgList = Arrays.asList(query.getOrgPath().split("/")); + busTransferRecords.setReceiveDeptSid(orgList.get(orgList.size() - 1)); + ResultBean sysOrganizationResultBean = sysOrganizationFeign.fetchBySid(orgList.get(orgList.size() - 1)); + if (sysOrganizationResultBean.getData() != null) { + SysOrganizationVo sysOrganizationVo = sysOrganizationResultBean.getData(); + busTransferRecords.setReceiveDept(sysOrganizationVo.getName()); + } + busTransferRecords.setReceiveState(1); + busTransferRecords.setReceiveRemarks(query.getReceiveRemarks()); + List receiveFileList = query.getReceiveFilesList(); + if (!receiveFileList.isEmpty()) { + receiveFileList = receiveFileList.stream().map(v -> v.replaceAll(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.toList()); + String receiveFile = String.join(",", receiveFileList); + busTransferRecords.setReceiveFiles(receiveFile); + } + //查询发票的状态是否是移交中 + ResultBean resultBean = finVehicleInvoiceFeign.selectByVinAndContractNo(busTransferRecords.getVinSid(), busTransferRecords.getContractNo()); + if (resultBean.getData() != null) { + FinVehicleInvoice finVehicleInvoice = resultBean.getData(); + if (CertificState.TransferState.TRANSTATE_YJZ.getCode().equals(finVehicleInvoice.getTransferStateKey())) { + //修改发票中的接收人、接收时间以及移交状态为已移交 + StateUpdateQuery stateUpdateQuery = new StateUpdateQuery(); + stateUpdateQuery.setVinSid(busTransferRecords.getVinSid()); + stateUpdateQuery.setTransferState(CertificState.TransferState.TRANSTATE_YYJ.getRemarks()); + stateUpdateQuery.setTransferStateKey(CertificState.TransferState.TRANSTATE_YYJ.getCode()); + stateUpdateQuery.setReceiveName(receiveName); + stateUpdateQuery.setReceiveSid(query.getUserSid()); + ResultBean resultBean1 = finVehicleInvoiceFeign.updateYjState(stateUpdateQuery); + } + } + //生成车辆对应销售专员的待接收记录 + //查询该车辆的对应的销售专员 + BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busTransferRecords.getContractNo()); + String staffUserSid = busSalesOrder.getCreateBySid(); + busTransferRecordss.setReceiveRoleSid("89d7f310-a221-405b-858e-dd650e0993d5"); + busTransferRecordss.setReceiveSid(staffUserSid); + String orgPath = busSalesOrder.getOrgSidPath(); + List staffOrgPathList = Arrays.asList(orgPath.split("/")); + busTransferRecordss.setReceiveDeptSid(staffOrgPathList.get(staffOrgPathList.size() - 1)); + ResultBean sysOrganizationResultBean1 = sysOrganizationFeign.fetchBySid(staffOrgPathList.get(staffOrgPathList.size() - 1)); + if (sysOrganizationResultBean1.getData() != null) { + SysOrganizationVo sysOrganizationVo = sysOrganizationResultBean1.getData(); + busTransferRecordss.setReceiveDept(sysOrganizationVo.getName()); + } + ResultBean sysResultBean1 = sysUserFeign.selectUserInfoByUserSid(staffUserSid); + if (sysResultBean1.getData() != null) { + SysUserInfoVo sysUserInfoVo = sysResultBean1.getData(); + busTransferRecordss.setReceiveName(sysUserInfoVo.getStaffName()); + } + busTransferRecordss.setTransferDept(busTransferRecords.getReceiveDept()); + busTransferRecordss.setTransferName(busTransferRecords.getReceiveName()); + busTransferRecordss.setTransferSid(busTransferRecords.getReceiveSid()); + busTransferRecordss.setTransferDeptSid(busTransferRecords.getReceiveDeptSid()); + baseMapper.insert(busTransferRecordss); + baseMapper.updateById(busTransferRecords); + } + } + return rb.success(); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.java index 64cf8cadd7..20797e7599 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.java @@ -23,4 +23,6 @@ public interface BusVehicleInformationMapper extends BaseMapper selectByMainSid(String sid); int selectByMainSidUpdate(@Param("sid") String sid, @Param("date") Date date); + + List selectByMainSids(String sid); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml index 25e7fad3bd..c607b64304 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml @@ -21,10 +21,14 @@ + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationService.java index 2f5b876612..2469e266b0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationService.java @@ -31,4 +31,8 @@ public class BusVehicleInformationService extends MybatisBaseService selectByMainSids(String sid) { + return baseMapper.selectByMainSids(sid); + } } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java index 3342ae4966..bd638d8149 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java @@ -102,10 +102,15 @@ public interface FinVehicleInvoiceFeign { @ApiOperation("根据合同号获取发票信息") @PostMapping("/selectByContractNo") @ResponseBody - ResultBean> selectByContractNo(@RequestParam("contractNo")String contractNo); + ResultBean> selectByContractNo(@RequestParam("contractNo") String contractNo); @ApiOperation("修改发票的移交状态") @PostMapping("/updateYjState") @ResponseBody ResultBean updateYjState(@RequestBody StateUpdateQuery query); + + @ApiOperation("根据车辆和合同号查询发票信息") + @GetMapping("/selectByVinAndContractNo") + @ResponseBody + ResultBean selectByVinAndContractNo(@RequestParam("vinSid") String vinSid, @RequestParam("contractNo") String contractNo); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java index ba004cb949..a41deec5a7 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java @@ -119,4 +119,9 @@ public class FinVehicleInvoiceFeignFallback implements FinVehicleInvoiceFeign { return null; } + @Override + public ResultBean selectByVinAndContractNo(String vinSid, String contractNo) { + return null; + } + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/StateUpdateQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/StateUpdateQuery.java index 12dba7560b..cadfee6997 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/StateUpdateQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/StateUpdateQuery.java @@ -18,4 +18,9 @@ public class StateUpdateQuery implements Query { private String transferStateKey; @ApiModelProperty("移交状态value") private String transferState; + + @ApiModelProperty("接收人") + private String receiveSid; + @ApiModelProperty("接收时间") + private String receiveName; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java index cdd2be984d..dab1820df5 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java @@ -62,4 +62,6 @@ public interface FinVehicleInvoiceMapper extends BaseMapper { @Update("update fin_vehicle_invoice set transferStateKey = #{code},transferState = #{remarks} where sid = #{sid}") void updateTransferState(@Param("sid") String sid,@Param("code") String code,@Param("remarks") String remarks); + + FinVehicleInvoice selectByVinAndContractNo(@Param("vinSid") String vinSid, @Param("contractNo") String contractNo); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml index cf62aacc32..c14250e79b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml @@ -230,4 +230,8 @@ from fin_vehicle_invoice where contractNo = #{contractNo} + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java index 0d8c0392ab..b409011201 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java @@ -235,4 +235,9 @@ public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign { return finVehicleInvoiceService.updateYjState(query); } + @Override + public ResultBean selectByVinAndContractNo(String vinSid, String contractNo) { + return finVehicleInvoiceService.selectByVinAndContractNo(vinSid,contractNo); + } + } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java index 0a2fe71710..42254f7f86 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java @@ -40,6 +40,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Arrays; +import java.util.Date; import java.util.List; /** @@ -515,12 +516,26 @@ public class FinVehicleInvoiceService extends MybatisBaseService selectByVinAndContractNo(String vinSid, String contractNo) { + ResultBean rb = ResultBean.fireFail(); + FinVehicleInvoice finVehicleInvoice = baseMapper.selectByVinAndContractNo(vinSid,contractNo); + return rb.success().setData(finVehicleInvoice); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeign.java index 7e32f94e6f..eaebedc3bb 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeign.java @@ -71,4 +71,8 @@ public interface SysUserRoleFeign { @ApiOperation("根据角色sid查询用户id列表") @GetMapping("/getUserIdListByRoleSid") public ResultBean> getUserIdListByRoleSid(@RequestParam("roleList") List roleList); + + @ApiOperation("查询用户的角色") + @GetMapping("/selectByUserSid") + ResultBean> selectByUserSid(@RequestParam("userSid") String userSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeignFallback.java index 39d4a86a85..828268b386 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeignFallback.java @@ -78,4 +78,9 @@ public class SysUserRoleFeignFallback implements SysUserRoleFeign { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui_portal/sysuserrole/getUserIdByRoleSid无法访问"); } + + @Override + public ResultBean> selectByUserSid(String userSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleMapper.java index c7615f989f..aa75da1ba3 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleMapper.java @@ -55,4 +55,6 @@ public interface SysUserRoleMapper extends BaseMapper { int deleteByRoleSid(String sids); List selectRoleSid(String userSid); + + List selectByUserSids(String userSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleMapper.xml index e695bc2a24..d5b5463207 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleMapper.xml @@ -46,4 +46,8 @@ + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleRest.java index b14e3b7fa8..0a57dd89bc 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleRest.java @@ -110,4 +110,9 @@ public class SysUserRoleRest implements SysUserRoleFeign { public ResultBean> getUserIdListByRoleSid(List roleList) { return sysUserRoleService.getUserIdListByRoleSid(roleList); } + + @Override + public ResultBean> selectByUserSid(String userSid) { + return sysUserRoleService.selectByUserSids(userSid); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleService.java index 63e709c520..e045bda82d 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleService.java @@ -131,4 +131,10 @@ public class SysUserRoleService extends MybatisBaseService selectRoleSid(String userSid) { return baseMapper.selectRoleSid(userSid); } + + public ResultBean> selectByUserSids(String userSid) { + ResultBean> rb = ResultBean.fireFail(); + List list = baseMapper.selectByUserSids(userSid); + return rb.success().setData(list); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryPlan/AppBusHandoverPrepareService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryPlan/AppBusHandoverPrepareService.java index 22cab2de6a..9971f85942 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryPlan/AppBusHandoverPrepareService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryPlan/AppBusHandoverPrepareService.java @@ -29,6 +29,7 @@ package com.yxt.anrui.terminal.biz.autoservice.deliveryPlan; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareFeign; +import com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationVo; import com.yxt.anrui.buscenter.api.bushandoverprepare.RemarkDto; import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*; import com.yxt.anrui.terminal.api.autoservice.deliveryPlan.*; @@ -204,7 +205,15 @@ public class AppBusHandoverPrepareService { public ResultBean getCarDataInfo(String sid) { ResultBean rb = ResultBean.fireFail(); - return null; + ResultBean resultBean = busHandoverPrepareFeign.getVehicleInformationInfo(sid); + PrepareVehicleInfoVo prepareVehicleInfoVo = new PrepareVehicleInfoVo(); + if(resultBean.getData() != null){ + HandoverInformationVo handoverInformationVo = resultBean.getData(); + BeanUtil.copyProperties(handoverInformationVo,prepareVehicleInfoVo); + }else{ + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(prepareVehicleInfoVo); } public ResultBean saveState(StateDateDto dto) {