Skip to content

E
enterprise-platform
Commit 01ce88ac authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改员工属性

parent 7f6c1192
Show whitespace changes
Inline Side-by-side
Showing with 2356 additions and 2170 deletions
db/module.sql
View file @ 01ce88ac
......@@ -202,7 +202,7 @@ CREATE TABLE mortals_xhx_staff(
`gender` tinyint(2) DEFAULT '1' COMMENT '性别(1.男,2.女)',
`birthday` datetime COMMENT '出生日期',
`photoPath` varchar(255) COMMENT '照片',
`Email` varchar(128) COMMENT '邮件地址',
`email` varchar(128) COMMENT '邮件地址',
`phoneNumber` varchar(128) NOT NULL COMMENT '联系电话',
`idCard` varchar(128) COMMENT '身份证号码',
`workNum` varchar(128) COMMENT '工号',
......
enterprise-manager-ui/admin/src/views/staff/drawershow.vue
View file @ 01ce88ac
......@@ -13,7 +13,7 @@
<Field :span="20" label="职位" prop="positionId" v-model="form.positionId" type="select" :enum-data="dict.positionId" placeholder="请输入职位ID"/>
<Field :span="20" label="联系电话" prop="phoneNumber" v-model="form.phoneNumber" placeholder="请输入联系电话"/>
<Field :span="20" label="头像" prop="photoPath" placeholder="请输入照片"><imageUpload v-model="form.photoPath" prePath="/file/preview"/> </Field>
<Field :span="20" label="邮件地址" prop="Email" v-model="form.Email" placeholder="请输入邮件地址"/>
<Field :span="20" label="邮件地址" prop="email" v-model="form.email" placeholder="请输入邮件地址"/>
<Field :span="20" label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
......@@ -37,7 +37,33 @@
this.changePath("staff")
},
data() {
var checkEmail = (rule, value, callback) => {
let mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/;
if (!value) { //如果输入为空直接返回
callback();
} else {
//如果字符串 string 中含有与 RegExpObject 匹配的文本，则返回 true，否则返回 false。
if (mailReg.test(value)) { //匹配成功返回
callback();
} else { //匹配不成功返回错误显示
callback(new Error("邮箱格式:xx@xx.xx，只含数字、大小写字母、下划线、横杠"));
}
}
};
var checkPhone = (rule,value,callback) =>{
let phoneReg = /^1[3|4|5|7|8][0-9]{9}$/
if(!value){
callback()
}else{
if(phoneReg.test(value)){
callback()
}else{
callback(new Error("电话格式:13、14、15、17、18开头+9位阿拉伯数字"))
}
}
}
return {
// 遮罩层
loading: true,
// 弹出层标题
......@@ -66,16 +92,20 @@
{required: true,message: "请输入员工姓名", trigger: "blur" },
{max: 64,message: "最多只能录入64个字符",trigger: "blur",},
],
phoneNumber: [
{required: true,message: "请输入联系电话", trigger: "blur" },
{max: 128,message: "最多只能录入128个字符",trigger: "blur",},
positionId: [
{required: true,message: "请选择职位", trigger: "blur" }
],
companyIds: [
{required: true,message: "请输入所属公司", trigger: "blur" },
{max: 128,message: "最多只能录入128个字符",trigger: "blur",},
{required: true,message: "请选择所属企业", trigger: "blur" }
],
phoneNumber: [
{required: true,message: "请输入联系电话", trigger: "blur" },
{ validator: checkPhone,trigger: "blur" },
{max: 11,message: "最多只能录入11个字符",trigger: "blur",},
],
createTime: [
{required: true,message: "请选择创建时间" },
email: [
{ validator: checkEmail,trigger: "blur" }
],
}
};
......
enterprise-manager-ui/admin/src/views/staff/list.vue
View file @ 01ce88ac
......@@ -76,12 +76,12 @@
{label: "联系电话", prop: "phoneNumber"},
{label: "邮件地址", prop: "Email"},
{label: "邮件地址", prop: "email"},
{label: "所属公司", prop: "companyId",formatter: this.formatters},
{label: "所属公司", prop: "companyIds",formatter: this.formatters},
{label: "职位", prop: "positionName"},
{label: "职位", prop: "positionId",formatter:this.formatter},
{label: "发送名片次数", prop: "sendBusinessCardTimes"},
{label: "累计查看次数", prop: "sumViews"},
......
enterprise-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffEntity.java
View file @ 01ce88ac
......@@ -11,11 +11,11 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.staff.model.vo.StaffVo;
import lombok.Data;
/**
* 员工基本信息实体对象
*
* @author zxfei
* @date 2023-09-18
*/
* 员工基本信息实体对象
*
* @author zxfei
* @date 2023-09-28
*/
@Data
public class StaffEntity extends StaffVo {
private static final long serialVersionUID = 1L;
......@@ -37,10 +37,6 @@ public class StaffEntity extends StaffVo {
*/
private String photoPath;
/**
* 邮件地址
*/
private String Email;
/**
* 联系电话
*/
private String phoneNumber;
......@@ -112,6 +108,10 @@ public class StaffEntity extends StaffVo {
* 发送名片次数
*/
private Integer sendBusinessCardTimes;
/**
* 邮件地址
*/
private String email;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -133,7 +133,6 @@ public class StaffEntity extends StaffVo {
this.gender = 1;
this.birthday = new Date();
this.photoPath = "";
this.Email = "";
this.phoneNumber = "";
this.idCard = "";
this.workNum = "";
......@@ -152,5 +151,6 @@ public class StaffEntity extends StaffVo {
this.sumViews = 0;
this.viewsByDay = 0;
this.sendBusinessCardTimes = 0;
this.email = "";
}
}
\ No newline at end of file
enterprise-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffQuery.java
View file @ 01ce88ac
......@@ -4,11 +4,11 @@ import java.util.Date;
import java.util.List;
import com.mortals.xhx.module.staff.model.StaffEntity;
/**
* 员工基本信息查询对象
*
* @author zxfei
* @date 2023-09-18
*/
* 员工基本信息查询对象
*
* @author zxfei
* @date 2023-09-28
*/
public class StaffQuery extends StaffEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -56,11 +56,6 @@ public class StaffQuery extends StaffEntity {
/** 照片排除列表 */
private List <String> photoPathNotList;
/** 邮件地址 */
private List<String> EmailList;
/** 邮件地址排除列表 */
private List <String> EmailNotList;
/** 联系电话 */
private List<String> phoneNumberList;
......@@ -266,6 +261,11 @@ public class StaffQuery extends StaffEntity {
/** 结束 更新时间 */
private String updateTimeEnd;
/** 邮件地址 */
private List<String> emailList;
/** 邮件地址排除列表 */
private List <String> emailNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<StaffQuery> orConditionList;
......@@ -532,38 +532,6 @@ public class StaffQuery extends StaffEntity {
this.photoPathNotList = photoPathNotList;
}
/**
* 获取 邮件地址
* @return EmailList
*/
public List<String> getEmailList(){
return this.EmailList;
}
/**
* 设置 邮件地址
* @param EmailList
*/
public void setEmailList(List<String> EmailList){
this.EmailList = EmailList;
}
/**
* 获取 邮件地址
* @return EmailNotList
*/
public List<String> getEmailNotList(){
return this.EmailNotList;
}
/**
* 设置 邮件地址
* @param EmailNotList
*/
public void setEmailNotList(List<String> EmailNotList){
this.EmailNotList = EmailNotList;
}
/**
* 获取 联系电话
* @return phoneNumberList
......@@ -1709,6 +1677,38 @@ public class StaffQuery extends StaffEntity {
this.updateTimeEnd = updateTimeEnd;
}
/**
* 获取 邮件地址
* @return emailList
*/
public List<String> getEmailList(){
return this.emailList;
}
/**
* 设置 邮件地址
* @param emailList
*/
public void setEmailList(List<String> emailList){
this.emailList = emailList;
}
/**
* 获取 邮件地址
* @return emailNotList
*/
public List<String> getEmailNotList(){
return this.emailNotList;
}
/**
* 设置 邮件地址
* @param emailNotList
*/
public void setEmailNotList(List<String> emailNotList){
this.emailNotList = emailNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
......@@ -1857,25 +1857,6 @@ public class StaffQuery extends StaffEntity {
}
/**
* 设置 邮件地址
* @param Email
*/
public StaffQuery Email(String Email){
setEmail(Email);
return this;
}
/**
* 设置 邮件地址
* @param EmailList
*/
public StaffQuery EmailList(List<String> EmailList){
this.EmailList = EmailList;
return this;
}
/**
* 设置 联系电话
* @param phoneNumber
......@@ -2518,6 +2499,25 @@ public class StaffQuery extends StaffEntity {
}
/**
* 设置 邮件地址
* @param email
*/
public StaffQuery email(String email){
setEmail(email);
return this;
}
/**
* 设置 邮件地址
* @param emailList
*/
public StaffQuery emailList(List<String> emailList){
this.emailList = emailList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
enterprise-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java
View file @ 01ce88ac
......@@ -93,7 +93,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
}
if(!ObjectUtils.isEmpty(entity.getPositionId())){
PositionEntity positionEntity = positionService.get(entity.getPositionId(), getContext());
entity.setCompanyName(positionEntity.getPositionName());
entity.setPositionName(positionEntity.getPositionName());
}
}
}
\ No newline at end of file
enterprise-manager/src/main/resources/sqlmap/module/staff/StaffMapper.xml
View file @ 01ce88ac
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.staff.dao.ibatis.StaffDaoImpl">
<!-- 字段和属性映射 -->
......@@ -10,7 +10,6 @@
<result property="gender" column="gender" />
<result property="birthday" column="birthday" />
<result property="photoPath" column="photoPath" />
<result property="Email" column="Email" />
<result property="phoneNumber" column="phoneNumber" />
<result property="idCard" column="idCard" />
<result property="workNum" column="workNum" />
......@@ -33,6 +32,7 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="email" column="email" />
</resultMap>
......@@ -55,9 +55,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('photoPath') or colPickMode == 1 and data.containsKey('photoPath')))">
a.photoPath,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('Email') or colPickMode == 1 and data.containsKey('Email')))">
a.Email,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('phoneNumber') or colPickMode == 1 and data.containsKey('phoneNumber')))">
a.phoneNumber,
</if>
......@@ -124,23 +121,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('email') or colPickMode == 1 and data.containsKey('email')))">
a.email,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="StaffEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_staff
(name,gender,birthday,photoPath,Email,phoneNumber,idCard,workNum,companyIds,companyName,positionId,positionName,staffType,staffStatus,source,registerPath,entryDate,regularDate,leaveDate,remark,sumViews,viewsByDay,sendBusinessCardTimes,createUserId,createTime,updateUserId,updateTime)
(name,gender,birthday,photoPath,phoneNumber,idCard,workNum,companyIds,companyName,positionId,positionName,staffType,staffStatus,source,registerPath,entryDate,regularDate,leaveDate,remark,sumViews,viewsByDay,sendBusinessCardTimes,createUserId,createTime,updateUserId,updateTime,email)
VALUES
(#{name},#{gender},#{birthday},#{photoPath},#{Email},#{phoneNumber},#{idCard},#{workNum},#{companyIds},#{companyName},#{positionId},#{positionName},#{staffType},#{staffStatus},#{source},#{registerPath},#{entryDate},#{regularDate},#{leaveDate},#{remark},#{sumViews},#{viewsByDay},#{sendBusinessCardTimes},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
(#{name},#{gender},#{birthday},#{photoPath},#{phoneNumber},#{idCard},#{workNum},#{companyIds},#{companyName},#{positionId},#{positionName},#{staffType},#{staffStatus},#{source},#{registerPath},#{entryDate},#{regularDate},#{leaveDate},#{remark},#{sumViews},#{viewsByDay},#{sendBusinessCardTimes},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{email})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_staff
(name,gender,birthday,photoPath,Email,phoneNumber,idCard,workNum,companyIds,companyName,positionId,positionName,staffType,staffStatus,source,registerPath,entryDate,regularDate,leaveDate,remark,sumViews,viewsByDay,sendBusinessCardTimes,createUserId,createTime,updateUserId,updateTime)
(name,gender,birthday,photoPath,phoneNumber,idCard,workNum,companyIds,companyName,positionId,positionName,staffType,staffStatus,source,registerPath,entryDate,regularDate,leaveDate,remark,sumViews,viewsByDay,sendBusinessCardTimes,createUserId,createTime,updateUserId,updateTime,email)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.name},#{item.gender},#{item.birthday},#{item.photoPath},#{item.Email},#{item.phoneNumber},#{item.idCard},#{item.workNum},#{item.companyIds},#{item.companyName},#{item.positionId},#{item.positionName},#{item.staffType},#{item.staffStatus},#{item.source},#{item.registerPath},#{item.entryDate},#{item.regularDate},#{item.leaveDate},#{item.remark},#{item.sumViews},#{item.viewsByDay},#{item.sendBusinessCardTimes},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
(#{item.name},#{item.gender},#{item.birthday},#{item.photoPath},#{item.phoneNumber},#{item.idCard},#{item.workNum},#{item.companyIds},#{item.companyName},#{item.positionId},#{item.positionName},#{item.staffType},#{item.staffStatus},#{item.source},#{item.registerPath},#{item.entryDate},#{item.regularDate},#{item.leaveDate},#{item.remark},#{item.sumViews},#{item.viewsByDay},#{item.sendBusinessCardTimes},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.email})
</foreach>
</insert>
......@@ -165,9 +165,6 @@
<if test="(colPickMode==0 and data.containsKey('photoPath')) or (colPickMode==1 and !data.containsKey('photoPath'))">
a.photoPath=#{data.photoPath},
</if>
<if test="(colPickMode==0 and data.containsKey('Email')) or (colPickMode==1 and !data.containsKey('Email'))">
a.Email=#{data.Email},
</if>
<if test="(colPickMode==0 and data.containsKey('phoneNumber')) or (colPickMode==1 and !data.containsKey('phoneNumber'))">
a.phoneNumber=#{data.phoneNumber},
</if>
......@@ -261,6 +258,9 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('email')) or (colPickMode==1 and !data.containsKey('email'))">
a.email=#{data.email},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -306,13 +306,6 @@
</if>
</foreach>
</trim>
<trim prefix="Email=(case" suffix="ELSE Email end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('Email')) or (colPickMode==1 and !item.containsKey('Email'))">
when a.id=#{item.id} then #{item.Email}
</if>
</foreach>
</trim>
<trim prefix="phoneNumber=(case" suffix="ELSE phoneNumber end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('phoneNumber')) or (colPickMode==1 and !item.containsKey('phoneNumber'))">
......@@ -512,6 +505,13 @@
</if>
</foreach>
</trim>
<trim prefix="email=(case" suffix="ELSE email end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('email')) or (colPickMode==1 and !item.containsKey('email'))">
when a.id=#{item.id} then #{item.email}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -740,27 +740,6 @@
</foreach>
</if>
<if test="conditionParamRef.containsKey('Email')">
<if test="conditionParamRef.Email != null and conditionParamRef.Email != ''">
${_conditionType_} a.Email like #{${_conditionParam_}.Email}
</if>
<if test="conditionParamRef.Email == null">
${_conditionType_} a.Email is null
</if>
</if>
<if test="conditionParamRef.containsKey('EmailList') and conditionParamRef.EmailList.size() > 0">
${_conditionType_} a.Email in
<foreach collection="conditionParamRef.EmailList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('EmailNotList') and conditionParamRef.EmailNotList.size() > 0">
${_conditionType_} a.Email not in
<foreach collection="conditionParamRef.EmailNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('phoneNumber')">
<if test="conditionParamRef.phoneNumber != null and conditionParamRef.phoneNumber != ''">
${_conditionType_} a.phoneNumber like #{${_conditionParam_}.phoneNumber}
......@@ -1246,18 +1225,193 @@
<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')
</if>
<if test="conditionParamRef.containsKey('email')">
<if test="conditionParamRef.email != null and conditionParamRef.email != ''">
${_conditionType_} a.email like #{${_conditionParam_}.email}
</if>
<if test="conditionParamRef.email == null">
${_conditionType_} a.email is null
</if>
</if>
<if test="conditionParamRef.containsKey('emailList') and conditionParamRef.emailList.size() > 0">
${_conditionType_} a.email in
<foreach collection="conditionParamRef.emailList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('emailNotList') and conditionParamRef.emailNotList.size() > 0">
${_conditionType_} a.email not in
<foreach collection="conditionParamRef.emailNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('genderList') and conditionParamRef.genderList.size() > 0">
field(a.gender,
<foreach collection="conditionParamRef.genderList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('positionIdList') and conditionParamRef.positionIdList.size() > 0">
field(a.positionId,
<foreach collection="conditionParamRef.positionIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('staffTypeList') and conditionParamRef.staffTypeList.size() > 0">
field(a.staffType,
<foreach collection="conditionParamRef.staffTypeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('staffStatusList') and conditionParamRef.staffStatusList.size() > 0">
field(a.staffStatus,
<foreach collection="conditionParamRef.staffStatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
field(a.source,
<foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('sumViewsList') and conditionParamRef.sumViewsList.size() > 0">
field(a.sumViews,
<foreach collection="conditionParamRef.sumViewsList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('viewsByDayList') and conditionParamRef.viewsByDayList.size() > 0">
field(a.viewsByDay,
<foreach collection="conditionParamRef.viewsByDayList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('sendBusinessCardTimesList') and conditionParamRef.sendBusinessCardTimesList.size() > 0">
field(a.sendBusinessCardTimes,
<foreach collection="conditionParamRef.sendBusinessCardTimesList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
a.${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('genderList') and conditionParamRef.genderList.size() > 0">
field(a.gender,
<foreach collection="conditionParamRef.genderList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('positionIdList') and conditionParamRef.positionIdList.size() > 0">
field(a.positionId,
<foreach collection="conditionParamRef.positionIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('staffTypeList') and conditionParamRef.staffTypeList.size() > 0">
field(a.staffType,
<foreach collection="conditionParamRef.staffTypeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('staffStatusList') and conditionParamRef.staffStatusList.size() > 0">
field(a.staffStatus,
<foreach collection="conditionParamRef.staffStatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
field(a.source,
<foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('sumViewsList') and conditionParamRef.sumViewsList.size() > 0">
field(a.sumViews,
<foreach collection="conditionParamRef.sumViewsList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('viewsByDayList') and conditionParamRef.viewsByDayList.size() > 0">
field(a.viewsByDay,
<foreach collection="conditionParamRef.viewsByDayList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('sendBusinessCardTimesList') and conditionParamRef.sendBusinessCardTimesList.size() > 0">
field(a.sendBusinessCardTimes,
<foreach collection="conditionParamRef.sendBusinessCardTimesList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')">
a.id
......@@ -1284,11 +1438,6 @@
<if test='orderCol.photoPath != null and "DESC".equalsIgnoreCase(orderCol.photoPath)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('Email')">
a.Email
<if test='orderCol.Email != null and "DESC".equalsIgnoreCase(orderCol.Email)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('phoneNumber')">
a.phoneNumber
<if test='orderCol.phoneNumber != null and "DESC".equalsIgnoreCase(orderCol.phoneNumber)'>DESC</if>
......@@ -1399,8 +1548,15 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('email')">
a.email
<if test='orderCol.email != null and "DESC".equalsIgnoreCase(orderCol.email)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
......
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