Merge branch 'main' of http://47.112.118.149:10082/xgxt_sd/zhxg_java

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;
+
+/**
+ * <p>
+ * 宿舍学生关联表
+ * </p>
+ *
+ */
+@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;
+
+}
+
+
+
+

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

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

srs-flowable/src/main/java/com/srs/flowable/mapper/EnlistmentReserveMapper.java

@@ -75,6 +75,8 @@ public interface EnlistmentReserveMapper extends BaseMapper<EnlistmentReserve> {
      */
     int deleteRtEnlistmentReserveById(Long id);
 
+    int deleteDormitoryStudentById(String StuNo);
+
     /**
      * 批量删除应征入伍保留学籍申请
      *

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<OutsideAccom
      */
     int updateDmsOutsideAccommodationApply(OutsideAccommodationApply outsideAccommodationApply);
 
+    /*根据学号更新学生住宿信息*/
+    boolean updateSrsDormitoryStudent(DormitoryStudent dormitoryStudent);
+
     /**
      * 删除外宿申请
      *

srs-flowable/src/main/resources/mapper/EnlistmentReserveMapper.xml

@@ -200,6 +200,13 @@
         where id = #{id}
     </delete>
 
+    <!--根据学号删除学生入住信息-->
+    <delete id="deleteDormitoryStudentById" parameterType="String">
+        delete
+        from srs_dormitory_student
+        where stu_no = #{stuNo}
+    </delete>
+
     <delete id="deleteRtEnlistmentReserveByIds" parameterType="String">
         delete from rt_enlistment_reserve where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">

srs-flowable/src/main/resources/mapper/OutsideAccommodationApplyMapper.xml

@@ -301,6 +301,26 @@
         </trim>
     </insert>
 
+    <!--根据学号更新学生住宿信息-->
+    <update id="updateSrsDormitoryStudent" parameterType="DormitoryStudent">
+        update srs_dormitory_student
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="dormitoryId != null">dormitory_id = #{dormitoryId},</if>
+            <if test="dormitoryId == null">dormitory_id =NULL,</if>
+            <if test="bedId != null">bed_id = #{bedId},</if>
+            <if test="stuNo != null and stuNo!=''">stu_no = #{stuNo},</if>
+            <if test="isDormitoryHead != null">is_dormitory_head = #{isDormitoryHead},</if>
+            <if test="status != null">status =#{status},</if>
+            <if test="checkinTime!=null"> checkin_time = #{checkinTime},</if>
+            <if test="checkinTime==null"> checkin_time =NULL,</if>
+            <if test="inStatus != null and inStatus!=''">in_status = #{inStatus},</if>
+            <if test="isInStudentsleep != null and isInStudentsleep!=''">isInStudentsleep = #{isInStudentsleep},</if>
+        </trim>
+        <where>
+            <if test="stuNo!=null"> and stu_no = #{stuNo}</if>
+        </where>
+    </update>
+
     <update id="updateDmsOutsideAccommodationApply" parameterType="OutsideAccommodationApply">
         update dms_outside_accommodation_apply
         <trim prefix="SET" suffixOverrides=",">