diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java index a8849305..96713c88 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java @@ -51,5 +51,7 @@ public class MemberVo { private Long memberId; @ApiModelProperty("成员名") private String memberName; + @ApiModelProperty("userId") + private Long userId; } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreKey.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreKey.java index 407e838d..8eb52089 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreKey.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreKey.java @@ -1,77 +1,39 @@ - -package com.ccsens.mt.bean.po; - -import java.io.Serializable; - -public class CompeteCountScoreKey implements Serializable { - private Long id; - - private Integer shouldTimes; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Integer getShouldTimes() { - return shouldTimes; - } - - public void setShouldTimes(Integer shouldTimes) { - this.shouldTimes = shouldTimes; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", shouldTimes=").append(shouldTimes); - sb.append("]"); - return sb.toString(); - } -} - - -//public class CompeteCountScoreKey implements Serializable { -// private Long id; -// -// private Integer shouldTimes; -// -// private static final long serialVersionUID = 1L; -// -// public Long getId() { -// return id; -// } -// -// public void setId(Long id) { -// this.id = id; -// } -// -// public Integer getShouldTimes() { -// return shouldTimes; -// } -// -// public void setShouldTimes(Integer shouldTimes) { -// this.shouldTimes = shouldTimes; -// } -// -// @Override -// public String toString() { -// StringBuilder sb = new StringBuilder(); -// sb.append(getClass().getSimpleName()); -// sb.append(" ["); -// sb.append("Hash = ").append(hashCode()); -// sb.append(", id=").append(id); -// sb.append(", shouldTimes=").append(shouldTimes); -// sb.append("]"); -// return sb.toString(); -// } -//} \ No newline at end of file +package com.ccsens.mt.bean.po; + +import java.io.Serializable; + +public class CompeteCountScoreKey implements Serializable { + private Long id; + + private Integer shouldTimes; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Integer getShouldTimes() { + return shouldTimes; + } + + public void setShouldTimes(Integer shouldTimes) { + this.shouldTimes = shouldTimes; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", shouldTimes=").append(shouldTimes); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index 3e2f5740..d63f37a0 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -172,7 +172,12 @@ public class CompeteTaskService implements ICompeteTaskService { JsonResponse normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo); log.info("修改tall的任务信息后返回：{}", normalTaskJsonResponse); //失败return - if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) { + if (ObjectUtil.isNull(normalTaskJsonResponse)) { + log.info("调用tall返回null"); + return; + } + if(normalTaskJsonResponse.getCode() != 200){ + log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg()); return; } } @@ -192,7 +197,12 @@ public class CompeteTaskService implements ICompeteTaskService { JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); //异常return log.info("添加任务后返回：{}", normalTaskJsonResponse); - if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) { + if (ObjectUtil.isNull(normalTaskJsonResponse)) { + log.info("调用tall返回null"); + return; + } + if(normalTaskJsonResponse.getCode() != 200){ + log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg()); return; } TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); @@ -421,44 +431,44 @@ public class CompeteTaskService implements ICompeteTaskService { @Override public List queryJudgment(ProvinceCompeteDto.QueryJudgment param) { List queryJudgmentList = competeJudgmentDao.queryJudgment(param.getCompeteTimeId(), param.getProjectId()); - if (CollectionUtil.isNotEmpty(queryJudgmentList)) { - queryJudgmentList.forEach(projectJudgment -> { -// for(ProvinceCompeteVo.QueryJudgment projectJudgment : queryJudgmentList){ - //裁判数量 - int count = projectJudgment.getProjectType() == 0 ? 3 : 7; - for (int i = 0; i < projectJudgment.getSiteNums(); i++) { - if (i < projectJudgment.getSiteList().size()) { - ProvinceCompeteVo.ProjectSite siteJudgment = projectJudgment.getSiteList().get(i); - if (CollectionUtil.isEmpty(siteJudgment.getJudgmentList())) { - siteJudgment.setJudgmentList(new ArrayList<>()); - } - int a = siteJudgment.getJudgmentList().size(); - for (int j = 0; j < count - a; j++) { - ProvinceCompeteVo.SiteJudgment siteJudgment1 = new ProvinceCompeteVo.SiteJudgment(); - siteJudgment1.setJudgmentNum(a + j); - siteJudgment.getJudgmentList().add(siteJudgment1); - } - } else { - int a = projectJudgment.getSiteList().size(); - System.out.println("==========="+ a); - System.out.println("==========="+ projectJudgment.getSiteNums()); - System.out.println("==========="+ (projectJudgment.getSiteNums()-a)); - for (int j = 0; j < projectJudgment.getSiteNums() - a; j++) { - ProvinceCompeteVo.ProjectSite siteJudgment = new ProvinceCompeteVo.ProjectSite(); - siteJudgment.setSiteNum(a + j + 1); - projectJudgment.getSiteList().add(siteJudgment); - int b = siteJudgment.getJudgmentList().size(); - for (int x = 0; x < count - b; x++) { - ProvinceCompeteVo.SiteJudgment siteJudgment1 = new ProvinceCompeteVo.SiteJudgment(); - siteJudgment1.setJudgmentNum(b + x); - siteJudgment.getJudgmentList().add(siteJudgment1); - } - } - } - } -// } - }); - } +// if (CollectionUtil.isNotEmpty(queryJudgmentList)) { +// queryJudgmentList.forEach(projectJudgment -> { +//// for(ProvinceCompeteVo.QueryJudgment projectJudgment : queryJudgmentList){ +// //裁判数量 +// int count = projectJudgment.getProjectType() == 0 ? 3 : 7; +// for (int i = 0; i < projectJudgment.getSiteNums(); i++) { +// if (i < projectJudgment.getSiteList().size()) { +// ProvinceCompeteVo.ProjectSite siteJudgment = projectJudgment.getSiteList().get(i); +// if (CollectionUtil.isEmpty(siteJudgment.getJudgmentList())) { +// siteJudgment.setJudgmentList(new ArrayList<>()); +// } +// int a = siteJudgment.getJudgmentList().size(); +// for (int j = 0; j < count - a; j++) { +// ProvinceCompeteVo.SiteJudgment siteJudgment1 = new ProvinceCompeteVo.SiteJudgment(); +// siteJudgment1.setJudgmentNum(a + j); +// siteJudgment.getJudgmentList().add(siteJudgment1); +// } +// } else { +// int a = projectJudgment.getSiteList().size(); +//// System.out.println("==========="+ a); +//// System.out.println("==========="+ projectJudgment.getSiteNums()); +//// System.out.println("==========="+ (projectJudgment.getSiteNums()-a)); +// for (int j = 0; j < projectJudgment.getSiteNums() - a; j++) { +// ProvinceCompeteVo.ProjectSite siteJudgment = new ProvinceCompeteVo.ProjectSite(); +// siteJudgment.setSiteNum(a + j + 1); +// projectJudgment.getSiteList().add(siteJudgment); +// int b = siteJudgment.getJudgmentList().size(); +// for (int x = 0; x < count - b; x++) { +// ProvinceCompeteVo.SiteJudgment siteJudgment1 = new ProvinceCompeteVo.SiteJudgment(); +// siteJudgment1.setJudgmentNum(b + x); +// siteJudgment.getJudgmentList().add(siteJudgment1); +// } +// } +// } +// } +//// } +// }); +// } return queryJudgmentList; } @@ -532,7 +542,12 @@ public class CompeteTaskService implements ICompeteTaskService { JsonResponse roleJsonResponse = tallFeignClient.saveRole(saveRole); log.info("添加角色后返回：{}", roleJsonResponse); //失败return - if (ObjectUtil.isNull(roleJsonResponse) || roleJsonResponse.getCode() != 200) { + if (ObjectUtil.isNull(roleJsonResponse)) { + log.info("调用tall返回null"); + return; + } + if( roleJsonResponse.getCode() != 200) { + log.info("调用tall异常后返回：{}", roleJsonResponse.getMsg()); return; } MemberVo.RoleInfo roleInfo = roleJsonResponse.getData(); @@ -554,37 +569,60 @@ public class CompeteTaskService implements ICompeteTaskService { Long userId = null; //失败return if (ObjectUtil.isNull(memberJsonResponse)) { + log.info("调用tall返回null"); return; } if(memberJsonResponse.getCode() != 200 && memberJsonResponse.getCode() != 21){ + log.info("调用tall异常后返回：{}", memberJsonResponse.getMsg()); return; } if(roleJsonResponse.getCode() == 200){ MemberVo.Member member = memberJsonResponse.getData(); - userId = member.getUserId(); + if(ObjectUtil.isNotNull(member)){ + userId = member.getUserId(); + } } //code等于21代表成员已存在 if (memberJsonResponse.getCode() == 21) { + log.info("该成员已存在：{}", memberJsonResponse.getMsg()); //查询该手机号在项目内的成员的id MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone(); getMemberByPhone.setProjectId(tallProjectId); getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone()); getMemberByPhone.setToken(token); + log.info("查找该手机号以前的成员信息：{}", judgmentInfo.getJudgmentPhone()); JsonResponse memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone); - if (ObjectUtil.isNotNull(memberListJsonResponse)) { - MemberVo.MemberList memberList = memberListJsonResponse.getData(); - if (ObjectUtil.isNotNull(memberList)) { - memberId = memberList.getMemberId(); - } + log.info("查找该手机号以前的成员信息返回：{}", memberListJsonResponse); + //失败return + if (ObjectUtil.isNull(memberListJsonResponse)) { + log.info("调用tall返回null"); + return; + } + if(memberListJsonResponse.getCode() != 200){ + log.info("调用tall异常后返回：{}", memberJsonResponse.getMsg()); + return; + } + + MemberVo.MemberList memberList = memberListJsonResponse.getData(); + if (ObjectUtil.isNotNull(memberList)) { + memberId = memberList.getMemberId(); + userId = memberList.getUserId(); } + //将该成员添加至角色下 if (ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)) { MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); saveMemberInRole.setRoleId(roleId); saveMemberInRole.setMemberId(memberId); saveMemberInRole.setToken(token); + log.info("将该成员添加至角色内"); JsonResponse jsonResponse = tallFeignClient.saveMemberInRole(saveMemberInRole); - if (ObjectUtil.isNull(jsonResponse) || jsonResponse.getCode() != 200) { + if (ObjectUtil.isNull(jsonResponse)) { + log.info("调用tall返回null"); + return; + } + if(jsonResponse.getCode() != 200){ + log.info("调用tall异常后返回：{}", jsonResponse.getMsg()); return; } } @@ -610,7 +648,12 @@ public class CompeteTaskService implements ICompeteTaskService { log.info("在tall内添加任务：{}", addTask); JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); log.info("添加任务后返回：{}", normalTaskJsonResponse); - if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) { + if (ObjectUtil.isNull(normalTaskJsonResponse)) { + log.info("调用tall返回null"); + return; + } + if(normalTaskJsonResponse.getCode() != 200){ + log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg()); return; } if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { @@ -624,7 +667,12 @@ public class CompeteTaskService implements ICompeteTaskService { log.info("修改tall内任务插件配置：{}", updatePluginConfig); JsonResponse pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig); log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse); - if (ObjectUtil.isNull(pluginVoJsonResponse) || pluginVoJsonResponse.getCode() != 200) { + if (ObjectUtil.isNull(pluginVoJsonResponse)) { + log.info("调用tall返回null"); + return; + } + if(pluginVoJsonResponse.getCode() != 200){ + log.info("调用tall异常后返回：{}", pluginVoJsonResponse.getMsg()); return; } } diff --git a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java index 4d64301a..b1589cf8 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -1740,7 +1740,7 @@ public class ExcelService implements IExcelService { } else { for (int i = 0; i < eights.size(); i++) { List cells = new ArrayList<>(); - cells.add(new PoiUtil.PoiUtilCell("第" + i + "名")); + cells.add(new PoiUtil.PoiUtilCell("第" + (i + 1) + "名")); cells.add(new PoiUtil.PoiUtilCell(eights.get(i).getEightNames(), 8, 1)); raws.add(cells); } diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 4ecd13fd..f59084b0 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: common, util-dev + active: test + include: common, util-test diff --git a/mt/src/main/resources/mapper_dao/CompeteJudgmentDao.xml b/mt/src/main/resources/mapper_dao/CompeteJudgmentDao.xml index 44e60370..824582ab 100644 --- a/mt/src/main/resources/mapper_dao/CompeteJudgmentDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteJudgmentDao.xml @@ -36,7 +36,9 @@ FROM t_compete_project p LEFT JOIN t_compete_time ct on p.type = ct.type LEFT JOIN t_compete_project_config pc on p.id = pc.project_id + LEFT JOIN (SELECT 1 as nums union All SELECT 2 as nums union All SELECT 3 as nums) n on 1=1 LEFT JOIN t_compete_judgment j on j.project_id = p.id and (j.rec_status = 0 or j.rec_status IS NULL) + and j.chief_judgment = n.nums WHERE ct.id = #{competeTimeId} diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index 4bec2fe9..9b81fac3 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -597,8 +597,8 @@ AND startOrder.rec_status = 0 AND team.rec_status = 0 AND tm.rec_status = 0 - group by score.id) t1, - + group by score.id) t1 + left join (SELECT CONCAT( CASE team.group_remark WHEN 1 THEN '小学' WHEN 2 THEN '中学' WHEN 3 THEN '高职院校' WHEN 4 THEN '本科院校' ELSE '俱乐部'END, @@ -632,14 +632,14 @@ AND team.rec_status = 0 AND tm.rec_status = 0 group by score.id) t2 - WHERE + on t1.groupName = t2.groupName - AND t1.finalScore <= t2.finalScore + AND t1.finalScore < t2.finalScore GROUP BY t1.groupName, t1.name order by rangee desc diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java index 4e30b456..e3f7c08e 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java @@ -367,6 +367,8 @@ public class ProjectVo { private Long memberId; @ApiModelProperty("成员名") private String memberName; + @ApiModelProperty("userId") + private Long userId; } diff --git a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java index d3060c65..58ffdde5 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java @@ -457,6 +457,7 @@ public class ProMemberService implements IProMemberService { member = new ProjectVo.MemberList(); member.setMemberId(memberList.get(0).getId()); member.setMemberName(memberList.get(0).getNickname()); + member.setUserId(memberList.get(0).getUserId()); } return member; } diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b5408a3a..ebc544af 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: util-dev,common + active: test + include: util-test,common