一键全部通过

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

@@ -172,4 +172,6 @@ public interface ReportMapper extends BaseMapper<Report> {
     Map<String, Object> selectCostTimeByProject(String startDate, String endDate, Integer projectId);
 
     List<HashMap<String, Object>> selectFill(String userId,LocalDate startDate, LocalDate endDate);
+
+    void approveAllImportList(Integer companyId);
 }

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

@@ -5058,7 +5058,13 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     public HttpRespMsg approveAllImport(HttpServletRequest request) {
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
-        reportMapper.approveAllDeptImportList(user.getCompanyId(), token);
+        boolean canAuditAll = sysFunctionService.hasPriviledge(user.getRoleId(), "审核全员日报");
+        if (canAuditAll) {
+            reportMapper.approveAllImportList(user.getCompanyId());
+        } else {
+            reportMapper.approveAllDeptImportList(user.getCompanyId(), token);
+        }
+
         //需要进行审核记录保存
         ReportAuditLog log = new ReportAuditLog();
         log.setAuditChannel(0);//导入审核

fhKeeper/formulahousekeeper/management-platform-import/src/main/resources/mapper/ReportMapper.xml

@@ -704,6 +704,12 @@
         AND report.creator_id in(select id from user where user.department_id in (select department_id from department where report_audit_userid = #{leaderId}))
     </update>
 
+    <update id="approveAllImportList" >
+        update report set state = 1
+        WHERE report.company_id = #{companyId}
+        and report.state = -1
+    </update>
+
     <select id="getDeptImportAuditListCount" resultType="java.lang.Long">
         SELECT count(a.id) FROM report AS a
         left join user on user.id = a.creator_id