Merge branch 'developer' into 'master'

Developer

See merge request !77

gic-data-cloud-api/src/main/java/com/gic/cloud/constants/LogAndUpdateTipsTypeEnum.java

@@ -10,6 +10,8 @@ public enum LogAndUpdateTipsTypeEnum {
     INDEX(1),
     // 数据解读
     DATA_EXPLAIN(2),
+    // 好办
+    HAOBAN(3),
     ;
     private Integer code;
 

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/AccountGroupDTO.java

@@ -29,9 +29,9 @@ public class AccountGroupDTO implements Serializable{
     private Integer enterpriseId;
 
     /**
-     * 1：有效 0:无效
+     * 0：有效 1:无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 排序
@@ -80,12 +80,12 @@ public class AccountGroupDTO implements Serializable{
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public AccountGroupDTO setStatus(Integer status) {
-        this.status = status;
+    public AccountGroupDTO setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/DataAuthDTO.java

@@ -53,9 +53,9 @@ public class DataAuthDTO implements Serializable{
     private String goodsAreaAuth;
 
     /**
-     * 1：有效 0:无效
+     * 0：有效 1:无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 创建时间
@@ -135,12 +135,12 @@ public class DataAuthDTO implements Serializable{
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public DataAuthDTO setStatus(Integer status) {
-        this.status = status;
+    public DataAuthDTO setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 
@@ -182,6 +182,19 @@ public class DataAuthDTO implements Serializable{
 
     @Override
     public String toString() {
-        return super.toString();
+        return "DataAuthDTO{" +
+                "dataAuthId=" + dataAuthId +
+                ", dataAuthName='" + dataAuthName + '\'' +
+                ", enterpriseId=" + enterpriseId +
+                ", onlinePerformance='" + onlinePerformance + '\'' +
+                ", noOwnerStore=" + noOwnerStore +
+                ", storeWidgetId=" + storeWidgetId +
+                ", memberCardAuth='" + memberCardAuth + '\'' +
+                ", goodsAreaAuth='" + goodsAreaAuth + '\'' +
+                ", deleteFlag=" + deleteFlag +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", memberCount=" + memberCount +
+                '}';
     }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/DataExplainDTO.java

@@ -49,7 +49,7 @@ public class DataExplainDTO implements Serializable {
     /**
      *
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 模块id
@@ -114,12 +114,13 @@ public class DataExplainDTO implements Serializable {
         this.updateTime = updateTime;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public DataExplainDTO setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
     }
 
     public String getModuleId() {
@@ -148,6 +149,18 @@ public class DataExplainDTO implements Serializable {
 
     @Override
     public String toString() {
-        return super.toString();
+        return "DataExplainDTO{" +
+                "dataExplainId=" + dataExplainId +
+                ", dataName='" + dataName + '\'' +
+                ", dataClassify='" + dataClassify + '\'' +
+                ", indexRemark='" + indexRemark + '\'' +
+                ", complement='" + complement + '\'' +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", deleteFlag=" + deleteFlag +
+                ", moduleId='" + moduleId + '\'' +
+                ", optUserId=" + optUserId +
+                ", optUserName='" + optUserName + '\'' +
+                '}';
     }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/EnterprisePortraitRelDTO.java

@@ -54,6 +54,8 @@ public class EnterprisePortraitRelDTO implements Serializable{
      */
     private Integer status;
 
+    private Integer deleteFlag;
+
     public Integer getPortraitRelationId() {
         return portraitRelationId;
     }
@@ -135,8 +137,28 @@ public class EnterprisePortraitRelDTO implements Serializable{
         return this;
     }
 
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public EnterprisePortraitRelDTO setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
+    }
+
     @Override
     public String toString() {
-        return super.toString();
+        return "EnterprisePortraitRelDTO{" +
+                "portraitRelationId=" + portraitRelationId +
+                ", portraitName='" + portraitName + '\'' +
+                ", portraitCode='" + portraitCode + '\'' +
+                ", enterpriseId=" + enterpriseId +
+                ", sort=" + sort +
+                ", dataType=" + dataType +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", status=" + status +
+                ", deleteFlag=" + deleteFlag +
+                '}';
     }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/FunctionDTO.java

@@ -34,9 +34,9 @@ public class FunctionDTO implements Serializable{
     private String functionComponent;
 
     /**
-     * 1：有效 0:无效
+     * 0：有效 1:无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 创建时间
@@ -89,12 +89,12 @@ public class FunctionDTO implements Serializable{
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public FunctionDTO setStatus(Integer status) {
-        this.status = status;
+    public FunctionDTO setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 
@@ -127,6 +127,15 @@ public class FunctionDTO implements Serializable{
 
     @Override
     public String toString() {
-        return super.toString();
+        return "FunctionDTO{" +
+                "functionId=" + functionId +
+                ", functionName='" + functionName + '\'' +
+                ", enterpriseId=" + enterpriseId +
+                ", functionComponent='" + functionComponent + '\'' +
+                ", deleteFlag=" + deleteFlag +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", memberCount=" + memberCount +
+                '}';
     }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/FunctionModuleDTO.java

@@ -46,9 +46,9 @@ public class FunctionModuleDTO implements Serializable{
     private String logo;
 
     /**
-     * 1：有效 0:无效
+     * 0：有效 1:无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 创建时间
@@ -114,12 +114,12 @@ public class FunctionModuleDTO implements Serializable{
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public FunctionModuleDTO setStatus(Integer status) {
-        this.status = status;
+    public FunctionModuleDTO setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 
@@ -152,6 +152,17 @@ public class FunctionModuleDTO implements Serializable{
 
     @Override
     public String toString() {
-        return super.toString();
+        return "FunctionModuleDTO{" +
+                "functionModuleId=" + functionModuleId +
+                ", functionModuleName='" + functionModuleName + '\'' +
+                ", functionModuleCode='" + functionModuleCode + '\'' +
+                ", functionModuleDesc='" + functionModuleDesc + '\'' +
+                ", operationId='" + operationId + '\'' +
+                ", operationName='" + operationName + '\'' +
+                ", logo='" + logo + '\'' +
+                ", deleteFlag=" + deleteFlag +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
     }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/IndexDescDTO.java

@@ -40,7 +40,7 @@ public class IndexDescDTO implements Serializable {
     /**
      *
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      *
@@ -111,12 +111,13 @@ public class IndexDescDTO implements Serializable {
         this.indexGroupName = indexGroupName;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public IndexDescDTO setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
     }
 
     public Date getCreateTime() {
@@ -209,6 +210,24 @@ public class IndexDescDTO implements Serializable {
 
     @Override
     public String toString() {
-        return super.toString();
+        return "IndexDescDTO{" +
+                "indexDescId=" + indexDescId +
+                ", moduleId='" + moduleId + '\'' +
+                ", indexName='" + indexName + '\'' +
+                ", unit='" + unit + '\'' +
+                ", indexCode='" + indexCode + '\'' +
+                ", indexGroupName='" + indexGroupName + '\'' +
+                ", deleteFlag=" + deleteFlag +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", enterpriseId=" + enterpriseId +
+                ", sort=" + sort +
+                ", updateTips=" + updateTips +
+                ", indexDescEnterpriseId=" + indexDescEnterpriseId +
+                ", updateTipsId=" + updateTipsId +
+                ", indexId=" + indexId +
+                ", remark='" + remark + '\'' +
+                ", seq=" + seq +
+                '}';
     }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/IndexGroupDTO.java

@@ -45,7 +45,7 @@ public class IndexGroupDTO implements Serializable {
     /**
      *
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     private List<IndexGroupDTO> childList;
 
@@ -97,12 +97,13 @@ public class IndexGroupDTO implements Serializable {
         this.updateTime = updateTime;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public IndexGroupDTO setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
     }
 
     public List<IndexGroupDTO> getChildList() {
@@ -115,6 +116,15 @@ public class IndexGroupDTO implements Serializable {
 
     @Override
     public String toString() {
-        return super.toString();
+        return "IndexGroupDTO{" +
+                "indexGroupId=" + indexGroupId +
+                ", indexGroupName='" + indexGroupName + '\'' +
+                ", parentId=" + parentId +
+                ", groupChain='" + groupChain + '\'' +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", deleteFlag=" + deleteFlag +
+                ", childList=" + childList +
+                '}';
     }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/TempStoreConditionDTO.java

@@ -28,9 +28,9 @@ public class TempStoreConditionDTO implements Serializable{
     private Integer enterpriseId;
 
     /**
-     * 1：有效 0:无效
+     * 0：有效 1:无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 创建时间
@@ -69,12 +69,12 @@ public class TempStoreConditionDTO implements Serializable{
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public TempStoreConditionDTO setStatus(Integer status) {
-        this.status = status;
+    public TempStoreConditionDTO setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/UserDTO.java

@@ -54,9 +54,9 @@ public class UserDTO implements Serializable{
     private Integer functionAuthId;
 
     /**
-     * 1：有效 0:无效
+     * 0：有效 1:无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 创建时间
@@ -142,12 +142,12 @@ public class UserDTO implements Serializable{
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public UserDTO setStatus(Integer status) {
-        this.status = status;
+    public UserDTO setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 
@@ -180,6 +180,19 @@ public class UserDTO implements Serializable{
 
     @Override
     public String toString() {
-        return super.toString();
+        return "UserDTO{" +
+                "userId=" + userId +
+                ", userName='" + userName + '\'' +
+                ", enterpriseId=" + enterpriseId +
+                ", phone='" + phone + '\'' +
+                ", nationCode='" + nationCode + '\'' +
+                ", accountGroupId=" + accountGroupId +
+                ", dataAuthId=" + dataAuthId +
+                ", functionAuthId=" + functionAuthId +
+                ", deleteFlag=" + deleteFlag +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", memberCount=" + memberCount +
+                '}';
     }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/service/IndexApiService.java

@@ -102,9 +102,9 @@ public interface IndexApiService {
      * @Title: listByModule
      * @Description: 
      * @author zhiwj 
-     * @param moduleId
+     * @param indexDescCode
      * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.cloud.dto.IndexDTO>>
      * @throws 
      */
-    ServiceResponse<List<IndexDTO>> listByModule(String moduleId); 
+    ServiceResponse<IndexDTO> getByIndexDescCode(String indexDescCode);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/constanst/DeleteFlagConstants.java

+package com.gic.cloud.constanst;
+/**
+ * 数据删除标志
+ * @ClassName: DeleteFlagConstants

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/10/13 4:43 PM

+ */
+public class DeleteFlagConstants {
+    /**
+     * 数据正常状态
+     */
+    public static final int NORMAL_STATUS = 0;
+
+    /**
+     * 数据删除状态
+     */
+    public static final int DELETE_STATUS = 1;
+}

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/EnterprisePortraitRelMapper.java

@@ -14,13 +14,7 @@ import com.gic.cloud.entity.TabGicEnterprisePortraitRel;
  * @date 2020/9/7 10:45 AM

  */
 public interface EnterprisePortraitRelMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param portraitRelationId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer portraitRelationId);
+
 
     /**
      * 插入一条记录

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabAttentionStoreMapper.java

@@ -13,13 +13,7 @@ import java.util.List;
  * @date 2020/9/7 10:41 AM

  */
 public interface TabAttentionStoreMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param attentionId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer attentionId);
