单行评分查询

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

@@ -0,0 +1,68 @@
+package com.ccsens.cloudutil.feign;
+
+import com.ccsens.cloudutil.bean.QueryParam;
+import com.ccsens.cloudutil.bean.tall.dto.LogDto;
+import com.ccsens.cloudutil.bean.tall.dto.MemberRoleDto;
+import com.ccsens.cloudutil.bean.tall.dto.UserDto;
+import com.ccsens.cloudutil.bean.tall.vo.MemberVo;
+import com.ccsens.cloudutil.bean.tall.vo.PluginVo;
+import com.ccsens.cloudutil.bean.tall.vo.TaskVo;
+import com.ccsens.util.JsonResponse;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@FeignClient(name = "mt", path = "", fallbackFactory = MtFeignClientFallBack.class)
+public interface MtFeignClient {
+    /**
+     * 普通成员获取自己对任务的评分
+     * @param taskId
+     * @param userId
+     * @return
+     */
+    @GetMapping("plugins/memberScore")
+    BigDecimal getMemberScore(@RequestParam(name = "taskId")Long taskId, @RequestParam(name = "userId")Long userId);
+
+    /**
+     * 项目经理获取任务的平均分
+     * @param projectId
+     * @param taskId
+     * @return
+     */
+    @GetMapping("plugins/adminScore")
+    BigDecimal getAdminScore(@RequestParam(name = "projectId")Long projectId, @RequestParam(name = "taskId")Long taskId);
+
+}
+
+
+@Slf4j
+@Component
+class MtFeignClientFallBack implements FallbackFactory<MtFeignClient> {
+    @Override
+    public MtFeignClient create(Throwable throwable) {
+        String msg = throwable == null ? "" : throwable.getMessage();
+        if (!StringUtils.isEmpty(msg)) {
+            log.error(msg);
+        }
+        return new MtFeignClient() {
+            @Override
+            public BigDecimal getMemberScore(Long taskId,Long userId) {
+                return null;
+            }
+
+            @Override
+            public BigDecimal getAdminScore(Long projectId,Long taskId) {
+                return null;
+            }
+
+        };
+    }
+}

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

