From 0cbc77ec9f004b565928cb627b619d9c7fbe399b Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 24 Aug 2023 16:17:58 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E4=BC=A0=E5=8F=82=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/otamanagement/otaAuthentication/components/detil.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
index ee8ed0400..fbb483ac4 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
@@ -905,7 +905,7 @@ export default {
     if(this.$route.query.vehicleTypeCode){
       this.vehicleTypeCode = this.$route.query.vehicleTypeCode
     }
-    getAction('/ota/otaManageApplyEO/getCarList', {}).then((res) => {
+    getAction('/ota/otaManageApplyEO/getCarList', {plannedBpLaunchBatch:this.$route.query.plannedBpLaunchBatch}).then((res) => {
       if (res.success) {
         this.typeList = res.result
       } else {

From ef4e9b9f1e6681b6ef720d3b7dc43dd09bd6ff64 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 24 Aug 2023 16:43:24 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E9=80=89=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ota/controller/OtaManageApplyEOController.java  | 4 ++--
 .../com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java | 2 +-
 .../jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml  | 3 +++
 .../jero/modules/ota/service/IOtaManageApplyEOService.java  | 2 +-
 .../ota/service/impl/OtaManageApplyEOServiceImpl.java       | 6 +++---
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java
index 82a8e27e3..736b86a3d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java
@@ -159,8 +159,8 @@ public class OtaManageApplyEOController extends JeroController<OtaManageApplyEO,
 	@AutoLog(value = "下拉数据-全部和分车型（不含年款）")
 	@ApiOperation(value="下拉数据-全部和分车型（不含年款）", notes="下拉数据-全部和分车型（不含年款）")
 	@GetMapping(value = "/getCarList")
-	public Result<?> getCarList(String cut) {
-		List<String> result = otaManageApplyEOService.getCarList(cut);
+	public Result<?> getCarList(String cut,String plannedBpLaunchBatch) {
+		List<String> result = otaManageApplyEOService.getCarList(cut,plannedBpLaunchBatch);
 		return Result.OK(result);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java
index e4cdc8894..6a2513245 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java
@@ -31,7 +31,7 @@ public interface OtaManageApplyEOMapper extends BaseMapper<OtaManageApplyEO> {
 
     List<VersionVO> getByAppliedVehicleProject(@Param("appliedVehicleProject") String appliedVehicleProject);
 
-    List<OtaManageApplyEO> getOtaCarList();
+    List<OtaManageApplyEO> getOtaCarList(@Param("plannedBpLaunchBatch") String plannedBpLaunchBatch);
 
     List<OtaManageReceiveNsdpEO> getReleaseDate(@Param("plannedBpLaunchBatchList") List<String> plannedBpLaunchBatchList);
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
index ee351c024..55b5b8a81 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
@@ -94,6 +94,9 @@
 
     <select id="getOtaCarList" resultType="com.jero.modules.ota.entity.OtaManageApplyEO">
         select * from ota_manage_receive
+        <if test="plannedBpLaunchBatch != null and plannedBpLaunchBatch != ''">
+            where planned_bp_launch_batch =#{plannedBpLaunchBatch}
+        </if>
     </select>
 
     <select id="getReleaseDate" resultType="com.jero.modules.ota.entity.OtaManageReceiveNsdpEO">
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java
index ba3ff0d77..e26df0208 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java
@@ -95,7 +95,7 @@ public interface IOtaManageApplyEOService extends IService<OtaManageApplyEO> {
 	 下拉数据-全部和分车型（不含年款）
 	 * @return
 	 */
-	List<String> getCarList(String cut);
+	List<String> getCarList(String cut,String plannedBpLaunchBatch);
 
 	/**
 	 *
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
index ca76791c1..efc59c887 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
@@ -757,7 +757,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
      */
     @Override
     public Map<String, Object> getPullDownList() {
-        List<OtaManageApplyEO> otaManageApplyEOS = this.getBaseMapper().getOtaCarList();
+        List<OtaManageApplyEO> otaManageApplyEOS = this.getBaseMapper().getOtaCarList(null);
         Map<String, Object> result = new HashMap<>();
         if (!otaManageApplyEOS.isEmpty()) {
             //软件版本 planned_bp_launch_batch_
@@ -803,8 +803,8 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
      * @return
      */
     @Override
-    public List<String> getCarList(String cut) {
-        List<OtaManageApplyEO> otaManageApplyEOS = this.getBaseMapper().getOtaCarList();
+    public List<String> getCarList(String cut,String plannedBpLaunchBatch) {
+        List<OtaManageApplyEO> otaManageApplyEOS = this.getBaseMapper().getOtaCarList(plannedBpLaunchBatch);
         List<String> result = new LinkedList<>();
         if (CutEnum.CN.getValue().equals(cut)) {
             result.add("全部");

From d7802ae216ffeed02972549893eb06e8b8e0d6a7 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 24 Aug 2023 16:49:14 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otaAuthentication/components/detil.vue       | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
index fbb483ac4..591c2c7e3 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
@@ -956,13 +956,17 @@ export default {
     },
     pageOnChange(page) {
       this.pageNo = page
-      this.preservation()
+      if(this.vehicleTypeCode !== this.$t('whole')){
+        this.preservation()
+      }
       this.getList()
     },
     SizeChange(page, pageSize) {
       this.pageNo = 1
       this.pageSize = pageSize
-      this.preservation()
+      if(this.vehicleTypeCode !== this.$t('whole')){
+        this.preservation()
+      }
       this.getList()
     },
     getList() {
@@ -1005,7 +1009,11 @@ export default {
     },
     handChange(val){
       this.vehicleTypeCode = val
-      this.preservation()
+      this.pageNo = 1
+      // console.log(this.vehicleTypeCode)
+      // if(this.vehicleTypeCode !== this.$t('whole')){
+        this.preservation()
+      // }
       this.getHeader()
       this.$forceUpdate()
     },
@@ -1032,7 +1040,7 @@ export default {
       }
       this.queryParam.appliedVehicleProject = this.vehicleTypeCode == this.$t('whole')?this.queryParam.appliedVehicleProject:this.vehicleTypeCode
       this.queryParam.plannedBpLaunchBatch = this.$route.query.plannedBpLaunchBatch
-      let exportName = this.$route.query.plannedBpLaunchBatch
+      let exportName = this.$route.query.plannedBpLaunchBatch + '.xlsx'
       let query = {
         exportName: exportName,
         selections: this.selectedRowKeys.join(','),

From a8af5db9d78604df7d2079c8040e92887d468843 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 24 Aug 2023 17:19:37 +0800
Subject: [PATCH 4/4] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E8=AF=A6=E6=83=85-?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otamanagement/otaAuthentication/components/detil.vue  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
index 591c2c7e3..dc89cf631 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
@@ -1010,10 +1010,6 @@ export default {
     handChange(val){
       this.vehicleTypeCode = val
       this.pageNo = 1
-      // console.log(this.vehicleTypeCode)
-      // if(this.vehicleTypeCode !== this.$t('whole')){
-        this.preservation()
-      // }
       this.getHeader()
       this.$forceUpdate()
     },
@@ -1040,9 +1036,9 @@ export default {
       }
       this.queryParam.appliedVehicleProject = this.vehicleTypeCode == this.$t('whole')?this.queryParam.appliedVehicleProject:this.vehicleTypeCode
       this.queryParam.plannedBpLaunchBatch = this.$route.query.plannedBpLaunchBatch
-      let exportName = this.$route.query.plannedBpLaunchBatch + '.xlsx'
+      let exportName = this.$route.query.plannedBpLaunchBatch+ ' ' + dateName + '.xlsx'
       let query = {
-        exportName: exportName,
+        exportName: this.$route.query.plannedBpLaunchBatch,
         selections: this.selectedRowKeys.join(','),
         ...this.queryParam,
         orderBy: this.orderBy,