diff --git a/srs-flowable/src/main/java/com/srs/flowable/domain/DormitoryStudent.java b/srs-flowable/src/main/java/com/srs/flowable/domain/DormitoryStudent.java new file mode 100644 index 0000000..760bb91 --- /dev/null +++ b/srs-flowable/src/main/java/com/srs/flowable/domain/DormitoryStudent.java @@ -0,0 +1,69 @@ +package com.srs.flowable.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * 宿舍学生关联表 + *

+ * + */ +@Data +@TableName("srs_dormitory_student") +@ApiModel(value = "SrsDormitoryStudent对象", description = "宿舍学生关联表") +public class DormitoryStudent implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键ID") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("宿舍ID") + @TableField("dormitory_id") + private Long dormitoryId; + + @ApiModelProperty("床位ID") + @TableField("bed_id") + private Long bedId; + + @ApiModelProperty("学生学号") + @TableField("stu_no") + private String stuNo; + + @ApiModelProperty("是否为宿舍长(0否 1是)") + @TableField("is_dormitory_head") + private Integer isDormitoryHead; + + @ApiModelProperty("状态(0未缴费 1已缴费)") + @TableField("status") + private Integer status; + + @ApiModelProperty("入住时间") + @TableField("checkin_time") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDateTime checkinTime; + + @ApiModelProperty("入住状态") + @TableField("in_status") + public String inStatus; + + @ApiModelProperty("是否在校住宿") + @TableField("isInStudentsleep") + public String isInStudentsleep; + +} + + + + diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java index c155a2c..4fd0322 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java @@ -93,6 +93,9 @@ public class ApprovalAssigneeListener implements ExecutionListener { // 如果到了最后一个审批人，则修改申请表审核状态 if (currentNodeName.equals("教务处主管领导审批")){ status = 6L; + + // 审批通过后删除学生入住信息 + rtEnlistmentReserveMapper.deleteDormitoryStudentById(enlistmentReserve.getStudentNo()); } // 改变申请表中的审核状态（审核通过） enlistmentReserve.setApplyStatus(status); diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationEndListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationEndListener.java index 562a278..308d58e 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationEndListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationEndListener.java @@ -3,6 +3,7 @@ package com.srs.flowable.listener.outsideAccommodation; import com.srs.common.utils.SecurityUtils; import com.srs.common.utils.spring.SpringUtils; +import com.srs.flowable.domain.DormitoryStudent; import com.srs.flowable.domain.OutsideAccommodationApply; import com.srs.flowable.domain.OutsideAccommodationApproval; import com.srs.flowable.mapper.OutsideAccommodationApplyMapper; @@ -76,6 +77,11 @@ public class OutsideAccommodationEndListener implements ExecutionListener { if (currentNodeName.equals("学校领导审批")){ // 改变申请表中的审核状态（审核通过） status = 5L; + DormitoryStudent dormitoryStudent = new DormitoryStudent(); + dormitoryStudent.setStuNo(outsideAccommodationApply.getStudentNo()); + dormitoryStudent.setIsInStudentsleep("外宿"); + // 审核通过改变学生住宿状态 + outsideAccommodationApplyMapper.updateSrsDormitoryStudent(dormitoryStudent); } outsideAccommodationApply.setStatus(status); outsideAccommodationApplyMapper.updateDmsOutsideAccommodationApply(outsideAccommodationApply); diff --git a/srs-flowable/src/main/java/com/srs/flowable/mapper/EnlistmentReserveMapper.java b/srs-flowable/src/main/java/com/srs/flowable/mapper/EnlistmentReserveMapper.java index 38568ba..8013649 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/mapper/EnlistmentReserveMapper.java +++ b/srs-flowable/src/main/java/com/srs/flowable/mapper/EnlistmentReserveMapper.java @@ -75,6 +75,8 @@ public interface EnlistmentReserveMapper extends BaseMapper { */ int deleteRtEnlistmentReserveById(Long id); + int deleteDormitoryStudentById(String StuNo); + /** * 批量删除应征入伍保留学籍申请 * diff --git a/srs-flowable/src/main/java/com/srs/flowable/mapper/OutsideAccommodationApplyMapper.java b/srs-flowable/src/main/java/com/srs/flowable/mapper/OutsideAccommodationApplyMapper.java index b34697e..ba98a78 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/mapper/OutsideAccommodationApplyMapper.java +++ b/srs-flowable/src/main/java/com/srs/flowable/mapper/OutsideAccommodationApplyMapper.java @@ -2,6 +2,7 @@ package com.srs.flowable.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.srs.common.doman.vo.TeacherVo; +import com.srs.flowable.domain.DormitoryStudent; import com.srs.flowable.domain.OutsideAccommodationApply; import org.apache.ibatis.annotations.Options; import org.apache.ibatis.annotations.Param; @@ -67,6 +68,9 @@ public interface OutsideAccommodationApplyMapper extends BaseMapper + + + delete + from srs_dormitory_student + where stu_no = #{stuNo} + + delete from rt_enlistment_reserve where id in diff --git a/srs-flowable/src/main/resources/mapper/OutsideAccommodationApplyMapper.xml b/srs-flowable/src/main/resources/mapper/OutsideAccommodationApplyMapper.xml index 0bac24a..c14c084 100644 --- a/srs-flowable/src/main/resources/mapper/OutsideAccommodationApplyMapper.xml +++ b/srs-flowable/src/main/resources/mapper/OutsideAccommodationApplyMapper.xml @@ -301,6 +301,26 @@ + + + update srs_dormitory_student + + dormitory_id = #{dormitoryId}, + dormitory_id =NULL, + bed_id = #{bedId}, + stu_no = #{stuNo}, + is_dormitory_head = #{isDormitoryHead}, + status =#{status}, + checkin_time = #{checkinTime}, + checkin_time =NULL, + in_status = #{inStatus}, + isInStudentsleep = #{isInStudentsleep}, + + + and stu_no = #{stuNo} + + + update dms_outside_accommodation_apply