Merge branch 'pre'

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

@@ -8,15 +8,11 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.module.activity.dto.ActivityEnrollExportDto;
-import com.xjrsoft.module.activity.dto.ActivityEnrollPageDto;
-import com.xjrsoft.module.activity.dto.AddActivityEnrollDto;
-import com.xjrsoft.module.activity.dto.ChangeStatusDto;
-import com.xjrsoft.module.activity.dto.UpdateActivityInfoDto;
-import com.xjrsoft.module.activity.dto.UserEnrollDto;
+import com.xjrsoft.module.activity.dto.*;
 import com.xjrsoft.module.activity.entity.ActivityEnroll;
 import com.xjrsoft.module.activity.service.IActivityEnrollService;
 import com.xjrsoft.module.activity.vo.ActivityEnrollExcelVo;
@@ -27,13 +23,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.ByteArrayOutputStream;
@@ -43,14 +33,14 @@ import java.util.Date;
 import java.util.List;
 
 /**
-* @title: 活动信息
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @RestController
 @RequestMapping("/activity" + "/activityEnroll")
-@Api(value = "/activity"  + "/activityEnroll",tags = "活动登记代码")
+@Api(value = "/activity" + "/activityEnroll", tags = "活动登记代码")
 @AllArgsConstructor
 public class ActivityEnrollController {
 
@@ -59,16 +49,16 @@ public class ActivityEnrollController {
 
 
     @GetMapping(value = "/page")
-    @ApiOperation(value="活动信息列表(分页)")
+    @ApiOperation(value = "活动信息列表(分页)")
     @SaCheckPermission("activityinfo:detail")
-    public RT<PageOutput<ActivityEnrollPageVo>> page(@Valid ActivityEnrollPageDto dto){
-
+    @XjrLog(value = "活动信息列表(分页)")
+    public RT<PageOutput<ActivityEnrollPageVo>> page(@Valid ActivityEnrollPageDto dto) {
         Page<ActivityEnrollPageVo> page = activityEnrollService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<ActivityEnrollPageVo> pageOutput = ConventPage.getPageOutput(page, ActivityEnrollPageVo.class);
         for (ActivityEnrollPageVo item : pageOutput.getList()) {
-            if(item.getStudentId() != null){
+            if (item.getStudentId() != null) {
                 item.setRoleId(3L);
-            }else if(item.getTeacherId() != null){
+            } else if (item.getTeacherId() != null) {
                 item.setRoleId(2L);
             }
         }
@@ -76,8 +66,9 @@ public class ActivityEnrollController {
     }
 
     @PostMapping(value = "/change-status")
-    @ApiOperation(value="修改状态")
+    @ApiOperation(value = "修改状态")
     @SaCheckPermission("officebuild:detail")
+    @XjrLog(value = "修改状态", saveResponseData = true)
     public RT<Boolean> changeStatus(@Valid @RequestBody List<ChangeStatusDto> dtoList) throws Exception {
         List<ActivityEnroll> enrollList = new ArrayList<>();
         for (ChangeStatusDto dto : dtoList) {
@@ -94,7 +85,8 @@ public class ActivityEnrollController {
     @PostMapping
     @ApiOperation(value = "新增活动信息")
     @SaCheckPermission("activityinfo:add")
-    public RT<Boolean> add(@Valid @RequestBody AddActivityEnrollDto dto){
+    @XjrLog(value = "新增活动信息", saveResponseData = true)
+    public RT<Boolean> add(@Valid @RequestBody AddActivityEnrollDto dto) {
 
         boolean isSuccess = activityEnrollService.save(dto);
         return RT.ok(isSuccess);
@@ -103,7 +95,8 @@ public class ActivityEnrollController {
     @PutMapping
     @ApiOperation(value = "修改活动信息")
     @SaCheckPermission("activityinfo:edit")
-    public RT<Boolean> update(@Valid @RequestBody UpdateActivityInfoDto dto){
+    @XjrLog(value = "修改活动信息", saveResponseData = true)
+    public RT<Boolean> update(@Valid @RequestBody UpdateActivityInfoDto dto) {
 
         ActivityEnroll activityInfo = BeanUtil.toBean(dto, ActivityEnroll.class);
         return RT.ok(activityEnrollService.update(activityInfo));
@@ -113,32 +106,34 @@ public class ActivityEnrollController {
     @DeleteMapping
     @ApiOperation(value = "删除活动信息")
     @SaCheckPermission("activityinfo:delete")
-    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+    @XjrLog(value = "删除活动信息", saveResponseData = true)
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
         return RT.ok(activityEnrollService.delete(ids));
     }
 
 
     @PostMapping("/export-query")
     @ApiOperation(value = "导出列表")
+    @XjrLog(value = "导出列表")
     public ResponseEntity<byte[]> exportData(@Valid @RequestBody ActivityEnrollExportDto dto) {
         List<ActivityEnrollPageVo> listVos = activityEnrollService.getList(dto);
         List<ActivityEnrollExcelVo> list = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
         for (ActivityEnrollPageVo listVo : listVos) {
-            list.add(new ActivityEnrollExcelVo(){{
+            list.add(new ActivityEnrollExcelVo() {{
                 setName(listVo.getName());
                 setMobile(listVo.getMobile());
-                if(listVo.getTeacherId() != null){
+                if (listVo.getTeacherId() != null) {
                     setRoleType("教师");
                 }
-                if(listVo.getStudentId() != null){
+                if (listVo.getStudentId() != null) {
                     setRoleType("学生");
                 }
-                if(listVo.getStatus() == 0){
+                if (listVo.getStatus() == 0) {
                     setStatus("待确认");
-                }else if(listVo.getStatus() == 1){
+                } else if (listVo.getStatus() == 1) {
                     setStatus("未参与");
-                }else if(listVo.getStatus() == 2){
+                } else if (listVo.getStatus() == 2) {
                     setStatus("已参与");
                 }
                 setUserName(listVo.getUserName());
@@ -153,15 +148,16 @@ public class ActivityEnrollController {
     }
 
     @PostMapping(value = "/enroll")
-    @ApiOperation(value="报名")
+    @ApiOperation(value = "报名")
     @SaCheckPermission("activityinfo:detail")
-    public RT<Boolean> enroll(@Valid @RequestBody UserEnrollDto dto){
+    @XjrLog(value = "报名", saveResponseData = true)
+    public RT<Boolean> enroll(@Valid @RequestBody UserEnrollDto dto) {
         List<ActivityEnroll> enrollList = activityEnrollService.list(
                 new QueryWrapper<ActivityEnroll>().lambda()
                         .eq(ActivityEnroll::getUserId, StpUtil.getLoginIdAsLong())
                         .eq(ActivityEnroll::getActivityInfoId, dto.getActivityInfoId())
         );
-        if(!enrollList.isEmpty()){
+        if (!enrollList.isEmpty()) {
             return RT.error("已报名，无需重复报名");
         }
         ActivityEnroll activityEnroll = new ActivityEnroll() {{
@@ -172,7 +168,7 @@ public class ActivityEnrollController {
         boolean save = activityEnrollService.save(activityEnroll);
 
         XjrUser xjrUser = xjrUserService.getById(StpUtil.getLoginIdAsLong());
-        if(StrUtil.isNotEmpty(dto.getMobile()) && !dto.getMobile().equals(xjrUser.getMobile())){
+        if (StrUtil.isNotEmpty(dto.getMobile()) && !dto.getMobile().equals(xjrUser.getMobile())) {
             xjrUser.setMobile(dto.getMobile());
             xjrUserService.updateById(xjrUser);
         }

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

@@ -8,18 +8,13 @@ import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.mybatis.SqlRunnerAdapter;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.module.activity.dto.ActivityEnrollExportDto;
-import com.xjrsoft.module.activity.dto.ActivityInfoPageDto;
-import com.xjrsoft.module.activity.dto.ActivityInfoTodayDto;
-import com.xjrsoft.module.activity.dto.AddActivityEnrollRangeDto;
-import com.xjrsoft.module.activity.dto.AddActivityInfoDto;
-import com.xjrsoft.module.activity.dto.ChangeStatusDto;
-import com.xjrsoft.module.activity.dto.UpdateActivityInfoDto;
+import com.xjrsoft.module.activity.dto.*;
 import com.xjrsoft.module.activity.entity.ActivityEnroll;
 import com.xjrsoft.module.activity.entity.ActivityInfo;
 import com.xjrsoft.module.activity.service.IActivityEnrollRangeService;
@@ -40,34 +35,23 @@ import com.xjrsoft.module.teacher.entity.XjrUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
-* @title: 活动信息
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @RestController
 @RequestMapping("/activity" + "/activityInfo")
-@Api(value = "/activity"  + "/activityInfo",tags = "活动信息代码")
+@Api(value = "/activity" + "/activityInfo", tags = "活动信息代码")
 @AllArgsConstructor
 public class ActivityInfoController {
 
@@ -81,9 +65,10 @@ public class ActivityInfoController {
     private final IActivityEnrollRangeService rangeService;
 
     @GetMapping(value = "/page")
-    @ApiOperation(value="活动信息列表(分页)")
+    @ApiOperation(value = "活动信息列表(分页)")
     @SaCheckPermission("activityinfo:detail")
-    public RT<PageOutput<ActivityInfoPageVo>> page(@Valid ActivityInfoPageDto dto){
+    @XjrLog(value = "活动信息列表(分页)")
+    public RT<PageOutput<ActivityInfoPageVo>> page(@Valid ActivityInfoPageDto dto) {
 
         Page<ActivityInfoPageVo> page = activityInfoService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<ActivityInfoPageVo> pageOutput = ConventPage.getPageOutput(page, ActivityInfoPageVo.class);
@@ -91,68 +76,70 @@ public class ActivityInfoController {
     }
 
     @GetMapping(value = "/today-schedule")
-    @ApiOperation(value="今日安排(分页)")
+    @ApiOperation(value = "今日安排(分页)")
     @SaCheckPermission("activityinfo:detail")
-    public RT<PageOutput<ActivityInfoPageVo>> todaySchedule(@Valid ActivityInfoTodayDto dto){
+    @XjrLog(value = "今日安排(分页)")
+    public RT<PageOutput<ActivityInfoPageVo>> todaySchedule(@Valid ActivityInfoTodayDto dto) {
         List<String> roleList = StpUtil.getRoleList();
-        if(dto.getLoginUserId() == null){
+        if (dto.getLoginUserId() == null) {
             dto.setLoginUserId(StpUtil.getLoginIdAsLong());
         }
-        if(roleList.contains("STUDENT")){
+        if (roleList.contains("STUDENT")) {
             dto.setRoleType(3);
-        }else if(roleList.contains("TEACHER")){
+        } else if (roleList.contains("TEACHER")) {
             dto.setRoleType(2);
         }
         return RT.ok();
     }
 
     @GetMapping(value = "/info")
-    @ApiOperation(value="根据id查询活动信息信息")
+    @ApiOperation(value = "根据id查询活动信息信息")
     @SaCheckPermission("activityinfo:detail")
-    public RT<ActivityInfoVo> info(@RequestParam Long id, Integer category){
+    @XjrLog(value = "根据id查询活动信息信息", saveResponseData = true)
+    public RT<ActivityInfoVo> info(@RequestParam Long id, Integer category) {
         ActivityInfoVo infoVo = null;
-        if(category == null || (category == 1 || category == 2)){
+        if (category == null || (category == 1 || category == 2)) {
             ActivityInfo activityInfo = activityInfoService.getByIdDeep(id);
             if (activityInfo == null) {
                 return RT.error("找不到此数据！");
             }
             infoVo = BeanUtil.toBean(activityInfo, ActivityInfoVo.class);
-            if(infoVo.getOrgId() != null){
+            if (infoVo.getOrgId() != null) {
                 Department department = departmentService.getById(infoVo.getOrgId());
-                if(department != null){
+                if (department != null) {
                     infoVo.setOrgName(department.getName());
                 }
             }
-            if(infoVo.getEnterpriseId() != null){
+            if (infoVo.getEnterpriseId() != null) {
                 String tableName = "company_coop";
                 Entity where = Entity.create(tableName);
                 where.set("id", infoVo.getEnterpriseId());
                 Map<String, Object> objectMap = SqlRunnerAdapter.db().dynamicSelectOne(tableName, where);
 
-                if(objectMap != null && objectMap.containsKey("company_name")){
+                if (objectMap != null && objectMap.containsKey("company_name")) {
                     infoVo.setEnterpriseName(objectMap.get("company_name").toString());
                 }
             }
 
             List<ActivityEnrollRangeVo> userRelationList = new ArrayList<>();
-            if(activityInfo.getEnrollRange() != null && !activityInfo.getEnrollRange().isEmpty()){
+            if (activityInfo.getEnrollRange() != null && !activityInfo.getEnrollRange().isEmpty()) {
                 JSONArray asJsonArray = JSONUtil.parseArray(activityInfo.getEnrollRange());
                 for (Object jsonElement : asJsonArray) {
                     ActivityEnrollRangeVo relationDto = JSONUtil.toBean(JSONUtil.parseObj(jsonElement), ActivityEnrollRangeVo.class);
-                    if(relationDto.getUserId() != null){
+                    if (relationDto.getUserId() != null) {
                         XjrUser xjrUser = xjrUserService.getById(relationDto.getUserId());
-                        if(xjrUser != null){
+                        if (xjrUser != null) {
                             relationDto.setName(xjrUser.getName());
                         }
-                    }else if(relationDto.getDeptId() != null){
+                    } else if (relationDto.getDeptId() != null) {
                         Department department = departmentService.getById(relationDto.getDeptId());
-                        if(department != null){
+                        if (department != null) {
                             relationDto.setName(department.getName());
                         }
 
-                    }else if(relationDto.getClassId() != null){
+                    } else if (relationDto.getClassId() != null) {
                         BaseClass aClass = classService.getById(relationDto.getClassId());
-                        if(aClass != null){
+                        if (aClass != null) {
                             relationDto.setName(aClass.getName());
                         }
                     }
@@ -177,65 +164,65 @@ public class ActivityInfoController {
 
             Set<ActivityEnrollPageVo> notSuretSet = enrollList.stream().filter(x -> (x.getStatus() == 1 || x.getStatus() == 0)).collect(Collectors.toSet());
             infoVo.setNotSureCount(notSuretSet.size());
-        }else if(category == 3){
+        } else if (category == 3) {
             String tableName = "club_activities";
             Entity where = Entity.create(tableName);
             where.set("id", id);
             Map<String, Object> objectMap = SqlRunnerAdapter.db().dynamicSelectOne(tableName, where);
             infoVo = new ActivityInfoVo();
-            if(objectMap == null){
+            if (objectMap == null) {
                 return RT.ok(infoVo);
             }
 
             infoVo.setName(objectMap.get("club_activities_name").toString());
             infoVo.setContent(objectMap.get("club_activities_content").toString());
-            infoVo.setStartDate((Date)objectMap.get("start_time"));
-            infoVo.setEndDate((Date)objectMap.get("end_time"));
+            infoVo.setStartDate((Date) objectMap.get("start_time"));
+            infoVo.setEndDate((Date) objectMap.get("end_time"));
             infoVo.setPlace(objectMap.get("activity_location").toString());
-        }else if(category == 4){
+        } else if (category == 4) {
             String tableName = "moral_event";
             Entity where = Entity.create(tableName);
             where.set("id", id);
             Map<String, Object> objectMap = SqlRunnerAdapter.db().dynamicSelectOne(tableName, where);
             infoVo = new ActivityInfoVo();
-            if(objectMap == null){
+            if (objectMap == null) {
                 return RT.ok(infoVo);
             }
             infoVo.setName(objectMap.get("moral_event_name").toString());
             infoVo.setContent(objectMap.get("event_content").toString());
-            infoVo.setStartDate((Date)objectMap.get("event_start_time"));
-            infoVo.setEndDate((Date)objectMap.get("event_end_time"));
+            infoVo.setStartDate((Date) objectMap.get("event_start_time"));
+            infoVo.setEndDate((Date) objectMap.get("event_end_time"));
             infoVo.setPlace(objectMap.get("event_address").toString());
             infoVo.setOrgName(objectMap.get("host_unit").toString());
             infoVo.setDutyPerson(objectMap.get("event_leader").toString());
-        }else if(category == 5){
+        } else if (category == 5) {
             String tableName = "wf_teacher_training";
             Entity where = Entity.create(tableName);
             where.set("id", id);
             Map<String, Object> objectMap = SqlRunnerAdapter.db().dynamicSelectOne(tableName, where);
             infoVo = new ActivityInfoVo();
-            if(objectMap == null){
+            if (objectMap == null) {
                 return RT.ok(infoVo);
             }
             infoVo.setName(objectMap.get("training_name").toString());
             infoVo.setContent(objectMap.get("training_topic").toString());
-            infoVo.setStartDate(Date.from(((LocalDateTime)objectMap.get("start_time")).atZone(ZoneId.systemDefault()).toInstant()));
-            infoVo.setEndDate(Date.from(((LocalDateTime)objectMap.get("end_time")).atZone(ZoneId.systemDefault()).toInstant()));
+            infoVo.setStartDate(Date.from(((LocalDateTime) objectMap.get("start_time")).atZone(ZoneId.systemDefault()).toInstant()));
+            infoVo.setEndDate(Date.from(((LocalDateTime) objectMap.get("end_time")).atZone(ZoneId.systemDefault()).toInstant()));
             infoVo.setPlace(objectMap.get("training_address").toString());
             infoVo.setDutyPerson(objectMap.get("person_in_charge").toString());
-        }else if(category == 6){
+        } else if (category == 6) {
             String tableName = "party_build_event";
             Entity where = Entity.create(tableName);
             where.set("id", id);
             Map<String, Object> objectMap = SqlRunnerAdapter.db().dynamicSelectOne(tableName, where);
             infoVo = new ActivityInfoVo();
-            if(objectMap == null){
+            if (objectMap == null) {
                 return RT.ok(infoVo);
             }
             infoVo.setName(objectMap.get("event_type").toString());
             infoVo.setContent(objectMap.get("event_content").toString());
-            infoVo.setStartDate((Date)objectMap.get("event_start_time"));
-            infoVo.setEndDate((Date)objectMap.get("event_end_time"));
+            infoVo.setStartDate((Date) objectMap.get("event_start_time"));
+            infoVo.setEndDate((Date) objectMap.get("event_end_time"));
             infoVo.setPlace(objectMap.get("event_address").toString());
         }
 
@@ -243,11 +230,12 @@ public class ActivityInfoController {
     }
 
     @PostMapping(value = "/change-status")
-    @ApiOperation(value="修改状态")
+    @ApiOperation(value = "修改状态")
     @SaCheckPermission("officebuild:detail")
+    @XjrLog(value = "修改状态", saveResponseData = true)
     public RT<Boolean> changeStatus(@Valid @RequestBody ChangeStatusDto dto) throws Exception {
         ActivityInfo activityInfo = activityInfoService.getById(dto.getId());
-        if(activityInfo == null){
+        if (activityInfo == null) {
             throw new MyException("未能找到活动信息");
         }
         activityInfo.setStatus(dto.getStatus());
@@ -259,7 +247,8 @@ public class ActivityInfoController {
     @PostMapping
     @ApiOperation(value = "新增活动信息")
     @SaCheckPermission("activityinfo:add")
-    public RT<Boolean> add(@Valid @RequestBody AddActivityInfoDto dto){
+    @XjrLog(value = "新增活动信息", saveResponseData = true)
+    public RT<Boolean> add(@Valid @RequestBody AddActivityInfoDto dto) {
 
         boolean isSuccess = activityInfoService.add(dto);
         return RT.ok(isSuccess);
@@ -268,7 +257,8 @@ public class ActivityInfoController {
     @PutMapping
     @ApiOperation(value = "修改活动信息")
     @SaCheckPermission("activityinfo:edit")
-    public RT<Boolean> update(@Valid @RequestBody UpdateActivityInfoDto dto){
+    @XjrLog(value = "修改活动信息", saveResponseData = true)
+    public RT<Boolean> update(@Valid @RequestBody UpdateActivityInfoDto dto) {
         return RT.ok(activityInfoService.update(dto));
 
     }
@@ -276,17 +266,19 @@ public class ActivityInfoController {
     @DeleteMapping
     @ApiOperation(value = "删除活动信息")
     @SaCheckPermission("activityinfo:delete")
-    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+    @XjrLog(value = "删除活动信息", saveResponseData = true)
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
         return RT.ok(activityInfoService.delete(ids));
     }
 
 
     @GetMapping(value = "/effective-list")
-    @ApiOperation(value="移动端活动信息列表(分页)")
+    @ApiOperation(value = "移动端活动信息列表(分页)")
     @SaCheckPermission("activityinfo:detail")
-    public RT<PageOutput<ActivityInfoPageVo>> mobilePage(@Valid ActivityInfoPageDto dto){
+    @XjrLog(value = "移动端活动信息列表(分页)")
+    public RT<PageOutput<ActivityInfoPageVo>> mobilePage(@Valid ActivityInfoPageDto dto) {
         AddActivityEnrollRangeDto rangeDto = new AddActivityEnrollRangeDto();
-        if(dto.getLoginUserId() == null){
+        if (dto.getLoginUserId() == null) {
             dto.setLoginUserId(StpUtil.getLoginIdAsLong());
         }
 
@@ -304,12 +296,12 @@ public class ActivityInfoController {
 
         for (ActivityInfoPageVo record : page.getRecords()) {
             record.setIsEnroll(0);
-            if(collect.contains(Long.parseLong(record.getId()))){
+            if (collect.contains(Long.parseLong(record.getId()))) {
                 record.setIsEnroll(1);
             }
-            if(record.getCoverFileId() != null){
+            if (record.getCoverFileId() != null) {
                 File file = fileService.getOne(new QueryWrapper<File>().lambda().eq(File::getFolderId, record.getCoverFileId()));
-                if(file != null){
+                if (file != null) {
                     record.setCoverFileUrl(file.getFileUrl());
                 }
             }
@@ -320,15 +312,16 @@ public class ActivityInfoController {
     }
 
     @GetMapping(value = "/my-enroll-list")
-    @ApiOperation(value="我的报名记录(分页)")
+    @ApiOperation(value = "我的报名记录(分页)")
     @SaCheckPermission("activityinfo:detail")
-    public RT<PageOutput<ActivityInfoPageVo>> myEnrollList(@Valid ActivityInfoPageDto dto){
+    @XjrLog(value = "我的报名记录(分页)")
+    public RT<PageOutput<ActivityInfoPageVo>> myEnrollList(@Valid ActivityInfoPageDto dto) {
         dto.setLoginUserId(StpUtil.getLoginIdAsLong());
         Page<ActivityInfoPageVo> page = activityInfoService.getMyPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         for (ActivityInfoPageVo record : page.getRecords()) {
-            if(record.getCoverFileId() != null){
+            if (record.getCoverFileId() != null) {
                 File file = fileService.getOne(new QueryWrapper<File>().lambda().eq(File::getFolderId, record.getCoverFileId()));
-                if(file != null){
+                if (file != null) {
                     record.setCoverFileUrl(file.getFileUrl());
                 }
             }

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

@@ -6,11 +6,11 @@ import lombok.EqualsAndHashCode;
 
 
 /**
-* @title: 活动信息分页查询入参
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息分页查询入参
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class ActivityEnrollExportDto {

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

@@ -7,11 +7,11 @@ import lombok.EqualsAndHashCode;
 
 
 /**
-* @title: 活动信息分页查询入参
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息分页查询入参
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class ActivityEnrollPageDto extends PageInput {

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

@@ -9,11 +9,11 @@ import java.util.List;
 
 
 /**
-* @title: 活动信息分页查询入参
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息分页查询入参
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class ActivityInfoPageDto extends PageInput {

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

@@ -9,11 +9,11 @@ import java.util.List;
 
 
 /**
-* @title: 活动信息分页查询入参
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息分页查询入参
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class ActivityInfoTodayDto extends PageInput {

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

@@ -8,24 +8,24 @@ import java.util.List;
 
 
 /**
-* @title: 活动登记表
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动登记表
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Data
 public class AddActivityEnrollDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-    * 活动(activity_info)
-    */
+     * 活动(activity_info)
+     */
     @ApiModelProperty("活动(activity_info)")
     private Long activityInfoId;
     /**
-    * 参与人(xjr_user)
-    */
+     * 参与人(xjr_user)
+     */
     @ApiModelProperty("参与人")
     private List<AddActivityEnrollRangeDto> enrollRangeList;
 

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

