Skip to content

V
vehicle-quality-review
Commit 65202478 authored by 宋源硕's avatar 宋源硕
Browse files
Options

Merge branch 'songyuanshuo' into 'dev' 

取消新增场景时任务与创新基地人员的绑定、更改评审人员查询。

See merge request !428
parents 424bfee8 5446484f
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 24 deletions
quality-review/src/main/java/com/ruoyi/mapper/ReviewSceneChangeTaskMapper.java
View file @ 65202478
......@@ -6,6 +6,7 @@ import com.ruoyi.web.request.ReviewSceneChangeTaskFindCreateRequest;
import com.ruoyi.web.request.ReviewSceneChangeTaskFindFinishRequest;
import com.ruoyi.web.request.ReviewSceneChangeTaskFindPendingRequest;
import com.ruoyi.web.response.ReviewSceneChangeTaskResponse;
import com.ruoyi.web.response.ReviewerListResponse;
import org.springframework.stereotype.Repository;
import org.apache.ibatis.annotations.Param;
......@@ -60,6 +61,8 @@ public interface ReviewSceneChangeTaskMapper extends BaseMapper<ReviewSceneChang
* @return
*/
List<ReviewSceneChangeTaskResponse> findFinishList(@Param("userId") Long userId, @Param("request") ReviewSceneChangeTaskFindFinishRequest request);
List<ReviewerListResponse> selectReviewerListByTaskId(@Param("id") Long id);
}
......
quality-review/src/main/java/com/ruoyi/service/impl/ReviewSceneChangeTaskServiceImpl.java
View file @ 65202478
......@@ -3,6 +3,7 @@ package com.ruoyi.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.Db;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
......@@ -24,6 +25,7 @@ import com.ruoyi.web.request.ReviewSceneChangeTaskPassRequest;
import com.ruoyi.web.response.ReviewDetailsListResponse;
import com.ruoyi.web.response.ReviewKeyPointListResponse;
import com.ruoyi.web.response.ReviewSceneChangeTaskResponse;
import com.ruoyi.web.response.ReviewerListResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -83,7 +85,7 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
// 保存任务
save(reviewSceneChangeTask);
// 绑定创新基地人员
/*// 绑定创新基地人员
List<SysUser> InnovationSysUsers = sysUserService.selectUserListByRoleId(ReviewSceneChangeTask.INNOVATION_BASE_ID);
List<ReviewSceneChangeTaskUserRelation> InnovationRelations = new ArrayList();
for(SysUser sysUser : InnovationSysUsers) {
......@@ -96,7 +98,7 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
InnovationRelations.add(relation);
}
reviewSceneChangeTaskUserRelationService.saveBatch(InnovationRelations);
reviewSceneChangeTaskUserRelationService.saveBatch(InnovationRelations);*/
// 绑定审核人
List<SysUser> sysUsers = sysUserService.selectUserListByRoleId(ReviewSceneChangeTask.REVIEW_ROLE_ID);
......@@ -249,18 +251,29 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
List<ReviewSceneChangeTaskResponse> reviewSceneChangeTask = reviewSceneChangeTaskMapper.findPendingListByUserId(userId,request);
//查询审核人员
List<Long> reviewerIdList = sysUserRoleMapper.selectReviewerIdByRoleId(ReviewSceneChangeTask.REVIEW_ROLE_ID);
for (ReviewSceneChangeTaskResponse task : reviewSceneChangeTask){
Long id = Long.parseLong(task.getId());
List<ReviewerListResponse> reviewerListResponseList = reviewSceneChangeTaskMapper.selectReviewerListByTaskId(id);
Set<String> reviewerNameSet = new HashSet<>();
for (ReviewerListResponse reviewer : reviewerListResponseList){
reviewerNameSet.add(reviewer.getReviewer());
}
//生成审核人员名字字符串
String reviewerNames = String.join("、", reviewerNameSet);
task.setReviewer(reviewerNames);
}
/*List<Long> reviewerIdList = sysUserRoleMapper.selectReviewerIdByRoleId(ReviewSceneChangeTask.REVIEW_ROLE_ID);
List<SysUser> reviewerList = sysUserService.selectUserListByIds(reviewerIdList);
Set<String> reviewerNameSet = new HashSet<>();
for (SysUser reviewer : reviewerList){
reviewerNameSet.add(reviewer.getNickName());
}
//生成审核人员名字字符串
String reviewerNames = String.join("、", reviewerNameSet);
for (ReviewSceneChangeTaskResponse taskResponse : reviewSceneChangeTask){
taskResponse.setReviewer(reviewerNames);
}
}*/
return reviewSceneChangeTask;
}
......@@ -274,17 +287,28 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
List<ReviewSceneChangeTaskResponse> reviewSceneChangeTask = reviewSceneChangeTaskMapper.findFinishListByUserId(userId,request);
//查询审核人员
for (ReviewSceneChangeTaskResponse task : reviewSceneChangeTask){
Long id = Long.parseLong(task.getId());
List<ReviewerListResponse> reviewerListResponseList = reviewSceneChangeTaskMapper.selectReviewerListByTaskId(id);
Set<String> reviewerNameSet = new HashSet<>();
for (ReviewerListResponse reviewer : reviewerListResponseList){
reviewerNameSet.add(reviewer.getReviewer());
}
//生成审核人员名字字符串
String reviewerNames = String.join("、", reviewerNameSet);
task.setReviewer(reviewerNames);
}
/*List<Long> reviewerIdList = sysUserRoleMapper.selectReviewerIdByRoleId(ReviewSceneChangeTask.REVIEW_ROLE_ID);
List<Long> reviewerIdList = sysUserRoleMapper.selectReviewerIdByRoleId(ReviewSceneChangeTask.REVIEW_ROLE_ID);
List<SysUser> reviewerList = sysUserService.selectUserListByIds(reviewerIdList);
Set<String> reviewerNameSet = new HashSet<>();
for (SysUser reviewer : reviewerList){
reviewerNameSet.add(reviewer.getNickName());
}
//生成审核人员名字字符串
String reviewerNames = String.join("、", reviewerNameSet);
for (ReviewSceneChangeTaskResponse taskResponse: reviewSceneChangeTask){
taskResponse.setReviewer(reviewerNames);
}
}*/
return reviewSceneChangeTask;
}
......@@ -297,18 +321,15 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
public List<ReviewSceneChangeTask> findCreateListByUserId(Long userId, ReviewSceneChangeTaskFindCreateRequest request) {
List<ReviewSceneChangeTask> reviewSceneChangeTask = reviewSceneChangeTaskMapper.findCreateListByUserId(userId,request);
//查询审核人员
List<Long> reviewerIdList = sysUserRoleMapper.selectReviewerIdByRoleId(ReviewSceneChangeTask.REVIEW_ROLE_ID);
List<SysUser> reviewerList = sysUserService.selectUserListByIds(reviewerIdList);
Set<String> reviewerNameSet = new HashSet<>();
for (SysUser reviewer : reviewerList) {
reviewerNameSet.add(reviewer.getNickName());
}
// 生成审核人员名字字符串
String reviewerNames = String.join("、", reviewerNameSet);
for(ReviewSceneChangeTask task : reviewSceneChangeTask){
/*List<Long> reviewerIdList = sysUserRoleMapper.selectReviewerIdByRoleId(ReviewSceneChangeTask.REVIEW_ROLE_ID);*/
for (ReviewSceneChangeTask task : reviewSceneChangeTask){
List<ReviewerListResponse> reviewerListResponseList = reviewSceneChangeTaskMapper.selectReviewerListByTaskId(task.getId());
Set<String> reviewerNameSet = new HashSet<>();
for (ReviewerListResponse reviewer : reviewerListResponseList){
reviewerNameSet.add(reviewer.getReviewer());
}
// 生成审核人员名字字符串
String reviewerNames = String.join("、", reviewerNameSet);
task.setReviewer(reviewerNames);
}
return reviewSceneChangeTask;
......@@ -317,7 +338,14 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
@Override
public ReviewSceneChangeTask getBySceneChangeTaskId(Long id) {
ReviewSceneChangeTask reviewSceneChangeTask = reviewSceneChangeTaskMapper.findSceneChangeTaskById(id);
//查询审核人员
List<ReviewerListResponse> reviewerListResponseList = reviewSceneChangeTaskMapper.selectReviewerListByTaskId(id);
Set<String> reviewerNameSet = new HashSet<>();
for (ReviewerListResponse reviewer : reviewerListResponseList){
reviewerNameSet.add(reviewer.getReviewer());
}
String reviewerNames = String.join("、", reviewerNameSet);
reviewSceneChangeTask.setReviewer(reviewerNames);
/*//查询审核人员
List<Long> reviewerIdList = sysUserRoleMapper.selectReviewerIdByRoleId(ReviewSceneChangeTask.REVIEW_ROLE_ID);
List<SysUser> reviewerList = sysUserService.selectUserListByIds(reviewerIdList);
......@@ -328,7 +356,7 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
// 生成审核人员名字字符串
String reviewerNames = String.join("、", reviewerNameSet);
reviewSceneChangeTask.setReviewer(reviewerNames);
reviewSceneChangeTask.setReviewer(reviewerNames);*/
return reviewSceneChangeTask;
}
......
quality-review/src/main/java/com/ruoyi/web/response/ReviewerListResponse.java 0 → 100644
View file @ 65202478
package com.ruoyi.web.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ApiModel(value = "ReviewerListResponse", description = "评审人员集合")
@Data
public class ReviewerListResponse {
@ApiModelProperty("评审员名称")
private String reviewer;
}
quality-review/src/main/resources/mapper/ReviewSceneChangeTaskMapper.xml
View file @ 65202478
......@@ -62,7 +62,7 @@
SELECT sct.*, sctu.decision FROM t_review_scene_change_task sct
LEFT JOIN t_review_scene_change_task_user_relation sctu ON sct.id = sctu.task_id
WHERE sctu.user_id = #{userId} and sctu.decision IS NULL and sctu.role_id = 103
and sct.innovation_base_result = 'PASS'
/*and sct.innovation_base_result = 'PASS'*/
<if test="request.operationSort != null and request.operationSort != ''">
and sct.operation_sort = #{request.operationSort}
</if>
......@@ -81,7 +81,7 @@
SELECT sct.*, sctu.decision FROM t_review_scene_change_task sct
LEFT JOIN t_review_scene_change_task_user_relation sctu ON sct.id = sctu.task_id
WHERE sctu.user_id = #{userId} and sctu.decision IS NOT NULL and sctu.role_id = 103
and sct.innovation_base_result = 'PASS'
/*and sct.innovation_base_result = 'PASS'*/
<if test="request.operationSort != null and request.operationSort != ''">
and sct.operation_sort = #{request.operationSort}
</if>
......@@ -98,7 +98,7 @@
<select id="findCreateListByUserId" resultType="com.ruoyi.domain.ReviewSceneChangeTask">
SELECT * FROM t_review_scene_change_task
WHERE task_initiator_id = #{userId} and innovation_base_result = 'PASS'
WHERE task_initiator_id = #{userId} /*and innovation_base_result = 'PASS'*/
<if test="request.operationSort != null and request.operationSort != ''">
and operation_sort = #{request.operationSort}
</if>
......@@ -155,5 +155,10 @@
and inspect_standard_id = #{request.inspectStandardId}
</if>
</select>
<select id="selectReviewerListByTaskId" resultType="com.ruoyi.web.response.ReviewerListResponse">
select name as reviewer
from t_review_scene_change_task_user_relation
where task_id = #{id}
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment