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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml

@@ -81,7 +81,7 @@
                     and omr.impact_eu_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%'))
             </if>
             <if test="otaManageApplyEO.appliedVehicleProject != null and otaManageApplyEO.appliedVehicleProject != ''">
-                and omr.vehicle_type LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.appliedVehicleProject}),'%')
+                and omr.applied_vehicle_project LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.appliedVehicleProject}),'%')
             </if>
         </where>
         order by omr.id desc

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

@@ -1,5 +1,6 @@
 package com.jero.modules.ota.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.enums.CutEnum;
@@ -189,19 +190,38 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
      */
     @Override
     public List<OtaManageApplyEO> getOtaPage(OtaManageApplyEO otaManageApplyEO) {
+        LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        boolean otaManager = isOtaManager();
         List<OtaManageApplyEO> otaManageApplyEOList = this.getBaseMapper().getOtaList(otaManageApplyEO);
+        List<OtaManageApplyEO> dataList = new ArrayList<>();
+
+        //去跟manager和studio权限
+        if(otaManager){
+            dataList = otaManageApplyEOList;
+        }else{
+            LambdaQueryWrapper<OtaManagePermission> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(OtaManagePermission::getUserId,currentUser.getId());
+            List<OtaManagePermission> managePermissionList = otaManagePermissionService.list(wrapper);
+            if(!managePermissionList.isEmpty()){
+                List<String> applyIdList = managePermissionList.stream().map(OtaManagePermission::getApplyId).distinct().collect(Collectors.toList());
+                List<OtaManageApplyEO> collect = otaManageApplyEOList.stream().filter(e -> applyIdList.contains(e.getPlannedBpLaunchBatch())).collect(Collectors.toList());
+                dataList = collect;
+            }
+        }
+
         List<OtaManageApplyEO> result = new ArrayList<>();
-        if (!otaManageApplyEOList.isEmpty()) {
+        if (!dataList.isEmpty()) {
             List<String> otaNameList = OtaCarEnum.getOtaNameList();
-            List<String> plannedBpLaunchBatchList = otaManageApplyEOList.stream()
+            List<String> plannedBpLaunchBatchList = dataList.stream()
                     .filter(e -> StringUtils.isNotBlank(e.getPlannedBpLaunchBatch()))
                     .map(OtaManageApplyEO::getPlannedBpLaunchBatch).distinct().collect(Collectors.toList());
             if (!plannedBpLaunchBatchList.isEmpty()) {
                 for (String plannedBpLaunchBatch : plannedBpLaunchBatchList) {
                     OtaManageApplyEO manageApplyEO = new OtaManageApplyEO();
                     manageApplyEO.setPlannedBpLaunchBatch(plannedBpLaunchBatch);
+                    manageApplyEO.setId(plannedBpLaunchBatch);
 
-                    List<OtaManageApplyEO> otaManageApplyEOS = otaManageApplyEOList.stream()
+                    List<OtaManageApplyEO> otaManageApplyEOS = dataList.stream()
                             .filter(e -> plannedBpLaunchBatch.equals(e.getPlannedBpLaunchBatch())).collect(Collectors.toList());
                     if(!otaManageApplyEOS.isEmpty()){
                         //发布时间
@@ -614,7 +634,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
         List<OtaManageApplyEO> otaManageApplyEOList = this.getBaseMapper().getOtaCarPage(otaManageApplyEO);
         List<OtaManageApplyEO> list = new ArrayList<>();
         String carMarket = otaManageApplyEO.getAppliedVehicleProject();
-        if (StringUtils.isNotBlank(carMarket) && !"全部".equals(carMarket) && !otaManageApplyEOList.isEmpty()) {
+        if (StringUtils.isNotBlank(carMarket) && !"全部".equals(carMarket) && !"All".equals(carMarket) && !otaManageApplyEOList.isEmpty()) {
 
             String[] conditionSplit = carMarket.split(" ");
 

jero-web/src/views/otamanagement/otaAuthentication/components/batSetting.vue

@@ -164,11 +164,12 @@ export default {
           this.confirmLoading = true
           postAction('/ota/otaManageApplyEO/updateVdrBatch', query).then((res) => {
             if (res.success) {
-              this.$message.success(this.$t('OperationSuccessful'))
+              // this.$message.success(this.$t('OperationSuccessful'))
               this.visible = false
               this.confirmLoading = false
               this.ids = []
-              this.$emit('getList')
+              this.$emit('msgForm',res.result.msgList)
+              // this.$emit('getList')
             } else {
               this.$message.warning(this.$t('operationFailed'))
               this.confirmLoading = false

jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue

@@ -247,7 +247,7 @@
                       @showSizeChange="SizeChange" />
       </div>
     </div>
-    <batSetting :url="url" @getList="getList" ref="batSettingRef"/>
+    <batSetting :url="url" @getList="getList" @msgForm='msgForm' ref="batSettingRef"/>
     <applyforrematch :url="url" @getList="getList" ref="applyforrematchRef"/>
     <rejectReason :url="url" @getList="getList" @msgForm='msgForm' ref="rejectReasonRef"/>
     <remark @remarkForm='remarkForm' ref="remarkRef"/>