填报审核相关修改

zjugis-business/src/main/java/com/zjugis/business/bean/response/ProjectReportResp.java

@@ -18,6 +18,9 @@ public class ProjectReportResp {
     @Schema(description = "项目ID")
     private String projectId;
 
+    @Schema(description = "审核记录ID")
+    private String auditId;
+
     @Schema(description = "期号ID")
     private String periodId;
 

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

@@ -1,6 +1,7 @@
 package com.zjugis.business.mapper;
 
 import com.zjugis.business.bean.entity.ProjectReportAudit;
+import com.zjugis.business.enums.ProjectReportStatusEnum;
 import com.zjugis.framework.mybatis.core.mapper.BaseMapperX;
 import com.zjugis.framework.mybatis.core.query.LambdaQueryWrapperX;
 import org.springframework.stereotype.Repository;
@@ -17,6 +18,7 @@ public interface ProjectReportAuditMapper extends BaseMapperX<ProjectReportAudit
 
     /**
      * 获取填报审核信息列表
+     *
      * @param reportId
      * @return
      */
@@ -25,4 +27,16 @@ public interface ProjectReportAuditMapper extends BaseMapperX<ProjectReportAudit
                 .eq(ProjectReportAudit::getReportId, reportId)
                 .orderByDesc(ProjectReportAudit::getCreateTime));
     }
+
+    /**
+     * 获取当前待审核记录列表
+     *
+     * @param loginUserId
+     * @return
+     */
+    default List<ProjectReportAudit> getCurrentAuditList(String loginUserId) {
+        return selectList(new LambdaQueryWrapperX<ProjectReportAudit>()
+                .eq(ProjectReportAudit::getAuditorId, loginUserId)
+                .eq(ProjectReportAudit::getAuditStatus, ProjectReportStatusEnum.AUDIT.getValue()));
+    }
 }

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

@@ -24,7 +24,7 @@ public interface ProjectReportMapper extends BaseMapperX<ProjectReport> {
      * @return
      */
     default List<ProjectReport> getReportList(Set<String> projectIds, String periodId) {
-        return selectList(new LambdaQueryWrapperX<ProjectReport>().eq(ProjectReport::getPeriodId, periodId).in(ProjectReport::getPeriodId, projectIds));
+        return selectList(new LambdaQueryWrapperX<ProjectReport>().eq(ProjectReport::getPeriodId, periodId).in(ProjectReport::getProjectId, projectIds));
     }
 
     /**

zjugis-business/src/main/java/com/zjugis/business/service/ProjectReportAuditService.java

@@ -43,4 +43,11 @@ public interface ProjectReportAuditService {
      * @return
      */
     List<ProjectReportAudit> getListByReportId(String reportId);
+
+    /**
+     * 获取当前待审核记录列表
+     * @param loginUserId
+     * @return
+     */
+    List<ProjectReportAudit> getCurrentAuditList(String loginUserId);
 }

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

@@ -52,4 +52,9 @@ public class ProjectReportAuditServiceImpl implements ProjectReportAuditService
     public List<ProjectReportAudit> getListByReportId(String reportId) {
         return projectReportAuditMapper.projectReportAuditMapper(reportId);
     }
+
+    @Override
+    public List<ProjectReportAudit> getCurrentAuditList(String loginUserId) {
+        return projectReportAuditMapper.getCurrentAuditList(loginUserId);
+    }
 }

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

@@ -184,7 +184,14 @@ public class ProjectReportServiceImpl implements ProjectReportService {
     public List<ProjectReportResp> getCheckList() {
         ProjectReportPeriod currentReportPeriod = projectReportPeriodService.getCurrentReportPeriod();
         List<ProjectReport> checkList = projectReportMapper.getCheckList(SecurityFrameworkUtils.getLoginUserId(), currentReportPeriod.getId());
-        return ProjectReportConvert.INSTANCE.convertList01(checkList);
+        List<ProjectReportAudit> currentAuditList = projectReportAuditService.getCurrentAuditList(SecurityFrameworkUtils.getLoginUserId());
+        Map<String, ProjectReportAudit> reportAuditMap = CollectionUtils.convertMap(currentAuditList, ProjectReportAudit::getReportId);
+        List<ProjectReportResp> resps = ProjectReportConvert.INSTANCE.convertList01(checkList);
+        resps.forEach(projectReportResp -> {
+            ProjectReportAudit reportAudit = reportAuditMap.get(projectReportResp.getReportId());
+            projectReportResp.setAuditId(reportAudit.getId());
+        });
+        return resps;
     }
 
     @Override