From 6fd1def03b6b90a2282628808f463a80d9ed6265 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Mon, 23 Nov 2020 18:17:03 +0800 Subject: [PATCH 1/6] v20201123v1.5 --- .../java/com/ccsens/mt/service/CompeteTaskService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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..6626f81f 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -440,9 +440,9 @@ public class CompeteTaskService implements ICompeteTaskService { } } else { int a = projectJudgment.getSiteList().size(); - System.out.println("==========="+ a); - System.out.println("==========="+ projectJudgment.getSiteNums()); - System.out.println("==========="+ (projectJudgment.getSiteNums()-a)); +// 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); @@ -561,7 +561,9 @@ public class CompeteTaskService implements ICompeteTaskService { } 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) { From 8be3c5b986e8b1081ae1953bfb57a5c4ffd5e27e Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Mon, 23 Nov 2020 19:32:53 +0800 Subject: [PATCH 2/6] 20201123v1.6 --- .../mt/bean/po/CompeteCountScoreKey.java | 116 ++++++------------ 1 file changed, 39 insertions(+), 77 deletions(-) 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 From 7b9f4969afc281f0ccf15247cccf0159bfa6b745 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Tue, 24 Nov 2020 11:28:12 +0800 Subject: [PATCH 3/6] 20201124v1.1 --- .../ccsens/mt/bean/po/CompeteCountScore.java | 24 ++- .../mt/bean/po/CompeteCountScoreExample.java | 120 +++++++-------- .../mapper/CompeteCountScoreMapper.java | 5 +- .../ccsens/mt/service/CompeteTaskService.java | 143 ++++++++++++------ .../com/ccsens/mt/service/ExcelService.java | 2 +- mt/src/main/resources/application.yml | 4 +- .../mapper_dao/CompeteJudgmentDao.xml | 2 + .../mapper_raw/CompeteCountScoreMapper.xml | 50 +++--- 8 files changed, 209 insertions(+), 141 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java index d89e1feb..bd87e822 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java @@ -4,7 +4,9 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -public class CompeteCountScore extends CompeteCountScoreKey implements Serializable { +public class CompeteCountScore implements Serializable { + private Long id; + private Long competeTimeId; private Long projectId; @@ -17,6 +19,8 @@ public class CompeteCountScore extends CompeteCountScoreKey implements Serializa private BigDecimal judgmentBScore2; + private Integer shouldTimes; + private Integer deductTimes; private String deductCause; @@ -31,6 +35,14 @@ public class CompeteCountScore extends CompeteCountScoreKey implements Serializa private static final long serialVersionUID = 1L; + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + public Long getCompeteTimeId() { return competeTimeId; } @@ -79,6 +91,14 @@ public class CompeteCountScore extends CompeteCountScoreKey implements Serializa this.judgmentBScore2 = judgmentBScore2; } + public Integer getShouldTimes() { + return shouldTimes; + } + + public void setShouldTimes(Integer shouldTimes) { + this.shouldTimes = shouldTimes; + } + public Integer getDeductTimes() { return deductTimes; } @@ -133,12 +153,14 @@ public class CompeteCountScore extends CompeteCountScoreKey implements Serializa sb.append(getClass().getSimpleName()); sb.append(" ["); sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); sb.append(", competeTimeId=").append(competeTimeId); sb.append(", projectId=").append(projectId); sb.append(", siteOrderId=").append(siteOrderId); sb.append(", chiefJudgmentScore=").append(chiefJudgmentScore); sb.append(", judgmentAScore=").append(judgmentAScore); sb.append(", judgmentBScore2=").append(judgmentBScore2); + sb.append(", shouldTimes=").append(shouldTimes); sb.append(", deductTimes=").append(deductTimes); sb.append(", deductCause=").append(deductCause); sb.append(", finalScore=").append(finalScore); diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java index c72f3961..f7572afa 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java @@ -166,66 +166,6 @@ public class CompeteCountScoreExample { return (Criteria) this; } - public Criteria andShouldTimesIsNull() { - addCriterion("should_times is null"); - return (Criteria) this; - } - - public Criteria andShouldTimesIsNotNull() { - addCriterion("should_times is not null"); - return (Criteria) this; - } - - public Criteria andShouldTimesEqualTo(Integer value) { - addCriterion("should_times =", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesNotEqualTo(Integer value) { - addCriterion("should_times <>", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesGreaterThan(Integer value) { - addCriterion("should_times >", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesGreaterThanOrEqualTo(Integer value) { - addCriterion("should_times >=", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesLessThan(Integer value) { - addCriterion("should_times <", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesLessThanOrEqualTo(Integer value) { - addCriterion("should_times <=", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesIn(List values) { - addCriterion("should_times in", values, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesNotIn(List values) { - addCriterion("should_times not in", values, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesBetween(Integer value1, Integer value2) { - addCriterion("should_times between", value1, value2, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesNotBetween(Integer value1, Integer value2) { - addCriterion("should_times not between", value1, value2, "shouldTimes"); - return (Criteria) this; - } - public Criteria andCompeteTimeIdIsNull() { addCriterion("compete_time_id is null"); return (Criteria) this; @@ -586,6 +526,66 @@ public class CompeteCountScoreExample { return (Criteria) this; } + public Criteria andShouldTimesIsNull() { + addCriterion("should_times is null"); + return (Criteria) this; + } + + public Criteria andShouldTimesIsNotNull() { + addCriterion("should_times is not null"); + return (Criteria) this; + } + + public Criteria andShouldTimesEqualTo(Integer value) { + addCriterion("should_times =", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesNotEqualTo(Integer value) { + addCriterion("should_times <>", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesGreaterThan(Integer value) { + addCriterion("should_times >", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesGreaterThanOrEqualTo(Integer value) { + addCriterion("should_times >=", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesLessThan(Integer value) { + addCriterion("should_times <", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesLessThanOrEqualTo(Integer value) { + addCriterion("should_times <=", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesIn(List values) { + addCriterion("should_times in", values, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesNotIn(List values) { + addCriterion("should_times not in", values, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesBetween(Integer value1, Integer value2) { + addCriterion("should_times between", value1, value2, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesNotBetween(Integer value1, Integer value2) { + addCriterion("should_times not between", value1, value2, "shouldTimes"); + return (Criteria) this; + } + public Criteria andDeductTimesIsNull() { addCriterion("deduct_times is null"); return (Criteria) this; diff --git a/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java index 5592b7ec..faf0e354 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java +++ b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java @@ -2,7 +2,6 @@ package com.ccsens.mt.persist.mapper; import com.ccsens.mt.bean.po.CompeteCountScore; import com.ccsens.mt.bean.po.CompeteCountScoreExample; -import com.ccsens.mt.bean.po.CompeteCountScoreKey; import java.util.List; import org.apache.ibatis.annotations.Param; @@ -11,7 +10,7 @@ public interface CompeteCountScoreMapper { int deleteByExample(CompeteCountScoreExample example); - int deleteByPrimaryKey(CompeteCountScoreKey key); + int deleteByPrimaryKey(Long id); int insert(CompeteCountScore record); @@ -19,7 +18,7 @@ public interface CompeteCountScoreMapper { List selectByExample(CompeteCountScoreExample example); - CompeteCountScore selectByPrimaryKey(CompeteCountScoreKey key); + CompeteCountScore selectByPrimaryKey(Long id); int updateByExampleSelective(@Param("record") CompeteCountScore record, @Param("example") CompeteCountScoreExample example); 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 6626f81f..11a51052 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,9 +569,11 @@ 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){ @@ -567,26 +584,44 @@ public class CompeteTaskService implements ICompeteTaskService { } //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(); } + //将该成员添加至角色下 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; } } @@ -612,7 +647,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)) { @@ -626,7 +666,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 68f17e7a..99ab9e1b 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -1649,7 +1649,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_raw/CompeteCountScoreMapper.xml b/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml index 6f586d68..f562ef5f 100644 --- a/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml @@ -3,13 +3,13 @@ - + @@ -76,8 +76,8 @@ - id, should_times, compete_time_id, project_id, site_order_id, chief_judgment_score, - judgment_a_score, judgment_b_score2, deduct_times, deduct_cause, final_score, created_at, + id, compete_time_id, project_id, site_order_id, chief_judgment_score, judgment_a_score, + judgment_b_score2, should_times, deduct_times, deduct_cause, final_score, created_at, updated_at, rec_status - select from t_compete_count_score where id = #{id,jdbcType=BIGINT} - and should_times = #{shouldTimes,jdbcType=INTEGER} - + delete from t_compete_count_score where id = #{id,jdbcType=BIGINT} - and should_times = #{shouldTimes,jdbcType=INTEGER} delete from t_compete_count_score @@ -113,14 +111,14 @@ - insert into t_compete_count_score (id, should_times, compete_time_id, - project_id, site_order_id, chief_judgment_score, - judgment_a_score, judgment_b_score2, deduct_times, + insert into t_compete_count_score (id, compete_time_id, project_id, + site_order_id, chief_judgment_score, judgment_a_score, + judgment_b_score2, should_times, deduct_times, deduct_cause, final_score, created_at, updated_at, rec_status) - values (#{id,jdbcType=BIGINT}, #{shouldTimes,jdbcType=INTEGER}, #{competeTimeId,jdbcType=BIGINT}, - #{projectId,jdbcType=BIGINT}, #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=DECIMAL}, - #{judgmentAScore,jdbcType=DECIMAL}, #{judgmentBScore2,jdbcType=DECIMAL}, #{deductTimes,jdbcType=INTEGER}, + values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, + #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=DECIMAL}, #{judgmentAScore,jdbcType=DECIMAL}, + #{judgmentBScore2,jdbcType=DECIMAL}, #{shouldTimes,jdbcType=INTEGER}, #{deductTimes,jdbcType=INTEGER}, #{deductCause,jdbcType=VARCHAR}, #{finalScore,jdbcType=DECIMAL}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) @@ -130,9 +128,6 @@ id, - - should_times, - compete_time_id, @@ -151,6 +146,9 @@ judgment_b_score2, + + should_times, + deduct_times, @@ -174,9 +172,6 @@ #{id,jdbcType=BIGINT}, - - #{shouldTimes,jdbcType=INTEGER}, - #{competeTimeId,jdbcType=BIGINT}, @@ -195,6 +190,9 @@ #{judgmentBScore2,jdbcType=DECIMAL}, + + #{shouldTimes,jdbcType=INTEGER}, + #{deductTimes,jdbcType=INTEGER}, @@ -227,9 +225,6 @@ id = #{record.id,jdbcType=BIGINT}, - - should_times = #{record.shouldTimes,jdbcType=INTEGER}, - compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, @@ -248,6 +243,9 @@ judgment_b_score2 = #{record.judgmentBScore2,jdbcType=DECIMAL}, + + should_times = #{record.shouldTimes,jdbcType=INTEGER}, + deduct_times = #{record.deductTimes,jdbcType=INTEGER}, @@ -274,13 +272,13 @@ update t_compete_count_score set id = #{record.id,jdbcType=BIGINT}, - should_times = #{record.shouldTimes,jdbcType=INTEGER}, compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, project_id = #{record.projectId,jdbcType=BIGINT}, site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=DECIMAL}, judgment_a_score = #{record.judgmentAScore,jdbcType=DECIMAL}, judgment_b_score2 = #{record.judgmentBScore2,jdbcType=DECIMAL}, + should_times = #{record.shouldTimes,jdbcType=INTEGER}, deduct_times = #{record.deductTimes,jdbcType=INTEGER}, deduct_cause = #{record.deductCause,jdbcType=VARCHAR}, final_score = #{record.finalScore,jdbcType=DECIMAL}, @@ -312,6 +310,9 @@ judgment_b_score2 = #{judgmentBScore2,jdbcType=DECIMAL}, + + should_times = #{shouldTimes,jdbcType=INTEGER}, + deduct_times = #{deductTimes,jdbcType=INTEGER}, @@ -332,7 +333,6 @@ where id = #{id,jdbcType=BIGINT} - and should_times = #{shouldTimes,jdbcType=INTEGER} update t_compete_count_score @@ -342,6 +342,7 @@ chief_judgment_score = #{chiefJudgmentScore,jdbcType=DECIMAL}, judgment_a_score = #{judgmentAScore,jdbcType=DECIMAL}, judgment_b_score2 = #{judgmentBScore2,jdbcType=DECIMAL}, + should_times = #{shouldTimes,jdbcType=INTEGER}, deduct_times = #{deductTimes,jdbcType=INTEGER}, deduct_cause = #{deductCause,jdbcType=VARCHAR}, final_score = #{finalScore,jdbcType=DECIMAL}, @@ -349,6 +350,5 @@ updated_at = #{updatedAt,jdbcType=TIMESTAMP}, rec_status = #{recStatus,jdbcType=TINYINT} where id = #{id,jdbcType=BIGINT} - and should_times = #{shouldTimes,jdbcType=INTEGER} \ No newline at end of file From 098a7dc018aeef1b97088dabce6343404fb44a95 Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Tue, 24 Nov 2020 12:09:18 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=AE=A1=E6=95=B0=E8=B5=9B=E6=8E=92?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper_dao/CompeteScoreDao.xml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index f1eb223f..06cc9ae1 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -563,7 +563,7 @@ having count(t2.groupName) <= 8 From e5f5b6700ecc290899ec061466fd0976d750698a Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Tue, 24 Nov 2020 14:28:25 +0800 Subject: [PATCH 5/6] 20201124v1.3 --- .../main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java | 2 ++ .../main/java/com/ccsens/mt/service/CompeteTaskService.java | 1 + tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java | 2 ++ .../main/java/com/ccsens/tall/service/ProMemberService.java | 1 + tall/src/main/resources/application.yml | 4 ++-- 5 files changed, 8 insertions(+), 2 deletions(-) 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/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index 11a51052..d63f37a0 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -606,6 +606,7 @@ public class CompeteTaskService implements ICompeteTaskService { MemberVo.MemberList memberList = memberListJsonResponse.getData(); if (ObjectUtil.isNotNull(memberList)) { memberId = memberList.getMemberId(); + userId = memberList.getUserId(); } //将该成员添加至角色下 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 From f36c5ccb0b1f27c576f58be6546a34400af7494f Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Tue, 24 Nov 2020 14:29:36 +0800 Subject: [PATCH 6/6] 20201124v1.5 --- mt/src/main/resources/mapper_dao/CompeteScoreDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index 06cc9ae1..faa4233c 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -563,7 +563,7 @@ having count(t2.groupName) <= 8