Merge remote-tracking branch 'origin/dev_20230808_OTA' into dev_20230808_OTA

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) {
+	public Result<?> getCarList(String cut,String plannedBpLaunchBatch) {
-		List<String> result = otaManageApplyEOService.getCarList(cut);
+		List<String> result = otaManageApplyEOService.getCarList(cut,plannedBpLaunchBatch);
 		return Result.OK(result);
 	}
 

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);
 

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">

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);
 
 	/**
 	 *

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java

@@ -769,7 +769,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_
@@ -815,8 +815,8 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
      * @return
      */
     @Override
-    public List<String> getCarList(String cut) {
+    public List<String> getCarList(String cut,String plannedBpLaunchBatch) {
-        List<OtaManageApplyEO> otaManageApplyEOS = this.getBaseMapper().getOtaCarList();
+        List<OtaManageApplyEO> otaManageApplyEOS = this.getBaseMapper().getOtaCarList(plannedBpLaunchBatch);
         List<String> result = new LinkedList<>();
         if (CutEnum.CN.getValue().equals(cut)) {
             result.add("全部");

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 {
@@ -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,7 @@ export default {
     },
     handChange(val){
       this.vehicleTypeCode = val
-      this.preservation()
+      this.pageNo = 1
       this.getHeader()
       this.$forceUpdate()
     },
@@ -1032,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
+      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,