Skip to content

H
haoban-manage3.0
Commit 4e91250b by qwmqiuwenmin
Options

Merge branch 'developer' into 'master' 

Developer

See merge request !67
parents 860ea4b6 b6be7124
Showing with 4273 additions and 30 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/ApplicationEnterpriseRelatedDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto;
import java.io.Serializable;
import java.util.Date;
public class ApplicationEnterpriseRelatedDTO implements Serializable{
private String templateEnterpriseRelationId;
private String wxEnterpriseId;
private String applicationTemplateId;
private String wxEnterpriseName;
private Integer statusFlag;
private Date createTime;
private Date updateTime;
private static final long serialVersionUID = 1L;
public String getTemplateEnterpriseRelationId() {
return templateEnterpriseRelationId;
}
public void setTemplateEnterpriseRelationId(String templateEnterpriseRelationId) {
this.templateEnterpriseRelationId = templateEnterpriseRelationId == null ? null : templateEnterpriseRelationId.trim();
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
}
public String getApplicationTemplateId() {
return applicationTemplateId;
}
public void setApplicationTemplateId(String applicationTemplateId) {
this.applicationTemplateId = applicationTemplateId == null ? null : applicationTemplateId.trim();
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getWxEnterpriseName() {
return wxEnterpriseName;
}
public void setWxEnterpriseName(String wxEnterpriseName) {
this.wxEnterpriseName = wxEnterpriseName;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/ApplicationTemplateDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
public class ApplicationTemplateDTO implements Serializable{
private String applicationTemplateId;
private String applicationTemplateName;
private List<String> applicationIds;
private Integer statusFlag;
private Integer defaultFlag;
private Date createTime;
private Date updateTime;
private static final long serialVersionUID = 1L;
public String getApplicationTemplateId() {
return applicationTemplateId;
}
public void setApplicationTemplateId(String applicationTemplateId) {
this.applicationTemplateId = applicationTemplateId == null ? null : applicationTemplateId.trim();
}
public String getApplicationTemplateName() {
return applicationTemplateName;
}
public void setApplicationTemplateName(String applicationTemplateName) {
this.applicationTemplateName = applicationTemplateName == null ? null : applicationTemplateName.trim();
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Integer getDefaultFlag() {
return defaultFlag;
}
public void setDefaultFlag(Integer defaultFlag) {
this.defaultFlag = defaultFlag;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public List<String> getApplicationIds() {
return applicationIds;
}
public void setApplicationIds(List<String> applicationIds) {
this.applicationIds = applicationIds;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/AuditDTO.java
......@@ -43,10 +43,30 @@ public class AuditDTO implements Serializable {
private Integer statusFlag;
private String detail;
private String wxEnterpriseId;
private String relatedId;
private static final long serialVersionUID = 1L;
public String getCommitStoreName() {
public String getRelatedId() {
return relatedId;
}
public void setRelatedId(String relatedId) {
this.relatedId = relatedId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getCommitStoreName() {
return commitStoreName;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/AuditSettingDTO.java
......@@ -16,9 +16,20 @@ public class AuditSettingDTO implements Serializable {
private Integer statusFlag;
private Integer clerkChangeFlag;
private static final long serialVersionUID = 1L;
public String getSettingId() {
public Integer getClerkChangeFlag() {
return clerkChangeFlag;
}
public void setClerkChangeFlag(Integer clerkChangeFlag) {
this.clerkChangeFlag = clerkChangeFlag;
}
public String getSettingId() {
return settingId;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/AuditStaffDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
public class AuditStaffDTO implements Serializable{
private String staffId;
private String wxEnterpriseId;
private String wxUserId;
private String clerkId;
private String clerkName;
private String clerkCode;
private String staffName;
private String phoneNumber;
private String nationCode;
private Integer sex;
private String headPic;
private String enterpriseId;
private static final long serialVersionUID = 1L;
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getPhoneNumber() {
return phoneNumber;
}
public void setPhoneNumber(String phoneNumber) {
this.phoneNumber = phoneNumber;
}
public String getNationCode() {
return nationCode;
}
public void setNationCode(String nationCode) {
this.nationCode = nationCode;
}
public Integer getSex() {
return sex;
}
public void setSex(Integer sex) {
this.sex = sex;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public String getHeadPic() {
return headPic;
}
public void setHeadPic(String headPic) {
this.headPic = headPic;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/BatchAuditLogDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto;
import java.io.Serializable;
import java.util.Date;
public class BatchAuditLogDTO implements Serializable {
private String batchAuditLogId;
private String auditId;
private String batchId;
private String enterpriseName;
private String commitName;
private Date commitTime;
private Integer auditResult;
private Integer auditType;
private Date createTime;
private Date updateTime;
private Integer status;
private static final long serialVersionUID = 1L;
public String getBatchAuditLogId() {
return batchAuditLogId;
}
public void setBatchAuditLogId(String batchAuditLogId) {
this.batchAuditLogId = batchAuditLogId == null ? null : batchAuditLogId.trim();
}
public String getAuditId() {
return auditId;
}
public void setAuditId(String auditId) {
this.auditId = auditId == null ? null : auditId.trim();
}
public String getBatchId() {
return batchId;
}
public void setBatchId(String batchId) {
this.batchId = batchId == null ? null : batchId.trim();
}
public String getEnterpriseName() {
return enterpriseName;
}
public void setEnterpriseName(String enterpriseName) {
this.enterpriseName = enterpriseName == null ? null : enterpriseName.trim();
}
public String getCommitName() {
return commitName;
}
public void setCommitName(String commitName) {
this.commitName = commitName == null ? null : commitName.trim();
}
public Date getCommitTime() {
return commitTime;
}
public void setCommitTime(Date commitTime) {
this.commitTime = commitTime;
}
public Integer getAuditResult() {
return auditResult;
}
public void setAuditResult(Integer auditResult) {
this.auditResult = auditResult;
}
public Integer getAuditType() {
return auditType;
}
public void setAuditType(Integer auditType) {
this.auditType = auditType;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
}
\ No newline at end of file
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/DepartmentShortDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto;
import java.io.Serializable;
import java.util.Date;
public class DepartmentShortDTO implements Serializable {
private String departmentId;
private String departmentName;
private String parentDepartmentId;
private String wxDepartmentId;
private Integer level;
private Long sort;
public String getDepartmentId() {
return departmentId;
}
public void setDepartmentId(String departmentId) {
this.departmentId = departmentId;
}
public String getDepartmentName() {
return departmentName;
}
public void setDepartmentName(String departmentName) {
this.departmentName = departmentName;
}
public String getParentDepartmentId() {
return parentDepartmentId;
}
public void setParentDepartmentId(String parentDepartmentId) {
this.parentDepartmentId = parentDepartmentId;
}
public String getWxDepartmentId() {
return wxDepartmentId;
}
public void setWxDepartmentId(String wxDepartmentId) {
this.wxDepartmentId = wxDepartmentId;
}
public Integer getLevel() {
return level;
}
public void setLevel(Integer level) {
this.level = level;
}
public Long getSort() {
return sort;
}
public void setSort(Long sort) {
this.sort = sort;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/EnterpriseDetailDTO.java
package com.gic.haoban.manage.api.dto;
import java.io.Serializable;
import java.util.Date;
/**
* Created by tgs on 2020/2/9.
......@@ -17,6 +18,9 @@ public class EnterpriseDetailDTO implements Serializable{
private String version;
private int nodeCount;
private String enterpriseLogo;
private String staffId;
private String staffName;
private Date createTime;
public String getWxEnterpriseRelatedId() {
return wxEnterpriseRelatedId;
}
......@@ -59,6 +63,24 @@ public class EnterpriseDetailDTO implements Serializable{
public void setEnterpriseLogo(String enterpriseLogo) {
this.enterpriseLogo = enterpriseLogo;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/MaidianLogDTO.java
......@@ -51,6 +51,10 @@ public class MaidianLogDTO implements Serializable{
private String storeId;
private String clerkCode;
private String clerkId;
private String enterpriseId;
private Date createTime;
......@@ -257,6 +261,22 @@ public class MaidianLogDTO implements Serializable{
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/PreDealLogInfoDTO.java
......@@ -59,6 +59,8 @@ public class PreDealLogInfoDTO implements Serializable {
*/
private Integer statusFlag;
private String dataContent;
private String reason;
/**
......@@ -71,6 +73,14 @@ public class PreDealLogInfoDTO implements Serializable {
*/
private Date updateTime;
public String getDataContent() {
return dataContent;
}
public void setDataContent(String dataContent) {
this.dataContent = dataContent;
}
/**
*/
private static final long serialVersionUID = 1L;
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/SecretSettingDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto;
import java.io.Serializable;
import java.util.Date;
/**
* Created By MBG-GUI-EXTENSION https://github.com/spawpaw/mybatis-generator-gui-extension
* Description:
* secret配置表
* @author fdh
*/
public class SecretSettingDTO implements Serializable {
/**
*
*/
private String secretId;
/**
* 企业微信id
*
*/
private String wxEnterpriseId;
/**
* 名称
*
*/
private String secretName;
/**
* 值
*
*/
private String secretVal;
/**
* gic企业id 会员小程序用到
*
*/
private String enterpriseId;
/**
* 类型 0 客户联系secret 2通讯录secret 3好办助手 4会员小程序
*
*/
private Integer secretType;
/**
* 0 校验失败 1校验成果
*
*/
private Integer checkFlag;
/**
* 0 删除 1正常
*
*/
private Integer statusFlag;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
/**
*/
private static final long serialVersionUID = 1L;
/**
* This method returns the value of the database column tab_haoban_secret_setting.secret_id
*
* @return the value of tab_haoban_secret_setting.secret_id
*/
public String getSecretId() {
return secretId;
}
/**
* This method sets the value of the database column tab_haoban_secret_setting.secret_id
*
* @param secretId the value for tab_haoban_secret_setting.secret_id
*/
public void setSecretId(String secretId) {
this.secretId = secretId;
}
/**
* This method returns the value of the database column tab_haoban_secret_setting.wx_enterprise_id
*
* @return the value of tab_haoban_secret_setting.wx_enterprise_id
*/
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
/**
* This method sets the value of the database column tab_haoban_secret_setting.wx_enterprise_id
*
* @param wxEnterpriseId the value for tab_haoban_secret_setting.wx_enterprise_id
*/
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
/**
* This method returns the value of the database column tab_haoban_secret_setting.secret_name
*
* @return the value of tab_haoban_secret_setting.secret_name
*/
public String getSecretName() {
return secretName;
}
/**
* This method sets the value of the database column tab_haoban_secret_setting.secret_name
*
* @param secretName the value for tab_haoban_secret_setting.secret_name
*/
public void setSecretName(String secretName) {
this.secretName = secretName;
}
/**
* This method returns the value of the database column tab_haoban_secret_setting.secret_val
*
* @return the value of tab_haoban_secret_setting.secret_val
*/
public String getSecretVal() {
return secretVal;
}
/**
* This method sets the value of the database column tab_haoban_secret_setting.secret_val
*
* @param secretVal the value for tab_haoban_secret_setting.secret_val
*/
public void setSecretVal(String secretVal) {
this.secretVal = secretVal;
}
/**
* This method returns the value of the database column tab_haoban_secret_setting.enterprise_id
*
* @return the value of tab_haoban_secret_setting.enterprise_id
*/
public String getEnterpriseId() {
return enterpriseId;
}
/**
* This method sets the value of the database column tab_haoban_secret_setting.enterprise_id
*
* @param enterpriseId the value for tab_haoban_secret_setting.enterprise_id
*/
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
/**
* This method returns the value of the database column tab_haoban_secret_setting.secret_type
*
* @return the value of tab_haoban_secret_setting.secret_type
*/
public Integer getSecretType() {
return secretType;
}
/**
* This method sets the value of the database column tab_haoban_secret_setting.secret_type
*
* @param secretType the value for tab_haoban_secret_setting.secret_type
*/
public void setSecretType(Integer secretType) {
this.secretType = secretType;
}
/**
* This method returns the value of the database column tab_haoban_secret_setting.check_flag
*
* @return the value of tab_haoban_secret_setting.check_flag
*/
public Integer getCheckFlag() {
return checkFlag;
}
/**
* This method sets the value of the database column tab_haoban_secret_setting.check_flag
*
* @param checkFlag the value for tab_haoban_secret_setting.check_flag
*/
public void setCheckFlag(Integer checkFlag) {
this.checkFlag = checkFlag;
}
/**
* This method returns the value of the database column tab_haoban_secret_setting.status_flag
*
* @return the value of tab_haoban_secret_setting.status_flag
*/
public Integer getStatusFlag() {
return statusFlag;
}
/**
* This method sets the value of the database column tab_haoban_secret_setting.status_flag
*
* @param statusFlag the value for tab_haoban_secret_setting.status_flag
*/
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
/**
* This method returns the value of the database column tab_haoban_secret_setting.create_time
*
* @return the value of tab_haoban_secret_setting.create_time
*/
public Date getCreateTime() {
return createTime;
}
/**
* This method sets the value of the database column tab_haoban_secret_setting.create_time
*
* @param createTime the value for tab_haoban_secret_setting.create_time
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* This method returns the value of the database column tab_haoban_secret_setting.update_time
*
* @return the value of tab_haoban_secret_setting.update_time
*/
public Date getUpdateTime() {
return updateTime;
}
/**
* This method sets the value of the database column tab_haoban_secret_setting.update_time
*
* @param updateTime the value for tab_haoban_secret_setting.update_time
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}
\ No newline at end of file
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffClerkInfoDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto;
import java.io.Serializable;
import java.util.Date;
public class StaffClerkInfoDTO implements Serializable{
private String staffClerkRelationId;
private String staffId;
private String wxEnterpriseId;
private String wxUserId;
private String enterpriseId;
private String enterpriseName;
private String storeId;
private String storeName;
private String clerkId;
private String clerkName;
private String clerkCode;
private Integer statusFlag;
private Date createTime;
private Date updateTime;
private String clerkPhoneNumber;
private static final long serialVersionUID = 1L;
public String getEnterpriseName() {
return enterpriseName;
}
public void setEnterpriseName(String enterpriseName) {
this.enterpriseName = enterpriseName;
}
public String getStoreName() {
return storeName;
}
public void setStoreName(String storeName) {
this.storeName = storeName;
}
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public String getClerkPhoneNumber() {
return clerkPhoneNumber;
}
public void setClerkPhoneNumber(String clerkPhoneNumber) {
this.clerkPhoneNumber = clerkPhoneNumber;
}
public String getStaffClerkRelationId() {
return staffClerkRelationId;
}
public void setStaffClerkRelationId(String staffClerkRelationId) {
this.staffClerkRelationId = staffClerkRelationId == null ? null : staffClerkRelationId.trim();
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId == null ? null : staffId.trim();
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId == null ? null : wxUserId.trim();
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId == null ? null : enterpriseId.trim();
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId == null ? null : storeId.trim();
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId == null ? null : clerkId.trim();
}
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode == null ? null : clerkCode.trim();
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffClerkRelationDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto;
import java.io.Serializable;
import java.util.Date;
public class StaffClerkRelationDTO implements Serializable{
private String staffClerkRelationId;
private String staffId;
private String wxEnterpriseId;
private String wxUserId;
private String enterpriseId;
private String storeId;
private String clerkId;
private String clerkCode;
private Integer statusFlag;
private Date createTime;
private Date updateTime;
private static final long serialVersionUID = 1L;
public String getStaffClerkRelationId() {
return staffClerkRelationId;
}
public void setStaffClerkRelationId(String staffClerkRelationId) {
this.staffClerkRelationId = staffClerkRelationId == null ? null : staffClerkRelationId.trim();
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId == null ? null : staffId.trim();
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId == null ? null : wxUserId.trim();
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId == null ? null : enterpriseId.trim();
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId == null ? null : storeId.trim();
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId == null ? null : clerkId.trim();
}
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode == null ? null : clerkCode.trim();
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffDTO.java
......@@ -57,10 +57,20 @@ public class StaffDTO implements Serializable{
private Boolean weixinPush;
private long memberCount;
private String clerkId;
private static final long serialVersionUID = 1L;
public int getClerkType() {
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public int getClerkType() {
return clerkType;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/TemplateEnterpriseRelatedDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto;
import java.io.Serializable;
import java.util.Date;
public class TemplateEnterpriseRelatedDTO implements Serializable{
private String templateEnterpriseRelationId;
private String wxEnterpriseId;
private String wxEnterpriseName;
private String applicationTemplateId;
private Integer statusFlag;
private Date createTime;
private Date updateTime;
private static final long serialVersionUID = 1L;
public String getTemplateEnterpriseRelationId() {
return templateEnterpriseRelationId;
}
public void setTemplateEnterpriseRelationId(String templateEnterpriseRelationId) {
this.templateEnterpriseRelationId = templateEnterpriseRelationId == null ? null : templateEnterpriseRelationId.trim();
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
}
public String getApplicationTemplateId() {
return applicationTemplateId;
}
public void setApplicationTemplateId(String applicationTemplateId) {
this.applicationTemplateId = applicationTemplateId == null ? null : applicationTemplateId.trim();
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getWxEnterpriseName() {
return wxEnterpriseName;
}
public void setWxEnterpriseName(String wxEnterpriseName) {
this.wxEnterpriseName = wxEnterpriseName;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/AppPageType.java
......@@ -23,7 +23,14 @@ public enum AppPageType {
//任务列表
TASK_LIST(9, "hbapp_task_list"),
//商品详情
GOOD_DETAIL(10, "hbapp_commodity_detail");
GOOD_DETAIL(10, "hbapp_commodity_detail"),
//我的关联记录
MY_RELATED_RECORD(11, "store_relate_my_record_list"),
//门店关联记录
STORE_RELATED_RECORD(12, "store_relate_store_record_list"),
//edaixi订单详情
EDAIXI_DETAIL(13, "hbapp_eWashing_order_preview");
AppPageType(int type, String desc){
this.code = type;
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/AuditRsultType.java 0 → 100644
package com.gic.haoban.manage.api.enums;
/**
* Created by tgs on 2020/2/20.
*/
public enum AuditRsultType {
success(1, "成功"),
fail(0,"失败");
AuditRsultType(Integer type, String desc){
this.code = type;
this.desc = desc;
}
private int code;
private String desc;
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/AuditStatus.java 0 → 100644
package com.gic.haoban.manage.api.enums;
/**
* Created by tgs on 2020/2/20.
*/
public enum AuditStatus {
NO_AUDIT(0, "未审核"),
AGREE(1,"已同意"),
REFUSE(2,"已拒绝"),
CANCEL(3,"已取消"),
NOT_NEED_AUDIT(4,"无需审核"),
AUDIT_FAIL(5,"审核失败");
AuditStatus(Integer type, String desc){
this.code = type;
this.desc = desc;
}
private int code;
private String desc;
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/AuditType.java 0 → 100644
package com.gic.haoban.manage.api.enums;
/**
* Created by tgs on 2020/2/20.
*/
public enum AuditType {
STORE_CHANGE(1, "门店信息变更"),
CLERK_BIND(2,"导购绑定"),
CLERK_ADD(3,"导购新增"),
CLERK_DEL(4,"导购删除"),
CLERK_UNBIND(5,"导购解除绑定");
AuditType(Integer type, String desc){
this.code = type;
this.desc = desc;
}
private int code;
private String desc;
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/SecretTypeEnum.java 0 → 100644
package com.gic.haoban.manage.api.enums;
/**
* Created by hua on 2020/6/3.
*/
public enum SecretTypeEnum {
CONTACT_CUSTOMER(1,"顾客联系"),
CONTACT_SECRET(2,"通讯录"),
HAOBAN_HELP(3,"好办助手"),
MEMBER_WAPP(4,"会员小程序");
private int val;
private String name;
SecretTypeEnum(int val,String name) {
this.val = val;
this.name = name;
}
public int getVal() {
return val;
}
public void setVal(int val) {
this.val = val;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ApplicationTemplateApiService.java 0 → 100644
package com.gic.haoban.manage.api.service;
import java.util.List;
import com.gic.haoban.manage.api.dto.ApplicationEnterpriseRelatedDTO;
import com.gic.haoban.manage.api.dto.ApplicationTemplateDTO;
import com.gic.haoban.manage.api.dto.TemplateEnterpriseRelatedDTO;
public interface ApplicationTemplateApiService {
ApplicationTemplateDTO selectByTemplateName(String templateName);
String insertTemplate(ApplicationTemplateDTO template,String applicationIds);
List<TemplateEnterpriseRelatedDTO> listEnterpriseByTemplateId(String templateId);
void delTemplate(String templateId);
void editTemplate(String applicationTemplateId, String applicationTemplateName, String applicationIds);
List<ApplicationTemplateDTO> listByTemplateName(String applicationTemplateName);
void addTemplateEnterprise(String applicationTemplateId, String wxEnterpriseIds);
void delTemplateEnterprise(String wxEnterpriseId);
List<ApplicationEnterpriseRelatedDTO> listTemplateEnterprise(String applicationTemplateId, String wxEnterpriseName, String enterpriseName);
void setDefaultTemplateEnterprise(String applicationTemplateId);
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/AuditApiService.java
......@@ -5,6 +5,7 @@ import java.util.List;
import com.gic.api.base.commons.Page;
import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.manage.api.dto.AuditDTO;
import com.gic.haoban.manage.api.dto.BatchAuditLogDTO;
/**
......@@ -14,7 +15,7 @@ public interface AuditApiService {
Page<AuditDTO> page(Integer auditType, String search,String wxEnterpriseId,String enterpriseId,Integer auditStatus,Integer auditFlag,BasePageInfo pageInfo);
void audit(String auditId,String aduitName);
String audit(String batchId,String auditId,String aduitName);
void refuse(String auditId,String auditReason,String aduitName);
......@@ -25,4 +26,20 @@ public interface AuditApiService {
List<AuditDTO> listByStoreId(String storeId);
AuditDTO findByStoreIdAndChangeField(String storeId,String changeField);
void insert(AuditDTO audit);
Page<AuditDTO> listByStaffId(String staffId,Integer auditType,Integer auditStatus, BasePageInfo pageInfo);
Page<AuditDTO> pageStoreListByParams(String storeId, BasePageInfo pageInfo, Integer auditType, Integer auditStatus);
AuditDTO findById(String auditId);
void update(AuditDTO audit);
List<BatchAuditLogDTO> listBatchLog(String batchId);
AuditDTO findByBindRelatedIdAndAuditType(String relatedId,int auditType);
boolean judgeHavePhoneNumberOrCode(String enterpriseId,String clerkCode,String phoneNumber);
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/AuditSettingApiService.java
......@@ -7,7 +7,7 @@ import com.gic.haoban.manage.api.dto.AuditSettingDTO;
*/
public interface AuditSettingApiService {
void saveSetting(String wxEnterpriseId , int auditFlag);
void saveSetting(String wxEnterpriseId , int auditFlag,int clerkChangeFlag);
AuditSettingDTO findSettingByWxEnterpriseId(String wxEnterpriseId);
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DealSyncOperationApiService.java
......@@ -110,5 +110,12 @@ public interface DealSyncOperationApiService {
*/
public void dealQywxDepartment(String taskId, String wxEnterpriseId);
/**
* 清理不存在的数据
* @param wxEnterpriseId
* @param taskId
*/
public void cleanDiffrence(String wxEnterpriseId,String taskId);
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DepartmentApiService.java
......@@ -6,6 +6,7 @@ import com.gic.api.base.commons.Page;
import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.manage.api.dto.DepartmentDTO;
import com.gic.haoban.manage.api.dto.DepartmentShortDTO;
public interface DepartmentApiService {
......@@ -158,8 +159,7 @@ public interface DepartmentApiService {
* @return
*/
ServiceResponse<List<DepartmentDTO>> listStoreListByStaffId(String wxUserId);
void initwxDepartmentMQ(String res);
boolean isInitLocked(String wxEnterpriseId);
......@@ -174,4 +174,19 @@ public interface DepartmentApiService {
List<DepartmentDTO> listSonByDepartmentIds(List<String> departmentIdSet, String wxEnterpriseId);
/**
* 搜索
* @param search
* @param wxEnterpriseId
* @return
*/
List<DepartmentShortDTO> searchDepartment(String search, String wxEnterpriseId);
/**
* 获取所有部门
* @param wxEnterpriseId
* @return
*/
List<DepartmentShortDTO> listAllDepartment(String wxEnterpriseId);
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java
......@@ -6,6 +6,7 @@ import com.gic.api.base.commons.Page;
import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.manage.api.dto.GicClerkDTO;
import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
import com.gic.haoban.manage.api.dto.StaffDTO;
import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
import com.gic.haoban.manage.api.dto.UserLoginLogDTO;
......@@ -26,10 +27,18 @@ public interface StaffApiService {
public List<StaffDepartmentRelatedDTO> listStaffDepartmentByStaffId(String staffId);
public Page<StaffDTO> pageStaff(String departmentId, Integer activeFlag, String keyword, BasePageInfo pageInfo);
public Page<StaffDTO> pageStaff(List<String> departmentId, Integer activeFlag, String keyword, BasePageInfo pageInfo);
public void del(String staffDepartmentStaffRelatedId);
/**
* 获取微信成员
* @param userId
* @param wxEnterpriseId
* @return
*/
public ServiceResponse getWxSaveNew(String userId,String wxEnterpriseId);
public void wxGetAdd(String userId,String wxEnterpriseId);
public void staffEdit(StaffDTO staffDTO, String departmentIds);
......@@ -82,4 +91,20 @@ public interface StaffApiService {
void wxFristAdd(String userJson, String wxEnterpriseId);
List<String> listBindClerkUserId(String storeId);
public List<StaffClerkRelationDTO> listBindRelationUserId(String storeId);
/**
* 激活
* @param staffId
* @return
*/
public boolean activeStaff(String staffId);
/**
* 获取一个staff
* @param wxEnterpriseId
* @return
*/
public StaffDTO getWxStaffOne(String wxEnterpriseId);
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffClerkRelationApiService.java 0 → 100644
package com.gic.haoban.manage.api.service;
import java.util.List;
import java.util.Set;
import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.manage.api.dto.StaffClerkInfoDTO;
import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
public interface StaffClerkRelationApiService {
List<StaffClerkRelationDTO> listBindCode(String enterpriseId, Set<String> clerkCodeList);
List<StaffClerkRelationDTO> listBindCodeByStaffId(List<String> enterpriseIdList, String staffId);
/**
* 根据staffid 获取列表
* @param staffId
* @return
*/
List<StaffClerkInfoDTO> listBindDetailByStaffId(String staffId);
/**
* 绑定
* @return
*/
public ServiceResponse bindStaffClerk(StaffClerkRelationDTO staffClerkRelationDTO);
StaffClerkRelationDTO getByCodeAndEnterpriseId(String clerkCode, String enterpriseId);
String insert(StaffClerkRelationDTO staffClerkRelation);
void insertOrUpdate(StaffClerkRelationDTO staffClerkRelation);
void delAndInsert(StaffClerkRelationDTO staffClerkRelation);
/**
* 解绑
* @param storeId
* @param clerkCode
* @return
*/
String delByStoreIdAndCode(String storeId,String clerkCode);
StaffClerkRelationDTO getOneByClerkId(String clerkId);
List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkIds);
/**
* 导购列表
* @param storeId
* @return
*/
List<StaffClerkRelationDTO>listByStoreId(String storeId);
/**
* 解绑
* @param staffId
* @param clerkId
* @return
*/
boolean unbindByStaffAndClerkId(String staffId,String clerkId);
/**
* 查询导购信息
* @param clerkId
* @return
*/
StaffClerkRelationDTO getOneByStoreIdAndStaffId(String storeId,String staffId);
/**
* 查询导购信息
* @param clerkId
* @return
*/
StaffClerkRelationDTO getByClerkId(String clerkId);
/**
*
* @param enterpriseId
* @param wxUserId
* @return
*/
List<StaffClerkRelationDTO> listByEnterpriseIdAndWxUserId(String enterpriseId,String wxUserId);
/**
* 删除关联关系
* @param clerkId
*/
void delByClerkId(String clerkId);
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffDepartmentRelatedApiService.java
......@@ -8,6 +8,8 @@ import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
public interface StaffDepartmentRelatedApiService {
List<StaffDepartmentRelatedDTO> listByDepartmentId(String departmentId);
List<StaffDepartmentRelatedDTO> listByDepartmentIds(List<String> departmentIds);
List<StaffDepartmentRelatedDTO> listByStaffId(String staffId);
......@@ -34,7 +36,17 @@ public interface StaffDepartmentRelatedApiService {
//发送消息，单人发送
boolean sendSingleMessage(String clerkId,String title,String content,String pageUrl);
//发送消息，带审核理由
public boolean sendAuditMessage(String clerkId, String title,String content, String pageUrl,int auditStatus, String auditReason);
List<StaffDepartmentRelatedDTO> listByStaffIds(List<String> staffIds);
public void sendClerkBind(String staffId,String clerkCode,String storeId,int auditStatus,String auditReason);
public void sendStaffBind(String staffId,String clerkCode,String storeId,int auditStatus,String auditReason);
public void sendClerkAdd (String clerkName,String clerkCode,String storeId,int auditStatus,String auditReason);
public void sendClerkDel (String clerkName,String clerkCode,String storeId,int auditStatus,String auditReason);
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseApiService.java
......@@ -5,6 +5,7 @@ import java.util.Set;
import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.manage.api.dto.QywxCorpInfoSimpleDTO;
import com.gic.haoban.manage.api.dto.SecretSettingDTO;
import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
......@@ -39,4 +40,34 @@ public interface WxEnterpriseApiService {
List<YwWxEnterpriseDTO> listByIds(Set<String> enterpriseIds);
boolean enterpriseIsOver(String enterpriseId);
/**
* 获取配置
* @param wxEnterpriseId
* @param secretType
* @param enterpriseId
* @return
*/
public SecretSettingDTO getSecretSetting(String wxEnterpriseId,int secretType,String enterpriseId);
/**
* 保存
* @param secretSettingDTO
* @return
*/
public boolean saveSecretSetting(SecretSettingDTO secretSettingDTO);
/**
* secretList
* @param wxEnterpriseId
* @return
*/
List<SecretSettingDTO> listSecret(String wxEnterpriseId);
/**
* 删除
* @param secretId
* @return
*/
public boolean delSecretSetting(String secretId);
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseRelatedApiService.java
......@@ -26,4 +26,6 @@ public interface WxEnterpriseRelatedApiService {
*/
List<EnterpriseDetailDTO> queryBindGicEnterpriseByTime(String seqTime);
int wxEnterpriseBind(String enterpriseId, String wxEnterpriseId, String version, String staffId, String staffName);
}
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/ApplicationTemplateController.java 0 → 100644
package com.gic.haoban.manage.web.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.api.dto.ApplicationDTO;
import com.gic.haoban.manage.api.dto.ApplicationEnterpriseRelatedDTO;
import com.gic.haoban.manage.api.dto.ApplicationTemplateDTO;
import com.gic.haoban.manage.api.dto.TemplateEnterpriseRelatedDTO;
import com.gic.haoban.manage.api.service.ApplicationApiService;
import com.gic.haoban.manage.api.service.ApplicationTemplateApiService;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
@RestController
public class ApplicationTemplateController extends WebBaseController{
@Autowired
private ApplicationTemplateApiService applicationTemplateApiService;
@Autowired
private ApplicationApiService applicationApiService;
@RequestMapping("list-application-template")
public HaobanResponse listTemplate(String applicationTemplateName){
List<ApplicationTemplateDTO> templateList = applicationTemplateApiService.listByTemplateName(applicationTemplateName);
return resultResponse(HaoBanErrCode.ERR_1,templateList);
}
@RequestMapping("add-template")
public HaobanResponse addTemplate(String applicationTemplateName,String applicationIds){
ApplicationTemplateDTO template = applicationTemplateApiService.selectByTemplateName(applicationTemplateName);
if(template != null){
return resultResponse(HaoBanErrCode.ERR_10020);
}
template = new ApplicationTemplateDTO();
template.setApplicationTemplateName(applicationTemplateName);
applicationTemplateApiService.insertTemplate(template,applicationIds);
return resultResponse(HaoBanErrCode.ERR_1);
}
@RequestMapping("del-template")
public HaobanResponse delTemplate(String applicationTemplateId){
List<TemplateEnterpriseRelatedDTO> list = applicationTemplateApiService.listEnterpriseByTemplateId(applicationTemplateId);
if(list != null && !list.isEmpty()){
return resultResponse(HaoBanErrCode.ERR_10020);
}
applicationTemplateApiService.delTemplate(applicationTemplateId);
return resultResponse(HaoBanErrCode.ERR_1);
}
@RequestMapping("edit-template")
public HaobanResponse editTemplate(String applicationTemplateId,String applicationTemplateName,String applicationIds){
ApplicationTemplateDTO template = applicationTemplateApiService.selectByTemplateName(applicationTemplateName);
if(template != null && !template.getApplicationTemplateId().equals(applicationTemplateId)){
return resultResponse(HaoBanErrCode.ERR_10020);
}
applicationTemplateApiService.editTemplate(applicationTemplateId,applicationTemplateName,applicationIds);
return resultResponse(HaoBanErrCode.ERR_1);
}
@RequestMapping("application-list")
public HaobanResponse applicationList() {
List<ApplicationDTO> list = applicationApiService.listApplication();
return resultResponse(HaoBanErrCode.ERR_1,list);
}
@RequestMapping("add-template-enterprise")
public HaobanResponse addTemplateEnterprise(String applicationTemplateId,String wxEnterpriseIds){
applicationTemplateApiService.addTemplateEnterprise(applicationTemplateId,wxEnterpriseIds);
return resultResponse(HaoBanErrCode.ERR_1);
}
@RequestMapping("del-template-enterprise")
public HaobanResponse delTemplateEnterprise(String wxEnterpriseId){
applicationTemplateApiService.delTemplateEnterprise(wxEnterpriseId);
return resultResponse(HaoBanErrCode.ERR_1);
}
@RequestMapping("fresh-template-enterprise")
public HaobanResponse freshTemplateEnterprise(String applicationTemplateId){
//applicationTemplateApiService.freshTemplateEnterprise(applicationTemplateId);
return resultResponse(HaoBanErrCode.ERR_1);
}
@RequestMapping("view-template-enterprise")
public HaobanResponse viewTemplateEnterprise(String applicationTemplateId,String wxEnterpriseName,String enterpriseName){
List<ApplicationEnterpriseRelatedDTO> list = applicationTemplateApiService.listTemplateEnterprise(applicationTemplateId,wxEnterpriseName,enterpriseName);
return resultResponse(HaoBanErrCode.ERR_1,list);
}
@RequestMapping("set-default-template")
public HaobanResponse setDefaultTemplateEnterprise(String applicationTemplateId){
applicationTemplateApiService.setDefaultTemplateEnterprise(applicationTemplateId);
return resultResponse(HaoBanErrCode.ERR_1);
}
}
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/MaidianDictController.java
......@@ -2,13 +2,13 @@ package com.gic.haoban.manage.web.controller;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.csp.sentinel.util.StringUtil;
import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.api.dto.MaidianDictDTO;
import com.gic.haoban.manage.api.dto.MaidianDictModuleDTO;
......@@ -35,7 +35,7 @@ public class MaidianDictController extends WebBaseController{
//保存字典
@RequestMapping("save-page")
public HaobanResponse savePage(MaidianDictDTO dto) {
if(StringUtil.isEmpty(dto.getModuleId())){
if(StringUtils.isEmpty(dto.getModuleId())){
return resultResponse(HaoBanErrCode.ERR_2);
}
maidianDictApiService.savePage(dto);
......
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/PayController.java 0 → 100644
package com.gic.haoban.manage.web.controller;
import com.gic.clerk.api.dto.*;
import com.gic.clerk.api.service.ClerkService;
import com.gic.enterprise.api.dto.*;
import com.gic.enterprise.api.dto.EnterpriseDTO;
import com.gic.enterprise.api.service.EnterpriseService;
import com.gic.enterprise.api.service.StoreService;
import com.gic.haoban.common.utils.EntityUtil;
import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.api.dto.*;
import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import com.gic.haoban.manage.web.vo.EnterpriseVo;
import com.gic.haoban.manage.web.vo.StaffClerkInfoVo;
import com.gic.haoban.manage.web.vo.WxClerkInfoVO;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
/**
* Created 2020/6/3.
*
* @author hua
*/
@RestController
@RequestMapping("/pay")
public class PayController extends WebBaseController {
private static final Logger logger= LoggerFactory.getLogger(PayController.class);
@Autowired
private StaffApiService staffApiService;
@Autowired
private WxEnterpriseApiService wxEnterpriseApiService;
@Autowired
private StaffClerkRelationApiService staffClerkRelationApiService;
@Autowired
private ClerkService clerkService;
@Autowired
private StoreService storeService;
@Autowired
private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
@Autowired
private EnterpriseService enterpriseService;
/**
* 微信成员列表
* @param userId
* @param corpId
* @return
*/
@RequestMapping("/wx-user-list")
public HaobanResponse userList(String userId,String corpId) {
if (StringUtils.isAnyBlank(userId,corpId)) {
logger.info("参数异常");
return resultResponse(HaoBanErrCode.ERR_2);
}
WxEnterpriseDTO enterpriseDTO = wxEnterpriseApiService.getEnterpriseBycorpId(corpId);
if (enterpriseDTO==null) {
logger.info("不存在商户");
return resultResponse(HaoBanErrCode.ERR_20001);
}
StaffDTO staffDTO = staffApiService.selectByUserIdAndEnterpriseId(userId, enterpriseDTO.getWxEnterpriseId());
if (staffDTO==null) {
logger.info("不存在成员");
return resultResponse(HaoBanErrCode.ERR_6);
}
List<StaffClerkInfoDTO> list = staffClerkRelationApiService.listBindDetailByStaffId(staffDTO.getStaffId());
List<StaffClerkInfoVo> infoVos = EntityUtil.changeEntityListByJSON(StaffClerkInfoVo.class, list);
if (CollectionUtils.isNotEmpty(infoVos)) {
infoVos.forEach(staffClerkInfoVo -> {
com.gic.clerk.api.dto.ClerkDTO clerkDTO = clerkService.getClerkByClerkId(staffClerkInfoVo.getClerkId());
StoreDTO store = storeService.getStore(staffClerkInfoVo.getStoreId());
if (null != clerkDTO) {
staffClerkInfoVo.setClerkType(clerkDTO.getClerkType());
}
if (null != store) {
staffClerkInfoVo.setStoreCode(store.getStoreCode());
}
staffClerkInfoVo.setWxEnterpriseName(enterpriseDTO.getCorpName());
});
}
return resultResponse(HaoBanErrCode.ERR_1,infoVos);
}
/**
* 微信成员列表
* @param storeId
* @return
*/
@RequestMapping("/store-clerk-list")
public HaobanResponse storeList(String storeId,String corpId) {
WxEnterpriseDTO enterpriseDTO = wxEnterpriseApiService.getEnterpriseBycorpId(corpId);
if (enterpriseDTO==null) {
logger.info("不存在商户");
return resultResponse(HaoBanErrCode.ERR_20001);
}
StoreDTO store = storeService.getStore(storeId);
if (store==null) {
logger.info("不存在门店");
return resultResponse(HaoBanErrCode.ERR_20002);
}
List<ClerkListDTO> list = clerkService.getClerkByStoreId(store.getEnterpriseId(), storeId);
List<WxClerkInfoVO> retList = EntityUtil.changeEntityListByJSON(WxClerkInfoVO.class, list);
if (CollectionUtils.isNotEmpty(retList)) {
List<StaffClerkRelationDTO> relationDTOS = staffClerkRelationApiService.listByStoreId(storeId);
Map<String, StaffClerkRelationDTO> maps = relationDTOS.stream().collect(Collectors.toMap(StaffClerkRelationDTO::getClerkId, mid -> mid));
retList.stream().forEach(wxClerkInfoVO -> {
StaffClerkRelationDTO relationDTO = maps.get(wxClerkInfoVO.getClerkId());
if (null!=relationDTO) {
wxClerkInfoVO.setStaffId(relationDTO.getStaffId());
wxClerkInfoVO.setWxUserId(relationDTO.getWxUserId());
}
});
}
return resultResponse(HaoBanErrCode.ERR_1,retList);
}
/**
* 微信企业列表
* @return
*/
@RequestMapping("/enterprise-list")
public HaobanResponse enterpriseList() {
List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.queryAllHasGicEnterpriseId();
Set<String> wxEnterpriseIds = list.stream().map(enterpriseDetailDTO -> {
return enterpriseDetailDTO.getWxEnterpriseId();
}).collect(Collectors.toSet());
List<String> enterpriseIds = list.stream().map(enterpriseDetailDTO -> {
return enterpriseDetailDTO.getEnterpriseId();
}).collect(Collectors.toList());
List<EnterpriseDTO> enterpriseDTOS = enterpriseService.listEnterpriseByIds(enterpriseIds);
Map<String, EnterpriseDTO> gicEntMap = enterpriseDTOS.stream().collect(Collectors.toMap(EnterpriseDTO::getEnterpriseId, _t -> _t));
List<EnterpriseVo> enterpriseVos = EntityUtil.changeEntityListByJSON(EnterpriseVo.class, list);
List<YwWxEnterpriseDTO> ywWxEnterpriseDTOS = wxEnterpriseApiService.listByIds(wxEnterpriseIds);
Map<String, YwWxEnterpriseDTO> map = ywWxEnterpriseDTOS.stream().collect(Collectors.toMap(YwWxEnterpriseDTO::getWxEnterpriseId, _t -> _t));
enterpriseVos.forEach(enterpriseVo -> {
YwWxEnterpriseDTO enterpriseDTO = map.get(enterpriseVo.getWxEnterpriseId());
EnterpriseDTO gicEnt = gicEntMap.get(enterpriseVo.getEnterpriseId());
if (null!=enterpriseDTO) {
enterpriseVo.setWxEnterpiseName(enterpriseDTO.getCorpName());
}
if (null!=gicEnt) {
enterpriseVo.setEnterpriseName(gicEnt.getEnterpriseName());
}
});
return resultResponse(HaoBanErrCode.ERR_1,enterpriseVos);
}
}
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java
......@@ -70,7 +70,13 @@ public enum HaoBanErrCode {
ERR_10006(10006,"字典key已存在"),
ERR_10007(10007,"字典名称已存在"),
ERR_10008(10008,"title已存在"),
ERR_10020(10020,"模板名称已存在"),
ERR_20001(20001,"企业微信商户不存在"),
ERR_20002(20002,"门店不存在"),
ERR_DEFINE(-888, "自定义错误"),
ERR_OTHER(-999, "未知错误code");
private int code;
......
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/vo/EnterpriseVo.java 0 → 100644
package com.gic.haoban.manage.web.vo;
import java.io.Serializable;
/**
* Created 2018/10/22.
*
* @author hua
*/
public class EnterpriseVo implements Serializable {
/**
*
*/
private static final long serialVersionUID = 1L;
private String wxEnterpriseId;
private String enterpriseId;
private String enterpriseName;
private String wxEnterpiseName;
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getEnterpriseName() {
return enterpriseName;
}
public void setEnterpriseName(String enterpriseName) {
this.enterpriseName = enterpriseName;
}
public String getWxEnterpiseName() {
return wxEnterpiseName;
}
public void setWxEnterpiseName(String wxEnterpiseName) {
this.wxEnterpiseName = wxEnterpiseName;
}
}
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/vo/StaffClerkInfoVo.java 0 → 100644
package com.gic.haoban.manage.web.vo;
import java.io.Serializable;
import java.util.Date;
public class StaffClerkInfoVo implements Serializable{
private String staffClerkRelationId;
private String staffId;
private String wxEnterpriseId;
private String wxEnterpriseName;
private String wxUserId;
private String enterpriseId;
private String enterpriseName;
private String storeId;
private String storeName;
private String storeCode;
private Integer clerkType;
private String clerkId;
private String clerkName;
private String clerkCode;
private Integer statusFlag;
private Date createTime;
private Date updateTime;
private String clerkPhoneNumber;
private static final long serialVersionUID = 1L;
public String getWxEnterpriseName() {
return wxEnterpriseName;
}
public void setWxEnterpriseName(String wxEnterpriseName) {
this.wxEnterpriseName = wxEnterpriseName;
}
public String getStoreCode() {
return storeCode;
}
public void setStoreCode(String storeCode) {
this.storeCode = storeCode;
}
public Integer getClerkType() {
return clerkType;
}
public void setClerkType(Integer clerkType) {
this.clerkType = clerkType;
}
public String getEnterpriseName() {
return enterpriseName;
}
public void setEnterpriseName(String enterpriseName) {
this.enterpriseName = enterpriseName;
}
public String getStoreName() {
return storeName;
}
public void setStoreName(String storeName) {
this.storeName = storeName;
}
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public String getClerkPhoneNumber() {
return clerkPhoneNumber;
}
public void setClerkPhoneNumber(String clerkPhoneNumber) {
this.clerkPhoneNumber = clerkPhoneNumber;
}
public String getStaffClerkRelationId() {
return staffClerkRelationId;
}
public void setStaffClerkRelationId(String staffClerkRelationId) {
this.staffClerkRelationId = staffClerkRelationId == null ? null : staffClerkRelationId.trim();
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId == null ? null : staffId.trim();
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId == null ? null : wxUserId.trim();
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId == null ? null : enterpriseId.trim();
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId == null ? null : storeId.trim();
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId == null ? null : clerkId.trim();
}
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode == null ? null : clerkCode.trim();
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/vo/WxClerkInfoVO.java 0 → 100644
package com.gic.haoban.manage.web.vo;
import java.io.Serializable;
/**
* Created 2020/6/4.
*
* @author hua
*/
public class WxClerkInfoVO implements Serializable {
private String enterpriseId;
private String clerkId;
private String staffId;
private String wxUserId;
private String clerkName;
private int clerkType;
private String clerkCode;
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public int getClerkType() {
return clerkType;
}
public void setClerkType(int clerkType) {
this.clerkType = clerkType;
}
}
haoban-manage3-operation-web/src/main/webapp/WEB-INF/dubbo-haoban-manage3-operation-web.xml
......@@ -20,6 +20,7 @@
<!--<dubbo:registry address="zookeeper://localhost:2181|zookeeper://115.159.182.172:2199" protocol="dubbo"/>-->
<dubbo:reference interface="com.gic.haoban.manage.api.service.StaffApiService" id="staffApiService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.StaffClerkRelationApiService" id="staffClerkRelationApiService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService" id="wxEnterpriseRelatedApiService" />
<dubbo:reference interface="com.gic.haoban.manage.api.service.ApplicationApiService" id="applicationApiService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.WxEnterpriseApiService" id="wxEnterpriseApiService"/>
......@@ -34,4 +35,6 @@
<dubbo:reference interface="com.gic.haoban.manage.api.service.HelpApiService" id="helpApiService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.MaidianDictApiService" id="maidianDictApiService"/>
<dubbo:reference id="applicationTemplateApiService" interface="com.gic.haoban.manage.api.service.ApplicationTemplateApiService" timeout="10000"/>
</beans>
haoban-manage3-operation-web/src/main/webapp/WEB-INF/spring-interceptor.xml
......@@ -13,6 +13,7 @@
<mvc:exclude-mapping path="/gic-login*"/>
<mvc:exclude-mapping path="/*test.json"/>
<mvc:exclude-mapping path="/test/*"/>
<mvc:exclude-mapping path="/pay/*"/>
<mvc:exclude-mapping path="/login"/>
<mvc:exclude-mapping path="/nationcode/get-nationcode-list"/>
<mvc:exclude-mapping path="/get-pic-code"/>
......
haoban-manage3-service/pom.xml
......@@ -57,7 +57,7 @@
<dependency>
<groupId>com.vdurmont</groupId>
<artifactId>emoji-java</artifactId>
<version>4.0.0</version>
<version>5.1.1</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
......@@ -84,7 +84,11 @@
<artifactId>gic-enterprise-api</artifactId>
<version>${gic-enterprise-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-communicate-api</artifactId>
<version>${haoban-communicate-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-message-api</artifactId>
......@@ -127,6 +131,17 @@
<artifactId>haoban-app-customer-api</artifactId>
<version>${haoban-app-customer-api}</version>
</dependency>
<dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
<version>2.1.4.RELEASE</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-binlog-base</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/DepartmentMapper.java
......@@ -2,12 +2,14 @@ package com.gic.haoban.manage.service.dao.mapper;
import java.util.List;
import com.gic.haoban.manage.api.dto.DepartmentShortDTO;
import org.apache.ibatis.annotations.Param;
import org.apache.xpath.operations.Bool;
import com.gic.haoban.manage.api.dto.DepartmentDTO;
import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
import com.github.pagehelper.Page;
import retrofit2.http.PATCH;
public interface DepartmentMapper {
int deleteByPrimaryKey(String departmentId);
......@@ -24,7 +26,7 @@ public interface DepartmentMapper {
List<TabHaobanDepartment> listByParentId(@Param("parentId")String parentId);
List<TabHaobanDepartment> listStoreLikeName(@Param("departmentName")String departmentName);
List<TabHaobanDepartment> listDepartmentLikeName(@Param("departmentName")String departmentName);
long selectMaxSort(@Param("parentDepartmentId")String parentDepartmentId);
......@@ -66,4 +68,24 @@ public interface DepartmentMapper {
TabHaobanDepartment getTempFlagDepartment(@Param("wxEnterpriseId") String wxEnterpriseId);
Integer totalStoreCountByEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
public int cleanDepartment(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("dIds") List<String> wxDeIds);
public List<TabHaobanDepartment> listDepartmentByWxDepartIds(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("dIds") List<String> wxDeIds);
/**
* 查询所有部门
* @param wxEnterpriseId
* @return
*/
public List<TabHaobanDepartment> listAllDepartment(String wxEnterpriseId);
/**
* 查询所有部门
* @param wxEnterpriseId
* @return
*/
public List<TabHaobanDepartment> searchDepartment(String search,String wxEnterpriseId);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/SecretSettingMapper.java 0 → 100644
package com.gic.haoban.manage.service.dao.mapper;
import com.gic.haoban.manage.api.dto.SecretSettingDTO;
import com.gic.haoban.manage.service.entity.TabSecretSetting;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import retrofit2.http.PATCH;
import java.util.List;
@Mapper
public interface SecretSettingMapper {
/**
*/
int deleteByPrimaryKey(String secretId);
/**
*/
int insert(TabSecretSetting record);
/**
*/
int insertSelective(TabSecretSetting record);
/**
*/
TabSecretSetting selectByPrimaryKey(String secretId);
/**
*/
int updateByPrimaryKeySelective(TabSecretSetting record);
/**
*/
int updateByPrimaryKey(TabSecretSetting record);
/**
* 获取企业secret配置信息
* @param wxEnterpriseId
* @return
*/
List<TabSecretSetting> listSecretSetting(@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* 获取配置
* @param wxEnterpriseId
* @param secretType
* @return
*/
TabSecretSetting getSecretSetting(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("secretType") int secretType, @Param("enterpriseId") String enterpriseId);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffDepartmentRelatedMapper.java
......@@ -40,7 +40,7 @@ public interface StaffDepartmentRelatedMapper {
TabHaobanStaffDepartmentRelated getDepartmentIdAndCode(@Param("departmentId")String departmentId, @Param("clerkCode")String code);
List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(@Param("departmentId")String departmentId, @Param("keyword")String keyword);
List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(@Param("departmentIds")List<String> departmentIds, @Param("keyword")String keyword);
int countByDepartmentIds(@Param("departmentIds")List<String> departmentIds);
......@@ -52,4 +52,7 @@ public interface StaffDepartmentRelatedMapper {
List<TabHaobanStaffDepartmentRelated> listStaffDepartmentByStaffIds(@Param("staffIds")List<String> staffIds);
List<TabHaobanStaffDepartmentRelated> listByDepartmentIds(@Param("departmentIds")List<String> departmentIds);
int cleanStaffDepartment(@Param("wxEnterpriseId")String wxEnterpriseId,@Param("staffIds")List<String> staffIds);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffMapper.java
......@@ -38,4 +38,8 @@ public interface StaffMapper {
List<TabHaobanStaff> listByPhoneNumber(@Param("phoneNumber")String phoneNumber);
List<TabHaobanStaff> listByUserIdsAndWxEnterpriseId(@Param("userIds")List<String> userIds, @Param("wxEnterpriseId")String wxEnterpriseId);
public int cleanStaff(@Param("wxEnterpriseId")String wxEnterpriseId,@Param("staffIds")List<String> staffIds);
TabHaobanStaff getWxStaffByOne(@Param("wxEnterpriseId")String wxEnterpriseId);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanApplicationTemplateMapper.java 0 → 100644
package com.gic.haoban.manage.service.dao.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.service.entity.TabHaobanApplicationTemplate;
public interface TabHaobanApplicationTemplateMapper {
int deleteByPrimaryKey(String applicationTemplateId);
int insert(TabHaobanApplicationTemplate record);
int insertSelective(TabHaobanApplicationTemplate record);
TabHaobanApplicationTemplate selectByPrimaryKey(String applicationTemplateId);
int updateByPrimaryKeySelective(TabHaobanApplicationTemplate record);
int updateByPrimaryKey(TabHaobanApplicationTemplate record);
TabHaobanApplicationTemplate selectByTemplateName(@Param("templateName")String templateName);
List<TabHaobanApplicationTemplate> listByTemplateName(@Param("templateName")String applicationTemplateName);
TabHaobanApplicationTemplate selectDefaultTemplate();
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanAuditMapper.java
......@@ -28,4 +28,12 @@ public interface TabHaobanAuditMapper {
List<TabHaobanAudit> listByStoreId(String storeId);
TabHaobanAudit findByStoreIdAndChangeField(@Param("storeId")String storeId,@Param("changeField")String changeField);
com.github.pagehelper.Page listByStaffId(@Param("staffId")String staffId,@Param("auditType")Integer auditType,@Param("auditStatus")Integer auditStatus);
com.github.pagehelper.Page pageStoreListByParams(@Param("storeId")String storeId, @Param("auditType")Integer auditType, @Param("auditStatus")Integer auditStatus);
TabHaobanAudit findByBindRelatedIdAndAuditType(@Param("relatedId")String relatedId,@Param("auditType")int auditType);
List<TabHaobanAudit> judgeHavePhoneNumberOrCode(@Param("enterpriseId")String enterpriseId,@Param("clerkCode")String clerkCode, @Param("phoneNumber")String phoneNumber);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/AuditSettingMapper.java → haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanAuditSettingMapper.java
......@@ -2,7 +2,7 @@ package com.gic.haoban.manage.service.dao.mapper;
import com.gic.haoban.manage.service.entity.TabHaobanAuditSetting;
public interface AuditSettingMapper {
public interface TabHaobanAuditSettingMapper {
int deleteByPrimaryKey(String settingId);
int insert(TabHaobanAuditSetting record);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanBatchAuditLogMapper.java 0 → 100644
package com.gic.haoban.manage.service.dao.mapper;
import java.util.List;
import com.gic.haoban.manage.service.entity.TabHaobanBatchAuditLog;
public interface TabHaobanBatchAuditLogMapper {
int deleteByPrimaryKey(String batchAuditLogId);
int insert(TabHaobanBatchAuditLog record);
int insertSelective(TabHaobanBatchAuditLog record);
TabHaobanBatchAuditLog selectByPrimaryKey(String batchAuditLogId);
int updateByPrimaryKeySelective(TabHaobanBatchAuditLog record);
int updateByPrimaryKey(TabHaobanBatchAuditLog record);
List<TabHaobanBatchAuditLog> listByBatchId(String batchId);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanStaffClerkRelationMapper.java 0 → 100644
package com.gic.haoban.manage.service.dao.mapper;
import java.util.List;
import java.util.Set;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
public interface TabHaobanStaffClerkRelationMapper {
int deleteByPrimaryKey(String staffClerkRelationId);
int insert(TabHaobanStaffClerkRelation record);
int insertSelective(TabHaobanStaffClerkRelation record);
TabHaobanStaffClerkRelation selectByPrimaryKey(String staffClerkRelationId);
int updateByPrimaryKeySelective(TabHaobanStaffClerkRelation record);
int updateByPrimaryKey(TabHaobanStaffClerkRelation record);
List<TabHaobanStaffClerkRelation> listBindCode(@Param("enterpriseId")String enterpriseId, @Param("clerkCodeList")Set<String> clerkCodeList);
List<TabHaobanStaffClerkRelation> listBindCodeByStaffId(@Param("enterpriseIdList")List<String> enterpriseIdList, @Param("staffId")String staffId);
TabHaobanStaffClerkRelation getOneByClerkId(@Param("clerkId")String clerkId);
/**
* 改变状态 格局clerkId
* @param clerkId
* @param status
* @return
*/
public int changeStatusByClerkId(@Param("clerkId") String clerkId,@Param("status") Integer status);
/**
* 更新信息
* @param record
* @return
*/
int updateByClerkId(TabHaobanStaffClerkRelation record);
/**
* 格局clerkId 查询staffClerkRelation
*
* @param clerkId
* @param wxEnterpriseId
* @return
*/
TabHaobanStaffClerkRelation getBindByClerkId(@Param("clerkId") String clerkId,@Param("wxEnterpriseId") String wxEnterpriseId);
TabHaobanStaffClerkRelation getByCodeAndEnterpriseId(@Param("clerkCode")String clerkCode, @Param("enterpriseId")String enterpriseId);
/**
* 解绑
*/
void delByStoreIdAndCode( @Param("storeId")String storeId,@Param("clerkCode")String clerkCode);
List<TabHaobanStaffClerkRelation> listByClerkIds(@Param("clerkIds") List<String> clerkIds);
List<TabHaobanStaffClerkRelation> listByStoreId(@Param("storeId")String storeId);
TabHaobanStaffClerkRelation getOneByStoreIdAndStaffId(@Param("storeId")String storeId,@Param("staffId")String staffId);
/**
* 解绑
*/
int cleanStaffDepart( @Param("wxEnterpriseId")String wxEnterpriseId,@Param("staffIds")List<String> staffIds);
TabHaobanStaffClerkRelation getOneBindCodeNoStatus(@Param("enterpriseId")String enterpriseId, @Param("clerkCode")String clerkCode);
TabHaobanStaffClerkRelation getOneBindStoreId(@Param("staffId")String staffId, @Param("storeId")String storeId);
TabHaobanStaffClerkRelation getByClerkId(@Param("clerkId")String clerkId);
int delByPrimaryKey(@Param("staffClerkRelationId")String staffClerkRelationId);
void delByClerkId(@Param("clerkId")String clerkId);
List<TabHaobanStaffClerkRelation>listByEnterpriseIdAndWxUserId(@Param("enterpriseId")String enterpriseId,@Param("wxUserId")String wxUserId);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanTemplateApplicationRelatedMapper.java 0 → 100644
package com.gic.haoban.manage.service.dao.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.service.entity.TabHaobanTemplateApplicationRelated;
public interface TabHaobanTemplateApplicationRelatedMapper {
int deleteByPrimaryKey(String templateApplicationRelatedId);
int insert(TabHaobanTemplateApplicationRelated record);
int insertSelective(TabHaobanTemplateApplicationRelated record);
TabHaobanTemplateApplicationRelated selectByPrimaryKey(String templateApplicationRelatedId);
int updateByPrimaryKeySelective(TabHaobanTemplateApplicationRelated record);
int updateByPrimaryKey(TabHaobanTemplateApplicationRelated record);
List<TabHaobanTemplateApplicationRelated> listTemplicationApplicationByTemplateId(@Param("applicationTemplateId")String applicationTemplateId);
TabHaobanTemplateApplicationRelated selectByTemplateIdAndApplicationId(@Param("applicationTemplateId")String applicationTemplateId,
@Param("applicationId")String applicationId);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanTemplateEnterpriseRelationMapper.java 0 → 100644
package com.gic.haoban.manage.service.dao.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.service.entity.TabHaobanTemplateEnterpriseRelation;
public interface TabHaobanTemplateEnterpriseRelationMapper {
int deleteByPrimaryKey(String templateEnterpriseRelationId);
int insert(TabHaobanTemplateEnterpriseRelation record);
int insertSelective(TabHaobanTemplateEnterpriseRelation record);
TabHaobanTemplateEnterpriseRelation selectByPrimaryKey(String templateEnterpriseRelationId);
int updateByPrimaryKeySelective(TabHaobanTemplateEnterpriseRelation record);
int updateByPrimaryKey(TabHaobanTemplateEnterpriseRelation record);
List<TabHaobanTemplateEnterpriseRelation> listEnterpriseByTemplateId(@Param("templateId")String templateId);
TabHaobanTemplateEnterpriseRelation selectByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
List<TabHaobanTemplateEnterpriseRelation> listEnterpriseByParams(@Param("applicationTemplateId")String applicationTemplateId, @Param("wxEnterpriseIds")List<String> wxEnterpriseIds,
@Param("wxEnterpriseName")String wxEnterpriseName);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanApplicationTemplate.java 0 → 100644
package com.gic.haoban.manage.service.entity;
import java.io.Serializable;
import java.util.Date;
public class TabHaobanApplicationTemplate implements Serializable {
private String applicationTemplateId;
private String applicationTemplateName;
private Integer statusFlag;
private Integer defaultFlag;
private Date createTime;
private Date updateTime;
private static final long serialVersionUID = 1L;
public String getApplicationTemplateId() {
return applicationTemplateId;
}
public void setApplicationTemplateId(String applicationTemplateId) {
this.applicationTemplateId = applicationTemplateId == null ? null : applicationTemplateId.trim();
}
public String getApplicationTemplateName() {
return applicationTemplateName;
}
public void setApplicationTemplateName(String applicationTemplateName) {
this.applicationTemplateName = applicationTemplateName == null ? null : applicationTemplateName.trim();
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Integer getDefaultFlag() {
return defaultFlag;
}
public void setDefaultFlag(Integer defaultFlag) {
this.defaultFlag = defaultFlag;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanAudit.java
......@@ -42,9 +42,19 @@ public class TabHaobanAudit implements Serializable {
private String wxEnterpriseId;
private String relatedId;
private static final long serialVersionUID = 1L;
public String getAuditId() {
public String getRelatedId() {
return relatedId;
}
public void setRelatedId(String relatedId) {
this.relatedId = relatedId;
}
public String getAuditId() {
return auditId;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanAuditSetting.java
......@@ -16,6 +16,8 @@ public class TabHaobanAuditSetting implements Serializable {
private Integer statusFlag;
private Integer clerkChangeFlag;
private static final long serialVersionUID = 1L;
public String getSettingId() {
......@@ -65,4 +67,12 @@ public class TabHaobanAuditSetting implements Serializable {
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Integer getClerkChangeFlag() {
return clerkChangeFlag;
}
public void setClerkChangeFlag(Integer clerkChangeFlag) {
this.clerkChangeFlag = clerkChangeFlag;
}
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanBatchAuditLog.java 0 → 100644
package com.gic.haoban.manage.service.entity;
import java.io.Serializable;
import java.util.Date;
public class TabHaobanBatchAuditLog implements Serializable {
private String batchAuditLogId;
private String auditId;
private String batchId;
private String enterpriseName;
private String commitName;
private Date commitTime;
private Integer auditResult;
private Integer auditType;
private Date createTime;
private Date updateTime;
private Integer status;
private static final long serialVersionUID = 1L;
public String getBatchAuditLogId() {
return batchAuditLogId;
}
public void setBatchAuditLogId(String batchAuditLogId) {
this.batchAuditLogId = batchAuditLogId == null ? null : batchAuditLogId.trim();
}
public String getAuditId() {
return auditId;
}
public void setAuditId(String auditId) {
this.auditId = auditId == null ? null : auditId.trim();
}
public String getBatchId() {
return batchId;
}
public void setBatchId(String batchId) {
this.batchId = batchId == null ? null : batchId.trim();
}
public String getEnterpriseName() {
return enterpriseName;
}
public void setEnterpriseName(String enterpriseName) {
this.enterpriseName = enterpriseName == null ? null : enterpriseName.trim();
}
public String getCommitName() {
return commitName;
}
public void setCommitName(String commitName) {
this.commitName = commitName == null ? null : commitName.trim();
}
public Date getCommitTime() {
return commitTime;
}
public void setCommitTime(Date commitTime) {
this.commitTime = commitTime;
}
public Integer getAuditResult() {
return auditResult;
}
public void setAuditResult(Integer auditResult) {
this.auditResult = auditResult;
}
public Integer getAuditType() {
return auditType;
}
public void setAuditType(Integer auditType) {
this.auditType = auditType;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanMaidianLog.java
......@@ -53,6 +53,10 @@ public class TabHaobanMaidianLog implements Serializable {
private Date createTime;
private Date updateTime;
private String clerkId;
private String enterpriseId;
private static final long serialVersionUID = 1L;
......@@ -255,6 +259,22 @@ public class TabHaobanMaidianLog implements Serializable {
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanStaffClerkRelation.java 0 → 100644
package com.gic.haoban.manage.service.entity;
import java.io.Serializable;
import java.util.Date;
public class TabHaobanStaffClerkRelation implements Serializable {
private String staffClerkRelationId;
private String staffId;
private String wxEnterpriseId;
private String wxUserId;
private String enterpriseId;
private String storeId;
private String clerkId;
private String clerkCode;
private Integer statusFlag;
private Date createTime;
private Date updateTime;
private static final long serialVersionUID = 1L;
public String getStaffClerkRelationId() {
return staffClerkRelationId;
}
public void setStaffClerkRelationId(String staffClerkRelationId) {
this.staffClerkRelationId = staffClerkRelationId == null ? null : staffClerkRelationId.trim();
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId == null ? null : staffId.trim();
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId == null ? null : wxUserId.trim();
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId == null ? null : enterpriseId.trim();
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId == null ? null : storeId.trim();
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId == null ? null : clerkId.trim();
}
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode == null ? null : clerkCode.trim();
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanTemplateApplicationRelated.java 0 → 100644
package com.gic.haoban.manage.service.entity;
import java.io.Serializable;
import java.util.Date;
public class TabHaobanTemplateApplicationRelated implements Serializable {
private String templateApplicationRelatedId;
private String applicationId;
private String templateId;
private Integer statusFlag;
private Date createTime;
private Date updateTime;
private static final long serialVersionUID = 1L;
public String getTemplateApplicationRelatedId() {
return templateApplicationRelatedId;
}
public void setTemplateApplicationRelatedId(String templateApplicationRelatedId) {
this.templateApplicationRelatedId = templateApplicationRelatedId == null ? null : templateApplicationRelatedId.trim();
}
public String getApplicationId() {
return applicationId;
}
public void setApplicationId(String applicationId) {
this.applicationId = applicationId == null ? null : applicationId.trim();
}
public String getTemplateId() {
return templateId;
}
public void setTemplateId(String templateId) {
this.templateId = templateId == null ? null : templateId.trim();
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanTemplateEnterpriseRelation.java 0 → 100644
package com.gic.haoban.manage.service.entity;
import java.io.Serializable;
import java.util.Date;
public class TabHaobanTemplateEnterpriseRelation implements Serializable {
private String templateEnterpriseRelationId;
private String wxEnterpriseId;
private String applicationTemplateId;
private Integer statusFlag;
private String wxEnterpriseName;
private Date createTime;
private Date updateTime;
private static final long serialVersionUID = 1L;
public String getTemplateEnterpriseRelationId() {
return templateEnterpriseRelationId;
}
public void setTemplateEnterpriseRelationId(String templateEnterpriseRelationId) {
this.templateEnterpriseRelationId = templateEnterpriseRelationId == null ? null : templateEnterpriseRelationId.trim();
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
}
public String getApplicationTemplateId() {
return applicationTemplateId;
}
public void setApplicationTemplateId(String applicationTemplateId) {
this.applicationTemplateId = applicationTemplateId == null ? null : applicationTemplateId.trim();
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getWxEnterpriseName() {
return wxEnterpriseName;
}
public void setWxEnterpriseName(String wxEnterpriseName) {
this.wxEnterpriseName = wxEnterpriseName;
}
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanWxEnterpriseRelated.java
......@@ -17,6 +17,10 @@ public class TabHaobanWxEnterpriseRelated implements Serializable {
private Date createTime;
private Date updateTime;
private String staffId;
private String staffName;
private static final long serialVersionUID = 1L;
......@@ -75,4 +79,22 @@ public class TabHaobanWxEnterpriseRelated implements Serializable {
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabSecretSetting.java 0 → 100644
package com.gic.haoban.manage.service.entity;
import java.io.Serializable;
import java.util.Date;
/**
* Created By MBG-GUI-EXTENSION https://github.com/spawpaw/mybatis-generator-gui-extension
* Description:
* secret配置表
* @author fdh
*/
public class TabSecretSetting implements Serializable {
/**
*
*/
private String secretId;
/**
* 企业微信id
*
*/
private String wxEnterpriseId;
/**
* 名称
*
*/
private String secretName;
/**
* 值
*
*/
private String secretVal;
/**
* gic企业id 会员小程序用到
*
*/
private String enterpriseId;
/**
* 类型 0 客户联系secret 2通讯录secret 3好办助手 4会员小程序
*
*/
private Integer secretType;
/**
* 0 校验失败 1校验成果
*
*/
private Integer checkFlag;
/**
* 0 删除 1正常
*
*/
private Integer statusFlag;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
/**
*/
private static final long serialVersionUID = 1L;
/**
* This method returns the value of the database column tab_haoban_secret_setting.secret_id
*
* @return the value of tab_haoban_secret_setting.secret_id
*/
public String getSecretId() {
return secretId;
}
/**
* This method sets the value of the database column tab_haoban_secret_setting.secret_id
*
* @param secretId the value for tab_haoban_secret_setting.secret_id
*/
public void setSecretId(String secretId) {
this.secretId = secretId;
}
/**
* This method returns the value of the database column tab_haoban_secret_setting.wx_enterprise_id
*
* @return the value of tab_haoban_secret_setting.wx_enterprise_id
*/
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
/**
* This method sets the value of the database column tab_haoban_secret_setting.wx_enterprise_id
*
* @param wxEnterpriseId the value for tab_haoban_secret_setting.wx_enterprise_id
*/
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
/**
* This method returns the value of the database column tab_haoban_secret_setting.secret_name
*
* @return the value of tab_haoban_secret_setting.secret_name
*/
public String getSecretName() {
return secretName;
}
/**
* This method sets the value of the database column tab_haoban_secret_setting.secret_name
*
* @param secretName the value for tab_haoban_secret_setting.secret_name
*/
public void setSecretName(String secretName) {
this.secretName = secretName;
}
/**
* This method returns the value of the database column tab_haoban_secret_setting.secret_val
*
* @return the value of tab_haoban_secret_setting.secret_val
*/
public String getSecretVal() {
return secretVal;
}
/**
* This method sets the value of the database column tab_haoban_secret_setting.secret_val
*
* @param secretVal the value for tab_haoban_secret_setting.secret_val
*/
public void setSecretVal(String secretVal) {
this.secretVal = secretVal;
}
/**
* This method returns the value of the database column tab_haoban_secret_setting.enterprise_id
*
* @return the value of tab_haoban_secret_setting.enterprise_id
*/
public String getEnterpriseId() {
return enterpriseId;
}
/**
* This method sets the value of the database column tab_haoban_secret_setting.enterprise_id
*
* @param enterpriseId the value for tab_haoban_secret_setting.enterprise_id
*/
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
/**
* This method returns the value of the database column tab_haoban_secret_setting.secret_type
*
* @return the value of tab_haoban_secret_setting.secret_type
*/
public Integer getSecretType() {
return secretType;
}
/**
* This method sets the value of the database column tab_haoban_secret_setting.secret_type
*
* @param secretType the value for tab_haoban_secret_setting.secret_type
*/
public void setSecretType(Integer secretType) {
this.secretType = secretType;
}
/**
* This method returns the value of the database column tab_haoban_secret_setting.check_flag
*
* @return the value of tab_haoban_secret_setting.check_flag
*/
public Integer getCheckFlag() {
return checkFlag;
}
/**
* This method sets the value of the database column tab_haoban_secret_setting.check_flag
*
* @param checkFlag the value for tab_haoban_secret_setting.check_flag
*/
public void setCheckFlag(Integer checkFlag) {
this.checkFlag = checkFlag;
}
/**
* This method returns the value of the database column tab_haoban_secret_setting.status_flag
*
* @return the value of tab_haoban_secret_setting.status_flag
*/
public Integer getStatusFlag() {
return statusFlag;
}
/**
* This method sets the value of the database column tab_haoban_secret_setting.status_flag
*
* @param statusFlag the value for tab_haoban_secret_setting.status_flag
*/
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
/**
* This method returns the value of the database column tab_haoban_secret_setting.create_time
*
* @return the value of tab_haoban_secret_setting.create_time
*/
public Date getCreateTime() {
return createTime;
}
/**
* This method sets the value of the database column tab_haoban_secret_setting.create_time
*
* @param createTime the value for tab_haoban_secret_setting.create_time
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* This method returns the value of the database column tab_haoban_secret_setting.update_time
*
* @return the value of tab_haoban_secret_setting.update_time
*/
public Date getUpdateTime() {
return updateTime;
}
/**
* This method sets the value of the database column tab_haoban_secret_setting.update_time
*
* @param updateTime the value for tab_haoban_secret_setting.update_time
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/BinlogBasePojo.java 0 → 100644
package com.gic.haoban.manage.service.pojo;
import com.gic.binlog.base.entity.enums.GicRecordType;
import java.io.Serializable;
/**
* Created 2020/5/27.
*
* @author hua
*/
public class BinlogBasePojo implements Serializable {
protected int recordType;
protected String prefix;
public void setRecordType(int recordType) {
this.recordType = recordType;
}
public int getRecordType() {
return recordType;
}
public String getPrefix() {
return prefix;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/ClerkSyncPojo.java 0 → 100644
package com.gic.haoban.manage.service.pojo;
import com.alibaba.fastjson.annotation.JSONField;
import java.io.Serializable;
/**
* Created 2020/5/27.
*
* @author hua
*/
public class ClerkSyncPojo extends BinlogBasePojo {
@JSONField(name = "clerk_id")
private String clerkId;
@JSONField(name = "storeId")
private String storeId;
@JSONField(name = "clerk_code")
private String clerkCode;
@JSONField(name = "enterprise_id")
private String enterpriseId;
private Integer status;
private Integer oldStatus;
public Integer getOldStatus() {
return oldStatus;
}
public void setOldStatus(Integer oldStatus) {
this.oldStatus = oldStatus;
}
public ClerkSyncPojo() {
prefix="clerk";
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/ApplicationTemplateService.java 0 → 100644
package com.gic.haoban.manage.service.service;
import java.util.List;
import com.gic.haoban.manage.api.dto.ApplicationTemplateDTO;
public interface ApplicationTemplateService {
ApplicationTemplateDTO selectByTemplateName(String templateName);
String insertTemplate(ApplicationTemplateDTO template);
void delTemplate(String templateId);
ApplicationTemplateDTO selectByTemplateId(String applicationTemplateId);
void editTemplate(ApplicationTemplateDTO old);
List<ApplicationTemplateDTO> listByTemplateName(String applicationTemplateName);
ApplicationTemplateDTO selectDefaultTemplate();
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/DepartmentService.java
......@@ -3,6 +3,7 @@ package com.gic.haoban.manage.service.service;
import java.util.List;
import com.gic.haoban.manage.api.dto.DepartmentDTO;
import com.gic.haoban.manage.api.dto.DepartmentShortDTO;
import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
import com.github.pagehelper.Page;
......@@ -56,4 +57,34 @@ public interface DepartmentService {
Integer totalStoreCountByEnterpriseId(String wxEnterpriseId);
/**
* 清空数据
* @param wxEnterpriseId
* @param wxDepartmentList
* @return
*/
Integer cleanDepartment(String wxEnterpriseId,List<String> wxDepartmentList);
/**
* 清空数据
* @param wxEnterpriseId
* @param wxDepartmentList
* @return
*/
List<DepartmentDTO> listDepartmentByWxDepartIds(String wxEnterpriseId,List<String> wxDepartmentList);
/**
* 搜索 返回10条
* @param search
* @param wxEnterpriseId
* @return
*/
List<DepartmentShortDTO> searchDepartment(String search,String wxEnterpriseId);
/**
* 获取搜友部门
* @param wxEnterpriseId
* @return
*/
List<DepartmentShortDTO> listAllDepartment(String wxEnterpriseId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/SecretSettingService.java 0 → 100644
package com.gic.haoban.manage.service.service;
import com.gic.haoban.manage.api.dto.SecretSettingDTO;
import com.gic.haoban.manage.service.entity.TabSecretSetting;
import java.util.List;
/**
* Created 2020/6/3.
*
* @author hua
*/
public interface SecretSettingService {
/**
* 保存配置
* @param secretSetting
* @return
*/
public boolean saveSecretSetting(SecretSettingDTO secretSetting);
/**
* 删除配置
* @param secretId
* @return
*/
public boolean delSecretSetting(String secretId);
/**
* 根据企业查询配置项目
* @param wxEnterpriseId
* @return
*/
public List<SecretSettingDTO> listSecretSetting(String wxEnterpriseId);
/**
* 根据非会员小程序类型获取
* @param wxEnterpriseId
* @param secretType
* @return
*/
public SecretSettingDTO getSecretSetting(String wxEnterpriseId,int secretType);
/**
* 根据会员小程序类型获取
* @param wxEnterpriseId
* @param enterpriseId
* @return
*/
public SecretSettingDTO getMemberSecretSetting(String wxEnterpriseId,String enterpriseId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffClerkRelationService.java 0 → 100644
package com.gic.haoban.manage.service.service;
import java.util.List;
import java.util.Set;
import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
import org.apache.ibatis.annotations.Param;
public interface StaffClerkRelationService {
List<StaffClerkRelationDTO> listBindCode(String enterpriseId, Set<String> clerkCodeList);
List<StaffClerkRelationDTO> listBindCodeByStaffId(List<String> enterpriseIdList, String staffId);
/**
* 删除绑定
* @param clerkId
* @return
*/
public boolean delBind(String clerkId);
/**
* 绑定
* @param dto
* @return
*/
public boolean bind(StaffClerkRelationDTO dto);
/**
* 根据clerkId 更新数据
* @param dto
* @return
*/
public boolean updateByClerkId(StaffClerkRelationDTO dto);
/**
* 查询绑定根据clerkId
* @param clerkId
* @param wxEnterpriseId
* @return
*/
public StaffClerkRelationDTO getBindByClerkId(String clerkId,String wxEnterpriseId);
StaffClerkRelationDTO getByCodeAndEnterpriseId(String clerkCode, String enterpriseId);
String insert(StaffClerkRelationDTO staffClerkRelation);
public int cleanStaffClerk( String wxEnterpriseId, List<String> staffIds);
StaffClerkRelationDTO getOneBindCodeNoStatus(String enterpriseId, String clerkCode);
StaffClerkRelationDTO getOneBindByStoreId(String staffId, String storeId);
StaffClerkRelationDTO getByClerkId(String clerkId);
List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkList);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffDepartmentRelatedService.java
......@@ -24,11 +24,21 @@ public interface StaffDepartmentRelatedService {
int countByDepartmentId(String departmentId);
List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(String departmentId, String keyword);
List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(List<String> departmentId, String keyword);
List<TabHaobanStaffDepartmentRelated> listByWxUserId(String wxUserId);
StaffDepartmentRelatedDTO getById(String staffDepartmentStaffRelatedId);
/**
* 清空stafff
* @param wxEnterpriseId
* @param staffIds
* @return
*/
public int cleanStaffDepartment(String wxEnterpriseId,List<String> staffIds);
public int update(TabHaobanStaffDepartmentRelated tab);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffService.java
......@@ -6,6 +6,7 @@ import java.util.Set;
import com.gic.haoban.manage.api.dto.StaffDTO;
import com.gic.haoban.manage.service.entity.TabHaobanStaff;
import com.github.pagehelper.Page;
import org.apache.ibatis.annotations.Param;
public interface StaffService {
......@@ -25,4 +26,13 @@ public interface StaffService {
List<StaffDTO> listByUserIdsAndWxEnterpriseId(List<String> userIds, String wxEnterpriseId);
/**
* 清楚微信信息
* @param wxEnterpriseId
* @return
*/
public int cleanStaff(String wxEnterpriseId, List<String> staffIds);
TabHaobanStaff getWxStaffByOne( String wxEnterpriseId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/TemplateApplicationRelatedService.java 0 → 100644
package com.gic.haoban.manage.service.service;
import java.util.List;
import com.gic.haoban.manage.service.entity.TabHaobanTemplateApplicationRelated;
public interface TemplateApplicationRelatedService {
void insert(TabHaobanTemplateApplicationRelated tab);
void update(String applicationTemplateId, String applicationIds);
List<TabHaobanTemplateApplicationRelated> listByTemplateId(String applicationTemplateId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/TemplateEnterpriseRelatedService.java 0 → 100644
package com.gic.haoban.manage.service.service;
import java.util.List;
import com.gic.haoban.manage.api.dto.TemplateEnterpriseRelatedDTO;
public interface TemplateEnterpriseRelatedService {
List<TemplateEnterpriseRelatedDTO> listEnterpriseByTemplateId(String templateId);
TemplateEnterpriseRelatedDTO selectByWxEnterpriseId(String wxEnterpriseId);
void insert(TemplateEnterpriseRelatedDTO dto);
void update(TemplateEnterpriseRelatedDTO dto);
List<TemplateEnterpriseRelatedDTO> listEnterpriseByParams(String applicationTemplateId, List<String> wxEnterpriseIds, String wxEnterpriseName);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/ApplicationTemplateServiceImpl.java 0 → 100644
package com.gic.haoban.manage.service.service.impl;
import java.util.Date;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.gic.commons.util.EntityUtil;
import com.gic.haoban.common.utils.StringUtil;
import com.gic.haoban.manage.api.dto.ApplicationTemplateDTO;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanApplicationTemplateMapper;
import com.gic.haoban.manage.service.entity.TabHaobanApplicationTemplate;
import com.gic.haoban.manage.service.service.ApplicationTemplateService;
@Service
public class ApplicationTemplateServiceImpl implements ApplicationTemplateService {
@Autowired
private TabHaobanApplicationTemplateMapper mapper;
@Override
public ApplicationTemplateDTO selectByTemplateName(String templateName) {
return EntityUtil.changeEntityByJSON(ApplicationTemplateDTO.class,mapper.selectByTemplateName(templateName));
}
@Override
public String insertTemplate(ApplicationTemplateDTO template) {
String uuId = StringUtil.randomUUID();
template.setApplicationTemplateId(uuId);
template.setCreateTime(new Date());
template.setUpdateTime(new Date());
template.setStatusFlag(1);
mapper.insertSelective(EntityUtil.changeEntityByJSON(TabHaobanApplicationTemplate.class, template));
return uuId;
}
@Override
public void delTemplate(String templateId) {
mapper.deleteByPrimaryKey(templateId);
}
@Override
public ApplicationTemplateDTO selectByTemplateId(String applicationTemplateId) {
return EntityUtil.changeEntityByJSON(ApplicationTemplateDTO.class, mapper.selectByPrimaryKey(applicationTemplateId));
}
@Override
public void editTemplate(ApplicationTemplateDTO old) {
old.setUpdateTime(new Date());
mapper.updateByPrimaryKeySelective(EntityUtil.changeEntityByJSON(TabHaobanApplicationTemplate.class, old));
}
@Override
public List<ApplicationTemplateDTO> listByTemplateName(String applicationTemplateName) {
return EntityUtil.changeEntityListByJSON(ApplicationTemplateDTO.class, mapper.listByTemplateName(applicationTemplateName));
}
@Override
public ApplicationTemplateDTO selectDefaultTemplate() {
return EntityUtil.changeEntityByJSON(ApplicationTemplateDTO.class, mapper.selectDefaultTemplate());
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/DepartmentServiceImpl.java
......@@ -4,6 +4,7 @@ import java.util.Date;
import java.util.List;
import com.gic.haoban.base.api.common.Constant;
import com.gic.haoban.manage.api.dto.DepartmentShortDTO;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -195,4 +196,25 @@ public class DepartmentServiceImpl implements DepartmentService {
public Integer totalStoreCountByEnterpriseId(String wxEnterpriseId) {
return mapper.totalStoreCountByEnterpriseId(wxEnterpriseId);
}
@Override
public Integer cleanDepartment(String wxEnterpriseId, List<String> wxDepartmentList) {
return mapper.cleanDepartment(wxEnterpriseId,wxDepartmentList);
}
@Override
public List<DepartmentDTO> listDepartmentByWxDepartIds(String wxEnterpriseId, List<String> wxDepartmentList) {
return EntityUtil.changeEntityListByJSON(DepartmentDTO.class, mapper.listDepartmentByWxDepartIds(wxEnterpriseId,wxDepartmentList));
}
@Override
public List<DepartmentShortDTO> searchDepartment(String search, String wxEnterpriseId) {
return EntityUtil.changeEntityListByJSON(DepartmentShortDTO.class, mapper.searchDepartment(search,wxEnterpriseId));
}
@Override
public List<DepartmentShortDTO> listAllDepartment(String wxEnterpriseId) {
return EntityUtil.changeEntityListByJSON(DepartmentShortDTO.class, mapper.listAllDepartment(wxEnterpriseId));
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/SecretSettingServiceImpl.java 0 → 100644
package com.gic.haoban.manage.service.service.impl;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.ToolUtil;
import com.gic.haoban.manage.api.dto.SecretSettingDTO;
import com.gic.haoban.manage.api.enums.SecretTypeEnum;
import com.gic.haoban.manage.service.dao.mapper.SecretSettingMapper;
import com.gic.haoban.manage.service.entity.TabSecretSetting;
import com.gic.haoban.manage.service.service.SecretSettingService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
* Created 2020/6/3.
*
* @author hua
*/
@Service
public class SecretSettingServiceImpl implements SecretSettingService {
private static final Logger logger= LoggerFactory.getLogger(SecretSettingServiceImpl.class);
@Autowired
private SecretSettingMapper secretSettingMapper;
@Override
public boolean saveSecretSetting(SecretSettingDTO secretSetting) {
if (secretSetting.getSecretId()!=null) {
secretSetting.setUpdateTime(new Date());
secretSettingMapper.updateByPrimaryKeySelective(EntityUtil.changeEntityByJSON(TabSecretSetting.class,secretSetting));
return true;
}else{
secretSetting.setSecretId(ToolUtil.randomUUID());
secretSetting.setCreateTime(new Date());
secretSetting.setUpdateTime(new Date());
secretSetting.setStatusFlag(1);
secretSettingMapper.insert(EntityUtil.changeEntityByJSON(TabSecretSetting.class,secretSetting));
return true;
}
}
@Override
public boolean delSecretSetting(String secretId) {
TabSecretSetting tabSecretSetting = new TabSecretSetting();
tabSecretSetting.setSecretId(secretId);
tabSecretSetting.setStatusFlag(0);
tabSecretSetting.setUpdateTime(new Date());
int i = secretSettingMapper.updateByPrimaryKeySelective(tabSecretSetting);
return i>0;
}
@Override
public List<SecretSettingDTO> listSecretSetting(String wxEnterpriseId) {
List<TabSecretSetting> list = secretSettingMapper.listSecretSetting(wxEnterpriseId);
return EntityUtil.changeEntityListByJSON(SecretSettingDTO.class,list);
}
@Override
public SecretSettingDTO getSecretSetting(String wxEnterpriseId, int secretType) {
if (secretType == SecretTypeEnum.MEMBER_WAPP.getVal()) {
logger.info("会员小程序配置使用getMemberSecretSetting接口");
return null;
}
TabSecretSetting secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, secretType, null);
return EntityUtil.changeEntityByJSON(SecretSettingDTO.class,secretSetting);
}
@Override
public SecretSettingDTO getMemberSecretSetting(String wxEnterpriseId, String enterpriseId) {
TabSecretSetting secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, SecretTypeEnum.MEMBER_WAPP.getVal(), enterpriseId);
return EntityUtil.changeEntityByJSON(SecretSettingDTO.class,secretSetting);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java 0 → 100644
package com.gic.haoban.manage.service.service.impl;
import java.util.Date;
import java.util.List;
import java.util.Set;
import com.alibaba.fastjson.JSONObject;
import com.gic.commons.util.ToolUtil;
import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
import javafx.scene.control.Tab;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.gic.commons.util.EntityUtil;
import com.gic.haoban.common.utils.StringUtil;
import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
import com.gic.haoban.manage.service.service.StaffClerkRelationService;
@Service
public class StaffClerkRelationServiceImpl implements StaffClerkRelationService {
private static final Logger logger= LoggerFactory.getLogger(StaffClerkRelationServiceImpl.class);
@Autowired
private TabHaobanStaffClerkRelationMapper mapper;
@Override
public List<StaffClerkRelationDTO> listBindCode(String enterpriseId, Set<String> clerkCodeList) {
return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, mapper.listBindCode(enterpriseId,clerkCodeList));
}
@Override
public List<StaffClerkRelationDTO> listBindCodeByStaffId(List<String> enterpriseIdList, String staffId) {
return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, mapper.listBindCodeByStaffId(enterpriseIdList,staffId));
}
@Override
public boolean delBind(String clerkId) {
int i = mapper.changeStatusByClerkId(clerkId, 0);
return i>=0;
}
@Override
public boolean bind(StaffClerkRelationDTO dto) {
dto.setStaffClerkRelationId(ToolUtil.randomUUID());
dto.setStatusFlag(1);
dto.setCreateTime(new Date());
dto.setUpdateTime(new Date());
int insert = mapper.insert(EntityUtil.changeEntityByJSON(TabHaobanStaffClerkRelation.class, dto));
return insert>0;
}
@Override
public boolean updateByClerkId(StaffClerkRelationDTO dto) {
if (StringUtils.isAnyBlank(dto.getClerkCode(),dto.getClerkId(),dto.getStoreId())) {
logger.info("操作不对：{}", JSONObject.toJSONString(dto));
return false;
}
int i = mapper.updateByClerkId(EntityUtil.changeEntityByJSON(TabHaobanStaffClerkRelation.class, dto));
return i>=0;
}
@Override
public StaffClerkRelationDTO getBindByClerkId(String clerkId, String wxEnterpriseId) {
TabHaobanStaffClerkRelation relation = mapper.getBindByClerkId(clerkId, wxEnterpriseId);
return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class,relation);
}
@Override
public StaffClerkRelationDTO getByCodeAndEnterpriseId(String clerkCode, String enterpriseId) {
return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class, mapper.getByCodeAndEnterpriseId(clerkCode,enterpriseId));
}
@Override
public String insert(StaffClerkRelationDTO staffClerkRelation) {
String uuid = StringUtil.randomUUID();
staffClerkRelation.setStaffClerkRelationId(uuid);
staffClerkRelation.setCreateTime(new Date());
staffClerkRelation.setUpdateTime(new Date());
staffClerkRelation.setStatusFlag(1);
TabHaobanStaffClerkRelation relation = EntityUtil.changeEntityByJSON(TabHaobanStaffClerkRelation.class, staffClerkRelation);
mapper.insert(relation);
return uuid;
}
@Override
public int cleanStaffClerk(String wxEnterpriseId, List<String> staffIds) {
return mapper.cleanStaffDepart(wxEnterpriseId,staffIds);
}
@Override
public StaffClerkRelationDTO getOneBindCodeNoStatus(String enterpriseId, String clerkCode) {
return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class,mapper.getOneBindCodeNoStatus(enterpriseId,clerkCode));
}
@Override
public StaffClerkRelationDTO getOneBindByStoreId(String staffId, String storeId) {
return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class,mapper.getOneBindStoreId(staffId,storeId));
}
@Override
public StaffClerkRelationDTO getByClerkId(String clerkId) {
return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class,mapper.getByClerkId(clerkId));
}
@Override
public List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkList) {
return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class,mapper.listByClerkIds(clerkList));
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffDepartmentRelatedServiceImpl.java
package com.gic.haoban.manage.service.service.impl;
import java.util.Collections;
import java.util.Date;
import java.util.List;
......@@ -81,13 +82,24 @@ public class StaffDepartmentRelatedServiceImpl implements StaffDepartmentRelated
}
@Override
public List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(String departmentId, String keyword) {
return mapper.listByDepartmentIdByKeyword(departmentId,keyword);
public List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(List<String> departmentIds, String keyword) {
if(departmentIds == null || departmentIds.isEmpty()){
return Collections.EMPTY_LIST;
}
return mapper.listByDepartmentIdByKeyword(departmentIds,keyword);
}
@Override
public StaffDepartmentRelatedDTO getById(String staffDepartmentStaffRelatedId) {
return EntityUtil.changeEntityByJSON(StaffDepartmentRelatedDTO.class, mapper.getById(staffDepartmentStaffRelatedId));
}
@Override
public int cleanStaffDepartment(String wxEnterpriseId, List<String> staffIds) {
return mapper.cleanStaffDepartment(wxEnterpriseId,staffIds);
}
@Override
public int update(TabHaobanStaffDepartmentRelated tab) {
return mapper.updateByPrimaryKeySelective(tab);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffServiceImpl.java
......@@ -66,6 +66,7 @@ public class StaffServiceImpl implements StaffService {
@Override
public void updateByPrimaryKey(TabHaobanStaff tab) {
tab.setUpdateTime(new Date());
mapper.updateByPrimaryKeySelective(tab);
}
......@@ -82,4 +83,13 @@ public class StaffServiceImpl implements StaffService {
return EntityUtil.changeEntityListByJSON(StaffDTO.class, this.mapper.listByUserIdsAndWxEnterpriseId(userIds,wxEnterpriseId));
}
@Override
public int cleanStaff(String wxEnterpriseId, List<String> staffIds) {
return mapper.cleanStaff(wxEnterpriseId,staffIds);
}
@Override
public TabHaobanStaff getWxStaffByOne(String wxEnterpriseId) {
return mapper.getWxStaffByOne(wxEnterpriseId);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/TemplateApplicationRelatedServiceImpl.java 0 → 100644
package com.gic.haoban.manage.service.service.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.gic.haoban.common.utils.StringUtil;
import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanTemplateApplicationRelatedMapper;
import com.gic.haoban.manage.service.entity.TabHaobanTemplateApplicationRelated;
import com.gic.haoban.manage.service.service.TemplateApplicationRelatedService;
@Service
public class TemplateApplicationRelatedServiceImpl implements TemplateApplicationRelatedService {
@Autowired
private TabHaobanTemplateApplicationRelatedMapper mapper;
@Override
public void insert(TabHaobanTemplateApplicationRelated tab) {
tab.setTemplateApplicationRelatedId(StringUtil.randomUUID());
tab.setStatusFlag(1);
tab.setCreateTime(new Date());
tab.setUpdateTime(new Date());
mapper.insertSelective(tab);
}
@Override
public void update(String applicationTemplateId, String applicationIds) {
List<TabHaobanTemplateApplicationRelated> list = mapper.listTemplicationApplicationByTemplateId(applicationTemplateId);
List<String> idList = list.stream().map(TabHaobanTemplateApplicationRelated::getApplicationId).collect(Collectors.toList());
List<String> delIdList = new ArrayList<String>();
for (String string : idList) {
if(applicationIds.contains(string)){
continue;
}
delIdList.add(string);
}
//删除应用
for (String applicationId : delIdList) {
TabHaobanTemplateApplicationRelated tab = mapper.selectByTemplateIdAndApplicationId(applicationTemplateId,applicationId);
if(tab != null){
tab.setStatusFlag(0);
tab.setUpdateTime(new Date());
mapper.updateByPrimaryKeySelective(tab);
}
}
//新增应用
String[] applicationIdArr = applicationIds.split(",");
for (String applicationId : applicationIdArr) {
TabHaobanTemplateApplicationRelated tab = mapper.selectByTemplateIdAndApplicationId(applicationTemplateId,applicationId);
if(tab != null){
continue;
}
tab = new TabHaobanTemplateApplicationRelated();
tab.setTemplateId(applicationTemplateId);
tab.setApplicationId(applicationId);
this.insert(tab);
}
}
@Override
public List<TabHaobanTemplateApplicationRelated> listByTemplateId(String applicationTemplateId) {
return mapper.listTemplicationApplicationByTemplateId(applicationTemplateId);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/TemplateEnterpriseRelatedServiceImpl.java 0 → 100644
package com.gic.haoban.manage.service.service.impl;
import java.util.Date;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.gic.commons.util.EntityUtil;
import com.gic.haoban.common.utils.StringUtil;
import com.gic.haoban.manage.api.dto.TemplateEnterpriseRelatedDTO;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanTemplateEnterpriseRelationMapper;
import com.gic.haoban.manage.service.entity.TabHaobanTemplateEnterpriseRelation;
import com.gic.haoban.manage.service.service.TemplateEnterpriseRelatedService;
@Service
public class TemplateEnterpriseRelatedServiceImpl implements TemplateEnterpriseRelatedService {
@Autowired
private TabHaobanTemplateEnterpriseRelationMapper mapper;
@Override
public List<TemplateEnterpriseRelatedDTO> listEnterpriseByTemplateId(String templateId) {
return EntityUtil.changeEntityListByJSON(TemplateEnterpriseRelatedDTO.class, mapper.listEnterpriseByTemplateId(templateId));
}
@Override
public TemplateEnterpriseRelatedDTO selectByWxEnterpriseId(String wxEnterpriseId) {
return EntityUtil.changeEntityByJSON(TemplateEnterpriseRelatedDTO.class, mapper.selectByWxEnterpriseId(wxEnterpriseId));
}
@Override
public void insert(TemplateEnterpriseRelatedDTO dto) {
dto.setTemplateEnterpriseRelationId(StringUtil.randomUUID());
dto.setCreateTime(new Date());
dto.setUpdateTime(new Date());
dto.setStatusFlag(1);
mapper.insert(EntityUtil.changeEntityByJSON(TabHaobanTemplateEnterpriseRelation.class, dto));
}
@Override
public void update(TemplateEnterpriseRelatedDTO dto) {
dto.setUpdateTime(new Date());
mapper.updateByPrimaryKeySelective(EntityUtil.changeEntityByJSON(TabHaobanTemplateEnterpriseRelation.class, dto));
}
@Override
public List<TemplateEnterpriseRelatedDTO> listEnterpriseByParams(String applicationTemplateId, List<String> wxEnterpriseIds,
String wxEnterpriseName) {
return EntityUtil.changeEntityListByJSON(TemplateEnterpriseRelatedDTO.class, mapper.listEnterpriseByParams(applicationTemplateId,wxEnterpriseIds,wxEnterpriseName));
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ApplicationApiServiceImpl.java
package com.gic.haoban.manage.service.service.out.impl;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
......@@ -11,13 +12,21 @@ import cn.hutool.core.collection.CollectionUtil;
import com.gic.commons.util.EntityUtil;
import com.gic.haoban.manage.api.dto.ApplicationDTO;
import com.gic.haoban.manage.api.dto.ApplicationTemplateDTO;
import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
import com.gic.haoban.manage.api.dto.TemplateEnterpriseRelatedDTO;
import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
import com.gic.haoban.manage.api.service.ApplicationApiService;
import com.gic.haoban.manage.service.dao.mapper.ApplicationMapper;
import com.gic.haoban.manage.service.entity.TabHaobanApplication;
import com.gic.haoban.manage.service.entity.TabHaobanTemplateApplicationRelated;
import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseApplicationRelated;
import com.gic.haoban.manage.service.service.ApplicationService;
import com.gic.haoban.manage.service.service.ApplicationTemplateService;
import com.gic.haoban.manage.service.service.TemplateApplicationRelatedService;
import com.gic.haoban.manage.service.service.TemplateEnterpriseRelatedService;
import com.gic.haoban.manage.service.service.WxEnterpriseApplicationRelatedService;
import com.gic.haoban.manage.service.service.WxEnterpriseService;
import org.springframework.stereotype.Service;
......@@ -30,6 +39,14 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
private ApplicationMapper applicationMapper;
@Autowired
private WxEnterpriseApplicationRelatedService wxEnterpriseApplicationRelatedService;
@Autowired
private TemplateEnterpriseRelatedService templateEnterpriseRelatedService;
@Autowired
private TemplateApplicationRelatedService templateApplicationRelatedService;
@Autowired
private ApplicationTemplateService applicationTemplateService;
@Autowired
private WxEnterpriseService wxEnterpriseService;
@Override
public List<ApplicationDTO> listApplication() {
List<TabHaobanApplication> list = applicationService.listApplication();
......@@ -53,8 +70,14 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
@Override
public List<ApplicationDTO> listApplicationByWxEnterpriseId(String wxEnterpriseId) {
List<TabHaobanApplication> list = applicationService.listApplication();
List<TabHaobanWxEnterpriseApplicationRelated> relatedList = wxEnterpriseApplicationRelatedService.listByWxEnterpriseId(wxEnterpriseId);
List<String> applicationIds = relatedList.stream().map(s->s.getApplicationId()).collect(Collectors.toList());
TemplateEnterpriseRelatedDTO template = templateEnterpriseRelatedService.selectByWxEnterpriseId(wxEnterpriseId);
if(template == null){
return Collections.EMPTY_LIST;
}
List<TabHaobanTemplateApplicationRelated> applicatinList = templateApplicationRelatedService.listByTemplateId(template.getApplicationTemplateId());
//List<TabHaobanWxEnterpriseApplicationRelated> relatedList = wxEnterpriseApplicationRelatedService.listByWxEnterpriseId(wxEnterpriseId);
List<String> applicationIds = applicatinList.stream().map(s->s.getApplicationId()).collect(Collectors.toList());
List<TabHaobanApplication> result = new ArrayList<TabHaobanApplication>();
for (TabHaobanApplication tabHaobanApplication : list) {
if(applicationIds.contains(tabHaobanApplication.getApplicationId())){
......@@ -67,9 +90,23 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
@Override
public void insertApplicationRelation(String wxEnterpriseId) {
List<TabHaobanApplication> list = applicationService.listApplication();
Set<String> applicationSet = list.stream().map(TabHaobanApplication::getApplicationId).collect(Collectors.toSet());
wxEnterpriseApplicationRelatedService.saveEnterpriseApplicationRelateds(applicationSet, wxEnterpriseId);
TemplateEnterpriseRelatedDTO dto = templateEnterpriseRelatedService.selectByWxEnterpriseId(wxEnterpriseId);
if(dto == null){
ApplicationTemplateDTO defaultTemplate = applicationTemplateService.selectDefaultTemplate();
if(defaultTemplate != null){
dto = new TemplateEnterpriseRelatedDTO();
dto.setApplicationTemplateId(defaultTemplate.getApplicationTemplateId());
dto.setWxEnterpriseId(wxEnterpriseId);
WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
if(enterprise != null){
dto.setWxEnterpriseName(enterprise.getCorpName());
}
templateEnterpriseRelatedService.insert(dto);
}
}
// List<TabHaobanApplication> list = applicationService.listApplication();
// Set<String> applicationSet = list.stream().map(TabHaobanApplication::getApplicationId).collect(Collectors.toSet());
// wxEnterpriseApplicationRelatedService.saveEnterpriseApplicationRelateds(applicationSet, wxEnterpriseId);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ApplicationSettingApiServiceImpl.java
package com.gic.haoban.manage.service.service.out.impl;
import java.util.Collections;
import java.util.Date;
import java.util.List;
......@@ -55,6 +56,9 @@ public class ApplicationSettingApiServiceImpl implements ApplicationSettingApiSe
@Override
public List<ApplicationSettingDTO> listOpenByWxEnterpriseIdAndApplicationIds(
String wxEnterpriseId, List<String> applicationIds) {
if(applicationIds == null || applicationIds.isEmpty()){
return Collections.EMPTY_LIST;
}
List<TabHaobanApplicationSetting> list = applicationSettingMapper.listOpenByWxEnterpriseIdAndApplicationIds(wxEnterpriseId,applicationIds);
if(CollectionUtil.isEmpty(list)){
return null;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ApplicationTemplateApiServiceImpl.java 0 → 100644
package com.gic.haoban.manage.service.service.out.impl;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import com.alibaba.dubbo.common.json.JSON;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.api.dto.EnterpriseDTO;
import com.gic.enterprise.api.service.EnterpriseService;
import com.gic.haoban.manage.api.dto.ApplicationEnterpriseRelatedDTO;
import com.gic.haoban.manage.api.dto.ApplicationTemplateDTO;
import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
import com.gic.haoban.manage.api.dto.TemplateEnterpriseRelatedDTO;
import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
import com.gic.haoban.manage.api.service.ApplicationTemplateApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
import com.gic.haoban.manage.service.entity.TabHaobanTemplateApplicationRelated;
import com.gic.haoban.manage.service.service.ApplicationTemplateService;
import com.gic.haoban.manage.service.service.TemplateApplicationRelatedService;
import com.gic.haoban.manage.service.service.TemplateEnterpriseRelatedService;
import cn.hutool.core.collection.CollectionUtil;
@Service
public class ApplicationTemplateApiServiceImpl implements ApplicationTemplateApiService {
private static Logger logger = LoggerFactory.getLogger(ApplicationTemplateApiServiceImpl.class);
@Autowired
private ApplicationTemplateService applicationTemplateService;
@Autowired
private TemplateEnterpriseRelatedService templateEnterpriseRelatedService;
@Autowired
private TemplateApplicationRelatedService templateApplicationRelatedService;
@Autowired
private WxEnterpriseApiService wxEnterpriseApiService;
@Autowired
private EnterpriseService enterpriseService;
@Autowired
private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
@Override
public ApplicationTemplateDTO selectByTemplateName(String templateName) {
return applicationTemplateService.selectByTemplateName(templateName);
}
@Override
public String insertTemplate(ApplicationTemplateDTO template,String applicationIds) {
String templateId = applicationTemplateService.insertTemplate(template);
String[] applicationIdArr = applicationIds.split(",");
for (String applicationId : applicationIdArr) {
TabHaobanTemplateApplicationRelated tab = new TabHaobanTemplateApplicationRelated();
tab.setTemplateId(templateId);
tab.setApplicationId(applicationId);
templateApplicationRelatedService.insert(tab);
}
return templateId;
}
@Override
public List<TemplateEnterpriseRelatedDTO> listEnterpriseByTemplateId(String templateId) {
return templateEnterpriseRelatedService.listEnterpriseByTemplateId(templateId);
}
@Override
public void delTemplate(String templateId) {
List<TemplateEnterpriseRelatedDTO> list = templateEnterpriseRelatedService.listEnterpriseByTemplateId(templateId);
if(list != null && !list.isEmpty()){
return;
}
applicationTemplateService.delTemplate(templateId);
}
@Override
public void editTemplate(String applicationTemplateId, String applicationTemplateName, String applicationIds) {
ApplicationTemplateDTO template = applicationTemplateService.selectByTemplateName(applicationTemplateName);
if(template != null && !template.getApplicationTemplateId().equals(applicationTemplateId)){
return;
}
ApplicationTemplateDTO old = applicationTemplateService.selectByTemplateId(applicationTemplateId);
old.setApplicationTemplateName(applicationTemplateName);
templateApplicationRelatedService.update(applicationTemplateId,applicationIds);
applicationTemplateService.editTemplate(old);
}
@Override
public List<ApplicationTemplateDTO> listByTemplateName(String applicationTemplateName) {
List<ApplicationTemplateDTO> list = applicationTemplateService.listByTemplateName(applicationTemplateName);
for (ApplicationTemplateDTO applicationTemplateDTO : list) {
List<TabHaobanTemplateApplicationRelated> applicationList = templateApplicationRelatedService.listByTemplateId(applicationTemplateDTO.getApplicationTemplateId());
List<String> applicationIdList = applicationList.stream().map(s->s.getApplicationId()).collect(Collectors.toList());
applicationTemplateDTO.setApplicationIds(applicationIdList);
}
return list;
}
@Override
public void addTemplateEnterprise(String applicationTemplateId, String wxEnterpriseIds) {
String[] wxEnterpriseIdArr = wxEnterpriseIds.split(",");
for (String wxEnterpriseId : wxEnterpriseIdArr) {
TemplateEnterpriseRelatedDTO dto = templateEnterpriseRelatedService.selectByWxEnterpriseId(wxEnterpriseId);
if(dto != null){
if(!dto.getApplicationTemplateId().equals(applicationTemplateId)){
dto.setApplicationTemplateId(applicationTemplateId);
templateEnterpriseRelatedService.update(dto);
}
continue;
}
dto = new TemplateEnterpriseRelatedDTO();
dto.setWxEnterpriseId(wxEnterpriseId);
WxEnterpriseDTO enterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
if(enterprise != null){
dto.setWxEnterpriseName(enterprise.getCorpName());
}
dto.setApplicationTemplateId(applicationTemplateId);
templateEnterpriseRelatedService.insert(dto);
}
}
@Override
public void delTemplateEnterprise(String wxEnterpriseId) {
TemplateEnterpriseRelatedDTO dto = templateEnterpriseRelatedService.selectByWxEnterpriseId(wxEnterpriseId);
if(dto != null){
dto.setStatusFlag(0);
templateEnterpriseRelatedService.update(dto);
}
}
@Override
public List<ApplicationEnterpriseRelatedDTO> listTemplateEnterprise(String applicationTemplateId, String wxEnterpriseName, String enterpriseName) {
List<String> wxEnterpriseIds = new ArrayList<String>();
if(!StringUtils.isEmpty(enterpriseName)){
List<EnterpriseDTO> enterpriseNames = enterpriseService.getEnterpriseByName(enterpriseName);
if(CollectionUtil.isNotEmpty(enterpriseNames)){
List<String>enterpriseIds = enterpriseNames.stream().map(s->s.getEnterpriseId()).collect(Collectors.toList());
List<EnterpriseDetailDTO> wxEnterpriseIdDTOs = wxEnterpriseRelatedApiService.listEnterpriseByEnterpriseIds(enterpriseIds);
if(CollectionUtil.isNotEmpty(wxEnterpriseIdDTOs)){
wxEnterpriseIds = wxEnterpriseIdDTOs.stream().map(s->s.getWxEnterpriseId()).collect(Collectors.toList());
}
}
if(CollectionUtil.isEmpty(wxEnterpriseIds)){
wxEnterpriseIds = Arrays.asList("-9999");
}
}
return EntityUtil.changeEntityListByJSON(ApplicationEnterpriseRelatedDTO.class, templateEnterpriseRelatedService.listEnterpriseByParams(applicationTemplateId,wxEnterpriseIds,wxEnterpriseName));
}
@Override
public void setDefaultTemplateEnterprise(String applicationTemplateId) {
List<ApplicationTemplateDTO> list = this.listByTemplateName("");
for (ApplicationTemplateDTO applicationTemplateDTO : list) {
if(applicationTemplateDTO.getDefaultFlag() != null && applicationTemplateDTO.getDefaultFlag() == 1){
applicationTemplateDTO.setDefaultFlag(0);
applicationTemplateService.editTemplate(applicationTemplateDTO);
}
}
ApplicationTemplateDTO dto = applicationTemplateService.selectByTemplateId(applicationTemplateId);
dto.setDefaultFlag(1);
applicationTemplateService.editTemplate(dto);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditSettingApiServiceImpl.java
......@@ -9,7 +9,8 @@ import com.gic.commons.util.EntityUtil;
import com.gic.haoban.common.utils.UuidUtil;
import com.gic.haoban.manage.api.dto.AuditSettingDTO;
import com.gic.haoban.manage.api.service.AuditSettingApiService;
import com.gic.haoban.manage.service.dao.mapper.AuditSettingMapper;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanAuditMapper;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanAuditSettingMapper;
import com.gic.haoban.manage.service.entity.TabHaobanAuditSetting;
/**
......@@ -18,10 +19,10 @@ import com.gic.haoban.manage.service.entity.TabHaobanAuditSetting;
@Service
public class AuditSettingApiServiceImpl implements AuditSettingApiService{
@Autowired
private AuditSettingMapper auditSettingMapper;
private TabHaobanAuditSettingMapper auditSettingMapper;
@Override
public void saveSetting(String wxEnterpriseId, int auditFlag) {
public void saveSetting(String wxEnterpriseId, int auditFlag,int clerkChangeFlag) {
TabHaobanAuditSetting tab = auditSettingMapper.findSetting(wxEnterpriseId);
if(tab == null){
tab = new TabHaobanAuditSetting();
......@@ -31,9 +32,11 @@ public class AuditSettingApiServiceImpl implements AuditSettingApiService{
tab.setSettingId(UuidUtil.randomUUID());
tab.setStatusFlag(1);
tab.setWxEnterpriseId(wxEnterpriseId);
tab.setClerkChangeFlag(clerkChangeFlag);
auditSettingMapper.insert(tab);
}else{
tab.setAuditFlag(auditFlag);
tab.setClerkChangeFlag(clerkChangeFlag);
tab.setUpdateTime(new Date());
auditSettingMapper.updateByPrimaryKeySelective(tab);
}
......@@ -44,8 +47,14 @@ public class AuditSettingApiServiceImpl implements AuditSettingApiService{
String wxEnterpriseId) {
TabHaobanAuditSetting tab = auditSettingMapper.findSetting(wxEnterpriseId);
if(tab == null){
return null;
AuditSettingDTO dto = new AuditSettingDTO();
dto.setWxEnterpriseId(wxEnterpriseId);
dto.setAuditFlag(1);
dto.setClerkChangeFlag(0);
return dto;
}
int clerkChangeFlag = tab.getClerkChangeFlag()== null?0:tab.getClerkChangeFlag();
tab.setClerkChangeFlag(clerkChangeFlag);
AuditSettingDTO dto = EntityUtil.changeEntity(AuditSettingDTO.class, tab);
return dto;
}
......
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