微信消息通知模板调整

src/main/java/com/xjrsoft/module/databoard/controller/DatadetailController.java

@@ -10,8 +10,10 @@ import com.xjrsoft.common.enums.GenderDictionaryEnum;
 import com.xjrsoft.common.enums.StudyStatusEnum;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.mybatis.SqlRunnerAdapter;
+import com.xjrsoft.common.utils.SqlRunnerAdapterUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.databoard.dto.StatisticsDetailDto;
+import com.xjrsoft.module.databoard.vo.CourseCountListVo;
 import com.xjrsoft.module.databoard.vo.CourseStatisticsDetailVo;
 import com.xjrsoft.module.databoard.vo.DistributionVo;
 import com.xjrsoft.module.databoard.vo.DurationVo;
@@ -626,6 +628,21 @@ public class DatadetailController {
     @SaCheckPermission("datadetail:detail")
     public RT<CourseStatisticsDetailVo> courseStatistics(@Valid StatisticsDetailDto dto) {
         CourseStatisticsDetailVo result = new CourseStatisticsDetailVo();
+        String sql = "SELECT t1.id, t1.name,t4.name AS dept_name," +
+                " (SELECT GROUP_CONCAT(DISTINCT(course_name)) FROM course_table WHERE teacher_id = t1.id) AS course_names," +
+                " (SELECT COUNT(*) FROM course_table WHERE teacher_id = t1.id) AS course_count FROM xjr_user t1" +
+                " INNER JOIN base_teacher t2 ON t1.id = t2.user_id" +
+                " INNER JOIN xjr_user_dept_relation t3 ON t1.id = t3.user_id" +
+                " INNER JOIN xjr_department t4 ON t3.dept_id = t4.id" +
+                " WHERE t1.delete_mark = 0 AND t4.is_major = 1" +
+                " ORDER BY course_count DESC LIMIT 5";
+        List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql);
+        List<CourseCountListVo> courseCountList = new ArrayList<>();
+        for (Map<String, Object> objectMap : list) {
+            CourseCountListVo listVo = SqlRunnerAdapterUtil.convertMapToEntity(objectMap, CourseCountListVo.class);
+            courseCountList.add(listVo);
+        }
+        result.setCourseCountList(courseCountList);
         return RT.ok(result);
     }
 

src/main/java/com/xjrsoft/module/databoard/vo/CourseCountListVo.java

@@ -0,0 +1,33 @@
+package com.xjrsoft.module.databoard.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+* @title: 数据看板-课时排行榜
+* @Author dzx
+* @Date: 2024年8月2日
+* @Version 1.0
+*/
+@Data
+public class CourseCountListVo {
+
+    /**
+    * 发起流程总数
+    */
+    @ApiModelProperty("统计项")
+    private String name;
+    /**
+    * 完成总数
+    */
+    @ApiModelProperty("总课时")
+    private Long courseCount;
+
+    @ApiModelProperty("课程名称")
+    private String courseNames;
+
+    @ApiModelProperty("所属部门")
+    private String deptName;
+
+}

src/main/java/com/xjrsoft/module/databoard/vo/CourseStatisticsDetailVo.java

@@ -15,25 +15,14 @@ import java.util.List;
 public class CourseStatisticsDetailVo {
 
 
-    @ApiModelProperty("总金额")
-    private Double totalAmount;
+    @ApiModelProperty("课时榜")
+    private List<CourseCountListVo> courseCountList;
 
-    @ApiModelProperty("申购类型次数对比数据")
-    private List<ItemCountVo> categoryCountList;
+    @ApiModelProperty("教学部课时统计")
+    private List<ItemCountRatioVo> deptCourseList;
 
-    @ApiModelProperty("申购类型金额对比数据")
-    private List<ItemDoubleVo> categoryAmountList;
+    @ApiModelProperty("其他补充课时")
+    private List<ItemCountRatioVo> otnherCourseList;
 
-    @ApiModelProperty("申购次数")
-    private Integer allCount;
-
-    @ApiModelProperty("通过次数")
-    private Integer adoptCount;
-
-    @ApiModelProperty("待审次数")
-    private Integer pendingCount;
-
-    @ApiModelProperty("部门申购统计数据")
-    private List<ItemCountAmountVo> deptList;
 
 }

src/main/java/com/xjrsoft/module/databoard/vo/ItemCountRatioVo.java

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.databoard.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+* @title:
+* @Author dzx
+* @Date: 2024年8月2日
+* @Version 1.0
+*/
+@Data
+public class ItemCountRatioVo {
+
+
+    @ApiModelProperty("统计项")
+    private String item;
+
+    @ApiModelProperty("数量")
+    private Integer count;
+
+    @ApiModelProperty("占比")
+    private Double ratio;
+
+}

src/main/java/com/xjrsoft/module/material/service/impl/MaterialTaskServiceImpl.java

@@ -533,7 +533,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
 
             WeChatSendMessageDto weChatSendMessageDto = new WeChatSendMessageDto();
             weChatSendMessageDto.setUserId(materialTaskAssignUser.getOpenId());
-            weChatSendMessageDto.setTemplateId("qmpXORPM1Cocqn503Qa4OkNNQ0uxlj2-ed9m6uWO-v4");
+            weChatSendMessageDto.setTemplateId("qmpXORPM1Cocqn503Qa4OoWtTgVnrxa9bCZJowZPYFk");
             //weChatSendMessageDto.setUrl(StrUtil.format("{}/pages/message/notice/detail?id={}", commonPropertiesConfig.getDomainApp(), id));
             weChatSendMessageDto.setMsgId(materialTask.getId().toString());
             JSONObject data = new JSONObject();

src/main/java/com/xjrsoft/module/oa/service/impl/NewsServiceImpl.java

@@ -858,7 +858,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
                     for (User user : userList) {
                         WeChatSendMessageDto weChatSendMessageDto = new WeChatSendMessageDto();
                         weChatSendMessageDto.setUserId(user.getOpenId());
-                        weChatSendMessageDto.setTemplateId("qmpXORPM1Cocqn503Qa4OkNNQ0uxlj2-ed9m6uWO-v4");
+                        weChatSendMessageDto.setTemplateId("qmpXORPM1Cocqn503Qa4OoWtTgVnrxa9bCZJowZPYFk");
                         weChatSendMessageDto.setUrl(StrUtil.format("{}/pages/message/notice/detail?id={}", commonPropertiesConfig.getDomainApp(), id));
                         weChatSendMessageDto.setMsgId(id.toString());
                         JSONObject data = new JSONObject();
@@ -891,7 +891,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
                     for (NewsRelationVo newsRelationVo : newsRelationVoList) {
                         WeChatSendMessageDto weChatSendMessageDto = new WeChatSendMessageDto();
                         weChatSendMessageDto.setUserId(newsRelationVo.getUserName());
-                        weChatSendMessageDto.setTemplateId("qmpXORPM1Cocqn503Qa4OkNNQ0uxlj2-ed9m6uWO-v4");
+                        weChatSendMessageDto.setTemplateId("qmpXORPM1Cocqn503Qa4OoWtTgVnrxa9bCZJowZPYFk");
                         weChatSendMessageDto.setUrl(StrUtil.format("{}/pages/message/notice/detail?id={}", commonPropertiesConfig.getDomainApp(), id));
                         weChatSendMessageDto.setMsgId(id.toString());
                         JSONObject data = new JSONObject();