0.3教学实验报告

src/main/java/com/msdw/tms/api/ClassTeachingApi.java

@@ -3,9 +3,12 @@ package com.msdw.tms.api;
 import com.msdw.tms.common.utils.R;
 import com.msdw.tms.entity.ExperimentalReportEntity;
 import com.msdw.tms.entity.ExperimentalTeachingEntity;
+import com.msdw.tms.entity.vo.ExperimentalReportVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @Api(value = "用户端班级实验", tags = "用户端班级实验信息")
 public interface ClassTeachingApi {
@@ -23,8 +26,14 @@ public interface ClassTeachingApi {
     R querySimulationPlayList(Integer page,Integer size);
 
     @ApiOperation(value = "校验是否需要邀请码",notes = "校验是否需要邀请码")
-    R check(Integer userId,Integer projectId);
+    R check(@ApiParam(value = "用户id",required = true) Integer userId,@ApiParam(value = "项目id",required = true) Integer projectId);
 
-    @ApiOperation(value = "查看实验报告",notes = "查看实验报告")
+    @ApiOperation(value = "查看教学实验报告",notes = "查看教学实验报告")
-    R queryExperimentalReport(ExperimentalReportEntity entity);
+    R queryExperimentalReport(@ApiParam(value = "学生id",required = true) Integer studentId,
+                              @ApiParam(value = "项目id",required = true) Integer projectId,
+                              @ApiParam(value = "实验记录主键",required = true) Integer recordId,
+                              @ApiParam(value = "实验报告主键",required = true) Integer reportId);
+
+    @ApiOperation(value = "查看虚拟实验报告",notes = "查看虚拟实验报告")
+    R queryVirtualReport(@ApiParam(value = "实验记录主键",required = true) Integer recordId);
 }

src/main/java/com/msdw/tms/api/QuestionsControllerApi.java

@@ -4,7 +4,6 @@ import com.msdw.tms.common.utils.R;
 import com.msdw.tms.entity.request.QuestionsAddRequest;
 import com.msdw.tms.entity.request.QuestionsQueryRequest;
 import com.msdw.tms.entity.request.QuestionsUpdateRequest;
-import com.msdw.tms.entity.vo.RulesVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -52,12 +51,8 @@ public interface QuestionsControllerApi {
     /**
      * 是否禁用试题
      */
-//    @ApiOperation(value = "是否禁用试题", notes = "是否禁用试题")
-//    R isNable(RulesVo rulesVo);
     @ApiOperation(value = "是否禁用试题", notes = "是否禁用试题")
     R isNable(@ApiParam(name = "id", value = "试题主键", required = true) List<Integer> idList);
-//    2020.09.18
-//    R isNable(@ApiParam(name = "id", value = "试题主键", required = true) Integer id);
 
     /**
      * 删除

src/main/java/com/msdw/tms/api/StudentControllerApi.java

@@ -41,4 +41,7 @@ public interface StudentControllerApi {
 
     @ApiOperation(value = "导入学生失败原因导出",notes = "导入学生失败原因导出")
     public void exportFailureRecord(HttpServletResponse response, String token) throws Exception;
+
+    @ApiOperation(value = "查询账号信息",notes = "查询账号信息")
+    public R queryAccount(String account,Integer schoolId);
 }

src/main/java/com/msdw/tms/api/SystemSetttingApi.java

@@ -45,4 +45,9 @@ public interface SystemSetttingApi {
 
     @ApiOperation(value = "导入员工失败原因导出",notes = "导入员工失败原因导出")
     public void exportFailureRecord(HttpServletResponse response, String token) throws Exception;
+
+    @ApiOperation(value = "查询账号信息",notes = "查询账号信息")
+    public R queryAccount(String account,Integer schoolId);
 }
+
+

src/main/java/com/msdw/tms/controller/AchievementManagementController.java

@@ -0,0 +1,13 @@
+package com.msdw.tms.controller;
+
+import com.msdw.tms.service.AchievementManagementService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+@RestController
+@RequestMapping("/Achievement")
+public class AchievementManagementController {
+
+    @Autowired
+    private AchievementManagementService achievementManagementService;
+}

src/main/java/com/msdw/tms/controller/ClassTeachingController.java

@@ -6,6 +6,7 @@ import com.msdw.tms.common.utils.R;
 import com.msdw.tms.entity.ExperimentalReportEntity;
 import com.msdw.tms.entity.ExperimentalStudentEntity;
 import com.msdw.tms.entity.ExperimentalTeachingEntity;
+import com.msdw.tms.entity.vo.ExperimentalReportVo;
 import com.msdw.tms.entity.vo.ProjectRecordVo;
 import com.msdw.tms.service.ClassTeachingService;
 import com.msdw.tms.service.ExperimentalReportService;
@@ -151,11 +152,24 @@ public class ClassTeachingController implements ClassTeachingApi {
      * @return
      */
     @Override
-    @PostMapping("/queryExperimentalReport")
+    @GetMapping("/queryExperimentalReport")
-    public R queryExperimentalReport(@RequestBody ExperimentalReportEntity entity){
+    public R queryExperimentalReport(@RequestParam Integer studentId,@RequestParam Integer projectId,@RequestParam Integer recordId,@RequestParam Integer reportId){
+//    public R queryExperimentalReport(@RequestBody ExperimentalReportVo entity){
+        ExperimentalReportVo entity = new ExperimentalReportVo();
+        R result = experimentalReportService.queryReport(studentId,projectId,recordId,reportId);
 
-        R result = experimentalReportService.queryReport(entity);
+        return result;
+    }
 
-        return R.ok().put("data",result);
+    /**
+     * 学生查看虚拟实验报告
+     * @param entity
+     * @return
+     */
+    @Override
+    @GetMapping("/queryVirtualReport")
+    public R queryVirtualReport(@RequestParam Integer recordId){
+        R result = experimentalReportService.queryVirtualReport(recordId);
+        return result;
     }
 }

src/main/java/com/msdw/tms/controller/QuestionsController.java

@@ -1,20 +1,13 @@
 package com.msdw.tms.controller;
 
 import com.msdw.tms.api.QuestionsControllerApi;
-import com.msdw.tms.common.exception.ExceptionCast;
-import com.msdw.tms.common.utils.Constant;
 import com.msdw.tms.common.utils.FilesResult;
 import com.msdw.tms.common.utils.PageUtils;
 import com.msdw.tms.common.utils.R;
-import com.msdw.tms.entity.EvaluationRulesEntity;
-import com.msdw.tms.entity.QuestionsEntity;
 import com.msdw.tms.entity.request.QuestionsAddRequest;
 import com.msdw.tms.entity.request.QuestionsQueryRequest;
 import com.msdw.tms.entity.request.QuestionsUpdateRequest;
-import com.msdw.tms.entity.response.CommonCode;
-import com.msdw.tms.entity.vo.EvaluationVO;
 import com.msdw.tms.entity.vo.QuestionsDetailVO;
-import com.msdw.tms.entity.vo.RulesVo;
 import com.msdw.tms.service.QuestionsService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
@@ -98,62 +91,11 @@ public class QuestionsController implements QuestionsControllerApi {
      */
     @Override
     @PutMapping("/isenable")
-//    public R isNable(@RequestBody Integer id) {
     public R isNable(@RequestBody List<Integer> idList) {
         Integer id = idList.get(0);
-        boolean b = questionsService.isEnable(id);
+        R result = questionsService.isEnable(id);
-
+        return result;
-        return b ? R.ok() : R.error();
     }
-
-//    /**
-//     * 是否禁用试题
-//     */
-//    @Override
-//    @PutMapping("/isenable")
-////    2020.09.18
-////     @RequiresPermissions("qms:questions:isenable")
-////    public R isNable(@RequestBody Integer id) {
-//    public R isNable(@RequestBody RulesVo rules) {
-////    public R isNable(@RequestBody List<Integer> idList) {
-////        Integer id = idList.get(0);
-//        QuestionsEntity questionsEntity = new QuestionsEntity();
-//        Integer id = rules.getQuestionId();
-//        questionsEntity.setId(id);
-//        QuestionsEntity byId = questionsService.getById(id);
-//        int rulesNumber = rules.getQuestionsNumber();
-//        if (byId.getIsEnable().equals(Constant.IsEnable.ENABLE.getType())) {
-//            Integer types = rules.getTypes();
-////            String questionsTypes= types==1 ?  "single_num" : (types==2 ? "multiple_num":"judgment_num");//根据题型获取数据库字段名
-//            EvaluationRulesEntity rule = questionsService.queryNumberOfTatolQuestions();
-//            int num = 0;
-//            if (types==1){
-//                num += rule.getSingleNum();
-//            }else if (types==2){
-//                num += rule.getMultipleNum();
-//            }else if (types==3){
-//                num += rule.getJudgmentNum();
-//            }
-//            if (num<rulesNumber-1){
-//                return R.error(400,"试题数量不能少于测评设置对应题的数量");
-//            }else{
-//                questionsEntity.setIsEnable(Constant.IsEnable.NOT_ENABLE.getType());
-//            }
-//
-//        } else if (byId.getIsEnable().equals(Constant.IsEnable.NOT_ENABLE.getType())) {
-//            questionsEntity.setIsEnable(Constant.IsEnable.ENABLE.getType());
-//        } else {
-//            ExceptionCast.cast(CommonCode.INVALID_PARAM);
-//        }
-//
-//        boolean b = questionsService.isEnable(rules,questionsEntity);
-//
-//        EvaluationRulesEntity questions= questionsService.queryNumberOfQuestions();
-//        if (b){
-//            return R.ok().put("questions", questions);
-//        }else {
-//            return R.error().put("questions", questions);
-//        }
 //    }
 
     /**

src/main/java/com/msdw/tms/controller/StudentController.java

@@ -51,7 +51,7 @@ public class StudentController implements StudentControllerApi{
         Integer result = studentService.queryStudentIdNumber(studentVo.getWorkNumber(),schoolId);
         Integer res = userInfoService.queryStudentAccount(account,schoolId);
         if (phone!=null&&phone!=""){
-            Integer outcome = userInfoService.queryStudentPhone(phone,schoolId);
+            Integer outcome = userInfoService.queryStudentPhone(phone);
             if(outcome==1){
                 return R.error("手机号不能重复，只能绑定一个用户");
             }
@@ -126,7 +126,7 @@ public class StudentController implements StudentControllerApi{
         userInfoService.updateAccount(studentVo.getUserId());//将手机号码/账号重置
         Integer result = studentService.queryStudentIdNumber(studentVo.getWorkNumber(),ConstantUtils.Keda_schoolId);
         Integer res = userInfoService.queryStudentAccount(studentVo.getAccount(),ConstantUtils.Keda_schoolId);
-        Integer re = userInfoService.queryStudentPhone(phone, ConstantUtils.Keda_schoolId);
+        Integer re = userInfoService.queryStudentPhone(phone);
         if (phone!=null&&phone!=""){
             if (re==1){
                 return R.error("手机号码不能重复");
@@ -211,9 +211,22 @@ public class StudentController implements StudentControllerApi{
     }
 
     @Override
-    @GetMapping("/export_failure")
+    @GetMapping("/exportFailure")
     public void exportFailureRecord(HttpServletResponse response, String token) throws Exception{
 
         studentService.exportFailureRecord(response,token);
     }
+
+    /**
+     * 查询账号是否存在，若存在则返回账号信息
+     * @param account
+     * @return
+     */
+    @Override
+    @GetMapping("/queryAccount")
+    public R queryAccount(String account,Integer schoolId){
+
+        R result =  studentService.queryAccount(account,schoolId);
+        return result;
+    }
 }

src/main/java/com/msdw/tms/controller/SystemSettingController.java

@@ -136,8 +136,21 @@ public class SystemSettingController implements SystemSetttingApi {
      * @throws Exception
      */
     @Override
-    @GetMapping("/export_failure")
+    @GetMapping("/exportFailure")
     public void exportFailureRecord(HttpServletResponse response, @RequestParam String token) throws Exception{
         systemSetttingService.exportFailureRecord(response,token);
     }
+
+    /**
+     * 查询账号信息
+     * 若存在于本校则返回信息
+     * @param account
+     * @return
+     */
+    @Override
+    @GetMapping("/queryAccount")
+    public R queryAccount(String account,Integer schoolId){
+        R result = systemSetttingService.queryAccount(account,schoolId);
+        return result;
+    }
 }

src/main/java/com/msdw/tms/controller/UserInfoController.java

@@ -64,7 +64,7 @@ public class UserInfoController implements UserInfoControllerApi {
         userInfoEntity.setSchoolId(2105);
         Integer schoolId = userInfoEntity.getSchoolId();
         Integer integer = userInfoService.queryStudentAccount(userInfoEntity.getAccount(),schoolId);
-        Integer integer1 = userInfoService.queryStudentPhone(userInfoEntity.getPhone(),schoolId);
+        Integer integer1 = userInfoService.queryStudentPhone(userInfoEntity.getPhone());
         if (integer==1){
             return R.error(400,"账号已存在");
         }

src/main/java/com/msdw/tms/dao/AchievementManagementDao.java

@@ -0,0 +1,7 @@
+package com.msdw.tms.dao;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AchievementManagementDao {
+}

src/main/java/com/msdw/tms/dao/ClassTeachingDao.java

@@ -19,4 +19,8 @@ public interface ClassTeachingDao {
     IPage<BroadcastEntity> querySimulationPlayList(Page page1);
 
     void updateSurplusTimeUp(ProjectRecordVo recordVo);
+
+    void updateSurplusTimeLe(ProjectRecordVo recordVo);
+
+    void updateSurplusTimeGt(ProjectRecordVo recordVo);
 }

src/main/java/com/msdw/tms/dao/ExperimentalReportDao.java

@@ -9,5 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ExperimentalReportDao extends BaseMapper<ExperimentalReportEntity> {
 
-    ExperimentalReportVo queryReport(ExperimentalReportEntity entity);
+    ExperimentalReportVo queryReport(ExperimentalReportVo entity);
+
+    ExperimentalReportVo queryVirtualReport(Integer recordId);
 }

src/main/java/com/msdw/tms/dao/QuestionsDao.java

@@ -30,4 +30,6 @@ public interface QuestionsDao extends BaseMapper<QuestionsEntity> {
 
     EvaluationRulesEntity queryNumberOfTatolQuestions();
 
+    Integer queryQuestionNumber(Integer number);
+
 }

src/main/java/com/msdw/tms/dao/StudentDao.java

@@ -33,4 +33,6 @@ public interface StudentDao extends BaseMapper<StudentEntity> {
     int bacthAddStudents(List<StudentVo> students);
 
     int querySchoolAppellationName(String schoolAppellationName);
+
+    List<StudentVo> queryAccount(String account,Integer schoolId);
 }

src/main/java/com/msdw/tms/dao/SystemSetttingDao.java

@@ -55,4 +55,6 @@ public interface SystemSetttingDao {
     Integer queryDepartmentNameOrganization(String staffProfessionalArchitectureName,Integer schoolId);
 
     List<StaffVo> judgmentGrade(String name,Integer schoolId);
+
+    List<StaffVo> queryAccount(String account,Integer schoolId);
 }

src/main/java/com/msdw/tms/dao/UserInfoDao.java

@@ -25,9 +25,9 @@ public interface UserInfoDao extends BaseMapper<UserInfoEntity> {
 
     Integer disableAccount(StudentVo studentIds);
 
-    List<StudentEntity> queryStudentAccount(String account, Integer schoolId);
+    List<StudentEntity> queryStudentAccount(String account);
 
-    List<StudentEntity> queryStudentPhone(String phone, Integer schoolId);
+    List<StudentEntity> queryStudentPhone(String phone);
 
 //    int bacthAddStudents(List<StudentVo> students);
 
@@ -39,8 +39,6 @@ public interface UserInfoDao extends BaseMapper<UserInfoEntity> {
 
     List<Integer> queryPhone(String phone);
 
-//    List<String> queryAccount(String account);
-
     List<StaffVo> queryAccount(String account);
 
     StaffVo queryAccountUpdate(Integer userId);

src/main/java/com/msdw/tms/entity/AchievementManagementEntity.java

@@ -0,0 +1,14 @@
+package com.msdw.tms.entity;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 成绩管理/川大
+ */
+@Data
+@Accessors(chain = true)
+public class AchievementManagementEntity {
+
+
+}

src/main/java/com/msdw/tms/entity/vo/ExperimentalReportVo.java

@@ -28,4 +28,7 @@ public class ExperimentalReportVo extends ExperimentalReportEntity {
     private String submitTime;
     //实验成绩
     private Integer score;
+    //试验记录id（实验记录表主键）
+    private Integer recordId;
+
 }

src/main/java/com/msdw/tms/entity/vo/ProjectRecordVo.java

@@ -1,6 +1,5 @@
 package com.msdw.tms.entity.vo;
 
-import com.msdw.tms.entity.ExperimentalTeachingEntity;
 import com.msdw.tms.entity.ProjectRecordEntity;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -12,8 +11,17 @@ import java.util.List;
 @Accessors(chain = true)
 public class ProjectRecordVo extends ProjectRecordEntity implements Serializable {
 
+
+    /**
+     * 实验项目id
+     */
+    private Integer id;
+    /**
+     * 教学实验主键id
+     */
+    private Integer reportId;
     /**
-     * 实验项目名称
+     * 项目名称
      */
     private String projectName;
     /**
@@ -89,33 +97,4 @@ public class ProjectRecordVo extends ProjectRecordEntity implements Serializable
      */
     private Integer studentId;
 
-//    /**
-//     * 班级实验状态，0 不限，1 未发布，2 进行中，3 已完成
-//     */
-//    private Integer experimentStartus;
-//    /**
-//    /**
-//     * 实验项目id
-//     */
-//    private Integer projectid;
-//    /**
-//     * 实验项目名称
-//     */
-//    private String projectname;
-//    /**
-//     * 实验目标
-//     */
-//    private String projecttarget;
-//    /**
-//     * 实验描述
-//     */
-//    private String projectdescribe;
-//    /**
-//     * 实验描述(0开启 1未开启)
-//     */
-//    private Integer isprojectdata;
-//    /**
-//     * 实验提示
-//     */
-//    private String projecttips;
 }

src/main/java/com/msdw/tms/entity/vo/RulesVo.java

@@ -1,18 +0,0 @@
-package com.msdw.tms.entity.vo;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-@Data
-@Accessors(chain = true)
-public class RulesVo {
-    //题型（1单选2多选3判断）
-    private Integer types;
-    //试题数量
-    private Integer questionsNumber;
-    //测评对应该试题数量
-//    private int rulesNumber;
-    //试题id
-    private Integer questionId;
-
-}

src/main/java/com/msdw/tms/entity/vo/StaffExportVo.java

@@ -30,19 +30,19 @@ public class StaffExportVo {
     private String workNumber;
 
     //管理员专业名称
-    @ExcelAttribute(sort = 4)
+    @ExcelAttribute(sort = 5)
     private String staffGradeName;
 
     //管理员组织架构名称
-    @ExcelAttribute(sort = 5)
+    @ExcelAttribute(sort = 4)
     private String staffProfessionalArchitectureName;
 
     //老师专业组织名称
-    @ExcelAttribute(sort = 6)
+    @ExcelAttribute(sort = 7)
     private String staffGradeNameTwo;
 
     //老师组织架构名称
-    @ExcelAttribute(sort = 7)
+    @ExcelAttribute(sort = 6)
     private String staffProfessionalArchitectureNameTwo;
 
     //手机号码

src/main/java/com/msdw/tms/service/AchievementManagementService.java

@@ -0,0 +1,4 @@
+package com.msdw.tms.service;
+
+public interface AchievementManagementService {
+}

src/main/java/com/msdw/tms/service/ExperimentalReportService.java

@@ -8,5 +8,7 @@ import com.msdw.tms.entity.vo.ExperimentalReportVo;
 
 public interface ExperimentalReportService extends IService<ExperimentalReportEntity> {
 
-    R queryReport(ExperimentalReportEntity entity);
+    R queryReport(Integer studentId,Integer projectId,Integer recordId,Integer reportId);
+
+    R queryVirtualReport(Integer recordId);
 }

src/main/java/com/msdw/tms/service/QuestionsService.java

@@ -4,15 +4,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.msdw.tms.common.utils.FilesResult;
 import com.msdw.tms.common.utils.PageUtils;
 import com.msdw.tms.common.utils.R;
-import com.msdw.tms.entity.EvaluationRulesEntity;
 import com.msdw.tms.entity.QuestionsEntity;
 import com.msdw.tms.entity.request.QuestionsAddRequest;
 import com.msdw.tms.entity.request.QuestionsQueryRequest;
 import com.msdw.tms.entity.request.QuestionsUpdateRequest;
 import com.msdw.tms.entity.vo.EvaluationVO;
 import com.msdw.tms.entity.vo.QuestionsDetailVO;
-import com.msdw.tms.entity.vo.RulesVo;
-import org.apache.tomcat.util.digester.Rules;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -37,7 +34,7 @@ public interface QuestionsService extends IService<QuestionsEntity> {
 
     boolean updateQuestionById(QuestionsUpdateRequest questions);
 
-    boolean isEnable(Integer id);
+//    boolean isEnable(Integer id);
 
     Map<String, String> importQuestion(MultipartFile file) throws IOException;
 
@@ -53,14 +50,8 @@ public interface QuestionsService extends IService<QuestionsEntity> {
 
     void exportFailureRecord(HttpServletResponse response, String token) throws Exception;
 
-
-
-
-//    EvaluationRulesEntity queryNumberOfQuestions();
-//    boolean isEnable(RulesVo rules,QuestionsEntity questionsEntity);
     boolean deleteByIds(List<Integer> asList);
-//测评设置是否禁用试题
-//    EvaluationRulesEntity queryNumberOfTatolQuestions();
 
+    R isEnable(Integer id);
 }
 

src/main/java/com/msdw/tms/service/StudentService.java

@@ -35,4 +35,7 @@ public interface StudentService extends IService<StudentEntity>{
     Map<String ,String> upload(MultipartFile file, Integer schoolId) throws IOException;
 
     void exportFailureRecord(HttpServletResponse response,String token) throws Exception;
+
+    R queryAccount(String account,Integer schoolId);
+
 }

src/main/java/com/msdw/tms/service/SystemSetttingService.java

@@ -32,4 +32,6 @@ public interface SystemSetttingService {
     void exportFailureRecord(HttpServletResponse response, String token) throws Exception;
 
     void downloadFiles(HttpServletResponse response)  throws IOException;
+
+    R queryAccount(String account,Integer schoolId);
 }

src/main/java/com/msdw/tms/service/UserInfoService.java

@@ -29,7 +29,7 @@ public interface UserInfoService extends IService<UserInfoEntity> {
 
     Integer queryStudentAccount(String account,Integer schoolId);
 
-    Integer queryStudentPhone(String phone,Integer schoolId);
+    Integer queryStudentPhone(String phone);
 
     HashMap<String, UserProsonalEntityVo> queryUserInfo(Integer id);
 

src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java

@@ -0,0 +1,14 @@
+package com.msdw.tms.service.impl;
+
+import com.msdw.tms.dao.AchievementManagementDao;
+import com.msdw.tms.service.AchievementManagementService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AchievementManagementServiceImpl implements AchievementManagementService {
+
+    @Autowired
+    private AchievementManagementDao achievementManagementDao;
+
+}

src/main/java/com/msdw/tms/service/impl/ClassTeachingServiceImpl.java

@@ -42,6 +42,8 @@ public class ClassTeachingServiceImpl implements ClassTeachingService {
         this.classMapper.updateSurplusTimeNull(recordVo);//将已结束的实验的倒计时重置为0
         this.classMapper.updateSurplusTime(recordVo);//倒计时：设定倒计时的剩余时间
         this.classMapper.updateSurplusTimeUp(recordVo);//倒计时：设定距离实验开始的剩余时间
+        this.classMapper.updateSurplusTimeLe(recordVo);
+        this.classMapper.updateSurplusTimeGt(recordVo);
         IPage<ProjectRecordVo> schoolRecord = this.classMapper.getByClassRecord(page1, recordVo);
         PageUtils pageUtils = new PageUtils(schoolRecord);
         return pageUtils;

src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java

@@ -9,6 +9,7 @@ import com.msdw.tms.dao.ExperimentalTeachingDao;
 import com.msdw.tms.entity.ExperimentalReportEntity;
 import com.msdw.tms.entity.vo.ExperimentalReportVo;
 import com.msdw.tms.service.ExperimentalReportService;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,13 +20,17 @@ public class ExperimentalReportServiceImpl extends ServiceImpl<ExperimentalRepor
     private ExperimentalReportDao reportDao;
 
     @Override
-    public R queryReport(ExperimentalReportEntity entity) {
+    public R queryReport(Integer studentId,Integer projectId,Integer recordId,Integer reportId) {
-
+        ExperimentalReportVo entity = new ExperimentalReportVo();
-        if (entity.getStudentId()==null|entity.getProjectId()==null){
+        entity.setRecordId(recordId).setStudentId(studentId).setProjectId(projectId).setReportId(reportId);
-            return R.error(400,"studentId / projectId不能为空");
-        }
         ExperimentalReportVo result = reportDao.queryReport(entity);
         return R.ok().put("data",result);
 
     }
+
+    @Override
+    public R queryVirtualReport(Integer recordId) {
+        ExperimentalReportVo result = reportDao.queryVirtualReport(recordId);
+        return R.ok().put("data",result);
+    }
 }

src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java

@@ -48,6 +48,10 @@ public class ExperimentalTeachingServiceImpl extends ServiceImpl<ExperimentalTea
         recordVo.setStartTime(vo.getStartTime()).setEndTime(vo.getStopTime());
         classTeachingDao.updateSurplusTimeNull(recordVo);//将已结束的实验的倒计时重置为0
         classTeachingDao.updateSurplusTime(recordVo);//倒计时：设定倒计时的剩余时间
+        classTeachingDao.updateSurplusTimeUp(recordVo);//
+        classTeachingDao.updateSurplusTimeLe(recordVo);//将剩余时间大于30天的记录的倒计时设置为'838:00:00'，前端转为">30天"
+        classTeachingDao.updateSurplusTimeGt(recordVo);//将剩余时间大于30天的记录的倒计时设置为'838:00:00'，前端转为">30天"
+
 
         Page<T> page1 = new Page<>(page, size);
         ExperimentalTeachingDao userDao = this.getBaseMapper();

src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java

@@ -56,6 +56,9 @@ public class QuestionsServiceImpl extends ServiceImpl<QuestionsDao, QuestionsEnt
     @Autowired
     private EvaluationRulesService evaluationRulesService;
 
+    @Autowired
+    private QuestionsDao questionsDao;
+
     @Resource
     XlsxTemplateService xlsxTemplateService;
 
@@ -288,26 +291,19 @@ public class QuestionsServiceImpl extends ServiceImpl<QuestionsDao, QuestionsEnt
         return queryWrapper;
     }
 
-    @Override
-    @Transactional
-    public boolean isEnable(Integer id) {
-        QuestionsEntity questionsEntity = new QuestionsEntity();
-        questionsEntity.setId(id);
-        QuestionsEntity byId = this.getById(id);
-        if (byId.getIsEnable().equals(Constant.IsEnable.ENABLE.getType())) {
-            questionsEntity.setIsEnable(Constant.IsEnable.NOT_ENABLE.getType());
-        } else if (byId.getIsEnable().equals(Constant.IsEnable.NOT_ENABLE.getType())) {
-            questionsEntity.setIsEnable(Constant.IsEnable.ENABLE.getType());
-        } else {
-            ExceptionCast.cast(CommonCode.INVALID_PARAM);
-        }
-
-        return this.updateById(questionsEntity);
-    }
-
 //    @Override
 //    @Transactional
-//    public boolean isEnable(RulesVo rulesVo,QuestionsEntity questionsEntity) {
+//    public boolean isEnable(Integer id) {
+//        QuestionsEntity questionsEntity = new QuestionsEntity();
+//        questionsEntity.setId(id);
+//        QuestionsEntity byId = this.getById(id);
+//        if (byId.getIsEnable().equals(Constant.IsEnable.ENABLE.getType())) {
+//            questionsEntity.setIsEnable(Constant.IsEnable.NOT_ENABLE.getType());
+//        } else if (byId.getIsEnable().equals(Constant.IsEnable.NOT_ENABLE.getType())) {
+//            questionsEntity.setIsEnable(Constant.IsEnable.ENABLE.getType());
+//        } else {
+//            ExceptionCast.cast(CommonCode.INVALID_PARAM);
+//        }
 //
 //        return this.updateById(questionsEntity);
 //    }
@@ -325,6 +321,53 @@ public class QuestionsServiceImpl extends ServiceImpl<QuestionsDao, QuestionsEnt
         return updateBatchById(collect);
     }
 
+    @Override
+    @Transactional
+    public R isEnable(Integer id) {
+        QuestionsEntity questionsEntity = new QuestionsEntity();
+//        Integer id = rules.getQuestionId();
+        questionsEntity.setId(id);
+        QuestionsEntity byId = questionsDao.selectById(id);
+        EvaluationRulesEntity questions= questionsDao.queryNumberOfQuestions();
+        if (byId.getIsEnable().equals(Constant.IsEnable.ENABLE.getType())) {
+//            Integer types = rules.getTypes();
+            Integer types = byId.getQuestionType();
+            EvaluationRulesEntity rule = questionsDao.queryNumberOfTatolQuestions();
+            Integer num = questionsDao.queryQuestionNumber(types);
+            int rulesNumber = 0;
+            switch (types){
+                case 1:
+                    rulesNumber = questions.getSingleNum();
+                    break;
+                case 2:
+                    rulesNumber = questions.getMultipleNum();
+                    break;
+                case 3:
+                    rulesNumber = questions.getJudgmentNum();
+                    break;
+            }
+            if (num<=rulesNumber){
+                return R.error(400,"试题数量不能少于测评设置对应题的数量");
+            }else{
+                questionsEntity.setIsEnable(Constant.IsEnable.NOT_ENABLE.getType());
+            }
+
+        } else if (byId.getIsEnable().equals(Constant.IsEnable.NOT_ENABLE.getType())) {
+            questionsEntity.setIsEnable(Constant.IsEnable.ENABLE.getType());
+        } else {
+            ExceptionCast.cast(CommonCode.INVALID_PARAM);
+        }
+
+        int i = questionsDao.updateById(questionsEntity);
+
+
+        if (i==1){
+            return R.ok();
+        }else {
+            return R.error();
+        }
+    }
+
     /**
      * 1、校验题干重复和题型不对的，
      * 2、从列表中将该题剔除并记录index和导入失败的原因，
@@ -644,7 +687,7 @@ public class QuestionsServiceImpl extends ServiceImpl<QuestionsDao, QuestionsEnt
 //        return questions;
 //    }
 //
-    //测评试题是否禁用试题
+////    测评试题是否禁用试题
 //    @Override
 //    public EvaluationRulesEntity queryNumberOfTatolQuestions() {
 //        EvaluationRulesEntity evaluationRulesEntity = this.getBaseMapper().queryNumberOfTatolQuestions();

src/main/java/com/msdw/tms/service/impl/StudentServiceImpl.java

@@ -15,6 +15,7 @@ import com.msdw.tms.entity.UserInfoEntity;
 import com.msdw.tms.entity.XlsxTemplateEntity;
 import com.msdw.tms.entity.response.CommonCode;
 import com.msdw.tms.entity.vo.QuestionsImportFailureVO;
+import com.msdw.tms.entity.vo.StaffVo;
 import com.msdw.tms.entity.vo.StudentImportFailureVo;
 import com.msdw.tms.entity.vo.StudentVo;
 import com.msdw.tms.service.AliyunOssService;
@@ -153,11 +154,11 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao,StudentEntity> im
                 StudentVo studentVo = new StudentVo();
                 String schoolAppellationName = student.getSchoolAppellationName();
                 List<Integer> result1 = studentDao.queryStudentIdNumber(workNumber,schoolId);
-                List<StudentEntity> result4 = userInfoDao.queryStudentAccount(account, schoolId);
+                List<StudentEntity> result4 = userInfoDao.queryStudentAccount(account);
                 String email = student.getEmail();
                 if (phone!=null&&phone!=""){
-                    List<StudentEntity> result2 = userInfoDao.queryStudentPhone(phone, schoolId);
+                    List<StudentEntity> result2 = userInfoDao.queryStudentPhone(phone);
-                    if (result2.size()==1){
+                    if (result2.size()>=1){
                         log.error("该号码已被使用");
                         StudentImportFailureVo vo = new StudentImportFailureVo();
                         ++ii;
@@ -182,7 +183,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao,StudentEntity> im
                 ;
                 studentVo.setAccount(student.getAccount()).setSchoolAppellationName(schoolAppellationName).setUserName(student.getUserName()).setIsdel(Constant.IsDel.NOT_DEL.getType());
 
-                if (result1.size()==1){
+                if (result1.size()>=1){
                     log.error("该学号已存在");
                     StudentImportFailureVo vo = new StudentImportFailureVo();
                     ++ii;
@@ -195,7 +196,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao,StudentEntity> im
                     students.remove(i);
                     i--;
                     continue;
-                }else if(result4.size()==1){
+                }else if(result4.size()>=1){
                     log.error("账号已存在");
                     StudentImportFailureVo vo = new StudentImportFailureVo();
                     ++ii;
@@ -283,67 +284,19 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao,StudentEntity> im
                 export(response, inputStream, parse, "学生信息导入失败表.xlsx");
 
     }
-//    public HashMap<String, Object> readStudent(Integer schoolId, MultipartFile file) {
+
-//        HashMap<String, Object> resp = new HashMap<String, Object>();
+    @Override
-//        try {
+    public R queryAccount(String account,Integer schoolId) {
-//            // 读取excel文件中的学生信息
+        List<StudentVo> result =  studentDao.queryAccount(account,schoolId);
-//            List<Student> students = ExcelImportHelper.readStudent(file);
+        List<StaffVo> vos = userInfoDao.queryAccount(account);
-//            List<UserM> users = new ArrayList<UserM>();
+        if (result.size()>1){
-//            // 循环员工信息，将员工信息与用户信息进行对比
+            return R.error("系统存在多个相同的账号："+account);
-//            for (int i = 0; i < students.size(); i++) {
+        }else if (result.size()==1){return R.ok().put("data",result);
-//                Student student = students.get(i);
+        }else if (vos.size()>0){
-//                // 学校id
+            return R.error("账号已存在");
-//                student.setSchoolId(schoolId);
+        }
-//
+        return R.ok();
-//                Student stu=studentMapper.getStudent(student);
+
-//
+    }
-//                if(stu!=null) {
-//                    // 专业id
-//                    student.setProfessionalId(stu.getProfessionalId());
-//                    // 年级
-//                    student.setGradeId(stu.getGradeId());
-//                    //班级
-//                    student.setClassId(stu.getClassId());
-//
-//                    UserM user = new UserM();
-//                    // 用户名称
-//                    user.setName(student.getStudentName());
-//                    // 用户密码
-//                    user.setPassword("huoran123");
-//                    // 用户角色
-//                    user.setAccountRole(student.getRoleId());
-//                    // 工号
-//                    user.setWorkNumber(student.getWorkNumber());
-//                    // 手机号
-//                    user.setPhone(student.getPhone());
-//                    // 邮箱
-//                    user.setEmail(student.getEmail());
-//                    // 唯一标识性账号
-//                    user.setUniqueIdentificationAccount(student.getUniqueIdentificationAccount());
-//                    // 学校id
-//                    user.setSchoolId(schoolId);
-//
-//                    users.add(user);
-//
-//                }else {
-//                    students.remove(i);
-//                    i--;
-//                }
-//            }
-//            if (!students.isEmpty() && students.size() > 0) {
-//                // 批量添加学生
-//                studentMapper.bacthAddStudent(students);
-//                // 批量添加用户
-//                userMapper.addUserM(users);
-//            }
-//            resp.put("retcode", 200);
-//        } catch (RuntimeException e) {
-//            logger.error(e.getMessage());
-//            resp.put("retcode", 500);
-//            resp.put("retvalue", "Inquiry Failed");
-//            return resp;
-//        }
-//        return resp;
-//    }
 
 }

src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java

@@ -2,6 +2,7 @@ package com.msdw.tms.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.msdw.tms.common.exception.ExceptionCast;
@@ -10,6 +11,8 @@ import com.msdw.tms.common.utils.poi.ExcelExportUtil;
 import com.msdw.tms.dao.SystemSetttingDao;
 import com.msdw.tms.dao.UserInfoDao;
 import com.msdw.tms.entity.StaffEntity;
+import com.msdw.tms.entity.StudentEntity;
+import com.msdw.tms.entity.UserInfoEntity;
 import com.msdw.tms.entity.XlsxTemplateEntity;
 import com.msdw.tms.entity.response.CommonCode;
 import com.msdw.tms.entity.vo.StaffExportVo;
@@ -130,7 +133,6 @@ public class SystemSettingServiceImpl implements SystemSetttingService {
         String email = staffVo.getEmail();
         String workNumber = staffVo.getWorkNumber();
         List<StaffEntity> staff = staffVo.getStaff();//获取员工数据
-
         StaffVo result = userInfoDao.queryAccountUpdate(staffVo.getUserId());
         String roleIds = result.getRoleId();
         String[] splitOld = staffVo.getRoleId().split(",");
@@ -320,7 +322,7 @@ public class SystemSettingServiceImpl implements SystemSetttingService {
                         if (architectureName!=null&&architectureName!=""){
                             if (gradeName==null|gradeName==""){
                                 StaffExportVo vo = new StaffExportVo();
-                                vo.setFailureMsg("二级部门不能为空");
+                                vo.setFailureMsg("二级部门不能为空（管理员）");
                                 vo.setIndex(ii).setUserName(staffVo.getUserName()).setAccount(staffVo.getAccount()).setRole(staffVo.getRole()).setWorkNumber(staffVo.getWorkNumber()).setStaffGradeName(staffVo.getStaffGradeName()).setStaffProfessionalArchitectureName(staffVo.getStaffProfessionalArchitectureName()).setStaffGradeNameTwo(staffVo.getStaffGradeNameTwo()).setStaffProfessionalArchitectureNameTwo(staffVo.getStaffProfessionalArchitectureNameTwo()).setPhone(staffVo.getPhone()).setEmail(staffVo.getEmail()).setSchoolAppellationName(staffVo.getSchoolAppellationName());
                                 staffs.remove(i);
                                 i--;
@@ -330,7 +332,7 @@ public class SystemSettingServiceImpl implements SystemSetttingService {
                                 Integer b = systemSetttingDao.queryDepartmentNameOrganization(architectureName, ConstantUtils.Keda_schoolId);
                                 if (b==null){
                                     StaffExportVo vo = new StaffExportVo();
-                                    vo.setFailureMsg("不存在的一级部门");
+                                    vo.setFailureMsg("不存在的一级部门（管理员）");
                                     vo.setIndex(ii).setUserName(staffVo.getUserName()).setAccount(staffVo.getAccount()).setRole(staffVo.getRole()).setWorkNumber(staffVo.getWorkNumber()).setStaffGradeName(staffVo.getStaffGradeName()).setStaffProfessionalArchitectureName(staffVo.getStaffProfessionalArchitectureName()).setStaffGradeNameTwo(staffVo.getStaffGradeNameTwo()).setStaffProfessionalArchitectureNameTwo(staffVo.getStaffProfessionalArchitectureNameTwo()).setPhone(staffVo.getPhone()).setEmail(staffVo.getEmail()).setSchoolAppellationName(staffVo.getSchoolAppellationName());
                                     staffs.remove(i);
                                     i--;
@@ -340,7 +342,7 @@ public class SystemSettingServiceImpl implements SystemSetttingService {
                                 List<StaffVo> a = systemSetttingDao.judgmentGrade(architectureName,ConstantUtils.Keda_schoolId);
                                 if (a.size()==0){
                                     StaffExportVo vo = new StaffExportVo();
-                                    vo.setFailureMsg("不存在此子级部门");
+                                    vo.setFailureMsg("不存在此子级部门（管理员）");
                                     vo.setIndex(ii).setUserName(staffVo.getUserName()).setAccount(staffVo.getAccount()).setRole(staffVo.getRole()).setWorkNumber(staffVo.getWorkNumber()).setStaffGradeName(staffVo.getStaffGradeName()).setStaffProfessionalArchitectureName(staffVo.getStaffProfessionalArchitectureName()).setStaffGradeNameTwo(staffVo.getStaffGradeNameTwo()).setStaffProfessionalArchitectureNameTwo(staffVo.getStaffProfessionalArchitectureNameTwo()).setPhone(staffVo.getPhone()).setEmail(staffVo.getEmail()).setSchoolAppellationName(staffVo.getSchoolAppellationName());
                                     staffs.remove(i);
                                     i--;
@@ -349,11 +351,12 @@ public class SystemSettingServiceImpl implements SystemSetttingService {
                                 }
                             }
                         }
-                    }else if (s.indexOf("3")!=-1){
+                    }
+                    if (s.indexOf("3")!=-1){
                         if (architectureNameTwo!=null&&architectureNameTwo!=""){
                             if (gradeNameTwo==null|gradeNameTwo==""){
                                 StaffExportVo vo = new StaffExportVo();
-                                vo.setFailureMsg("二级部门不能为空");
+                                vo.setFailureMsg("二级部门不能为空（老师）");
                                 vo.setIndex(ii).setUserName(staffVo.getUserName()).setAccount(staffVo.getAccount()).setRole(staffVo.getRole()).setWorkNumber(staffVo.getWorkNumber()).setStaffGradeName(staffVo.getStaffGradeName()).setStaffProfessionalArchitectureName(staffVo.getStaffProfessionalArchitectureName()).setStaffGradeNameTwo(staffVo.getStaffGradeNameTwo()).setStaffProfessionalArchitectureNameTwo(staffVo.getStaffProfessionalArchitectureNameTwo()).setPhone(staffVo.getPhone()).setEmail(staffVo.getEmail()).setSchoolAppellationName(staffVo.getSchoolAppellationName());
                                 staffs.remove(i);
                                 i--;
@@ -363,7 +366,7 @@ public class SystemSettingServiceImpl implements SystemSetttingService {
                                 Integer b = systemSetttingDao.queryDepartmentNameOrganization(architectureNameTwo, ConstantUtils.Keda_schoolId);
                                 if (b==null){
                                     StaffExportVo vo = new StaffExportVo();
-                                    vo.setFailureMsg("不存在的一级部门");
+                                    vo.setFailureMsg("不存在此的一级部门（老师）");
                                     vo.setIndex(ii).setUserName(staffVo.getUserName()).setAccount(staffVo.getAccount()).setRole(staffVo.getRole()).setWorkNumber(staffVo.getWorkNumber()).setStaffGradeName(staffVo.getStaffGradeName()).setStaffProfessionalArchitectureName(staffVo.getStaffProfessionalArchitectureName()).setStaffGradeNameTwo(staffVo.getStaffGradeNameTwo()).setStaffProfessionalArchitectureNameTwo(staffVo.getStaffProfessionalArchitectureNameTwo()).setPhone(staffVo.getPhone()).setEmail(staffVo.getEmail()).setSchoolAppellationName(staffVo.getSchoolAppellationName());
                                     staffs.remove(i);
                                     i--;
@@ -373,7 +376,7 @@ public class SystemSettingServiceImpl implements SystemSetttingService {
                                 List<StaffVo> a = systemSetttingDao.judgmentGrade(architectureNameTwo,ConstantUtils.Keda_schoolId);
                                 if (a.size()==0){
                                     StaffExportVo vo = new StaffExportVo();
-                                    vo.setFailureMsg("不存在此子级部门");
+                                    vo.setFailureMsg("不存在的子级部门（老师）");
                                     vo.setIndex(ii).setUserName(staffVo.getUserName()).setAccount(staffVo.getAccount()).setRole(staffVo.getRole()).setWorkNumber(staffVo.getWorkNumber()).setStaffGradeName(staffVo.getStaffGradeName()).setStaffProfessionalArchitectureName(staffVo.getStaffProfessionalArchitectureName()).setStaffGradeNameTwo(staffVo.getStaffGradeNameTwo()).setStaffProfessionalArchitectureNameTwo(staffVo.getStaffProfessionalArchitectureNameTwo()).setPhone(staffVo.getPhone()).setEmail(staffVo.getEmail()).setSchoolAppellationName(staffVo.getSchoolAppellationName());
                                     staffs.remove(i);
                                     i--;
@@ -476,4 +479,22 @@ public class SystemSettingServiceImpl implements SystemSetttingService {
         XlsxTemplateEntity xlsxTemplate = xlsxTemplateService.getById(ConstantUtils.XLSX_TEMPLATE_ID3);
         ossService.downloadFiles(response, xlsxTemplate.getFileName());
     }
+
+    @Override
+    public R queryAccount(String account,Integer schoolId) {
+        HashMap<String, Object> map = new HashMap<>();
+        List<StaffVo> result = systemSetttingDao.queryAccount(account,schoolId);
+        List<StaffVo> vos = userInfoDao.queryAccount(account);
+        if (result.size()>1){return R.error("系统存在多个相同的账号："+account);
+        }else if (result.size()==1){
+            StaffVo staffVo = result.get(0);
+            map.put("user",staffVo);
+            List<StaffVo> staffVos = systemSetttingDao.queryStaffInfo(staffVo.getUserId());
+            map.put("staff",staffVos);
+            return R.ok().put("data",map);
+        }else if (vos.size()>0){
+            return R.error("账号已存在");
+        }
+        return R.ok();
+    }
 }

src/main/java/com/msdw/tms/service/impl/UserInfoServiceImpl.java

@@ -97,7 +97,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoDao, UserInfoEntity
 
     @Override
     public Integer queryStudentAccount(String account,Integer schoolId) {
-        List<StudentEntity> result = userInfoDao.queryStudentAccount(account,schoolId);
+        List<StudentEntity> result = userInfoDao.queryStudentAccount(account);
         if (result.size()==1){
             return 1;
         }else{
@@ -106,8 +106,8 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoDao, UserInfoEntity
     }
 
     @Override
-    public Integer queryStudentPhone(String phone,Integer schoolId) {
+    public Integer queryStudentPhone(String phone) {
-        List<StudentEntity> result = userInfoDao.queryStudentPhone(phone,schoolId);
+        List<StudentEntity> result = userInfoDao.queryStudentPhone(phone);
         if (result.size()==1){
             return 1;
         }else{

src/main/resources/mapper/tms/AchievementManagementDao.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.msdw.tms.dao.AchievementManagementDao">
+
+</mapper>

src/main/resources/mapper/tms/ClassTeachingDao.xml

@@ -65,6 +65,7 @@
 	AND stop_time >= now( )
 	AND is_del = 0
 	AND `status` !=3
+	AND 30 >= DATEDIFF( stop_time, now( ) )
     </update>
     <update id="updateSurplusTimeNull" parameterType="com.msdw.tms.entity.ExperimentalTeachingEntity">
     UPDATE tms_experimental_teaching
@@ -80,6 +81,27 @@
 	        start_time >  now()
 	        AND is_del = 0
 	        AND `status` !=3
+	        AND 30 >= DATEDIFF( start_time,now( ) )
+            AND DATEDIFF( start_time,now( ) ) >=0
+    </update>
+    <update id="updateSurplusTimeLe">
+    UPDATE tms_experimental_teaching
+    SET surplus_time = '838:00:00'
+    WHERE
+	    now( ) >= start_time
+	AND stop_time >= now( )
+	AND is_del = 0
+	AND `status` !=3
+	AND DATEDIFF( stop_time, now( ) ) > 30
+    </update>
+    <update id="updateSurplusTimeGt">
+    UPDATE tms_experimental_teaching
+    SET surplus_time = '838:00:00'
+    WHERE
+	    start_time > now( )
+	AND is_del = 0
+	AND `status` != 3
+	AND DATEDIFF( start_time, now( ) ) > 30
     </update>
 
     <select id="querySimulationPlayList" resultType="com.msdw.tms.entity.BroadcastEntity">

src/main/resources/mapper/tms/ExperimentalReportDao.xml

@@ -19,7 +19,7 @@ SELECT
 	hpm.experimentalGoal AS experiment_goal,
 	tpr.submitTime,
 	tpr.score,
-	( SELECT userName FROM hr_user_info WHERE userId = ( SELECT teacherId FROM tms_experimental_report WHERE studentId = #{studentId} AND projectId = #{projectId} ) ) AS teacherName,
+	( SELECT userName FROM hr_user_info WHERE userId = ( SELECT teacherId FROM tms_experimental_report WHERE studentId = #{studentId} AND reportId = #{reportId} AND isdel=0 GROUP BY teacherId) ) AS teacherName,
 	ter.period,
 	ter.laboratory,
 	ter.principle,
@@ -42,12 +42,34 @@ WHERE
 	u.userId = stu.userId
 	AND stu.studentId = ter.studentId
 	AND hpm.projectId = tet.project_id
-	AND ter.projectId = tet.project_id
+	AND ter.projectId = tet.id
 	AND stu.userId = tpr.userId
-	AND tet.project_id = tpr.projectId
-	AND tet.stop_time = tpr.endTime
 	AND ter.studentId = #{studentId}
-	AND ter.projectId = #{projectId}
 	AND ter.isdel = 0
+	AND tpr.isdel = 0
+	AND tpr.recordId = #{recordId}
+	AND ter.projectId = #{projectId}
+    </select>
+	<select id="queryVirtualReport" resultType="com.msdw.tms.entity.vo.ExperimentalReportVo">
+SELECT
+	tpr.recordId,
+	u.userId,
+	u.userName,
+	stu.workNumber,
+	hpm.projectName,
+	hpm.experimentalGoal AS experiment_goal,
+	tpr.submitTime,
+	tpr.score
+FROM
+	hr_user_info u,
+	student stu,
+	hr_project_management hpm,
+	tms_project_record tpr
+WHERE
+	u.userId = stu.userId
+	AND stu.userId = tpr.userId
+	AND hpm.projectId = tpr.projectId
+	AND tpr.recordId = #{recordId}
+	AND tpr.isdel = 0
 	</select>
 </mapper>

src/main/resources/mapper/tms/ProjectRecordDao.xml

@@ -19,6 +19,7 @@
 
     <select id="getByUserRecord"  resultType="com.msdw.tms.entity.vo.ProjectRecordVo">
         SELECT
+            tpr.recordId,
             tpr.projectId,
             projectName,
             score,
@@ -40,6 +41,9 @@
     <!--    -->
     <select id="getByUserExperimentRecord"  resultType="com.msdw.tms.entity.vo.ProjectRecordVo">
         SELECT
+            tet.id,
+            ter.reportId,
+            tpr.recordId,
             tpr.projectId,
             projectName,
             score,
@@ -52,6 +56,7 @@
             tms_project_record tpr
             LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId
             LEFT JOIN tms_experimental_teaching tet ON tet.project_id = tpr.projectId
+            LEFT JOIN tms_experimental_report ter ON ter.projectId = tet.id
         WHERE
             tpr.userId = #{pro.userid}
         AND

src/main/resources/mapper/tms/QuestionsDao.xml

@@ -59,6 +59,8 @@
     <select id="queryNumberOfTatolQuestions" resultType="com.msdw.tms.entity.EvaluationRulesEntity">
         SELECT single_num,multiple_num,judgment_num from tms_evaluation_rules
     </select>
-
+    <select id="queryQuestionNumber" resultType="java.lang.Integer">
+        select count(*) FROM tms_questions WHERE is_del = 0 and is_enable = 1 AND question_type =#{number}
+    </select>
 
 </mapper>

src/main/resources/mapper/tms/StudentDao.xml

@@ -30,7 +30,7 @@
 		AND s.isdel = 0
 		<if test="searchContent!=null">AND (u.userName LIKE CONCAT('%',#{searchContent},'%') OR s.workNumber LIKE CONCAT('%',#{searchContent},'%'))</if>
 		ORDER BY
-		lastLoginTime DESC,studentId
+		lastLoginTime DESC,studentId DESC
 	</select>
 
 	<select id="queryStudentIdNumber" resultType="java.lang.Integer">
@@ -49,6 +49,26 @@
 	<select id="querySchoolAppellationName" resultType="java.lang.Integer">
 		SELECT schoolId FROM school WHERE schoolName = #{schoolAppellationName}
 	</select>
+    <select id="queryAccount" resultType="com.msdw.tms.entity.vo.StudentVo">
+SELECT
+	u.account,
+	u.userName,
+	u.phone,
+	u.email,
+	u.roleId,
+	u.uniqueIdentificationAccount,
+	u.schoolId,
+	s.workNumber
+FROM
+	hr_user_info u,
+	student s
+WHERE
+	u.userId = s.userId
+	AND u.account = #{account}
+	AND s.schoolId = #{schoolId}
+	AND u.isdel = 0
+	AND s.isdel = 0
+	</select>
 
     <insert id="saveStudent" useGeneratedKeys="true" keyProperty="studentId">
 	INSERT INTO student ( schoolId, userId, workNumber, roleId, isdel,platformId )

src/main/resources/mapper/tms/SystemSetting.xml

@@ -108,10 +108,10 @@
 		u.isdel=0
 		AND
 		s.isdel=0
-	    <if test="searchContent!=null">AND (u.userName LIKE CONCAT('%',#{searchContent},'%') OR s.workNumber LIKE CONCAT('%',#{searchContent},'%'))</if>
+		<if test="searchContent!=null">AND (u.userName LIKE CONCAT('%',#{searchContent},'%') OR s.workNumber LIKE CONCAT('%',#{searchContent},'%') OR u.account LIKE CONCAT('%',#{searchContent},'%') )</if>
 		<if test="staffGradeIds!=null and staffGradeIds!='' ">AND FIND_IN_SET(staffGradeId,#{staffGradeIds})</if>
 		<if test="staffProfessionalArchitectureIds!=null and staffProfessionalArchitectureIds!=''">AND FIND_IN_SET(staffProfessionalArchitectureId,#{staffProfessionalArchitectureIds})</if>
-		GROUP BY s.userId  ORDER BY u.lastLoginTime DESC,creationTime DESC
+		GROUP BY s.userId  ORDER BY u.updateTime DESC,u.lastLoginTime DESC,creationTime DESC
 	</select>
 	<select id="querystaffDetail" resultType="com.msdw.tms.entity.vo.StaffVo">
 		SELECT
@@ -151,7 +151,6 @@
 			staff
 		WHERE
 			userId = #{userId}
-		AND roleId in ( SELECT roleId FROM staff WHERE userId = #{userId} )
 	</select>
 	<select id="queryDepartmentNameGrade" resultType="java.lang.Integer">
 		select staffGradeId from staff_grade where staffGradeName = #{staffGradeName} and staffProfessionalArchitectureId=#{organizationId}
@@ -172,4 +171,25 @@ WHERE
 	AND a.staffProfessionalArchitectureName = #{name}
 	AND g.isdel = 0 AND a.isdel = 0
 	</select>
+	<select id="queryAccount" resultType="com.msdw.tms.entity.vo.StaffVo">
+SELECT
+	u.userId,
+	u.account,
+	u.roleId,
+	u.userName,
+	u.phone,
+	u.email,
+	u.uniqueIdentificationAccount,
+	u.schoolId
+FROM
+	hr_user_info u,
+	staff s
+WHERE
+	u.account = #{account}
+	AND s.schoolId = #{schoolId}
+	AND s.userId = u.userId
+	AND u.isdel = 0
+	AND s.isdel = 0
+	GROUP BY u.userId
+	</select>
 </mapper>

src/main/resources/mapper/tms/UserInfoDao.xml

@@ -49,7 +49,10 @@
                 schoolId = #{schoolId},
             </if>
             <if test="phone !=null">
-                phone = #{phone}
+                phone = #{phone},
+            </if>
+            <if test="1==1">
+                updateTime = now()
             </if>
         </set>
         WHERE userId = #{userId};
@@ -66,8 +69,6 @@
 		hr_user_info
 	WHERE
 		account = #{account}
-	and
-		schoolId = #{schoolId}
     </select>
     <select id="queryStudentPhone" resultType="com.msdw.tms.entity.StudentEntity">
     SELECT
@@ -76,8 +77,6 @@
 		hr_user_info
 	WHERE
 		phone = #{phone}
-		and
-		schoolId = #{schoolId}
     </select>
     <select id="queryPhone" resultType="java.lang.Integer">
         SELECT
@@ -188,7 +187,10 @@
                 schoolId = #{schoolAppellationId},
             </if>
             <if test="roleId !=null">
-                roleId = #{roleId}
+                roleId = #{roleId},
+            </if>
+            <if test="1==1">
+                updateTime = now()
             </if>
         </set>
         WHERE userId = #{userId};