huoran
/
msdw_tms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

编辑实验报告

Browse Source
hehai
rong.liu 4 years ago
parent 70f8f2103f
commit 2921bbd0be
7 changed files with 211 additions and 151 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 109
      src/main/java/com/msdw/tms/api/AchievementManagementApi.java
  2. 118
      src/main/java/com/msdw/tms/controller/AchievementManagementController.java
  3. 7
      src/main/java/com/msdw/tms/dao/AchievementManagementDao.java
  4. 80
      src/main/java/com/msdw/tms/entity/ExperimentalReportEntity.java
  5. 11
      src/main/java/com/msdw/tms/service/AchievementManagementService.java
  6. 12
      src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
  7. 25
      src/main/resources/mapper/tms/AchievementManagementDao.xml

109
src/main/java/com/msdw/tms/api/AchievementManagementApi.java
Unescape View File

@ -9,78 +9,78 @@ import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@Api(value = "成绩管理",tags = "成绩管理") @Api(value = "成绩管理", tags = "成绩管理")
public interface AchievementManagementApi { public interface AchievementManagementApi {
@ApiOperation(value = "查询指导老师",notes = "查询指导老师") @ApiOperation(value = "查询指导老师", notes = "查询指导老师")
R getTeacher(Integer projectId); R getTeacher(Integer projectId);
@ApiOperation(value = "查询用户实验报告",notes = "查询用户实验报告") @ApiOperation(value = "查询用户实验报告", notes = "查询用户实验报告")
R getReport(Integer userId,Integer reportId); R getReport(Integer userId, Integer reportId);
@ApiOperation(value = "成绩管理列表",notes = "查询成绩管理列表") @ApiOperation(value = "成绩管理列表", notes = "查询成绩管理列表")
R list(@RequestParam(value = "系统id",required = true) Integer systemId, R list(@RequestParam(value = "系统id", required = true) Integer systemId,
@RequestParam(value = "分类",required = false) Integer projectPermissions, @RequestParam(value = "分类", required = false) Integer projectPermissions,
@RequestParam(value = "搜索内容",required = false) String searchContant, @RequestParam(value = "搜索内容", required = false) String searchContant,
@RequestParam(value = "开始时间",required = false) String startTime, @RequestParam(value = "开始时间", required = false) String startTime,
@RequestParam(value = "结束时间",required = false) String endTime, @RequestParam(value = "结束时间", required = false) String endTime,
@RequestParam(value = "月份",required = false) Integer month, @RequestParam(value = "月份", required = false) Integer month,
@RequestParam(value = "页码",required = true) Integer page, @RequestParam(value = "页码", required = true) Integer page,
@RequestParam(value = "页数大小",required = true) Integer size); @RequestParam(value = "页数大小", required = true) Integer size);
@ApiOperation(value = "查询实验教学列表",notes = "查询实验教学列表") @ApiOperation(value = "查询实验教学列表", notes = "查询实验教学列表")
R newList(@RequestParam(value = "用户id",required = true) Integer userId, R newList(@RequestParam(value = "用户id", required = true) Integer userId,
@RequestParam(value = "搜索内容",required = false) String searchContant, @RequestParam(value = "搜索内容", required = false) String searchContant,
@RequestParam(value = "开始时间",required = false) String startTime, @RequestParam(value = "开始时间", required = false) String startTime,
@RequestParam(value = "结束时间",required = false) String endTime, @RequestParam(value = "结束时间", required = false) String endTime,
@RequestParam(value = "月份",required = false) Integer month, @RequestParam(value = "月份", required = false) Integer month,
@RequestParam(value = "页码",required = true) Integer page, @RequestParam(value = "页码", required = true) Integer page,
@RequestParam(value = "页数大小",required = true) Integer size); @RequestParam(value = "页数大小", required = true) Integer size);
@ApiOperation(value = "成绩管理列表",notes = "查询成绩管理列表") @ApiOperation(value = "成绩管理列表", notes = "查询成绩管理列表")
R reportList(@RequestParam(value = "系统id",required = true) Integer systemId, R reportList(@RequestParam(value = "系统id", required = true) Integer systemId,
@RequestParam(value = "项目id",required = true) Integer projectId, @RequestParam(value = "项目id", required = true) Integer projectId,
@RequestParam(value = "搜索内容",required = false) String searchContant, @RequestParam(value = "搜索内容", required = false) String searchContant,
@RequestParam(value = "页码",required = true) Integer page, @RequestParam(value = "页码", required = true) Integer page,
@RequestParam(value = "页数大小",required = true) Integer size); @RequestParam(value = "页数大小", required = true) Integer size);
@ApiOperation(value = "川大新增实验记录",notes = "川大新增实验记录") @ApiOperation(value = "川大新增实验记录", notes = "川大新增实验记录")
R addReport(ExperimentalReportEntity entity); R addReport(ExperimentalReportEntity entity);
@ApiOperation(value = "查询实验记录",notes = "查询实验记录") @ApiOperation(value = "查询实验记录", notes = "查询实验记录")
R queryReport(@ApiParam(value = "实验报告主键id",required = true) Integer reportId); R queryReport(@ApiParam(value = "实验报告主键id", required = true) Integer reportId);
// @ApiOperation(value = "直接修改实验记录分数",notes = "直接修改实验记录分数") // @ApiOperation(value = "直接修改实验记录分数",notes = "直接修改实验记录分数")
// R updateScore(@ApiParam(value = "recordid和score") ProjectRecordEntity entity); // R updateScore(@ApiParam(value = "recordid和score") ProjectRecordEntity entity);
@ApiOperation(value = "删除实验报告",notes = "根据实验记录主键reportId和实验报告主键recordId删除实验报告") @ApiOperation(value = "删除实验报告", notes = "根据实验记录主键reportId和实验报告主键recordId删除实验报告")
R deleteReport(@ApiParam(value = "实验记录主键",required = true) Integer reportId,@ApiParam(value = "实验报告主键",required = true) @RequestParam Integer recordId); R deleteReport(@ApiParam(value = "实验记录主键", required = true) Integer reportId, @ApiParam(value = "实验报告主键", required = true) @RequestParam Integer recordId);
@ApiOperation(value = "班级实验报告列表查询",notes = "班级实验报告列表查询") @ApiOperation(value = "班级实验报告列表查询", notes = "班级实验报告列表查询")
R queryEvaluationReport(@ApiParam(value = "搜索内容（学校名称/学生姓名）",required = false) String searchContant, R queryEvaluationReport(@ApiParam(value = "搜索内容（学校名称/学生姓名）", required = false) String searchContant,
@ApiParam(value = "项目",required = true) Integer projectId, @ApiParam(value = "项目", required = true) Integer projectId,
@ApiParam(value = "当前页码",required = true) Integer page, @ApiParam(value = "当前页码", required = true) Integer page,
@ApiParam(value = "每页显示数据量",required = true) Integer size); @ApiParam(value = "每页显示数据量", required = true) Integer size);
@ApiOperation(value = "班级实验成绩导出",notes = "班级实验成绩导出") @ApiOperation(value = "班级实验成绩导出", notes = "班级实验成绩导出")
void exportAchievement(HttpServletResponse response, @ApiParam(value = "实验记录集合recordId(此处为ids字符串（1，2，3）)")String ids) throws Exception; void exportAchievement(HttpServletResponse response, @ApiParam(value = "实验记录集合recordId(此处为ids字符串（1，2，3）)") String ids) throws Exception;
@ApiOperation(value = "成绩管理列表",notes = "成绩管理列表筛选查询") @ApiOperation(value = "成绩管理列表", notes = "成绩管理列表筛选查询")
R queryAchievement(@ApiParam(value = "平台id",required = false) Integer systemId, R queryAchievement(@ApiParam(value = "平台id", required = false) Integer systemId,
@ApiParam(value = "项目类型（0练习，1考核）",required = false) Integer projectPermissions, @ApiParam(value = "项目类型（0练习，1考核）", required = false) Integer projectPermissions,
@ApiParam(value = "搜索内容（项目名称/实验班级）",required = false) String searchContant, @ApiParam(value = "搜索内容（项目名称/实验班级）", required = false) String searchContant,
@ApiParam(value = "开始时间",required = false) String startingtime, @ApiParam(value = "开始时间", required = false) String startingtime,
@ApiParam(value = "结束时间",required = false) String endtime, @ApiParam(value = "结束时间", required = false) String endtime,
@ApiParam(value = "最近几月",required = false) Integer month); @ApiParam(value = "最近几月", required = false) Integer month);
// @ApiOperation(value = "修改教师评语",notes = "修改教师评语:评语comment和实验报告主键reportId") // @ApiOperation(value = "修改教师评语",notes = "修改教师评语:评语comment和实验报告主键reportId")
// R updateComment(@ApiParam(value = "评语comment和实验报告主键reportId",required = true) ExperimentalReportEntity entity); // R updateComment(@ApiParam(value = "评语comment和实验报告主键reportId",required = true) ExperimentalReportEntity entity);
@ApiOperation(value = "发布成绩",notes = "发布成绩--修改教师签名") @ApiOperation(value = "发布成绩", notes = "发布成绩--修改教师签名")
R updateSignatrue(@ApiParam(value = "实验报告主键reportId + 是否使用教师签名isSignature + 教师签名id signatureId + 教师评语comment") ExperimentalReportEntity entity); R updateSignatrue(@ApiParam(value = "实验报告主键reportId + 是否使用教师签名isSignature + 教师签名id signatureId + 教师评语comment") ExperimentalReportEntity entity);
@ApiOperation(value = "成绩管理删除项目",notes = "将项目管理表isdel置1") @ApiOperation(value = "成绩管理删除项目", notes = "将项目管理表isdel置1")
R deleteReportByProjectId(@ApiParam(value = "项目id",required = true) Integer projectId); R deleteReportByProjectId(@ApiParam(value = "项目id", required = true) Integer projectId);
@ApiOperation(value = "成绩管理:虚拟仿真实验成绩管理", notes = "成绩管理:虚拟仿真实验成绩管理") @ApiOperation(value = "成绩管理:虚拟仿真实验成绩管理", notes = "成绩管理:虚拟仿真实验成绩管理")
@ -89,4 +89,7 @@ public interface AchievementManagementApi {
@ApiOperation(value = "成绩管理:实验教学成绩管理", notes = "成绩管理:实验教学成绩管理") @ApiOperation(value = "成绩管理:实验教学成绩管理", notes = "成绩管理:实验教学成绩管理")
R getTeachAchievement(@RequestParam(required = true) Integer id); R getTeachAchievement(@RequestParam(required = true) Integer id);
@ApiOperation(value = "成绩管理:编辑实验报告", notes = "成绩管理:编辑实验报告")
R modify(@ApiParam(value = "要修改的字段") ExperimentalReportEntity entity);
} }

118
src/main/java/com/msdw/tms/controller/AchievementManagementController.java
Unescape View File

@ -27,21 +27,24 @@ public class AchievementManagementController implements AchievementManagementApi
@Autowired @Autowired
private ProjectRecordService projectRecordService; private ProjectRecordService projectRecordService;
/** /**
* 查询用户实验报告 * 查询用户实验报告
*
* @param projectId * @param projectId
* @param * @param
* @return * @return
*/ */
@Override @Override
@GetMapping("/getTeacher") @GetMapping("/getTeacher")
public R getTeacher(@RequestParam Integer projectId){ public R getTeacher(@RequestParam Integer projectId) {
R data = service.getTeacher(projectId); R data = service.getTeacher(projectId);
return data; return data;
} }
/** /**
* 查询用户实验报告 * 查询用户实验报告
*
* @param userId * @param userId
* @param reportId * @param reportId
* @param * @param
@ -49,13 +52,12 @@ public class AchievementManagementController implements AchievementManagementApi
*/ */
@Override @Override
@GetMapping("/getReport") @GetMapping("/getReport")
public R getReport(@RequestParam Integer reportId,@RequestParam Integer userId){ public R getReport(@RequestParam Integer reportId, @RequestParam Integer userId) {
R data = service.getReport(userId,reportId); R data = service.getReport(userId, reportId);
return data; return data;
} }
/** /**
* 查询实验记录 * 查询实验记录
*/ */
@ -68,27 +70,27 @@ public class AchievementManagementController implements AchievementManagementApi
@RequestParam(required = false) String endTime, @RequestParam(required = false) String endTime,
@RequestParam(required = false) Integer month, @RequestParam(required = false) Integer month,
@RequestParam(required = true) Integer page, @RequestParam(required = true) Integer page,
@RequestParam(required = true) Integer size){ @RequestParam(required = true) Integer size) {
ResultsVo vo = new ResultsVo(); ResultsVo vo = new ResultsVo();
if (systemId==null){ if (systemId == null) {
return R.error("系统id不能为空！"); return R.error("系统id不能为空！");
}else{ } else {
vo.setSystemId(systemId); vo.setSystemId(systemId);
} }
if (projectPermissions!=null){ if (projectPermissions != null) {
vo.setProjectPermissions(projectPermissions); vo.setProjectPermissions(projectPermissions);
} }
if (searchContant!=null){ if (searchContant != null) {
vo.setSearchContant(searchContant); vo.setSearchContant(searchContant);
} }
if (startTime!=null){ if (startTime != null) {
vo.setStartTime(startTime); vo.setStartTime(startTime);
} }
if (endTime!=null){ if (endTime != null) {
vo.setEndTime(endTime); vo.setEndTime(endTime);
} }
List<ResultsEntity> result = service.list(vo,page,size); List<ResultsEntity> result = service.list(vo, page, size);
return R.ok().put("data",result); return R.ok().put("data", result);
} }
/** /**
@ -97,29 +99,29 @@ public class AchievementManagementController implements AchievementManagementApi
@Override @Override
@GetMapping("/newList") @GetMapping("/newList")
public R newList(@RequestParam(required = true) Integer userId, public R newList(@RequestParam(required = true) Integer userId,
@RequestParam(required = false) String searchContant, @RequestParam(required = false) String searchContant,
@RequestParam(required = false) String startTime, @RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime, @RequestParam(required = false) String endTime,
@RequestParam(required = false) Integer month, @RequestParam(required = false) Integer month,
@RequestParam(required = true) Integer page, @RequestParam(required = true) Integer page,
@RequestParam(required = true) Integer size){ @RequestParam(required = true) Integer size) {
ResultsVo vo = new ResultsVo(); ResultsVo vo = new ResultsVo();
if (userId==null){ if (userId == null) {
return R.error("用户id不能为空！"); return R.error("用户id不能为空！");
}else{ } else {
vo.setUserId(userId); vo.setUserId(userId);
} }
if (searchContant!=null){ if (searchContant != null) {
vo.setSearchContant(searchContant); vo.setSearchContant(searchContant);
} }
if (startTime!=null){ if (startTime != null) {
vo.setStartTime(startTime); vo.setStartTime(startTime);
} }
if (endTime!=null){ if (endTime != null) {
vo.setEndTime(endTime); vo.setEndTime(endTime);
} }
List<ResultsEntity> result = service.newList(vo,page,size); List<ResultsEntity> result = service.newList(vo, page, size);
return R.ok().put("data",result); return R.ok().put("data", result);
} }
/** /**
@ -128,22 +130,22 @@ public class AchievementManagementController implements AchievementManagementApi
@Override @Override
@GetMapping("/reportList") @GetMapping("/reportList")
public R reportList(@RequestParam(required = true) Integer systemId, public R reportList(@RequestParam(required = true) Integer systemId,
@RequestParam(required = true) Integer projectId, @RequestParam(required = true) Integer projectId,
@RequestParam(required = false) String searchContant, @RequestParam(required = false) String searchContant,
@RequestParam(required = true) Integer page, @RequestParam(required = true) Integer page,
@RequestParam(required = true) Integer size){ @RequestParam(required = true) Integer size) {
ResultsVo vo = new ResultsVo(); ResultsVo vo = new ResultsVo();
if (systemId==null||projectId==null){ if (systemId == null || projectId == null) {
return R.error("系统或项目数据不能为空！"); return R.error("系统或项目数据不能为空！");
}else{ } else {
vo.setSystemId(systemId); vo.setSystemId(systemId);
vo.setProjectId(projectId); vo.setProjectId(projectId);
} }
if (searchContant!=null){ if (searchContant != null) {
vo.setSearchContant(searchContant); vo.setSearchContant(searchContant);
} }
List<ReportEntity> result = service.reportList(vo,page,size); List<ReportEntity> result = service.reportList(vo, page, size);
return R.ok().put("data",result); return R.ok().put("data", result);
} }
/** /**
@ -151,9 +153,9 @@ public class AchievementManagementController implements AchievementManagementApi
*/ */
@Override @Override
@PostMapping("/addReport") @PostMapping("/addReport")
public R addReport(@RequestBody ExperimentalReportEntity entity){ public R addReport(@RequestBody ExperimentalReportEntity entity) {
R result = service.addReport(entity); R result = service.addReport(entity);
return R.ok().put("reportId",entity.getReportId()); return R.ok().put("reportId", entity.getReportId());
} }
// /** // /**
@ -171,7 +173,7 @@ public class AchievementManagementController implements AchievementManagementApi
*/ */
@Override @Override
@GetMapping("/queryReport") @GetMapping("/queryReport")
public R queryReport(@RequestParam(required = true) Integer reportId){ public R queryReport(@RequestParam(required = true) Integer reportId) {
R result = service.queryReport(reportId); R result = service.queryReport(reportId);
return result; return result;
} }
@ -180,7 +182,7 @@ public class AchievementManagementController implements AchievementManagementApi
// @Override // @Override
@Transactional @Transactional
@PostMapping("/updateReport") @PostMapping("/updateReport")
public R updateScore(@RequestBody ProjectRecordEntity entity){ public R updateScore(@RequestBody ProjectRecordEntity entity) {
ProjectRecordEntity vo = new ProjectRecordEntity() ProjectRecordEntity vo = new ProjectRecordEntity()
.setRecordid(entity.getRecordid()).setScore(entity.getScore()); .setRecordid(entity.getRecordid()).setScore(entity.getScore());
projectRecordService.updateScore(vo); projectRecordService.updateScore(vo);
@ -189,20 +191,22 @@ public class AchievementManagementController implements AchievementManagementApi
/** /**
* 需求：删除实验记录====管理端删除，但是学生端仍需保留 * 需求：删除实验记录====管理端删除，但是学生端仍需保留
* 将isdel属性设置为0 * 将isdel属性设置为0
*
* @param reportId * @param reportId
* @return * @return
*/ */
@Override @Override
@PostMapping("/deleteReport") @PostMapping("/deleteReport")
public R deleteReport(@RequestParam Integer reportId,@RequestParam Integer recordId){ public R deleteReport(@RequestParam Integer reportId, @RequestParam Integer recordId) {
R result = service.deleteReport(reportId,recordId); R result = service.deleteReport(reportId, recordId);
return result; return result;
} }
/** /**
* 班级实验报告列表查询 * 班级实验报告列表查询
*
* @param searchContant * @param searchContant
* @return * @return
*/ */
@ -211,21 +215,22 @@ public class AchievementManagementController implements AchievementManagementApi
public R queryEvaluationReport(@RequestParam(required = false) String searchContant, public R queryEvaluationReport(@RequestParam(required = false) String searchContant,
@RequestParam(required = true) Integer projectId, @RequestParam(required = true) Integer projectId,
@RequestParam(required = true) Integer page, @RequestParam(required = true) Integer page,
@RequestParam(required = true) Integer size){ @RequestParam(required = true) Integer size) {
R result = service.queryEvaluationReport(searchContant,projectId,page,size); R result = service.queryEvaluationReport(searchContant, projectId, page, size);
return result; return result;
} }
/** /**
* 班级实验成绩导出 * 班级实验成绩导出
*
* @param response * @param response
* @param ids (ids：recordId) * @param ids (ids：recordId)
* @throws Exception * @throws Exception
*/ */
@Override @Override
@GetMapping("/exportAchievement") @GetMapping("/exportAchievement")
public void exportAchievement(HttpServletResponse response, @RequestParam String ids) throws Exception { public void exportAchievement(HttpServletResponse response, @RequestParam String ids) throws Exception {
service.exportAchievement(response,ids);//SearchAchievementVo vo service.exportAchievement(response, ids);//SearchAchievementVo vo
} }
//成绩管理列表 //成绩管理列表
@ -236,19 +241,20 @@ public class AchievementManagementController implements AchievementManagementApi
@RequestParam(required = false) String searchContant, @RequestParam(required = false) String searchContant,
@RequestParam(required = false) String startingtime, @RequestParam(required = false) String startingtime,
@RequestParam(required = false) String endtime, @RequestParam(required = false) String endtime,
@RequestParam(required = false) Integer month){ @RequestParam(required = false) Integer month) {
R result = service.queryAchievement(systemId,projectPermissions,searchContant,startingtime,endtime,month); R result = service.queryAchievement(systemId, projectPermissions, searchContant, startingtime, endtime, month);
return result; return result;
} }
/** /**
* 修改评语 * 修改评语
*
* @param entity * @param entity
* @return * @return
*/ */
// @Override // @Override
@PostMapping("/updateComment") @PostMapping("/updateComment")
public R updateComment(@RequestBody ExperimentalReportEntity entity){ public R updateComment(@RequestBody ExperimentalReportEntity entity) {
R result = service.updateComment(entity); R result = service.updateComment(entity);
return result; return result;
} }
@ -256,12 +262,13 @@ public class AchievementManagementController implements AchievementManagementApi
/** /**
* 发布成绩： * 发布成绩：
* 修改教师签名+修改教师评语 * 修改教师签名+修改教师评语
* @param entity （isSignature，signatureId，reportId，comment） *
* @param entity （isSignature，signatureId，reportId，comment）
* @return * @return
*/ */
@Override @Override
@PostMapping("/release") @PostMapping("/release")
public R updateSignatrue(@RequestBody ExperimentalReportEntity entity){ public R updateSignatrue(@RequestBody ExperimentalReportEntity entity) {
service.updateSignatrue(entity); service.updateSignatrue(entity);
return R.ok(); return R.ok();
} }
@ -269,6 +276,7 @@ public class AchievementManagementController implements AchievementManagementApi
/** /**
* 删除成绩管理中的项目 * 删除成绩管理中的项目
*
* @param projectId * @param projectId
* @return * @return
*/ */
@ -297,4 +305,12 @@ public class AchievementManagementController implements AchievementManagementApi
List<AchievementManagementVO> result = service.getTeachAchievement(id); List<AchievementManagementVO> result = service.getTeachAchievement(id);
return R.ok().put("data", result); return R.ok().put("data", result);
} }
@Override
@PostMapping("/modify")
public R modify(@RequestBody ExperimentalReportEntity entity) {
Integer code = service.modify(entity);
return R.ok();
}
} }

7
src/main/java/com/msdw/tms/dao/AchievementManagementDao.java
Unescape View File

@ -47,7 +47,7 @@ public interface AchievementManagementDao extends BaseMapper<ExperimentalReportE
AchievementManagementVO queryReport(Integer reportId); AchievementManagementVO queryReport(Integer reportId);
void deleteReport(Integer reportId,Integer recordId); void deleteReport(Integer reportId, Integer recordId);
IPage<AchievementManagementVO> queryEvaluationReport(Page<T> tPage, String searchContant, Integer projectId); IPage<AchievementManagementVO> queryEvaluationReport(Page<T> tPage, String searchContant, Integer projectId);
@ -71,7 +71,7 @@ public interface AchievementManagementDao extends BaseMapper<ExperimentalReportE
List<AchievementManagementVO> queryPythonTest(Integer eventId); List<AchievementManagementVO> queryPythonTest(Integer eventId);
void updateSignatrue(Integer isSignature,Integer signatureId,Integer reportId,String comment); void updateSignatrue(Integer isSignature, Integer signatureId, Integer reportId, String comment);
void deleteReportById(Integer projectId); void deleteReportById(Integer projectId);
@ -79,4 +79,7 @@ public interface AchievementManagementDao extends BaseMapper<ExperimentalReportE
List<AchievementManagementVO> getImitationAchievement(Integer projectId); List<AchievementManagementVO> getImitationAchievement(Integer projectId);
List<AchievementManagementVO> getTeachAchievement(Integer id); List<AchievementManagementVO> getTeachAchievement(Integer id);
//编辑实验报告
Integer modify(ExperimentalReportEntity entity);
} }

