Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/test/java/com/msdw/tms/service/AchievementManagementTest.java

.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,118 +0,0 @@
-/*
- * Copyright 2007-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    private static final String WRAPPER_VERSION = "0.5.6";
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
-            + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if (mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if (mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if (!outputFile.getParentFile().exists()) {
-            if (!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
-            String username = System.getenv("MVNW_USERNAME");
-            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
-            Authenticator.setDefault(new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication(username, password);
-                }
-            });
-        }
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +0,0 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

README.md

@@ -1,3 +0,0 @@
-# msdw_tms
-
-测评管理系统

pom.xml

@@ -225,6 +225,19 @@
             <artifactId>pagehelper</artifactId>
             <version>5.1.2</version>
         </dependency>
+
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.28</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -2,12 +2,9 @@ package com.msdw.tms.api;
 
 import com.msdw.tms.common.utils.R;
 import com.msdw.tms.entity.ExperimentalTeachingEntity;
-import com.msdw.tms.entity.UserEntity;
-import com.msdw.tms.entity.vo.ExperimentalTeachingEntityVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.springframework.web.bind.annotation.GetMapping;
 
 import java.text.ParseException;
 
@@ -20,6 +17,7 @@ public interface ExperimentalTeachingControllerApi {
            @ApiParam(name = "month", value = "月份：1、近一个月内 3、近三个月内 6、近六个月内", required = false) Integer month,
            @ApiParam(name = "type", value = "类型：1、手动发布 2、定时发布", required = false) Integer type,
            @ApiParam(name = "status", value = "状态：1、待开始 2、进行中 3、已结束", required = false) Integer status,
+           @ApiParam(name = "systemId", value = "系统id", required = false) Integer systemId,
            @ApiParam(name = "startTime", value = "开始时间", required = false) String startTime,
            @ApiParam(name = "stopTime", value = "结束时间", required = false) String stopTime,
            @ApiParam(name = "searchContent", value = "搜索内容", required = false) String searchContent,

src/main/java/com/msdw/tms/common/exception/ExceptionCatch.java

@@ -7,6 +7,7 @@ import com.msdw.tms.entity.response.ResultCode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -59,4 +60,16 @@ public class ExceptionCatch {
         ResultCode resultCode = customException.getResultCode();
         return new ResponseResult(resultCode);
     }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)//捕获CustomException类型异常
+    @ResponseBody
+    public ResponseResult MethodArgumentNotValidException(MethodArgumentNotValidException customException) {
+        customException.printStackTrace();
+        //记录日志
+        LOGGER.error("catch exception:{}", customException.getMessage());
+        String message = customException.getBindingResult().getAllErrors().get(0).getDefaultMessage();
+        int code =402;
+
+        return ResponseResult.FAIL(code,message);
+    }
 }

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

@@ -43,58 +43,61 @@ public class ClassTeachingController implements ClassTeachingApi {
      */
     @Override
     @GetMapping("userRecord")
-    public R queryTestRecord(@RequestParam Integer page, @RequestParam Integer size, Integer month,String startTime,String endTime,
+    public R queryTestRecord(@RequestParam Integer page, @RequestParam Integer size, Integer month, String startTime, String endTime,
-                             String condition, @RequestParam Integer status,@RequestParam Integer schoolId){
+                             String condition, @RequestParam Integer status, @RequestParam Integer schoolId) {
         ProjectRecordVo recordVo = new ProjectRecordVo();
-            if (status==1||status==2||status==3) {//限定实验状态
+        if (status == 1 || status == 2 || status == 3) {//限定实验状态
-                recordVo.setStatus(status);
+            recordVo.setStatus(status);
-            }else{//不限定实验状态
+        } else {//不限定实验状态
-                recordVo.setStatus(null);
+            recordVo.setStatus(null);
-            }
+        }
-            if(!StringUtils.isEmpty(condition)){
+        if (!StringUtils.isEmpty(condition)) {
-                recordVo.setCondition(condition);
+            recordVo.setCondition(condition);
+        }
+        if (!StringUtils.isEmpty(month)) {
+            recordVo.setMonth(month);
+        } else {
+            recordVo.setMonth(null);
+            if (!StringUtils.isEmpty(startTime)) {
+                recordVo.setStartTime(startTime);
             }
-            if(!StringUtils.isEmpty(month)) {
+            if (!StringUtils.isEmpty(endTime)) {
-                recordVo.setMonth(month);
+                recordVo.setEndTime(endTime);
-            }else {
-                recordVo.setMonth(null);
-                if(!StringUtils.isEmpty(startTime)) {
-                    recordVo.setStartTime(startTime);
-                }if(!StringUtils.isEmpty(endTime)) {
-                    recordVo.setEndTime(endTime);
-                }
             }
-            recordVo.setSchoolId(schoolId);
+        }
-            PageUtils page1 = classTeachingService.queryClassRecord(page,size,recordVo);
+        recordVo.setSchoolId(schoolId);
-            return R.ok().put("page", page1);
+        PageUtils page1 = classTeachingService.queryClassRecord(page, size, recordVo);
+        return R.ok().put("page", page1);
     }
 
     /**
      * 校验是否需要输入邀请码
+     *
      * @param userId
      * @param projectId
      * @return
      */
     @Override
     @GetMapping("/checkInvitationCode")
-    public R check(@RequestParam Integer userId,@RequestParam("id") Integer projectId){
+    public R check(@RequestParam Integer userId, @RequestParam("id") Integer projectId) {
-        List o = experimentalStudentService.queryIsCode(userId,projectId);
+        List o = experimentalStudentService.queryIsCode(userId, projectId);
-        if (o.size()>0){
+        if (o.size() > 0) {
             return R.ok();
-        }else{
+        } else {
-            return R.error(200,"false");
+            return R.error(200, "false");
         }
     }
 
     /**
      * 通过邀请码进入实验
+     *
      * @param
      * @return
      */
     @Override
     @Transactional
     @PostMapping("/joinPractice")
-    public R joinPractice(@RequestBody ExperimentalTeachingEntity entity1){
+    public R joinPractice(@RequestBody ExperimentalTeachingEntity entity1) {
         //获取参数
         Integer projectId = entity1.getProjectId();
         Integer id = entity1.getId();
@@ -106,58 +109,61 @@ public class ClassTeachingController implements ClassTeachingApi {
 //        Integer ICode = experimentalStudentService.queryIsCode(userId);//获取iscode信息,
 
         //if (isCode==0)
-            if (invitationCode!=null){
+        if (invitationCode != null) {
-                entity.setId(id);
+            entity.setId(id);
 //                entity.setProjectId(projectId);
-                ExperimentalTeachingEntity result= classTeachingService.queryInvitationcode(entity);//邀请码唯一
+            ExperimentalTeachingEntity result = classTeachingService.queryInvitationcode(entity);//邀请码唯一
-                Integer code = result.getInvitationCode();
+            Integer code = result.getInvitationCode();
-                if (invitationCode.equals(code)==true){
+            if (invitationCode.equals(code) == true) {
-                    ExperimentalStudentEntity student = studentEntity.setUserId(userId).setProjectId(id);
+                ExperimentalStudentEntity student = studentEntity.setUserId(userId).setProjectId(id);
-                    experimentalStudentService.saveCode(student);
+                experimentalStudentService.saveCode(student);
-                    return R.ok();
+                return R.ok();
-                }else{
+            } else {
-                    return R.error("邀请码错误，验证失败！！！");
+                return R.error("邀请码错误，验证失败！！！");
-                }
-            }else{
-                return R.error(400,"邀请码格式错误！！！");
             }
+        } else {
+            return R.error(400, "邀请码格式错误！！！");
         }
+    }
 
     /**
      * 查看虚拟仿真课程列表信息
+     *
      * @param page
      * @param size
      * @return
      */
     @Override
     @GetMapping("/simulationPlayList")
-    public R querySimulationPlayList(@RequestParam Integer page,@RequestParam Integer size){
+    public R querySimulationPlayList(@RequestParam Integer page, @RequestParam Integer size) {
-        PageUtils page1 = classTeachingService.querySimulationPlayList(page,size);
+        PageUtils page1 = classTeachingService.querySimulationPlayList(page, size);
-        return R.ok().put("data",page1);
+        return R.ok().put("data", page1);
     }
 
     /**
-     * 学生查看实验报告
+     * 学生查看实验报告(教学)
+     *
      * @param
      * @return
      */
     @Override
     @GetMapping("/queryExperimentalReport")
-    public R queryExperimentalReport(@RequestParam Integer studentId,@RequestParam Integer projectId,@RequestParam Integer recordId,@RequestParam Integer reportId){
+    public R queryExperimentalReport(@RequestParam Integer studentId, @RequestParam Integer projectId, @RequestParam Integer recordId, @RequestParam Integer reportId) {
         ExperimentalReportVo entity = new ExperimentalReportVo();
-        R result = experimentalReportService.queryReport(studentId,projectId,recordId,reportId);
+        R result = experimentalReportService.queryReport(studentId, projectId, recordId, reportId);
 
         return result;
     }
 
     /**
-     * 学生查看虚拟实验报告
+     * 学生查看虚拟实验报告(虚仿)
+     *
      * @param
      * @return
      */
     @Override
     @GetMapping("/queryVirtualReport")
-    public R queryVirtualReport(@RequestParam Integer recordId){
+    public R queryVirtualReport(@RequestParam Integer recordId) {
         R result = experimentalReportService.queryVirtualReport(recordId);
         return result;
     }

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

@@ -2,26 +2,16 @@ package com.msdw.tms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.msdw.tms.api.ExperimentalProjectControllerApi;
-import com.msdw.tms.api.ExperimentalTeachingControllerApi;
-import com.msdw.tms.api.UserControllerApi;
 import com.msdw.tms.common.utils.Constant;
 import com.msdw.tms.common.utils.PageUtils;
 import com.msdw.tms.common.utils.R;
 import com.msdw.tms.entity.ExperimentalProjectEntity;
-import com.msdw.tms.entity.ExperimentalTeachingEntity;
-import com.msdw.tms.entity.UserEntity;
 import com.msdw.tms.entity.vo.ExperimentalProjectEntityVO;
-import com.msdw.tms.entity.vo.ExperimentalTeachingEntityVO;
-import com.msdw.tms.entity.vo.UserEntityVo;
 import com.msdw.tms.service.ExperimentalProjectService;
-import com.msdw.tms.service.UserService;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("tms/project")
@@ -40,7 +30,7 @@ public class ExperimentalProjectController implements ExperimentalProjectControl
         return R.ok().put("experimental_project_name", one);
     }
 
-    /**
+    /**nm
      * 根据id查询实验班级详情
      */
     @GetMapping("/getById/{id}")

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

@@ -2,24 +2,20 @@ package com.msdw.tms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.msdw.tms.api.ExperimentalTeachingControllerApi;
-import com.msdw.tms.api.UserControllerApi;
 import com.msdw.tms.common.utils.Constant;
 import com.msdw.tms.common.utils.PageUtils;
 import com.msdw.tms.common.utils.R;
 import com.msdw.tms.entity.ExperimentalTeachingEntity;
-import com.msdw.tms.entity.UserEntity;
-import com.msdw.tms.entity.vo.ExperimentalTeachingEntityVO;
 import com.msdw.tms.entity.vo.ExperimentalTeachingVO;
-import com.msdw.tms.entity.vo.UserEntityVo;
 import com.msdw.tms.service.ExperimentalTeachingService;
-import com.msdw.tms.service.UserService;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
 
 @RestController
 @RequestMapping("tms/exp")
@@ -32,6 +28,7 @@ public class ExperimentalTeachingController implements ExperimentalTeachingContr
     /**
      * 根据id查询实验班级详情
      */
+   @Override
    @GetMapping("/getById/{id}")
    public R getById(@PathVariable("id") Integer id){
        ExperimentalTeachingEntity et = experimentalTeachingService.getById(id);
@@ -40,6 +37,7 @@ public class ExperimentalTeachingController implements ExperimentalTeachingContr
     /**
      * 根据邀请码查询
      */
+    @Override
     @GetMapping("/getInvitationCode")
     public R getInvitationCode(@RequestParam Integer invitationCode) {
         ExperimentalTeachingEntity one = experimentalTeachingService.getOne(new QueryWrapper<ExperimentalTeachingEntity>().eq("invitation_code", invitationCode)
@@ -49,15 +47,19 @@ public class ExperimentalTeachingController implements ExperimentalTeachingContr
     /**
      * 查询
      */
+    @Override
     @GetMapping("/list")
-    public R list(@RequestParam Integer page,
+    public R list(@RequestParam Integer page, @RequestParam Integer size,
-                  @RequestParam Integer size,
+                  Integer month, Integer type, Integer status,Integer systemId, String startTime,
-                  Integer month, Integer type, Integer status, String startTime, String stopTime, String searchContent,@RequestParam Integer schoolId){
+                  String stopTime, String searchContent,@RequestParam Integer schoolId){
         ExperimentalTeachingVO vo = new ExperimentalTeachingVO();
         vo.setSchoolId(schoolId);
         if (month!=null){
             vo.setMonth(month);
         }
+        if (systemId!=null){
+            vo.setSystemId(systemId);
+        }
         if (type!=null){
             vo.setType(type);
         }
@@ -80,6 +82,7 @@ public class ExperimentalTeachingController implements ExperimentalTeachingContr
     /**
      * 保存
      */
+    @Override
     @PostMapping("/save")
     public R save(@RequestBody ExperimentalTeachingEntity experimentalTeachingEntity){
         experimentalTeachingService.save(experimentalTeachingEntity);
@@ -89,6 +92,7 @@ public class ExperimentalTeachingController implements ExperimentalTeachingContr
     /**
      * 修改
      */
+    @Override
     @PostMapping("/update")
     public R update(@RequestBody ExperimentalTeachingEntity experimentalTeachingEntity) throws ParseException {
         //添加实验结束时间
@@ -117,6 +121,7 @@ public class ExperimentalTeachingController implements ExperimentalTeachingContr
     /**
      * 删除
      */
+    @Override
     @PostMapping("/delete")
     public R delete(@RequestBody Integer[] ids){
         experimentalTeachingService.removeByIds(Arrays.asList(ids));

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

@@ -0,0 +1,156 @@
+package com.msdw.tms.controller;
+
+
+import com.msdw.tms.common.exception.ExceptionCast;
+import com.msdw.tms.common.utils.PageUtils;
+import com.msdw.tms.entity.SysPermission;
+import com.msdw.tms.entity.SysRole;
+import com.msdw.tms.entity.SysRolePermission;
+import com.msdw.tms.entity.request.RolePermissionRequest;
+import com.msdw.tms.entity.response.CommonCode;
+import com.msdw.tms.entity.response.ResponseResult;
+import com.msdw.tms.entity.response.RolePermissionResponse;
+import com.msdw.tms.service.ISysPermissionService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 菜单权限表 前端控制器
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@RestController
+@RequestMapping("/sys-permission")
+@Api(tags = {"角色权限管理"})
+public class SysPermissionController {
+
+    @Autowired
+    private ISysPermissionService permissionService;
+
+    /**
+     * 权限菜单树形列表展示
+     * @return
+     */
+    @GetMapping("/tree")
+    public ResponseResult tree(){
+        List<SysPermission> list = permissionService.listWithTree();
+        return new ResponseResult<List<SysPermission>>().SUCCESS(list);
+    }
+
+    /**
+     * 新增角色权限
+     */
+    @Transactional
+    @PostMapping("/saveRolePermission")
+    public ResponseResult saveRolePermission(@Valid @RequestBody RolePermissionRequest rolePermission) {
+        Date date = new Date();
+        rolePermission.setCreateTime(date);
+        rolePermission.setMotifyTime(date);
+        //此处要判重，新增的角色名称要唯一
+        int count = permissionService.uniqueRoleName(rolePermission.getName());
+        if(count >0){
+            ExceptionCast.cast(CommonCode.ROLE_NAME_EXIST);
+        }
+        //新增角色到角色表
+        int request = permissionService.addHrmsRole(rolePermission);
+        //根据选中的permissionId批量新增数据到hrms_role_permission
+        List<Long> asList = Arrays.asList(rolePermission.getPermissionIds());
+        List<RolePermissionRequest> rolePermissionList = getRolePermissionList(asList, rolePermission.getRoleId());
+        boolean result = permissionService.addHrmsRolePermission(rolePermissionList);
+
+        return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
+    }
+
+    private List<RolePermissionRequest> getRolePermissionList(List<Long> asList, Long roleId) {
+        return asList.stream().map(permissionId -> {
+            RolePermissionRequest request = new RolePermissionRequest();
+            request.setRoleId(roleId);
+            request.setPermissionId(permissionId);
+            return request;
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * 修改角色权限
+     */
+    @Transactional
+    @PostMapping("/updateRolePermission")
+    public ResponseResult updateRolePermission(@Valid @RequestBody RolePermissionRequest rolePermission) {
+        Date date = new Date();
+        rolePermission.setMotifyTime(date);
+        //根据角色Id修改角色内容
+        int request = permissionService.updateHrmsRole(rolePermission);
+        //删除该角色Id对应的所有权限
+        List<Long> asList = Arrays.asList(rolePermission.getPermissionIds());
+        permissionService.deleteHrmsRolePermission(rolePermission.getRoleId());
+        //根据选中的permissionId批量新增数据到hrms_role_permission
+        List<RolePermissionRequest> rolePermissionList = getRolePermissionList(asList, rolePermission.getRoleId());
+        boolean result = permissionService.addHrmsRolePermission(rolePermissionList);
+
+        return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
+    }
+
+    /**
+     * 删除用户角色权限
+     */
+    @Transactional
+    @PostMapping("/delRolePermission")
+    public ResponseResult delRolePermission(@RequestBody RolePermissionRequest rolePermission) {
+        //根据角色Id查询该角色是否有用户关联
+        int count = permissionService.queryCountByRoleId(rolePermission.getRoleIds());
+        if(count >0){
+            ExceptionCast.cast(CommonCode.ROLE_EMP_EXIST);
+        }
+        //没有关联则根据roleId删除hrms_role表对应记录
+        boolean b = permissionService.deleteHrmsRoleByRoleId(rolePermission.getRoleIds());
+        //根据角色id删除对应所有权限
+        boolean result = permissionService.deleteHrmsRolePermission(rolePermission.getRoleIds());
+
+        return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
+    }
+
+    /**
+     * 查看权限数组
+     * @param roleId
+     * @return
+     */
+    @GetMapping("/queryPermissionArrById")
+    public ResponseResult queryPermissionArrById(@RequestParam("roleId") Long roleId) {
+        List<SysRolePermission> list = permissionService.queryPermissionArrById(roleId);
+        ArrayList<Integer> sb = new ArrayList<Integer>();
+        for (SysRolePermission rolePermission:list) {
+            sb.add(rolePermission.getPermissionId().intValue());
+        }
+        Integer[] ids = sb.toArray(new Integer[sb.size()]);
+        //根据roleId查询角色名称和角色描述
+        SysRole roleMsg = permissionService.queryRoleMsg(roleId);
+        Map map = new HashMap();
+        map.put("permissionIds",ids);
+        map.put("name",roleMsg.getName());
+        map.put("description",roleMsg.getDescription());
+        return new ResponseResult<List<RolePermissionResponse>>().SUCCESS(map);
+    }
+
+    /**
+     * 角色权限列表展示
+     * @param page
+     * @param size
+     * @return
+     */
+    @GetMapping("/rolePermissionList")
+    public ResponseResult rolePermissionList(@RequestParam("page") Integer page,
+                                             @RequestParam("size") Integer size,@RequestParam("name")String name) {
+        PageUtils data = permissionService.queryPage(page, size, name);
+        return new ResponseResult<PageUtils>().SUCCESS(data);
+    }
+
+}

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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
@@ -32,7 +33,7 @@ public class SystemSettingController implements SystemSetttingApi {
      */
     @Override
     @PostMapping("/addStaff")
-    public R addStaff(@RequestBody StaffVo staffVo){
+    public R addStaff(@RequestBody @Valid StaffVo staffVo){
         R r = systemSetttingService.addStaff(staffVo);
         return r;
     }
@@ -153,4 +154,15 @@ public class SystemSettingController implements SystemSetttingApi {
         R result = systemSetttingService.queryAccount(account,schoolId);
         return result;
     }
+
+    /**
+     * 重置密码
+     * @param userId
+     * @return
+     */
+    @GetMapping("/resetPwd")
+    public R resetPwd(@RequestParam Integer userId,String newPwd){
+        R r = systemSetttingService.resetPwd(userId,newPwd);
+        return r;
+    }
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.msdw.tms.entity.ExperimentalProjectEntity;
 import com.msdw.tms.entity.ExperimentalReportEntity;
 import com.msdw.tms.entity.ProjectRecordEntity;
+import com.msdw.tms.entity.resp.GetByUserRecordResp;
 import com.msdw.tms.entity.vo.ProjectRecordExportVo;
 import com.msdw.tms.entity.vo.ProjectRecordVo;
 import com.msdw.tms.entity.vo.RecordVo;
@@ -15,8 +16,6 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
- * 
- * 
  * @author
  * @email
  * @date 2020-08-19 16:07:02
@@ -24,17 +23,17 @@ import java.util.List;
 @Mapper
 public interface ProjectRecordDao extends BaseMapper<ProjectRecordEntity> {
 
-    IPage<ProjectRecordVo> getByUserRecord(Page page,@Param("pro") ProjectRecordEntity projectRecordEntity,Integer projectPermissions);
+    IPage<GetByUserRecordResp> getByUserRecord(Page page, @Param("userId") Integer userId, @Param("projectPermissions") Integer projectPermissions);
 
-    IPage<ProjectRecordVo> getByUserExperimentRecord(Page page,@Param("pro") ProjectRecordEntity projectRecordEntity);
+    IPage<ProjectRecordVo> getByUserExperimentRecord(Page page, @Param("pro") ProjectRecordEntity projectRecordEntity);
 
     List<ProjectRecordExportVo> getByUserRecordImport(ProjectRecordEntity projectRecordEntity);
 
-    ProjectRecordVo getByUserScore(@Param("userid") Integer userId,@Param("isdel") Integer isdel);
+    ProjectRecordVo getByUserScore(@Param("userid") Integer userId, @Param("isdel") Integer isdel);
 
     ProjectRecordVo queryScore(@Param("userId") Integer userId);
 
-    IPage<ProjectRecordVo> getBySchoolRecord(Page page,@Param("pro") ProjectRecordVo projectRecord);
+    IPage<ProjectRecordVo> getBySchoolRecord(Page page, @Param("pro") ProjectRecordVo projectRecord);
 
     boolean updateUserRecord(ProjectRecordEntity projectRecord);
 

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

@@ -0,0 +1,22 @@
+package com.msdw.tms.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.msdw.tms.entity.SysPermission;
+import com.msdw.tms.entity.response.RolePermissionResponse;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 菜单权限表 Mapper 接口
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Mapper
+public interface SysPermissionMapper extends BaseMapper<SysPermission> {
+
+    IPage<RolePermissionResponse> pageByCondition(Page page,String name);
+}

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

@@ -0,0 +1,28 @@
+package com.msdw.tms.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.msdw.tms.entity.SysRole;
+import com.msdw.tms.entity.request.RolePermissionRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户角色表 Mapper 接口
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Mapper
+public interface SysRoleMapper extends BaseMapper<SysRole> {
+
+    int addHrmsRole(RolePermissionRequest rolePermission);
+
+    int updateHrmsRole(RolePermissionRequest rolePermission);
+
+    boolean deleteHrmsRoleByRoleId(@Param("roleIds") List<Long> roleIds);
+
+}

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

@@ -0,0 +1,31 @@
+package com.msdw.tms.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.msdw.tms.entity.SysRolePermission;
+import com.msdw.tms.entity.request.RolePermissionRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 角色权限中间表 Mapper 接口
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Mapper
+public interface SysRolePermissionMapper extends BaseMapper<SysRolePermission> {
+
+    int uniqueRoleName(String name);
+
+    boolean addHrmsRolePermission(@Param("rolePermissionList") List<RolePermissionRequest> rolePermissionList);
+
+    boolean deleteHrmsRolePermission(@Param("roleIds") List<Long> roleIds);
+
+    boolean deleteHrmsRolePermissionSingle(Long roleId);
+
+    List<SysRolePermission> queryPermissionArrById(Long roleId);
+}

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

@@ -0,0 +1,22 @@
+package com.msdw.tms.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.msdw.tms.entity.SysUserRole;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户角色中间表 Mapper 接口
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Mapper
+public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
+
+    int queryCountByRoleId(@Param("roleIds") List<Long> roleIds);
+}

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

@@ -45,6 +45,8 @@ public class ExperimentalTeachingEntity {
     private Integer isCode;
     //绑定用户Id
     private Integer userId;
+    //绑定系统Id
+    private Integer systemId;
     //创建时间
     private String creationTime;
     //实验倒计时

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

@@ -0,0 +1,100 @@
+package com.msdw.tms.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 菜单权限表
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Data
+@TableName("sys_permission")
+public class SysPermission implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 权限标识符
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 父权限id
+     */
+    private Long parentId;
+
+    /**
+     * 层级
+     */
+    private Integer level;
+
+    /**
+     * 是否是菜单：1、是，0、不是（0目前为按钮）
+     */
+    private Integer menuOrNot;
+
+    /**
+     * 状态：0、启用，1、禁用
+     */
+    private Integer status;
+
+    /**
+     * 路径
+     */
+    private String url;
+
+    /**
+     * 页面路径
+     */
+    private String menuUrl;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 图标
+     */
+    private String icon;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date motifyTime;
+
+    /**
+     * 子权限
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
+    private List<SysPermission> children;
+}

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

@@ -0,0 +1,60 @@
+package com.msdw.tms.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户角色表
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Data
+@TableName("sys_role")
+public class SysRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 角色名称
+     */
+    private String name;
+
+    /**
+     * 角色描述
+     */
+    private String description;
+
+    /**
+     * 是否删除：0、未删除，1、删除
+     */
+    private Integer delOrNot;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date motifyTime;
+
+    /**
+     * 编码
+     */
+    private String code;
+}

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

@@ -0,0 +1,39 @@
+package com.msdw.tms.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 角色权限中间表
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Data
+@TableName("sys_role_permission")
+public class SysRolePermission implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 角色id
+     */
+    private Long roleId;
+
+    /**
+     * 权限id
+     */
+    private Long permissionId;
+}

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

@@ -0,0 +1,39 @@
+package com.msdw.tms.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户角色中间表
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Data
+@TableName("sys_user_role")
+public class SysUserRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 角色id
+     */
+    private Long roleId;
+}

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.Pattern;
+
 @Accessors(chain = true)
 @Data
 @TableName("hr_user_info")
@@ -15,6 +17,7 @@ public class UserInfoEntity {
     //用户姓名
     private String userName;
     //用户账号
+    @Pattern(regexp = "/^[1-9]([0-9]{1,5})?$/", message = "账号只能为数字！")
     private String account;
     //用户密码
     private String password;
@@ -60,4 +63,6 @@ public class UserInfoEntity {
     private Integer schoolAppellationId;
     //token
     private String token;
+    //最后登录时间
+    private String lastLoginTime;
 }

src/main/java/com/msdw/tms/entity/request/RolePermissionRequest.java

@@ -0,0 +1,83 @@
+package com.msdw.tms.entity.request;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 记录菜单权限
+ * 
+ * @author gongsj
+ * @email gongsj@gmail.com
+ * @date 2020-09-07 17:12:14
+ */
+@Data
+public class RolePermissionRequest implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 角色id
+	 */
+	private Long roleId;
+
+	/**
+	 * 角色ids
+	 */
+	private Long[] roleIds;
+	/**
+	 * 角色名称
+	 */
+	private String name;
+
+	/**
+	 * 角色描述
+	 */
+	private String description;
+
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+
+	/**
+	 * 更新时间
+	 */
+	private Date motifyTime;
+
+	/**
+	 * 权限ids
+	 */
+	@NotEmpty(message = "权限至少选中一项！")
+	private Long[] permissionIds;
+
+	private Long permissionId;
+
+	/**
+	 * 拥有权限名称
+	 */
+	private String permissionName;
+
+	/**
+	 * 父级id
+	 */
+	private Long parentId;
+
+	/**
+	 * 子权限
+	 */
+	@JsonInclude(JsonInclude.Include.NON_EMPTY)
+	@TableField(exist = false)
+	private List<RolePermissionRequest> children;
+
+	/**
+	 * 排序
+	 */
+	private Integer sort;
+
+}

src/main/java/com/msdw/tms/entity/resp/GetByUserRecordResp.java

@@ -0,0 +1,89 @@
+package com.msdw.tms.entity.resp;
+
+import lombok.Data;
+
+/**
+ * @ProjectName: tms
+ * @Package: com.msdw.tms.entity.resp
+ * @ClassName: GetByUserRecordResp
+ * @Description: java类作用描述
+ * @Author: Maureen.Rong
+ * @CreateDate: 2021/2/25 15:26
+ * @UpdateDate: 2021/2/25 15:26
+ * @Version: 1.0
+ */
+
+public class GetByUserRecordResp {
+    private String projectName;
+    private Integer recordId;
+    private Integer score;
+    private Integer codeId;
+    private String startingTime;
+    private String submitTime;
+    private Integer timeSum;
+    private Integer userId;
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public Integer getRecordId() {
+        return recordId;
+    }
+
+    public void setRecordId(Integer recordId) {
+        this.recordId = recordId;
+    }
+
+    public Integer getScore() {
+        return score;
+    }
+
+    public void setScore(Integer score) {
+        this.score = score;
+    }
+
+    public Integer getCodeId() {
+        return codeId;
+    }
+
+    public void setCodeId(Integer codeId) {
+        this.codeId = codeId;
+    }
+
+    public String getStartingTime() {
+        return startingTime;
+    }
+
+    public void setStartingTime(String startingTime) {
+        this.startingTime = startingTime;
+    }
+
+    public String getSubmitTime() {
+        return submitTime;
+    }
+
+    public void setSubmitTime(String submitTime) {
+        this.submitTime = submitTime;
+    }
+
+    public Integer getTimeSum() {
+        return timeSum;
+    }
+
+    public void setTimeSum(Integer timeSum) {
+        this.timeSum = timeSum;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+}

src/main/java/com/msdw/tms/entity/response/CommonCode.java

@@ -18,6 +18,9 @@ public enum CommonCode implements ResultCode {
     REPEAT_INEXCEL(false, 10010, "试题在excel表中重复！"),
     EVALUATION_QUESTION_NUM_INVALID(false, 10011, "当前测评题数设置为0，请先设置测评题数！"),
     FAIL(false, 11111, "操作失败！"),
+
+    ROLE_NAME_EXIST(false,20001,"该角色名称已存在，请重新输入！"),
+    ROLE_EMP_EXIST(false,44001,"该角色有用户关联，不能删除！"),
     SERVER_ERROR(false, 99999, "抱歉，系统繁忙，请稍后重试！");
     //操作是否成功
     boolean success;

src/main/java/com/msdw/tms/entity/response/ResponseResult.java

@@ -1,22 +1,46 @@
 package com.msdw.tms.entity.response;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+/**
+ * @Author: gongsj.
+ * @Description: 统一返回的结果集。
+ * @Date:Created in 2020/09/07 12:28.
+ * @Modified By:
+ */
 @Data
 @ToString
 @NoArgsConstructor
-public class ResponseResult implements Response {
+@AllArgsConstructor
+public class ResponseResult<T> {
+    /**
+     * 操作是否成功
+     */
+    private boolean success;
 
-    //操作是否成功
+    /**
-    boolean success = SUCCESS;
+     * 状态码
+     */
+    private int code;
 
-    //操作代码
+    /**
-    int code = SUCCESS_CODE;
+     * 返回的数据
+     */
+    private T data;
 
-    //提示信息
+    /**
-    String message;
+     * 提示信息
+     */
+    private String message;
+
+    public ResponseResult(boolean success, int code, String message) {
+        this.success = success;
+        this.code = code;
+        this.message = message;
+    }
 
     public ResponseResult(ResultCode resultCode) {
         this.success = resultCode.success();
@@ -28,8 +52,24 @@ public class ResponseResult implements Response {
         return new ResponseResult(CommonCode.SUCCESS);
     }
 
+    public static ResponseResult SUCCESS(Object t) {
+        return new ResponseResult<>(true, 10000, t, "操作成功!");
+    }
+
+    public static ResponseResult FAIL(Object t) {
+        return new ResponseResult<>(false, 99999, t, "操作失败,请检查客户名称是否已存在或者文件和数据格式是否正确!");
+    }
+
+    public ResponseResult SUCCESS_DATA(T t) {
+        return new ResponseResult<>(false, 20000, t, "操作失败!");
+    }
+
     public static ResponseResult FAIL() {
         return new ResponseResult(CommonCode.FAIL);
     }
 
+    public static ResponseResult FAIL(int code, String message) {
+        return new ResponseResult<>(false, code, null, message);
+    }
+
 }

src/main/java/com/msdw/tms/entity/response/RolePermissionResponse.java

@@ -0,0 +1,80 @@
+package com.msdw.tms.entity.response;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 记录菜单权限
+ * 
+ * @author gongsj
+ * @email gongsj@gmail.com
+ * @date 2020-09-07 17:12:14
+ */
+@Data
+@TableName("hrms_permission")
+public class RolePermissionResponse implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 角色id
+	 */
+	@ApiModelProperty("id")
+	private Long roleId;
+	/**
+	 * 角色名称
+	 */
+	@ApiModelProperty("名称")
+	private String name;
+
+	/**
+	 * 角色描述
+	 */
+	@ApiModelProperty("角色描述")
+	private String description;
+
+	/**
+	 * 权限id
+	 */
+	@ApiModelProperty("权限id")
+	private Long permissionId;
+
+	/**
+	 * 拥有权限名称
+	 */
+	@ApiModelProperty("权限名称")
+	private String permissionName;
+
+	/**
+	 * 父级id
+	 */
+	@ApiModelProperty("父级id")
+	private Long parentId;
+
+	/**
+	 * 子权限
+	 */
+	@ApiModelProperty("子权限")
+	@JsonInclude(JsonInclude.Include.NON_EMPTY)
+	@TableField(exist = false)
+	private List<RolePermissionResponse> children;
+
+	/**
+	 * 排序
+	 */
+	@ApiModelProperty("子权限")
+	private Integer sort;
+
+	/**
+	 * 权限标识
+	 */
+	private String code;
+
+	private boolean disabled=true;
+
+}

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

@@ -18,4 +18,6 @@ public class ExperimentalTeachingVO {
     private Integer status;
     //学校id
     private Integer schoolId;
+    //绑定系统Id
+    private Integer systemId;
 }

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

@@ -0,0 +1,45 @@
+package com.msdw.tms.service;
+
+import com.msdw.tms.common.utils.PageUtils;
+import com.msdw.tms.entity.SysPermission;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.msdw.tms.entity.SysRole;
+import com.msdw.tms.entity.SysRolePermission;
+import com.msdw.tms.entity.request.RolePermissionRequest;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 菜单权限表 服务类
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+public interface ISysPermissionService extends IService<SysPermission> {
+
+    List<SysPermission> listWithTree();
+
+    int uniqueRoleName(String name);
+
+    int addHrmsRole(RolePermissionRequest rolePermission);
+
+    boolean addHrmsRolePermission(List<RolePermissionRequest> rolePermissionList);
+
+    int updateHrmsRole(RolePermissionRequest rolePermission);
+
+    boolean deleteHrmsRolePermission(Long roleId);
+
+    boolean deleteHrmsRolePermission(Long[] roleIds);
+
+    int queryCountByRoleId(Long[] roleIds);
+
+    boolean deleteHrmsRoleByRoleId(Long[] roleIds);
+
+    List<SysRolePermission> queryPermissionArrById(Long roleId);
+
+    SysRole queryRoleMsg(Long roleId);
+
+    PageUtils queryPage(Integer page, Integer size, String name);
+}

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

@@ -0,0 +1,16 @@
+package com.msdw.tms.service;
+
+import com.msdw.tms.entity.SysRolePermission;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 角色权限中间表 服务类
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+public interface ISysRolePermissionService extends IService<SysRolePermission> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.msdw.tms.service;
+
+import com.msdw.tms.entity.SysRole;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户角色表 服务类
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+public interface ISysRoleService extends IService<SysRole> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.msdw.tms.service;
+
+import com.msdw.tms.entity.SysUserRole;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户角色中间表 服务类
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+public interface ISysUserRoleService extends IService<SysUserRole> {
+
+}

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

@@ -11,27 +11,25 @@ import java.util.HashMap;
 import java.util.List;
 
 /**
- * 
- *
  * @author
  * @email
  * @date 2020-08-19 16:07:02
  */
 public interface ProjectRecordService extends IService<ProjectRecordEntity> {
 
-    PageUtils queryPage(Integer page,Integer size,Integer userId,Integer projectPermissions);
+    PageUtils queryPage(Integer page, Integer size, Integer userId, Integer projectPermissions);
 
-    PageUtils queryExperimentPage(Integer page,Integer size,Integer userid);
+    PageUtils queryExperimentPage(Integer page, Integer size, Integer userid);
 
     ProjectRecordVo queryUserScore(Integer userId);
 
     ProjectRecordVo queryScore(Integer userId);
 
-    void exportProjectRecord(HttpServletResponse response, Integer userId)throws Exception;
+    void exportProjectRecord(HttpServletResponse response, Integer userId) throws Exception;
 
-    void exportExperimentProjectRecord(HttpServletResponse response, Integer userId)throws Exception;
+    void exportExperimentProjectRecord(HttpServletResponse response, Integer userId) throws Exception;
 
-    PageUtils querySchoolRecord(Integer page,Integer size,ProjectRecordVo projectRecord);
+    PageUtils querySchoolRecord(Integer page, Integer size, ProjectRecordVo projectRecord);
 
     boolean updateUserRecord(ProjectRecordEntity projectRecord);
 

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

@@ -34,4 +34,6 @@ public interface SystemSetttingService {
     void downloadFiles(HttpServletResponse response)  throws IOException;
 
     R queryAccount(String account,Integer schoolId);
+
+    R resetPwd(Integer userId,String newPwd);
 }

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

@@ -15,7 +15,7 @@ import java.util.HashMap;
 import java.util.List;
 
 @Service
-public class ExperimentalReportServiceImpl extends ServiceImpl<ExperimentalReportDao,ExperimentalReportEntity>  implements ExperimentalReportService {
+public class ExperimentalReportServiceImpl extends ServiceImpl<ExperimentalReportDao, ExperimentalReportEntity> implements ExperimentalReportService {
 
     @Autowired
     private ExperimentalReportDao reportDao;
@@ -23,37 +23,47 @@ public class ExperimentalReportServiceImpl extends ServiceImpl<ExperimentalRepor
     @Autowired
     private AchievementManagementDao achievementManagementDao;
 
+    /**
+     * 学生查看实验报告(教学)
+     *
+     * @param studentId
+     * @param projectId
+     * @param recordId
+     * @param reportId
+     * @return
+     */
     @Override
-    public R queryReport(Integer studentId,Integer projectId,Integer recordId,Integer reportId) {
+    public R queryReport(Integer studentId, Integer projectId, Integer recordId, Integer reportId) {
-        Integer systemId =reportDao.querySystemId(recordId);
+        Integer systemId = reportDao.querySystemId(recordId);
         ExperimentalReportVo entity = new ExperimentalReportVo();
         entity.setRecordId(recordId).setStudentId(studentId).setProjectId(projectId).setReportId(reportId);
         ExperimentalReportVo result = reportDao.queryReport(entity);
         //python实验
         HashMap<String, Object> map = new HashMap<>();
-        map.put("report",result);
+        map.put("report", result);
-        if(systemId==1|systemId==4|systemId==5){
+        if (systemId == 1 | systemId == 4 | systemId == 5) {
             List<AchievementManagementVO> data = achievementManagementDao.queryPythonTest(recordId);
-            map.put("data",data);
+            map.put("data", data);
-            return R.ok().put("data",map);
+            return R.ok().put("data", map);
         }
-        return R.ok().put("data",map);
+        return R.ok().put("data", map);
     }
 
+    //虚拟实验
     @Override
     public R queryVirtualReport(Integer recordId) {
         ExperimentalReportVo result = reportDao.queryVirtualReport(recordId);
-        Integer systemId =reportDao.querySystemId(recordId);
+        Integer systemId = reportDao.querySystemId(recordId);
 
         //python实验
-        if(systemId==1|systemId==4|systemId==5){
+        if (systemId == 1 | systemId == 4 | systemId == 5) {
             List<AchievementManagementVO> data = achievementManagementDao.queryPythonTest(recordId);
             HashMap<String, Object> map = new HashMap<>();
-            map.put("data",data);
+            map.put("data", data);
-            map.put("report",result);
+            map.put("report", result);
-            return R.ok().put("data",map);
+            return R.ok().put("data", map);
         }
 
-        return R.ok().put("data",result);
+        return R.ok().put("data", result);
     }
 }

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

@@ -1,31 +1,20 @@
 package com.msdw.tms.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.msdw.tms.common.utils.Constant;
 import com.msdw.tms.common.utils.PageUtils;
-import com.msdw.tms.common.utils.Query;
 import com.msdw.tms.dao.ClassTeachingDao;
 import com.msdw.tms.dao.ExperimentalTeachingDao;
-import com.msdw.tms.dao.UserDao;
 import com.msdw.tms.entity.ExperimentalTeachingEntity;
-import com.msdw.tms.entity.UserEntity;
-import com.msdw.tms.entity.vo.ExperimentalTeachingEntityVO;
 import com.msdw.tms.entity.vo.ExperimentalTeachingVO;
 import com.msdw.tms.entity.vo.ProjectRecordVo;
-import com.msdw.tms.entity.vo.UserEntityVo;
 import com.msdw.tms.service.ExperimentalTeachingService;
-import com.msdw.tms.service.UserService;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-import java.util.Map;
-
 @Service("experimentalTeachingService")
 public class ExperimentalTeachingServiceImpl extends ServiceImpl<ExperimentalTeachingDao, ExperimentalTeachingEntity> implements ExperimentalTeachingService {
 

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

@@ -12,6 +12,7 @@ import com.msdw.tms.entity.ExperimentalReportEntity;
 import com.msdw.tms.entity.ProjectRecordEntity;
 import com.msdw.tms.entity.request.ExperimentProjectRecordImportRequest;
 import com.msdw.tms.entity.request.ProjectRecordImportRequest;
+import com.msdw.tms.entity.resp.GetByUserRecordResp;
 import com.msdw.tms.entity.vo.ProjectRecordExportVo;
 import com.msdw.tms.entity.vo.ProjectRecordVo;
 import com.msdw.tms.service.ProjectRecordService;
@@ -37,14 +38,15 @@ public class ProjectRecordServiceImpl extends ServiceImpl<ProjectRecordDao, Proj
 
 
     @Override
-    public PageUtils queryPage(Integer page,Integer size,Integer userId,Integer projectPermissions) {
+    public PageUtils queryPage(Integer page, Integer size, Integer userId, Integer projectPermissions) {
 
-        ProjectRecordEntity projectRecord = new ProjectRecordEntity().setUserid(userId);
+        /*GetByUserRecordResp projectRecord = new GetByUserRecordResp();
+        projectRecord.setUserId(userId);*/
 
         //分页对象
         Page<T> page1 = new Page<>(page, size);
 
-        IPage<ProjectRecordVo> projectRecordVos = this.baseMapper.getByUserRecord(page1,projectRecord,projectPermissions);
+        IPage<GetByUserRecordResp> projectRecordVos = this.baseMapper.getByUserRecord(page1, userId, projectPermissions);
 
         PageUtils questionsPage = new PageUtils(projectRecordVos);
 
@@ -59,7 +61,7 @@ public class ProjectRecordServiceImpl extends ServiceImpl<ProjectRecordDao, Proj
         //分页对象
         Page<T> page1 = new Page<>(page, size);
 
-        IPage<ProjectRecordVo> projectRecordVos = this.baseMapper.getByUserExperimentRecord(page1,projectRecord);
+        IPage<ProjectRecordVo> projectRecordVos = this.baseMapper.getByUserExperimentRecord(page1, projectRecord);
 
         PageUtils questionsPage = new PageUtils(projectRecordVos);
 
@@ -70,9 +72,9 @@ public class ProjectRecordServiceImpl extends ServiceImpl<ProjectRecordDao, Proj
     public ProjectRecordVo queryUserScore(Integer userId) {
 
         Integer isdel = Constant.IsDel.NOT_DEL.getType();
-        ProjectRecordVo projectRecordVo = this.baseMapper.getByUserScore(userId ,isdel);
+        ProjectRecordVo projectRecordVo = this.baseMapper.getByUserScore(userId, isdel);
         Double totalTime = projectRecordVo.getTotalTime();
-        if (totalTime!=null) {
+        if (totalTime != null) {
             DecimalFormat df = new DecimalFormat("0.00");
             double time = totalTime / 60;
             String format = df.format(time);
@@ -80,17 +82,17 @@ public class ProjectRecordServiceImpl extends ServiceImpl<ProjectRecordDao, Proj
         }
 
 
-        return  projectRecordVo;
+        return projectRecordVo;
     }
 
     @Override
     public ProjectRecordVo queryScore(Integer userId) {
         ProjectRecordVo projectRecordVo = this.baseMapper.queryScore(userId);
-        return  projectRecordVo;
+        return projectRecordVo;
     }
 
     @Override
-    public void exportProjectRecord(HttpServletResponse response,Integer userId)throws Exception{
+    public void exportProjectRecord(HttpServletResponse response, Integer userId) throws Exception {
         //获取数据
         ProjectRecordEntity projectRecord = new ProjectRecordEntity().setUserid(userId).setIsdel(Constant.IsDel.NOT_DEL.getType());
 
@@ -122,7 +124,7 @@ public class ProjectRecordServiceImpl extends ServiceImpl<ProjectRecordDao, Proj
      * 导出个人教学试验记录
      */
     @Override
-    public void exportExperimentProjectRecord(HttpServletResponse response,Integer userId)throws Exception{
+    public void exportExperimentProjectRecord(HttpServletResponse response, Integer userId) throws Exception {
         //获取数据
         ProjectRecordEntity projectRecord = new ProjectRecordEntity().setUserid(userId).setIsdel(Constant.IsDel.NOT_DEL.getType());
 

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

@@ -0,0 +1,127 @@
+package com.msdw.tms.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.msdw.tms.common.utils.PageUtils;
+import com.msdw.tms.dao.SysPermissionMapper;
+import com.msdw.tms.dao.SysRoleMapper;
+import com.msdw.tms.dao.SysRolePermissionMapper;
+import com.msdw.tms.dao.SysUserRoleMapper;
+import com.msdw.tms.entity.SysPermission;
+import com.msdw.tms.entity.SysRole;
+import com.msdw.tms.entity.SysRolePermission;
+import com.msdw.tms.entity.request.RolePermissionRequest;
+import com.msdw.tms.entity.response.RolePermissionResponse;
+import com.msdw.tms.service.ISysPermissionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 菜单权限表 服务实现类
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Service
+public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, SysPermission> implements ISysPermissionService {
+
+    @Resource
+    private SysRolePermissionMapper rolePermissionMapper;
+
+    @Resource
+    private SysRoleMapper roleMapper;
+
+    @Resource
+    private SysUserRoleMapper userRoleMapper;
+
+    @Override
+    public List<SysPermission> listWithTree() {
+/*        List<SysPermission>list = this.getBaseMapper().queryPermissionTree();
+        return getPermissionTreeList(list,0L);*/
+        System.out.println("this.list()=================="+this.list());
+        return getPermissionTreeList(this.list(), 0L);
+    }
+
+    private List<SysPermission> getPermissionTreeList(List<SysPermission> list, Long parentId){
+        return list.stream()
+                .filter(item -> parentId.equals(item.getParentId()))
+                .peek(item -> item.setChildren(getPermissionTreeList(list, item.getId())))
+                .sorted(Comparator.comparingInt(menu -> (menu.getSort() == null ? 0 : menu.getSort())))
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public int uniqueRoleName(String name) {
+        return rolePermissionMapper.uniqueRoleName(name);
+    }
+
+    @Override
+    public int addHrmsRole(RolePermissionRequest rolePermission) {
+        int request = roleMapper.addHrmsRole(rolePermission);
+        return request;
+    }
+
+    @Override
+    public boolean addHrmsRolePermission(List<RolePermissionRequest> rolePermissionList) {
+        return rolePermissionMapper.addHrmsRolePermission(rolePermissionList);
+    }
+
+    @Override
+    public int updateHrmsRole(RolePermissionRequest rolePermission) {
+        return roleMapper.updateHrmsRole(rolePermission);
+    }
+
+    @Override
+    public boolean deleteHrmsRolePermission(Long roleId) {
+        return rolePermissionMapper.deleteHrmsRolePermissionSingle(roleId);
+    }
+
+    @Override
+    public boolean deleteHrmsRolePermission(Long[] roleIds) {
+        return rolePermissionMapper.deleteHrmsRolePermission(Arrays.asList(roleIds));
+    }
+
+    @Override
+    public int queryCountByRoleId(Long[] roleIds) {
+        int count = userRoleMapper.queryCountByRoleId(Arrays.asList(roleIds));
+        return count;
+    }
+
+    @Override
+    public boolean deleteHrmsRoleByRoleId(Long[] roleIds) {
+        return roleMapper.deleteHrmsRoleByRoleId(Arrays.asList(roleIds));
+    }
+
+    @Override
+    public List<SysRolePermission> queryPermissionArrById(Long roleId) {
+        return rolePermissionMapper.queryPermissionArrById(roleId);
+    }
+
+    @Override
+    public SysRole queryRoleMsg(Long roleId) {
+        return roleMapper.selectById(roleId);
+    }
+
+    @Override
+    public PageUtils queryPage(Integer page, Integer size, String name) {
+        //分页参数
+        if (page <= 0) {
+            page = 1;
+        }
+        if (size <= 0) {
+            size = 10;
+        }
+        IPage<RolePermissionResponse> systemLogVo = this.getBaseMapper().pageByCondition(new Page(page, size),name);
+
+        return new PageUtils(systemLogVo);
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.msdw.tms.service.impl;
+
+import com.msdw.tms.dao.SysRolePermissionMapper;
+import com.msdw.tms.entity.SysRolePermission;
+import com.msdw.tms.service.ISysRolePermissionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 角色权限中间表 服务实现类
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Service
+public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionMapper, SysRolePermission> implements ISysRolePermissionService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.msdw.tms.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.msdw.tms.dao.SysRoleMapper;
+import com.msdw.tms.entity.SysRole;
+import com.msdw.tms.service.ISysRoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户角色表 服务实现类
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Service
+public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.msdw.tms.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.msdw.tms.dao.SysUserRoleMapper;
+import com.msdw.tms.entity.SysUserRole;
+import com.msdw.tms.service.ISysUserRoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户角色中间表 服务实现类
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Service
+public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUserRole> implements ISysUserRoleService {
+
+}

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.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -497,4 +498,18 @@ public class SystemSettingServiceImpl implements SystemSetttingService {
         }
         return R.ok();
     }
+
+    @Override
+    @Transactional
+    public R resetPwd(Integer userId,String newPwd) {
+        UserInfoEntity user = new UserInfoEntity();
+        user.setPassword(newPwd);
+        int count = userInfoDao.update(user, new QueryWrapper<UserInfoEntity>().eq("userId", userId));
+        if(count > 0){
+            return R.ok();
+        }else{
+            return R.error(20002,"重置失败");
+        }
+    }
+
 }

src/main/java/com/msdw/tms/util/MyBatisPlusCodeGenerator.java

@@ -0,0 +1,115 @@
+package com.msdw.tms.util;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.DateType;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: LvFang
+ * @Date: Created in 2019/6/11.
+ * @Description:
+ */
+public class MyBatisPlusCodeGenerator {
+
+    //包名
+    public static final String PACKAGE_NAME = "com.msdw.tms";
+
+    public static void main(String[] args) {
+        String[] tables = new String[] {"sys_role","sys_role_permission","sys_user_role"};//表名数组
+        String[] tablePrefixs = new String[] {""};//去掉前缀
+        executeCode(PACKAGE_NAME,tables,tablePrefixs);
+    }
+
+    private static void executeCode(String pack, String[] tables, String[] tablePrefixs) {
+        // 代码生成器
+        AutoGenerator mpg = new AutoGenerator();
+
+        // 全局配置
+        GlobalConfig gc = new GlobalConfig();
+        // 是否覆盖已有文件
+        gc.setFileOverride(false);
+        // 生成文件的输出目录
+        String projectPath = System.getProperty("user.dir");//user.dir 表示当前工程路径无需替换
+        gc.setOutputDir(projectPath + "/src/main/java");
+        //设置bean命名规范
+        gc.setEntityName("%s");
+        // 开发人员
+        gc.setAuthor("Qyq");
+        // 是否打开输出目录
+        gc.setOpen(false);
+        // 开启 BaseResultMap
+        gc.setBaseResultMap(true);
+        // 指定生成的主键的ID类型
+        gc.setIdType(IdType.ID_WORKER);
+        // 时间类型对应策略: 只使用 java.util.date 代替
+        gc.setDateType(DateType.ONLY_DATE);
+        mpg.setGlobalConfig(gc);
+
+        // 数据源配置
+        DataSourceConfig config= new DataSourceConfig();
+        // 从试图获取
+        config.setUrl("jdbc:mysql://localhost:3306/msdw_tms?serverTimezone=UTC");
+        config.setDriverName("com.mysql.cj.jdbc.Driver");
+        config.setUsername("root");
+        config.setPassword("root");
+        mpg.setDataSource(config);
+
+        // 包配置
+        PackageConfig pc = new PackageConfig();
+        // 父包名。如果为空，将下面子包名必须写全部， 否则就只需写子包名
+        pc.setParent(pack);
+        // Entity包名
+        pc.setEntity("entity");
+        mpg.setPackageInfo(pc);
+
+        // 自定义配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                // to do nothing
+            }
+        };
+        List<FileOutConfig> focList = new ArrayList<>();
+        focList.add(new FileOutConfig("/templates/mapper.xml.ftl") {
+            public String outputFile(TableInfo tableInfo) {
+                // 自定义输入文件名称
+                if (StringUtils.isEmpty(pc.getModuleName())) {
+                    return projectPath + "/src/main/resources/mapper/tms/" + tableInfo.getXmlName() + StringPool.DOT_XML;
+                }else {
+                    return projectPath + "/src/main/resources/mapper/tms/" + pc.getModuleName() + "/" + tableInfo.getXmlName() + StringPool.DOT_XML;
+                }
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);
+        mpg.setTemplate(new TemplateConfig().setXml(null));
+
+        // 策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        // 数据库表映射到实体的命名策略: 下划线转驼峰命名
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        // 数据库表字段映射到实体的命名策略: 下划线转驼峰命名
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        // 【实体】是否为lombok模型（默认 false）
+        strategy.setEntityLombokModel(false);
+        // 需要包含的表名，允许正则表达式（与exclude二选一配置）
+        strategy.setInclude(tables);
+        // 驼峰转连字符
+        strategy.setControllerMappingHyphenStyle(true);
+        // 表前缀
+        strategy.setTablePrefix(tablePrefixs);
+        mpg.setStrategy(strategy);
+        mpg.setTemplateEngine(new FreemarkerTemplateEngine());
+        mpg.execute();
+    }
+}

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

@@ -2,378 +2,442 @@
 <!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">
 
-	<!-- 通用查询映射结果 -->
+    <!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.msdw.tms.entity.ExperimentalReportEntity">
+    <resultMap id="BaseResultMap" type="com.msdw.tms.entity.ExperimentalReportEntity">
-		<id column="reportId" property="reportId"/>
+        <id column="reportId" property="reportId"/>
-		<result column="projectId" property="projectId"/>
+        <result column="projectId" property="projectId"/>
-		<result column="principle" property="principle"/>
+        <result column="principle" property="principle"/>
-		<result column="content" property="content"/>
+        <result column="content" property="content"/>
-		<result column="data" property="data"/>
+        <result column="data" property="data"/>
-		<result column="analysis" property="analysis"/>
+        <result column="analysis" property="analysis"/>
-		<result column="conclusion" property="conclusion"/>
+        <result column="conclusion" property="conclusion"/>
-		<result column="summarize" property="summarize"/>
+        <result column="summarize" property="summarize"/>
-		<result column="purpose" property="purpose"/>
+        <result column="purpose" property="purpose"/>
-		<result column="improvement" property="improvement"/>
+        <result column="improvement" property="improvement"/>
-		<result column="comment" property="comment"/>
+        <result column="comment" property="comment"/>
-		<result column="studentId" property="studentId"/>
+        <result column="studentId" property="studentId"/>
-		<result column="teacherName" property="teacherName"/>
+        <result column="teacherName" property="teacherName"/>
-		<result column="period" property="period"/>
+        <result column="period" property="period"/>
-		<result column="laboratory" property="laboratory"/>
+        <result column="laboratory" property="laboratory"/>
-		<result column="equipment" property="equipment"/>
+        <result column="equipment" property="equipment"/>
-		<result column="score" property="score"/>
+        <result column="score" property="score"/>
-		<result column="timeConsuming" property="timeConsuming"/>
+        <result column="timeConsuming" property="timeConsuming"/>
-		<result column="startTime" property="startTime"/>
+        <result column="startTime" property="startTime"/>
-		<result column="creationTime" property="creationTime"/>
+        <result column="creationTime" property="creationTime"/>
-		<result column="className" property="className"/>
+        <result column="className" property="className"/>
-		<result column="steps1" property="steps1"/>
+        <result column="steps1" property="steps1"/>
-		<result column="steps2" property="steps2"/>
+        <result column="steps2" property="steps2"/>
-		<result column="steps3" property="steps3"/>
+        <result column="steps3" property="steps3"/>
-		<result column="steps4" property="steps4"/>
+        <result column="steps4" property="steps4"/>
-		<result column="steps5" property="steps5"/>
+        <result column="steps5" property="steps5"/>
-		<result column="steps6" property="steps6"/>
+        <result column="steps6" property="steps6"/>
-		<result column="steps7" property="steps7"/>
+        <result column="steps7" property="steps7"/>
-		<result column="steps8" property="steps8"/>
+        <result column="steps8" property="steps8"/>
-		<result column="steps9" property="steps9"/>
+        <result column="steps9" property="steps9"/>
-		<result column="steps10" property="steps10"/>
+        <result column="steps10" property="steps10"/>
-		<result column="projectName" property="projectName"/>
+        <result column="projectName" property="projectName"/>
-		<result column="workNumber" property="workNumber"/>
+        <result column="workNumber" property="workNumber"/>
-	</resultMap>
+    </resultMap>
 
-	<select id="getReport" resultMap="BaseResultMap" parameterType="com.msdw.tms.entity.ExperimentalReportEntity">
+    <select id="getReport" resultMap="BaseResultMap" parameterType="com.msdw.tms.entity.ExperimentalReportEntity">
-        SELECT her.*,pm.projectName,s.workNumber FROM
+        SELECT her.*, pm.projectName, s.workNumber
-        hr_experimental_report her,hr_project_management pm,student s
+        FROM hr_experimental_report her,
-        WHERE her.reportId = #{reportId} and her.studentId = #{studentId} and her.projectId = pm.projectId and her.studentId = s.userId
+             hr_project_management pm,
+             student s
+        WHERE her.reportId = #{reportId}
+          and her.studentId = #{studentId}
+          and her.projectId = pm.projectId
+          and her.studentId = s.userId
     </select>
 
-	<select id="getScore" resultType="com.msdw.tms.entity.vo.UserScoreVO" parameterType="com.msdw.tms.entity.vo.UserScoreVO">
+    <select id="getScore" resultType="com.msdw.tms.entity.vo.UserScoreVO"
-		SELECT id,score,tradingJudgmentPointsId,projectId,systemId,userId,isCorrect,reportId,userAnswers
+            parameterType="com.msdw.tms.entity.vo.UserScoreVO">
-		FROM hr_user_score WHERE reportId = #{reportId} and userId = #{userId}
+        SELECT id,
-	</select>
+               score,
+               tradingJudgmentPointsId,
+               projectId,
+               systemId,
+               userId,
+               isCorrect,
+               reportId,
+               userAnswers
+        FROM hr_user_score
+        WHERE reportId = #{reportId}
+          and userId = #{userId}
+    </select>
 
-<!--	<resultMap id="achievementMap" type="com.msdw.tms.entity.ExperimentalReportEntity">-->
+    <!--	<resultMap id="achievementMap" type="com.msdw.tms.entity.ExperimentalReportEntity">-->
-<!--		<result property="experimentalClassName" column="experimental_class_name"></result>-->
+    <!--		<result property="experimentalClassName" column="experimental_class_name"></result>-->
-<!--	</resultMap>-->
+    <!--	</resultMap>-->
-	<insert id="addReport" useGeneratedKeys="true" keyProperty="reportId">
+    <insert id="addReport" useGeneratedKeys="true" keyProperty="reportId">
-        INSERT INTO hr_experimental_report( projectId, content, principle, step, analysis, summarize, improvement,
+        INSERT INTO hr_experimental_report(projectId, content, principle, step, analysis, summarize, improvement,
-        commentId, studentId, period,laboratory,className,steps1,steps2,steps3,steps4,steps5,steps6,steps7,steps8,steps9,steps10,timeConsuming,startTime,creationTime,purpose,teacherName)
+                                           commentId, studentId, period, laboratory, className, steps1, steps2, steps3,
-		VALUES
+                                           steps4, steps5, steps6, steps7, steps8, steps9, steps10, timeConsuming,
-		(#{projectId},#{content}, #{principle}, #{step}, #{analysis}, #{summarize}, #{improvement}, #{commentId}, #{studentId},
+                                           startTime, creationTime, purpose, teacherName)
- 		#{period}, #{laboratory},#{className},#{steps1},#{steps2},#{steps3},#{steps4},#{steps5},#{steps6},#{steps7},#{steps8},#{steps9},#{steps10},#{timeConsuming},#{startTime},#{creationTime},#{purpose},#{teacherName})
+        VALUES (#{projectId}, #{content}, #{principle}, #{step}, #{analysis}, #{summarize}, #{improvement},
+                #{commentId}, #{studentId},
+                #{period}, #{laboratory}, #{className}, #{steps1}, #{steps2}, #{steps3}, #{steps4}, #{steps5},
+                #{steps6}, #{steps7}, #{steps8}, #{steps9}, #{steps10}, #{timeConsuming}, #{startTime}, #{creationTime},
+                #{purpose}, #{teacherName})
     </insert>
 
-	<update id="deleteReport">
+    <update id="deleteReport">
-        UPDATE tms_project_record tpr,hr_experimental_report tcr SET tpr.isdel = 1 , tcr.isdel = 1 WHERE tpr.recordId = tcr.eventId AND tcr.reportId = #{reportId}
+        UPDATE tms_project_record tpr,hr_experimental_report tcr
+        SET tpr.isdel = 1, tcr.isdel = 1
+        WHERE tpr.recordId = tcr.eventId AND tcr.reportId = #{reportId}
+    </update>
+    <update id="updateComment">
+        UPDATE tms_experimental_report
+        SET `comment` = #{comment}
+        WHERE reportId = #{reportId}
     </update>
-	<update id="updateComment">
-		UPDATE tms_experimental_report SET `comment` = #{comment} WHERE reportId = #{reportId}
-	</update>
 
-	<update id="updateSignatrue">
+    <update id="updateSignatrue">
-UPDATE tms_experimental_report SET isSignature = #{isSignature} , signatureId = #{signatureId}, `comment` = #{comment} WHERE reportId = #{reportId}
+        UPDATE tms_experimental_report
-	</update>
+        SET isSignature = #{isSignature},
-	<select id="queryReport" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">
+            signatureId = #{signatureId},
-SELECT
+            `comment`   = #{comment}
-	ter.reportId,
+        WHERE reportId = #{reportId}
-	IFNULL( ter.`comment`, ( SELECT `comment` FROM tms_comment WHERE id = commentId ) ) AS comment,
+    </update>
-	ter.projectId,
+    <select id="queryReport" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">
-	ter.principle,
+        SELECT ter.reportId,
-	ter.content,
+               IFNULL(ter.`comment`, (SELECT `comment` FROM tms_comment WHERE id = commentId)) AS comment,
-	ter.step,
+               ter.projectId,
-	ter.`data`,
+               ter.principle,
-	ter.analysis,
+               ter.content,
-	ter.conclusion,
+               ter.step,
-	ter.summarize,
+               ter.`data`,
-	ter.improvement,
+               ter.analysis,
-	ter.commentId,
+               ter.conclusion,
-	ter.studentId,
+               ter.summarize,
-	ter.teacherName,
+               ter.improvement,
-	ter.period,
+               ter.commentId,
-	ter.laboratory,
+               ter.studentId,
-	ter.eventId,
+               ter.teacherName,
-	ter.isSignature,
+               ter.period,
-	ter.signatureId,
+               ter.laboratory,
-	ter.isdel ,
+               ter.eventId,
-	hpm.projectName,
+               ter.isSignature,
-	hpm.systemId,
+               ter.signatureId,
-	ts.signature_name AS signatureName,
+               ter.isdel,
-	ts.signature_url AS signatureUrl,
+               hpm.projectName,
-	tc.`level`
+               hpm.systemId,
-FROM
+               ts.signature_name                                                               AS signatureName,
-	tms_experimental_report ter
+               ts.signature_url                                                                AS signatureUrl,
-	LEFT JOIN tms_signature ts ON signatureId = ts.id
+               tc.`level`
-	LEFT JOIN tms_comment tc ON commentId = tc.id
+        FROM tms_experimental_report ter
-	LEFT JOIN tms_project_record AS tpr ON tpr.recordId = ter.eventId
+                 LEFT JOIN tms_signature ts ON signatureId = ts.id
-	LEFT JOIN hr_project_management AS hpm ON hpm.projectId = tpr.projectId
+                 LEFT JOIN tms_comment tc ON commentId = tc.id
-WHERE
+                 LEFT JOIN tms_project_record AS tpr ON tpr.recordId = ter.eventId
-	reportId = #{reportId}
+                 LEFT JOIN hr_project_management AS hpm ON hpm.projectId = tpr.projectId
+        WHERE reportId = #{reportId}
+    </select>
+    <select id="queryEvaluationReport" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">
+        SELECT
+        u.userName,
+        sch.schoolName,
+        s.workNumber,
+        tpr.score,
+        tpr.submitTime,
+        tpr.recordId,
+        tcr.reportId
+        FROM
+        hr_project_management hpm,
+        hr_user_info u,
+        student s,
+        tms_project_record tpr,
+        tms_experimental_report tcr,
+        school sch
+        WHERE
+        hpm.projectId = tpr.projectId
+        AND tpr.userId = u.userId
+        AND u.userId = s.userId
+        AND sch.schoolId = u.schoolId
+        AND tcr.eventId = tpr.recordId
+        AND tpr.isdel = 0
+        AND tcr.isdel = 0
+        AND u.isdel = 0
+        AND tpr.projectId = #{projectId}
+        <if test="searchContant!=null and searchContant!=''">AND (sch.schoolName LIKE CONCAT('%',#{searchContant},'%')
+            OR u.userName LIKE CONCAT('%',#{searchContant},'%') )
+        </if>
+        GROUP BY
+        tcr.reportId
+        ORDER BY tpr.submitTime DESC
+    </select>
+
+    <select id="queryAchievement" resultType="com.msdw.tms.entity.request.AchievementImportRequest">
+        SELECT
+        u.userName,
+        sch.schoolName,
+        s.workNumber,
+        tpr.score,
+        tpr.submitTime,
+        tpr.recordId,
+        tcr.reportId
+        FROM
+        hr_project_management hpm,
+        hr_user_info u,
+        student s,
+        tms_project_record tpr,
+        tms_experimental_report tcr,
+        school sch
+        WHERE
+        hpm.projectId = tpr.projectId
+        AND tpr.userId = u.userId
+        AND u.userId = s.userId
+        AND sch.schoolId = u.schoolId
+        AND tcr.eventId = tpr.recordId
+        AND tpr.isdel = 0
+        AND tcr.isdel = 0
+        AND u.isdel = 0
+        <if test="ids.size()>0">
+            AND recordId IN (
+            <foreach collection="ids" separator="," item="recordId">
+                #{recordId}
+            </foreach>
+            )
+        </if>
+        GROUP BY
+        tcr.reportId
+        ORDER BY tpr.submitTime DESC
+    </select>
+    <select id="queryFictitiousRecord" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">
+        SELECT
+        hpm.projectName,
+        hpm.creationTime AS creationtime,
+        hpm.projectPermissions,
+        count( tcr.reportId ) AS reportNumber,
+        tcr.projectId,
+        tcr.reportId,
+        tpr.recordId
+        FROM
+        hr_project_management hpm
+        LEFT JOIN tms_project_record tpr ON hpm.projectId = tpr.projectId
+        LEFT JOIN tms_experimental_report tcr ON tpr.recordId = tcr.eventId
+        WHERE
+        tpr.isdel = 0
+        AND tcr.isdel = 0
+        AND hpm.projectPermissions = 0
+        <if test="systemId!=null and systemId!=''">AND hpm.systemId = #{systemId}</if>
+        <if test="searchContant!=null and searchContant!=''">and hpm.projectName like concat('%',#{searchContant},'%')
+        </if>
+        <if test="startingtime!=null and startingtime!='' and endtime!=null and endtime != ''">and hpm.creationTime
+            between #{endtime} and #{startingtime}
+        </if>
+        <if test="month!=null and month != ''">and DATE_SUB(CURDATE(), INTERVAL #{month} month ) &lt;=
+            date(hpm.creationTime)
+        </if>
+        <if test="projectIds.size!=null">
+            AND tpr.projectId IN (
+            <foreach collection="projectIds" separator="," item="projectId">
+                #{projectId}
+            </foreach>
+            )
+        </if>
+        GROUP BY
+        tcr.reportId
+        ORDER BY
+        creationtime DESC,tcr.reportId DESC
     </select>
-	<select id="queryEvaluationReport" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">
+    <select id="queryEducationRecord" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">
-		SELECT
+        SELECT
-		u.userName,
+        hpm.projectName,
-		sch.schoolName,
+        hpm.creationTime AS creationtime,
-		s.workNumber,
+        tet.experimental_class_name,
-		tpr.score,
+        hpm.projectPermissions,
-		tpr.submitTime,
+        tcr.projectId,
-		tpr.recordId,
+        tcr.reportId,
-		tcr.reportId
+        tpr.recordId,
-		FROM
+        count( tcr.reportId ) AS reportNumber
-		hr_project_management hpm,
+        FROM
-		hr_user_info u,
+        hr_project_management hpm
-		student s,
+        LEFT JOIN tms_experimental_teaching tet ON tet.project_id = hpm.projectId
-		tms_project_record tpr,
+        LEFT JOIN tms_project_record tpr ON tet.project_id = tpr.projectId
-		tms_experimental_report tcr,
+        LEFT JOIN tms_experimental_report tcr ON tcr.projectId = tet.id
-		school sch
+        WHERE
-		WHERE
+        tpr.isdel = 0
-		hpm.projectId = tpr.projectId
+        AND hpm.projectPermissions = 1
-		AND tpr.userId = u.userId
+        AND tcr.isdel = 0
-		AND u.userId = s.userId
+        <if test="systemId!=null and systemId!=''">AND hpm.systemId = #{systemId}</if>
-		AND sch.schoolId = u.schoolId
+        <if test="searchContant!=null and searchContant!=''">and (hpm.projectName like concat('%',#{searchContant},'%')
-		AND tcr.eventId = tpr.recordId
+            OR tet.experimental_class_name like concat('%',#{searchContant},'%') )
-		AND tpr.isdel = 0
+        </if>
-		AND tcr.isdel = 0
+        <if test="startingtime!=null and startingtime!='' and endtime!=null and endtime != ''">and hpm.creationTime
-		AND u.isdel = 0
+            between #{endtime} and #{startingtime}
-		AND tpr.projectId = #{projectId}
+        </if>
-		<if test="searchContant!=null and searchContant!=''"> AND (sch.schoolName LIKE CONCAT('%',#{searchContant},'%') OR u.userName LIKE CONCAT('%',#{searchContant},'%') )</if>
+        <if test="month!=null and month != ''">and DATE_SUB(CURDATE(), INTERVAL #{month} month ) &lt;=
-		GROUP BY
+            date(creation_time)
-		tcr.reportId
+        </if>
-		ORDER BY tpr.submitTime DESC
+        <if test="projectIds.size!=null">
-	</select>
+            AND tet.id IN (
+            <foreach collection="projectIds" separator="," item="projectId">
+                #{projectId}
+            </foreach>
+            )
+        </if>
+        GROUP BY
+        tcr.reportId
+        ORDER BY
+        creationtime DESC,tcr.reportId DESC
+    </select>
+    <select id="queryFictitiousReport" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">
+        SELECT
+        u.userName,
+        sch.schoolName,
+        s.workNumber,
+        tpr.score,
+        tpr.submitTime,
+        tpr.recordId,
+        tcr.reportId
+        FROM
+        hr_project_management hpm,
+        hr_user_info u,
+        student s,
+        tms_project_record tpr,
+        tms_experimental_report tcr,
+        school sch
+        WHERE
+        hpm.projectId = tpr.projectId
+        AND tpr.userId = u.userId
+        AND u.userId = s.userId
+        AND sch.schoolId = u.schoolId
+        AND tcr.eventId = tpr.recordId
+        AND tpr.isdel = 0
+        AND tcr.isdel = 0
+        AND u.isdel = 0
+        AND tpr.projectId = #{projectId}
+        <if test="searchContant!=null and searchContant!=''">AND (sch.schoolName LIKE CONCAT('%',#{searchContant},'%')
+            OR u.userName LIKE CONCAT('%',#{searchContant},'%') )
+        </if>
+        GROUP BY
+        tcr.reportId
+        ORDER BY tpr.submitTime DESC
+    </select>
+    <select id="countEducationProjectId" resultType="java.lang.Integer">
+        SELECT ter.projectId
+        FROM tms_experimental_report ter
+                 LEFT JOIN tms_experimental_teaching tet ON tet.id = ter.projectId
+                 LEFT JOIN hr_project_management hpm ON tet.project_id = hpm.projectId
+        WHERE ter.isdel = 0
+          AND hpm.projectPermissions = 1
+          AND ter.projectId IS NOT NULL
+        GROUP BY ter.projectId
+    </select>
+    <select id="countFictitiousProjectId" resultType="java.lang.Integer">
+        SELECT tpr.projectId
+        FROM tms_project_record tpr
+                 LEFT JOIN hr_project_management hpm ON tpr.projectId = hpm.projectId
+        WHERE tpr.isdel = 0
+          AND hpm.projectPermissions = 0
+        GROUP BY tpr.projectId
+    </select>
+    <select id="queryEvaluationName" resultType="java.lang.String">
+        SELECT project_name AS evaluationName
+        FROM tms_experimental_teaching
+        WHERE project_id = #{projectId}
+    </select>
+    <select id="queryPythonTest" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">
+        SELECT hec.`code`                              AS userAnswer,
+               hec.codeId,
+               IF
+                   (p.rightAndWrong = 0, hsi.score, 0) AS codeScore,
+               hjp.judgmentPointsName,
+               hjp.experimentcode                      AS answer
+        FROM hr_experiment_code AS hec,
+             hr_score_index AS hsi,
+             hr_judgment_points AS hjp,
+             pointrecord p
+        WHERE hjp.judgmentPointsId = hsi.judgmentPointsId
+          AND hjp.judgmentPointsId = hec.judgmentPointsId
+          AND p.codeId = hec.codeId
 
-	<select id="queryAchievement" resultType="com.msdw.tms.entity.request.AchievementImportRequest">
+          AND hjp.isdel = 0
-		SELECT
+          AND hec.recordId = #{recordId}
-		u.userName,
+        GROUP BY hec.codeId
-		sch.schoolName,
+    </select>
-		s.workNumber,
-		tpr.score,
-		tpr.submitTime,
-		tpr.recordId,
-		tcr.reportId
-		FROM
-		hr_project_management hpm,
-		hr_user_info u,
-		student s,
-		tms_project_record tpr,
-		tms_experimental_report tcr,
-		school sch
-		WHERE
-		hpm.projectId = tpr.projectId
-		AND tpr.userId = u.userId
-		AND u.userId = s.userId
-		AND sch.schoolId = u.schoolId
-		AND tcr.eventId = tpr.recordId
-		AND tpr.isdel = 0
-		AND tcr.isdel = 0
-		AND u.isdel = 0
-		<if test="ids.size()>0">
-			AND recordId IN (
-			<foreach collection="ids" separator="," item="recordId">
-				#{recordId}
-			</foreach>
-			)
-		</if>
-		GROUP BY
-		tcr.reportId
-		ORDER BY tpr.submitTime DESC
-	</select>
-	<select id="queryFictitiousRecord" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">
-		SELECT
-		hpm.projectName,
-		hpm.creationTime AS creationtime,
-		hpm.projectPermissions,
-		count( tcr.reportId ) AS reportNumber,
-		tcr.projectId,
-		tcr.reportId,
-		tpr.recordId
-		FROM
-		hr_project_management hpm
-		LEFT JOIN tms_project_record tpr ON hpm.projectId = tpr.projectId
-		LEFT JOIN tms_experimental_report tcr ON tpr.recordId = tcr.eventId
-		WHERE
-		tpr.isdel = 0
-		AND tcr.isdel = 0
-		AND hpm.projectPermissions = 0
-		<if test="systemId!=null and systemId!=''"> AND hpm.systemId = #{systemId} </if>
-		<if test="searchContant!=null and searchContant!=''"> and hpm.projectName like concat('%',#{searchContant},'%')</if>
-		<if test="startingtime!=null and startingtime!='' and endtime!=null and endtime != ''"> and hpm.creationTime between #{endtime} and #{startingtime}</if>
-		<if test="month!=null and month != ''">and DATE_SUB(CURDATE(), INTERVAL #{month} month ) &lt;= date(hpm.creationTime)</if>
-		<if test="projectIds.size!=null">
-			AND tpr.projectId IN (
-			<foreach collection="projectIds" separator="," item="projectId">
-				#{projectId}
-			</foreach>
-			) </if>
-		GROUP BY
-		tcr.reportId
-		ORDER BY
-		creationtime DESC,tcr.reportId DESC
-	</select>
-	<select id="queryEducationRecord" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">
-		SELECT
-		hpm.projectName,
-		hpm.creationTime AS creationtime,
-		tet.experimental_class_name,
-		hpm.projectPermissions,
-		tcr.projectId,
-		tcr.reportId,
-		tpr.recordId,
-		count( tcr.reportId ) AS reportNumber
-		FROM
-		hr_project_management hpm
-		LEFT JOIN tms_experimental_teaching tet ON tet.project_id = hpm.projectId
-		LEFT JOIN tms_project_record tpr ON tet.project_id = tpr.projectId
-		LEFT JOIN tms_experimental_report tcr ON tcr.projectId = tet.id
-		WHERE
-		tpr.isdel = 0
-		AND hpm.projectPermissions = 1
-		AND tcr.isdel = 0
-		<if test="systemId!=null and systemId!=''"> AND hpm.systemId = #{systemId} </if>
-		<if test="searchContant!=null and searchContant!=''"> and (hpm.projectName like concat('%',#{searchContant},'%') OR tet.experimental_class_name like concat('%',#{searchContant},'%') )</if>
-		<if test="startingtime!=null and startingtime!='' and endtime!=null and endtime != ''"> and hpm.creationTime between #{endtime} and #{startingtime}</if>
-		<if test="month!=null and month != ''">and DATE_SUB(CURDATE(), INTERVAL #{month} month ) &lt;= date(creation_time)</if>
-		<if test="projectIds.size!=null">
-			AND tet.id IN (
-			<foreach collection="projectIds" separator="," item="projectId">
-				#{projectId}
-			</foreach>
-			) </if>
-		GROUP BY
-		tcr.reportId
-		ORDER BY
-		creationtime DESC,tcr.reportId DESC
-	</select>
-	<select id="queryFictitiousReport" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">
-		SELECT
-		u.userName,
-		sch.schoolName,
-		s.workNumber,
-		tpr.score,
-		tpr.submitTime,
-		tpr.recordId,
-		tcr.reportId
-		FROM
-		hr_project_management hpm,
-		hr_user_info u,
-		student s,
-		tms_project_record tpr,
-		tms_experimental_report tcr,
-		school sch
-		WHERE
-		hpm.projectId = tpr.projectId
-		AND tpr.userId = u.userId
-		AND u.userId = s.userId
-		AND sch.schoolId = u.schoolId
-		AND tcr.eventId = tpr.recordId
-		AND tpr.isdel = 0
-		AND tcr.isdel = 0
-		AND u.isdel = 0
-		AND tpr.projectId = #{projectId}
-		<if test="searchContant!=null and searchContant!=''"> AND (sch.schoolName LIKE CONCAT('%',#{searchContant},'%') OR u.userName LIKE CONCAT('%',#{searchContant},'%') )</if>
-		GROUP BY
-		tcr.reportId
-		ORDER BY tpr.submitTime DESC
-	</select>
-	<select id="countEducationProjectId" resultType="java.lang.Integer">
-SELECT
-	ter.projectId
-FROM
-	tms_experimental_report ter
-	LEFT JOIN tms_experimental_teaching tet ON tet.id = ter.projectId
-	LEFT JOIN hr_project_management hpm ON tet.project_id = hpm.projectId
-WHERE
-	ter.isdel = 0
-	AND hpm.projectPermissions = 1
-	AND ter.projectId IS NOT NULL
-GROUP BY
-	ter.projectId
-	</select>
-	<select id="countFictitiousProjectId" resultType="java.lang.Integer">
-SELECT
-	tpr.projectId
-FROM
-	tms_project_record tpr
-	LEFT JOIN hr_project_management hpm ON tpr.projectId = hpm.projectId
-WHERE
-	tpr.isdel = 0
-	AND hpm.projectPermissions = 0
-GROUP BY
-	tpr.projectId
-	</select>
-	<select id="queryEvaluationName" resultType="java.lang.String">
-		SELECT project_name AS evaluationName FROM tms_experimental_teaching WHERE project_id = #{projectId}
-	</select>
-	<select id="queryPythonTest" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">
-SELECT
-	hec.`code` AS userAnswer,
-	hec.codeId,
-	if(p.rightAndWrong=0,hsi.score,0) AS codeScore,
-	hjp.judgmentPointsName,
-	hjp.experimentcode AS answer
-FROM
-	hr_experiment_code AS hec,
-	hr_score_index AS hsi,
-	hr_judgment_points AS hjp,
-	pointrecord p
-WHERE
-	hjp.judgmentPointsId = hsi.judgmentPointsId
-	AND hjp.judgmentPointsId = hec.judgmentPointsId
-	AND p.codeId = hec.codeId
-	AND hsi.isdel = 0
-	AND hjp.isdel = 0
-	AND hec.recordId = #{recordId}
-GROUP BY
-	hec.codeId
-ORDER BY
-	hec.codeId ASC
-	</select>
 
     <select id="list" resultType="com.msdw.tms.entity.ResultsEntity">
-	SELECT hpm.creationTime,hpm.projectId,hpm.projectName,hpm.projectPermissions,hpm.systemId,(SELECT count(*) FROM hr_experimental_report her where hpm.projectId = her.projectId ) as number
+        SELECT hpm.creationTime,hpm.projectId,hpm.projectName,hpm.projectPermissions,hpm.systemId,(SELECT count(*) FROM
-	FROM hr_project_management hpm WHERE systemId = #{systemId}
+        hr_experimental_report her where hpm.projectId = her.projectId ) as number
-	AND hpm.isdel = 0
+        FROM hr_project_management hpm WHERE systemId = #{systemId}
-	<if test="projectPermissions!=null and projectPermissions!=''"> AND hpm.projectPermissions = #{projectPermissions} </if>
+        AND hpm.isdel = 0
-	<if test="searchContant!=null and searchContant!=''"> and hpm.projectName like concat('%',#{searchContant},'%')</if>
+        <if test="projectPermissions!=null and projectPermissions!=''">AND hpm.projectPermissions =
-	<if test="startTime!=null and startTime!='' and endTime!=null and endTime != ''"> and hpm.creationTime between #{endTime} and #{startTime}</if>
+            #{projectPermissions}
-	<if test="month!=null and month != ''">and DATE_SUB(CURDATE(), INTERVAL #{month} month ) &lt;= date(hpm.creationTime)</if>
+        </if>
-	ORDER BY hpm.creationTime DESC
+        <if test="searchContant!=null and searchContant!=''">and hpm.projectName like concat('%',#{searchContant},'%')
-	</select>
+        </if>
+        <if test="startTime!=null and startTime!='' and endTime!=null and endTime != ''">and hpm.creationTime between
+            #{endTime} and #{startTime}
+        </if>
+        <if test="month!=null and month != ''">and DATE_SUB(CURDATE(), INTERVAL #{month} month ) &lt;=
+            date(hpm.creationTime)
+        </if>
+        ORDER BY hpm.creationTime DESC
+    </select>
 
-	<select id="newList" resultType="com.msdw.tms.entity.ResultsEntity">
+    <select id="newList" resultType="com.msdw.tms.entity.ResultsEntity">
-		SELECT et.id,et.experimental_class_name as experimentalClassName,et.experimental_name as experimentalName,et.project_id as projectId,
+        SELECT et.id,et.experimental_class_name as experimentalClassName,et.experimental_name as
-		pm.projectName,pm.projectPermissions,et.creation_time as creationTime,(SELECT count(*) FROM hr_experimental_report her where et.project_id = her.projectId ) as number
+        experimentalName,et.project_id as projectId,
-		FROM tms_experimental_teaching et,hr_project_management pm
+        pm.projectName,pm.projectPermissions,et.creation_time as creationTime,(SELECT count(*) FROM
-		WHERE user_id = #{userId}
+        hr_experimental_report her where et.project_id = her.projectId ) as number
-		AND et.project_id = pm.projectId
+        FROM tms_experimental_teaching et,hr_project_management pm
-		AND pm.isdel = 0
+        WHERE user_id = #{userId}
-		<if test="searchContant!=null and searchContant!=''"> and et.experimental_class_name like concat('%',#{searchContant},'%') or et.experimental_name like concat('%',#{searchContant},'%')  or pm.projectName like concat('%',#{searchContant},'%') </if>
+        AND et.project_id = pm.projectId
-		<if test="startTime!=null and startTime!='' and endTime!=null and endTime != ''"> and et.creation_time between #{endTime} and #{startTime}</if>
+        AND pm.isdel = 0
-		<if test="month!=null and month != ''">and DATE_SUB(CURDATE(), INTERVAL #{month} month ) &lt;= date(et.creation_time)</if>
+        <if test="searchContant!=null and searchContant!=''">and et.experimental_class_name like
-		ORDER BY et.creation_time DESC
+            concat('%',#{searchContant},'%') or et.experimental_name like concat('%',#{searchContant},'%') or
-	</select>
+            pm.projectName like concat('%',#{searchContant},'%')
+        </if>
+        <if test="startTime!=null and startTime!='' and endTime!=null and endTime != ''">and et.creation_time between
+            #{endTime} and #{startTime}
+        </if>
+        <if test="month!=null and month != ''">and DATE_SUB(CURDATE(), INTERVAL #{month} month ) &lt;=
+            date(et.creation_time)
+        </if>
+        ORDER BY et.creation_time DESC
+    </select>
 
-	<select id="reportList" resultType="com.msdw.tms.entity.ReportEntity">
+    <select id="reportList" resultType="com.msdw.tms.entity.ReportEntity">
-	SELECT hui.userId,her.reportId,hui.userName as studentName,s.schoolName,stu.workNumber,her.score,her.creationTime
+        SELECT hui.userId,her.reportId,hui.userName as
-	FROM hr_experimental_report her,hr_user_info hui,school s,student stu
+        studentName,s.schoolName,stu.workNumber,her.score,her.creationTime
-	WHERE her.projectId = #{projectId}
+        FROM hr_experimental_report her,hr_user_info hui,school s,student stu
-	AND her.studentId = hui.userId
+        WHERE her.projectId = #{projectId}
-	AND her.studentId = stu.userId
+        AND her.studentId = hui.userId
-	AND hui.schoolId = s.schoolId
+        AND her.studentId = stu.userId
-	AND her.isdel = 0
+        AND hui.schoolId = s.schoolId
-	<if test="searchContant!=null and searchContant!=''"> AND (hui.userName LIKE CONCAT('%',#{searchContant},'%') OR s.schoolName LIKE CONCAT('%',#{searchContant},'%') )</if>
+        AND her.isdel = 0
-	ORDER BY her.creationTime desc
+        <if test="searchContant!=null and searchContant!=''">AND (hui.userName LIKE CONCAT('%',#{searchContant},'%') OR
-	</select>
+            s.schoolName LIKE CONCAT('%',#{searchContant},'%') )
+        </if>
+        ORDER BY her.creationTime desc
+    </select>
 
-	<select id="getTeacher" resultType="java.lang.String">
+    <select id="getTeacher" resultType="java.lang.String">
-		SELECT hui.userName FROM hr_project_management pm,hr_user_info hui
+        SELECT hui.userName
-		WHERE pm.projectId = #{projectId} and pm.userId = hui.userId
+        FROM hr_project_management pm,
-	</select>
+             hr_user_info hui
+        WHERE pm.projectId = #{projectId}
+          and pm.userId = hui.userId
+    </select>
 
     <select id="queryTradingJudgmentPointsId" resultType="java.lang.Integer">
-        SELECT tradingJudgmentPointsId FROM hr_user_score
+        SELECT tradingJudgmentPointsId
+        FROM hr_user_score
         WHERE reportId = #{reportId}
     </select>
-	<select id="getUserAnswers" resultType="com.msdw.tms.entity.vo.JudgmentPointsRuleVO">
+    <select id="getUserAnswers" resultType="com.msdw.tms.entity.vo.JudgmentPointsRuleVO">
-	SELECT tjp.judgment_points_name as judgmentPointsName,ru.type,ru.id,ru.level_one as levelOne,ru.level_two as levelTwo,ru.level_three as levelThree,ru.level_four as levelFour,ru.trading_judgment_points_id as  tradingJudgmentPointsId
+        SELECT tjp.judgment_points_name      as judgmentPointsName,
-	FROM hr_trading_judgment_points_rule ru,hr_trading_judgment_points tjp
+               ru.type,
-	WHERE ru.trading_judgment_points_id = #{tradingJudgmentPointsId} and ru.trading_judgment_points_id = tjp.id
+               ru.id,
-	</select>
+               ru.level_one                  as levelOne,
+               ru.level_two                  as levelTwo,
+               ru.level_three                as levelThree,
+               ru.level_four                 as levelFour,
+               ru.trading_judgment_points_id as tradingJudgmentPointsId
+        FROM hr_trading_judgment_points_rule ru,
+             hr_trading_judgment_points tjp
+        WHERE ru.trading_judgment_points_id = #{tradingJudgmentPointsId}
+          and ru.trading_judgment_points_id = tjp.id
+    </select>
 </mapper>

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

@@ -27,7 +27,7 @@
         AND (user_id in (select userId FROM staff WHERE schoolId = #{cla.schoolId} AND isdel = 0 AND  FIND_IN_SET(roleId,'1,2,3') )
         OR user_id IN ( SELECT userId FROM hr_user_info WHERE disableAccount = 0 AND isdel = 0 AND FIND_IN_SET( roleId, '1' ) ) )
         <if test="cla.status!=null">and `status` = #{cla.status}</if>
-        <if test="cla.condition!=null">and ( project_name like concat('%',#{cla.condition},'%') or experimental_class_name like concat('%',#{cla.condition},'%') )</if>
+        <if test="cla.condition!=null">and ( experimental_name like concat('%',#{cla.condition},'%') or experimental_class_name like concat('%',#{cla.condition},'%') )</if>
         <if test="cla.startTime!=null and cla.endTime!=null">and stop_time between #{cla.endTime} and #{cla.startTime}</if>
         <if test="cla.month!=null">and DATE_SUB(CURDATE(), INTERVAL #{cla.month} month ) &lt;= date(creation_time)</if>
         ORDER BY creation_time DESC

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

@@ -1,85 +1,75 @@
 <?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.ExperimentalReportDao">
-<resultMap id="reportMap" type="com.msdw.tms.entity.vo.ExperimentalReportVo">
+    <resultMap id="reportMap" type="com.msdw.tms.entity.vo.ExperimentalReportVo">
-	<result property="experimentalClassName" column="experimental_class_name"></result>
+        <result property="experimentalClassName" column="experimental_class_name"></result>
-	<result property="startTime" column="start_time"></result>
+        <result property="startTime" column="start_time"></result>
-	<result property="experimentGoal" column="experiment_goal"></result>
+        <result property="experimentGoal" column="experiment_goal"></result>
-	<result property="projectName" column="project_name"></result>
+        <result property="projectName" column="project_name"></result>
-</resultMap>
+    </resultMap>
 
     <select id="queryReport" resultType="com.msdw.tms.entity.vo.ExperimentalReportVo">
-SELECT
+        SELECT u.userId,
-	u.userId,
+               u.userName,
-	u.userName,
+               stu.workNumber,
-	stu.workNumber,
+               tet.project_name,
-	tet.project_name,
+               tet.id                                                                          AS experimentId,
-	tet.id AS experimentId,
+               tet.experimental_class_name,
-	tet.experimental_class_name,
+               hpm.experimentalGoal                                                            AS experiment_goal,
-	hpm.experimentalGoal AS experiment_goal,
+               tpr.submitTime,
-	tpr.submitTime,
+               tpr.score,
-	tpr.score,
+               ter.period,
-	ter.teacherName,
+               ter.laboratory,
-	ter.period,
+               ter.principle,
-	ter.laboratory,
+               ter.content,
-	ter.principle,
+               ter.step,
-	ter.content,
+               ter.`data`,
-	ter.step,
+               ter.analysis,
-	ter.`data`,
+               ter.conclusion,
-	ter.analysis,
+               ter.summarize,
-	ter.conclusion,
+               ter.improvement,
-	ter.summarize,
+               IFNULL(ter.`comment`, (SELECT `comment` FROM tms_comment WHERE id = commentId)) AS comment
-	ter.improvement,
+        FROM hr_user_info u,
-	IFNULL( ter.`comment`, ( SELECT `comment` FROM tms_comment WHERE id = commentId ) ) AS comment
+             student stu,
-FROM
+             tms_experimental_report ter,
-	hr_user_info u,
+             hr_project_management hpm,
-	student stu,
+             tms_experimental_teaching tet,
-	tms_experimental_report ter,
+             tms_project_record tpr
-	hr_project_management hpm,
+        WHERE u.userId = stu.userId
-	tms_experimental_teaching tet,
+          AND stu.studentId = ter.studentId
-	tms_project_record tpr
+          AND hpm.projectId = tet.project_id
-WHERE
+          AND ter.projectId = tet.id
-	u.userId = stu.userId
+          AND stu.userId = tpr.userId
-	AND stu.studentId = ter.studentId
+          AND ter.studentId = #{studentId}
-	AND hpm.projectId = tet.project_id
+          AND ter.isdel = 0
-	AND ter.projectId = tet.id
+          AND tpr.isdel = 0
-	AND stu.userId = tpr.userId
+          AND tpr.recordId = #{recordId}
-	AND ter.studentId = #{studentId}
+          AND ter.projectId = #{projectId}
-	AND ter.isdel = 0
+    </select>
-	AND tpr.isdel = 0
+    <select id="queryVirtualReport" resultType="com.msdw.tms.entity.vo.ExperimentalReportVo">
-	AND tpr.recordId = #{recordId}
+        SELECT tpr.recordId,
-	AND ter.projectId = #{projectId}
+               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.isdel = 0
+          AND tpr.recordId = #{recordId}
+    </select>
+    <select id="querySystemId" resultType="java.lang.Integer">
+        SELECT systemId
+        FROM hr_project_management hpm,
+             tms_project_record tpr
+        WHERE tpr.projectId = hpm.projectId
+          AND tpr.recordId = #{recordId}
     </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>
-	<select id="querySystemId" resultType="java.lang.Integer">
-SELECT
-	systemId
-FROM
-	hr_project_management hpm,
-	tms_project_record tpr
-WHERE
-	tpr.projectId = hpm.projectId
-	AND tpr.recordId = #{recordId}
-	</select>
 </mapper>

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

@@ -31,7 +31,9 @@
         <if test="exp.status!=null">
             AND `status`=#{exp.status,jdbcType=INTEGER}
         </if>
-
+        <if test="exp.systemId!=null">
+            AND `system_id`=#{exp.systemId,jdbcType=INTEGER}
+        </if>
         <if test='exp.startTime!=null and exp.stopTime!=null'>
             AND creation_time between #{exp.startTime} and #{exp.stopTime}
         </if>

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

@@ -14,16 +14,16 @@
         <result property="endtime" column="endTime"/>
         <result property="submitTime" column="submitTime"/>
         <result property="isdel" column="isdel"/>
-<!--        <result property="experimental_class_name" column="experimentalClassName"/>-->
+        <!--        <result property="experimental_class_name" column="experimentalClassName"/>-->
     </resultMap>
     <insert id="addReport" useGeneratedKeys="true" keyProperty="eventId" keyColumn="recordId">
-INSERT INTO tms_project_record ( userId, projectId, score, startingTime, endTime, timeSum, submitTime )
+        INSERT INTO tms_project_record (userId, projectId, score, startingTime, endTime, timeSum, submitTime)
-VALUES
+        VALUES (#{userid}, #{projectid}, #{score}, #{startingtime}, now(), #{timeSum}, now())
-	(#{userid}, #{projectid}, #{score}, #{startingtime}, now(), #{timeSum}, now())
     </insert>
 
-    <select id="getByUserRecord"  resultType="com.msdw.tms.entity.vo.ProjectRecordVo">
+
-        SELECT
+    <!--
+    SELECT
             her.reportId as reportId,
             her.projectId,
             projectName,
@@ -42,85 +42,89 @@ VALUES
         AND
             tp.projectPermissions = #{projectPermissions}
             order by her.creationTime desc
+    -->
+    <select id="getByUserRecord" resultType="com.msdw.tms.entity.resp.GetByUserRecordResp"
+            parameterType="java.lang.Integer">
+        SELECT projectName,
+               c.recordId,
+               r.score,
+               c.codeId,
+               r.startingTime,
+               r.submitTime,
+               r.timeSum,
+               c.userId
+        FROM hr_experiment_code c
+                 INNER JOIN hr_project_management t ON t.projectId = c.projectId
+                 INNER JOIN tms_project_record r ON r.recordId = c.recordId
+        WHERE c.userId = #{userId}
+          and r.isdel = 0
+          and projectPermissions = #{projectPermissions}
+        GROUP BY c.recordId desc
     </select>
 
     <!--    -->
-    <select id="getByUserExperimentRecord"  resultType="com.msdw.tms.entity.vo.ProjectRecordVo">
+    <select id="getByUserExperimentRecord" resultType="com.msdw.tms.entity.vo.ProjectRecordVo">
-        SELECT
+        SELECT tet.id,
-            tet.id,
+               ter.reportId,
-            ter.reportId,
+               tpr.recordId,
-            tpr.recordId,
+               tpr.projectId,
-            tpr.projectId,
+               projectName,
-            projectName,
+               score,
-            score,
+               timeSum,
-            timeSum,
+               startingTime                as startTime,
-            startingTime as startTime,
+               endTime,
-            endTime,
+               recordState,
-            recordState,
+               tet.experimental_class_name as experimentalClassName
-            tet.experimental_class_name as experimentalClassName
+        FROM tms_project_record tpr
-        FROM
+                 LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId
-            tms_project_record tpr
+                 LEFT JOIN tms_experimental_teaching tet ON tet.project_id = tpr.projectId
-            LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId
+                 LEFT JOIN tms_experimental_report ter ON ter.projectId = tet.id
-            LEFT JOIN tms_experimental_teaching tet ON tet.project_id = tpr.projectId
+        WHERE tpr.userId = #{pro.userid}
-            LEFT JOIN tms_experimental_report ter ON ter.projectId = tet.id
+          AND tpr.isdel = #{pro.isdel}
-        WHERE
+          AND tp.projectPermissions !=0
-            tpr.userId = #{pro.userid}
-        AND
-            tpr.isdel = #{pro.isdel}
-        AND
-            tp.projectPermissions !=0
         AND
             ter.eventId = tpr.recordId
         ORDER BY
-	        tpr.submitTime DESC
+            tpr.recordId DESC
     </select>
 
-    <select id="getByUserRecordImport"  resultType="com.msdw.tms.entity.vo.ProjectRecordExportVo">
+    <select id="getByUserRecordImport" resultType="com.msdw.tms.entity.vo.ProjectRecordExportVo">
-        SELECT
+        SELECT tpr.projectId,
-            tpr.projectId,
+               projectName,
-            projectName,
+               score,
-            score,
+               timeSum,
-            timeSum,
+               startingTime as startTime,
-            startingTime as startTime,
+               endTime,
-            endTime,
+               recordState,
-            recordState,
+               tet.experimental_class_name
-            tet.experimental_class_name
+        FROM tms_project_record tpr
-        FROM
+                 LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId
-            tms_project_record tpr
+                 LEFT JOIN tms_experimental_teaching tet ON tpr.projectId = tet.project_id
-            LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId
+        WHERE tpr.userId = #{userid}
-            LEFT JOIN tms_experimental_teaching tet ON tpr.projectId = tet.project_id
+          AND tpr.isdel = #{isdel}
-        WHERE
+          AND tpr.projectId = tet.project_id
-            tpr.userId = #{userid}
+          AND tp.projectPermissions != 0
-        AND
-            tpr.isdel = #{isdel}
-        AND
-            tpr.projectId = tet.project_id
-        AND
-            tp.projectPermissions != 0
         ORDER BY
-	        tpr.submitTime DESC
+            tpr.submitTime DESC
     </select>
 
     <!--    个人实验预览-->
     <select id="getByUserScore" resultType="com.msdw.tms.entity.vo.ProjectRecordVo">
-        SELECT
+        SELECT userName,
-            userName,
+               count(*)     AS experimentNumber,
-            count( * ) AS experimentNumber,
+               sum(timeSum) AS totalTime,
-            sum( timeSum ) AS totalTime,
+               avg(score)      avgScore
-            avg( score ) avgScore
+        FROM tms_project_record pr
-        FROM
+                 LEFT JOIN hr_user_info u ON pr.userId = u.userId
-            tms_project_record pr
+        WHERE pr.userId = #{userid}
-            LEFT JOIN hr_user_info u ON pr.userId = u.userId
+          and pr.isdel = #{isdel}
-        WHERE
+          and u.isdel = #{isdel}
-            pr.userId = #{userid}
-        and
-            pr.isdel = #{isdel}
-        and
-            u.isdel = #{isdel}
     </select>
     <!--    个人实验预览-->
     <select id="queryScore" resultType="com.msdw.tms.entity.vo.ProjectRecordVo">
-        SELECT count(*) as experimentNumber,sum(timeConsuming) as totalTime, avg(score) as avgScore FROM hr_experimental_report where studentId = 547
+        SELECT count(*) as experimentNumber, sum(timeConsuming) as totalTime, avg(score) as avgScore
+        FROM hr_experimental_report
+        where studentId = 547
     </select>
 
     <select id="getBySchoolRecord" resultType="com.msdw.tms.entity.vo.ProjectRecordVo">
@@ -149,34 +153,35 @@ VALUES
         and
         sc.isdel = #{pro.isdel}
         <if test="pro.month!=null">and DATE_SUB(CURDATE(), INTERVAL #{pro.month} month ) &lt;= date(submitTime)</if>
-        <if test="pro.startTime!=null and pro.endTime!=null">and submitTime between #{pro.startTime} and #{pro.endTime}</if>
+        <if test="pro.startTime!=null and pro.endTime!=null">and submitTime between #{pro.startTime} and
+            #{pro.endTime}
+        </if>
         <if test="pro.recordState!=null">and recordState=#{pro.recordState}</if>
-        <if test="pro.condition!=null">and ( projectName like concat('%',#{pro.condition},'%') or schoolName like concat('%',#{pro.condition},'%') or userName like concat('%',#{pro.condition},'%') )</if>
+        <if test="pro.condition!=null">and ( projectName like concat('%',#{pro.condition},'%') or schoolName like
+            concat('%',#{pro.condition},'%') or userName like concat('%',#{pro.condition},'%') )
+        </if>
     </select>
     <select id="getByRecordImport" resultType="com.msdw.tms.entity.vo.ProjectRecordExportVo">
-        SELECT
+        SELECT tpr.projectId,
-            tpr.projectId,
+               projectName,
-            projectName,
+               score,
-            score,
+               timeSum,
-            timeSum,
+               startingTime as startTime,
-            startingTime as startTime,
+               endTime,
-            endTime,
+               recordState
-            recordState
+        FROM tms_project_record tpr
-        FROM
+                 LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId
-            tms_project_record tpr
+        WHERE tpr.userId = #{userid}
-            LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId
+          AND tpr.isdel = #{isdel}
-        WHERE
+          AND tp.projectPermissions = 0
-            tpr.userId = #{userid}
-        AND
-            tpr.isdel = #{isdel}
-        AND
-            tp.projectPermissions =0
     </select>
     <select id="queryReport" resultType="com.msdw.tms.entity.ProjectRecordEntity">
-        SELECT * FROM tms_project_record WHERE recordId = #{recordId}
+        SELECT *
+        FROM tms_project_record
+        WHERE recordId = #{recordId}
     </select>
 
-    <update id="updateUserRecord" parameterType="com.msdw.tms.entity.ProjectRecordEntity" >
+    <update id="updateUserRecord" parameterType="com.msdw.tms.entity.ProjectRecordEntity">
         update tms_project_record
         set isdel = #{isdel}
         <if test="recordstate!=null">,recordstate = #{recordstate}</if>
@@ -184,6 +189,8 @@ VALUES
     </update>
 
     <update id="updateScore">
-        UPDATE tms_project_record SET score = #{score} WHERE recordId = #{recordid}
+        UPDATE tms_project_record
+        SET score = #{score}
+        WHERE recordId = #{recordid}
     </update>
 </mapper>

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

@@ -0,0 +1,36 @@
+<?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.SysPermissionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.msdw.tms.entity.SysPermission">
+        <id column="id" property="id" />
+        <result column="code" property="code" />
+        <result column="name" property="name" />
+        <result column="parent_id" property="parentId" />
+        <result column="level" property="level" />
+        <result column="menu_or_not" property="menuOrNot" />
+        <result column="status" property="status" />
+        <result column="url" property="url" />
+        <result column="menu_url" property="menuUrl" />
+        <result column="sort" property="sort" />
+        <result column="icon" property="icon" />
+        <result column="create_time" property="createTime" />
+        <result column="motify_time" property="motifyTime" />
+    </resultMap>
+
+    <select id="pageByCondition" resultType="com.msdw.tms.entity.response.RolePermissionResponse">
+        select rp.role_id as roleId, hr.`name`,hr.description,GROUP_CONCAT(hp.`name`separator '/') as permissionName
+        FROM sys_role_permission rp
+        LEFT JOIN sys_role hr on hr.id = rp.role_id
+        LEFT JOIN sys_permission hp on hp.id= rp.permission_id
+        <where>
+        hr.del_or_not=0
+            <if test="name != null and name != ''">
+                AND hr.name LIKE CONCAT('%' #{name} '%')
+            </if>
+        </where>
+        GROUP BY rp.role_id
+    </select>
+
+</mapper>

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

@@ -0,0 +1,40 @@
+<?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.SysRoleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.msdw.tms.entity.SysRole">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="description" property="description" />
+        <result column="del_or_not" property="delOrNot" />
+        <result column="create_time" property="createTime" />
+        <result column="motify_time" property="motifyTime" />
+        <result column="code" property="code" />
+    </resultMap>
+
+    <insert id="addHrmsRole" parameterType="com.msdw.tms.entity.request.RolePermissionRequest"
+            useGeneratedKeys="true" keyProperty="roleId" keyColumn="id">
+        INSERT INTO sys_role
+        (`name`,description,create_time,motify_time)
+        values (#{name},#{description},#{createTime},#{motifyTime});
+    </insert>
+
+    <update id="updateHrmsRole" parameterType="com.msdw.tms.entity.request.RolePermissionRequest">
+        UPDATE sys_role
+        <set>
+            `name`=#{name},
+            description=#{description},
+            motify_time=#{motifyTime},
+        </set>
+        WHERE id = #{roleId}
+    </update>
+
+    <delete id="deleteHrmsRoleByRoleId">
+        update sys_role set del_or_not = 1 where id IN
+        <foreach collection="roleIds" index="index" open="(" separator="," close=")" item="item">
+            #{item}
+        </foreach>
+    </delete>
+
+</mapper>

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

@@ -0,0 +1,38 @@
+<?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.SysRolePermissionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.msdw.tms.entity.SysRolePermission">
+        <id column="id" property="id" />
+        <result column="role_id" property="roleId" />
+        <result column="permission_id" property="permissionId" />
+    </resultMap>
+
+    <select id="uniqueRoleName" parameterType="string" resultType="java.lang.Integer">
+        select count(0) from sys_role where `name` = #{name}
+    </select>
+
+    <insert id="addHrmsRolePermission" parameterType="com.msdw.tms.entity.request.RolePermissionRequest">
+        INSERT INTO sys_role_permission (role_id,permission_id) values
+        <foreach collection="rolePermissionList" index="index" separator="," item="item">
+            (#{item.roleId},#{item.permissionId})
+        </foreach>
+    </insert>
+
+    <delete id="deleteHrmsRolePermission">
+        delete from sys_role_permission where role_id in
+        <foreach collection="roleIds" index="index" open="(" separator="," close=")" item="item">
+            #{item}
+        </foreach>
+    </delete>
+
+    <delete id="deleteHrmsRolePermissionSingle">
+        delete from sys_role_permission where role_id=#{roleId}
+    </delete>
+
+    <select id="queryPermissionArrById" resultMap="BaseResultMap">
+        select id, permission_id from sys_role_permission where role_id = #{roleId}
+    </select>
+
+</mapper>

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

@@ -0,0 +1,19 @@
+<?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.SysUserRoleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.msdw.tms.entity.SysUserRole">
+        <id column="id" property="id" />
+        <result column="user_id" property="userId" />
+        <result column="role_id" property="roleId" />
+    </resultMap>
+
+    <select id="queryCountByRoleId" resultType="java.lang.Integer">
+        select count(0) from sys_user_role where role_id in
+        <foreach collection="roleIds" index="index" open="(" separator="," close=")" item="item">
+            #{item}
+        </foreach>
+    </select>
+
+</mapper>

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

@@ -96,12 +96,14 @@
 		s.staffId,
 		s.workNumber,
 		s.staffProfessionalArchitectureId,
-		s.staffProfessionalArchitectureName,
+		spa.staffProfessionalArchitectureName,
 		s.staffGradeId,
-		s.staffGradeName
+		sg.staffGradeName
 		FROM
 		hr_user_info u
 		LEFT JOIN staff s ON u.userId = s.userId
+		LEFT JOIN staff_professional_architecture spa on spa.staffProfessionalArchitectureId = s.staffProfessionalArchitectureId
+		LEFT JOIN staff_grade sg on sg.staffGradeId = s.staffGradeId
 		WHERE
 		s.schoolId = #{schoolId}
 		AND
@@ -109,8 +111,8 @@
 		AND
 		s.isdel=0
 		<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="staffGradeIds!=null and staffGradeIds!='' ">AND FIND_IN_SET(s.staffGradeId,#{staffGradeIds})</if>
-		<if test="staffProfessionalArchitectureIds!=null and staffProfessionalArchitectureIds!=''">AND FIND_IN_SET(staffProfessionalArchitectureId,#{staffProfessionalArchitectureIds})</if>
+		<if test="staffProfessionalArchitectureIds!=null and staffProfessionalArchitectureIds!=''">AND FIND_IN_SET(s.staffProfessionalArchitectureId,#{staffProfessionalArchitectureIds})</if>
 		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">

src/test/java/com/msdw/tms/service/AchievementManagementTest.java

@@ -1,142 +1,145 @@
-package com.msdw.tms.service;
+//package com.msdw.tms.service;
-
+//
-import com.msdw.tms.common.utils.R;
+//import com.msdw.tms.common.utils.R;
-import com.msdw.tms.dao.AchievementManagementDao;
+//import com.msdw.tms.dao.AchievementManagementDao;
-import com.msdw.tms.entity.ProjectRecordEntity;
+//import com.msdw.tms.entity.ProjectEntity;
-import com.msdw.tms.entity.request.AchievementImportRequest;
+//import com.msdw.tms.entity.ProjectRecordEntity;
-import com.msdw.tms.entity.vo.AchievementManagementVO;
+//import com.msdw.tms.entity.request.AchievementImportRequest;
-import org.junit.jupiter.api.Test;
+//import com.msdw.tms.entity.vo.AchievementManagementVo;
-import org.springframework.beans.factory.annotation.Autowired;
+//import com.msdw.tms.entity.vo.SearchAchievementVo;
-import org.springframework.boot.test.context.SpringBootTest;
+//import org.junit.jupiter.api.Test;
-
+//import org.springframework.beans.factory.annotation.Autowired;
-import java.util.ArrayList;
+//import org.springframework.boot.test.context.SpringBootTest;
-import java.util.List;
+//
-
+//import java.util.ArrayList;
-@SpringBootTest
+//import java.util.Date;
-public class AchievementManagementTest {
+//import java.util.List;
-
+//
-    @Autowired
+//@SpringBootTest
-    private AchievementManagementService achievementManagementService;
+//public class AchievementManagementTest {
-
+//
-    @Autowired
+//    @Autowired
-    private ProjectRecordService projectRecordService;
+//    private AchievementManagementService achievementManagementService;
-
+//
-    @Autowired
+//    @Autowired
-    AchievementManagementDao achievementManagementDao;
+//    private ProjectRecordService projectRecordService;
-
+//
-    //测试新增实验记录
+//    @Autowired
+//    AchievementManagementDao achievementManagementDao;
+//
+//    //测试新增实验记录
+////    @Test
+////    public void addReport(){
+////        AchievementManagementVo vo = new AchievementManagementVo();
+////        ProjectRecordEntity entity = new ProjectRecordEntity();
+////        Date date = new Date();
+////        //用户id
+////        Integer userId = 385;
+////
+////        entity.setUserid(userId)
+////                .setProjectid(368)
+////                .setScore(100)
+////                .setRecordstate(0)
+////                .setStartingtime(date)
+////                .setEndtime(date)
+////                .setSubmittime(date)
+////                .setTimeSum(0)
+////                .setIsdel(0);
+////        vo.setUserId(userId)
+////                .setEvaluationId(158)
+////                .setExperimentalGoal("目标2")
+////                .setPrinciple("原理2")
+////                .setStep("步骤2")
+////                .setAnalysis("实验分析2")
+////                .setSummarize("实验总结2")
+////                .setImprovement("实验建议2")
+////                .setCommentId(3)
+////                .setTeacherId(178)
+////                .setPeriod("学时")
+////                .setLaboratory("实验室名称2")
+////                .setIsSignature(0)
+////                .setSignatureId(4)
+////                .setIsdel(0);
+////        vo.setEntity(entity);
+////        R r = achievementManagementService.addReport(vo);
+////        System.out.println(r);
+////    }
+//
 //    @Test
-//    public void addReport(){
+//    public void queryReport(){
-//        AchievementManagementVO vo = new AchievementManagementVO();
+//        Integer reportId = 4;
-//        ProjectRecordEntity entity = new ProjectRecordEntity();
+//        Integer recordId = 100;
-//        Date date = new Date();
+//        R r = achievementManagementService.queryReport(reportId);
-//        //用户id
+//        System.out.println(r);
-//        Integer userId = 385;
+//    }
+//
+//    @Test
+//    public void updateScore(){
+//        ProjectRecordEntity vo = new ProjectRecordEntity();
+//        Integer recordId = 100;
+//        Integer score = 99;
+//        vo.setRecordid(recordId).setScore(score);
+//        projectRecordService.updateScore(vo);
+//    }
 //
-//        entity.setUserid(userId)
+//    @Test
-//                .setProjectid(368)
+//    public void daleteReport(){
-//                .setScore(100)
+//        Integer reportId = 4;
-//                .setRecordstate(0)
+//        Integer recordId = 100;
-//                .setStartingtime(date)
+//        AchievementManagementVo vo = new AchievementManagementVo();
-//                .setEndtime(date)
+//        ProjectRecordEntity entity = new ProjectRecordEntity();
-//                .setSubmittime(date)
+//        entity.setRecordid(recordId);
-//                .setTimeSum(0)
+//        vo.setReportId(reportId);
-//                .setIsdel(0);
-//        vo.setUserId(userId)
-//                .setEvaluationId(158)
-//                .setExperimentalGoal("目标2")
-//                .setPrinciple("原理2")
-//                .setStep("步骤2")
-//                .setAnalysis("实验分析2")
-//                .setSummarize("实验总结2")
-//                .setImprovement("实验建议2")
-//                .setCommentId(3)
-//                .setTeacherId(178)
-//                .setPeriod("学时")
-//                .setLaboratory("实验室名称2")
-//                .setIsSignature(0)
-//                .setSignatureId(4)
-//                .setIsdel(0);
 //        vo.setEntity(entity);
-//        R r = achievementManagementService.addReport(vo);
+//        R r = achievementManagementService.deleteReport(reportId);
 //        System.out.println(r);
 //    }
-
+//
-    @Test
+//    //测试查询班级实验成绩列表
-    public void queryReport(){
+//    @Test
-        Integer reportId = 4;
+//    public void queryEvaluationReport(){
-        Integer recordId = 100;
+//    String searchContant = "michonne";
-        R r = achievementManagementService.queryReport(reportId);
+//    //        String searchContant = "";
-        System.out.println(r);
+//    Integer projectId = 368;
-    }
+//    Integer page = 1;
-
+//    Integer size = 2;
-    @Test
+//    R r = achievementManagementService.queryEvaluationReport(searchContant,projectId,page,size);
-    public void updateScore(){
+//        System.out.println(r);
-        ProjectRecordEntity vo = new ProjectRecordEntity();
+//}
-        Integer recordId = 100;
+//
-        Integer score = 99;
+//    //筛选查询-教学实验
-        vo.setRecordid(recordId).setScore(score);
+//    @Test
-        projectRecordService.updateScore(vo);
+//    public void queryEvaluationReportByRecordId(){
-    }
+//        Integer month = 1;
-
+//        Integer systemId = 1;
-    @Test
+//        String searchContent= "";
-    public void daleteReport(){
+//        String staingTime = "";
-        Integer reportId = 4;
+//        String endTime = "";
-        Integer recordId = 100;
+//        List<Integer> list = achievementManagementDao.countEducationProjectId();
-        AchievementManagementVO vo = new AchievementManagementVO();
+//        List<AchievementManagementVo> result = achievementManagementDao.queryEducationRecord(systemId, searchContent, staingTime, endTime, month, list);
-        ProjectRecordEntity entity = new ProjectRecordEntity();
+//        System.out.println(result);
-        entity.setRecordid(recordId);
+//    }
-        vo.setReportId(reportId);
+//    //筛选查询-虚拟实验
-        vo.setEntity(entity);
+//    @Test
-        R r = achievementManagementService.deleteReport(reportId);
+//    public void queryFictitiousReportByRecordId(){
-        System.out.println(r);
+//        Integer month = null;
-    }
+//        Integer systemId = 1;
-
+//        String searchContent= "";
-    //测试查询班级实验成绩列表
+//        String staingTime = "";
-    @Test
+//        String endTime = "";
-    public void queryEvaluationReport(){
+//        List<Integer> list = achievementManagementDao.countFictitiousProjectId();
-    String searchContant = "michonne";
+//        List<AchievementManagementVo> result = achievementManagementDao.queryFictitiousRecord(systemId, searchContent, staingTime, endTime, month, list);
-    //        String searchContant = "";
+//        System.out.println(result);
-    Integer projectId = 368;
+//    }
-    Integer page = 1;
+//
-    Integer size = 2;
+//    @Test
-    R r = achievementManagementService.queryEvaluationReport(searchContant,projectId,page,size);
+//    public void testQuery(){
-        System.out.println(r);
+////        String str = "184,185";
-}
+//        ArrayList<Integer> integers = new ArrayList<>();
-
+//        integers.add(184);
-    //筛选查询-教学实验
+//        integers.add(185);
-    @Test
+//
-    public void queryEvaluationReportByRecordId(){
+//        List<AchievementImportRequest> achievementImportRequests = achievementManagementDao.queryAchievement(integers);
-        Integer month = 1;
+//        System.out.println(achievementImportRequests);
-        Integer systemId = 1;
+//    }
-        String searchContent= "";
+//}
-        String staingTime = "";
-        String endTime = "";
-        List<Integer> list = achievementManagementDao.countEducationProjectId();
-        List<AchievementManagementVO> result = achievementManagementDao.queryEducationRecord(systemId, searchContent, staingTime, endTime, month, list);
-        System.out.println(result);
-    }
-    //筛选查询-虚拟实验
-    @Test
-    public void queryFictitiousReportByRecordId(){
-        Integer month = null;
-        Integer systemId = 1;
-        String searchContent= "";
-        String staingTime = "";
-        String endTime = "";
-        List<Integer> list = achievementManagementDao.countFictitiousProjectId();
-        List<AchievementManagementVO> result = achievementManagementDao.queryFictitiousRecord(systemId, searchContent, staingTime, endTime, month, list);
-        System.out.println(result);
-    }
-
-    @Test
-    public void testQuery(){
-//        String str = "184,185";
-        ArrayList<Integer> integers = new ArrayList<>();
-        integers.add(184);
-        integers.add(185);
-
-        List<AchievementImportRequest> achievementImportRequests = achievementManagementDao.queryAchievement(integers);
-        System.out.println(achievementImportRequests);
-    }
-}