Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppCompleteRecordVo.java

@@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -25,7 +26,7 @@ public class AppCompleteRecordVo implements Vo {
     @ApiModelProperty("创建日期")
     private Date createTime;
     private String downLoadUrl;
-    private List<String> urls;
+    private List<String> urls = new ArrayList<>();
     private Boolean showUpload;
     private Boolean showDownload;
     private String linkSid;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml

@@ -46,11 +46,13 @@
             ${ew.sqlSegment}
         </where>
         group by bvh.contractNo
+        ORDER BY bvh.createTime DESC
     </select>
     <select id="selectByNo" resultType="com.yxt.anrui.buscenter.api.busvehicledatahandover.AppVinListVo">
         select vinNo as vin, sid as recordSid
         from bus_vehicle_data_handover
         where contractNo = #{contractNo}
+          and completeStateKey = '001'
     </select>
     <select id="completePageVo"
             resultType="com.yxt.anrui.buscenter.api.busvehicledatahandover.AppCompleteRecordVo">
@@ -67,5 +69,6 @@
             ${ew.sqlSegment}
         </where>
         group by bvh.billNo
+        ORDER BY bvh.createTime DESC
     </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java

@@ -689,9 +689,13 @@ public class BusVehicleDataHandoverService extends MybatisBaseService<BusVehicle
                             record.setUrls(entrustConfirmImages);
                         }
                     }
-                    sb.append(entity.getVinNo()).append(",");
+                    if (entity.getCompleteStateKey().equals("002")) {
+                        sb.append(entity.getVinNo()).append(",");
+                    }
+                }
+                if (sb.toString().length() > 0) {
+                    sb.delete(sb.length() - 1, sb.length());
                 }
-                sb.delete(sb.length() - 1, sb.length());
                 record.setVins(sb.toString());
             }
         }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

@@ -250,7 +250,6 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
         qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
                 apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
-        qw.orderByDesc("createTime");
         List<FinVehicleInvoiceExportVo> invoiceExportVoList = baseMapper.selByExcel(qw);
         int id = 1;
         for (FinVehicleInvoiceExportVo invoiceExportVo : invoiceExportVoList) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/CompleteRecordVo.java

@@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -24,7 +25,7 @@ public class CompleteRecordVo implements Vo {
     @ApiModelProperty("创建日期")
     private Date createTime;
     private String downLoadUrl;
-    private List<String> urls;
+    private List<String> urls = new ArrayList<>();
     private Boolean showUpload;
     private Boolean showDownload;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehInitVo.java

@@ -1,8 +1,10 @@
 package com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -17,6 +19,7 @@ public class VehInitVo implements Vo {
     private String contractId;
     private String customerName;
     private String operaName;
-    private String operaDate;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date operaDate;
     private List<VehListBean> list;
 }