20201116v1.6

cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;
 
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -76,4 +77,35 @@ public class MemberRoleDto {
             return assign;
         }
     }
+
+    @Data
+    @ApiModel("添加成员")
+    public static class SaveMember{
+        @NotNull
+        @ApiModelProperty("项目id")
+        private Long projectId;
+        @ApiModelProperty("成员名")
+        private String memberName;
+        @NotEmpty
+        @ApiModelProperty("成员手机号")
+        private String phone;
+        @ApiModelProperty("所属角色的id")
+        private List<Long> roleId;
+        @ApiModelProperty("奖惩干系人手机号")
+        private String stakeholderPhone;
+        @ApiModelProperty("奖惩干系人姓名")
+        private String stakeholderName;
+    }
+
+    @Data
+    @ApiModel("添加角色")
+    public static class SaveRole{
+        @NotNull(message = "项目不能为空")
+        @ApiModelProperty("项目id")
+        private Long projectId;
+        @NotEmpty(message = "角色名不能为空")
+        @ApiModelProperty("角色名")
+        private String roleName;
+    }
+
 }

cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java

@@ -1,5 +1,7 @@
 package com.ccsens.cloudutil.bean.tall.vo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -18,4 +20,26 @@ public class MemberVo {
         private Long joinTime;
         private Long stakeholderId;
     }
+
+    @Data
+    @ApiModel("角色信息")
+    public static class RoleInfo{
+        @ApiModelProperty("角色id")
+        private Long roleId;
+        @ApiModelProperty("角色名")
+        private String roleName;
+    }
+
+    @Data
+    @ApiModel("添加时返回成员信息")
+    public static class Member{
+        @ApiModelProperty("成员id")
+        private Long memberId;
+        @ApiModelProperty("成员名")
+        private String memberName;
+        @ApiModelProperty("手机号")
+        private String phone;
+        @ApiModelProperty("userId")
+        private Long userId;
+    }
 }

cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java

@@ -198,8 +198,20 @@ public interface TallFeignClient {
     /**
      * 修改任务插件配置
      */
-    @DeleteMapping("/plugins/config")
+    @RequestMapping("/plugins/config")
     JsonResponse<TaskVo.PluginVo> updatePluginConfig(TallTaskDto.UpdatePluginConfig updatePluginConfig);
+
+    /**
+     * 添加角色
+     */
+    @RequestMapping("/roles/save")
+    JsonResponse<MemberVo.RoleInfo> saveRole(MemberRoleDto.SaveRole saveRole);
+
+    /**
+     * 添加成员
+     */
+    @RequestMapping("/members/save")
+    JsonResponse<MemberVo.Member> saveMember(MemberRoleDto.SaveMember saveMember);
 }
 
 @Slf4j
@@ -332,6 +344,16 @@ class TallFeignClientFallBack implements FallbackFactory<TallFeignClient> {
             public JsonResponse<TaskVo.PluginVo> updatePluginConfig(TallTaskDto.UpdatePluginConfig updatePluginConfig) {
                 return JsonResponse.newInstance().fail();
             }
+
+            @Override
+            public JsonResponse<MemberVo.RoleInfo> saveRole(MemberRoleDto.SaveRole saveRole) {
+                return JsonResponse.newInstance().fail();
+            }
+
+            @Override
+            public JsonResponse<MemberVo.Member> saveMember(MemberRoleDto.SaveMember saveMember) {
+                return JsonResponse.newInstance().fail();
+            }
         };
     }
 

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

