Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-business/src/main/java/com/zjugis/business/mapper/ProjectReportAuditMapper.java

@@ -48,6 +48,6 @@ public interface ProjectReportAuditMapper extends BaseMapperX<ProjectReportAudit
     default List<ProjectReportAudit> getPassListByUserId(String loginUserId){
         return selectList(new LambdaQueryWrapperX<ProjectReportAudit>()
                 .eq(ProjectReportAudit::getAuditorId, loginUserId)
-                .eq(ProjectReportAudit::getAuditStatus, ProjectReportStatusEnum.PASS.getValue()));
+                .ne(ProjectReportAudit::getAuditStatus, ProjectReportStatusEnum.AUDIT.getValue()));
     }
 }

zjugis-business/src/main/java/com/zjugis/business/mapper/ProjectReportMapper.java

@@ -86,10 +86,12 @@ public interface ProjectReportMapper extends BaseMapperX<ProjectReport> {
      * 通过ID列表寻找记录
      *
      * @param reportIds
+     * @param id
      * @return
      */
-    default List<ProjectReport> getListByIds(Set<String> reportIds) {
+    default List<ProjectReport> getListByIds(Set<String> reportIds, String periodId) {
         return selectList(new LambdaQueryWrapperX<ProjectReport>()
-                .in(ProjectReport::getId, reportIds));
+                .in(ProjectReport::getId, reportIds)
+                .eq(ProjectReport::getPeriodId, periodId));
     }
 }

zjugis-business/src/main/java/com/zjugis/business/service/impl/ProjectReportServiceImpl.java

@@ -225,12 +225,13 @@ public class ProjectReportServiceImpl implements ProjectReportService {
 
     @Override
     public List<ProjectReportResp> getCheckedList() {
+        ProjectReportPeriod currentReportPeriod = projectReportPeriodService.getCurrentReportPeriod();
         List<ProjectReportAudit> passAuditList = projectReportAuditService.getPassListByUserId(SecurityFrameworkUtils.getLoginUserId());
         Set<String> reportIds = convertSet(passAuditList, ProjectReportAudit::getReportId);
         if(CollectionUtil.isEmpty(reportIds)){
             return null;
         }
-        List<ProjectReport> checkedList = projectReportMapper.getListByIds(reportIds);
+        List<ProjectReport> checkedList = projectReportMapper.getListByIds(reportIds,currentReportPeriod.getId());
         return ProjectReportConvert.INSTANCE.convertList01(checkedList);
     }