Merge branch 'dev' of http://gitlab.91isoft.com:90/wangfei/vehicle-quality-review into wangdingyi

quality-review/src/main/java/com/ruoyi/domain/SystemReviewTask.java

@@ -120,32 +120,38 @@ public class SystemReviewTask {
      * 关联标准表id
      */
     @JsonFormat(shape = JsonFormat.Shape.STRING)
+    @ApiModelProperty("关联标准表id")
     private Long standardId;
 
     /**
      * 标准名称
      */
+    @ApiModelProperty("标准名称")
     private String name;
 
     /**
      * 标准号
      */
+    @ApiModelProperty("标准号")
     private String standardNo;
 
     /**
      * 文件路径
      */
+    @ApiModelProperty("文件路径")
     private String file;
 
     /**
      * 提交人id
      */
     @JsonFormat(shape = JsonFormat.Shape.STRING)
+    @ApiModelProperty("提交人id")
     private Long submitById;
 
     /**
      * 提交人姓名
      */
+    @ApiModelProperty("提交人姓名")
     private String submitByName;
 
 }

quality-review/src/main/java/com/ruoyi/mapper/ReviewTaskUserRelationMapper.java

@@ -2,8 +2,11 @@ package com.ruoyi.mapper;
 
 import com.ruoyi.domain.ReviewTaskUserRelation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
 * @author wangfei
 * @description 针对表【t_system_review_task_user_relation(体系审查任务&用户映射关系)】的数据库操作Mapper
@@ -13,6 +16,13 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface ReviewTaskUserRelationMapper extends BaseMapper<ReviewTaskUserRelation> {
 
+    /**
+     * 根据任务id查询小组成员
+     * @param taskId
+     * @return
+     */
+    List<ReviewTaskUserRelation> selectQTeamMembers(@Param("taskId") Long taskId);
+
 }
 
 

quality-review/src/main/java/com/ruoyi/service/ReviewTaskUserRelationService.java

@@ -2,6 +2,9 @@ package com.ruoyi.service;
 
 import com.ruoyi.domain.ReviewTaskUserRelation;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * @author wangfei
@@ -10,4 +13,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface ReviewTaskUserRelationService extends IService<ReviewTaskUserRelation> {
 
+    /**
+     * 根据任务id查询小组成员
+     * @param taskId
+     * @return
+     */
+    List<ReviewTaskUserRelation> selectQTeamMembers(Long taskId);
+
 }

quality-review/src/main/java/com/ruoyi/service/impl/ReviewTaskUserRelationServiceImpl.java

@@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.domain.ReviewTaskUserRelation;
 import com.ruoyi.service.ReviewTaskUserRelationService;
 import com.ruoyi.mapper.ReviewTaskUserRelationMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * @author wangfei
 * @description 针对表【t_review_task_user_relation(体系审查任务&用户映射关系)】的数据库操作Service实现
@@ -15,6 +19,19 @@ import org.springframework.stereotype.Service;
 public class ReviewTaskUserRelationServiceImpl extends ServiceImpl<ReviewTaskUserRelationMapper, ReviewTaskUserRelation>
     implements ReviewTaskUserRelationService {
 
+    @Autowired
+    ReviewTaskUserRelationMapper reviewTaskUserRelationMapper;
+
+    /**
+     * 根据任务id查询小组成员
+     * @param taskId
+     * @return
+     */
+    @Override
+    public List<ReviewTaskUserRelation> selectQTeamMembers(Long taskId){
+        return reviewTaskUserRelationMapper.selectQTeamMembers(taskId);
+    }
+
 }
 
 

quality-review/src/main/java/com/ruoyi/web/ReviewTaskUserRelationController.java

+package com.ruoyi.web;
+
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.domain.ReviewTaskUserRelation;
+import com.ruoyi.service.ReviewTaskUserRelationService;
+import com.ruoyi.web.request.ReviewTaskUserRelationMembersRequest;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.skywalking.apm.toolkit.trace.Tag;
+import org.apache.skywalking.apm.toolkit.trace.Tags;
+import org.apache.skywalking.apm.toolkit.trace.Trace;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+@Api("体系审查任务组成员")
+@RestController
+@RequestMapping("/review/Task/User")
+public class ReviewTaskUserRelationController extends BaseController {
+
+    @Autowired
+    ReviewTaskUserRelationService reviewTaskUserRelationService;
+
+
+    /**
+     * 根据任务id查询小组成员
+     * @return
+     */
+    @ApiOperation("根据任务Id查询任务组成员")
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @RequestMapping(method = RequestMethod.POST, value = "/members")
+    public R<List<ReviewTaskUserRelation>> selectQTeamMemberList(@Validated @RequestBody ReviewTaskUserRelationMembersRequest request){
+        List<ReviewTaskUserRelation> list = reviewTaskUserRelationService.selectQTeamMembers(request.getTaskId());
+        return R.ok(list);
+    }
+
+}

quality-review/src/main/java/com/ruoyi/web/request/ReviewTaskUserRelationMembersRequest.java

+package com.ruoyi.web.request;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ReviewTaskUserRelationMembersRequest {
+    @ApiModelProperty("任务id")
+    private Long taskId;
+}

quality-review/src/main/resources/mapper/ReviewTaskUserRelationMapper.xml

@@ -14,4 +14,12 @@
     <sql id="Base_Column_List">
         task_id,user_id,is_leader,name
     </sql>
+
+    <select id="selectQTeamMembers" parameterType="Long" resultMap="BaseResultMap">
+        <include refid="Base_Column_List"/>
+        where
+        <if test="taskId != null and taskId != ''">
+            task_id = #{taskId}
+        </if>
+    </select>
 </mapper>