@@ -77,7 +77,8 @@ public class CompeteTaskController {
     @MustLogin
     @ApiOperation(value = "分配裁判信息", notes = "zy:传入裁判分配信息表，根据内容给每个的项目的每个场次添加裁判信息")
     @RequestMapping(value = "/allocation/judgment", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<List<ProvinceCompeteVo.QueryJudgment>> allocationJudgment(@ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.AllocationJudgment> params) {
+    public JsonResponse<List<ProvinceCompeteVo.QueryJudgment>> allocationJudgment(
+            @ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.AllocationJudgmentAndTall> params) {
         log.info("分配裁判信息：{}",params);
         List<ProvinceCompeteVo.QueryJudgment> queryJudgmentList = competeTaskService.allocationJudgment(params.getParam());
         log.info("分配裁判信息：{}",queryJudgmentList);

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

@@ -239,7 +239,18 @@ public class ProvinceCompeteDto {
         private Long companyId;
     }
 
-
+    @Data
+    @ApiModel("分配裁判信息包括tall的项目id")
+    public static class AllocationJudgmentAndTall{
+        @NotNull
+        @ApiModelProperty("大赛id")
+        private Long competeTimeId;
+        @NotNull
+        @ApiModelProperty("tall的项目id")
+        private Long tallProjectId;
+        @ApiModelProperty("每个项目下的裁判信息")
+        private List<AllocationJudgment> allocationJudgmentList;
+    }
     @Data
     @ApiModel("分配裁判信息")
     public static class AllocationJudgment{

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

@@ -50,7 +50,7 @@ public class VideoDto {
     @Data
     @ApiModel("上传视频保存上传记录 (比赛视频)")
     public static class UploadVdeo{
-        @ApiModelProperty("视频文件id")
+        @ApiModelProperty("单位id")
         private Long companyId;
         @ApiModelProperty("大赛id")
         private Long competeTimeId;

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

@@ -14,7 +14,7 @@ public class CompeteJudgment implements Serializable {
 
     private Long competeTimeId;
 
-    private Long siteOrderId;
+    private Integer site;
 
     private Long projectId;
 
@@ -28,6 +28,8 @@ public class CompeteJudgment implements Serializable {
 
     private Byte recStatus;
 
+    private Long memberId;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -70,12 +72,12 @@ public class CompeteJudgment implements Serializable {
         this.competeTimeId = competeTimeId;
     }
 
-    public Long getSiteOrderId() {
-        return siteOrderId;
+    public Integer getSite() {
+        return site;
     }
 
-    public void setSiteOrderId(Long siteOrderId) {
-        this.siteOrderId = siteOrderId;
+    public void setSite(Integer site) {
+        this.site = site;
     }
 
     public Long getProjectId() {
@@ -126,6 +128,14 @@ public class CompeteJudgment implements Serializable {
         this.recStatus = recStatus;
     }
 
+    public Long getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(Long memberId) {
+        this.memberId = memberId;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -137,13 +147,14 @@ public class CompeteJudgment implements Serializable {
         sb.append(", phone=").append(phone);
         sb.append(", remark=").append(remark);
         sb.append(", competeTimeId=").append(competeTimeId);
-        sb.append(", siteOrderId=").append(siteOrderId);
+        sb.append(", site=").append(site);
         sb.append(", projectId=").append(projectId);
         sb.append(", userId=").append(userId);
         sb.append(", chiefJudgment=").append(chiefJudgment);
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", recStatus=").append(recStatus);
+        sb.append(", memberId=").append(memberId);
         sb.append("]");
         return sb.toString();
     }

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

@@ -435,63 +435,63 @@ public class CompeteJudgmentExample {
             return (Criteria) this;
         }
 
-        public Criteria andSiteOrderIdIsNull() {
-            addCriterion("site_order_id is null");
+        public Criteria andSiteIsNull() {
+            addCriterion("site is null");
             return (Criteria) this;
         }
 
-        public Criteria andSiteOrderIdIsNotNull() {
-            addCriterion("site_order_id is not null");
+        public Criteria andSiteIsNotNull() {
+            addCriterion("site is not null");
             return (Criteria) this;
         }
 
-        public Criteria andSiteOrderIdEqualTo(Long value) {
-            addCriterion("site_order_id =", value, "siteOrderId");
+        public Criteria andSiteEqualTo(Integer value) {
+            addCriterion("site =", value, "site");
             return (Criteria) this;
         }
 
-        public Criteria andSiteOrderIdNotEqualTo(Long value) {
-            addCriterion("site_order_id <>", value, "siteOrderId");
+        public Criteria andSiteNotEqualTo(Integer value) {
+            addCriterion("site <>", value, "site");
             return (Criteria) this;
         }
 
-        public Criteria andSiteOrderIdGreaterThan(Long value) {
-            addCriterion("site_order_id >", value, "siteOrderId");
+        public Criteria andSiteGreaterThan(Integer value) {
+            addCriterion("site >", value, "site");
             return (Criteria) this;
         }
 
-        public Criteria andSiteOrderIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("site_order_id >=", value, "siteOrderId");
+        public Criteria andSiteGreaterThanOrEqualTo(Integer value) {
+            addCriterion("site >=", value, "site");
             return (Criteria) this;
         }
 
-        public Criteria andSiteOrderIdLessThan(Long value) {
-            addCriterion("site_order_id <", value, "siteOrderId");
+        public Criteria andSiteLessThan(Integer value) {
+            addCriterion("site <", value, "site");
             return (Criteria) this;
         }
 
-        public Criteria andSiteOrderIdLessThanOrEqualTo(Long value) {
-            addCriterion("site_order_id <=", value, "siteOrderId");
+        public Criteria andSiteLessThanOrEqualTo(Integer value) {
+            addCriterion("site <=", value, "site");
             return (Criteria) this;
         }
 
-        public Criteria andSiteOrderIdIn(List<Long> values) {
-            addCriterion("site_order_id in", values, "siteOrderId");
+        public Criteria andSiteIn(List<Integer> values) {
+            addCriterion("site in", values, "site");
             return (Criteria) this;
         }
 
-        public Criteria andSiteOrderIdNotIn(List<Long> values) {
-            addCriterion("site_order_id not in", values, "siteOrderId");
+        public Criteria andSiteNotIn(List<Integer> values) {
+            addCriterion("site not in", values, "site");
             return (Criteria) this;
         }
 
-        public Criteria andSiteOrderIdBetween(Long value1, Long value2) {
-            addCriterion("site_order_id between", value1, value2, "siteOrderId");
+        public Criteria andSiteBetween(Integer value1, Integer value2) {
+            addCriterion("site between", value1, value2, "site");
             return (Criteria) this;
         }
 
-        public Criteria andSiteOrderIdNotBetween(Long value1, Long value2) {
-            addCriterion("site_order_id not between", value1, value2, "siteOrderId");
+        public Criteria andSiteNotBetween(Integer value1, Integer value2) {
+            addCriterion("site not between", value1, value2, "site");
             return (Criteria) this;
         }
 
@@ -854,6 +854,66 @@ public class CompeteJudgmentExample {
             addCriterion("rec_status not between", value1, value2, "recStatus");
             return (Criteria) this;
         }
+
+        public Criteria andMemberIdIsNull() {
+            addCriterion("member_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdIsNotNull() {
+            addCriterion("member_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdEqualTo(Long value) {
+            addCriterion("member_id =", value, "memberId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdNotEqualTo(Long value) {
+            addCriterion("member_id <>", value, "memberId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdGreaterThan(Long value) {
+            addCriterion("member_id >", value, "memberId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("member_id >=", value, "memberId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdLessThan(Long value) {
+            addCriterion("member_id <", value, "memberId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdLessThanOrEqualTo(Long value) {
+            addCriterion("member_id <=", value, "memberId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdIn(List<Long> values) {
+            addCriterion("member_id in", values, "memberId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdNotIn(List<Long> values) {
+            addCriterion("member_id not in", values, "memberId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdBetween(Long value1, Long value2) {
+            addCriterion("member_id between", value1, value2, "memberId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdNotBetween(Long value1, Long value2) {
+            addCriterion("member_id not between", value1, value2, "memberId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -263,6 +263,8 @@ public class ProvinceCompeteVo {
         private Long startOrderId;
         @ApiModelProperty("场次")
         private int competeOrder;
+        @ApiModelProperty("选手关联项目id/团队id")
+        private Long playerOrTeamId;
         @ApiModelProperty("场地")
         private int site;
         @ApiModelProperty("选手名")

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

@@ -85,5 +85,5 @@ public interface CompetePlayerDao extends CompetePlayerMapper {
      * @param idCard 身份证
      * @return
      */
-    int selectJoinNumByIdCard(@Param("type")int type, @Param("idCard")String idCard);
+    int selectJoinNumByIdCard(@Param("type")int type, @Param("idCard")String idCard,@Param("playerId")Long playerId);
 }

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

@@ -3,7 +3,9 @@ package com.ccsens.mt.service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
+import com.ccsens.cloudutil.bean.tall.dto.MemberRoleDto;
 import com.ccsens.cloudutil.bean.tall.dto.TallTaskDto;
+import com.ccsens.cloudutil.bean.tall.vo.MemberVo;
 import com.ccsens.cloudutil.bean.tall.vo.TaskVo;
 import com.ccsens.cloudutil.feign.TallFeignClient;
 import com.ccsens.mt.bean.dto.CompeteDto;
@@ -25,6 +27,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * @author 逗
@@ -288,8 +291,62 @@ public class CompeteTaskService implements ICompeteTaskService{
      * 分配裁判
      */
     @Override
-    public List<ProvinceCompeteVo.QueryJudgment> allocationJudgment(ProvinceCompeteDto.AllocationJudgment param) {
+    public List<ProvinceCompeteVo.QueryJudgment> allocationJudgment(ProvinceCompeteDto.AllocationJudgmentAndTall param) {
+        //查找项目
+        if(CollectionUtil.isNotEmpty(param.getAllocationJudgmentList())){
+            for(ProvinceCompeteDto.AllocationJudgment allocationJudgment : param.getAllocationJudgmentList()) {
+                CompeteProject project = competeProjectDao.selectByPrimaryKey(allocationJudgment.getProjectId());
+                if (ObjectUtil.isNotNull(project)) {
 
-        return null;
+                    if (CollectionUtil.isNotEmpty(allocationJudgment.getSiteJudgmentList())) {
+                        allocationJudgment.getSiteJudgmentList().forEach(siteJudgment -> {
+                            if (ObjectUtil.isNotNull(siteJudgment)) {
+                                siteJudgment.getJudgmentInfoList().forEach(judgmentInfo -> {
+                                    // TODO 查找该手机号在此项目之前的裁判信息，修改，同时修改tall内的成员角色信息
+                                    //添加裁判信息
+                                    CompeteJudgment competeJudgment = new CompeteJudgment();
+                                    competeJudgment.setId(snowflake.nextId());
+                                    competeJudgment.setName(judgmentInfo.getJudgmentName());
+                                    competeJudgment.setPhone(judgmentInfo.getJudgmentPhone());
+                                    competeJudgment.setRemark(judgmentInfo.getRemark());
+                                    competeJudgment.setCompeteTimeId(param.getCompeteTimeId());
+                                    competeJudgment.setProjectId(allocationJudgment.getProjectId());
+                                    competeJudgment.setSite(siteJudgment.getSite());
+                                    competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum());
+                                    competeJudgmentDao.insertSelective(competeJudgment);
+                                    //添加角色
+                                    MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole();
+                                    saveRole.setProjectId(param.getTallProjectId());
+                                    String jdgmentNum = "";
+                                    if(judgmentInfo.getJudgmentNum() == 0){
+                                        jdgmentNum = "主裁判";
+                                    }else {
+                                        jdgmentNum = "裁判"+judgmentInfo.getJudgmentNum();
+                                    }
+                                    saveRole.setRoleName(project.getName()+"-场地"+siteJudgment.getSite()+"-"+jdgmentNum);
+                                    Long roleId = null;
+                                    JsonResponse<MemberVo.RoleInfo> memberJsonResponse = tallFeignClient.saveRole(saveRole);
+                                    if (ObjectUtil.isNotNull(memberJsonResponse)) {
+                                        MemberVo.RoleInfo roleInfo = memberJsonResponse.getData();
+                                        if (ObjectUtil.isNotNull(roleInfo)) {
+                                            roleId = roleInfo.getRoleId();
+                                        }
+                                    }
+                                    //添加成员
+
+
+                                    //添加任务
+                                });
+                            }
+                        });
+                    }
+                }
+            }
+        }
+
+        //在tall内添加裁判角色
+        //在tall内添加裁判成员
+        //添加每个裁判的任务
+        return competeJudgmentDao.queryJudgment(param.getCompeteTimeId());
     }
 }

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

@@ -44,5 +44,5 @@ public interface ICompeteTaskService {
      * @param param
      * @return
      */
-    List<ProvinceCompeteVo.QueryJudgment> allocationJudgment(ProvinceCompeteDto.AllocationJudgment param);
+    List<ProvinceCompeteVo.QueryJudgment> allocationJudgment(ProvinceCompeteDto.AllocationJudgmentAndTall param);
 }

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

@@ -135,7 +135,7 @@ public class ProvinceService implements IProvinceService {
             //身份证不能为空，且正确
             if(StrUtil.isEmpty(param.getIdCard()) || !IdcardUtil.isValidCard(param.getIdCard())){throw new BaseException(CodeEnum.ID_CARD_ERROR);}
             //是否已注册
-            int idCardNum = competePlayerDao.selectJoinNumByIdCard(type,param.getIdCard());
+            int idCardNum = competePlayerDao.selectJoinNumByIdCard(type,param.getIdCard(),param.getPlayerId());
 //            CompetePlayerExample competePlayerExample = new CompetePlayerExample();
 //            competePlayerExample.createCriteria().andIdCardEqualTo(param.getIdCard());
 //            if(competePlayerDao.countByExample(competePlayerExample) != 0){
@@ -200,8 +200,7 @@ public class ProvinceService implements IProvinceService {
             //身份证正确
             if(!IdcardUtil.isValidCard(param.getIdCard())){throw new BaseException(CodeEnum.ID_CARD_ERROR);}
             //是否已注册
-            //是否已注册
-            int idCardNum = competePlayerDao.selectJoinNumByIdCard(type,param.getIdCard());
+            int idCardNum = competePlayerDao.selectJoinNumByIdCard(type,param.getIdCard(),param.getPlayerId());
             if(idCardNum > 0){
                 throw new BaseException(CodeEnum.ID_CARD_ALREADY);
             }

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/CompetePlayerDao.xml

@@ -307,7 +307,13 @@
             t_compete_player p left join t_compete_company c on p.company_id = c.id
         where
             p.id_card = #{idCard}
+        <if test="playerId != null">
+            and
+            p.id != #{playerId}
+        </if>
         and
             c.type = #{type}
+        and p.rec_status = 0
+        and c.rec_status = 0
     </select>
 </mapper>

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

@@ -24,6 +24,7 @@
             <result column="team" property="team" />
             <result column="groupName" property="groupName" />
             <result column="videoUrl" property="videoUrl" />
+            <result column="playerOrTeamId" property="playerOrTeamId" />
             <collection property="playerNameList" ofType="String">
                 <result column="playerName"/>
             </collection>
@@ -196,7 +197,8 @@
       pr.`team` as team,
       if(pr.team = 0,a.plName,b.plName) as playerName,
       if(pr.team = 0,a.groupName,b.groupName) as groupName,
-      if(pr.team = 0,a.videoUrl,b.videoUrl) as videoUrl
+      if(pr.team = 0,a.videoUrl,b.videoUrl) as videoUrl,
+      if(pr.team = 0,a.ppId,b.teamId) as playerOrTeamId
       from
       t_compete_start_order so
       LEFT JOIN t_compete_project pr on so.project_id = pr.id

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

@@ -7,13 +7,14 @@
     <result column="phone" jdbcType="VARCHAR" property="phone" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="compete_time_id" jdbcType="BIGINT" property="competeTimeId" />
-    <result column="site_order_id" jdbcType="BIGINT" property="siteOrderId" />
+    <result column="site" jdbcType="INTEGER" property="site" />
     <result column="project_id" jdbcType="BIGINT" property="projectId" />
     <result column="user_id" jdbcType="BIGINT" property="userId" />
     <result column="chief_judgment" jdbcType="TINYINT" property="chiefJudgment" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+    <result column="member_id" jdbcType="BIGINT" property="memberId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -74,8 +75,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, name, phone, remark, compete_time_id, site_order_id, project_id, user_id, chief_judgment, 
-    created_at, updated_at, rec_status
+    id, name, phone, remark, compete_time_id, site, project_id, user_id, chief_judgment, 
+    created_at, updated_at, rec_status, member_id
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteJudgmentExample" resultMap="BaseResultMap">
     select
@@ -109,15 +110,15 @@
   </delete>
   <insert id="insert" parameterType="com.ccsens.mt.bean.po.CompeteJudgment">
     insert into t_compete_judgment (id, name, phone, 
-      remark, compete_time_id, site_order_id, 
+      remark, compete_time_id, site, 
       project_id, user_id, chief_judgment, 
-      created_at, updated_at, rec_status
-      )
+      created_at, updated_at, rec_status, 
+      member_id)
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, 
-      #{remark,jdbcType=VARCHAR}, #{competeTimeId,jdbcType=BIGINT}, #{siteOrderId,jdbcType=BIGINT}, 
+      #{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}
-      )
+      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, 
+      #{memberId,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompeteJudgment">
     insert into t_compete_judgment
@@ -137,8 +138,8 @@
       <if test="competeTimeId != null">
         compete_time_id,
       </if>
-      <if test="siteOrderId != null">
-        site_order_id,
+      <if test="site != null">
+        site,
       </if>
       <if test="projectId != null">
         project_id,
@@ -158,6 +159,9 @@
       <if test="recStatus != null">
         rec_status,
       </if>
+      <if test="memberId != null">
+        member_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -175,8 +179,8 @@
       <if test="competeTimeId != null">
         #{competeTimeId,jdbcType=BIGINT},
       </if>
-      <if test="siteOrderId != null">
-        #{siteOrderId,jdbcType=BIGINT},
+      <if test="site != null">
+        #{site,jdbcType=INTEGER},
       </if>
       <if test="projectId != null">
         #{projectId,jdbcType=BIGINT},
@@ -196,6 +200,9 @@
       <if test="recStatus != null">
         #{recStatus,jdbcType=TINYINT},
       </if>
+      <if test="memberId != null">
+        #{memberId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ccsens.mt.bean.po.CompeteJudgmentExample" resultType="java.lang.Long">
@@ -222,8 +229,8 @@
       <if test="record.competeTimeId != null">
         compete_time_id = #{record.competeTimeId,jdbcType=BIGINT},
       </if>
-      <if test="record.siteOrderId != null">
-        site_order_id = #{record.siteOrderId,jdbcType=BIGINT},
+      <if test="record.site != null">
+        site = #{record.site,jdbcType=INTEGER},
       </if>
       <if test="record.projectId != null">
         project_id = #{record.projectId,jdbcType=BIGINT},
@@ -243,6 +250,9 @@
       <if test="record.recStatus != null">
         rec_status = #{record.recStatus,jdbcType=TINYINT},
       </if>
+      <if test="record.memberId != null">
+        member_id = #{record.memberId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -255,13 +265,14 @@
       phone = #{record.phone,jdbcType=VARCHAR},
       remark = #{record.remark,jdbcType=VARCHAR},
       compete_time_id = #{record.competeTimeId,jdbcType=BIGINT},
-      site_order_id = #{record.siteOrderId,jdbcType=BIGINT},
+      site = #{record.site,jdbcType=INTEGER},
       project_id = #{record.projectId,jdbcType=BIGINT},
       user_id = #{record.userId,jdbcType=BIGINT},
       chief_judgment = #{record.chiefJudgment,jdbcType=TINYINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
-      rec_status = #{record.recStatus,jdbcType=TINYINT}
+      rec_status = #{record.recStatus,jdbcType=TINYINT},
+      member_id = #{record.memberId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -281,8 +292,8 @@
       <if test="competeTimeId != null">
         compete_time_id = #{competeTimeId,jdbcType=BIGINT},
       </if>
-      <if test="siteOrderId != null">
-        site_order_id = #{siteOrderId,jdbcType=BIGINT},
+      <if test="site != null">
+        site = #{site,jdbcType=INTEGER},
       </if>
       <if test="projectId != null">
         project_id = #{projectId,jdbcType=BIGINT},
@@ -302,6 +313,9 @@
       <if test="recStatus != null">
         rec_status = #{recStatus,jdbcType=TINYINT},
       </if>
+      <if test="memberId != null">
+        member_id = #{memberId,jdbcType=BIGINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -311,13 +325,14 @@
       phone = #{phone,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=VARCHAR},
       compete_time_id = #{competeTimeId,jdbcType=BIGINT},
-      site_order_id = #{siteOrderId,jdbcType=BIGINT},
+      site = #{site,jdbcType=INTEGER},
       project_id = #{projectId,jdbcType=BIGINT},
       user_id = #{userId,jdbcType=BIGINT},
       chief_judgment = #{chiefJudgment,jdbcType=TINYINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
-      rec_status = #{recStatus,jdbcType=TINYINT}
+      rec_status = #{recStatus,jdbcType=TINYINT},
+      member_id = #{memberId,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java

@@ -17,4 +17,17 @@ public class RoleVo {
         @ApiModelProperty("角色名")
         private String roleName;
     }
+
+    @Data
+    @ApiModel("添加时返回成员信息")
+    public static class MemberInfo{
+        @ApiModelProperty("成员id")
+        private Long memberId;
+        @ApiModelProperty("成员名")
+        private String memberName;
+        @ApiModelProperty("手机号")
+        private String phone;
+        @ApiModelProperty("userId")
+        private Long userId;
+    }
 }

tall/src/main/java/com/ccsens/tall/service/IProMemberService.java

@@ -6,6 +6,7 @@ import com.ccsens.tall.bean.po.ProMember;
 import com.ccsens.tall.bean.po.ProRole;
 import com.ccsens.tall.bean.vo.MemberVo;
 import com.ccsens.tall.bean.vo.ProjectVo;
+import com.ccsens.tall.bean.vo.RoleVo;
 
 import java.util.List;
 
@@ -38,7 +39,7 @@ public interface IProMemberService {
      * @param saveMember 项目id，角色id，成员姓名和手机号等
      * @throws Exception 权限不足异常
      */
-    void saveProMember(Long currentUserId, MemberDto.SaveMember saveMember) throws Exception;
+    RoleVo.MemberInfo saveProMember(Long currentUserId, MemberDto.SaveMember saveMember) throws Exception;
 
     /**
      * 删除成员

tall/src/main/java/com/ccsens/tall/service/IProRoleService.java

@@ -28,7 +28,7 @@ public interface IProRoleService {
 
     void deleteRoleByProjectId(Long projectId) throws Exception;
 
-    void saveRole(Long currentUserId, RoleDto.SaveRole saveRole);
+    RoleVo.RoleByProjectId saveRole(Long currentUserId, RoleDto.SaveRole saveRole);
 
     ProjectVo.RoleInfo updateRole(Long currentUserId, RoleDto.UpdateRole updateRole);
 

tall/src/main/java/com/ccsens/tall/service/ProMemberService.java

@@ -11,6 +11,7 @@ import com.ccsens.tall.bean.dto.ProjectDto;
 import com.ccsens.tall.bean.po.*;
 import com.ccsens.tall.bean.vo.MemberVo;
 import com.ccsens.tall.bean.vo.ProjectVo;
+import com.ccsens.tall.bean.vo.RoleVo;
 import com.ccsens.tall.persist.dao.*;
 import com.ccsens.tall.persist.mapper.SysImitationMapper;
 import com.ccsens.util.CodeEnum;
@@ -246,7 +247,8 @@ public class ProMemberService implements IProMemberService {
     }
 
     @Override
-    public void saveProMember(Long currentUserId, MemberDto.SaveMember saveMember) throws Exception {
+    public RoleVo.MemberInfo saveProMember(Long currentUserId, MemberDto.SaveMember saveMember) throws Exception {
+        RoleVo.MemberInfo memberInfo = new RoleVo.MemberInfo();
         int power = proRoleService.selectPowerByRoleName(currentUserId, saveMember.getProjectId());
         if (power > 1) {
             //用项目id和手机号判断用户是否存在
@@ -265,6 +267,7 @@ public class ProMemberService implements IProMemberService {
             proMember.setNickname(saveMember.getMemberName());
             proMember.setPhone(saveMember.getPhone());
             proMember.setUserId(userId);
+
             //获取奖惩干系人
             Long stakeholderId = null;
             if(StrUtil.isNotEmpty(saveMember.getStakeholderPhone())){
@@ -302,6 +305,10 @@ public class ProMemberService implements IProMemberService {
             }
             proMember.setStakeholderId(stakeholderId);
             proMemberDao.insertSelective(proMember);
+            memberInfo.setMemberId(proMember.getId());
+            memberInfo.setMemberName(proMember.getNickname());
+            memberInfo.setPhone(proMember.getPhone());
+            memberInfo.setUserId(proMember.getUserId());
             //添加成员与角色的关联
             if(CollectionUtil.isNotEmpty(saveMember.getRoleId())){
                 saveMember.getRoleId().forEach(roleId -> {
@@ -323,6 +330,7 @@ public class ProMemberService implements IProMemberService {
         } else {
             throw new BaseException(CodeEnum.NOT_POWER);
         }
+        return memberInfo;
     }
 
     @Override

tall/src/main/java/com/ccsens/tall/service/ProRoleService.java

@@ -362,7 +362,7 @@ public class ProRoleService implements IProRoleService {
 
 
     @Override
-    public void saveRole(Long currentUserId, RoleDto.SaveRole saveRole) {
+    public RoleVo.RoleByProjectId saveRole(Long currentUserId, RoleDto.SaveRole saveRole) {
         //检查操作者的权限
         int power = selectPowerByRoleName(currentUserId, saveRole.getProjectId());
         if (power < 2) {
@@ -383,6 +383,10 @@ public class ProRoleService implements IProRoleService {
         role.setName(saveRole.getRoleName());
         role.setParentId(parentId);
         proRoleDao.insertSelective(role);
+        RoleVo.RoleByProjectId roleInfo = new RoleVo.RoleByProjectId();
+        roleInfo.setRoleId(role.getId());
+        roleInfo.setRoleName(role.getName());
+        return roleInfo;
     }
 
     @Override

tall/src/main/java/com/ccsens/tall/web/MemberController.java

@@ -3,6 +3,7 @@ package com.ccsens.tall.web;
 import com.ccsens.tall.bean.dto.MemberDto;
 import com.ccsens.tall.bean.dto.ProjectDto;
 import com.ccsens.tall.bean.vo.ProjectVo;
+import com.ccsens.tall.bean.vo.RoleVo;
 import com.ccsens.tall.service.IProMemberService;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.WebConstant;
@@ -38,12 +39,12 @@ public class MemberController {
     @ApiImplicitParams({
     })
     @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse saveMember(HttpServletRequest request,
-                                   @ApiParam @Validated @RequestBody MemberDto.SaveMember saveMember) throws Exception {
+    public JsonResponse<RoleVo.MemberInfo> saveMember(HttpServletRequest request,
+                                                      @ApiParam @Validated @RequestBody MemberDto.SaveMember saveMember) throws Exception {
         Long currentUserId =  Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
         log.info("添加成员：{}",saveMember.toString());
-        proMemberService.saveProMember(currentUserId,saveMember);
-        return JsonResponse.newInstance().ok();
+        RoleVo.MemberInfo memberInfo = proMemberService.saveProMember(currentUserId,saveMember);
+        return JsonResponse.newInstance().ok(memberInfo);
     }
 
     @ApiOperation(value = "删除成员",notes = "")

tall/src/main/java/com/ccsens/tall/web/RoleController.java

@@ -43,11 +43,11 @@ public class RoleController {
     @ApiImplicitParams({
     })
     @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse saveRole(HttpServletRequest request,
+    public JsonResponse<RoleVo.RoleByProjectId> saveRole(HttpServletRequest request,
                                  @ApiParam @Validated @RequestBody RoleDto.SaveRole saveRole) throws Exception {
         Long currentUserId =  Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
-        proRoleService.saveRole(currentUserId,saveRole);
-        return JsonResponse.newInstance().ok();
+        RoleVo.RoleByProjectId roleInfo = proRoleService.saveRole(currentUserId,saveRole);
+        return JsonResponse.newInstance().ok(roleInfo);
     }
 
     @ApiOperation(value = "修改角色信息",notes = "")