+
 
     /**
      * 插入一条记录

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabDataExplainMapper.java

@@ -11,13 +11,7 @@ import com.github.pagehelper.Page;
  * @date 2020/9/7 9:57 AM
 
  */
 public interface TabDataExplainMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param dataExplainId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer dataExplainId);
+
 
     /**
      * 插入一条记录

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexDescEnterpriseMapper.java

@@ -12,13 +12,7 @@ import java.util.List;
  * @date 2020/9/7 10:45 AM

  */
 public interface TabIndexDescEnterpriseMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param indexDescEnterpriseId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer indexDescEnterpriseId);
+
 
     /**
      * 插入一条记录

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexDescMapper.java

@@ -13,13 +13,7 @@ import java.util.List;
  * @date 2020/9/7 10:45 AM

  */
 public interface TabIndexDescMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param indexDescId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer indexDescId);
+
 
     /**
      * 插入一条记录

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexGroupMapper.java

@@ -12,13 +12,7 @@ import java.util.List;
  * @date 2020/9/7 10:30 AM

  */
 public interface TabIndexGroupMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param indexGroupId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer indexGroupId);
+
 
     /**
      * 插入一条记录

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexLogMapper.java

@@ -12,13 +12,7 @@ import java.util.List;
  * @date 2020/9/7 10:35 AM

  */
 public interface TabIndexLogMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param cloudIndexLogId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer cloudIndexLogId);
+
 
     /**
      * 插入一条记录

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexMapper.java

@@ -11,13 +11,7 @@ import com.github.pagehelper.Page;
  * @date 2020/9/7 10:35 AM

  */
 public interface TabIndexMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param indexId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer indexId);
+
 
     /**
      * 插入一条记录

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexModuleRelMapper.java

@@ -12,13 +12,7 @@ import java.util.List;
  * @date 2020/9/7 10:35 AM

  */
 public interface TabIndexModuleRelMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param indexModuleRelId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer indexModuleRelId);
+
 
     /**
      * 插入一条记录

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabSysAccountGroupMapper.java

@@ -13,13 +13,7 @@ import java.util.List;
  * @date 2020/9/7 10:31 AM

  */
 public interface TabSysAccountGroupMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param accountGroupId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer accountGroupId);
+
 
     /**
      * 插入一条记录

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabSysDataAuthMapper.java

@@ -12,13 +12,7 @@ import java.util.List;
  * @date 2020/9/7 10:34 AM

  */
 public interface TabSysDataAuthMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param dataAuthId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer dataAuthId);
+
 
     /**
      * 插入一条记录

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabSysFunctionMapper.java

@@ -12,13 +12,7 @@ import java.util.List;
  * @date 2020/9/7 10:32 AM

  */
 public interface TabSysFunctionMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param functionId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer functionId);
+
 
     /**
      * 插入一条记录

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabSysFunctionModuleMapper.java

@@ -12,13 +12,7 @@ import java.util.List;
  * @date 2020/9/7 10:33 AM

  */
 public interface TabSysFunctionModuleMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param functionModuleId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer functionModuleId);
+
 
     /**
      * 插入一条记录

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabSysTempStoreConditionMapper.java

@@ -10,13 +10,7 @@ import org.apache.ibatis.annotations.Param;
  * @date 2020/9/7 10:34 AM

  */
 public interface TabSysTempStoreConditionMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param tempStoreConditionId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer tempStoreConditionId);
+
 
     /**
      * 插入一条记录

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabSysUserMapper.java

@@ -14,13 +14,7 @@ import java.util.List;
  * @date 2020/9/7 10:32 AM

  */
 public interface TabSysUserMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param userId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer userId);
+
 
     /**
      * 插入一条记录

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabUpdateTipsMapper.java

@@ -12,13 +12,6 @@ import java.util.List;
  * @date 2020/9/7 10:35 AM

  */
 public interface TabUpdateTipsMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param updateTipsId 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer updateTipsId);
 
     /**
      * 插入一条记录

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabAttentionStore.java

@@ -33,7 +33,7 @@ public class TabAttentionStore {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -77,12 +77,13 @@ public class TabAttentionStore {
         this.enterpriseId = enterpriseId;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public TabAttentionStore setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
     }
 
     public Date getCreateTime() {

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabDataExplain.java

@@ -48,7 +48,7 @@ public class TabDataExplain {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 模块id
@@ -111,12 +111,13 @@ public class TabDataExplain {
         this.updateTime = updateTime;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public TabDataExplain setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
     }
 
     public String getModuleId() {

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabGicEnterprisePortraitRel.java

@@ -48,10 +48,12 @@ public class TabGicEnterprisePortraitRel {
     private Date updateTime;
 
     /**
-     * 
+     * 1:正常 2：回收站
      */
     private Integer status;
 
+    private Integer deleteFlag;
+
     public Integer getPortraitRelationId() {
         return portraitRelationId;
     }
@@ -132,4 +134,13 @@ public class TabGicEnterprisePortraitRel {
         this.portraitName = portraitName;
         return this;
     }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public TabGicEnterprisePortraitRel setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
+    }
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabIndex.java

