20201118v1.2

mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java

@@ -90,4 +90,14 @@ public class CompeteTaskController {
         return JsonResponse.newInstance().ok(queryJudgmentList);
     }
 
+    @MustLogin
+    @ApiOperation(value = "查看裁判身份，场次id和比赛项目id等信息", notes = "zy:通过tall内的roleId和detailId，获取裁判的身份，比赛项目相关的信息")
+    @RequestMapping(value = "/query/projectByTall", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<ProvinceCompeteVo.QueryProjectByTall> queryProjectByTall(
+            @ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.ProjectByTall> params) {
+        log.info("查看裁判身份场次id：{}",params);
+        ProvinceCompeteVo.QueryProjectByTall queryProjectByTall = competeTaskService.queryProjectByTall(params.getParam());
+        log.info("查看裁判身份场次id：{}",queryProjectByTall);
+        return JsonResponse.newInstance().ok(queryProjectByTall);
+    }
 }

mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java

@@ -289,5 +289,12 @@ public class ProvinceCompeteDto {
         @ApiModelProperty("备注")
         private String remark;
     }
-
+    @Data
+    @ApiModel("通过tall查看裁判和项目的信息")
+    public static class ProjectByTall{
+        @ApiModelProperty("tall内的任务详情id")
+        private Long taskDetailId;
+        @ApiModelProperty("tall内的角色id")
+        private Long roleId;
+    }
 }

mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java

@@ -30,6 +30,8 @@ public class CompeteJudgment implements Serializable {
 
     private Long memberId;
 
+    private Long roleId;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -136,6 +138,14 @@ public class CompeteJudgment implements Serializable {
         this.memberId = memberId;
     }
 
+    public Long getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId) {
+        this.roleId = roleId;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -155,6 +165,7 @@ public class CompeteJudgment implements Serializable {
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", recStatus=").append(recStatus);
         sb.append(", memberId=").append(memberId);
+        sb.append(", roleId=").append(roleId);
         sb.append("]");
         return sb.toString();
     }

mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java

@@ -914,6 +914,66 @@ public class CompeteJudgmentExample {
             addCriterion("member_id not between", value1, value2, "memberId");
             return (Criteria) this;
         }
