Merge branch 'master' of http://47.100.37.243:10191/quyueting/manHourHousekeeper

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

@@ -1098,11 +1098,11 @@
         MIN(rl.operate_date) AS createTime
         FROM report_log rl
         FORCE INDEX (idx_report_log_main)  -- 强制使用新索引
-        LEFT JOIN `user` ON `user`.id = rl.operator_id
+        LEFT JOIN `user` ON `user`.id = rl.creator_id
         LEFT JOIN department d ON `user`.department_id = d.department_id
         WHERE rl.company_id = #{companyId}
         AND rl.create_date between #{startDate} and #{endDate}
-        AND rl.msg LIKE CONCAT(`user`.name, '%提交了日报')  -- 使用LIKE替代CONCAT相等
+        AND rl.msg LIKE '%提交了日报'  -- 使用LIKE替代CONCAT相等
         AND `user`.is_active = 1
         <if test="userId!=null">
             and `user`.id=#{userId}
@@ -1117,10 +1117,10 @@
         SELECT 1
         FROM report_log r2
         FORCE INDEX (idx_report_log_sub)  -- 强制子查询使用索引
-        WHERE r2.operator_id = rl.operator_id
+        WHERE r2.creator_id = rl.creator_id
         AND r2.create_date = rl.create_date
         AND r2.operate_date > rl.operate_date
-        AND r2.msg LIKE CONCAT(`user`.name, '%撤销了日报')
+        AND r2.msg LIKE '%撤销了日报'
         )
         GROUP BY user.id, rl.create_date;
     </select>

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskGroupController.java

@@ -465,12 +465,8 @@ public class TaskGroupController {
         }
         //针对泓浒 需要特殊处理分组
         if(user.getCompanyId()==7536){
-            //针对项目过滤不处理逻辑
-            List<String> filterProjectName=new ArrayList<>();
-            filterProjectName.add("公共项目号");
-            filterProjectName.add("品质检验项目号");
-            filterProjectName.add("请假");
-            if(!filterProjectName.contains(project.getProjectName())&&!project.getProjectCode().startsWith("HH-RD")){
+            //针对项目编号为HH-EQ的才进行处理
+            if(project.getProjectCode().startsWith("HH-EQ")){
                 //检查生产订单和销售订单
                 DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
                 String projectCode = project.getProjectCode();