OTA-升级活动备案-处理列表任务名称。

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java

@@ -90,6 +90,7 @@ public class OtaBaSjListController extends JeroController<OtaBaSjList, IOtaBaSjL
         }
         queryWrapper.orderByDesc(OtaBaSjList::getCreateTime);
         IPage<OtaBaSjList> pageList = otaBaSjListService.page(page, queryWrapper);
+        this.otaBaSjListService.disposeData(pageList.getRecords(),otaBaSjList);
         return Result.OK(pageList);
     }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java

@@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -163,6 +164,10 @@ public class OtaBaSjList implements Serializable {
     @ApiModelProperty(value = "升级状态")
     private java.lang.String sjzt;
 
+    // 任务名称
+    @TableField(exist = false)
+    private String rwmc;
+
     public void updateData(OtaBaSjSjmbcx otaBaSjSjmbcx) {
         this.cpdjbh = otaBaSjSjmbcx.getBabh();
         this.ggpc = otaBaSjSjmbcx.getBapc();

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

@@ -73,4 +73,11 @@ public interface IOtaBaSjListService extends IService<OtaBaSjList> {
     void importData(MultipartFile file, String cut, StringBuilder errMsg) throws Exception;
 
     void exportData(String otaId, HttpServletResponse response, HttpServletRequest request) throws Exception;
+
+    /**
+     * 处理数据
+     * @param datas
+     * @param otaBaSjList
+     */
+    void disposeData(List<OtaBaSjList> datas, OtaBaSjList otaBaSjList);
 }

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

@@ -1,13 +1,16 @@
 package com.jero.modules.ota.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.exception.JeroBootException;
 import com.jero.modules.ota.entity.OtaBaSjList;
 import com.jero.modules.ota.entity.OtaBaSjLsjl;
+import com.jero.modules.ota.entity.OtaBaSjQtsjxx;
 import com.jero.modules.ota.entity.OtaBaSjSjmbcx;
 import com.jero.modules.ota.mapper.OtaBaSjListMapper;
 import com.jero.modules.ota.service.*;
 import com.jero.modules.ota.utils.ImportFileUtil;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -21,6 +24,7 @@ import java.io.FileOutputStream;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 升级备案-升级活动备案列表
@@ -229,4 +233,31 @@ public class OtaBaSjListServiceImpl extends ServiceImpl<OtaBaSjListMapper, OtaBa
         ImportFileUtil.toZip(exportFile.getCanonicalPath(), fos1, true);
         ImportFileUtil.exportTemplate(response, outPath);
     }
+
+    /**
+     * 处理数据
+     * @param datas
+     * @param otaBaSjList
+     */
+    @Override
+    public void disposeData(List<OtaBaSjList> datas, OtaBaSjList otaBaSjList) {
+        if(CollectionUtils.isNotEmpty(datas)){
+            List<String> otaBaSjListIdList = datas.stream().map(OtaBaSjList::getId).distinct().collect(Collectors.toList());
+            QueryWrapper<OtaBaSjQtsjxx> otaBaSjQtsjxxQueryWrap = new QueryWrapper<>();
+            otaBaSjQtsjxxQueryWrap.lambda().in(OtaBaSjQtsjxx::getOtaId,otaBaSjListIdList);
+            List<OtaBaSjQtsjxx> otaBaSjQtsjxxList = this.otaBaSjQtsjxxService.list(otaBaSjQtsjxxQueryWrap);
+            datas.forEach(data -> {
+                if (CollectionUtils.isNotEmpty(otaBaSjQtsjxxList)) {
+                    String rwmc = otaBaSjQtsjxxList.stream().filter(otaBaSjQtsjxx -> {
+                        boolean flag = false;
+                        if(StringUtils.equals(otaBaSjQtsjxx.getOtaId(), data.getId())){
+                            flag = true;
+                        }
+                        return flag;
+                    }).map(OtaBaSjQtsjxx::getRwmc).collect(Collectors.joining(","));
+                    data.setRwmc(rwmc);
+                }
+            });
+        }
+    }
 }