dianliang/school_website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
xyc 2025-06-09 14:15:35 +08:00
parent a247cb5a4b
commit d8761b6876
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java
View File

@ -107,6 +107,7 @@ public class HitRegInfoController extends BaseController
list1.add(hitRegInfoExportVo); list1.add(hitRegInfoExportVo);
}catch (Exception e) { }catch (Exception e) {
log.error("导出错误,团队信息:{}", hitRegInfo1); log.error("导出错误,团队信息:{}", hitRegInfo1);
log.error("导出错误,错误信息:{}", e.getMessage());
} }
} }

12
ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java
View File

@ -137,10 +137,10 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService {
*/ */
@Override @Override
public List<HitRegInfo> selectHitRegInfoListExport(HitRegInfo hitRegInfo) { public List<HitRegInfo> selectHitRegInfoListExport(HitRegInfo hitRegInfo) {
if (ObjectUtil.isEmpty(hitRegInfo.getYear())) { // if (ObjectUtil.isEmpty(hitRegInfo.getYear())) {
//获取当前年 // //获取当前年
hitRegInfo.setYear(DateUtil.format(new Date(), "yyyy")); // hitRegInfo.setYear(DateUtil.format(new Date(), "yyyy"));
} // }
Long userId = SecurityUtils.getLoginUser().getUserId(); Long userId = SecurityUtils.getLoginUser().getUserId();
//判断当前登陆人是否是领队老师，如果是查询该老师学校下的战队 //判断当前登陆人是否是领队老师，如果是查询该老师学校下的战队
HitRegistrationTeachInfo teacherInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(userId, hitRegInfo.getYear()); HitRegistrationTeachInfo teacherInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(userId, hitRegInfo.getYear());
@ -155,12 +155,12 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService {
for (HitRegInfoUser regInfoUser : hitRegInfoUsers) { for (HitRegInfoUser regInfoUser : hitRegInfoUsers) {
switch (regInfoUser.getType()) { switch (regInfoUser.getType()) {
case "3": { case "3": {
HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(), hitRegInfo.getYear()); HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(), null);
regInfo.setLdTeacher(hitRegistrationTeachInfo); regInfo.setLdTeacher(hitRegistrationTeachInfo);
break; break;
} }
case "2": { case "2": {
HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(), hitRegInfo.getYear()); HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(), null);
regInfo.getZdTeacher().add(hitRegistrationTeachInfo); regInfo.getZdTeacher().add(hitRegistrationTeachInfo);
break; break;
} }

6
ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml
View File

@ -55,7 +55,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectHitRegistrationTeachInfoByUserId" <select id="selectHitRegistrationTeachInfoByUserId"
resultType="com.ruoyi.common.core.domain.HitRegistrationTeachInfo"> resultType="com.ruoyi.common.core.domain.HitRegistrationTeachInfo">
select * from hit_registration_teach_info select * from hit_registration_teach_info
where user_id = #{userId} and create_time like concat(#{year},'%') <where>user_id = #{userId}
<if test="year != null">
and create_time like concat(#{year},'%')
</if>
</where>
</select> </select>
<select id="selectHitRegistrationTeachInfoByUserIdNoYear" <select id="selectHitRegistrationTeachInfoByUserIdNoYear"

2
ruoyi-ui/src/views/officialWebsite/Components/header.vue
View File

@ -146,7 +146,7 @@
<!-- <image-upload :limit="1" v-model="registerForm.hitRegistrationTeachInfo.file"></image-upload>--> <!-- <image-upload :limit="1" v-model="registerForm.hitRegistrationTeachInfo.file"></image-upload>-->
<el-upload <el-upload
ref="upload" ref="upload"
:limit="1" :limit="1"system/hit_reg_info/export
:headers="upload.headers" :headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport" :action="upload.url + '?updateSupport=' + upload.updateSupport"
:disabled="upload.isUploading" :disabled="upload.isUploading"