Commit 39a7b1e1 by xugaojun

欢迎语添加

parent fd3b6ea2
...@@ -45,6 +45,10 @@ public class WelcomeListDTO implements Serializable { ...@@ -45,6 +45,10 @@ public class WelcomeListDTO implements Serializable {
*/ */
private String operatorName; private String operatorName;
/** /**
* 默认欢迎语标记 1是 0否
*/
private Integer defaultWelcomeFlag;
/**
* 适用部门列表 * 适用部门列表
*/ */
private List<WelcomeSuitDepartmentDTO> suitDepartmentList; private List<WelcomeSuitDepartmentDTO> suitDepartmentList;
...@@ -145,6 +149,14 @@ public class WelcomeListDTO implements Serializable { ...@@ -145,6 +149,14 @@ public class WelcomeListDTO implements Serializable {
this.suitStaffList = suitStaffList; this.suitStaffList = suitStaffList;
} }
public Integer getDefaultWelcomeFlag() {
return defaultWelcomeFlag;
}
public void setDefaultWelcomeFlag(Integer defaultWelcomeFlag) {
this.defaultWelcomeFlag = defaultWelcomeFlag;
}
@Override @Override
public String toString() { public String toString() {
return "WelcomeListDTO{" + return "WelcomeListDTO{" +
......
...@@ -43,6 +43,10 @@ public class WelcomeListBO { ...@@ -43,6 +43,10 @@ public class WelcomeListBO {
*/ */
private String operatorName; private String operatorName;
/** /**
* 默认欢迎语标记 1是 0否
*/
private Integer defaultWelcomeFlag;
/**
* 适用部门列表 * 适用部门列表
*/ */
private List<WelcomeSuitDepartmentBO> suitDepartmentList; private List<WelcomeSuitDepartmentBO> suitDepartmentList;
...@@ -143,6 +147,14 @@ public class WelcomeListBO { ...@@ -143,6 +147,14 @@ public class WelcomeListBO {
this.suitStaffList = suitStaffList; this.suitStaffList = suitStaffList;
} }
public Integer getDefaultWelcomeFlag() {
return defaultWelcomeFlag;
}
public void setDefaultWelcomeFlag(Integer defaultWelcomeFlag) {
this.defaultWelcomeFlag = defaultWelcomeFlag;
}
@Override @Override
public String toString() { public String toString() {
return "WelcomeListBO{" + return "WelcomeListBO{" +
......
...@@ -47,8 +47,8 @@ public class WelcomeServiceImpl implements WelcomeService { ...@@ -47,8 +47,8 @@ public class WelcomeServiceImpl implements WelcomeService {
private TabMiniprogramSettingMapper miniprogramSettingMapper; private TabMiniprogramSettingMapper miniprogramSettingMapper;
private static final int WELCOME_LIMIT = 50; private static final int WELCOME_LIMIT = 50;
private static final int DEPARTMENT_NUM_LIMIT = 100; private static final int DEPARTMENT_NUM_LIMIT = 2000;
private static final int STAFF_NUM_LIMIT = 1000; private static final int STAFF_NUM_LIMIT = 2000;
@Override @Override
public Boolean saveWelcome(SaveWelcomeBO bo) { public Boolean saveWelcome(SaveWelcomeBO bo) {
...@@ -191,6 +191,7 @@ public class WelcomeServiceImpl implements WelcomeService { ...@@ -191,6 +191,7 @@ public class WelcomeServiceImpl implements WelcomeService {
bo.setUpdateTime(one.getUpdateTime()); bo.setUpdateTime(one.getUpdateTime());
bo.setOperatorId(one.getOperatorId()); bo.setOperatorId(one.getOperatorId());
bo.setOperatorName(one.getOperatorName()); bo.setOperatorName(one.getOperatorName());
bo.setDefaultWelcomeFlag(one.getDefaultWelcomeFlag());
// 媒体列表 // 媒体列表
bo.setWelcomeMediaList( bo.setWelcomeMediaList(
convertWelcomeMedia(welcomeMediaMapper.listByWelcomeId(one.getWelcomeId())) convertWelcomeMedia(welcomeMediaMapper.listByWelcomeId(one.getWelcomeId()))
......
...@@ -68,6 +68,7 @@ public class WelcomeApiServiceImpl implements WelcomeApiService { ...@@ -68,6 +68,7 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
dto.setUpdateTime(one.getUpdateTime()); dto.setUpdateTime(one.getUpdateTime());
dto.setOperatorId(one.getOperatorId()); dto.setOperatorId(one.getOperatorId());
dto.setOperatorName(one.getOperatorName()); dto.setOperatorName(one.getOperatorName());
dto.setDefaultWelcomeFlag(one.getDefaultWelcomeFlag());
// 媒体列表 // 媒体列表
dto.setWelcomeMediaList( dto.setWelcomeMediaList(
CollectionUtils.isEmpty(one.getWelcomeMediaList()) ? Collections.emptyList() CollectionUtils.isEmpty(one.getWelcomeMediaList()) ? Collections.emptyList()
......
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