Skip to content

G
gic-evaluate
Commit e14fab91 by zhiwj
Options

添加缺少的字段

parent c21830db
Showing with 75 additions and 52 deletions
gic-evaluate-api/src/main/java/com/gic/evaluate/dto/BadEvaluateConfigDTO.java
package com.gic.evaluate.dto;
import java.io.Serializable;
import java.util.Date;
/**
*
......@@ -107,11 +106,6 @@ public class BadEvaluateConfigDTO implements Serializable {
*/
private Integer goodNoReturn;
/**
*
*/
private Date updateTime;
public Integer getBadEvaluateConfigId() {
return badEvaluateConfigId;
}
......@@ -256,14 +250,6 @@ public class BadEvaluateConfigDTO implements Serializable {
this.goodNoReturn = goodNoReturn;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getTaskAssign() {
return taskAssign;
}
......
gic-evaluate-api/src/main/java/com/gic/evaluate/dto/EvaluateOrderConfigDTO.java
......@@ -79,6 +79,11 @@ public class EvaluateOrderConfigDTO implements Serializable {
private Integer review;
/**
* 追评提醒 X天
*/
private Integer reviewRemind;
/**
* 追评期限
*/
private Integer reviewLimitday;
......@@ -99,10 +104,9 @@ public class EvaluateOrderConfigDTO implements Serializable {
private Integer commentModule;
/**
* 奖励
* 展示规则 1仅本条评论 2评论及其追评
*/
private Integer reward;
private Integer showType;
/**
* 1. 按评分从高到低 2. 按时间倒序
*/
......@@ -269,14 +273,6 @@ public class EvaluateOrderConfigDTO implements Serializable {
this.commentModule = commentModule;
}
public Integer getReward() {
return reward;
}
public void setReward(Integer reward) {
this.reward = reward;
}
public Integer getOrderType() {
return orderType;
}
......@@ -324,4 +320,20 @@ public class EvaluateOrderConfigDTO implements Serializable {
public void setReplyQuick(List<String> replyQuick) {
this.replyQuick = replyQuick;
}
public Integer getReviewRemind() {
return reviewRemind;
}
public void setReviewRemind(Integer reviewRemind) {
this.reviewRemind = reviewRemind;
}
public Integer getShowType() {
return showType;
}
public void setShowType(Integer showType) {
this.showType = showType;
}
}
gic-evaluate-service/src/main/java/com/gic/evaluate/entity/TabEvaluateOrderConfig.java
......@@ -57,6 +57,11 @@ public class TabEvaluateOrderConfig {
private Integer review;
/**
* 追评提醒 X天
*/
private Integer reviewRemind;
/**
* 追评期限
*/
private Integer reviewLimitday;
......@@ -77,9 +82,9 @@ public class TabEvaluateOrderConfig {
private Integer commentModule;
/**
* 奖励
* 展示规则 1仅本条评论 2评论及其追评
*/
private Integer reward;
private Integer showType;
/**
* 1. 按评分从高到低 2. 按时间倒序
......@@ -191,6 +196,14 @@ public class TabEvaluateOrderConfig {
this.review = review;
}
public Integer getReviewRemind() {
return reviewRemind;
}
public void setReviewRemind(Integer reviewRemind) {
this.reviewRemind = reviewRemind;
}
public Integer getReviewLimitday() {
return reviewLimitday;
}
......@@ -223,12 +236,12 @@ public class TabEvaluateOrderConfig {
this.commentModule = commentModule;
}
public Integer getReward() {
return reward;
public Integer getShowType() {
return showType;
}
public void setReward(Integer reward) {
this.reward = reward;
public void setShowType(Integer showType) {
this.showType = showType;
}
public Integer getOrderType() {
......
gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/EvaluateOrderConfigServiceImpl.java
......@@ -33,11 +33,12 @@ public class EvaluateOrderConfigServiceImpl implements EvaluateOrderConfigServic
evaluateOrderConfig.setEvaluateLimitday(30);
evaluateOrderConfig.setDefaultContent("默认好评！");
evaluateOrderConfig.setReview(Constants.OPEN);
evaluateOrderConfig.setReviewRemind(10);
evaluateOrderConfig.setReviewLimitday(90);
evaluateOrderConfig.setReviewUserHidden(Constants.OPEN);
evaluateOrderConfig.setReviewTimes(1);
evaluateOrderConfig.setCommentModule(1);
evaluateOrderConfig.setReward(Constants.OPEN);
evaluateOrderConfig.setShowType(1);
evaluateOrderConfig.setOrderType(Constants.EVALUATE_ORDER_SORT_SCORE);
evaluateOrderConfig.setBadEvaluateTag(Constants.OPEN);
evaluateOrderConfig.setBadEvaluateTagType(-1);
......
gic-evaluate-service/src/main/resources/mapper/TabEvaluateOrderConfigMapper.xml
......@@ -12,11 +12,12 @@
<result column="evaluate_limitday" jdbcType="INTEGER" property="evaluateLimitday" />
<result column="default_content" jdbcType="VARCHAR" property="defaultContent" />
<result column="review" jdbcType="INTEGER" property="review" />
<result column="review_remind" jdbcType="INTEGER" property="reviewRemind" />
<result column="review_limitday" jdbcType="INTEGER" property="reviewLimitday" />
<result column="review_user_hidden" jdbcType="INTEGER" property="reviewUserHidden" />
<result column="review_times" jdbcType="INTEGER" property="reviewTimes" />
<result column="comment_module" jdbcType="INTEGER" property="commentModule" />
<result column="reward" jdbcType="INTEGER" property="reward" />
<result column="show_type" jdbcType="INTEGER" property="showType" />
<result column="order_type" jdbcType="INTEGER" property="orderType" />
<result column="bad_evaluate_tag" jdbcType="INTEGER" property="badEvaluateTag" />
<result column="bad_evaluate_tag_type" jdbcType="INTEGER" property="badEvaluateTagType" />
......@@ -26,8 +27,8 @@
</resultMap>
<sql id="Base_Column_List">
evaluate_order_config_id, enterprise_id, goods, store, service, mind_hour, remind_day,
evaluate_limitday, default_content, review, review_limitday, review_user_hidden,
review_times, comment_module, reward, order_type, bad_evaluate_tag, bad_evaluate_tag_type,
evaluate_limitday, default_content, review, review_remind, review_limitday, review_user_hidden,
review_times, comment_module, show_type, order_type, bad_evaluate_tag, bad_evaluate_tag_type,
bad_suggestion_tag, bad_suggestion_tag_type, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
......@@ -44,19 +45,19 @@
insert into tab_evaluate_order_config (evaluate_order_config_id, enterprise_id,
goods, store, service,
mind_hour, remind_day, evaluate_limitday,
default_content, review, review_limitday,
review_user_hidden, review_times, comment_module,
reward, order_type, bad_evaluate_tag,
bad_evaluate_tag_type, bad_suggestion_tag, bad_suggestion_tag_type,
update_time)
default_content, review, review_remind,
review_limitday, review_user_hidden, review_times,
comment_module, show_type, order_type,
bad_evaluate_tag, bad_evaluate_tag_type, bad_suggestion_tag,
bad_suggestion_tag_type, update_time)
values (#{evaluateOrderConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER},
#{goods,jdbcType=INTEGER}, #{store,jdbcType=INTEGER}, #{service,jdbcType=INTEGER},
#{mindHour,jdbcType=INTEGER}, #{remindDay,jdbcType=INTEGER}, #{evaluateLimitday,jdbcType=INTEGER},
#{defaultContent,jdbcType=VARCHAR}, #{review,jdbcType=INTEGER}, #{reviewLimitday,jdbcType=INTEGER},
#{reviewUserHidden,jdbcType=INTEGER}, #{reviewTimes,jdbcType=INTEGER}, #{commentModule,jdbcType=INTEGER},
#{reward,jdbcType=INTEGER}, #{orderType,jdbcType=INTEGER}, #{badEvaluateTag,jdbcType=INTEGER},
#{badEvaluateTagType,jdbcType=INTEGER}, #{badSuggestionTag,jdbcType=INTEGER}, #{badSuggestionTagType,jdbcType=INTEGER},
#{updateTime,jdbcType=TIMESTAMP})
#{defaultContent,jdbcType=VARCHAR}, #{review,jdbcType=INTEGER}, #{reviewRemind,jdbcType=INTEGER},
#{reviewLimitday,jdbcType=INTEGER}, #{reviewUserHidden,jdbcType=INTEGER}, #{reviewTimes,jdbcType=INTEGER},
#{commentModule,jdbcType=INTEGER}, #{showType,jdbcType=INTEGER}, #{orderType,jdbcType=INTEGER},
#{badEvaluateTag,jdbcType=INTEGER}, #{badEvaluateTagType,jdbcType=INTEGER}, #{badSuggestionTag,jdbcType=INTEGER},
#{badSuggestionTagType,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.gic.evaluate.entity.TabEvaluateOrderConfig">
insert into tab_evaluate_order_config
......@@ -91,6 +92,9 @@
<if test="review != null">
review,
</if>
<if test="reviewRemind != null">
review_remind,
</if>
<if test="reviewLimitday != null">
review_limitday,
</if>
......@@ -103,8 +107,8 @@
<if test="commentModule != null">
comment_module,
</if>
<if test="reward != null">
reward,
<if test="showType != null">
show_type,
</if>
<if test="orderType != null">
order_type,
......@@ -156,6 +160,9 @@
<if test="review != null">
#{review,jdbcType=INTEGER},
</if>
<if test="reviewRemind != null">
#{reviewRemind,jdbcType=INTEGER},
</if>
<if test="reviewLimitday != null">
#{reviewLimitday,jdbcType=INTEGER},
</if>
......@@ -168,8 +175,8 @@
<if test="commentModule != null">
#{commentModule,jdbcType=INTEGER},
</if>
<if test="reward != null">
#{reward,jdbcType=INTEGER},
<if test="showType != null">
#{showType,jdbcType=INTEGER},
</if>
<if test="orderType != null">
#{orderType,jdbcType=INTEGER},
......@@ -221,6 +228,9 @@
<if test="review != null">
review = #{review,jdbcType=INTEGER},
</if>
<if test="reviewRemind != null">
review_remind = #{reviewRemind,jdbcType=INTEGER},
</if>
<if test="reviewLimitday != null">
review_limitday = #{reviewLimitday,jdbcType=INTEGER},
</if>
......@@ -233,8 +243,8 @@
<if test="commentModule != null">
comment_module = #{commentModule,jdbcType=INTEGER},
</if>
<if test="reward != null">
reward = #{reward,jdbcType=INTEGER},
<if test="showType != null">
show_type = #{showType,jdbcType=INTEGER},
</if>
<if test="orderType != null">
order_type = #{orderType,jdbcType=INTEGER},
......@@ -268,11 +278,12 @@
evaluate_limitday = #{evaluateLimitday,jdbcType=INTEGER},
default_content = #{defaultContent,jdbcType=VARCHAR},
review = #{review,jdbcType=INTEGER},
review_remind = #{reviewRemind,jdbcType=INTEGER},
review_limitday = #{reviewLimitday,jdbcType=INTEGER},
review_user_hidden = #{reviewUserHidden,jdbcType=INTEGER},
review_times = #{reviewTimes,jdbcType=INTEGER},
comment_module = #{commentModule,jdbcType=INTEGER},
reward = #{reward,jdbcType=INTEGER},
show_type = #{showType,jdbcType=INTEGER},
order_type = #{orderType,jdbcType=INTEGER},
bad_evaluate_tag = #{badEvaluateTag,jdbcType=INTEGER},
bad_evaluate_tag_type = #{badEvaluateTagType,jdbcType=INTEGER},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment