1、分班查询调整

2、审批消息推送调整

src/main/java/com/xjrsoft/module/oa/utils/SendMessageUtil.java

@@ -116,7 +116,7 @@ public class SendMessageUtil {
                 WeChatSendMessageDto weChatSendMessageDto = new WeChatSendMessageDto();
                 weChatSendMessageDto.setUserId(openId);
                 weChatSendMessageDto.setTemplateId("sHsmz7LRj7HLd7GSTS3r2jCLvK-4Wp19iGzEvYK8n_I");
-                weChatSendMessageDto.setMsgId(param.getTaskId());
+                weChatSendMessageDto.setMsgId(IdUtil.getSnowflakeNextIdStr());
                 weChatSendMessageDto.setUrl(StrUtil.format("{}/xjrsoft/pages/workflow/approval?taskId={}&processId={}&type=todo", cpConfig.getDomainApp(), param.getTaskId(), param.getProcessId()));
                 weChatSendMessageDto.setContent(data);
                 weChatUtil.sendTemplateMessage(weChatSendMessageDto);

src/main/resources/mapper/banding/BandingTaskMapper.xml

@@ -9,11 +9,20 @@
         INNER JOIN enrollment_plan a2 ON a1.enrollment_plan_id = a2.id
         WHERE a1.delete_mark = 0 AND a2.delete_mark = 0
         AND a2.grade_id = t.grade_id AND a2.enroll_type = t.enroll_type
-        and a1.is_can_banding = 1
+        AND a1.is_can_banding = 1
         ) AS admissions_count,
-        (SELECT COUNT(*) FROM banding_task_class_student a1
+        IF(t.status = 1,
+        (
+        SELECT COUNT(*) FROM banding_task_class_student_sure a1
         INNER JOIN banding_task_class a2 ON a1.banding_task_class_id = a2.id
-        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 AND a2.banding_task_id = t.id) AS divided_count
+        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 AND a2.banding_task_id = t.id
+        ),
+        (
+        SELECT COUNT(*) FROM banding_task_class_student a1
+        INNER JOIN banding_task_class a2 ON a1.banding_task_class_id = a2.id
+        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 AND a2.banding_task_id = t.id
+        )
+        ) AS divided_count
         FROM banding_task t
         LEFT JOIN base_grade t1 ON (t1.id = t.grade_id)
         LEFT JOIN xjr_dictionary_detail t2 ON (t2.code = t.enroll_type)