Commit 0bafb7e9 authored by yuanshuo's avatar yuanshuo

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

 Conflicts:
	quality-review/src/main/java/com/ruoyi/web/ReviewSceneChangeTaskController.java
parents b003423c 3c030345
......@@ -16,15 +16,18 @@ import com.ruoyi.web.response.ReviewKeyPointListResponse;
import com.ruoyi.web.response.ReviewSceneChangeTaskResponse;
import com.ruoyi.web.request.*;
import com.ruoyi.web.response.ReviewStandardListResponse;
import com.ruoyi.web.response.ReviewSceneChangeTaskResponse;
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.apache.xmlbeans.impl.xb.xsdschema.Public;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
......
......@@ -61,7 +61,7 @@
<select id="findPendingListByUserId" resultType="com.ruoyi.web.response.ReviewSceneChangeTaskResponse">
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
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 != ''">
and sct.operation_sort = #{request.operationSort}
......@@ -80,7 +80,7 @@
<select id="findFinishListByUserId" resultType="com.ruoyi.web.response.ReviewSceneChangeTaskResponse">
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
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 != ''">
and sct.operation_sort = #{request.operationSort}
......
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