数据看板

src/main/java/com/xjrsoft/module/activity/service/impl/ActivityEnrollServiceImpl.java

@@ -59,7 +59,7 @@ public class ActivityEnrollServiceImpl extends MPJBaseServiceImpl<ActivityEnroll
                                     setUserId(enrollRange.getUserId());
                                     setCreateDate(createDate);
                                     setActivityInfoId(dto.getActivityInfoId());
-                                    setStatus(0);
+                                    setStatus(1);
                                 }}
                         );
                     }
@@ -78,7 +78,7 @@ public class ActivityEnrollServiceImpl extends MPJBaseServiceImpl<ActivityEnroll
                                         setUserId(user.getId());
                                         setCreateDate(createDate);
                                         setActivityInfoId(dto.getActivityInfoId());
-                                        setStatus(0);
+                                        setStatus(1);
                                     }}
                             );
                         }
@@ -98,7 +98,7 @@ public class ActivityEnrollServiceImpl extends MPJBaseServiceImpl<ActivityEnroll
                                         setUserId(user.getUserId());
                                         setCreateDate(createDate);
                                         setActivityInfoId(dto.getActivityInfoId());
-                                        setStatus(0);
+                                        setStatus(1);
                                     }}
                             );
                         }
@@ -119,7 +119,8 @@ public class ActivityEnrollServiceImpl extends MPJBaseServiceImpl<ActivityEnroll
 
     @Override
     public Boolean delete(List<Long> ids) {
-        return null;
+        this.baseMapper.deleteBatchIds(ids);
+        return true;
     }
 
     public Page<ActivityEnrollPageVo> getPage(Page<ActivityEnrollPageVo> page, ActivityEnrollPageDto dto) {

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

@@ -15,6 +15,7 @@ import com.xjrsoft.module.courseTable.entity.CourseTable;
 import com.xjrsoft.module.courseTable.service.ICourseTableService;
 import com.xjrsoft.module.databoard.dto.StatisticsDto;
 import com.xjrsoft.module.databoard.vo.CourseStatisticsVo;
+import com.xjrsoft.module.databoard.vo.HealthStatisticsVo;
 import com.xjrsoft.module.databoard.vo.MeetingStatisticsVo;
 import com.xjrsoft.module.databoard.vo.PersonStatisticsVo;
 import com.xjrsoft.module.databoard.vo.ProcessStatisticsVo;
@@ -259,4 +260,31 @@ public class DataboardController {
         return RT.ok(result);
     }
 
+    @GetMapping(value = "/health-statistics")
+    @ApiOperation(value="学生健康统计")
+    @SaCheckPermission("databoard:detail")
+    public RT<HealthStatisticsVo> healthStatistics(@Valid StatisticsDto dto){
+        String sql = "SELECT gender,COUNT(*) AS a_count FROM student_infection WHERE status = 1 GROUP BY gender";
+        List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql);
+        HealthStatisticsVo result = new HealthStatisticsVo();
+        for (Map<String, Object> objectMap : list) {
+            if(GenderDictionaryEnum.FEMALE.getCode().equals(objectMap.get("gender").toString())){
+                result.setInfectionFemaleCount(Integer.parseInt(objectMap.get("a_count").toString()));
+            }if(GenderDictionaryEnum.MALE.getCode().equals(objectMap.get("gender").toString())){
+                result.setInfectionMaleCount(Integer.parseInt(objectMap.get("a_count").toString()));
+            }
+        }
+
+        sql = "SELECT gender,COUNT(*) AS a_count FROM student_psychological WHERE status = 1 GROUP BY gender";
+        list = SqlRunnerAdapter.db().selectList(sql);
+        for (Map<String, Object> objectMap : list) {
+            if(GenderDictionaryEnum.FEMALE.getCode().equals(objectMap.get("gender").toString())){
+                result.setInfectionFemaleCount(Integer.parseInt(objectMap.get("a_count").toString()));
+            }if(GenderDictionaryEnum.MALE.getCode().equals(objectMap.get("gender").toString())){
+                result.setPsychologicalMaleCount(Integer.parseInt(objectMap.get("a_count").toString()));
+            }
+        }
+        return RT.ok(result);
+    }
+
 }

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

@@ -0,0 +1,28 @@
+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 HealthStatisticsVo {
+
+
+    @ApiModelProperty("传染病登记人数-男")
+    private Integer infectionMaleCount;
+
+    @ApiModelProperty("传染病登记人数-女")
+    private Integer infectionFemaleCount;
+
+    @ApiModelProperty("心理咨询人数-男")
+    private Integer psychologicalMaleCount;
+
+    @ApiModelProperty("心理咨询人数-女")
+    private Integer psychologicalFemaleCount;
+
+}