@@ -138,7 +138,7 @@ public class TabIndex {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     public Integer getIndexId() {
         return indexId;
@@ -340,11 +340,12 @@ public class TabIndex {
         this.updateTime = updateTime;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public TabIndex setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
     }
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabIndexDesc.java

@@ -38,7 +38,7 @@ public class TabIndexDesc {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -92,12 +92,13 @@ public class TabIndexDesc {
         this.indexGroupName = indexGroupName;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public TabIndexDesc setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
     }
 
     public Date getCreateTime() {

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabIndexDescEnterprise.java

@@ -38,7 +38,7 @@ public class TabIndexDescEnterprise {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -90,12 +90,13 @@ public class TabIndexDescEnterprise {
         this.sort = sort;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public TabIndexDescEnterprise setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
     }
 
     public Date getCreateTime() {

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabIndexGroup.java

@@ -43,7 +43,7 @@ public class TabIndexGroup {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     public Integer getIndexGroupId() {
         return indexGroupId;
@@ -93,11 +93,12 @@ public class TabIndexGroup {
         this.updateTime = updateTime;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public TabIndexGroup setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
     }
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabIndexLog.java

@@ -43,7 +43,7 @@ public class TabIndexLog {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 
@@ -108,12 +108,13 @@ public class TabIndexLog {
         this.reason = reason;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public TabIndexLog setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
     }
 
     public Date getCreateTime() {

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabIndexModuleRel.java

@@ -43,7 +43,7 @@ public class TabIndexModuleRel {
     /**
      * 
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     public Integer getIndexModuleRelId() {
         return indexModuleRelId;
@@ -93,11 +93,12 @@ public class TabIndexModuleRel {
         this.updateTime = updateTime;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public TabIndexModuleRel setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
     }
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabSysAccountGroup.java

@@ -26,9 +26,9 @@ public class TabSysAccountGroup {
     private Integer enterpriseId;
 
     /**
-     * 1：有效 0:无效
+     * 0：有效 1:无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 排序
@@ -72,12 +72,12 @@ public class TabSysAccountGroup {
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public TabSysAccountGroup setStatus(Integer status) {
-        this.status = status;
+    public TabSysAccountGroup setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabSysDataAuth.java

@@ -51,9 +51,9 @@ public class TabSysDataAuth {
     private String goodsAreaAuth;
 
     /**
-     * 1：有效 0:无效
+     * 0：有效 1:无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 创建时间
@@ -128,12 +128,12 @@ public class TabSysDataAuth {
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public TabSysDataAuth setStatus(Integer status) {
-        this.status = status;
+    public TabSysDataAuth setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabSysFunction.java

@@ -31,9 +31,9 @@ public class TabSysFunction {
     private String functionComponent;
 
     /**
-     * 1：有效 0:无效
+     * 0：有效 1无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 创建时间
@@ -81,12 +81,12 @@ public class TabSysFunction {
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public TabSysFunction setStatus(Integer status) {
-        this.status = status;
+    public TabSysFunction setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabSysFunctionModule.java

@@ -43,9 +43,9 @@ public class TabSysFunctionModule {
     private String logo;
 
     /**
-     * 1：有效 0:无效
+     * 0：有效 1:无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 创建时间
@@ -111,12 +111,12 @@ public class TabSysFunctionModule {
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public TabSysFunctionModule setStatus(Integer status) {
-        this.status = status;
+    public TabSysFunctionModule setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabSysTempStoreCondition.java

@@ -26,9 +26,9 @@ public class TabSysTempStoreCondition {
     private Integer enterpriseId;
 
     /**
-     * 1：有效 0:无效
+     * 0：有效 1:无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 创建时间
@@ -67,12 +67,12 @@ public class TabSysTempStoreCondition {
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public TabSysTempStoreCondition setStatus(Integer status) {
-        this.status = status;
+    public TabSysTempStoreCondition setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabSysUser.java

@@ -51,9 +51,9 @@ public class TabSysUser {
     private Integer functionAuthId;
 
     /**
-     * 1：有效 0:无效
+     * 0：有效 1:无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * 创建时间
@@ -137,12 +137,12 @@ public class TabSysUser {
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public TabSysUser setStatus(Integer status) {
-        this.status = status;
+    public TabSysUser setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/AccountGroupServiceImpl.java

@@ -3,6 +3,7 @@ package com.gic.cloud.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.gic.cloud.constanst.DeleteFlagConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -28,7 +29,7 @@ public class AccountGroupServiceImpl implements AccountGroupService{
         Date now = new Date();
         dto.setUpdateTime(now);
         dto.setCreateTime(now);
-        dto.setStatus(1);
+        dto.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
         TabSysAccountGroup record = EntityUtil.changeEntityNew(TabSysAccountGroup.class, dto);
         tabSysAccountGroupMapper.insert(record);
         return record.getAccountGroupId();

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/DataAuthServiceImpl.java

 package com.gic.cloud.service.impl;
 
+import com.gic.cloud.constanst.DeleteFlagConstants;
 import com.gic.cloud.dao.mapper.TabSysDataAuthMapper;
 import com.gic.cloud.dto.DataAuthDTO;
 import com.gic.cloud.entity.TabSysDataAuth;
@@ -30,7 +31,7 @@ public class DataAuthServiceImpl implements DataAuthService{
         Date now = new Date();
         record.setUpdateTime(now);
         record.setCreateTime(now);
-        record.setStatus(1);
+        record.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
         tabSysDataAuthMapper.insert(record);
         return record.getDataAuthId();
     }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/DataExplainServiceImpl.java

 package com.gic.cloud.service.impl;
 
+import com.gic.cloud.constanst.DeleteFlagConstants;
 import com.gic.cloud.dao.mapper.TabDataExplainMapper;
 import com.gic.cloud.dto.DataExplainDTO;
 import com.gic.cloud.entity.TabDataExplain;
@@ -37,7 +38,7 @@ public class DataExplainServiceImpl implements DataExplainService {
     public Integer save(DataExplainDTO dataExplainDTO) {
         TabDataExplain tabDataExplain = EntityUtil.changeEntityByJSON(TabDataExplain.class, dataExplainDTO);
         tabDataExplain.setCreateTime(new Date());
-        tabDataExplain.setStatus(1);
+        tabDataExplain.setDataExplainId(DeleteFlagConstants.NORMAL_STATUS);
         tabDataExplainMapper.insertSelective(tabDataExplain);
         return tabDataExplain.getDataExplainId();
     }
@@ -68,7 +69,7 @@ public class DataExplainServiceImpl implements DataExplainService {
     public void deleteById(Integer dataExplainId) {
         TabDataExplain dataExplain = new TabDataExplain();
         dataExplain.setDataExplainId(dataExplainId);
-        dataExplain.setStatus(0);
+        dataExplain.setDataExplainId(DeleteFlagConstants.DELETE_STATUS);
         tabDataExplainMapper.updateByPrimaryKeySelective(dataExplain);
     }
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/FunctionModuleServiceImpl.java

@@ -3,6 +3,7 @@ package com.gic.cloud.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.gic.cloud.constanst.DeleteFlagConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -29,7 +30,7 @@ public class FunctionModuleServiceImpl implements FunctionModuleService{
         Date now = new Date();
         record.setCreateTime(now);
         record.setUpdateTime(now);
-        record.setStatus(1);
+        record.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
         tabSysFunctionModuleMapper.insert(record);
         return record.getFunctionModuleId();
     }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/FunctionServiceImpl.java

 package com.gic.cloud.service.impl;
 
+import com.gic.cloud.constanst.DeleteFlagConstants;
 import com.gic.cloud.dao.mapper.TabSysFunctionMapper;
 import com.gic.cloud.dto.FunctionDTO;
 import com.gic.cloud.entity.TabSysFunction;
@@ -30,7 +31,7 @@ public class FunctionServiceImpl implements FunctionService{
         Date now = new Date();
         record.setCreateTime(now);
         record.setUpdateTime(now);
-        record.setStatus(1);
+        record.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
         tabSysFunctionMapper.insert(record);
         return record.getFunctionId();
     }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/IndexDescServiceImpl.java

 package com.gic.cloud.service.impl;
 
+import com.gic.cloud.constanst.DeleteFlagConstants;
 import com.gic.cloud.dao.mapper.TabIndexDescMapper;
 import com.gic.cloud.dto.IndexDescDTO;
 import com.gic.cloud.entity.TabIndexDesc;
@@ -106,7 +107,7 @@ public class IndexDescServiceImpl implements IndexDescService {
             indexDescEnterprise.setEnterpriseId(enterpriseId);
             indexDescEnterprise.setIndexStatus(1);
             indexDescEnterprise.setSort(0);
-            indexDescEnterprise.setStatus(1);
+            indexDescEnterprise.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
             indexDescEnterpriseService.insert(indexDescEnterprise);
         }
     }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/IndexGroupServiceImpl.java

 package com.gic.cloud.service.impl;
 
+import com.gic.cloud.constanst.DeleteFlagConstants;
 import com.gic.cloud.dao.mapper.TabIndexGroupMapper;
 import com.gic.cloud.dto.IndexGroupDTO;
 import com.gic.cloud.entity.TabIndexGroup;
@@ -36,7 +37,7 @@ public class IndexGroupServiceImpl implements IndexGroupService {
     @Override
     public Integer save(IndexGroupDTO indexGroupDTO) {
         TabIndexGroup indexGroup = EntityUtil.changeEntityByJSON(TabIndexGroup.class, indexGroupDTO);
-        indexGroup.setStatus(1);
+        indexGroup.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
         indexGroup.setCreateTime(new Date());
         tabIndexGroupMapper.insertSelective(indexGroup);
         return indexGroup.getIndexGroupId();
@@ -56,7 +57,7 @@ public class IndexGroupServiceImpl implements IndexGroupService {
     public void delete(Integer indexGroupId) {
         TabIndexGroup tabIndexGroup = new TabIndexGroup();
         tabIndexGroup.setIndexGroupId(indexGroupId);
-        tabIndexGroup.setStatus(0);
+        tabIndexGroup.setDeleteFlag(DeleteFlagConstants.DELETE_STATUS);
         tabIndexGroupMapper.updateByPrimaryKeySelective(EntityUtil.changeEntityByJSON(TabIndexGroup.class, tabIndexGroup));
     }
 

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/IndexLogServiceImpl.java

 package com.gic.cloud.service.impl;
 
+import com.gic.cloud.constanst.DeleteFlagConstants;
 import com.gic.cloud.constants.LogAndUpdateTipsTypeEnum;
 import com.gic.cloud.dao.mapper.TabIndexLogMapper;
 import com.gic.cloud.dto.DataExplainDTO;
@@ -40,7 +41,7 @@ public class IndexLogServiceImpl implements IndexLogService {
         indexLog.setOptUserId(indexDTO.getOptUserId());
         indexLog.setOptUserName(indexDTO.getOptUserName());
         indexLog.setReason(reason);
-        indexLog.setStatus(1);
+        indexLog.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
         indexLog.setCreateTime(new Date());
         indexLog.setUpdateTime(new Date());
         indexLog.setType(LogAndUpdateTipsTypeEnum.INDEX.getCode());
@@ -74,7 +75,7 @@ public class IndexLogServiceImpl implements IndexLogService {
         indexLog.setOptUserId(dataExplainDTO.getOptUserId());
         indexLog.setOptUserName(dataExplainDTO.getOptUserName());
         indexLog.setReason(reason);
-        indexLog.setStatus(1);
+        indexLog.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
         indexLog.setCreateTime(new Date());
         indexLog.setUpdateTime(new Date());
         indexLog.setType(LogAndUpdateTipsTypeEnum.DATA_EXPLAIN.getCode());

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/IndexModuleRelServiceImpl.java

 package com.gic.cloud.service.impl;
 
+import com.gic.cloud.constanst.DeleteFlagConstants;
 import com.gic.cloud.dao.mapper.TabIndexModuleRelMapper;
 import com.gic.cloud.entity.TabIndexModuleRel;
 import com.gic.cloud.service.IndexModuleRelService;
@@ -34,7 +35,7 @@ public class IndexModuleRelServiceImpl implements IndexModuleRelService {
                 rel.setBusinessId(businessId);
                 rel.setModuleId(moduleId);
                 rel.setCreateTime(new Date());
-                rel.setStatus(1);
+                rel.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
                 tabIndexModuleRelMapper.insertSelectiveByNotExist(rel);
             }
             // 把所有userId关联status都设置为1

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/IndexServiceImpl.java

 package com.gic.cloud.service.impl;
 
+import com.gic.cloud.constanst.DeleteFlagConstants;
 import com.gic.cloud.dao.mapper.TabIndexMapper;
 import com.gic.cloud.dto.IndexDTO;
 import com.gic.cloud.entity.TabIndex;
@@ -54,7 +55,7 @@ public class IndexServiceImpl implements IndexService {
     @Override
     public Integer save(IndexDTO indexDTO) {
         TabIndex tabIndex = EntityUtil.changeEntityByJSON(TabIndex.class, indexDTO);
-        tabIndex.setStatus(1);
+        tabIndex.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
         tabIndex.setCreateTime(new Date());
         tabIndex.setUpdateTime(new Date());
         tabIndexMapper.insertSelective(tabIndex);
@@ -95,7 +96,7 @@ public class IndexServiceImpl implements IndexService {
     public void deleteById(Integer indexId) {
         TabIndex index = new TabIndex();
         index.setIndexId(indexId);
-        index.setStatus(0);
+        index.setDeleteFlag(DeleteFlagConstants.DELETE_STATUS);
         tabIndexMapper.updateByPrimaryKeySelective(index);
     }
 

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/StoreAttentionServiceImpl.java

 package com.gic.cloud.service.impl;
 
+import com.gic.cloud.constanst.DeleteFlagConstants;
 import com.gic.cloud.dao.mapper.TabAttentionStoreMapper;
 import com.gic.cloud.entity.TabAttentionStore;
 import com.gic.cloud.service.StoreAttenttionService;
@@ -25,7 +26,7 @@ public class StoreAttentionServiceImpl implements StoreAttenttionService {
     public int addStoreAttenttion(TabAttentionStore tabAttentionStore) {
         tabAttentionStore.setCreateTime(new Date());
         tabAttentionStore.setUpdateTime(new Date());
-        tabAttentionStore.setStatus(1);
+        tabAttentionStore.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
         int i = this.tabAttentionStoreMapper.insertSelective(tabAttentionStore);
         return i;
     }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/TempStoreConditionServiceImpl.java

 package com.gic.cloud.service.impl;
 
+import com.gic.cloud.constanst.DeleteFlagConstants;
 import com.gic.cloud.dao.mapper.TabSysTempStoreConditionMapper;
 import com.gic.cloud.dto.TempStoreConditionDTO;
 import com.gic.cloud.entity.TabSysTempStoreCondition;
@@ -27,7 +28,7 @@ public class TempStoreConditionServiceImpl implements TempStoreConditionService{
         Date now = new Date();
         record.setCreateTime(now);
         record.setUpdateTime(now);
-        record.setStatus(1);
+        record.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
         tabSysTempStoreConditionMapper.insert(record);
         return record.getTempStoreConditionId();
     }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/UserServiceImpl.java

 package com.gic.cloud.service.impl;
 
+import com.gic.cloud.constanst.DeleteFlagConstants;
 import com.gic.cloud.dao.mapper.TabSysUserMapper;
 import com.gic.cloud.dto.UserDTO;
 import com.gic.cloud.entity.TabSysUser;
@@ -30,7 +31,7 @@ public class UserServiceImpl implements UserService{
     public Integer saveUser(UserDTO dto) {
         TabSysUser record = EntityUtil.changeEntityNew(TabSysUser.class, dto);
         Date now = new Date();
-        record.setStatus(1);
+        record.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
         record.setCreateTime(now);
         record.setUpdateTime(now);
         tabSysUserMapper.insert(record);

gic-data-cloud-service/src/main/java/com/gic/cloud/service/outer/impl/EnterprisePortraitRelApiServiceImpl.java

 package com.gic.cloud.service.outer.impl;
 
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.cloud.constanst.DeleteFlagConstants;
 import com.gic.cloud.dao.mapper.EnterprisePortraitRelMapper;
 import com.gic.cloud.dto.EnterprisePortraitRelDTO;
 import com.gic.cloud.entity.TabGicEnterprisePortraitRel;
@@ -61,7 +62,8 @@ public class EnterprisePortraitRelApiServiceImpl implements EnterprisePortraitRe
                     .setPortraitName(fieldName)
                     .setStatus(1)
                     .setUpdateTime(new Date())
-                    .setSort(maxSort + 1));
+                    .setSort(maxSort + 1)
+                    .setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS));
         } else {
             if (!record.getPortraitName().equals(fieldName)) {
                 //如果名称有变动，则更新
@@ -140,7 +142,8 @@ public class EnterprisePortraitRelApiServiceImpl implements EnterprisePortraitRe
     public ServiceResponse<Void> delete(Integer portraitRelationId) {
         enterprisePortraitRelMapper.updateByPrimaryKeySelective(new TabGicEnterprisePortraitRel()
                 .setPortraitRelationId(portraitRelationId)
-                .setStatus(0));
+                .setStatus(0)
+                .setDeleteFlag(DeleteFlagConstants.DELETE_STATUS));
         return ServiceResponse.success();
     }
 

gic-data-cloud-service/src/main/java/com/gic/cloud/service/outer/impl/IndexApiServiceImpl.java

@@ -6,6 +6,7 @@ import com.gic.cloud.constants.LogAndUpdateTipsTypeEnum;
 import com.gic.cloud.constants.UpdateTypeEnum;
 import com.gic.cloud.dto.IndexDTO;
 import com.gic.cloud.entity.TabIndex;
+import com.gic.cloud.entity.TabIndexDesc;
 import com.gic.cloud.entity.TabIndexGroup;
 import com.gic.cloud.qo.IndexQo;
 import com.gic.cloud.service.*;
@@ -31,6 +32,8 @@ import java.util.stream.Stream;
 @Service("indexApiService")
 public class IndexApiServiceImpl implements IndexApiService {
 
+    private static final String HAOBAN_NAME = "haoban";
+
     @Autowired
     private IndexService indexService;
     @Autowired
@@ -41,6 +44,8 @@ public class IndexApiServiceImpl implements IndexApiService {
     private UpdateTipService updateTipService;
     @Autowired
     private IndexGroupService indexGroupService;
+    @Autowired
+    private IndexDescService indexDescService;
 
     @Override
     public ServiceResponse<Void> saveIndex(IndexDTO indexDTO) {
@@ -182,10 +187,19 @@ public class IndexApiServiceImpl implements IndexApiService {
     }
 
     @Override
-    public ServiceResponse<List<IndexDTO>> listByModule(String moduleId) {
-        IndexQo indexQo = new IndexQo();
-        indexQo.setModuleId(moduleId);
-        List<TabIndex> indexList = indexService.listAllIndex(indexQo);
-        return EnterpriseServiceResponse.success(EntityUtil.changeEntityListByJSON(IndexDTO.class, indexList));
+    public ServiceResponse<IndexDTO> getByIndexDescCode(String indexDescCode) {
+        TabIndexDesc indexDesc = indexDescService.getIndexDesc(HAOBAN_NAME, indexDescCode, null);
+        if (indexDesc == null) {
+            return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS.getCode(), ErrorCode.NOTEXISTS.getMsg());
+        }
+        List<Integer> list = indexModuleRelService.listBusinessIdByModuleId(indexDesc.getIndexDescId().toString(), LogAndUpdateTipsTypeEnum.INDEX.getCode());
+        if (CollectionUtils.isEmpty(list)) {
+            return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS.getCode(), ErrorCode.NOTEXISTS.getMsg());
+        }
+        TabIndex index = indexService.getByIndexId(list.get(0));
+        if (index == null) {
+            return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS.getCode(), ErrorCode.NOTEXISTS.getMsg());
+        }
+        return EnterpriseServiceResponse.success(EntityUtil.changeEntityByJSON(IndexDTO.class, index));
     }
 }

gic-data-cloud-service/src/main/resources/mapper/EnterprisePortraitRelMapper.xml

@@ -11,10 +11,11 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
   </resultMap>
   <sql id="Base_Column_List">
     portrait_relation_id, portrati_name, portrait_code, enterprise_id, sort, data_type, create_time,
-    update_time, status
+    update_time, status, delete_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -22,17 +23,14 @@
     from tab_gic_enterprise_portrait_rel
     where portrait_relation_id = #{portraitRelationId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_gic_enterprise_portrait_rel
-    where portrait_relation_id = #{portraitRelationId,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.cloud.entity.TabGicEnterprisePortraitRel">
     insert into tab_gic_enterprise_portrait_rel (portrait_relation_id, portrati_name, portrait_code, enterprise_id,
       sort, data_type, create_time, 
-      update_time, status)
+      update_time, status, delete_flag)
     values (#{portraitRelationId,jdbcType=INTEGER}, #{portraitName,jdbcType=CHAR}, #{portraitCode,jdbcType=CHAR}, #{enterpriseId,jdbcType=INTEGER},
       #{sort,jdbcType=INTEGER}, #{dataType,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER})
+      #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.cloud.entity.TabGicEnterprisePortraitRel">
     insert into tab_gic_enterprise_portrait_rel
@@ -64,6 +62,9 @@
       <if test="status != null">
         status,
       </if>
+      <if test="deleteFlag != null">
+        delete_flag,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="portraitRelationId != null">
@@ -93,6 +94,9 @@
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.cloud.entity.TabGicEnterprisePortraitRel">
@@ -122,6 +126,9 @@
       <if test="status != null">
         status = #{status,jdbcType=INTEGER},
       </if>
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      </if>
     </set>
     where portrait_relation_id = #{portraitRelationId,jdbcType=INTEGER}
   </update>
@@ -134,7 +141,8 @@
       data_type = #{dataType,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER}
+      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER}
     where portrait_relation_id = #{portraitRelationId,jdbcType=INTEGER}
   </update>
 
@@ -157,7 +165,7 @@
   <insert id="insertForeach" parameterType="java.util.List">
     insert into tab_gic_enterprise_portrait_rel (portrait_relation_id, portrati_name, portrait_code, enterprise_id,
     sort, data_type, create_time,
-    update_time, status)
+    update_time, status, delete_flag)
     VALUES
     <foreach collection="list" item="item" index="index" separator=",">
       (
@@ -169,7 +177,8 @@
       #{item.dataType},
       #{item.createTime},
       #{item.updateTime},
-      #{item.status}
+      #{item.status},
+      #{item.deleteFlag}
       )
     </foreach>
   </insert>

gic-data-cloud-service/src/main/resources/mapper/TabAttentionStoreMapper.xml

@@ -6,12 +6,12 @@
     <result column="store_id" jdbcType="INTEGER" property="storeId" />
     <result column="user_id" jdbcType="INTEGER" property="userId" />
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
-    <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">
-    attention_id, store_id, user_id, enterprise_id, status, create_time, update_time
+    attention_id, store_id, user_id, enterprise_id, delete_flag, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -19,16 +19,13 @@
     from tab_attention_store
     where attention_id = #{attentionId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_attention_store
-    where attention_id = #{attentionId,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.cloud.entity.TabAttentionStore">
     insert into tab_attention_store (attention_id, store_id, user_id, 
-      enterprise_id, status, create_time, 
+      enterprise_id, delete_flag, create_time,
       update_time)
     values (#{attentionId,jdbcType=INTEGER}, #{storeId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, 
-      #{enterpriseId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{enterpriseId,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.cloud.entity.TabAttentionStore">
@@ -46,8 +43,8 @@
       <if test="enterpriseId != null">
         enterprise_id,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -69,8 +66,8 @@
       <if test="enterpriseId != null">
         #{enterpriseId,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},
@@ -92,8 +89,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>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -109,7 +106,7 @@
     set store_id = #{storeId,jdbcType=INTEGER},
       user_id = #{userId,jdbcType=INTEGER},
       enterprise_id = #{enterpriseId,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where attention_id = #{attentionId,jdbcType=INTEGER}
@@ -118,11 +115,11 @@
     select
     <include refid="Base_Column_List" />
     from tab_attention_store
-    where status = 1 and user_id = #{userId} and enterprise_id = #{enterpriseId} order by create_time desc
+    where delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS} and user_id = #{userId} and enterprise_id = #{enterpriseId} order by create_time desc
   </select>
   <update id="removeAttention" >
     update tab_attention_store
-    set status = 0
+    set delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@DELETE_STATUS}
     where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and user_id= #{userId}
     <if test="storeIds != null and storeIds.size()>0">
     and store_id in

gic-data-cloud-service/src/main/resources/mapper/TabDataExplainMapper.xml

@@ -9,12 +9,12 @@
     <result column="complement" jdbcType="VARCHAR" property="complement" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="module_id" jdbcType="VARCHAR" property="moduleId" />
   </resultMap>
   <sql id="Base_Column_List">
     data_explain_id, data_name, data_classify, index_remark, complement, create_time, 
-    update_time, status, module_id
+    update_time, delete_flag, module_id
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -22,18 +22,15 @@
     from tab_data_explain
     where data_explain_id = #{dataExplainId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_data_explain
-    where data_explain_id = #{dataExplainId,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.cloud.entity.TabDataExplain">
     insert into tab_data_explain (data_explain_id, data_name, data_classify, 
       index_remark, complement, create_time, 
-      update_time, status, module_id
+      update_time, delete_flag, module_id
       )
     values (#{dataExplainId,jdbcType=INTEGER}, #{dataName,jdbcType=VARCHAR}, #{dataClassify,jdbcType=VARCHAR}, 
       #{indexRemark,jdbcType=VARCHAR}, #{complement,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, #{moduleId,jdbcType=VARCHAR}
+      #{updateTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=INTEGER}, #{moduleId,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.cloud.entity.TabDataExplain">
@@ -63,8 +60,8 @@
       <if test="updateTime != null">
         update_time,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="moduleId != null">
         module_id,
@@ -92,8 +89,8 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="moduleId != null">
         #{moduleId,jdbcType=VARCHAR},
@@ -121,8 +118,8 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="moduleId != null">
         module_id = #{moduleId,jdbcType=VARCHAR},
@@ -138,7 +135,7 @@
       complement = #{complement,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       module_id = #{moduleId,jdbcType=VARCHAR}
     where data_explain_id = #{dataExplainId,jdbcType=INTEGER}
   </update>
@@ -146,7 +143,7 @@
   <select id="getBySelective" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
-    from tab_data_explain where status = 1
+    from tab_data_explain where delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     <if test="dataName != null ">
         and data_name = #{dataName}
     </if>
@@ -158,7 +155,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_data_explain
-    where status = 1
+    where delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     <if test="search != null and search != '' ">
         and ( data_name like concat('%', #{search}, '%') or data_classify like concat('%', #{search}, '%') )
     </if>

gic-data-cloud-service/src/main/resources/mapper/TabIndexDescEnterpriseMapper.xml

@@ -7,12 +7,12 @@
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
     <result column="index_status" jdbcType="INTEGER" property="indexStatus" />
     <result column="sort" jdbcType="INTEGER" property="sort" />
-    <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">
-    index_desc_enterprise_id, index_desc_id, enterprise_id, index_status, sort, status, 
+    index_desc_enterprise_id, index_desc_id, enterprise_id, index_status, sort, delete_flag,
     create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -21,18 +21,15 @@
     from tab_index_desc_enterprise
     where index_desc_enterprise_id = #{indexDescEnterpriseId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_index_desc_enterprise
-    where index_desc_enterprise_id = #{indexDescEnterpriseId,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.cloud.entity.TabIndexDescEnterprise">
     insert into tab_index_desc_enterprise (index_desc_enterprise_id, index_desc_id, 
       enterprise_id, index_status, sort, 
-      status, create_time, update_time
+      delete_flag, create_time, update_time
       )
     values (#{indexDescEnterpriseId,jdbcType=INTEGER}, #{indexDescId,jdbcType=INTEGER}, 
       #{enterpriseId,jdbcType=INTEGER}, #{indexStatus,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER}, 
-      #{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.cloud.entity.TabIndexDescEnterprise">
@@ -53,8 +50,8 @@
       <if test="sort != null">
         sort,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -79,8 +76,8 @@
       <if test="sort != null">
         #{sort,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},
@@ -98,7 +95,7 @@
     WHERE
     tab_index_desc_enterprise.enterprise_id = #{enterpriseId}
     AND tab_index_desc_enterprise.index_desc_id = #{indexDescId}
-    AND tab_index_desc_enterprise.status = 1
+    AND tab_index_desc_enterprise.delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     )
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.cloud.entity.TabIndexDescEnterprise">
@@ -116,8 +113,8 @@
       <if test="sort != null">
         sort = #{sort,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},
@@ -134,7 +131,7 @@
       enterprise_id = #{enterpriseId,jdbcType=INTEGER},
       index_status = #{indexStatus,jdbcType=INTEGER},
       sort = #{sort,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where index_desc_enterprise_id = #{indexDescEnterpriseId,jdbcType=INTEGER}

gic-data-cloud-service/src/main/resources/mapper/TabIndexDescMapper.xml

@@ -7,7 +7,7 @@
     <result column="index_name" jdbcType="VARCHAR" property="indexName" />
     <result column="index_code" jdbcType="VARCHAR" property="indexCode" />
     <result column="index_group_name" jdbcType="VARCHAR" property="indexGroupName" />
-    <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>
@@ -17,17 +17,17 @@
     <result column="index_name" jdbcType="VARCHAR" property="indexName" />
     <result column="index_code" jdbcType="VARCHAR" property="indexCode" />
     <result column="index_group_name" jdbcType="VARCHAR" property="indexGroupName" />
-    <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">
-    index_desc_id, module_id, index_name, index_code, index_group_name, status, create_time, 
+    index_desc_id, module_id, index_name, index_code, index_group_name, delete_flag, create_time,
     update_time, remark
   </sql>
   <sql id="DTO_List" >
     ${alias}.index_desc_id, ${alias}.module_id, ${alias}.index_name, ${alias}.index_code, ${alias}.index_group_name,
-    ${alias}.status, ${alias}.create_time, ${alias}.update_time
+    ${alias}.delete_flag, ${alias}.create_time, ${alias}.update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -35,16 +35,13 @@
     from tab_index_desc
     where index_desc_id = #{indexDescId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_index_desc
-    where index_desc_id = #{indexDescId,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.cloud.entity.TabIndexDesc">
     insert into tab_index_desc (index_desc_id, module_id, index_name, 
-      index_code, index_group_name, status, 
+      index_code, index_group_name, delete_flag,
       create_time, update_time)
     values (#{indexDescId,jdbcType=INTEGER}, #{moduleId,jdbcType=VARCHAR}, #{indexName,jdbcType=VARCHAR}, 
-      #{indexCode,jdbcType=VARCHAR}, #{indexGroupName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
+      #{indexCode,jdbcType=VARCHAR}, #{indexGroupName,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER},
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.cloud.entity.TabIndexDesc">
@@ -65,8 +62,8 @@
       <if test="indexGroupName != null">
         index_group_name,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -91,8 +88,8 @@
       <if test="indexGroupName != null">
         #{indexGroupName,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},
@@ -117,8 +114,8 @@
       <if test="indexGroupName != null">
         index_group_name = #{indexGroupName,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},
@@ -135,7 +132,7 @@
       index_name = #{indexName,jdbcType=VARCHAR},
       index_code = #{indexCode,jdbcType=VARCHAR},
       index_group_name = #{indexGroupName,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where index_desc_id = #{indexDescId,jdbcType=INTEGER}
@@ -147,7 +144,7 @@
     </include>
     from tab_index_desc t1
     left join tab_index_desc_enterprise t2 on t1.index_desc_id = t2.index_desc_id
-    where t1.status = 1
+    where t1.delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     and t2.enterprise_id = #{enterpriseId}
     and t1.module_id = #{moduleId}
     <if test="indexGroupName != null and indexGroupName != '' ">
@@ -171,14 +168,14 @@
     left join tab_index_module_rel t5 on t1.index_desc_id = t5.module_id
     left join tab_index t3 on t5.business_id = t3.index_id
 --     left join tab_update_tips t4 on t3.index_id = t4.business_id
-    where t1.status = 1
+    where t1.delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     and t2.enterprise_id = #{enterpriseId}
     and t1.module_id = #{moduleId}
     <if test="indexGroupName != null and indexGroupName != '' ">
       and t1.index_group_name = #{indexGroupName}
     </if>
     and t2.index_status = #{indexStatus}
-    and (t3.status = 1 or t3.status is null)
+    and (t3.delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS} or t3.delete_flag is null)
     and (t3.classify_type = 1 or t3.classify_type is null)
 --     AND (t4.type = 1 or t4.type is null)
     and (t5.type = 1 or t5.type = 1 is null)
@@ -206,12 +203,12 @@
   <select id="listAll" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
-    from tab_index_desc where status = 1 
+    from tab_index_desc where delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
   </select>
   <select id="listAllUnRel" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
-    from tab_index_desc where status = 1
+    from tab_index_desc where delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     <if test="null != ids and ids.size > 0">
       and index_desc_id not in
       <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
@@ -223,7 +220,7 @@
   <select id="listByIds" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
-    from tab_index_desc where status = 1
+    from tab_index_desc where delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     <if test="null != ids and ids.size > 0">
       and index_desc_id in
       <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">

gic-data-cloud-service/src/main/resources/mapper/TabIndexGroupMapper.xml

@@ -8,11 +8,11 @@
     <result column="group_chain" jdbcType="VARCHAR" property="groupChain" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
   </resultMap>
   <sql id="Base_Column_List">
     index_group_id, index_group_name, parent_id, group_chain, create_time, update_time, 
-    status
+    delete_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -20,17 +20,14 @@
     from tab_index_group
     where index_group_id = #{indexGroupId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_index_group
-    where index_group_id = #{indexGroupId,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.cloud.entity.TabIndexGroup">
     insert into tab_index_group (index_group_id, index_group_name, parent_id, 
       group_chain, create_time, update_time, 
-      status)
+      delete_flag)
     values (#{indexGroupId,jdbcType=INTEGER}, #{indexGroupName,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER}, 
       #{groupChain,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{status,jdbcType=INTEGER})
+      #{deleteFlag,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.cloud.entity.TabIndexGroup">
     <selectKey keyProperty="indexGroupId" order="AFTER" resultType="java.lang.Integer">
@@ -56,8 +53,8 @@
       <if test="updateTime != null">
         update_time,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -79,8 +76,8 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
     </trim>
   </insert>
@@ -102,8 +99,8 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
     </set>
     where index_group_id = #{indexGroupId,jdbcType=INTEGER}
@@ -115,14 +112,14 @@
       group_chain = #{groupChain,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER}
+      delete_flag = #{deleteFlag,jdbcType=INTEGER}
     where index_group_id = #{indexGroupId,jdbcType=INTEGER}
   </update>
   <select id="getBySelective" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from tab_index_group
-    where status = 1
+    where delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     <if test="indexGroupName != null ">
         and index_group_name = #{indexGroupName}
     </if>
@@ -134,7 +131,7 @@
     <select id="listIndexGroup" resultMap="BaseResultMap">
       select
       <include refid="Base_Column_List" />
-      from tab_index_group where status = 1
+      from tab_index_group where delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
       <if test="null != ids and ids.size > 0">
         and index_group_id in
         <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
@@ -147,7 +144,7 @@
     select
     index_group_id
     from tab_index_group
-    where status = 1
+    where delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     and group_chain like concat('%_', #{indexGroupId}, '_%')
   </select>
 </mapper>
\ No newline at end of file

gic-data-cloud-service/src/main/resources/mapper/TabIndexLogMapper.xml

@@ -8,13 +8,13 @@
     <result column="opt_user_id" jdbcType="INTEGER" property="optUserId" />
     <result column="opt_user_name" jdbcType="VARCHAR" property="optUserName" />
     <result column="reason" jdbcType="VARCHAR" property="reason" />
-    <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" />
     <result column="type" jdbcType="INTEGER" property="type" />
   </resultMap>
   <sql id="Base_Column_List">
-    cloud_index_log_id, business_id, opt_time, opt_user_id, opt_user_name, reason, status, 
+    cloud_index_log_id, business_id, opt_time, opt_user_id, opt_user_name, reason, delete_flag,
     create_time, update_time, type
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -23,18 +23,15 @@
     from tab_index_log
     where cloud_index_log_id = #{cloudIndexLogId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_index_log
-    where cloud_index_log_id = #{cloudIndexLogId,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.cloud.entity.TabIndexLog">
     insert into tab_index_log (cloud_index_log_id, business_id, opt_time, 
       opt_user_id, opt_user_name, reason, 
-      status, create_time, update_time, 
+      delete_flag, create_time, update_time,
       type)
     values (#{cloudIndexLogId,jdbcType=INTEGER}, #{businessId,jdbcType=INTEGER}, #{optTime,jdbcType=TIMESTAMP}, 
       #{optUserId,jdbcType=INTEGER}, #{optUserName,jdbcType=VARCHAR}, #{reason,jdbcType=VARCHAR}, 
-      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
       #{type,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.cloud.entity.TabIndexLog">
@@ -58,8 +55,8 @@
       <if test="reason != null">
         reason,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -90,8 +87,8 @@
       <if test="reason != null">
         #{reason,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},
@@ -122,8 +119,8 @@
       <if test="reason != null">
         reason = #{reason,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},
@@ -144,7 +141,7 @@
       opt_user_id = #{optUserId,jdbcType=INTEGER},
       opt_user_name = #{optUserName,jdbcType=VARCHAR},
       reason = #{reason,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       type = #{type,jdbcType=INTEGER}
@@ -154,7 +151,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_index_log
-    where status = 1
+    where delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     <if test="businessId != null ">
         and business_id = #{businessId}
     </if>

gic-data-cloud-service/src/main/resources/mapper/TabIndexMapper.xml

@@ -27,13 +27,13 @@
     <result column="complement" jdbcType="VARCHAR" property="complement" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
   </resultMap>
   <sql id="Base_Column_List">
     index_id, classify_type, classify_name, is_app_index, rel_app_index, code, name, 
     index_level, index_level_name, rel_top_level, unit_code, unit_name, decimal_size, 
     index_group_id, data_type, index_type, base_organized, base_time, update_rate, update_rate_remark, 
-    index_remark, show_status, complement, create_time, update_time, status
+    index_remark, show_status, complement, create_time, update_time, delete_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -41,10 +41,7 @@
     from tab_index
     where index_id = #{indexId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_index
-    where index_id = #{indexId,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.cloud.entity.TabIndex">
     insert into tab_index (index_id, classify_type, classify_name, 
       is_app_index, rel_app_index, code, 
@@ -54,7 +51,7 @@
       index_type, base_organized, base_time, 
       update_rate, update_rate_remark, index_remark, 
       show_status, complement, create_time, 
-      update_time, status)
+      update_time, delete_flag)
     values (#{indexId,jdbcType=INTEGER}, #{classifyType,jdbcType=INTEGER}, #{classifyName,jdbcType=VARCHAR}, 
       #{isAppIndex,jdbcType=INTEGER}, #{relAppIndex,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, 
       #{name,jdbcType=VARCHAR}, #{indexLevel,jdbcType=INTEGER}, #{indexLevelName,jdbcType=VARCHAR}, 
@@ -63,7 +60,7 @@
       #{indexType,jdbcType=INTEGER}, #{baseOrganized,jdbcType=VARCHAR}, #{baseTime,jdbcType=VARCHAR}, 
       #{updateRate,jdbcType=VARCHAR}, #{updateRateRemark,jdbcType=VARCHAR}, #{indexRemark,jdbcType=VARCHAR}, 
       #{showStatus,jdbcType=INTEGER}, #{complement,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER})
+      #{updateTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.cloud.entity.TabIndex">
     <selectKey keyProperty="indexId" order="AFTER" resultType="java.lang.Integer">
@@ -146,8 +143,8 @@
       <if test="updateTime != null">
         update_time,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -226,8 +223,8 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
     </trim>
   </insert>
@@ -306,8 +303,8 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
     </set>
     where index_id = #{indexId,jdbcType=INTEGER}
@@ -338,14 +335,14 @@
       complement = #{complement,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER}
+      delete_flag = #{deleteFlag,jdbcType=INTEGER}
     where index_id = #{indexId,jdbcType=INTEGER}
   </update>
   <select id="getBySelective" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from tab_index
-    where status = 1
+    where delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     <if test="name != null and name != '' ">
         and name = #{name}
     </if>
@@ -365,7 +362,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_index
-    where status = 1
+    where delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     <if test="classifyType != null ">
         and classify_type = #{classifyType}
     </if>

gic-data-cloud-service/src/main/resources/mapper/TabIndexModuleRelMapper.xml

@@ -8,10 +8,10 @@
     <result column="module_id" jdbcType="VARCHAR" property="moduleId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
   </resultMap>
   <sql id="Base_Column_List">
-    index_module_rel_id, type, business_id, module_id, create_time, update_time, status
+    index_module_rel_id, type, business_id, module_id, create_time, update_time, delete_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -19,17 +19,14 @@
     from tab_index_module_rel
     where index_module_rel_id = #{indexModuleRelId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_index_module_rel
-    where index_module_rel_id = #{indexModuleRelId,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.cloud.entity.TabIndexModuleRel">
     insert into tab_index_module_rel (index_module_rel_id, type, business_id, 
       module_id, create_time, update_time, 
-      status)
+      delete_flag)
     values (#{indexModuleRelId,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{businessId,jdbcType=INTEGER}, 
       #{moduleId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
-      #{status,jdbcType=INTEGER})
+      #{deleteFlag,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.cloud.entity.TabIndexModuleRel">
     insert into tab_index_module_rel
@@ -52,8 +49,8 @@
       <if test="updateTime != null">
         update_time,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -75,8 +72,8 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
     </trim>
   </insert>
@@ -98,8 +95,8 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
     </set>
     where index_module_rel_id = #{indexModuleRelId,jdbcType=INTEGER}
@@ -111,11 +108,11 @@
       module_id = #{moduleId,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER}
+      delete_flag = #{deleteFlag,jdbcType=INTEGER}
     where index_module_rel_id = #{indexModuleRelId,jdbcType=INTEGER}
   </update>
   <update id="delByBusinessId">
-    update tab_index_module_rel set status = 0 where business_id = #{businessId} and type = #{type} and status = 1
+    update tab_index_module_rel set delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@DELETE_STATUS} where business_id = #{businessId} and type = #{type} and delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
   </update>
   <insert id="insertSelectiveByNotExist">
     INSERT INTO tab_index_module_rel (
@@ -124,14 +121,14 @@
             module_id,
             create_time,
             update_time,
-            status
+            delete_flag
         ) SELECT
             #{type},
             #{businessId},
             #{moduleId},
             #{createTime},
             #{updateTime},
-            #{status}
+            #{deleteFlag}
         FROM
             DUAL
         WHERE
@@ -148,7 +145,7 @@
   </insert>
 <!--  void updateStatusByBusinessIds(@Param("businessId") Integer businessId, @Param("ids") List<Integer> moduleIdList, @Param("type") Integer type);-->
   <update id="updateStatusByBusinessIds">
-    update tab_index_module_rel set status = 1 where business_id = #{businessId} and `type` = #{type}
+    update tab_index_module_rel set delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS} where business_id = #{businessId} and `type` = #{type}
     <if test="null != ids and ids.size > 0">
       and module_id in
       <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
@@ -160,19 +157,19 @@
     select
     module_id
     from tab_index_module_rel
-    where status = 1 and business_id = #{businessId} and type = #{type}
+    where delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS} and business_id = #{businessId} and type = #{type}
   </select>
   <select id="listBusinessIdByModuleId" resultType="int">
     select
     business_id
     from tab_index_module_rel
-    where status = 1 and module_id = #{moduleId} and type = #{type}
+    where delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS} and module_id = #{moduleId} and type = #{type}
   </select>
   <select id="listBusinessIdByModuleIds" resultType="int">
     select
     business_id
     from tab_index_module_rel
-    where status = 1
+    where delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     <if test="null != ids and ids.size > 0">
       and module_id in
       <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
@@ -183,7 +180,7 @@
   <select id="listModuleIdByBusinessIds" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
-    from tab_index_module_rel where type = #{type}
+    from tab_index_module_rel where type = #{type} and delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     <if test="null != ids and ids.size > 0">
       and business_id in
       <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">

gic-data-cloud-service/src/main/resources/mapper/TabSysAccountGroupMapper.xml

@@ -5,13 +5,13 @@
     <id column="account_group_id" jdbcType="INTEGER" property="accountGroupId" />
     <result column="account_group_name" jdbcType="VARCHAR" property="accountGroupName" />
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="sort" jdbcType="INTEGER" property="sort" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    account_group_id, account_group_name, enterprise_id, status, sort, create_time, update_time
+    account_group_id, account_group_name, enterprise_id, delete_flag, sort, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -19,16 +19,13 @@
     from tab_sys_account_group
     where account_group_id = #{accountGroupId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_sys_account_group
-    where account_group_id = #{accountGroupId,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.cloud.entity.TabSysAccountGroup" useGeneratedKeys="true" keyProperty="accountGroupId">
     insert into tab_sys_account_group (account_group_id, account_group_name, 
-      enterprise_id, status, sort, 
+      enterprise_id, delete_flag, sort,
       create_time, update_time)
     values (#{accountGroupId,jdbcType=INTEGER}, #{accountGroupName,jdbcType=VARCHAR}, 
-      #{enterpriseId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER}, 
+      #{enterpriseId,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER},
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.cloud.entity.TabSysAccountGroup">
@@ -43,8 +40,8 @@
       <if test="enterpriseId != null">
         enterprise_id,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="sort != null">
         sort,
@@ -66,8 +63,8 @@
       <if test="enterpriseId != null">
         #{enterpriseId,jdbcType=INTEGER},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="sort != null">
         #{sort,jdbcType=INTEGER},
@@ -89,8 +86,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>
       <if test="sort != null">
         sort = #{sort,jdbcType=INTEGER},
@@ -108,7 +105,7 @@
     update tab_sys_account_group
     set account_group_name = #{accountGroupName,jdbcType=VARCHAR},
       enterprise_id = #{enterpriseId,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       sort = #{sort,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
@@ -122,27 +119,27 @@
     <if test="accountGroupId != null">
       and account_group_id &lt;&gt; #{accountGroupId}
     </if>
-    and status = 1
+    and delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
   </select>
 
   <select id="queryMaxSort" resultType="int">
     select ifnull(max(sort),0) from tab_sys_account_group
     where enterprise_id = #{enterpriseId}
-    and status = 1
+    and delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
   </select>
 
   <select id="listAccountGroupOrderBySort" resultMap="BaseResultMap">
     select <include refid="Base_Column_List"></include>
     from tab_sys_account_group
     where enterprise_id = #{enterpriseId}
-    and status = 1
+    and delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     order by sort
   </select>
 
   <update id="deleteAccountGroup">
-    update tab_sys_account_group set status = 0
+    update tab_sys_account_group set delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@DELETE_STATUS}
 
     where account_group_id = #{accountGroupId}
-    and status = 1
+    and delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
   </update>
 </mapper>
\ No newline at end of file

gic-data-cloud-service/src/main/resources/mapper/TabSysDataAuthMapper.xml

@@ -10,13 +10,13 @@
     <result column="store_widget_id" jdbcType="INTEGER" property="storeWidgetId" />
     <result column="member_card_auth" jdbcType="VARCHAR" property="memberCardAuth" />
     <result column="goods_area_auth" jdbcType="VARCHAR" property="goodsAreaAuth" />
-    <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">
     data_auth_id, data_auth_name, enterprise_id, online_performance, no_owner_store, store_widget_id,
-    member_card_auth, goods_area_auth, status, create_time, update_time
+    member_card_auth, goods_area_auth, delete_flag, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -24,18 +24,15 @@
     from tab_sys_data_auth
     where data_auth_id = #{dataAuthId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_sys_data_auth
-    where data_auth_id = #{dataAuthId,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.cloud.entity.TabSysDataAuth" useGeneratedKeys="true" keyProperty="dataAuthId">
     insert into tab_sys_data_auth (data_auth_id, data_auth_name, enterprise_id, 
       online_performance, no_owner_store, store_widget_id, member_card_auth,
-      goods_area_auth, status, create_time, 
+      goods_area_auth, delete_flag, create_time,
       update_time)
     values (#{dataAuthId,jdbcType=INTEGER}, #{dataAuthName,jdbcType=VARCHAR}, #{enterpriseId,jdbcType=INTEGER}, 
       #{onlinePerformance,jdbcType=VARCHAR}, #{noOwnerStore,jdbcType=INTEGER}, #{storeWidgetId,jdbcType=INTEGER}, #{memberCardAuth,jdbcType=VARCHAR},
-      #{goodsAreaAuth,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{goodsAreaAuth,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.cloud.entity.TabSysDataAuth">
@@ -65,8 +62,8 @@
       <if test="goodsAreaAuth != null">
         goods_area_auth,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -100,8 +97,8 @@
       <if test="goodsAreaAuth != null">
         #{goodsAreaAuth,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},
@@ -135,8 +132,8 @@
       <if test="goodsAreaAuth != null">
         goods_area_auth = #{goodsAreaAuth,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},
@@ -156,7 +153,7 @@
       store_widget_id = #{storeWidgetId,jdbcType=INTEGER},
       member_card_auth = #{memberCardAuth,jdbcType=VARCHAR},
       goods_area_auth = #{goodsAreaAuth,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where data_auth_id = #{dataAuthId,jdbcType=INTEGER}
@@ -170,13 +167,13 @@
     <if test="dataAuthId != null">
       and data_auth_id &lt;&gt; #{dataAuthId}
     </if>
-    and status = 1
+    and delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
   </select>
 
   <update id="deleteDataAuth">
-    update tab_sys_data_auth set status = 0
+    update tab_sys_data_auth set delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@DELETE_STATUS}
     where data_auth_id = #{dataAuthId}
-    and status = 1
+    and delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
   </update>
 
   <select id="listDataAuth" resultMap="BaseResultMap">
@@ -187,7 +184,7 @@
     <if test="dataAuthName != null and dataAuthName != ''">
       and data_auth_name like concat('%', #{dataAuthName}, '%')
     </if>
-    and status = 1
+    and delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     order by create_time desc
   </select>
 </mapper>
\ No newline at end of file

gic-data-cloud-service/src/main/resources/mapper/TabSysFunctionMapper.xml

@@ -6,12 +6,12 @@
     <result column="function_name" jdbcType="VARCHAR" property="functionName" />
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
     <result column="function_component" jdbcType="VARCHAR" property="functionComponent" />
-    <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">
-    function_id, function_name, enterprise_id, function_component, status, create_time, 
+    function_id, function_name, enterprise_id, function_component, delete_flag, create_time,
     update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -20,16 +20,13 @@
     from tab_sys_function
     where function_id = #{functionId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_sys_function
-    where function_id = #{functionId,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.cloud.entity.TabSysFunction" useGeneratedKeys="true" keyProperty="functionId">
     insert into tab_sys_function (function_id, function_name, enterprise_id, 
-      function_component, status, create_time, 
+      function_component, delete_flag, create_time,
       update_time)
     values (#{functionId,jdbcType=INTEGER}, #{functionName,jdbcType=VARCHAR}, #{enterpriseId,jdbcType=INTEGER}, 
-      #{functionComponent,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{functionComponent,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.cloud.entity.TabSysFunction">
@@ -47,8 +44,8 @@
       <if test="functionComponent != null">
         function_component,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -70,8 +67,8 @@
       <if test="functionComponent != null">
         #{functionComponent,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},
@@ -93,8 +90,8 @@
       <if test="functionComponent != null">
         function_component = #{functionComponent,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},
@@ -110,7 +107,7 @@
     set function_name = #{functionName,jdbcType=VARCHAR},
       enterprise_id = #{enterpriseId,jdbcType=INTEGER},
       function_component = #{functionComponent,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where function_id = #{functionId,jdbcType=INTEGER}
@@ -123,13 +120,13 @@
     <if test="functionId != null">
       and function_id &lt;&gt; #{functionId}
     </if>
-    and status = 1
+    and delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
   </select>
 
   <update id="deleteFunction">
-    update tab_sys_function set status = 0
+    update tab_sys_function set delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@DELETE_STATUS}
     where function_id = #{functionId}
-    and status = 1
+    and delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
   </update>
 
   <select id="listFunction" resultMap="BaseResultMap">
@@ -139,7 +136,7 @@
     <if test="functionName != null and functionName != ''">
       and function_name like concat('%', #{functionName}, '%')
     </if>
-    and status = 1
+    and delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     order by create_time desc
   </select>
 </mapper>
\ No newline at end of file

gic-data-cloud-service/src/main/resources/mapper/TabSysFunctionModuleMapper.xml

@@ -9,13 +9,13 @@
     <result column="operation_id" jdbcType="VARCHAR" property="operationId" />
     <result column="operation_name" jdbcType="VARCHAR" property="operationName" />
     <result column="logo" jdbcType="VARCHAR" property="logo" />
-    <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">
     function_module_id, function_module_name, function_module_code, function_module_desc, 
-    operation_id, operation_name, logo, status, create_time, update_time
+    operation_id, operation_name, logo, delete_flag, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -23,18 +23,15 @@
     from tab_sys_function_module
     where function_module_id = #{functionModuleId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_sys_function_module
-    where function_module_id = #{functionModuleId,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.cloud.entity.TabSysFunctionModule" useGeneratedKeys="true" keyProperty="functionModuleId">
     insert into tab_sys_function_module (function_module_id, function_module_name, 
       function_module_code, function_module_desc, 
-      operation_id, operation_name, logo, status,
+      operation_id, operation_name, logo, delete_flag,
       create_time, update_time)
     values (#{functionModuleId,jdbcType=INTEGER}, #{functionModuleName,jdbcType=VARCHAR}, 
       #{functionModuleCode,jdbcType=VARCHAR}, #{functionModuleDesc,jdbcType=VARCHAR}, 
-      #{operationId,jdbcType=VARCHAR}, #{operationName,jdbcType=VARCHAR}, #{logo,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
+      #{operationId,jdbcType=VARCHAR}, #{operationName,jdbcType=VARCHAR}, #{logo,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER},
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.cloud.entity.TabSysFunctionModule">
@@ -61,8 +58,8 @@
       <if test="logo != null">
         logo,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -93,8 +90,8 @@
       <if test="logo != null">
         #{logo,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 +122,8 @@
       <if test="logo != null">
         logo = #{logo,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 +142,7 @@
       operation_id = #{operationId,jdbcType=VARCHAR},
       operation_name = #{operationName,jdbcType=VARCHAR},
       logo = #{logo,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where function_module_id = #{functionModuleId,jdbcType=INTEGER}
@@ -154,7 +151,7 @@
   <select id="listFunctionModule" resultMap="BaseResultMap">
     select <include refid="Base_Column_List"></include>
     from tab_sys_function_module
-    where status = 1
+    where delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     <if test="search != null and search != ''">
       and (function_module_name like concat('%', #{search}, '%') or function_module_code like concat('%', #{search}, '%')
       or operation_name like concat('%', #{search}, '%'))

gic-data-cloud-service/src/main/resources/mapper/TabSysTempStoreConditionMapper.xml

@@ -5,12 +5,12 @@
     <id column="temp_store_condition_id" jdbcType="INTEGER" property="tempStoreConditionId" />
     <result column="store_widget_id" jdbcType="INTEGER" property="storeWidgetId" />
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
-    <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">
-    temp_store_condition_id, store_widget_id, enterprise_id, status, create_time, update_time
+    temp_store_condition_id, store_widget_id, enterprise_id, delete_flag, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -18,16 +18,13 @@
     from tab_sys_temp_store_condition
     where temp_store_condition_id = #{tempStoreConditionId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_sys_temp_store_condition
-    where temp_store_condition_id = #{tempStoreConditionId,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.cloud.entity.TabSysTempStoreCondition" useGeneratedKeys="true" keyProperty="tempStoreConditionId">
     insert into tab_sys_temp_store_condition (temp_store_condition_id, store_widget_id, 
-      enterprise_id, status, create_time, 
+      enterprise_id, delete_flag, create_time,
       update_time)
     values (#{tempStoreConditionId,jdbcType=INTEGER}, #{storeWidgetId,jdbcType=INTEGER}, 
-      #{enterpriseId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{enterpriseId,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.cloud.entity.TabSysTempStoreCondition">
@@ -42,8 +39,8 @@
       <if test="enterpriseId != null">
         enterprise_id,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -62,8 +59,8 @@
       <if test="enterpriseId != null">
         #{enterpriseId,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},
@@ -82,8 +79,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>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -98,7 +95,7 @@
     update tab_sys_temp_store_condition
     set store_widget_id = #{storeWidgetId,jdbcType=INTEGER},
       enterprise_id = #{enterpriseId,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where temp_store_condition_id = #{tempStoreConditionId,jdbcType=INTEGER}
@@ -110,6 +107,6 @@
     from tab_sys_temp_store_condition
 
     where enterprise_id = #{enterpriseId}
-    and status = 1
+    and delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
   </select>
 </mapper>
\ No newline at end of file

gic-data-cloud-service/src/main/resources/mapper/TabSysUserMapper.xml

@@ -10,13 +10,13 @@
     <result column="account_group_id" jdbcType="INTEGER" property="accountGroupId" />
     <result column="data_auth_id" jdbcType="INTEGER" property="dataAuthId" />
     <result column="function_auth_id" jdbcType="INTEGER" property="functionAuthId" />
-    <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">
     user_id, user_name, enterprise_id, phone, nation_code, account_group_id, data_auth_id, 
-    function_auth_id, status, create_time, update_time
+    function_auth_id, delete_flag, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -24,18 +24,15 @@
     from tab_sys_user
     where user_id = #{userId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_sys_user
-    where user_id = #{userId,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.cloud.entity.TabSysUser" useGeneratedKeys="true" keyProperty="userId">
     insert into tab_sys_user (user_id, user_name, enterprise_id, 
       phone, nation_code, account_group_id, 
-      data_auth_id, function_auth_id, status, 
+      data_auth_id, function_auth_id, delete_flag,
       create_time, update_time)
     values (#{userId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, #{enterpriseId,jdbcType=INTEGER}, 
       #{phone,jdbcType=VARCHAR}, #{nationCode,jdbcType=VARCHAR}, #{accountGroupId,jdbcType=INTEGER}, 
-      #{dataAuthId,jdbcType=INTEGER}, #{functionAuthId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
+      #{dataAuthId,jdbcType=INTEGER}, #{functionAuthId,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER},
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.cloud.entity.TabSysUser">
@@ -65,8 +62,8 @@
       <if test="functionAuthId != null">
         function_auth_id,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="createTime != null">
         create_time,
@@ -100,8 +97,8 @@
       <if test="functionAuthId != null">
         #{functionAuthId,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},
@@ -135,8 +132,8 @@
       <if test="functionAuthId != null">
         function_auth_id = #{functionAuthId,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},
@@ -156,7 +153,7 @@
       account_group_id = #{accountGroupId,jdbcType=INTEGER},
       data_auth_id = #{dataAuthId,jdbcType=INTEGER},
       function_auth_id = #{functionAuthId,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where user_id = #{userId,jdbcType=INTEGER}
@@ -170,25 +167,25 @@
     <if test="userId != null">
       and user_id &lt;&gt; #{userId}
     </if>
-    and status = 1
+    and delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
   </select>
 
   <update id="deleteUser">
-    update tab_sys_user set status = 0
+    update tab_sys_user set delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@DELETE_STATUS}
     where user_id = #{userId}
-    and status = 1
+    and delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
   </update>
 
   <update id="deleteUserByAccountGroupId">
-    update tab_sys_user set status = 0
+    update tab_sys_user set delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@DELETE_STATUS}
     where account_group_id = #{accountGroupId}
-    and status = 1
+    and delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
   </update>
 
   <select id="pageUser" parameterType="com.gic.cloud.qo.UserQo" resultMap="BaseResultMap">
     select <include refid="Base_Column_List"></include>
     from tab_sys_user
-    where status = 1
+    where delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     <if test="enterpriseId != null">
       and enterprise_id = #{enterpriseId}
     </if>
@@ -209,7 +206,7 @@
 
   <update id="bulkTransferAccountGroup">
     update tab_sys_user set account_group_id = #{targetAccountGroupId}
-    where status = 1
+    where delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     and user_id in
     <foreach collection="userIdList" index="index" item="item" open="(" separator="," close=")">
       #{item}
@@ -220,7 +217,7 @@
     select account_group_id accountGroupId, count(user_id) memberCount
     from tab_sys_user
     where enterprise_id = #{enterpriseId}
-    and status = 1
+    and delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     group by account_group_id
   </select>
 
@@ -229,14 +226,14 @@
     from tab_sys_user
     where  nation_code = #{nationCode}
     and phone = #{phone}
-    and status = 1
+    and delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
   </select>
 
   <select id="countGroupByFunctionAuthId" resultType="com.gic.cloud.dto.UserDTO">
     select function_auth_id functionAuthId, count(user_id) memberCount
     from tab_sys_user
     where enterprise_id = #{enterpriseId}
-    and status = 1
+    and delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     <if test="functionIdList != null and functionIdList.size() > 0">
       and function_auth_id in
       <foreach collection="functionIdList" index="index" item="item" open="(" separator="," close=")">
@@ -250,7 +247,7 @@
     select data_auth_id dataAuthId, count(user_id) memberCount
     from tab_sys_user
     where enterprise_id = #{enterpriseId}
-    and status = 1
+    and delete_flag = ${@com.gic.cloud.constanst.DeleteFlagConstants@NORMAL_STATUS}
     <if test="dataAuthIdList != null and dataAuthIdList.size() > 0">
       and data_auth_id in
       <foreach collection="dataAuthIdList" index="index" item="item" open="(" separator="," close=")">

gic-data-cloud-service/src/main/resources/mapper/TabUpdateTipsMapper.xml

@@ -17,10 +17,7 @@
     from tab_update_tips
     where update_tips_id = #{updateTipsId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_update_tips
-    where update_tips_id = #{updateTipsId,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.cloud.entity.TabUpdateTips">
     insert into tab_update_tips (update_tips_id, user_id, business_id, 
       show_status, type)

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/MemberCloudDataController.java

@@ -261,6 +261,7 @@ public class MemberCloudDataController {
                 .setPortraitCode("1")
                 .setSort(1)
                 .setStatus(1)
+                .setDeleteFlag(0)
                 .setPortraitName("会员等级"));
         list.add(new EnterprisePortraitRelDTO()
                 .setCreateTime(new Date())
@@ -270,6 +271,7 @@ public class MemberCloudDataController {
                 .setPortraitCode("2")
                 .setSort(2)
                 .setStatus(1)
+                .setDeleteFlag(0)
                 .setPortraitName("性别"));
         list.add(new EnterprisePortraitRelDTO()
                 .setCreateTime(new Date())
@@ -279,6 +281,7 @@ public class MemberCloudDataController {
                 .setPortraitCode("3")
                 .setSort(3)
                 .setStatus(1)
+                .setDeleteFlag(0)
                 .setPortraitName("年龄段"));
         list.add(new EnterprisePortraitRelDTO()
                 .setCreateTime(new Date())
@@ -288,6 +291,7 @@ public class MemberCloudDataController {
                 .setPortraitCode("4")
                 .setSort(4)
                 .setStatus(1)
+                .setDeleteFlag(0)
                 .setPortraitName("4开卡渠道"));
         list.add(new EnterprisePortraitRelDTO()
                 .setCreateTime(new Date())
@@ -297,6 +301,7 @@ public class MemberCloudDataController {
                 .setPortraitCode("5")
                 .setSort(5)
                 .setStatus(1)
+                .setDeleteFlag(0)
                 .setPortraitName("生日月份"));
         list.add(new EnterprisePortraitRelDTO()
                 .setCreateTime(new Date())
@@ -306,6 +311,7 @@ public class MemberCloudDataController {
                 .setPortraitCode("6")
                 .setSort(6)
                 .setStatus(1)
+                .setDeleteFlag(0)
                 .setPortraitName("星座名称"));
         enterprisePortraitRelApiService.insertForeach(list);
         ServiceResponse<List<EnterprisePortraitRelDTO>> portraitFieldRes = enterprisePortraitRelApiService.listPortraitField(enterpriseId,  1, params.getDataStatus());