Explorar el Código

学生处分列表调整

dzx hace 1 año
padre
commit
ac4d1eb652

+ 4 - 0
src/main/java/com/xjrsoft/module/student/controller/BaseStudentPunishmentInfoController.java

@@ -137,6 +137,10 @@ public class BaseStudentPunishmentInfoController {
         BasePunishmentStudentHandle handle = BeanUtil.toBean(dto, BasePunishmentStudentHandle.class);
         handle.setCreateDate(new Date());
         boolean save = handleService.save(handle);
+        BaseStudentPunishmentInfo punishmentInfo = baseStudentPunishmentInfoService.getById(dto.getPunishmentInfoId());
+        punishmentInfo.setPunishmentTypeId(dto.getPunishmentTypeId());
+        punishmentInfo.setModifyDate(new Date());
+        baseStudentPunishmentInfoService.updateById(punishmentInfo);
         return RT.ok(save);
     }
 }

+ 6 - 1
src/main/java/com/xjrsoft/module/student/dto/AddBasePunishmentStudentHandleDto.java

@@ -2,8 +2,10 @@ package com.xjrsoft.module.student.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.Date;
 
 
@@ -30,12 +32,15 @@ public class AddBasePunishmentStudentHandleDto implements Serializable {
     /**
     * 调整日期
     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("调整日期")
-    private Date adjustDate;
+    private LocalDate adjustDate;
     /**
     * 调整原因
     */
     @ApiModelProperty("调整原因")
     private String adjustReason;
 
+    @ApiModelProperty("处分类型id")
+    private Long punishmentTypeId;
 }