|
@@ -87,6 +87,7 @@ public class StudentInstrumentController extends BaseController {
|
|
|
if (studentInstrument.getEndTime() != null) {
|
|
|
studentInstrument.setEndTime(DateUtil.getLastTimeWithDay(studentInstrument.getEndTime()));
|
|
|
}
|
|
|
+ studentInstrument.setOperation(sysUser.getId());
|
|
|
SysUser student = sysUserFeignService.queryUserById(studentInstrument.getStudentId());
|
|
|
studentInstrument.setOrganId(student.getOrganId());
|
|
|
return succeed(studentInstrumentService.addStudentInstrument(studentInstrument));
|
|
@@ -102,32 +103,51 @@ public class StudentInstrumentController extends BaseController {
|
|
|
return failed("用户信息获取失败");
|
|
|
}
|
|
|
StudentInstrument studentInstrument = studentInstrumentService.get(id);
|
|
|
- if (studentInstrument == null) {
|
|
|
- return succeed();
|
|
|
- }
|
|
|
- if (!studentInstrument.getStudentId().equals(studentId)) {
|
|
|
- return failed("该学生乐器信息不存在");
|
|
|
+ if (studentInstrument == null || !studentInstrument.getStudentId().equals(studentId)) {
|
|
|
+ return failed("学生乐器信息不存在");
|
|
|
}
|
|
|
return succeed(studentInstrument);
|
|
|
}
|
|
|
|
|
|
|
|
|
- @ApiOperation(value = "获取乐保信息")
|
|
|
+ @ApiOperation(value = "修改乐保信息")
|
|
|
@PostMapping("/update")
|
|
|
@PreAuthorize("@pcs.hasPermissions('studentInstrument/update')")
|
|
|
- public HttpResponseResult<StudentInstrument> update(Long id, Integer studentId) {
|
|
|
+ public HttpResponseResult<StudentInstrument> update(StudentInstrument studentInstrument) {
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
if (sysUser == null) {
|
|
|
return failed("用户信息获取失败");
|
|
|
}
|
|
|
- StudentInstrument studentInstrument = studentInstrumentService.get(id);
|
|
|
- if (studentInstrument == null) {
|
|
|
- return succeed();
|
|
|
+ if (studentInstrument.getStudentId() == null) {
|
|
|
+ return failed("学生id不能为空");
|
|
|
}
|
|
|
- if (!studentInstrument.getStudentId().equals(studentId)) {
|
|
|
- return failed("该学生乐器信息不存在");
|
|
|
+ if (studentInstrument.getStartTime() != null) {
|
|
|
+ studentInstrument.setStartTime(DateUtil.trunc(studentInstrument.getStartTime()));
|
|
|
}
|
|
|
- return succeed(studentInstrument);
|
|
|
+
|
|
|
+ if (studentInstrument.getEndTime() != null) {
|
|
|
+ studentInstrument.setEndTime(DateUtil.getLastTimeWithDay(studentInstrument.getEndTime()));
|
|
|
+ }
|
|
|
+ studentInstrument.setOperation(sysUser.getId());
|
|
|
+ SysUser student = sysUserFeignService.queryUserById(studentInstrument.getStudentId());
|
|
|
+ studentInstrument.setOrganId(student.getOrganId());
|
|
|
+ return succeed(studentInstrumentService.updateStudentInstrument(studentInstrument));
|
|
|
}
|
|
|
|
|
|
+ @ApiOperation(value = "删除学生乐器信息")
|
|
|
+ @PostMapping("/del")
|
|
|
+ @PreAuthorize("@pcs.hasPermissions('studentInstrument/del')")
|
|
|
+ public HttpResponseResult<StudentInstrument> update(Long id, Integer studentId) {
|
|
|
+ SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
+ if (sysUser == null) {
|
|
|
+ return failed("用户信息获取失败");
|
|
|
+ }
|
|
|
+ StudentInstrument studentInstrument = studentInstrumentService.get(id);
|
|
|
+ if (studentInstrument == null || !studentInstrument.getStudentId().equals(studentId)) {
|
|
|
+ return failed("学生乐器信息不存在");
|
|
|
+ }
|
|
|
+ studentInstrument.setOperation(sysUser.getId());
|
|
|
+ studentInstrument.setDelFlag(1);
|
|
|
+ return succeed(studentInstrumentService.updateStudentInstrument(studentInstrument));
|
|
|
+ }
|
|
|
}
|