@@ -32,6 +32,7 @@ import java.util.Map;
 public interface TallFeignClient {
     /**
      * 获取
+     *
      * @param map
      * @return
      */
@@ -40,6 +41,7 @@ public interface
 
     /**
      * 注册用户
+     *
      * @param signup
      * @return
      */
@@ -48,6 +50,7 @@ public interface
 
     /**
      * 为用户分配角色
+     *
      * @param assign
      * @return
      */
@@ -56,6 +59,7 @@ public interface
 
     /**
      * 为用户删除角色
+     *
      * @param deleteDto
      * @return
      */
@@ -64,6 +68,7 @@ public interface
 
     /**
      * 根据token获取userId
+     *
      * @param token
      * @return
      */
@@ -72,6 +77,7 @@ public interface
 
     /**
      * 记录操作日志
+     *
      * @param logDto
      * @return
      */
@@ -80,6 +86,7 @@ public interface
 
     /**
      * 通过任务id获得项目id
+     *
      * @param taskId
      * @return
      */
@@ -88,12 +95,15 @@ public interface
 
     /**
      * 查询该用户在项目中的member信息
+     *
      * @return
      */
     @GetMapping("/users/member")
     JsonResponse<MemberVo.MemberInfo> getMemberByUserId(@RequestParam(name = "userId") Long userId, @RequestParam(name = "projectId") Long projectId);
+
     /**
      * 当用户不在项目中时查询该用户信息
+     *
      * @return
      */
     @GetMapping("/users/userInfo")
@@ -102,6 +112,7 @@ public interface
 
     /**
      * 获取项目下的所有成员id
+     *
      * @param projectId
      * @return
      */
@@ -110,6 +121,7 @@ public interface
 
     /**
      * 通过token获得userId(消息系统用)
+     *
      * @param token
      * @return
      */
@@ -180,6 +192,7 @@ class TallFeignClientFallBack implements FallbackFactory<TallFeignClient> {
             public JsonResponse<MemberVo.MemberInfo> getMemberByUserId(Long userId, Long projectId) {
                 return JsonResponse.newInstance().fail();
             }
+
             @Override
             public JsonResponse<MemberVo.MemberInfo> getUserByUserId(Long userId) {
                 return JsonResponse.newInstance().fail();

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

@@ -88,7 +88,7 @@ public class ScoreDto {
         @ApiModelProperty("角色id")
         private Long roleId;
         @ApiModelProperty("任务Id")
-        private Long playerId;
+        private Long taskId;
         @ApiModelProperty("分数")
         private BigDecimal score;
     }

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

@@ -8,9 +8,9 @@ public class MtSigninOther implements Serializable {
 
     private Long signinBasicId;
 
-    private String key;
+    private String sKey;
 
-    private String value;
+    private String sValue;
 
     private Date createdAt;
 
@@ -36,20 +36,20 @@ public class MtSigninOther implements Serializable {
         this.signinBasicId = signinBasicId;
     }
 
-    public String getKey() {
-        return key;
+    public String getsKey() {
+        return sKey;
     }
 
-    public void setKey(String key) {
-        this.key = key == null ? null : key.trim();
+    public void setsKey(String sKey) {
+        this.sKey = sKey == null ? null : sKey.trim();
     }
 
-    public String getValue() {
-        return value;
+    public String getsValue() {
+        return sValue;
     }
 
-    public void setValue(String value) {
-        this.value = value == null ? null : value.trim();
+    public void setsValue(String sValue) {
+        this.sValue = sValue == null ? null : sValue.trim();
     }
 
     public Date getCreatedAt() {
@@ -84,8 +84,8 @@ public class MtSigninOther implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", signinBasicId=").append(signinBasicId);
-        sb.append(", key=").append(key);
-        sb.append(", value=").append(value);
+        sb.append(", sKey=").append(sKey);
+        sb.append(", sValue=").append(sValue);
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", recStatus=").append(recStatus);

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

@@ -225,143 +225,143 @@ public class MtSigninOtherExample {
             return (Criteria) this;
         }
 
-        public Criteria andKeyIsNull() {
-            addCriterion("key is null");
+        public Criteria andSKeyIsNull() {
+            addCriterion("s_key is null");
             return (Criteria) this;
         }
 
-        public Criteria andKeyIsNotNull() {
-            addCriterion("key is not null");
+        public Criteria andSKeyIsNotNull() {
+            addCriterion("s_key is not null");
             return (Criteria) this;
         }
 
-        public Criteria andKeyEqualTo(String value) {
-            addCriterion("key =", value, "key");
+        public Criteria andSKeyEqualTo(String value) {
+            addCriterion("s_key =", value, "sKey");
             return (Criteria) this;
         }
 
-        public Criteria andKeyNotEqualTo(String value) {
-            addCriterion("key <>", value, "key");
+        public Criteria andSKeyNotEqualTo(String value) {
+            addCriterion("s_key <>", value, "sKey");
             return (Criteria) this;
         }
 
-        public Criteria andKeyGreaterThan(String value) {
-            addCriterion("key >", value, "key");
+        public Criteria andSKeyGreaterThan(String value) {
+            addCriterion("s_key >", value, "sKey");
             return (Criteria) this;
         }
 
-        public Criteria andKeyGreaterThanOrEqualTo(String value) {
-            addCriterion("key >=", value, "key");
+        public Criteria andSKeyGreaterThanOrEqualTo(String value) {
+            addCriterion("s_key >=", value, "sKey");
             return (Criteria) this;
         }
 
-        public Criteria andKeyLessThan(String value) {
-            addCriterion("key <", value, "key");
+        public Criteria andSKeyLessThan(String value) {
+            addCriterion("s_key <", value, "sKey");
             return (Criteria) this;
         }
 
-        public Criteria andKeyLessThanOrEqualTo(String value) {
-            addCriterion("key <=", value, "key");
+        public Criteria andSKeyLessThanOrEqualTo(String value) {
+            addCriterion("s_key <=", value, "sKey");
             return (Criteria) this;
         }
 
-        public Criteria andKeyLike(String value) {
-            addCriterion("key like", value, "key");
+        public Criteria andSKeyLike(String value) {
+            addCriterion("s_key like", value, "sKey");
             return (Criteria) this;
         }
 
-        public Criteria andKeyNotLike(String value) {
-            addCriterion("key not like", value, "key");
+        public Criteria andSKeyNotLike(String value) {
+            addCriterion("s_key not like", value, "sKey");
             return (Criteria) this;
         }
 
-        public Criteria andKeyIn(List<String> values) {
-            addCriterion("key in", values, "key");
+        public Criteria andSKeyIn(List<String> values) {
+            addCriterion("s_key in", values, "sKey");
             return (Criteria) this;
         }
 
-        public Criteria andKeyNotIn(List<String> values) {
-            addCriterion("key not in", values, "key");
+        public Criteria andSKeyNotIn(List<String> values) {
+            addCriterion("s_key not in", values, "sKey");
             return (Criteria) this;
         }
 
-        public Criteria andKeyBetween(String value1, String value2) {
-            addCriterion("key between", value1, value2, "key");
+        public Criteria andSKeyBetween(String value1, String value2) {
+            addCriterion("s_key between", value1, value2, "sKey");
             return (Criteria) this;
         }
 
-        public Criteria andKeyNotBetween(String value1, String value2) {
-            addCriterion("key not between", value1, value2, "key");
+        public Criteria andSKeyNotBetween(String value1, String value2) {
+            addCriterion("s_key not between", value1, value2, "sKey");
             return (Criteria) this;
         }
 
-        public Criteria andValueIsNull() {
-            addCriterion("value is null");
+        public Criteria andSValueIsNull() {
+            addCriterion("s_value is null");
             return (Criteria) this;
         }
 
-        public Criteria andValueIsNotNull() {
-            addCriterion("value is not null");
+        public Criteria andSValueIsNotNull() {
+            addCriterion("s_value is not null");
             return (Criteria) this;
         }
 
-        public Criteria andValueEqualTo(String value) {
-            addCriterion("value =", value, "value");
+        public Criteria andSValueEqualTo(String value) {
+            addCriterion("s_value =", value, "sValue");
             return (Criteria) this;
         }
 
-        public Criteria andValueNotEqualTo(String value) {
-            addCriterion("value <>", value, "value");
+        public Criteria andSValueNotEqualTo(String value) {
+            addCriterion("s_value <>", value, "sValue");
             return (Criteria) this;
         }
 
-        public Criteria andValueGreaterThan(String value) {
-            addCriterion("value >", value, "value");
+        public Criteria andSValueGreaterThan(String value) {
+            addCriterion("s_value >", value, "sValue");
             return (Criteria) this;
         }
 
-        public Criteria andValueGreaterThanOrEqualTo(String value) {
-            addCriterion("value >=", value, "value");
+        public Criteria andSValueGreaterThanOrEqualTo(String value) {
+            addCriterion("s_value >=", value, "sValue");
             return (Criteria) this;
         }
 
-        public Criteria andValueLessThan(String value) {
-            addCriterion("value <", value, "value");
+        public Criteria andSValueLessThan(String value) {
+            addCriterion("s_value <", value, "sValue");
             return (Criteria) this;
         }
 
-        public Criteria andValueLessThanOrEqualTo(String value) {
-            addCriterion("value <=", value, "value");
+        public Criteria andSValueLessThanOrEqualTo(String value) {
+            addCriterion("s_value <=", value, "sValue");
             return (Criteria) this;
         }
 
-        public Criteria andValueLike(String value) {
-            addCriterion("value like", value, "value");
+        public Criteria andSValueLike(String value) {
+            addCriterion("s_value like", value, "sValue");
             return (Criteria) this;
         }
 
-        public Criteria andValueNotLike(String value) {
-            addCriterion("value not like", value, "value");
+        public Criteria andSValueNotLike(String value) {
+            addCriterion("s_value not like", value, "sValue");
             return (Criteria) this;
         }
 
-        public Criteria andValueIn(List<String> values) {
-            addCriterion("value in", values, "value");
+        public Criteria andSValueIn(List<String> values) {
+            addCriterion("s_value in", values, "sValue");
             return (Criteria) this;
         }
 
-        public Criteria andValueNotIn(List<String> values) {
-            addCriterion("value not in", values, "value");
+        public Criteria andSValueNotIn(List<String> values) {
+            addCriterion("s_value not in", values, "sValue");
             return (Criteria) this;
         }
 
-        public Criteria andValueBetween(String value1, String value2) {
-            addCriterion("value between", value1, value2, "value");
+        public Criteria andSValueBetween(String value1, String value2) {
+            addCriterion("s_value between", value1, value2, "sValue");
             return (Criteria) this;
         }
 
-        public Criteria andValueNotBetween(String value1, String value2) {
-            addCriterion("value not between", value1, value2, "value");
+        public Criteria andSValueNotBetween(String value1, String value2) {
+            addCriterion("s_value not between", value1, value2, "sValue");
             return (Criteria) this;
         }
 

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

@@ -165,7 +165,7 @@ public class ScoreService implements IScoreService{
         if(ObjectUtil.isNull(userId)){
             throw new BaseException(CodeEnum.NOT_LOGIN);
         }
-        TaskVo.TaskInfoWithFeign taskInfo = tallFeignClient.getProjectId(submitOnlyOneScore.getPlayerId());
+        TaskVo.TaskInfoWithFeign taskInfo = tallFeignClient.getProjectId(submitOnlyOneScore.getTaskId());
         if(ObjectUtil.isNull(taskInfo)){
             throw new BaseException(CodeEnum.NOT_TASK);
         }

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

@@ -48,20 +48,28 @@ public class SigninService implements ISigninService{
         List<MtSigninBasic> signinBasicList = signinBasicDao.selectByExample(signinBasicExample);
         if(CollectionUtil.isNotEmpty(signinBasicList)){
             MtSigninBasic mtSigninBasic = signinBasicList.get(0);
-            //已签到，返回签到的信息
             List<SigninVo.SignField> signFieldList = new ArrayList<>();
+            //查询签到字段
+            List<PluginVo.PluginSignField> pluginSignFieldList = tallFeignClient.getSignFieldByTaskPluginId(taskPluginId);
+            if(CollectionUtil.isNotEmpty(pluginSignFieldList)){
+                for(PluginVo.PluginSignField pluginSignField : pluginSignFieldList) {
+                    SigninVo.SignField signField = new SigninVo.SignField();
+                    signField.setName(pluginSignField.getName());
+                    signField.setDescription(pluginSignField.getDescription());
+                    signField.setField(pluginSignField.getFieldValue());
+                    signField.setIsFuzzy(pluginSignField.getIsFuzzy());
+                    signField.setIsRequired(pluginSignField.getIsRequired());
+                    signField.setType(pluginSignField.getType());
+                    //已签到，返回签到的信息
                     MtSigninOtherExample signinOtherExample = new MtSigninOtherExample();
-            signinOtherExample.createCriteria().andSigninBasicIdEqualTo(mtSigninBasic.getId());
+                    signinOtherExample.createCriteria().andSigninBasicIdEqualTo(mtSigninBasic.getId())
+                            .andSKeyEqualTo(pluginSignField.getName());
                     List<MtSigninOther> signinOtherList = signinOtherDao.selectByExample(signinOtherExample);
-            if(CollectionUtil.isNotEmpty(signinOtherList)){
-                for (MtSigninOther signinOther : signinOtherList){
-                    SigninVo.SignField signField = new SigninVo.SignField();
-                    signField.setName(signinOther.getKey());
-                    signField.setValue(signinOther.getValue());
+                    signField.setValue(signinOtherList.get(0).getsValue());
+
                     signFieldList.add(signField);
                 }
             }
-
             signInfoVo.setIsSign(1);
             signInfoVo.setSequence(mtSigninBasic.getSequence());
             signInfoVo.setSignTime(mtSigninBasic.getSigninTime());
@@ -137,8 +145,8 @@ public class SigninService implements ISigninService{
                 MtSigninOther signinOther = new MtSigninOther();
                 signinOther.setId(snowflake.nextId());
                 signinOther.setSigninBasicId(signinBasic.getId());
-                signinOther.setKey(signinVoInfo.getKey());
-                signinOther.setValue(signinVoInfo.getValue());
+                signinOther.setsKey(signinVoInfo.getKey());
+                signinOther.setsValue(signinVoInfo.getValue());
                 signinOtherDao.insertSelective(signinOther);
             }
         }
@@ -175,8 +183,8 @@ public class SigninService implements ISigninService{
             if(CollectionUtil.isNotEmpty(signinOtherList)){
                 for (MtSigninOther signinOther : signinOtherList){
                     SigninVo.SaveSignInfo saveSignInfo = new SigninVo.SaveSignInfo();
-                    saveSignInfo.setKey(signinOther.getKey());
-                    saveSignInfo.setValue(signinOther.getValue());
+                    saveSignInfo.setKey(signinOther.getsKey());
+                    saveSignInfo.setValue(signinOther.getsValue());
                     saveSignInfos.add(saveSignInfo);
                 }
             }
@@ -210,8 +218,8 @@ public class SigninService implements ISigninService{
                 if(CollectionUtil.isNotEmpty(signinOtherList)){
                     for (MtSigninOther signinOther : signinOtherList){
                         SigninVo.SaveSignInfo saveSignInfo = new SigninVo.SaveSignInfo();
-                        saveSignInfo.setKey(signinOther.getKey());
-                        saveSignInfo.setValue(signinOther.getValue());
+                        saveSignInfo.setKey(signinOther.getsKey());
+                        saveSignInfo.setValue(signinOther.getsValue());
                         saveSignInfos.add(saveSignInfo);
                     }
                 }

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

@@ -4,8 +4,8 @@
   <resultMap id="BaseResultMap" type="com.ccsens.mt.bean.po.MtSigninOther">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="signin_basic_id" jdbcType="BIGINT" property="signinBasicId" />
-    <result column="key" jdbcType="VARCHAR" property="key" />
-    <result column="value" jdbcType="VARCHAR" property="value" />
+    <result column="s_key" jdbcType="VARCHAR" property="sKey" />
+    <result column="s_value" jdbcType="VARCHAR" property="sValue" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
@@ -69,7 +69,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, signin_basic_id, key, value, created_at, updated_at, rec_status
+    id, signin_basic_id, s_key, s_value, created_at, updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.MtSigninOtherExample" resultMap="BaseResultMap">
     select
@@ -102,11 +102,11 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.ccsens.mt.bean.po.MtSigninOther">
-    insert into t_mt_signin_other (id, signin_basic_id, key, 
-      value, created_at, updated_at, 
+    insert into t_mt_signin_other (id, signin_basic_id, s_key, 
+      s_value, created_at, updated_at, 
       rec_status)
-    values (#{id,jdbcType=BIGINT}, #{signinBasicId,jdbcType=BIGINT}, #{key,jdbcType=VARCHAR}, 
-      #{value,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
+    values (#{id,jdbcType=BIGINT}, #{signinBasicId,jdbcType=BIGINT}, #{sKey,jdbcType=VARCHAR}, 
+      #{sValue,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
       #{recStatus,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.MtSigninOther">
@@ -118,11 +118,11 @@
       <if test="signinBasicId != null">
         signin_basic_id,
       </if>
-      <if test="key != null">
-        key,
+      <if test="sKey != null">
+        s_key,
       </if>
-      <if test="value != null">
-        value,
+      <if test="sValue != null">
+        s_value,
       </if>
       <if test="createdAt != null">
         created_at,
@@ -141,11 +141,11 @@
       <if test="signinBasicId != null">
         #{signinBasicId,jdbcType=BIGINT},
       </if>
-      <if test="key != null">
-        #{key,jdbcType=VARCHAR},
+      <if test="sKey != null">
+        #{sKey,jdbcType=VARCHAR},
       </if>
-      <if test="value != null">
-        #{value,jdbcType=VARCHAR},
+      <if test="sValue != null">
+        #{sValue,jdbcType=VARCHAR},
       </if>
       <if test="createdAt != null">
         #{createdAt,jdbcType=TIMESTAMP},
@@ -173,11 +173,11 @@
       <if test="record.signinBasicId != null">
         signin_basic_id = #{record.signinBasicId,jdbcType=BIGINT},
       </if>
-      <if test="record.key != null">
-        key = #{record.key,jdbcType=VARCHAR},
+      <if test="record.sKey != null">
+        s_key = #{record.sKey,jdbcType=VARCHAR},
       </if>
-      <if test="record.value != null">
-        value = #{record.value,jdbcType=VARCHAR},
+      <if test="record.sValue != null">
+        s_value = #{record.sValue,jdbcType=VARCHAR},
       </if>
       <if test="record.createdAt != null">
         created_at = #{record.createdAt,jdbcType=TIMESTAMP},
@@ -197,8 +197,8 @@
     update t_mt_signin_other
     set id = #{record.id,jdbcType=BIGINT},
       signin_basic_id = #{record.signinBasicId,jdbcType=BIGINT},
-      key = #{record.key,jdbcType=VARCHAR},
-      value = #{record.value,jdbcType=VARCHAR},
+      s_key = #{record.sKey,jdbcType=VARCHAR},
+      s_value = #{record.sValue,jdbcType=VARCHAR},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{record.recStatus,jdbcType=TINYINT}
@@ -212,11 +212,11 @@
       <if test="signinBasicId != null">
         signin_basic_id = #{signinBasicId,jdbcType=BIGINT},
       </if>
-      <if test="key != null">
-        key = #{key,jdbcType=VARCHAR},
+      <if test="sKey != null">
+        s_key = #{sKey,jdbcType=VARCHAR},
       </if>
-      <if test="value != null">
-        value = #{value,jdbcType=VARCHAR},
+      <if test="sValue != null">
+        s_value = #{sValue,jdbcType=VARCHAR},
       </if>
       <if test="createdAt != null">
         created_at = #{createdAt,jdbcType=TIMESTAMP},
@@ -233,8 +233,8 @@
   <update id="updateByPrimaryKey" parameterType="com.ccsens.mt.bean.po.MtSigninOther">
     update t_mt_signin_other
     set signin_basic_id = #{signinBasicId,jdbcType=BIGINT},
-      key = #{key,jdbcType=VARCHAR},
-      value = #{value,jdbcType=VARCHAR},
+      s_key = #{sKey,jdbcType=VARCHAR},
+      s_value = #{sValue,jdbcType=VARCHAR},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{recStatus,jdbcType=TINYINT}

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

@@ -113,6 +113,8 @@ public class TaskVo {
         private int virtual;
         @ApiModelProperty("有无分组")
         private int hasGroup;
+        @ApiModelProperty("分数")
+        private BigDecimal score;
         @ApiModelProperty("插件")
         private List<PluginVo> plugins;
         @ApiModelProperty("二级任务")

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

@@ -225,7 +225,6 @@ public class ProMemberService implements IProMemberService {
     /**
      * 游戏中查询用户的信息
      * @param userId
-     * @param projectId
      * @return
      */
     @Override

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

@@ -5,8 +5,10 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.ccsens.cloudutil.feign.MtFeignClient;
 import com.ccsens.tall.bean.dto.TaskDto;
 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.TaskVo;
 import com.ccsens.tall.persist.dao.*;
@@ -24,6 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 
@@ -61,6 +64,8 @@ public class ProTaskDetailService implements IProTaskDetailService {
     private TaskPluginDao taskPluginDao;
     @Autowired
     private Snowflake snowflake;
+    @Autowired
+    private MtFeignClient mtFeignClient;
 
     @Override
     public void saveTaskDetail(ProTaskDetail taskDetail) {
@@ -136,6 +141,11 @@ public class ProTaskDetailService implements IProTaskDetailService {
                 List<TaskVo.NormalTask> secondNormalTaskList = taskDetailDao.selectNormalTaskListByPM(projectId, firstTaskDetail.getId(), startTime, endTime,roleId);
                 if (CollectionUtil.isNotEmpty(secondNormalTaskList)) {
                     for (TaskVo.NormalTask task : secondNormalTaskList) {
+                        //处理分数
+                        BigDecimal score = mtFeignClient.getAdminScore(task.getProjectId(),task.getDetailId());
+                        if(ObjectUtil.isNotNull(score)){
+                            task.setScore(score);
+                        }
                         //处理插件
                         managePlugin(currentUserId,roleId,task);
                         //二级任务完成状态
@@ -205,6 +215,12 @@ public class ProTaskDetailService implements IProTaskDetailService {
 
         if (CollectionUtil.isNotEmpty(secondTaskVoList)) {
             for (TaskVo.NormalTask normalTask : secondTaskVoList) {
+                //处理分数
+                MemberVo.MemberInfo memberInfo = proMemberService.getMemberByUserIdAndProjectId(currentUserId,normalTask.getProjectId());
+                BigDecimal score = mtFeignClient.getMemberScore(normalTask.getDetailId(),memberInfo.getId());
+                if(ObjectUtil.isNotNull(score)){
+                    normalTask.setScore(score);
+                }
                 //处理插件
                 managePlugin(currentUserId,roleId,normalTask);
                 ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId, normalTask.getId());

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

@@ -358,14 +358,19 @@ public class UserService implements IUserService {
         //1.查找对应账户,不存在则注册
         List<SysAuth> authList = null;
         SysAuth theAuth = null;
+        if(ObjectUtil.isNotNull(openId)) {
             SysAuthExample authExample = new SysAuthExample();
             authExample.createCriteria().andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.Wxmp.value)
                     .andIdentifierEqualTo(openId);
             authList = authDao.selectByExample(authExample);
+        }
         if (CollectionUtil.isEmpty(authList)) {
+            List<SysAuth> sysAuthList = null;
+            if(ObjectUtil.isNotNull(unionId)) {
                 SysAuthExample sysAuthExample = new SysAuthExample();
                 sysAuthExample.createCriteria().andCredentialEqualTo(unionId);
-            List<SysAuth> sysAuthList = authDao.selectByExample(sysAuthExample);
+                sysAuthList = authDao.selectByExample(sysAuthExample);
+            }
             if (CollectionUtil.isNotEmpty(sysAuthList)) {
 //                    SysAuth sysAuth = sysAuthList.get(0);
                 //添加认证方式