From b11724033bb36ed29b950cd0ac97c46e31c8fa16 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 27 Jun 2023 17:45:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=AF=B9=E5=A4=96?=
 =?UTF-8?q?=E4=BA=A4=E4=BB=98=E6=9C=AA=E5=AE=8C=E6=88=90=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppNotCompleteRecordVo.java               |  1 -
 .../busvehicledatahandover/AppVinListVo.java  |  2 +
 .../BusVehicleDataHandoverMapper.xml          |  2 +-
 .../BusVehicleDataHandoverService.java        | 56 ++++++++++++++-----
 .../NotCompleteRecordVo.java                  |  1 -
 .../vehicleinformationhandover/VinListVo.java |  2 +
 6 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppNotCompleteRecordVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppNotCompleteRecordVo.java
index cfc7924efa..561698e738 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppNotCompleteRecordVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppNotCompleteRecordVo.java
@@ -19,7 +19,6 @@ public class AppNotCompleteRecordVo implements Vo {
     private String customerName;
     private String createInfo;
     private String carModel;
-    private String billId;
     private List<AppVinListVo> vinList = new ArrayList<>();
     private String createName;
     @ApiModelProperty("创建日期")
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppVinListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppVinListVo.java
index 5fc0fcfc6c..b124a68ab3 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppVinListVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppVinListVo.java
@@ -15,6 +15,8 @@ import java.util.List;
 public class AppVinListVo implements Vo {
     private String vin;
     private String recordSid;
+    private String billId;
+    private int viewType;
     private List<String> urls = new ArrayList<>();
 
 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml
index eff824305d..1a552b9715 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml
@@ -50,7 +50,7 @@
         ORDER BY bvh.createTime DESC
     </select>
     <select id="selectByNo" resultType="com.yxt.anrui.buscenter.api.busvehicledatahandover.AppVinListVo">
-        select vinNo as vin, sid as recordSid
+        select vinNo as vin, sid as recordSid,billNo as billId
         from bus_vehicle_data_handover
         where contractNo = #{contractNo}
           and completeStateKey = '001'
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java
index c78451d761..52de68739b 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java
@@ -580,31 +580,57 @@ public class BusVehicleDataHandoverService extends MybatisBaseService<BusVehicle
         IPage<AppNotCompleteRecordVo> pagging = baseMapper.notCompletePageVo(page, qw);
         List<AppNotCompleteRecordVo> records = pagging.getRecords();
         records.removeAll(Collections.singleton(null));
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        // 组装的map
+        Map<String, List<AppVinListVo>> map = new HashMap<>();
+        // 最后返回的list
         for (AppNotCompleteRecordVo record : records) {
+            List<AppVinListVo> forMapList = new ArrayList<>();
+            // 外层
             String createName = record.getCreateName();
-            Date createTime = record.getCreateTime();
-            String createTimeFormat = sdf.format(createTime);
-            record.setCreateInfo(createName + "," + createTimeFormat);
+            record.setCreateInfo(createName);
             String contractNo = record.getContractId();
-            //根据合同编号查询车辆列表
+            // 根据合同编号查询车辆列表
             List<AppVinListVo> vinListVos = baseMapper.selectByNo(contractNo);
             vinListVos.removeAll(Collections.singleton(null));
+            map.clear();
             if (!vinListVos.isEmpty()) {
+                // 组装
                 for (AppVinListVo vinVo : vinListVos) {
-                    String recordSid = vinVo.getRecordSid();
-                    BusVehicleDataHandover handover = fetchBySid(recordSid);
-                    String linkSid = handover.getLinkSid();
-                    //交车资料确认单
-                    List<BuscenterFile> fileList = buscenterFileService.selectByLinkSid(linkSid, BuscenterFileEnum.ENTRUST_CONFIRM_IMAGES.getAttachType());
-                    fileList.removeAll(Collections.singleton(null));
-                    if (!fileList.isEmpty()) {
-                        List<String> entrustConfirmImages = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
-                        vinVo.setUrls(entrustConfirmImages);
+                    // 循环当前合同下的车架号
+                    String billId = vinVo.getBillId();
+                    // 取出来
+                    List<AppVinListVo> vinListVos1 = map.get(billId);
+                    if (vinListVos1 == null)
+                        vinListVos1 = new ArrayList<>();
+                    vinListVos1.add(vinVo);
+                    map.put(billId, vinListVos1);
+                }
+                for (Map.Entry<String, List<AppVinListVo>> m : map.entrySet()) {
+                    List<AppVinListVo> value = m.getValue();
+                    for (int i = 0; i < value.size(); i++) {
+                        // 当前单据编号下的所有车架号
+                        AppVinListVo appVinListVo = value.get(i);
+                        if (i == 0) {
+                            AppVinListVo appVinListVo1 = new AppVinListVo();
+                            appVinListVo1.setViewType(0);
+                            appVinListVo1.setBillId(appVinListVo.getBillId());
+                            BusVehicleDataHandover handover = fetchBySid(appVinListVo.getRecordSid());
+                            String linkSid = handover.getLinkSid();
+                            //交车资料确认单
+                            List<BuscenterFile> fileList = buscenterFileService.selectByLinkSid(linkSid, BuscenterFileEnum.ENTRUST_CONFIRM_IMAGES.getAttachType());
+                            fileList.removeAll(Collections.singleton(null));
+                            if (!fileList.isEmpty()) {
+                                List<String> entrustConfirmImages = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
+                                appVinListVo1.setUrls(entrustConfirmImages);
+                            }
+                            forMapList.add(appVinListVo1);
+                        }
+                        appVinListVo.setViewType(1);
+                        forMapList.add(appVinListVo);
                     }
                 }
             }
-            record.setVinList(vinListVos);
+            record.setVinList(forMapList);
         }
         PagerVo<AppNotCompleteRecordVo> p = PagerUtil.pageToVo(pagging, null);
         return rb.success().setData(p);
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/NotCompleteRecordVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/NotCompleteRecordVo.java
index 33f20572ca..94489387ba 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/NotCompleteRecordVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/NotCompleteRecordVo.java
@@ -20,7 +20,6 @@ public class NotCompleteRecordVo implements Vo {
     private String customerName;
     private String createInfo;
     private String carModel;
-    private String billId;
     private List<VinListVo> vinList = new ArrayList<>();
 
 
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VinListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VinListVo.java
index 4f149f82c9..53cd0ad6b6 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VinListVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VinListVo.java
@@ -15,5 +15,7 @@ import java.util.List;
 public class VinListVo implements Vo {
     private String vin;
     private String recordSid;
+    private String billId;
+    private int viewType;
     private List<String> urls = new ArrayList<>();
 }