@@ -6,36 +6,35 @@ import lombok.Data;
 import java.io.Serializable;
 
 
-
 /**
-* @title: 活动报名范围
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动报名范围
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Data
 public class AddActivityEnrollRangeDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-    * 所属班级id
-    */
+     * 所属班级id
+     */
     @ApiModelProperty("所属班级id")
     private Long classId;
     /**
-    * 所属部门id
-    */
+     * 所属部门id
+     */
     @ApiModelProperty("所属部门id")
     private Long deptId;
     /**
-    * 用id
-    */
+     * 用id
+     */
     @ApiModelProperty("用id")
     private Long userId;
     /**
-    * 活动(activity)
-    */
+     * 活动(activity)
+     */
     @ApiModelProperty("活动(activity)")
     private Long activityInfoId;
 

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

@@ -8,92 +8,91 @@ import java.util.Date;
 import java.util.List;
 
 
-
 /**
-* @title: 活动信息
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Data
 public class AddActivityInfoDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-    * 赛事名称
-    */
+     * 赛事名称
+     */
     @ApiModelProperty("赛事名称")
     private String name;
     /**
-    * 活动地点
-    */
+     * 活动地点
+     */
     @ApiModelProperty("活动地点")
     private String place;
     /**
-    * 活动开始时间
-    */
+     * 活动开始时间
+     */
     @ApiModelProperty("活动开始时间")
     private Date startDate;
     /**
-    * 活动结束时间
-    */
+     * 活动结束时间
+     */
     @ApiModelProperty("活动结束时间")
     private Date endDate;
     /**
-    * 活动类型(xjr_dictionary_detail[match_activity_type])
-    */
+     * 活动类型(xjr_dictionary_detail[match_activity_type])
+     */
     @ApiModelProperty("活动类型(xjr_dictionary_detail[match_activity_type])")
     private String type;
     /**
-    * 组织部门(xjr_department)
-    */
+     * 组织部门(xjr_department)
+     */
     @ApiModelProperty("组织部门(xjr_department)")
     private Long orgId;
     /**
-    * 报名结束时间
-    */
+     * 报名结束时间
+     */
     @ApiModelProperty("报名结束时间")
     private Date enrollEndTime;
     /**
-    * 活动负责人
-    */
+     * 活动负责人
+     */
     @ApiModelProperty("活动负责人")
     private String dutyPerson;
     /**
-    * 活动负责人电话
-    */
+     * 活动负责人电话
+     */
     @ApiModelProperty("活动负责人电话")
     private String dutyPersonMobile;
     /**
-    * 封面图片
-    */
+     * 封面图片
+     */
     @ApiModelProperty("封面图片")
     private String coverFileId;
     /**
-    * 状态(0:未发布 1:报名中 2:报名结束 3:活动结束)
-    */
+     * 状态(0:未发布 1:报名中 2:报名结束 3:活动结束)
+     */
     @ApiModelProperty("状态(0:未发布 1:报名中 2:报名结束 3:活动结束)")
     private Integer status;
     /**
-    * 活动内容
-    */
+     * 活动内容
+     */
     @ApiModelProperty("活动内容")
     private String content;
     /**
-    * 合作企业
-    */
+     * 合作企业
+     */
     @ApiModelProperty("合作企业(校企活动时填写)")
     private Long enterpriseId;
     /**
-    * 1:校企合作活动 2:赛事活动
-    */
+     * 1:校企合作活动 2:赛事活动
+     */
     @ApiModelProperty("1:校企合作活动 2:赛事活动")
     private Integer category;
 
     /**
-    * activityEnrollRange
-    */
+     * activityEnrollRange
+     */
     @ApiModelProperty("activityEnrollRange子表")
     private List<AddActivityEnrollRangeDto> activityEnrollRangeList;
 }

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

@@ -7,19 +7,19 @@ import java.io.Serializable;
 
 
 /**
-* @title: 活动信息
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Data
 public class ChangeStatusDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-    * 赛事名称
-    */
+     * 赛事名称
+     */
     @ApiModelProperty("主键编号")
     private Long id;
 

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

@@ -4,21 +4,20 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
-
 /**
-* @title: 活动信息
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Data
 public class UpdateActivityInfoDto extends AddActivityInfoDto {
 
     private static final long serialVersionUID = 1L;
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     private Long id;
 }

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

@@ -7,11 +7,11 @@ import java.io.Serializable;
 
 
 /**
-* @title: 活动信息
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Data
 public class UserEnrollDto implements Serializable {
 
@@ -20,7 +20,8 @@ public class UserEnrollDto implements Serializable {
     @ApiModelProperty("活动id")
     private String activityInfoId;
     /**
-    */
+     *
+     */
     @ApiModelProperty("手机号")
     private String mobile;
 }

src/main/java/com/xjrsoft/module/activity/entity/ActivityEnroll.java

@@ -1,10 +1,6 @@
 package com.xjrsoft.module.activity.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,11 +10,11 @@ import java.util.Date;
 
 
 /**
-* @title: 活动登记表
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动登记表
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Data
 @TableName("activity_enroll")
 @ApiModel(value = "activity_enroll", description = "活动登记表")
@@ -27,61 +23,61 @@ public class ActivityEnroll implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableId
     private Long id;
     /**
-    * 创建人
-    */
+     * 创建人
+     */
     @ApiModelProperty("创建人")
     @TableField(fill = FieldFill.INSERT)
     private Long createUserId;
     /**
-    * 创建时间
-    */
+     * 创建时间
+     */
     @ApiModelProperty("创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createDate;
     /**
-    * 修改人
-    */
+     * 修改人
+     */
     @ApiModelProperty("修改人")
     @TableField(fill = FieldFill.UPDATE)
     private Long modifyUserId;
     /**
-    * 修改日期
-    */
+     * 修改日期
+     */
     @ApiModelProperty("修改日期")
     @TableField(fill = FieldFill.UPDATE)
     private Date modifyDate;
     /**
-    * 删除标记
-    */
+     * 删除标记
+     */
     @ApiModelProperty("删除标记")
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
     private Integer deleteMark;
     /**
-    * 有效标记
-    */
+     * 有效标记
+     */
     @ApiModelProperty("有效标记")
     @TableField(fill = FieldFill.INSERT)
     private Integer enabledMark;
     /**
-    * 活动(activity_info)
-    */
+     * 活动(activity_info)
+     */
     @ApiModelProperty("活动(activity_info)")
     private Long activityInfoId;
     /**
-    * 参与人(xjr_user)
-    */
+     * 参与人(xjr_user)
+     */
     @ApiModelProperty("参与人(xjr_user)")
     private Long userId;
     /**
-    * 状态(0:待确认 1:未参与 2:已参与)
-    */
+     * 状态(0:待确认 1:未参与 2:已参与)
+     */
     @ApiModelProperty("状态(0:待确认 1:未参与 2:已参与)")
     private Integer status;
 

src/main/java/com/xjrsoft/module/activity/entity/ActivityEnrollRange.java

@@ -1,10 +1,6 @@
 package com.xjrsoft.module.activity.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,11 +10,11 @@ import java.util.Date;
 
 
 /**
-* @title: 活动报名范围
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动报名范围
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Data
 @TableName("activity_enroll_range")
 @ApiModel(value = "activity_enroll_range", description = "活动报名范围")
@@ -27,66 +23,66 @@ public class ActivityEnrollRange implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableId
     private Long id;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Long createUserId;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Date createDate;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.UPDATE)
     private Long modifyUserId;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.UPDATE)
     private Date modifyDate;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
     private Integer deleteMark;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Integer enabledMark;
     /**
-    * 所属班级id
-    */
+     * 所属班级id
+     */
     @ApiModelProperty("所属班级id")
     private Long classId;
     /**
-    * 所属部门id
-    */
+     * 所属部门id
+     */
     @ApiModelProperty("所属部门id")
     private Long deptId;
     /**
-    * 用id
-    */
+     * 用id
+     */
     @ApiModelProperty("用id")
     private Long userId;
     /**
-    * 活动(activity)
-    */
+     * 活动(activity)
+     */
     @ApiModelProperty("活动(activity)")
     private Long activityInfoId;
 

src/main/java/com/xjrsoft/module/activity/entity/ActivityInfo.java

@@ -1,10 +1,6 @@
 package com.xjrsoft.module.activity.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,11 +12,11 @@ import java.util.List;
 
 
 /**
-* @title: 活动信息
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Data
 @TableName("activity_info")
 @ApiModel(value = "activity_info", description = "活动信息")
@@ -29,134 +25,134 @@ public class ActivityInfo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableId
     private Long id;
     /**
-    * 创建人
-    */
+     * 创建人
+     */
     @ApiModelProperty("创建人")
     @TableField(fill = FieldFill.INSERT)
     private Long createUserId;
     /**
-    * 创建时间
-    */
+     * 创建时间
+     */
     @ApiModelProperty("创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createDate;
     /**
-    * 修改人
-    */
+     * 修改人
+     */
     @ApiModelProperty("修改人")
     @TableField(fill = FieldFill.UPDATE)
     private Long modifyUserId;
     /**
-    * 修改日期
-    */
+     * 修改日期
+     */
     @ApiModelProperty("修改日期")
     @TableField(fill = FieldFill.UPDATE)
     private Date modifyDate;
     /**
-    * 删除标记
-    */
+     * 删除标记
+     */
     @ApiModelProperty("删除标记")
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
     private Integer deleteMark;
     /**
-    * 有效标记
-    */
+     * 有效标记
+     */
     @ApiModelProperty("有效标记")
     @TableField(fill = FieldFill.INSERT)
     private Integer enabledMark;
     /**
-    * 赛事名称
-    */
+     * 赛事名称
+     */
     @ApiModelProperty("赛事名称")
     private String name;
     /**
-    * 活动地点
-    */
+     * 活动地点
+     */
     @ApiModelProperty("活动地点")
     private String place;
     /**
-    * 活动开始时间
-    */
+     * 活动开始时间
+     */
     @ApiModelProperty("活动开始时间")
     private Date startDate;
     /**
-    * 活动结束时间
-    */
+     * 活动结束时间
+     */
     @ApiModelProperty("活动结束时间")
     private Date endDate;
     /**
-    * 活动类型(xjr_dictionary_detail[match_activity_type])
-    */
+     * 活动类型(xjr_dictionary_detail[match_activity_type])
+     */
     @ApiModelProperty("活动类型(xjr_dictionary_detail[match_activity_type])")
     private String type;
     /**
-    * 组织部门(xjr_department)
-    */
+     * 组织部门(xjr_department)
+     */
     @ApiModelProperty("组织部门(xjr_department)")
     private Long orgId;
     /**
-    * 报名结束时间
-    */
+     * 报名结束时间
+     */
     @ApiModelProperty("报名结束时间")
     private Date enrollEndTime;
     /**
-    * 活动负责人
-    */
+     * 活动负责人
+     */
     @ApiModelProperty("活动负责人")
     private String dutyPerson;
     /**
-    * 活动负责人电话
-    */
+     * 活动负责人电话
+     */
     @ApiModelProperty("活动负责人电话")
     private String dutyPersonMobile;
     /**
-    * 封面图片
-    */
+     * 封面图片
+     */
     @ApiModelProperty("封面图片")
     private String coverFileId;
     /**
-    * 报名范围
-    */
+     * 报名范围
+     */
     @ApiModelProperty("报名范围")
     private String enrollRange;
     /**
-    * 状态(0:未发布 1:报名中 2:报名结束 3:活动结束)
-    */
+     * 状态(0:未发布 1:报名中 2:报名结束 3:活动结束)
+     */
     @ApiModelProperty("状态(0:未发布 1:报名中 2:报名结束 3:活动结束)")
     private Integer status;
     /**
-    * 活动内容
-    */
+     * 活动内容
+     */
     @ApiModelProperty("活动内容")
     private String content;
     /**
-    * 合作企业
-    */
+     * 合作企业
+     */
     @ApiModelProperty("合作企业")
     private Long enterpriseId;
     /**
-    * 1:校企合作活动 2:赛事活动
-    */
+     * 1:校企合作活动 2:赛事活动
+     */
     @ApiModelProperty("活动类别(1:校企合作活动 2:赛事活动)")
     private Integer category;
 
     /**
-    * activityEnrollRange
-    */
+     * activityEnrollRange
+     */
     @ApiModelProperty("activityEnrollRange子表")
     @TableField(exist = false)
     @EntityMapping(thisField = "id", joinField = "activityInfoId")
     private List<ActivityEnrollRange> activityEnrollRangeList;
     /**
-    * activityEnroll
-    */
+     * activityEnroll
+     */
     @ApiModelProperty("activityEnroll子表")
     @TableField(exist = false)
     @EntityMapping(thisField = "id", joinField = "activityInfoId")

src/main/java/com/xjrsoft/module/activity/mapper/ActivityEnrollMapper.java

@@ -12,11 +12,11 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
-* @title: 活动登记表
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动登记表
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Mapper
 public interface ActivityEnrollMapper extends MPJBaseMapper<ActivityEnroll> {
 

src/main/java/com/xjrsoft/module/activity/mapper/ActivityEnrollRangeMapper.java

@@ -9,11 +9,11 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
-* @title: 活动报名范围
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动报名范围
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Mapper
 public interface ActivityEnrollRangeMapper extends MPJBaseMapper<ActivityEnrollRange> {
 

src/main/java/com/xjrsoft/module/activity/mapper/ActivityInfoMapper.java

@@ -9,11 +9,11 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
-* @title: 活动信息
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Mapper
 public interface ActivityInfoMapper extends MPJBaseMapper<ActivityInfo> {
 

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

@@ -7,11 +7,11 @@ import com.xjrsoft.module.activity.entity.ActivityEnrollRange;
 import java.util.List;
 
 /**
-* @title: 活动信息
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 
 public interface IActivityEnrollRangeService extends MPJBaseService<ActivityEnrollRange> {
 

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

@@ -11,34 +11,34 @@ import com.xjrsoft.module.activity.vo.ActivityEnrollPageVo;
 import java.util.List;
 
 /**
-* @title: 活动信息
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 
 public interface IActivityEnrollService extends MPJBaseService<ActivityEnroll> {
     /**
-    * 新增
-    *
-    * @return
-    */
+     * 新增
+     *
+     * @return
+     */
     Boolean save(AddActivityEnrollDto dto);
 
     /**
-    * 更新
-    *
-    * @param activityInfo
-    * @return
-    */
+     * 更新
+     *
+     * @param activityInfo
+     * @return
+     */
     Boolean update(ActivityEnroll activityInfo);
 
     /**
-    * 删除
-    *
-    * @param ids
-    * @return
-    */
+     * 删除
+     *
+     * @param ids
+     * @return
+     */
     Boolean delete(List<Long> ids);
 
 

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

@@ -11,33 +11,33 @@ import com.xjrsoft.module.activity.vo.ActivityInfoPageVo;
 import java.util.List;
 
 /**
-* @title: 活动信息
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 
 public interface IActivityInfoService extends MPJBaseService<ActivityInfo> {
     /**
-    * 新增
-    *
-    * @return
-    */
+     * 新增
+     *
+     * @return
+     */
     Boolean add(AddActivityInfoDto dto);
 
     /**
-    * 更新
-    *
-    * @return
-    */
+     * 更新
+     *
+     * @return
+     */
     Boolean update(UpdateActivityInfoDto dto);
 
     /**
-    * 删除
-    *
-    * @param ids
-    * @return
-    */
+     * 删除
+     *
+     * @param ids
+     * @return
+     */
     Boolean delete(List<Long> ids);
 
 

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

@@ -11,11 +11,11 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 /**
-* @title: 活动信息
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Service
 @AllArgsConstructor
 public class ActivityEnrollRangeServiceImpl extends MPJBaseServiceImpl<ActivityEnrollRangeMapper, ActivityEnrollRange> implements IActivityEnrollRangeService {

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

@@ -30,20 +30,21 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
-* @title: 活动信息
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Service
 @AllArgsConstructor
 public class ActivityEnrollServiceImpl extends MPJBaseServiceImpl<ActivityEnrollMapper, ActivityEnroll> implements IActivityEnrollService {
     private final IUserService userService;
     private final IBaseStudentSchoolRollService rollService;
+
     @Override
     public Boolean save(AddActivityEnrollDto dto) {
         List<ActivityEnroll> insertList = new ArrayList<>();
-        if(dto.getEnrollRangeList() != null){
+        if (dto.getEnrollRangeList() != null) {
             List<ActivityEnroll> existList = this.list(
                     new QueryWrapper<ActivityEnroll>().lambda()
                             .eq(ActivityEnroll::getActivityInfoId, dto.getActivityInfoId())
@@ -52,10 +53,10 @@ public class ActivityEnrollServiceImpl extends MPJBaseServiceImpl<ActivityEnroll
             Date createDate = new Date();
             Set<Long> existUserId = existList.stream().map(ActivityEnroll::getUserId).collect(Collectors.toSet());
             for (AddActivityEnrollRangeDto enrollRange : dto.getEnrollRangeList()) {
-                if(enrollRange.getUserId() != null){
-                    if(!existUserId.contains(enrollRange.getUserId() )){
+                if (enrollRange.getUserId() != null) {
+                    if (!existUserId.contains(enrollRange.getUserId())) {
                         insertList.add(
-                                new ActivityEnroll(){{
+                                new ActivityEnroll() {{
                                     setUserId(enrollRange.getUserId());
                                     setCreateDate(createDate);
                                     setActivityInfoId(dto.getActivityInfoId());
@@ -63,7 +64,7 @@ public class ActivityEnrollServiceImpl extends MPJBaseServiceImpl<ActivityEnroll
                                 }}
                         );
                     }
-                }else if(enrollRange.getDeptId() != null){
+                } else if (enrollRange.getDeptId() != null) {
                     List<User> userList = userService.list(
                             new MPJLambdaWrapper<User>()
                                     .select(XjrUser::getId)
@@ -72,7 +73,7 @@ public class ActivityEnrollServiceImpl extends MPJBaseServiceImpl<ActivityEnroll
                                     .eq(UserDeptRelation::getDeptId, enrollRange.getDeptId())
                     );
                     for (User user : userList) {
-                        if(!existUserId.contains(user.getId() )) {
+                        if (!existUserId.contains(user.getId())) {
                             insertList.add(
                                     new ActivityEnroll() {{
                                         setUserId(user.getId());
@@ -83,7 +84,7 @@ public class ActivityEnrollServiceImpl extends MPJBaseServiceImpl<ActivityEnroll
                             );
                         }
                     }
-                }else if(enrollRange.getClassId() != null){
+                } else if (enrollRange.getClassId() != null) {
                     List<BaseStudentSchoolRoll> userList = rollService.list(
                             new MPJLambdaWrapper<BaseStudentSchoolRoll>()
                                     .select(BaseStudentSchoolRoll::getId)
@@ -92,7 +93,7 @@ public class ActivityEnrollServiceImpl extends MPJBaseServiceImpl<ActivityEnroll
                                     .eq(BaseStudentSchoolRoll::getClassId, enrollRange.getClassId())
                     );
                     for (BaseStudentSchoolRoll user : userList) {
-                        if(!existUserId.contains(user.getId() )) {
+                        if (!existUserId.contains(user.getId())) {
                             insertList.add(
                                     new ActivityEnroll() {{
                                         setUserId(user.getUserId());
@@ -106,7 +107,7 @@ public class ActivityEnrollServiceImpl extends MPJBaseServiceImpl<ActivityEnroll
                 }
             }
         }
-        if(!insertList.isEmpty()){
+        if (!insertList.isEmpty()) {
             this.saveBatch(insertList);
         }
         return true;

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

@@ -25,11 +25,11 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
-* @title: 活动信息
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Service
 @AllArgsConstructor
 public class ActivityInfoServiceImpl extends MPJBaseServiceImpl<ActivityInfoMapper, ActivityInfo> implements IActivityInfoService {
@@ -43,7 +43,7 @@ public class ActivityInfoServiceImpl extends MPJBaseServiceImpl<ActivityInfoMapp
     @Transactional(rollbackFor = Exception.class)
     public Boolean add(AddActivityInfoDto dto) {
         ActivityInfo activityInfo = BeanUtil.toBean(dto, ActivityInfo.class);
-        if(activityInfo.getActivityEnrollRangeList() != null){
+        if (activityInfo.getActivityEnrollRangeList() != null) {
             for (ActivityEnrollRange activityEnrollRange : activityInfo.getActivityEnrollRangeList()) {
                 activityEnrollRange.setActivityInfoId(activityInfo.getId());
                 activityInfoActivityEnrollRangeMapper.insert(activityEnrollRange);
@@ -83,7 +83,7 @@ public class ActivityInfoServiceImpl extends MPJBaseServiceImpl<ActivityInfoMapp
                 }
             }
             //已经不存在的id 删除
-            if(activityEnrollRangeRemoveIds.size() > 0){
+            if (activityEnrollRangeRemoveIds.size() > 0) {
                 activityInfoActivityEnrollRangeMapper.deleteBatchIds(activityEnrollRangeRemoveIds);
             }
         }

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

@@ -6,11 +6,11 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
-* @title: 活动信息分页列表出参
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息分页列表出参
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Data
 public class ActivityEnrollExcelVo {
 

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

@@ -6,37 +6,37 @@ import lombok.Data;
 import java.util.Date;
 
 /**
-* @title: 活动信息分页列表出参
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息分页列表出参
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Data
 public class ActivityEnrollPageVo {
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     private String id;
     /**
-    * 赛事名称
-    */
+     * 赛事名称
+     */
     @ApiModelProperty("参与人员名称")
     private String name;
     /**
-    * 报名时间
-    */
+     * 报名时间
+     */
     @ApiModelProperty("报名时间")
     private Date createDate;
     /**
-    * 活动结束时间
-    */
+     * 活动结束时间
+     */
     @ApiModelProperty("活动结束时间")
     private Date endDate;
     /**
-    * 用户名
-    */
+     * 用户名
+     */
     @ApiModelProperty("用户名")
     private String userName;
 
@@ -46,8 +46,8 @@ public class ActivityEnrollPageVo {
     @ApiModelProperty("角色id")
     private Long roleId;
     /**
-    * 状态(0:待确认 1:未参与 2:已参与)
-    */
+     * 状态(0:待确认 1:未参与 2:已参与)
+     */
     @ApiModelProperty("状态(0:待确认 1:未参与 2:已参与)")
     private Integer status;
 

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

@@ -4,37 +4,37 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
-* @title: 活动报名范围表单出参
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动报名范围表单出参
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Data
 public class ActivityEnrollRangeVo {
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     private Long id;
     /**
-    * 所属班级id
-    */
+     * 所属班级id
+     */
     @ApiModelProperty("所属班级id")
     private Long classId;
     /**
-    * 所属部门id
-    */
+     * 所属部门id
+     */
     @ApiModelProperty("所属部门id")
     private Long deptId;
     /**
-    * 用id
-    */
+     * 用id
+     */
     @ApiModelProperty("用id")
     private Long userId;
     /**
-    * 活动(activity)
-    */
+     * 活动(activity)
+     */
     @ApiModelProperty("活动(activity)")
     private Long activityInfoId;
 
@@ -43,5 +43,4 @@ public class ActivityEnrollRangeVo {
     private String name;
 
 
-
 }

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

@@ -6,35 +6,34 @@ import lombok.Data;
 import java.util.Date;
 
 /**
-* @title: 活动登记表表单出参
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动登记表表单出参
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Data
 public class ActivityEnrollVo {
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     private Long id;
     /**
-    * 活动(activity_info)
-    */
+     * 活动(activity_info)
+     */
     @ApiModelProperty("活动(activity_info)")
     private Long activityInfoId;
     /**
-    * 参与人(xjr_user)
-    */
+     * 参与人(xjr_user)
+     */
     @ApiModelProperty("参与人(xjr_user)")
     private Date userId;
     /**
-    * 状态(0:待确认 1:未参与 2:已参与)
-    */
+     * 状态(0:待确认 1:未参与 2:已参与)
+     */
     @ApiModelProperty("状态(0:待确认 1:未参与 2:已参与)")
     private Integer STATUS;
 
 
-
 }

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

@@ -6,101 +6,101 @@ import lombok.Data;
 import java.util.Date;
 
 /**
-* @title: 活动信息分页列表出参
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息分页列表出参
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Data
 public class ActivityInfoPageVo {
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     private String id;
     /**
-    * 赛事名称
-    */
+     * 赛事名称
+     */
     @ApiModelProperty("活动名称")
     private String name;
     /**
-    * 活动地点
-    */
+     * 活动地点
+     */
     @ApiModelProperty("活动地点")
     private String place;
     /**
-    * 活动开始时间
-    */
+     * 活动开始时间
+     */
     @ApiModelProperty("活动开始时间")
     private Date startDate;
     /**
-    * 活动结束时间
-    */
+     * 活动结束时间
+     */
     @ApiModelProperty("活动结束时间")
     private Date endDate;
     /**
-    * 活动类型(xjr_dictionary_detail[match_activity_type])
-    */
+     * 活动类型(xjr_dictionary_detail[match_activity_type])
+     */
     @ApiModelProperty("活动类型(xjr_dictionary_detail[match_activity_type])")
     private String type;
 
     @ApiModelProperty("活动类型-中文")
     private String typeCn;
     /**
-    * 组织部门(xjr_department)
-    */
+     * 组织部门(xjr_department)
+     */
     @ApiModelProperty("组织部门(xjr_department)")
     private Long orgId;
 
     @ApiModelProperty("组织部门名称")
     private String orgCn;
     /**
-    * 报名结束时间
-    */
+     * 报名结束时间
+     */
     @ApiModelProperty("报名结束时间")
     private Date enrollEndTime;
     /**
-    * 活动负责人
-    */
+     * 活动负责人
+     */
     @ApiModelProperty("活动负责人")
     private String dutyPerson;
     /**
-    * 活动负责人电话
-    */
+     * 活动负责人电话
+     */
     @ApiModelProperty("活动负责人电话")
     private String dutyPersonMobile;
     /**
-    * 封面图片
-    */
+     * 封面图片
+     */
     @ApiModelProperty("封面图片")
     private String coverFileId;
 
     @ApiModelProperty("封面图片地址")
     private String coverFileUrl;
     /**
-    * 报名范围
-    */
+     * 报名范围
+     */
     @ApiModelProperty("报名范围")
     private String enrollRange;
     /**
-    * 状态(0:未发布 1:报名中 2:报名结束 3:活动结束)
-    */
+     * 状态(0:未发布 1:报名中 2:报名结束 3:活动结束)
+     */
     @ApiModelProperty("状态(0:未发布 1:报名中 2:报名结束 3:活动结束)")
     private Integer status;
     /**
-    * 活动内容
-    */
+     * 活动内容
+     */
     @ApiModelProperty("活动内容")
     private String content;
     /**
-    * 合作企业
-    */
+     * 合作企业
+     */
     @ApiModelProperty("合作企业")
     private Long enterpriseId;
     /**
-    * 1:校企合作活动 2:赛事活动 3:社团活动 4:思政德育活动 5:教研培训 6:党建活动
-    */
+     * 1:校企合作活动 2:赛事活动 3:社团活动 4:思政德育活动 5:教研培训 6:党建活动
+     */
     @ApiModelProperty("1:校企合作活动 2:赛事活动 3:社团活动 4:思政德育活动 5:教研培训 6:党建活动 7:课表数据 8:会议")
     private Integer category;
 

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

@@ -6,101 +6,101 @@ import lombok.Data;
 import java.util.Date;
 
 /**
-* @title: 活动信息分页列表出参
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息分页列表出参
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Data
 public class ActivityInfoTodayVo {
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     private String id;
     /**
-    * 赛事名称
-    */
+     * 赛事名称
+     */
     @ApiModelProperty("活动名称")
     private String name;
     /**
-    * 活动地点
-    */
+     * 活动地点
+     */
     @ApiModelProperty("活动地点")
     private String place;
     /**
-    * 活动开始时间
-    */
+     * 活动开始时间
+     */
     @ApiModelProperty("开始时间")
     private String startDate;
     /**
-    * 活动结束时间
-    */
+     * 活动结束时间
+     */
     @ApiModelProperty("结束时间")
     private String endDate;
     /**
-    * 活动类型(xjr_dictionary_detail[match_activity_type])
-    */
+     * 活动类型(xjr_dictionary_detail[match_activity_type])
+     */
     @ApiModelProperty("活动类型(xjr_dictionary_detail[match_activity_type])")
     private String type;
 
     @ApiModelProperty("活动类型-中文")
     private String typeCn;
     /**
-    * 组织部门(xjr_department)
-    */
+     * 组织部门(xjr_department)
+     */
     @ApiModelProperty("组织部门(xjr_department)")
     private Long orgId;
 
     @ApiModelProperty("组织部门名称")
     private String orgCn;
     /**
-    * 报名结束时间
-    */
+     * 报名结束时间
+     */
     @ApiModelProperty("报名结束时间")
     private Date enrollEndTime;
     /**
-    * 活动负责人
-    */
+     * 活动负责人
+     */
     @ApiModelProperty("活动负责人")
     private String dutyPerson;
     /**
-    * 活动负责人电话
-    */
+     * 活动负责人电话
+     */
     @ApiModelProperty("活动负责人电话")
     private String dutyPersonMobile;
     /**
-    * 封面图片
-    */
+     * 封面图片
+     */
     @ApiModelProperty("封面图片")
     private String coverFileId;
 
     @ApiModelProperty("封面图片地址")
     private String coverFileUrl;
     /**
-    * 报名范围
-    */
+     * 报名范围
+     */
     @ApiModelProperty("报名范围")
     private String enrollRange;
     /**
-    * 状态(0:未发布 1:报名中 2:报名结束 3:活动结束)
-    */
+     * 状态(0:未发布 1:报名中 2:报名结束 3:活动结束)
+     */
     @ApiModelProperty("状态(0:未发布 1:报名中 2:报名结束 3:活动结束)")
     private Integer status;
     /**
-    * 活动内容
-    */
+     * 活动内容
+     */
     @ApiModelProperty("活动内容")
     private String content;
     /**
-    * 合作企业
-    */
+     * 合作企业
+     */
     @ApiModelProperty("合作企业")
     private Long enterpriseId;
     /**
-    * 1:校企合作活动 2:赛事活动 3:社团活动 4:思政德育活动 5:教研培训 6:党建活动
-    */
+     * 1:校企合作活动 2:赛事活动 3:社团活动 4:思政德育活动 5:教研培训 6:党建活动
+     */
     @ApiModelProperty("1:校企合作活动 2:赛事活动 3:社团活动 4:思政德育活动 5:教研培训 6:党建活动 7:课表数据 8:会议")
     private Integer category;
 

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

@@ -7,105 +7,105 @@ import java.util.Date;
 import java.util.List;
 
 /**
-* @title: 活动信息表单出参
-* @Author dzx
-* @Date: 2024-07-19
-* @Version 1.0
-*/
+ * @title: 活动信息表单出参
+ * @Author dzx
+ * @Date: 2024-07-19
+ * @Version 1.0
+ */
 @Data
 public class ActivityInfoVo {
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     private Long id;
     /**
-    * 赛事名称
-    */
+     * 赛事名称
+     */
     @ApiModelProperty("赛事名称")
     private String name;
     /**
-    * 活动地点
-    */
+     * 活动地点
+     */
     @ApiModelProperty("活动地点")
     private String place;
     /**
-    * 活动开始时间
-    */
+     * 活动开始时间
+     */
     @ApiModelProperty("活动开始时间")
     private Date startDate;
     /**
-    * 活动结束时间
-    */
+     * 活动结束时间
+     */
     @ApiModelProperty("活动结束时间")
     private Date endDate;
     /**
-    * 活动类型(xjr_dictionary_detail[match_activity_type])
-    */
+     * 活动类型(xjr_dictionary_detail[match_activity_type])
+     */
     @ApiModelProperty("活动类型(xjr_dictionary_detail[match_activity_type])")
     private String type;
     /**
-    * 组织部门(xjr_department)
-    */
+     * 组织部门(xjr_department)
+     */
     @ApiModelProperty("组织部门(xjr_department)")
     private Long orgId;
 
     @ApiModelProperty("组织部门名称")
     private String orgName;
     /**
-    * 报名结束时间
-    */
+     * 报名结束时间
+     */
     @ApiModelProperty("报名结束时间")
     private Date enrollEndTime;
     /**
-    * 活动负责人
-    */
+     * 活动负责人
+     */
     @ApiModelProperty("活动负责人")
     private String dutyPerson;
     /**
-    * 活动负责人电话
-    */
+     * 活动负责人电话
+     */
     @ApiModelProperty("活动负责人电话")
     private String dutyPersonMobile;
     /**
-    * 封面图片
-    */
+     * 封面图片
+     */
     @ApiModelProperty("封面图片")
     private String coverFileId;
     /**
-    * 报名范围
-    */
+     * 报名范围
+     */
     @ApiModelProperty("报名范围")
     private String enrollRange;
     /**
-    * 状态(0:未发布 1:报名中 2:报名结束 3:活动结束)
-    */
+     * 状态(0:未发布 1:报名中 2:报名结束 3:活动结束)
+     */
     @ApiModelProperty("状态(0:未发布 1:报名中 2:报名结束 3:活动结束)")
     private Integer status;
     /**
-    * 活动内容
-    */
+     * 活动内容
+     */
     @ApiModelProperty("活动内容")
     private String content;
     /**
-    * 合作企业
-    */
+     * 合作企业
+     */
     @ApiModelProperty("合作企业")
     private Long enterpriseId;
 
     @ApiModelProperty("合作企业名称")
     private String enterpriseName;
     /**
-    * 1:校企合作活动 2:赛事活动
-    */
+     * 1:校企合作活动 2:赛事活动
+     */
     @ApiModelProperty("1:校企合作活动 2:赛事活动")
     private Integer category;
 
 
     /**
-    * activityEnrollRange
-    */
+     * activityEnrollRange
+     */
     @ApiModelProperty("activityEnrollRange子表")
     private List<ActivityEnrollRangeVo> activityEnrollRangeList;
 

src/main/java/com/xjrsoft/module/app/controller/AppFuncDesignController.java

@@ -12,11 +12,7 @@ import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.app.dto.AddFuncDesignDto;
-import com.xjrsoft.module.app.dto.AppFuncDesignPageDto;
-import com.xjrsoft.module.app.dto.DeleteAppPageDesignDto;
-import com.xjrsoft.module.app.dto.UpdateAppFuncDesignDto;
-import com.xjrsoft.module.app.dto.UpdateEnableMarkDto;
+import com.xjrsoft.module.app.dto.*;
 import com.xjrsoft.module.app.entity.AppFuncDesign;
 import com.xjrsoft.module.app.entity.AppMenu;
 import com.xjrsoft.module.app.service.IAppFuncDesignService;
@@ -28,28 +24,21 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author tzx
  * @since 2023-07-26
  */
 @RestController
-@RequestMapping(GlobalConstant.APP_MODEL +"/func-design")
-@Api(value = GlobalConstant.APP_MODEL +"/func-design", tags = "app端功能页面设计")
+@RequestMapping(GlobalConstant.APP_MODEL + "/func-design")
+@Api(value = GlobalConstant.APP_MODEL + "/func-design", tags = "app端功能页面设计")
 @AllArgsConstructor
 public class AppFuncDesignController {
 
@@ -59,6 +48,7 @@ public class AppFuncDesignController {
 
     @GetMapping(value = "/page")
     @ApiOperation("app端功能页面设计分页")
+    @XjrLog(value = "app端功能页面设计分页")
     public R page(AppFuncDesignPageDto dto) {
 
         IPage<AppFuncDesignPageVo> page = funcDesignService.selectJoinListPage(ConventPage.getPage(dto), AppFuncDesignPageVo.class, MPJWrappers.<AppFuncDesign>lambdaJoin()
@@ -79,18 +69,21 @@ public class AppFuncDesignController {
 
     @PostMapping
     @ApiOperation(value = "新增app端功能页面设计")
+    @XjrLog(value = "新增app端功能页面设计", saveResponseData = true)
     public R add(@Valid @RequestBody AddFuncDesignDto dto) {
         return R.ok(funcDesignService.add(dto));
     }
 
     @PutMapping
     @ApiOperation(value = "修改app端功能页面设计")
+    @XjrLog(value = "修改app端功能页面设计", saveResponseData = true)
     public R update(@Valid @RequestBody UpdateAppFuncDesignDto dto) {
         return R.ok(funcDesignService.modify(dto));
     }
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询数app端功能页面设计详细信息")
+    @XjrLog(value = "根据id查询数app端功能页面设计详细信息", saveResponseData = true)
     public R info(@RequestParam Long id) {
         AppFuncDesign appFuncDesign = funcDesignService.getById(id);
         if (appFuncDesign == null) {
@@ -102,14 +95,13 @@ public class AppFuncDesignController {
         appFuncDesignVo.setMenuConfigs(BeanUtil.toBean(appMenu, AppMenuVo.class));
 
 
-
         return R.ok(appFuncDesignVo);
     }
 
 
     @DeleteMapping
     @ApiOperation(value = "删除")
-    @XjrLog(value = "删除app端展示页面设计")
+    @XjrLog(value = "删除app端展示页面设计", saveResponseData = true)
     @Transactional(rollbackFor = Exception.class)
     public R delete(@Valid @RequestBody DeleteAppPageDesignDto dto) {
         AppFuncDesign appFuncDesign = funcDesignService.getById(dto.getId());
@@ -123,7 +115,7 @@ public class AppFuncDesignController {
 
     @PutMapping("/update-enable-mark")
     @ApiOperation(value = "修改启用状态")
-    @XjrLog(value = "修改启用状态")
+    @XjrLog(value = "修改启用状态", saveResponseData = true)
     public R updateEnableMark(@Valid @RequestBody UpdateEnableMarkDto dto) {
         AppFuncDesign appFuncDesign = new AppFuncDesign();
         appFuncDesign.setId(dto.getId());

src/main/java/com/xjrsoft/module/app/controller/AppMenuController.java

@@ -24,28 +24,22 @@ import com.xjrsoft.module.app.vo.AppMenuPageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.List;
 
 /**
  * <p>
- *  app 菜单前端控制器
+ * app 菜单前端控制器
  * </p>
  *
  * @author tzx
  * @since 2023-07-26
  */
 @RestController
-@RequestMapping(GlobalConstant.APP_MODEL +"/menu")
-@Api(value = GlobalConstant.APP_MODEL +"/menu", tags = "app 菜单模块")
+@RequestMapping(GlobalConstant.APP_MODEL + "/menu")
+@Api(value = GlobalConstant.APP_MODEL + "/menu", tags = "app 菜单模块")
 @AllArgsConstructor
 public class AppMenuController {
 
@@ -53,7 +47,8 @@ public class AppMenuController {
 
     @GetMapping("/page")
     @ApiOperation("app菜单分页接口")
-    public R page(AppMenuPageDto dto){
+    @XjrLog(value = "app菜单分页接口")
+    public R page(AppMenuPageDto dto) {
 
         LambdaQueryWrapper<AppMenu> queryWrapper = Wrappers.lambdaQuery(AppMenu.class)
                 .eq(StrUtil.isNotBlank(dto.getName()), AppMenu::getName, dto.getName())
@@ -70,7 +65,8 @@ public class AppMenuController {
 
     @GetMapping("/list")
     @ApiOperation("app菜单 列表 不分页")
-    public R list(AppMenuListDto dto){
+    @XjrLog(value = "app菜单 列表 不分页")
+    public R list(AppMenuListDto dto) {
 
         LambdaQueryWrapper<AppMenu> queryWrapper = Wrappers.lambdaQuery(AppMenu.class)
                 .eq(StrUtil.isNotBlank(dto.getName()), AppMenu::getName, dto.getName())
@@ -90,7 +86,8 @@ public class AppMenuController {
 
     @PostMapping
     @ApiOperation("新增")
-    public R add(@Valid @RequestBody AddAppMenuDto dto){
+    @XjrLog(value = "新增", saveResponseData = true)
+    public R add(@Valid @RequestBody AddAppMenuDto dto) {
 
         AppMenu appMenu = BeanUtil.toBean(dto, AppMenu.class);
 
@@ -101,7 +98,8 @@ public class AppMenuController {
 
     @PutMapping
     @ApiOperation("修改")
-    public R update(@Valid @RequestBody UpdateAppMenuDto dto){
+    @XjrLog(value = "修改", saveResponseData = true)
+    public R update(@Valid @RequestBody UpdateAppMenuDto dto) {
 
         AppMenu appMenu = BeanUtil.toBean(dto, AppMenu.class);
 

src/main/java/com/xjrsoft/module/app/controller/AppPageDesignController.java

@@ -11,12 +11,7 @@ import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.app.dto.AddAppPageDesignDto;
-import com.xjrsoft.module.app.dto.AppPageDesignDraftDto;
-import com.xjrsoft.module.app.dto.AppPageDesignDto;
-import com.xjrsoft.module.app.dto.DeleteAppPageDesignDto;
-import com.xjrsoft.module.app.dto.UpdateAppPageDesignDto;
-import com.xjrsoft.module.app.dto.UpdateEnableMarkDto;
+import com.xjrsoft.module.app.dto.*;
 import com.xjrsoft.module.app.entity.AppPageDesign;
 import com.xjrsoft.module.app.service.IAppMenuService;
 import com.xjrsoft.module.app.service.IAppPageDesignService;
@@ -25,14 +20,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 
@@ -45,8 +33,8 @@ import javax.validation.Valid;
  * @since 2023-06-25
  */
 @RestController
-@RequestMapping(GlobalConstant.APP_MODEL +"/page-design")
-@Api(value = GlobalConstant.APP_MODEL +"/page-design", tags = "app端展示页面设计")
+@RequestMapping(GlobalConstant.APP_MODEL + "/page-design")
+@Api(value = GlobalConstant.APP_MODEL + "/page-design", tags = "app端展示页面设计")
 @AllArgsConstructor
 public class AppPageDesignController {
 
@@ -62,7 +50,7 @@ public class AppPageDesignController {
         queryWrapper.like(StrUtil.isNotBlank(dto.getKeyword()), AppPageDesign::getName, dto.getKeyword())
                 .like(StrUtil.isNotBlank(dto.getName()), AppPageDesign::getName, dto.getName())
                 .like(StrUtil.isNotBlank(dto.getCode()), AppPageDesign::getCode, dto.getCode())
-                .eq(ObjectUtil.isNotEmpty(dto.getEnabledMark()), AppPageDesign::getEnabledMark,dto.getEnabledMark())
+                .eq(ObjectUtil.isNotEmpty(dto.getEnabledMark()), AppPageDesign::getEnabledMark, dto.getEnabledMark())
                 .select(AppPageDesign.class, x -> VoToColumnUtil.fieldsToColumns(AppPageDesignVo.class).contains(x.getProperty()))
                 .orderByAsc(AppPageDesign::getSortCode);
 

src/main/java/com/xjrsoft/module/app/controller/BaseAppFunctionController.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
@@ -20,27 +21,20 @@ import com.xjrsoft.module.app.vo.BaseAppFunctionVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.List;
 
 /**
-* @title: APP端功能模块管理
-* @Author fanxp
-* @Date: 2023-11-07
-* @Version 1.0
-*/
+ * @title: APP端功能模块管理
+ * @Author fanxp
+ * @Date: 2023-11-07
+ * @Version 1.0
+ */
 @RestController
 @RequestMapping("/app" + "/baseappfunction")
-@Api(value = "/app"  + "/baseappfunction",tags = "APP端功能模块管理代码")
+@Api(value = "/app" + "/baseappfunction", tags = "APP端功能模块管理代码")
 @AllArgsConstructor
 public class BaseAppFunctionController {
 
@@ -48,21 +42,24 @@ public class BaseAppFunctionController {
     private final IBaseAppFunctionService baseAppFunctionService;
 
     @GetMapping(value = "/page")
-    @ApiOperation(value="APP端功能模块管理列表(分页)")
+    @ApiOperation(value = "APP端功能模块管理列表(分页)")
     @SaCheckPermission("baseappfunction:detail")
-    public RT<PageOutput<BaseAppFunctionPageVo>> page(@Valid BaseAppFunctionPageDto dto){
+    @XjrLog(value = "APP端功能模块管理列表(分页)")
+    public RT<PageOutput<BaseAppFunctionPageVo>> page(@Valid BaseAppFunctionPageDto dto) {
 
         LambdaQueryWrapper<BaseAppFunction> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper
                 .orderByDesc(BaseAppFunction::getId)
-                .select(BaseAppFunction.class,x -> VoToColumnUtil.fieldsToColumns(BaseAppFunctionPageVo.class).contains(x.getProperty()));
+                .select(BaseAppFunction.class, x -> VoToColumnUtil.fieldsToColumns(BaseAppFunctionPageVo.class).contains(x.getProperty()));
         IPage<BaseAppFunction> page = baseAppFunctionService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<BaseAppFunctionPageVo> pageOutput = ConventPage.getPageOutput(page, BaseAppFunctionPageVo.class);
         return RT.ok(pageOutput);
     }
+
     @GetMapping(value = "/list")
-    @ApiOperation(value="根据Type返回模块")
+    @ApiOperation(value = "根据Type返回模块")
     @SaCheckPermission("baseappfunction:detail")
+    @XjrLog(value = "根据Type返回模块")
     public RT<List<BaseAppFunctionListVo>> list(@Valid BaseAppFunctionListDto dto) {
 
         LambdaQueryWrapper<BaseAppFunction> queryWrapper = new LambdaQueryWrapper<>();
@@ -77,12 +74,13 @@ public class BaseAppFunctionController {
     }
 
     @GetMapping(value = "/info")
-    @ApiOperation(value="根据id查询APP端功能模块管理信息")
+    @ApiOperation(value = "根据id查询APP端功能模块管理信息")
     @SaCheckPermission("baseappfunction:detail")
-    public RT<BaseAppFunctionVo> info(@RequestParam Long id){
+    @XjrLog(value = "根据id查询APP端功能模块管理信息", saveResponseData = true)
+    public RT<BaseAppFunctionVo> info(@RequestParam Long id) {
         BaseAppFunction baseAppFunction = baseAppFunctionService.getById(id);
         if (baseAppFunction == null) {
-           return RT.error("找不到此数据！");
+            return RT.error("找不到此数据！");
         }
         return RT.ok(BeanUtil.toBean(baseAppFunction, BaseAppFunctionVo.class));
     }
@@ -91,16 +89,18 @@ public class BaseAppFunctionController {
     @PostMapping
     @ApiOperation(value = "新增APP端功能模块管理")
     @SaCheckPermission("baseappfunction:add")
-    public RT<Boolean> add(@Valid @RequestBody AddBaseAppFunctionDto dto){
+    @XjrLog(value = "新增APP端功能模块管理", saveResponseData = true)
+    public RT<Boolean> add(@Valid @RequestBody AddBaseAppFunctionDto dto) {
         BaseAppFunction baseAppFunction = BeanUtil.toBean(dto, BaseAppFunction.class);
         boolean isSuccess = baseAppFunctionService.save(baseAppFunction);
-    return RT.ok(isSuccess);
+        return RT.ok(isSuccess);
     }
 
     @PutMapping
     @ApiOperation(value = "修改APP端功能模块管理")
     @SaCheckPermission("baseappfunction:edit")
-    public RT<Boolean> update(@Valid @RequestBody UpdateBaseAppFunctionDto dto){
+    @XjrLog(value = "修改APP端功能模块管理", saveResponseData = true)
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseAppFunctionDto dto) {
 
         BaseAppFunction baseAppFunction = BeanUtil.toBean(dto, BaseAppFunction.class);
         return RT.ok(baseAppFunctionService.updateById(baseAppFunction));
@@ -110,7 +110,8 @@ public class BaseAppFunctionController {
     @DeleteMapping
     @ApiOperation(value = "删除APP端功能模块管理")
     @SaCheckPermission("baseappfunction:delete")
-    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+    @XjrLog(value = "删除APP端功能模块管理", saveResponseData = true)
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
         return RT.ok(baseAppFunctionService.removeBatchByIds(ids));
 
     }

src/main/java/com/xjrsoft/module/app/dto/AddBaseAppFunctionDto.java

@@ -6,61 +6,60 @@ import lombok.Data;
 import java.io.Serializable;
 
 
-
 /**
-* @title: APP端功能模块管理
-* @Author fanxp
-* @Date: 2023-11-07
-* @Version 1.0
-*/
+ * @title: APP端功能模块管理
+ * @Author fanxp
+ * @Date: 2023-11-07
+ * @Version 1.0
+ */
 @Data
 public class AddBaseAppFunctionDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-    * 功能分类(xjr_dictionary_item[APPFUNC])
-    */
+     * 功能分类(xjr_dictionary_item[APPFUNC])
+     */
     @ApiModelProperty("功能分类(xjr_dictionary_item[APPFUNC])")
     private String type;
     /**
-    * 名称
-    */
+     * 名称
+     */
     @ApiModelProperty("名称")
     private String name;
     /**
-    * 图标
-    */
+     * 图标
+     */
     @ApiModelProperty("图标")
     private String icon;
     /**
-    * 图标前缀
-    */
+     * 图标前缀
+     */
     @ApiModelProperty("图标前缀")
     private String prefix;
     /**
-    * 图标颜色
-    */
+     * 图标颜色
+     */
     @ApiModelProperty("图标颜色")
     private String color;
     /**
-    * 模板ID
-    */
+     * 模板ID
+     */
     @ApiModelProperty("模板ID")
     private Long schemaId;
     /**
-    * 排序
-    */
+     * 排序
+     */
     @ApiModelProperty("排序")
     private Integer sortCode;
     /**
-    * 菜单类型 0=菜单 1=目录
-    */
+     * 菜单类型 0=菜单 1=目录
+     */
     @ApiModelProperty("菜单类型 0=菜单 1=目录")
     private Integer isDirectory;
     /**
-    * 功能地址
-    */
+     * 功能地址
+     */
     @ApiModelProperty("功能地址")
     private String url;
 

src/main/java/com/xjrsoft/module/app/dto/BaseAppFunctionListDto.java

@@ -7,11 +7,11 @@ import lombok.EqualsAndHashCode;
 
 
 /**
-* @title: APP端功能模块管理列表查询入参
-* @Author fanxp
-* @Date: 2023-11-07
-* @Version 1.0
-*/
+ * @title: APP端功能模块管理列表查询入参
+ * @Author fanxp
+ * @Date: 2023-11-07
+ * @Version 1.0
+ */
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class BaseAppFunctionListDto extends ListInput {

src/main/java/com/xjrsoft/module/app/dto/BaseAppFunctionPageDto.java

@@ -6,11 +6,11 @@ import lombok.EqualsAndHashCode;
 
 
 /**
-* @title: APP端功能模块管理分页查询入参
-* @Author fanxp
-* @Date: 2023-11-07
-* @Version 1.0
-*/
+ * @title: APP端功能模块管理分页查询入参
+ * @Author fanxp
+ * @Date: 2023-11-07
+ * @Version 1.0
+ */
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class BaseAppFunctionPageDto extends PageInput {

src/main/java/com/xjrsoft/module/app/dto/UpdateAppFuncDesignDto.java

@@ -43,7 +43,6 @@ public class UpdateAppFuncDesignDto {
     private Integer sortCode;
 
 
-
     @ApiModelProperty("状态")
     private Integer enabledMark;
 

src/main/java/com/xjrsoft/module/app/dto/UpdateAppMenuDto.java

@@ -29,7 +29,6 @@ public class UpdateAppMenuDto {
     private String url;
 
 
-
     @ApiModelProperty("备注")
     private String remark;
 

src/main/java/com/xjrsoft/module/app/dto/UpdateBaseAppFunctionDto.java

@@ -4,21 +4,20 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
-
 /**
-* @title: APP端功能模块管理
-* @Author fanxp
-* @Date: 2023-11-07
-* @Version 1.0
-*/
+ * @title: APP端功能模块管理
+ * @Author fanxp
+ * @Date: 2023-11-07
+ * @Version 1.0
+ */
 @Data
 public class UpdateBaseAppFunctionDto extends AddBaseAppFunctionDto {
 
     private static final long serialVersionUID = 1L;
 
     /**
-    * 主键编号
-    */
+     * 主键编号
+     */
     @ApiModelProperty("主键编号")
     private Long id;
 }

src/main/java/com/xjrsoft/module/app/entity/BaseAppFunction.java

@@ -1,10 +1,6 @@
 package com.xjrsoft.module.app.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,11 +10,11 @@ import java.util.Date;
 
 
 /**
-* @title: APP端功能模块管理
-* @Author fanxp
-* @Date: 2023-11-07
-* @Version 1.0
-*/
+ * @title: APP端功能模块管理
+ * @Author fanxp
+ * @Date: 2023-11-07
+ * @Version 1.0
+ */
 @Data
 @TableName("base_app_function")
 @ApiModel(value = "APP端功能模块管理对象", description = "APP端功能模块管理")
@@ -27,91 +23,91 @@ public class BaseAppFunction implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 主键编号
-    */
+     * 主键编号
+     */
     @ApiModelProperty("主键编号")
     @TableId
     private Long id;
     /**
-    * 创建人
-    */
+     * 创建人
+     */
     @ApiModelProperty("创建人")
     @TableField(fill = FieldFill.INSERT)
     private Long createUserId;
     /**
-    * 创建时间
-    */
+     * 创建时间
+     */
     @ApiModelProperty("创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createDate;
     /**
-    * 修改人
-    */
+     * 修改人
+     */
     @ApiModelProperty("修改人")
     @TableField(fill = FieldFill.UPDATE)
     private Long modifyUserId;
     /**
-    * 修改时间
-    */
+     * 修改时间
+     */
     @ApiModelProperty("修改时间")
     @TableField(fill = FieldFill.UPDATE)
     private Date modifyDate;
     /**
-    * 删除标记
-    */
+     * 删除标记
+     */
     @ApiModelProperty("删除标记")
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
     private Integer deleteMark;
     /**
-    * 有效标志
-    */
+     * 有效标志
+     */
     @ApiModelProperty("有效标志")
     @TableField(fill = FieldFill.INSERT)
     private Integer enabledMark;
     /**
-    * 功能分类(xjr_dictionary_item[APPFUNC])
-    */
+     * 功能分类(xjr_dictionary_item[APPFUNC])
+     */
     @ApiModelProperty("功能分类(xjr_dictionary_item[APPFUNC])")
     private String type;
     /**
-    * 名称
-    */
+     * 名称
+     */
     @ApiModelProperty("名称")
     private String name;
     /**
-    * 图标
-    */
+     * 图标
+     */
     @ApiModelProperty("图标")
     private String icon;
     /**
-    * 图标前缀
-    */
+     * 图标前缀
+     */
     @ApiModelProperty("图标前缀")
     private String prefix;
     /**
-    * 图标颜色
-    */
+     * 图标颜色
+     */
     @ApiModelProperty("图标颜色")
     private String color;
     /**
-    * 模板ID
-    */
+     * 模板ID
+     */
     @ApiModelProperty("模板ID")
     private Long schemaId;
     /**
-    * 排序
-    */
+     * 排序
+     */
     @ApiModelProperty("排序")
     private Integer sortCode;
     /**
-    * 菜单类型 0=菜单 1=目录
-    */
+     * 菜单类型 0=菜单 1=目录
+     */
     @ApiModelProperty("菜单类型 0=菜单 1=目录")
     private Integer isDirectory;
     /**
-    * 功能地址
-    */
+     * 功能地址
+     */
     @ApiModelProperty("功能地址")
     private String url;
 

src/main/java/com/xjrsoft/module/app/mapper/AppFuncDesignMapper.java

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author tzx

src/main/java/com/xjrsoft/module/app/mapper/AppMenuMapper.java

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author tzx

src/main/java/com/xjrsoft/module/app/mapper/BaseAppFunctionMapper.java

@@ -5,11 +5,11 @@ import com.xjrsoft.module.app.entity.BaseAppFunction;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
-* @title: APP端功能模块管理
-* @Author fanxp
-* @Date: 2023-11-07
-* @Version 1.0
-*/
+ * @title: APP端功能模块管理
+ * @Author fanxp
+ * @Date: 2023-11-07
+ * @Version 1.0
+ */
 @Mapper
 public interface BaseAppFunctionMapper extends BaseMapper<BaseAppFunction> {
 

src/main/java/com/xjrsoft/module/app/service/IAppFuncDesignService.java

@@ -7,7 +7,7 @@ import com.xjrsoft.module.app.entity.AppFuncDesign;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author tzx

src/main/java/com/xjrsoft/module/app/service/IAppMenuService.java

@@ -5,7 +5,7 @@ import com.xjrsoft.module.app.entity.AppMenu;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author tzx

src/main/java/com/xjrsoft/module/app/service/IBaseAppFunctionService.java

@@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.xjrsoft.module.app.entity.BaseAppFunction;
 
 /**
-* @title: APP端功能模块管理
-* @Author fanxp
-* @Date: 2023-11-07
-* @Version 1.0
-*/
+ * @title: APP端功能模块管理
+ * @Author fanxp
+ * @Date: 2023-11-07
+ * @Version 1.0
+ */
 
 public interface IBaseAppFunctionService extends IService<BaseAppFunction> {
 }

src/main/java/com/xjrsoft/module/app/service/impl/AppFuncDesignServiceImpl.java

@@ -46,11 +46,7 @@ import javax.sql.DataSource;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 
 /**
  * <p>
@@ -74,7 +70,6 @@ public class AppFuncDesignServiceImpl extends MPJBaseServiceImpl<AppFuncDesignMa
     private final IDatabaselinkService databaselinkService;
 
 
-
     @Override
     @SneakyThrows
     @Transactional(rollbackFor = Exception.class)
@@ -98,7 +93,7 @@ public class AppFuncDesignServiceImpl extends MPJBaseServiceImpl<AppFuncDesignMa
             save(appFuncDesign);
 
         } else {
-            if(dto.getFormType() == FormTemplateType.CUSTOM.getCode()){
+            if (dto.getFormType() == FormTemplateType.CUSTOM.getCode()) {
                 GeneratorConfig generatorConfig = JSONUtil.toBean(dto.getJsonContent(), GeneratorConfig.class);
                 generatorEndCode(generatorConfig);
             }
@@ -140,7 +135,7 @@ public class AppFuncDesignServiceImpl extends MPJBaseServiceImpl<AppFuncDesignMa
 
         } else {
 
-            if(dto.getFormType() == FormTemplateType.CUSTOM.getCode()){
+            if (dto.getFormType() == FormTemplateType.CUSTOM.getCode()) {
                 GeneratorConfig generatorConfig = JSONUtil.toBean(dto.getJsonContent(), GeneratorConfig.class);
                 generatorEndCode(generatorConfig);
             }
@@ -171,7 +166,7 @@ public class AppFuncDesignServiceImpl extends MPJBaseServiceImpl<AppFuncDesignMa
         JSON jsonContent = JSONUtil.readJSON(tempFile, StandardCharsets.UTF_8);
 
         //如果已经包含了此地址  就不再生成
-        if (jsonContent.getByPath("pages").toString().contains( "pages/" + dto.getOutputValue() + StringPool.SLASH + dto.getClassName().toLowerCase() + StringPool.SLASH + "list")) {
+        if (jsonContent.getByPath("pages").toString().contains("pages/" + dto.getOutputValue() + StringPool.SLASH + dto.getClassName().toLowerCase() + StringPool.SLASH + "list")) {
             return;
         }
 
@@ -201,10 +196,11 @@ public class AppFuncDesignServiceImpl extends MPJBaseServiceImpl<AppFuncDesignMa
 
     /**
      * 根据json 生成后端代码
+     *
      * @param generatorConfig
      */
     @SneakyThrows
-    private void generatorEndCode(GeneratorConfig generatorConfig){
+    private void generatorEndCode(GeneratorConfig generatorConfig) {
 
         Optional<TableConfig> tableConfigOptional = generatorConfig.getTableConfigs().stream().filter(TableConfig::getIsMain).findFirst();
         //主表
@@ -334,7 +330,5 @@ public class AppFuncDesignServiceImpl extends MPJBaseServiceImpl<AppFuncDesignMa
         //---------------------------------------生成三层代码结束----------------------------------------------------
 
 
-
-
     }
 }

src/main/java/com/xjrsoft/module/app/service/impl/AppMenuServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author tzx

src/main/java/com/xjrsoft/module/app/service/impl/AppPageDesignServiceImpl.java

@@ -84,7 +84,7 @@ public class AppPageDesignServiceImpl extends ServiceImpl<AppPageDesignMapper, A
             appMenu.setIcon(dto.getIcon());
             appMenu.setCategoryId(dto.getCategoryId());
             appMenu.setRemark(dto.getRemark());
-            appMenu.setUrl(StringPool.SLASH+"pages"+StringPool.SLASH +first.get().getValue().toLowerCase() + StringPool.SLASH + dto.getCode().toLowerCase());
+            appMenu.setUrl(StringPool.SLASH + "pages" + StringPool.SLASH + first.get().getValue().toLowerCase() + StringPool.SLASH + dto.getCode().toLowerCase());
             appMenuMapper.insert(appMenu);
 
             appPageDesign.setAppMenuId(appMenu.getId());
@@ -119,7 +119,6 @@ public class AppPageDesignServiceImpl extends ServiceImpl<AppPageDesignMapper, A
         }
 
 
-
         return Boolean.TRUE;
     }
 
@@ -147,7 +146,7 @@ public class AppPageDesignServiceImpl extends ServiceImpl<AppPageDesignMapper, A
             appMenu.setName(dto.getName());
             appMenu.setIcon(dto.getIcon());
             appMenu.setCategoryId(dto.getCategoryId());
-            appMenu.setUrl(StringPool.SLASH+"pages"+StringPool.SLASH +first.get().getValue().toLowerCase() + StringPool.SLASH + dto.getCode().toLowerCase());
+            appMenu.setUrl(StringPool.SLASH + "pages" + StringPool.SLASH + first.get().getValue().toLowerCase() + StringPool.SLASH + dto.getCode().toLowerCase());
             appMenu.setRemark(dto.getRemark());
             //如果发布菜单  menuid 不为空  则需要修改
             if (ObjectUtil.isNotNull(dto.getAppMenuId())) {
@@ -171,10 +170,10 @@ public class AppPageDesignServiceImpl extends ServiceImpl<AppPageDesignMapper, A
             //判断page.json里面是否有对应的路径，没有就进行生成
             String path = "pages/" + first.get().getValue().toLowerCase() + StringPool.SLASH + dto.getCode().toLowerCase();
 
-            if (((JSONObject) jsonContent).get("pages").toString().contains(path)){
+            if (((JSONObject) jsonContent).get("pages").toString().contains(path)) {
                 JSONArray pages = JSONUtil.parseArray(jsonContent.getByPath("pages").toString());
                 for (Object page : pages) {
-                    if (page.toString().contains(path) && !page.toString().contains(dto.getName())){//找到这个path路径的值，再判断页面名称是否改变，改变则先移除，再新增
+                    if (page.toString().contains(path) && !page.toString().contains(dto.getName())) {//找到这个path路径的值，再判断页面名称是否改变，改变则先移除，再新增
                         pages.remove(page);
                         Map<String, Object> pageJsonMap = new HashMap<>();
                         pageJsonMap.put("path", path);
@@ -186,7 +185,7 @@ public class AppPageDesignServiceImpl extends ServiceImpl<AppPageDesignMapper, A
                         FileUtil.writeString(jsonContent.toJSONString(4), tempFile, StandardCharsets.UTF_8);
                     }
                 }
-            }else {
+            } else {
                 Map<String, Object> pageJsonMap = new HashMap<>();
                 pageJsonMap.put("path", path);
                 Map<String, Object> styleMap = new HashMap<>();
@@ -211,7 +210,6 @@ public class AppPageDesignServiceImpl extends ServiceImpl<AppPageDesignMapper, A
     }
 
 
-
     /**
      * 获取实体类生成目录
      *

src/main/java/com/xjrsoft/module/app/service/impl/BaseAppFunctionServiceImpl.java

@@ -8,11 +8,11 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 /**
-* @title: APP端功能模块管理
-* @Author fanxp
-* @Date: 2023-11-07
-* @Version 1.0
-*/
+ * @title: APP端功能模块管理
+ * @Author fanxp
+ * @Date: 2023-11-07
+ * @Version 1.0
+ */
 @Service
 @AllArgsConstructor
 public class BaseAppFunctionServiceImpl extends ServiceImpl<BaseAppFunctionMapper, BaseAppFunction> implements IBaseAppFunctionService {

src/main/java/com/xjrsoft/module/app/vo/AppPageDesignVo.java

@@ -46,5 +46,4 @@ public class AppPageDesignVo implements Serializable {
     private Integer enabledMark;
 
 
-
 }

src/main/java/com/xjrsoft/module/app/vo/BaseAppFunctionListVo.java

@@ -4,62 +4,62 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
-* @title: APP端功能模块管理列表列表入参
-* @Author fanxp
-* @Date: 2023-11-07
-* @Version 1.0
-*/
+ * @title: APP端功能模块管理列表列表入参
+ * @Author fanxp
+ * @Date: 2023-11-07
+ * @Version 1.0
+ */
 @Data
 public class BaseAppFunctionListVo {
 
     /**
-    * 主键编号
-    */
+     * 主键编号
+     */
     @ApiModelProperty("主键编号")
     private String id;
     /**
-    * 功能分类(xjr_dictionary_item[APPFUNC])
-    */
+     * 功能分类(xjr_dictionary_item[APPFUNC])
+     */
     @ApiModelProperty("功能分类(xjr_dictionary_item[APPFUNC])")
     private String type;
     /**
-    * 名称
-    */
+     * 名称
+     */
     @ApiModelProperty("名称")
     private String name;
     /**
-    * 图标
-    */
+     * 图标
+     */
     @ApiModelProperty("图标")
     private String icon;
     /**
-    * 图标前缀
-    */
+     * 图标前缀
+     */
     @ApiModelProperty("图标前缀")
     private String prefix;
     /**
-    * 图标颜色
-    */
+     * 图标颜色
+     */
     @ApiModelProperty("图标颜色")
     private String color;
     /**
-    * 模板ID
-    */
+     * 模板ID
+     */
     @ApiModelProperty("模板ID")
     private Long schemaId;
     /**
-    * 排序
-    */
+     * 排序
+     */
     @ApiModelProperty("排序")
     private Integer sortCode;
     /**
-    * 菜单类型 0=菜单 1=目录
-    */
+     * 菜单类型 0=菜单 1=目录
+     */
     @ApiModelProperty("菜单类型 0=菜单 1=目录")
     private Integer isDirectory;
     /**
-    * 功能地址
-    */
+     * 功能地址
+     */
     @ApiModelProperty("功能地址")
     private String url;
 

src/main/java/com/xjrsoft/module/app/vo/BaseAppFunctionPageVo.java

@@ -6,92 +6,92 @@ import lombok.Data;
 import java.util.Date;
 
 /**
-* @title: APP端功能模块管理分页列表出参
-* @Author fanxp
-* @Date: 2023-11-07
-* @Version 1.0
-*/
+ * @title: APP端功能模块管理分页列表出参
+ * @Author fanxp
+ * @Date: 2023-11-07
+ * @Version 1.0
+ */
 @Data
 public class BaseAppFunctionPageVo {
 
     /**
-    * 主键编号
-    */
+     * 主键编号
+     */
     @ApiModelProperty("主键编号")
     private String id;
     /**
-    * 创建人
-    */
+     * 创建人
+     */
     @ApiModelProperty("创建人")
     private Long createUserId;
     /**
-    * 创建时间
-    */
+     * 创建时间
+     */
     @ApiModelProperty("创建时间")
     private Date createDate;
     /**
-    * 修改人
-    */
+     * 修改人
+     */
     @ApiModelProperty("修改人")
     private Long modifyUserId;
     /**
-    * 修改时间
-    */
+     * 修改时间
+     */
     @ApiModelProperty("修改时间")
     private Date modifyDate;
     /**
-    * 删除标记
-    */
+     * 删除标记
+     */
     @ApiModelProperty("删除标记")
     private Integer deleteMark;
     /**
-    * 有效标志
-    */
+     * 有效标志
+     */
     @ApiModelProperty("有效标志")
     private Integer enabledMark;
     /**
-    * 功能分类(xjr_dictionary_item[APPFUNC])
-    */
+     * 功能分类(xjr_dictionary_item[APPFUNC])
+     */
     @ApiModelProperty("功能分类(xjr_dictionary_item[APPFUNC])")
     private String type;
     /**
-    * 名称
-    */
+     * 名称
+     */
     @ApiModelProperty("名称")
     private String name;
     /**
-    * 图标
-    */
+     * 图标
+     */
     @ApiModelProperty("图标")
     private String icon;
     /**
-    * 图标前缀
-    */
+     * 图标前缀
+     */
     @ApiModelProperty("图标前缀")
     private String prefix;
     /**
-    * 图标颜色
-    */
+     * 图标颜色
+     */
     @ApiModelProperty("图标颜色")
     private String color;
     /**
-    * 模板ID
-    */
+     * 模板ID
+     */
     @ApiModelProperty("模板ID")
     private Long schemaId;
     /**
-    * 排序
-    */
+     * 排序
+     */
     @ApiModelProperty("排序")
     private Integer sortCode;
     /**
-    * 菜单类型 0=菜单 1=目录
-    */
+     * 菜单类型 0=菜单 1=目录
+     */
     @ApiModelProperty("菜单类型 0=菜单 1=目录")
     private Integer isDirectory;
     /**
-    * 功能地址
-    */
+     * 功能地址
+     */
     @ApiModelProperty("功能地址")
     private String url;
 

src/main/java/com/xjrsoft/module/app/vo/BaseAppFunctionVo.java

@@ -4,65 +4,64 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
-* @title: APP端功能模块管理表单出参
-* @Author fanxp
-* @Date: 2023-11-07
-* @Version 1.0
-*/
+ * @title: APP端功能模块管理表单出参
+ * @Author fanxp
+ * @Date: 2023-11-07
+ * @Version 1.0
+ */
 @Data
 public class BaseAppFunctionVo {
 
     /**
-    * 主键编号
-    */
+     * 主键编号
+     */
     @ApiModelProperty("主键编号")
     private Long id;
     /**
-    * 功能分类(xjr_dictionary_item[APPFUNC])
-    */
+     * 功能分类(xjr_dictionary_item[APPFUNC])
+     */
     @ApiModelProperty("功能分类(xjr_dictionary_item[APPFUNC])")
     private String type;
     /**
-    * 名称
-    */
+     * 名称
+     */
     @ApiModelProperty("名称")
     private String name;
     /**
-    * 图标
-    */
+     * 图标
+     */
     @ApiModelProperty("图标")
     private String icon;
     /**
-    * 图标前缀
-    */
+     * 图标前缀
+     */
     @ApiModelProperty("图标前缀")
     private String prefix;
     /**
-    * 图标颜色
-    */
+     * 图标颜色
+     */
     @ApiModelProperty("图标颜色")
     private String color;
     /**
-    * 模板ID
-    */
+     * 模板ID
+     */
     @ApiModelProperty("模板ID")
     private Long schemaId;
     /**
-    * 排序
-    */
+     * 排序
+     */
     @ApiModelProperty("排序")
     private Integer sortCode;
     /**
-    * 菜单类型 0=菜单 1=目录
-    */
+     * 菜单类型 0=菜单 1=目录
+     */
     @ApiModelProperty("菜单类型 0=菜单 1=目录")
     private Integer isDirectory;
     /**
-    * 功能地址
-    */
+     * 功能地址
+     */
     @ApiModelProperty("功能地址")
     private String url;
 
 
-
 }

src/main/java/com/xjrsoft/module/assessment/controller/AssessmentPlanAnswerController.java

@@ -4,47 +4,32 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.module.assessment.dto.AssessmentPlanAnswerPageDto;
-import com.xjrsoft.module.assessment.dto.AssessmentPlanAnswerStudentDto;
-import com.xjrsoft.module.assessment.dto.AssessmentPlanSubmitDto;
-import com.xjrsoft.module.assessment.dto.AssessmentTemplatePlanPageDto;
-import com.xjrsoft.module.assessment.dto.AssessmentTemplatePlanSureDto;
+import com.xjrsoft.module.assessment.dto.*;
 import com.xjrsoft.module.assessment.service.IAssessmentTemplatePlanService;
-import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerClassResultVo;
-import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerStudentPageVo;
-import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerStudentVo;
-import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerTeacherPageVo;
-import com.xjrsoft.module.assessment.vo.AssessmentTemplatePlanAnswerResultVo;
-import com.xjrsoft.module.assessment.vo.AssessmentTemplatePlanPageVo;
-import com.xjrsoft.module.assessment.vo.AssessmentTemplatePlanQuestionVo;
-import com.xjrsoft.module.assessment.vo.AssessmentTemplatePlanResultVo;
+import com.xjrsoft.module.assessment.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
 
 /**
-* @title: 考核计划
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @RestController
 @RequestMapping("/assessment" + "/assessmentTemplateAnswer")
-@Api(value = "/assessment"  + "/assessmentTemplateAnswer",tags = "考核计划答题代码")
+@Api(value = "/assessment" + "/assessmentTemplateAnswer", tags = "考核计划答题代码")
 @AllArgsConstructor
 public class AssessmentPlanAnswerController {
 
@@ -52,9 +37,10 @@ public class AssessmentPlanAnswerController {
     private final IAssessmentTemplatePlanService planService;
 
     @GetMapping(value = "/student-page")
-    @ApiOperation(value="考核计划答题列表-学生端(分页)")
+    @ApiOperation(value = "考核计划答题列表-学生端(分页)")
     @SaCheckPermission("assessmenttemplateplan:detail")
-    public RT<PageOutput<AssessmentPlanAnswerStudentPageVo>> studentPage(@Valid AssessmentPlanAnswerPageDto dto){
+    @XjrLog(value = "考核计划答题列表-学生端(分页)")
+    public RT<PageOutput<AssessmentPlanAnswerStudentPageVo>> studentPage(@Valid AssessmentPlanAnswerPageDto dto) {
         dto.setStudentUserId(StpUtil.getLoginIdAsLong());
         Page<AssessmentPlanAnswerStudentPageVo> page = planService.getStudentPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<AssessmentPlanAnswerStudentPageVo> pageOutput = ConventPage.getPageOutput(page, AssessmentPlanAnswerStudentPageVo.class);
@@ -72,9 +58,10 @@ public class AssessmentPlanAnswerController {
 //    }
 
     @GetMapping(value = "/teacher-page")
-    @ApiOperation(value="考核计划答题列表-教师端(分页)")
+    @ApiOperation(value = "考核计划答题列表-教师端(分页)")
     @SaCheckPermission("assessmenttemplateplan:detail")
-    public RT<PageOutput<AssessmentPlanAnswerTeacherPageVo>> teacherPage(@Valid AssessmentPlanAnswerPageDto dto){
+    @XjrLog(value = "考核计划答题列表-教师端(分页)")
+    public RT<PageOutput<AssessmentPlanAnswerTeacherPageVo>> teacherPage(@Valid AssessmentPlanAnswerPageDto dto) {
         dto.setTeacherId(StpUtil.getLoginIdAsLong());
         dto.setIsHeadTeacher(1);
         Page<AssessmentPlanAnswerTeacherPageVo> page = planService.getTeacherPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -83,11 +70,12 @@ public class AssessmentPlanAnswerController {
     }
 
     @GetMapping(value = "/all-class-page")
-    @ApiOperation(value="考核计划答题列表-所有班级(分页)")
+    @ApiOperation(value = "考核计划答题列表-所有班级(分页)")
     @SaCheckPermission("assessmenttemplateplan:detail")
-    public RT<PageOutput<AssessmentPlanAnswerTeacherPageVo>> allClassPage(@Valid AssessmentPlanAnswerPageDto dto){
+    @XjrLog(value = "考核计划答题列表-所有班级(分页)")
+    public RT<PageOutput<AssessmentPlanAnswerTeacherPageVo>> allClassPage(@Valid AssessmentPlanAnswerPageDto dto) {
 
-        if(StpUtil.getRoleList().contains("CLASSTE")){
+        if (StpUtil.getRoleList().contains("CLASSTE")) {
             dto.setTeacherId(StpUtil.getLoginIdAsLong());
             dto.setIsHeadTeacher(0);
         }
@@ -97,93 +85,104 @@ public class AssessmentPlanAnswerController {
     }
 
     @GetMapping(value = "/mobile-page")
-    @ApiOperation(value="考核计划答题列表-所有计划(分页)")
+    @ApiOperation(value = "考核计划答题列表-所有计划(分页)")
     @SaCheckPermission("assessmenttemplateplan:detail")
-    public RT<List<AssessmentTemplatePlanPageVo>> mobilePage(@Valid AssessmentTemplatePlanPageDto dto){
+    @XjrLog(value = "考核计划答题列表-所有计划(分页)")
+    public RT<List<AssessmentTemplatePlanPageVo>> mobilePage(@Valid AssessmentTemplatePlanPageDto dto) {
         List<AssessmentTemplatePlanPageVo> page = planService.getMobilePage(dto);
         return RT.ok(page);
     }
 
     @GetMapping(value = "/answer-student-page")
-    @ApiOperation(value="考核计划答题列表-学生答题情况(分页)")
+    @ApiOperation(value = "考核计划答题列表-学生答题情况(分页)")
     @SaCheckPermission("assessmenttemplateplan:detail")
-    public RT<PageOutput<AssessmentPlanAnswerStudentVo>> answerStudent(@Valid AssessmentPlanAnswerStudentDto dto){
+    @XjrLog(value = "考核计划答题列表-学生答题情况(分页)")
+    public RT<PageOutput<AssessmentPlanAnswerStudentVo>> answerStudent(@Valid AssessmentPlanAnswerStudentDto dto) {
         Page<AssessmentPlanAnswerStudentVo> page = planService.getAnswerStudent(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<AssessmentPlanAnswerStudentVo> pageOutput = ConventPage.getPageOutput(page, AssessmentPlanAnswerStudentVo.class);
         return RT.ok(pageOutput);
     }
 
     @GetMapping(value = "/answer-student-list")
-    @ApiOperation(value="考核计划答题列表-学生答题情况")
+    @ApiOperation(value = "考核计划答题列表-学生答题情况")
     @SaCheckPermission("assessmenttemplateplan:detail")
-    public RT<List<AssessmentPlanAnswerStudentVo>> answerStudentList(@Valid AssessmentPlanAnswerStudentDto dto){
+    @XjrLog(value = "考核计划答题列表-学生答题情况")
+    public RT<List<AssessmentPlanAnswerStudentVo>> answerStudentList(@Valid AssessmentPlanAnswerStudentDto dto) {
         List<AssessmentPlanAnswerStudentVo> page = planService.getAnswerStudentList(dto);
         return RT.ok(page);
     }
 
     @GetMapping(value = "/info")
-    @ApiOperation(value="根据id查询考核计划信息")
+    @ApiOperation(value = "根据id查询考核计划信息")
     @SaCheckPermission("assessmenttemplateplan:detail")
-    public RT<AssessmentTemplatePlanQuestionVo> info(@RequestParam Long id){
+    @XjrLog(value = "根据id查询考核计划信息", saveResponseData = true)
+    public RT<AssessmentTemplatePlanQuestionVo> info(@RequestParam Long id) {
         AssessmentTemplatePlanQuestionVo questionVo = planService.getQuestionsById(id);
         if (questionVo == null) {
-           return RT.error("找不到此数据！");
+            return RT.error("找不到此数据！");
         }
         return RT.ok(questionVo);
     }
 
 
-    @PostMapping(value="sure")
+    @PostMapping(value = "sure")
     @ApiOperation(value = "班主任确认考核")
     @SaCheckPermission("assessmenttemplateplan:add")
-    public RT<Boolean> add(@Valid @RequestBody AssessmentTemplatePlanSureDto dto){
+    @XjrLog(value = "班主任确认考核", saveResponseData = true)
+    public RT<Boolean> add(@Valid @RequestBody AssessmentTemplatePlanSureDto dto) {
         boolean isSuccess = planService.sure(dto);
         return RT.ok(isSuccess);
     }
 
-    @PostMapping(value="save-answer")
+    @PostMapping(value = "save-answer")
     @ApiOperation(value = "提交答题")
     @SaCheckPermission("assessmenttemplateplan:save-answer")
-    public RT<Boolean> saveAnswer(@Valid @RequestBody AssessmentPlanSubmitDto dto){
+    @XjrLog(value = "提交答题", saveResponseData = true)
+    public RT<Boolean> saveAnswer(@Valid @RequestBody AssessmentPlanSubmitDto dto) {
         boolean isSuccess = planService.saveAnswer(dto);
         return RT.ok(isSuccess);
     }
 
-    @GetMapping(value="class-result")
+    @GetMapping(value = "class-result")
     @ApiOperation(value = "班级答题情况")
     @SaCheckPermission("assessmenttemplateplan:class-result")
-    public RT<List<AssessmentPlanAnswerClassResultVo>> classResult(@RequestParam Long id){
+    @XjrLog(value = "班级答题情况")
+    public RT<List<AssessmentPlanAnswerClassResultVo>> classResult(@RequestParam Long id) {
         List<AssessmentPlanAnswerClassResultVo> resultList = planService.getClassResult(id);
         return RT.ok(resultList);
     }
 
-    @GetMapping(value="question-result")
+    @GetMapping(value = "question-result")
     @ApiOperation(value = "每道题的答题情况")
     @SaCheckPermission("assessmenttemplateplan:question-result")
-    public RT<AssessmentTemplatePlanResultVo> questionResult(@RequestParam Long id){
+    @XjrLog(value = "每道题的答题情况", saveResponseData = true)
+    public RT<AssessmentTemplatePlanResultVo> questionResult(@RequestParam Long id) {
         AssessmentTemplatePlanResultVo resultList = planService.getQuestionResult(id);
         return RT.ok(resultList);
     }
 
-    @PostMapping(value="send-msg")
+    @PostMapping(value = "send-msg")
     @ApiOperation(value = "推送微信通知")
     @SaCheckPermission("assessmenttemplateplan:send-msg")
-    public RT<Boolean> questionResult(@Valid @RequestBody AssessmentTemplatePlanSureDto dto){
+    @XjrLog(value = "推送微信通知", saveResponseData = true)
+    public RT<Boolean> questionResult(@Valid @RequestBody AssessmentTemplatePlanSureDto dto) {
         Boolean sendMsg = planService.sendMsg(dto);
         return RT.ok(sendMsg);
     }
 
-    @GetMapping(value="answer-student-result")
+    @GetMapping(value = "answer-student-result")
     @ApiOperation(value = "每个学生的答题详情")
     @SaCheckPermission("assessmenttemplateplan:answer-student-result")
-    public RT<AssessmentTemplatePlanAnswerResultVo> studentAnswerResult(@RequestParam Long studentUserId, @RequestParam Long assessmentTemplatePlanId){
+    @XjrLog(value = "每个学生的答题详情", saveResponseData = true)
+    public RT<AssessmentTemplatePlanAnswerResultVo> studentAnswerResult(@RequestParam Long studentUserId, @RequestParam Long assessmentTemplatePlanId) {
         AssessmentTemplatePlanAnswerResultVo result = planService.getAnswerStudentResult(studentUserId, assessmentTemplatePlanId);
         return RT.ok(result);
     }
 
     @PostMapping(value = "/answer-export-query")
-    @ApiOperation(value="考核计划答题列表-学生答题情况导出")
+    @ApiOperation(value = "考核计划答题列表-学生答题情况导出")
     @SaCheckPermission("assessmenttemplateplan:detail")
+    @XjrLog(value = "考核计划答题列表-学生答题情况导出")
     public ResponseEntity<byte[]> answerExportQuery(@Valid @RequestBody AssessmentPlanAnswerStudentDto dto) throws IOException {
         String fileName = "answerExportQuery" + ExcelTypeEnum.XLSX.getValue();
         byte[] bytes = planService.answerExportQuery(dto);

src/main/java/com/xjrsoft/module/assessment/controller/AssessmentTemplateController.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
@@ -18,27 +19,20 @@ import com.xjrsoft.module.assessment.vo.AssessmentTemplateVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.List;
 
 /**
-* @title: 考核模板
-* @Author dzx
-* @Date: 2024-03-29
-* @Version 1.0
-*/
+ * @title: 考核模板
+ * @Author dzx
+ * @Date: 2024-03-29
+ * @Version 1.0
+ */
 @RestController
 @RequestMapping("/assessment" + "/assessmentTemplate")
-@Api(value = "/assessment"  + "/assessmentTemplate",tags = "考核模板代码")
+@Api(value = "/assessment" + "/assessmentTemplate", tags = "考核模板代码")
 @AllArgsConstructor
 public class AssessmentTemplateController {
 
@@ -46,26 +40,28 @@ public class AssessmentTemplateController {
     private final IAssessmentTemplateService assessmentTemplateService;
 
     @GetMapping(value = "/page")
-    @ApiOperation(value="考核模板列表(分页)")
+    @ApiOperation(value = "考核模板列表(分页)")
     @SaCheckPermission("assessmenttemplate:detail")
-    public RT<PageOutput<AssessmentTemplatePageVo>> page(@Valid AssessmentTemplatePageDto dto){
+    @XjrLog(value = "考核模板列表(分页)")
+    public RT<PageOutput<AssessmentTemplatePageVo>> page(@Valid AssessmentTemplatePageDto dto) {
 
         LambdaQueryWrapper<AssessmentTemplate> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(StrUtil.isNotEmpty(dto.getName()), AssessmentTemplate::getName, dto.getName())
-            .orderByDesc(AssessmentTemplate::getId)
-            .select(AssessmentTemplate.class,x -> VoToColumnUtil.fieldsToColumns(AssessmentTemplatePageVo.class).contains(x.getProperty()));
+                .orderByDesc(AssessmentTemplate::getId)
+                .select(AssessmentTemplate.class, x -> VoToColumnUtil.fieldsToColumns(AssessmentTemplatePageVo.class).contains(x.getProperty()));
         IPage<AssessmentTemplate> page = assessmentTemplateService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<AssessmentTemplatePageVo> pageOutput = ConventPage.getPageOutput(page, AssessmentTemplatePageVo.class);
         return RT.ok(pageOutput);
     }
 
     @GetMapping(value = "/info")
-    @ApiOperation(value="根据id查询考核模板信息")
+    @ApiOperation(value = "根据id查询考核模板信息")
     @SaCheckPermission("assessmenttemplate:detail")
-    public RT<AssessmentTemplateVo> info(@RequestParam Long id){
+    @XjrLog(value = "根据id查询考核模板信息", saveResponseData = true)
+    public RT<AssessmentTemplateVo> info(@RequestParam Long id) {
         AssessmentTemplateVo assessmentTemplate = assessmentTemplateService.getById(id);
         if (assessmentTemplate == null) {
-           return RT.error("找不到此数据！");
+            return RT.error("找不到此数据！");
         }
         return RT.ok(assessmentTemplate);
     }
@@ -74,7 +70,8 @@ public class AssessmentTemplateController {
     @PostMapping
     @ApiOperation(value = "新增考核模板")
     @SaCheckPermission("assessmenttemplate:add")
-    public RT<Boolean> add(@Valid @RequestBody AddAssessmentTemplateDto dto){
+    @XjrLog(value = "新增考核模板", saveResponseData = true)
+    public RT<Boolean> add(@Valid @RequestBody AddAssessmentTemplateDto dto) {
         boolean isSuccess = assessmentTemplateService.addCustom(dto);
         return RT.ok(isSuccess);
     }
@@ -82,7 +79,8 @@ public class AssessmentTemplateController {
     @PutMapping
     @ApiOperation(value = "修改考核模板")
     @SaCheckPermission("assessmenttemplate:edit")
-    public RT<Boolean> update(@Valid @RequestBody UpdateAssessmentTemplateDto dto){
+    @XjrLog(value = "修改考核模板", saveResponseData = true)
+    public RT<Boolean> update(@Valid @RequestBody UpdateAssessmentTemplateDto dto) {
         return RT.ok(assessmentTemplateService.update(dto));
 
     }
@@ -90,7 +88,8 @@ public class AssessmentTemplateController {
     @DeleteMapping
     @ApiOperation(value = "删除考核模板")
     @SaCheckPermission("assessmenttemplate:delete")
-    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+    @XjrLog(value = "删除考核模板", saveResponseData = true)
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
         return RT.ok(assessmentTemplateService.delete(ids));
     }
 

src/main/java/com/xjrsoft/module/assessment/controller/AssessmentTemplatePlanController.java

@@ -3,15 +3,12 @@ package com.xjrsoft.module.assessment.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.module.assessment.dto.AddAssessmentTemplatePlanDto;
-import com.xjrsoft.module.assessment.dto.AssessmentTemplatePlanChangeStatusDto;
-import com.xjrsoft.module.assessment.dto.AssessmentTemplatePlanPageDto;
-import com.xjrsoft.module.assessment.dto.UpdateAssessmentTemplatePlanDto;
-import com.xjrsoft.module.assessment.dto.UpdateAssessmentTemplatePlanTimeDto;
+import com.xjrsoft.module.assessment.dto.*;
 import com.xjrsoft.module.assessment.entity.AssessmentTemplatePlan;
 import com.xjrsoft.module.assessment.service.IAssessmentTemplatePlanService;
 import com.xjrsoft.module.assessment.vo.AssessmentTemplatePlanPageVo;
@@ -19,28 +16,21 @@ import com.xjrsoft.module.assessment.vo.AssessmentTemplatePlanVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.Date;
 import java.util.List;
 
 /**
-* @title: 考核计划
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @RestController
 @RequestMapping("/assessment" + "/assessmentTemplatePlan")
-@Api(value = "/assessment"  + "/assessmentTemplatePlan",tags = "考核计划代码")
+@Api(value = "/assessment" + "/assessmentTemplatePlan", tags = "考核计划代码")
 @AllArgsConstructor
 public class AssessmentTemplatePlanController {
 
@@ -48,9 +38,10 @@ public class AssessmentTemplatePlanController {
     private final IAssessmentTemplatePlanService planService;
 
     @GetMapping(value = "/page")
-    @ApiOperation(value="考核计划列表(分页)")
+    @ApiOperation(value = "考核计划列表(分页)")
     @SaCheckPermission("assessmenttemplateplan:detail")
-    public RT<PageOutput<AssessmentTemplatePlanPageVo>> page(@Valid AssessmentTemplatePlanPageDto dto){
+    @XjrLog(value = "考核计划列表(分页)")
+    public RT<PageOutput<AssessmentTemplatePlanPageVo>> page(@Valid AssessmentTemplatePlanPageDto dto) {
 
         Page<AssessmentTemplatePlanPageVo> page = planService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<AssessmentTemplatePlanPageVo> pageOutput = ConventPage.getPageOutput(page, AssessmentTemplatePlanPageVo.class);
@@ -58,20 +49,22 @@ public class AssessmentTemplatePlanController {
     }
 
     @GetMapping(value = "/info")
-    @ApiOperation(value="根据id查询考核计划信息")
+    @ApiOperation(value = "根据id查询考核计划信息")
     @SaCheckPermission("assessmenttemplateplan:detail")
-    public RT<AssessmentTemplatePlanVo> info(@RequestParam Long id){
+    @XjrLog(value = "根据id查询考核计划信息", saveResponseData = true)
+    public RT<AssessmentTemplatePlanVo> info(@RequestParam Long id) {
         AssessmentTemplatePlan assessmentTemplatePlan = planService.getById(id);
         if (assessmentTemplatePlan == null) {
-           return RT.error("找不到此数据！");
+            return RT.error("找不到此数据！");
         }
         return RT.ok(BeanUtil.toBean(assessmentTemplatePlan, AssessmentTemplatePlanVo.class));
     }
 
     @GetMapping(value = "/semester-class")
-    @ApiOperation(value="根据学期id查询被选择过的班级")
+    @ApiOperation(value = "根据学期id查询被选择过的班级")
     @SaCheckPermission("assessmenttemplateplan:detail")
-    public RT<List<Long>> getSemesterClass(@RequestParam Long id){
+    @XjrLog(value = "根据学期id查询被选择过的班级")
+    public RT<List<Long>> getSemesterClass(@RequestParam Long id) {
         List<Long> semesterClass = planService.getSemesterClass(id);
         return RT.ok(semesterClass);
     }
@@ -80,7 +73,8 @@ public class AssessmentTemplatePlanController {
     @PostMapping
     @ApiOperation(value = "新增考核计划")
     @SaCheckPermission("assessmenttemplateplan:add")
-    public RT<Boolean> add(@Valid @RequestBody AddAssessmentTemplatePlanDto dto){
+    @XjrLog(value = "新增考核计划", saveResponseData = true)
+    public RT<Boolean> add(@Valid @RequestBody AddAssessmentTemplatePlanDto dto) {
         boolean isSuccess = planService.add(dto);
         return RT.ok(isSuccess);
     }
@@ -88,7 +82,8 @@ public class AssessmentTemplatePlanController {
     @PutMapping
     @ApiOperation(value = "修改考核计划")
     @SaCheckPermission("assessmenttemplateplan:edit")
-    public RT<Boolean> update(@Valid @RequestBody UpdateAssessmentTemplatePlanDto dto){
+    @XjrLog(value = "修改考核计划", saveResponseData = true)
+    public RT<Boolean> update(@Valid @RequestBody UpdateAssessmentTemplatePlanDto dto) {
 
         return RT.ok(planService.update(dto));
 
@@ -97,7 +92,8 @@ public class AssessmentTemplatePlanController {
     @PutMapping(value = "/update-time")
     @ApiOperation(value = "修改考核计划时间")
     @SaCheckPermission("assessmenttemplateplan:edit")
-    public RT<Boolean> updateTime(@Valid @RequestBody UpdateAssessmentTemplatePlanTimeDto dto){
+    @XjrLog(value = "修改考核计划时间", saveResponseData = true)
+    public RT<Boolean> updateTime(@Valid @RequestBody UpdateAssessmentTemplatePlanTimeDto dto) {
 
         return RT.ok(planService.updateTime(dto));
 
@@ -106,29 +102,31 @@ public class AssessmentTemplatePlanController {
     @DeleteMapping
     @ApiOperation(value = "删除考核计划")
     @SaCheckPermission("assessmenttemplateplan:delete")
-    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+    @XjrLog(value = "删除考核计划", saveResponseData = true)
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
         return RT.ok(planService.delete(ids));
     }
 
     @PostMapping(value = "/change-status")
     @ApiOperation(value = "修改状态")
     @SaCheckPermission("assessmenttemplateplan:change-status")
-    public RT<Boolean> changeStatus(@Valid @RequestBody AssessmentTemplatePlanChangeStatusDto dto){
+    @XjrLog(value = "修改状态", saveResponseData = true)
+    public RT<Boolean> changeStatus(@Valid @RequestBody AssessmentTemplatePlanChangeStatusDto dto) {
         AssessmentTemplatePlan templatePlan = planService.getById(dto.getId());
-        if(templatePlan == null){
+        if (templatePlan == null) {
             throw new MyException("未能找到场所信息");
         }
-        if(dto.getStatus() == 1){
+        if (dto.getStatus() == 1) {
             templatePlan.setStartTime(new Date());
-        }else if(dto.getStatus() == 2){
+        } else if (dto.getStatus() == 2) {
             templatePlan.setEndTime(new Date());
         }
         templatePlan.setStatus(dto.getStatus());
         planService.updateById(templatePlan);
-        if(dto.getStatus() == 1){
-            if(templatePlan.getIsNeedConfirm() == 1){
+        if (dto.getStatus() == 1) {
+            if (templatePlan.getIsNeedConfirm() == 1) {
                 planService.sendMsgToTeacher(templatePlan);
-            }else{
+            } else {
                 planService.sendMsgToClass(templatePlan);
             }
         }

src/main/java/com/xjrsoft/module/assessment/dto/AddAssessmentPlanAnswerClassDto.java

@@ -6,31 +6,30 @@ import lombok.Data;
 import java.io.Serializable;
 
 
-
 /**
-* @title: 考核计划答题参与班级
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划答题参与班级
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 public class AddAssessmentPlanAnswerClassDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-    * 班级id
-    */
+     * 班级id
+     */
     @ApiModelProperty("班级id")
     private String classId;
     /**
-    * 班主任是否确认(0:否 1:是)
-    */
+     * 班主任是否确认(0:否 1:是)
+     */
     @ApiModelProperty("班主任是否确认(0:否 1:是)")
     private Integer isConfirm;
     /**
-    * 考核计划id(assessment_template_plan)
-    */
+     * 考核计划id(assessment_template_plan)
+     */
     @ApiModelProperty("考核计划id(assessment_template_plan)")
     private Long assessmentTemplatePlanId;
 

src/main/java/com/xjrsoft/module/assessment/dto/AddAssessmentPlanAnswerResultDto.java

@@ -8,44 +8,44 @@ import java.util.List;
 
 
 /**
-* @title: 考核模板题目
-* @Author dzx
-* @Date: 2024-03-29
-* @Version 1.0
-*/
+ * @title: 考核模板题目
+ * @Author dzx
+ * @Date: 2024-03-29
+ * @Version 1.0
+ */
 @Data
 public class AddAssessmentPlanAnswerResultDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     private Integer sortCode;
     /**
-    * 题目题干
-    */
+     * 题目题干
+     */
     @ApiModelProperty("题目题干")
     private String name;
     /**
-    * 分数
-    */
+     * 分数
+     */
     @ApiModelProperty("分数")
     private Long score;
     /**
-    * 题目类型
-    */
+     * 题目类型
+     */
     @ApiModelProperty("题目类型")
     private String type;
     /**
-    * 是否必填(1:是 0:否)
-    */
+     * 是否必填(1:是 0:否)
+     */
     @ApiModelProperty("是否必填(1:是 0:否)")
     private Short required;
     /**
-    * 考核模板id(assessment_template)
-    */
+     * 考核模板id(assessment_template)
+     */
     @ApiModelProperty("考核模板id(assessment_template)")
     private Long assessmentTemplateId;
 

src/main/java/com/xjrsoft/module/assessment/dto/AddAssessmentPlanAnswerStudentDto.java

@@ -6,26 +6,25 @@ import lombok.Data;
 import java.io.Serializable;
 
 
-
 /**
-* @title: 考核计划答题参与学生
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划答题参与学生
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 public class AddAssessmentPlanAnswerStudentDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-    * 班级ic
-    */
+     * 班级ic
+     */
     @ApiModelProperty("班级ic")
     private String studentUserId;
     /**
-    * 考核计划id(assessment_template_plan)
-    */
+     * 考核计划id(assessment_template_plan)
+     */
     @ApiModelProperty("考核计划id(assessment_template_plan)")
     private Long assessmentTemplatePlanId;
 

src/main/java/com/xjrsoft/module/assessment/dto/AddAssessmentPlanQuestionDto.java

@@ -6,56 +6,55 @@ import lombok.Data;
 import java.io.Serializable;
 
 
-
 /**
-* @title: 考核模板题目
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核模板题目
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 public class AddAssessmentPlanQuestionDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     private Integer sortCode;
     /**
-    * 题目题干
-    */
+     * 题目题干
+     */
     @ApiModelProperty("题目题干")
     private String name;
     /**
-    * 分数
-    */
+     * 分数
+     */
     @ApiModelProperty("分数")
     private Long score;
     /**
-    * 题目类型
-    */
+     * 题目类型
+     */
     @ApiModelProperty("题目类型")
     private String type;
     /**
-    * 类别(1:大题 2:小题 3:选项)
-    */
+     * 类别(1:大题 2:小题 3:选项)
+     */
     @ApiModelProperty("类别(1:大题 2:小题 3:选项)")
     private Integer category;
     /**
-    * 父级id
-    */
+     * 父级id
+     */
     @ApiModelProperty("父级id")
     private Long parentId;
     /**
-    * 小题是否必填(1:是 0:否)
-    */
+     * 小题是否必填(1:是 0:否)
+     */
     @ApiModelProperty("小题是否必填(1:是 0:否)")
     private Short required;
     /**
-    * 考核计划id(assessment_template_plan)
-    */
+     * 考核计划id(assessment_template_plan)
+     */
     @ApiModelProperty("考核计划id(assessment_template_plan)")
     private Long assessmentTemplatePlanId;
 

src/main/java/com/xjrsoft/module/assessment/dto/AddAssessmentQuestionDto.java

@@ -7,46 +7,45 @@ import java.io.Serializable;
 import java.util.List;
 
 
-
 /**
-* @title: 考核模板题目
-* @Author dzx
-* @Date: 2024-03-29
-* @Version 1.0
-*/
+ * @title: 考核模板题目
+ * @Author dzx
+ * @Date: 2024-03-29
+ * @Version 1.0
+ */
 @Data
 public class AddAssessmentQuestionDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     private Integer sortCode;
     /**
-    * 题目题干
-    */
+     * 题目题干
+     */
     @ApiModelProperty("题目题干")
     private String name;
     /**
-    * 分数
-    */
+     * 分数
+     */
     @ApiModelProperty("分数")
     private Long score;
     /**
-    * 题目类型
-    */
+     * 题目类型
+     */
     @ApiModelProperty("题目类型")
     private String type;
     /**
-    * 是否必填(1:是 0:否)
-    */
+     * 是否必填(1:是 0:否)
+     */
     @ApiModelProperty("是否必填(1:是 0:否)")
     private Short required;
     /**
-    * 考核模板id(assessment_template)
-    */
+     * 考核模板id(assessment_template)
+     */
     @ApiModelProperty("考核模板id(assessment_template)")
     private Long assessmentTemplateId;
 

src/main/java/com/xjrsoft/module/assessment/dto/AddAssessmentQuestionOptionsDto.java

@@ -6,36 +6,35 @@ import lombok.Data;
 import java.io.Serializable;
 
 
-
 /**
-* @title: 考核模板题目选项
-* @Author dzx
-* @Date: 2024-03-29
-* @Version 1.0
-*/
+ * @title: 考核模板题目选项
+ * @Author dzx
+ * @Date: 2024-03-29
+ * @Version 1.0
+ */
 @Data
 public class AddAssessmentQuestionOptionsDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     private Integer sortCode;
     /**
-    * 选项名称
-    */
+     * 选项名称
+     */
     @ApiModelProperty("选项名称")
     private String name;
     /**
-    * 分数
-    */
+     * 分数
+     */
     @ApiModelProperty("分数")
     private Long score;
     /**
-    * 考核题目id(assessment_question)
-    */
+     * 考核题目id(assessment_question)
+     */
     @ApiModelProperty("考核题目id(assessment_question)")
     private Long assessmentQuestionId;
 

src/main/java/com/xjrsoft/module/assessment/dto/AddAssessmentTemplateDto.java

@@ -7,32 +7,31 @@ import java.io.Serializable;
 import java.util.List;
 
 
-
 /**
-* @title: 考核模板
-* @Author dzx
-* @Date: 2024-03-29
-* @Version 1.0
-*/
+ * @title: 考核模板
+ * @Author dzx
+ * @Date: 2024-03-29
+ * @Version 1.0
+ */
 @Data
 public class AddAssessmentTemplateDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-    * 名称
-    */
+     * 名称
+     */
     @ApiModelProperty("名称")
     private String name;
     /**
-    * 分数
-    */
+     * 分数
+     */
     @ApiModelProperty("分数")
     private Long score;
 
     /**
-    * assessmentQuestion
-    */
+     * assessmentQuestion
+     */
     @ApiModelProperty("大题")
     private List<AddAssessmentQuestionDto> children;
 

src/main/java/com/xjrsoft/module/assessment/dto/AddAssessmentTemplatePlanDto.java

@@ -8,46 +8,45 @@ import java.util.Date;
 import java.util.List;
 
 
-
 /**
-* @title: 考核计划
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 public class AddAssessmentTemplatePlanDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-    * 名称
-    */
+     * 名称
+     */
     @ApiModelProperty("名称")
     private String name;
     /**
-    * 分数
-    */
+     * 分数
+     */
     @ApiModelProperty("分数")
     private Long score;
     /**
-    * 计划开始时间
-    */
+     * 计划开始时间
+     */
     @ApiModelProperty("计划开始时间")
     private Date startTime;
     /**
-    * 计划结束时间
-    */
+     * 计划结束时间
+     */
     @ApiModelProperty("计划结束时间")
     private Date endTime;
     /**
-    * 状态(0:未发布 1:已发布)
-    */
+     * 状态(0:未发布 1:已发布)
+     */
     @ApiModelProperty("状态(0:未发布 1:已发布)")
     private Integer status;
     /**
-    * 考核模板id(assessment_template)
-    */
+     * 考核模板id(assessment_template)
+     */
     @ApiModelProperty("考核模板id(assessment_template)")
     private Long assessmentTemplateId;
 

src/main/java/com/xjrsoft/module/assessment/dto/AssessmentPlanAnswerPageDto.java

@@ -7,11 +7,11 @@ import lombok.EqualsAndHashCode;
 
 
 /**
-* @title: 考核计划分页查询入参
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划分页查询入参
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class AssessmentPlanAnswerPageDto extends PageInput {

src/main/java/com/xjrsoft/module/assessment/dto/AssessmentPlanAnswerStudentDto.java

@@ -7,11 +7,11 @@ import lombok.EqualsAndHashCode;
 
 
 /**
-* @title: 考核答题提交入参
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核答题提交入参
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class AssessmentPlanAnswerStudentDto extends PageInput {

src/main/java/com/xjrsoft/module/assessment/dto/AssessmentPlanAnswerSubmitDto.java

@@ -8,11 +8,11 @@ import java.io.Serializable;
 
 
 /**
-* @title: 考核答题提交入参
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核答题提交入参
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class AssessmentPlanAnswerSubmitDto implements Serializable {

src/main/java/com/xjrsoft/module/assessment/dto/AssessmentPlanSubmitDto.java

@@ -9,19 +9,18 @@ import java.util.List;
 
 
 /**
-* @title: 考核答题提交入参
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核答题提交入参
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class AssessmentPlanSubmitDto implements Serializable {
 
-    @ApiModelProperty("考核计划id")
-    private Long assessmentTemplatePlanId;
-
     @ApiModelProperty("问题答案")
     List<AssessmentPlanAnswerSubmitDto> answerList;
+    @ApiModelProperty("考核计划id")
+    private Long assessmentTemplatePlanId;
 
 }

src/main/java/com/xjrsoft/module/assessment/dto/AssessmentQuestionResultDto.java

@@ -8,11 +8,11 @@ import java.io.Serializable;
 
 
 /**
-* @title: 考核答题提交入参
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核答题提交入参
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class AssessmentQuestionResultDto implements Serializable {

src/main/java/com/xjrsoft/module/assessment/dto/AssessmentTemplatePageDto.java

@@ -7,11 +7,11 @@ import lombok.EqualsAndHashCode;
 
 
 /**
-* @title: 考核模板分页查询入参
-* @Author dzx
-* @Date: 2024-03-29
-* @Version 1.0
-*/
+ * @title: 考核模板分页查询入参
+ * @Author dzx
+ * @Date: 2024-03-29
+ * @Version 1.0
+ */
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class AssessmentTemplatePageDto extends PageInput {

src/main/java/com/xjrsoft/module/assessment/dto/AssessmentTemplatePlanPageDto.java

@@ -7,11 +7,11 @@ import lombok.EqualsAndHashCode;
 
 
 /**
-* @title: 考核计划分页查询入参
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划分页查询入参
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class AssessmentTemplatePlanPageDto extends PageInput {

src/main/java/com/xjrsoft/module/assessment/dto/UpdateAssessmentTemplateDto.java

@@ -4,21 +4,20 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
-
 /**
-* @title: 考核模板
-* @Author dzx
-* @Date: 2024-03-29
-* @Version 1.0
-*/
+ * @title: 考核模板
+ * @Author dzx
+ * @Date: 2024-03-29
+ * @Version 1.0
+ */
 @Data
 public class UpdateAssessmentTemplateDto extends AddAssessmentTemplateDto {
 
     private static final long serialVersionUID = 1L;
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     private Long id;
 }

src/main/java/com/xjrsoft/module/assessment/dto/UpdateAssessmentTemplatePlanDto.java

@@ -4,21 +4,20 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
-
 /**
-* @title: 考核计划
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 public class UpdateAssessmentTemplatePlanDto extends AddAssessmentTemplatePlanDto {
 
     private static final long serialVersionUID = 1L;
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     private Long id;
 }

src/main/java/com/xjrsoft/module/assessment/dto/UpdateAssessmentTemplatePlanTimeDto.java

@@ -8,19 +8,19 @@ import java.util.Date;
 
 
 /**
-* @title: 考核计划
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 public class UpdateAssessmentTemplatePlanTimeDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     private Long id;
 

src/main/java/com/xjrsoft/module/assessment/entity/AssessmentPlanAnswerClass.java

@@ -1,10 +1,6 @@
 package com.xjrsoft.module.assessment.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,11 +10,11 @@ import java.util.Date;
 
 
 /**
-* @title: 考核计划答题参与班级
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划答题参与班级
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 @TableName("assessment_plan_answer_class")
 @ApiModel(value = "assessment_plan_answer_class", description = "考核计划答题参与班级")
@@ -27,61 +23,61 @@ public class AssessmentPlanAnswerClass implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableId
     private Long id;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Long createUserId;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Date createDate;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.UPDATE)
     private Long modifyUserId;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.UPDATE)
     private Date modifyDate;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
     private Integer deleteMark;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Integer enabledMark;
     /**
-    * 班级id
-    */
+     * 班级id
+     */
     @ApiModelProperty("班级id")
     private Long classId;
     /**
-    * 班主任是否确认(0:否 1:是)
-    */
+     * 班主任是否确认(0:否 1:是)
+     */
     @ApiModelProperty("班主任是否确认(0:否 1:是)")
     private Integer isConfirm;
     /**
-    * 考核计划id(assessment_template_plan)
-    */
+     * 考核计划id(assessment_template_plan)
+     */
     @ApiModelProperty("考核计划id(assessment_template_plan)")
     private Long assessmentTemplatePlanId;
 

src/main/java/com/xjrsoft/module/assessment/entity/AssessmentPlanAnswerResult.java

@@ -13,11 +13,11 @@ import java.util.Date;
 
 
 /**
-* @title: 考核模板题目
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核模板题目
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 @TableName("assessment_plan_answer_result")
 @ApiModel(value = "assessment_plan_answer_result", description = "考核答题结果")
@@ -26,55 +26,55 @@ public class AssessmentPlanAnswerResult implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     private Long id;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Long createUserId;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Date createDate;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.UPDATE)
     private Long modifyUserId;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.UPDATE)
     private Date modifyDate;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
     private Integer deleteMark;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Integer enabledMark;
     /**
-    * 学生id
-    */
+     * 学生id
+     */
     @ApiModelProperty("学生id")
     private Long studentUserId;
     /**
-    * 选项id(assessment_plan_question[category=3的id])
-    */
+     * 选项id(assessment_plan_question[category=3的id])
+     */
     @ApiModelProperty("选项id(assessment_plan_question[category=2的id])")
     private Long questionId;
     /**
@@ -83,8 +83,8 @@ public class AssessmentPlanAnswerResult implements Serializable {
     @ApiModelProperty("选项id(assessment_plan_question[category=3的id])")
     private String answerId;
     /**
-    * 考核计划id(assessment_template_plan)
-    */
+     * 考核计划id(assessment_template_plan)
+     */
     @ApiModelProperty("考核计划id(assessment_template_plan)")
     private Long assessmentTemplatePlanId;
 

src/main/java/com/xjrsoft/module/assessment/entity/AssessmentPlanAnswerStudent.java

@@ -1,10 +1,6 @@
 package com.xjrsoft.module.assessment.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,11 +10,11 @@ import java.util.Date;
 
 
 /**
-* @title: 考核计划答题参与学生
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划答题参与学生
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 @TableName("assessment_plan_answer_student")
 @ApiModel(value = "assessment_plan_answer_student", description = "考核计划答题参与学生")
@@ -27,56 +23,56 @@ public class AssessmentPlanAnswerStudent implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableId
     private Long id;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Long createUserId;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Date createDate;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.UPDATE)
     private Long modifyUserId;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.UPDATE)
     private Date modifyDate;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
     private Integer deleteMark;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Integer enabledMark;
     /**
-    * 班级ic
-    */
+     * 班级ic
+     */
     @ApiModelProperty("学生id")
     private Long studentUserId;
     /**
-    * 考核计划id(assessment_template_plan)
-    */
+     * 考核计划id(assessment_template_plan)
+     */
     @ApiModelProperty("考核计划id(assessment_template_plan)")
     private Long assessmentTemplatePlanId;
 

src/main/java/com/xjrsoft/module/assessment/entity/AssessmentPlanQuestion.java

@@ -13,11 +13,11 @@ import java.util.Date;
 
 
 /**
-* @title: 考核模板题目
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核模板题目
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 @TableName("assessment_plan_question")
 @ApiModel(value = "assessment_plan_question", description = "考核模板题目")
@@ -26,85 +26,85 @@ public class AssessmentPlanQuestion implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     private Long id;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Long createUserId;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Date createDate;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.UPDATE)
     private Long modifyUserId;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.UPDATE)
     private Date modifyDate;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
     private Integer deleteMark;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Integer enabledMark;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     private Integer sortCode;
     /**
-    * 题目题干
-    */
+     * 题目题干
+     */
     @ApiModelProperty("题目题干")
     private String name;
     /**
-    * 分数
-    */
+     * 分数
+     */
     @ApiModelProperty("分数")
     private Long score;
     /**
-    * 题目类型
-    */
+     * 题目类型
+     */
     @ApiModelProperty("题目类型")
     private String type;
     /**
-    * 类别(1:大题 2:小题 3:选项)
-    */
+     * 类别(1:大题 2:小题 3:选项)
+     */
     @ApiModelProperty("类别(1:大题 2:小题 3:选项)")
     private Integer category;
     /**
-    * 父级id
-    */
+     * 父级id
+     */
     @ApiModelProperty("父级id")
     private Long parentId;
     /**
-    * 小题是否必填(1:是 0:否)
-    */
+     * 小题是否必填(1:是 0:否)
+     */
     @ApiModelProperty("小题是否必填(1:是 0:否)")
     private Short required;
     /**
-    * 考核计划id(assessment_template_plan)
-    */
+     * 考核计划id(assessment_template_plan)
+     */
     @ApiModelProperty("考核计划id(assessment_template_plan)")
     private Long assessmentTemplatePlanId;
 

src/main/java/com/xjrsoft/module/assessment/entity/AssessmentQuestion.java

@@ -1,10 +1,6 @@
 package com.xjrsoft.module.assessment.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,11 +10,11 @@ import java.util.Date;
 
 
 /**
-* @title: 考核模板题目
-* @Author dzx
-* @Date: 2024-03-29
-* @Version 1.0
-*/
+ * @title: 考核模板题目
+ * @Author dzx
+ * @Date: 2024-03-29
+ * @Version 1.0
+ */
 @Data
 @TableName("assessment_question")
 @ApiModel(value = "assessment_question", description = "考核模板题目")
@@ -27,66 +23,66 @@ public class AssessmentQuestion implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableId
     private Long id;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Long createUserId;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Date createDate;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.UPDATE)
     private Long modifyUserId;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.UPDATE)
     private Date modifyDate;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
     private Integer deleteMark;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Integer enabledMark;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     private Integer sortCode;
     /**
-    * 题目题干
-    */
+     * 题目题干
+     */
     @ApiModelProperty("题目题干")
     private String name;
     /**
-    * 分数
-    */
+     * 分数
+     */
     @ApiModelProperty("分数")
     private Long score;
     /**
-    * 题目类型
-    */
+     * 题目类型
+     */
     @ApiModelProperty("题目类型")
     private String type;
 
@@ -97,13 +93,13 @@ public class AssessmentQuestion implements Serializable {
     private Long parentId;
 
     /**
-    * 是否必填(1:是 0:否)
-    */
+     * 是否必填(1:是 0:否)
+     */
     @ApiModelProperty("是否必填(1:是 0:否)")
     private Short required;
     /**
-    * 考核模板id(assessment_template)
-    */
+     * 考核模板id(assessment_template)
+     */
     @ApiModelProperty("考核模板id(assessment_template)")
     private Long assessmentTemplateId;
 

src/main/java/com/xjrsoft/module/assessment/entity/AssessmentTemplate.java

@@ -1,10 +1,6 @@
 package com.xjrsoft.module.assessment.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,11 +12,11 @@ import java.util.List;
 
 
 /**
-* @title: 考核模板
-* @Author dzx
-* @Date: 2024-03-29
-* @Version 1.0
-*/
+ * @title: 考核模板
+ * @Author dzx
+ * @Date: 2024-03-29
+ * @Version 1.0
+ */
 @Data
 @TableName("assessment_template")
 @ApiModel(value = "assessment_template", description = "考核模板")
@@ -29,62 +25,62 @@ public class AssessmentTemplate implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableId
     private Long id;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Long createUserId;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Date createDate;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.UPDATE)
     private Long modifyUserId;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.UPDATE)
     private Date modifyDate;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
     private Integer deleteMark;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Integer enabledMark;
     /**
-    * 名称
-    */
+     * 名称
+     */
     @ApiModelProperty("名称")
     private String name;
     /**
-    * 分数
-    */
+     * 分数
+     */
     @ApiModelProperty("分数")
     private Long score;
 
     /**
-    * assessmentQuestion
-    */
+     * assessmentQuestion
+     */
     @ApiModelProperty("assessmentQuestion子表")
     @TableField(exist = false)
     @EntityMapping(thisField = "id", joinField = "assessmentTemplateId")

src/main/java/com/xjrsoft/module/assessment/entity/AssessmentTemplatePlan.java

@@ -1,10 +1,6 @@
 package com.xjrsoft.module.assessment.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,11 +12,11 @@ import java.util.List;
 
 
 /**
-* @title: 考核计划
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 @TableName("assessment_template_plan")
 @ApiModel(value = "assessment_template_plan", description = "考核计划")
@@ -29,76 +25,76 @@ public class AssessmentTemplatePlan implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableId
     private Long id;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Long createUserId;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Date createDate;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.UPDATE)
     private Long modifyUserId;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.UPDATE)
     private Date modifyDate;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
     private Integer deleteMark;
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Integer enabledMark;
     /**
-    * 名称
-    */
+     * 名称
+     */
     @ApiModelProperty("名称")
     private String name;
     /**
-    * 分数
-    */
+     * 分数
+     */
     @ApiModelProperty("分数")
     private Long score;
     /**
-    * 计划开始时间
-    */
+     * 计划开始时间
+     */
     @ApiModelProperty("计划开始时间")
     private Date startTime;
     /**
-    * 计划结束时间
-    */
+     * 计划结束时间
+     */
     @ApiModelProperty("计划结束时间")
     private Date endTime;
     /**
-    * 状态(0:未发布 1:已发布)
-    */
+     * 状态(0:未发布 1:已发布)
+     */
     @ApiModelProperty("状态(0:未发布 1:已发布)")
     private Integer status;
     /**
-    * 考核模板id(assessment_template)
-    */
+     * 考核模板id(assessment_template)
+     */
     @ApiModelProperty("考核模板id(assessment_template)")
     private Long assessmentTemplateId;
 
@@ -121,22 +117,22 @@ public class AssessmentTemplatePlan implements Serializable {
     private Integer randomNumber;
 
     /**
-    * assessmentPlanQuestion
-    */
+     * assessmentPlanQuestion
+     */
     @ApiModelProperty("assessmentPlanQuestion子表")
     @TableField(exist = false)
     @EntityMapping(thisField = "id", joinField = "assessmentTemplatePlanId")
     private List<AssessmentPlanQuestion> assessmentPlanQuestionList;
     /**
-    * assessmentPlanAnswerClass
-    */
+     * assessmentPlanAnswerClass
+     */
     @ApiModelProperty("assessmentPlanAnswerClass子表")
     @TableField(exist = false)
     @EntityMapping(thisField = "id", joinField = "assessmentTemplatePlanId")
     private List<AssessmentPlanAnswerClass> assessmentPlanAnswerClassList;
     /**
-    * assessmentPlanAnswerStudent
-    */
+     * assessmentPlanAnswerStudent
+     */
     @ApiModelProperty("assessmentPlanAnswerStudent子表")
     @TableField(exist = false)
     @EntityMapping(thisField = "id", joinField = "assessmentTemplatePlanId")

src/main/java/com/xjrsoft/module/assessment/mapper/AssessmentPlanAnswerClassMapper.java

@@ -7,11 +7,11 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Update;
 
 /**
-* @title: 考核计划答题参与班级
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划答题参与班级
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Mapper
 public interface AssessmentPlanAnswerClassMapper extends MPJBaseMapper<AssessmentPlanAnswerClass> {
 

src/main/java/com/xjrsoft/module/assessment/mapper/AssessmentPlanAnswerResultMapper.java

@@ -12,11 +12,11 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
-* @title: 考核计划答题参与班级
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划答题参与班级
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Mapper
 public interface AssessmentPlanAnswerResultMapper extends MPJBaseMapper<AssessmentPlanAnswerResult> {
 

src/main/java/com/xjrsoft/module/assessment/mapper/AssessmentPlanAnswerStudentMapper.java

@@ -8,11 +8,11 @@ import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 /**
-* @title: 考核计划答题参与学生
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划答题参与学生
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Mapper
 public interface AssessmentPlanAnswerStudentMapper extends MPJBaseMapper<AssessmentPlanAnswerStudent> {
 

src/main/java/com/xjrsoft/module/assessment/mapper/AssessmentPlanQuestionMapper.java

@@ -6,11 +6,11 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Update;
 
 /**
-* @title: 考核模板题目
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核模板题目
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Mapper
 public interface AssessmentPlanQuestionMapper extends MPJBaseMapper<AssessmentPlanQuestion> {
     @Update("update assessment_plan_question set delete_mark = 1,modify_date = now(),modify_user_id = #{loginId} WHERE assessment_template_plan_id = #{planId}")

src/main/java/com/xjrsoft/module/assessment/mapper/AssessmentQuestionMapper.java

@@ -6,11 +6,11 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Update;
 
 /**
-* @title: 考核模板题目
-* @Author dzx
-* @Date: 2024-03-29
-* @Version 1.0
-*/
+ * @title: 考核模板题目
+ * @Author dzx
+ * @Date: 2024-03-29
+ * @Version 1.0
+ */
 @Mapper
 public interface AssessmentQuestionMapper extends MPJBaseMapper<AssessmentQuestion> {
     @Update("update assessment_question set delete_mark = 1,modify_date = now(),modify_user_id = #{loginId} WHERE assessment_template_id = #{assessmentTemplateId}")

src/main/java/com/xjrsoft/module/assessment/mapper/AssessmentTemplateMapper.java

@@ -5,11 +5,11 @@ import com.xjrsoft.module.assessment.entity.AssessmentTemplate;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
-* @title: 考核模板
-* @Author dzx
-* @Date: 2024-03-29
-* @Version 1.0
-*/
+ * @title: 考核模板
+ * @Author dzx
+ * @Date: 2024-03-29
+ * @Version 1.0
+ */
 @Mapper
 public interface AssessmentTemplateMapper extends MPJBaseMapper<AssessmentTemplate> {
 

src/main/java/com/xjrsoft/module/assessment/mapper/AssessmentTemplatePlanMapper.java

@@ -16,16 +16,17 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
-* @title: 考核计划
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Mapper
 public interface AssessmentTemplatePlanMapper extends MPJBaseMapper<AssessmentTemplatePlan> {
 
     /**
      * 分页查询
+     *
      * @param page
      * @param dto
      */

src/main/java/com/xjrsoft/module/assessment/service/IAssessmentTemplatePlanService.java

@@ -2,56 +2,39 @@ package com.xjrsoft.module.assessment.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseService;
-import com.xjrsoft.module.assessment.dto.AddAssessmentTemplatePlanDto;
-import com.xjrsoft.module.assessment.dto.AssessmentPlanAnswerPageDto;
-import com.xjrsoft.module.assessment.dto.AssessmentPlanAnswerStudentDto;
-import com.xjrsoft.module.assessment.dto.AssessmentPlanSubmitDto;
-import com.xjrsoft.module.assessment.dto.AssessmentTemplatePlanPageDto;
-import com.xjrsoft.module.assessment.dto.AssessmentTemplatePlanSureDto;
-import com.xjrsoft.module.assessment.dto.UpdateAssessmentTemplatePlanDto;
-import com.xjrsoft.module.assessment.dto.UpdateAssessmentTemplatePlanTimeDto;
+import com.xjrsoft.module.assessment.dto.*;
 import com.xjrsoft.module.assessment.entity.AssessmentTemplatePlan;
-import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerClassResultVo;
-import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerStudentPageVo;
-import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerStudentVo;
-import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerTeacherPageVo;
-import com.xjrsoft.module.assessment.vo.AssessmentTemplatePlanAnswerResultVo;
-import com.xjrsoft.module.assessment.vo.AssessmentTemplatePlanPageVo;
-import com.xjrsoft.module.assessment.vo.AssessmentTemplatePlanQuestionVo;
-import com.xjrsoft.module.assessment.vo.AssessmentTemplatePlanResultVo;
-import org.springframework.web.bind.annotation.RequestParam;
+import com.xjrsoft.module.assessment.vo.*;
 
 import java.io.IOException;
 import java.util.List;
 
 /**
-* @title: 考核计划
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 
 public interface IAssessmentTemplatePlanService extends MPJBaseService<AssessmentTemplatePlan> {
     /**
-    * 新增
-    *
-    */
+     * 新增
+     */
     Boolean add(AddAssessmentTemplatePlanDto dto);
 
     /**
-    * 更新
-    *
-    */
+     * 更新
+     */
     Boolean update(UpdateAssessmentTemplatePlanDto dto);
 
     Boolean updateTime(UpdateAssessmentTemplatePlanTimeDto dto);
 
     /**
-    * 删除
-    *
-    * @param ids
-    * @return
-    */
+     * 删除
+     *
+     * @param ids
+     * @return
+     */
     Boolean delete(List<Long> ids);
 
     /**
@@ -71,6 +54,7 @@ public interface IAssessmentTemplatePlanService extends MPJBaseService<Assessmen
 
     /**
      * 班主任确认
+     *
      * @return
      */
     Boolean sure(AssessmentTemplatePlanSureDto dto);

src/main/java/com/xjrsoft/module/assessment/service/IAssessmentTemplateService.java

@@ -9,39 +9,39 @@ import com.xjrsoft.module.assessment.vo.AssessmentTemplateVo;
 import java.util.List;
 
 /**
-* @title: 考核模板
-* @Author dzx
-* @Date: 2024-03-29
-* @Version 1.0
-*/
+ * @title: 考核模板
+ * @Author dzx
+ * @Date: 2024-03-29
+ * @Version 1.0
+ */
 
 public interface IAssessmentTemplateService extends MPJBaseService<AssessmentTemplate> {
     /**
-    * 新增
-    *
-    * @param assessmentTemplate
-    * @return
-    */
+     * 新增
+     *
+     * @param assessmentTemplate
+     * @return
+     */
     Boolean add(AssessmentTemplate assessmentTemplate);
 
     Boolean addCustom(AddAssessmentTemplateDto dto);
 
     /**
-    * 更新
-    *
-    * @param assessmentTemplate
-    * @return
-    */
+     * 更新
+     *
+     * @param assessmentTemplate
+     * @return
+     */
     Boolean update(AssessmentTemplate assessmentTemplate);
 
     Boolean update(UpdateAssessmentTemplateDto dto);
 
     /**
-    * 删除
-    *
-    * @param ids
-    * @return
-    */
+     * 删除
+     *
+     * @param ids
+     * @return
+     */
     Boolean delete(List<Long> ids);
 
     AssessmentTemplateVo getById(Long id);

src/main/java/com/xjrsoft/module/assessment/service/impl/AssessmentTemplatePlanServiceImpl.java

@@ -17,47 +17,11 @@ import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.common.utils.WeChatUtil;
 import com.xjrsoft.config.CommonPropertiesConfig;
-import com.xjrsoft.module.assessment.dto.AddAssessmentTemplatePlanDto;
-import com.xjrsoft.module.assessment.dto.AssessmentPlanAnswerPageDto;
-import com.xjrsoft.module.assessment.dto.AssessmentPlanAnswerStudentDto;
-import com.xjrsoft.module.assessment.dto.AssessmentPlanAnswerSubmitDto;
-import com.xjrsoft.module.assessment.dto.AssessmentPlanSubmitDto;
-import com.xjrsoft.module.assessment.dto.AssessmentQuestionResultDto;
-import com.xjrsoft.module.assessment.dto.AssessmentTemplatePlanPageDto;
-import com.xjrsoft.module.assessment.dto.AssessmentTemplatePlanSureDto;
-import com.xjrsoft.module.assessment.dto.UpdateAssessmentTemplatePlanDto;
-import com.xjrsoft.module.assessment.dto.UpdateAssessmentTemplatePlanTimeDto;
-import com.xjrsoft.module.assessment.entity.AssessmentPlanAnswerClass;
-import com.xjrsoft.module.assessment.entity.AssessmentPlanAnswerResult;
-import com.xjrsoft.module.assessment.entity.AssessmentPlanAnswerStudent;
-import com.xjrsoft.module.assessment.entity.AssessmentPlanQuestion;
-import com.xjrsoft.module.assessment.entity.AssessmentQuestion;
-import com.xjrsoft.module.assessment.entity.AssessmentTemplate;
-import com.xjrsoft.module.assessment.entity.AssessmentTemplatePlan;
-import com.xjrsoft.module.assessment.mapper.AssessmentPlanAnswerClassMapper;
-import com.xjrsoft.module.assessment.mapper.AssessmentPlanAnswerResultMapper;
-import com.xjrsoft.module.assessment.mapper.AssessmentPlanAnswerStudentMapper;
-import com.xjrsoft.module.assessment.mapper.AssessmentPlanQuestionMapper;
-import com.xjrsoft.module.assessment.mapper.AssessmentQuestionMapper;
-import com.xjrsoft.module.assessment.mapper.AssessmentTemplateMapper;
-import com.xjrsoft.module.assessment.mapper.AssessmentTemplatePlanMapper;
+import com.xjrsoft.module.assessment.dto.*;
+import com.xjrsoft.module.assessment.entity.*;
+import com.xjrsoft.module.assessment.mapper.*;
 import com.xjrsoft.module.assessment.service.IAssessmentTemplatePlanService;
-import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerClassResultVo;
-import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerDetailVo;
-import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerStudentPageVo;
-import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerStudentVo;
-import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerTeacherPageVo;
-import com.xjrsoft.module.assessment.vo.AssessmentQuestionOptionResultVo;
-import com.xjrsoft.module.assessment.vo.AssessmentQuestionResultVo;
-import com.xjrsoft.module.assessment.vo.AssessmentQuestionVo;
-import com.xjrsoft.module.assessment.vo.AssessmentTemplatePlanAnswerResultVo;
-import com.xjrsoft.module.assessment.vo.AssessmentTemplatePlanPageVo;
-import com.xjrsoft.module.assessment.vo.AssessmentTemplatePlanQuestionVo;
-import com.xjrsoft.module.assessment.vo.AssessmentTemplatePlanResultVo;
-import com.xjrsoft.module.assessment.vo.OneQuestionAnswerVo;
-import com.xjrsoft.module.assessment.vo.OneQuestionVo;
-import com.xjrsoft.module.assessment.vo.TwoQuestionAnswerVo;
-import com.xjrsoft.module.assessment.vo.TwoQuestionVo;
+import com.xjrsoft.module.assessment.vo.*;
 import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.mapper.BaseClassMapper;
 import com.xjrsoft.module.organization.dto.WeChatSendMessageDto;
@@ -66,14 +30,7 @@ import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
 import lombok.AllArgsConstructor;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.stereotype.Service;
@@ -82,22 +39,15 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Random;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
-* @title: 考核计划
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Service
 @AllArgsConstructor
 public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<AssessmentTemplatePlanMapper, AssessmentTemplatePlan> implements IAssessmentTemplatePlanService {
@@ -125,9 +75,9 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
 
         //查询模板下面的题目信息
         List<AssessmentQuestion> questionList = questionMapper.selectList(
-            new QueryWrapper<AssessmentQuestion>().lambda()
-            .eq(AssessmentQuestion::getDeleteMark, DeleteMark.NODELETE.getCode())
-            .eq(AssessmentQuestion::getAssessmentTemplateId, dto.getAssessmentTemplateId())
+                new QueryWrapper<AssessmentQuestion>().lambda()
+                        .eq(AssessmentQuestion::getDeleteMark, DeleteMark.NODELETE.getCode())
+                        .eq(AssessmentQuestion::getAssessmentTemplateId, dto.getAssessmentTemplateId())
         );
         Map<Long, Long> parentMap = new HashMap<>();
         for (AssessmentQuestion assessmentQuestion : questionList) {
@@ -141,22 +91,22 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
             planQuestionMapper.insert(planQuestion);
         }
         List<BaseClass> classList = baseClassMapper.selectList(
-            new QueryWrapper<BaseClass>().lambda()
-            .eq(BaseClass::getDeleteMark, DeleteMark.NODELETE.getCode())
-            .eq(BaseClass::getIsGraduate, 1)
+                new QueryWrapper<BaseClass>().lambda()
+                        .eq(BaseClass::getDeleteMark, DeleteMark.NODELETE.getCode())
+                        .eq(BaseClass::getIsGraduate, 1)
         );
         List<Long> classIds = new ArrayList<>();
-        if("all".equals(dto.getType())){
+        if ("all".equals(dto.getType())) {
             for (BaseClass baseClass : classList) {
                 classIds.add(baseClass.getId());
             }
             dto.setClassIds(classIds);
-        }else if("random".equals(dto.getType())){
+        } else if ("random".equals(dto.getType())) {
             List<Integer> randomList = new ArrayList<>();
             Random random = new Random();
-            while(randomList.size() < dto.getRandomNumber()){
+            while (randomList.size() < dto.getRandomNumber()) {
                 int nextInt = random.nextInt(classList.size());
-                if(!randomList.contains(nextInt) && nextInt >= 0){
+                if (!randomList.contains(nextInt) && nextInt >= 0) {
                     randomList.add(nextInt);
 
                 }
@@ -178,8 +128,8 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
 
             MPJLambdaWrapper<XjrUser> query = new MPJLambdaWrapper<>();
             query.leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, XjrUser::getId)
-            .in(BaseStudentSchoolRoll::getStduyStatus, Arrays.asList(stduyStatus))
-            .eq(BaseStudentSchoolRoll::getClassId, classId);
+                    .in(BaseStudentSchoolRoll::getStduyStatus, Arrays.asList(stduyStatus))
+                    .eq(BaseStudentSchoolRoll::getClassId, classId);
             List<XjrUser> studentList = xjrUserMapper.selectJoinList(XjrUser.class, query);
             for (XjrUser xjrUser : studentList) {
                 AssessmentPlanAnswerStudent answer = new AssessmentPlanAnswerStudent();
@@ -204,10 +154,10 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
         planQuestionMapper.deleteByPlanId(assessmentTemplatePlan.getId(), StpUtil.getLoginIdAsLong());
         //查询模板下面的题目信息
         List<AssessmentQuestion> questionList = questionMapper.selectList(
-            new QueryWrapper<AssessmentQuestion>().lambda()
-            .eq(AssessmentQuestion::getDeleteMark, DeleteMark.NODELETE.getCode())
-            .eq(AssessmentQuestion::getAssessmentTemplateId, dto.getAssessmentTemplateId())
-            .orderByAsc(AssessmentQuestion::getCategory)
+                new QueryWrapper<AssessmentQuestion>().lambda()
+                        .eq(AssessmentQuestion::getDeleteMark, DeleteMark.NODELETE.getCode())
+                        .eq(AssessmentQuestion::getAssessmentTemplateId, dto.getAssessmentTemplateId())
+                        .orderByAsc(AssessmentQuestion::getCategory)
         );
         Map<Long, Long> parentMap = new HashMap<>();
         for (AssessmentQuestion assessmentQuestion : questionList) {
@@ -224,21 +174,21 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
         answerClassMapper.deleteByPlanId(assessmentTemplatePlan.getId(), StpUtil.getLoginIdAsLong());
         studentMapper.deleteByPlanId(assessmentTemplatePlan.getId(), StpUtil.getLoginIdAsLong());
         List<BaseClass> classList = baseClassMapper.selectList(
-            new QueryWrapper<BaseClass>().lambda()
-            .eq(BaseClass::getDeleteMark, DeleteMark.NODELETE.getCode())
-            .eq(BaseClass::getIsGraduate, 1)
+                new QueryWrapper<BaseClass>().lambda()
+                        .eq(BaseClass::getDeleteMark, DeleteMark.NODELETE.getCode())
+                        .eq(BaseClass::getIsGraduate, 1)
         );
         List<Long> classIds = new ArrayList<>();
-        if("all".equals(dto.getType())){
+        if ("all".equals(dto.getType())) {
             for (BaseClass baseClass : classList) {
                 classIds.add(baseClass.getId());
             }
-        }else if("random".equals(dto.getType())){
+        } else if ("random".equals(dto.getType())) {
             List<Integer> randomList = new ArrayList<>();
             Random random = new Random();
-            while(randomList.size() < dto.getRandomNumber()){
+            while (randomList.size() < dto.getRandomNumber()) {
                 int nextInt = random.nextInt(classList.size());
-                if(!randomList.contains(nextInt) && nextInt >= 0){
+                if (!randomList.contains(nextInt) && nextInt >= 0) {
                     randomList.add(nextInt);
                 }
             }
@@ -318,15 +268,15 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
                         .eq(AssessmentPlanAnswerStudent::getAssessmentTemplatePlanId, id)
                         .eq(AssessmentPlanAnswerStudent::getStudentUserId, StpUtil.getLoginIdAsLong())
         );
-        if(studentList.isEmpty()){
+        if (studentList.isEmpty()) {
             throw new MyException("当前登录账号与消息接收账号不匹配，请重新登录账号！");
         }
         AssessmentTemplatePlan templatePlan = templatePlanMapper.selectById(id);
         AssessmentTemplatePlanQuestionVo vo = BeanUtil.toBean(templatePlan, AssessmentTemplatePlanQuestionVo.class);
         List<AssessmentPlanQuestion> questionList = planQuestionMapper.selectList(
-            new QueryWrapper<AssessmentPlanQuestion>().lambda()
-            .eq(AssessmentPlanQuestion::getDeleteMark, DeleteMark.NODELETE.getCode())
-            .eq(AssessmentPlanQuestion::getAssessmentTemplatePlanId, id)
+                new QueryWrapper<AssessmentPlanQuestion>().lambda()
+                        .eq(AssessmentPlanQuestion::getDeleteMark, DeleteMark.NODELETE.getCode())
+                        .eq(AssessmentPlanQuestion::getAssessmentTemplatePlanId, id)
         );
 
         Integer submitStatus = studentMapper.getSubmitStatus(id, StpUtil.getLoginIdAsLong());
@@ -344,7 +294,7 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
         //循环大题
         List<AssessmentQuestionVo> oneList = new ArrayList<>();
         for (AssessmentPlanQuestion assessmentQuestion : questionList) {
-            if(assessmentQuestion.getCategory() == 1){
+            if (assessmentQuestion.getCategory() == 1) {
                 oneList.add(BeanUtil.toBean(assessmentQuestion, AssessmentQuestionVo.class));
             }
         }
@@ -353,7 +303,7 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
         for (AssessmentQuestionVo oneQuestion : oneList) {
             List<AssessmentQuestionVo> twoList = new ArrayList<>();
             for (AssessmentPlanQuestion assessmentQuestion : questionList) {
-                if(assessmentQuestion.getCategory() == 2 && assessmentQuestion.getParentId().equals(oneQuestion.getId())){
+                if (assessmentQuestion.getCategory() == 2 && assessmentQuestion.getParentId().equals(oneQuestion.getId())) {
                     AssessmentQuestionVo questionVo = BeanUtil.toBean(assessmentQuestion, AssessmentQuestionVo.class);
                     questionVo.setValue(resultMap.get(questionVo.getId()));
                     twoList.add(questionVo);
@@ -367,7 +317,7 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
             for (AssessmentQuestionVo twoQuestion : oneQuestion.getChildren()) {
                 List<AssessmentQuestionVo> optionList = new ArrayList<>();
                 for (AssessmentPlanQuestion assessmentQuestion : questionList) {
-                    if(assessmentQuestion.getCategory() == 3 && assessmentQuestion.getParentId().equals(twoQuestion.getId())){
+                    if (assessmentQuestion.getCategory() == 3 && assessmentQuestion.getParentId().equals(twoQuestion.getId())) {
                         optionList.add(BeanUtil.toBean(assessmentQuestion, AssessmentQuestionVo.class));
                     }
                 }
@@ -390,16 +340,16 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
         }
         Map<Long, String> questionTypeMaps = new HashMap<>();
         planQuestionMapper.selectList(
-            new QueryWrapper<AssessmentPlanQuestion>().lambda()
-            .in(AssessmentPlanQuestion::getId, questionIds)
-        ).forEach(question ->{
+                new QueryWrapper<AssessmentPlanQuestion>().lambda()
+                        .in(AssessmentPlanQuestion::getId, questionIds)
+        ).forEach(question -> {
             questionTypeMaps.put(question.getId(), question.getType());
         });
 
         // 学生提交
         studentMapper.submitAnswer(dto.getAssessmentTemplatePlanId(), studentUserId);
         for (AssessmentPlanAnswerSubmitDto answerSubmitDto : dto.getAnswerList()) {
-            if("multi_question".equals(questionTypeMaps.get(answerSubmitDto.getQuestionId()))){
+            if ("multi_question".equals(questionTypeMaps.get(answerSubmitDto.getQuestionId()))) {
                 String[] split = answerSubmitDto.getAnswerId().split(",");
                 for (String answerId : split) {
                     AssessmentPlanAnswerResult answerStudent = new AssessmentPlanAnswerResult();
@@ -410,7 +360,7 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
                     answerStudent.setAnswerId(answerId);
                     resultMapper.insert(answerStudent);
                 }
-            }else{
+            } else {
                 AssessmentPlanAnswerResult answerStudent = new AssessmentPlanAnswerResult();
                 answerStudent.setAssessmentTemplatePlanId(dto.getAssessmentTemplatePlanId());
                 answerStudent.setStudentUserId(studentUserId);
@@ -432,7 +382,7 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
     @Override
     public Page<AssessmentPlanAnswerStudentVo> getAnswerStudent(Page<AssessmentPlanAnswerStudentDto> page, AssessmentPlanAnswerStudentDto dto) {
         List<String> roleList = StpUtil.getRoleList();
-        if(roleList.size() == 2 && roleList.contains("CLASSTE") && roleList.contains("TEACHER")){
+        if (roleList.size() == 2 && roleList.contains("CLASSTE") && roleList.contains("TEACHER")) {
             dto.setTeacherId(StpUtil.getLoginIdAsLong());
         }
         return templatePlanMapper.getAnswerStudent(page, dto);
@@ -441,7 +391,7 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
     @Override
     public List<AssessmentPlanAnswerStudentVo> getAnswerStudentList(AssessmentPlanAnswerStudentDto dto) {
         List<String> roleList = StpUtil.getRoleList();
-        if(roleList.size() == 2 && roleList.contains("CLASSTE") && roleList.contains("TEACHER")){
+        if (roleList.size() == 2 && roleList.contains("CLASSTE") && roleList.contains("TEACHER")) {
             dto.setTeacherId(StpUtil.getLoginIdAsLong());
         }
         return this.baseMapper.getAnswerStudentList(dto);
@@ -463,15 +413,15 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
         AssessmentTemplatePlanResultVo vo = BeanUtil.toBean(templatePlan, AssessmentTemplatePlanResultVo.class);
         vo.setStudentCount(studentMapper.getSubmitStudentCount(id));
         List<AssessmentPlanQuestion> questionList = planQuestionMapper.selectList(
-            new QueryWrapper<AssessmentPlanQuestion>().lambda()
-            .eq(AssessmentPlanQuestion::getDeleteMark, DeleteMark.NODELETE.getCode())
-            .eq(AssessmentPlanQuestion::getAssessmentTemplatePlanId, id)
+                new QueryWrapper<AssessmentPlanQuestion>().lambda()
+                        .eq(AssessmentPlanQuestion::getDeleteMark, DeleteMark.NODELETE.getCode())
+                        .eq(AssessmentPlanQuestion::getAssessmentTemplatePlanId, id)
         );
 
         //循环大题
         List<OneQuestionVo> oneList = new ArrayList<>();
         for (AssessmentPlanQuestion assessmentQuestion : questionList) {
-            if(assessmentQuestion.getCategory() == 1){
+            if (assessmentQuestion.getCategory() == 1) {
                 oneList.add(BeanUtil.toBean(assessmentQuestion, OneQuestionVo.class));
             }
         }
@@ -479,7 +429,7 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
         for (OneQuestionVo oneQuestion : oneList) {
             List<TwoQuestionVo> twoList = new ArrayList<>();
             for (AssessmentPlanQuestion assessmentQuestion : questionList) {
-                if(assessmentQuestion.getCategory() == 2 && assessmentQuestion.getParentId().equals(oneQuestion.getId())){
+                if (assessmentQuestion.getCategory() == 2 && assessmentQuestion.getParentId().equals(oneQuestion.getId())) {
                     TwoQuestionVo questionVo = BeanUtil.toBean(assessmentQuestion, TwoQuestionVo.class);
                     twoList.add(questionVo);
                 }
@@ -502,53 +452,53 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
         for (OneQuestionVo oneQuestion : oneList) {
             for (TwoQuestionVo twoQuestion : oneQuestion.getChildren()) {
                 List<AssessmentQuestionOptionResultVo> optionList = new ArrayList<>();
-                if(AssessQuestionTypeEnum.RADIO.getCode().equals(twoQuestion.getType()) || AssessQuestionTypeEnum.MULTI.getCode().equals(twoQuestion.getType())){
+                if (AssessQuestionTypeEnum.RADIO.getCode().equals(twoQuestion.getType()) || AssessQuestionTypeEnum.MULTI.getCode().equals(twoQuestion.getType())) {
                     for (AssessmentPlanQuestion assessmentQuestion : questionList) {
-                        if(assessmentQuestion.getCategory() == 3 && assessmentQuestion.getParentId().equals(twoQuestion.getId())){
+                        if (assessmentQuestion.getCategory() == 3 && assessmentQuestion.getParentId().equals(twoQuestion.getId())) {
                             AssessmentQuestionOptionResultVo questionVo = BeanUtil.toBean(assessmentQuestion, AssessmentQuestionOptionResultVo.class);
                             Integer count = answerCountMap.get(assessmentQuestion.getParentId().toString() + assessmentQuestion.getId().toString());
-                            questionVo.setCount(count == null?0:count);
+                            questionVo.setCount(count == null ? 0 : count);
 
                             questionVo.setPercentage(vo.getStudentCount());
                             optionList.add(questionVo);
                         }
                     }
-                }else if(AssessQuestionTypeEnum.JUDGE.getCode().equals(twoQuestion.getType())){
-                    optionList.add(new AssessmentQuestionOptionResultVo(){{
+                } else if (AssessQuestionTypeEnum.JUDGE.getCode().equals(twoQuestion.getType())) {
+                    optionList.add(new AssessmentQuestionOptionResultVo() {{
                         setName("是");
                         Integer count = answerCountMap.get(twoQuestion.getId().toString() + "1");
                         setPercentage(vo.getStudentCount());
-                        setCount(count == null?0:count);
+                        setCount(count == null ? 0 : count);
                     }});
-                    optionList.add(new AssessmentQuestionOptionResultVo(){{
+                    optionList.add(new AssessmentQuestionOptionResultVo() {{
                         setName("否");
                         Integer count = answerCountMap.get(twoQuestion.getId().toString() + "0");
                         setPercentage(vo.getStudentCount());
-                        setCount(count == null?0:count);
+                        setCount(count == null ? 0 : count);
                     }});
-                }else if(AssessQuestionTypeEnum.SCALE.getCode().equals(twoQuestion.getType())) {
+                } else if (AssessQuestionTypeEnum.SCALE.getCode().equals(twoQuestion.getType())) {
                     for (AssessmentPlanAnswerDetailVo detailVo : scaleQuestionResult) {
-                        if(detailVo.getQuestionId().equals(twoQuestion.getId())){
-                            optionList.add(new AssessmentQuestionOptionResultVo(){{
+                        if (detailVo.getQuestionId().equals(twoQuestion.getId())) {
+                            optionList.add(new AssessmentQuestionOptionResultVo() {{
                                 setName(detailVo.getAnswerId() + "星");
                                 Integer count = detailVo.getChooseCount();
                                 setPercentage(vo.getStudentCount());
-                                setCount(count == null?0:count);
+                                setCount(count == null ? 0 : count);
                             }});
                         }
                     }
-                }else if(AssessQuestionTypeEnum.TEXT.getCode().equals(twoQuestion.getType())) {
+                } else if (AssessQuestionTypeEnum.TEXT.getCode().equals(twoQuestion.getType())) {
                     AssessmentQuestionOptionResultVo questionVo = new AssessmentQuestionOptionResultVo();
                     int notNullCount = 0;
                     int nullCount = 0;
                     for (AssessmentPlanAnswerDetailVo detailVo : textQuestionResult) {
-                        if(!Objects.equals(detailVo.getQuestionId(), twoQuestion.getId())){
+                        if (!Objects.equals(detailVo.getQuestionId(), twoQuestion.getId())) {
                             continue;
                         }
-                        if(StrUtil.isNotEmpty(detailVo.getAnswerId())){
-                            notNullCount ++;
-                        }else{
-                            nullCount ++;
+                        if (StrUtil.isNotEmpty(detailVo.getAnswerId())) {
+                            notNullCount++;
+                        } else {
+                            nullCount++;
                         }
                     }
 
@@ -569,15 +519,15 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
     public Boolean sendMsg(AssessmentTemplatePlanSureDto dto) {
         Long teacherId = null;
         List<String> roleList = StpUtil.getRoleList();
-        if(roleList.size() == 2 && roleList.contains("TEACHER") && roleList.contains("CLASSTE")){
+        if (roleList.size() == 2 && roleList.contains("TEACHER") && roleList.contains("CLASSTE")) {
             teacherId = StpUtil.getLoginIdAsLong();
         }
         //先查询班上的所有学生
         MPJLambdaWrapper<XjrUser> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
                 .select(XjrUser.class, x -> VoToColumnUtil.fieldsToColumns(XjrUser.class).contains(x.getProperty()))
-                .innerJoin(AssessmentPlanAnswerStudent.class, AssessmentPlanAnswerStudent::getStudentUserId,XjrUser::getId)
-                .innerJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId,XjrUser::getId)
+                .innerJoin(AssessmentPlanAnswerStudent.class, AssessmentPlanAnswerStudent::getStudentUserId, XjrUser::getId)
+                .innerJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, XjrUser::getId)
                 .innerJoin(BaseClass.class, BaseClass::getId, BaseStudentSchoolRoll::getClassId)
                 .eq(BaseStudentSchoolRoll::getClassId, dto.getClassId())
                 .eq(AssessmentPlanAnswerStudent::getAssessmentTemplatePlanId, dto.getId())
@@ -635,7 +585,7 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
         //循环大题
         List<OneQuestionAnswerVo> oneList = new ArrayList<>();
         for (AssessmentPlanQuestion assessmentQuestion : questionList) {
-            if(assessmentQuestion.getCategory() == 1){
+            if (assessmentQuestion.getCategory() == 1) {
                 oneList.add(BeanUtil.toBean(assessmentQuestion, OneQuestionAnswerVo.class));
             }
         }
@@ -643,7 +593,7 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
         for (OneQuestionAnswerVo oneQuestion : oneList) {
             List<TwoQuestionAnswerVo> twoList = new ArrayList<>();
             for (AssessmentPlanQuestion assessmentQuestion : questionList) {
-                if(assessmentQuestion.getCategory() == 2 && assessmentQuestion.getParentId().equals(oneQuestion.getId())){
+                if (assessmentQuestion.getCategory() == 2 && assessmentQuestion.getParentId().equals(oneQuestion.getId())) {
                     TwoQuestionAnswerVo questionVo = BeanUtil.toBean(assessmentQuestion, TwoQuestionAnswerVo.class);
                     twoList.add(questionVo);
                 }
@@ -658,29 +608,29 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
         for (OneQuestionAnswerVo oneQuestion : oneList) {
             for (TwoQuestionAnswerVo twoQuestion : oneQuestion.getChildren()) {
                 List<AssessmentPlanAnswerDetailVo> resultList = answerResultMap.get(twoQuestion.getId());
-                if(AssessQuestionTypeEnum.MULTI.getCode().equals(twoQuestion.getType())){
+                if (AssessQuestionTypeEnum.MULTI.getCode().equals(twoQuestion.getType())) {
                     String answerStr = "";
-                    for(int i = 0; i < resultList.size(); i ++){
-                        if(i > 0){
+                    for (int i = 0; i < resultList.size(); i++) {
+                        if (i > 0) {
                             answerStr += "\r\n";
                         }
-                        answerStr += resultList.get(i).getAnswerId() + "";
+                        answerStr += resultList.get(i).getAnswerId();
                     }
                     twoQuestion.setResult(answerStr);
-                }else if(AssessQuestionTypeEnum.SCALE.getCode().equals(twoQuestion.getType())){
+                } else if (AssessQuestionTypeEnum.SCALE.getCode().equals(twoQuestion.getType())) {
                     twoQuestion.setResult(resultList.get(0).getAnswerId() + "星");
-                }else if(AssessQuestionTypeEnum.JUDGE.getCode().equals(twoQuestion.getType())){
+                } else if (AssessQuestionTypeEnum.JUDGE.getCode().equals(twoQuestion.getType())) {
                     List<String> answerList = resultList.stream().filter(x -> x.getAnswerId() != null)
                             .map(AssessmentPlanAnswerDetailVo::getAnswerId).collect(Collectors.toList());
                     String replace = answerList.toString().replace("[", "").replace("]", "");
-                    if("1".equals(replace)){
+                    if ("1".equals(replace)) {
                         twoQuestion.setResult("是");
-                    }else if("0".equals(replace)){
+                    } else if ("0".equals(replace)) {
                         twoQuestion.setResult("否");
                     }
-                }else{
+                } else {
                     List<String> answerList = resultList.stream().filter(x -> x.getAnswerId() != null).map(AssessmentPlanAnswerDetailVo::getAnswerId).collect(Collectors.toList());
-                    if(!answerList.isEmpty()){
+                    if (!answerList.isEmpty()) {
                         twoQuestion.setResult(answerList.toString().replace("[", "").replace("]", ""));
                     }
                 }
@@ -731,48 +681,48 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
                     .stream().collect(Collectors.groupingBy(AssessmentPlanAnswerDetailVo::getQuestionId));
             for (AssessmentPlanQuestion question : towQuesList) {
                 List<AssessmentPlanAnswerDetailVo> resultList = answerMaps.get(question.getId());
-                if(resultList.isEmpty()){
+                if (resultList.isEmpty()) {
                     rowData.add("");
                     continue;
                 }
-                if(AssessQuestionTypeEnum.MULTI.getCode().equals(question.getType())){
+                if (AssessQuestionTypeEnum.MULTI.getCode().equals(question.getType())) {
                     String answerStr = "";
-                    for(int i = 0; i < resultList.size(); i ++){
-                        if(i > 0){
+                    for (int i = 0; i < resultList.size(); i++) {
+                        if (i > 0) {
                             answerStr += "\r\n";
                         }
-                        answerStr += resultList.get(i).getAnswerId() + "";
+                        answerStr += resultList.get(i).getAnswerId();
                     }
                     rowData.add(answerStr);
-                }else if(AssessQuestionTypeEnum.SCALE.getCode().equals(question.getType())){
+                } else if (AssessQuestionTypeEnum.SCALE.getCode().equals(question.getType())) {
                     rowData.add(resultList.get(0).getAnswerId() + "星");
-                }else if(AssessQuestionTypeEnum.TEXT.getCode().equals(question.getType())){
+                } else if (AssessQuestionTypeEnum.TEXT.getCode().equals(question.getType())) {
                     List<String> answerList = resultList.stream().filter(x -> x.getAnswerId() != null).map(AssessmentPlanAnswerDetailVo::getAnswerId).collect(Collectors.toList());
-                    if(!answerList.isEmpty()){
+                    if (!answerList.isEmpty()) {
                         rowData.add(answerList.toString().replace("[", "").replace("]", ""));
-                    }else{
+                    } else {
                         rowData.add("");
                     }
-                }else if(AssessQuestionTypeEnum.JUDGE.getCode().equals(question.getType())){
+                } else if (AssessQuestionTypeEnum.JUDGE.getCode().equals(question.getType())) {
                     List<String> answerList = resultList.stream().filter(x -> x.getAnswerId() != null)
                             .map(AssessmentPlanAnswerDetailVo::getAnswerId).collect(Collectors.toList());
                     String replace = answerList.toString().replace("[", "").replace("]", "");
-                    if("1".equals(replace)){
+                    if ("1".equals(replace)) {
                         rowData.add("是");
-                    }else if("0".equals(replace)){
+                    } else if ("0".equals(replace)) {
                         rowData.add("否");
                     }
-                }else{
+                } else {
                     List<String> answerList = resultList.stream().filter(x -> x.getAnswerId() != null).map(AssessmentPlanAnswerDetailVo::getAnswerId).collect(Collectors.toList());
-                    if(!answerList.isEmpty()){
+                    if (!answerList.isEmpty()) {
                         rowData.add(answerList.toString().replace("[", "").replace("]", ""));
-                    }else{
+                    } else {
                         rowData.add("");
                     }
                 }
             }
             dataList.add(rowData);
-            sortCode ++;
+            sortCode++;
         }
 
         Workbook workbook = new XSSFWorkbook();
@@ -787,7 +737,7 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
 
         for (List<String> rowData : dataList) {
             Row dataRow = sheet.createRow(dataRowNumber);
-            for (int i = 0; i < rowData.size(); i ++){
+            for (int i = 0; i < rowData.size(); i++) {
 //                if(i < 7){
 //                    sheet.autoSizeColumn(i);
 //                }
@@ -795,7 +745,7 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
                 Font font = workbook.createFont();
                 font.setBold(false);// 设置为粗体
                 font.setFontName("宋体");
-                font.setFontHeightInPoints((short)12);
+                font.setFontHeightInPoints((short) 12);
 
                 CellStyle cellStyle = workbook.createCellStyle();
                 cellStyle.setFont(font); // 将字体应用到样式
@@ -807,7 +757,7 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
                 row1cell2.setCellStyle(cellStyle);
             }
 
-            dataRowNumber ++;
+            dataRowNumber++;
         }
 
         //写入文件
@@ -869,7 +819,7 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
                         .eq(AssessmentPlanAnswerClass::getAssessmentTemplatePlanId, templatePlan.getId())
         );
         for (AssessmentPlanAnswerClass answerClass : classList) {
-            this.sendMsg(new AssessmentTemplatePlanSureDto(){{
+            this.sendMsg(new AssessmentTemplatePlanSureDto() {{
                 setClassId(answerClass.getClassId());
                 setId(templatePlan.getId());
             }});
@@ -887,7 +837,7 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
         font.setBold(true);// 设置为粗体
         font.setFontName("宋体");
         //font.setColor(IndexedColors.RED.getIndex()); // 设置字体颜色为红色
-        font.setFontHeightInPoints((short)12);
+        font.setFontHeightInPoints((short) 12);
 
         CellStyle cellStyle = workbook.createCellStyle();
         cellStyle.setFont(font); // 将字体应用到样式
@@ -902,35 +852,35 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
         sheet.addMergedRegion(new CellRangeAddress(rowNumber, 1, cellNumber, cellNumber));
         sheet.setColumnWidth(cellNumber, 5 * 3 * 256);
 
-        cellNumber ++;
+        cellNumber++;
         cell = row.createCell(cellNumber);
         cell.setCellValue("班级");
         cell.setCellStyle(cellStyle);
         sheet.addMergedRegion(new CellRangeAddress(rowNumber, 1, cellNumber, cellNumber));
         sheet.setColumnWidth(cellNumber, 5 * 3 * 256);
 
-        cellNumber ++;
+        cellNumber++;
         cell = row.createCell(cellNumber);
         cell.setCellValue("学生姓名");
         cell.setCellStyle(cellStyle);
         sheet.addMergedRegion(new CellRangeAddress(rowNumber, 1, cellNumber, cellNumber));
         sheet.setColumnWidth(cellNumber, 5 * 3 * 256);
 
-        cellNumber ++;
+        cellNumber++;
         cell = row.createCell(cellNumber);
         cell.setCellValue("提交时间");
         cell.setCellStyle(cellStyle);
         sheet.addMergedRegion(new CellRangeAddress(rowNumber, 1, cellNumber, cellNumber));
         sheet.setColumnWidth(cellNumber, 5 * 3 * 256);
 
-        cellNumber ++;
+        cellNumber++;
         for (AssessmentPlanQuestion question : oneQuesList) {
             int size = towQuesMaps.get(question.getId()).size();
 
             cell = row.createCell(cellNumber);
             cell.setCellValue(question.getName());
             cell.setCellStyle(cellStyle);
-            if(size > 1){
+            if (size > 1) {
                 sheet.addMergedRegion(new CellRangeAddress(rowNumber, rowNumber, cellNumber, cellNumber + size - 1));
             }
             cellNumber = cellNumber + size;
@@ -943,7 +893,7 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
         font.setBold(true);// 设置为粗体
         font.setFontName("宋体");
         //font.setColor(IndexedColors.RED.getIndex()); // 设置字体颜色为红色
-        font.setFontHeightInPoints((short)12);
+        font.setFontHeightInPoints((short) 12);
 
         CellStyle cellStyle = workbook.createCellStyle();
         cellStyle.setFont(font); // 将字体应用到样式
@@ -957,7 +907,7 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
             cell.setCellValue(question.getName());
             cell.setCellStyle(cellStyle);
             sheet.setColumnWidth(cellNumber, 20 * 3 * 256);
-            cellNumber ++;
+            cellNumber++;
         }
     }
 }

src/main/java/com/xjrsoft/module/assessment/service/impl/AssessmentTemplateServiceImpl.java

@@ -26,11 +26,11 @@ import java.util.Date;
 import java.util.List;
 
 /**
-* @title: 考核模板
-* @Author dzx
-* @Date: 2024-03-29
-* @Version 1.0
-*/
+ * @title: 考核模板
+ * @Author dzx
+ * @Date: 2024-03-29
+ * @Version 1.0
+ */
 @Service
 @AllArgsConstructor
 public class AssessmentTemplateServiceImpl extends MPJBaseServiceImpl<AssessmentTemplateMapper, AssessmentTemplate> implements IAssessmentTemplateService {
@@ -136,15 +136,15 @@ public class AssessmentTemplateServiceImpl extends MPJBaseServiceImpl<Assessment
         AssessmentTemplate assessmentTemplate = assessmentTemplateMapper.selectById(id);
         AssessmentTemplateVo vo = BeanUtil.toBean(assessmentTemplate, AssessmentTemplateVo.class);
         List<AssessmentQuestion> questionList = assessmentQuestionMapper.selectList(
-            new QueryWrapper<AssessmentQuestion>().lambda()
-            .eq(AssessmentQuestion::getDeleteMark, DeleteMark.NODELETE.getCode())
-            .eq(AssessmentQuestion::getAssessmentTemplateId, id)
+                new QueryWrapper<AssessmentQuestion>().lambda()
+                        .eq(AssessmentQuestion::getDeleteMark, DeleteMark.NODELETE.getCode())
+                        .eq(AssessmentQuestion::getAssessmentTemplateId, id)
         );
 
         //循环大题
         List<AssessmentQuestionVo> oneList = new ArrayList<>();
         for (AssessmentQuestion assessmentQuestion : questionList) {
-            if(assessmentQuestion.getCategory() == 1){
+            if (assessmentQuestion.getCategory() == 1) {
                 oneList.add(BeanUtil.toBean(assessmentQuestion, AssessmentQuestionVo.class));
             }
         }
@@ -153,7 +153,7 @@ public class AssessmentTemplateServiceImpl extends MPJBaseServiceImpl<Assessment
         for (AssessmentQuestionVo oneQuestion : oneList) {
             List<AssessmentQuestionVo> twoList = new ArrayList<>();
             for (AssessmentQuestion assessmentQuestion : questionList) {
-                if(assessmentQuestion.getCategory() == 2 && assessmentQuestion.getParentId().equals(oneQuestion.getId())){
+                if (assessmentQuestion.getCategory() == 2 && assessmentQuestion.getParentId().equals(oneQuestion.getId())) {
                     twoList.add(BeanUtil.toBean(assessmentQuestion, AssessmentQuestionVo.class));
                 }
             }
@@ -165,7 +165,7 @@ public class AssessmentTemplateServiceImpl extends MPJBaseServiceImpl<Assessment
             for (AssessmentQuestionVo twoQuestion : oneQuestion.getChildren()) {
                 List<AssessmentQuestionVo> optionList = new ArrayList<>();
                 for (AssessmentQuestion assessmentQuestion : questionList) {
-                    if(assessmentQuestion.getCategory() == 3 && assessmentQuestion.getParentId().equals(twoQuestion.getId())){
+                    if (assessmentQuestion.getCategory() == 3 && assessmentQuestion.getParentId().equals(twoQuestion.getId())) {
                         optionList.add(BeanUtil.toBean(assessmentQuestion, AssessmentQuestionVo.class));
                     }
                 }

src/main/java/com/xjrsoft/module/assessment/vo/AssessmentPlanAnswerClassResultVo.java

@@ -4,11 +4,11 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
-* @title: 考核计划答题参与班级表单出参
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划答题参与班级表单出参
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 public class AssessmentPlanAnswerClassResultVo {
 
@@ -25,5 +25,4 @@ public class AssessmentPlanAnswerClassResultVo {
     private Integer unsubmittedCount;
 
 
-
 }

src/main/java/com/xjrsoft/module/assessment/vo/AssessmentPlanAnswerClassVo.java

@@ -4,35 +4,34 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
-* @title: 考核计划答题参与班级表单出参
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划答题参与班级表单出参
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 public class AssessmentPlanAnswerClassVo {
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     private Long id;
     /**
-    * 班级id
-    */
+     * 班级id
+     */
     @ApiModelProperty("班级id")
     private String classId;
     /**
-    * 班主任是否确认(0:否 1:是)
-    */
+     * 班主任是否确认(0:否 1:是)
+     */
     @ApiModelProperty("班主任是否确认(0:否 1:是)")
     private Integer isConfirm;
     /**
-    * 考核计划id(assessment_template_plan)
-    */
+     * 考核计划id(assessment_template_plan)
+     */
     @ApiModelProperty("考核计划id(assessment_template_plan)")
     private Long assessmentTemplatePlanId;
 
 
-
 }

src/main/java/com/xjrsoft/module/assessment/vo/AssessmentPlanAnswerDetailVo.java

@@ -4,11 +4,11 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
-* @title: 考核题目选项数量统计
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核题目选项数量统计
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 public class AssessmentPlanAnswerDetailVo {
 

src/main/java/com/xjrsoft/module/assessment/vo/AssessmentPlanAnswerStudentPageVo.java

@@ -6,47 +6,47 @@ import lombok.Data;
 import java.util.Date;
 
 /**
-* @title: 考核计划分页列表出参
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划分页列表出参
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 public class AssessmentPlanAnswerStudentPageVo {
 
     /**
-    * 
-    */
+     *
+     */
     @ApiModelProperty("")
     private String id;
     /**
-    * 名称
-    */
+     * 名称
+     */
     @ApiModelProperty("名称")
     private String name;
     /**
-    * 分数
-    */
+     * 分数
+     */
     @ApiModelProperty("分数")
     private Long score;
     /**
-    * 计划开始时间
-    */
+     * 计划开始时间
+     */
     @ApiModelProperty("计划开始时间")
     private Date startTime;
     /**
-    * 计划结束时间
-    */
+     * 计划结束时间
+     */
     @ApiModelProperty("计划结束时间")
     private Date endTime;
     /**
-    * 状态(0:未发布 1:已发布)
-    */
+     * 状态(0:未发布 1:已发布)
+     */
     @ApiModelProperty("状态(0:未发布 1:已发布)")
     private Integer status;
     /**
-    * 考核模板id(assessment_template)
-    */
+     * 考核模板id(assessment_template)
+     */
     @ApiModelProperty("考核模板id(assessment_template)")
     private Long assessmentTemplateId;
 

src/main/java/com/xjrsoft/module/assessment/vo/AssessmentPlanAnswerStudentVo.java

@@ -6,11 +6,11 @@ import lombok.Data;
 import java.util.Date;
 
 /**
-* @title: 考核计划答题参与学生表单出参
-* @Author dzx
-* @Date: 2024-04-01
-* @Version 1.0
-*/
+ * @title: 考核计划答题参与学生表单出参
+ * @Author dzx
+ * @Date: 2024-04-01
+ * @Version 1.0
+ */
 @Data
 public class AssessmentPlanAnswerStudentVo {
 
@@ -23,8 +23,8 @@ public class AssessmentPlanAnswerStudentVo {
     @ApiModelProperty("所属班级")
     private String className;
     /**
-    * 考核计划id(assessment_template_plan)
-    */
+     * 考核计划id(assessment_template_plan)
+     */
     @ApiModelProperty("考核计划id(assessment_template_plan)")
     private Long assessmentTemplatePlanId;
 
@@ -38,5 +38,4 @@ public class AssessmentPlanAnswerStudentVo {
     private Date submitDate;
 
 
-
 }