ccsens_wiki
/
ccsenscloud
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'pt' of https://dd.tall.wiki/gitea/ccsens_wiki/ccsenscloud into pt

tiaosheng
wang0018 5 years ago
parent
5129ee9fac da229f9a1a
commit
059b42de9b
9 changed files with 358 additions and 195 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      mt/src/main/java/com/ccsens/mt/api/ExcelController.java
  2. 21
      mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java
  3. 6
      mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java
  4. 2
      mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java
  5. 417
      mt/src/main/java/com/ccsens/mt/service/ExcelService.java
  6. 2
      mt/src/main/java/com/ccsens/mt/service/IExcelService.java
  7. 2
      mt/src/main/resources/application.yml
  8. 97
      mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
  9. 2
      tall/src/main/resources/application-dev.yml

2
mt/src/main/java/com/ccsens/mt/api/ExcelController.java
View File

@ -108,7 +108,7 @@ public class ExcelController {
@MustLogin
@ApiOperation(value = "xxx大赛报名表（查询）", notes = "")
@RequestMapping(value = "/enterInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<TableVo.CompeteJoin> getEnterInfo(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> params) {
public JsonResponse<TableVo.CompeteJoin> getEnterInfo(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.EnterInfo> params) {
log.info("日程安排更新：{}",params);
List<TableVo.CompeteJoin> competeJoinList = excelService.getCompeteJoinDetail(params.getParam());
return JsonResponse.newInstance().ok(competeJoinList);

21
mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java
View File

@ -305,4 +305,25 @@ public class CompeteDto {
@ApiModelProperty("")
private String fileBase64;
}
@Data
@ApiModel
public static class EnterInfo{
@NotNull
@ApiModelProperty("第几届信息的id")
private Long competeTimeId;
@ApiModelProperty("项目id")
private Long projectId;
@ApiModelProperty("组别id")
private Long groupId;
@ApiModelProperty("团队id")
private Long companyId;
@ApiModelProperty("姓名")
private String name;
@ApiModelProperty("身份证号")
private String idCard;
}
}

6
mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java
View File

@ -32,8 +32,10 @@ public class TableVo {
private int age;
@ApiModelProperty("身份证号")
private String idCard;
@ApiModelProperty("身份证明")
private String idCardPromise;
@ApiModelProperty("身份证明正面")
private String idCardPromiseFront;
@ApiModelProperty("身份证明背面")
private String idCardPromiseBack;
@ApiModelProperty("一寸证件照")
private String picture;
@ApiModelProperty("学籍证明/俱乐部证明")

2
mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java
View File

@ -16,4 +16,6 @@ import java.util.List;
public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper {
CompeteProjectConfig selectByProjectId(@Param("projectId") Long projectId);
List<TableVo.SchedulePlanDetail> selectDetail ();
List<TableVo.CompeteJoin> selectSingle (@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard);
List<TableVo.CompeteJoin> selectGroup (@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard);
}

417
mt/src/main/java/com/ccsens/mt/service/ExcelService.java
View File

@ -1,4 +1,5 @@
package com.ccsens.mt.service;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.ObjectUtil;
@ -997,7 +998,12 @@ public class ExcelService implements IExcelService {
//单项时间
dailyScheduleProcess.setSingleTime(competeProjectConfig.getProjectDuration());
//场地
dailyScheduleProcess.setSiteNum(competeProjectConfig.getSiteNum());
int siteNum = competeProjectConfig.getSiteNum();
if(siteNum == 0){
dailyScheduleProcess.setSiteNum(1);
}else{
dailyScheduleProcess.setSiteNum(siteNum);
}
//场次
double a = (double)count / (double)competeProjectConfig.getSiteNum();
double times = Math.ceil(a);
@ -1028,7 +1034,12 @@ public class ExcelService implements IExcelService {
//单项时间
dailyScheduleProcess.setSingleTime(competeProjectConfig.getProjectDuration());
//场地
dailyScheduleProcess.setSiteNum(competeProjectConfig.getSiteNum());
int siteNum = competeProjectConfig.getSiteNum();
if(siteNum == 0){
dailyScheduleProcess.setSiteNum(1);
}else{
dailyScheduleProcess.setSiteNum(siteNum);
}
//场次
double a = (double)count / (double)competeProjectConfig.getSiteNum();
double times = Math.ceil(a);
@ -1080,7 +1091,12 @@ public class ExcelService implements IExcelService {
if (ObjectUtil.isNotNull(competeProjectConfig1)) {
dailyScheduleProcess.setSingleTime(competeProjectConfig1.getProjectDuration());
//场地
dailyScheduleProcess.setSiteNum(competeProjectConfig1.getSiteNum());
int siteNum = competeProjectConfig1.getSiteNum();
if (siteNum == 0){
dailyScheduleProcess.setSiteNum(1);
}else {
dailyScheduleProcess.setSiteNum(siteNum);
}
//场次
double a = (double) updateAndSearch.getJoinNum() /(double) competeProjectConfig1.getSiteNum();
double games = Math.ceil(a);
@ -1100,157 +1116,179 @@ public class ExcelService implements IExcelService {
@Override
public List<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.CompeteTime params) {
List<TableVo.CompeteJoin> competeJoinList = new ArrayList<>();
Long competeTimeId = params.getCompeteTimeId();
CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(competeTimeId);
int type = competeTime.getType();
Byte level = 2;
CompeteProjectExample competeProjectExample = new CompeteProjectExample();
competeProjectExample.createCriteria().andTypeEqualTo((byte) type).andLevelEqualTo(level);
//获取参赛项目集合
List<CompeteProject> competeProjectList = competeProjectMapper.selectByExample(competeProjectExample);
for (CompeteProject competeProject : competeProjectList) {
String projectName = competeProject.getName();
if (competeProject.getTeam() == 0) {
//如果不是团队项目，查询该项目下报名人数集合
CompeteProjectPlayerExample competeProjectPlayerExample = new CompeteProjectPlayerExample();
competeProjectPlayerExample.createCriteria().andProjectIdEqualTo(competeProject.getId());
List<CompeteProjectPlayer> competeProjectPlayerList = competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample);
for (CompeteProjectPlayer competeProjectPlayer : competeProjectPlayerList) {
//查询每个报名人的详细信息下
CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeProjectPlayer.getPlayerId());
TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin();
//项目id
competeJoin.setProjectId(competeProject.getId());
//姓名
competeJoin.setName(competePlayer.getName());
//身份证号
competeJoin.setIdCard(competePlayer.getIdCard());
//根据身份证获取选手年龄并赋值
String idCard = competeJoin.getIdCard();
int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
competeJoin.setAge(ageByIdCard);
Byte gender = competePlayer.getGender();
if (gender == 0) {
competeJoin.setGender("女");
} else {
competeJoin.setGender("男");
}
//查询单位,并赋值
CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId());
if (ObjectUtil.isNotNull(competeCompany)) {
competeJoin.setJoinTeam(competeCompany.getName());
}
//查询组别，并赋值
CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId());
if (ObjectUtil.isNotNull(competeGroup)) {
competeJoin.setCompeteGroup(competePlayer.getName());
}
//身份证明查询，并赋值
CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile());
if (ObjectUtil.isNotNull(commonFile)) {
competeJoin.setIdCardPromise(commonFile.getVisitLocation());
}
//一寸证件照查询赋值
CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile());
if (ObjectUtil.isNotNull(commonFile1)) {
competeJoin.setPicture(commonFile1.getVisitLocation());
}
//学籍证明/俱乐部证明
CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile());
if (ObjectUtil.isNotNull(commonFile2)) {
competeJoin.setStudentPromise(commonFile2.getVisitLocation());
}
//体检证明
CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile());
if (ObjectUtil.isNotNull(commonFile3)) {
competeJoin.setBodyTest(commonFile3.getVisitLocation());
}
//人身意外伤害保险证明
CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile());
if (ObjectUtil.isNotNull(commonFile4)) {
competeJoin.setBodyProtect(commonFile4.getVisitLocation());
}
//参赛项目名赋值
competeJoin.setCompeteProject(projectName);
competeJoinList.add(competeJoin);
}
public List<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.EnterInfo params) {
List<TableVo.CompeteJoin> competeJoinList = new ArrayList<>();
//个人项目查询
List<TableVo.CompeteJoin> competeJoinList1 = competeProjectConfigDao.selectSingle(params.getCompeteTimeId(),params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard());
for (TableVo.CompeteJoin competeJoin : competeJoinList1){
//获取身份证
String idCard = competeJoin.getIdCard();
//根据身份证获取选手年龄并赋值
int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
competeJoin.setAge(ageByIdCard);
competeJoinList.add(competeJoin);
}
//团队项目查询
List<TableVo.CompeteJoin> competeJoinList2 = competeProjectConfigDao.selectGroup(params.getCompeteTimeId(),params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard());
for (TableVo.CompeteJoin competeJoin : competeJoinList2){
//获取身份证
String idCard = competeJoin.getIdCard();
//根据身份证获取选手年龄并赋值
int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
competeJoin.setAge(ageByIdCard);
competeJoinList.add(competeJoin);
}
// Long competeTimeId = params.getCompeteTimeId();
// CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(competeTimeId);
// int type = competeTime.getType();
// Byte level = 2;
// CompeteProjectExample competeProjectExample = new CompeteProjectExample();
// competeProjectExample.createCriteria().andTypeEqualTo((byte) type).andLevelEqualTo(level);
// //获取参赛项目集合
// List<CompeteProject> competeProjectList = competeProjectMapper.selectByExample(competeProjectExample);
// for (CompeteProject competeProject : competeProjectList) {
// String projectName = competeProject.getName();
// if (competeProject.getTeam() == 0) {
// //如果不是团队项目，查询该项目下报名人数集合
// CompeteProjectPlayerExample competeProjectPlayerExample = new CompeteProjectPlayerExample();
// competeProjectPlayerExample.createCriteria().andProjectIdEqualTo(competeProject.getId());
// List<CompeteProjectPlayer> competeProjectPlayerList = competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample);
// for (CompeteProjectPlayer competeProjectPlayer : competeProjectPlayerList) {
// //查询每个报名人的详细信息下
// CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeProjectPlayer.getPlayerId());
// TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin();
// //项目id
// competeJoin.setProjectId(competeProject.getId());
// //姓名
// competeJoin.setName(competePlayer.getName());
// //身份证号
// competeJoin.setIdCard(competePlayer.getIdCard());
// //根据身份证获取选手年龄并赋值
// String idCard = competeJoin.getIdCard();
// int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
// competeJoin.setAge(ageByIdCard);
// Byte gender = competePlayer.getGender();
// if (gender == 0) {
// competeJoin.setGender("女");
// } else {
// competeJoin.setGender("男");
// }
// //查询单位,并赋值
// CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId());
// if (ObjectUtil.isNotNull(competeCompany)) {
// competeJoin.setJoinTeam(competeCompany.getName());
// }
// //查询组别，并赋值
// CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId());
// if (ObjectUtil.isNotNull(competeGroup)) {
// competeJoin.setCompeteGroup(competePlayer.getName());
// }
// //身份证明查询，并赋值
// CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile());
// if (ObjectUtil.isNotNull(commonFile)) {
// competeJoin.setIdCardPromise(commonFile.getVisitLocation());
// }
// //一寸证件照查询赋值
// CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile());
// if (ObjectUtil.isNotNull(commonFile1)) {
// competeJoin.setPicture(commonFile1.getVisitLocation());
// }
// //学籍证明/俱乐部证明
// CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile());
// if (ObjectUtil.isNotNull(commonFile2)) {
// competeJoin.setStudentPromise(commonFile2.getVisitLocation());
// }
// //体检证明
// CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile());
// if (ObjectUtil.isNotNull(commonFile3)) {
// competeJoin.setBodyTest(commonFile3.getVisitLocation());
// }
// //人身意外伤害保险证明
// CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile());
// if (ObjectUtil.isNotNull(commonFile4)) {
// competeJoin.setBodyProtect(commonFile4.getVisitLocation());
// }
// //参赛项目名赋值
// competeJoin.setCompeteProject(projectName);
// competeJoinList.add(competeJoin);
// }
//
// } else { //团队项目
// //获取参赛队伍集合
// CompeteTeamExample competeTeamExample = new CompeteTeamExample();
// competeTeamExample.createCriteria().andProjectIdEqualTo(competeProject.getId());
// List<CompeteTeam> competeTeamList = competeTeamDao.selectByExample(competeTeamExample);
// for (CompeteTeam competeTeam : competeTeamList) {
// //获取队伍下的成员集合
// CompeteTeamMemberExample competeTeamMemberExample = new CompeteTeamMemberExample();
// competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId());
// List<CompeteTeamMember> competeTeamMemberList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
// for (CompeteTeamMember competeTeamMember : competeTeamMemberList) {
// //查询成员详细信息
// CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId());
// TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin();
// //项目id
// competeJoin.setProjectId(competeProject.getId());
// //姓名
// competeJoin.setName(competePlayer.getName());
// //身份证号
// competeJoin.setIdCard(competePlayer.getIdCard());
// //根据身份证获取选手年龄并赋值
// String idCard = competeJoin.getIdCard();
// int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
// competeJoin.setAge(ageByIdCard);
// //性别
// Byte gender = competePlayer.getGender();
// if (gender == 0) {
// competeJoin.setGender("女");
// } else {
// competeJoin.setGender("男");
// }
// //查询单位,并赋值
// CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId());
// if (ObjectUtil.isNotNull(competeCompany)) {
// competeJoin.setJoinTeam(competeCompany.getName());
// }
// //查询组别，并赋值
// CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId());
// if (ObjectUtil.isNotNull(competeGroup)) {
// competeJoin.setCompeteGroup(competePlayer.getName());
// }
// //身份证明查询，并赋值
// CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile());
// if (ObjectUtil.isNotNull(commonFile)){
// competeJoin.setIdCardPromise(commonFile.getVisitLocation());
// }
// //一寸证件照查询赋值
// CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile());
// if (ObjectUtil.isNotNull(commonFile1)){
// competeJoin.setPicture(commonFile1.getVisitLocation());
// }
// //学籍证明/俱乐部证明
// CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile());
// if (ObjectUtil.isNotNull(commonFile2)){
// competeJoin.setStudentPromise(commonFile2.getVisitLocation());
// }
// //体检证明
// CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile());
// if (ObjectUtil.isNotNull(commonFile3)){
// competeJoin.setBodyTest(commonFile3.getVisitLocation());
// }
// //人身意外伤害保险证明
// CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile());
// if (ObjectUtil.isNotNull(commonFile4)){
// competeJoin.setBodyProtect(commonFile4.getVisitLocation());
// }
// //参赛项目名赋值
// competeJoin.setCompeteProject(projectName);
// competeJoinList.add(competeJoin);
// }
// }
// }
// }
// return competeJoinList;
} else { //团队项目
//获取参赛队伍集合
CompeteTeamExample competeTeamExample = new CompeteTeamExample();
competeTeamExample.createCriteria().andProjectIdEqualTo(competeProject.getId());
List<CompeteTeam> competeTeamList = competeTeamDao.selectByExample(competeTeamExample);
for (CompeteTeam competeTeam : competeTeamList) {
//获取队伍下的成员集合
CompeteTeamMemberExample competeTeamMemberExample = new CompeteTeamMemberExample();
competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId());
List<CompeteTeamMember> competeTeamMemberList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
for (CompeteTeamMember competeTeamMember : competeTeamMemberList) {
//查询成员详细信息
CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId());
TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin();
//项目id
competeJoin.setProjectId(competeProject.getId());
//姓名
competeJoin.setName(competePlayer.getName());
//身份证号
competeJoin.setIdCard(competePlayer.getIdCard());
//根据身份证获取选手年龄并赋值
String idCard = competeJoin.getIdCard();
int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
competeJoin.setAge(ageByIdCard);
//性别
Byte gender = competePlayer.getGender();
if (gender == 0) {
competeJoin.setGender("女");
} else {
competeJoin.setGender("男");
}
//查询单位,并赋值
CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId());
if (ObjectUtil.isNotNull(competeCompany)) {
competeJoin.setJoinTeam(competeCompany.getName());
}
//查询组别，并赋值
CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId());
if (ObjectUtil.isNotNull(competeGroup)) {
competeJoin.setCompeteGroup(competePlayer.getName());
}
//身份证明查询，并赋值
CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile());
if (ObjectUtil.isNotNull(commonFile)){
competeJoin.setIdCardPromise(commonFile.getVisitLocation());
}
//一寸证件照查询赋值
CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile());
if (ObjectUtil.isNotNull(commonFile1)){
competeJoin.setPicture(commonFile1.getVisitLocation());
}
//学籍证明/俱乐部证明
CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile());
if (ObjectUtil.isNotNull(commonFile2)){
competeJoin.setStudentPromise(commonFile2.getVisitLocation());
}
//体检证明
CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile());
if (ObjectUtil.isNotNull(commonFile3)){
competeJoin.setBodyTest(commonFile3.getVisitLocation());
}
//人身意外伤害保险证明
CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile());
if (ObjectUtil.isNotNull(commonFile4)){
competeJoin.setBodyProtect(commonFile4.getVisitLocation());
}
//参赛项目名赋值
competeJoin.setCompeteProject(projectName);
competeJoinList.add(competeJoin);
}
}
}
}
return competeJoinList;
return competeJoinList;
}
@Override
@ -1258,45 +1296,46 @@ public class ExcelService implements IExcelService {
List<TableVo.SchedulePlanDetailAllIn> schedulePlanDetailListUp = new ArrayList<>();
List<TableVo.SchedulePlanDetailAllIn> schedulePlanDetailListDown = new ArrayList<>();
//关联查询项目名，该项目在config和project中都存在
List <TableVo.SchedulePlanDetail> schedulePlanDetailList = competeProjectConfigDao.selectDetail();
for (TableVo.SchedulePlanDetail schedulePlanDetail : schedulePlanDetailList){
//项目名
String projectName = schedulePlanDetail.getProjectName();
//开始时间yyyy-MM-dd HH:mm:ss
long startTime = schedulePlanDetail.getStartTime();
Date date = new Date(startTime);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm");
String sm = simpleDateFormat.format(date);
//结束时间
long endTime = schedulePlanDetail.getEndTime();
Date date1 = new Date(endTime);
SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm");
String em = simpleDateFormat1.format(date1);
//拼接
String string = projectName + "("+ sm +"-"+ em + ")";
//项目开始日期
SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("MM-dd");
String md = simpleDateFormat2.format(date);
//上午项目
if (Integer.parseInt(sm.substring(0,2)) >= 6 && Integer.parseInt(sm.substring(0,2)) <= 12){
TableVo.SchedulePlanDetailAllIn schedulePlanDetailAllIn = new TableVo.SchedulePlanDetailAllIn();
schedulePlanDetailAllIn.setData(md);
schedulePlanDetailAllIn.setString(string);
schedulePlanDetailListUp.add(schedulePlanDetailAllIn);
}//下午项目
else if (Integer.parseInt(sm.substring(0,2)) > 12 && Integer.parseInt(sm.substring(0,2)) <= 18){
TableVo.SchedulePlanDetailAllIn schedulePlanDetailAllIn1 = new TableVo.SchedulePlanDetailAllIn();
schedulePlanDetailAllIn1.setData(md);
schedulePlanDetailAllIn1.setString(string);
schedulePlanDetailListDown.add(schedulePlanDetailAllIn1);
List<TableVo.SchedulePlanDetail> schedulePlanDetailList = competeProjectConfigDao.selectDetail();
TableVo.SchedulePlan schedulePlan = new TableVo.SchedulePlan();
if (CollectionUtil.isNotEmpty(schedulePlanDetailList)) {
for (TableVo.SchedulePlanDetail schedulePlanDetail : schedulePlanDetailList) {
//项目名
String projectName = schedulePlanDetail.getProjectName();
//开始时间yyyy-MM-dd HH:mm:ss
long startTime = schedulePlanDetail.getStartTime();
Date date = new Date(startTime);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm");
String sm = simpleDateFormat.format(date);
//结束时间
long endTime = schedulePlanDetail.getEndTime();
Date date1 = new Date(endTime);
SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm");
String em = simpleDateFormat1.format(date1);
//拼接
String string = projectName + "(" + sm + "-" + em + ")";
//项目开始日期
SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("MM-dd");
String md = simpleDateFormat2.format(date);
//上午项目
if (Integer.parseInt(sm.substring(0, 2)) >= 6 && Integer.parseInt(sm.substring(0, 2)) <= 12) {
TableVo.SchedulePlanDetailAllIn schedulePlanDetailAllIn = new TableVo.SchedulePlanDetailAllIn();
schedulePlanDetailAllIn.setData(md);
schedulePlanDetailAllIn.setString(string);
schedulePlanDetailListUp.add(schedulePlanDetailAllIn);
}//下午项目
else if (Integer.parseInt(sm.substring(0, 2)) > 12 && Integer.parseInt(sm.substring(0, 2)) <= 18) {
TableVo.SchedulePlanDetailAllIn schedulePlanDetailAllIn1 = new TableVo.SchedulePlanDetailAllIn();
schedulePlanDetailAllIn1.setData(md);
schedulePlanDetailAllIn1.setString(string);
schedulePlanDetailListDown.add(schedulePlanDetailAllIn1);
}
}
schedulePlan.setSchedulePlanDetailListDown(schedulePlanDetailListDown);
schedulePlan.setSchedulePlanDetailListUp(schedulePlanDetailListUp);
}
TableVo.SchedulePlan schedulePlan = new TableVo.SchedulePlan();
schedulePlan.setSchedulePlanDetailListDown(schedulePlanDetailListDown);
schedulePlan.setSchedulePlanDetailListUp(schedulePlanDetailListUp);
return schedulePlan;
}
}

2
mt/src/main/java/com/ccsens/mt/service/IExcelService.java
View File

@ -42,7 +42,7 @@ public interface IExcelService {
* @param params 大赛id
* @return 返回失败的信息
*/
List<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.CompeteTime params);
List<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.EnterInfo params);
/**

2
mt/src/main/resources/application.yml
View File

@ -2,3 +2,5 @@ spring:
profiles:
active: dev
include: common, util-dev

97
mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
View File

@ -24,4 +24,101 @@
FROM t_compete_project_config a , t_compete_project b
where a.project_id = b.id
</select>
<select id="selectSingle" resultType="com.ccsens.mt.bean.vo.TableVo$CompeteJoin" parameterType="java.util.Map">
SELECT
tcpro.id as projectId,
tcpro.name as competeProject,
tcg.group_name as competeGroup,
tcc.`name` as joinTeam,
tcp.`name` as name,
tcp.gender as gender,
tcp.id_card as idCard,
(SELECT visit_location from t_common_file where tcp.id_card_front_file = id ) as idCardPromiseFront,
(SELECT visit_location from t_common_file where tcp.id_card_back_file = id ) as idCardPromiseBack,
(SELECT visit_location from t_common_file where tcp.id_photo_file = id ) as picture,
(SELECT visit_location from t_common_file where tcp.student_record_file = id ) as studentPromise,
(SELECT visit_location from t_common_file where tcp.health_record_file = id ) as bodyTest,
(SELECT visit_location from t_common_file where tcp.insurance_record_file = id ) as bodyProtect
from
t_compete_project tcpro LEFT JOIN t_compete_project_player tcpp on tcpro.id = tcpp.project_id
LEFT JOIN t_compete_player tcp on tcpp.player_id = tcp.id
LEFT JOIN t_compete_group tcg on tcg.id = tcp.compete_group_id
LEFT JOIN t_compete_company tcc on tcc.id = tcp.company_id
LEFT JOIN t_compete_time tct on tct.type = tcpro.type
where
<if test="competeTimeId != null">
tct.id = #{competeTimeId}
</if>
<if test="projectId != null">
and tcpro.id = #{projectId}
</if>
<if test="groupId != null">
and tcg.id = #{groupId}
</if>
<if test="companyId != null">
and tcc.id = #{companyId}
</if>
<if test="name != null and name != ''">
and tcp.name = #{name}
</if>
<if test="idCard != null and idCard != ''">
and tcp.id_card = #{idCard}
</if>
and tcp.rec_status = 0
and tcc.rec_status = 0
and tcpp.rec_status = 0
and tcpro.rec_status = 0
and tct.rec_status = 0
</select>
<select id="selectGroup" resultType="com.ccsens.mt.bean.vo.TableVo$CompeteJoin" parameterType="java.util.Map">
SELECT
tcpro.id as projectId,
tcpro.name as competeProject,
tcg.group_name as competeGroup,
tcc.`name` as joinTeam,
tcp.`name` as name,
tcp.gender as gender,
tcp.id_card as idCard,
(SELECT visit_location from t_common_file where tcp.id_card_front_file = id ) as idCardPromiseFront,
(SELECT visit_location from t_common_file where tcp.id_card_back_file = id ) as idCardPromiseBack,
(SELECT visit_location from t_common_file where tcp.id_photo_file = id ) as picture,
(SELECT visit_location from t_common_file where tcp.student_record_file = id ) as studentPromise,
(SELECT visit_location from t_common_file where tcp.health_record_file = id ) as bodyTest,
(SELECT visit_location from t_common_file where tcp.insurance_record_file = id ) as bodyProtect
from
t_compete_project tcpro LEFT JOIN t_compete_team tct on tcpro.id = tct.project_id
LEFT JOIN t_compete_team_member tctm on tct.id = tctm.compete_team_id
LEFT JOIN t_compete_player tcp on tcp.id = tctm.player_id
LEFT JOIN t_compete_company tcc on tcc.id = tcp.company_id
LEFT JOIN t_compete_group tcg on tcg.id = tcp.compete_group_id
LEFT JOIN t_compete_time tctt on tctt.type = tcpro.type
WHERE
<if test="competeTimeId != null">
tctt.id = #{competeTimeId}
</if>
<if test="projectId != null">
and tcpro.id = #{projectId}
</if>
<if test="groupId != null">
and tcg.id = #{groupId}
</if>
<if test="companyId != null">
and tcc.id = #{companyId}
</if>
<if test="name != null and name != ''">
and tcp.name = #{name}
</if>
<if test="idCard != null and idCard != ''">
and tcp.id_card = #{idCard}
</if>
and tcpro.rec_status = 0
and tctm.rec_status = 0
and tcp.rec_status = 0
and tcc.rec_status = 0
and tcg.rec_status = 0
and tct.rec_status = 0
and tctt.rec_status = 0
</select>
</mapper>

2
tall/src/main/resources/application-dev.yml
View File

@ -1,5 +1,5 @@
server:
port: 7030
port: 7070
servlet:
context-path: /v1.0
spring:

Write Preview
Loading…
Cancel
Save