From 06eff9a80f695bce527c4ed9119735820ac3f01f Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 29 May 2023 16:09:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=8C=85=E7=94=B3=E8=AF=B7=E4=BA=A4=E6=8E=A5=EF=BC=8C=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E9=9A=8F=E8=BD=A6=E8=B5=84=E6=96=99=E4=BA=A4?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppBusDiscountpackageHandoverQuery.java | 6 ++- .../app/AppBusDiscountpackageHandoverVo.java | 2 +- .../BusDiscountpackageHandoverMapper.xml | 2 +- .../BusDiscountpackageHandoverService.java | 20 ++++++--- .../BusVehicleInformationHandoverService.java | 1 + .../AppBusDiscountpackageHandoversQuery.java | 5 ++- .../AppBusDiscountpackageHandoversVo.java | 2 +- .../AppDiscountPackageHandoverFegin.java | 1 + .../AppVehicleInformationDto.java | 34 ++++++++------ ...hicleInformationHandoverDetailsListVo.java | 31 +++++++++++++ ...ppVehicleInformationHandoverDetailsVo.java | 8 +--- .../AppVehicleInformationHandoverDto.java | 13 +++--- .../AppVehicleInformationVo.java | 19 ++++++-- .../VehicleInformationHandoverFeign.java | 18 +++++--- ...hicleInformationHandoverFeignFallback.java | 7 ++- .../AppDiscountPackageHandoverService.java | 17 +++---- .../VehicleInformationHandoverRest.java | 12 ++--- .../VehicleInformationHandoverService.java | 45 ++++++++++++++----- 18 files changed, 168 insertions(+), 75 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationHandoverDetailsListVo.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverQuery.java index ea11b47cc5..63d2274f7b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverQuery.java @@ -15,9 +15,11 @@ public class AppBusDiscountpackageHandoverQuery implements Query { private String orgPath; // 分公司sid @ApiModelProperty("当前登录用户sid") private String userSid; // - @ApiModelProperty("待接收销售专员用户sid") - private String recUserSid; // 待接收销售专员用户sid +// @ApiModelProperty("待接收销售专员用户sid") +// private String recUserSid; // 待接收销售专员用户sid @ApiModelProperty("1待准备 2待交接 3已交接") private String type; // 1待准备 2待交接 3已交接 + @ApiModelProperty("1待准备 2待交接 3已交接") + private String names; // 1待准备 2待交接 3已交接 } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java index 453a7ce238..b1f16efec1 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java @@ -32,7 +32,7 @@ public class AppBusDiscountpackageHandoverVo implements Vo { @ApiModelProperty("车型名称") private String model; // 车型名称 @ApiModelProperty("车辆台数") - private String carNun; // 车辆台数 + private String carNum; // 车辆台数 @ApiModelProperty("接收人姓名") private String recName; // 接收人姓名 @ApiModelProperty("接收人电话") 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 42dda880cb..3e1c7930c0 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 @@ -30,7 +30,7 @@ contractNo as contractId, customerName, vehModel as model, - vehCount as carNun, + vehCount as carNum, recName, recPhone, recTime 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 87da0d974c..bf8c93ffbf 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 @@ -495,8 +495,8 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("useOrgSid", query.getOrgPath()); qw.eq("isDelete", 0); - if (StringUtils.isNotBlank(query.getRecUserSid())) { - qw.eq("recUserSid", query.getRecUserSid()); + if (StringUtils.isNotBlank(query.getUserSid())) { + qw.eq("recUserSid", query.getUserSid()); } if (StringUtils.isNotBlank(query.getType())) { if (query.getType().equals("3")) { @@ -505,6 +505,10 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService wrapper.like("contractNo", query.getNames()).or().like("customerName", query.getNames()) + .or().like("recName",query.getNames())); + } return qw; } @@ -517,9 +521,6 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService getDiscountHandoverList(PagerQuery pq) { //从传入参数中取查询条件 AppBusDiscountpackageHandoverQuery query = pq.getParams(); - //取到当前登录用户的sid - String userSid = query.getUserSid(); - query.setRecUserSid(userSid); QueryWrapper qw = appCreateQueryWrapper(query); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectAppPageVo(page, qw); @@ -528,8 +529,13 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService informations; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationHandoverDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationHandoverDetailsVo.java index bb2dd4febb..52df8d7cb0 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationHandoverDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationHandoverDetailsVo.java @@ -15,10 +15,11 @@ import java.util.Date; */ @Data public class AppVehicleInformationHandoverDetailsVo implements Vo { - private String sid; @ApiModelProperty("车辆sid") private String vehicleSid; // 车辆sid + @ApiModelProperty("是否是燃气车 0不是1是") + private String isFuelVehicle; // 是否是燃气车 0不是1是 @ApiModelProperty("车架号") private String vinNo; @ApiModelProperty("车型") @@ -29,11 +30,6 @@ public class AppVehicleInformationHandoverDetailsVo implements Vo { private String customerName; @ApiModelProperty("接收人") private String recName; // 接收人 - @ApiModelProperty("接收日期") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date recTime; @ApiModelProperty("随车资料") private AppVehicleInformationVo busVehicleInformation; - @ApiModelProperty("备注信息") - private String remarks; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationHandoverDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationHandoverDto.java index 7a01d7e80e..457087a9bb 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationHandoverDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationHandoverDto.java @@ -16,16 +16,18 @@ public class AppVehicleInformationHandoverDto implements Dto { private String sid; @ApiModelProperty("交接状态") private Integer handoverState; // 交接状态 + @ApiModelProperty("创建人sid") + private String createBySid; // 创建人sid @ApiModelProperty("车架号") private String vinNo; // 车架号 @ApiModelProperty("车辆sid") private String vehicleSid; // 车辆sid - @ApiModelProperty("创建人sid") - private String createBySid; // 创建人sid @ApiModelProperty("客户名称") private String customerName; // 客户名称 @ApiModelProperty("车型名") private String model; // 车型名 + @ApiModelProperty("车型sid") + private String modelSid; @ApiModelProperty("合同号") private String contractNo; // 合同号 @ApiModelProperty("接收人") @@ -38,10 +40,9 @@ public class AppVehicleInformationHandoverDto implements Dto { private String useOrgName; @ApiModelProperty("关联业务sid") private String busSid; - @ApiModelProperty("接收日期") - private Date recTime; + @ApiModelProperty("是否是燃气车 0不是1是") + private Integer isFuelVehicle; // 是否是燃气车 0不是1是 @ApiModelProperty("随车资料") private AppVehicleInformationDto busVehicleInformation; - @ApiModelProperty("备注信息") - private String remarks; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationVo.java index 67679bca7c..5b1486e5aa 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationVo.java @@ -1,9 +1,12 @@ package com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @author Administrator * @description @@ -11,12 +14,11 @@ import lombok.Data; */ @Data public class AppVehicleInformationVo implements Vo { + private String informationSid; @ApiModelProperty("车钥匙个数") private String vehicleKeyNum; // 车钥匙个数 - // @ApiModelProperty("发票0无1有") -// private Integer invoice; // 发票 @ApiModelProperty("一致性证书0无1有") - private Integer certificate; // 一致性证书0无1有 + private String certificate; // 一致性证书0无1有 @ApiModelProperty("申请表0无1有") private String applyForm; // 申请表0无1有 @ApiModelProperty("保修手册、说明书0无1有") @@ -27,4 +29,15 @@ public class AppVehicleInformationVo implements Vo { private String dirverCard; // 驾驶员卡0无1有 @ApiModelProperty("气瓶产品质量证明书（燃气车）0无1有") private String gasCertificate; // 气瓶产品质量证明书（燃气车）0无1有 + @ApiModelProperty("接收人") + private String recName; // 接收人 + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty("接收时间") + private Date recTime; // 接收时间 + @ApiModelProperty("移交人") + private String transferName; // 移交人 + @ApiModelProperty("备注信息") + private String remarks; + @ApiModelProperty("剩余随车资料") + private String vehicleHandoverData; //剩余随车资料 } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeign.java index 099badcbab..f715f34315 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeign.java @@ -34,10 +34,17 @@ public interface VehicleInformationHandoverFeign { @ResponseBody public ResultBean appSaveOrUpdate(@RequestBody AppVehicleInformationHandoverDto dto); - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") + @ApiOperation("编辑回显") + @GetMapping("/fetchDetailsBySid/{sid}/{times}") @ResponseBody - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid,@PathVariable("times") String times); + + + @ApiOperation("随车资料交接详情") + @GetMapping("details/{sid}") + @ResponseBody + public ResultBean details(@PathVariable("sid") String sid); + @ApiOperation("根据创建人sid查询合同用于交车资料查询") @ResponseBody @@ -45,16 +52,13 @@ public interface VehicleInformationHandoverFeign { public ResultBean> contractForHandover(@RequestBody PagerQuery pq); + @ApiOperation("对外二次交付新增或修改交车资料管理") @PostMapping("/saveVehicleData") @ResponseBody public ResultBean saveVehicleData(@RequestBody AppVehicleDataHandoverDto dto); -// @ApiOperation("对外二次交付查看交车资料确认单详情") -// @GetMapping("/fetchVehicleDataBySid/{sid}") -// @ResponseBody -// public ResultBean fetchVehicleDataBySid(@PathVariable("sid") String sid); @ApiOperation(("打印交车资料确认单")) @PostMapping("/createPdf") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeignFallback.java index d893f7523d..7f1694c9ee 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeignFallback.java @@ -25,7 +25,12 @@ public class VehicleInformationHandoverFeignFallback implements VehicleInformati } @Override - public ResultBean fetchDetailsBySid(String sid) { + public ResultBean fetchDetailsBySid(String sid,String times) { + return null; + } + + @Override + public ResultBean details(String sid) { return null; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverService.java index 21294f7368..dddfbeeace 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverService.java @@ -43,14 +43,15 @@ public class AppDiscountPackageHandoverService { */ public ResultBean> listPage(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); - PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); - ResultBean> resultBean = busDiscountpackageHandoverFeign.getDiscountHandoverList(pq); - System.out.println(resultBean.getData().getRecords()); - List voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppBusDiscountpackageHandoversVo.class)).collect(Collectors.toList()); - PagerVo v = new PagerVo<>(); - BeanUtil.copyProperties(resultBean.getData(), v); - v.setRecords(voList); - return rb.success().setData(v); + PagerQuery pq = new PagerQuery<>(); + BeanUtil.copyProperties(pagerQuery,pq); + ResultBean> voResultBean = busDiscountpackageHandoverFeign.getDiscountHandoverList(pq); + PagerVo vo = new PagerVo<>(); + if (voResultBean.getSuccess()) { + PagerVo data = voResultBean.getData(); + BeanUtil.copyProperties(data,vo); + } + return rb.success().setData(vo); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverRest.java index b06b3457bb..2ca4cc5dbd 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverRest.java @@ -36,14 +36,14 @@ public class VehicleInformationHandoverRest implements VehicleInformationHandove } @Override - public ResultBean fetchDetailsBySid(String sid) { - return null; + public ResultBean fetchDetailsBySid(String sid, String times) { + return vehicleInformationHandoverService.fetchDetailsBySid(sid,times); } -// @Override -// public ResultBean fetchDetailsBySid(String sid) { -// return vehicleInformationHandoverService.fetchDetailsBySid(sid); -// } + @Override + public ResultBean details(String sid) { + return vehicleInformationHandoverService.details(sid); + } @Override public ResultBean> contractForHandover(PagerQuery pq) { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverService.java index 5246ebd0f9..26ef3f4e5c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverService.java @@ -45,19 +45,9 @@ public class VehicleInformationHandoverService { PagerQuery pagerQuery = new PagerQuery<>(); BeanUtil.copyProperties(pq, pagerQuery); PagerVo data = busVehicleInformationHandoverFeign.listPage(pagerQuery).getData(); - List vos = new ArrayList<>(); PagerVo pagerVo = new PagerVo<>(); if (null != data) { - if (null != data.getRecords()) { - List records = data.getRecords(); - for (BusVehicleInformationHandoverVo record : records) { - AppVehicleInformationHandoverVo vo = new AppVehicleInformationHandoverVo(); - BeanUtil.copyProperties(record, vo); - vos.add(vo); - } - } - BeanUtil.copyProperties(data, pagerVo); - pagerVo.setRecords(vos); + BeanUtil.copyProperties(data,pagerVo); } return rb.success().setData(pagerVo); } @@ -192,4 +182,37 @@ public class VehicleInformationHandoverService { BeanUtil.copyProperties(data,pagerVo); return rb.success().setData(pagerVo); } + + /** + * 移动端随车资料内部交接编辑回显 + * @param sid + * @param times + * @return + */ + public ResultBean fetchDetailsBySid(String sid, String times) { + ResultBean rb = ResultBean.fireFail(); + ResultBean voResultBean = busVehicleInformationHandoverFeign.fetchDetailsBySid(sid, times); + AppVehicleInformationHandoverDetailsVo vo = new AppVehicleInformationHandoverDetailsVo(); + if (voResultBean.getSuccess()) { + BusVehicleInformationHandoverDetailsVo data = voResultBean.getData(); + BeanUtil.copyProperties(data,vo); + } + return rb.success().setData(vo); + } + + /** + * 随车资料交接详情 + * @param sid + * @return + */ + public ResultBean details(String sid) { + ResultBean rb = ResultBean.fireFail(); + ResultBean voResultBean = busVehicleInformationHandoverFeign.details(sid); + AppVehicleInformationHandoverDetailsListVo vo = new AppVehicleInformationHandoverDetailsListVo(); + if (voResultBean.getSuccess()) { + BusVehicleInformationHandoverDetailsListVo data = voResultBean.getData(); + BeanUtil.copyProperties(data,vo); + } + return rb.success().setData(vo); + } }