Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
I
ims
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
iuav
ims
Commits
5fe08a84
提交
5fe08a84
authored
1月 09, 2024
作者:
han
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
飞手端继续上传图片
上级
70db58ea
流水线
#7925
已通过 于阶段
in 2 分 58 秒
变更
5
流水线
1
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
51 行增加
和
1 行删除
+51
-1
RequirementsController.java
...om/mmc/csf/release/controller/RequirementsController.java
+6
-1
RequirementsDao.java
...rc/main/java/com/mmc/csf/release/dao/RequirementsDao.java
+1
-0
RequirementsService.java
...java/com/mmc/csf/release/service/RequirementsService.java
+2
-0
RequirementsServiceImpl.java
...mmc/csf/release/service/impl/RequirementsServiceImpl.java
+37
-0
RequirementsDao.xml
...rc/main/resources/mapper/requirements/RequirementsDao.xml
+5
-0
没有找到文件。
release-service/src/main/java/com/mmc/csf/release/controller/RequirementsController.java
浏览文件 @
5fe08a84
...
...
@@ -228,7 +228,12 @@ public class RequirementsController extends BaseController {
return
requirementsService
.
fulfilATaskDetails
(
requirementsInfoId
,
userAccountId
);
}
@ApiOperation
(
value
=
"new——小程序-—飞手端--继续上传图片"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ResultBody
.
class
)})
@PostMapping
(
"updateTaskUrl"
)
public
ResultBody
updateTaskUrl
(
@ApiParam
(
value
=
"完成任务图片"
,
required
=
true
)
@RequestParam
String
taskUrl
,
@ApiParam
(
value
=
"发布服务需求id"
,
required
=
true
)
@RequestParam
Integer
requirementsInfoId
)
{
return
requirementsService
.
updateTaskUrl
(
taskUrl
,
requirementsInfoId
);
}
@ApiOperation
(
value
=
"new——小程序-—发布者--订单结算"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ResultBody
.
class
)})
@PostMapping
(
"settleAccounts"
)
...
...
release-service/src/main/java/com/mmc/csf/release/dao/RequirementsDao.java
浏览文件 @
5fe08a84
...
...
@@ -124,6 +124,7 @@ public interface RequirementsDao {
void
fulfilATask
(
ServiceFulfilATaskDO
serviceFulfilATaskDO
);
void
updateTaskUrl
(
@Param
(
"taskUrl"
)
String
taskUrl
,
@Param
(
"requirementsInfoId"
)
Integer
requirementsInfoId
);
ServiceFulfilATaskDO
fulfilATaskDetails
(
Integer
requirementsInfoId
,
Integer
userAccountId
);
...
...
release-service/src/main/java/com/mmc/csf/release/service/RequirementsService.java
浏览文件 @
5fe08a84
...
...
@@ -88,6 +88,8 @@ public interface RequirementsService {
ResultBody
fulfilATask
(
ServiceFulfilATaskVO
fulfilATaskVO
);
ResultBody
updateTaskUrl
(
String
taskUrl
,
Integer
requirementsInfoId
);
ResultBody
<
ServiceFulfilATaskDTO
>
fulfilATaskDetails
(
Integer
requirementsInfoId
,
Integer
userAccountId
);
ResultBody
settleAccounts
(
ServiceSettleAccountsVO
settleAccountsVO
,
HttpServletRequest
request
);
...
...
release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java
浏览文件 @
5fe08a84
...
...
@@ -2,6 +2,8 @@ package com.mmc.csf.release.service.impl;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.google.gson.Gson
;
import
com.google.gson.JsonArray
;
import
com.mmc.csf.common.util.json.JsonUtil
;
import
com.mmc.csf.common.util.page.PageResult
;
import
com.mmc.csf.common.util.web.HttpsRequestUtil
;
...
...
@@ -3165,6 +3167,41 @@ public class RequirementsServiceImpl implements RequirementsService {
}
@Override
public
ResultBody
updateTaskUrl
(
String
taskUrl
,
Integer
requirementsInfoId
)
{
if
(
StringUtils
.
isEmpty
(
taskUrl
)){
return
ResultBody
.
error
(
"传的内容为空"
);
}
ServiceFulfilATaskDO
serviceFulfilATaskDO
=
requirementsDao
.
fulfilATaskDetails
(
requirementsInfoId
,
null
);
if
(
serviceFulfilATaskDO
==
null
){
return
ResultBody
.
error
(
"没有查到这个订单"
);
}
String
taskUrl1
=
serviceFulfilATaskDO
.
getTaskUrl
();
if
(
StringUtils
.
isEmpty
(
taskUrl1
)){
String
newTaskUrl
=
taskUrl
;
requirementsDao
.
updateTaskUrl
(
newTaskUrl
,
requirementsInfoId
);
return
ResultBody
.
success
();
}
// 解析为JSON数组
JsonArray
jsonArray1
=
new
Gson
().
fromJson
(
taskUrl1
,
JsonArray
.
class
);
JsonArray
jsonArray2
=
new
Gson
().
fromJson
(
taskUrl
,
JsonArray
.
class
);
// 合并JSON数组
JsonArray
mergedArray
=
new
JsonArray
();
for
(
int
i
=
0
;
i
<
jsonArray1
.
size
();
i
++)
{
mergedArray
.
add
(
jsonArray1
.
get
(
i
));
}
for
(
int
i
=
0
;
i
<
jsonArray2
.
size
();
i
++)
{
mergedArray
.
add
(
jsonArray2
.
get
(
i
));
}
// 转换为字符串形式
String
newTaskUrl
=
mergedArray
.
toString
();
requirementsDao
.
updateTaskUrl
(
newTaskUrl
,
requirementsInfoId
);
return
ResultBody
.
success
();
}
@Override
public
ResultBody
<
ServiceFulfilATaskDTO
>
fulfilATaskDetails
(
Integer
requirementsInfoId
,
Integer
userAccountId
)
{
ServiceFulfilATaskDO
serviceFulfilATaskDO
=
requirementsDao
.
fulfilATaskDetails
(
requirementsInfoId
,
userAccountId
);
ServiceFulfilATaskDTO
serviceFulfilATaskDTO
=
serviceFulfilATaskDO
.
buildServiceFulfilATaskDTO
();
...
...
release-service/src/main/resources/mapper/requirements/RequirementsDao.xml
浏览文件 @
5fe08a84
...
...
@@ -1696,6 +1696,11 @@
set repertory = #{num}
where id = #{requireId}
</update>
<update
id=
"updateTaskUrl"
>
update service_fulfil_a_task
set task_url = #{taskUrl}
where requirements_info_id = #{requirementsInfoId}
</update>
<insert
id=
"insertAgreePilotOrder"
>
insert into agree_pilot_order(require_info_id, service_flow_id, pilot_certification_user_id, create_time)
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论