Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
I
ims
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
iuav
ims
Commits
456fc653
提交
456fc653
authored
12月 26, 2023
作者:
han
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
团队派单
上级
92be5e44
流水线
#7731
已通过 于阶段
in 2 分 57 秒
变更
5
流水线
1
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
36 行增加
和
0 行删除
+36
-0
RequirementsController.java
...om/mmc/csf/release/controller/RequirementsController.java
+6
-0
RequirementsDao.java
...rc/main/java/com/mmc/csf/release/dao/RequirementsDao.java
+4
-0
RequirementsService.java
...java/com/mmc/csf/release/service/RequirementsService.java
+5
-0
RequirementsServiceImpl.java
...mmc/csf/release/service/impl/RequirementsServiceImpl.java
+16
-0
RequirementsDao.xml
...rc/main/resources/mapper/requirements/RequirementsDao.xml
+5
-0
没有找到文件。
release-service/src/main/java/com/mmc/csf/release/controller/RequirementsController.java
浏览文件 @
456fc653
...
...
@@ -376,6 +376,12 @@ public class RequirementsController extends BaseController {
public
ResultBody
personSendOrder
(
HttpServletRequest
request
,
@RequestBody
PersonSendOrderVO
personSendOrderVO
)
{
return
requirementsService
.
personSendOrder
(
personSendOrderVO
,
this
.
getUserLoginInfoFromRedis
(
request
).
getToken
());
}
@ApiOperation
(
value
=
"团队派单"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ResultBody
.
class
)})
@PostMapping
(
"/teamSendOrder"
)
public
ResultBody
teamSendOrder
(
@ApiParam
(
value
=
"父订单id"
)
@RequestParam
Integer
fatherRequireId
,
@ApiParam
(
value
=
"团队管理员的id"
)
@RequestParam
Integer
messageId
)
{
return
requirementsService
.
teamSendOrder
(
fatherRequireId
,
messageId
);
}
@ApiOperation
(
value
=
"我的派单列表——待确认"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ResultBody
.
class
)})
...
...
release-service/src/main/java/com/mmc/csf/release/dao/RequirementsDao.java
浏览文件 @
456fc653
...
...
@@ -409,6 +409,10 @@ public interface RequirementsDao {
* 根据飞手进行派单操作
*/
Integer
personSendOrder
(
PersonSendOrderDO
personSendOrderDO
);
/**
* 查询父订单下面的所有子订单id
*/
List
<
Integer
>
selectAllSuborder
(
Integer
fatherRequireId
);
/**
* 修改info表中的状态
...
...
release-service/src/main/java/com/mmc/csf/release/service/RequirementsService.java
浏览文件 @
456fc653
...
...
@@ -148,6 +148,11 @@ public interface RequirementsService {
ResultBody
personSendOrder
(
PersonSendOrderVO
personSendOrderVO
,
String
token
);
/**
* 根据团队进行派单操作
*/
ResultBody
teamSendOrder
(
Integer
fatherRequireId
,
Integer
messageId
);
/**
* 飞手确认接单
*/
ResultBody
orderConfirmationByPilot
(
Integer
id
,
Integer
status
);
...
...
release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java
浏览文件 @
456fc653
...
...
@@ -3325,6 +3325,22 @@ public class RequirementsServiceImpl implements RequirementsService {
}
@Override
public
ResultBody
teamSendOrder
(
Integer
fatherRequireId
,
Integer
messageId
)
{
// 查询所有的子订单id
List
<
Integer
>
ids
=
requirementsDao
.
selectAllSuborder
(
fatherRequireId
);
PersonSendOrderDO
personSendOrderDO
=
null
;
for
(
Integer
id
:
ids
)
{
personSendOrderDO
=
new
PersonSendOrderDO
();
personSendOrderDO
.
setRequirementsInfoId
(
id
);
personSendOrderDO
.
setTeamUserId
(
messageId
);
requirementsDao
.
personSendOrder
(
personSendOrderDO
);
// 修改info表中的状态为13派单中
requirementsDao
.
updateInfoStatus
(
id
,
13
);
}
return
ResultBody
.
success
(
"等待团队管理员确认"
);
}
@Override
public
ResultBody
orderConfirmationByPilot
(
Integer
id
,
Integer
status
)
{
if
(
requirementsDao
.
isReConfirm
(
id
)
!=
0
){
return
ResultBody
.
error
(
"重复确认"
);
...
...
release-service/src/main/resources/mapper/requirements/RequirementsDao.xml
浏览文件 @
456fc653
...
...
@@ -1969,6 +1969,11 @@
from requirements_service_temp
where require_info_id = #{requireId} and team_user_id is not null;
</select>
<select
id=
"selectAllSuborder"
resultType=
"java.lang.Integer"
>
select id
from requirements_info
where father_require_id = #{fatherRequireId} and is_deleted = 0
</select>
<delete
id=
"deleteRequirementsServiceInfo"
>
delete from requirements_service where requirements_info_id = #{requireId} and pilot_certification_user_id = #{userAccountId}
</delete>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论