diff --git a/src/main/java/com/msdw/tms/api/AchievementManagementApi.java b/src/main/java/com/msdw/tms/api/AchievementManagementApi.java index 92d05d4..b6a7e74 100644 --- a/src/main/java/com/msdw/tms/api/AchievementManagementApi.java +++ b/src/main/java/com/msdw/tms/api/AchievementManagementApi.java @@ -9,78 +9,78 @@ import org.springframework.web.bind.annotation.RequestParam; import javax.servlet.http.HttpServletResponse; -@Api(value = "成绩管理",tags = "成绩管理") +@Api(value = "成绩管理", tags = "成绩管理") public interface AchievementManagementApi { - @ApiOperation(value = "查询指导老师",notes = "查询指导老师") + @ApiOperation(value = "查询指导老师", notes = "查询指导老师") R getTeacher(Integer projectId); - @ApiOperation(value = "查询用户实验报告",notes = "查询用户实验报告") - R getReport(Integer userId,Integer reportId); - - @ApiOperation(value = "成绩管理列表",notes = "查询成绩管理列表") - R list(@RequestParam(value = "系统id",required = true) Integer systemId, - @RequestParam(value = "分类",required = false) Integer projectPermissions, - @RequestParam(value = "搜索内容",required = false) String searchContant, - @RequestParam(value = "开始时间",required = false) String startTime, - @RequestParam(value = "结束时间",required = false) String endTime, - @RequestParam(value = "月份",required = false) Integer month, - @RequestParam(value = "页码",required = true) Integer page, - @RequestParam(value = "页数大小",required = true) Integer size); - - @ApiOperation(value = "查询实验教学列表",notes = "查询实验教学列表") - R newList(@RequestParam(value = "用户id",required = true) Integer userId, - @RequestParam(value = "搜索内容",required = false) String searchContant, - @RequestParam(value = "开始时间",required = false) String startTime, - @RequestParam(value = "结束时间",required = false) String endTime, - @RequestParam(value = "月份",required = false) Integer month, - @RequestParam(value = "页码",required = true) Integer page, - @RequestParam(value = "页数大小",required = true) Integer size); - - @ApiOperation(value = "成绩管理列表",notes = "查询成绩管理列表") - R reportList(@RequestParam(value = "系统id",required = true) Integer systemId, - @RequestParam(value = "项目id",required = true) Integer projectId, - @RequestParam(value = "搜索内容",required = false) String searchContant, - @RequestParam(value = "页码",required = true) Integer page, - @RequestParam(value = "页数大小",required = true) Integer size); - - @ApiOperation(value = "川大新增实验记录",notes = "川大新增实验记录") + @ApiOperation(value = "查询用户实验报告", notes = "查询用户实验报告") + R getReport(Integer userId, Integer reportId); + + @ApiOperation(value = "成绩管理列表", notes = "查询成绩管理列表") + R list(@RequestParam(value = "系统id", required = true) Integer systemId, + @RequestParam(value = "分类", required = false) Integer projectPermissions, + @RequestParam(value = "搜索内容", required = false) String searchContant, + @RequestParam(value = "开始时间", required = false) String startTime, + @RequestParam(value = "结束时间", required = false) String endTime, + @RequestParam(value = "月份", required = false) Integer month, + @RequestParam(value = "页码", required = true) Integer page, + @RequestParam(value = "页数大小", required = true) Integer size); + + @ApiOperation(value = "查询实验教学列表", notes = "查询实验教学列表") + R newList(@RequestParam(value = "用户id", required = true) Integer userId, + @RequestParam(value = "搜索内容", required = false) String searchContant, + @RequestParam(value = "开始时间", required = false) String startTime, + @RequestParam(value = "结束时间", required = false) String endTime, + @RequestParam(value = "月份", required = false) Integer month, + @RequestParam(value = "页码", required = true) Integer page, + @RequestParam(value = "页数大小", required = true) Integer size); + + @ApiOperation(value = "成绩管理列表", notes = "查询成绩管理列表") + R reportList(@RequestParam(value = "系统id", required = true) Integer systemId, + @RequestParam(value = "项目id", required = true) Integer projectId, + @RequestParam(value = "搜索内容", required = false) String searchContant, + @RequestParam(value = "页码", required = true) Integer page, + @RequestParam(value = "页数大小", required = true) Integer size); + + @ApiOperation(value = "川大新增实验记录", notes = "川大新增实验记录") R addReport(ExperimentalReportEntity entity); - @ApiOperation(value = "查询实验记录",notes = "查询实验记录") - R queryReport(@ApiParam(value = "实验报告主键id",required = true) Integer reportId); + @ApiOperation(value = "查询实验记录", notes = "查询实验记录") + R queryReport(@ApiParam(value = "实验报告主键id", required = true) Integer reportId); // @ApiOperation(value = "直接修改实验记录分数",notes = "直接修改实验记录分数") // R updateScore(@ApiParam(value = "recordid和score") ProjectRecordEntity entity); - @ApiOperation(value = "删除实验报告",notes = "根据实验记录主键reportId和实验报告主键recordId删除实验报告") - R deleteReport(@ApiParam(value = "实验记录主键",required = true) Integer reportId,@ApiParam(value = "实验报告主键",required = true) @RequestParam Integer recordId); + @ApiOperation(value = "删除实验报告", notes = "根据实验记录主键reportId和实验报告主键recordId删除实验报告") + R deleteReport(@ApiParam(value = "实验记录主键", required = true) Integer reportId, @ApiParam(value = "实验报告主键", required = true) @RequestParam Integer recordId); - @ApiOperation(value = "班级实验报告列表查询",notes = "班级实验报告列表查询") - R queryEvaluationReport(@ApiParam(value = "搜索内容（学校名称/学生姓名）",required = false) String searchContant, - @ApiParam(value = "项目",required = true) Integer projectId, - @ApiParam(value = "当前页码",required = true) Integer page, - @ApiParam(value = "每页显示数据量",required = true) Integer size); + @ApiOperation(value = "班级实验报告列表查询", notes = "班级实验报告列表查询") + R queryEvaluationReport(@ApiParam(value = "搜索内容（学校名称/学生姓名）", required = false) String searchContant, + @ApiParam(value = "项目", required = true) Integer projectId, + @ApiParam(value = "当前页码", required = true) Integer page, + @ApiParam(value = "每页显示数据量", required = true) Integer size); - @ApiOperation(value = "班级实验成绩导出",notes = "班级实验成绩导出") - void exportAchievement(HttpServletResponse response, @ApiParam(value = "实验记录集合recordId(此处为ids字符串（1，2，3）)")String ids) throws Exception; + @ApiOperation(value = "班级实验成绩导出", notes = "班级实验成绩导出") + void exportAchievement(HttpServletResponse response, @ApiParam(value = "实验记录集合recordId(此处为ids字符串（1，2，3）)") String ids) throws Exception; - @ApiOperation(value = "成绩管理列表",notes = "成绩管理列表筛选查询") - R queryAchievement(@ApiParam(value = "平台id",required = false) Integer systemId, - @ApiParam(value = "项目类型（0练习，1考核）",required = false) Integer projectPermissions, - @ApiParam(value = "搜索内容（项目名称/实验班级）",required = false) String searchContant, - @ApiParam(value = "开始时间",required = false) String startingtime, - @ApiParam(value = "结束时间",required = false) String endtime, - @ApiParam(value = "最近几月",required = false) Integer month); + @ApiOperation(value = "成绩管理列表", notes = "成绩管理列表筛选查询") + R queryAchievement(@ApiParam(value = "平台id", required = false) Integer systemId, + @ApiParam(value = "项目类型（0练习，1考核）", required = false) Integer projectPermissions, + @ApiParam(value = "搜索内容（项目名称/实验班级）", required = false) String searchContant, + @ApiParam(value = "开始时间", required = false) String startingtime, + @ApiParam(value = "结束时间", required = false) String endtime, + @ApiParam(value = "最近几月", required = false) Integer month); // @ApiOperation(value = "修改教师评语",notes = "修改教师评语:评语comment和实验报告主键reportId") // 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); - @ApiOperation(value = "成绩管理删除项目",notes = "将项目管理表isdel置1") - R deleteReportByProjectId(@ApiParam(value = "项目id",required = true) Integer projectId); + @ApiOperation(value = "成绩管理删除项目", notes = "将项目管理表isdel置1") + R deleteReportByProjectId(@ApiParam(value = "项目id", required = true) Integer projectId); @ApiOperation(value = "成绩管理:虚拟仿真实验成绩管理", notes = "成绩管理:虚拟仿真实验成绩管理") @@ -89,4 +89,7 @@ public interface AchievementManagementApi { @ApiOperation(value = "成绩管理:实验教学成绩管理", notes = "成绩管理:实验教学成绩管理") R getTeachAchievement(@RequestParam(required = true) Integer id); + @ApiOperation(value = "成绩管理:编辑实验报告", notes = "成绩管理:编辑实验报告") + R modify(@ApiParam(value = "要修改的字段") ExperimentalReportEntity entity); + } diff --git a/src/main/java/com/msdw/tms/controller/AchievementManagementController.java b/src/main/java/com/msdw/tms/controller/AchievementManagementController.java index 05a12ef..4b027b8 100644 --- a/src/main/java/com/msdw/tms/controller/AchievementManagementController.java +++ b/src/main/java/com/msdw/tms/controller/AchievementManagementController.java @@ -27,21 +27,24 @@ public class AchievementManagementController implements AchievementManagementApi @Autowired private ProjectRecordService projectRecordService; + /** * 查询用户实验报告 + * * @param projectId * @param * @return */ @Override @GetMapping("/getTeacher") - public R getTeacher(@RequestParam Integer projectId){ + public R getTeacher(@RequestParam Integer projectId) { R data = service.getTeacher(projectId); return data; } /** * 查询用户实验报告 + * * @param userId * @param reportId * @param @@ -49,13 +52,12 @@ public class AchievementManagementController implements AchievementManagementApi */ @Override @GetMapping("/getReport") - public R getReport(@RequestParam Integer reportId,@RequestParam Integer userId){ - R data = service.getReport(userId,reportId); + public R getReport(@RequestParam Integer reportId, @RequestParam Integer userId) { + R data = service.getReport(userId, reportId); return data; } - /** * 查询实验记录 */ @@ -68,27 +70,27 @@ public class AchievementManagementController implements AchievementManagementApi @RequestParam(required = false) String endTime, @RequestParam(required = false) Integer month, @RequestParam(required = true) Integer page, - @RequestParam(required = true) Integer size){ + @RequestParam(required = true) Integer size) { ResultsVo vo = new ResultsVo(); - if (systemId==null){ + if (systemId == null) { return R.error("系统id不能为空！"); - }else{ + } else { vo.setSystemId(systemId); } - if (projectPermissions!=null){ + if (projectPermissions != null) { vo.setProjectPermissions(projectPermissions); } - if (searchContant!=null){ + if (searchContant != null) { vo.setSearchContant(searchContant); } - if (startTime!=null){ + if (startTime != null) { vo.setStartTime(startTime); } - if (endTime!=null){ + if (endTime != null) { vo.setEndTime(endTime); } - List result = service.list(vo,page,size); - return R.ok().put("data",result); + List result = service.list(vo, page, size); + return R.ok().put("data", result); } /** @@ -97,29 +99,29 @@ public class AchievementManagementController implements AchievementManagementApi @Override @GetMapping("/newList") public R newList(@RequestParam(required = true) Integer userId, - @RequestParam(required = false) String searchContant, - @RequestParam(required = false) String startTime, - @RequestParam(required = false) String endTime, - @RequestParam(required = false) Integer month, - @RequestParam(required = true) Integer page, - @RequestParam(required = true) Integer size){ + @RequestParam(required = false) String searchContant, + @RequestParam(required = false) String startTime, + @RequestParam(required = false) String endTime, + @RequestParam(required = false) Integer month, + @RequestParam(required = true) Integer page, + @RequestParam(required = true) Integer size) { ResultsVo vo = new ResultsVo(); - if (userId==null){ + if (userId == null) { return R.error("用户id不能为空！"); - }else{ + } else { vo.setUserId(userId); } - if (searchContant!=null){ + if (searchContant != null) { vo.setSearchContant(searchContant); } - if (startTime!=null){ + if (startTime != null) { vo.setStartTime(startTime); } - if (endTime!=null){ + if (endTime != null) { vo.setEndTime(endTime); } - List result = service.newList(vo,page,size); - return R.ok().put("data",result); + List result = service.newList(vo, page, size); + return R.ok().put("data", result); } /** @@ -128,22 +130,22 @@ public class AchievementManagementController implements AchievementManagementApi @Override @GetMapping("/reportList") public R reportList(@RequestParam(required = true) Integer systemId, - @RequestParam(required = true) Integer projectId, - @RequestParam(required = false) String searchContant, - @RequestParam(required = true) Integer page, - @RequestParam(required = true) Integer size){ + @RequestParam(required = true) Integer projectId, + @RequestParam(required = false) String searchContant, + @RequestParam(required = true) Integer page, + @RequestParam(required = true) Integer size) { ResultsVo vo = new ResultsVo(); - if (systemId==null||projectId==null){ + if (systemId == null || projectId == null) { return R.error("系统或项目数据不能为空！"); - }else{ + } else { vo.setSystemId(systemId); vo.setProjectId(projectId); } - if (searchContant!=null){ + if (searchContant != null) { vo.setSearchContant(searchContant); } - List result = service.reportList(vo,page,size); - return R.ok().put("data",result); + List result = service.reportList(vo, page, size); + return R.ok().put("data", result); } /** @@ -151,9 +153,9 @@ public class AchievementManagementController implements AchievementManagementApi */ @Override @PostMapping("/addReport") - public R addReport(@RequestBody ExperimentalReportEntity entity){ + public R addReport(@RequestBody ExperimentalReportEntity 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 @GetMapping("/queryReport") - public R queryReport(@RequestParam(required = true) Integer reportId){ + public R queryReport(@RequestParam(required = true) Integer reportId) { R result = service.queryReport(reportId); return result; } @@ -180,7 +182,7 @@ public class AchievementManagementController implements AchievementManagementApi // @Override @Transactional @PostMapping("/updateReport") - public R updateScore(@RequestBody ProjectRecordEntity entity){ + public R updateScore(@RequestBody ProjectRecordEntity entity) { ProjectRecordEntity vo = new ProjectRecordEntity() .setRecordid(entity.getRecordid()).setScore(entity.getScore()); projectRecordService.updateScore(vo); @@ -189,20 +191,22 @@ public class AchievementManagementController implements AchievementManagementApi /** * 需求：删除实验记录====管理端删除，但是学生端仍需保留 - * 将isdel属性设置为0 + * 将isdel属性设置为0 + * * @param reportId * @return */ @Override @PostMapping("/deleteReport") - public R deleteReport(@RequestParam Integer reportId,@RequestParam Integer recordId){ - R result = service.deleteReport(reportId,recordId); + public R deleteReport(@RequestParam Integer reportId, @RequestParam Integer recordId) { + R result = service.deleteReport(reportId, recordId); return result; } /** * 班级实验报告列表查询 + * * @param searchContant * @return */ @@ -211,21 +215,22 @@ public class AchievementManagementController implements AchievementManagementApi public R queryEvaluationReport(@RequestParam(required = false) String searchContant, @RequestParam(required = true) Integer projectId, @RequestParam(required = true) Integer page, - @RequestParam(required = true) Integer size){ - R result = service.queryEvaluationReport(searchContant,projectId,page,size); + @RequestParam(required = true) Integer size) { + R result = service.queryEvaluationReport(searchContant, projectId, page, size); return result; } /** * 班级实验成绩导出 + * * @param response - * @param ids (ids：recordId) + * @param ids (ids：recordId) * @throws Exception */ @Override @GetMapping("/exportAchievement") 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 startingtime, @RequestParam(required = false) String endtime, - @RequestParam(required = false) Integer month){ - R result = service.queryAchievement(systemId,projectPermissions,searchContant,startingtime,endtime,month); + @RequestParam(required = false) Integer month) { + R result = service.queryAchievement(systemId, projectPermissions, searchContant, startingtime, endtime, month); return result; } /** * 修改评语 + * * @param entity * @return */ // @Override @PostMapping("/updateComment") - public R updateComment(@RequestBody ExperimentalReportEntity entity){ + public R updateComment(@RequestBody ExperimentalReportEntity entity) { R result = service.updateComment(entity); return result; } @@ -256,12 +262,13 @@ public class AchievementManagementController implements AchievementManagementApi /** * 发布成绩： * 修改教师签名+修改教师评语 - * @param entity （isSignature，signatureId，reportId，comment） + * + * @param entity （isSignature，signatureId，reportId，comment） * @return */ @Override @PostMapping("/release") - public R updateSignatrue(@RequestBody ExperimentalReportEntity entity){ + public R updateSignatrue(@RequestBody ExperimentalReportEntity entity) { service.updateSignatrue(entity); return R.ok(); } @@ -269,6 +276,7 @@ public class AchievementManagementController implements AchievementManagementApi /** * 删除成绩管理中的项目 + * * @param projectId * @return */ @@ -297,4 +305,12 @@ public class AchievementManagementController implements AchievementManagementApi List result = service.getTeachAchievement(id); return R.ok().put("data", result); } + + + @Override + @PostMapping("/modify") + public R modify(@RequestBody ExperimentalReportEntity entity) { + Integer code = service.modify(entity); + return R.ok(); + } } diff --git a/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java b/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java index 27286ba..799e79a 100644 --- a/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java +++ b/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java @@ -47,7 +47,7 @@ public interface AchievementManagementDao extends BaseMapper queryEvaluationReport(Page tPage, String searchContant, Integer projectId); @@ -71,7 +71,7 @@ public interface AchievementManagementDao extends BaseMapper 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); @@ -79,4 +79,7 @@ public interface AchievementManagementDao extends BaseMapper getImitationAchievement(Integer projectId); List getTeachAchievement(Integer id); + + //编辑实验报告 + Integer modify(ExperimentalReportEntity entity); } diff --git a/src/main/java/com/msdw/tms/entity/ExperimentalReportEntity.java b/src/main/java/com/msdw/tms/entity/ExperimentalReportEntity.java index ae5e261..cc2f0bc 100644 --- a/src/main/java/com/msdw/tms/entity/ExperimentalReportEntity.java +++ b/src/main/java/com/msdw/tms/entity/ExperimentalReportEntity.java @@ -13,112 +13,118 @@ import lombok.experimental.Accessors; public class ExperimentalReportEntity { //实验报告主键 @TableId(type = IdType.AUTO) - @ApiModelProperty(value = "实验报告主键",name = "reportId",required = false) + @ApiModelProperty(value = "实验报告主键", name = "reportId", required = false) private Integer reportId; //绑定实验id - @ApiModelProperty(value = "绑定实验id",name = "projectId",required = false) + @ApiModelProperty(value = "绑定实验id", name = "projectId", required = false) private Integer projectId; //实验原理 - @ApiModelProperty(value = "实验原理",name = "principle",required = false) + @ApiModelProperty(value = "实验原理", name = "principle", required = false) private String principle; //实验内容 - @ApiModelProperty(value = "实验内容",name = "content",required = false) + @ApiModelProperty(value = "实验内容", name = "content", required = false) private String content; //实验步骤 - @ApiModelProperty(value = "实验步骤",name = "step",required = false) + @ApiModelProperty(value = "实验步骤", name = "step", required = false) private String step; //实验数据 - @ApiModelProperty(value = "实验数据",name = "data",required = false) + @ApiModelProperty(value = "实验数据", name = "data", required = false) private String data; //实验分析 - @ApiModelProperty(value = "实验分析",name = "analysis",required = false) + @ApiModelProperty(value = "实验分析", name = "analysis", required = false) private String analysis; //实验结论 - @ApiModelProperty(value = "实验结论",name = "conclusion",required = false) + @ApiModelProperty(value = "实验结论", name = "conclusion", required = false) private String conclusion; //实验总结 - @ApiModelProperty(value = "实验总结",name = "summarize",required = false) + @ApiModelProperty(value = "实验总结", name = "summarize", required = false) private String summarize; //实验目的 - @ApiModelProperty(value = "实验目的",name = "purpose",required = false) + @ApiModelProperty(value = "实验目的", name = "purpose", required = false) private String purpose; //对本实验过程的方法及手段的改进建议 - @ApiModelProperty(value = "对本实验过程的方法及手段的改进建议",name = "improvement",required = false) + @ApiModelProperty(value = "对本实验过程的方法及手段的改进建议", name = "improvement", required = false) private String improvement; //老师评语 - @ApiModelProperty(value = "老师评语",name = "commentId",required = false) + @ApiModelProperty(value = "老师评语", name = "commentId", required = false) private Integer commentId; //教师评语 - @ApiModelProperty(value = "教师评语",name = "comment",required = false) + @ApiModelProperty(value = "教师评语", name = "comment", required = false) private String comment; //绑定学生id - @ApiModelProperty(value = "绑定学生id",name = "studentId",required = false) + @ApiModelProperty(value = "绑定学生id", name = "studentId", required = false) private Integer studentId; //绑定老师id - @ApiModelProperty(value = "绑定老师id",name = "teacherId",required = false) + @ApiModelProperty(value = "绑定老师id", name = "teacherId", required = false) private Integer teacherId; //指导老师 - @ApiModelProperty(value = "指导老师",name = "teacherName",required = false) + @ApiModelProperty(value = "指导老师", name = "teacherName", required = false) private String teacherName; //学时 - @ApiModelProperty(value = "学时",name = "period",required = false) + @ApiModelProperty(value = "学时", name = "period", required = false) private String period; //实验室名称 - @ApiModelProperty(value = "实验室名称",name = "laboratory",required = false) + @ApiModelProperty(value = "实验室名称", name = "laboratory", required = false) private String laboratory; //绑定教师签名id - @ApiModelProperty(value = "绑定教师签名id",name = "signatureId",required = false) + @ApiModelProperty(value = "绑定教师签名id", name = "signatureId", required = false) private Integer signatureId; //是否启用教师签名照 - @ApiModelProperty(value = "是否启用教师签名照",name = "isSignature",required = false) + @ApiModelProperty(value = "是否启用教师签名照", name = "isSignature", required = false) private Integer isSignature; //绑定项目id - @ApiModelProperty(value = "绑定项目id",name = "eventId",required = false) + @ApiModelProperty(value = "绑定项目id", name = "eventId", required = false) private Integer eventId; //实验器材 - @ApiModelProperty(value = "实验器材",name = "equipment",required = false) + @ApiModelProperty(value = "实验器材", name = "equipment", required = false) private String equipment; - @ApiModelProperty(value = "最终得分",name = "score",required = false) + @ApiModelProperty(value = "最终得分", name = "score", required = false) private Integer score; - @ApiModelProperty(value = "耗时/小时",name = "timeConsuming",required = false) + @ApiModelProperty(value = "耗时/小时", name = "timeConsuming", required = false) private Integer timeConsuming; - @ApiModelProperty(value = "开始时间",name = "startTime",required = false) + @ApiModelProperty(value = "开始时间", name = "startTime", required = false) private String startTime; - @ApiModelProperty(value = "创建时间",name = "creationTime",required = false) + @ApiModelProperty(value = "创建时间", name = "creationTime", required = false) private String creationTime; - @ApiModelProperty(value = "班级名称",name = "className",required = false) + @ApiModelProperty(value = "班级名称", name = "className", required = false) private String className; //步骤1 - @ApiModelProperty(value = "步骤1",name = "steps1",required = false) + @ApiModelProperty(value = "步骤1", name = "steps1", required = false) private String steps1; //步骤2 - @ApiModelProperty(value = "步骤2",name = "steps2",required = false) + @ApiModelProperty(value = "步骤2", name = "steps2", required = false) private String steps2; //步骤3 - @ApiModelProperty(value = "步骤3",name = "steps3",required = false) + @ApiModelProperty(value = "步骤3", name = "steps3", required = false) private String steps3; //步骤4 - @ApiModelProperty(value = "步骤4",name = "steps4",required = false) + @ApiModelProperty(value = "步骤4", name = "steps4", required = false) private String steps4; //步骤5 - @ApiModelProperty(value = "步骤5",name = "steps5",required = false) + @ApiModelProperty(value = "步骤5", name = "steps5", required = false) private String steps5; //步骤6 - @ApiModelProperty(value = "步骤6",name = "steps6",required = false) + @ApiModelProperty(value = "步骤6", name = "steps6", required = false) private String steps6; //步骤7 - @ApiModelProperty(value = "步骤7",name = "steps7",required = false) + @ApiModelProperty(value = "步骤7", name = "steps7", required = false) private String steps7; //步骤8 - @ApiModelProperty(value = "步骤8",name = "steps8",required = false) + @ApiModelProperty(value = "步骤8", name = "steps8", required = false) private String steps8; //步骤9 - @ApiModelProperty(value = "步骤9",name = "steps9",required = false) + @ApiModelProperty(value = "步骤9", name = "steps9", required = false) private String steps9; //步骤10 - @ApiModelProperty(value = "步骤10",name = "steps10",required = false) + @ApiModelProperty(value = "步骤10", name = "steps10", required = false) 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 workNumber; diff --git a/src/main/java/com/msdw/tms/service/AchievementManagementService.java b/src/main/java/com/msdw/tms/service/AchievementManagementService.java index b3a8ea7..4b78743 100644 --- a/src/main/java/com/msdw/tms/service/AchievementManagementService.java +++ b/src/main/java/com/msdw/tms/service/AchievementManagementService.java @@ -30,15 +30,15 @@ public interface AchievementManagementService extends IService getImitationAchievement(Integer projectId); List getTeachAchievement(Integer id); + + //编辑实验报告 + Integer modify(ExperimentalReportEntity entity); } diff --git a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java index a51cf8c..bfc6608 100644 --- a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java @@ -171,8 +171,8 @@ public class AchievementManagementServiceImpl extends ServiceImpl getTeachAchievement(Integer id) { - return achievementManagementDao.getTeachAchievement(id); + return achievementManagementDao.getTeachAchievement(id); + } + + @Override + public Integer modify(ExperimentalReportEntity entity) { + return achievementManagementDao.modify(entity); } } diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml index 243c9c0..3021099 100644 --- a/src/main/resources/mapper/tms/AchievementManagementDao.xml +++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml @@ -553,4 +553,29 @@ + + UPDATE tms_experimental_report + + + instructor=#{instructor, jdbcType=VARCHAR}, + + + + period=#{period, jdbcType=INTEGER}, + + + proName=#{proName, jdbcType=VARCHAR}, + + + purpose=#{purpose, jdbcType=VARCHAR}, + + + summarize=#{summarize, jdbcType=VARCHAR}, + + + + WHERE reportId = #{reportId} + + + \ No newline at end of file