修改信息完成

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/CoscoAnnualreviewTaskSupplierMapper.java

@@ -98,4 +98,11 @@ public interface CoscoAnnualreviewTaskSupplierMapper {
      * @return
      */
     List<SupplierAnnualReviewStatisticsVo> getSupplierAnnualReviewStatisticsList(SupplierAnnualReviewStatisticsVo vo);
+
+    /**
+     * 根据id列表查询查询
+     * @param ids
+     * @return
+     */
+    List<CoscoAnnualreviewTaskSupplier> selectByIds(List<String> ids);
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/AnnualScheduledTasksServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class AnnualScheduledTasksServiceImpl implements AnnualScheduledTasksService {
@@ -52,16 +53,18 @@ public class AnnualScheduledTasksServiceImpl implements AnnualScheduledTasksServ
     @Transactional(rollbackFor = Exception.class)
     public void closeTask() {
         //查询所有需要关闭的项目
-        List<CoscoAnnualreviewTask> coscoAnnualreviewTasks =
+        List<CoscoAnnualreviewTask> coscoAnnualreviewTasks = coscoAnnualreviewTaskMapper.selectCloseTask();
-                coscoAnnualreviewTaskMapper.selectCloseTask();
+        if(!coscoAnnualreviewTasks.isEmpty()){
+            List<String> ids = coscoAnnualreviewTasks.stream().map(CoscoAnnualreviewTask::getId).collect(Collectors.toList());
+            List<CoscoAnnualreviewTaskSupplier> coscoAnnualreviewTaskSuppliers =coscoAnnualreviewTaskSupplierMapper.
+                    selectByIds(ids);
             for (CoscoAnnualreviewTask coscoAnnualreviewTask : coscoAnnualreviewTasks) {
                 //获取年审任务全部信息
                 CoscoAnnualreviewTaskSupplier coscoAnnualreviewTaskSupplier = new CoscoAnnualreviewTaskSupplier();
                 coscoAnnualreviewTaskSupplier.setAnnualreviewTaskId(coscoAnnualreviewTask.getId());
-            List<CoscoAnnualreviewTaskSupplier> coscoAnnualreviewTaskSuppliers =
+                List<CoscoAnnualreviewTaskSupplier> collect = coscoAnnualreviewTaskSuppliers.stream().filter(supplier -> supplier.getAnnualreviewTaskId().equals(coscoAnnualreviewTask.getId())).collect(Collectors.toList());
-                    coscoAnnualreviewTaskSupplierMapper.selectCoscoAnnualreviewTaskSupplierList(coscoAnnualreviewTaskSupplier);
                 //根据人员技术分数
-            coscoAnnualreviewTaskSuppliers.forEach(supplier -> {
+                collect.forEach(supplier -> {
                     AuditQuantityVo selectVo = new AuditQuantityVo();
                     selectVo.setSupplierId(supplier.getSupplierId());
                     selectVo.setAnnualreviewTaskId(coscoAnnualreviewTask.getId());
@@ -86,3 +89,5 @@ public class AnnualScheduledTasksServiceImpl implements AnnualScheduledTasksServ
         }
 
     }
+
+}

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml

@@ -68,6 +68,15 @@
         order by cat.create_time desc
     </select>
 
+    <select id="selectByIds"
+            parameterType="list"
+            resultMap="CoscoAnnualreviewTaskSupplierResult">
+        <include refid="selectCoscoAnnualreviewTaskSupplierVo"/>
+        where id in
+        <foreach item="item" collection="list" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </select>
     <select id="selectCoscoAnnualreviewTaskSupplierList"
             parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTaskSupplier"
             resultMap="CoscoAnnualreviewTaskSupplierResult">