Commit 55f19a4e authored by yuanshuo's avatar yuanshuo

修改查询评审列表sql

1.更改/review/scene/change/task/findPending 接口sql 去除根据评审基地意见判断
2.更改/review/scene/change/task/findFinish接口sql去除根据评审基地意见判断
3.更改/review/scene/change/task/findCreate接口sql去除根据评审基地意见判断
parent f4fe5804
...@@ -178,6 +178,7 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha ...@@ -178,6 +178,7 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
if(task.getTaskResult().equals(ReviewSceneChangeTaskUserRelation.DECISION_PASS)) { if(task.getTaskResult().equals(ReviewSceneChangeTaskUserRelation.DECISION_PASS)) {
// 更新审核标准 // 更新审核标准
reviewSceneService.change(task); reviewSceneService.change(task);
// TODO 评审通过修改标准版本号,每月第一天次数从1开始
//场景变更时发送信息 //场景变更时发送信息
if (Objects.equals(task.getOperationSort(), "ADD_SCENE") || Objects.equals(task.getOperationSort(), "DELETE_SCENE")) { if (Objects.equals(task.getOperationSort(), "ADD_SCENE") || Objects.equals(task.getOperationSort(), "DELETE_SCENE")) {
...@@ -521,6 +522,7 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha ...@@ -521,6 +522,7 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
public List<SysUser> getReviewList() { public List<SysUser> getReviewList() {
// 获取用户ID列表 // 获取用户ID列表
List<Long> reviewerIdList = sysUserRoleMapper.selectReviewerIdByRoleId(ReviewSceneChangeTask.REVIEW_ROLE_ID); List<Long> reviewerIdList = sysUserRoleMapper.selectReviewerIdByRoleId(ReviewSceneChangeTask.REVIEW_ROLE_ID);
System.out.println(reviewerIdList + "========");
// 获取用户列表 // 获取用户列表
List<SysUser> reviewerList = sysUserService.selectUserListByIds(reviewerIdList); List<SysUser> reviewerList = sysUserService.selectUserListByIds(reviewerIdList);
......
...@@ -113,6 +113,8 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask ...@@ -113,6 +113,8 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
// 4. 修改任务状态为 SIGNED 待签字 // 4. 修改任务状态为 SIGNED 待签字
systemReviewTask.setTaskStatus(SystemReviewTask.STATUS_SIGNED); systemReviewTask.setTaskStatus(SystemReviewTask.STATUS_SIGNED);
// TODO setsystemReviewTask.version的值,根据任务的standardId从t_standard表查到current_version的值
// 5. 设置问卷结果 // 5. 设置问卷结果
if (reviewDetailsResultMapper.findNotPass(systemReviewTask.getId()) > 0) { if (reviewDetailsResultMapper.findNotPass(systemReviewTask.getId()) > 0) {
systemReviewTask.setTaskResult("REJECT"); systemReviewTask.setTaskResult("REJECT");
......
...@@ -62,7 +62,6 @@ ...@@ -62,7 +62,6 @@
SELECT sct.*, sctu.decision FROM t_review_scene_change_task sct 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 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 WHERE sctu.user_id = #{userId} and sctu.decision IS NULL and sctu.role_id = 103
and sct.innovation_base_result = 'PASS'
<if test="request.operationSort != null and request.operationSort != ''"> <if test="request.operationSort != null and request.operationSort != ''">
and sct.operation_sort = #{request.operationSort} and sct.operation_sort = #{request.operationSort}
</if> </if>
...@@ -82,7 +81,6 @@ ...@@ -82,7 +81,6 @@
SELECT sct.*, sctu.decision FROM t_review_scene_change_task sct 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 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 WHERE sctu.user_id = #{userId} and sctu.decision IS NOT NULL and sctu.role_id = 103
and sct.innovation_base_result = 'PASS'
<if test="request.operationSort != null and request.operationSort != ''"> <if test="request.operationSort != null and request.operationSort != ''">
and sct.operation_sort = #{request.operationSort} and sct.operation_sort = #{request.operationSort}
</if> </if>
...@@ -101,7 +99,7 @@ ...@@ -101,7 +99,7 @@
<select id="findCreateListByUserId" resultType="com.ruoyi.domain.ReviewSceneChangeTask"> <select id="findCreateListByUserId" resultType="com.ruoyi.domain.ReviewSceneChangeTask">
SELECT * FROM t_review_scene_change_task SELECT * FROM t_review_scene_change_task
WHERE task_initiator_id = #{userId} and innovation_base_result = 'PASS' WHERE task_initiator_id = #{userId}
<if test="request.operationSort != null and request.operationSort != ''"> <if test="request.operationSort != null and request.operationSort != ''">
and operation_sort = #{request.operationSort} and operation_sort = #{request.operationSort}
</if> </if>
......
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