From 26ed393b0839511e51561615ca509ee4cb332e7f Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 8 Jun 2023 16:46:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=8F=E8=BD=A6=E8=B5=84=E6=96=99=E7=A7=BB?= =?UTF-8?q?=E4=BA=A4=E4=BA=BA=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDiscountpackageHandover.java | 15 +- .../BusDiscountpackageHandoverDetailsVo.java | 1 - .../BusDiscountpackageHandoverDto.java | 18 ++- .../BusDiscountpackageHandoverFeign.java | 2 +- .../BusDiscountpackageHandoverVo.java | 11 +- .../api/bushandover/BusHandoverFeign.java | 1 - .../BusHandoverItemForDeliveryVo.java | 4 +- .../bushandoveritems/BusHandoverItems.java | 3 +- .../BusDeliveredApplyService.java | 4 +- .../BusDiscountpackageHandoverMapper.xml | 14 +- .../BusDiscountpackageHandoverRest.java | 2 +- .../BusDiscountpackageHandoverService.java | 131 +++++++++--------- .../biz/bushandover/BusHandoverService.java | 70 +++++++++- .../BusVehicleInformationHandoverService.java | 4 +- 14 files changed, 178 insertions(+), 102 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandover.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandover.java index aa25c21443..264dfa9fe1 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandover.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandover.java @@ -5,7 +5,6 @@ import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.util.Date; /** @@ -47,6 +46,16 @@ public class BusDiscountpackageHandover extends BaseEntity { private String useOrgSid; // 创建组织sid @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - - + @ApiModelProperty("移交状态key") + private String transferStateKey; + @ApiModelProperty("移交状态value") + private String transferStateValue; + @ApiModelProperty("移交人sid") + private String transferUserSid; + @ApiModelProperty("移交人") + private String transferName; + @ApiModelProperty("移交人电话") + private String transferPhone; + @ApiModelProperty("移交备注") + private String transferRemarks; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDetailsVo.java index 2b0a1e002d..f3d4306f74 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDetailsVo.java @@ -2,7 +2,6 @@ package com.yxt.anrui.buscenter.api.busdiscountpackagehandover; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java index af54ebeb80..843977b484 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java @@ -2,10 +2,7 @@ package com.yxt.anrui.buscenter.api.busdiscountpackagehandover; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverList; import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto; -import com.yxt.anrui.buscenter.api.busfile.BusFile; -import com.yxt.anrui.buscenter.api.busfile.BusFileDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -27,8 +24,6 @@ public class BusDiscountpackageHandoverDto implements Dto { private String sid; // sid @ApiModelProperty("createBySid") private String createBySid; // createBySid - @ApiModelProperty("交接状态 1待准备2待交接3已交接") - private String state; // 交接状态 1待准备2待交接3已交接 @ApiModelProperty("合同编号") private String contractNo; // 合同编号 @ApiModelProperty("车型名称") @@ -64,5 +59,16 @@ public class BusDiscountpackageHandoverDto implements Dto { private List busDiscountpackageHandoverLists; @ApiModelProperty("业务关联附件表") private List busFiles; - + @ApiModelProperty("移交状态key") + private String transferStateKey; + @ApiModelProperty("移交状态value") + private String transferStateValue; + @ApiModelProperty("移交人sid") + private String transferUserSid; + @ApiModelProperty("移交人") + private String transferName; + @ApiModelProperty("移交人电话") + private String transferPhone; + @ApiModelProperty("移交备注") + private String transferRemarks; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java index 34d7134545..3a32cdb6f4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java @@ -48,7 +48,7 @@ public interface BusDiscountpackageHandoverFeign { @ApiOperation("交接操作") @PostMapping("/toDohandover") @ResponseBody - public ResultBean toDohandover(@RequestBody BusDiscountpackageHandoverDto dto) throws ParseException; + public ResultBean toDohandover(@RequestBody BusDiscountpackageHandoverDto dto); @ApiOperation("优惠包交接详情") @GetMapping("/handoverDetails/{sid}") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverVo.java index aea29ecefb..67e7906011 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverVo.java @@ -19,8 +19,6 @@ public class BusDiscountpackageHandoverVo implements Vo { @ApiModelProperty("sid") private String sid; // sid - @ApiModelProperty("交接状态 1待准备，2待交接，3已交接") - private Integer state; // 交接状态 @ApiModelProperty("待准备服务站人员ture,销售专员false") private Boolean showHandover; // @ApiModelProperty("待交接服务站人员false,销售专员ture") @@ -45,6 +43,13 @@ public class BusDiscountpackageHandoverVo implements Vo { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("接收时间") private Date recTime; // 接收时间 - + @ApiModelProperty("移交人") + private String transferName; + @ApiModelProperty("移交人电话") + private String transferPhone; + @ApiModelProperty("移交状态key") + private String transferStateKey; + @ApiModelProperty("移交状态Value") + private String transferStateValue; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeign.java index d8899e9a21..128c7907b4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeign.java @@ -37,7 +37,6 @@ public interface BusHandoverFeign { @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); - @ApiOperation("确认交付信息回显") @PostMapping("/deliveryByHandoverWaitSids") @ResponseBody diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemForDeliveryVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemForDeliveryVo.java index 8b9cf43296..e89cde7910 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemForDeliveryVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemForDeliveryVo.java @@ -16,8 +16,10 @@ public class BusHandoverItemForDeliveryVo implements Vo { private String modelName; private String vinSid; private String vinNo; + private String itemKey; private String itemValue; @ApiModelProperty("是否是燃气车 0不是1是") private String isFuelVehicle; // 是否是燃气车 0不是1是 - + @ApiModelProperty("资料是否完全0不全1全") + private String completeState; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItems.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItems.java index 0eaadfd7e2..34dc0e455e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItems.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItems.java @@ -42,5 +42,6 @@ public class BusHandoverItems extends BaseEntity { private String policyPhoto; @ApiModelProperty("是否是燃气车 0不是1是") private String isFuelVehicle; // 是否是燃气车 0不是1是 - + @ApiModelProperty("资料是否完全0不全1全") + private String completeState; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 624dde316e..63816bb4f3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -888,13 +888,13 @@ public class BusDeliveredApplyService extends MybatisBaseService detailsList) { - log.info("推送优惠包待准备数据开始啦~~~~~~~~~~~~~~~~~~~~~~~~=============================="); + log.info("待准备数据开始啦~~~~~~~~~~~~~~~~~~~~~~~~=============================="); //推送优惠包待准备开始 //查询该是否有优惠包信息 List discountList = busDeliveredDetailsDiscountService.selectByApplySid(busDeliveredApply.getSid()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml index a6048fc97f..1085c9f724 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml @@ -8,7 +8,6 @@ resultType="com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverVo"> select distinct sid, - `state`, createTime, contractNo, customerName, @@ -17,15 +16,10 @@ recName, recPhone, recTime, - CASE - `state` - WHEN 1 THEN - '待准备' - WHEN 2 THEN - '待交接' - WHEN 3 THEN - '已交接' - END AS nodeState + transferName, + transferPhone, + transferStateKey, + transferStateValue FROM bus_discountpackage_handover ${ew.sqlSegment} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java index 6a96102661..e4cc8ac6cc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java @@ -55,7 +55,7 @@ public class BusDiscountpackageHandoverRest implements BusDiscountpackageHandove } @Override - public ResultBean toDohandover(BusDiscountpackageHandoverDto dto) throws ParseException { + public ResultBean toDohandover(BusDiscountpackageHandoverDto dto) { ResultBean rb = ResultBean.fireFail(); int i = busDiscountpackageHandoverService.toDohandover(dto); if (i > 0) { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java index 1515545750..f36a7eda0d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java @@ -18,7 +18,11 @@ import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService; import com.yxt.anrui.buscenter.biz.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListService; import com.yxt.anrui.portal.api.sysrole.SysRoleFeign; import com.yxt.anrui.portal.api.sysrole.SysRoleVo; +import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoDetailsVo; +import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign; 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.common.base.config.component.DocPdfComponent; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; @@ -62,6 +66,10 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService listDtos = dto.getBusDiscountpackageHandoverLists(); @@ -254,11 +251,31 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService roleVoList = sysRoleFeign.fetchByUserSid(userSid).getData(); @@ -267,12 +284,10 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService busFiles = dto.getBusFiles(); @@ -280,37 +295,17 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService 0) { - List listDtos = dto.getBusDiscountpackageHandoverLists(); - for (BusDiscountpackageHandoverListDto listDto : listDtos) { - String listDtoSid = listDto.getSid(); - //判断当前登录用户角色是否为销售专员 - if (null != roleVoList) { - for (SysRoleVo sysRoleVo : roleVoList) { - //如果当前登录用户角色包含分公司销售专员，将当前用户sid保存到查询条件中 - if ("分公司销售专员".equals(sysRoleVo.getName())) { - listDto.setState("3"); - } else if ((sysRoleVo.getName()).contains("服务站长")) { - listDto.setState("2"); - } - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - String currentTime = simpleDateFormat.format(System.currentTimeMillis()); - Date currentDate = simpleDateFormat.parse(currentTime); - listDto.setModifyTime(currentDate); - if (StringUtils.isNotBlank(listDto.getState())) { - busDiscountpackageHandoverListService.updateStateBySid(listDto.getState(), listDto.getModifyTime(), listDtoSid); - } - } - } - } - } return i; } @@ -667,15 +662,15 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService busFiles = bdhDto.getBusFiles(); - if (StringUtils.isNotBlank(bdhDto.getState())) { - i = this.updateBySid(bdhDto.toMap(), sid); - } +// if (StringUtils.isNotBlank(bdhDto.getState())) { +// i = this.updateBySid(bdhDto.toMap(), sid); +// } if (null != busFiles && i > 0) { this.uploadPicture(bdhDto); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java index bad8e816a7..9df60a0e20 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java @@ -789,14 +789,17 @@ public class BusHandoverService extends MybatisBaseService 0) { sb.append("发票").append("、"); + sbKey.append("001").append("、"); } if (prepareVehicle.getCertificateState() > 0) { sb.append("合格证").append("、"); + sbKey.append("002").append("、"); } if (prepareVehicle.getOnBoardDataState() > 0) { BusVehicleInformationHandoverDetailsListVo data = busVehicleInformationHandoverService.detailsByVinSid(handoverWait.getVinSid()).getData(); @@ -810,11 +813,61 @@ public class BusHandoverService extends MybatisBaseService 0) { + sbKey.append("003").append("、"); + } + //一致性证书 + if (Integer.parseInt(information.getCertificate()) > 0) { + sbKey.append("004").append("、"); + } + if (Integer.parseInt(information.getApplyForm()) > 0) { + sbKey.append("005").append("、"); + } + if (Integer.parseInt(information.getManual()) > 0) { + sbKey.append("006").append("、"); + } + if (Integer.parseInt(information.getEnvironmentalList()) > 0) { + sbKey.append("007").append("、"); + } + if (Integer.parseInt(information.getDirverCard()) > 0) { + sbKey.append("008").append("、"); + } + if (Integer.parseInt(information.getGasCertificate()) > 0) { + if ("0".equals(data.getIsFuelVehicle())) { + sbKey.append("009").append("、"); + } + } + } + } else { + if ("0".equals(data.getIsFuelVehicle())) { + sbKey.append("003、004、005、006、007、008、009").append("、"); + } else { + sbKey.append("003、004、005、006、007、008").append("、"); + } + } } } } sb.delete(sb.length() - 1, sb.length()); + sbKey.delete(sbKey.length() - 1, sbKey.length()); itemVo.setItemValue(sb.toString()); + itemVo.setItemKey(sbKey.toString()); + if (itemVo.getIsFuelVehicle().equals("0")) { + if (itemVo.getItemKey().equals("001、002、003、004、005、006、007、008、009")) { + itemVo.setCompleteState("1"); + } else { + itemVo.setCompleteState("0"); + } + } else { + if (itemVo.getItemKey().equals("001、002、003、004、005、006、007、008")) { + itemVo.setCompleteState("1"); + } else { + itemVo.setCompleteState("0"); + } + } } voList.add(itemVo); } @@ -831,6 +884,17 @@ public class BusHandoverService extends MybatisBaseService saveOrUpdateBusHandover(BusHandoverDeliveryDto dto) throws Exception { ResultBean rb = ResultBean.fireFail(); + //ToDo:验证是否包含已存在的车辆 + String contractNo = dto.getContractNo(); + List vinList = dto.getBusItemvos(); + if (vinList.size() == 0) { + return rb.setMsg("请选择车辆"); + } + List vinSidList = vinList.stream().map(v -> v.getVinSid()).collect(Collectors.toList()); + int count = baseMapper.selectByCount(contractNo, vinSidList); + if (count > 0) { + return rb.setMsg("选择的车辆包含已存在交车确认记录的数据"); + } BusHandover entity = new BusHandover(); String sid = entity.getSid(); BeanUtil.copyProperties(dto, entity, "id", "sid"); @@ -850,6 +914,8 @@ public class BusHandoverService extends MybatisBaseService filePaths = createPdf(entity.getSid()).getData(); List fileList = new ArrayList<>(); @@ -1091,8 +1157,8 @@ public class BusHandoverService extends MybatisBaseService 0) { for (BusReceiveVehicleListPdfVo detailsVo : listPdfVos) { Map map = new HashMap<>(); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java index ab0a19b6d4..04eaf05502 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java @@ -62,7 +62,7 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService