From 782775acdbfee4e9c894d58cbde1ebd6ce8ff412 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Wed, 24 Feb 2021 10:22:54 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=A8=A1=E5=9D=97bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tms/common/exception/ExceptionCatch.java | 13 + .../controller/SystemSettingController.java | 3 +- .../com/msdw/tms/entity/UserInfoEntity.java | 5 + .../tms/entity/response/ResponseResult.java | 54 +++- .../resources/mapper/tms/SystemSetting.xml | 10 +- .../service/AchievementManagementTest.java | 278 +++++++++--------- 6 files changed, 212 insertions(+), 151 deletions(-) diff --git a/src/main/java/com/msdw/tms/common/exception/ExceptionCatch.java b/src/main/java/com/msdw/tms/common/exception/ExceptionCatch.java index fdbea6f..5043a2d 100644 --- a/src/main/java/com/msdw/tms/common/exception/ExceptionCatch.java +++ b/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); + } } diff --git a/src/main/java/com/msdw/tms/controller/SystemSettingController.java b/src/main/java/com/msdw/tms/controller/SystemSettingController.java index cf67939..1a9989c 100644 --- a/src/main/java/com/msdw/tms/controller/SystemSettingController.java +++ b/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; } diff --git a/src/main/java/com/msdw/tms/entity/UserInfoEntity.java b/src/main/java/com/msdw/tms/entity/UserInfoEntity.java index 7a2b646..a0f2a63 100644 --- a/src/main/java/com/msdw/tms/entity/UserInfoEntity.java +++ b/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; } diff --git a/src/main/java/com/msdw/tms/entity/response/ResponseResult.java b/src/main/java/com/msdw/tms/entity/response/ResponseResult.java index c05f8ed..2b2464b 100644 --- a/src/main/java/com/msdw/tms/entity/response/ResponseResult.java +++ b/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 { + /** + * 操作是否成功 + */ + 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); + } + } diff --git a/src/main/resources/mapper/tms/SystemSetting.xml b/src/main/resources/mapper/tms/SystemSetting.xml index a48e684..86f6802 100644 --- a/src/main/resources/mapper/tms/SystemSetting.xml +++ b/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 AND (u.userName LIKE CONCAT('%',#{searchContent},'%') OR s.workNumber LIKE CONCAT('%',#{searchContent},'%') OR u.account LIKE CONCAT('%',#{searchContent},'%') ) - AND FIND_IN_SET(staffGradeId,#{staffGradeIds}) - AND FIND_IN_SET(staffProfessionalArchitectureId,#{staffProfessionalArchitectureIds}) + AND FIND_IN_SET(s.staffGradeId,#{staffGradeIds}) + AND FIND_IN_SET(s.staffProfessionalArchitectureId,#{staffProfessionalArchitectureIds}) GROUP BY s.userId ORDER BY u.updateTime DESC,u.lastLoginTime DESC,creationTime DESC + 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 + + hr.del_or_not=0 + + AND hr.name LIKE CONCAT('%' #{name} '%') + + + GROUP BY rp.role_id + + diff --git a/src/main/resources/mapper/tms/SysRoleMapper.xml b/src/main/resources/mapper/tms/SysRoleMapper.xml index 95f2bc5..050e8eb 100644 --- a/src/main/resources/mapper/tms/SysRoleMapper.xml +++ b/src/main/resources/mapper/tms/SysRoleMapper.xml @@ -1,6 +1,6 @@ - + @@ -13,4 +13,28 @@ + + INSERT INTO sys_role + (`name`,description,create_time,motify_time) + values (#{name},#{description},#{createTime},#{motifyTime}); + + + + UPDATE sys_role + + `name`=#{name}, + description=#{description}, + motify_time=#{motifyTime}, + + WHERE id = #{roleId} + + + + update sys_role set del_or_not = 1 where id IN + + #{item} + + + diff --git a/src/main/resources/mapper/tms/SysRolePermissionMapper.xml b/src/main/resources/mapper/tms/SysRolePermissionMapper.xml index ebeb487..17949cd 100644 --- a/src/main/resources/mapper/tms/SysRolePermissionMapper.xml +++ b/src/main/resources/mapper/tms/SysRolePermissionMapper.xml @@ -1,6 +1,6 @@ - + @@ -9,4 +9,30 @@ + + + + INSERT INTO sys_role_permission (role_id,permission_id) values + + (#{item.roleId},#{item.permissionId}) + + + + + delete from sys_role_permission where role_id in + + #{item} + + + + + delete from sys_role_permission where role_id=#{roleId} + + + + diff --git a/src/main/resources/mapper/tms/SysUserRoleMapper.xml b/src/main/resources/mapper/tms/SysUserRoleMapper.xml index 00527ea..b4f032e 100644 --- a/src/main/resources/mapper/tms/SysUserRoleMapper.xml +++ b/src/main/resources/mapper/tms/SysUserRoleMapper.xml @@ -1,6 +1,6 @@ - + @@ -9,4 +9,11 @@ + + From f70bd31d3902ea328016d76ecf6ee64e9c50fbff Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Thu, 25 Feb 2021 17:48:02 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExperimentalTeachingControllerApi.java | 4 +-- .../ExperimentalProjectController.java | 12 +-------- .../ExperimentalTeachingController.java | 25 +++++++++++-------- .../entity/ExperimentalTeachingEntity.java | 2 ++ .../tms/entity/vo/ExperimentalTeachingVO.java | 2 ++ .../impl/ExperimentalTeachingServiceImpl.java | 11 -------- 6 files changed, 21 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/msdw/tms/api/ExperimentalTeachingControllerApi.java b/src/main/java/com/msdw/tms/api/ExperimentalTeachingControllerApi.java index e5c9351..f6c28a0 100644 --- a/src/main/java/com/msdw/tms/api/ExperimentalTeachingControllerApi.java +++ b/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, diff --git a/src/main/java/com/msdw/tms/controller/ExperimentalProjectController.java b/src/main/java/com/msdw/tms/controller/ExperimentalProjectController.java index 049eed6..31799c7 100644 --- a/src/main/java/com/msdw/tms/controller/ExperimentalProjectController.java +++ b/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}") diff --git a/src/main/java/com/msdw/tms/controller/ExperimentalTeachingController.java b/src/main/java/com/msdw/tms/controller/ExperimentalTeachingController.java index 7dd84ce..f070234 100644 --- a/src/main/java/com/msdw/tms/controller/ExperimentalTeachingController.java +++ b/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().eq("invitation_code", invitationCode) @@ -49,15 +47,19 @@ public class ExperimentalTeachingController implements ExperimentalTeachingContr /** * 查询 */ + @Override @GetMapping("/list") - public R list(@RequestParam Integer page, - @RequestParam Integer size, - Integer month, Integer type, Integer status, String startTime, String stopTime, String searchContent,@RequestParam Integer schoolId){ + public R list(@RequestParam Integer page, @RequestParam Integer size, + Integer month, Integer type, Integer status,Integer systemId, String startTime, + 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)); diff --git a/src/main/java/com/msdw/tms/entity/ExperimentalTeachingEntity.java b/src/main/java/com/msdw/tms/entity/ExperimentalTeachingEntity.java index c6f3795..78033be 100644 --- a/src/main/java/com/msdw/tms/entity/ExperimentalTeachingEntity.java +++ b/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; //实验倒计时 diff --git a/src/main/java/com/msdw/tms/entity/vo/ExperimentalTeachingVO.java b/src/main/java/com/msdw/tms/entity/vo/ExperimentalTeachingVO.java index 270246f..b3370c1 100644 --- a/src/main/java/com/msdw/tms/entity/vo/ExperimentalTeachingVO.java +++ b/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; } diff --git a/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java index 140fa2c..1265737 100644 --- a/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java +++ b/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 implements ExperimentalTeachingService { From 69589a20d62e8786fc4d64ac21fbfa86f4bb3e25 Mon Sep 17 00:00:00 2001 From: "rong.liu" Date: Fri, 26 Feb 2021 10:16:24 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E7=AB=AF=E8=99=9A=E6=8B=9F=E5=AE=9E=E9=AA=8C=E6=95=99=E5=AD=A6?= =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E5=88=97=E8=A1=A8=E5=8F=8A=E5=AE=9E=E9=AA=8C?= =?UTF-8?q?=E6=8A=A5=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ClassTeachingController.java | 103 +-- .../controller/ProjectRecordController.java | 2 +- .../com/msdw/tms/dao/ProjectRecordDao.java | 15 +- .../tms/entity/resp/GetByUserRecordResp.java | 89 ++ .../tms/service/ProjectRecordService.java | 16 +- .../impl/ExperimentalReportServiceImpl.java | 29 +- .../impl/ProjectRecordServiceImpl.java | 22 +- .../mapper/tms/AchievementManagementDao.xml | 774 ++++++++++-------- .../mapper/tms/ExperimentalReportDao.xml | 148 ++-- .../resources/mapper/tms/ProjectRecordDao.xml | 188 +++-- 10 files changed, 771 insertions(+), 615 deletions(-) create mode 100644 src/main/java/com/msdw/tms/entity/resp/GetByUserRecordResp.java diff --git a/src/main/java/com/msdw/tms/controller/ClassTeachingController.java b/src/main/java/com/msdw/tms/controller/ClassTeachingController.java index 64d7282..35218c9 100644 --- a/src/main/java/com/msdw/tms/controller/ClassTeachingController.java +++ b/src/main/java/com/msdw/tms/controller/ClassTeachingController.java @@ -32,6 +32,7 @@ public class ClassTeachingController implements ClassTeachingApi { /** * 用户端查看班级实验列表 + * * @param page * @param size * @param month @@ -43,58 +44,61 @@ public class ClassTeachingController implements ClassTeachingApi { */ @Override @GetMapping("userRecord") - public R queryTestRecord(@RequestParam Integer page, @RequestParam Integer size, Integer month,String startTime,String endTime, - String condition, @RequestParam Integer status,@RequestParam Integer schoolId){ + public R queryTestRecord(@RequestParam Integer page, @RequestParam Integer size, Integer month, String startTime, String endTime, + String condition, @RequestParam Integer status, @RequestParam Integer schoolId) { ProjectRecordVo recordVo = new ProjectRecordVo(); - if (status==1||status==2||status==3) {//限定实验状态 - recordVo.setStatus(status); - }else{//不限定实验状态 - recordVo.setStatus(null); - } - if(!StringUtils.isEmpty(condition)){ - recordVo.setCondition(condition); + if (status == 1 || status == 2 || status == 3) {//限定实验状态 + recordVo.setStatus(status); + } else {//不限定实验状态 + recordVo.setStatus(null); + } + if (!StringUtils.isEmpty(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)) { - recordVo.setMonth(month); - }else { - recordVo.setMonth(null); - if(!StringUtils.isEmpty(startTime)) { - recordVo.setStartTime(startTime); - }if(!StringUtils.isEmpty(endTime)) { - recordVo.setEndTime(endTime); - } + if (!StringUtils.isEmpty(endTime)) { + recordVo.setEndTime(endTime); } - recordVo.setSchoolId(schoolId); - PageUtils page1 = classTeachingService.queryClassRecord(page,size,recordVo); - return R.ok().put("page", page1); + } + recordVo.setSchoolId(schoolId); + 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){ - List o = experimentalStudentService.queryIsCode(userId,projectId); - if (o.size()>0){ + public R check(@RequestParam Integer userId, @RequestParam("id") Integer projectId) { + List o = experimentalStudentService.queryIsCode(userId, projectId); + if (o.size() > 0) { return R.ok(); - }else{ - return R.error(200,"false"); + } else { + 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 +110,61 @@ public class ClassTeachingController implements ClassTeachingApi { // Integer ICode = experimentalStudentService.queryIsCode(userId);//获取iscode信息, //if (isCode==0) - if (invitationCode!=null){ - entity.setId(id); + if (invitationCode != null) { + entity.setId(id); // entity.setProjectId(projectId); - ExperimentalTeachingEntity result= classTeachingService.queryInvitationcode(entity);//邀请码唯一 - Integer code = result.getInvitationCode(); - if (invitationCode.equals(code)==true){ - ExperimentalStudentEntity student = studentEntity.setUserId(userId).setProjectId(id); - experimentalStudentService.saveCode(student); - return R.ok(); - }else{ - return R.error("邀请码错误，验证失败！！！"); - } - }else{ - return R.error(400,"邀请码格式错误！！！"); + ExperimentalTeachingEntity result = classTeachingService.queryInvitationcode(entity);//邀请码唯一 + Integer code = result.getInvitationCode(); + if (invitationCode.equals(code) == true) { + ExperimentalStudentEntity student = studentEntity.setUserId(userId).setProjectId(id); + experimentalStudentService.saveCode(student); + return R.ok(); + } else { + return R.error("邀请码错误，验证失败！！！"); } + } else { + return R.error(400, "邀请码格式错误！！！"); } + } /** * 查看虚拟仿真课程列表信息 + * * @param page * @param size * @return */ @Override @GetMapping("/simulationPlayList") - public R querySimulationPlayList(@RequestParam Integer page,@RequestParam Integer size){ - PageUtils page1 = classTeachingService.querySimulationPlayList(page,size); - return R.ok().put("data",page1); + public R querySimulationPlayList(@RequestParam Integer page, @RequestParam Integer size) { + PageUtils page1 = classTeachingService.querySimulationPlayList(page, size); + 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; } diff --git a/src/main/java/com/msdw/tms/controller/ProjectRecordController.java b/src/main/java/com/msdw/tms/controller/ProjectRecordController.java index 0235cb4..e69def5 100644 --- a/src/main/java/com/msdw/tms/controller/ProjectRecordController.java +++ b/src/main/java/com/msdw/tms/controller/ProjectRecordController.java @@ -64,7 +64,7 @@ public class ProjectRecordController implements ProjectRcordControllerApi { @Override @GetMapping("/user/record") public R queryUserRecord(@RequestParam Integer page,@RequestParam Integer size,@RequestParam Integer userId,@RequestParam Integer projectPermissions){ - PageUtils page1 = projectRecordService.queryPage(page,size,userId,projectPermissions); + PageUtils page1 = projectRecordService.queryPage(page,size,userId); return R.ok().put("data", page1); } diff --git a/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java b/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java index e1f10c7..7b5f19f 100644 --- a/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java +++ b/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,26 +16,24 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * - * - * @author - * @email + * @author + * @email * @date 2020-08-19 16:07:02 */ @Mapper public interface ProjectRecordDao extends BaseMapper { - IPage getByUserRecord(Page page,@Param("pro") ProjectRecordEntity projectRecordEntity,Integer projectPermissions); + IPage getByUserRecord(Page page, @Param("userId") Integer userId); - IPage getByUserExperimentRecord(Page page,@Param("pro") ProjectRecordEntity projectRecordEntity); + IPage getByUserExperimentRecord(Page page, @Param("pro") ProjectRecordEntity projectRecordEntity); List 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 getBySchoolRecord(Page page,@Param("pro") ProjectRecordVo projectRecord); + IPage getBySchoolRecord(Page page, @Param("pro") ProjectRecordVo projectRecord); boolean updateUserRecord(ProjectRecordEntity projectRecord); diff --git a/src/main/java/com/msdw/tms/entity/resp/GetByUserRecordResp.java b/src/main/java/com/msdw/tms/entity/resp/GetByUserRecordResp.java new file mode 100644 index 0000000..5155336 --- /dev/null +++ b/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; + } +} diff --git a/src/main/java/com/msdw/tms/service/ProjectRecordService.java b/src/main/java/com/msdw/tms/service/ProjectRecordService.java index 74edc2a..6f258a3 100644 --- a/src/main/java/com/msdw/tms/service/ProjectRecordService.java +++ b/src/main/java/com/msdw/tms/service/ProjectRecordService.java @@ -11,27 +11,25 @@ import java.util.HashMap; import java.util.List; /** - * - * - * @author - * @email + * @author + * @email * @date 2020-08-19 16:07:02 */ public interface ProjectRecordService extends IService { - PageUtils queryPage(Integer page,Integer size,Integer userId,Integer projectPermissions); + PageUtils queryPage(Integer page, Integer size, Integer userId); - 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); diff --git a/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java index b419d62..0b08a7c 100644 --- a/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java +++ b/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 implements ExperimentalReportService { +public class ExperimentalReportServiceImpl extends ServiceImpl implements ExperimentalReportService { @Autowired private ExperimentalReportDao reportDao; @@ -24,36 +24,37 @@ public class ExperimentalReportServiceImpl extends ServiceImpl map = new HashMap<>(); - map.put("report",result); - if(systemId==1|systemId==4|systemId==5){ + map.put("report", result); + if (systemId == 1 | systemId == 4 | systemId == 5) { List data = achievementManagementDao.queryPythonTest(recordId); - map.put("data",data); - return R.ok().put("data",map); + map.put("data", data); + 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 data = achievementManagementDao.queryPythonTest(recordId); HashMap map = new HashMap<>(); - map.put("data",data); - map.put("report",result); - return R.ok().put("data",map); + map.put("data", data); + map.put("report", result); + return R.ok().put("data", map); } - return R.ok().put("data",result); + return R.ok().put("data", result); } } diff --git a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java index 020f208..85a1c44 100644 --- a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java +++ b/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 page1 = new Page<>(page, size); - IPage projectRecordVos = this.baseMapper.getByUserRecord(page1,projectRecord,projectPermissions); + IPage projectRecordVos = this.baseMapper.getByUserRecord(page1, userId); PageUtils questionsPage = new PageUtils(projectRecordVos); @@ -59,7 +61,7 @@ public class ProjectRecordServiceImpl extends ServiceImpl page1 = new Page<>(page, size); - IPage projectRecordVos = this.baseMapper.getByUserExperimentRecord(page1,projectRecord); + IPage projectRecordVos = this.baseMapper.getByUserExperimentRecord(page1, projectRecord); PageUtils questionsPage = new PageUtils(projectRecordVos); @@ -70,9 +72,9 @@ public class ProjectRecordServiceImpl extends ServiceImpl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + SELECT her.*, pm.projectName, s.workNumber + FROM hr_experimental_report her, + hr_project_management pm, + student s + WHERE her.reportId = #{reportId} + and her.studentId = #{studentId} + and her.projectId = pm.projectId + and her.studentId = s.userId - + - - - - - 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) - 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 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) + 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}) - - 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 tms_experimental_report + SET `comment` = #{comment} + WHERE reportId = #{reportId} - - UPDATE tms_experimental_report SET `comment` = #{comment} WHERE reportId = #{reportId} - - -UPDATE tms_experimental_report SET isSignature = #{isSignature} , signatureId = #{signatureId}, `comment` = #{comment} WHERE reportId = #{reportId} - - + SELECT ter.reportId, + IFNULL(ter.`comment`, (SELECT `comment` FROM tms_comment WHERE id = commentId)) AS comment, + ter.projectId, + ter.principle, + ter.content, + ter.step, + ter.`data`, + ter.analysis, + ter.conclusion, + ter.summarize, + ter.improvement, + ter.commentId, + ter.studentId, + ter.teacherName, + ter.period, + ter.laboratory, + ter.eventId, + ter.isSignature, + ter.signatureId, + ter.isdel, + hpm.projectName, + hpm.systemId, + ts.signature_name AS signatureName, + ts.signature_url AS signatureUrl, + tc.`level` + FROM tms_experimental_report ter + LEFT JOIN tms_signature ts ON signatureId = ts.id + LEFT JOIN tms_comment tc ON commentId = tc.id + LEFT JOIN tms_project_record AS tpr ON tpr.recordId = ter.eventId + LEFT JOIN hr_project_management AS hpm ON hpm.projectId = tpr.projectId + WHERE reportId = #{reportId} + + + + + - + + + + + + - 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 recordId IN ( - - #{recordId} - - ) - - GROUP BY - tcr.reportId - ORDER BY tpr.submitTime DESC - - - - - - - - + AND hjp.isdel = 0 + AND hec.recordId = #{recordId} + GROUP BY hec.codeId + + 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 + FROM hr_project_management hpm WHERE systemId = #{systemId} + AND hpm.isdel = 0 + AND hpm.projectPermissions = + #{projectPermissions} + + and hpm.projectName like concat('%',#{searchContant},'%') + + and hpm.creationTime between + #{endTime} and #{startTime} + + and DATE_SUB(CURDATE(), INTERVAL #{month} month ) <= + date(hpm.creationTime) + + ORDER BY hpm.creationTime DESC + - + - + - + - + \ No newline at end of file diff --git a/src/main/resources/mapper/tms/ExperimentalReportDao.xml b/src/main/resources/mapper/tms/ExperimentalReportDao.xml index 6052511..7f087d8 100644 --- a/src/main/resources/mapper/tms/ExperimentalReportDao.xml +++ b/src/main/resources/mapper/tms/ExperimentalReportDao.xml @@ -1,85 +1,75 @@ - - - - - - - + + + + + + + + + - - \ No newline at end of file diff --git a/src/main/resources/mapper/tms/ProjectRecordDao.xml b/src/main/resources/mapper/tms/ProjectRecordDao.xml index 3fa668a..5cedac0 100644 --- a/src/main/resources/mapper/tms/ProjectRecordDao.xml +++ b/src/main/resources/mapper/tms/ProjectRecordDao.xml @@ -14,16 +14,16 @@ - + -INSERT INTO tms_project_record ( userId, projectId, score, startingTime, endTime, timeSum, submitTime ) -VALUES - (#{userid}, #{projectid}, #{score}, #{startingtime}, now(), #{timeSum}, now()) + INSERT INTO tms_project_record (userId, projectId, score, startingTime, endTime, timeSum, submitTime) + VALUES (#{userid}, #{projectid}, #{score}, #{startingtime}, now(), #{timeSum}, now()) - + 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 + ORDER BY c.codeId DESC - + SELECT tet.id, + ter.reportId, + tpr.recordId, + tpr.projectId, + projectName, + score, + timeSum, + startingTime as startTime, + endTime, + recordState, + tet.experimental_class_name as experimentalClassName + FROM tms_project_record tpr + LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId + LEFT JOIN tms_experimental_teaching tet ON tet.project_id = tpr.projectId + LEFT JOIN tms_experimental_report ter ON ter.projectId = tet.id + WHERE tpr.userId = #{pro.userid} + AND tpr.isdel = #{pro.isdel} + AND tp.projectPermissions !=0 AND ter.eventId = tpr.recordId ORDER BY - tpr.submitTime DESC + tpr.submitTime DESC - + SELECT tpr.projectId, + projectName, + score, + timeSum, + startingTime as startTime, + endTime, + recordState, + tet.experimental_class_name + FROM tms_project_record tpr + LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId + LEFT JOIN tms_experimental_teaching tet ON tpr.projectId = tet.project_id + WHERE tpr.userId = #{userid} + AND tpr.isdel = #{isdel} + AND tpr.projectId = tet.project_id + AND tp.projectPermissions != 0 ORDER BY - tpr.submitTime DESC + tpr.submitTime DESC - + update tms_project_record set isdel = #{isdel} ,recordstate = #{recordstate} @@ -184,6 +188,8 @@ VALUES - UPDATE tms_project_record SET score = #{score} WHERE recordId = #{recordid} + UPDATE tms_project_record + SET score = #{score} + WHERE recordId = #{recordid} \ No newline at end of file From d4b8ec26361dde4d740b6d22b39d7ef33210fdf1 Mon Sep 17 00:00:00 2001 From: "rong.liu" Date: Fri, 26 Feb 2021 11:54:16 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tms/service/impl/ExperimentalReportServiceImpl.java | 9 +++++++++ src/main/resources/mapper/tms/ProjectRecordDao.xml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java index 0b08a7c..80ced2d 100644 --- a/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java @@ -23,6 +23,15 @@ public class ExperimentalReportServiceImpl extends ServiceImpl From f01677dfd75d58e30b5fb11a6d69c9345977bc42 Mon Sep 17 00:00:00 2001 From: "rong.liu" Date: Fri, 26 Feb 2021 15:53:07 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=8C=BA=E5=88=86=E8=99=9A=E4=BB=BF?= =?UTF-8?q?=E5=8F=8A=E6=95=99=E5=AD=A6=E5=AE=9E=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/msdw/tms/controller/ProjectRecordController.java | 2 +- src/main/java/com/msdw/tms/dao/ProjectRecordDao.java | 2 +- src/main/java/com/msdw/tms/service/ProjectRecordService.java | 2 +- .../com/msdw/tms/service/impl/ProjectRecordServiceImpl.java | 4 ++-- src/main/resources/mapper/tms/ProjectRecordDao.xml | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/msdw/tms/controller/ProjectRecordController.java b/src/main/java/com/msdw/tms/controller/ProjectRecordController.java index e69def5..0235cb4 100644 --- a/src/main/java/com/msdw/tms/controller/ProjectRecordController.java +++ b/src/main/java/com/msdw/tms/controller/ProjectRecordController.java @@ -64,7 +64,7 @@ public class ProjectRecordController implements ProjectRcordControllerApi { @Override @GetMapping("/user/record") public R queryUserRecord(@RequestParam Integer page,@RequestParam Integer size,@RequestParam Integer userId,@RequestParam Integer projectPermissions){ - PageUtils page1 = projectRecordService.queryPage(page,size,userId); + PageUtils page1 = projectRecordService.queryPage(page,size,userId,projectPermissions); return R.ok().put("data", page1); } diff --git a/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java b/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java index 7b5f19f..4d4f96b 100644 --- a/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java +++ b/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java @@ -23,7 +23,7 @@ import java.util.List; @Mapper public interface ProjectRecordDao extends BaseMapper { - IPage getByUserRecord(Page page, @Param("userId") Integer userId); + IPage getByUserRecord(Page page, @Param("userId") Integer userId, @Param("projectPermissions") Integer projectPermissions); IPage getByUserExperimentRecord(Page page, @Param("pro") ProjectRecordEntity projectRecordEntity); diff --git a/src/main/java/com/msdw/tms/service/ProjectRecordService.java b/src/main/java/com/msdw/tms/service/ProjectRecordService.java index 6f258a3..780ad3d 100644 --- a/src/main/java/com/msdw/tms/service/ProjectRecordService.java +++ b/src/main/java/com/msdw/tms/service/ProjectRecordService.java @@ -17,7 +17,7 @@ import java.util.List; */ public interface ProjectRecordService extends IService { - PageUtils queryPage(Integer page, Integer size, Integer userId); + PageUtils queryPage(Integer page, Integer size, Integer userId, Integer projectPermissions); PageUtils queryExperimentPage(Integer page, Integer size, Integer userid); diff --git a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java index 85a1c44..8343694 100644 --- a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java @@ -38,7 +38,7 @@ public class ProjectRecordServiceImpl extends ServiceImpl page1 = new Page<>(page, size); - IPage projectRecordVos = this.baseMapper.getByUserRecord(page1, userId); + IPage projectRecordVos = this.baseMapper.getByUserRecord(page1, userId, projectPermissions); PageUtils questionsPage = new PageUtils(projectRecordVos); diff --git a/src/main/resources/mapper/tms/ProjectRecordDao.xml b/src/main/resources/mapper/tms/ProjectRecordDao.xml index c7b73d7..5b67e32 100644 --- a/src/main/resources/mapper/tms/ProjectRecordDao.xml +++ b/src/main/resources/mapper/tms/ProjectRecordDao.xml @@ -58,6 +58,7 @@ 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 From ae0b89f9ef451bad92acd8209c55cb3bc1977eaa Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Fri, 26 Feb 2021 16:08:25 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=8F=90=E4=BA=A4xml=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/tms/ExperimentalTeachingDao.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mapper/tms/ExperimentalTeachingDao.xml b/src/main/resources/mapper/tms/ExperimentalTeachingDao.xml index 9add2b8..3891647 100644 --- a/src/main/resources/mapper/tms/ExperimentalTeachingDao.xml +++ b/src/main/resources/mapper/tms/ExperimentalTeachingDao.xml @@ -31,7 +31,9 @@ AND `status`=#{exp.status,jdbcType=INTEGER} - + + AND `system_id`=#{exp.systemId,jdbcType=INTEGER} + AND creation_time between #{exp.startTime} and #{exp.stopTime}