编辑实验报告

hehai
rong.liu 4 years ago
parent 70f8f2103f
commit 2921bbd0be
  1. 3
      src/main/java/com/msdw/tms/api/AchievementManagementApi.java
  2. 18
      src/main/java/com/msdw/tms/controller/AchievementManagementController.java
  3. 3
      src/main/java/com/msdw/tms/dao/AchievementManagementDao.java
  4. 6
      src/main/java/com/msdw/tms/entity/ExperimentalReportEntity.java
  5. 3
      src/main/java/com/msdw/tms/service/AchievementManagementService.java
  6. 6
      src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
  7. 25
      src/main/resources/mapper/tms/AchievementManagementDao.xml

@ -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);
} }

@ -27,8 +27,10 @@ public class AchievementManagementController implements AchievementManagementApi
@Autowired @Autowired
private ProjectRecordService projectRecordService; private ProjectRecordService projectRecordService;
/** /**
* 查询用户实验报告 * 查询用户实验报告
*
* @param projectId * @param projectId
* @param * @param
* @return * @return
@ -42,6 +44,7 @@ public class AchievementManagementController implements AchievementManagementApi
/** /**
* 查询用户实验报告 * 查询用户实验报告
*
* @param userId * @param userId
* @param reportId * @param reportId
* @param * @param
@ -55,7 +58,6 @@ public class AchievementManagementController implements AchievementManagementApi
} }
/** /**
* 查询实验记录 * 查询实验记录
*/ */
@ -190,6 +192,7 @@ public class AchievementManagementController implements AchievementManagementApi
/** /**
* 需求删除实验记录====管理端删除但是学生端仍需保留 * 需求删除实验记录====管理端删除但是学生端仍需保留
* 将isdel属性设置为0 * 将isdel属性设置为0
*
* @param reportId * @param reportId
* @return * @return
*/ */
@ -203,6 +206,7 @@ public class AchievementManagementController implements AchievementManagementApi
/** /**
* 班级实验报告列表查询 * 班级实验报告列表查询
*
* @param searchContant * @param searchContant
* @return * @return
*/ */
@ -218,6 +222,7 @@ public class AchievementManagementController implements AchievementManagementApi
/** /**
* 班级实验成绩导出 * 班级实验成绩导出
*
* @param response * @param response
* @param ids (idsrecordId) * @param ids (idsrecordId)
* @throws Exception * @throws Exception
@ -243,6 +248,7 @@ public class AchievementManagementController implements AchievementManagementApi
/** /**
* 修改评语 * 修改评语
*
* @param entity * @param entity
* @return * @return
*/ */
@ -256,6 +262,7 @@ public class AchievementManagementController implements AchievementManagementApi
/** /**
* 发布成绩 * 发布成绩
* 修改教师签名+修改教师评语 * 修改教师签名+修改教师评语
*
* @param entity isSignaturesignatureIdreportIdcomment * @param entity isSignaturesignatureIdreportIdcomment
* @return * @return
*/ */
@ -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();
}
} }

@ -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);
} }

@ -119,6 +119,12 @@ public class ExperimentalReportEntity {
@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;

@ -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);
} }

@ -283,7 +283,6 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
} }
@Override @Override
public R deleteReportByProjectId(Integer projectId) { public R deleteReportByProjectId(Integer projectId) {
@ -304,4 +303,9 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
return achievementManagementDao.getTeachAchievement(id); return achievementManagementDao.getTeachAchievement(id);
} }
@Override
public Integer modify(ExperimentalReportEntity entity) {
return achievementManagementDao.modify(entity);
}
} }

@ -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>
Loading…
Cancel
Save