Skip to content

G
gic-evaluate
Commit d84811a2 by zhiwj
Options

咨询建议

parent d768d348
Showing with 210 additions and 225 deletions
gic-evaluate-api/src/main/java/com/gic/evaluate/dto/EvaluateOrderConfigDTO.java
package com.gic.evaluate.dto;
import java.io.Serializable;
import java.util.List;
/**
*
......@@ -108,29 +109,29 @@ public class EvaluateOrderConfigDTO implements Serializable {
private Integer orderType;
/**
* 正面快捷短语
* 恶意评价标记功能
*/
private String goodEvaluateQuick;
private Integer badEvaluateTag;
/**
* 负面快捷短语
* 恶意投诉标记功能
*/
private String badEvaluateQuick;
private Integer badSuggestionTag;
/**
* 后台快捷评语
* 正面快捷短语
*/
private String replyQuick;
private List<String> goodEvaluateQuick;
/**
* 恶意评价标记功能
* 负面快捷短语
*/
private Integer badEvaluateTag;
private List<String> badEvaluateQuick;
/**
* 恶意投诉标记功能
* 后台快捷评语
*/
private Integer badSuggestionTag;
private List<String> replyQuick;
public Integer getEvaluateOrderConfigId() {
return evaluateOrderConfigId;
......@@ -284,44 +285,43 @@ public class EvaluateOrderConfigDTO implements Serializable {
this.orderType = orderType;
}
public String getGoodEvaluateQuick() {
return goodEvaluateQuick;
public Integer getBadEvaluateTag() {
return badEvaluateTag;
}
public void setGoodEvaluateQuick(String goodEvaluateQuick) {
this.goodEvaluateQuick = goodEvaluateQuick;
public void setBadEvaluateTag(Integer badEvaluateTag) {
this.badEvaluateTag = badEvaluateTag;
}
public String getBadEvaluateQuick() {
return badEvaluateQuick;
public Integer getBadSuggestionTag() {
return badSuggestionTag;
}
public void setBadEvaluateQuick(String badEvaluateQuick) {
this.badEvaluateQuick = badEvaluateQuick;
public void setBadSuggestionTag(Integer badSuggestionTag) {
this.badSuggestionTag = badSuggestionTag;
}
public String getReplyQuick() {
return replyQuick;
public List<String> getGoodEvaluateQuick() {
return goodEvaluateQuick;
}
public void setReplyQuick(String replyQuick) {
this.replyQuick = replyQuick;
public void setGoodEvaluateQuick(List<String> goodEvaluateQuick) {
this.goodEvaluateQuick = goodEvaluateQuick;
}
public Integer getBadEvaluateTag() {
return badEvaluateTag;
public List<String> getBadEvaluateQuick() {
return badEvaluateQuick;
}
public void setBadEvaluateTag(Integer badEvaluateTag) {
this.badEvaluateTag = badEvaluateTag;
public void setBadEvaluateQuick(List<String> badEvaluateQuick) {
this.badEvaluateQuick = badEvaluateQuick;
}
public Integer getBadSuggestionTag() {
return badSuggestionTag;
public List<String> getReplyQuick() {
return replyQuick;
}
public void setBadSuggestionTag(Integer badSuggestionTag) {
this.badSuggestionTag = badSuggestionTag;
public void setReplyQuick(List<String> replyQuick) {
this.replyQuick = replyQuick;
}
}
gic-evaluate-service/src/main/java/com/gic/evaluate/dao/mapper/TabEvaluateQuickMapper.java
package com.gic.evaluate.dao.mapper;
import com.gic.evaluate.entity.TabEvaluateQuick;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface TabEvaluateQuickMapper {
/**
......@@ -50,4 +53,12 @@ public interface TabEvaluateQuickMapper {
* @return 更新条目数
*/
int updateByPrimaryKey(TabEvaluateQuick record);
void delByEnterpriseId(@Param("enterpriseId") Integer enterpriseId, @Param("quickReplyType") Integer quickReplyType);
void insertSelectiveByNotExist(TabEvaluateQuick tabEvaluateQuick);
void updateStatusByEvaluateQuicks(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateQuick") List<String> evaluateQuick, @Param("quickReplyType") Integer quickReplyType);
List<TabEvaluateQuick> listEvaluateQuick(@Param("enterpriseId") Integer enterpriseId, @Param("quickReplyType") Integer quickReplyType);
}
\ No newline at end of file
gic-evaluate-service/src/main/java/com/gic/evaluate/entity/TabEvaluateOrderConfig.java
......@@ -32,21 +32,6 @@ public class TabEvaluateOrderConfig {
private Integer service;
/**
* 商品质量必填
*/
private Integer goodsRequired;
/**
* 门店环境
*/
private Integer storeRequired;
/**
* 服务能力必填
*/
private Integer serviceRequired;
/**
* 消费后提醒时间（小时）
*/
private Integer mindHour;
......@@ -102,21 +87,6 @@ public class TabEvaluateOrderConfig {
private Integer orderType;
/**
* 正面快捷短语
*/
private String goodEvaluateQuick;
/**
* 负面快捷短语
*/
private String badEvaluateQuick;
/**
* 后台快捷评语
*/
private String replyQuick;
/**
* 恶意评价标记功能
*/
private Integer badEvaluateTag;
......@@ -171,30 +141,6 @@ public class TabEvaluateOrderConfig {
this.service = service;
}
public Integer getGoodsRequired() {
return goodsRequired;
}
public void setGoodsRequired(Integer goodsRequired) {
this.goodsRequired = goodsRequired;
}
public Integer getStoreRequired() {
return storeRequired;
}
public void setStoreRequired(Integer storeRequired) {
this.storeRequired = storeRequired;
}
public Integer getServiceRequired() {
return serviceRequired;
}
public void setServiceRequired(Integer serviceRequired) {
this.serviceRequired = serviceRequired;
}
public Integer getMindHour() {
return mindHour;
}
......@@ -283,30 +229,6 @@ public class TabEvaluateOrderConfig {
this.orderType = orderType;
}
public String getGoodEvaluateQuick() {
return goodEvaluateQuick;
}
public void setGoodEvaluateQuick(String goodEvaluateQuick) {
this.goodEvaluateQuick = goodEvaluateQuick;
}
public String getBadEvaluateQuick() {
return badEvaluateQuick;
}
public void setBadEvaluateQuick(String badEvaluateQuick) {
this.badEvaluateQuick = badEvaluateQuick;
}
public String getReplyQuick() {
return replyQuick;
}
public void setReplyQuick(String replyQuick) {
this.replyQuick = replyQuick;
}
public Integer getBadEvaluateTag() {
return badEvaluateTag;
}
......
gic-evaluate-service/src/main/java/com/gic/evaluate/entity/TabEvaluateQuick.java
......@@ -9,7 +9,7 @@ public class TabEvaluateQuick {
/**
* 快捷标签id
*/
private String evaluateQuickId;
private Integer evaluateQuickId;
/**
* 标签类型 1:负面评价 2：正面评价 3：后台回复
......@@ -34,18 +34,18 @@ public class TabEvaluateQuick {
/**
* 企业ID
*/
private String enterpriseId;
private Integer enterpriseId;
/**
* 状态（0：无效，1：有效）
*/
private Integer status;
public String getEvaluateQuickId() {
public Integer getEvaluateQuickId() {
return evaluateQuickId;
}
public void setEvaluateQuickId(String evaluateQuickId) {
public void setEvaluateQuickId(Integer evaluateQuickId) {
this.evaluateQuickId = evaluateQuickId;
}
......@@ -81,11 +81,11 @@ public class TabEvaluateQuick {
this.updateTime = updateTime;
}
public String getEnterpriseId() {
public Integer getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
public void setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
}
......
gic-evaluate-service/src/main/java/com/gic/evaluate/service/EvaluateQuickService.java
package com.gic.evaluate.service;
import com.gic.evaluate.entity.TabEvaluateQuick;
import java.util.List;
/**
*
* @Description:
......@@ -8,4 +12,7 @@ package com.gic.evaluate.service;
*/
public interface EvaluateQuickService {
void saveEvaluateQuick(Integer enterpriseId, List<String> evaluateQuick, Integer quickReplyType);
List<TabEvaluateQuick> listEvaluateQuick(Integer enterpriseId, Integer quickReplyType);
}
gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/EvaluateOrderConfigServiceImpl.java
......@@ -28,9 +28,6 @@ public class EvaluateOrderConfigServiceImpl implements EvaluateOrderConfigServic
evaluateOrderConfig.setGoods(Constants.OPEN);
evaluateOrderConfig.setStore(Constants.OPEN);
evaluateOrderConfig.setService(Constants.OPEN);
evaluateOrderConfig.setGoodsRequired(Constants.OPEN);
evaluateOrderConfig.setStoreRequired(Constants.OPEN);
evaluateOrderConfig.setServiceRequired(Constants.CLOSE);
evaluateOrderConfig.setMindHour(3);
evaluateOrderConfig.setRemindDay(5);
evaluateOrderConfig.setEvaluateLimitday(30);
......@@ -60,4 +57,4 @@ public class EvaluateOrderConfigServiceImpl implements EvaluateOrderConfigServic
public TabEvaluateOrderConfig getEvaluateOrderConfig(Integer enterpriseId) {
return this.tabEvaluateOrderConfigMapper.getOrderConfig(enterpriseId);
}
}
}
\ No newline at end of file
gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/EvaluateQuickServiceImpl.java
package com.gic.evaluate.service.impl;
import com.gic.enterprise.constants.Constants;
import com.gic.evaluate.dao.mapper.TabEvaluateQuickMapper;
import com.gic.evaluate.entity.TabEvaluateQuick;
import com.gic.evaluate.service.EvaluateQuickService;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
*
* @Description:
......@@ -11,5 +19,33 @@ import org.springframework.stereotype.Service;
*/
@Service
public class EvaluateQuickServiceImpl implements EvaluateQuickService {
@Autowired
private TabEvaluateQuickMapper tabEvaluateQuickMapper;
@Override
public void saveEvaluateQuick(Integer enterpriseId, List<String> evaluateQuick, Integer quickReplyType) {
// 把所有的关联status设置为0
tabEvaluateQuickMapper.delByEnterpriseId(enterpriseId, quickReplyType);
if (CollectionUtils.isNotEmpty(evaluateQuick)) {
// 插入不存在的关联
for (String quick : evaluateQuick) {
TabEvaluateQuick tabEvaluateQuick = new TabEvaluateQuick();
tabEvaluateQuick.setTagType(quickReplyType);
tabEvaluateQuick.setTagName(quick);
tabEvaluateQuick.setCreateTime(new Date());
tabEvaluateQuick.setEnterpriseId(enterpriseId);
tabEvaluateQuick.setStatus(Constants.NORMAL_STATUS);
tabEvaluateQuickMapper.insertSelectiveByNotExist(tabEvaluateQuick);
}
// 把所有userId关联status都设置为1
tabEvaluateQuickMapper.updateStatusByEvaluateQuicks(enterpriseId, evaluateQuick, quickReplyType);
}
}
@Override
public List<TabEvaluateQuick> listEvaluateQuick(Integer enterpriseId, Integer quickReplyType) {
return tabEvaluateQuickMapper.listEvaluateQuick(enterpriseId, quickReplyType);
}
}
gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateConfigApiServiceImpl.java
......@@ -2,16 +2,25 @@ package com.gic.evaluate.service.outer.impl;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.response.EnterpriseServiceResponse;
import com.gic.evaluate.constant.QuickReplyTypeEnum;
import com.gic.evaluate.dto.BadEvaluateConfigDTO;
import com.gic.evaluate.dto.EvaluateOrderConfigDTO;
import com.gic.evaluate.entity.TabBadEvaluateConfig;
import com.gic.evaluate.entity.TabEvaluateOrderConfig;
import com.gic.evaluate.service.EvaluateConfigApiService;
import com.gic.enterprise.response.EnterpriseServiceResponse;
import com.gic.evaluate.entity.TabEvaluateQuick;
import com.gic.evaluate.service.BadEvaluateConfigService;
import com.gic.evaluate.service.EvaluateConfigApiService;
import com.gic.evaluate.service.EvaluateOrderConfigService;
import com.gic.evaluate.service.EvaluateQuickService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
/**
*
......@@ -26,6 +35,8 @@ public class EvaluateConfigApiServiceImpl implements EvaluateConfigApiService {
private EvaluateOrderConfigService evaluateOrderConfigService;
@Autowired
private BadEvaluateConfigService badEvaluateConfigService;
@Autowired
private EvaluateQuickService evaluateQuickService;
@Override
......@@ -40,8 +51,15 @@ public class EvaluateConfigApiServiceImpl implements EvaluateConfigApiService {
}
@Override
@Transactional(rollbackFor = Exception.class)
public ServiceResponse<Void> updateEvaluateOrderConfig(EvaluateOrderConfigDTO evaluateOrderConfigDTO) {
evaluateOrderConfigService.updateOrderConfig(evaluateOrderConfigDTO);
List<String> badEvaluateQuick = evaluateOrderConfigDTO.getBadEvaluateQuick();
List<String> goodEvaluateQuick = evaluateOrderConfigDTO.getGoodEvaluateQuick();
List<String> replyQuick = evaluateOrderConfigDTO.getReplyQuick();
evaluateQuickService.saveEvaluateQuick(evaluateOrderConfigDTO.getEnterpriseId(), badEvaluateQuick, QuickReplyTypeEnum.BAD.getCode());
evaluateQuickService.saveEvaluateQuick(evaluateOrderConfigDTO.getEnterpriseId(), goodEvaluateQuick, QuickReplyTypeEnum.GOOD.getCode());
evaluateQuickService.saveEvaluateQuick(evaluateOrderConfigDTO.getEnterpriseId(), replyQuick, QuickReplyTypeEnum.MANAGE.getCode());
return EnterpriseServiceResponse.success();
}
......@@ -54,7 +72,20 @@ public class EvaluateConfigApiServiceImpl implements EvaluateConfigApiService {
@Override
public ServiceResponse<EvaluateOrderConfigDTO> getEvaluateOrderConfig(Integer enterpriseId) {
TabEvaluateOrderConfig evaluateOrderConfig = evaluateOrderConfigService.getEvaluateOrderConfig(enterpriseId);
return EnterpriseServiceResponse.success(EntityUtil.changeEntityByJSON(EvaluateOrderConfigDTO.class, evaluateOrderConfig));
EvaluateOrderConfigDTO evaluateOrderConfigDTO = EntityUtil.changeEntityByJSON(EvaluateOrderConfigDTO.class, evaluateOrderConfig);
List<TabEvaluateQuick> badEvaluateQuickList = evaluateQuickService.listEvaluateQuick(enterpriseId, QuickReplyTypeEnum.BAD.getCode());
List<TabEvaluateQuick> goodEvaluateQuickList = evaluateQuickService.listEvaluateQuick(enterpriseId, QuickReplyTypeEnum.GOOD.getCode());
List<TabEvaluateQuick> manageEvaluateQuickList = evaluateQuickService.listEvaluateQuick(enterpriseId, QuickReplyTypeEnum.MANAGE.getCode());
List<String> badEvaluateQuick = Optional.ofNullable(badEvaluateQuickList).orElse(Collections.emptyList()).stream().map(TabEvaluateQuick::getTagName).collect(Collectors.toList());
List<String> goodEvaluateQuick = Optional.ofNullable(goodEvaluateQuickList).orElse(Collections.emptyList()).stream().map(TabEvaluateQuick::getTagName).collect(Collectors.toList());
List<String> manageEvaluateQuick = Optional.ofNullable(manageEvaluateQuickList).orElse(Collections.emptyList()).stream().map(TabEvaluateQuick::getTagName).collect(Collectors.toList());
evaluateOrderConfigDTO.setBadEvaluateQuick(badEvaluateQuick);
evaluateOrderConfigDTO.setGoodEvaluateQuick(goodEvaluateQuick);
evaluateOrderConfigDTO.setReplyQuick(manageEvaluateQuick);
return EnterpriseServiceResponse.success(evaluateOrderConfigDTO);
}
@Override
......
gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateOverviewApiServiceImpl.java
......@@ -46,7 +46,7 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
Map<String, Long> storeCountMap = evaluateService.getStoreCountChart(enterpriseId, startTime, endTime);
Map<String, Long> serviceCountMap = evaluateService.getServiceCountChart(enterpriseId, startTime, endTime);
HashMap<String, Map<String, Long>> hashMap = new HashMap<>();
HashMap<String, Map<String, Long>> hashMap = new HashMap<>(4);
hashMap.put("goodsCountMap", goodsCountMap);
hashMap.put("storeCountMap", storeCountMap);
hashMap.put("serviceCountMap", serviceCountMap);
......@@ -81,7 +81,7 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
List<Map<String, Object>> goodChart = this.evaluateService.evaluateGoodQuickChart(enterpriseId, startTime, endTime);
List<Map<String, Object>> badChart = this.evaluateService.evaluateBadQuickChart(enterpriseId, startTime, endTime);
Map<String, List<Map<String, Object>>> map = new HashMap<>();
Map<String, List<Map<String, Object>>> map = new HashMap<>(4);
map.put("goodChart", goodChart);
map.put("badChart", badChart);
return EnterpriseServiceResponse.success(map);
......@@ -92,7 +92,7 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
for (String date : dateList) {
Map<Object, Object> collect = chart.stream().collect(Collectors.toMap(e -> e.get("statisticsDate"), e -> e.get("count")));
Object value = collect.get(date);
Map<String, Object> map = new HashMap<>();
Map<String, Object> map = new HashMap<>(4);
map.put(date, value == null ? 0 : value);
result.add(map);
}
......
gic-evaluate-service/src/main/resources/mapper/TabEvaluateOrderConfigMapper.xml
......@@ -7,9 +7,6 @@
<result column="goods" jdbcType="INTEGER" property="goods" />
<result column="store" jdbcType="INTEGER" property="store" />
<result column="service" jdbcType="INTEGER" property="service" />
<result column="goods_required" jdbcType="INTEGER" property="goodsRequired" />
<result column="store_required" jdbcType="INTEGER" property="storeRequired" />
<result column="service_required" jdbcType="INTEGER" property="serviceRequired" />
<result column="mind_hour" jdbcType="INTEGER" property="mindHour" />
<result column="remind_day" jdbcType="INTEGER" property="remindDay" />
<result column="evaluate_limitday" jdbcType="INTEGER" property="evaluateLimitday" />
......@@ -21,18 +18,14 @@
<result column="comment_module" jdbcType="INTEGER" property="commentModule" />
<result column="reward" jdbcType="INTEGER" property="reward" />
<result column="order_type" jdbcType="INTEGER" property="orderType" />
<result column="good_evaluate_quick" jdbcType="VARCHAR" property="goodEvaluateQuick" />
<result column="bad_evaluate_quick" jdbcType="VARCHAR" property="badEvaluateQuick" />
<result column="reply_quick" jdbcType="VARCHAR" property="replyQuick" />
<result column="bad_evaluate_tag" jdbcType="INTEGER" property="badEvaluateTag" />
<result column="bad_suggestion_tag" jdbcType="INTEGER" property="badSuggestionTag" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
evaluate_order_config_id, enterprise_id, goods, store, service, goods_required, store_required,
service_required, mind_hour, remind_day, evaluate_limitday, default_content, review,
review_limitday, review_user_hidden, review_times, comment_module, reward, order_type,
good_evaluate_quick, bad_evaluate_quick, reply_quick, bad_evaluate_tag, bad_suggestion_tag,
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_suggestion_tag,
update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
......@@ -48,21 +41,17 @@
<insert id="insert" parameterType="com.gic.evaluate.entity.TabEvaluateOrderConfig">
insert into tab_evaluate_order_config (evaluate_order_config_id, enterprise_id,
goods, store, service,
goods_required, store_required, service_required,
mind_hour, remind_day, evaluate_limitday,
default_content, review, review_limitday,
review_user_hidden, review_times, comment_module,
reward, order_type, good_evaluate_quick,
bad_evaluate_quick, reply_quick, bad_evaluate_tag,
reward, order_type, bad_evaluate_tag,
bad_suggestion_tag, update_time)
values (#{evaluateOrderConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER},
#{goods,jdbcType=INTEGER}, #{store,jdbcType=INTEGER}, #{service,jdbcType=INTEGER},
#{goodsRequired,jdbcType=INTEGER}, #{storeRequired,jdbcType=INTEGER}, #{serviceRequired,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}, #{goodEvaluateQuick,jdbcType=VARCHAR},
#{badEvaluateQuick,jdbcType=VARCHAR}, #{replyQuick,jdbcType=VARCHAR}, #{badEvaluateTag,jdbcType=INTEGER},
#{reward,jdbcType=INTEGER}, #{orderType,jdbcType=INTEGER}, #{badEvaluateTag,jdbcType=INTEGER},
#{badSuggestionTag,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.gic.evaluate.entity.TabEvaluateOrderConfig">
......@@ -83,15 +72,6 @@
<if test="service != null">
service,
</if>
<if test="goodsRequired != null">
goods_required,
</if>
<if test="storeRequired != null">
store_required,
</if>
<if test="serviceRequired != null">
service_required,
</if>
<if test="mindHour != null">
mind_hour,
</if>
......@@ -125,15 +105,6 @@
<if test="orderType != null">
order_type,
</if>
<if test="goodEvaluateQuick != null">
good_evaluate_quick,
</if>
<if test="badEvaluateQuick != null">
bad_evaluate_quick,
</if>
<if test="replyQuick != null">
reply_quick,
</if>
<if test="badEvaluateTag != null">
bad_evaluate_tag,
</if>
......@@ -160,15 +131,6 @@
<if test="service != null">
#{service,jdbcType=INTEGER},
</if>
<if test="goodsRequired != null">
#{goodsRequired,jdbcType=INTEGER},
</if>
<if test="storeRequired != null">
#{storeRequired,jdbcType=INTEGER},
</if>
<if test="serviceRequired != null">
#{serviceRequired,jdbcType=INTEGER},
</if>
<if test="mindHour != null">
#{mindHour,jdbcType=INTEGER},
</if>
......@@ -202,15 +164,6 @@
<if test="orderType != null">
#{orderType,jdbcType=INTEGER},
</if>
<if test="goodEvaluateQuick != null">
#{goodEvaluateQuick,jdbcType=VARCHAR},
</if>
<if test="badEvaluateQuick != null">
#{badEvaluateQuick,jdbcType=VARCHAR},
</if>
<if test="replyQuick != null">
#{replyQuick,jdbcType=VARCHAR},
</if>
<if test="badEvaluateTag != null">
#{badEvaluateTag,jdbcType=INTEGER},
</if>
......@@ -237,15 +190,6 @@
<if test="service != null">
service = #{service,jdbcType=INTEGER},
</if>
<if test="goodsRequired != null">
goods_required = #{goodsRequired,jdbcType=INTEGER},
</if>
<if test="storeRequired != null">
store_required = #{storeRequired,jdbcType=INTEGER},
</if>
<if test="serviceRequired != null">
service_required = #{serviceRequired,jdbcType=INTEGER},
</if>
<if test="mindHour != null">
mind_hour = #{mindHour,jdbcType=INTEGER},
</if>
......@@ -279,15 +223,6 @@
<if test="orderType != null">
order_type = #{orderType,jdbcType=INTEGER},
</if>
<if test="goodEvaluateQuick != null">
good_evaluate_quick = #{goodEvaluateQuick,jdbcType=VARCHAR},
</if>
<if test="badEvaluateQuick != null">
bad_evaluate_quick = #{badEvaluateQuick,jdbcType=VARCHAR},
</if>
<if test="replyQuick != null">
reply_quick = #{replyQuick,jdbcType=VARCHAR},
</if>
<if test="badEvaluateTag != null">
bad_evaluate_tag = #{badEvaluateTag,jdbcType=INTEGER},
</if>
......@@ -306,9 +241,6 @@
goods = #{goods,jdbcType=INTEGER},
store = #{store,jdbcType=INTEGER},
service = #{service,jdbcType=INTEGER},
goods_required = #{goodsRequired,jdbcType=INTEGER},
store_required = #{storeRequired,jdbcType=INTEGER},
service_required = #{serviceRequired,jdbcType=INTEGER},
mind_hour = #{mindHour,jdbcType=INTEGER},
remind_day = #{remindDay,jdbcType=INTEGER},
evaluate_limitday = #{evaluateLimitday,jdbcType=INTEGER},
......@@ -320,9 +252,6 @@
comment_module = #{commentModule,jdbcType=INTEGER},
reward = #{reward,jdbcType=INTEGER},
order_type = #{orderType,jdbcType=INTEGER},
good_evaluate_quick = #{goodEvaluateQuick,jdbcType=VARCHAR},
bad_evaluate_quick = #{badEvaluateQuick,jdbcType=VARCHAR},
reply_quick = #{replyQuick,jdbcType=VARCHAR},
bad_evaluate_tag = #{badEvaluateTag,jdbcType=INTEGER},
bad_suggestion_tag = #{badSuggestionTag,jdbcType=INTEGER},
update_time = #{updateTime,jdbcType=TIMESTAMP}
......
gic-evaluate-service/src/main/resources/mapper/TabEvaluateQuickMapper.xml
......@@ -2,33 +2,33 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gic.evaluate.dao.mapper.TabEvaluateQuickMapper">
<resultMap id="BaseResultMap" type="com.gic.evaluate.entity.TabEvaluateQuick">
<id column="evaluate_quick_id" jdbcType="CHAR" property="evaluateQuickId" />
<id column="evaluate_quick_id" jdbcType="INTEGER" property="evaluateQuickId" />
<result column="tag_type" jdbcType="INTEGER" property="tagType" />
<result column="tag_name" jdbcType="VARCHAR" property="tagName" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="enterprise_id" jdbcType="CHAR" property="enterpriseId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="status" jdbcType="INTEGER" property="status" />
</resultMap>
<sql id="Base_Column_List">
evaluate_quick_id, tag_type, tag_name, create_time, update_time, enterprise_id, status
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_evaluate_quick
where evaluate_quick_id = #{evaluateQuickId,jdbcType=CHAR}
where evaluate_quick_id = #{evaluateQuickId,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from tab_evaluate_quick
where evaluate_quick_id = #{evaluateQuickId,jdbcType=CHAR}
where evaluate_quick_id = #{evaluateQuickId,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.gic.evaluate.entity.TabEvaluateQuick">
insert into tab_evaluate_quick (evaluate_quick_id, tag_type, tag_name,
create_time, update_time, enterprise_id,
status)
values (#{evaluateQuickId,jdbcType=CHAR}, #{tagType,jdbcType=INTEGER}, #{tagName,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{enterpriseId,jdbcType=CHAR},
values (#{evaluateQuickId,jdbcType=INTEGER}, #{tagType,jdbcType=INTEGER}, #{tagName,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{enterpriseId,jdbcType=INTEGER},
#{status,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.gic.evaluate.entity.TabEvaluateQuick">
......@@ -58,7 +58,7 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="evaluateQuickId != null">
#{evaluateQuickId,jdbcType=CHAR},
#{evaluateQuickId,jdbcType=INTEGER},
</if>
<if test="tagType != null">
#{tagType,jdbcType=INTEGER},
......@@ -73,7 +73,7 @@
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=CHAR},
#{enterpriseId,jdbcType=INTEGER},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
......@@ -96,13 +96,13 @@
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=CHAR},
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
</set>
where evaluate_quick_id = #{evaluateQuickId,jdbcType=CHAR}
where evaluate_quick_id = #{evaluateQuickId,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.evaluate.entity.TabEvaluateQuick">
update tab_evaluate_quick
......@@ -110,8 +110,57 @@
tag_name = #{tagName,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
enterprise_id = #{enterpriseId,jdbcType=CHAR},
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER}
where evaluate_quick_id = #{evaluateQuickId,jdbcType=CHAR}
where evaluate_quick_id = #{evaluateQuickId,jdbcType=INTEGER}
</update>
<update id="delByEnterpriseId">
update tab_evaluate_quick set status = 0 where enterprise_id = #{enterpriseId} and tag_type = #{quickReplyType}
</update>
<insert id="insertSelectiveByNotExist">
INSERT INTO tab_evaluate_quick (
tag_type,
tag_name,
create_time,
enterprise_id,
status
) SELECT
#{tagType},
#{tagName},
#{createTime},
#{enterpriseId},
#{status}
FROM
DUAL
WHERE
NOT EXISTS (
SELECT
1
FROM
tab_evaluate_quick tb
WHERE
tb.enterprise_id = #{enterpriseId}
AND tb.tag_name = #{tagName}
AND tb.tag_type = #{tagType}
)
</insert>
<update id="updateStatusByEvaluateQuicks">
update tab_evaluate_quick set status = 1 where enterprise_id = #{enterpriseId} and tag_type = #{quickReplyType}
<if test="null != evaluateQuick and evaluateQuick.size &gt; 0">
and tag_name in
<foreach close=")" collection="evaluateQuick" index="index" item="item" open="(" separator=",">
#{item}
</foreach>
</if>
</update>
<select id="listEvaluateQuick" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_evaluate_quick
where enterprise_id = #{enterpriseId}
and tag_type = #{quickReplyType}
and status = 1
</select>
</mapper>
\ No newline at end of file
gic-evaluate-web/src/main/java/com/gic/evaluate/web/vo/EvaluateOrderConfigVO.java
......@@ -140,17 +140,17 @@ public class EvaluateOrderConfigVO implements Serializable {
/**
* 正面快捷短语
*/
private String goodEvaluateQuick;
private String[] goodEvaluateQuick;
/**
* 负面快捷短语
*/
private String badEvaluateQuick;
private String[] badEvaluateQuick;
/**
* 后台快捷评语
*/
private String replyQuick;
private String[] replyQuick;
public Integer getEvaluateOrderConfigId() {
return evaluateOrderConfigId;
......@@ -304,27 +304,27 @@ public class EvaluateOrderConfigVO implements Serializable {
this.orderType = orderType;
}
public String getGoodEvaluateQuick() {
public String[] getGoodEvaluateQuick() {
return goodEvaluateQuick;
}
public void setGoodEvaluateQuick(String goodEvaluateQuick) {
public void setGoodEvaluateQuick(String[] goodEvaluateQuick) {
this.goodEvaluateQuick = goodEvaluateQuick;
}
public String getBadEvaluateQuick() {
public String[] getBadEvaluateQuick() {
return badEvaluateQuick;
}
public void setBadEvaluateQuick(String badEvaluateQuick) {
public void setBadEvaluateQuick(String[] badEvaluateQuick) {
this.badEvaluateQuick = badEvaluateQuick;
}
public String getReplyQuick() {
public String[] getReplyQuick() {
return replyQuick;
}
public void setReplyQuick(String replyQuick) {
public void setReplyQuick(String[] replyQuick) {
this.replyQuick = replyQuick;
}
}
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