Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vehicle-quality-review
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王飞
vehicle-quality-review
Commits
0d408f97
Commit
0d408f97
authored
Feb 22, 2024
by
wdy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改任务&查询已办任务
parent
71dfc9fb
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
84 additions
and
11 deletions
+84
-11
TaskMapper.java
...ity-review/src/main/java/com/ruoyi/mapper/TaskMapper.java
+4
-0
TaskService.java
...y-review/src/main/java/com/ruoyi/service/TaskService.java
+7
-0
TaskServiceImpl.java
...src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java
+19
-7
TaskController.java
...ty-review/src/main/java/com/ruoyi/web/TaskController.java
+10
-1
TaskEditRequest.java
.../src/main/java/com/ruoyi/web/request/TaskEditRequest.java
+7
-0
TaskMapper.xml
quality-review/src/main/resources/mapper/TaskMapper.xml
+35
-2
TaskUserRelationMapper.xml
...view/src/main/resources/mapper/TaskUserRelationMapper.xml
+2
-1
No files found.
quality-review/src/main/java/com/ruoyi/mapper/TaskMapper.java
View file @
0d408f97
...
@@ -2,6 +2,8 @@ package com.ruoyi.mapper;
...
@@ -2,6 +2,8 @@ package com.ruoyi.mapper;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.ruoyi.domain.Task
;
import
com.ruoyi.domain.Task
;
import
com.ruoyi.domain.TaskSampleRelation
;
import
com.ruoyi.domain.TaskUserRelation
;
import
com.ruoyi.web.request.TaskFindFinishRequest
;
import
com.ruoyi.web.request.TaskFindFinishRequest
;
import
com.ruoyi.web.request.TaskFindPendingRequest
;
import
com.ruoyi.web.request.TaskFindPendingRequest
;
import
com.ruoyi.web.request.TaskFindRequest
;
import
com.ruoyi.web.request.TaskFindRequest
;
...
@@ -21,6 +23,8 @@ public interface TaskMapper extends BaseMapper<Task> {
...
@@ -21,6 +23,8 @@ public interface TaskMapper extends BaseMapper<Task> {
List
<
Task
>
findFinish
(
TaskFindFinishRequest
request
);
List
<
Task
>
findFinish
(
TaskFindFinishRequest
request
);
List
<
Task
>
findUserFinish
(
@Param
(
"request"
)
TaskFindFinishRequest
request
,
@Param
(
"userId"
)
Long
userId
);
List
<
TaskFindResponse
>
findByUserId
(
@Param
(
"request"
)
TaskFindRequest
request
,
@Param
(
"userId"
)
Long
userId
);
List
<
TaskFindResponse
>
findByUserId
(
@Param
(
"request"
)
TaskFindRequest
request
,
@Param
(
"userId"
)
Long
userId
);
Long
findByCarReviewTaskId
(
@Param
(
"carReviewId"
)
Long
carReviewId
);
Long
findByCarReviewTaskId
(
@Param
(
"carReviewId"
)
Long
carReviewId
);
...
...
quality-review/src/main/java/com/ruoyi/service/TaskService.java
View file @
0d408f97
...
@@ -47,4 +47,11 @@ public interface TaskService extends IService<Task> {
...
@@ -47,4 +47,11 @@ public interface TaskService extends IService<Task> {
List
<
TaskFindResponse
>
findCreate
(
TaskFindRequest
request
,
Long
userId
);
List
<
TaskFindResponse
>
findCreate
(
TaskFindRequest
request
,
Long
userId
);
TaskGetInfoResponse
getInfo
(
TaskGetInfoRequest
request
);
TaskGetInfoResponse
getInfo
(
TaskGetInfoRequest
request
);
/**
* 查询已办任务
* @param request
* @return
*/
List
<
Task
>
findUserFinish
(
TaskFindFinishRequest
request
,
Long
userId
);
}
}
quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java
View file @
0d408f97
...
@@ -135,7 +135,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
...
@@ -135,7 +135,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
// 保存关联的零部件样品信息
// 保存关联的零部件样品信息
List
<
TaskSampleRelation
>
partRelations
=
request
.
getPartSample
();
List
<
TaskSampleRelation
>
partRelations
=
request
.
getPartSample
();
if
(
relations
.
size
()
!=
0
&&
r
elations
!=
null
)
{
if
(
partRelations
.
size
()
!=
0
&&
partR
elations
!=
null
)
{
for
(
TaskSampleRelation
sampleRelation
:
partRelations
)
{
for
(
TaskSampleRelation
sampleRelation
:
partRelations
)
{
sampleRelation
.
setTaskId
(
task
.
getId
());
sampleRelation
.
setTaskId
(
task
.
getId
());
}
}
...
@@ -189,29 +189,35 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
...
@@ -189,29 +189,35 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
taskService
.
updateById
(
task
);
taskService
.
updateById
(
task
);
// 构建并保存该任务所关联的审核组信息
// 构建并保存该任务所关联的审核组信息
List
<
TaskUserRelation
>
list
=
taskUserRelationService
.
selectQTeamMembers
(
request
.
getId
());
taskUserRelationService
.
removeBatchByIds
(
list
);
for
(
TaskUserRelation
auditor
:
auditors
)
{
for
(
TaskUserRelation
auditor
:
auditors
)
{
auditor
.
setTaskId
(
task
.
getId
());
auditor
.
setTaskId
(
task
.
getId
());
}
}
taskUserRelationService
.
updateBatchById
(
auditors
);
taskUserRelationService
.
saveBatch
(
auditors
);
// 保存关联的整车样品信息
// 保存关联的整车样品信息
List
<
TaskSampleRelation
>
relationList
=
taskSampleRelationService
.
selectByTaskId
(
request
.
getId
(),
TaskSampleRelation
.
COMPLETE_VEHICLE_SAMPLE
);
taskSampleRelationService
.
removeBatchByIds
(
relationList
);
List
<
TaskSampleRelation
>
relations
=
request
.
getSample
();
List
<
TaskSampleRelation
>
relations
=
request
.
getSample
();
if
(
relations
.
size
()
!=
0
&&
relations
!=
null
)
{
if
(
relations
.
size
()
!=
0
&&
relations
!=
null
)
{
for
(
TaskSampleRelation
sampleRelation
:
relations
)
{
for
(
TaskSampleRelation
sampleRelation
:
relations
)
{
sampleRelation
.
setTaskId
(
task
.
getId
());
sampleRelation
.
setTaskId
(
task
.
getId
());
}
}
taskSampleRelationService
.
updateBatchById
(
relations
);
taskSampleRelationService
.
saveBatch
(
relations
);
}
}
// 保存关联的零部件样品信息
// 保存关联的零部件样品信息
List
<
TaskSampleRelation
>
partRelationList
=
taskSampleRelationService
.
selectByTaskId
(
request
.
getId
(),
TaskSampleRelation
.
PART_VEHICLE_SAMPLE
);
taskSampleRelationService
.
removeBatchByIds
(
partRelationList
);
List
<
TaskSampleRelation
>
partRelations
=
request
.
getPartSample
();
List
<
TaskSampleRelation
>
partRelations
=
request
.
getPartSample
();
if
(
relations
.
size
()
!=
0
&&
r
elations
!=
null
)
{
if
(
partRelations
.
size
()
!=
0
&&
partR
elations
!=
null
)
{
for
(
TaskSampleRelation
s
ampleRelation
:
partRelations
)
{
for
(
TaskSampleRelation
partS
ampleRelation
:
partRelations
)
{
s
ampleRelation
.
setTaskId
(
task
.
getId
());
partS
ampleRelation
.
setTaskId
(
task
.
getId
());
}
}
taskSampleRelationService
.
updateBatchById
(
partRelations
);
taskSampleRelationService
.
saveBatch
(
partRelations
);
}
}
}
}
...
@@ -270,6 +276,12 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
...
@@ -270,6 +276,12 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
return
response
;
return
response
;
}
}
@Override
public
List
<
Task
>
findUserFinish
(
TaskFindFinishRequest
request
,
Long
userId
)
{
return
taskMapper
.
findUserFinish
(
request
,
userId
);
}
public
Long
saveSystemReview
(
TaskCreateRequest
request
,
SysUser
initiator
,
Standard
standard
,
TaskUserRelation
leader
)
{
public
Long
saveSystemReview
(
TaskCreateRequest
request
,
SysUser
initiator
,
Standard
standard
,
TaskUserRelation
leader
)
{
// 构建并保存任务信息
// 构建并保存任务信息
...
...
quality-review/src/main/java/com/ruoyi/web/TaskController.java
View file @
0d408f97
...
@@ -90,7 +90,7 @@ public class TaskController extends BaseController {
...
@@ -90,7 +90,7 @@ public class TaskController extends BaseController {
return
getDataTable
(
taskService
.
findPending
(
request
));
return
getDataTable
(
taskService
.
findPending
(
request
));
}
}
@ApiOperation
(
"查询
完成的
任务"
)
@ApiOperation
(
"查询
已归档
任务"
)
@Trace
@Trace
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/findFinish"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/findFinish"
)
...
@@ -99,6 +99,15 @@ public class TaskController extends BaseController {
...
@@ -99,6 +99,15 @@ public class TaskController extends BaseController {
return
getDataTable
(
taskService
.
findFinish
(
request
));
return
getDataTable
(
taskService
.
findFinish
(
request
));
}
}
@ApiOperation
(
"查询已办任务"
)
@Trace
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/findUserFinish"
)
public
TableDataInfo
<
Task
>
findUserFinish
(
@Validated
@RequestBody
TaskFindFinishRequest
request
)
{
startPage
(
request
);
return
getDataTable
(
taskService
.
findUserFinish
(
request
,
getUserId
()));
}
@ApiOperation
(
"编辑任务"
)
@ApiOperation
(
"编辑任务"
)
@Trace
@Trace
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
...
...
quality-review/src/main/java/com/ruoyi/web/request/TaskEditRequest.java
View file @
0d408f97
package
com
.
ruoyi
.
web
.
request
;
package
com
.
ruoyi
.
web
.
request
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.ruoyi.domain.TaskSampleRelation
;
import
com.ruoyi.domain.TaskSampleRelation
;
import
com.ruoyi.domain.TaskUserRelation
;
import
com.ruoyi.domain.TaskUserRelation
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
...
@@ -13,6 +16,10 @@ import java.util.List;
...
@@ -13,6 +16,10 @@ import java.util.List;
@Data
@Data
public
class
TaskEditRequest
{
public
class
TaskEditRequest
{
@ApiModelProperty
(
"主键"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
private
Long
id
;
@ApiModelProperty
(
"小组成员"
)
@ApiModelProperty
(
"小组成员"
)
private
List
<
TaskUserRelation
>
auditors
;
private
List
<
TaskUserRelation
>
auditors
;
...
...
quality-review/src/main/resources/mapper/TaskMapper.xml
View file @
0d408f97
...
@@ -82,7 +82,7 @@
...
@@ -82,7 +82,7 @@
</select>
</select>
<select
id=
"findPending"
parameterType=
"com.ruoyi.web.request.TaskFindPendingRequest"
resultMap=
"ResponseMap"
>
<select
id=
"findPending"
parameterType=
"com.ruoyi.web.request.TaskFindPendingRequest"
resultMap=
"ResponseMap"
>
SELECT t.id, t.system_review_task_id, t.car_review_task_id,
SELECT t.id, t.system_review_task_id, t.car_review_task_id,
t.task_no,t.task_name,t.task_status,t.name,
t.task_no,t.task_name,t.task_status,t.
run_status,t.
name,
t.leader_id,t.leader,
t.leader_id,t.leader,
t.task_begin_time,
t.task_begin_time,
t.product_model,
t.product_model,
...
@@ -122,7 +122,7 @@
...
@@ -122,7 +122,7 @@
</select>
</select>
<select
id=
"findFinish"
parameterType=
"com.ruoyi.web.request.TaskFindFinishRequest"
resultType=
"com.ruoyi.domain.Task"
>
<select
id=
"findFinish"
parameterType=
"com.ruoyi.web.request.TaskFindFinishRequest"
resultType=
"com.ruoyi.domain.Task"
>
SELECT t.id, t.system_review_task_id, t.car_review_task_id,
SELECT t.id, t.system_review_task_id, t.car_review_task_id,
t.task_no,t.task_name,t.task_status,
t.task_no,t.task_name,t.task_status,
t.name,
t.product_model,
t.product_model,
t.leader_id,t.leader,
t.leader_id,t.leader,
t.task_begin_time,t.task_end_time
t.task_begin_time,t.task_end_time
...
@@ -204,6 +204,39 @@
...
@@ -204,6 +204,39 @@
</where>
</where>
order by t.create_time desc
order by t.create_time desc
</select>
</select>
<select
id=
"findUserFinish"
parameterType=
"com.ruoyi.web.request.TaskFindFinishRequest"
resultType=
"com.ruoyi.domain.Task"
>
SELECT t.id, t.system_review_task_id, t.car_review_task_id,
t.task_no,t.task_name,t.task_status,t.name,
t.product_model,
t.leader_id,t.leader,
t.task_begin_time,t.task_end_time
FROM t_task t
<where>
t.id IN (
SELECT task_id FROM t_task_user_relation WHERE user_id = #{userId}
)
and t.task_status = 'FINISH'
<if
test=
"request.standardId != null and request.standardId != ''"
>
and t.standard_id = #{standardId}
</if>
<if
test=
"request.taskNo != null and request.taskNo != ''"
>
and t.task_no = #{taskNo}
</if>
<if
test=
"request.taskName != null and request.taskName != ''"
>
and t.task_name like concat('%',#{taskName},'%')
</if>
<if
test=
"request.productModel != null and request.productModel != ''"
>
and t.product_model = #{productModel}
</if>
<if
test=
"request.inspectionItem != null and request.inspectionItem != ''"
>
AND (
(#{request.inspectionItem} = 'sraif' AND t.system_review_task_id IS NOT NULL)
OR
(#{request.inspectionItem} = 'grfis' AND t.car_review_task_id IS NOT NULL)
)
</if>
</where>
</select>
</mapper>
</mapper>
quality-review/src/main/resources/mapper/TaskUserRelationMapper.xml
View file @
0d408f97
...
@@ -9,10 +9,11 @@
...
@@ -9,10 +9,11 @@
<result
property=
"userId"
column=
"user_id"
jdbcType=
"BIGINT"
/>
<result
property=
"userId"
column=
"user_id"
jdbcType=
"BIGINT"
/>
<result
property=
"isLeader"
column=
"is_leader"
jdbcType=
"TINYINT"
/>
<result
property=
"isLeader"
column=
"is_leader"
jdbcType=
"TINYINT"
/>
<result
property=
"name"
column=
"name"
jdbcType=
"VARCHAR"
/>
<result
property=
"name"
column=
"name"
jdbcType=
"VARCHAR"
/>
<result
property=
"deptName"
column=
"dept_name"
jdbcType=
"VARCHAR"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
select task_id,user_id,is_leader,name from t_task_user_relation
select task_id,user_id,is_leader,name
,dept_name
from t_task_user_relation
</sql>
</sql>
<select
id=
"selectQTeamMembers"
parameterType=
"Long"
resultMap=
"BaseResultMap"
>
<select
id=
"selectQTeamMembers"
parameterType=
"Long"
resultMap=
"BaseResultMap"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment