From 714f0f97e80b120e764ae62b3b7c7ee125c82130 Mon Sep 17 00:00:00 2001 From: zlwu <704541015@qq.com> Date: Sat, 16 Aug 2025 14:13:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/XgDormViolationController.java | 11 +- .../xg/convert/StudentInfoExcelConvert.java | 138 ++++++++++++ .../xg/domain/vo/XgDormViolationExportVo.java | 206 ++++++++++++++++++ .../xg/domain/vo/XgDormViolationVo.java | 28 ++- .../xg/mapper/XgDormViolationMapper.java | 8 + .../xg/service/IXgDormViolationService.java | 8 + .../impl/XgDormViolationServiceImpl.java | 11 + .../resources/dormViolation_template.xlsx | Bin 0 -> 10886 bytes .../dormViolation/XgDormViolationMapper.xml | 39 ++++ 9 files changed, 436 insertions(+), 13 deletions(-) create mode 100644 backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/convert/StudentInfoExcelConvert.java create mode 100644 backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/vo/XgDormViolationExportVo.java create mode 100644 backend/ruoyi-modules/ruoyi-xg/src/main/resources/dormViolation_template.xlsx diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormViolationController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormViolationController.java index 9f2eee68..c7ec24b7 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormViolationController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormViolationController.java @@ -1,5 +1,6 @@ package org.dromara.xg.controller; +import java.util.ArrayList; import java.util.List; import lombok.RequiredArgsConstructor; @@ -7,6 +8,7 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; +import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; @@ -20,6 +22,7 @@ import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.xg.domain.vo.XgDormViolationVo; import org.dromara.xg.domain.bo.XgDormViolationBo; import org.dromara.xg.domain.vo.StudentOptionVo; +import org.dromara.xg.domain.vo.XgDormViolationExportVo; import org.dromara.xg.domain.bo.StudentOptionBo; import org.dromara.xg.service.IXgDormViolationService; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -55,7 +58,13 @@ public class XgDormViolationController extends BaseController { @PostMapping("/export") public void export(XgDormViolationBo bo, HttpServletResponse response) { List list = xgDormViolationService.queryList(bo); - ExcelUtil.exportExcel(list, "宿舍违纪记录", XgDormViolationVo.class, response); + List exportList = new ArrayList(); + for (XgDormViolationVo vo : list) { + XgDormViolationExportVo exportVo = new XgDormViolationExportVo(); + BeanUtils.copyProperties(vo, exportVo); + exportList.add(exportVo); + } + ExcelUtil.exportExcel(exportList, "宿舍违纪记录", XgDormViolationExportVo.class, response); } /** diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/convert/StudentInfoExcelConvert.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/convert/StudentInfoExcelConvert.java new file mode 100644 index 00000000..f405316e --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/convert/StudentInfoExcelConvert.java @@ -0,0 +1,138 @@ +package org.dromara.xg.convert; + +import cn.hutool.core.util.StrUtil; +import cn.idev.excel.converters.Converter; +import cn.idev.excel.enums.CellDataTypeEnum; +import cn.idev.excel.metadata.GlobalConfiguration; +import cn.idev.excel.metadata.data.ReadCellData; +import cn.idev.excel.metadata.data.WriteCellData; +import cn.idev.excel.metadata.property.ExcelContentProperty; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.xg.domain.vo.StudentOptionVo; +import org.dromara.xg.service.IXgDormViolationService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 学生信息Excel转换器 + * 将学生ID转换为学生详细信息(学号、姓名、学院名称、专业名称、班级名称) + * + * @author zlwu + * @date 2025-01-03 + */ +public class StudentInfoExcelConvert implements Converter { + + private static final Logger log = LoggerFactory.getLogger(StudentInfoExcelConvert.class); + + @Override + public Class supportJavaTypeKey() { + return String.class; + } + + @Override + public CellDataTypeEnum supportExcelTypeKey() { + return CellDataTypeEnum.STRING; + } + + @Override + public String convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, + GlobalConfiguration globalConfiguration) { + String value = cellData.getStringValue(); + if (StrUtil.isBlank(value)) { + return ""; + } + + try { + // 获取服务实例 + IXgDormViolationService dormViolationService = SpringUtils.getBean(IXgDormViolationService.class); + if (dormViolationService == null) { + log.warn("无法获取宿舍违纪服务实例,返回原始值"); + return value; + } + + // 分割学号(逗号分隔) + String[] studentNoArray = value.split(","); + List studentIdList = Arrays.stream(studentNoArray) + .map(String::trim) + .filter(StrUtil::isNotBlank) + .map(studentNo -> { + try { + StudentOptionVo student = dormViolationService.getStudentByStudentNo(studentNo); + if (student != null) { + return student.getId().toString(); + } else { + log.warn("未找到学号为 {} 的学生", studentNo); + return null; + } + } catch (Exception e) { + log.error("根据学号查询学生信息失败,学号: {}", studentNo, e); + return null; + } + }) + .filter(id -> id != null) + .collect(Collectors.toList()); + + return String.join(",", studentIdList); + } catch (Exception e) { + log.error("学号转学生ID失败,原始值: {}", value, e); + return ""; + } + } + + @Override + public WriteCellData convertToExcelData(String value, ExcelContentProperty contentProperty, + GlobalConfiguration globalConfiguration) { + if (StrUtil.isBlank(value)) { + return new WriteCellData<>(""); + } + + try { + // 获取服务实例 + IXgDormViolationService dormViolationService = SpringUtils.getBean(IXgDormViolationService.class); + if (dormViolationService == null) { + log.warn("无法获取宿舍违纪服务实例,返回原始值"); + return new WriteCellData<>(value); + } + + // 分割学生ID(逗号分隔) + String[] idArray = value.split(","); + List studentInfoList = Arrays.stream(idArray) + .map(String::trim) + .filter(StrUtil::isNotBlank) + .map(idStr -> { + try { + Long studentId = Long.parseLong(idStr); + StudentOptionVo student = dormViolationService.getStudentById(studentId); + if (student != null) { + // 格式:学号-姓名(学院-专业-班级) + return String.format("%s-%s(%s-%s-%s)", + student.getStudentNo(), + student.getName(), + student.getCollegeName(), + student.getMajorName(), + student.getClassName()); + } else { + return idStr + "-未知学生"; + } + } catch (NumberFormatException e) { + log.warn("无效的学生ID格式: {}", idStr); + return idStr + "-格式错误"; + } catch (Exception e) { + log.error("查询学生信息失败,学生ID: {}", idStr, e); + return idStr + "-查询失败"; + } + }) + .collect(Collectors.toList()); + + String convertedValue = String.join("; ", studentInfoList); + return new WriteCellData<>(convertedValue); + } catch (Exception e) { + log.error("学生信息转换失败,原始值: {}", value, e); + return new WriteCellData<>(value + "-转换失败"); + } + } +} diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/vo/XgDormViolationExportVo.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/vo/XgDormViolationExportVo.java new file mode 100644 index 00000000..4fa23cc1 --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/vo/XgDormViolationExportVo.java @@ -0,0 +1,206 @@ +package org.dromara.xg.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import org.dromara.xg.convert.StudentInfoExcelConvert; +import org.dromara.xg.domain.XgDormViolation; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + +/** + * 宿舍违纪记录视图对象 xg_dorm_violation + * + * @author zlwu + * @date 2025-08-16 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = XgDormViolation.class) +public class XgDormViolationExportVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 违纪记录ID(主键) + */ + @ExcelProperty(value = "违纪记录ID") + private Long id; + + /** + * 学生ID + */ + // @ExcelProperty(value = "学生ID") + // private Long studentId; + + /** + * 学生姓名 + */ + @ExcelProperty(value = "学生姓名") + private String studentName; + + /** + * 学号 + */ + @ExcelProperty(value = "学号") + private String studentNo; + + /** + * 学院ID + */ + // @ExcelProperty(value = "学院ID") + // private Long collegeId; + + /** + * 学院名称 + */ + @ExcelProperty(value = "学院名称") + private String collegeName; + + /** + * 专业ID + */ + // @ExcelProperty(value = "专业ID") + // private Long majorId; + + /** + * 专业名称 + */ + @ExcelProperty(value = "专业名称") + private String majorName; + + /** + * 班级ID + */ + // @ExcelProperty(value = "班级ID") + // private Long classId; + + /** + * 班级名称 + */ + @ExcelProperty(value = "班级名称") + private String className; + + /** + * 校区ID + */ + // @ExcelProperty(value = "校区ID") + // private Long campusId; + + /** + * 校区名称 + */ + @ExcelProperty(value = "校区名称") + private String campusName; + + /** + * 宿舍区域ID + */ + // @ExcelProperty(value = "宿舍区域ID") + // private Long areaId; + + /** + * 宿舍区域名称 + */ + @ExcelProperty(value = "宿舍区域名称") + private String areaName; + + /** + * 宿舍楼ID + */ + // @ExcelProperty(value = "宿舍楼ID") + // private Long buildingId; + + /** + * 宿舍楼名称 + */ + @ExcelProperty(value = "宿舍楼名称") + private String buildingName; + + /** + * 宿舍房间ID + */ + // @ExcelProperty(value = "宿舍房间ID") + // private Long roomId; + + /** + * 房间名称 + */ + @ExcelProperty(value = "房间名称") + private String roomName; + + /** + * 床位ID + */ + // @ExcelProperty(value = "床位ID") + // private Long bedId; + + /** + * 床位名称 + */ + @ExcelProperty(value = "床位名称") + private String bedName; + + /** + * 违纪类型 + */ + @ExcelProperty(value = "违纪类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "dorm_violation_type") + private String violationType; + + /** + * 违纪等级:1轻微 2一般 3严重 4特别严重 + */ + @ExcelProperty(value = "违纪等级", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "dorm_violation_level") + private String violationLevel; + + /** + * 违纪发生时间 + */ + @ExcelProperty(value = "违纪发生时间") + private Date violationTime; + + /** + * 违纪行为描述 + */ + @ExcelProperty(value = "违纪行为描述") + private String violationDescription; + + /** + * 涉及其他学生id(逗号分隔) + */ + @ExcelProperty(value = "涉及其他学生id", converter = StudentInfoExcelConvert.class) + // @ExcelDictFormat(readConverterExp = "逗=号分隔") + private String involvedStudents; + + /** + * 附件OSS ID列表(逗号分隔) + */ + // @ExcelProperty(value = "附件OSS ID列表", converter = ExcelDictConvert.class) + // @ExcelDictFormat(readConverterExp = "逗=号分隔") + // private String attachmentOssIds; + + /** + * 删除标志(0代表存在 1代表删除) + */ + // @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class) + // @ExcelDictFormat(readConverterExp = "0=代表存在,1=代表删除") + // private String deleted; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + +} diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/vo/XgDormViolationVo.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/vo/XgDormViolationVo.java index 1f47a323..dfb9469e 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/vo/XgDormViolationVo.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/vo/XgDormViolationVo.java @@ -32,12 +32,13 @@ public class XgDormViolationVo implements Serializable { * 违纪记录ID(主键) */ @ExcelProperty(value = "违纪记录ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "主=键") private Long id; /** * 学生ID */ - // @ExcelProperty(value = "学生ID") + @ExcelProperty(value = "学生ID") private Long studentId; /** @@ -55,7 +56,7 @@ public class XgDormViolationVo implements Serializable { /** * 学院ID */ - // @ExcelProperty(value = "学院ID") + @ExcelProperty(value = "学院ID") private Long collegeId; /** @@ -67,7 +68,7 @@ public class XgDormViolationVo implements Serializable { /** * 专业ID */ - // @ExcelProperty(value = "专业ID") + @ExcelProperty(value = "专业ID") private Long majorId; /** @@ -79,7 +80,7 @@ public class XgDormViolationVo implements Serializable { /** * 班级ID */ - // @ExcelProperty(value = "班级ID") + @ExcelProperty(value = "班级ID") private Long classId; /** @@ -91,7 +92,7 @@ public class XgDormViolationVo implements Serializable { /** * 校区ID */ - // @ExcelProperty(value = "校区ID") + @ExcelProperty(value = "校区ID") private Long campusId; /** @@ -103,7 +104,7 @@ public class XgDormViolationVo implements Serializable { /** * 宿舍区域ID */ - // @ExcelProperty(value = "宿舍区域ID") + @ExcelProperty(value = "宿舍区域ID") private Long areaId; /** @@ -115,7 +116,7 @@ public class XgDormViolationVo implements Serializable { /** * 宿舍楼ID */ - // @ExcelProperty(value = "宿舍楼ID") + @ExcelProperty(value = "宿舍楼ID") private Long buildingId; /** @@ -127,7 +128,7 @@ public class XgDormViolationVo implements Serializable { /** * 宿舍房间ID */ - // @ExcelProperty(value = "宿舍房间ID") + @ExcelProperty(value = "宿舍房间ID") private Long roomId; /** @@ -139,7 +140,7 @@ public class XgDormViolationVo implements Serializable { /** * 床位ID */ - // @ExcelProperty(value = "床位ID") + @ExcelProperty(value = "床位ID") private Long bedId; /** @@ -158,7 +159,7 @@ public class XgDormViolationVo implements Serializable { /** * 违纪等级:1轻微 2一般 3严重 4特别严重 */ - @ExcelProperty(value = "违纪等级", converter = ExcelDictConvert.class) + @ExcelProperty(value = "违纪等级:1轻微 2一般 3严重 4特别严重", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "dorm_violation_level") private String violationLevel; @@ -178,18 +179,21 @@ public class XgDormViolationVo implements Serializable { * 涉及其他学生id(逗号分隔) */ @ExcelProperty(value = "涉及其他学生id", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "逗=号分隔") private String involvedStudents; /** * 附件OSS ID列表(逗号分隔) */ - // @ExcelProperty(value = "附件OSS ID列表", converter = ExcelDictConvert.class) + @ExcelProperty(value = "附件OSS ID列表", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "逗=号分隔") private String attachmentOssIds; /** * 删除标志(0代表存在 1代表删除) */ - // @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class) + @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=代表存在,1=代表删除") private String deleted; /** diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/mapper/XgDormViolationMapper.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/mapper/XgDormViolationMapper.java index 5725073c..b175928d 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/mapper/XgDormViolationMapper.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/mapper/XgDormViolationMapper.java @@ -33,4 +33,12 @@ public interface XgDormViolationMapper extends BaseMapperPlusRzg-Q8V+O9)Pa26uONhXBFdf=lo~aCnF0?%mzoecRtR zePrsd>Z$6ko~|kdX>bTQke3!Fw<+-Q`A35Velf8(R&cU+aDJr#B*Osy0rQh=iIa~; z7!(9V01N~K<*#Ih4i1bSwl?W;-BP^*7^2sK&nRZ=a#|vJGD>h{Eml~wkI8Ly;KQR# z-x137zYgT{=r*DBi8@lj~S*#_{Fq=GAN~7os zQ?98MQm@II;K?66JWzU9(M?PoCXh&Q;flE95z_N*@@>v`*-{7+-BDlBbe-zw5bD3w ziK5%-5v{2;?mUv`ez9M(TGX?(uEzdx2uam|UFsj&i@O|*9)P>xi02sO2XejC#V#Cl z|E@_VNqv6j?&R^RSclJEjk8nZ+mDmO7@o`fZ@tKWSGZb};ek3(;U++ZqyAOl#`aF8 zFB*@EUzh4-!s$PST+iO_kX>$O7FymQh6?NrK<{sj^;wRP#f!ISq&l0^*6+5i^u-rk z@2Oig3)AyRIsNqD^hG>=QVL^@+#(@~MN|=m3>iS@$%swUk`eVtdJ&l)Kb`X-HisRD z?K2WGS^*3lyNqkGz%oJPp2QSNfl^(a8fqk>c3>8z1JXgCXE9{`NfEY&qMJOn{}vO0 z0cfI=6-`Az#}eu!)bJuwF_Ft82v@IyKZqq_bRf*L2ZM#-Q`-bJVd2oRR|h27+#x9XYGJp>rhT{EYNbcPuDKum^$KIKRWD-2Wifb zKgI@c=sx~fdwgxogOUdE3?Pc5raaFQUIDA2yngB&>Hz(_71G>&B58nDKn7X?{cl!q zb#}40eX&D+oUU{)6GrGMv) zj<(Qt{=yQnzIguaJs6h;b@0(;$=Ig{TI3$^!lc>7!cziT7D`LF$#t<@ zCQ|rY4!5j&i@ZCpwvRqL*}gwN1HZ`0eY3}NU7K`S?bt=srmeLPXo3BEG%9A*1(oih#?EA!8gh<{N z7HP^E*z)<&czbF)lFpN4M57G)NG@ma;zW#3sNnN73FOdn0Ql=15__i{)H6cySX>0F z5&AP2G}XJRActkGTg0$DS_B2cAM6KRSBtE<6=!WkClyJ!X-HYLoM1QxFml2d*-pD` zwLcep$5V-`*Q-(_CD%(*=G-JZkR{ehJ2qk7>E znZkEWfzO!!EdfF<5^_j=@$WXcd=h+Tp|uVLz+GYLV>-JN!6p)W1ac~SW`WZF*%^6Cr#Q{zT5MSpl6-pr0Kq91(w@ z7XfnLam@gZ#4p4Hkx7txIExSh0Z)c7`5+zK9|AfX5|pXN<_bYG;u$8b!e=$mNg>1Mm$(o zqsp&!#evl3l&{AyUwWN}j3nA!vyn*3Kz=#y+fuXWN{TWqv z*_ttZrnKJcD(>2%Ue9+6|Iy^WIy2_9%s3>z;;L^#rvd$@^Ff1Cm<#)}rirR^ypd zC{qPrdYOSxqOQ70pPw7tu#e7uI?3AQmfa(QO^?CroA}u0;_C;%)XgzAh=ARd));ax zG6zF_uDtXr!_&$|MxuP5GCFo+o99J9h8md-fVcyy#``G?VU;fj`TDV+B4Sn9x9Nsq zfu|9}TP!H5C>QLgR|DgOdD)Na%rB7POUQ^39=ZnwWGNZ18mdjM28P`!*Z@GItF|X; zhb!TY`BLS^5!L_iJYQbgfX>s!!qnFEx0f~U)8z;59Qoz&@+a;yf2NEwXu0Vio2Tcc-)%`Hw>hC=PeqmYJ{gO$1^cSLgF zSn+I!H}2v=F^u;avDApDrZguv&h!tZt;BB~AdiP|s20HQRgSWviKSDHRcOil4FQbR z2!&@hJsyDopB+Vt?R|&`O5g-6=b(cnD?ZJq25oGlL`O65bKhu??{=pR!GobDrY-a! z#Fw*%Bi+rBZg!8f7!1P|a%1U1&OcQI0C@LrR3G=$-6~Zk=?q?JKbm!F-c5sGKvYeAdVf$`y}owJ4p#>Hng6xVwO0Fa zY6$0peWl}?b&(%@rC{^(9o}1}eIX2nHmIGO0lW@9dt29USb9NDKF)~iB_~&h3_vPo ziUSu!U0b%s*7viCv9P(&avrUU#B~jDd(s#x!kW5P5wOxb1zOS*-~-Sg3IY)T$v52N zXAqDIow_2!$>^uCBGoF>S%i_1d$$TCbD=Yl88BSKCWDOBAcHZ1C%eQxC_+B3ltJ}3Pop(N8F4}j#J%H-r z(_-jPcivasn92XyzezLRg`p%17(=vo*(Pwq_Vrxxq05n#S? zYdRTO09*S+e%Nzt%;Ry*B@qtqVf&+N^L6B{4BFr*=Vl)m5wqAet~=D%(A1IeGmAvA zli}OZzE#2f1$KArd^M~4T73YC16zT`30W z2dh+Td}Lo@BZn4f^YSM_B}ra6V+%^uW2WVLukqzps9v8{M+GAW6a_uNDAPsGPsrr- z?KlOaSwTIZ3@?Z}aqR`X`vwo263t|)$KNN^WMk*3Q5koMPeOcBM?C3iMBWTgP8t{P zOMZ7$ZOJJnx!Z#ziI=tz(~lvA;n|qt(jAlBEG=OXor2Y?2hou0fb>W3&~NU9u?q?a@%*@wGp?$^{u{UPb9TIFZ2_B>d7~3()Pv+ znBN!<+l4ySEuQ@)}9HptJV#19p{WN)XSWthB9Ue3vRI%3{a}E zmydXXyCm7_Kh!kp2_%^UpJiC+c7A>O z7E>a_{^mWk^gzfFDe4~Rd`?2Cpb%h}h(dBuedN`&fO0u$sP=)Xy1k6~15zNGb)6NhKPl>2L}8*h zE8tA62BXIGv7D_y$Zc#suqE`uQKS|JldvD-J3&Q$TV8JGM`orDOzTj8JW?9G4K5|b zIfRl~*^!Dk=Y<8=aSo+8RuSh#Rt8l?-RW|pIfVBdRcIsc**$}1$@(T3$B;6muS>QY zu(cYUon=U(_SS1 zG~N9*p*wvMV?|t5x^KdgnSk>jO{0^ zrM&6994ZvWVwRq)tekMn>?~^I;`hxm(=K*~5V(d%7v7!M9ezcAC?RuvvLan6;A-9+ zRn*SS*i`}GZte~09R3slLn2u2TqLeMu*>rcG&CVC%8_7jADS&$n2>MN;o(FvG^{2u zRH$(UGEfSAuoM|*G#?dV=54$Q#Q+9fPM)9hQmh9G=y3{MtQideV37c|{)CP;oW=#YeTm>AG)lTEFOHYwAWHUbLhgluf9vjV&ESRp?zVC$+rMJh~l;Fitoz zqitp4WZN3Hd6+!5IFhJhZA|BHN5M&K_=F;Hu%+3ZuPYJU9io=dG#FCoVVLX%=+`M3KBDWd8yVEl_ z+6_7};bz)2CsI;BXfhAYlIsOioAaXGIvb>w|EQXFyjP2pe!G>ln$~t9(ss1Jaq@I_ zKE3fYGJdL$?7mL))`z2(=BSMcaiJiMl$H2`tVX(Ci!4vlgF(^pgUEaXL8C#Jo<6N^ zh6Pnh*!q2YfW50u;Vj}&)@;3Q>CXM5T`4Ex>vr=Wmp*gwd^1?5@clR24sUKhgeXy? zesiN%QbIhcTwDfMG6SFGu~f6-Etv_0#3PtQ$5HQ^4CRMIz@FZu89aJM)ldE?mqp60 z!4AmKA4~ckx-znOaa@{3Sen6UdWY{cwY`>DM`I@S+QYIJlgXEuTAN}u-$^6v{x z6cES&g$M$YV+aBQ{P?-hTs&<|f3C1qUE7#t2|~Y^KKCl6Zg`Q@1xKQ`#>JX6U1=)S zq8vz4MHTLMwbmPb-EK>(!c>@E`3^-AMFJZxXoKleo`UcM;ib{vR+B8JR@HqVpID8( z&5q868`Ju{b&J1oefN7Bd)V{jd_@>-dr)xTmB@Oaw*CGp!bA@0%S7stJKcJFfjST7 z@b{?UiK_H>i{%6YX(Qx8e<+S6ytruo^OLb~|0yh4}TUoLo$Uq3)9@spvOm z+fBy3VKFCf$I@B~m@iQ#7bVDo5a?kRFQQVwh>}r=ZvktzRqC1cm-CP%8I86&YGRQQqsID3-2jjYGW&B zX6$?9J=K*W`(T%k+a5o}X^+&3sahe?x1YfZ!EPt99?R(Sy(i=j@c{ACr~UKWySo_k z=x4Ey4?PqeuEHfVLW=bI6kn219#7wkZwFu|+(dj#y@_w5&J!W85FxoTdSgcH+wIut zLbEKv{)IoA{)gVsn{!(O^TX@PoX8cs^Cg1r&Tq5lH(st>ZH$BjHj#t)8DTl9@UhkP z+)k7jBvRlgfonFlUiOlli1;PRk)M$XmK`aqS=f+eyJVonS8&quMjs9;^?3dKM+k8$ zpj9JdIaDr@)T^?#7r>fwli0~Z9@fS4g*=nZlwvstDUAYD3+TNlzF9RHqd&M2QEXnt-|o-__JXfS17ojq;OKe z=g_r@Y(&Vt3{}jp1jET#D&T;sYTi!($iwC1)w>k63j%o8hf{jpRMgH{&1)%|Yy-@3 zCIqjHi^Wg|;pDj>8Ha*;5@n6jW}lHjhjf}VQL%IedWXTjAfy!2Wkq5l77WkYde|-4 zbr-7FJ`9lK^U(zp$|+qF(5lUNIin2ir+DHufzDFQVB^*0q*F$ngYNK{kdnuP`i%}r z6$3@uD)miyMb}y1+Sf`r7-~y_iQc<6W(LSVEA-w=N%hA^CZuvIrieRKObXCnK}%PP6252P~)w-$BBj z_-qXNpkY^>ws?2#vt$_|!W*d*P5R46b5m@V} zsPH!*Bf0Y#y2HK21^KDdcC9{tC;b%A^ z@rKkEdQO({ZoBa?^kexnR@QR9s3ViE8Wnvb_!IP*1$uDSaO&&dZFeKgi&68ChD5-p z8!B@?oIfglh*qgn-g4-(N%xlphJy)?zX;r88=zso>Cuk&8VW0y)tFn$j2wfdZ%nJO zN1Ska1mR0%v@1duXKtWfLx>wxXDLv=mw>+20Ng^*PRR3crB977XA@n{V$PqB1;lV3 zWZB$*F4^?O+!IpWuh@nzC6Mdq@%<8_tlH+euT%6{MGZpB(Uju+`G?I4r!L_sQ?4sy z`TB%BU6D@Y028v?7dA6I5sy4XG7uNEn^>X!`Rb^qOmW!RI}Go!r&S#sx}#lgt*e8Ub=6cc zxgfBR7EW7DKBD*YAGmZku;lF_-q)6+z@%&r=%7%IA10*6Pg0Sl)a^R(|DHu*p`)Z< zgSt1sYFe@ZS4uH2O#LyDp0W8zM~k7^MVFRgF+7RmyF(Mb{h^_w=GscH#k+XZ+hu8t zN9Qb4PiJKO^NU>~wGm)f&>mcVxd)oGGxo-&ZzRoIgW;vqN#wj{(&G4>=A9hQ3G6i( zHku!BYpQ>&C>tm343oWS<;$$*MK(YzT-$7VLjd{yhX>=kvci!<4LEVKz%dXR_6;)l z)BdR;UaSzU7+dsL^7902fD92O@mo)rF_}TJ{p;kUMNmq3K2Q{LtmZEFf{$U@Y%}D!A8s^+KgAafPGmiy=68E< zqq99XdtZG0-d{-^;-p|7G8Oy%k(qOp|MuqQ0GkRqv%}{!eT(bOp}2xqTLLGe^Lb@w z#)>y5M!3>z3jake!M5nk2h*oCckIs2MvrHEQbMU31VZjW!fBWD?)C)aXB4HcDSV+K z`%hbg!~st4mt#CFJ)WYbI6`hnHUR=?mJ}0S$fdbVR-mXDh~XZQLp@cHA_{CIn;WF? zTUaQ9lm6j@(A=Jw$aCj=$h+?3E^*OHWX1M_v*>h-toROn~Rsj zOd>crmEVi#;~r@?3@P*Twxvpjco3OL@9=SEyT=az*+z91Of}Q<(e#$z3TWhbCNJ;p z+2fY}TN%UmgQ}6TJyK;eos_EiG90{WS)DZD!Kve+gUBv0kTzPkHXbtUXK&ZJ3Lthx zu9P+cAk%3Ah>G>zEqt}(bY*OYrl=4vQKwGRXhGX#oTdAK$ji*2B8)HyP|FF0zNW!- z4!)7Of-~(kZXoTm0TSYOh+4zMr5$2^4i&GU6{!HBQyf|P$_&rx*AAyfjZaitr7qt^ z`NAkhXCa-|AmQ+1IAT*ke*~=!A*5bFa;#4fqkwT&0UUE$1dzvI8SO8&Fr1}PD9y!s z**0DL^!TJskb0ouz)OuDoYYLYU1;$v*%k=-Db`Lod_|>FfrHm6ZQDh3W>j$gt%n4s znJ_VQ=TN&K`CD1hI%eM2GjWcI9SVjUJGkr$KUSz=z$Lk=F?0~ZtY3HV0IG-vS)0P6 z*sT{;Ox%KboH2PEP(q;b3i0^RQ3xUEDyYSLJ;n)a9EY1)DKMo;_<4;!9{^g^D6$tx z#ul@|m5^&4Yaj+?n{vf;HnzDFE^7jNu?|9dbFo|k$?n<2Rp229VXZ&FI`_p~t<&^k z!s<%RBKL~voa60=bG$g~_~l1$NCO#Uu+kTz41z+k7V9Yqt)*{Y;U%j;ja%hl(9YgMhEw@_{Le$!lXY&&vS zv2wuXy{s7^3k7FZLfWe6>PZ41qcDf!7)ub{!gtR9glk5BbXb--!_2yr!Rk;llc|g^` zSIacKe4(JhBFvy4NNO^#yqU;C*QZA7vrre8Ev;L@onzj@_1JO^c3lVQE3$$Ho-IZ=MY-B$g zgGC9tzB^|kJQe%VF{Jz%{QnPTzht_BkqP6U*;Qp1dnZHl--Ftkj5F@uK(biiMfOkR ze*?c9%~eOMkpcw}KqglE{F+>n0@0b>2X~Q+h#d$JQL-uOBA(jI?CiZdZbuWmr%Q4j z{7b02QOys;PQZCj=9LlU7#x!*4dKoxLMVxl`8sDzI#SAtsTyCEfkM@az6!^$?{Bb( z!yP`;QDgsNX%gOn>1lNN8YShVtCQ;KUvi#Mz@h6qncDoG%Jk-PYkLOXTL)&Gf!WOe z&@jGGmdB3+!!sxYr-7#^yB)Ibn5c^`ugH#MO?>^6Wu7M}(c?9bJK6;m>1SG?V^VH+ z)7E`VTJcv&^q32x+X7t`0|o4d+&UD`d^|K(10~AZXTd#H9C{#H4=;@FgM)T?KP)i< z;&gqKCRoCFXc8UAxPNyS%%Ak%MaRf!y*sZ|y^j=SQ+@yBhh{Wq)ikxrH0G7eN?L<#Lc6|w_3x-nn z|9{r}Ck66P>TGqFxt#Y1IF)D<-r%KSqktvq=-M>zJD9tzUu2{dl`^{XAQ`61VhEMeLtXr zwiZ+AE{}prr(86L_rXChQ1`8Ot#7ZIqlbv=7Bw7gC}3vvL=$F;-7UiC+eEOGrEeiu za0i;)K|+awiR1V)Y$mIEE;P)7}^=rpd>N&B68XL9_4d0UqhuBdL zXUXjGz6PGEt8P{p8hujf9Av+m16EB`QJ*TaM&dj0VZIj&LFXg{Zf7VJG= zA_LknbkmPu5kSKZuAbkzq`%ZVYKTc$z+i^=i4MP5f~=|-9gGH7T7)4B3aZAjjNxAK z&7IGCV$tBdGR6Gb*a(KKX&0Wh&ICBSLgWg-)ijVQ8nY zu<9JvOs{y?su4+J&<;~NLGN3TqbV_| zpkNq3qr1O~wthDm&}tx{ASA$^2Jnvt{Kep(YcO6M*01(b|7An^him#>=%Ids)%H+KaH4_LsV}zdz*fm1!@;zvNN<751Mxwckhkdzsar=w#qr|F6(L zimrZ#|6U*TC!7fAaQ=k4Km(BWDdl_#a$vy0oA(R+*D$L83I0D@`S1GwJ*)92 zzkOhg{-1IjzjOFKT>B>nMWB~^;qc$!?Z4^b@202+{scn*$jSd*2ft_K|CG4$SJUa-Hc*Z)7*KZ~vu Uq#=L$4s_tQkqD$)qIkjmAArJwLI3~& literal 0 HcmV?d00001 diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/resources/mapper/dormViolation/XgDormViolationMapper.xml b/backend/ruoyi-modules/ruoyi-xg/src/main/resources/mapper/dormViolation/XgDormViolationMapper.xml index 46ec6588..e81ccb55 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/resources/mapper/dormViolation/XgDormViolationMapper.xml +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/resources/mapper/dormViolation/XgDormViolationMapper.xml @@ -118,4 +118,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND s.id = #{studentId} + + +