1. 修复代码

2. 建筑专业版批量审核时更新进度

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ReportMapper.java

@@ -137,4 +137,5 @@ public interface ReportMapper extends BaseMapper<Report> {
             "AND EXISTS(SELECT 1 FROM report r WHERE report.`creator_id` = r.creator_id AND report.`create_date` = r.create_date AND report.id <> r.id AND r.state = 0)\n" +
             "AND report.audit_dept_managerid IS NULL AND report.`company_id` = #{companyId}\n")
     List<Map<String, Object>> getErrorData(Integer companyId);
+
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ProjectService.java

@@ -189,4 +189,5 @@ public interface ProjectService extends IService<Project> {
 
     HttpRespMsg fixParticipators(Integer companyId, HttpServletRequest request);
 
+    HttpRespMsg removeDuplicateParticipators(Integer companyId, HttpServletRequest request);
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -1943,11 +1943,23 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                         reportMapper.update(new Report().setState(1).setProjectAuditTime(LocalDateTime.now()),
                                 new QueryWrapper<Report>().in("id", ids));
                         List<Report> finalReportList = reportMapper.selectList(new QueryWrapper<Report>().in("id", ids));
+                        List<ReportProfessionProgress> professionProgressList = reportProfessionProgressService.list(new QueryWrapper<ReportProfessionProgress>().in("report_id", ids));
+
+                        //审核通过时，才会更新到个人的专业进度上去
+                        professionProgressList.forEach(pro->{
+                            PpMembs memb = new PpMembs();
+                            memb.setProgress(pro.getProgress());
+                            Report report1 = finalReportList.stream().filter(f -> f.getId().equals(pro.getReportId())).findFirst().get();
+                            Integer projectId = report1.getProjectId();
+                            //更新个人在项目中的专业进度
+                            ppMembsMapper.update(memb, new QueryWrapper<PpMembs>().eq("project_id", projectId)
+                                    .eq("memb_id", report1.getCreatorId()).eq("profession_id", pro.getProfessionId()));
+                        });
+
                         notifyLeaders(finalReportList);
                     }
                 }
             }
-
         } else {
             LocalDateTime now = LocalDateTime.now();
             Report oneReport = reportMapper.selectById(ids.get(0));