领用-退回添加筛选条件

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/collect/service/CollectService.java

@@ -497,6 +497,9 @@ public class CollectService {
 
             queryWrapper.between("a.collect_date", contractDates[0], contractDates[1]);
         }
+        if (StringUtils.isNotBlank(dto.getStatusReturn())) {
+            queryWrapper.eq("returna.status", dto.getStatusReturn());
+        }
         IPage<CollectDto> list = basicMapper.findList(page, queryWrapper);
         list.getRecords().stream().forEach(item -> {
             // 领用申请