xgxt_sd/zhxg_java
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改班会材料搜索

Browse Source
This commit is contained in:
18154758993
2026-01-05 15:21:39 +08:00
parent cdaffb0adb
commit 179783c2b9
5 changed files with 147 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dms-dormitory/src/main/resources/mapper/dormitory/SrsDormitoryStudentMapper.xml
View File

@@ -274,7 +274,7 @@
<select id="listSmokeEarly" parameterType="String" resultType="SrsStuReg">
<select id="listSmokeEarly" parameterType="String" resultType="com.srs.stureg.domain.SrsStuReg">
select a.BJDM,a.XB, a.KSH,a.is_smoke,a.is_early
from srs_stu_reg as a
left join srs_class as b on a.BJDM = b.class_code

65
srs-admin/src/main/java/com/srs/web/controller/routine/RtClassMettingContentController.java
View File

@@ -85,32 +85,31 @@ public class RtClassMettingContentController extends BaseController {
@GetMapping("/listStu")
@ApiOperation("学生查询辅导员班会内容列表")
public TableDataInfo listStu(RtClassMettingContent rtClassMettingContent)
{
List<Map< String, Object >> list1 = rtClassMettingStuUploadService.listStuClass(getUsername());
if(list1.size() == 0){
throw new RuntimeException("未查询到您的学生信息，请联系管理员");
public TableDataInfo listStu(RtClassMettingContent rtClassMettingContent) {
List<Map<String, Object>> list1 = rtClassMettingStuUploadService.listStuClass(getUsername());
if (list1.size() == 0) {
throw new RuntimeException("未查询到您的学生信息,请联系管理员");
}
QueryWrapper<SrsStudent> studentQueryWrapper = new QueryWrapper<>();
studentQueryWrapper.eq("stu_no", getUsername());
studentQueryWrapper.last("limit 1");
SrsStudent student=_stuMapper.selectOne(studentQueryWrapper);
if(student==null){
return getDataTable(new ArrayList<Map< String, Object >>());
SrsStudent student = _stuMapper.selectOne(studentQueryWrapper);
if (student == null) {
return getDataTable(new ArrayList<Map<String, Object>>());
}
Long classId=student.getClassId();
if(classId==null){
return getDataTable(new ArrayList<Map< String, Object >>());
Long classId = student.getClassId();
if (classId == null) {
return getDataTable(new ArrayList<Map<String, Object>>());
}
SrsClass srsClass=_classMapper.selectSrsClassByClassId(classId);
if(srsClass==null){
return getDataTable(new ArrayList<Map< String, Object >>());
SrsClass srsClass = _classMapper.selectSrsClassByClassId(classId);
if (srsClass == null) {
return getDataTable(new ArrayList<Map<String, Object>>());
}
Long teacherId=srsClass.getTeacherId();
Long teacherId = srsClass.getTeacherId();
CphTeacher fdy = _fdyMapper.selectById(teacherId);
if(fdy==null){
return getDataTable(new ArrayList<Map< String, Object >>());
if (fdy == null) {
return getDataTable(new ArrayList<Map<String, Object>>());
}
rtClassMettingContent.setCrTeacherNo(fdy.getEmployeeId());
startPage();
@@ -122,8 +121,7 @@ public class RtClassMettingContentController extends BaseController {
@GetMapping("/listFdy")
@ApiOperation("查询辅导员班会内容列表")
public TableDataInfo listFdy(RtClassMettingContent rtClassMettingContent)
{
public TableDataInfo listFdy(RtClassMettingContent rtClassMettingContent) {
rtClassMettingContent.setCrTeacherNo(getUsername());
startPage();
List<RtClassMettingContent> list = rtClassMettingContentService.selectRtClassMettingContentList(rtClassMettingContent);
@@ -138,8 +136,7 @@ public class RtClassMettingContentController extends BaseController {
//@PreAuthorize("@ss.hasPermi('classmetting:classMettingContent:list')")
@GetMapping("/list")
@ApiOperation("查询班会内容列表")
public TableDataInfo list(RtClassMettingContent rtClassMettingContent)
{
public TableDataInfo list(RtClassMettingContent rtClassMettingContent) {
startPage();
List<RtClassMettingContent> list = rtClassMettingContentService.selectRtClassMettingContentList(rtClassMettingContent);
//list.add(1);
@@ -153,8 +150,7 @@ public class RtClassMettingContentController extends BaseController {
@Log(title = "班会内容", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation("导出班会内容列表")
public void export(HttpServletResponse response, RtClassMettingContent rtClassMettingContent)
{
public void export(HttpServletResponse response, RtClassMettingContent rtClassMettingContent) {
List<RtClassMettingContent> list = rtClassMettingContentService.selectRtClassMettingContentList(rtClassMettingContent);
ExcelUtil<RtClassMettingContent> util = new ExcelUtil<RtClassMettingContent>(RtClassMettingContent.class);
util.exportExcel(response, list, "班会内容数据");
@@ -166,21 +162,19 @@ public class RtClassMettingContentController extends BaseController {
//@PreAuthorize("@ss.hasPermi('classmetting:classMettingContent:query')")
@GetMapping(value = "/{crId}")
@ApiOperation("获取班会内容详细信息")
public AjaxResult getInfo(@PathVariable("crId") Long crId)
{
public AjaxResult getInfo(@PathVariable("crId") Long crId) {
return success(rtClassMettingContentService.selectRtClassMettingContentByCrId(crId));
}
@Log(title = "班会内容", businessType = BusinessType.INSERT)
@PostMapping("/stuAdd")
@ApiOperation("学生新增班会内容")
public AjaxResult stuAdd(@RequestBody RtClassMettingContent rtClassMettingContent)
{
List<Map< String, Object >> list = rtClassMettingStuUploadService.listStuClass(getUsername());
if(list.size() == 0){
throw new RuntimeException("您的班级为空，请联系管理员");
public AjaxResult stuAdd(@RequestBody RtClassMettingContent rtClassMettingContent) {
List<Map<String, Object>> list = rtClassMettingStuUploadService.listStuClass(getUsername());
if (list.size() == 0) {
throw new RuntimeException("您的班级为空,请联系管理员");
}
Map< String, Object > map = list.get(0);
Map<String, Object> map = list.get(0);
rtClassMettingContent.setCrTeacherNo(map.get("t_no").toString());
rtClassMettingContent.setCreateBy(getUsername());
@@ -194,8 +188,7 @@ public class RtClassMettingContentController extends BaseController {
@Log(title = "班会内容", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ApiOperation("新增班会内容")
public AjaxResult add(@RequestBody RtClassMettingContent rtClassMettingContent)
{
public AjaxResult add(@RequestBody RtClassMettingContent rtClassMettingContent) {
rtClassMettingContent.setCrTeacherNo(getUsername());
rtClassMettingContent.setCreateBy(getUsername());
return rtClassMettingContentService.insertRtClassMettingContent(rtClassMettingContent);
@@ -208,8 +201,7 @@ public class RtClassMettingContentController extends BaseController {
@Log(title = "班会内容", businessType = BusinessType.UPDATE)
@PostMapping("/update")
@ApiOperation("修改班会内容")
public AjaxResult edit(@RequestBody RtClassMettingContent rtClassMettingContent)
{
public AjaxResult edit(@RequestBody RtClassMettingContent rtClassMettingContent) {
rtClassMettingContent.setUpdateBy(getUsername());
return toAjax(rtClassMettingContentService.updateRtClassMettingContent(rtClassMettingContent));
}
@@ -221,8 +213,7 @@ public class RtClassMettingContentController extends BaseController {
@Log(title = "班会内容", businessType = BusinessType.DELETE)
@PostMapping("/{crIds}")
@ApiOperation("删除班会内容")
public AjaxResult remove(@PathVariable Long[] crIds)
{
public AjaxResult remove(@PathVariable Long[] crIds) {
return toAjax(rtClassMettingContentService.deleteRtClassMettingContentByCrIds(crIds));
}
}

34
srs-routine/src/main/java/com/srs/routine/domain/RtClassMettingContent.java
View File

@@ -3,13 +3,19 @@ package com.srs.routine.domain;
import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.srs.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.*;
import com.srs.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import com.srs.common.core.domain.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
@@ -119,17 +125,17 @@ private static final long serialVersionUID=1L;
private String crAddr;
/**
* 状态：0：保存、1：发布，2：停用，3：结束
* 状态:0:保存、1:发布,2:停用,3:结束
*/
@ApiModelProperty("状态：0：保存、1：发布，2：停用，3：结束")
@ApiModelProperty("状态:0:保存、1:发布,2:停用,3:结束")
@TableField("status")
@Excel(name = "状态：0：保存、1：发布，2：停用，3：结束")
@Excel(name = "状态:0:保存、1:发布,2:停用,3:结束")
private String status;
/**
* 删除标志（0代表存在
* 删除标志(0代表存在
*/
@ApiModelProperty("删除标志（0代表存在")
@ApiModelProperty("删除标志(0代表存在")
@TableField("del_flag")
private String delFlag;
@@ -158,4 +164,16 @@ private static final long serialVersionUID=1L;
@TableField(exist = false)
private List<SrsAttachResource> attachResourceList;
/**
* 学院ID(用于查询条件)
*/
@TableField(exist = false)
private Long deptId;
/**
* 学院名称(用于显示)
*/
@TableField(exist = false)
private String deptName;
}

3
srs-routine/src/main/resources/mapper/routine/RtClassMettingContentMapper.xml
View File

@@ -55,6 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN
srs_class sc ON rm.cr_class_no = sc.class_id
LEFT JOIN
srs_majors sm ON sc.major_id = sm.major_id
LEFT JOIN
sys_user u ON rm.cr_teacher_no = u.user_name
</sql>
@@ -65,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="crCmNo != null and crCmNo != ''"> and rm.cr_cm_no = #{crCmNo}</if>
<if test="crCmTitle != null and crCmTitle != ''"> and mt.cm_title like concat('%',#{crCmTitle},'%')</if>
<if test="crDepartmentNo != null and crDepartmentNo != ''"> and rm.cr_department_no = #{crDepartmentNo}</if>
<if test="deptId != null"> and sm.college_id = #{deptId}</if>
<if test="crMajorNo != null and crMajorNo != ''"> and rm.cr_major_no = #{crMajorNo}</if>
<if test="crClassNo != null and crClassNo != ''"> and rm.cr_class_no = #{crClassNo}</if>
<if test="crTeacherNo != null and crTeacherNo != ''"> and rm.cr_teacher_no = #{crTeacherNo}</if>

119
srs-stureg/src/main/java/com/srs/stureg/domain/SrsStuReg.java
View File

@@ -23,8 +23,7 @@ import com.srs.common.core.domain.BaseEntity;
*/
@Data
@TableName("srs_stu_reg")
public class SrsStuReg extends BaseEntity
{
public class SrsStuReg extends BaseEntity {
private static final long serialVersionUID = 1L;
@TableField(exist = false)
@@ -49,123 +48,169 @@ public class SrsStuReg extends BaseEntity
@TableField("is_change_SJHM")
private String isChangeSJHM;
@TableId(value = "id",type = IdType.AUTO)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 学生姓名 */
/**
* 学生姓名
*/
@Excel(name = "学生姓名")
@TableField("XSXM")
private String XSXM;
/** 考生号 */
/**
* 考生号
*/
@Excel(name = "考生号")
@TableField("KSH")
private String KSH;
/** 身份证号 */
/**
* 身份证号
*/
@Excel(name = "身份证号")
@TableField("SFZH")
@Sensitive(desensitizedType = DesensitizedType.ID_CARD)
private String SFZH;
/** 手机号 */
/**
* 手机号
*/
@Excel(name = "手机号")
@TableField("SJH")
@Sensitive(desensitizedType = DesensitizedType.PHONE)
private String SJH;
/** 性别 */
/**
* 性别
*/
@Excel(name = "性别")
@TableField("XB")
private String XB;
/** 政治面貌 */
/**
* 政治面貌
*/
@Excel(name = "政治面貌")
@TableField("ZZMM")
private String ZZMM;
/** 民族 */
/**
* 民族
*/
@Excel(name = "民族")
@TableField("MZ")
private String MZ;
/** 校编学号 */
/**
* 校编学号
*/
@Excel(name = "校编学号")
@TableField("XH")
private String XH;
/** 学院 */
/**
* 学院
*/
@Excel(name = "学院")
@TableField("XY")
private String XY;
/** 学院代码 */
/**
* 学院代码
*/
@Excel(name = "学院代码")
@TableField("XYDM")
private String XYDM;
/** 专业 */
/**
* 专业
*/
@Excel(name = "专业")
@TableField("ZY")
private String ZY;
/** 专业代码 */
/**
* 专业代码
*/
@Excel(name = "专业代码")
@TableField("ZYDM")
private String ZYDM;
/** 班级 */
/**
* 班级
*/
@Excel(name = "班级")
@TableField("BJ")
private String BJ;
/** 班级代码 */
/**
* 班级代码
*/
@Excel(name = "班级代码")
@TableField("BJDM")
private String BJDM;
/** 毕业学校 */
/**
* 毕业学校
*/
@Excel(name = "毕业学校")
@TableField("last_school")
private String lastSchool;
/** 毕业学校所在地 */
/**
* 毕业学校所在地
*/
@Excel(name = "毕业学校所在地")
@TableField("last_school_addr")
private String lastSchoolAddr;
/** 家庭联系人姓名 */
/**
* 家庭联系人姓名
*/
@Excel(name = "家庭联系人姓名")
@TableField("fam_name")
private String famName;
/** 与本人关系 */
/**
* 与本人关系
*/
@Excel(name = "与本人关系")
@TableField("fam_relation")
private String famRelation;
/** 家庭联系人电话 */
/**
* 家庭联系人电话
*/
@Excel(name = "家庭联系人电话")
@TableField("fam_phone")
@Sensitive(desensitizedType = DesensitizedType.PHONE)
private String famPhone;
/** 家庭现居地址 */
/**
* 家庭现居地址
*/
@Excel(name = "家庭现居地址")
@TableField("fam_now_addr")
private String famNowAddr;
/** 户籍所在地 */
/**
* 户籍所在地
*/
@Excel(name = "户籍所在地")
@TableField("sfz_addr")
private String sfzAddr;
/** 是否申请助学贷款 1：是，2：否*/
/**
* 是否申请助学贷款 1：是，2：否
*/
@Excel(name = "是否申请助学贷款")
@TableField("is_loan")
private String isLoan;
/** 是否申请助学贷款 1：是，0：否*/
/**
* 是否申请助学贷款 1：是，0：否
*/
@Excel(name = "是否是定向生")
@TableField("is_direction")
private String isDirection;
@@ -175,13 +220,19 @@ public class SrsStuReg extends BaseEntity
private String loanNo;
/** 学院id */
/**
* 学院id
*/
private Long deptId;
/** 专业id */
/**
* 专业id
*/
private Long majorId;
/** 所属班级ID */
/**
* 所属班级ID
*/
private Long classId;
@Excel(name = "是否退伍复学")
@@ -205,12 +256,16 @@ public class SrsStuReg extends BaseEntity
@Excel(name = "兴趣特长")
@TableField("hobby")
public String hobby;
/** 注册状态 */
/**
* 注册状态
*/
@Excel(name = "注册状态")
@TableField("reg_status")
private String regStatus;
/** 删除标志（0代表存在 */
/**
* 删除标志（0代表存在
*/
@TableField("del_flag")
private String delFlag;
@TableField("LQZY")
@@ -221,7 +276,7 @@ public class SrsStuReg extends BaseEntity
private String PCDM;
@TableField("TDDW")
private String TDDW;
// @TableField("ZYDH")
// @TableField("ZYDH")
// private String ZYDH;
@TableField("XZNX")
private String XZNX;