80
src/main/java/com/msdw/tms/entity/ExperimentalReportEntity.java
Unescape View File

@ -13,112 +13,118 @@ import lombok.experimental.Accessors;
public class ExperimentalReportEntity { public class ExperimentalReportEntity {
//实验报告主键 //实验报告主键
@TableId(type = IdType.AUTO) @TableId(type = IdType.AUTO)
@ApiModelProperty(value = "实验报告主键",name = "reportId",required = false) @ApiModelProperty(value = "实验报告主键", name = "reportId", required = false)
private Integer reportId; private Integer reportId;
//绑定实验id //绑定实验id
@ApiModelProperty(value = "绑定实验id",name = "projectId",required = false) @ApiModelProperty(value = "绑定实验id", name = "projectId", required = false)
private Integer projectId; private Integer projectId;
//实验原理 //实验原理
@ApiModelProperty(value = "实验原理",name = "principle",required = false) @ApiModelProperty(value = "实验原理", name = "principle", required = false)
private String principle; private String principle;
//实验内容 //实验内容
@ApiModelProperty(value = "实验内容",name = "content",required = false) @ApiModelProperty(value = "实验内容", name = "content", required = false)
private String content; private String content;
//实验步骤 //实验步骤
@ApiModelProperty(value = "实验步骤",name = "step",required = false) @ApiModelProperty(value = "实验步骤", name = "step", required = false)
private String step; private String step;
//实验数据 //实验数据
@ApiModelProperty(value = "实验数据",name = "data",required = false) @ApiModelProperty(value = "实验数据", name = "data", required = false)
private String data; private String data;
//实验分析 //实验分析
@ApiModelProperty(value = "实验分析",name = "analysis",required = false) @ApiModelProperty(value = "实验分析", name = "analysis", required = false)
private String analysis; private String analysis;
//实验结论 //实验结论
@ApiModelProperty(value = "实验结论",name = "conclusion",required = false) @ApiModelProperty(value = "实验结论", name = "conclusion", required = false)
private String conclusion; private String conclusion;
//实验总结 //实验总结
@ApiModelProperty(value = "实验总结",name = "summarize",required = false) @ApiModelProperty(value = "实验总结", name = "summarize", required = false)
private String summarize; private String summarize;
//实验目的 //实验目的
@ApiModelProperty(value = "实验目的",name = "purpose",required = false) @ApiModelProperty(value = "实验目的", name = "purpose", required = false)
private String purpose; private String purpose;
//对本实验过程的方法及手段的改进建议 //对本实验过程的方法及手段的改进建议
@ApiModelProperty(value = "对本实验过程的方法及手段的改进建议",name = "improvement",required = false) @ApiModelProperty(value = "对本实验过程的方法及手段的改进建议", name = "improvement", required = false)
private String improvement; private String improvement;
//老师评语 //老师评语
@ApiModelProperty(value = "老师评语",name = "commentId",required = false) @ApiModelProperty(value = "老师评语", name = "commentId", required = false)
private Integer commentId; private Integer commentId;
//教师评语 //教师评语
@ApiModelProperty(value = "教师评语",name = "comment",required = false) @ApiModelProperty(value = "教师评语", name = "comment", required = false)
private String comment; private String comment;
//绑定学生id //绑定学生id
@ApiModelProperty(value = "绑定学生id",name = "studentId",required = false) @ApiModelProperty(value = "绑定学生id", name = "studentId", required = false)
private Integer studentId; private Integer studentId;
//绑定老师id //绑定老师id
@ApiModelProperty(value = "绑定老师id",name = "teacherId",required = false) @ApiModelProperty(value = "绑定老师id", name = "teacherId", required = false)
private Integer teacherId; private Integer teacherId;
//指导老师 //指导老师
@ApiModelProperty(value = "指导老师",name = "teacherName",required = false) @ApiModelProperty(value = "指导老师", name = "teacherName", required = false)
private String teacherName; private String teacherName;
//学时 //学时
@ApiModelProperty(value = "学时",name = "period",required = false) @ApiModelProperty(value = "学时", name = "period", required = false)
private String period; private String period;
//实验室名称 //实验室名称
@ApiModelProperty(value = "实验室名称",name = "laboratory",required = false) @ApiModelProperty(value = "实验室名称", name = "laboratory", required = false)
private String laboratory; private String laboratory;
//绑定教师签名id //绑定教师签名id
@ApiModelProperty(value = "绑定教师签名id",name = "signatureId",required = false) @ApiModelProperty(value = "绑定教师签名id", name = "signatureId", required = false)
private Integer signatureId; private Integer signatureId;
//是否启用教师签名照 //是否启用教师签名照
@ApiModelProperty(value = "是否启用教师签名照",name = "isSignature",required = false) @ApiModelProperty(value = "是否启用教师签名照", name = "isSignature", required = false)
private Integer isSignature; private Integer isSignature;
//绑定项目id //绑定项目id
@ApiModelProperty(value = "绑定项目id",name = "eventId",required = false) @ApiModelProperty(value = "绑定项目id", name = "eventId", required = false)
private Integer eventId; private Integer eventId;
//实验器材 //实验器材
@ApiModelProperty(value = "实验器材",name = "equipment",required = false) @ApiModelProperty(value = "实验器材", name = "equipment", required = false)
private String equipment; private String equipment;
@ApiModelProperty(value = "最终得分",name = "score",required = false) @ApiModelProperty(value = "最终得分", name = "score", required = false)
private Integer score; private Integer score;
@ApiModelProperty(value = "耗时/小时",name = "timeConsuming",required = false) @ApiModelProperty(value = "耗时/小时", name = "timeConsuming", required = false)
private Integer timeConsuming; private Integer timeConsuming;
@ApiModelProperty(value = "开始时间",name = "startTime",required = false) @ApiModelProperty(value = "开始时间", name = "startTime", required = false)
private String startTime; private String startTime;
@ApiModelProperty(value = "创建时间",name = "creationTime",required = false) @ApiModelProperty(value = "创建时间", name = "creationTime", required = false)
private String creationTime; private String creationTime;
@ApiModelProperty(value = "班级名称",name = "className",required = false) @ApiModelProperty(value = "班级名称", name = "className", required = false)
private String className; private String className;
//步骤1 //步骤1
@ApiModelProperty(value = "步骤1",name = "steps1",required = false) @ApiModelProperty(value = "步骤1", name = "steps1", required = false)
private String steps1; private String steps1;
//步骤2 //步骤2
@ApiModelProperty(value = "步骤2",name = "steps2",required = false) @ApiModelProperty(value = "步骤2", name = "steps2", required = false)
private String steps2; private String steps2;
//步骤3 //步骤3
@ApiModelProperty(value = "步骤3",name = "steps3",required = false) @ApiModelProperty(value = "步骤3", name = "steps3", required = false)
private String steps3; private String steps3;
//步骤4 //步骤4
@ApiModelProperty(value = "步骤4",name = "steps4",required = false) @ApiModelProperty(value = "步骤4", name = "steps4", required = false)
private String steps4; private String steps4;
//步骤5 //步骤5
@ApiModelProperty(value = "步骤5",name = "steps5",required = false) @ApiModelProperty(value = "步骤5", name = "steps5", required = false)
private String steps5; private String steps5;
//步骤6 //步骤6
@ApiModelProperty(value = "步骤6",name = "steps6",required = false) @ApiModelProperty(value = "步骤6", name = "steps6", required = false)
private String steps6; private String steps6;
//步骤7 //步骤7
@ApiModelProperty(value = "步骤7",name = "steps7",required = false) @ApiModelProperty(value = "步骤7", name = "steps7", required = false)
private String steps7; private String steps7;
//步骤8 //步骤8
@ApiModelProperty(value = "步骤8",name = "steps8",required = false) @ApiModelProperty(value = "步骤8", name = "steps8", required = false)
private String steps8; private String steps8;
//步骤9 //步骤9
@ApiModelProperty(value = "步骤9",name = "steps9",required = false) @ApiModelProperty(value = "步骤9", name = "steps9", required = false)
private String steps9; private String steps9;
//步骤10 //步骤10
@ApiModelProperty(value = "步骤10",name = "steps10",required = false) @ApiModelProperty(value = "步骤10", name = "steps10", required = false)
private String steps10; private String steps10;
@ApiModelProperty(value = "指导老师", name = "instructor", required = false)
private String instructor;
@ApiModelProperty(value = "项目名称", name = "proName", required = false)
private String proName;
private transient String projectName; private transient String projectName;
private transient String workNumber; private transient String workNumber;

11
src/main/java/com/msdw/tms/service/AchievementManagementService.java
Unescape View File

@ -30,15 +30,15 @@ public interface AchievementManagementService extends IService<ExperimentalRepor
R addReport(ExperimentalReportEntity entity); R addReport(ExperimentalReportEntity entity);
R queryReport(Integer reportId ); R queryReport(Integer reportId);
R deleteReport(Integer reportId,Integer recordId); R deleteReport(Integer reportId, Integer recordId);
R queryEvaluationReport(String searchContant,Integer projectId,Integer page,Integer size); R queryEvaluationReport(String searchContant, Integer projectId, Integer page, Integer size);
void exportAchievement(HttpServletResponse response, String vo) throws Exception; void exportAchievement(HttpServletResponse response, String vo) throws Exception;
R queryAchievement(Integer systemId,Integer projectPermissions, String searchContant, String startingtime, String endtime, Integer month); R queryAchievement(Integer systemId, Integer projectPermissions, String searchContant, String startingtime, String endtime, Integer month);
R updateComment(ExperimentalReportEntity entity); R updateComment(ExperimentalReportEntity entity);
@ -49,4 +49,7 @@ public interface AchievementManagementService extends IService<ExperimentalRepor
List<AchievementManagementVO> getImitationAchievement(Integer projectId); List<AchievementManagementVO> getImitationAchievement(Integer projectId);
List<AchievementManagementVO> getTeachAchievement(Integer id); List<AchievementManagementVO> getTeachAchievement(Integer id);
//编辑实验报告
Integer modify(ExperimentalReportEntity entity);
} }

