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

新生报到宿舍分配代码调整

Browse Source
This commit is contained in:
18154758993
2025-08-28 09:51:18 +08:00
parent f258ae20bc
commit 5409611abc
19 changed files with 85 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsDormitoryMapper.java
View File

@@ -30,6 +30,10 @@ public interface DmsDormitoryMapper extends MPJBaseMapper<DmsDormitory> {
@Select("select * from view_dorm_info")
public List<Map<String, Object>> listDormInfo();
public List<DmsDormitory> listViewDormInfoByIds(@Param("ids") List<Long> ids);
public DmsDormitory getDormitoryById(@Param("id") Long id);
public DomInfo getDormHas(Long id);
public List<DomInfo> countRecordConfirmStatus();

11
dms-dormitory/src/main/java/com/srs/dormitory/service/impl/IDmsDormitoryDeptServiceImpl.java
View File

@@ -278,7 +278,9 @@ public class IDmsDormitoryDeptServiceImpl extends ServiceImpl<DmsDormitoryDeptMa
TransactionStatus status = transactionManager.getTransaction(def);
try{
Long dmId = param.get(0).getDormitoryId();
DmsDormitory dm = _dmMapper.selectById(dmId);
// DmsDormitory dm = _dmMapper.selectById(dmId);
DmsDormitory dm = _dmMapper.getDormitoryById(dmId);
if(dm == null){
throw new Exception("该宿舍不存在，请重新输入");
}
@@ -328,9 +330,9 @@ public class IDmsDormitoryDeptServiceImpl extends ServiceImpl<DmsDormitoryDeptMa
TransactionStatus status = transactionManager.getTransaction(def);
try{
QueryWrapper<DmsDormitory> dmQuery = new QueryWrapper<>();
dmQuery.in("id",dto.getDormIds());
List<DmsDormitory> dmList = _dmMapper.selectList(dmQuery);
// QueryWrapper<DmsDormitory> dmQuery = new QueryWrapper<>();
// dmQuery.in("id",dto.getDormIds());
List<DmsDormitory> dmList = _dmMapper.listViewDormInfoByIds(dto.getDormIds());
List<String> isExistXydm = new ArrayList<>();
@@ -415,7 +417,6 @@ public class IDmsDormitoryDeptServiceImpl extends ServiceImpl<DmsDormitoryDeptMa
@Override
public TableDataInfo getDormitory(SelectDormDto dto) {
DmsSearch param = new DmsSearch();
if (dto.getFloorId() != null) {

25
dms-dormitory/src/main/resources/mapper/dormitory/DmsDormitoryMapper.xml
View File

@@ -615,4 +615,29 @@
where a.id = #{id}
</select>
<select id="listViewDormInfoByIds" parameterType="List" resultType="DmsDormitory">
select a.*,
case b.occupancy
when b.occupancy is not null then b.occupancy
else 0
end
as occupancy from view_dorm_info as a
left join view_dorm_stu_count as b on a.id = b.dormitory_id
where a.id in
<foreach item="item" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<select id="getDormitoryById" parameterType="Long" resultType="DmsDormitory">
select a.*,
case b.occupancy
when b.occupancy is not null then b.occupancy
else 0
end
as occupancy from view_dorm_info as a
left join view_dorm_stu_count as b on a.id = b.dormitory_id
where a.id = #{id}
</select>
</mapper>

1
srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphGoodApplyController.java
View File

@@ -94,7 +94,6 @@ public class CphGoodApplyController extends BaseController {
Object total = ajaxResult.get("data");
Page page = (Page) total;
list.add("rwgl-" + page.getTotal());
String username = new String();
return AjaxResult.success(list);
}

19
srs-admin/src/main/java/com/srs/web/controller/stureg/SrsOrderController.java
View File

@@ -162,15 +162,16 @@ public class SrsOrderController extends BaseController
stuReg.setRegStatus("1");
_stuRegService.updateSrsStuReg(stuReg);
srsStuTodoService.confirmTask(getUsername(),"ZXJF");
String classCode = stuReg.getBJDM();
QueryWrapper<SrsClass> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("class_code",classCode);
SrsClass srsClass = srcClassMapper.selectOne(queryWrapper);
Long teacherId = srsClass.getTeacherId();
CphTeacher cphTeacher = cphTeacherMapper.selectCphTeacherByTeacherId(teacherId);
String employeeId = cphTeacher.getEmployeeId();
// 自动分配宿舍
srsDormitoryStudentService.assignDormitoryByTeacher(employeeId);
// 分配宿舍逻辑
// String classCode = stuReg.getBJDM();
// QueryWrapper<SrsClass> queryWrapper = new QueryWrapper<>();
// queryWrapper.eq("class_code",classCode);
// SrsClass srsClass = srcClassMapper.selectOne(queryWrapper);
// Long teacherId = srsClass.getTeacherId();
// CphTeacher cphTeacher = cphTeacherMapper.selectCphTeacherByTeacherId(teacherId);
// String employeeId = cphTeacher.getEmployeeId();
// // 自动分配宿舍
// srsDormitoryStudentService.assignDormitoryByTeacher(employeeId);
return AjaxResult.success("已缴费");
}else {

14
srs-admin/src/main/resources/application.yml
View File

@@ -21,7 +21,7 @@ srs:
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080 正式：8085 测试：8088
port: 8088
port: 8085
servlet:
# 应用的访问路径
context-path: /
@@ -62,8 +62,8 @@ spring:
# 国际化资源文件路径
basename: i18n/messages
profiles:
# active: druid #正式环境
active: dev #测试环境
active: druid #正式环境
# active: dev #测试环境
# 文件上传
servlet:
multipart:
@@ -79,15 +79,15 @@ spring:
# redis 配置
redis:
# 地址
# host: localhost #正式环境redis
host: 47.112.118.149 #测试开发地址
host: localhost #正式环境redis
# host: 47.112.118.149 #测试开发地址
# 端口，默认为6379
port: 6379
# 数据库索引
database: 0
# 密码SSSS
password: Houpuyfb #测试开发密码
# password: #正式环境密码
# password: Houpuyfb #测试开发密码
password: #正式环境密码
# 连接超时时间
timeout: 10s
lettuce:

15
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphClasstwoMapper.java
View File

@@ -1,6 +1,5 @@
package com.srs.comprehensive.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.srs.comprehensive.domain.CphClasstwo;
import com.srs.comprehensive.domain.Vo.CphScoreVo;
import com.srs.comprehensive.domain.Vo.StuIdNo;
@@ -12,7 +11,7 @@ import java.util.List;
/**
* 第二课堂Mapper接口
*
*
* @author zhy
* @date 2023-07-03
*/
@@ -29,7 +28,7 @@ public interface CphClasstwoMapper extends EasyBaseMapper<CphClasstwo>
/**
* 查询第二课堂
*
*
* @param id 第二课堂主键
* @return 第二课堂
*/
@@ -37,7 +36,7 @@ public interface CphClasstwoMapper extends EasyBaseMapper<CphClasstwo>
/**
* 查询第二课堂列表
*
*
* @param cphClasstwo 第二课堂
* @return 第二课堂集合
*/
@@ -57,7 +56,7 @@ public interface CphClasstwoMapper extends EasyBaseMapper<CphClasstwo>
/**
* 新增第二课堂
*
*
* @param cphClasstwo 第二课堂
* @return 结果
*/
@@ -65,7 +64,7 @@ public interface CphClasstwoMapper extends EasyBaseMapper<CphClasstwo>
/**
* 修改第二课堂
*
*
* @param cphClasstwo 第二课堂
* @return 结果
*/
@@ -73,7 +72,7 @@ public interface CphClasstwoMapper extends EasyBaseMapper<CphClasstwo>
/**
* 删除第二课堂
*
*
* @param id 第二课堂主键
* @return 结果
*/
@@ -81,7 +80,7 @@ public interface CphClasstwoMapper extends EasyBaseMapper<CphClasstwo>
/**
* 批量删除第二课堂
*
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/

2
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphStuScoreMiddlesMapper.java
View File

@@ -1,8 +1,6 @@
package com.srs.comprehensive.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.srs.comprehensive.domain.CphStuScoreMiddle;
import com.srs.comprehensive.domain.Dto.CphStuScoreMiddleDto;
import com.srs.framework.mybatisplusMapper.EasyBaseMapper;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Mapper;

3
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphTeacherMapper.java
View File

@@ -1,13 +1,10 @@
package com.srs.comprehensive.mapper;
import com.srs.common.core.domain.entity.SysDept;
import java.util.List;
import java.util.Map;
import com.srs.comprehensive.domain.CphTeacher;
import com.srs.comprehensive.domain.Dto.CphExport;
import com.srs.comprehensive.domain.SrsClass;
import com.srs.comprehensive.domain.SrsGrade;
import com.srs.comprehensive.domain.SrsMajors;
import com.srs.comprehensive.domain.Vo.*;

14
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsAddRecordMapper.java
View File

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param;
/**
* 【加分记录】Mapper接口
*
*
* @author srs
* @date 2023-06-20
*/
@@ -24,7 +24,7 @@ public interface SrsAddRecordMapper extends EasyBaseMapper<SrsAddRecord>
/**
* 查询【请填写功能名称】
*
*
* @param id 【请填写功能名称】主键
* @return 【请填写功能名称】
*/
@@ -32,7 +32,7 @@ public interface SrsAddRecordMapper extends EasyBaseMapper<SrsAddRecord>
/**
* 查询【请填写功能名称】列表
*
*
* @param srsAddRecord 【请填写功能名称】
* @return 【请填写功能名称】集合
*/
@@ -40,7 +40,7 @@ public interface SrsAddRecordMapper extends EasyBaseMapper<SrsAddRecord>
/**
* 新增【请填写功能名称】
*
*
* @param srsAddRecord 【请填写功能名称】
* @return 结果
*/
@@ -50,7 +50,7 @@ public interface SrsAddRecordMapper extends EasyBaseMapper<SrsAddRecord>
/**
* 修改【请填写功能名称】
*
*
* @param srsAddRecord 【请填写功能名称】
* @return 结果
*/
@@ -58,7 +58,7 @@ public interface SrsAddRecordMapper extends EasyBaseMapper<SrsAddRecord>
/**
* 删除【请填写功能名称】
*
*
* @param id 【请填写功能名称】主键
* @return 结果
*/
@@ -66,7 +66,7 @@ public interface SrsAddRecordMapper extends EasyBaseMapper<SrsAddRecord>
/**
* 批量删除【请填写功能名称】
*
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/

1
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsClassMapper.java
View File

@@ -7,7 +7,6 @@ import com.srs.comprehensive.domain.Vo.CphSearch;
import com.srs.framework.mybatisplusMapper.EasyBaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;

1
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsGradeMapper.java
View File

@@ -2,7 +2,6 @@ package com.srs.comprehensive.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.srs.comprehensive.domain.SrsGrade;
import com.srs.framework.mybatisplusMapper.EasyBaseMapper;
import org.apache.ibatis.annotations.Mapper;

1
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsMajorsMapper.java
View File

@@ -2,7 +2,6 @@ package com.srs.comprehensive.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.srs.comprehensive.domain.SrsMajors;
import com.srs.framework.mybatisplusMapper.EasyBaseMapper;
import org.apache.ibatis.annotations.Mapper;

17
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsSportTestMapper.java
View File

@@ -1,13 +1,10 @@
package com.srs.comprehensive.mapper;
import java.util.List;
import java.util.Set;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.srs.comprehensive.domain.SrsSportTest;
import com.srs.comprehensive.domain.SumSportTest;
import com.srs.comprehensive.domain.Vo.CphScoreVo;
import com.srs.comprehensive.domain.Vo.SrsSportTestStudent;
import com.srs.comprehensive.domain.Vo.StuIdNo;
import com.srs.framework.mybatisplusMapper.EasyBaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -15,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
/**
* 体能测试Mapper接口
*
*
* @author srs
* @date 2023-06-28
*/
@@ -39,7 +36,7 @@ public interface SrsSportTestMapper extends EasyBaseMapper<SrsSportTest>
/**
* 查询体能测试
*
*
* @param id 体能测试主键
* @return 体能测试
*/
@@ -53,7 +50,7 @@ public interface SrsSportTestMapper extends EasyBaseMapper<SrsSportTest>
/**
* 查询体能测试列表
*
*
* @param srsSportTest 体能测试
* @return 体能测试集合
*/
@@ -63,7 +60,7 @@ public interface SrsSportTestMapper extends EasyBaseMapper<SrsSportTest>
/**
* 新增体能测试
*
*
* @param srsSportTest 体能测试
* @return 结果
*/
@@ -71,7 +68,7 @@ public interface SrsSportTestMapper extends EasyBaseMapper<SrsSportTest>
/**
* 修改体能测试
*
*
* @param srsSportTest 体能测试
* @return 结果
*/
@@ -79,7 +76,7 @@ public interface SrsSportTestMapper extends EasyBaseMapper<SrsSportTest>
/**
* 删除体能测试
*
*
* @param id 体能测试主键
* @return 结果
*/
@@ -87,7 +84,7 @@ public interface SrsSportTestMapper extends EasyBaseMapper<SrsSportTest>
/**
* 批量删除体能测试
*
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/

2
srs-flowable/src/main/java/com/srs/flowable/listener/LeaveApproveListener.java
View File

@@ -66,6 +66,6 @@ public class LeaveApproveListener implements ExecutionListener {
log.info("审核成功");
//推送消息
//todo 推送消息,推送给辅导员，目的要拿到辅导员工号
}
}

2
srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XYWJCLWYHListener.java
View File

@@ -76,4 +76,4 @@ public class XYWJCLWYHListener implements ExecutionListener {
}
return null;
}
}
}

2
srs-framework/pom.xml
View File

@@ -78,4 +78,4 @@
</dependencies>
</project>
</project>

3
srs-framework/src/main/java/com/srs/framework/mybatisplusMapper/EasyBaseMapper.java
View File

@@ -1,6 +1,7 @@
package com.srs.framework.mybatisplusMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
public interface EasyBaseMapper<T> extends BaseMapper<T> {
@@ -11,4 +12,4 @@ public interface EasyBaseMapper<T> extends BaseMapper<T> {
* @return 影响行数
*/
Integer insertBatchSomeColumn(List<T> entityList);
}
}

15
srs-stureg/src/main/java/com/srs/stureg/mapper/SrsMsgQueueMapper.java
View File

@@ -4,12 +4,11 @@ import java.util.List;
import com.srs.framework.mybatisplusMapper.EasyBaseMapper;
import com.srs.stureg.domain.SrsMsgQueue;
import com.srs.stureg.domain.SrsStuReg;
import org.apache.ibatis.annotations.Mapper;
/**
* 短信队列Mapper接口
*
*
* @author srs
* @date 2023-07-24
*/
@@ -18,7 +17,7 @@ public interface SrsMsgQueueMapper extends EasyBaseMapper<SrsMsgQueue>
{
/**
* 查询短信队列
*
*
* @param id 短信队列主键
* @return 短信队列
*/
@@ -26,7 +25,7 @@ public interface SrsMsgQueueMapper extends EasyBaseMapper<SrsMsgQueue>
/**
* 查询短信队列列表
*
*
* @param srsMsgQueue 短信队列
* @return 短信队列集合
*/
@@ -34,7 +33,7 @@ public interface SrsMsgQueueMapper extends EasyBaseMapper<SrsMsgQueue>
/**
* 新增短信队列
*
*
* @param srsMsgQueue 短信队列
* @return 结果
*/
@@ -42,7 +41,7 @@ public interface SrsMsgQueueMapper extends EasyBaseMapper<SrsMsgQueue>
/**
* 修改短信队列
*
*
* @param srsMsgQueue 短信队列
* @return 结果
*/
@@ -50,7 +49,7 @@ public interface SrsMsgQueueMapper extends EasyBaseMapper<SrsMsgQueue>
/**
* 删除短信队列
*
*
* @param id 短信队列主键
* @return 结果
*/
@@ -58,7 +57,7 @@ public interface SrsMsgQueueMapper extends EasyBaseMapper<SrsMsgQueue>
/**
* 批量删除短信队列
*
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/