2/2 导入修改

src/main/java/cn/cslg/pas/service/business/AssoProjectPersonService.java

@@ -55,7 +55,8 @@ public class AssoProjectPersonService extends ServiceImpl<AssoProjectPersonMappe
         //根据ids查询是否存在
         LambdaQueryWrapper<AssoProjectPerson> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select(AssoProjectPerson::getPersonId);
-        queryWrapper.in(AssoProjectPerson::getPersonId, personIds);
+        queryWrapper.in(AssoProjectPerson::getPersonId, personIds)
+                .eq(AssoProjectPerson::getProjectId,projectId);
         List<AssoProjectPerson> assoProjectPersonList = this.list(queryWrapper);
         List<String> ids = assoProjectPersonList.stream().map(AssoProjectPerson::getPersonId).collect(Collectors.toList());
         if (ids != null) {

src/main/java/cn/cslg/pas/service/business/ImportTaskService.java

@@ -316,16 +316,14 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
                 importTaskVO.setStateStr(systemDict2.getLabel());
             }
 
-
-            long percentage = (long) Math.floor((importTaskVO.getDoneNum() + 0D) / importTaskVO.getAllNum() * 100D);
-            importTaskVO.setPercentage(percentage);
-
-
             //装载正在进行中任务的完成条数
             ImportTaskAMVO importTaskAMVO = importTaskAMVOS.stream().filter(item -> item.getId().equals(importTaskVO.getId())).findFirst().orElse(null);
             if (importTaskAMVO != null) {
                 importTaskVO.setDoneNum(importTaskAMVO.getDoneNum());
+                importTaskAMVO.setAllNum(importTaskAMVO.getAllNum());
             }
+            long percentage = (long) Math.floor((importTaskVO.getDoneNum() + 0D) / importTaskVO.getAllNum() * 100D);
+            importTaskVO.setPercentage(percentage);
         }
 
     }