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

更新10.18

Browse Source
This commit is contained in:
许允枞 2024-10-18 17:06:53 +08:00
parent 9e65b5504c
commit 5f25237500
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
package com.ruoyi.cms.controller;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
@ -97,6 +98,10 @@ public class HitRegInfoController extends BaseController
hitRegInfoExportVo.setStudent2Phone(hitRegInfo1.getStudentUserss().get(1).getPhoneNumber());
hitRegInfoExportVo.setStudent3(hitRegInfo1.getStudentUserss().get(2).getStuName());
hitRegInfoExportVo.setStudent3Phone(hitRegInfo1.getStudentUserss().get(2).getPhoneNumber());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String formattedCreateTime = sdf.format(hitRegInfo1.getCreateTime());
hitRegInfoExportVo.setCreateTime(formattedCreateTime);
list1.add(hitRegInfoExportVo);
}catch (Exception e) {
log.error("导出错误,团队信息:{}", hitRegInfo1);

6
ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegInfoExportVo.java
View File

@ -1,8 +1,11 @@
package com.ruoyi.cms.domain.vo;
import cn.hutool.core.date.DateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
@ -67,4 +70,7 @@ public class HitRegInfoExportVo {
@Excel(name = "学生3手机号")
private String student3Phone;
@Excel(name = "报名时间")
private String createTime;
}

3
ruoyi-ui/.env.development
View File

@ -4,9 +4,8 @@ VUE_APP_TITLE = 虚拟仿真实验教学中心
# 开发环境配置
ENV = 'development'
# 若依管理系统/开发环境
# VUE_APP_BASE_API = 'http://192.168.1.54:8080'
#VUE_APP_BASE_API = 'http://192.168.31.25:8080'
VUE_APP_BASE_API = 'http://localhost:8081/hgdWebsite'
# VUE_APP_BASE_API = 'http://192.168.1.54:8080/hgdWebsite'
# VUE_APP_BASE_API = '/dev-api'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

10
ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue
View File

@ -48,11 +48,11 @@
v-hasPermi="['hit:hitRegistrationStudentInfo:export']"
>导出</el-button>
</el-col>
<!-- <el-col :span="1.5" v-hasPermi="['hit:open']">-->
<!-- <el-switch v-model="registerStatus" @change="updateRegisterStatus" active-value="1" inactive-value="0"-->
<!-- active-text="开启报名" inactive-text="关闭报名" >-->
<!-- </el-switch>-->
<!-- </el-col>-->
<el-col :span="1.5" v-hasPermi="['hit:open']">
<el-switch v-model="registerStatus" @change="updateRegisterStatus" active-value="1" inactive-value="0"
active-text="开启报名" inactive-text="关闭报名" >
</el-switch>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>