Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
I
ims-ci-test
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
test-ci
ims-ci-test
Commits
3943239c
提交
3943239c
authored
9月 18, 2023
作者:
张小凤
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Gambit(add)
上级
d15e1974
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
12 行增加
和
4 行删除
+12
-4
RequirementsInfoVO.java
...in/java/com/mmc/csf/infomation/vo/RequirementsInfoVO.java
+4
-0
ForumGambitQO.java
...ain/java/com/mmc/csf/release/gambit/qo/ForumGambitQO.java
+1
-1
GambitController.java
...java/com/mmc/csf/release/controller/GambitController.java
+2
-2
RequirementsInfoDO.java
...c/csf/release/entity/requirements/RequirementsInfoDO.java
+3
-0
RequirementsDao.xml
...rc/main/resources/mapper/requirements/RequirementsDao.xml
+2
-1
没有找到文件。
csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/RequirementsInfoVO.java
浏览文件 @
3943239c
...
@@ -15,6 +15,7 @@ import javax.validation.constraints.NotNull;
...
@@ -15,6 +15,7 @@ import javax.validation.constraints.NotNull;
import
javax.validation.constraints.Size
;
import
javax.validation.constraints.Size
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.Date
;
/**
/**
* @author: zj
* @author: zj
...
@@ -181,4 +182,7 @@ public class RequirementsInfoVO implements Serializable {
...
@@ -181,4 +182,7 @@ public class RequirementsInfoVO implements Serializable {
@ApiModelProperty
(
value
=
"抢单飞手id"
)
@ApiModelProperty
(
value
=
"抢单飞手id"
)
private
Integer
pilotCertificationId
;
private
Integer
pilotCertificationId
;
@ApiModelProperty
(
value
=
"创建时间"
)
private
Date
createTime
;
}
}
csf-common/csf-common-model/src/main/java/com/mmc/csf/release/gambit/qo/ForumGambitQO.java
浏览文件 @
3943239c
...
@@ -35,7 +35,7 @@ public class ForumGambitQO {
...
@@ -35,7 +35,7 @@ public class ForumGambitQO {
@ApiModelProperty
(
value
=
"话题名称"
,
example
=
"深圳暴雨"
)
@ApiModelProperty
(
value
=
"话题名称"
,
example
=
"深圳暴雨"
)
private
String
gambitName
;
private
String
gambitName
;
@ApiModelProperty
(
value
=
"话题属性
"
,
example
=
"话题属性 1普通 2热门 3推荐
"
)
@ApiModelProperty
(
value
=
"话题属性
1普通 2热门 3推荐"
,
example
=
"1
"
)
private
Integer
gambitProperty
;
private
Integer
gambitProperty
;
...
...
release-service/src/main/java/com/mmc/csf/release/controller/GambitController.java
浏览文件 @
3943239c
...
@@ -97,7 +97,7 @@ public class GambitController extends BaseController{
...
@@ -97,7 +97,7 @@ public class GambitController extends BaseController{
@ApiOperation
(
value
=
"小程序话题下面的动态列表"
)
@ApiOperation
(
value
=
"小程序话题下面的动态列表"
)
@PostMapping
(
"/appGambitList"
)
@PostMapping
(
"/appGambitList
s
"
)
public
ResultBody
<
ForumDynamicGambitDO
>
appGambitList
(
HttpServletRequest
request
,
@RequestBody
TopicDynamicsQO
topicDynamicsQO
){
public
ResultBody
<
ForumDynamicGambitDO
>
appGambitList
(
HttpServletRequest
request
,
@RequestBody
TopicDynamicsQO
topicDynamicsQO
){
return
ResultBody
.
success
(
gambitService
.
appGambitList
(
topicDynamicsQO
));
return
ResultBody
.
success
(
gambitService
.
appGambitList
(
topicDynamicsQO
));
}
}
...
@@ -115,7 +115,7 @@ public class GambitController extends BaseController{
...
@@ -115,7 +115,7 @@ public class GambitController extends BaseController{
return
ResultBody
.
success
(
gambitService
.
replyList
(
replyQO
));
return
ResultBody
.
success
(
gambitService
.
replyList
(
replyQO
));
}
}
@Api
ModelProperty
(
value
=
"用户发的动态"
)
@Api
Operation
(
value
=
"用户发的动态"
)
@PostMapping
(
"/userDynamicList"
)
@PostMapping
(
"/userDynamicList"
)
public
ResultBody
<
ForumDynamicGambitDO
>
userDynamicList
(
HttpServletRequest
request
,
@RequestBody
UserTopicDynamicsQO
userTopicDynamicsQO
){
public
ResultBody
<
ForumDynamicGambitDO
>
userDynamicList
(
HttpServletRequest
request
,
@RequestBody
UserTopicDynamicsQO
userTopicDynamicsQO
){
return
ResultBody
.
success
(
gambitService
.
userDynamicList
(
userTopicDynamicsQO
));
return
ResultBody
.
success
(
gambitService
.
userDynamicList
(
userTopicDynamicsQO
));
...
...
release-service/src/main/java/com/mmc/csf/release/entity/requirements/RequirementsInfoDO.java
浏览文件 @
3943239c
...
@@ -177,6 +177,8 @@ public class RequirementsInfoDO implements Serializable {
...
@@ -177,6 +177,8 @@ public class RequirementsInfoDO implements Serializable {
@ApiModelProperty
(
value
=
"发布者openid"
)
@ApiModelProperty
(
value
=
"发布者openid"
)
private
String
openid
;
private
String
openid
;
public
RequirementsInfoVO
buildRequirementsInfoVO
()
{
public
RequirementsInfoVO
buildRequirementsInfoVO
()
{
return
RequirementsInfoVO
.
builder
().
id
(
this
.
id
).
requirementTypeId
(
this
.
requirementTypeId
).
userAccountId
(
this
.
userAccountId
).
publishName
(
this
.
publishName
)
return
RequirementsInfoVO
.
builder
().
id
(
this
.
id
).
requirementTypeId
(
this
.
requirementTypeId
).
userAccountId
(
this
.
userAccountId
).
publishName
(
this
.
publishName
)
.
publishPhone
(
this
.
publishPhone
).
requireDescription
(
this
.
requireDescription
).
solved
(
this
.
solved
).
taskStartTime
(
this
.
taskStartTime
).
taskEndTime
(
this
.
taskEndTime
)
.
publishPhone
(
this
.
publishPhone
).
requireDescription
(
this
.
requireDescription
).
solved
(
this
.
solved
).
taskStartTime
(
this
.
taskStartTime
).
taskEndTime
(
this
.
taskEndTime
)
...
@@ -208,6 +210,7 @@ public class RequirementsInfoDO implements Serializable {
...
@@ -208,6 +210,7 @@ public class RequirementsInfoDO implements Serializable {
.
pilotCertificationUserId
(
this
.
pilotCertificationUserId
)
.
pilotCertificationUserId
(
this
.
pilotCertificationUserId
)
.
preemptPhone
(
this
.
preemptPhone
)
.
preemptPhone
(
this
.
preemptPhone
)
.
pilotCertificationId
(
this
.
pilotCertificationId
)
.
pilotCertificationId
(
this
.
pilotCertificationId
)
.
createTime
(
this
.
createTime
)
.
build
();
.
build
();
}
}
...
...
release-service/src/main/resources/mapper/requirements/RequirementsDao.xml
浏览文件 @
3943239c
...
@@ -473,7 +473,8 @@
...
@@ -473,7 +473,8 @@
ra.update_order_amount,
ra.update_order_amount,
ri.insurance,
ri.insurance,
ri.publish,
ri.publish,
ri.service_name
ri.service_name,
ri.create_time
FROM requirements_info ri
FROM requirements_info ri
left join requirements_amount ra
left join requirements_amount ra
on ra.requirements_info_id = ri.id and ri.user_account_id = ra.user_account_id
on ra.requirements_info_id = ri.id and ri.user_account_id = ra.user_account_id
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论