From fa896988fb4c3be0117ad9311ef9d15c2bd1a414 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Thu, 29 Dec 2022 08:51:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=82=E8=BD=A6=E5=8F=B0=E8=B4=A6=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/basetrailer/BaseTrailerDetailsVo.java |  8 ++-
 .../api/basetrailer/BaseTrailerQuery.java     |  8 ++-
 .../base/api/basetrailer/BaseTrailerVo.java   | 10 +--
 .../basetrailermodel/BaseTrailerModel.java    |  2 -
 .../basevehicle/BaseExistingCarListVo.java    |  8 +++
 .../biz/basetrailer/BaseTrailerMapper.xml     |  7 ++-
 .../biz/basetrailer/BaseTrailerService.java   | 61 ++++++++++++++++---
 .../biz/basevehicle/BaseVehicleService.java   |  4 ++
 .../portal/biz/flow/FlowableService.java      |  1 -
 9 files changed, 88 insertions(+), 21 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerDetailsVo.java
index 66d5989f14..6c6659083f 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerDetailsVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerDetailsVo.java
@@ -34,6 +34,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-base(基础信息) <br/>
  * File: BaseTrailerVo.java <br/>
@@ -55,6 +57,8 @@ public class BaseTrailerDetailsVo implements Vo {
 	private static final long serialVersionUID = 7329089796476337351L;
 	@ApiModelProperty("挂车sid")
 	private String sid;
+	@ApiModelProperty("挂车车架号")
+	private String vinNo;
 	@ApiModelProperty("挂车车型sid")
 	private String trailerModelSid;
 	@ApiModelProperty("挂车车型")
@@ -99,7 +103,7 @@ public class BaseTrailerDetailsVo implements Vo {
 	@ApiModelProperty("分公司名称")
 	private String useOrgName;
 	@ApiModelProperty("发票照片")
-	private CommonAppendixVo invoicePic;
+	private List<CommonAppendixVo> invoicePic;
 	@ApiModelProperty("合格证照片")
-	private CommonAppendixVo certificatePic;
+	private List<CommonAppendixVo> certificatePic;
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerQuery.java
index 7bb01758c8..5ff47c22e7 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerQuery.java
@@ -53,10 +53,14 @@ public class BaseTrailerQuery implements Query {
 	private String vinNo;
 	@ApiModelProperty("车辆品牌sid")
     private String carBrand; // 车辆品牌sid
-	@ApiModelProperty("车辆型号sid")
-	private String carModelSid; // 车辆型号sid
+	@ApiModelProperty("车辆型号")
+	private String carModelName; // 车辆型号
 	@ApiModelProperty("厂商sid")
     private String settlementSid; // 厂商sid
 	@ApiModelProperty("分公司sid")
 	private String useOrgSid;
+	@ApiModelProperty("入库开始日期")
+	private String warehousingStartDate;
+	@ApiModelProperty("入库结束日期")
+	private String warehousingEndDate;
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerVo.java
index 47bc72a268..d26cca126a 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerVo.java
@@ -54,6 +54,10 @@ public class BaseTrailerVo implements Vo {
 
 	@ApiModelProperty("挂车sid")
 	private String sid; // 挂车sid
+	@ApiModelProperty("挂车车型sid")
+	private String trailerModelSid;
+	@ApiModelProperty("挂车车型信息")
+	private String trailerModel;
 	@ApiModelProperty("挂车车架号")
 	private String vinNo;
 	@ApiModelProperty("厂商结算价")
@@ -67,11 +71,9 @@ public class BaseTrailerVo implements Vo {
 	@ApiModelProperty("销售专员名称")
 	private String staffName;
 	@ApiModelProperty("出库日期")
-	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-	private Date issueDate;
+	private String issueDate;
 	@ApiModelProperty("入库日期")
-	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-	private Date warehousingDate;
+	private String warehousingDate;
 	@ApiModelProperty("库存状态value")
 	private String stockStateValue;
 	@ApiModelProperty("成交价")
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModel.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModel.java
index ae2584cc7f..9417d61ea3 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModel.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModel.java
@@ -54,8 +54,6 @@ public class BaseTrailerModel extends BaseEntity {
     private String brandSid; // 车辆品牌sid
 	@ApiModelProperty("车辆品牌名称")
     private String brandName; // 车辆品牌名称
-	@ApiModelProperty("车辆型号sid")
-    private String carModelSid; // 车辆型号sid
 	@ApiModelProperty("车辆型号名称")
     private String carModelName; // 车辆型号名称
 	@ApiModelProperty("厂商sid")
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseExistingCarListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseExistingCarListVo.java
index 869c834460..edcfe8ce27 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseExistingCarListVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseExistingCarListVo.java
@@ -38,4 +38,12 @@ public class BaseExistingCarListVo implements Vo {
     private String saleOrderNo;
     @ApiModelProperty("销售订单日期")
     private String saleOrderDate;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("销售专员")
+    private String staffName;
+    @ApiModelProperty("销售专员sid")
+    private String staffSid;
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml
index 4882fdb26c..5582502e37 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml
@@ -5,9 +5,12 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.base.api.basetrailer.BaseTrailerVo">
         SELECT
-        *
+        bt.*,
+        btm.*
         FROM
-        base_trailer
+        base_trailer bt
+        LEFT JOIN base_trailer_model btm
+        ON bt.`trailerModelSid` = btm.`sid`
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
index 894aeb4e66..26ec1059ca 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
@@ -57,6 +57,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -93,19 +94,24 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
     private QueryWrapper<BaseTrailer> createQueryWrapper(BaseTrailerQuery query) {
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<BaseTrailer> qw = new QueryWrapper<>();
-        qw.eq("useOrgSid",query.getUseOrgSid());
+        qw.eq("bt.useOrgSid",query.getUseOrgSid());
         if (StringUtils.isNotBlank(query.getVinNo())) {
-            qw.eq("vinNo", query.getVinNo());
+            qw.like("bt.vinNo", query.getVinNo());
         }
         if (StringUtils.isNotBlank(query.getCarBrand())) {
-            qw.eq("carBrand", query.getCarBrand());
+            qw.eq("btm.brandSid", query.getCarBrand());
         }
         if (StringUtils.isNotBlank(query.getSettlementSid())) {
-            qw.eq("settlementSid", query.getSettlementSid());
+            qw.eq("btm.manufacturerSid", query.getSettlementSid());
         }
-        if (StringUtils.isNotBlank(query.getCarModelSid())) {
-            qw.like("carModelSid", query.getCarModelSid());
+        if (StringUtils.isNotBlank(query.getCarModelName())) {
+            qw.like("btm.carModelName", query.getCarModelName());
         }
+        String warehousingStartDate = query.getWarehousingStartDate();
+        String warehousingEndDate = query.getWarehousingEndDate();
+        qw.apply(StringUtils.isNotEmpty(warehousingStartDate), "date_format (bt.warehousingDate,'%Y-%m-%d') >= date_format('" + warehousingStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(warehousingEndDate), "date_format (bt.warehousingDate,'%Y-%m-%d') <= date_format('" + warehousingEndDate + "','%Y-%m-%d')"
+                );
         return qw;
     }
 
@@ -114,6 +120,18 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         QueryWrapper<BaseTrailer> qw = createQueryWrapper(query);
         IPage<BaseTrailer> page = PagerUtil.queryToPage(pq);
         IPage<BaseTrailerVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (BaseTrailerVo record : pagging.getRecords()) {
+            String trailerModelSid = record.getTrailerModelSid();
+            BaseTrailerModel baseTrailerModel = baseTrailerModelService.fetchBySid(trailerModelSid);
+            String appearanceSizeLong = baseTrailerModel.getAppearanceSizeLong();
+            String appearanceSizeWide = baseTrailerModel.getAppearanceSizeWide();
+            String appearanceSizeHigh = baseTrailerModel.getAppearanceSizeHigh();
+            String appearanceSizeTotalHigh = baseTrailerModel.getAppearanceSizeTotalHigh();
+            String trailerTypeValue = baseTrailerModel.getTrailerTypeValue();
+            StringBuilder trailerModel = new StringBuilder();
+            trailerModel.append(trailerTypeValue).append("(").append("长").append(appearanceSizeLong).append("mm，").append("宽").append(appearanceSizeWide).append("mm，").append("高").append(appearanceSizeHigh).append("mm，").append("总高").append(appearanceSizeTotalHigh).append("mm").append(")");
+            record.setTrailerModel(trailerModel.toString());
+        }
         PagerVo<BaseTrailerVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -154,21 +172,25 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
             }
         }
         List<CommonAppendixVo> commonAppendixVos = commonAppendixService.selByLinkSid(sid);
+        List<CommonAppendixVo> invoicePic = new ArrayList<>();
+        List<CommonAppendixVo> certificatePic = new ArrayList<>();
         for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
             if (commonAppendixVo.getAttachType().equals("挂车发票照片")){
                 String filePath = commonAppendixVo.getFilePath();
                 String urlPrefix = fileUploadComponent.getUrlPrefix();
                 filePath = urlPrefix + filePath;
                 commonAppendixVo.setFilePath(filePath);
-                baseTrailerDetailsVo.setInvoicePic(commonAppendixVo);
+                invoicePic.add(commonAppendixVo);
             }else if (commonAppendixVo.getAttachType().equals("挂车合格证照片")){
                 String filePath = commonAppendixVo.getFilePath();
                 String urlPrefix = fileUploadComponent.getUrlPrefix();
                 filePath = urlPrefix + filePath;
                 commonAppendixVo.setFilePath(filePath);
-                baseTrailerDetailsVo.setCertificatePic(commonAppendixVo);
+                certificatePic.add(commonAppendixVo);
             }
         }
+        baseTrailerDetailsVo.setInvoicePic(invoicePic);
+        baseTrailerDetailsVo.setCertificatePic(certificatePic);
         return rb.success().setData(baseTrailerDetailsVo);
     }
 
@@ -226,6 +248,29 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
     public ResultBean updateTrailer(BaseTrailerDto dto, String sid) {
         ResultBean rb = ResultBean.fireFail();
         int count = updateBySid(dto, sid);
+        commonAppendixService.deleteFiles(sid);
+        List<CommonAppendixDto> invoicePics = dto.getInvoicePic();
+        List<CommonAppendixDto> certificatePics = dto.getCertificatePic();
+        for (CommonAppendixDto invoicePic : invoicePics) {
+            invoicePic.setLinkSid(sid);
+            String invoiceFilePath = invoicePic.getFilePath();
+            if (invoiceFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                invoiceFilePath = invoiceFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            invoicePic.setFilePath(invoiceFilePath);
+            invoicePic.setAttachType("挂车发票照片");
+            commonAppendixService.saveOrUpdateDto(invoicePic);
+        }
+        for (CommonAppendixDto certificatePic : certificatePics) {
+            certificatePic.setLinkSid(sid);
+            String certificateFilePath = certificatePic.getFilePath();
+            if (certificateFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                certificateFilePath = certificateFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            certificatePic.setFilePath(certificateFilePath);
+            certificatePic.setAttachType("挂车合格证照片");
+            commonAppendixService.saveOrUpdateDto(certificatePic);
+        }
         if (count == 0) {
             return rb.setMsg("修改失败");
         }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
index e3be3ae90e..8a6a608880 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@@ -2157,6 +2157,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                 if (!busSalesOrderDetailsVo.getNodeState().equals("待提交") && !busSalesOrderDetailsVo.getNodeState().equals("已终止")) {
                     existingCarListVo.setSaleOrderNo(busSalesOrderDetailsVo.getBillNo());
                     existingCarListVo.setSaleOrderDate(busSalesOrderDetailsVo.getCreateDate());
+                    existingCarListVo.setCustomerSid(busSalesOrderDetailsVo.getCustomerSid());
+                    existingCarListVo.setCustomerName(busSalesOrderDetailsVo.getCustomerName());
+                    existingCarListVo.setStaffSid(busSalesOrderDetailsVo.getStaffSid());
+                    existingCarListVo.setStaffName(busSalesOrderDetailsVo.getStaffName());
                     break;
                 }
             }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
index d2643fb3bb..d0c2221b7c 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
@@ -448,7 +448,6 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         }
         taskQuery.setFields(taskParamList);
         taskQueryPagerQuery.setParams(taskQuery);
-
         return flowTaskFeign.businessDoneList(userSid, taskQueryPagerQuery);
     }