status修改成deleteFlag

gic-evaluate-api/src/main/java/com/gic/evaluate/constant/Constants.java

@@ -18,6 +18,15 @@ public class Constants {
     public static final Integer CLOSE = 0;
 
     /**
+     * 正常
+     */
+    public static final Integer NORMAL = 0;
+    /**
+     * 关闭
+     */
+    public static final Integer DELETE = 1;
+
+    /**
      * 按评分从高到低
      */
     public static final Integer EVALUATE_ORDER_SORT_SCORE = 1;

gic-evaluate-api/src/main/java/com/gic/evaluate/dto/EvaluateDTO.java

@@ -190,7 +190,7 @@ public class EvaluateDTO implements Serializable {
     /**
      *
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      *
@@ -496,12 +496,12 @@ public class EvaluateDTO implements Serializable {
         this.replyStatus = replyStatus;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {
@@ -654,7 +654,7 @@ public class EvaluateDTO implements Serializable {
                 ", showStatus=" + showStatus +
                 ", visitStatus=" + visitStatus +
                 ", replyStatus=" + replyStatus +
-                ", status=" + status +
+                ", status=" + deleteFlag +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 ", quickIds='" + quickIds + '\'' +

gic-evaluate-api/src/main/java/com/gic/evaluate/dto/EvaluateQuickDTO.java

@@ -44,7 +44,7 @@ public class EvaluateQuickDTO implements Serializable {
     /**
      * 状态（0：无效，1：有效）
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     public Integer getEvaluateQuickId() {
         return evaluateQuickId;
@@ -94,12 +94,12 @@ public class EvaluateQuickDTO implements Serializable {
         this.enterpriseId = enterpriseId;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     @Override
@@ -111,7 +111,7 @@ public class EvaluateQuickDTO implements Serializable {
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 ", enterpriseId=" + enterpriseId +
-                ", status=" + status +
+                ", status=" + deleteFlag +
                 '}';
     }
 }

gic-evaluate-api/src/main/java/com/gic/evaluate/dto/ProblemDTO.java

@@ -101,6 +101,9 @@ public class ProblemDTO implements Serializable {
     /**
      *
      */
+    private Integer deleteFlag;
+
+
     private Integer status;
 
     /**
@@ -260,12 +263,12 @@ public class ProblemDTO implements Serializable {
         this.showStatus = showStatus;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {
@@ -348,6 +351,10 @@ public class ProblemDTO implements Serializable {
         this.unionId = unionId;
     }
 
+    public Integer getStatus() {
+        return deleteFlag;
+    }
+
     @Override
     public String toString() {
         return "ProblemDTO{" +
@@ -370,7 +377,7 @@ public class ProblemDTO implements Serializable {
                 ", maliciousStatus=" + maliciousStatus +
                 ", maliciousStatusTime=" + maliciousStatusTime +
                 ", showStatus=" + showStatus +
-                ", status=" + status +
+                ", status=" + deleteFlag +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 ", replyContent='" + replyContent + '\'' +

gic-evaluate-api/src/main/java/com/gic/evaluate/dto/ProblemReplyDTO.java

@@ -64,7 +64,7 @@ public class ProblemReplyDTO implements Serializable {
     /**
      *
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      *
@@ -152,12 +152,12 @@ public class ProblemReplyDTO implements Serializable {
         this.userName = userName;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {
@@ -205,7 +205,7 @@ public class ProblemReplyDTO implements Serializable {
                 ", memberImgUrl='" + memberImgUrl + '\'' +
                 ", userId=" + userId +
                 ", userName='" + userName + '\'' +
-                ", status=" + status +
+                ", status=" + deleteFlag +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 ", imgList=" + imgList +

gic-evaluate-service/src/main/java/com/gic/evaluate/dao/mapper/TabBadEvaluateConfigMapper.java

@@ -11,14 +11,6 @@ import com.gic.evaluate.entity.TabBadEvaluateConfig;
  */
 public interface TabBadEvaluateConfigMapper {
     /**
-     * 根据主键删除
-     *
-     * @param badEvaluateConfigId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer badEvaluateConfigId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-evaluate-service/src/main/java/com/gic/evaluate/dao/mapper/TabEvaluateImgMapper.java

@@ -14,14 +14,6 @@ import java.util.List;
  */
 public interface TabEvaluateImgMapper {
     /**
-     * 根据主键删除
-     *
-     * @param evaluateImgId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer evaluateImgId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-evaluate-service/src/main/java/com/gic/evaluate/dao/mapper/TabEvaluateMapper.java

@@ -22,14 +22,6 @@ import java.util.Set;
  */
 public interface TabEvaluateMapper {
     /**
-     * 根据主键删除
-     *
-     * @param evaluateId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer evaluateId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-evaluate-service/src/main/java/com/gic/evaluate/dao/mapper/TabEvaluateMsgLogMapper.java

@@ -17,14 +17,6 @@ import java.util.Map;
  */
 public interface TabEvaluateMsgLogMapper {
     /**
-     * 根据主键删除
-     *
-     * @param evaluateMsgLogId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Long evaluateMsgLogId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-evaluate-service/src/main/java/com/gic/evaluate/dao/mapper/TabEvaluateOrderConfigMapper.java

@@ -11,14 +11,6 @@ import com.gic.evaluate.entity.TabEvaluateOrderConfig;
  */
 public interface TabEvaluateOrderConfigMapper {
     /**
-     * 根据主键删除
-     *
-     * @param evaluateOrderConfigId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer evaluateOrderConfigId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-evaluate-service/src/main/java/com/gic/evaluate/dao/mapper/TabEvaluateQuickMapper.java

@@ -15,14 +15,6 @@ import java.util.Map;
  */
 public interface TabEvaluateQuickMapper {
     /**
-     * 根据主键删除
-     *
-     * @param evaluateQuickId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(String evaluateQuickId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象
@@ -96,7 +88,7 @@ public interface TabEvaluateQuickMapper {
      * @return void
      * @throws
      */
-    void updateStatusByEvaluateQuicks(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateQuick") List<String> evaluateQuick, @Param("quickReplyType") Integer quickReplyType);
+    void updateDeleteFlagByEvaluateQuicks(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateQuick") List<String> evaluateQuick, @Param("quickReplyType") Integer quickReplyType);
 
     /**
      * listEvaluateQuick

gic-evaluate-service/src/main/java/com/gic/evaluate/dao/mapper/TabEvaluateReplyMapper.java

@@ -14,14 +14,6 @@ import java.util.List;
  */
 public interface TabEvaluateReplyMapper {
     /**
-     * 根据主键删除
-     *
-     * @param evaluateReplyId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer evaluateReplyId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-evaluate-service/src/main/java/com/gic/evaluate/dao/mapper/TabEvaluateTagsMapper.java

@@ -14,14 +14,6 @@ import java.util.List;
  */
 public interface TabEvaluateTagsMapper {
     /**
-     * 根据主键删除
-     *
-     * @param evaluateTagsId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer evaluateTagsId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-evaluate-service/src/main/java/com/gic/evaluate/dao/mapper/TabProblemImgMapper.java

@@ -13,14 +13,6 @@ import java.util.List;
  */
 public interface TabProblemImgMapper {
     /**
-     * 根据主键删除
-     *
-     * @param problemImgId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer problemImgId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-evaluate-service/src/main/java/com/gic/evaluate/dao/mapper/TabProblemMapper.java

@@ -18,14 +18,6 @@ import java.util.List;
  */
 public interface TabProblemMapper {
     /**
-     * 根据主键删除
-     *
-     * @param problemId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer problemId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-evaluate-service/src/main/java/com/gic/evaluate/dao/mapper/TabProblemReplyMapper.java

@@ -14,14 +14,6 @@ import java.util.List;
  */
 public interface TabProblemReplyMapper {
     /**
-     * 根据主键删除
-     *
-     * @param problemReplyId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer problemReplyId);
-
-    /**
      * 插入一条记录
      *
      * @param record 实体对象

gic-evaluate-service/src/main/java/com/gic/evaluate/entity/TabEvaluate.java

@@ -201,7 +201,7 @@ public class TabEvaluate {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -509,12 +509,12 @@ public class TabEvaluate {
         this.replyStatus = replyStatus;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {

gic-evaluate-service/src/main/java/com/gic/evaluate/entity/TabEvaluateImg.java

@@ -51,7 +51,7 @@ public class TabEvaluateImg {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -119,12 +119,12 @@ public class TabEvaluateImg {
         this.fieldCode = fieldCode;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {

gic-evaluate-service/src/main/java/com/gic/evaluate/entity/TabEvaluateQuick.java

@@ -46,7 +46,7 @@ public class TabEvaluateQuick {
     /**
      * 状态（0：无效，1：有效）
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     public Integer getEvaluateQuickId() {
         return evaluateQuickId;
@@ -96,11 +96,11 @@ public class TabEvaluateQuick {
         this.enterpriseId = enterpriseId;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 }
\ No newline at end of file

gic-evaluate-service/src/main/java/com/gic/evaluate/entity/TabEvaluateReply.java

@@ -76,7 +76,7 @@ public class TabEvaluateReply {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -184,12 +184,12 @@ public class TabEvaluateReply {
         this.userName = userName;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {

gic-evaluate-service/src/main/java/com/gic/evaluate/entity/TabEvaluateTags.java

@@ -61,7 +61,7 @@ public class TabEvaluateTags {
     /**
      * 状态（0：无效，1：有效）
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     public Integer getEvaluateTagsId() {
         return evaluateTagsId;
@@ -135,11 +135,11 @@ public class TabEvaluateTags {
         this.enterpriseId = enterpriseId;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 }
\ No newline at end of file

gic-evaluate-service/src/main/java/com/gic/evaluate/entity/TabProblem.java

@@ -101,7 +101,7 @@ public class TabProblem {
     /**
      * 0删除 1正常  2结束
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -249,12 +249,12 @@ public class TabProblem {
         this.showStatus = showStatus;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {

gic-evaluate-service/src/main/java/com/gic/evaluate/entity/TabProblemImg.java

@@ -50,7 +50,7 @@ public class TabProblemImg {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -118,12 +118,12 @@ public class TabProblemImg {
         this.fieldCode = fieldCode;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {

gic-evaluate-service/src/main/java/com/gic/evaluate/entity/TabProblemReply.java

@@ -76,7 +76,7 @@ public class TabProblemReply {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -184,12 +184,12 @@ public class TabProblemReply {
         this.userName = userName;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {

gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/EvaluateImgServiceImpl.java

@@ -45,7 +45,7 @@ public class EvaluateImgServiceImpl implements EvaluateImgService {
             tabProblemImg.setEvaluateReplyId(problemReplyId);
             tabProblemImg.setSortNum(i);
             tabProblemImg.setImgUrl(imgUrlList.get(i));
-            tabProblemImg.setStatus(Constants.OPEN);
+            tabProblemImg.setDeleteFlag(Constants.NORMAL);
             tabProblemImg.setCreateTime(new Date());
             tabEvaluateImgMapper.insertSelective(tabProblemImg);
         }

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.constant.Constants;
 import com.gic.evaluate.constant.QuickReplyTypeEnum;
 import com.gic.evaluate.dao.mapper.TabEvaluateQuickMapper;
 import com.gic.evaluate.entity.TabEvaluateQuick;
@@ -38,11 +38,11 @@ public class EvaluateQuickServiceImpl implements EvaluateQuickService {
                 tabEvaluateQuick.setTagName(quick);
                 tabEvaluateQuick.setCreateTime(new Date());
                 tabEvaluateQuick.setEnterpriseId(enterpriseId);
-                tabEvaluateQuick.setStatus(Constants.NORMAL_STATUS);
+                tabEvaluateQuick.setDeleteFlag(Constants.NORMAL);
                 tabEvaluateQuickMapper.insertSelectiveByNotExist(tabEvaluateQuick);
             }
             // 把所有userId关联status都设置为1
-            tabEvaluateQuickMapper.updateStatusByEvaluateQuicks(enterpriseId, evaluateQuick, quickReplyType);
+            tabEvaluateQuickMapper.updateDeleteFlagByEvaluateQuicks(enterpriseId, evaluateQuick, quickReplyType);
         }
     }
 

gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/EvaluateReplyServiceImpl.java

@@ -51,7 +51,7 @@ public class EvaluateReplyServiceImpl implements EvaluateReplyService {
         tabEvaluateReply.setReplyContent(userReplyDTO.getReplyContent());
         tabEvaluateReply.setUserId(userReplyDTO.getUserId());
         tabEvaluateReply.setUserName(userReplyDTO.getUserName());
-        tabEvaluateReply.setStatus(Constants.NORMAL_STATUS);
+        tabEvaluateReply.setDeleteFlag(com.gic.evaluate.constant.Constants.NORMAL);
         tabEvaluateReply.setShowStatus(Constants.NORMAL_STATUS);
         tabEvaluateReply.setCreateTime(new Date());
         tabEvaluateReplyMapper.insertSelective(tabEvaluateReply);
@@ -69,7 +69,7 @@ public class EvaluateReplyServiceImpl implements EvaluateReplyService {
         tabEvaluateReply.setMemberId(memberReplyDTO.getMemberId());
         tabEvaluateReply.setMemberName(memberReplyDTO.getMemberName());
         tabEvaluateReply.setMemberImgUrl(memberReplyDTO.getMemberImgUrl());
-        tabEvaluateReply.setStatus(Constants.NORMAL_STATUS);
+        tabEvaluateReply.setDeleteFlag(com.gic.evaluate.constant.Constants.NORMAL);
         tabEvaluateReply.setShowStatus(Constants.NORMAL_STATUS);
         tabEvaluateReply.setCreateTime(new Date());
         tabEvaluateReplyMapper.insertSelective(tabEvaluateReply);
@@ -80,7 +80,7 @@ public class EvaluateReplyServiceImpl implements EvaluateReplyService {
     public void delReply(Integer evaluateReplyId) {
         TabEvaluateReply tabEvaluateReply = new TabEvaluateReply();
         tabEvaluateReply.setEvaluateReplyId(evaluateReplyId);
-        tabEvaluateReply.setStatus(Constants.DEL_STATUS);
+        tabEvaluateReply.setDeleteFlag(com.gic.evaluate.constant.Constants.DELETE);
         tabEvaluateReplyMapper.updateByPrimaryKeySelective(tabEvaluateReply);
     }
 

gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/EvaluateServiceImpl.java

@@ -85,7 +85,7 @@ public class EvaluateServiceImpl implements EvaluateService {
     @Override
     public TabEvaluate getEvaluate(Integer enterpriseId, Integer evaluateId) {
         TabEvaluate evaluate = this.tabEvaluateMapper.selectByPrimaryKey(evaluateId);
-        if (evaluate != null && Constants.NORMAL_STATUS.equals(evaluate.getStatus()) && evaluate.getEnterpriseId().equals(enterpriseId)) {
+        if (evaluate != null && com.gic.evaluate.constant.Constants.NORMAL.equals(evaluate.getDeleteFlag()) && evaluate.getEnterpriseId().equals(enterpriseId)) {
             return evaluate;
         }
         return null;
@@ -94,7 +94,7 @@ public class EvaluateServiceImpl implements EvaluateService {
     @Override
     public Integer saveEvaluate(EvaluateDTO evaluateDTO) {
         TabEvaluate evaluate = EntityUtil.changeEntityByJSON(TabEvaluate.class, evaluateDTO);
-        evaluate.setStatus(Constants.NORMAL_STATUS);
+        evaluate.setDeleteFlag(com.gic.evaluate.constant.Constants.NORMAL);
         Date date = new Date();
         evaluate.setEvaluateTime(date);
         evaluate.setCreateTime(date);

gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/EvaluateTagsServiceImpl.java

@@ -48,7 +48,7 @@ public class EvaluateTagsServiceImpl implements EvaluateTagsService {
             tabEvaluateTags.setCreateTime(new Date());
             tabEvaluateTags.setUpdateTime(new Date());
             tabEvaluateTags.setEnterpriseId(enterpriseId);
-            tabEvaluateTags.setStatus(Constants.OPEN);
+            tabEvaluateTags.setDeleteFlag(Constants.NORMAL);
             tabEvaluateTagsMapper.insertSelective(tabEvaluateTags);
         } else {
             logger.info("该快评不存在:{}, evaluateId:{}", quickTagsId, evaluateId);

gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/ProblemImgServiceImpl.java

@@ -45,7 +45,7 @@ public class ProblemImgServiceImpl implements ProblemImgService {
             tabProblemImg.setProblemReplyId(problemReplyId);
             tabProblemImg.setSortNum(i);
             tabProblemImg.setImgUrl(imgUrlList.get(i));
-            tabProblemImg.setStatus(Constants.OPEN);
+            tabProblemImg.setDeleteFlag(Constants.NORMAL);
             tabProblemImg.setCreateTime(new Date());
             tabProblemImgMapper.insertSelective(tabProblemImg);
         }

gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/ProblemReplyServiceImpl.java

@@ -57,7 +57,7 @@ public class ProblemReplyServiceImpl implements ProblemReplyService {
         tabProblemReply.setReplyContent(problemUserReplyDTO.getReplyContent());
         tabProblemReply.setUserId(problemUserReplyDTO.getUserId());
         tabProblemReply.setUserName(problemUserReplyDTO.getUserName());
-        tabProblemReply.setStatus(Constants.OPEN);
+        tabProblemReply.setDeleteFlag(Constants.NORMAL);
         tabProblemReply.setCreateTime(new Date());
         tabProblemReplyMapper.insertSelective(tabProblemReply);
     }
@@ -74,7 +74,7 @@ public class ProblemReplyServiceImpl implements ProblemReplyService {
         problemReply.setMemberId(problemMemberReplyDTO.getMemberId());
         problemReply.setMemberName(problemMemberReplyDTO.getMemberName());
         problemReply.setMemberImgUrl(problemMemberReplyDTO.getMemberImgUrl());
-        problemReply.setStatus(Constants.OPEN);
+        problemReply.setDeleteFlag(Constants.NORMAL);
         problemReply.setCreateTime(new Date());
         tabProblemReplyMapper.insertSelective(problemReply);
         return problemReply.getProblemReplyId();

gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/ProblemServiceImpl.java

@@ -63,7 +63,7 @@ public class ProblemServiceImpl implements ProblemService {
         problem.setProblemStatus(ReplyEnum.WAIT.getCode());
         problem.setMaliciousStatus(Constants.CLOSE);
         problem.setShowStatus(Constants.OPEN);
-        problem.setStatus(Constants.OPEN);
+        problem.setDeleteFlag(Constants.NORMAL);
         problem.setCreateTime(new Date());
         tabProblemMapper.insertSelective(problem);
         return problem.getProblemId();
@@ -78,7 +78,7 @@ public class ProblemServiceImpl implements ProblemService {
     public void endProblem(Integer problemId) {
         TabProblem problem = new TabProblem();
         problem.setProblemId(problemId);
-        problem.setStatus(2);
+        problem.setDeleteFlag(2);
         tabProblemMapper.updateByPrimaryKeySelective(problem);
     }
 

gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/ProblemManageApiServiceImpl.java

@@ -135,7 +135,7 @@ public class ProblemManageApiServiceImpl implements ProblemManageApiService {
     public ServiceResponse<Void> deleteReply(Integer problemReplyId) {
         ProblemReplyDTO problemReplyDTO = new ProblemReplyDTO();
         problemReplyDTO.setProblemReplyId(problemReplyId);
-        problemReplyDTO.setStatus(Constants.CLOSE);
+        problemReplyDTO.setDeleteFlag(Constants.DELETE);
         problemReplyService.update(problemReplyDTO);
         return EnterpriseServiceResponse.success();
     }

gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/ProblemOutApiServiceImpl.java

@@ -159,7 +159,7 @@ public class ProblemOutApiServiceImpl implements ProblemOutApiService {
                     if (Constants.OPEN.equals(problemDTO.getMaliciousStatus())) {
                         Date date = DateUtil.addNumForHour(new Date(), -evaluateOrderConfig.getBadSuggestionTagType());
                         if (DateUtil.compareDate(problemDTO.getMaliciousStatusTime(), date)) {
-                            problemDTO.setStatus(2);
+                            problemDTO.setDeleteFlag(2);
                         }
                     }
                 }

gic-evaluate-service/src/main/resources/mapper/TabBadEvaluateConfigMapper.xml

@@ -35,10 +35,6 @@
     from tab_bad_evaluate_config
     where bad_evaluate_config_id = #{badEvaluateConfigId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_bad_evaluate_config
-    where bad_evaluate_config_id = #{badEvaluateConfigId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.evaluate.entity.TabBadEvaluateConfig">
     insert into tab_bad_evaluate_config (bad_evaluate_config_id, enterprise_id, 
       bad_once_status, bad_goods_type, bad_goods_score, 

gic-evaluate-service/src/main/resources/mapper/TabEvaluateImgMapper.xml

@@ -9,13 +9,13 @@
     <result column="sort_num" jdbcType="INTEGER" property="sortNum" />
     <result column="img_url" jdbcType="VARCHAR" property="imgUrl" />
     <result column="field_code" jdbcType="VARCHAR" property="fieldCode" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
     evaluate_img_id, enterprise_id, evaluate_id, evaluate_reply_id, sort_num, img_url, 
-    field_code, status, create_time, update_time
+    field_code, delete_flag, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -23,18 +23,14 @@
     from tab_evaluate_img
     where evaluate_img_id = #{evaluateImgId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_evaluate_img
-    where evaluate_img_id = #{evaluateImgId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.evaluate.entity.TabEvaluateImg">
     insert into tab_evaluate_img (evaluate_img_id, enterprise_id, evaluate_id, 
       evaluate_reply_id, sort_num, img_url, 
-      field_code, status, create_time, 
+      field_code, delete_flag, create_time,
       update_time)
     values (#{evaluateImgId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{evaluateId,jdbcType=INTEGER}, 
       #{evaluateReplyId,jdbcType=INTEGER}, #{sortNum,jdbcType=INTEGER}, #{imgUrl,jdbcType=VARCHAR}, 
-      #{fieldCode,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{fieldCode,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.evaluate.entity.TabEvaluateImg">
@@ -61,8 +57,8 @@
       <if test="fieldCode != null">
         field_code,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -93,8 +89,8 @@
       <if test="fieldCode != null">
         #{fieldCode,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -125,8 +121,8 @@
       <if test="fieldCode != null">
         field_code = #{fieldCode,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -145,7 +141,7 @@
       sort_num = #{sortNum,jdbcType=INTEGER},
       img_url = #{imgUrl,jdbcType=VARCHAR},
       field_code = #{fieldCode,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where evaluate_img_id = #{evaluateImgId,jdbcType=INTEGER}
@@ -155,13 +151,13 @@
     <include refid="Base_Column_List" />
     from tab_evaluate_img
     where evaluate_id = #{evaluateId} and evaluate_reply_id is null
-    and status = 1
+    and delete_flag = 0
   </select>
   <select id="listImageByEvaluateReplyId" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from tab_evaluate_img
     where evaluate_reply_id = #{evaluateReplyId}
-    and status = 1
+    and delete_flag = 0
   </select>
 </mapper>
\ No newline at end of file

gic-evaluate-service/src/main/resources/mapper/TabEvaluateMapper.xml

@@ -39,7 +39,7 @@
     <result column="show_status" jdbcType="INTEGER" property="showStatus" />
     <result column="visit_status" jdbcType="INTEGER" property="visitStatus" />
     <result column="reply_status" jdbcType="INTEGER" property="replyStatus" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
@@ -50,7 +50,7 @@
     store_group_name, area_name, order_number, receipts_date, order_mount, clerk_id, 
     clerk_name, bad_evaluate_status, good_evaluate_status, review_status, top_hot_status, 
     malicious_status, malicious_status_time, show_status, visit_status, reply_status, 
-    status, create_time, update_time
+    delete_flag, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -58,10 +58,6 @@
     from tab_evaluate
     where evaluate_id = #{evaluateId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_evaluate
-    where evaluate_id = #{evaluateId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.evaluate.entity.TabEvaluate">
     insert into tab_evaluate (evaluate_id, enterprise_id, store_id, 
       store_info_id, member_id, order_id, 
@@ -75,7 +71,7 @@
       clerk_name, bad_evaluate_status, good_evaluate_status, 
       review_status, top_hot_status, malicious_status, 
       malicious_status_time, show_status, visit_status, 
-      reply_status, status, create_time, 
+      reply_status, delete_flag, create_time,
       update_time)
     values (#{evaluateId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{storeId,jdbcType=INTEGER}, 
       #{storeInfoId,jdbcType=INTEGER}, #{memberId,jdbcType=BIGINT}, #{orderId,jdbcType=BIGINT}, 
@@ -89,7 +85,7 @@
       #{clerkName,jdbcType=VARCHAR}, #{badEvaluateStatus,jdbcType=INTEGER}, #{goodEvaluateStatus,jdbcType=INTEGER}, 
       #{reviewStatus,jdbcType=INTEGER}, #{topHotStatus,jdbcType=INTEGER}, #{maliciousStatus,jdbcType=INTEGER}, 
       #{maliciousStatusTime,jdbcType=TIMESTAMP}, #{showStatus,jdbcType=INTEGER}, #{visitStatus,jdbcType=INTEGER}, 
-      #{replyStatus,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{replyStatus,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.evaluate.entity.TabEvaluate">
@@ -209,8 +205,8 @@
       <if test="replyStatus != null">
         reply_status,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -331,8 +327,8 @@
       <if test="replyStatus != null">
         #{replyStatus,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -453,8 +449,8 @@
       <if test="replyStatus != null">
         reply_status = #{replyStatus,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -503,7 +499,7 @@
       show_status = #{showStatus,jdbcType=INTEGER},
       visit_status = #{visitStatus,jdbcType=INTEGER},
       reply_status = #{replyStatus,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      deleteFlag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where evaluate_id = #{evaluateId,jdbcType=INTEGER}
@@ -631,7 +627,7 @@
     FROM
       tab_evaluate
 	where enterprise_id = #{enterpriseId}
-	and status = 1
+	and delete_flag = 0
 	<if test="startTime != null and startTime != '' ">
         and evaluate_time &gt;= #{startTime}
     </if>
@@ -657,7 +653,7 @@
     FROM
 	tab_evaluate
 	where enterprise_id = #{enterpriseId}
-	and status = 1
+	and delete_flag = 0
     and goods_score &gt; 0
 	<if test="startTime != null and startTime != '' ">
         and evaluate_time &gt;= #{startTime}
@@ -684,7 +680,7 @@
     FROM
 	tab_evaluate
 	where enterprise_id = #{enterpriseId}
-	and status = 1
+	and delete_flag = 0
     and store_score &gt; 0
 	<if test="startTime != null and startTime != '' ">
         and evaluate_time &gt;= #{startTime}
@@ -711,7 +707,7 @@
     FROM
 	tab_evaluate
 	where enterprise_id = #{enterpriseId}
-	and status = 1
+	and delete_flag = 0
     and service_score &gt; 0
 	<if test="startTime != null and startTime != '' ">
         and evaluate_time &gt;= #{startTime}
@@ -731,7 +727,7 @@
     DATE_FORMAT(receipts_date,'%Y-%m-%d') statisticsDate,
     count(*) `count`
     from tab_evaluate
-    where status = 1
+    where delete_flag = 0
     and enterprise_id = #{enterpriseId}
     <if test="startTime != null and startTime != '' ">
       and DATE_FORMAT(evaluate_time,'%Y-%m-%d') &gt;= #{startTime}
@@ -761,7 +757,7 @@
     round(avg(service_score), 2) serviceScore
     from tab_evaluate
     where enterprise_id = #{enterpriseId}
-    and status = 1
+    and delete_flag = 0
     <if test="storeGroupId != null ">
         and store_group_id = #{storeGroupId}
     </if>
@@ -807,7 +803,7 @@
     round(avg(service_score), 2) serviceScore
     from tab_evaluate
     where enterprise_id = #{enterpriseId}
-    and status = 1
+    and delete_flag = 0
     <if test="storeGroupId != null ">
         and store_group_id = #{storeGroupId}
     </if>
@@ -823,7 +819,7 @@
     count(good_evaluate_status = 1 or null) / count(*) goodRate
     from tab_evaluate
     where enterprise_id = #{enterpriseId}
-    and status = 1
+    and delete_flag = 0
     <if test="storeGroupId != null ">
       and store_group_id = #{storeGroupId}
     </if>
@@ -857,7 +853,7 @@
   from tab_evaluate
   where enterprise_id = #{enterpriseId}
   and order_id = #{orderId}
-  and status = 1
+  and delete_flag = 0
   limit 1
   </select>
 <!--  &lt;select id="evaluateQuickChart" resultType="map"&gt;-->
@@ -891,7 +887,7 @@
     DATE_FORMAT(evaluate_time,'%Y') statisticsDate,
     count(*) `count`
     from tab_evaluate
-    where status = 1
+    where delete_flag = 0
       <if test="enterpriseId != null ">
           and enterprise_id = #{enterpriseId}
       </if>
@@ -908,7 +904,7 @@
     DATE_FORMAT(evaluate_time,'%Y-%m') statisticsDate,
     count(*) `count`
     from tab_evaluate
-    where status = 1
+    where delete_flag = 0
     <if test="enterpriseId != null ">
         and enterprise_id = #{enterpriseId}
     </if>
@@ -928,7 +924,7 @@
     DATE_FORMAT(evaluate_time,'%Y-%m-%d') statisticsDate,
     count(*) `count`
     from tab_evaluate
-    where status = 1
+    where delete_flag = 0
     <if test="enterpriseId != null ">
         and enterprise_id = #{enterpriseId}
     </if>
@@ -950,13 +946,13 @@
     tab_evaluate
     where enterprise_id = #{enterpriseId}
     and store_id = #{storeId}
-    and status = 1
+    and delete_flag = 0
     and top_hot_status = 1
   </select>
   <select id="listAllEvaluateId" resultType="int">
     select
     evaluate_id
-    from tab_evaluate where enterprise_id = #{enterpriseId} and status = 1
+    from tab_evaluate where enterprise_id = #{enterpriseId} and delete_flag = 0
   </select>
   <select id="getStoreHasTopHot" resultType="int">
     select
@@ -974,7 +970,7 @@
     select
     count(*)
     from tab_evaluate
-    where status = 1 and enterprise_id=#{enterpriseId}
+    where delete_flag = 0 and enterprise_id=#{enterpriseId}
     <if test="quickReplyType == 1">
       and bad_evaluate_status = 1
     </if>
@@ -1000,7 +996,7 @@
     count(*) evaluateCount
     from tab_evaluate
     where enterprise_id = #{enterpriseId}
-    and status = 1
+    and delete_flag = 0
     <if test="null != ids">
       and store_id in
       <foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">
@@ -1020,6 +1016,6 @@
         #{item}
       </foreach>
     </if>
-    and status = 1
+    and delete_flag = 0
   </select>
 </mapper>
\ No newline at end of file

gic-evaluate-service/src/main/resources/mapper/TabEvaluateMsgLogMapper.xml

@@ -36,10 +36,6 @@
     from tab_evaluate_msg_log
     where evaluate_msg_log_id = #{evaluateMsgLogId,jdbcType=BIGINT}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from tab_evaluate_msg_log
-    where evaluate_msg_log_id = #{evaluateMsgLogId,jdbcType=BIGINT}
-  </delete>
   <insert id="insert" parameterType="com.gic.evaluate.entity.TabEvaluateMsgLog">
     insert into tab_evaluate_msg_log (evaluate_msg_log_id, enterprise_id, order_id, 
       order_number, store_id, sale_amount, 

gic-evaluate-service/src/main/resources/mapper/TabEvaluateOrderConfigMapper.xml

@@ -37,10 +37,6 @@
     from tab_evaluate_order_config
     where evaluate_order_config_id = #{evaluateOrderConfigId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_evaluate_order_config
-    where evaluate_order_config_id = #{evaluateOrderConfigId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.evaluate.entity.TabEvaluateOrderConfig">
     insert into tab_evaluate_order_config (evaluate_order_config_id, enterprise_id, 
       goods, store, service, 

gic-evaluate-service/src/main/resources/mapper/TabEvaluateQuickMapper.xml

@@ -8,10 +8,10 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
   </resultMap>
   <sql id="Base_Column_List">
-    evaluate_quick_id, tag_type, tag_name, create_time, update_time, enterprise_id, status
+    evaluate_quick_id, tag_type, tag_name, create_time, update_time, enterprise_id, delete_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -19,17 +19,13 @@
     from tab_evaluate_quick
     where evaluate_quick_id = #{evaluateQuickId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_evaluate_quick
-    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)
+      delete_flag)
     values (#{evaluateQuickId,jdbcType=INTEGER}, #{tagType,jdbcType=INTEGER}, #{tagName,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{enterpriseId,jdbcType=INTEGER}, 
-      #{status,jdbcType=INTEGER})
+      #{deleteFlag,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.evaluate.entity.TabEvaluateQuick">
     insert into tab_evaluate_quick
@@ -52,8 +48,8 @@
       <if test="enterpriseId != null">
         enterprise_id,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -75,8 +71,8 @@
       <if test="enterpriseId != null">
         #{enterpriseId,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
     </trim>
   </insert>
@@ -98,8 +94,8 @@
       <if test="enterpriseId != null">
         enterprise_id = #{enterpriseId,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
     </set>
     where evaluate_quick_id = #{evaluateQuickId,jdbcType=INTEGER}
@@ -111,11 +107,11 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       enterprise_id = #{enterpriseId,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER}
+      delete_flag = #{deleteFlag,jdbcType=INTEGER}
     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 tab_evaluate_quick set delete_flag = 1 where enterprise_id = #{enterpriseId} and tag_type = #{quickReplyType}
   </update>
   <insert id="insertSelectiveByNotExist">
     INSERT INTO tab_evaluate_quick (
@@ -123,13 +119,13 @@
             tag_name,
             create_time,
             enterprise_id,
-            status
+            delete_flag
         ) SELECT
             #{tagType},
             #{tagName},
             #{createTime},
             #{enterpriseId},
-            #{status}
+            #{deleteFlag}
         FROM
             DUAL
         WHERE
@@ -144,8 +140,8 @@
                     AND tb.tag_type = #{tagType}
             )
   </insert>
-  <update id="updateStatusByEvaluateQuicks">
-    update tab_evaluate_quick set status = 1 where enterprise_id = #{enterpriseId} and tag_type = #{quickReplyType}
+  <update id="updateDeleteFlagByEvaluateQuicks">
+    update tab_evaluate_quick set delete_flag = 0 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=",">
@@ -160,7 +156,7 @@
     from tab_evaluate_quick
     where enterprise_id = #{enterpriseId}
     and tag_type = #{quickReplyType}
-    and status = 1
+    and delete_flag = 0
   </select>
 
 <select id="evaluateQuickChart" resultType="map">

gic-evaluate-service/src/main/resources/mapper/TabEvaluateReplyMapper.xml

@@ -14,13 +14,13 @@
     <result column="show_status" jdbcType="INTEGER" property="showStatus" />
     <result column="user_id" jdbcType="INTEGER" property="userId" />
     <result column="user_name" jdbcType="VARCHAR" property="userName" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
     evaluate_reply_id, enterprise_id, evaluate_id, reply_date, replyer_type, reply_content, 
-    member_id, member_name, member_img_url, show_status, user_id, user_name, status, 
+    member_id, member_name, member_img_url, show_status, user_id, user_name, delete_flag,
     create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -29,22 +29,18 @@
     from tab_evaluate_reply
     where evaluate_reply_id = #{evaluateReplyId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_evaluate_reply
-    where evaluate_reply_id = #{evaluateReplyId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.evaluate.entity.TabEvaluateReply">
     insert into tab_evaluate_reply (evaluate_reply_id, enterprise_id, evaluate_id, 
       reply_date, replyer_type, reply_content, 
       member_id, member_name, member_img_url, 
       show_status, user_id, user_name, 
-      status, create_time, update_time
+      delete_flag, create_time, update_time
       )
     values (#{evaluateReplyId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{evaluateId,jdbcType=INTEGER}, 
       #{replyDate,jdbcType=TIMESTAMP}, #{replyerType,jdbcType=INTEGER}, #{replyContent,jdbcType=VARCHAR}, 
       #{memberId,jdbcType=BIGINT}, #{memberName,jdbcType=VARCHAR}, #{memberImgUrl,jdbcType=VARCHAR}, 
       #{showStatus,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, 
-      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.evaluate.entity.TabEvaluateReply">
@@ -89,8 +85,8 @@
       <if test="userName != null">
         user_name,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -136,8 +132,8 @@
       <if test="userName != null">
         #{userName,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -183,8 +179,8 @@
       <if test="userName != null">
         user_name = #{userName,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -208,7 +204,7 @@
       show_status = #{showStatus,jdbcType=INTEGER},
       user_id = #{userId,jdbcType=INTEGER},
       user_name = #{userName,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where evaluate_reply_id = #{evaluateReplyId,jdbcType=INTEGER}
@@ -224,7 +220,7 @@
         #{item}
       </foreach>
     </if>
-    and status = 1
+    and delete_flag = 0
     <if test="showStatus != null ">
         and show_status = #{showStatus}
     </if>
@@ -239,6 +235,6 @@
     where enterprise_id = #{enterpriseId}
     and evaluate_id = #{evaluateId}
     and replyer_type = 1
-    and status = 1
+    and delete_flag = 0
   </select>
 </mapper>
\ No newline at end of file

gic-evaluate-service/src/main/resources/mapper/TabEvaluateTagsMapper.xml

@@ -11,11 +11,11 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
   </resultMap>
   <sql id="Base_Column_List">
     evaluate_tags_id, evaluate_id, evaluate_reply_id, member_id, tag_type, tag_name, 
-    create_time, update_time, enterprise_id, status
+    create_time, update_time, enterprise_id, delete_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -23,19 +23,15 @@
     from tab_evaluate_tags
     where evaluate_tags_id = #{evaluateTagsId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_evaluate_tags
-    where evaluate_tags_id = #{evaluateTagsId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.evaluate.entity.TabEvaluateTags">
     insert into tab_evaluate_tags (evaluate_tags_id, evaluate_id, evaluate_reply_id, 
       member_id, tag_type, tag_name, 
       create_time, update_time, enterprise_id, 
-      status)
+      delete_flag)
     values (#{evaluateTagsId,jdbcType=INTEGER}, #{evaluateId,jdbcType=INTEGER}, #{evaluateReplyId,jdbcType=INTEGER}, 
       #{memberId,jdbcType=BIGINT}, #{tagType,jdbcType=INTEGER}, #{tagName,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{enterpriseId,jdbcType=INTEGER}, 
-      #{status,jdbcType=INTEGER})
+      #{deleteFlag,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.evaluate.entity.TabEvaluateTags">
     insert into tab_evaluate_tags
@@ -67,8 +63,8 @@
       <if test="enterpriseId != null">
         enterprise_id,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -99,8 +95,8 @@
       <if test="enterpriseId != null">
         #{enterpriseId,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
     </trim>
   </insert>
@@ -131,8 +127,8 @@
       <if test="enterpriseId != null">
         enterprise_id = #{enterpriseId,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
     </set>
     where evaluate_tags_id = #{evaluateTagsId,jdbcType=INTEGER}
@@ -147,7 +143,7 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       enterprise_id = #{enterpriseId,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER}
+      delete_flag = #{deleteFlag,jdbcType=INTEGER}
     where evaluate_tags_id = #{evaluateTagsId,jdbcType=INTEGER}
   </update>
   <select id="listEvaluateTags" resultMap="BaseResultMap">
@@ -155,7 +151,7 @@
     <include refid="Base_Column_List" />
     from tab_evaluate_tags
     where enterprise_id = #{enterpriseId}
-    and status = 1
+    and delete_flag = 0
     <if test="null != evaluateIdList and evaluateIdList.size > 0">
       and evaluate_id in
       <foreach collection="evaluateIdList" index="index" item="item" open="(" separator="," close=")">

gic-evaluate-service/src/main/resources/mapper/TabProblemImgMapper.xml

@@ -9,13 +9,13 @@
     <result column="sort_num" jdbcType="INTEGER" property="sortNum" />
     <result column="img_url" jdbcType="VARCHAR" property="imgUrl" />
     <result column="field_code" jdbcType="VARCHAR" property="fieldCode" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
     problem_img_id, enterprise_id, problem_id, problem_reply_id, sort_num, img_url, field_code, 
-    status, create_time, update_time
+    delete_flag, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -23,18 +23,14 @@
     from tab_problem_img
     where problem_img_id = #{problemImgId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_problem_img
-    where problem_img_id = #{problemImgId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.evaluate.entity.TabProblemImg">
     insert into tab_problem_img (problem_img_id, enterprise_id, problem_id, 
       problem_reply_id, sort_num, img_url, 
-      field_code, status, create_time, 
+      field_code, delete_flag, create_time,
       update_time)
     values (#{problemImgId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{problemId,jdbcType=INTEGER}, 
       #{problemReplyId,jdbcType=INTEGER}, #{sortNum,jdbcType=INTEGER}, #{imgUrl,jdbcType=VARCHAR}, 
-      #{fieldCode,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{fieldCode,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.evaluate.entity.TabProblemImg">
@@ -61,8 +57,8 @@
       <if test="fieldCode != null">
         field_code,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -93,8 +89,8 @@
       <if test="fieldCode != null">
         #{fieldCode,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -125,8 +121,8 @@
       <if test="fieldCode != null">
         field_code = #{fieldCode,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -145,7 +141,7 @@
       sort_num = #{sortNum,jdbcType=INTEGER},
       img_url = #{imgUrl,jdbcType=VARCHAR},
       field_code = #{fieldCode,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where problem_img_id = #{problemImgId,jdbcType=INTEGER}
@@ -155,13 +151,13 @@
     <include refid="Base_Column_List" />
     from tab_problem_img
     where problem_id = #{problemId} and problem_reply_id is null
-    and status = 1
+    and delete_flag = 0
   </select>
   <select id="listImageByProblemReplyId" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from tab_problem_img
     where problem_reply_id = #{problemReplyId}
-    and status = 1
+    and delete_flag = 0
   </select>
 </mapper>
\ No newline at end of file

gic-evaluate-service/src/main/resources/mapper/TabProblemMapper.xml

@@ -19,14 +19,14 @@
     <result column="malicious_status" jdbcType="INTEGER" property="maliciousStatus" />
     <result column="malicious_status_time" jdbcType="TIMESTAMP" property="maliciousStatusTime" />
     <result column="show_status" jdbcType="INTEGER" property="showStatus" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
     problem_id, enterprise_id, store_id, store_name, ecu_id, acu_id, member_id, member_name, 
     member_phone, member_img_url, problem_content, image_url, has_other_image, problem_status, 
-    malicious_status, malicious_status_time, show_status, status, create_time, update_time
+    malicious_status, malicious_status_time, show_status, delete_flag, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -34,24 +34,20 @@
     from tab_problem
     where problem_id = #{problemId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_problem
-    where problem_id = #{problemId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.evaluate.entity.TabProblem">
     insert into tab_problem (problem_id, enterprise_id, store_id, 
       store_name, ecu_id, acu_id, 
       member_id, member_name, member_phone, 
       member_img_url, problem_content, image_url, 
       has_other_image, problem_status, malicious_status, 
-      malicious_status_time, show_status, status, 
+      malicious_status_time, show_status, delete_flag,
       create_time, update_time)
     values (#{problemId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{storeId,jdbcType=INTEGER}, 
       #{storeName,jdbcType=VARCHAR}, #{ecuId,jdbcType=BIGINT}, #{acuId,jdbcType=BIGINT}, 
       #{memberId,jdbcType=BIGINT}, #{memberName,jdbcType=VARCHAR}, #{memberPhone,jdbcType=VARCHAR}, 
       #{memberImgUrl,jdbcType=VARCHAR}, #{problemContent,jdbcType=VARCHAR}, #{imageUrl,jdbcType=VARCHAR}, 
       #{hasOtherImage,jdbcType=INTEGER}, #{problemStatus,jdbcType=INTEGER}, #{maliciousStatus,jdbcType=INTEGER}, 
-      #{maliciousStatusTime,jdbcType=TIMESTAMP}, #{showStatus,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
+      #{maliciousStatusTime,jdbcType=TIMESTAMP}, #{showStatus,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER},
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.evaluate.entity.TabProblem">
@@ -111,8 +107,8 @@
       <if test="showStatus != null">
         show_status,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -173,8 +169,8 @@
       <if test="showStatus != null">
         #{showStatus,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -235,8 +231,8 @@
       <if test="showStatus != null">
         show_status = #{showStatus,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -265,7 +261,7 @@
       malicious_status = #{maliciousStatus,jdbcType=INTEGER},
       malicious_status_time = #{maliciousStatusTime,jdbcType=TIMESTAMP},
       show_status = #{showStatus,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where problem_id = #{problemId,jdbcType=INTEGER}
@@ -358,11 +354,11 @@
     t1.malicious_status maliciousStatus,
     t1.malicious_status_time maliciousStatusTime,
     t1.show_status showStatus,
-    t1.status status,
+    t1.delete_flag deleteFlag,
     t1.create_time createTime,
     t3.problemCount
     from tab_problem t1
-    left join ( select problem_id, count(*) problemCount from tab_problem_reply where status &lt;&gt; 0 GROUP BY problem_id ) t3 on t1.problem_id = t3.problem_id
+    left join ( select problem_id, count(*) problemCount from tab_problem_reply where delete_flag &lt;&gt; 1 GROUP BY problem_id ) t3 on t1.problem_id = t3.problem_id
     where t1.acu_id = #{acuId}
     order by create_time desc
   </select>
@@ -370,7 +366,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_problem
-    where status = 1
+    where delete_flag = 0
     and acu_id = #{acuId}
     and malicious_status = 1
     and malicious_status_time &gt; #{date}

gic-evaluate-service/src/main/resources/mapper/TabProblemReplyMapper.xml

@@ -14,7 +14,7 @@
     <result column="member_img_url" jdbcType="VARCHAR" property="memberImgUrl" />
     <result column="user_id" jdbcType="INTEGER" property="userId" />
     <result column="user_name" jdbcType="VARCHAR" property="userName" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
@@ -29,22 +29,18 @@
     from tab_problem_reply
     where problem_reply_id = #{problemReplyId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_problem_reply
-    where problem_reply_id = #{problemReplyId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="com.gic.evaluate.entity.TabProblemReply">
     insert into tab_problem_reply (problem_reply_id, enterprise_id, problem_id, 
       replyer_type, reply_content, ecu_id, 
       acu_id, member_id, member_name, 
       member_img_url, user_id, user_name, 
-      status, create_time, update_time
+      delete_flag, create_time, update_time
       )
     values (#{problemReplyId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{problemId,jdbcType=INTEGER}, 
       #{replyerType,jdbcType=INTEGER}, #{replyContent,jdbcType=VARCHAR}, #{ecuId,jdbcType=BIGINT}, 
       #{acuId,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT}, #{memberName,jdbcType=VARCHAR}, 
       #{memberImgUrl,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, 
-      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.evaluate.entity.TabProblemReply">
@@ -89,8 +85,8 @@
       <if test="userName != null">
         user_name,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -136,8 +132,8 @@
       <if test="userName != null">
         #{userName,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -183,8 +179,8 @@
       <if test="userName != null">
         user_name = #{userName,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -208,7 +204,7 @@
       member_img_url = #{memberImgUrl,jdbcType=VARCHAR},
       user_id = #{userId,jdbcType=INTEGER},
       user_name = #{userName,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where problem_reply_id = #{problemReplyId,jdbcType=INTEGER}
@@ -218,7 +214,7 @@
     <include refid="Base_Column_List" />
     from tab_problem_reply
     where problem_id = #{problemId}
-    and status = 1
+    and deleteFlag = 0
   </select>
   <select id="firstReplyByProblemId" resultMap="BaseResultMap">
     SELECT
@@ -230,7 +226,7 @@
         tab_problem_reply
     WHERE
         replyer_type = 2
-        and status = 1
+        and delete_flag = 0
         <if test="null != ids and ids.size &gt; 0">
           and problem_id in
           <foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">