材料缴交下载调整

src/main/java/com/xjrsoft/module/material/service/impl/MaterialTaskServiceImpl.java

@@ -560,6 +560,8 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
 
     @Override
     public byte[] downloadFile(MaterialTaskAssignListDto dto) {
+        List<MaterialTaskAssignListVo> materialTaskAssignListVos = this.assignList(dto);
+        List<Long> ids = materialTaskAssignListVos.stream().map(MaterialTaskAssignListVo::getId).collect(Collectors.toList());
 
         MPJLambdaWrapper<MaterialTaskAppendix> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
@@ -567,9 +569,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
                 .distinct()
                 .select(MaterialTaskAppendix::getId)
                 .select(MaterialTaskAppendix.class, x -> VoToColumnUtil.fieldsToColumns(MaterialTaskAppendix.class).contains(x.getProperty()))
-                .innerJoin(MaterialTaskAssign.class, MaterialTaskAssign::getId, MaterialTaskAppendix::getMaterialTaskId)
-                .eq(MaterialTaskAssign::getMaterialTaskId, dto.getMaterialTaskId())
-                .eq(MaterialTaskAssign::getStatus, dto.getState())
+                .eq(MaterialTaskAppendix::getMaterialTaskId, ids)
         ;
 
         List<MaterialTaskAppendix> appendices = appendixMapper.selectJoinList(MaterialTaskAppendix.class, queryWrapper);