Skip to content

E
easy-affair-show
Commit 787ee02e authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

客户试用申请修改，客户状态bug修改

parent 9100c632
Show whitespace changes
Inline Side-by-side
Showing with 1397 additions and 785 deletions
eas-manager/doc/api.md
View file @ 787ee02e
...@@ -1000,8 +1000,9 @@ size|Integer|否|每页条数，值为-1，查询所有记录 ...@@ -1000,8 +1000,9 @@ size|Integer|否|每页条数，值为-1，查询所有记录
**请求样例:** **请求样例:**
``` ```
{ {
"page":1, "query": "a",
"size":10 "page": 1,
"size": 6
} }
``` ```
...@@ -1151,16 +1152,24 @@ dict|object|字典对象 ...@@ -1151,16 +1152,24 @@ dict|object|字典对象
参数名称|类型|必填|描述 参数名称|类型|必填|描述
:---|:---|:---|:------- :---|:---|:---|:-------
customerId|Long|是|客户ID memberLevel|Integer|是|会员等级，，0：未开启，1：试用客户，2：VIP，3：设计师，默认0
memberLevel|Integer|是|申请会员等级，1：试用客户，2：VIP，3：设计师 custName|String|是|客户真实名称
isAccept|Integer|是|受理状态，0:未受理，1:同意，2:不同意。默认：0 organization|String|是|单位名称
contactTelphone|String|是|联系电话
sex|Integer|是|性别
mailbox|String|是|邮箱
job|String|是|职位
**请求样例:** **请求样例:**
``` ```
{ {
"customerId":6633, "contactTelphone": "13888888888",
"memberLevel":5866, "custName": "测试",
"isAccept":6478, "job": "总监",
"mailbox": "qqq@123.com",
"organization": "测试公司",
"memberLevel":1,
"sex":1
} }
``` ```
...@@ -1171,15 +1180,6 @@ isAccept|Integer|是|受理状态，0:未受理，1:同意，2:不同意。默 ...@@ -1171,15 +1180,6 @@ isAccept|Integer|是|受理状态，0:未受理，1:同意，2:不同意。默
code|Integer|结果码（-1.失败，1.成功） code|Integer|结果码（-1.失败，1.成功）
msg|String|消息 msg|String|消息
data|object|数据对象 data|object|数据对象
 id|Long|保存后主键id
 entity|object|保存更新实体
  id|Long|主键ID，主键，自增长
  customerId|Long|客户ID
  memberLevel|Integer|申请会员等级，1：试用客户，2：VIP，3：设计师
  isAccept|Integer|受理状态，0:未受理，1:同意，2:不同意。默认：0
  createUserId|Long|受理用户
  createTime|Date|提交时间
  updateTime|Date|受理时间
