提交 3943239c 作者: 张小凤

Gambit(add)

上级 d15e1974
...@@ -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;
} }
...@@ -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;
......
...@@ -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("/appGambitLists")
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));
} }
@ApiModelProperty(value = "用户发的动态") @ApiOperation(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));
......
...@@ -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();
} }
......
...@@ -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 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论