From f851351f6e4ae49ebd5da89f7ad9f8c70d3997b7 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 14 Nov 2022 21:51:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E8=BD=A6=E7=A1=AE=E8=AE=A4=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/common/enums/DictCommonEnum.java | 16 ++ .../commoncontract/CommonContractService.java | 2 + .../api/bushandover/BusHandover.java | 41 +++++ .../api/bushandover/BusHandoverDto.java | 64 +++----- .../api/bushandover/BusHandoverFeign.java | 18 +++ .../bushandover/BusHandoverFeignFallback.java | 9 ++ .../api/bushandover/BusHandoverInitVo.java | 37 +++++ .../api/bushandover/BusHandoverListVo.java | 18 +++ .../api/bushandover/BusHandoverQuery.java | 50 ++---- .../api/bushandover/BusHandoverVo.java | 60 +++---- .../api/bushandoveritems/BusHanItemDto.java | 23 +++ .../bushandoveritems/BusHandoItemListVo.java | 2 + .../BusHandoverItemsListVo.java | 5 +- .../BusHandoverItemsQuery.java | 2 +- .../bushandoveritems/BusHandoverItemsVo.java | 4 +- .../api/bushandoveritems/BusItemDto.java | 20 +++ .../api/bushandoverwait/BusHandoverWait.java | 3 + .../bushandoverwait/BusHandoverWaitDto.java | 48 ++++++ .../bushandoverwait/BusHandoverWaitFeign.java | 5 + .../bushandoverwait/BusHandoverWaitVo.java | 6 +- .../biz/bushandover/BusHandoverMapper.java | 6 + .../biz/bushandover/BusHandoverMapper.xml | 69 +++++--- .../biz/bushandover/BusHandoverRest.java | 23 ++- .../biz/bushandover/BusHandoverService.java | 149 +++++++++++++++++- .../BusHandoverItemsService.java | 10 +- .../BusHandoverWaitMapper.java | 2 + .../bushandoverwait/BusHandoverWaitMapper.xml | 8 + .../bushandoverwait/BusHandoverWaitRest.java | 7 +- .../BusHandoverWaitService.java | 24 ++- .../deliveryConfirm/DeliveryBillListVo.java | 19 +++ .../deliveryConfirm/DeliveryConDto.java | 27 ++++ .../deliveryConfirm/DeliveryConItemVo.java | 2 + .../deliveryConfirm/DeliveryConListVo.java | 7 +- .../deliveryConfirm/DeliveryConQuery.java | 2 + .../deliveryConfirm/DeliveryConVo.java | 6 +- .../deliveryConfirm/DeliveryConfirmFeign.java | 13 ++ .../deliveryConfirm/DeliveryConfirmVo.java | 9 +- .../deliveryConfirm/DeliveryDto.java | 48 ++++++ .../deliveryConfirm/DeliveryItemDto.java | 22 +++ .../deliveryConfirm/DeliveryListQuery.java | 24 +++ .../deliveryConfirm/DeliveryListVo.java | 37 +++++ .../deliveryConfirm/DeliveryVo.java | 4 +- .../deliveryConfirm/DeliveryConfirmRest.java | 12 ++ .../DeliveryConfirmService.java | 46 +++++- 44 files changed, 825 insertions(+), 184 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverInitVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverListVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHanItemDto.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusItemDto.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryBillListVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryItemDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryListQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryListVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java index f4bfcd9c20..bfd4249658 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java @@ -111,4 +111,20 @@ public class DictCommonEnum { } + @Getter + public static enum HandoverType { + WJX("001", "未交车"), + YJC("002", "已交车"), + ; + + private final String code; + private final String remarks; + + HandoverType(String code, String remarks) { + this.code = code; + this.remarks = remarks; + } + + } + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index bb5444b92b..ea7a7d1d97 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1519,6 +1519,7 @@ public class CommonContractService extends MybatisBaseService carPhoto= Collections.emptyList(); + @ApiModelProperty("机构sid:当前部门的全路径") + private String orgPath; + + private List vinList; } \ No newline at end of file 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 8a8812881f..0a14624965 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 @@ -1,7 +1,16 @@ package com.yxt.anrui.buscenter.api.bushandover; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; /** * Project: anrui-buscenter(业务中心)
@@ -65,4 +74,13 @@ public interface BusHandoverFeign { @GetMapping("/initInsert/{sid}") public ResultBean initInsert(@PathVariable("sid") String sid);*/ + @ApiOperation("保存确认交付信息") + @PutMapping("/saveDeliverybill") + ResultBean> saveDeliverybill(@RequestBody BusHandoverDto dto); + + @ApiOperation("获取交车确认列表") + @PostMapping("/getDeliveryConfirmList") + ResultBean> getDeliveryConfirmList(@RequestBody PagerQuery pagerQuery); + +// ResultBean<> getDeliveryConfirmInfo(); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeignFallback.java index 21a50f13f4..2a0d154235 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeignFallback.java @@ -22,6 +22,15 @@ import java.util.List; */ @Component public class BusHandoverFeignFallback implements BusHandoverFeign { + @Override + public ResultBean> saveDeliverybill(BusHandoverDto dto) { + return null; + } + + @Override + public ResultBean> getDeliveryConfirmList(PagerQuery pagerQuery) { + return null; + } /*@Override public ResultBean> listPage(PagerQuery pq){ diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverInitVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverInitVo.java new file mode 100644 index 0000000000..aa7b8176e5 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverInitVo.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.buscenter.api.bushandover; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/11/14 16:36 + * @Description + */ +@Data +public class BusHandoverInitVo implements Vo { + private static final long serialVersionUID = 1513358790229014971L; + + private String contractNo; + @ApiModelProperty("记录sid") + private String sid; + //接收人 + //客户名称 + //合同编号 + //交付日期 + //交付地点 + //接收车辆确认书照片 + //委托提车授权书 + //交付车辆 + //车型 + //接收人身份证 + //备注 + //交车资料确认单 + //委托人身份证（正反面） + //出门证照片 + //用户sid + //组织机构sid + // + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverListVo.java new file mode 100644 index 0000000000..8d7519c7a5 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverListVo.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.buscenter.api.bushandover; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/11/14 19:17 + * @Description + */ +@Data +public class BusHandoverListVo implements Vo { + private static final long serialVersionUID = 5027965430019731656L; + + private String name; + + private String downloadUrl; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverQuery.java index d6c3a2b8ff..813bc3b9cb 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverQuery.java @@ -1,14 +1,11 @@ package com.yxt.anrui.buscenter.api.bushandover; -import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * Project: anrui-buscenter(业务中心)
* File: BusHandoverQuery.java
@@ -25,43 +22,14 @@ import java.util.Date; @ApiModel(value = "交车确认单 查询条件", description = "交车确认单 查询条件") @Data public class BusHandoverQuery implements Query { + private static final long serialVersionUID = 3758170671761265631L; + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("客户名称/合同编号") + private String name; + + @ApiModelProperty("orgPath") + private String orgPath; - - @ApiModelProperty("确认单编号（制定编号规则:单据类型编号+部门全编号+员工编号+客户编号+yyyyMMDD+0000）") - private String billNo; - - @ApiModelProperty("贷款人sid") - private String borrowerSid; - - @ApiModelProperty("贷款名称") - private String borrowerName; - - @ApiModelProperty("业务员sid") - private String staffSid; - - @ApiModelProperty("交车人姓名") - private String staffName; - - @ApiModelProperty("部门sid") - private String orgSid; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @ApiModelProperty("交车日期") - private Date deliveryDateStart; - private Date deliveryDateEnd; - - @ApiModelProperty("交车地点") - private String deliveryAddress; - - @ApiModelProperty("确认结论") - private String conclusion; - - @ApiModelProperty("定位信息") - private String glsInfo; - - @ApiModelProperty("委托书照片（非本人提车）") - private String authorizationPhoto; - - @ApiModelProperty("签收人签字照片") - private String receiverSign; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverVo.java index c6949b5434..990bcb1ebe 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverVo.java @@ -1,14 +1,11 @@ package com.yxt.anrui.buscenter.api.bushandover; -import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * Project: anrui-buscenter(业务中心)
* File: BusHandoverVo.java
@@ -25,43 +22,24 @@ import java.util.Date; @ApiModel(value = "交车确认单 视图数据对象", description = "交车确认单 视图数据对象") @Data public class BusHandoverVo implements Vo { + private static final long serialVersionUID = -427524393461360221L; + + @ApiModelProperty("合同编号") + private String contractNo; + @ApiModelProperty("交车状态key") + private String handoverStateKey; + @ApiModelProperty("交车状态") + private String handoverStateValue; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("车型别名") + private String modelName; + @ApiModelProperty("交车数量") + private String number; + @ApiModelProperty("是否显示交车确认") + private boolean showUpdate; + @ApiModelProperty("记录sid") + private String sid; + //下载路径 - - @ApiModelProperty("确认单编号（制定编号规则:单据类型编号+部门全编号+员工编号+客户编号+yyyyMMDD+0000）") - private String billNo; - - @ApiModelProperty("贷款人sid") - private String borrowerSid; - - @ApiModelProperty("贷款名称") - private String borrowerName; - - @ApiModelProperty("业务员sid") - private String staffSid; - - @ApiModelProperty("交车人姓名") - private String staffName; - - @ApiModelProperty("部门sid") - private String orgSid; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @ApiModelProperty("交车日期") - private Date deliveryDate; - private Date deliveryDateEnd; - - @ApiModelProperty("交车地点") - private String deliveryAddress; - - @ApiModelProperty("确认结论") - private String conclusion; - - @ApiModelProperty("定位信息") - private String glsInfo; - - @ApiModelProperty("委托书照片（非本人提车）") - private String authorizationPhoto; - - @ApiModelProperty("签收人签字照片") - private String receiverSign; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHanItemDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHanItemDto.java new file mode 100644 index 0000000000..479fef8625 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHanItemDto.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.buscenter.api.bushandoveritems; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/11/14 13:56 + * @Description + */ +@Data +public class BusHanItemDto implements Dto { + private static final long serialVersionUID = -422200574451058866L; + + private String vinNo; + private String vinSid; + @ApiModelProperty("交付清单") + private List manifest = new ArrayList<>(); +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoItemListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoItemListVo.java index 3207c9e3be..4ed39bbbf7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoItemListVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoItemListVo.java @@ -17,4 +17,6 @@ public class BusHandoItemListVo implements Vo { private String name; @ApiModelProperty("默认true") private boolean state; + + private String itemKey; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsListVo.java index bdd22a96d6..665e9395a1 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsListVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsListVo.java @@ -18,5 +18,8 @@ public class BusHandoverItemsListVo implements Vo { @ApiModelProperty("车架号") private String vin; - private List mainfest; + @ApiModelProperty("车辆sid") + private String vinSid; + + private List manifest; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsQuery.java index 3c29ec9554..e34f59921f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsQuery.java @@ -30,7 +30,7 @@ public class BusHandoverItemsQuery implements Query { private List list; - private String contractSid; + private String contractId; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsVo.java index 781e042fa4..33dea609e4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsVo.java @@ -26,8 +26,8 @@ import java.util.List; public class BusHandoverItemsVo implements Vo { private static final long serialVersionUID = -2147801665880523508L; - @ApiModelProperty("合同sid") - private String contractSid; + @ApiModelProperty("合同编号") + private String contractId; @ApiModelProperty("接收人") private String name; @ApiModelProperty("身份证号") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusItemDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusItemDto.java new file mode 100644 index 0000000000..c26b9d84a6 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusItemDto.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.buscenter.api.bushandoveritems; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/11/14 13:59 + * @Description + */ +@Data +public class BusItemDto implements Dto { + private static final long serialVersionUID = -6400511209851669569L; + + private String name; + + private boolean state; + + private String itemKey; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWait.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWait.java index 3806281783..5fa467b29e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWait.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWait.java @@ -39,4 +39,7 @@ public class BusHandoverWait extends BaseEntity { @ApiModelProperty("付款状态value") private String payStateValue; + @ApiModelProperty("分公司sid") + private String useOrgSid; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitDto.java new file mode 100644 index 0000000000..f188850a96 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitDto.java @@ -0,0 +1,48 @@ +package com.yxt.anrui.buscenter.api.bushandoverwait; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/11/14 17:07 + * @Description + */ +@Data +public class BusHandoverWaitDto implements Dto { + private static final long serialVersionUID = -5302962276174024782L; + + @ApiModelProperty("合同编号") + private String contractNo; + + @ApiModelProperty("付款方式") + private String payTypeKey; + + @ApiModelProperty("付款方式value") + private String payTypeValue; + + @ApiModelProperty("客户名称") + private String customerName; + + @ApiModelProperty("客户sid") + private String customerSid; + + @ApiModelProperty("车架号") + private String vinNo; + + @ApiModelProperty("车辆sid") + private String vinSid; + + @ApiModelProperty("付款状态key") + private String payStateKey; + + @ApiModelProperty("付款状态value") + private String payStateValue; + @ApiModelProperty("车型sid") + private String modelSid; + + @ApiModelProperty("车型别名") + private String modelName; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitFeign.java index 8c09bf8feb..1f8a00eb28 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitFeign.java @@ -27,4 +27,9 @@ public interface BusHandoverWaitFeign { @PostMapping("/pagerList") @ResponseBody ResultBean> pagerList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("新增待交车") + @PostMapping("/save") + @ResponseBody + ResultBean save(@RequestBody BusHandoverWaitDto dto); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitVo.java index b23f617a97..7fba3b1f6c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitVo.java @@ -19,7 +19,7 @@ public class BusHandoverWaitVo implements Vo { private String contractNo; @ApiModelProperty("合同状态") - private String contractState; + private String contractStateValue; @ApiModelProperty("合同sid") private String contractSid; @@ -28,7 +28,7 @@ public class BusHandoverWaitVo implements Vo { private String customerName; @ApiModelProperty("付款方式") - private String payType; + private String payTypeValue; - private List list = new ArrayList<>(); + private List vinList = new ArrayList<>(); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.java index 43cdef91eb..81bda851e2 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.java @@ -1,8 +1,13 @@ package com.yxt.anrui.buscenter.biz.bushandover; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.buscenter.api.bushandover.BusHandover; +import com.yxt.anrui.buscenter.api.bushandover.BusHandoverVo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * Project: anrui-buscenter(业务中心)
@@ -19,6 +24,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface BusHandoverMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); /*//@Update("update bus_handover set name=#{msg} where id=#{id}") //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml index 469247adb1..ed1d9879db 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml @@ -3,32 +3,55 @@ - + + - - - --> \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverRest.java index 47b3065e13..214a50a668 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverRest.java @@ -1,10 +1,16 @@ package com.yxt.anrui.buscenter.biz.bushandover; -import com.yxt.anrui.buscenter.api.bushandover.BusHandoverFeign; +import com.yxt.anrui.buscenter.api.bushandover.*; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * Project: anrui-buscenter(业务中心)
* File: BusHandoverFeignFallback.java
@@ -22,6 +28,21 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("v1/bushandover") public class BusHandoverRest implements BusHandoverFeign { + + @Autowired + private BusHandoverService busHandoverService; + + @Override + public ResultBean> saveDeliverybill(BusHandoverDto dto) { + return busHandoverService.saveDeliverybill(dto); + } + + @Override + public ResultBean> getDeliveryConfirmList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = busHandoverService.pagerList(pagerQuery); + return rb.success().setData(pv); + } /*@Autowired private FileUploadComponent fileUploadComponent; @Autowired 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 3c7b1b36b5..150cf201f7 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 @@ -1,9 +1,33 @@ package com.yxt.anrui.buscenter.biz.bushandover; -import com.yxt.anrui.buscenter.api.bushandover.BusHandover; +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.api.commoncontract.CommonContract; +import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; +import com.yxt.anrui.base.common.enums.DictCommonEnum; +import com.yxt.anrui.buscenter.api.bushandover.*; +import com.yxt.anrui.buscenter.api.bushandoveritems.BusHanItemDto; +import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItems; +import com.yxt.anrui.buscenter.api.bushandoveritems.BusItemDto; +import com.yxt.anrui.buscenter.biz.bushandoveritems.BusHandoverItemsService; +import com.yxt.anrui.buscenter.biz.bushandoverwait.BusHandoverWaitService; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + /** * Project: anrui-buscenter(业务中心)
* File: BusHandoverService.java
@@ -19,6 +43,117 @@ import org.springframework.stereotype.Service; */ @Service public class BusHandoverService extends MybatisBaseService { + + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private BusHandoverItemsService busHandoverItemsService; + @Autowired + private CommonContractFeign commonContractFeign; + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private BusHandoverWaitService busHandoverWaitService; + + public ResultBean> saveDeliverybill(BusHandoverDto dto) { + ResultBean> rb = ResultBean.fireFail(); + BusHandover busHandover = new BusHandover(); + BeanUtil.copyProperties(dto, busHandover, "sid"); + String userSid = dto.getUserSid(); + //根据机构sid查询分公司sid + String orgPath = dto.getOrgPath(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + busHandover.setUseOrgSid(useOrgSid); + busHandover.setCreateBySid(userSid); + busHandover.setHandoverStateKey(DictCommonEnum.HandoverType.WJX.getCode()); + busHandover.setHandoverStateValue(DictCommonEnum.HandoverType.WJX.getRemarks()); + //根据合同编号查询订单sid以及客户名称、客户sid + ResultBean commonContractResultBean = commonContractFeign.selectByNo(dto.getContractNo()); + CommonContract commonContract = commonContractResultBean.getData(); + if (commonContract != null) { + busHandover.setContractNo(commonContract.getContractNo()); + busHandover.setCustomerName(commonContract.getPartyB()); + busHandover.setCustomerSid(commonContract.getCustomerSid()); + } + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + SysUserVo sysUserVo = userVoResultBean.getData(); + if (sysUserVo != null) { + busHandover.setStaffSid(sysUserVo.getStaffSid()); + } + List busHanItemDtos = dto.getVinList(); + busHanItemDtos.removeAll(Collections.singleton(null)); + if (!busHanItemDtos.isEmpty()) { + for (BusHanItemDto busHanItemDto : busHanItemDtos) { + //根据合同编号、车辆sid逻辑删除待交车中的 + busHandoverWaitService.deleteByVinSid(dto.getContractNo(), busHanItemDto.getVinSid()); + BusHandoverItems busHandoverItems = new BusHandoverItems(); + busHandoverItems.setHandoverSid(busHandover.getSid()); + busHandoverItems.setVinNo(busHanItemDto.getVinNo()); + busHandoverItems.setVinSid(busHanItemDto.getVinSid()); + if(commonContract != null){ + busHandoverItems.setModelName(commonContract.getModelName()); + busHandoverItems.setModelSid(commonContract.getModelSid()); + } + List lists = busHanItemDto.getManifest(); + List itemKeyList = new ArrayList<>(); + List itemValueList = new ArrayList<>(); + for (BusItemDto busItemDto : lists) { + if (busItemDto.isState()) { + itemValueList.add(busItemDto.getName()); + itemKeyList.add(busItemDto.getItemKey()); + } + } + String itemKey = String.join(",", itemKeyList); + String itemValue = String.join(",", itemValueList); + busHandoverItems.setItemKey(itemKey); + busHandoverItems.setItemValue(itemValue); + busHandoverItemsService.save(busHandoverItems); + } + } + baseMapper.insert(busHandover); + List list = new ArrayList<>(); + BusHandoverListVo vo = new BusHandoverListVo(); + vo.setName("<<接收车辆确认书>>"); + list.add(vo); + vo = new BusHandoverListVo(); + vo.setName("<<出门证>>"); + list.add(vo); + vo = new BusHandoverListVo(); + vo.setName("<<交车资料确认单>>"); + list.add(vo); + return rb.success().setData(list); + } + + public PagerVo pagerList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + BusHandoverQuery params = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (params != null) { + String orgPath = params.getOrgPath(); + if (StringUtils.isNotBlank(orgPath)) { + orgPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData(); + qw.eq("bh.useOrgSid", orgPath); + } + if (StringUtils.isNotBlank(params.getUserSid())) { + qw.eq("bh.createBySid", params.getUserSid()); + } + } + IPage pagging = baseMapper.selectPageVo(page, qw, params.getName()); + List recordsList = pagging.getRecords(); + recordsList.removeAll(Collections.singleton(null)); + if (!recordsList.isEmpty()) { + for (BusHandoverVo record : recordsList) { + if (DictCommonEnum.HandoverType.YJC.getCode().equals(record.getHandoverStateKey())) { + record.setShowUpdate(false); + } else { + record.setShowUpdate(true); + } + } + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } /*@Autowired private SysOrganizationFeign sysOrganizationFeign; @@ -189,12 +324,12 @@ public class BusHandoverService extends MybatisBaseService getDeliveryBill(BusHandoverItemsQuery query) { ResultBean rb = ResultBean.fireFail(); BusHandoverItemsVo vo = new BusHandoverItemsVo(); - String contractSid = query.getContractSid(); + String contractSid = query.getContractId(); List list = query.getList(); List voList = new ArrayList<>(); for (BusHandoverItemsListQuery busHandoverItemsListQuery : list) { @@ -46,14 +47,17 @@ public class BusHandoverItemsService extends MybatisBaseService { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); List selectByNo(String contractNo); + + int deleteByVinSid(@Param("contractNo") String contractNo, @Param("vinSid") String vinSid); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitMapper.xml index 407cb9ccc2..5a37f22dc1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitMapper.xml @@ -24,5 +24,13 @@ select vinNo, vinSid from bus_handover_wait where contractNo = #{contractNo} + and isDelete = 0 + + + update bus_handover_wait + set isDelete=1 + where contractNo = #{contractNo} + and vinSid = #{vinSid} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitRest.java index 1adb7f34b9..4ab46d90dc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitRest.java @@ -1,6 +1,6 @@ package com.yxt.anrui.buscenter.biz.bushandoverwait; -import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanVo; +import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitDto; import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitFeign; import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitQuery; import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitVo; @@ -32,4 +32,9 @@ public class BusHandoverWaitRest implements BusHandoverWaitFeign { PagerVo pv = busHandoverWaitService.pagerList(pagerQuery); return rb.success().setData(pv); } + + @Override + public ResultBean save(BusHandoverWaitDto dto) { + return busHandoverWaitService.saveAll(dto); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java index 4cb8969d93..139b58aac1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java @@ -1,13 +1,11 @@ package com.yxt.anrui.buscenter.biz.bushandoverwait; +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.api.commoncontract.CommonContract; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; -import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWait; -import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitListVo; -import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitQuery; -import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitVo; +import com.yxt.anrui.buscenter.api.bushandoverwait.*; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -42,8 +40,9 @@ public class BusHandoverWaitService extends MybatisBaseService pagging = baseMapper.selectPageVo(page, qw, params.getName()); List records = pagging.getRecords(); @@ -51,6 +50,7 @@ public class BusHandoverWaitService extends MybatisBaseService commonContractResultBean = commonContractFeign.selectByNo(contractNo); CommonContract commonContract = commonContractResultBean.getData(); @@ -59,9 +59,21 @@ public class BusHandoverWaitService extends MybatisBaseService busHandoverWaitListVoList = baseMapper.selectByNo(contractNo); - record.setList(busHandoverWaitListVoList); + record.setVinList(busHandoverWaitListVoList); } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } + + public ResultBean saveAll(BusHandoverWaitDto dto) { + ResultBean rb = ResultBean.fireFail(); + BusHandoverWait busHandoverWait = new BusHandoverWait(); + BeanUtil.copyProperties(dto, busHandoverWait, "sid"); + baseMapper.insert(busHandoverWait); + return rb.success(); + } + + public int deleteByVinSid(String contractNo, String vinSid) { + return baseMapper.deleteByVinSid(contractNo, vinSid); + } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryBillListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryBillListVo.java new file mode 100644 index 0000000000..d10e7773fd --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryBillListVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.autoservice.deliveryConfirm; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/11/14 19:15 + * @Description + */ +@Data +public class DeliveryBillListVo implements Vo { + private static final long serialVersionUID = -781872796645873397L; + @ApiModelProperty("名称") + private String name; + @ApiModelProperty("下载地址") + private String downloadUrl; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConDto.java new file mode 100644 index 0000000000..49712329b5 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConDto.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.terminal.api.autoservice.deliveryConfirm; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/11/14 15:28 + * @Description + */ +@Data +public class DeliveryConDto implements Dto { + private static final long serialVersionUID = -7339973589789913061L; + @JsonProperty("vin") + private String vinNo; + @JsonProperty("carSid") + private String vinSid; + @ApiModelProperty("交付清单") + private List manifest = new ArrayList<>(); + + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConItemVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConItemVo.java index ede8821f6c..c752143113 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConItemVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConItemVo.java @@ -17,4 +17,6 @@ public class DeliveryConItemVo implements Vo { private String name; @ApiModelProperty("默认true") private boolean state; + + private String itemKey; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConListVo.java index 4869a9b1d3..2db7ccb20e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConListVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConListVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.deliveryConfirm; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,5 +18,9 @@ public class DeliveryConListVo implements Vo { @ApiModelProperty("车架号") private String vin; - private List mainfest; + @ApiModelProperty("车辆sid") + @JsonProperty("carSid") + private String vinSid; + + private List manifest; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConQuery.java index 41de82384a..5d5255f97a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConQuery.java @@ -17,4 +17,6 @@ public class DeliveryConQuery implements Query { private List list; private String userSid; + + private String contractId; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConVo.java index 15a187df23..a2183674b0 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.deliveryConfirm; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,8 +16,9 @@ import java.util.List; public class DeliveryConVo implements Vo { private static final long serialVersionUID = 3387249405937612233L; - @ApiModelProperty("合同sid") - private String contractSid; + @ApiModelProperty("合同id") + @JsonProperty("contractId") + private String contractId; @ApiModelProperty("接收人") private String name; @ApiModelProperty("身份证号") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConfirmFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConfirmFeign.java index 64a8dbe18b..487dd336ff 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConfirmFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConfirmFeign.java @@ -7,9 +7,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.List; + /** * @Author dimengzhe * @Date 2022/11/10 15:41 @@ -33,4 +36,14 @@ public interface DeliveryConfirmFeign { @ResponseBody ResultBean getDeliveryBill(@RequestBody DeliveryConQuery deliveryConQuery); + @ApiOperation("保存确认交付信息") + @PutMapping("/saveDeliveryBill") + @ResponseBody + ResultBean> saveDeliverybill(@RequestBody DeliveryDto dto); + + @ApiOperation("获取交车确认列表") + @PostMapping("/getDeliveryConfirmList") + @ResponseBody + ResultBean> getDeliveryConfirmList(@RequestBody PagerQuery pagerQuery); + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConfirmVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConfirmVo.java index 2a1be46b27..5cf4f8890b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConfirmVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConfirmVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.deliveryConfirm; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,19 +17,25 @@ import java.util.List; public class DeliveryConfirmVo implements Vo { private static final long serialVersionUID = 2889347824395603659L; @ApiModelProperty("合同编号") + @JsonProperty("contractId") private String contractNo; @ApiModelProperty("合同状态") private String contractStateKey; @ApiModelProperty("合同状态") + @JsonProperty("contractState") private String contractStateValue; @ApiModelProperty("客户名称") private String customerName; @ApiModelProperty("付款方式") + @JsonProperty("payType") private String payTypeValue; @ApiModelProperty("付款方式key") private String payTypeKey; - private List list = new ArrayList<>(); + private List vinList = new ArrayList<>(); + + @ApiModelProperty("合同sid") + private String contractSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryDto.java new file mode 100644 index 0000000000..325d9d65e6 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryDto.java @@ -0,0 +1,48 @@ +package com.yxt.anrui.terminal.api.autoservice.deliveryConfirm; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/11/14 15:30 + * @Description + */ +@Data +public class DeliveryDto implements Dto { + private static final long serialVersionUID = -1537198808834710187L; + + @ApiModelProperty("合同编号") + @JsonProperty("contractId") + private String contractNo; + + @ApiModelProperty("接收人") + @JsonProperty("name") + private String recipient; + + @ApiModelProperty("身份证号") + @JsonProperty("idNumber") + private String idNo; + + @ApiModelProperty("联系电话") + private String mobile; + @ApiModelProperty("车辆交付日期") + @JsonProperty("date") + private String deliverDate; + + @ApiModelProperty("车辆交付地点") + @JsonProperty("address") + private String deliverAddress; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("机构sid:当前部门的全路径") + private String orgPath; + + private List vinList; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryItemDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryItemDto.java new file mode 100644 index 0000000000..2c45804dd1 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryItemDto.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.terminal.api.autoservice.deliveryConfirm; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/11/14 15:31 + * @Description + */ +@Data +public class DeliveryItemDto implements Dto { + private static final long serialVersionUID = 675087259391359115L; + @ApiModelProperty("交付清单名称") + private String name; + @ApiModelProperty("是否勾选，状态") + private boolean state; + @ApiModelProperty("交付清单key") + private String itemKey; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryListQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryListQuery.java new file mode 100644 index 0000000000..3536c57d73 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryListQuery.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.terminal.api.autoservice.deliveryConfirm; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/11/14 16:19 + * @Description + */ +@Data +public class DeliveryListQuery implements Query { + private static final long serialVersionUID = 676535497310364791L; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("客户名称/合同编号") + private String name; + + @ApiModelProperty("orgPath") + private String orgPath; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryListVo.java new file mode 100644 index 0000000000..30d27b9765 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryListVo.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.terminal.api.autoservice.deliveryConfirm; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/11/14 16:16 + * @Description + */ +@Data +public class DeliveryListVo implements Vo { + private static final long serialVersionUID = -8831277052913251600L; + + @ApiModelProperty("合同编号") + @JsonProperty("contractId") + private String contractNo; + @ApiModelProperty("交车状态key") + private String handoverStateKey; + @ApiModelProperty("交车状态") + @JsonProperty("deliveryState") + private String handoverStateValue; + @ApiModelProperty("客户名称") + @JsonProperty("name") + private String customerName; + @ApiModelProperty("车型别名") + @JsonProperty("model") + private String modelName; + @ApiModelProperty("交车数量") + private String number; + @ApiModelProperty("是否显示交车确认") + private boolean showUpdate; + @ApiModelProperty("记录sid") + private String sid; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryVo.java index 9d393ecfbd..72f86654e6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.deliveryConfirm; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import lombok.Data; @@ -11,7 +12,8 @@ import lombok.Data; @Data public class DeliveryVo implements Vo { private static final long serialVersionUID = 1429737874187218432L; - + @JsonProperty("vin") private String vinNo; + @JsonProperty("carSid") private String vinSid; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryConfirm/DeliveryConfirmRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryConfirm/DeliveryConfirmRest.java index f504cb6385..afecb1329d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryConfirm/DeliveryConfirmRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryConfirm/DeliveryConfirmRest.java @@ -9,6 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import java.util.List; + /** * @Author dimengzhe * @Date 2022/11/10 15:43 @@ -30,4 +32,14 @@ public class DeliveryConfirmRest implements DeliveryConfirmFeign { public ResultBean getDeliveryBill(DeliveryConQuery deliveryConQuery) { return deliveryConfirmService.getDeliveryBill(deliveryConQuery); } + + @Override + public ResultBean> saveDeliverybill(DeliveryDto dto) { + return deliveryConfirmService.saveDeliverybill(dto); + } + + @Override + public ResultBean> getDeliveryConfirmList(PagerQuery pagerQuery) { + return deliveryConfirmService.getDeliveryConfirmList(pagerQuery); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryConfirm/DeliveryConfirmService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryConfirm/DeliveryConfirmService.java index 67c9ea5e62..92f30e84be 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryConfirm/DeliveryConfirmService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryConfirm/DeliveryConfirmService.java @@ -2,13 +2,14 @@ package com.yxt.anrui.terminal.biz.autoservice.deliveryConfirm; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; +import com.yxt.anrui.buscenter.api.bushandover.*; +import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemsFeign; +import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemsQuery; +import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemsVo; import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitFeign; import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitQuery; import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitVo; -import com.yxt.anrui.terminal.api.autoservice.deliveryConfirm.DeliveryConQuery; -import com.yxt.anrui.terminal.api.autoservice.deliveryConfirm.DeliveryConVo; -import com.yxt.anrui.terminal.api.autoservice.deliveryConfirm.DeliveryConfirmQuery; -import com.yxt.anrui.terminal.api.autoservice.deliveryConfirm.DeliveryConfirmVo; +import com.yxt.anrui.terminal.api.autoservice.deliveryConfirm.*; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -31,6 +32,10 @@ public class DeliveryConfirmService { @Autowired private BusHandoverWaitFeign busHandoverWaitFeign; + @Autowired + private BusHandoverFeign busHandoverFeign; + @Autowired + private BusHandoverItemsFeign busHandoverItemsFeign; public ResultBean> getDeliveryConfirmNotList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); @@ -44,6 +49,37 @@ public class DeliveryConfirmService { } public ResultBean getDeliveryBill(DeliveryConQuery deliveryConQuery) { - return null; + ResultBean rb = ResultBean.fireFail(); + DeliveryConVo vo = new DeliveryConVo(); + BusHandoverItemsQuery busHandoverItemsQuery = new BusHandoverItemsQuery(); + BeanUtil.copyProperties(deliveryConQuery, busHandoverItemsQuery); + ResultBean resultBean = busHandoverItemsFeign.getDeliveryBill(busHandoverItemsQuery); + if (resultBean.getSuccess()) { + BusHandoverItemsVo busHandoverItemsVo = resultBean.getData(); + BeanUtil.copyProperties(busHandoverItemsVo, vo); + } else { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(vo); + } + + public ResultBean> saveDeliverybill(DeliveryDto dto) { + ResultBean> rb = ResultBean.fireFail(); + BusHandoverDto busHandoverDto = new BusHandoverDto(); + BeanUtil.copyProperties(dto, busHandoverDto); + ResultBean> resultBean = busHandoverFeign.saveDeliverybill(busHandoverDto); + List list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), DeliveryBillListVo.class)).collect(Collectors.toList()); + return rb.success().setData(list); + } + + public ResultBean> getDeliveryConfirmList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); + ResultBean> resultBean = busHandoverFeign.getDeliveryConfirmList(pq); + List voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), DeliveryListVo.class)).collect(Collectors.toList()); + PagerVo v = new PagerVo<>(); + BeanUtil.copyProperties(resultBean.getData(), v); + v.setRecords(voList); + return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v); } }