Skip to content

G
gic-platform-enterprise
Commit b6cab78b by guojuxing
Options

status改成delete_flag

parent d3396317
Showing with 646 additions and 808 deletions
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/IndexModuleDTO.java
......@@ -55,7 +55,7 @@ public class IndexModuleDTO implements Serializable {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -140,12 +140,13 @@ public class IndexModuleDTO implements Serializable {
this.objectType = objectType;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public IndexModuleDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......@@ -207,7 +208,7 @@ public class IndexModuleDTO implements Serializable {
", isUse=" + isUse +
", createUserLoginName='" + createUserLoginName + '\'' +
", objectType=" + objectType +
", status=" + status +
", deleteFlag=" + deleteFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
", sort=" + sort +
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/LinkDTO.java
......@@ -34,9 +34,9 @@ public class LinkDTO implements Serializable, Comparable<LinkDTO> {
private Integer parentId;
/**
* 状态（1.有效 0.失效）
* 状态（0.有效 1.失效）
*/
private Integer status;
private Integer deleteFlag;
/**
* 节点类型（0:层级节点无使用意义, 1:普通链接, 2:门店选择, 3:商品分类, 4:商品选择, 5:H5链接, 6:自定义链接 , 7第三方小程序）,8积分商城-卡券，9积分商城-礼品 10：商品分类链接 11：商城自定义页面12:裂变纺13:悦时
......@@ -112,12 +112,13 @@ public class LinkDTO implements Serializable, Comparable<LinkDTO> {
this.parentId = parentId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public LinkDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Integer getType() {
......@@ -212,7 +213,7 @@ public class LinkDTO implements Serializable, Comparable<LinkDTO> {
", createTime=" + createTime +
", updateTime=" + updateTime +
", parentId=" + parentId +
", status=" + status +
", deleteFlag=" + deleteFlag +
", type=" + type +
", objectType=" + objectType +
", name='" + name + '\'' +
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/PushTypeDTO.java
......@@ -41,6 +41,8 @@ public class PushTypeDTO implements Serializable {
*/
private Date updateTime;
private Integer deleteFlag;
public Integer getId() {
return id;
}
......@@ -89,6 +91,15 @@ public class PushTypeDTO implements Serializable {
this.classifyDesc = classifyDesc;
}
public Integer getDeleteFlag() {
return deleteFlag;
}
public PushTypeDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
@Override
public String toString() {
return "PushTypeDTO{" +
......@@ -98,6 +109,7 @@ public class PushTypeDTO implements Serializable {
", status=" + status +
", createTime=" + createTime +
", updateTime=" + updateTime +
", deleteFlag=" + deleteFlag +
'}';
}
}
\ No newline at end of file
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/QrcodeScenesClassifyDTO.java
......@@ -39,7 +39,7 @@ public class QrcodeScenesClassifyDTO implements Serializable {
/**
*
*/
private Integer status;
private Integer deleteFlag;
public Integer getId() {
return id;
......@@ -81,12 +81,13 @@ public class QrcodeScenesClassifyDTO implements Serializable {
this.updateTime = updateTime;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public QrcodeScenesClassifyDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
@Override
......@@ -97,7 +98,7 @@ public class QrcodeScenesClassifyDTO implements Serializable {
", enterpriseId=" + enterpriseId +
", createTime=" + createTime +
", updateTime=" + updateTime +
", status=" + status +
", status=" + deleteFlag +
'}';
}
}
\ No newline at end of file
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/QrcodeScenesDTO.java
......@@ -53,6 +53,8 @@ public class QrcodeScenesDTO implements Serializable {
*/
private Integer status;
private Integer deleteFlag;
public Integer getScenesId() {
return scenesId;
}
......@@ -125,6 +127,15 @@ public class QrcodeScenesDTO implements Serializable {
this.scenesClassifyName = scenesClassifyName;
}
public Integer getDeleteFlag() {
return deleteFlag;
}
public QrcodeScenesDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
@Override
public String toString() {
return "QrcodeScenesDTO{" +
......@@ -137,6 +148,7 @@ public class QrcodeScenesDTO implements Serializable {
", createTime=" + createTime +
", updateTime=" + updateTime +
", status=" + status +
", deleteFlag=" + deleteFlag +
'}';
}
}
\ No newline at end of file
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/QrcodeScenesValueDTO.java
......@@ -39,7 +39,7 @@ public class QrcodeScenesValueDTO implements Serializable {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -91,12 +91,13 @@ public class QrcodeScenesValueDTO implements Serializable {
this.name = name;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public QrcodeScenesValueDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......@@ -123,7 +124,7 @@ public class QrcodeScenesValueDTO implements Serializable {
", enterpriseId=" + enterpriseId +
", code='" + code + '\'' +
", name='" + name + '\'' +
", status=" + status +
", deleteFlag=" + deleteFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
'}';
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/TodoItemDTO.java
......@@ -68,7 +68,7 @@ public class TodoItemDTO implements Serializable {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
* 跳转的url 不加域名 比如： /damo-system/user/approve?id=1
......@@ -159,12 +159,13 @@ public class TodoItemDTO implements Serializable {
this.updateTime = updateTime;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TodoItemDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public String getItemInfoUrl() {
......@@ -187,7 +188,7 @@ public class TodoItemDTO implements Serializable {
", finishTime=" + finishTime +
", createTime=" + createTime +
", updateTime=" + updateTime +
", status=" + status +
", status=" + deleteFlag +
", itemInfoUrl='" + itemInfoUrl + '\'' +
", itemTypeName='" + itemTypeName + '\'' +
'}';
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/WmStoreDTO.java
......@@ -69,9 +69,9 @@ public class WmStoreDTO implements Serializable{
private Integer authStatus;
/**
* 1:有效
* 0:有效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -164,12 +164,12 @@ public class WmStoreDTO implements Serializable{
return this;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public WmStoreDTO setStatus(Integer status) {
this.status = status;
public WmStoreDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
......@@ -223,7 +223,7 @@ public class WmStoreDTO implements Serializable{
", mallMode=" + mallMode +
", storeBrandId=" + storeBrandId +
", authStatus=" + authStatus +
", status=" + status +
", status=" + deleteFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
'}';
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/wm/WmStoreConfigDTO.java
......@@ -39,9 +39,9 @@ public class WmStoreConfigDTO implements Serializable{
private String storeConfigJson;
/**
* 1:有效
* 0:有效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -98,12 +98,12 @@ public class WmStoreConfigDTO implements Serializable{
return this;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public WmStoreConfigDTO setStatus(Integer status) {
this.status = status;
public WmStoreConfigDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
......@@ -133,7 +133,7 @@ public class WmStoreConfigDTO implements Serializable{
", wmMallStoreId=" + wmMallStoreId +
", storeConfigType=" + storeConfigType +
", storeConfigJson='" + storeConfigJson + '\'' +
", status=" + status +
", status=" + deleteFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
'}';
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/wm/WmStoreCouponConfigDTO.java
......@@ -56,7 +56,7 @@ public class WmStoreCouponConfigDTO implements Serializable{
/**
* 1:有效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -122,12 +122,12 @@ public class WmStoreCouponConfigDTO implements Serializable{
return this;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public WmStoreCouponConfigDTO setStatus(Integer status) {
this.status = status;
public WmStoreCouponConfigDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
......@@ -178,7 +178,7 @@ public class WmStoreCouponConfigDTO implements Serializable{
", wmCouponId='" + wmCouponId + '\'' +
", wmCouponName='" + wmCouponName + '\'' +
", gicCouponExpire=" + gicCouponExpire +
", status=" + status +
", status=" + deleteFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
'}';
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/constant/DeleteFlagConstants.java 0 → 100644
package com.gic.enterprise.constant;
/**
* 数据删除标志
* @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-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabHelpCenter.java
......@@ -48,7 +48,7 @@ public class TabHelpCenter {
/**
*
*/
private Integer status;
private Integer deleteFlag;
public Integer getHelpId() {
return helpId;
......@@ -106,11 +106,12 @@ public class TabHelpCenter {
this.isShow = isShow;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabHelpCenter setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabIndexModule.java
......@@ -53,7 +53,7 @@ public class TabIndexModule {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -134,12 +134,13 @@ public class TabIndexModule {
this.objectType = objectType;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabIndexModule setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabIndexModuleEnterprise.java
......@@ -28,7 +28,7 @@ public class TabIndexModuleEnterprise {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -64,12 +64,13 @@ public class TabIndexModuleEnterprise {
this.enterpriseId = enterpriseId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabIndexModuleEnterprise setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabLink.java
......@@ -31,9 +31,9 @@ public class TabLink {
private Integer parentId;
/**
* 状态（1.有效 0.失效）
* 状态（0.有效 1.失效）
*/
private Integer status;
private Integer deleteFlag;
/**
* 节点类型（0:层级节点无使用意义, 1:普通链接, 2:门店选择, 3:商品分类, 4:商品选择, 5:H5链接, 6:自定义链接 , 7第三方小程序）,8积分商城-卡券，9积分商城-礼品 10：商品分类链接 11：商城自定义页面12:裂变纺13:悦时 14小程序自定义路径
......@@ -107,12 +107,13 @@ public class TabLink {
this.parentId = parentId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabLink setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Integer getType() {
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabLinkScene.java
......@@ -38,7 +38,7 @@ public class TabLinkScene {
/**
*
*/
private Integer status;
private Integer deleteFlag;
public Integer getLinkSceneId() {
return linkSceneId;
......@@ -80,11 +80,12 @@ public class TabLinkScene {
this.updateTime = updateTime;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabLinkScene setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabPlatformBrand.java
......@@ -48,7 +48,7 @@ public class TabPlatformBrand {
/**
*
*/
private Integer status;
private Integer deleteFlag;
public Integer getPlatformBrandId() {
return platformBrandId;
......@@ -106,11 +106,12 @@ public class TabPlatformBrand {
this.updateTime = updateTime;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabPlatformBrand setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabPlatformBrandRef.java
......@@ -57,7 +57,7 @@ public class TabPlatformBrandRef {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
* 1：门店品牌， 2：商品品牌
......@@ -136,12 +136,13 @@ public class TabPlatformBrandRef {
this.updateTime = updateTime;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabPlatformBrandRef setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Integer getType() {
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabProject.java
......@@ -23,7 +23,7 @@ public class TabProject {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -56,12 +56,13 @@ public class TabProject {
this.projectName = projectName;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabProject setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabProjectItem.java
......@@ -48,7 +48,7 @@ public class TabProjectItem {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -136,12 +136,13 @@ public class TabProjectItem {
this.useStatus = useStatus;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabProjectItem setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabPushClassify.java
......@@ -28,7 +28,7 @@ public class TabPushClassify {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -64,12 +64,13 @@ public class TabPushClassify {
this.classifyDesc = classifyDesc;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabPushClassify setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabPushMessage.java
......@@ -66,9 +66,9 @@ public class TabPushMessage {
private Date updateTime;
/**
* 0删除 1正常
* 1删除 0正常
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -178,12 +178,13 @@ public class TabPushMessage {
this.updateTime = updateTime;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabPushMessage setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Integer getCreator() {
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabPushUserMessage.java
......@@ -60,6 +60,8 @@ public class TabPushUserMessage {
*/
private String content;
private Integer deleteFlag;
public Integer getId() {
return id;
}
......@@ -139,4 +141,13 @@ public class TabPushUserMessage {
public void setContent(String content) {
this.content = content;
}
public Integer getDeleteFlag() {
return deleteFlag;
}
public TabPushUserMessage setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabQrcodeDownload.java
......@@ -76,7 +76,7 @@ public class TabQrcodeDownload {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -194,12 +194,13 @@ public class TabQrcodeDownload {
this.callBackMethod = callBackMethod;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabQrcodeDownload setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabQrcodeScenes.java
......@@ -50,6 +50,8 @@ public class TabQrcodeScenes {
*/
private Integer status;
private Integer deleteFlag;
public Integer getScenesId() {
return scenesId;
}
......@@ -113,4 +115,13 @@ public class TabQrcodeScenes {
public void setStatus(Integer status) {
this.status = status;
}
public Integer getDeleteFlag() {
return deleteFlag;
}
public TabQrcodeScenes setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabQrcodeScenesClassify.java
......@@ -38,7 +38,7 @@ public class TabQrcodeScenesClassify {
/**
*
*/
private Integer status = 1;
private Integer deleteFlag = 1;
public Integer getId() {
return id;
......@@ -80,11 +80,12 @@ public class TabQrcodeScenesClassify {
this.updateTime = updateTime;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabQrcodeScenesClassify setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabQrcodeScenesValue.java
......@@ -38,7 +38,7 @@ public class TabQrcodeScenesValue {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -90,12 +90,13 @@ public class TabQrcodeScenesValue {
this.name = name;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabQrcodeScenesValue setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabRiskMode.java
......@@ -53,7 +53,7 @@ public class TabRiskMode {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -129,12 +129,13 @@ public class TabRiskMode {
this.auditReason = auditReason;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabRiskMode setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabTodoItem.java
......@@ -58,7 +58,7 @@ public class TabTodoItem {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
* 存事项的需要反查的内容，url
......@@ -137,12 +137,13 @@ public class TabTodoItem {
this.updateTime = updateTime;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabTodoItem setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public String getItemInfoUrl() {
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabWmStore.java
......@@ -66,9 +66,9 @@ public class TabWmStore {
private Integer authStatus;
/**
* 1:有效
* 0:有效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -161,12 +161,12 @@ public class TabWmStore {
return this;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public TabWmStore setStatus(Integer status) {
this.status = status;
public TabWmStore setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabWmStoreConfig.java
......@@ -36,9 +36,9 @@ public class TabWmStoreConfig {
private String storeConfigJson;
/**
* 1:有效
* 0:有效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -95,12 +95,12 @@ public class TabWmStoreConfig {
return this;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public TabWmStoreConfig setStatus(Integer status) {
this.status = status;
public TabWmStoreConfig setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabWmStoreCouponConfig.java
......@@ -51,9 +51,9 @@ public class TabWmStoreCouponConfig {
private Date gicCouponExpire;
/**
* 1:有效
* 0:有效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -119,12 +119,12 @@ public class TabWmStoreCouponConfig {
return this;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public TabWmStoreCouponConfig setStatus(Integer status) {
this.status = status;
public TabWmStoreCouponConfig setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabWmStoreSyncLog.java
......@@ -46,9 +46,9 @@ public class TabWmStoreSyncLog {
private String storeCode;
/**
* 1:已同步微盟 0:微盟侧已删除
* 0:已同步微盟 1:微盟侧已删除
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -123,12 +123,12 @@ public class TabWmStoreSyncLog {
return this;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public TabWmStoreSyncLog setStatus(Integer status) {
this.status = status;
public TabWmStoreSyncLog setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/HelpCenterServiceImpl.java
package com.gic.enterprise.service.impl;
import com.gic.enterprise.constant.Constants;
import com.gic.enterprise.constant.DeleteFlagConstants;
import com.gic.enterprise.dao.mapper.TabHelpCenterMapper;
import com.gic.enterprise.entity.TabHelpCenter;
import com.gic.enterprise.service.HelpCenterService;
......@@ -41,7 +42,7 @@ public class HelpCenterServiceImpl implements HelpCenterService {
public Integer delHelpCenter(Integer helpId) {
TabHelpCenter helpCenter = new TabHelpCenter();
helpCenter.setHelpId(helpId);
helpCenter.setStatus(com.gic.enterprise.constants.Constants.DEL_STATUS);
helpCenter.setDeleteFlag(DeleteFlagConstants.DELETE_STATUS);
return this.tabHelpCenterMapper.updateByPrimaryKeySelective(helpCenter);
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/IndexModuleEnterpriseServiceImpl.java
package com.gic.enterprise.service.impl;
import com.gic.commons.util.GlobalInfo;
import com.gic.enterprise.constant.DeleteFlagConstants;
import com.gic.enterprise.dao.mapper.TabIndexModuleEnterpriseMapper;
import com.gic.enterprise.entity.TabIndexModuleEnterprise;
import com.gic.enterprise.service.IndexModuleEnterpriseService;
......@@ -34,7 +35,7 @@ public class IndexModuleEnterpriseServiceImpl implements IndexModuleEnterpriseSe
TabIndexModuleEnterprise indexModuleEnterprise = new TabIndexModuleEnterprise();
indexModuleEnterprise.setIndexModuleId(indexModuleId);
indexModuleEnterprise.setEnterpriseId(enterpriseId);
indexModuleEnterprise.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
indexModuleEnterprise.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
indexModuleEnterprise.setCreateTime(new Date());
tabIndexModuleEnterpriseMapper.insertSelectiveByNotExist(indexModuleEnterprise);
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/IndexModuleServiceImpl.java
......@@ -2,6 +2,7 @@ package com.gic.enterprise.service.impl;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.GlobalInfo;
import com.gic.enterprise.constant.DeleteFlagConstants;
import com.gic.enterprise.dao.mapper.TabIndexModuleMapper;
import com.gic.enterprise.dto.IndexModuleDTO;
import com.gic.enterprise.entity.TabIndexModule;
......@@ -45,7 +46,7 @@ public class IndexModuleServiceImpl implements IndexModuleService {
public Integer saveIndexModule(IndexModuleDTO indexModuleDTO) {
TabIndexModule indexModule = EntityUtil.changeEntityByJSON(TabIndexModule.class, indexModuleDTO);
indexModule.setCreateTime(new Date());
indexModule.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
indexModule.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
tabIndexModuleMapper.insertSelective(indexModule);
return indexModule.getIndexModuleId();
}
......@@ -59,7 +60,7 @@ public class IndexModuleServiceImpl implements IndexModuleService {
@Override
public void updateIndexModule(IndexModuleDTO indexModuleDTO) {
TabIndexModule indexModule = EntityUtil.changeEntityByJSON(TabIndexModule.class, indexModuleDTO);
indexModule.setStatus(null);
indexModule.setDeleteFlag(null);
tabIndexModuleMapper.updateByPrimaryKeySelective(indexModule);
}
......@@ -67,7 +68,7 @@ public class IndexModuleServiceImpl implements IndexModuleService {
public void delIndexModule(Integer indexModuleId) {
TabIndexModule tabIndexModule = new TabIndexModule();
tabIndexModule.setIndexModuleId(indexModuleId);
tabIndexModule.setStatus(GlobalInfo.DATA_STATUS_DELETE);
tabIndexModule.setDeleteFlag(DeleteFlagConstants.DELETE_STATUS);
tabIndexModuleMapper.updateByPrimaryKeySelective(tabIndexModule);
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/LinkSceneServiceImpl.java
package com.gic.enterprise.service.impl;
import com.gic.enterprise.constant.DeleteFlagConstants;
import com.gic.enterprise.constants.Constants;
import com.gic.enterprise.dao.mapper.TabLinkSceneMapper;
import com.gic.enterprise.entity.TabLinkScene;
......@@ -39,7 +40,7 @@ public class LinkSceneServiceImpl implements LinkSceneService {
linkScene.setLinkId(linkId);
linkScene.setEnterpriseId(enterpriseId);
linkScene.setCreateTime(new Date());
linkScene.setStatus(Constants.NORMAL_STATUS);
linkScene.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
tabLinkSceneMapper.insertSelectiveByNotExist(linkScene);
}
// 把所有关联status都设置为1
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/LinkServiceImpl.java
package com.gic.enterprise.service.impl;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.constant.DeleteFlagConstants;
import com.gic.enterprise.constant.LinkEnterpriseTypeEnum;
import com.gic.enterprise.constant.LinkSortEnum;
import com.gic.enterprise.constant.LinkTypeEnum;
......@@ -46,7 +47,7 @@ public class LinkServiceImpl implements LinkService {
TabLink tabLink = new TabLink();
tabLink.setCreateTime(new Date());
tabLink.setParentId(0);
tabLink.setStatus(Constants.NORMAL_STATUS);
tabLink.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
tabLink.setType(type);
tabLink.setName(name);
tabLink.setIsCustom(Constants.NORMAL_STATUS);
......@@ -75,7 +76,7 @@ public class LinkServiceImpl implements LinkService {
TabLink tabLink = EntityUtil.changeEntityByJSON(TabLink.class, linkDTO);
tabLink.setCreateTime(new Date());
tabLink.setParentId(linkDTO.getParentId());
tabLink.setStatus(Constants.NORMAL_STATUS);
tabLink.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
tabLink.setIsCustom(Constants.NORMAL_STATUS);
tabLink.setEnterpriseType(LinkEnterpriseTypeEnum.ALL.getCode());
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/PlatformBrandRefServiceImpl.java
package com.gic.enterprise.service.impl;
import com.gic.commons.util.GlobalInfo;
import com.gic.enterprise.constant.DeleteFlagConstants;
import com.gic.enterprise.dao.mapper.TabPlatformBrandRefMapper;
import com.gic.enterprise.dto.PlatformBrandRefDTO;
import com.gic.enterprise.entity.TabPlatformBrandRef;
......@@ -59,7 +60,7 @@ public class PlatformBrandRefServiceImpl implements PlatformBrandRefService {
platformBrandRef.setEnterpriseBrandCode(platformBrandRefDTO.getEnterpriseBrandCode());
platformBrandRef.setCreateTime(new Date());
platformBrandRef.setType(platformBrandRefDTO.getType());
platformBrandRef.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
platformBrandRef.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
tabPlatformBrandRefMapper.insertSelective(platformBrandRef);
return platformBrandRef.getPlatformBrandId();
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/PlatformBrandServiceImpl.java
package com.gic.enterprise.service.impl;
import com.gic.commons.util.GlobalInfo;
import com.gic.enterprise.constant.DeleteFlagConstants;
import com.gic.enterprise.dao.mapper.TabPlatformBrandMapper;
import com.gic.enterprise.dto.PlatformBrandDTO;
import com.gic.enterprise.entity.TabPlatformBrand;
......@@ -43,7 +44,7 @@ public class PlatformBrandServiceImpl implements PlatformBrandService {
tabPlatformBrand.setPlatformBrandName(platformBrandDTO.getPlatformBrandName());
tabPlatformBrand.setCreateType(platformBrandDTO.getCreateType());
tabPlatformBrand.setCreateTime(new Date());
tabPlatformBrand.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
tabPlatformBrand.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
tabPlatformBrandMapper.insertSelective(tabPlatformBrand);
return tabPlatformBrand.getPlatformBrandId();
}
......@@ -62,7 +63,7 @@ public class PlatformBrandServiceImpl implements PlatformBrandService {
public Integer delBrandById(Integer platformBrandId) {
TabPlatformBrand tabPlatformBrand = new TabPlatformBrand();
tabPlatformBrand.setPlatformBrandId(platformBrandId);
tabPlatformBrand.setStatus(GlobalInfo.DATA_STATUS_DELETE);
tabPlatformBrand.setDeleteFlag(DeleteFlagConstants.DELETE_STATUS);
return tabPlatformBrandMapper.updateByPrimaryKeySelective(tabPlatformBrand);
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/ProjectItemServiceImpl.java
......@@ -2,6 +2,7 @@ package com.gic.enterprise.service.impl;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.GlobalInfo;
import com.gic.enterprise.constant.DeleteFlagConstants;
import com.gic.enterprise.dao.mapper.TabProjectItemMapper;
import com.gic.enterprise.dto.ProjectItemDTO;
import com.gic.enterprise.entity.TabProjectItem;
......@@ -38,7 +39,7 @@ public class ProjectItemServiceImpl implements ProjectItemService {
@Override
public Integer save(ProjectItemDTO copy) {
TabProjectItem projectItem = EntityUtil.changeEntityByJSON(TabProjectItem.class, copy);
projectItem.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
projectItem.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
projectItem.setCreateTime(new Date());
Double sort = tabProjectItemMapper.getMinSort();
projectItem.setSort(sort == null ? 1d : sort - 1d);
......@@ -75,7 +76,7 @@ public class ProjectItemServiceImpl implements ProjectItemService {
public Integer del(Integer projectItemId) {
TabProjectItem projectItem = new TabProjectItem();
projectItem.setProjectItemId(projectItemId);
projectItem.setStatus(GlobalInfo.DATA_STATUS_DELETE);
projectItem.setDeleteFlag(DeleteFlagConstants.DELETE_STATUS);
return tabProjectItemMapper.updateByPrimaryKeySelective(projectItem);
}
......@@ -103,7 +104,7 @@ public class ProjectItemServiceImpl implements ProjectItemService {
@Override
public TabProjectItem getById(Integer projectItemId) {
TabProjectItem projectItem = tabProjectItemMapper.selectByPrimaryKey(projectItemId);
return (projectItem != null && projectItem.getStatus() == GlobalInfo.DATA_STATUS_NORMAL) ? projectItem : null;
return (projectItem != null && projectItem.getDeleteFlag() == DeleteFlagConstants.NORMAL_STATUS) ? projectItem : null;
}
@Override
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/ProjectServiceImpl.java
package com.gic.enterprise.service.impl;
import com.gic.commons.util.GlobalInfo;
import com.gic.enterprise.constant.DeleteFlagConstants;
import com.gic.enterprise.dao.mapper.TabProjectItemMapper;
import com.gic.enterprise.dao.mapper.TabProjectMapper;
import com.gic.enterprise.dto.ProjectDTO;
......@@ -35,7 +36,7 @@ public class ProjectServiceImpl implements ProjectService {
public Integer save(ProjectDTO copy) {
TabProject tabProject = new TabProject();
tabProject.setProjectName(copy.getProjectName());
tabProject.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
tabProject.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
tabProject.setCreateTime(new Date());
Double sort = tabProjectMapper.getMinSort();
......@@ -57,7 +58,7 @@ public class ProjectServiceImpl implements ProjectService {
public Integer delProject(Integer projectId) {
TabProject tabProject = new TabProject();
tabProject.setProjectId(projectId);
tabProject.setStatus(GlobalInfo.DATA_STATUS_DELETE);
tabProject.setDeleteFlag(DeleteFlagConstants.DELETE_STATUS);
return tabProjectMapper.updateByPrimaryKeySelective(tabProject);
}
......@@ -79,7 +80,7 @@ public class ProjectServiceImpl implements ProjectService {
@Override
public TabProject getById(Integer projectId) {
TabProject project = tabProjectMapper.selectByPrimaryKey(projectId);
if (project != null && project.getStatus() == GlobalInfo.DATA_STATUS_NORMAL) {
if (project != null && project.getDeleteFlag() == DeleteFlagConstants.NORMAL_STATUS) {
return project;
}
return null;
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/PushMessageServiceImpl.java
package com.gic.enterprise.service.impl;
import com.gic.enterprise.constant.DeleteFlagConstants;
import com.gic.enterprise.dao.mapper.TabPushMessageMapper;
import com.gic.enterprise.dto.UserMessageDTO;
import com.gic.enterprise.entity.TabPushClassify;
......@@ -45,7 +46,7 @@ public class PushMessageServiceImpl implements PushMessageService {
public int delete(Integer id) {
TabPushMessage tabPushMessage = new TabPushMessage();
tabPushMessage.setMessageId(id);
tabPushMessage.setStatus(0);
tabPushMessage.setDeleteFlag(DeleteFlagConstants.DELETE_STATUS);
return this.tabPushMessageMapper.updateByPrimaryKeySelective(tabPushMessage);
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/PushTypeServiceImpl.java
package com.gic.enterprise.service.impl;
import com.gic.enterprise.constant.DeleteFlagConstants;
import com.gic.enterprise.dao.mapper.TabPushClassifyMapper;
import com.gic.enterprise.entity.TabPushClassify;
import com.gic.enterprise.service.PushTypeService;
......@@ -41,7 +42,7 @@ public class PushTypeServiceImpl implements PushTypeService {
public int deletePushType(Integer id) {
TabPushClassify tabPushType = new TabPushClassify();
tabPushType.setId(id);
tabPushType.setStatus(0);
tabPushType.setDeleteFlag(DeleteFlagConstants.DELETE_STATUS);
return this.tabPushClassifyMapper.updateByPrimaryKeySelective(tabPushType);
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/PushUserMessageServiceImpl.java
package com.gic.enterprise.service.impl;
import com.gic.enterprise.constant.DeleteFlagConstants;
import com.gic.enterprise.dao.mapper.TabPushUserMessageMapper;
import com.gic.enterprise.entity.TabPushClassify;
import com.gic.enterprise.entity.TabPushUserMessage;
......@@ -32,6 +33,7 @@ public class PushUserMessageServiceImpl implements PushUserMessageService {
tab.setUserId(userId);
tab.setMessageId(messageId);
tab.setStatus(1);
tab.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
tab.setUpdateTime(new Date());
tab.setTitle(title);
tab.setContent(content);
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/QrCodeServiceImpl.java
package com.gic.enterprise.service.impl;
import com.gic.enterprise.constant.Constants;
import com.gic.enterprise.constant.DeleteFlagConstants;
import com.gic.enterprise.dao.mapper.TabQrcodeDownloadMapper;
import com.gic.enterprise.dao.mapper.TabQrcodeScenesClassifyMapper;
import com.gic.enterprise.dao.mapper.TabQrcodeScenesMapper;
......@@ -65,7 +66,7 @@ public class QrCodeServiceImpl implements QrCodeService {
public int deleteQrcodeScenesClassify(Integer id) {
TabQrcodeScenesClassify tab = new TabQrcodeScenesClassify();
tab.setId(id);
tab.setStatus(com.gic.enterprise.constants.Constants.DEL_STATUS);
tab.setDeleteFlag(DeleteFlagConstants.DELETE_STATUS);
return this.tabQrcodeScenesClassifyMapper.updateByPrimaryKeySelective(tab);
}
......@@ -102,7 +103,7 @@ public class QrCodeServiceImpl implements QrCodeService {
@Override
public int saveQrcodeScenesValue(TabQrcodeScenesValue tabQrcodeScenesValue) {
tabQrcodeScenesValue.setUpdateTime(new Date());
tabQrcodeScenesValue.setStatus(1);
tabQrcodeScenesValue.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
if(tabQrcodeScenesValue.getValueId() != null){
return this.tabQrcodeScenesValueMapper.updateByPrimaryKeySelective(tabQrcodeScenesValue);
}
......@@ -119,7 +120,7 @@ public class QrCodeServiceImpl implements QrCodeService {
public int deleteQrcodeScenesValue(Integer valueId) {
TabQrcodeScenesValue tab = new TabQrcodeScenesValue();
tab.setValueId(valueId);
tab.setStatus(com.gic.enterprise.constants.Constants.DEL_STATUS);
tab.setDeleteFlag(DeleteFlagConstants.DELETE_STATUS);
return this.tabQrcodeScenesValueMapper.updateByPrimaryKeySelective(tab);
}
......@@ -127,7 +128,7 @@ public class QrCodeServiceImpl implements QrCodeService {
public int saveQrcodeDownload(TabQrcodeDownload qrcodeDownload) {
qrcodeDownload.setCreateTime(new Date());
qrcodeDownload.setUpdateTime(new Date());
qrcodeDownload.setStatus(1);
qrcodeDownload.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
this.tabQrcodeDownloadMapper.insertSelective(qrcodeDownload);
return qrcodeDownload.getId();
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/RiskModeServiceImpl.java
package com.gic.enterprise.service.impl;
import com.gic.commons.util.GlobalInfo;
import com.gic.enterprise.constant.DeleteFlagConstants;
import com.gic.enterprise.dao.mapper.TabRiskModeMapper;
import com.gic.enterprise.entity.TabRiskMode;
import com.gic.enterprise.service.RiskModeService;
......@@ -34,7 +35,7 @@ public class RiskModeServiceImpl implements RiskModeService {
riskMode.setApplyTime(applyTime);
riskMode.setDurationCode(duration);
riskMode.setApplyReason(applyReason);
riskMode.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
riskMode.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
riskMode.setCreateTime(new Date());
tabRiskModeMapper.insertSelective(riskMode);
return riskMode.getRiskModeId();
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/TodoItemServiceImpl.java
......@@ -2,6 +2,7 @@ package com.gic.enterprise.service.impl;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.GlobalInfo;
import com.gic.enterprise.constant.DeleteFlagConstants;
import com.gic.enterprise.dao.mapper.TabTodoItemMapper;
import com.gic.enterprise.dto.TodoItemDTO;
import com.gic.enterprise.entity.TabTodoItem;
......@@ -31,7 +32,7 @@ public class TodoItemServiceImpl implements TodoItemService {
TabTodoItem tabTodoItem = EntityUtil.changeEntityByJSON(TabTodoItem.class, todoItemDTO);
tabTodoItem.setFinish(0);
tabTodoItem.setCreateTime(new Date());
tabTodoItem.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
tabTodoItem.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
tabTodoItemMapper.insertSelective(tabTodoItem);
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/WmStoreConfigServiceImpl.java
......@@ -3,6 +3,7 @@ package com.gic.enterprise.service.impl;
import java.util.Date;
import java.util.List;
import com.gic.enterprise.constant.DeleteFlagConstants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -28,7 +29,7 @@ public class WmStoreConfigServiceImpl implements WmStoreConfigService{
Date now = new Date();
dto.setUpdateTime(now);
dto.setCreateTime(now);
dto.setStatus(1);
dto.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
TabWmStoreConfig record = EntityUtil.changeEntityNew(TabWmStoreConfig.class, dto);
tabWmStoreConfigMapper.insert(record);
return record.getStoreConfigId();
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/WmStoreCouponConfigServiceImpl.java
package com.gic.enterprise.service.impl;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.constant.DeleteFlagConstants;
import com.gic.enterprise.dao.mapper.TabWmStoreCouponConfigMapper;
import com.gic.enterprise.dto.wm.WmStoreCouponConfigDTO;
import com.gic.enterprise.entity.TabWmStoreCouponConfig;
......@@ -30,7 +31,7 @@ public class WmStoreCouponConfigServiceImpl implements WmStoreCouponConfigServic
Date now = new Date();
dto.setCreateTime(now);
dto.setUpdateTime(now);
dto.setStatus(1);
dto.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
TabWmStoreCouponConfig record = EntityUtil.changeEntityNew(TabWmStoreCouponConfig.class, dto);
tabWmStoreCouponConfigMapper.insert(record);
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/WmStoreServiceImpl.java
package com.gic.enterprise.service.impl;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.constant.DeleteFlagConstants;
import com.gic.enterprise.dao.mapper.TabWmStoreMapper;
import com.gic.enterprise.dto.WmStoreDTO;
import com.gic.enterprise.entity.TabWmStore;
......@@ -27,7 +28,7 @@ public class WmStoreServiceImpl implements WmStoreService{
Date now = new Date();
wmStoreDTO.setCreateTime(now);
wmStoreDTO.setUpdateTime(now);
wmStoreDTO.setStatus(1);
wmStoreDTO.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
wmStoreDTO.setAuthStatus(0);
TabWmStore record = EntityUtil.changeEntityNew(TabWmStore.class, wmStoreDTO);
tabWmStoreMapper.insert(record);
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/WmStoreSyncLogServiceImpl.java
......@@ -4,6 +4,7 @@ import java.util.Arrays;
import java.util.Date;
import java.util.List;
import com.gic.enterprise.constant.DeleteFlagConstants;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -35,7 +36,7 @@ public class WmStoreSyncLogServiceImpl implements WmStoreSyncLogService {
TabWmStoreSyncLog record = new TabWmStoreSyncLog()
.setStoreId(storeId)
.setEnterpriseId(enterpriseId)
.setStatus(1)
.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS)
.setStoreCode(storeCode)
.setWmMallStoreId(wmMallStoreId)
.setStoreName(storeName)
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/RiskModeApiServiceImpl.java
......@@ -11,6 +11,7 @@ import com.gic.commons.util.GlobalInfo;
import com.gic.enterprise.constant.AuditTypeEnum;
import com.gic.enterprise.constant.Constants;
import com.gic.enterprise.constant.DataSecurityAuditEnum;
import com.gic.enterprise.constant.DeleteFlagConstants;
import com.gic.enterprise.dto.AuditLogDTO;
import com.gic.enterprise.dto.DictDTO;
import com.gic.enterprise.entity.TabRiskMode;
......@@ -141,7 +142,7 @@ public class RiskModeApiServiceImpl implements RiskModeApiService {
// 5分钟内有未审核的申请
return EnterpriseServiceResponse.failure(ErrorCode.OPERATION_FAILED.getCode(), "5分钟内有未审核的申请，请稍后再申请");
}
lastAudit.setStatus(GlobalInfo.DATA_STATUS_DELETE);
lastAudit.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
riskModeService.update(lastAudit);
}
......
gic-platform-enterprise-service/src/main/resources/mapper/TabHelpCenterMapper.xml
......@@ -9,10 +9,10 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="is_show" jdbcType="INTEGER" property="isShow" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
</resultMap>
<sql id="Base_Column_List">
help_id, title, help_url, mode, create_time, update_time, is_show, status
help_id, title, help_url, mode, create_time, update_time, is_show, delete_flag
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -24,10 +24,10 @@
<insert id="insert" parameterType="com.gic.enterprise.entity.TabHelpCenter">
insert into tab_help_center (help_id, title, help_url,
mode, create_time, update_time,
is_show, status)
is_show, delete_flag)
values (#{helpId,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR}, #{helpUrl,jdbcType=VARCHAR},
#{mode,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{isShow,jdbcType=INTEGER}, #{status,jdbcType=INTEGER})
#{isShow,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabHelpCenter">
insert into tab_help_center
......@@ -53,8 +53,8 @@
<if test="isShow != null">
is_show,
</if>
<if test="status != null">
status,
<if test="deleteFlag != null">
delete_flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
......@@ -79,8 +79,8 @@
<if test="isShow != null">
#{isShow,jdbcType=INTEGER},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=INTEGER},
</if>
</trim>
</insert>
......@@ -105,8 +105,8 @@
<if test="isShow != null">
is_show = #{isShow,jdbcType=INTEGER},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
<if test="deleteFlag != null">
delete_flag = #{deleteFlag,jdbcType=INTEGER},
</if>
</set>
where help_id = #{helpId,jdbcType=INTEGER}
......@@ -119,14 +119,14 @@
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
is_show = #{isShow,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER}
delete_flag = #{deleteFlag,jdbcType=INTEGER}
where help_id = #{helpId,jdbcType=INTEGER}
</update>
<select id="pageHelpCenter" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_help_center
where status=1
where delete_flag=${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="search != null and search != ''">
and title like concat('%', #{search}, '%')
</if>
......@@ -141,7 +141,7 @@
select
<include refid="Base_Column_List" />
from tab_help_center
where status=1
where delete_flag=${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
and is_show = 1
</select>
</mapper>
\ No newline at end of file
gic-platform-enterprise-service/src/main/resources/mapper/TabIndexModuleEnterpriseMapper.xml
......@@ -5,12 +5,12 @@
<id column="index_module_enterprise_id" jdbcType="INTEGER" property="indexModuleEnterpriseId" />
<result column="index_module_id" jdbcType="INTEGER" property="indexModuleId" />
<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">
index_module_enterprise_id, index_module_id, enterprise_id, status, create_time,
index_module_enterprise_id, index_module_id, enterprise_id, delete_flag, create_time,
update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
......@@ -22,10 +22,10 @@
<insert id="insert" parameterType="com.gic.enterprise.entity.TabIndexModuleEnterprise">
insert into tab_index_module_enterprise (index_module_enterprise_id, index_module_id,
enterprise_id, status, create_time,
enterprise_id, delete_flag, create_time,
update_time)
values (#{indexModuleEnterpriseId,jdbcType=INTEGER}, #{indexModuleId,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.enterprise.entity.TabIndexModuleEnterprise">
......@@ -40,8 +40,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,
......@@ -60,8 +60,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},
......@@ -80,8 +80,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},
......@@ -96,26 +96,26 @@
update tab_index_module_enterprise
set index_module_id = #{indexModuleId,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 index_module_enterprise_id = #{indexModuleEnterpriseId,jdbcType=INTEGER}
</update>
<update id="delByIndexModuleId">
update tab_index_module_enterprise
set status = 0
set delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@DELETE_STATUS}
where index_module_id = #{indexModuleId,jdbcType=INTEGER}
</update>
<insert id="insertSelectiveByNotExist">
INSERT INTO tab_index_module_enterprise (
index_module_id,
enterprise_id,
status,
delete_flag,
create_time
) SELECT
#{indexModuleId},
#{enterpriseId},
#{status},
#{deleteFlag},
#{createTime}
FROM
DUAL
......@@ -132,7 +132,7 @@
</insert>
<update id="updateStatusByEnterpriseId">
update tab_index_module_enterprise
set status = 1
set delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<where>
<if test="indexModuleId != null ">
and index_module_id = #{indexModuleId}
......@@ -149,7 +149,7 @@
select
<include refid="Base_Column_List" />
from tab_index_module_enterprise
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="indexModuleId != null ">
and index_module_id = #{indexModuleId}
</if>
......
gic-platform-enterprise-service/src/main/resources/mapper/TabIndexModuleMapper.xml
......@@ -10,14 +10,14 @@
<result column="is_use" jdbcType="INTEGER" property="isUse" />
<result column="create_user_login_name" jdbcType="VARCHAR" property="createUserLoginName" />
<result column="object_type" jdbcType="INTEGER" property="objectType" />
<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="sort" jdbcType="DOUBLE" property="sort" />
</resultMap>
<sql id="Base_Column_List">
index_module_id, index_module_name, index_module_code, module_type, module_template_code,
is_use, create_user_login_name, object_type, status, create_time, update_time, sort
is_use, create_user_login_name, object_type, delete_flag, create_time, update_time, sort
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -29,12 +29,12 @@
<insert id="insert" parameterType="com.gic.enterprise.entity.TabIndexModule">
insert into tab_index_module (index_module_id, index_module_name, index_module_code,
module_type, module_template_code, is_use,
create_user_login_name, object_type, status,
create_user_login_name, object_type, delete_flag,
create_time, update_time, sort
)
values (#{indexModuleId,jdbcType=INTEGER}, #{indexModuleName,jdbcType=VARCHAR}, #{indexModuleCode,jdbcType=VARCHAR},
#{moduleType,jdbcType=INTEGER}, #{moduleTemplateCode,jdbcType=VARCHAR}, #{isUse,jdbcType=INTEGER},
#{createUserLoginName,jdbcType=VARCHAR}, #{objectType,jdbcType=INTEGER}, #{status,jdbcType=INTEGER},
#{createUserLoginName,jdbcType=VARCHAR}, #{objectType,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{sort,jdbcType=DOUBLE}
)
</insert>
......@@ -68,8 +68,8 @@
<if test="objectType != null">
object_type,
</if>
<if test="status != null">
status,
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="createTime != null">
create_time,
......@@ -106,8 +106,8 @@
<if test="objectType != null">
#{objectType,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},
......@@ -144,8 +144,8 @@
<if test="objectType != null">
object_type = #{objectType,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},
......@@ -168,7 +168,7 @@
is_use = #{isUse,jdbcType=INTEGER},
create_user_login_name = #{createUserLoginName,jdbcType=VARCHAR},
object_type = #{objectType,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
sort = #{sort,jdbcType=DOUBLE}
......@@ -178,7 +178,7 @@
select
<include refid="Base_Column_List" />
from tab_index_module
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="indexModuleName != null ">
and index_module_name = #{indexModuleName}
</if>
......@@ -190,26 +190,26 @@
select
min(sort)
from tab_index_module
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
</select>
<select id="getMaxSort" resultType="double">
select
max(sort)
from tab_index_module
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
</select>
<select id="listIndexModule" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_index_module
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
order by sort
</select>
<select id="listTwoElementExceptId" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_index_module
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
and index_module_id &lt;&gt; #{indexModuleId}
order by sort
limit #{start}, #{size}
......@@ -217,11 +217,11 @@
<select id="listIndexModuleEnterprise" resultMap="BaseResultMap">
select
t1.index_module_id, t1.index_module_name, t1.index_module_code, t1.module_type, t1.module_template_code,
t1.is_use, t1.object_type, t1.status, t1.create_time, t1.update_time, t1.sort
t1.is_use, t1.object_type, t1.delete_flag, t1.create_time, t1.update_time, t1.sort
from tab_index_module t1, tab_index_module_enterprise t2
where t1.index_module_id = t2.index_module_id
and t1.status = 1
and t2.status = 1
and t1.delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
and t2.delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
and t1.is_use = 1
and (
t1.object_type = 1 or ( t1.object_type = 2 and t2.enterprise_id = #{enterpriseId} )
......
gic-platform-enterprise-service/src/main/resources/mapper/TabLinkMapper.xml
......@@ -6,7 +6,7 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="parent_id" jdbcType="INTEGER" property="parentId" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
<result column="type" jdbcType="INTEGER" property="type" />
<result column="object_type" jdbcType="INTEGER" property="objectType" />
<result column="name" jdbcType="VARCHAR" property="name" />
......@@ -17,7 +17,7 @@
<result column="enterprise_type" jdbcType="INTEGER" property="enterpriseType" />
</resultMap>
<sql id="Base_Column_List">
link_id, create_time, update_time, parent_id, status, type, object_type, name, h5_content,
link_id, create_time, update_time, parent_id, delete_flag, type, object_type, name, h5_content,
applet_content, conditions, is_custom, enterprise_type
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
......@@ -29,12 +29,12 @@
<insert id="insert" parameterType="com.gic.enterprise.entity.TabLink">
insert into tab_link (link_id, create_time, update_time,
parent_id, status, type,
parent_id, delete_flag, type,
object_type, name, h5_content,
applet_content, conditions, is_custom,
enterprise_type)
values (#{linkId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{parentId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{type,jdbcType=INTEGER},
#{parentId,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER}, #{type,jdbcType=INTEGER},
#{objectType,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{h5Content,jdbcType=VARCHAR},
#{appletContent,jdbcType=VARCHAR}, #{conditions,jdbcType=INTEGER}, #{isCustom,jdbcType=INTEGER},
#{enterpriseType,jdbcType=INTEGER})
......@@ -54,8 +54,8 @@
<if test="parentId != null">
parent_id,
</if>
<if test="status != null">
status,
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="type != null">
type,
......@@ -95,8 +95,8 @@
<if test="parentId != null">
#{parentId,jdbcType=INTEGER},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=INTEGER},
</if>
<if test="type != null">
#{type,jdbcType=INTEGER},
......@@ -136,8 +136,8 @@
<if test="parentId != null">
parent_id = #{parentId,jdbcType=INTEGER},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
<if test="deleteFlag != null">
delete_flag = #{deleteFlag,jdbcType=INTEGER},
</if>
<if test="type != null">
type = #{type,jdbcType=INTEGER},
......@@ -171,7 +171,7 @@
set create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
parent_id = #{parentId,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
type = #{type,jdbcType=INTEGER},
object_type = #{objectType,jdbcType=INTEGER},
name = #{name,jdbcType=VARCHAR},
......@@ -186,7 +186,7 @@
select
<include refid="Base_Column_List" />
from tab_link
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="name != null ">
and name = #{name}
</if>
......@@ -199,7 +199,7 @@
select
link_id
from tab_link
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="null != ids and ids.size &gt; 0">
and parent_id in
<foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">
......@@ -211,7 +211,7 @@
select
<include refid="Base_Column_List" />
from tab_link
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="null != ids and ids.size &gt; 0">
and parent_id in
<foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">
......@@ -220,7 +220,7 @@
</if>
</select>
<update id="delLinkByIdList">
update tab_link set status = 0 where status = 1
update tab_link set delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@DELETE_STATUS} where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
and link_id in
<foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">
#{item}
......@@ -230,14 +230,14 @@
select
<include refid="Base_Column_List" />
from tab_link
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
and parent_id = 0
</select>
<select id="listLinkMenu" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_link
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
and parent_id &lt;&gt; 0
-- and type = 0
<if test="search != null and search != '' ">
......@@ -249,22 +249,22 @@
</select>
<select id="listByGic" resultMap="BaseResultMap">
select
t1.link_id, t1.create_time, t1.update_time, t1.parent_id, t1.status, t1.type, t1.object_type, t1.name, t1.h5_content,
t1.link_id, t1.create_time, t1.update_time, t1.parent_id, t1.delete_flag, t1.type, t1.object_type, t1.name, t1.h5_content,
t1.applet_content, t1.is_custom
from tab_link t1 left join tab_link_scene t2 on t1.link_id = t2.link_id
and t1.parent_id = #{parentId}
and (t1.enterprise_type = 1 or (t1.enterprise_type = 2 and t2.enterprise_id = #{enterpriseId} and t2.status = 1 ))
and t1.status = 1
and (t1.enterprise_type = 1 or (t1.enterprise_type = 2 and t2.enterprise_id = #{enterpriseId} and t2.delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS} ))
and t1.delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
</select>
<select id="treeByGic" resultMap="BaseResultMap">
select
t1.link_id, t1.create_time, t1.update_time, t1.parent_id, t1.status, t1.type, t1.object_type, t1.name, t1.h5_content,
t1.link_id, t1.create_time, t1.update_time, t1.parent_id, t1.delete_flag, t1.type, t1.object_type, t1.name, t1.h5_content,
t1.applet_content, t1.is_custom
from tab_link t1 left join (
select * from tab_link_scene where status = 1
select * from tab_link_scene where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
) t2 on t1.link_id = t2.link_id
where (t1.enterprise_type = 1 or (t1.enterprise_type = 2 and t2.enterprise_id = #{enterpriseId} ))
and t1.status = 1
and t1.delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="objectType != null ">
<if test="objectType == 1">
and h5_content is not null
......
gic-platform-enterprise-service/src/main/resources/mapper/TabLinkSceneMapper.xml
......@@ -7,10 +7,10 @@
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<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">
link_scene_id, link_id, enterprise_id, create_time, update_time, status
link_scene_id, link_id, enterprise_id, create_time, update_time, delete_flag
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -21,10 +21,10 @@
<insert id="insert" parameterType="com.gic.enterprise.entity.TabLinkScene">
insert into tab_link_scene (link_scene_id, link_id, enterprise_id,
create_time, update_time, status
create_time, update_time, delete_flag
)
values (#{linkSceneId,jdbcType=INTEGER}, #{linkId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=INTEGER}
)
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabLinkScene">
......@@ -45,8 +45,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=",">
......@@ -65,8 +65,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>
......@@ -85,8 +85,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 link_scene_id = #{linkSceneId,jdbcType=INTEGER}
......@@ -97,30 +97,30 @@
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
status = #{status,jdbcType=INTEGER}
delete_flag = #{deleteFlag,jdbcType=INTEGER}
where link_scene_id = #{linkSceneId,jdbcType=INTEGER}
</update>
<select id="listByLinkId" resultType="int">
select
enterprise_id
from tab_link_scene
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
and link_id = #{linkId}
</select>
<update id="delByLinkEnterprise">
update tab_link_scene set status = 0 where status = 1 and link_id = #{linkId}
update tab_link_scene set delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@DELETE_STATUS} where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS} and link_id = #{linkId}
</update>
<insert id="insertSelectiveByNotExist">
INSERT INTO tab_link_scene (
link_id,
enterprise_id,
create_time,
status
delete_flag
) SELECT
#{linkId},
#{enterpriseId},
#{createTime},
#{status}
#{deleteFlag}
FROM
DUAL
WHERE
......@@ -135,14 +135,14 @@
)
</insert>
<update id="updateStatusByEnterpriseId">
update tab_link_scene set status = 1 where link_id = #{linkId}
update tab_link_scene set delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS} where link_id = #{linkId}
and enterprise_id in
<foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</update>
<update id="delByLinkIdList">
update tab_link_scene set status = 0 where status = 1 and
update tab_link_scene set delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@DELETE_STATUS} where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS} and
link_id in
<foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
#{item}
......
gic-platform-enterprise-service/src/main/resources/mapper/TabPlatformBrandMapper.xml
......@@ -9,11 +9,11 @@
<result column="create_type" jdbcType="INTEGER" property="createType" />
<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">
platform_brand_id, platform_brand_category_code, platform_brand_category_name, platform_brand_name,
create_type, create_time, update_time, status
create_type, create_time, update_time, delete_flag
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -26,11 +26,11 @@
insert into tab_platform_brand (platform_brand_id, platform_brand_category_code,
platform_brand_category_name, platform_brand_name,
create_type, create_time, update_time,
status)
delete_flag)
values (#{platformBrandId,jdbcType=INTEGER}, #{platformBrandCategoryCode,jdbcType=VARCHAR},
#{platformBrandCategoryName,jdbcType=VARCHAR}, #{platformBrandName,jdbcType=VARCHAR},
#{createType,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{status,jdbcType=INTEGER})
#{deleteFlag,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabPlatformBrand">
<selectKey keyProperty="platformBrandId" order="AFTER" resultType="java.lang.Integer">
......@@ -59,8 +59,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=",">
......@@ -85,8 +85,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>
......@@ -111,8 +111,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 platform_brand_id = #{platformBrandId,jdbcType=INTEGER}
......@@ -125,7 +125,7 @@
create_type = #{createType,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
status = #{status,jdbcType=INTEGER}
delete_flag = #{deleteFlag,jdbcType=INTEGER}
where platform_brand_id = #{platformBrandId,jdbcType=INTEGER}
</update>
<select id="getByBrandName" resultMap="BaseResultMap">
......@@ -136,13 +136,13 @@
<if test="platformBrandId != null">
and platform_brand_id &lt;&gt; #{platformBrandId}
</if>
and status = 1
and delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
</select>
<select id="listPlatformBrand" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_platform_brand
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="createType != null ">
and create_type = #{createType}
</if>
......@@ -155,7 +155,7 @@
order by create_time desc
</select>
<update id="delBrandByIds">
update tab_platform_brand set status = 0 where status = 1
update tab_platform_brand set delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@DELETE_STATUS} where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="null != ids">
and platform_brand_id in
<foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">
......
gic-platform-enterprise-service/src/main/resources/mapper/TabPlatformBrandRefMapper.xml
......@@ -11,12 +11,12 @@
<result column="enterprise_brand_code" jdbcType="VARCHAR" property="enterpriseBrandCode" />
<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="type" jdbcType="INTEGER" property="type" />
</resultMap>
<sql id="Base_Column_List">
platform_brand_ref_id, platform_brand_id, enterprise_id, enterprise_brand_id, enterprise_brand_name,
goods_brand_name, enterprise_brand_code, create_time, update_time, status, type
goods_brand_name, enterprise_brand_code, create_time, update_time, delete_flag, type
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -29,12 +29,12 @@
insert into tab_platform_brand_ref (platform_brand_ref_id, platform_brand_id,
enterprise_id, enterprise_brand_id, enterprise_brand_name,
goods_brand_name, enterprise_brand_code, create_time,
update_time, status, type
update_time, delete_flag, type
)
values (#{platformBrandRefId,jdbcType=INTEGER}, #{platformBrandId,jdbcType=INTEGER},
#{enterpriseId,jdbcType=INTEGER}, #{enterpriseBrandId,jdbcType=BIGINT}, #{enterpriseBrandName,jdbcType=VARCHAR},
#{goodsBrandName,jdbcType=VARCHAR}, #{enterpriseBrandCode,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}
#{updateTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}
)
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabPlatformBrandRef">
......@@ -67,8 +67,8 @@
<if test="updateTime != null">
update_time,
</if>
<if test="status != null">
status,
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="type != null">
type,
......@@ -102,8 +102,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="type != null">
#{type,jdbcType=INTEGER},
......@@ -137,8 +137,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="type != null">
type = #{type,jdbcType=INTEGER},
......@@ -156,16 +156,16 @@
enterprise_brand_code = #{enterpriseBrandCode,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
status = #{status,jdbcType=INTEGER},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
type = #{type,jdbcType=INTEGER}
where platform_brand_ref_id = #{platformBrandRefId,jdbcType=INTEGER}
</update>
<select id="countByPlatformBrandId" resultType="java.lang.Integer">
select count(1) from tab_platform_brand_ref where platform_brand_id = #{platformBrandId} and status = 1
select count(1) from tab_platform_brand_ref where platform_brand_id = #{platformBrandId} and delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
</select>
<select id="countByPlatformBrandIds" resultType="java.util.HashMap">
select platform_brand_id platformBrandId , count(1) brandCount from tab_platform_brand_ref where
status = 1
delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="null != ids">
and platform_brand_id in
<foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">
......@@ -176,20 +176,20 @@
platform_brand_id
</select>
<update id="delRef">
update tab_platform_brand_ref set status = 0 where enterprise_id = #{enterpriseId} and enterprise_brand_id = #{enterpriseBrandId}
update tab_platform_brand_ref set delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@DELETE_STATUS} where enterprise_id = #{enterpriseId} and enterprise_brand_id = #{enterpriseBrandId}
</update>
<select id="listByPlatformBrandRef" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_platform_brand_ref
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="platformBrandId != null ">
and platform_brand_id = #{platformBrandId}
</if>
order by create_time desc
</select>
<update id="delRefs">
update tab_platform_brand_ref set status = 0 where enterprise_id = #{enterpriseId} and status = 1
update tab_platform_brand_ref set delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@DELETE_STATUS} where enterprise_id = #{enterpriseId} and delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="null != ids">
and enterprise_brand_id in
<foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">
......@@ -198,10 +198,10 @@
</if>
</update>
<update id="updateRef">
update tab_platform_brand_ref set platform_brand_id = #{toBrandId} where status = 1 and platform_brand_id = #{fromBrandId}
update tab_platform_brand_ref set platform_brand_id = #{toBrandId} where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS} and platform_brand_id = #{fromBrandId}
</update>
<update id="updateRefs">
update tab_platform_brand_ref set platform_brand_id = #{toBrandId} where status = 1
update tab_platform_brand_ref set platform_brand_id = #{toBrandId} where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="null != ids">
and platform_brand_id in
<foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">
......
gic-platform-enterprise-service/src/main/resources/mapper/TabProjectItemMapper.xml
......@@ -9,7 +9,7 @@
<result column="project_id" jdbcType="INTEGER" property="projectId" />
<result column="callback_url" jdbcType="VARCHAR" property="callbackUrl" />
<result column="use_status" jdbcType="INTEGER" property="useStatus" />
<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="is_platform" jdbcType="INTEGER" property="isPlatform" />
......@@ -19,7 +19,7 @@
</resultMap>
<sql id="Base_Column_List">
project_item_id, project_item_name, project_item_code, project_item_desc, project_id,
callback_url, use_status, status, create_time, update_time, is_platform, audit_expire_duration,
callback_url, use_status, delete_flag, create_time, update_time, is_platform, audit_expire_duration,
audit_template_type, sort
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
......@@ -32,12 +32,12 @@
<insert id="insert" parameterType="com.gic.enterprise.entity.TabProjectItem">
insert into tab_project_item (project_item_id, project_item_name, project_item_code,
project_item_desc, project_id, callback_url,
use_status, status, create_time,
use_status, delete_flag, create_time,
update_time, is_platform, audit_expire_duration,
audit_template_type, sort)
values (#{projectItemId,jdbcType=INTEGER}, #{projectItemName,jdbcType=VARCHAR}, #{projectItemCode,jdbcType=VARCHAR},
#{projectItemDesc,jdbcType=VARCHAR}, #{projectId,jdbcType=INTEGER}, #{callbackUrl,jdbcType=VARCHAR},
#{useStatus,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{useStatus,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{isPlatform,jdbcType=INTEGER}, #{auditExpireDuration,jdbcType=INTEGER},
#{auditTemplateType,jdbcType=INTEGER}, #{sort,jdbcType=DOUBLE})
</insert>
......@@ -68,8 +68,8 @@
<if test="useStatus != null">
use_status,
</if>
<if test="status != null">
status,
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="createTime != null">
create_time,
......@@ -112,8 +112,8 @@
<if test="useStatus != null">
#{useStatus,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},
......@@ -156,8 +156,8 @@
<if test="useStatus != null">
use_status = #{useStatus,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},
......@@ -188,7 +188,7 @@
project_id = #{projectId,jdbcType=INTEGER},
callback_url = #{callbackUrl,jdbcType=VARCHAR},
use_status = #{useStatus,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
is_platform = #{isPlatform,jdbcType=INTEGER},
......@@ -201,7 +201,7 @@
select
<include refid="Base_Column_List" />
from tab_project_item
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="projectItemName != null and projectItemName != '' ">
and project_item_name = #{projectItemName}
</if>
......@@ -220,7 +220,7 @@
select
<include refid="Base_Column_List" />
from tab_project_item
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="projectId != null ">
and project_id = #{projectId}
</if>
......@@ -239,7 +239,7 @@
select
project_id projectId, count(1) itemCount
from tab_project_item
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="useStatus != null ">
and use_status = #{useStatus}
</if>
......@@ -255,7 +255,7 @@
select
<include refid="Base_Column_List" />
from tab_project_item
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="projectItemCode != null ">
and project_item_code = #{projectItemCode}
</if>
......@@ -265,15 +265,15 @@
select
<include refid="Base_Column_List" />
from tab_project_item
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
and project_item_id &lt;&gt; #{projectItemId}
order by sort
limit #{start}, #{size}
</select>
<select id="getMinSort" resultType="java.lang.Double">
select sort from tab_project_item where status = 1 order by sort limit 1
select sort from tab_project_item where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS} order by sort limit 1
</select>
<select id="getMaxSort" resultType="java.lang.Double">
select sort from tab_project_item where status = 1 order by sort desc limit 1
select sort from tab_project_item where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS} order by sort desc limit 1
</select>
</mapper>
\ No newline at end of file
gic-platform-enterprise-service/src/main/resources/mapper/TabProjectMapper.xml
......@@ -4,13 +4,13 @@
<resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabProject">
<id column="project_id" jdbcType="INTEGER" property="projectId" />
<result column="project_name" jdbcType="VARCHAR" property="projectName" />
<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="sort" jdbcType="DOUBLE" property="sort" />
</resultMap>
<sql id="Base_Column_List">
project_id, project_name, status, create_time, update_time, sort
project_id, project_name, delete_flag, create_time, update_time, sort
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -20,10 +20,10 @@
</select>
<insert id="insert" parameterType="com.gic.enterprise.entity.TabProject">
insert into tab_project (project_id, project_name, status,
insert into tab_project (project_id, project_name, delete_flag,
create_time, update_time, sort
)
values (#{projectId,jdbcType=INTEGER}, #{projectName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
values (#{projectId,jdbcType=INTEGER}, #{projectName,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{sort,jdbcType=DOUBLE}
)
</insert>
......@@ -39,8 +39,8 @@
<if test="projectName != null">
project_name,
</if>
<if test="status != null">
status,
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="createTime != null">
create_time,
......@@ -59,8 +59,8 @@
<if test="projectName != null">
#{projectName,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},
......@@ -79,8 +79,8 @@
<if test="projectName != null">
project_name = #{projectName,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},
......@@ -97,7 +97,7 @@
<update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabProject">
update tab_project
set project_name = #{projectName,jdbcType=VARCHAR},
status = #{status,jdbcType=INTEGER},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
sort = #{sort,jdbcType=DOUBLE}
......@@ -107,7 +107,7 @@
select
<include refid="Base_Column_List" />
from tab_project
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="projectName != null and projectName != '' ">
and project_name = #{projectName}
</if>
......@@ -120,7 +120,7 @@
select
<include refid="Base_Column_List" />
from tab_project
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="projectName != null and projectName != '' ">
and project_name like concat('%', #{projectName}, '%')
</if>
......@@ -130,15 +130,15 @@
select
<include refid="Base_Column_List" />
from tab_project
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
and project_id &lt;&gt; #{projectId}
order by sort
limit #{start}, #{size}
</select>
<select id="getMinSort" resultType="java.lang.Double">
select sort from tab_project where status = 1 order by sort limit 1
select sort from tab_project where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS} order by sort limit 1
</select>
<select id="getMaxSort" resultType="java.lang.Double">
select sort from tab_project where status = 1 order by sort desc limit 1
select sort from tab_project where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS} order by sort desc limit 1
</select>
</mapper>
\ No newline at end of file
gic-platform-enterprise-service/src/main/resources/mapper/TabPushClassifyMapper.xml
......@@ -5,12 +5,12 @@
<id column="id" jdbcType="INTEGER" property="id" />
<result column="classify_name" jdbcType="VARCHAR" property="classifyName" />
<result column="classify_desc" jdbcType="VARCHAR" property="classifyDesc" />
<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">
id, classify_name, classify_desc, status, create_time, update_time
id, classify_name, classify_desc, delete_flag, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -21,10 +21,10 @@
<insert id="insert" parameterType="com.gic.enterprise.entity.TabPushClassify">
insert into tab_push_classify (id, classify_name, classify_desc,
status, create_time, update_time
delete_flag, create_time, update_time
)
values (#{id,jdbcType=INTEGER}, #{classifyName,jdbcType=VARCHAR}, #{classifyDesc,jdbcType=VARCHAR},
#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
#{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
)
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabPushClassify">
......@@ -39,8 +39,8 @@
<if test="classifyDesc != null">
classify_desc,
</if>
<if test="status != null">
status,
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="createTime != null">
create_time,
......@@ -59,8 +59,8 @@
<if test="classifyDesc != null">
#{classifyDesc,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},
......@@ -79,8 +79,8 @@
<if test="classifyDesc != null">
classify_desc = #{classifyDesc,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},
......@@ -95,7 +95,7 @@
update tab_push_classify
set classify_name = #{classifyName,jdbcType=VARCHAR},
classify_desc = #{classifyDesc,jdbcType=VARCHAR},
status = #{status,jdbcType=INTEGER},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=INTEGER}
......@@ -104,7 +104,7 @@
select
<include refid="Base_Column_List" />
from tab_push_classify
where status=1
where delete_flag=${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="search != null and search != ''">
and title like concat('%', #{search}, '%')
</if>
......@@ -113,7 +113,7 @@
select
<include refid="Base_Column_List" />
from tab_push_classify
where status=1
where delete_flag=${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
and classify_name=#{name}
</select>
</mapper>
\ No newline at end of file
gic-platform-enterprise-service/src/main/resources/mapper/TabPushMessageMapper.xml
......@@ -13,7 +13,7 @@
<result column="push_time" jdbcType="TIMESTAMP" property="pushTime" />
<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="creator" jdbcType="INTEGER" property="creator" />
<result column="creatorName" jdbcType="VARCHAR" property="creatorname" />
<result column="read_count" jdbcType="INTEGER" property="readCount" />
......@@ -30,7 +30,7 @@
</resultMap>
<sql id="Base_Column_List">
message_id, push_classify_id, title, content, push_type, sign, push_enterprise_ids,
push_time_flag, push_time, create_time, update_time, status, creator, creatorName,
push_time_flag, push_time, create_time, update_time, delete_flag, creator, creatorName,
read_count, push_status
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
......@@ -47,13 +47,13 @@
insert into tab_push_message (message_id, push_classify_id, title,
content, push_type, sign,
push_enterprise_ids, push_time_flag, push_time,
create_time, update_time, status,
create_time, update_time, delete_flag,
creator, creatorName, read_count,
push_status)
values (#{messageId,jdbcType=INTEGER}, #{pushClassifyId,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR},
#{content,jdbcType=VARCHAR}, #{pushType,jdbcType=INTEGER}, #{sign,jdbcType=INTEGER},
#{pushEnterpriseIds,jdbcType=VARCHAR}, #{pushTimeFlag,jdbcType=INTEGER}, #{pushTime,jdbcType=TIMESTAMP},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=INTEGER},
#{creator,jdbcType=INTEGER}, #{creatorname,jdbcType=VARCHAR}, #{readCount,jdbcType=INTEGER},
#{pushStatus,jdbcType=INTEGER})
</insert>
......@@ -96,8 +96,8 @@
<if test="updateTime != null">
update_time,
</if>
<if test="status != null">
status,
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="creator != null">
creator,
......@@ -146,8 +146,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="creator != null">
#{creator,jdbcType=INTEGER},
......@@ -196,8 +196,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="creator != null">
creator = #{creator,jdbcType=INTEGER},
......@@ -226,7 +226,7 @@
push_time = #{pushTime,jdbcType=TIMESTAMP},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
status = #{status,jdbcType=INTEGER},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
creator = #{creator,jdbcType=INTEGER},
creatorName = #{creatorname,jdbcType=VARCHAR},
read_count = #{readCount,jdbcType=INTEGER},
......@@ -237,7 +237,7 @@
select
<include refid="Base_Column_List" />
from tab_push_message
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="search != null and search != ''">
and (title like concat('%', #{search}, '%') or content like concat('%', #{search}, '%'))
</if>
......
gic-platform-enterprise-service/src/main/resources/mapper/TabPushUserMessageMapper.xml
......@@ -12,10 +12,11 @@
<result column="classify" jdbcType="VARCHAR" property="classify" />
<result column="title" jdbcType="VARCHAR" property="title" />
<result column="content" jdbcType="VARCHAR" property="content" />
<result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
</resultMap>
<sql id="Base_Column_List">
id, enterprise_id, user_id, message_id, create_time, update_time, status, classify,
title, content
title, content, delete_flag
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -28,11 +29,11 @@
insert into tab_push_user_message (id, enterprise_id, user_id,
message_id, create_time, update_time,
status, classify, title,
content)
content, delete_flag)
values (#{id,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER},
#{messageId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{status,jdbcType=INTEGER}, #{classify,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR},
#{content,jdbcType=VARCHAR})
#{content,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabPushUserMessage">
insert into tab_push_user_message
......@@ -67,6 +68,9 @@
<if test="content != null">
content,
</if>
<if test="deleteFlag != null">
delete_flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -99,6 +103,9 @@
<if test="content != null">
#{content,jdbcType=VARCHAR},
</if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=INTEGER},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabPushUserMessage">
......@@ -131,6 +138,9 @@
<if test="content != null">
content = #{content,jdbcType=VARCHAR},
</if>
<if test="deleteFlag != null">
delete_flag = #{deleteFlag,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -144,7 +154,8 @@
status = #{status,jdbcType=INTEGER},
classify = #{classify,jdbcType=VARCHAR},
title = #{title,jdbcType=VARCHAR},
content = #{content,jdbcType=VARCHAR}
content = #{content,jdbcType=VARCHAR},
delete_flag = #{deleteFlag,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
<update id="recallMessage">
......
gic-platform-enterprise-service/src/main/resources/mapper/TabQrcodeDownloadMapper.xml
......@@ -14,7 +14,7 @@
<result column="custom_params" jdbcType="VARCHAR" property="customParams" />
<result column="call_back_service" jdbcType="VARCHAR" property="callBackService" />
<result column="call_back_method" jdbcType="VARCHAR" property="callBackMethod" />
<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="file_id" jdbcType="VARCHAR" property="fileId" />
......@@ -22,7 +22,7 @@
</resultMap>
<sql id="Base_Column_List">
id, enterprise_id, h5, applet_ids, fwh_ids, scenes_value_ids, type, end_time, content,
custom_params, call_back_service, call_back_method, status, create_time, update_time,
custom_params, call_back_service, call_back_method, delete_flag, create_time, update_time,
file_id, qr_code_type
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
......@@ -40,13 +40,13 @@
applet_ids, fwh_ids, scenes_value_ids,
type, end_time, content,
custom_params, call_back_service, call_back_method,
status, create_time, update_time,
delete_flag, create_time, update_time,
file_id, qr_code_type)
values (#{id,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{h5,jdbcType=INTEGER},
#{appletIds,jdbcType=VARCHAR}, #{fwhIds,jdbcType=VARCHAR}, #{scenesValueIds,jdbcType=VARCHAR},
#{type,jdbcType=INTEGER}, #{endTime,jdbcType=TIMESTAMP}, #{content,jdbcType=VARCHAR},
#{customParams,jdbcType=VARCHAR}, #{callBackService,jdbcType=VARCHAR}, #{callBackMethod,jdbcType=VARCHAR},
#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{fileId,jdbcType=VARCHAR}, #{qrCodeType,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabQrcodeDownload">
......@@ -91,8 +91,8 @@
<if test="callBackMethod != null">
call_back_method,
</if>
<if test="status != null">
status,
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="createTime != null">
create_time,
......@@ -144,8 +144,8 @@
<if test="callBackMethod != null">
#{callBackMethod,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},
......@@ -197,8 +197,8 @@
<if test="callBackMethod != null">
call_back_method = #{callBackMethod,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},
......@@ -228,7 +228,7 @@
custom_params = #{customParams,jdbcType=VARCHAR},
call_back_service = #{callBackService,jdbcType=VARCHAR},
call_back_method = #{callBackMethod,jdbcType=VARCHAR},
status = #{status,jdbcType=INTEGER},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
file_id = #{fileId,jdbcType=VARCHAR},
......
gic-platform-enterprise-service/src/main/resources/mapper/TabQrcodeScenesClassifyMapper.xml
......@@ -7,10 +7,10 @@
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<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">
id, classify_name, enterprise_id, create_time, update_time, status
id, classify_name, enterprise_id, create_time, update_time, delete_flag
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -21,10 +21,10 @@
<insert id="insert" parameterType="com.gic.enterprise.entity.TabQrcodeScenesClassify">
insert into tab_qrcode_scenes_classify (id, classify_name, enterprise_id,
create_time, update_time, status
create_time, update_time, delete_flag
)
values (#{id,jdbcType=INTEGER}, #{classifyName,jdbcType=VARCHAR}, #{enterpriseId,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=INTEGER}
)
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabQrcodeScenesClassify">
......@@ -45,8 +45,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=",">
......@@ -65,8 +65,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>
......@@ -85,8 +85,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 id = #{id,jdbcType=INTEGER}
......@@ -97,7 +97,7 @@
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
status = #{status,jdbcType=INTEGER}
delete_flag = #{deleteFlag,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
<select id="listQrCodeScenesClassify" resultMap="BaseResultMap">
......@@ -106,7 +106,7 @@
from tab_qrcode_scenes_classify
where (enterprise_id = #{enterpriseId,jdbcType=INTEGER} or enterprise_id=-1)
<if test="search != null and search != ''">
and classify_name like concat('%',#{search}, '%') and status=1
and classify_name like concat('%',#{search}, '%') and delete_flag=${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
</if>
order by enterprise_id asc,update_time desc
</select>
......@@ -116,7 +116,7 @@
from tab_qrcode_scenes_classify
where (enterprise_id = #{enterpriseId,jdbcType=INTEGER} or enterprise_id=-1)
and classify_name =#{name}
and status=1
and delete_flag=${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
order by enterprise_id asc,update_time desc
</select>
</mapper>
\ No newline at end of file
gic-platform-enterprise-service/src/main/resources/mapper/TabQrcodeScenesMapper.xml
......@@ -10,13 +10,14 @@
<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>
<resultMap id="DTOResultMap" type="com.gic.enterprise.dto.QrcodeScenesDTO" extends="BaseResultMap">
<result column="classify_name" jdbcType="VARCHAR" property="scenesClassifyName" />
</resultMap>
<sql id="Base_Column_List">
scenes_id, enterprise_id, scenes_name, scenes_classify_id, scenes_desc, create_time,
update_time, status
update_time, status, delete_flag
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -28,10 +29,10 @@
<insert id="insert" parameterType="com.gic.enterprise.entity.TabQrcodeScenes">
insert into tab_qrcode_scenes (scenes_id, enterprise_id, scenes_name,
scenes_classify_id, scenes_desc, create_time,
update_time, status)
update_time, status, delete_flag)
values (#{scenesId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{scenesName,jdbcType=VARCHAR},
#{scenesClassifyId,jdbcType=INTEGER}, #{scenesDesc,jdbcType=VARCHAR}, #{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.enterprise.entity.TabQrcodeScenes">
insert into tab_qrcode_scenes
......@@ -60,6 +61,9 @@
<if test="status != null">
status,
</if>
<if test="deleteFlag != null">
delete_flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="scenesId != null">
......@@ -86,6 +90,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.enterprise.entity.TabQrcodeScenes">
......@@ -112,6 +119,9 @@
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
<if test="deleteFlag != null">
delete_flag = #{deleteFlag,jdbcType=INTEGER},
</if>
</set>
where scenes_id = #{scenesId,jdbcType=INTEGER}
</update>
......@@ -123,7 +133,8 @@
scenes_desc = #{scenesDesc,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
status = #{status,jdbcType=INTEGER}
status = #{status,jdbcType=INTEGER},
delete_flag = #{deleteFlag,jdbcType=INTEGER}
where scenes_id = #{scenesId,jdbcType=INTEGER}
</update>
<select id="listQrCodeScenes" resultMap="DTOResultMap">
......@@ -145,6 +156,7 @@
update tab_qrcode_scenes
set status = #{status,jdbcType=INTEGER}
where scenes_id = #{scenesId,jdbcType=INTEGER}
and delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
</update>
<select id="listQrcodeScenesByName" resultMap="BaseResultMap">
select
......@@ -154,6 +166,7 @@
<if test="name != null and name != ''">
and scenes_name = #{name}
</if>
and delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
order by update_time desc
</select>
</mapper>
\ No newline at end of file
gic-platform-enterprise-service/src/main/resources/mapper/TabQrcodeScenesValueMapper.xml
......@@ -7,12 +7,12 @@
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="code" jdbcType="VARCHAR" property="code" />
<result column="name" jdbcType="VARCHAR" property="name" />
<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">
value_id, scenes_id, enterprise_id, code, name, status, create_time, update_time
value_id, scenes_id, enterprise_id, code, name, delete_flag, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -23,10 +23,10 @@
<insert id="insert" parameterType="com.gic.enterprise.entity.TabQrcodeScenesValue">
insert into tab_qrcode_scenes_value (value_id, scenes_id, enterprise_id,
code, name, status,
code, name, delete_flag,
create_time, update_time)
values (#{valueId,jdbcType=INTEGER}, #{scenesId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER},
#{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
#{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabQrcodeScenesValue">
......@@ -47,8 +47,8 @@
<if test="name != null">
name,
</if>
<if test="status != null">
status,
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="createTime != null">
create_time,
......@@ -73,8 +73,8 @@
<if test="name != null">
#{name,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},
......@@ -99,8 +99,8 @@
<if test="name != null">
name = #{name,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},
......@@ -117,7 +117,7 @@
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
code = #{code,jdbcType=VARCHAR},
name = #{name,jdbcType=VARCHAR},
status = #{status,jdbcType=INTEGER},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where value_id = #{valueId,jdbcType=INTEGER}
......@@ -127,7 +127,7 @@
<include refid="Base_Column_List" />
from tab_qrcode_scenes_value
where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
and status = 1
and delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="scenesId != null">
and scenes_id = #{scenesId,jdbcType=INTEGER}
</if>
......
gic-platform-enterprise-service/src/main/resources/mapper/TabRiskModeMapper.xml
......@@ -10,13 +10,13 @@
<result column="duration_code" jdbcType="INTEGER" property="durationCode" />
<result column="audit_result" jdbcType="INTEGER" property="auditResult" />
<result column="audit_reason" jdbcType="VARCHAR" property="auditReason" />
<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">
risk_mode_id, enterprise_id, apply_user_id, apply_time, apply_reason, duration_code,
audit_result, audit_reason, status, create_time, update_time
audit_result, audit_reason, delete_flag, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -28,11 +28,11 @@
<insert id="insert" parameterType="com.gic.enterprise.entity.TabRiskMode">
insert into tab_risk_mode (risk_mode_id, enterprise_id, apply_user_id,
apply_time, apply_reason, duration_code,
audit_result, audit_reason, status,
audit_result, audit_reason, delete_flag,
create_time, update_time)
values (#{riskModeId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{applyUserId,jdbcType=INTEGER},
#{applyTime,jdbcType=TIMESTAMP}, #{applyReason,jdbcType=VARCHAR}, #{durationCode,jdbcType=INTEGER},
#{auditResult,jdbcType=INTEGER}, #{auditReason,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
#{auditResult,jdbcType=INTEGER}, #{auditReason,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabRiskMode">
......@@ -65,8 +65,8 @@
<if test="auditReason != null">
audit_reason,
</if>
<if test="status != null">
status,
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="createTime != null">
create_time,
......@@ -100,8 +100,8 @@
<if test="auditReason != null">
#{auditReason,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 +135,8 @@
<if test="auditReason != null">
audit_reason = #{auditReason,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 +156,7 @@
duration_code = #{durationCode,jdbcType=INTEGER},
audit_result = #{auditResult,jdbcType=INTEGER},
audit_reason = #{auditReason,jdbcType=VARCHAR},
status = #{status,jdbcType=INTEGER},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where risk_mode_id = #{riskModeId,jdbcType=INTEGER}
......@@ -165,7 +165,7 @@
select
<include refid="Base_Column_List" />
from tab_risk_mode
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="enterpriseId != null ">
and enterprise_id = #{enterpriseId}
</if>
......
gic-platform-enterprise-service/src/main/resources/mapper/TabTodoItemMapper.xml
......@@ -11,12 +11,12 @@
<result column="finish_time" jdbcType="TIMESTAMP" property="finishTime" />
<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="item_info_url" jdbcType="VARCHAR" property="itemInfoUrl" />
</resultMap>
<sql id="Base_Column_List">
todo_item_id, enterprise_id, user_id, item_content, finish, item_type, finish_time,
create_time, update_time, status, item_info_url
create_time, update_time, delete_flag, item_info_url
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -29,11 +29,11 @@
insert into tab_todo_item (todo_item_id, enterprise_id, user_id,
item_content, finish, item_type,
finish_time, create_time, update_time,
status, item_info_url)
delete_flag, item_info_url)
values (#{todoItemId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER},
#{itemContent,jdbcType=VARCHAR}, #{finish,jdbcType=INTEGER}, #{itemType,jdbcType=VARCHAR},
#{finishTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{status,jdbcType=INTEGER}, #{itemInfoUrl,jdbcType=VARCHAR})
#{deleteFlag,jdbcType=INTEGER}, #{itemInfoUrl,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabTodoItem">
insert into tab_todo_item
......@@ -65,8 +65,8 @@
<if test="updateTime != null">
update_time,
</if>
<if test="status != null">
status,
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="itemInfoUrl != null">
item_info_url,
......@@ -100,8 +100,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="itemInfoUrl != null">
#{itemInfoUrl,jdbcType=VARCHAR},
......@@ -135,8 +135,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="itemInfoUrl != null">
item_info_url = #{itemInfoUrl,jdbcType=VARCHAR},
......@@ -154,7 +154,7 @@
finish_time = #{finishTime,jdbcType=TIMESTAMP},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
status = #{status,jdbcType=INTEGER},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
item_info_url = #{itemInfoUrl,jdbcType=VARCHAR}
where todo_item_id = #{todoItemId,jdbcType=INTEGER}
</update>
......@@ -162,7 +162,7 @@
select
<include refid="Base_Column_List" />
from tab_todo_item
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="enterpriseId != null ">
and enterprise_id = #{enterpriseId}
</if>
......@@ -180,7 +180,7 @@
<update id="finishTodoItem">
update tab_todo_item
set finish = 1, finish_time = now()
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="enterpriseId != null ">
and enterprise_id = #{enterpriseId}
</if>
......@@ -198,7 +198,7 @@
select
<include refid="Base_Column_List" />
from tab_todo_item
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="enterpriseId != null ">
and enterprise_id = #{enterpriseId}
</if>
......@@ -226,7 +226,7 @@
select
count(1)
from tab_todo_item
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
and finish = 0
<if test="enterpriseId != null ">
and enterprise_id = #{enterpriseId}
......
gic-platform-enterprise-service/src/main/resources/mapper/TabWmMemberCardConfigMapper.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gic.enterprise.dao.mapper.TabWmMemberCardConfigMapper">
<resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabWmMemberCardConfig">
<id column="member_card_config_id" jdbcType="INTEGER" property="memberCardConfigId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="wm_main_account" jdbcType="VARCHAR" property="wmMainAccount" />
<result column="open_card_mode" jdbcType="INTEGER" property="openCardMode" />
<result column="gic_member_to_wm" jdbcType="INTEGER" property="gicMemberToWm" />
<result column="wm_member_clerk_to_gic" jdbcType="INTEGER" property="wmMemberClerkToGic" />
<result column="wm_member_to_gic" jdbcType="INTEGER" property="wmMemberToGic" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
member_card_config_id, enterprise_id, wm_main_account, open_card_mode, gic_member_to_wm,
wm_member_clerk_to_gic, wm_member_to_gic, status, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_wm_member_card_config
where member_card_config_id = #{memberCardConfigId,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from tab_wm_member_card_config
where member_card_config_id = #{memberCardConfigId,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.gic.enterprise.entity.TabWmMemberCardConfig" useGeneratedKeys="true" keyProperty="memberCardConfigId">
insert into tab_wm_member_card_config (member_card_config_id, enterprise_id,
wm_main_account, open_card_mode, gic_member_to_wm,
wm_member_clerk_to_gic, wm_member_to_gic, status,
create_time, update_time)
values (#{memberCardConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER},
#{wmMainAccount,jdbcType=VARCHAR}, #{openCardMode,jdbcType=INTEGER}, #{gicMemberToWm,jdbcType=INTEGER},
#{wmMemberClerkToGic,jdbcType=INTEGER}, #{wmMemberToGic,jdbcType=INTEGER}, #{status,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabWmMemberCardConfig">
insert into tab_wm_member_card_config
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="memberCardConfigId != null">
member_card_config_id,
</if>
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="wmMainAccount != null">
wm_main_account,
</if>
<if test="openCardMode != null">
open_card_mode,
</if>
<if test="gicMemberToWm != null">
gic_member_to_wm,
</if>
<if test="wmMemberClerkToGic != null">
wm_member_clerk_to_gic,
</if>
<if test="wmMemberToGic != null">
wm_member_to_gic,
</if>
<if test="status != null">
status,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="memberCardConfigId != null">
#{memberCardConfigId,jdbcType=INTEGER},
</if>
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=INTEGER},
</if>
<if test="wmMainAccount != null">
#{wmMainAccount,jdbcType=VARCHAR},
</if>
<if test="openCardMode != null">
#{openCardMode,jdbcType=INTEGER},
</if>
<if test="gicMemberToWm != null">
#{gicMemberToWm,jdbcType=INTEGER},
</if>
<if test="wmMemberClerkToGic != null">
#{wmMemberClerkToGic,jdbcType=INTEGER},
</if>
<if test="wmMemberToGic != null">
#{wmMemberToGic,jdbcType=INTEGER},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabWmMemberCardConfig">
update tab_wm_member_card_config
<set>
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
<if test="wmMainAccount != null">
wm_main_account = #{wmMainAccount,jdbcType=VARCHAR},
</if>
<if test="openCardMode != null">
open_card_mode = #{openCardMode,jdbcType=INTEGER},
</if>
<if test="gicMemberToWm != null">
gic_member_to_wm = #{gicMemberToWm,jdbcType=INTEGER},
</if>
<if test="wmMemberClerkToGic != null">
wm_member_clerk_to_gic = #{wmMemberClerkToGic,jdbcType=INTEGER},
</if>
<if test="wmMemberToGic != null">
wm_member_to_gic = #{wmMemberToGic,jdbcType=INTEGER},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where member_card_config_id = #{memberCardConfigId,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabWmMemberCardConfig">
update tab_wm_member_card_config
set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
wm_main_account = #{wmMainAccount,jdbcType=VARCHAR},
open_card_mode = #{openCardMode,jdbcType=INTEGER},
gic_member_to_wm = #{gicMemberToWm,jdbcType=INTEGER},
wm_member_clerk_to_gic = #{wmMemberClerkToGic,jdbcType=INTEGER},
wm_member_to_gic = #{wmMemberToGic,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where member_card_config_id = #{memberCardConfigId,jdbcType=INTEGER}
</update>
<select id="getByWmMainAccount" resultMap="BaseResultMap">
select <include refid="Base_Column_List"></include>
from tab_wm_member_card_config
where wm_main_account = #{wmMainAccount}
and status = 1
</select>
</mapper>
\ No newline at end of file
gic-platform-enterprise-service/src/main/resources/mapper/TabWmOrderConfigMapper.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gic.enterprise.dao.mapper.TabWmOrderConfigMapper">
<resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabWmOrderConfig">
<id column="order_config_id" jdbcType="INTEGER" property="orderConfigId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="wm_main_account" jdbcType="VARCHAR" property="wmMainAccount" />
<result column="wm_order_to_offline" jdbcType="INTEGER" property="wmOrderToOffline" />
<result column="offline_differentiate_wm" jdbcType="INTEGER" property="offlineDifferentiateWm" />
<result column="order_from_mode" jdbcType="INTEGER" property="orderFromMode" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
order_config_id, enterprise_id, wm_main_account, wm_order_to_offline, offline_differentiate_wm,
order_from_mode, status, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_wm_order_config
where order_config_id = #{orderConfigId,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from tab_wm_order_config
where order_config_id = #{orderConfigId,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.gic.enterprise.entity.TabWmOrderConfig" useGeneratedKeys="true" keyProperty="orderConfigId">
insert into tab_wm_order_config (order_config_id, enterprise_id, wm_main_account,
wm_order_to_offline, offline_differentiate_wm,
order_from_mode, status, create_time,
update_time)
values (#{orderConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{wmMainAccount,jdbcType=VARCHAR},
#{wmOrderToOffline,jdbcType=INTEGER}, #{offlineDifferentiateWm,jdbcType=INTEGER},
#{orderFromMode,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabWmOrderConfig">
insert into tab_wm_order_config
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="orderConfigId != null">
order_config_id,
</if>
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="wmMainAccount != null">
wm_main_account,
</if>
<if test="wmOrderToOffline != null">
wm_order_to_offline,
</if>
<if test="offlineDifferentiateWm != null">
offline_differentiate_wm,
</if>
<if test="orderFromMode != null">
order_from_mode,
</if>
<if test="status != null">
status,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderConfigId != null">
#{orderConfigId,jdbcType=INTEGER},
</if>
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=INTEGER},
</if>
<if test="wmMainAccount != null">
#{wmMainAccount,jdbcType=VARCHAR},
</if>
<if test="wmOrderToOffline != null">
#{wmOrderToOffline,jdbcType=INTEGER},
</if>
<if test="offlineDifferentiateWm != null">
#{offlineDifferentiateWm,jdbcType=INTEGER},
</if>
<if test="orderFromMode != null">
#{orderFromMode,jdbcType=INTEGER},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabWmOrderConfig">
update tab_wm_order_config
<set>
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
<if test="wmMainAccount != null">
wm_main_account = #{wmMainAccount,jdbcType=VARCHAR},
</if>
<if test="wmOrderToOffline != null">
wm_order_to_offline = #{wmOrderToOffline,jdbcType=INTEGER},
</if>
<if test="offlineDifferentiateWm != null">
offline_differentiate_wm = #{offlineDifferentiateWm,jdbcType=INTEGER},
</if>
<if test="orderFromMode != null">
order_from_mode = #{orderFromMode,jdbcType=INTEGER},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where order_config_id = #{orderConfigId,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabWmOrderConfig">
update tab_wm_order_config
set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
wm_main_account = #{wmMainAccount,jdbcType=VARCHAR},
wm_order_to_offline = #{wmOrderToOffline,jdbcType=INTEGER},
offline_differentiate_wm = #{offlineDifferentiateWm,jdbcType=INTEGER},
order_from_mode = #{orderFromMode,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where order_config_id = #{orderConfigId,jdbcType=INTEGER}
</update>
<select id="getByWmMainAccount" resultMap="BaseResultMap">
select <include refid="Base_Column_List"></include>
FROM tab_wm_order_config
where status = 1
and wm_main_account = #{wmMainAccount}
</select>
</mapper>
\ No newline at end of file
gic-platform-enterprise-service/src/main/resources/mapper/TabWmStoreConfigMapper.xml
......@@ -7,13 +7,13 @@
<result column="wm_mall_store_id" jdbcType="INTEGER" property="wmMallStoreId" />
<result column="store_config_type" jdbcType="INTEGER" property="storeConfigType" />
<result column="store_config_json" jdbcType="VARCHAR" property="storeConfigJson" />
<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">
store_config_id, enterprise_id, wm_mall_store_id, store_config_type, store_config_json,
status, create_time, update_time
delete_flag, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -24,10 +24,10 @@
<insert id="insert" parameterType="com.gic.enterprise.entity.TabWmStoreConfig" useGeneratedKeys="true" keyProperty="storeConfigId">
insert into tab_wm_store_config (store_config_id, enterprise_id, wm_mall_store_id,
store_config_type, store_config_json, status,
store_config_type, store_config_json, delete_flag,
create_time, update_time)
values (#{storeConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{wmMallStoreId,jdbcType=INTEGER},
#{storeConfigType,jdbcType=INTEGER}, #{storeConfigJson,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
#{storeConfigType,jdbcType=INTEGER}, #{storeConfigJson,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabWmStoreConfig">
......@@ -48,8 +48,8 @@
<if test="storeConfigJson != null">
store_config_json,
</if>
<if test="status != null">
status,
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="createTime != null">
create_time,
......@@ -74,8 +74,8 @@
<if test="storeConfigJson != null">
#{storeConfigJson,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},
......@@ -100,8 +100,8 @@
<if test="storeConfigJson != null">
store_config_json = #{storeConfigJson,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},
......@@ -118,7 +118,7 @@
wm_mall_store_id = #{wmMallStoreId,jdbcType=INTEGER},
store_config_type = #{storeConfigType,jdbcType=INTEGER},
store_config_json = #{storeConfigJson,jdbcType=VARCHAR},
status = #{status,jdbcType=INTEGER},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where store_config_id = #{storeConfigId,jdbcType=INTEGER}
......@@ -128,7 +128,7 @@
select <include refid="Base_Column_List"></include>
from tab_wm_store_config
where wm_mall_store_id = #{wmMallStoreId}
and status = 1
and delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
and store_config_type = #{storeConfigType}
</select>
......@@ -136,7 +136,7 @@
select <include refid="Base_Column_List"></include>
from tab_wm_store_config
where wm_mall_store_id = #{wmMallStoreId}
and status = 1
and delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
order by store_config_type
</select>
</mapper>
\ No newline at end of file
gic-platform-enterprise-service/src/main/resources/mapper/TabWmStoreCouponConfigMapper.xml
......@@ -10,13 +10,13 @@
<result column="wm_coupon_id" jdbcType="VARCHAR" property="wmCouponId" />
<result column="wm_coupon_name" jdbcType="VARCHAR" property="wmCouponName" />
<result column="gic_coupon_expire" jdbcType="TIMESTAMP" property="gicCouponExpire" />
<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">
coupon_config_id, enterprise_id, wm_mall_store_id, gic_coupon_id, gic_coupon_name, wm_coupon_id, wm_coupon_name, gic_coupon_expire,
status, create_time, update_time
delete_flag, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -28,12 +28,12 @@
<insert id="insert" parameterType="com.gic.enterprise.entity.TabWmStoreCouponConfig">
insert into tab_wm_store_coupon_config (coupon_config_id, enterprise_id, wm_mall_store_id,
gic_coupon_id, gic_coupon_name, wm_coupon_id, wm_coupon_name, gic_coupon_expire,
status, create_time, update_time
delete_flag, create_time, update_time
)
values (#{couponConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{wmMallStoreId,jdbcType=INTEGER},
#{gicCouponId,jdbcType=VARCHAR}, #{gicCouponName,jdbcType=VARCHAR}, #{wmCouponId,jdbcType=VARCHAR},
#{wmCouponName,jdbcType=VARCHAR}, #{gicCouponExpire,jdbcType=TIMESTAMP},
#{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.enterprise.entity.TabWmStoreCouponConfig">
......@@ -63,8 +63,8 @@
<if test="gicCouponExpire != null">
gic_coupon_expire,
</if>
<if test="status != null">
status,
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="createTime != null">
create_time,
......@@ -98,8 +98,8 @@
<if test="gicCouponExpire != null">
#{gicCouponExpire,jdbcType=TIMESTAMP},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
......@@ -133,8 +133,8 @@
<if test="gicCouponExpire != null">
gic_coupon_expire = #{gicCouponExpire,jdbcType=TIMESTAMP},
</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},
......@@ -154,7 +154,7 @@
wm_coupon_id = #{wmCouponId,jdbcType=VARCHAR},
wm_coupon_name = #{wmCouponName,jdbcType=VARCHAR},
gic_coupon_expire = #{gicCouponExpire,jdbcType=TIMESTAMP},
status = #{status,jdbcType=INTEGER},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where coupon_config_id = #{couponConfigId,jdbcType=INTEGER}
......@@ -164,7 +164,7 @@
select <include refid="Base_Column_List"></include>
from tab_wm_store_coupon_config
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="wmMallStoreId != null and wmMallStoreId != '' ">
and wm_mall_store_id = #{wmMallStoreId}
</if>
......@@ -195,10 +195,10 @@
</select>
<update id="deleteWmGicCoupon">
update tab_wm_store_coupon_config set status = 0
update tab_wm_store_coupon_config set delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@DELETE_STATUS}
where gic_coupon_id = #{gicCouponId}
and status = 1
and delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
</update>
</mapper>
\ No newline at end of file
gic-platform-enterprise-service/src/main/resources/mapper/TabWmStoreMapper.xml
......@@ -13,13 +13,13 @@
<result column="mall_mode" jdbcType="INTEGER" property="mallMode" />
<result column="store_brand_id" jdbcType="INTEGER" property="storeBrandId" />
<result column="auth_status" jdbcType="INTEGER" property="authStatus" />
<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">
wm_mall_store_id, enterprise_id, wm_main_account, wm_pid, wm_store_id, wm_pid_name, member_wechat, wm_appid,
mall_mode, store_brand_id, auth_status, status, create_time, update_time
mall_mode, store_brand_id, auth_status, delete_flag, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -32,12 +32,12 @@
insert into tab_wm_store (wm_mall_store_id, enterprise_id, wm_main_account,
wm_pid, wm_store_id, wm_pid_name, member_wechat, wm_appid,
mall_mode, store_brand_id, auth_status,
status, create_time, update_time
delete_flag, create_time, update_time
)
values (#{wmMallStoreId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{wmMainAccount,jdbcType=VARCHAR},
#{wmPid,jdbcType=VARCHAR}, #{wmStoreId,jdbcType=VARCHAR}, #{wmPidName,jdbcType=VARCHAR}, #{memberWechat,jdbcType=VARCHAR}, #{wmAppid,jdbcType=VARCHAR},
#{mallMode,jdbcType=INTEGER}, #{storeBrandId,jdbcType=INTEGER}, #{authStatus,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.enterprise.entity.TabWmStore" useGeneratedKeys="true" keyProperty="wmMallStoreId">
......@@ -76,8 +76,8 @@
<if test="authStatus != null">
auth_status,
</if>
<if test="status != null">
status,
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="createTime != null">
create_time,
......@@ -120,8 +120,8 @@
<if test="authStatus != null">
#{authStatus,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},
......@@ -164,8 +164,8 @@
<if test="authStatus != null">
auth_status = #{authStatus,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},
......@@ -188,7 +188,7 @@
mall_mode = #{mallMode,jdbcType=INTEGER},
store_brand_id = #{storeBrandId,jdbcType=INTEGER},
auth_status = #{authStatus,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where wm_mall_store_id = #{wmMallStoreId,jdbcType=INTEGER}
......@@ -197,7 +197,7 @@
<select id="countByParam" resultType="int">
select count(1)
from tab_wm_store
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="dataType == 1">
and wm_main_account = #{data}
......@@ -216,7 +216,7 @@
<select id="countByStoreName" resultType="int">
select count(1)
from tab_wm_store
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="enterpriseId != null">
and enterprise_id = #{enterpriseId}
......@@ -232,7 +232,7 @@
<include refid="Base_Column_List"></include>
from tab_wm_store
where enterprise_id = #{enterpriseId}
and status = 1
and delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="appId != null and appId != '' ">
and wm_appid = #{appId}
</if>
......@@ -249,7 +249,7 @@
<include refid="Base_Column_List"></include>
from tab_wm_store
where wm_main_account = #{wmMainAccount}
and status = 1
and delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
</select>
<select id="getByWmStoreId" resultMap="BaseResultMap">
......@@ -257,7 +257,7 @@
<include refid="Base_Column_List"></include>
from tab_wm_store
where wm_store_id = #{wmStoreId}
and status = 1
and delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
limit 1
</select>
</mapper>
\ No newline at end of file
gic-platform-enterprise-service/src/main/resources/mapper/TabWmStoreSyncLogMapper.xml
......@@ -9,12 +9,12 @@
<result column="store_type" jdbcType="INTEGER" property="storeType" />
<result column="store_name" jdbcType="VARCHAR" property="storeName" />
<result column="store_code" jdbcType="VARCHAR" property="storeCode" />
<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">
id, enterprise_id, wm_mall_store_id, store_id, store_type, store_name, store_code, status,
id, enterprise_id, wm_mall_store_id, store_id, store_type, store_name, store_code, delete_flag,
create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
......@@ -27,11 +27,11 @@
<insert id="insert" parameterType="com.gic.enterprise.entity.TabWmStoreSyncLog">
insert into tab_wm_store_sync_log (id, enterprise_id, wm_mall_store_id,
store_id, store_type, store_name,
store_code, status, create_time,
store_code, delete_flag, create_time,
update_time)
values (#{id,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{wmMallStoreId,jdbcType=INTEGER},
#{storeId,jdbcType=INTEGER}, #{storeType,jdbcType=INTEGER}, #{storeName,jdbcType=VARCHAR},
#{storeCode,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{storeCode,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabWmStoreSyncLog">
......@@ -58,8 +58,8 @@
<if test="storeCode != null">
store_code,
</if>
<if test="status != null">
status,
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="createTime != null">
create_time,
......@@ -90,8 +90,8 @@
<if test="storeCode != null">
#{storeCode,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 +122,8 @@
<if test="storeCode != null">
store_code = #{storeCode,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},
......@@ -142,7 +142,7 @@
store_type = #{storeType,jdbcType=INTEGER},
store_name = #{storeName,jdbcType=VARCHAR},
store_code = #{storeCode,jdbcType=VARCHAR},
status = #{status,jdbcType=INTEGER},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=INTEGER}
......@@ -152,7 +152,7 @@
select <include refid="Base_Column_List"></include>
from tab_wm_store_sync_log
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
<if test="type != null">
and store_type = #{type}
</if>
......@@ -165,7 +165,7 @@
<select id="getStoreList" resultMap="BaseResultMap">
select <include refid="Base_Column_List"></include>
from tab_wm_store_sync_log
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
and wm_mall_store_id = #{wmMallStoreId}
<if test="typeList != null and typeList.size() > 0">
and store_type in
......@@ -176,8 +176,8 @@
</select>
<update id="deleteLogic">
update tab_wm_store_sync_log set status = 0
where status = 1
update tab_wm_store_sync_log set delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@DELETE_STATUS}
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
and wm_mall_store_id = #{wmMallStoreId}
and store_id = #{storeId}
</update>
......@@ -185,7 +185,7 @@
<select id="listByStoreId" resultMap="BaseResultMap">
select <include refid="Base_Column_List"></include>
from tab_wm_store_sync_log
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
and store_id = #{storeId}
and enterprise_id = #{enterpriseId}
group by wm_mall_store_id
......@@ -194,7 +194,7 @@
<select id="listByStoreIdList" resultMap="BaseResultMap">
select <include refid="Base_Column_List"></include>
from tab_wm_store_sync_log
where status = 1
where delete_flag = ${@com.gic.enterprise.constant.DeleteFlagConstants@NORMAL_STATUS}
and store_id in
<foreach collection="storeIdList" index="index" item="item" open="(" separator="," close=")">
#{item}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment