1、角色增加字段

2、报到调整

src/main/java/com/xjrsoft/common/enums/RoleEnum.java

@@ -20,7 +20,10 @@ public enum RoleEnum {
     /**
      * 家长
      */
-    PARENT(4L, "家长");
+    PARENT(4L, "家长"),
+    VISITOR(5L, "访客"),
+
+    CLASSTE(1745630294430511106L, "班主任");
 
     final Long code;
     final String value;

src/main/java/com/xjrsoft/module/organization/entity/Role.java

@@ -43,5 +43,9 @@ public class Role extends AuditEntity implements Serializable {
     private String remark;
 
 
+    @ApiModelProperty("是否系统角色(1:是 0:否)")
+    private Integer isSystem;
+
+
 
 }

src/main/java/com/xjrsoft/module/student/controller/StudentReportRecordController.java

@@ -85,7 +85,6 @@ public class StudentReportRecordController {
     private final IStudentReportRecordService studentReportRecordService;
     private final IBaseSemesterService semesterService;
     private final IBaseGradeService gradeService;
-    private final IStudentReportPlanService studentReportPlanService;
     private final IStudentReportPlanService planService;
     private final IBaseClassService classService;
 
@@ -424,7 +423,7 @@ public class StudentReportRecordController {
     @SaCheckPermission("studentreportrecord:detail")
     public RT<Boolean> sign(@Valid @RequestBody StudentReportSignDto dto){
         StudentReportRecord record = studentReportRecordService.getById(dto.getId());
-        StudentReportPlan reportPlan = studentReportPlanService.getById(record.getStudentReportPlanId());
+        StudentReportPlan reportPlan = planService.getById(record.getStudentReportPlanId());
         LocalDateTime now = LocalDateTime.now();
         if(reportPlan.getStatus() != 1 || !(now.isAfter(reportPlan.getStartTime()) && now.isBefore(reportPlan.getEndTime()))){
             return RT.error("不在报到时间内，无法报到");
@@ -439,7 +438,7 @@ public class StudentReportRecordController {
     @SaCheckPermission("studentreportrecord:detail")
     public RT<Boolean> allSign(@Valid @RequestBody List<StudentReportSignDto> dtoList){
         StudentReportRecord record = studentReportRecordService.getById(dtoList.get(0).getId());
-        StudentReportPlan reportPlan = studentReportPlanService.getById(record.getStudentReportPlanId());
+        StudentReportPlan reportPlan = planService.getById(record.getStudentReportPlanId());
         LocalDateTime now = LocalDateTime.now();
         if(reportPlan.getStatus() == 0 || now.isBefore(reportPlan.getStartTime()) ){
             return RT.error("暂未开始，无法报到");

src/main/java/com/xjrsoft/module/student/service/impl/StudentReportPlanServiceImpl.java

@@ -162,12 +162,12 @@ public class StudentReportPlanServiceImpl extends MPJBaseServiceImpl<StudentRepo
                 );
             }
 
-            if(!insertList.isEmpty()){
-                reportRecordService.remove(
-                        new QueryWrapper<StudentReportRecord>().lambda()
-                                .eq(StudentReportRecord::getStudentReportPlanId, studentReportPlan.getId())
-                );
+            long count = reportRecordService.count(
+                    new QueryWrapper<StudentReportRecord>().lambda()
+                            .eq(StudentReportRecord::getStudentReportPlanId, studentReportPlan.getId())
+            );
 
+            if(!insertList.isEmpty() && count == 0){
                 reportRecordService.saveBatch(insertList);
                 Set<String> studentUserIds = studentList.stream().map(BaseStudentUserPageVo::getId).collect(Collectors.toSet());
                 //发布后，将学生的状态改为不正常

src/main/resources/sqlScript/init_data.sql

@@ -1,4 +1,8 @@
-insert xjr_role(id,name,code,sort_code,remark,create_user_id,create_date,delete_mark,enabled_mark) value(1,'超级管理员','ADMIN',2,'超级管理员',1,'2021-07-25 20:42:11',0,1);
-insert xjr_role(id,name,code,sort_code,remark,create_user_id,create_date,delete_mark,enabled_mark) value(2,'教师','TEACHER',2,'教师',1,'2021-07-25 20:42:11',0,1);
-insert xjr_role(id,name,code,sort_code,remark,create_user_id,create_date,delete_mark,enabled_mark) value(3,'学生','STUDENT',3,'学生',1,'2021-07-25 20:42:11',0,1);
-insert xjr_role(id,name,code,sort_code,remark,create_user_id,create_date,delete_mark,enabled_mark) value(4,'家长','PARENT',4,'家长',1,'2021-07-25 20:42:11',0,1);
+ALTER TABLE `xjr_role`
+    ADD COLUMN `is_system` INT DEFAULT 0  NULL   COMMENT '是否是系统角色(1:是 0:否)' AFTER `enabled_mark`;
+insert xjr_role(id,name,code,sort_code,remark,create_user_id,create_date,delete_mark,enabled_mark,is_system) value(1,'超级管理员','ADMIN',2,'超级管理员',1,'2021-07-25 20:42:11',0,1,1);
+insert xjr_role(id,name,code,sort_code,remark,create_user_id,create_date,delete_mark,enabled_mark,is_system) value(2,'教师','TEACHER',2,'教师',1,'2021-07-25 20:42:11',0,1,1);
+insert xjr_role(id,name,code,sort_code,remark,create_user_id,create_date,delete_mark,enabled_mark,is_system) value(3,'学生','STUDENT',3,'学生',1,'2021-07-25 20:42:11',0,1,1);
+insert xjr_role(id,name,code,sort_code,remark,create_user_id,create_date,delete_mark,enabled_mark,is_system) value(4,'家长','PARENT',4,'家长',1,'2021-07-25 20:42:11',0,1,1);
+insert xjr_role(id,name,code,sort_code,remark,create_user_id,create_date,delete_mark,enabled_mark,is_system) value(5,'访客','VISITOR',5,'访客',1,'2021-07-25 20:42:11',0,1,1);
+insert xjr_role(id,name,code,sort_code,remark,create_user_id,create_date,delete_mark,enabled_mark,is_system) value(1745630294430511106,'班主任','CLASSTE',6,'班主任',1,'2021-07-25 20:42:11',0,1,1);