12
src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
Unescape View File

@ -171,8 +171,8 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
@Override @Override
@Transactional @Transactional
public R deleteReport(Integer reportId,Integer recordId) { public R deleteReport(Integer reportId, Integer recordId) {
achievementManagementDao.deleteReport(reportId,recordId); achievementManagementDao.deleteReport(reportId, recordId);
return R.ok(); return R.ok();
} }
@ -283,7 +283,6 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
} }
@Override @Override
public R deleteReportByProjectId(Integer projectId) { public R deleteReportByProjectId(Integer projectId) {
@ -301,7 +300,12 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
@Override @Override
public List<AchievementManagementVO> getTeachAchievement(Integer id) { public List<AchievementManagementVO> getTeachAchievement(Integer id) {
return achievementManagementDao.getTeachAchievement(id); return achievementManagementDao.getTeachAchievement(id);
}
@Override
public Integer modify(ExperimentalReportEntity entity) {
return achievementManagementDao.modify(entity);
} }
} }

25
src/main/resources/mapper/tms/AchievementManagementDao.xml
Unescape View File

@ -553,4 +553,29 @@
</select> </select>
<update id="modify" parameterType="com.msdw.tms.entity.ExperimentalReportEntity">
UPDATE tms_experimental_report
<set>
<if test="instructor != null">
instructor=#{instructor, jdbcType=VARCHAR},
</if>
<if test="period != null">
period=#{period, jdbcType=INTEGER},
</if>
<if test="proName != null">
proName=#{proName, jdbcType=VARCHAR},
</if>
<if test="purpose != null">
purpose=#{purpose, jdbcType=VARCHAR},
</if>
<if test="summarize != null">
summarize=#{summarize, jdbcType=VARCHAR},
</if>
</set>
WHERE reportId = #{reportId}
</update>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save