20201124v1.1

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);

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<Integer> values) {
-            addCriterion("should_times in", values, "shouldTimes");
-            return (Criteria) this;
-        }
-
-        public Criteria andShouldTimesNotIn(List<Integer> 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<Integer> values) {
+            addCriterion("should_times in", values, "shouldTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andShouldTimesNotIn(List<Integer> 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;

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<CompeteCountScore> selectByExample(CompeteCountScoreExample example);
 
-    CompeteCountScore selectByPrimaryKey(CompeteCountScoreKey key);
+    CompeteCountScore selectByPrimaryKey(Long id);
 
     int updateByExampleSelective(@Param("record") CompeteCountScore record, @Param("example") CompeteCountScoreExample example);
 

mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java

@@ -172,7 +172,12 @@ public class CompeteTaskService implements ICompeteTaskService {
                                 JsonResponse<TaskVo.NormalTask> 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<TaskVo.NormalTask> 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<ProvinceCompeteVo.QueryJudgment> queryJudgment(ProvinceCompeteDto.QueryJudgment param) {
         List<ProvinceCompeteVo.QueryJudgment> 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<MemberVo.RoleInfo> 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<MemberVo.MemberList> memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone);
-                if (ObjectUtil.isNotNull(memberListJsonResponse)) {
+                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<TaskVo.NormalTask> 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<TaskVo.PluginVo> 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;
                             }
                         }

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<PoiUtil.PoiUtilCell> 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);
             }

mt/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
+    active: test
+    include: common, util-test
 

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}
         <if test="projectId != null">

mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml

@@ -3,13 +3,13 @@
 <mapper namespace="com.ccsens.mt.persist.mapper.CompeteCountScoreMapper">
   <resultMap id="BaseResultMap" type="com.ccsens.mt.bean.po.CompeteCountScore">
     <id column="id" jdbcType="BIGINT" property="id" />
-    <id column="should_times" jdbcType="INTEGER" property="shouldTimes" />
     <result column="compete_time_id" jdbcType="BIGINT" property="competeTimeId" />
     <result column="project_id" jdbcType="BIGINT" property="projectId" />
     <result column="site_order_id" jdbcType="BIGINT" property="siteOrderId" />
     <result column="chief_judgment_score" jdbcType="DECIMAL" property="chiefJudgmentScore" />
     <result column="judgment_a_score" jdbcType="DECIMAL" property="judgmentAScore" />
     <result column="judgment_b_score2" jdbcType="DECIMAL" property="judgmentBScore2" />
+    <result column="should_times" jdbcType="INTEGER" property="shouldTimes" />
     <result column="deduct_times" jdbcType="INTEGER" property="deductTimes" />
     <result column="deduct_cause" jdbcType="VARCHAR" property="deductCause" />
     <result column="final_score" jdbcType="DECIMAL" property="finalScore" />
@@ -76,8 +76,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    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
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteCountScoreExample" resultMap="BaseResultMap">
@@ -94,17 +94,15 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="com.ccsens.mt.bean.po.CompeteCountScoreKey" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
     from t_compete_count_score
     where id = #{id,jdbcType=BIGINT}
-      and should_times = #{shouldTimes,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="com.ccsens.mt.bean.po.CompeteCountScoreKey">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     delete from t_compete_count_score
     where id = #{id,jdbcType=BIGINT}
-      and should_times = #{shouldTimes,jdbcType=INTEGER}
   </delete>
   <delete id="deleteByExample" parameterType="com.ccsens.mt.bean.po.CompeteCountScoreExample">
     delete from t_compete_count_score
@@ -113,14 +111,14 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.ccsens.mt.bean.po.CompeteCountScore">
-    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})
   </insert>
@@ -130,9 +128,6 @@
       <if test="id != null">
         id,
       </if>
-      <if test="shouldTimes != null">
-        should_times,
-      </if>
       <if test="competeTimeId != null">
         compete_time_id,
       </if>
@@ -151,6 +146,9 @@
       <if test="judgmentBScore2 != null">
         judgment_b_score2,
       </if>
+      <if test="shouldTimes != null">
+        should_times,
+      </if>
       <if test="deductTimes != null">
         deduct_times,
       </if>
@@ -174,9 +172,6 @@
       <if test="id != null">
         #{id,jdbcType=BIGINT},
       </if>
-      <if test="shouldTimes != null">
-        #{shouldTimes,jdbcType=INTEGER},
-      </if>
       <if test="competeTimeId != null">
         #{competeTimeId,jdbcType=BIGINT},
       </if>
@@ -195,6 +190,9 @@
       <if test="judgmentBScore2 != null">
         #{judgmentBScore2,jdbcType=DECIMAL},
       </if>
+      <if test="shouldTimes != null">
+        #{shouldTimes,jdbcType=INTEGER},
+      </if>
       <if test="deductTimes != null">
         #{deductTimes,jdbcType=INTEGER},
       </if>
@@ -227,9 +225,6 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=BIGINT},
       </if>
-      <if test="record.shouldTimes != null">
-        should_times = #{record.shouldTimes,jdbcType=INTEGER},
-      </if>
       <if test="record.competeTimeId != null">
         compete_time_id = #{record.competeTimeId,jdbcType=BIGINT},
       </if>
@@ -248,6 +243,9 @@
       <if test="record.judgmentBScore2 != null">
         judgment_b_score2 = #{record.judgmentBScore2,jdbcType=DECIMAL},
       </if>
+      <if test="record.shouldTimes != null">
+        should_times = #{record.shouldTimes,jdbcType=INTEGER},
+      </if>
       <if test="record.deductTimes != null">
         deduct_times = #{record.deductTimes,jdbcType=INTEGER},
       </if>
@@ -274,13 +272,13 @@
   <update id="updateByExample" parameterType="map">
     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 @@
       <if test="judgmentBScore2 != null">
         judgment_b_score2 = #{judgmentBScore2,jdbcType=DECIMAL},
       </if>
+      <if test="shouldTimes != null">
+        should_times = #{shouldTimes,jdbcType=INTEGER},
+      </if>
       <if test="deductTimes != null">
         deduct_times = #{deductTimes,jdbcType=INTEGER},
       </if>
@@ -332,7 +333,6 @@
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
-      and should_times = #{shouldTimes,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.ccsens.mt.bean.po.CompeteCountScore">
     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}
   </update>
 </mapper>