活动信息调整

src/main/java/com/xjrsoft/module/activity/controller/ActivityEnrollController.java

@@ -17,9 +17,7 @@ import com.xjrsoft.module.activity.entity.ActivityEnroll;
 import com.xjrsoft.module.activity.service.IActivityEnrollService;
 import com.xjrsoft.module.activity.vo.ActivityEnrollExcelVo;
 import com.xjrsoft.module.activity.vo.ActivityEnrollPageVo;
-import com.xjrsoft.module.banding.dto.BandingTaskClassStudentPageDto;
 import com.xjrsoft.module.banding.vo.BandingTaskClassExcelVo;
-import com.xjrsoft.module.banding.vo.BandingTaskClassStudentListVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -69,13 +67,15 @@ public class ActivityEnrollController {
     @PostMapping(value = "/change-status")
     @ApiOperation(value="修改状态")
     @SaCheckPermission("officebuild:detail")
-    public RT<Boolean> changeStatus(@Valid @RequestBody ChangeStatusDto dto) throws Exception {
-        ActivityEnroll enroll = activityEnrollService.getById(dto.getId());
-        if(enroll == null){
-            throw new MyException("未能找到该信息");
+    public RT<Boolean> changeStatus(@Valid @RequestBody List<ChangeStatusDto> dtoList) throws Exception {
+        List<ActivityEnroll> enrollList = new ArrayList<>();
+        for (ChangeStatusDto dto : dtoList) {
+            ActivityEnroll enroll = activityEnrollService.getById(dto.getId());
+            enroll.setStatus(dto.getStatus());
+            enrollList.add(enroll);
         }
-        enroll.setStatus(dto.getStatus());
-        activityEnrollService.updateById(enroll);
+
+        activityEnrollService.updateBatchById(enrollList);
         return RT.ok(true);
     }
 

src/main/java/com/xjrsoft/module/activity/controller/ActivityInfoController.java

@@ -59,8 +59,6 @@ public class ActivityInfoController {
 
         Page<ActivityInfoPageVo> page = activityInfoService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<ActivityInfoPageVo> pageOutput = ConventPage.getPageOutput(page, ActivityInfoPageVo.class);
-        for (ActivityInfoPageVo item : pageOutput.getList()) {
-        }
         return RT.ok(pageOutput);
     }
 
@@ -71,6 +69,9 @@ public class ActivityInfoController {
         ActivityInfo activityInfo = activityInfoService.getByIdDeep(id);
         if (activityInfo == null) {
            return RT.error("找不到此数据！");
+        }
+        if(activityInfo.getEnrollRange() != null && !"".equals(activityInfo.getEnrollRange())){
+
         }
         return RT.ok(BeanUtil.toBean(activityInfo, ActivityInfoVo.class));
     }

src/main/java/com/xjrsoft/module/activity/dto/AddActivityEnrollDto.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 

src/main/java/com/xjrsoft/module/activity/service/IActivityEnrollService.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.activity.dto.ActivityEnrollPageDto;
 import com.xjrsoft.module.activity.dto.AddActivityEnrollDto;
-import com.xjrsoft.module.activity.dto.AddActivityInfoDto;
 import com.xjrsoft.module.activity.entity.ActivityEnroll;
 import com.xjrsoft.module.activity.vo.ActivityEnrollPageVo;
 

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

@@ -26,7 +26,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**

src/main/java/com/xjrsoft/module/activity/vo/ActivityEnrollExcelVo.java

@@ -5,8 +5,6 @@ import com.alibaba.excel.annotation.write.style.ContentStyle;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
 * @title: 活动信息分页列表出参
 * @Author dzx

src/main/java/com/xjrsoft/module/activity/vo/ActivityInfoPageVo.java

@@ -101,4 +101,7 @@ public class ActivityInfoPageVo {
     @ApiModelProperty("合作企业名称")
     private Long enterpriseName;
 
+    @ApiModelProperty("报名人数")
+    private Integer enrollCount;
+
 }

src/main/java/com/xjrsoft/module/activity/vo/ActivityInfoVo.java

@@ -102,10 +102,20 @@ public class ActivityInfoVo {
     */
     @ApiModelProperty("activityEnrollRange子表")
     private List<ActivityEnrollRangeVo> activityEnrollRangeList;
-    /**
-    * activityEnroll
-    */
-    @ApiModelProperty("activityEnroll子表")
-    private List<ActivityEnrollVo> activityEnrollList;
 
+
+    @ApiModelProperty("报名人数")
+    private Integer enrollCount;
+
+    @ApiModelProperty("学生人数")
+    private Integer studentCount;
+
+    @ApiModelProperty("教师人数")
+    private Integer teacherCount;
+
+    @ApiModelProperty("确认参与人数")
+    private Integer sureCount;
+
+    @ApiModelProperty("未确认参与人数")
+    private Integer notSureCount;
 }

src/main/java/com/xjrsoft/module/attendance/controller/AttendanceMessageSetController.java

@@ -128,7 +128,7 @@ public class AttendanceMessageSetController {
     public RT<Boolean> add(@Valid @RequestBody AddAttendanceMessageSetDto dto){
         AttendanceMessageSet attendanceMessageSet = BeanUtil.toBean(dto, AttendanceMessageSet.class);
         boolean isSuccess = attendanceMessageSetService.add(attendanceMessageSet);
-    return RT.ok(isSuccess);
+        return RT.ok(isSuccess);
     }
 
     @PutMapping

src/main/resources/mapper/activity/ActivityInfoMapper.xml

@@ -6,7 +6,8 @@
     <select id="getPage" parameterType="com.xjrsoft.module.activity.dto.ActivityInfoPageDto" resultType="com.xjrsoft.module.activity.vo.ActivityInfoPageVo">
         SELECT t1.id,t2.name AS type_cn,t3.company_name AS enterprise_name,t1.name,t1.place,t1.start_date,t1.end_date,
         t1.type, t4.name AS org_name, t1.enroll_end_time, t1.duty_person,t1.duty_person_mobile, t1.cover_file_id,
-        t1.enroll_range, t1.status,t1.content,t1.category FROM activity_info t1
+        t1.enroll_range, t1.status,t1.content,t1.category,
+        (SELECT COUNT(*) FROM activity_enroll WHERE delete_mark = 0 AND activity_info_id = t1.id) as enroll_count FROM activity_info t1
         LEFT JOIN xjr_dictionary_detail t2 ON t1.type = t2.code
         LEFT JOIN company_coop t3 ON t1.enterprise_id = t3.id
         LEFT JOIN xjr_department t4 ON t1.org_id = t4.id

src/main/resources/sqlScript/20240718_sql.sql

@@ -320,3 +320,22 @@ CREATE TABLE `activity_enroll` (
 
 ALTER TABLE  `patrol_offline_courses`   
   ADD COLUMN `patrol_user_id` BIGINT NULL   COMMENT '巡课人(xjr_user)' AFTER `status`;
+  
+  
+-- --------------------------------------------------------------------------------------------
+-- 微信消息模板
+-- --------------------------------------------------------------------------------------------
+DROP TABLE IF EXISTS wechat_message_template;   
+CREATE TABLE `wechat_message_template` (
+  `id` BIGINT NOT NULL,
+  `create_user_id` BIGINT DEFAULT NULL COMMENT '创建人',
+  `create_date` DATETIME DEFAULT NULL COMMENT '创建时间',
+  `modify_user_id` BIGINT DEFAULT NULL COMMENT '修改人',
+  `modify_date` DATETIME DEFAULT NULL COMMENT '修改日期',
+  `delete_mark` INT DEFAULT NULL COMMENT '删除标记',
+  `enabled_mark` INT DEFAULT NULL COMMENT '有效标记',
+  `name` BIGINT DEFAULT NULL COMMENT '活动(activity_info)',
+  user_id DATETIME DEFAULT NULL COMMENT '参与人(xjr_user)',
+  STATUS INT DEFAULT 0 COMMENT '状态(0:待确认 1:未参与 2:已参与)',
+  PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='活动登记表';