+
+        public Criteria andRoleIdIsNull() {
+            addCriterion("role_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdIsNotNull() {
+            addCriterion("role_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdEqualTo(Long value) {
+            addCriterion("role_id =", value, "roleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdNotEqualTo(Long value) {
+            addCriterion("role_id <>", value, "roleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdGreaterThan(Long value) {
+            addCriterion("role_id >", value, "roleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("role_id >=", value, "roleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdLessThan(Long value) {
+            addCriterion("role_id <", value, "roleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdLessThanOrEqualTo(Long value) {
+            addCriterion("role_id <=", value, "roleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdIn(List<Long> values) {
+            addCriterion("role_id in", values, "roleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdNotIn(List<Long> values) {
+            addCriterion("role_id not in", values, "roleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdBetween(Long value1, Long value2) {
+            addCriterion("role_id between", value1, value2, "roleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdNotBetween(Long value1, Long value2) {
+            addCriterion("role_id not between", value1, value2, "roleId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java

@@ -317,4 +317,20 @@ public class ProvinceCompeteVo {
 
     }
 
+    @Data
+    @ApiModel("通过tall获取裁判和项目信息")
+    public static class QueryProjectByTall {
+        @ApiModelProperty("裁判身份")
+        private int judgmentNum;
+        @ApiModelProperty("裁判id")
+        private Long judgmentId;
+        @ApiModelProperty("场次id（出场顺序表的id）")
+        private Long startOrderId;
+        @ApiModelProperty("比赛项目id")
+        private Long projectId;
+        @ApiModelProperty("比赛项目的类型 0计数赛 1花样赛")
+        private int projectType;
+    }
+
+
 }

mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java

@@ -36,4 +36,11 @@ public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper {
      * @return 返回选手列表
      */
     List<ProvinceCompeteVo.StartOrderByCompanyAndProject> queryStartOrderByCompany(@Param("companyId")Long companyId, @Param("projectId")Long projectId, @Param("competeTimeId")Long competeTimeId);
+
+    /**
+     * 通过taskDetailId查询比赛场次和项目信息
+     * @param taskDetailId 任务详情id
+     * @return 返回比赛项目信息
+     */
+    ProvinceCompeteVo.QueryProjectByTall queryProjectByTaskDetailId(@Param("taskDetailId")Long taskDetailId);
 }

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

@@ -410,6 +410,7 @@ public class CompeteTaskService implements ICompeteTaskService{
         log.info("在tall内添加成员：{}",saveMember);
         JsonResponse<MemberVo.Member> memberJsonResponse = tallFeignClient.saveMember(saveMember);
         log.info("添加成员后返回：{}",memberJsonResponse);
+        //如果成员已存在，
         //添加任务
         //查找场次信息表
         CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample();
@@ -446,4 +447,26 @@ public class CompeteTaskService implements ICompeteTaskService{
             }
         }
     }
+
+    /**
+     * 通过tall查看裁判和比赛项目的信息
+     */
+    @Override
+    public ProvinceCompeteVo.QueryProjectByTall queryProjectByTall(ProvinceCompeteDto.ProjectByTall param) {
+        //查询比赛项目信息
+        ProvinceCompeteVo.QueryProjectByTall queryProjectByTall = projectConfigDao.queryProjectByTaskDetailId(param.getTaskDetailId());
+        log.info("根据taskDetailId查询到的场次和项目信息：{}",queryProjectByTall);
+        //查询裁判信息
+        CompeteJudgment judgment = new CompeteJudgment();
+        CompeteJudgmentExample judgmentExample = new CompeteJudgmentExample();
+        judgmentExample.createCriteria().andRoleIdEqualTo(param.getRoleId());
+        List<CompeteJudgment> judgmentList = competeJudgmentDao.selectByExample(judgmentExample);
+        if(CollectionUtil.isNotEmpty(judgmentList)){
+            judgment = judgmentList.get(0);
+        }
+        log.info("根据roleId查询到的裁判信息：{}",judgment);
+        queryProjectByTall.setJudgmentId(judgment.getId());
+        queryProjectByTall.setJudgmentNum(judgment.getChiefJudgment());
+        return queryProjectByTall;
+    }
 }

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

@@ -45,4 +45,11 @@ public interface ICompeteTaskService {
      * @return
      */
     List<ProvinceCompeteVo.QueryJudgment> allocationJudgment(ProvinceCompeteDto.AllocationJudgmentAndTall param,String token);
+
+    /**
+     * 通过tall的任务id和角色id查询裁判和比赛项目的信息
+     * @param param
+     * @return
+     */
+    ProvinceCompeteVo.QueryProjectByTall queryProjectByTall(ProvinceCompeteDto.ProjectByTall param);
 }

mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml

@@ -279,6 +279,19 @@
       and pr.rec_status = 0
       ORDER BY so.start_time
     </select>
+    <select id="queryProjectByTaskDetailId" resultType="com.ccsens.mt.bean.vo.ProvinceCompeteVo$QueryProjectByTall">
+        SELECT
+        s.id as startOrderId,
+        p.id as projectId,
+        if(p.parent_id = 2001,0,1) as projectType
+        FROM
+        `t_compete_start_order` s LEFT JOIN t_compete_project p on s.project_id = p.id
+        WHERE
+            s.task_id = #{taskDetailId}
+        and s.rec_status = 0
+        and p.rec_status = 0
+        LIMIT 1
+    </select>
 
 
 </mapper>

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

@@ -15,6 +15,7 @@
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
     <result column="member_id" jdbcType="BIGINT" property="memberId" />
+    <result column="role_id" jdbcType="BIGINT" property="roleId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -76,7 +77,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, name, phone, remark, compete_time_id, site, project_id, user_id, chief_judgment, 
-    created_at, updated_at, rec_status, member_id
+    created_at, updated_at, rec_status, member_id, role_id
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteJudgmentExample" resultMap="BaseResultMap">
     select
@@ -113,12 +114,12 @@
       remark, compete_time_id, site, 
       project_id, user_id, chief_judgment, 
       created_at, updated_at, rec_status, 
-      member_id)
+      member_id, role_id)
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, 
       #{remark,jdbcType=VARCHAR}, #{competeTimeId,jdbcType=BIGINT}, #{site,jdbcType=INTEGER}, 
       #{projectId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{chiefJudgment,jdbcType=TINYINT}, 
       #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, 
-      #{memberId,jdbcType=BIGINT})
+      #{memberId,jdbcType=BIGINT}, #{roleId,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompeteJudgment">
     insert into t_compete_judgment
@@ -162,6 +163,9 @@
       <if test="memberId != null">
         member_id,
       </if>
+      <if test="roleId != null">
+        role_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -203,6 +207,9 @@
       <if test="memberId != null">
         #{memberId,jdbcType=BIGINT},
       </if>
+      <if test="roleId != null">
+        #{roleId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ccsens.mt.bean.po.CompeteJudgmentExample" resultType="java.lang.Long">
@@ -253,6 +260,9 @@
       <if test="record.memberId != null">
         member_id = #{record.memberId,jdbcType=BIGINT},
       </if>
+      <if test="record.roleId != null">
+        role_id = #{record.roleId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -272,7 +282,8 @@
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{record.recStatus,jdbcType=TINYINT},
-      member_id = #{record.memberId,jdbcType=BIGINT}
+      member_id = #{record.memberId,jdbcType=BIGINT},
+      role_id = #{record.roleId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -316,6 +327,9 @@
       <if test="memberId != null">
         member_id = #{memberId,jdbcType=BIGINT},
       </if>
+      <if test="roleId != null">
+        role_id = #{roleId,jdbcType=BIGINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -332,7 +346,8 @@
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{recStatus,jdbcType=TINYINT},
-      member_id = #{memberId,jdbcType=BIGINT}
+      member_id = #{memberId,jdbcType=BIGINT},
+      role_id = #{roleId,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>