**响应消息样例:** **响应消息样例:**
``` ```
...@@ -4634,13 +4634,15 @@ data|object|数据对象 ...@@ -4634,13 +4634,15 @@ data|object|数据对象
id|Long|是|作品id id|Long|是|作品id
masterplateName|String|是|模板名称 masterplateName|String|是|模板名称
frontCover|String|是|封面图片地址（相对地址） frontCover|String|是|封面图片地址（相对地址）
plateType|int|是|板式
**请求样例:** **请求样例:**
``` ```
{ {
"id":6797, "id":6797,
"masterplateName":"c42lp8", "masterplateName":"c42lp8",
"frontCover":"g3odxd" "frontCover":"g3odxd",
"plateType":1
} }
``` ```
......
eas-manager/src/main/java/com/mortals/xhx/module/customer/dao/CustomerTrialDao.java
View file @ 787ee02e
...@@ -16,5 +16,4 @@ import java.util.List; ...@@ -16,5 +16,4 @@ import java.util.List;
*/ */
public interface CustomerTrialDao extends ICRUDDao<CustomerTrialEntity,Long>{ public interface CustomerTrialDao extends ICRUDDao<CustomerTrialEntity,Long>{
Result<CustomerTrialEntityExt> getListExt(CustomerTrialEntity params, PageInfo pageInfo);
} }
eas-manager/src/main/java/com/mortals/xhx/module/customer/dao/ibatis/CustomerTrialDaoImpl.java
View file @ 787ee02e
...@@ -23,40 +23,4 @@ import java.util.List; ...@@ -23,40 +23,4 @@ import java.util.List;
@Repository("customerTrialDao") @Repository("customerTrialDao")
public class CustomerTrialDaoImpl extends BaseCRUDDaoMybatis<CustomerTrialEntity,Long> implements CustomerTrialDao { public class CustomerTrialDaoImpl extends BaseCRUDDaoMybatis<CustomerTrialEntity,Long> implements CustomerTrialDao {
@Override
public Result<CustomerTrialEntityExt> getListExt(CustomerTrialEntity param, PageInfo pageInfo) {
ParamDto paramDto = this.getQueryParam(param);
Result result = new Result();
List list = null;
if (pageInfo.isCountPage()) {
int count = this.getCount(paramDto, "getListExtCount");
if (count == 0) {
list = new ArrayList();
} else if (pageInfo.getPrePageResult() == -1) {
list = this.getSqlSession().selectList(this.getSqlId("getListExt"), paramDto);
} else {
RowBounds rowBounds = new RowBounds(pageInfo.getBeginIndex(), pageInfo.getPrePageResult());
list = this.getSqlSession().selectList(this.getSqlId("getListExt"), this.cpyQueryParamDto(paramDto), rowBounds);
}
pageInfo.setTotalResult(count);
result.setPageInfo(pageInfo);
result.setList((List)list);
} else {
if (pageInfo.getPrePageResult() == -1) {
list = this.getSqlSession().selectList(this.getSqlId("getListExt"), paramDto);
} else {
RowBounds rowBounds = new RowBounds(pageInfo.getBeginIndex(), pageInfo.getPrePageResult());
list = this.getSqlSession().selectList(this.getSqlId("getListExt"), this.cpyQueryParamDto(paramDto), rowBounds);
}
pageInfo.setTotalResult(-1);
result.setPageInfo(pageInfo);
result.setList(list);
}
return result;
}
} }
eas-manager/src/main/java/com/mortals/xhx/module/customer/model/CustomerTrialEntity.java
View file @ 787ee02e
...@@ -7,19 +7,15 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,19 +7,15 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.customer.model.vo.CustomerTrialVo; import com.mortals.xhx.module.customer.model.vo.CustomerTrialVo;
/** /**
* 客户试用申请实体对象 * 客户试用申请实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-06-08 * @date 2022-07-26
*/ */
public class CustomerTrialEntity extends CustomerTrialVo { public class CustomerTrialEntity extends CustomerTrialVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 客户ID
*/
private Long customerId;
/** /**
* 申请会员等级，1：试用客户，2：VIP，3：设计师 * 申请会员等级，1：试用客户，2：VIP，3：设计师
*/ */
...@@ -28,24 +24,34 @@ public class CustomerTrialEntity extends CustomerTrialVo { ...@@ -28,24 +24,34 @@ public class CustomerTrialEntity extends CustomerTrialVo {
* 受理状态，0:未受理，1:同意，2:不同意。默认：0 * 受理状态，0:未受理，1:同意，2:不同意。默认：0
*/ */
private Integer isAccept; private Integer isAccept;
public CustomerTrialEntity(){}
/** /**
* 获取 客户ID * 客户真实名称
* @return Long
*/ */
public Long getCustomerId(){ private String custName;
return customerId;
}
/** /**
* 设置 客户ID * 单位名称
* @param customerId
*/ */
public void setCustomerId(Long customerId){ private String organization;
this.customerId = customerId; /**
} * 联系电话
*/
private String contactTelphone;
/**
* 性别
*/
private Integer sex;
/**
* 邮箱
*/
private String mailbox;
/**
* 职位
*/
private String job;
public CustomerTrialEntity(){}
/** /**
* 获取 申请会员等级，1：试用客户，2：VIP，3：设计师 * 获取 申请会员等级，1：试用客户，2：VIP，3：设计师
* @return Integer * @return Integer
...@@ -74,6 +80,90 @@ public class CustomerTrialEntity extends CustomerTrialVo { ...@@ -74,6 +80,90 @@ public class CustomerTrialEntity extends CustomerTrialVo {
public void setIsAccept(Integer isAccept){ public void setIsAccept(Integer isAccept){
this.isAccept = isAccept; this.isAccept = isAccept;
} }
/**
* 获取 客户真实名称
* @return String
*/
public String getCustName(){
return custName;
}
/**
* 设置 客户真实名称
* @param custName
*/
public void setCustName(String custName){
this.custName = custName;
}
/**
* 获取 单位名称
* @return String
*/
public String getOrganization(){
return organization;
}
/**
* 设置 单位名称
* @param organization
*/
public void setOrganization(String organization){
this.organization = organization;
}
/**
* 获取 联系电话
* @return String
*/
public String getContactTelphone(){
return contactTelphone;
}
/**
* 设置 联系电话
* @param contactTelphone
*/
public void setContactTelphone(String contactTelphone){
this.contactTelphone = contactTelphone;
}
/**
* 获取 性别
* @return Integer
*/
public Integer getSex(){
return sex;
}
/**
* 设置 性别
* @param sex
*/
public void setSex(Integer sex){
this.sex = sex;
}
/**
* 获取 邮箱
* @return String
*/
public String getMailbox(){
return mailbox;
}
/**
* 设置 邮箱
* @param mailbox
*/
public void setMailbox(String mailbox){
this.mailbox = mailbox;
}
/**
* 获取 职位
* @return String
*/
public String getJob(){
return job;
}
/**
* 设置 职位
* @param job
*/
public void setJob(String job){
this.job = job;
}
...@@ -96,18 +186,33 @@ public class CustomerTrialEntity extends CustomerTrialVo { ...@@ -96,18 +186,33 @@ public class CustomerTrialEntity extends CustomerTrialVo {
public String toString(){ public String toString(){
StringBuilder sb = new StringBuilder(""); StringBuilder sb = new StringBuilder("");
sb.append(",customerId:").append(getCustomerId());
sb.append(",memberLevel:").append(getMemberLevel()); sb.append(",memberLevel:").append(getMemberLevel());
sb.append(",isAccept:").append(getIsAccept()); sb.append(",isAccept:").append(getIsAccept());
sb.append(",custName:").append(getCustName());
sb.append(",organization:").append(getOrganization());
sb.append(",contactTelphone:").append(getContactTelphone());
sb.append(",sex:").append(getSex());
sb.append(",mailbox:").append(getMailbox());
sb.append(",job:").append(getJob());
return sb.toString(); return sb.toString();
} }
public void initAttrValue(){ public void initAttrValue(){
this.customerId = null;
this.memberLevel = null; this.memberLevel = null;
this.isAccept = null; this.isAccept = null;
this.custName = "";
this.organization = "";
this.contactTelphone = "";
this.sex = null;
this.mailbox = "";
this.job = "";
} }
} }
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/customer/model/CustomerTrialQuery.java
View file @ 787ee02e
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.customer.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.customer.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.customer.model.CustomerTrialEntity; import com.mortals.xhx.module.customer.model.CustomerTrialEntity;
/** /**
* 客户试用申请查询对象 * 客户试用申请查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-06-08 * @date 2022-07-26
*/ */
public class CustomerTrialQuery extends CustomerTrialEntity { public class CustomerTrialQuery extends CustomerTrialEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -21,18 +21,6 @@ public class CustomerTrialQuery extends CustomerTrialEntity { ...@@ -21,18 +21,6 @@ public class CustomerTrialQuery extends CustomerTrialEntity {
/** 主键ID，主键，自增长列表 */ /** 主键ID，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 开始 客户ID */
private Long customerIdStart;
/** 结束 客户ID */
private Long customerIdEnd;
/** 增加 客户ID */
private Long customerIdIncrement;
/** 客户ID列表 */
private List <Long> customerIdList;
/** 开始 申请会员等级，1：试用客户，2：VIP，3：设计师 */ /** 开始 申请会员等级，1：试用客户，2：VIP，3：设计师 */
private Integer memberLevelStart; private Integer memberLevelStart;
...@@ -81,21 +69,39 @@ public class CustomerTrialQuery extends CustomerTrialEntity { ...@@ -81,21 +69,39 @@ public class CustomerTrialQuery extends CustomerTrialEntity {
/** 结束 受理时间 */ /** 结束 受理时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 客户真实名称 */
private List<String> custNameList;
/** 单位名称 */
private List<String> organizationList;
/** 联系电话 */
private List<String> contactTelphoneList;
/** 开始 性别 */
private Integer sexStart;
/** 结束 性别 */
private Integer sexEnd;
/** 增加 性别 */
private Integer sexIncrement;
/** 性别列表 */
private List <Integer> sexList;
/** 邮箱 */
private List<String> mailboxList;
/** 职位 */
private List<String> jobList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CustomerTrialQuery> orConditionList; private List<CustomerTrialQuery> orConditionList;
/** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */ /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
private List<CustomerTrialQuery> andConditionList; private List<CustomerTrialQuery> andConditionList;
/**
* 客户真实名称
*/
private String custName;
/**
* 联系电话
*/
private String contactTelphone;
public CustomerTrialQuery(){} public CustomerTrialQuery(){}
/** /**
...@@ -162,70 +168,6 @@ public class CustomerTrialQuery extends CustomerTrialEntity { ...@@ -162,70 +168,6 @@ public class CustomerTrialQuery extends CustomerTrialEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 开始 客户ID
* @return customerIdStart
*/
public Long getCustomerIdStart(){
return this.customerIdStart;
}
/**
* 设置 开始 客户ID
* @param customerIdStart
*/
public void setCustomerIdStart(Long customerIdStart){
this.customerIdStart = customerIdStart;
}
/**
* 获取 结束 客户ID
* @return $customerIdEnd
*/
public Long getCustomerIdEnd(){
return this.customerIdEnd;
}
/**
* 设置 结束 客户ID
* @param customerIdEnd
*/
public void setCustomerIdEnd(Long customerIdEnd){
this.customerIdEnd = customerIdEnd;
}
/**
* 获取 增加 客户ID
* @return customerIdIncrement
*/
public Long getCustomerIdIncrement(){
return this.customerIdIncrement;
}
/**
* 设置 增加 客户ID
* @param customerIdIncrement
*/
public void setCustomerIdIncrement(Long customerIdIncrement){
this.customerIdIncrement = customerIdIncrement;
}
/**
* 获取 客户ID
* @return customerIdList
*/
public List<Long> getCustomerIdList(){
return this.customerIdList;
}
/**
* 设置 客户ID
* @param customerIdList
*/
public void setCustomerIdList(List<Long> customerIdList){
this.customerIdList = customerIdList;
}
/** /**
* 获取 开始 申请会员等级，1：试用客户，2：VIP，3：设计师 * 获取 开始 申请会员等级，1：试用客户，2：VIP，3：设计师
* @return memberLevelStart * @return memberLevelStart
...@@ -483,92 +425,186 @@ public class CustomerTrialQuery extends CustomerTrialEntity { ...@@ -483,92 +425,186 @@ public class CustomerTrialQuery extends CustomerTrialEntity {
} }
/** /**
* 设置 主键ID，主键，自增长 * 获取 客户真实名称
* @param id * @return custNameList
*/ */
public CustomerTrialQuery id(Long id){ public List<String> getCustNameList(){
setId(id); return this.custNameList;
return this;
} }
/** /**
* 设置 开始 主键ID，主键，自增长 * 设置 客户真实名称
* @param idStart * @param custNameList
*/ */
public CustomerTrialQuery idStart(Long idStart){ public void setCustNameList(List<String> custNameList){
this.idStart = idStart; this.custNameList = custNameList;
return this; }
/**
* 获取 单位名称
* @return organizationList
*/
public List<String> getOrganizationList(){
return this.organizationList;
} }
/** /**
* 设置 结束 主键ID，主键，自增长 * 设置 单位名称
* @param idEnd * @param organizationList
*/ */
public CustomerTrialQuery idEnd(Long idEnd){ public void setOrganizationList(List<String> organizationList){
this.idEnd = idEnd; this.organizationList = organizationList;
return this; }
/**
* 获取 联系电话
* @return contactTelphoneList
*/
public List<String> getContactTelphoneList(){
return this.contactTelphoneList;
} }
/** /**
* 设置 增加 主键ID，主键，自增长 * 设置 联系电话
* @param idIncrement * @param contactTelphoneList
*/ */
public CustomerTrialQuery idIncrement(Long idIncrement){ public void setContactTelphoneList(List<String> contactTelphoneList){
this.idIncrement = idIncrement; this.contactTelphoneList = contactTelphoneList;
return this; }
/**
* 获取 开始 性别
* @return sexStart
*/
public Integer getSexStart(){
return this.sexStart;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 开始 性别
* @param idList * @param sexStart
*/ */
public CustomerTrialQuery idList(List<Long> idList){ public void setSexStart(Integer sexStart){
this.idList = idList; this.sexStart = sexStart;
return this; }
/**
* 获取 结束 性别
* @return $sexEnd
*/
public Integer getSexEnd(){
return this.sexEnd;
}
/**
* 设置 结束 性别
* @param sexEnd
*/
public void setSexEnd(Integer sexEnd){
this.sexEnd = sexEnd;
}
/**
* 获取 增加 性别
* @return sexIncrement
*/
public Integer getSexIncrement(){
return this.sexIncrement;
}
/**
* 设置 增加 性别
* @param sexIncrement
*/
public void setSexIncrement(Integer sexIncrement){
this.sexIncrement = sexIncrement;
}
/**
* 获取 性别
* @return sexList
*/
public List<Integer> getSexList(){
return this.sexList;
}
/**
* 设置 性别
* @param sexList
*/
public void setSexList(List<Integer> sexList){
this.sexList = sexList;
}
/**
* 获取 邮箱
* @return mailboxList
*/
public List<String> getMailboxList(){
return this.mailboxList;
}
/**
* 设置 邮箱
* @param mailboxList
*/
public void setMailboxList(List<String> mailboxList){
this.mailboxList = mailboxList;
}
/**
* 获取 职位
* @return jobList
*/
public List<String> getJobList(){
return this.jobList;
} }
/** /**
* 设置 客户ID * 设置 职位
* @param customerId * @param jobList
*/ */
public CustomerTrialQuery customerId(Long customerId){ public void setJobList(List<String> jobList){
setCustomerId(customerId); this.jobList = jobList;
}
/**
* 设置 主键ID，主键，自增长
* @param id
*/
public CustomerTrialQuery id(Long id){
setId(id);
return this; return this;
} }
/** /**
* 设置 开始 客户ID * 设置 开始 主键ID，主键，自增长
* @param customerIdStart * @param idStart
*/ */
public CustomerTrialQuery customerIdStart(Long customerIdStart){ public CustomerTrialQuery idStart(Long idStart){
this.customerIdStart = customerIdStart; this.idStart = idStart;
return this; return this;
} }
/** /**
* 设置 结束 客户ID * 设置 结束 主键ID，主键，自增长
* @param customerIdEnd * @param idEnd
*/ */
public CustomerTrialQuery customerIdEnd(Long customerIdEnd){ public CustomerTrialQuery idEnd(Long idEnd){
this.customerIdEnd = customerIdEnd; this.idEnd = idEnd;
return this; return this;
} }
/** /**
* 设置 增加 客户ID * 设置 增加 主键ID，主键，自增长
* @param customerIdIncrement * @param idIncrement
*/ */
public CustomerTrialQuery customerIdIncrement(Long customerIdIncrement){ public CustomerTrialQuery idIncrement(Long idIncrement){
this.customerIdIncrement = customerIdIncrement; this.idIncrement = idIncrement;
return this; return this;
} }
/** /**
* 设置 客户ID * 设置 主键ID，主键，自增长
* @param customerIdList * @param idList
*/ */
public CustomerTrialQuery customerIdList(List<Long> customerIdList){ public CustomerTrialQuery idList(List<Long> idList){
this.customerIdList = customerIdList; this.idList = idList;
return this; return this;
} }
...@@ -709,6 +745,146 @@ public class CustomerTrialQuery extends CustomerTrialEntity { ...@@ -709,6 +745,146 @@ public class CustomerTrialQuery extends CustomerTrialEntity {
/**
* 设置 客户真实名称
* @param custName
*/
public CustomerTrialQuery custName(String custName){
setCustName(custName);
return this;
}
/**
* 设置 客户真实名称
* @param custNameList
*/
public CustomerTrialQuery custNameList(List<String> custNameList){
this.custNameList = custNameList;
return this;
}
/**
* 设置 单位名称
* @param organization
*/
public CustomerTrialQuery organization(String organization){
setOrganization(organization);
return this;
}
/**
* 设置 单位名称
* @param organizationList
*/
public CustomerTrialQuery organizationList(List<String> organizationList){
this.organizationList = organizationList;
return this;
}
/**
* 设置 联系电话
* @param contactTelphone
*/
public CustomerTrialQuery contactTelphone(String contactTelphone){
setContactTelphone(contactTelphone);
return this;
}
/**
* 设置 联系电话
* @param contactTelphoneList
*/
public CustomerTrialQuery contactTelphoneList(List<String> contactTelphoneList){
this.contactTelphoneList = contactTelphoneList;
return this;
}
/**
* 设置 性别
* @param sex
*/
public CustomerTrialQuery sex(Integer sex){
setSex(sex);
return this;
}
/**
* 设置 开始 性别
* @param sexStart
*/
public CustomerTrialQuery sexStart(Integer sexStart){
this.sexStart = sexStart;
return this;
}
/**
* 设置 结束 性别
* @param sexEnd
*/
public CustomerTrialQuery sexEnd(Integer sexEnd){
this.sexEnd = sexEnd;
return this;
}
/**
* 设置 增加 性别
* @param sexIncrement
*/
public CustomerTrialQuery sexIncrement(Integer sexIncrement){
this.sexIncrement = sexIncrement;
return this;
}
/**
* 设置 性别
* @param sexList
*/
public CustomerTrialQuery sexList(List<Integer> sexList){
this.sexList = sexList;
return this;
}
/**
* 设置 邮箱
* @param mailbox
*/
public CustomerTrialQuery mailbox(String mailbox){
setMailbox(mailbox);
return this;
}
/**
* 设置 邮箱
* @param mailboxList
*/
public CustomerTrialQuery mailboxList(List<String> mailboxList){
this.mailboxList = mailboxList;
return this;
}
/**
* 设置 职位
* @param job
*/
public CustomerTrialQuery job(String job){
setJob(job);
return this;
}
/**
* 设置 职位
* @param jobList
*/
public CustomerTrialQuery jobList(List<String> jobList){
this.jobList = jobList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
...@@ -741,19 +917,4 @@ public class CustomerTrialQuery extends CustomerTrialEntity { ...@@ -741,19 +917,4 @@ public class CustomerTrialQuery extends CustomerTrialEntity {
this.andConditionList = andConditionList; this.andConditionList = andConditionList;
} }
public String getCustName() {
return custName;
}
public void setCustName(String custName) {
this.custName = custName;
}
public String getContactTelphone() {
return contactTelphone;
}
public void setContactTelphone(String contactTelphone) {
this.contactTelphone = contactTelphone;
}
} }
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/customer/service/CustomerTrialService.java
View file @ 787ee02e
...@@ -17,8 +17,6 @@ import com.mortals.xhx.module.customer.model.CustomerTrialEntityExt; ...@@ -17,8 +17,6 @@ import com.mortals.xhx.module.customer.model.CustomerTrialEntityExt;
*/ */
public interface CustomerTrialService extends ICRUDService<CustomerTrialEntity,Long>{ public interface CustomerTrialService extends ICRUDService<CustomerTrialEntity,Long>{
Result<CustomerTrialEntityExt> findExt(CustomerTrialEntity params, PageInfo pageInfo, Context context) throws AppException;
/** /**
* 受理客户试用申请 * 受理客户试用申请
* @param entity * @param entity
......
eas-manager/src/main/java/com/mortals/xhx/module/customer/service/impl/CustomerServiceImpl.java
View file @ 787ee02e
...@@ -8,6 +8,8 @@ import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; ...@@ -8,6 +8,8 @@ import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.util.DateUtils; import com.mortals.framework.util.DateUtils;
import com.mortals.framework.util.SecurityUtil; import com.mortals.framework.util.SecurityUtil;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
import com.mortals.xhx.common.code.CustomerSatusEnum;
import com.mortals.xhx.common.code.UserStatus;
import com.mortals.xhx.module.customer.dao.CustomerDao; import com.mortals.xhx.module.customer.dao.CustomerDao;
import com.mortals.xhx.module.customer.model.CustomerEntity; import com.mortals.xhx.module.customer.model.CustomerEntity;
import com.mortals.xhx.module.customer.model.CustomerEntityExt; import com.mortals.xhx.module.customer.model.CustomerEntityExt;
...@@ -86,6 +88,9 @@ public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, Cu ...@@ -86,6 +88,9 @@ public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, Cu
if (user == null || !user.getLoginName().equals(loginName)) { if (user == null || !user.getLoginName().equals(loginName)) {
throw new AppException("用户名不存在！"); throw new AppException("用户名不存在！");
} }
if(user.getStatus()!= CustomerSatusEnum.NORMAL.getValue()){
throw new AppException("该账号已被禁用！");
}
try { try {
if (!user.getPassword().equals(SecurityUtil.md5DoubleEncoding(password))) { if (!user.getPassword().equals(SecurityUtil.md5DoubleEncoding(password))) {
throw new AppException("登录密码错误！"); throw new AppException("登录密码错误！");
......
eas-manager/src/main/java/com/mortals/xhx/module/customer/service/impl/CustomerTrialServiceImpl.java
View file @ 787ee02e
...@@ -5,20 +5,20 @@ import com.mortals.framework.model.PageInfo; ...@@ -5,20 +5,20 @@ import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
import com.mortals.framework.util.SecurityUtil; import com.mortals.framework.util.SecurityUtil;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
import com.mortals.xhx.common.code.CustomerSatusEnum;
import com.mortals.xhx.common.code.CustomerSrcEnum;
import com.mortals.xhx.common.code.TrialAcceptEnum; import com.mortals.xhx.common.code.TrialAcceptEnum;
import com.mortals.xhx.module.customer.dao.CustomerDao; import com.mortals.xhx.module.customer.dao.CustomerDao;
import com.mortals.xhx.module.customer.model.CustomerEntity; import com.mortals.xhx.module.customer.model.*;
import com.mortals.xhx.module.customer.model.CustomerTrialEntityExt;
import com.mortals.xhx.module.customer.model.CustomerTrialQuery;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.module.customer.dao.CustomerTrialDao; import com.mortals.xhx.module.customer.dao.CustomerTrialDao;
import com.mortals.xhx.module.customer.model.CustomerTrialEntity;
import com.mortals.xhx.module.customer.service.CustomerTrialService; import com.mortals.xhx.module.customer.service.CustomerTrialService;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -35,23 +35,28 @@ public class CustomerTrialServiceImpl extends AbstractCRUDServiceImpl<CustomerTr ...@@ -35,23 +35,28 @@ public class CustomerTrialServiceImpl extends AbstractCRUDServiceImpl<CustomerTr
private CustomerDao customerDao; private CustomerDao customerDao;
@Override @Override
public Result<CustomerTrialEntityExt> findExt(CustomerTrialEntity params, PageInfo pageInfo, Context context) throws AppException { protected CustomerTrialEntity findBefore(CustomerTrialEntity entity, PageInfo pageInfo, Context context) throws AppException {
CustomerTrialQuery query = new CustomerTrialQuery(); CustomerTrialQuery query = new CustomerTrialQuery();
BeanUtils.copyProperties(params,query); BeanUtils.copyProperties(entity,query);
if(StringUtils.isNotEmpty(params.getQuery())){ if(StringUtils.isNotEmpty(entity.getQuery())){
StringBuffer condition = new StringBuffer("%"); StringBuffer condition = new StringBuffer("%");
condition.append(params.getQuery()).append("%"); condition.append(entity.getQuery()).append("%");
CustomerTrialQuery condition1 = new CustomerTrialQuery(); CustomerTrialQuery condition1 = new CustomerTrialQuery();
CustomerTrialQuery condition2 = new CustomerTrialQuery(); CustomerTrialQuery condition2 = new CustomerTrialQuery();
condition1.setContactTelphone(condition.toString());
condition1.setCustName(condition.toString()); condition2.setCustName(condition.toString());
condition2.setContactTelphone(condition.toString());
List<CustomerTrialQuery> orConditionList = new ArrayList<>(); List<CustomerTrialQuery> orConditionList = new ArrayList<>();
orConditionList.add(condition1); orConditionList.add(condition1);
orConditionList.add(condition2); orConditionList.add(condition2);
query.setOrConditionList(orConditionList); query.setOrConditionList(orConditionList);
} }
return getDao().getListExt(query,pageInfo); return query;
}
@Override
protected void saveBefore(CustomerTrialEntity entity, Context context) throws AppException {
entity.setIsAccept(TrialAcceptEnum.NOT_ACCEPTED.getValue());
super.saveBefore(entity, context);
} }
@Override @Override
...@@ -73,16 +78,29 @@ public class CustomerTrialServiceImpl extends AbstractCRUDServiceImpl<CustomerTr ...@@ -73,16 +78,29 @@ public class CustomerTrialServiceImpl extends AbstractCRUDServiceImpl<CustomerTr
if(StringUtils.isEmpty(entity.getPassword())){ if(StringUtils.isEmpty(entity.getPassword())){
throw new AppException("登录密码不能为空"); throw new AppException("登录密码不能为空");
} }
if(StringUtils.isEmpty(entity.getEnterpriseConsultant())){
throw new AppException("企业顾问不能为空");
}
CustomerEntity customerEntity = new CustomerEntity(); CustomerEntity customerEntity = new CustomerEntity();
customerEntity.setId(customerTrialEntity.getCustomerId()); customerEntity.setJob(entity.getJob());
customerEntity.setCustName(entity.getCustName());
customerEntity.setMemberLevel(entity.getMemberLevel());
customerEntity.setOrganization(entity.getOrganization());
customerEntity.setContactTelphone(entity.getContactTelphone());
customerEntity.setSex(entity.getSex());
customerEntity.setMailbox(entity.getMailbox());
customerEntity.setCustomerSrc(1l);
customerEntity.setStatus(CustomerSatusEnum.NORMAL.getValue());
customerEntity.setEnterpriseConsultant(entity.getEnterpriseConsultant());
customerEntity.setCreateUserId(this.getContextUserId(context));
customerEntity.setCreateTime(new Date());
customerEntity.setLoginName(entity.getLoginName()); customerEntity.setLoginName(entity.getLoginName());
try { try {
customerEntity.setPassword(SecurityUtil.md5DoubleEncoding(entity.getPassword())); customerEntity.setPassword(SecurityUtil.md5DoubleEncoding(entity.getPassword()));
} catch (Exception e) { } catch (Exception e) {
throw new AppException("密码转换异常！", e); throw new AppException("密码转换异常！", e);
} }
customerEntity.setMemberLevel(customerTrialEntity.getMemberLevel()); customerDao.insert(customerEntity);
customerDao.update(customerEntity);
} }
CustomerTrialEntity update = new CustomerTrialEntity(); CustomerTrialEntity update = new CustomerTrialEntity();
update.setId(customerTrialEntity.getId()); update.setId(customerTrialEntity.getId());
......
eas-manager/src/main/java/com/mortals/xhx/module/customer/web/CustomerTrialController.java
View file @ 787ee02e
...@@ -56,35 +56,35 @@ public class CustomerTrialController extends BaseCRUDJsonBodyMappingController<C ...@@ -56,35 +56,35 @@ public class CustomerTrialController extends BaseCRUDJsonBodyMappingController<C
super.init(model, context); super.init(model, context);
} }
@Override // @Override
public Rest<Object> list(@RequestBody(required = false) CustomerTrialEntity query) { // public Rest<Object> list(@RequestBody(required = false) CustomerTrialEntity query) {
Map<String, Object> model = new HashMap(); // Map<String, Object> model = new HashMap();
Rest<Object> ret = new Rest(); // Rest<Object> ret = new Rest();
Context context = this.getContext(); // Context context = this.getContext();
String busiDesc = "查询" + this.getModuleDesc(); // String busiDesc = "查询" + this.getModuleDesc();
//
int code; // int code;
try { // try {
PageInfo pageInfo = this.buildPageInfo(query); // PageInfo pageInfo = this.buildPageInfo(query);
this.doListBefore(query, model, context); // this.doListBefore(query, model, context);
Result result = this.getService().findExt(query, pageInfo, context); // Result result = this.getService().findExt(query, pageInfo, context);
model.put("data", result.getList()); // model.put("data", result.getList());
model.put("pageInfo", result.getPageInfo()); // model.put("pageInfo", result.getPageInfo());
this.parsePageInfo(model, result.getPageInfo()); // this.parsePageInfo(model, result.getPageInfo());
code = this.doListAfter(query, model, context); // code = this.doListAfter(query, model, context);
this.recordSysLog(this.request, busiDesc + " 【成功】"); // this.recordSysLog(this.request, busiDesc + " 【成功】");
} catch (Exception var9) { // } catch (Exception var9) {
code = -1; // code = -1;
this.doException(this.request, busiDesc, model, var9); // this.doException(this.request, busiDesc, model, var9);
} // }
//
this.init(model, context); // this.init(model, context);
ret.setCode(code); // ret.setCode(code);
ret.setData(model); // ret.setData(model);
ret.setDict(model.get("dict") == null ? null : (Map)model.remove("dict")); // ret.setDict(model.get("dict") == null ? null : (Map)model.remove("dict"));
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString()); // ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
return ret; // return ret;
} // }
@PostMapping({"accept"}) @PostMapping({"accept"})
public String accept(@RequestBody CustomerTrialEntity entity) { public String accept(@RequestBody CustomerTrialEntity entity) {
......
eas-manager/src/main/java/com/mortals/xhx/module/design/model/DesignMasterplateEntity.java
View file @ 787ee02e
...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.design.model.vo.DesignMasterplateVo; ...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.design.model.vo.DesignMasterplateVo;
* 模版管理实体对象 * 模版管理实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-08 * @date 2022-07-26
*/ */
public class DesignMasterplateEntity extends DesignMasterplateVo { public class DesignMasterplateEntity extends DesignMasterplateVo {
...@@ -68,6 +68,10 @@ public class DesignMasterplateEntity extends DesignMasterplateVo { ...@@ -68,6 +68,10 @@ public class DesignMasterplateEntity extends DesignMasterplateVo {
* 设计草稿 * 设计草稿
*/ */
private String draft; private String draft;
/**
* 版式。1：横版2竖版默认：1
*/
private Integer plateType;
...@@ -254,6 +258,20 @@ public class DesignMasterplateEntity extends DesignMasterplateVo { ...@@ -254,6 +258,20 @@ public class DesignMasterplateEntity extends DesignMasterplateVo {
public void setDraft(String draft){ public void setDraft(String draft){
this.draft = draft; this.draft = draft;
} }
/**
* 获取 版式。1：横版2竖版默认：1
* @return Integer
*/
public Integer getPlateType(){
return plateType;
}
/**
* 设置 版式。1：横版2竖版默认：1
* @param plateType
*/
public void setPlateType(Integer plateType){
this.plateType = plateType;
}
...@@ -289,6 +307,7 @@ public class DesignMasterplateEntity extends DesignMasterplateVo { ...@@ -289,6 +307,7 @@ public class DesignMasterplateEntity extends DesignMasterplateVo {
sb.append(",masterplateUseNum:").append(getMasterplateUseNum()); sb.append(",masterplateUseNum:").append(getMasterplateUseNum());
sb.append(",previewUrl:").append(getPreviewUrl()); sb.append(",previewUrl:").append(getPreviewUrl());
sb.append(",draft:").append(getDraft()); sb.append(",draft:").append(getDraft());
sb.append(",plateType:").append(getPlateType());
return sb.toString(); return sb.toString();
} }
...@@ -319,5 +338,7 @@ public class DesignMasterplateEntity extends DesignMasterplateVo { ...@@ -319,5 +338,7 @@ public class DesignMasterplateEntity extends DesignMasterplateVo {
this.previewUrl = ""; this.previewUrl = "";
this.draft = ""; this.draft = "";
this.plateType = null;
} }
} }
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/design/model/DesignMasterplateQuery.java
View file @ 787ee02e
...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.design.model.DesignMasterplateEntity; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.design.model.DesignMasterplateEntity;
* 模版管理查询对象 * 模版管理查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-08 * @date 2022-07-26
*/ */
public class DesignMasterplateQuery extends DesignMasterplateEntity { public class DesignMasterplateQuery extends DesignMasterplateEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
...@@ -93,6 +93,18 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -93,6 +93,18 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
/** 设计草稿 */ /** 设计草稿 */
private List<String> draftList; private List<String> draftList;
/** 开始 版式。1：横版2竖版默认：1 */
private Integer plateTypeStart;
/** 结束 版式。1：横版2竖版默认：1 */
private Integer plateTypeEnd;
/** 增加 版式。1：横版2竖版默认：1 */
private Integer plateTypeIncrement;
/** 版式。1：横版2竖版默认：1列表 */
private List <Integer> plateTypeList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<DesignMasterplateQuery> orConditionList; private List<DesignMasterplateQuery> orConditionList;
...@@ -539,6 +551,70 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -539,6 +551,70 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
public void setDraftList(List<String> draftList){ public void setDraftList(List<String> draftList){
this.draftList = draftList; this.draftList = draftList;
} }
/**
* 获取 开始 版式。1：横版2竖版默认：1
* @return plateTypeStart
*/
public Integer getPlateTypeStart(){
return this.plateTypeStart;
}
/**
* 设置 开始 版式。1：横版2竖版默认：1
* @param plateTypeStart
*/
public void setPlateTypeStart(Integer plateTypeStart){
this.plateTypeStart = plateTypeStart;
}
/**
* 获取 结束 版式。1：横版2竖版默认：1
* @return $plateTypeEnd
*/
public Integer getPlateTypeEnd(){
return this.plateTypeEnd;
}
/**
* 设置 结束 版式。1：横版2竖版默认：1
* @param plateTypeEnd
*/
public void setPlateTypeEnd(Integer plateTypeEnd){
this.plateTypeEnd = plateTypeEnd;
}
/**
* 获取 增加 版式。1：横版2竖版默认：1
* @return plateTypeIncrement
*/
public Integer getPlateTypeIncrement(){
return this.plateTypeIncrement;
}
/**
* 设置 增加 版式。1：横版2竖版默认：1
* @param plateTypeIncrement
*/
public void setPlateTypeIncrement(Integer plateTypeIncrement){
this.plateTypeIncrement = plateTypeIncrement;
}
/**
* 获取 版式。1：横版2竖版默认：1
* @return plateTypeList
*/
public List<Integer> getPlateTypeList(){
return this.plateTypeList;
}
/**
* 设置 版式。1：横版2竖版默认：1
* @param plateTypeList
*/
public void setPlateTypeList(List<Integer> plateTypeList){
this.plateTypeList = plateTypeList;
}
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param id * @param id
...@@ -910,6 +986,51 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -910,6 +986,51 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
return this; return this;
} }
/**
* 设置 版式。1：横版2竖版默认：1
* @param plateType
*/
public DesignMasterplateQuery plateType(Integer plateType){
setPlateType(plateType);
return this;
}
/**
* 设置 开始 版式。1：横版2竖版默认：1
* @param plateTypeStart
*/
public DesignMasterplateQuery plateTypeStart(Integer plateTypeStart){
this.plateTypeStart = plateTypeStart;
return this;
}
/**
* 设置 结束 版式。1：横版2竖版默认：1
* @param plateTypeEnd
*/
public DesignMasterplateQuery plateTypeEnd(Integer plateTypeEnd){
this.plateTypeEnd = plateTypeEnd;
return this;
}
/**
* 设置 增加 版式。1：横版2竖版默认：1
* @param plateTypeIncrement
*/
public DesignMasterplateQuery plateTypeIncrement(Integer plateTypeIncrement){
this.plateTypeIncrement = plateTypeIncrement;
return this;
}
/**
* 设置 版式。1：横版2竖版默认：1
* @param plateTypeList
*/
public DesignMasterplateQuery plateTypeList(List<Integer> plateTypeList){
this.plateTypeList = plateTypeList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
eas-manager/src/main/resources/bootstrap.yml
View file @ 787ee02e
...@@ -34,8 +34,8 @@ mybatis: ...@@ -34,8 +34,8 @@ mybatis:
application: application:
auth: auth:
unloginUrl: /refresh,/error,/login/login,/login/index,/login/logout,/customer/login/login,customer/login/logout,/securitycode/createCode,/file/common/*,/file/preview/*,/test*,/api/asset/*,/api/*,/zwfw/*,/ws/*,/swagger-ui*,/topic/*,/uploads/* unloginUrl: /refresh,/error,/login/login,/login/index,/login/logout,/customer/login/login,/customer/login/logout,/securitycode/createCode,/customer/trial/save,/file/common/*,/file/preview/*,/test*,/api/asset/*,/api/*,/zwfw/*,/ws/*,/swagger-ui*,/topic/*,/uploads/*
uncheckUrl: /refresh,/error,/login/login,/login/index,/login/logout,/customer/login/login,customer/login/logout,/securitycode/createCode,/file/common/*,/file/preview/*,/test*,/api/asset/*,/api/*,/zwfw/*,/ws/*,/swagger-ui*,/topic/*,/uploads/* uncheckUrl: /refresh,/error,/login/login,/login/index,/login/logout,/customer/login/login,/customer/login/logout,/securitycode/createCode,/customer/trial/save,/file/common/*,/file/preview/*,/test*,/api/asset/*,/api/*,/zwfw/*,/ws/*,/swagger-ui*,/topic/*,/uploads/*
workflow: workflow:
tenantId: ${spring.application.name} tenantId: ${spring.application.name}
token: token:
......
eas-manager/src/main/resources/sqlmap/module/customer/CustomerTrialMapper.xml
View file @ 787ee02e
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.customer.dao.ibatis.CustomerTrialDaoImpl"> <mapper namespace="com.mortals.xhx.module.customer.dao.ibatis.CustomerTrialDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="CustomerTrialEntity" id="CustomerTrialEntity-Map"> <resultMap type="CustomerTrialEntity" id="CustomerTrialEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="customerId" column="customerId" />
<result property="memberLevel" column="memberLevel" /> <result property="memberLevel" column="memberLevel" />
<result property="isAccept" column="isAccept" /> <result property="isAccept" column="isAccept" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="custName" column="custName" />
<result property="organization" column="organization" />
<result property="contactTelphone" column="contactTelphone" />
<result property="sex" column="sex" />
<result property="mailbox" column="mailbox" />
<result property="job" column="job" />
</resultMap> </resultMap>
...@@ -22,9 +27,6 @@ ...@@ -22,9 +27,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id, a.id,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('customerId') or colPickMode == 1 and data.containsKey('customerId')))">
a.customerId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('memberLevel') or colPickMode == 1 and data.containsKey('memberLevel')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('memberLevel') or colPickMode == 1 and data.containsKey('memberLevel')))">
a.memberLevel, a.memberLevel,
</if> </if>
...@@ -40,23 +42,41 @@ ...@@ -40,23 +42,41 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('custName') or colPickMode == 1 and data.containsKey('custName')))">
a.custName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('organization') or colPickMode == 1 and data.containsKey('organization')))">
a.organization,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('contactTelphone') or colPickMode == 1 and data.containsKey('contactTelphone')))">
a.contactTelphone,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sex') or colPickMode == 1 and data.containsKey('sex')))">
a.sex,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('mailbox') or colPickMode == 1 and data.containsKey('mailbox')))">
a.mailbox,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('job') or colPickMode == 1 and data.containsKey('job')))">
a.job,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CustomerTrialEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="CustomerTrialEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_customer_trial insert into mortals_xhx_customer_trial
(customerId,memberLevel,isAccept,createUserId,createTime,updateTime) (memberLevel,isAccept,createUserId,createTime,updateTime,custName,organization,contactTelphone,sex,mailbox,job)
VALUES VALUES
(#{customerId},#{memberLevel},#{isAccept},#{createUserId},#{createTime},#{updateTime}) (#{memberLevel},#{isAccept},#{createUserId},#{createTime},#{updateTime},#{custName},#{organization},#{contactTelphone},#{sex},#{mailbox},#{job})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_customer_trial insert into mortals_xhx_customer_trial
(customerId,memberLevel,isAccept,createUserId,createTime,updateTime) (memberLevel,isAccept,createUserId,createTime,updateTime,custName,organization,contactTelphone,sex,mailbox,job)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.customerId},#{item.memberLevel},#{item.isAccept},#{item.createUserId},#{item.createTime},#{item.updateTime}) (#{item.memberLevel},#{item.isAccept},#{item.createUserId},#{item.createTime},#{item.updateTime},#{item.custName},#{item.organization},#{item.contactTelphone},#{item.sex},#{item.mailbox},#{item.job})
</foreach> </foreach>
</insert> </insert>
...@@ -66,12 +86,6 @@ ...@@ -66,12 +86,6 @@
update mortals_xhx_customer_trial as a update mortals_xhx_customer_trial as a
set set
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('customerId')) or (colPickMode==1 and !data.containsKey('customerId'))">
a.customerId=#{data.customerId},
</if>
<if test="(colPickMode==0 and data.containsKey('customerIdIncrement')) or (colPickMode==1 and !data.containsKey('customerIdIncrement'))">
a.customerId=ifnull(a.customerId,0) + #{data.customerIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('memberLevel')) or (colPickMode==1 and !data.containsKey('memberLevel'))"> <if test="(colPickMode==0 and data.containsKey('memberLevel')) or (colPickMode==1 and !data.containsKey('memberLevel'))">
a.memberLevel=#{data.memberLevel}, a.memberLevel=#{data.memberLevel},
</if> </if>
...@@ -96,6 +110,27 @@ ...@@ -96,6 +110,27 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('custName')) or (colPickMode==1 and !data.containsKey('custName'))">
a.custName=#{data.custName},
</if>
<if test="(colPickMode==0 and data.containsKey('organization')) or (colPickMode==1 and !data.containsKey('organization'))">
a.organization=#{data.organization},
</if>
<if test="(colPickMode==0 and data.containsKey('contactTelphone')) or (colPickMode==1 and !data.containsKey('contactTelphone'))">
a.contactTelphone=#{data.contactTelphone},
</if>
<if test="(colPickMode==0 and data.containsKey('sex')) or (colPickMode==1 and !data.containsKey('sex'))">
a.sex=#{data.sex},
</if>
<if test="(colPickMode==0 and data.containsKey('sexIncrement')) or (colPickMode==1 and !data.containsKey('sexIncrement'))">
a.sex=ifnull(a.sex,0) + #{data.sexIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('mailbox')) or (colPickMode==1 and !data.containsKey('mailbox'))">
a.mailbox=#{data.mailbox},
</if>
<if test="(colPickMode==0 and data.containsKey('job')) or (colPickMode==1 and !data.containsKey('job'))">
a.job=#{data.job},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -108,18 +143,6 @@ ...@@ -108,18 +143,6 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_xhx_customer_trial as a update mortals_xhx_customer_trial as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="customerId=(case" suffix="ELSE customerId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('customerId')) or (colPickMode==1 and !item.containsKey('customerId'))">
when a.id=#{item.id} then #{item.customerId}
</when>
<when test="(colPickMode==0 and item.containsKey('customerIdIncrement')) or (colPickMode==1 and !item.containsKey('customerIdIncrement'))">
when a.id=#{item.id} then ifnull(a.customerId,0) + #{item.customerIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="memberLevel=(case" suffix="ELSE memberLevel end),"> <trim prefix="memberLevel=(case" suffix="ELSE memberLevel end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -170,6 +193,53 @@ ...@@ -170,6 +193,53 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="custName=(case" suffix="ELSE custName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('custName')) or (colPickMode==1 and !item.containsKey('custName'))">
when a.id=#{item.id} then #{item.custName}
</if>
</foreach>
</trim>
<trim prefix="organization=(case" suffix="ELSE organization end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('organization')) or (colPickMode==1 and !item.containsKey('organization'))">
when a.id=#{item.id} then #{item.organization}
</if>
</foreach>
</trim>
<trim prefix="contactTelphone=(case" suffix="ELSE contactTelphone end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('contactTelphone')) or (colPickMode==1 and !item.containsKey('contactTelphone'))">
when a.id=#{item.id} then #{item.contactTelphone}
</if>
</foreach>
</trim>
<trim prefix="sex=(case" suffix="ELSE sex end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('sex')) or (colPickMode==1 and !item.containsKey('sex'))">
when a.id=#{item.id} then #{item.sex}
</when>
<when test="(colPickMode==0 and item.containsKey('sexIncrement')) or (colPickMode==1 and !item.containsKey('sexIncrement'))">
when a.id=#{item.id} then ifnull(a.sex,0) + #{item.sexIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="mailbox=(case" suffix="ELSE mailbox end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('mailbox')) or (colPickMode==1 and !item.containsKey('mailbox'))">
when a.id=#{item.id} then #{item.mailbox}
</if>
</foreach>
</trim>
<trim prefix="job=(case" suffix="ELSE job end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('job')) or (colPickMode==1 and !item.containsKey('job'))">
when a.id=#{item.id} then #{item.job}
</if>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -292,27 +362,6 @@ ...@@ -292,27 +362,6 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if> </if>
<if test="conditionParamRef.containsKey('customerId')">
<if test="conditionParamRef.customerId != null ">
${_conditionType_} a.customerId = #{${_conditionParam_}.customerId}
</if>
<if test="conditionParamRef.customerId == null">
${_conditionType_} a.customerId is null
</if>
</if>
<if test="conditionParamRef.containsKey('customerIdList')">
${_conditionType_} a.customerId in
<foreach collection="conditionParamRef.customerIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('customerIdStart') and conditionParamRef.customerIdStart != null">
${_conditionType_} a.customerId <![CDATA[ >= ]]> #{${_conditionParam_}.customerIdStart}
</if>
<if test="conditionParamRef.containsKey('customerIdEnd') and conditionParamRef.customerIdEnd != null">
${_conditionType_} a.customerId <![CDATA[ <= ]]> #{${_conditionParam_}.customerIdEnd}
</if>
<if test="conditionParamRef.containsKey('memberLevel')"> <if test="conditionParamRef.containsKey('memberLevel')">
<if test="conditionParamRef.memberLevel != null "> <if test="conditionParamRef.memberLevel != null ">
${_conditionType_} a.memberLevel = #{${_conditionParam_}.memberLevel} ${_conditionType_} a.memberLevel = #{${_conditionParam_}.memberLevel}
...@@ -406,6 +455,102 @@ ...@@ -406,6 +455,102 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('custName')">
<if test="conditionParamRef.custName != null and conditionParamRef.custName != ''">
${_conditionType_} a.custName like #{${_conditionParam_}.custName}
</if>
<if test="conditionParamRef.custName == null">
${_conditionType_} a.custName is null
</if>
</if>
<if test="conditionParamRef.containsKey('custNameList')">
${_conditionType_} a.custName in
<foreach collection="conditionParamRef.custNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('organization')">
<if test="conditionParamRef.organization != null and conditionParamRef.organization != ''">
${_conditionType_} a.organization like #{${_conditionParam_}.organization}
</if>
<if test="conditionParamRef.organization == null">
${_conditionType_} a.organization is null
</if>
</if>
<if test="conditionParamRef.containsKey('organizationList')">
${_conditionType_} a.organization in
<foreach collection="conditionParamRef.organizationList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('contactTelphone')">
<if test="conditionParamRef.contactTelphone != null and conditionParamRef.contactTelphone != ''">
${_conditionType_} a.contactTelphone like #{${_conditionParam_}.contactTelphone}
</if>
<if test="conditionParamRef.contactTelphone == null">
${_conditionType_} a.contactTelphone is null
</if>
</if>
<if test="conditionParamRef.containsKey('contactTelphoneList')">
${_conditionType_} a.contactTelphone in
<foreach collection="conditionParamRef.contactTelphoneList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sex')">
<if test="conditionParamRef.sex != null ">
${_conditionType_} a.sex = #{${_conditionParam_}.sex}
</if>
<if test="conditionParamRef.sex == null">
${_conditionType_} a.sex is null
</if>
</if>
<if test="conditionParamRef.containsKey('sexList')">
${_conditionType_} a.sex in
<foreach collection="conditionParamRef.sexList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sexStart') and conditionParamRef.sexStart != null">
${_conditionType_} a.sex <![CDATA[ >= ]]> #{${_conditionParam_}.sexStart}
</if>
<if test="conditionParamRef.containsKey('sexEnd') and conditionParamRef.sexEnd != null">
${_conditionType_} a.sex <![CDATA[ <= ]]> #{${_conditionParam_}.sexEnd}
</if>
<if test="conditionParamRef.containsKey('mailbox')">
<if test="conditionParamRef.mailbox != null and conditionParamRef.mailbox != ''">
${_conditionType_} a.mailbox like #{${_conditionParam_}.mailbox}
</if>
<if test="conditionParamRef.mailbox == null">
${_conditionType_} a.mailbox is null
</if>
</if>
<if test="conditionParamRef.containsKey('mailboxList')">
${_conditionType_} a.mailbox in
<foreach collection="conditionParamRef.mailboxList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('job')">
<if test="conditionParamRef.job != null and conditionParamRef.job != ''">
${_conditionType_} a.job like #{${_conditionParam_}.job}
</if>
<if test="conditionParamRef.job == null">
${_conditionType_} a.job is null
</if>
</if>
<if test="conditionParamRef.containsKey('jobList')">
${_conditionType_} a.job in
<foreach collection="conditionParamRef.jobList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -424,11 +569,6 @@ ...@@ -424,11 +569,6 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if> <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('customerId')">
a.customerId
<if test='orderCol.customerId != null and "DESC".equalsIgnoreCase(orderCol.customerId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('memberLevel')"> <if test="orderCol.containsKey('memberLevel')">
a.memberLevel a.memberLevel
<if test='orderCol.memberLevel != null and "DESC".equalsIgnoreCase(orderCol.memberLevel)'>DESC</if> <if test='orderCol.memberLevel != null and "DESC".equalsIgnoreCase(orderCol.memberLevel)'>DESC</if>
...@@ -454,6 +594,36 @@ ...@@ -454,6 +594,36 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('custName')">
a.custName
<if test='orderCol.custName != null and "DESC".equalsIgnoreCase(orderCol.custName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('organization')">
a.organization
<if test='orderCol.organization != null and "DESC".equalsIgnoreCase(orderCol.organization)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('contactTelphone')">
a.contactTelphone
<if test='orderCol.contactTelphone != null and "DESC".equalsIgnoreCase(orderCol.contactTelphone)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('sex')">
a.sex
<if test='orderCol.sex != null and "DESC".equalsIgnoreCase(orderCol.sex)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('mailbox')">
a.mailbox
<if test='orderCol.mailbox != null and "DESC".equalsIgnoreCase(orderCol.mailbox)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('job')">
a.job
<if test='orderCol.job != null and "DESC".equalsIgnoreCase(orderCol.job)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
eas-manager/src/main/resources/sqlmap/module/design/DesignMasterplateMapper.xml
View file @ 787ee02e
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<result property="masterplateUseNum" column="masterplateUseNum" /> <result property="masterplateUseNum" column="masterplateUseNum" />
<result property="previewUrl" column="previewUrl" /> <result property="previewUrl" column="previewUrl" />
<result property="draft" column="draft" /> <result property="draft" column="draft" />
<result property="plateType" column="plateType" />
</resultMap> </resultMap>
...@@ -72,23 +73,26 @@ ...@@ -72,23 +73,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('draft') or colPickMode == 1 and data.containsKey('draft')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('draft') or colPickMode == 1 and data.containsKey('draft')))">
a.draft, a.draft,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('plateType') or colPickMode == 1 and data.containsKey('plateType')))">
a.plateType,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="DesignMasterplateEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="DesignMasterplateEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_design_masterplate insert into mortals_xhx_design_masterplate
(masterplateName,masterplateCode,customerId,customerName,createTime,masterplateDesc,masterplatePath,pictureIds,pictureSrcIds,pictureBackgroundIds,fontIds,masterplateUseNum,previewUrl,draft) (masterplateName,masterplateCode,customerId,customerName,createTime,masterplateDesc,masterplatePath,pictureIds,pictureSrcIds,pictureBackgroundIds,fontIds,masterplateUseNum,previewUrl,draft,plateType)
VALUES VALUES
(#{masterplateName},#{masterplateCode},#{customerId},#{customerName},#{createTime},#{masterplateDesc},#{masterplatePath},#{pictureIds},#{pictureSrcIds},#{pictureBackgroundIds},#{fontIds},#{masterplateUseNum},#{previewUrl},#{draft}) (#{masterplateName},#{masterplateCode},#{customerId},#{customerName},#{createTime},#{masterplateDesc},#{masterplatePath},#{pictureIds},#{pictureSrcIds},#{pictureBackgroundIds},#{fontIds},#{masterplateUseNum},#{previewUrl},#{draft},#{plateType})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_design_masterplate insert into mortals_xhx_design_masterplate
(masterplateName,masterplateCode,customerId,customerName,createTime,masterplateDesc,masterplatePath,pictureIds,pictureSrcIds,pictureBackgroundIds,fontIds,masterplateUseNum,previewUrl,draft) (masterplateName,masterplateCode,customerId,customerName,createTime,masterplateDesc,masterplatePath,pictureIds,pictureSrcIds,pictureBackgroundIds,fontIds,masterplateUseNum,previewUrl,draft,plateType)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.masterplateName},#{item.masterplateCode},#{item.customerId},#{item.customerName},#{item.createTime},#{item.masterplateDesc},#{item.masterplatePath},#{item.pictureIds},#{item.pictureSrcIds},#{item.pictureBackgroundIds},#{item.fontIds},#{item.masterplateUseNum},#{item.previewUrl},#{item.draft}) (#{item.masterplateName},#{item.masterplateCode},#{item.customerId},#{item.customerName},#{item.createTime},#{item.masterplateDesc},#{item.masterplatePath},#{item.pictureIds},#{item.pictureSrcIds},#{item.pictureBackgroundIds},#{item.fontIds},#{item.masterplateUseNum},#{item.previewUrl},#{item.draft},#{item.plateType})
</foreach> </foreach>
</insert> </insert>
...@@ -149,6 +153,12 @@ ...@@ -149,6 +153,12 @@
<if test="(colPickMode==0 and data.containsKey('draft')) or (colPickMode==1 and !data.containsKey('draft'))"> <if test="(colPickMode==0 and data.containsKey('draft')) or (colPickMode==1 and !data.containsKey('draft'))">
a.draft=#{data.draft}, a.draft=#{data.draft},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('plateType')) or (colPickMode==1 and !data.containsKey('plateType'))">
a.plateType=#{data.plateType},
</if>
<if test="(colPickMode==0 and data.containsKey('plateTypeIncrement')) or (colPickMode==1 and !data.containsKey('plateTypeIncrement'))">
a.plateType=ifnull(a.plateType,0) + #{data.plateTypeIncrement},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -274,6 +284,18 @@ ...@@ -274,6 +284,18 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="plateType=(case" suffix="ELSE plateType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('plateType')) or (colPickMode==1 and !item.containsKey('plateType'))">
when a.id=#{item.id} then #{item.plateType}
</when>
<when test="(colPickMode==0 and item.containsKey('plateTypeIncrement')) or (colPickMode==1 and !item.containsKey('plateTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.plateType,0) + #{item.plateTypeIncrement}
</when>
</choose>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -624,6 +646,27 @@ ...@@ -624,6 +646,27 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('plateType')">
<if test="conditionParamRef.plateType != null ">
${_conditionType_} a.plateType = #{${_conditionParam_}.plateType}
</if>
<if test="conditionParamRef.plateType == null">
${_conditionType_} a.plateType is null
</if>
</if>
<if test="conditionParamRef.containsKey('plateTypeList')">
${_conditionType_} a.plateType in
<foreach collection="conditionParamRef.plateTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('plateTypeStart') and conditionParamRef.plateTypeStart != null">
${_conditionType_} a.plateType <![CDATA[ >= ]]> #{${_conditionParam_}.plateTypeStart}
</if>
<if test="conditionParamRef.containsKey('plateTypeEnd') and conditionParamRef.plateTypeEnd != null">
${_conditionType_} a.plateType <![CDATA[ <= ]]> #{${_conditionParam_}.plateTypeEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -712,6 +755,11 @@ ...@@ -712,6 +755,11 @@
<if test='orderCol.draft != null and "DESC".equalsIgnoreCase(orderCol.draft)'>DESC</if> <if test='orderCol.draft != null and "DESC".equalsIgnoreCase(orderCol.draft)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('plateType')">
a.plateType
<if test='orderCol.plateType != null and "DESC".equalsIgnoreCase(orderCol.plateType)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
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