Merge remote-tracking branch 'origin/dev' into dev

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

@@ -36,7 +36,7 @@ public enum StudyStatusEnum {
     private static final Map<String, String> lookup = new HashMap<>();
 
     static {
-        for (ArchivesStatusEnum s : ArchivesStatusEnum.values()) {
+        for (StudyStatusEnum s : StudyStatusEnum.values()) {
             lookup.put(s.getCode(), s.getValue());
         }
     }

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

@@ -40,6 +40,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -157,8 +158,11 @@ public class StudentReportPlanController {
             if(reportPlan.getStatus() == 1){
                 return RT.error("已发布，无法再次发布");
             }
+            LocalDateTime now = LocalDateTime.now();
+            if(now.isAfter(reportPlan.getStartTime())){
+                studentReportPlanService.release(reportPlan);
+            }
 
-//            studentReportPlanService.release(reportPlan);
             reportPlan.setStatus(dto.getStatus());
             reportPlan.setModifyDate(new Date());
             reportPlan.setModifyUserId(StpUtil.getLoginIdAsLong());

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

@@ -206,7 +206,7 @@ public class StudentReportRecordServiceImpl extends MPJBaseServiceImpl<StudentRe
         changeRecordService.insertData(
                 beforeData,beforeDataCode,
                 afterData,afterDataCode,
-                StpUtil.getLoginIdAsLong(), StpUtil.getLoginIdAsLong(),
+                roll.getUserId(), StpUtil.getLoginIdAsLong(),
                 StudentChangeTypeEnum.StduyStatus.getCode(), 3
         );