Commit ea6ad660 authored by 赵啸非's avatar 赵啸非

修改同步用户

parent 483058fb
package com.mortals.xhx.common.pdu;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.web.BaseForm;
public class LoginForm extends BaseForm {
private String loginName;
private String password;
private String securityCode;
public String getLoginName() {
return loginName;
}
public void setLoginName(String loginName) {
this.loginName = loginName;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public String getSecurityCode() {
return securityCode;
}
public void setSecurityCode(String securityCode) {
this.securityCode = securityCode;
}
@Override
public String toString() {
return "loginName:" + this.loginName + " password:" + this.password;
}
@Override
public boolean validate() throws AppException {
if (loginName == null || loginName.trim().length() == 0) {
throw new AppException("帐号不能为空!");
}
if (password == null || password.trim().length() == 0) {
throw new AppException("密码不能为空!");
}
// if (securityCode == null || securityCode.trim().length() == 0) {
// throw new AppException("验证码不能为空!");
// }
return super.validate();
}
}
package com.mortals.xhx.common.pdu.device;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class DeviceReq implements Serializable {
/**
* 1:新增,2:修改,3:删除,4:激活,5:启用,6:停用
*/
private Integer receiveMethod;
/**
* 产品id
*/
private Long productId;
/**
* 产品编码
*/
private String productCode;
/**
* 设备生产厂商ID
*/
private Long deviceFirmId;
/**
* 设备生产厂商名称
*/
private String deviceFirmname;
/**
* 设备名称
*/
private String deviceName;
/**
* 设备编码(暂定mac地址)
*/
private String deviceCode;
/**
* 设备Mac
*/
private String deviceMac;
/**
* 所属站点Id
*/
private Long siteId;
/**
* 所属站点编码
*/
private String siteCode;
/**
* 所属站点名称
*/
private String siteName;
/**
* 设备备注信息
*/
private String deviceRemark;
/**
* 设备
*/
private String homeUrl;
/**
* 设备访问ip
*/
private String ip;
/**
* 中心设备编码
*/
private String centernum;
/**
* 端口
*/
private String port;
/**
* 经度
*/
private String lon;
/**
* 纬度
*/
private String lati;
/**
* 楼层
*/
private Integer deviceInBuilding;
/**
* 所属楼栋
*/
private Integer deviceInFloor;
/**
* 负责人
*/
private String leadingOfficial;
/**
* 联系电话
*/
private String leadingOfficialTelephone;
/**
* 保修期至
*/
private Date defectsLiabilityPeriod;
/**
* 设备状态 (0.未激活,1.离线,2.在线)
*/
private Integer deviceStatus;
/**
* 设备来源(0.旧设备,1.新设备)
*/
private Integer source;
/**
* 激活(0.否,1.是)
*/
private Integer active;
/**
* 设备版本信息
*/
private String deviceVersion;
}
package com.mortals.xhx.feign.device; package com.mortals.xhx.feign.device;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.xhx.common.pdu.LoginForm;
import com.mortals.xhx.common.pdu.RespData; import com.mortals.xhx.common.pdu.RespData;
import com.mortals.xhx.common.pdu.device.DevicePdu; import com.mortals.xhx.common.pdu.device.DevicePdu;
import com.mortals.xhx.common.pdu.device.DeviceReq;
import com.mortals.xhx.feign.IFeign; import com.mortals.xhx.feign.IFeign;
import feign.hystrix.FallbackFactory; import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -11,8 +13,10 @@ import org.springframework.stereotype.Component; ...@@ -11,8 +13,10 @@ import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
/** /**
* 设备 Feign接口 * 设备 Feign接口
*
* @author zxfei * @author zxfei
* @date 2023-02-25 * @date 2023-02-25
*/ */
...@@ -47,9 +51,28 @@ public interface IDeviceFeign extends IFeign { ...@@ -47,9 +51,28 @@ public interface IDeviceFeign extends IFeign {
* @return * @return
*/ */
@PostMapping(value = "/device/save") @PostMapping(value = "/device/save")
Rest<RespData<DevicePdu>> save(@RequestBody DevicePdu devicePdu,@RequestHeader("Authorization") String authorization); Rest<RespData<DevicePdu>> save(@RequestBody DevicePdu devicePdu, @RequestHeader("Authorization") String authorization);
/**
* 获取token
*
* @param loginForm
* @return
*/
@PostMapping(value = "/api/getToken")
Rest<String> getToken(@RequestBody LoginForm loginForm);
/**
* 设备回调
*
* @param deviceReq
* @return
*/
@PostMapping(value = "/api/receive")
Rest<String> deviceCall(@RequestBody DeviceReq deviceReq, @RequestHeader("Authorization") String authorization);
} }
...@@ -61,18 +84,28 @@ class DeviceFeignFallbackFactory implements FallbackFactory<IDeviceFeign> { ...@@ -61,18 +84,28 @@ class DeviceFeignFallbackFactory implements FallbackFactory<IDeviceFeign> {
return new IDeviceFeign() { return new IDeviceFeign() {
@Override @Override
public Rest<RespData<List<DevicePdu>>> list(DevicePdu devicePdu) { public Rest<RespData<List<DevicePdu>>> list(DevicePdu devicePdu) {
return Rest.fail("暂时无法获取设备列表,请稍后再试!"); return Rest.fail("暂时无法获取设备列表,请稍后再试!");
} }
@Override @Override
public Rest<DevicePdu> info(Long id) { public Rest<DevicePdu> info(Long id) {
return Rest.fail("暂时无法获取设备详细,请稍后再试!"); return Rest.fail("暂时无法获取设备详细,请稍后再试!");
} }
@Override @Override
public Rest<RespData<DevicePdu>> save(DevicePdu devicePdu, String authorization) { public Rest<RespData<DevicePdu>> save(DevicePdu devicePdu, String authorization) {
return Rest.fail("暂时无法保存设备,请稍后再试!"); return Rest.fail("暂时无法保存设备,请稍后再试!");
} }
@Override
public Rest<String> getToken(LoginForm loginForm) {
return Rest.fail("暂时无法获取token,请稍后再试!");
}
@Override
public Rest<String> deviceCall(DeviceReq deviceReq, String authorization) {
return Rest.fail("暂时无法保存设备,请稍后再试!");
}
}; };
} }
} }
......
...@@ -57,8 +57,10 @@ CREATE TABLE mortals_xhx_room( ...@@ -57,8 +57,10 @@ CREATE TABLE mortals_xhx_room(
`createTime` datetime NOT NULL COMMENT '创建时间', `createTime` datetime NOT NULL COMMENT '创建时间',
`updateUserId` bigint(20) COMMENT '更新用户', `updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '更新时间', `updateTime` datetime COMMENT '更新时间',
`deviceCode` varchar(64) COMMENT '绑定的设备编码',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='房间管理'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='房间管理';
-- ---------------------------- -- ----------------------------
-- 房间工作人员信息表 -- 房间工作人员信息表
-- ---------------------------- -- ----------------------------
...@@ -96,8 +98,11 @@ CREATE TABLE mortals_xhx_workman( ...@@ -96,8 +98,11 @@ CREATE TABLE mortals_xhx_workman(
`createTime` datetime COMMENT '创建时间', `createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户', `createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间', `updateTime` datetime COMMENT '修改时间',
`loginName` varchar(64) COMMENT '登录用户名',
`loginPwd` varchar(64) COMMENT '密码',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='工作人员'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='工作人员';
-- ---------------------------- -- ----------------------------
-- 设备管理表 -- 设备管理表
-- ---------------------------- -- ----------------------------
......
...@@ -2370,6 +2370,74 @@ msg|String|消息|- ...@@ -2370,6 +2370,74 @@ msg|String|消息|-
``` ```
## 终端服务 ## 终端服务
### 工作人员登录
**请求URL:** workman/doLogin
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:**
**请求参数:**
参数名称|类型|备注|必填|其它
---|---|---|---|---
loginName|String|用户名|是|-
loginPwd|String|密码|是|-
**请求样例:**
```
```
**响应参数:**
参数名称 |参数类型|备注|其它
---|---|---|---
code|Integer|结果码(-1.失败,1.成功)|-
msg|String|消息|-
data|object|数据对象|-
**响应消息样例:**
```
```
### 工作人员密码修改
**请求URL:** workman/change/password
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:**
**请求参数:**
参数名称|类型|备注|必填|其它
---|---|---|---|---
loginName|String|用户名|是|-
oldPwd|String|旧密码|是|-
newPwd|String|新密码|是|-
**请求样例:**
```
```
**响应参数:**
参数名称 |参数类型|备注|其它
---|---|---|---
code|Integer|结果码(-1.失败,1.成功)|-
msg|String|消息|-
### 工作人员列表 ### 工作人员列表
**请求URL:** workman/list **请求URL:** workman/list
...@@ -2382,16 +2450,19 @@ msg|String|消息|- ...@@ -2382,16 +2450,19 @@ msg|String|消息|-
**请求参数:** **请求参数:**
参数名称|类型|必填|描述 参数名称| 类型 |必填|描述
:---|:---|:---|:------ :---|:--------|:---|:------
page|Integer|否|当前页 page| Integer |否|当前页
size|Integer|否|每页条数,值为-1,查询所有记录 size| Integer |否|每页条数,值为-1,查询所有记录
deviceCode| String |否|设备编码
**请求样例:** **请求样例:**
``` ```
{ {
"page":1, "page":1,
"size":10 "size":10,
"deviceCode":"123123"
} }
``` ```
...@@ -2515,12 +2586,14 @@ data| object |数据对象 ...@@ -2515,12 +2586,14 @@ data| object |数据对象
:---|:---|:---|:------ :---|:---|:---|:------
page|Integer|否|当前页 page|Integer|否|当前页
size|Integer|否|每页条数,值为-1,查询所有记录 size|Integer|否|每页条数,值为-1,查询所有记录
deviceCode| String |否|设备编码
**请求样例:** **请求样例:**
``` ```
{ {
"page":1, "page":1,
"size":10 "size":10,
"deviceCode","adfdd"
} }
``` ```
......
...@@ -7,8 +7,10 @@ ...@@ -7,8 +7,10 @@
size="50%"> size="50%">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field :span="20" label="所属房间" prop="roomId" v-model="form.roomId" :enumData="dict.roomId" type="select" placeholder="请输入所属房间"/> <Field :span="20" :disabled="pageInfo.type=='edit'" label="登录名" prop="loginName" v-model="form.loginName" placeholder="请输入登录名"/>
<Field :span="20" :disabled="pageInfo.type=='edit'" label="登录密码" prop="loginPwd" type="password" v-model="form.loginPwd" placeholder="请输入密码"/>
<Field :span="20" label="所属房间" prop="roomId" v-model="form.roomId" :enumData="dict.roomId" type="select" placeholder="请输入所属房间"/>
<Field :span="20" label="所属部门" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门"/> <Field :span="20" label="所属部门" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门"/>
<Field :span="20" label="姓名" prop="name" v-model="form.name" placeholder="请输入姓名"/> <Field :span="20" label="姓名" prop="name" v-model="form.name" placeholder="请输入姓名"/>
<Field :span="20" label="性别" prop="sex" v-model="form.sex" type="select" :enumData="dict.sex" placeholder="请选择性别"/> <Field :span="20" label="性别" prop="sex" v-model="form.sex" type="select" :enumData="dict.sex" placeholder="请选择性别"/>
...@@ -62,6 +64,22 @@ ...@@ -62,6 +64,22 @@
], ],
// 表单校验 // 表单校验
rules: { rules: {
loginName: [
{required: true,message: "请输入登录名称", trigger: "blur" },
{max: 64,message: "最多只能录入64个字符",trigger: "blur",},
],
loginPwd: [
{required: true,message: "请输入登录密码", trigger: "blur" },
{max: 64,message: "最多只能录入64个字符",trigger: "blur",},
],
roomId: [
{required: true,message: "请选择人员所属房间", trigger: "blur" }
],
mobile: [
{required: true,message: "请输入手机号码", trigger: "blur" },
{max: 64,message: "最多只能录入64个字符",trigger: "blur",},
],
workStatus: [ workStatus: [
{required: true,message: "请输入工作状态,来源基础设置", trigger: "blur" }, {required: true,message: "请输入工作状态,来源基础设置", trigger: "blur" },
{max: 64,message: "最多只能录入64个字符",trigger: "blur",}, {max: 64,message: "最多只能录入64个字符",trigger: "blur",},
......
...@@ -176,6 +176,7 @@ ...@@ -176,6 +176,7 @@
{label: "职位", prop: "userPost"}, {label: "职位", prop: "userPost"},
{label: "电话", prop: "phone"}, {label: "电话", prop: "phone"},
{label: "手机", prop: "mobile"},
{label: "工作状态", prop: "workStatus"}, {label: "工作状态", prop: "workStatus"},
......
package com.mortals.xhx.module.device.service.impl; package com.mortals.xhx.module.device.service.impl;
import com.mortals.framework.common.Rest;
import com.mortals.xhx.common.pdu.LoginForm;
import com.mortals.xhx.common.pdu.device.DeviceReq;
import com.mortals.xhx.feign.device.IDeviceFeign;
import lombok.Data;
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.framework.exception.AppException; import com.mortals.framework.exception.AppException;
...@@ -7,24 +14,35 @@ import com.mortals.xhx.module.device.dao.DeviceDao; ...@@ -7,24 +14,35 @@ import com.mortals.xhx.module.device.dao.DeviceDao;
import com.mortals.xhx.module.device.model.DeviceEntity; import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.device.service.DeviceService; import com.mortals.xhx.module.device.service.DeviceService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
/** /**
* DeviceService * DeviceService
* 设备管理 service实现 * 设备管理 service实现
* *
* @author zxfei * @author zxfei
* @date 2023-05-22 * @date 2023-05-22
*/ */
@Service("deviceService") @Service("deviceService")
@Slf4j @Slf4j
public class DeviceServiceImpl extends AbstractCRUDServiceImpl<DeviceDao, DeviceEntity, Long> implements DeviceService { public class DeviceServiceImpl extends AbstractCRUDServiceImpl<DeviceDao, DeviceEntity, Long> implements DeviceService {
@Autowired
private IDeviceFeign deviceFeign;
@Override @Override
protected void saveAfter(DeviceEntity entity, Context context) throws AppException { protected void saveAfter(DeviceEntity entity, Context context) throws AppException {
super.saveAfter(entity, context); super.saveAfter(entity, context);
//todo 通知设备管理系统 //todo 通知设备管理系统
String token = getToken();
DeviceReq deviceReq = new DeviceReq();
deviceReq.setReceiveMethod(1);
deviceFeign.deviceCall(deviceReq,token);
} }
@Override @Override
protected void updateAfter(DeviceEntity entity, Context context) throws AppException { protected void updateAfter(DeviceEntity entity, Context context) throws AppException {
super.updateAfter(entity, context); super.updateAfter(entity, context);
...@@ -40,4 +58,13 @@ public class DeviceServiceImpl extends AbstractCRUDServiceImpl<DeviceDao, Device ...@@ -40,4 +58,13 @@ public class DeviceServiceImpl extends AbstractCRUDServiceImpl<DeviceDao, Device
public void deviceEnabled(Long id, Integer status, Context context) { public void deviceEnabled(Long id, Integer status, Context context) {
} }
private String getToken() {
LoginForm loginForm = new LoginForm();
loginForm.setLoginName("admin");
loginForm.setPassword("xhx@yb123");
Rest<String> rest = deviceFeign.getToken(loginForm);
String token = rest.getData();
return token;
}
} }
\ No newline at end of file
...@@ -56,8 +56,6 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe ...@@ -56,8 +56,6 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
this.addDict(model, "deviceInFloor", paramService.getParamBySecondOrganize("Device","deviceInFloor")); this.addDict(model, "deviceInFloor", paramService.getParamBySecondOrganize("Device","deviceInFloor"));
this.addDict(model, "deviceStatus", paramService.getParamBySecondOrganize("Device","deviceStatus")); this.addDict(model, "deviceStatus", paramService.getParamBySecondOrganize("Device","deviceStatus"));
this.addDict(model, "enabled", paramService.getParamBySecondOrganize("Device","enabled")); this.addDict(model, "enabled", paramService.getParamBySecondOrganize("Device","enabled"));
this.addDict(model, "roomId", roomService.find(new RoomQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRoomName(), (o, n) -> n))); this.addDict(model, "roomId", roomService.find(new RoomQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRoomName(), (o, n) -> n)));
super.init(model, context); super.init(model, context);
......
...@@ -22,4 +22,6 @@ public class MettingRecordVo extends BaseEntityLong { ...@@ -22,4 +22,6 @@ public class MettingRecordVo extends BaseEntityLong {
/** 结束 会议日期 */ /** 结束 会议日期 */
private String meetDateEnd; private String meetDateEnd;
private String deviceCode;
} }
\ No newline at end of file
...@@ -7,8 +7,10 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; ...@@ -7,8 +7,10 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.metting.model.MettingRecordEntity; import com.mortals.xhx.module.metting.model.MettingRecordEntity;
import com.mortals.xhx.module.metting.service.MettingRecordService; import com.mortals.xhx.module.metting.service.MettingRecordService;
import com.mortals.xhx.module.room.model.RoomEntity;
import com.mortals.xhx.module.room.model.RoomQuery; import com.mortals.xhx.module.room.model.RoomQuery;
import com.mortals.xhx.module.room.service.RoomService; import com.mortals.xhx.module.room.service.RoomService;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -51,5 +53,13 @@ public class MettingRecordController extends BaseCRUDJsonBodyMappingController<M ...@@ -51,5 +53,13 @@ public class MettingRecordController extends BaseCRUDJsonBodyMappingController<M
protected void doListBefore(MettingRecordEntity query, Map<String, Object> model, Context context) throws AppException { protected void doListBefore(MettingRecordEntity query, Map<String, Object> model, Context context) throws AppException {
super.doListBefore(query, model, context); super.doListBefore(query, model, context);
query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING))); query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
if (!ObjectUtils.isEmpty(query.getDeviceCode())) {
//根据设备编码 查询房间room
RoomEntity roomEntity = roomService.selectOne(new RoomQuery().deviceCode(query.getDeviceCode()));
if (!ObjectUtils.isEmpty(roomEntity)) {
query.setRoomId(roomEntity.getId());
}
}
} }
} }
\ No newline at end of file
package com.mortals.xhx.module.room.model; package com.mortals.xhx.module.room.model;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.room.model.vo.RoomVo; import com.mortals.xhx.module.room.model.vo.RoomVo;
import lombok.Data; import lombok.Data;
/** /**
* 房间管理实体对象 * 房间管理实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-22 * @date 2023-05-25
*/ */
@Data @Data
public class RoomEntity extends RoomVo { public class RoomEntity extends RoomVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 房间名称 * 房间名称
*/ */
private String roomName; private String roomName;
/** /**
* 房间编码 * 房间编码
*/ */
private String roomCode; private String roomCode;
/** /**
* 房间类型(0.会议室,1.办公室) * 房间类型(0.会议室,1.办公室)
*/ */
private Integer roomType; private Integer roomType;
/** /**
* 绑定的电子门牌的设备ID * 绑定的电子门牌的设备ID
*/ */
private Long deviceId; private Long deviceId;
/** /**
* 绑定的设备名称 * 绑定的设备名称
*/ */
private String deviceName; private String deviceName;
/** /**
* 员工人数 * 员工人数
*/ */
private Long countPerson; private Long countPerson;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 绑定的设备编码
*/
private String deviceCode;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj == null) return false; if (obj == null) return false;
if (obj instanceof RoomEntity) { if (obj instanceof RoomEntity) {
RoomEntity tmp = (RoomEntity) obj; RoomEntity tmp = (RoomEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
} }
public void initAttrValue(){ public void initAttrValue() {
this.roomName = "";
this.roomName = ""; this.roomCode = "";
this.roomCode = ""; this.roomType = 0;
this.roomType = 0; this.deviceId = null;
this.deviceId = null; this.deviceName = "";
this.deviceCode = "";
this.deviceName = ""; this.countPerson = 0L;
this.countPerson = 0L; this.remark = "";
this.remark = ""; this.deviceCode = "";
} }
} }
\ No newline at end of file
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.room.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.room.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.room.model.RoomEntity; import com.mortals.xhx.module.room.model.RoomEntity;
/** /**
* 房间管理查询对象 * 房间管理查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-22 * @date 2023-05-25
*/ */
public class RoomQuery extends RoomEntity { public class RoomQuery extends RoomEntity {
/** 开始 主键ID,主键,自增长 */ /** 开始 主键ID,主键,自增长 */
private Long idStart; private Long idStart;
...@@ -131,6 +131,11 @@ public class RoomQuery extends RoomEntity { ...@@ -131,6 +131,11 @@ public class RoomQuery extends RoomEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 绑定的设备编码 */
private List<String> deviceCodeList;
/** 绑定的设备编码排除列表 */
private List <String> deviceCodeNotList;
/** 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<RoomQuery> orConditionList; private List<RoomQuery> orConditionList;
...@@ -140,1113 +145,1164 @@ public class RoomQuery extends RoomEntity { ...@@ -140,1113 +145,1164 @@ public class RoomQuery extends RoomEntity {
public RoomQuery(){} public RoomQuery(){}
/** /**
* 获取 开始 主键ID,主键,自增长 * 获取 开始 主键ID,主键,自增长
* @return idStart * @return idStart
*/ */
public Long getIdStart(){ public Long getIdStart(){
return this.idStart; return this.idStart;
} }
/** /**
* 设置 开始 主键ID,主键,自增长 * 设置 开始 主键ID,主键,自增长
* @param idStart * @param idStart
*/ */
public void setIdStart(Long idStart){ public void setIdStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
} }
/** /**
* 获取 结束 主键ID,主键,自增长 * 获取 结束 主键ID,主键,自增长
* @return $idEnd * @return $idEnd
*/ */
public Long getIdEnd(){ public Long getIdEnd(){
return this.idEnd; return this.idEnd;
} }
/** /**
* 设置 结束 主键ID,主键,自增长 * 设置 结束 主键ID,主键,自增长
* @param idEnd * @param idEnd
*/ */
public void setIdEnd(Long idEnd){ public void setIdEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
} }
/** /**
* 获取 增加 主键ID,主键,自增长 * 获取 增加 主键ID,主键,自增长
* @return idIncrement * @return idIncrement
*/ */
public Long getIdIncrement(){ public Long getIdIncrement(){
return this.idIncrement; return this.idIncrement;
} }
/** /**
* 设置 增加 主键ID,主键,自增长 * 设置 增加 主键ID,主键,自增长
* @param idIncrement * @param idIncrement
*/ */
public void setIdIncrement(Long idIncrement){ public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
} }
/** /**
* 获取 主键ID,主键,自增长 * 获取 主键ID,主键,自增长
* @return idList * @return idList
*/ */
public List<Long> getIdList(){ public List<Long> getIdList(){
return this.idList; return this.idList;
} }
/** /**
* 设置 主键ID,主键,自增长 * 设置 主键ID,主键,自增长
* @param idList * @param idList
*/ */
public void setIdList(List<Long> idList){ public void setIdList(List<Long> idList){
this.idList = idList; this.idList = idList;
} }
/** /**
* 获取 主键ID,主键,自增长 * 获取 主键ID,主键,自增长
* @return idNotList * @return idNotList
*/ */
public List<Long> getIdNotList(){ public List<Long> getIdNotList(){
return this.idNotList; return this.idNotList;
} }
/** /**
* 设置 主键ID,主键,自增长 * 设置 主键ID,主键,自增长
* @param idNotList * @param idNotList
*/ */
public void setIdNotList(List<Long> idNotList){ public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList; this.idNotList = idNotList;
} }
/** /**
* 获取 房间名称 * 获取 房间名称
* @return roomNameList * @return roomNameList
*/ */
public List<String> getRoomNameList(){ public List<String> getRoomNameList(){
return this.roomNameList; return this.roomNameList;
} }
/** /**
* 设置 房间名称 * 设置 房间名称
* @param roomNameList * @param roomNameList
*/ */
public void setRoomNameList(List<String> roomNameList){ public void setRoomNameList(List<String> roomNameList){
this.roomNameList = roomNameList; this.roomNameList = roomNameList;
} }
/** /**
* 获取 房间名称 * 获取 房间名称
* @return roomNameNotList * @return roomNameNotList
*/ */
public List<String> getRoomNameNotList(){ public List<String> getRoomNameNotList(){
return this.roomNameNotList; return this.roomNameNotList;
} }
/** /**
* 设置 房间名称 * 设置 房间名称
* @param roomNameNotList * @param roomNameNotList
*/ */
public void setRoomNameNotList(List<String> roomNameNotList){ public void setRoomNameNotList(List<String> roomNameNotList){
this.roomNameNotList = roomNameNotList; this.roomNameNotList = roomNameNotList;
} }
/** /**
* 获取 房间编码 * 获取 房间编码
* @return roomCodeList * @return roomCodeList
*/ */
public List<String> getRoomCodeList(){ public List<String> getRoomCodeList(){
return this.roomCodeList; return this.roomCodeList;
} }
/** /**
* 设置 房间编码 * 设置 房间编码
* @param roomCodeList * @param roomCodeList
*/ */
public void setRoomCodeList(List<String> roomCodeList){ public void setRoomCodeList(List<String> roomCodeList){
this.roomCodeList = roomCodeList; this.roomCodeList = roomCodeList;
} }
/** /**
* 获取 房间编码 * 获取 房间编码
* @return roomCodeNotList * @return roomCodeNotList
*/ */
public List<String> getRoomCodeNotList(){ public List<String> getRoomCodeNotList(){
return this.roomCodeNotList; return this.roomCodeNotList;
} }
/** /**
* 设置 房间编码 * 设置 房间编码
* @param roomCodeNotList * @param roomCodeNotList
*/ */
public void setRoomCodeNotList(List<String> roomCodeNotList){ public void setRoomCodeNotList(List<String> roomCodeNotList){
this.roomCodeNotList = roomCodeNotList; this.roomCodeNotList = roomCodeNotList;
} }
/** /**
* 获取 开始 房间类型(0.会议室,1.办公室) * 获取 开始 房间类型(0.会议室,1.办公室)
* @return roomTypeStart * @return roomTypeStart
*/ */
public Integer getRoomTypeStart(){ public Integer getRoomTypeStart(){
return this.roomTypeStart; return this.roomTypeStart;
} }
/** /**
* 设置 开始 房间类型(0.会议室,1.办公室) * 设置 开始 房间类型(0.会议室,1.办公室)
* @param roomTypeStart * @param roomTypeStart
*/ */
public void setRoomTypeStart(Integer roomTypeStart){ public void setRoomTypeStart(Integer roomTypeStart){
this.roomTypeStart = roomTypeStart; this.roomTypeStart = roomTypeStart;
} }
/** /**
* 获取 结束 房间类型(0.会议室,1.办公室) * 获取 结束 房间类型(0.会议室,1.办公室)
* @return $roomTypeEnd * @return $roomTypeEnd
*/ */
public Integer getRoomTypeEnd(){ public Integer getRoomTypeEnd(){
return this.roomTypeEnd; return this.roomTypeEnd;
} }
/** /**
* 设置 结束 房间类型(0.会议室,1.办公室) * 设置 结束 房间类型(0.会议室,1.办公室)
* @param roomTypeEnd * @param roomTypeEnd
*/ */
public void setRoomTypeEnd(Integer roomTypeEnd){ public void setRoomTypeEnd(Integer roomTypeEnd){
this.roomTypeEnd = roomTypeEnd; this.roomTypeEnd = roomTypeEnd;
} }
/** /**
* 获取 增加 房间类型(0.会议室,1.办公室) * 获取 增加 房间类型(0.会议室,1.办公室)
* @return roomTypeIncrement * @return roomTypeIncrement
*/ */
public Integer getRoomTypeIncrement(){ public Integer getRoomTypeIncrement(){
return this.roomTypeIncrement; return this.roomTypeIncrement;
} }
/** /**
* 设置 增加 房间类型(0.会议室,1.办公室) * 设置 增加 房间类型(0.会议室,1.办公室)
* @param roomTypeIncrement * @param roomTypeIncrement
*/ */
public void setRoomTypeIncrement(Integer roomTypeIncrement){ public void setRoomTypeIncrement(Integer roomTypeIncrement){
this.roomTypeIncrement = roomTypeIncrement; this.roomTypeIncrement = roomTypeIncrement;
} }
/** /**
* 获取 房间类型(0.会议室,1.办公室) * 获取 房间类型(0.会议室,1.办公室)
* @return roomTypeList * @return roomTypeList
*/ */
public List<Integer> getRoomTypeList(){ public List<Integer> getRoomTypeList(){
return this.roomTypeList; return this.roomTypeList;
} }
/** /**
* 设置 房间类型(0.会议室,1.办公室) * 设置 房间类型(0.会议室,1.办公室)
* @param roomTypeList * @param roomTypeList
*/ */
public void setRoomTypeList(List<Integer> roomTypeList){ public void setRoomTypeList(List<Integer> roomTypeList){
this.roomTypeList = roomTypeList; this.roomTypeList = roomTypeList;
} }
/** /**
* 获取 房间类型(0.会议室,1.办公室) * 获取 房间类型(0.会议室,1.办公室)
* @return roomTypeNotList * @return roomTypeNotList
*/ */
public List<Integer> getRoomTypeNotList(){ public List<Integer> getRoomTypeNotList(){
return this.roomTypeNotList; return this.roomTypeNotList;
} }
/** /**
* 设置 房间类型(0.会议室,1.办公室) * 设置 房间类型(0.会议室,1.办公室)
* @param roomTypeNotList * @param roomTypeNotList
*/ */
public void setRoomTypeNotList(List<Integer> roomTypeNotList){ public void setRoomTypeNotList(List<Integer> roomTypeNotList){
this.roomTypeNotList = roomTypeNotList; this.roomTypeNotList = roomTypeNotList;
} }
/** /**
* 获取 开始 绑定的电子门牌的设备ID * 获取 开始 绑定的电子门牌的设备ID
* @return deviceIdStart * @return deviceIdStart
*/ */
public Long getDeviceIdStart(){ public Long getDeviceIdStart(){
return this.deviceIdStart; return this.deviceIdStart;
} }
/** /**
* 设置 开始 绑定的电子门牌的设备ID * 设置 开始 绑定的电子门牌的设备ID
* @param deviceIdStart * @param deviceIdStart
*/ */
public void setDeviceIdStart(Long deviceIdStart){ public void setDeviceIdStart(Long deviceIdStart){
this.deviceIdStart = deviceIdStart; this.deviceIdStart = deviceIdStart;
} }
/** /**
* 获取 结束 绑定的电子门牌的设备ID * 获取 结束 绑定的电子门牌的设备ID
* @return $deviceIdEnd * @return $deviceIdEnd
*/ */
public Long getDeviceIdEnd(){ public Long getDeviceIdEnd(){
return this.deviceIdEnd; return this.deviceIdEnd;
} }
/** /**
* 设置 结束 绑定的电子门牌的设备ID * 设置 结束 绑定的电子门牌的设备ID
* @param deviceIdEnd * @param deviceIdEnd
*/ */
public void setDeviceIdEnd(Long deviceIdEnd){ public void setDeviceIdEnd(Long deviceIdEnd){
this.deviceIdEnd = deviceIdEnd; this.deviceIdEnd = deviceIdEnd;
} }
/** /**
* 获取 增加 绑定的电子门牌的设备ID * 获取 增加 绑定的电子门牌的设备ID
* @return deviceIdIncrement * @return deviceIdIncrement
*/ */
public Long getDeviceIdIncrement(){ public Long getDeviceIdIncrement(){
return this.deviceIdIncrement; return this.deviceIdIncrement;
} }
/** /**
* 设置 增加 绑定的电子门牌的设备ID * 设置 增加 绑定的电子门牌的设备ID
* @param deviceIdIncrement * @param deviceIdIncrement
*/ */
public void setDeviceIdIncrement(Long deviceIdIncrement){ public void setDeviceIdIncrement(Long deviceIdIncrement){
this.deviceIdIncrement = deviceIdIncrement; this.deviceIdIncrement = deviceIdIncrement;
} }
/** /**
* 获取 绑定的电子门牌的设备ID * 获取 绑定的电子门牌的设备ID
* @return deviceIdList * @return deviceIdList
*/ */
public List<Long> getDeviceIdList(){ public List<Long> getDeviceIdList(){
return this.deviceIdList; return this.deviceIdList;
} }
/** /**
* 设置 绑定的电子门牌的设备ID * 设置 绑定的电子门牌的设备ID
* @param deviceIdList * @param deviceIdList
*/ */
public void setDeviceIdList(List<Long> deviceIdList){ public void setDeviceIdList(List<Long> deviceIdList){
this.deviceIdList = deviceIdList; this.deviceIdList = deviceIdList;
} }
/** /**
* 获取 绑定的电子门牌的设备ID * 获取 绑定的电子门牌的设备ID
* @return deviceIdNotList * @return deviceIdNotList
*/ */
public List<Long> getDeviceIdNotList(){ public List<Long> getDeviceIdNotList(){
return this.deviceIdNotList; return this.deviceIdNotList;
} }
/** /**
* 设置 绑定的电子门牌的设备ID * 设置 绑定的电子门牌的设备ID
* @param deviceIdNotList * @param deviceIdNotList
*/ */
public void setDeviceIdNotList(List<Long> deviceIdNotList){ public void setDeviceIdNotList(List<Long> deviceIdNotList){
this.deviceIdNotList = deviceIdNotList; this.deviceIdNotList = deviceIdNotList;
} }
/** /**
* 获取 绑定的设备名称 * 获取 绑定的设备名称
* @return deviceNameList * @return deviceNameList
*/ */
public List<String> getDeviceNameList(){ public List<String> getDeviceNameList(){
return this.deviceNameList; return this.deviceNameList;
} }
/** /**
* 设置 绑定的设备名称 * 设置 绑定的设备名称
* @param deviceNameList * @param deviceNameList
*/ */
public void setDeviceNameList(List<String> deviceNameList){ public void setDeviceNameList(List<String> deviceNameList){
this.deviceNameList = deviceNameList; this.deviceNameList = deviceNameList;
} }
/** /**
* 获取 绑定的设备名称 * 获取 绑定的设备名称
* @return deviceNameNotList * @return deviceNameNotList
*/ */
public List<String> getDeviceNameNotList(){ public List<String> getDeviceNameNotList(){
return this.deviceNameNotList; return this.deviceNameNotList;
} }
/** /**
* 设置 绑定的设备名称 * 设置 绑定的设备名称
* @param deviceNameNotList * @param deviceNameNotList
*/ */
public void setDeviceNameNotList(List<String> deviceNameNotList){ public void setDeviceNameNotList(List<String> deviceNameNotList){
this.deviceNameNotList = deviceNameNotList; this.deviceNameNotList = deviceNameNotList;
} }
/** /**
* 获取 开始 员工人数 * 获取 开始 员工人数
* @return countPersonStart * @return countPersonStart
*/ */
public Long getCountPersonStart(){ public Long getCountPersonStart(){
return this.countPersonStart; return this.countPersonStart;
} }
/** /**
* 设置 开始 员工人数 * 设置 开始 员工人数
* @param countPersonStart * @param countPersonStart
*/ */
public void setCountPersonStart(Long countPersonStart){ public void setCountPersonStart(Long countPersonStart){
this.countPersonStart = countPersonStart; this.countPersonStart = countPersonStart;
} }
/** /**
* 获取 结束 员工人数 * 获取 结束 员工人数
* @return $countPersonEnd * @return $countPersonEnd
*/ */
public Long getCountPersonEnd(){ public Long getCountPersonEnd(){
return this.countPersonEnd; return this.countPersonEnd;
} }
/** /**
* 设置 结束 员工人数 * 设置 结束 员工人数
* @param countPersonEnd * @param countPersonEnd
*/ */
public void setCountPersonEnd(Long countPersonEnd){ public void setCountPersonEnd(Long countPersonEnd){
this.countPersonEnd = countPersonEnd; this.countPersonEnd = countPersonEnd;
} }
/** /**
* 获取 增加 员工人数 * 获取 增加 员工人数
* @return countPersonIncrement * @return countPersonIncrement
*/ */
public Long getCountPersonIncrement(){ public Long getCountPersonIncrement(){
return this.countPersonIncrement; return this.countPersonIncrement;
} }
/** /**
* 设置 增加 员工人数 * 设置 增加 员工人数
* @param countPersonIncrement * @param countPersonIncrement
*/ */
public void setCountPersonIncrement(Long countPersonIncrement){ public void setCountPersonIncrement(Long countPersonIncrement){
this.countPersonIncrement = countPersonIncrement; this.countPersonIncrement = countPersonIncrement;
} }
/** /**
* 获取 员工人数 * 获取 员工人数
* @return countPersonList * @return countPersonList
*/ */
public List<Long> getCountPersonList(){ public List<Long> getCountPersonList(){
return this.countPersonList; return this.countPersonList;
} }
/** /**
* 设置 员工人数 * 设置 员工人数
* @param countPersonList * @param countPersonList
*/ */
public void setCountPersonList(List<Long> countPersonList){ public void setCountPersonList(List<Long> countPersonList){
this.countPersonList = countPersonList; this.countPersonList = countPersonList;
} }
/** /**
* 获取 员工人数 * 获取 员工人数
* @return countPersonNotList * @return countPersonNotList
*/ */
public List<Long> getCountPersonNotList(){ public List<Long> getCountPersonNotList(){
return this.countPersonNotList; return this.countPersonNotList;
} }
/** /**
* 设置 员工人数 * 设置 员工人数
* @param countPersonNotList * @param countPersonNotList
*/ */
public void setCountPersonNotList(List<Long> countPersonNotList){ public void setCountPersonNotList(List<Long> countPersonNotList){
this.countPersonNotList = countPersonNotList; this.countPersonNotList = countPersonNotList;
} }
/** /**
* 获取 备注 * 获取 备注
* @return remarkList * @return remarkList
*/ */
public List<String> getRemarkList(){ public List<String> getRemarkList(){
return this.remarkList; return this.remarkList;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remarkList * @param remarkList
*/ */
public void setRemarkList(List<String> remarkList){ public void setRemarkList(List<String> remarkList){
this.remarkList = remarkList; this.remarkList = remarkList;
} }
/** /**
* 获取 备注 * 获取 备注
* @return remarkNotList * @return remarkNotList
*/ */
public List<String> getRemarkNotList(){ public List<String> getRemarkNotList(){
return this.remarkNotList; return this.remarkNotList;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remarkNotList * @param remarkNotList
*/ */
public void setRemarkNotList(List<String> remarkNotList){ public void setRemarkNotList(List<String> remarkNotList){
this.remarkNotList = remarkNotList; this.remarkNotList = remarkNotList;
} }
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
*/ */
public Long getCreateUserIdStart(){ public Long getCreateUserIdStart(){
return this.createUserIdStart; return this.createUserIdStart;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public void setCreateUserIdStart(Long createUserIdStart){ public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
} }
/** /**
* 获取 结束 创建用户 * 获取 结束 创建用户
* @return $createUserIdEnd * @return $createUserIdEnd
*/ */
public Long getCreateUserIdEnd(){ public Long getCreateUserIdEnd(){
return this.createUserIdEnd; return this.createUserIdEnd;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public void setCreateUserIdEnd(Long createUserIdEnd){ public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
} }
/** /**
* 获取 增加 创建用户 * 获取 增加 创建用户
* @return createUserIdIncrement * @return createUserIdIncrement
*/ */
public Long getCreateUserIdIncrement(){ public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement; return this.createUserIdIncrement;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public void setCreateUserIdIncrement(Long createUserIdIncrement){ public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
} }
/** /**
* 获取 创建用户 * 获取 创建用户
* @return createUserIdList * @return createUserIdList
*/ */
public List<Long> getCreateUserIdList(){ public List<Long> getCreateUserIdList(){
return this.createUserIdList; return this.createUserIdList;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public void setCreateUserIdList(List<Long> createUserIdList){ public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/** /**
* 获取 创建用户 * 获取 创建用户
* @return createUserIdNotList * @return createUserIdNotList
*/ */
public List<Long> getCreateUserIdNotList(){ public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList; return this.createUserIdNotList;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdNotList * @param createUserIdNotList
*/ */
public void setCreateUserIdNotList(List<Long> createUserIdNotList){ public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList; this.createUserIdNotList = createUserIdNotList;
} }
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
*/ */
public String getCreateTimeStart(){ public String getCreateTimeStart(){
return this.createTimeStart; return this.createTimeStart;
} }
/** /**
* 设置 开始 创建时间 * 设置 开始 创建时间
* @param createTimeStart * @param createTimeStart
*/ */
public void setCreateTimeStart(String createTimeStart){ public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart; this.createTimeStart = createTimeStart;
} }
/** /**
* 获取 结束 创建时间 * 获取 结束 创建时间
* @return createTimeEnd * @return createTimeEnd
*/ */
public String getCreateTimeEnd(){ public String getCreateTimeEnd(){
return this.createTimeEnd; return this.createTimeEnd;
} }
/** /**
* 设置 结束 创建时间 * 设置 结束 创建时间
* @param createTimeEnd * @param createTimeEnd
*/ */
public void setCreateTimeEnd(String createTimeEnd){ public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd; this.createTimeEnd = createTimeEnd;
} }
/** /**
* 获取 开始 更新用户 * 获取 开始 更新用户
* @return updateUserIdStart * @return updateUserIdStart
*/ */
public Long getUpdateUserIdStart(){ public Long getUpdateUserIdStart(){
return this.updateUserIdStart; return this.updateUserIdStart;
} }
/** /**
* 设置 开始 更新用户 * 设置 开始 更新用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public void setUpdateUserIdStart(Long updateUserIdStart){ public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
} }
/** /**
* 获取 结束 更新用户 * 获取 结束 更新用户
* @return $updateUserIdEnd * @return $updateUserIdEnd
*/ */
public Long getUpdateUserIdEnd(){ public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd; return this.updateUserIdEnd;
} }
/** /**
* 设置 结束 更新用户 * 设置 结束 更新用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public void setUpdateUserIdEnd(Long updateUserIdEnd){ public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
} }
/** /**
* 获取 增加 更新用户 * 获取 增加 更新用户
* @return updateUserIdIncrement * @return updateUserIdIncrement
*/ */
public Long getUpdateUserIdIncrement(){ public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement; return this.updateUserIdIncrement;
} }
/** /**
* 设置 增加 更新用户 * 设置 增加 更新用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){ public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
} }
/** /**
* 获取 更新用户 * 获取 更新用户
* @return updateUserIdList * @return updateUserIdList
*/ */
public List<Long> getUpdateUserIdList(){ public List<Long> getUpdateUserIdList(){
return this.updateUserIdList; return this.updateUserIdList;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public void setUpdateUserIdList(List<Long> updateUserIdList){ public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/** /**
* 获取 更新用户 * 获取 更新用户
* @return updateUserIdNotList * @return updateUserIdNotList
*/ */
public List<Long> getUpdateUserIdNotList(){ public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList; return this.updateUserIdNotList;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdNotList * @param updateUserIdNotList
*/ */
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){ public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList; this.updateUserIdNotList = updateUserIdNotList;
} }
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
*/ */
public String getUpdateTimeStart(){ public String getUpdateTimeStart(){
return this.updateTimeStart; return this.updateTimeStart;
} }
/** /**
* 设置 开始 更新时间 * 设置 开始 更新时间
* @param updateTimeStart * @param updateTimeStart
*/ */
public void setUpdateTimeStart(String updateTimeStart){ public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart; this.updateTimeStart = updateTimeStart;
} }
/** /**
* 获取 结束 更新时间 * 获取 结束 更新时间
* @return updateTimeEnd * @return updateTimeEnd
*/ */
public String getUpdateTimeEnd(){ public String getUpdateTimeEnd(){
return this.updateTimeEnd; return this.updateTimeEnd;
} }
/** /**
* 设置 结束 更新时间 * 设置 结束 更新时间
* @param updateTimeEnd * @param updateTimeEnd
*/ */
public void setUpdateTimeEnd(String updateTimeEnd){ public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/** /**
* 设置 主键ID,主键,自增长 * 获取 绑定的设备编码
* @param id * @return deviceCodeList
*/ */
public List<String> getDeviceCodeList(){
return this.deviceCodeList;
}
/**
* 设置 绑定的设备编码
* @param deviceCodeList
*/
public void setDeviceCodeList(List<String> deviceCodeList){
this.deviceCodeList = deviceCodeList;
}
/**
* 获取 绑定的设备编码
* @return deviceCodeNotList
*/
public List<String> getDeviceCodeNotList(){
return this.deviceCodeNotList;
}
/**
* 设置 绑定的设备编码
* @param deviceCodeNotList
*/
public void setDeviceCodeNotList(List<String> deviceCodeNotList){
this.deviceCodeNotList = deviceCodeNotList;
}
/**
* 设置 主键ID,主键,自增长
* @param id
*/
public RoomQuery id(Long id){ public RoomQuery id(Long id){
setId(id); setId(id);
return this; return this;
} }
/** /**
* 设置 开始 主键ID,主键,自增长 * 设置 开始 主键ID,主键,自增长
* @param idStart * @param idStart
*/ */
public RoomQuery idStart(Long idStart){ public RoomQuery idStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
return this; return this;
} }
/** /**
* 设置 结束 主键ID,主键,自增长 * 设置 结束 主键ID,主键,自增长
* @param idEnd * @param idEnd
*/ */
public RoomQuery idEnd(Long idEnd){ public RoomQuery idEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
return this; return this;
} }
/** /**
* 设置 增加 主键ID,主键,自增长 * 设置 增加 主键ID,主键,自增长
* @param idIncrement * @param idIncrement
*/ */
public RoomQuery idIncrement(Long idIncrement){ public RoomQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
return this; return this;
} }
/** /**
* 设置 主键ID,主键,自增长 * 设置 主键ID,主键,自增长
* @param idList * @param idList
*/ */
public RoomQuery idList(List<Long> idList){ public RoomQuery idList(List<Long> idList){
this.idList = idList; this.idList = idList;
return this; return this;
} }
/** /**
* 设置 主键ID,主键,自增长 * 设置 主键ID,主键,自增长
* @param idNotList * @param idNotList
*/ */
public RoomQuery idNotList(List<Long> idNotList){ public RoomQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList; this.idNotList = idNotList;
return this; return this;
} }
/** /**
* 设置 房间名称 * 设置 房间名称
* @param roomName * @param roomName
*/ */
public RoomQuery roomName(String roomName){ public RoomQuery roomName(String roomName){
setRoomName(roomName); setRoomName(roomName);
return this; return this;
} }
/** /**
* 设置 房间名称 * 设置 房间名称
* @param roomNameList * @param roomNameList
*/ */
public RoomQuery roomNameList(List<String> roomNameList){ public RoomQuery roomNameList(List<String> roomNameList){
this.roomNameList = roomNameList; this.roomNameList = roomNameList;
return this; return this;
} }
/** /**
* 设置 房间编码 * 设置 房间编码
* @param roomCode * @param roomCode
*/ */
public RoomQuery roomCode(String roomCode){ public RoomQuery roomCode(String roomCode){
setRoomCode(roomCode); setRoomCode(roomCode);
return this; return this;
} }
/** /**
* 设置 房间编码 * 设置 房间编码
* @param roomCodeList * @param roomCodeList
*/ */
public RoomQuery roomCodeList(List<String> roomCodeList){ public RoomQuery roomCodeList(List<String> roomCodeList){
this.roomCodeList = roomCodeList; this.roomCodeList = roomCodeList;
return this; return this;
} }
/** /**
* 设置 房间类型(0.会议室,1.办公室) * 设置 房间类型(0.会议室,1.办公室)
* @param roomType * @param roomType
*/ */
public RoomQuery roomType(Integer roomType){ public RoomQuery roomType(Integer roomType){
setRoomType(roomType); setRoomType(roomType);
return this; return this;
} }
/** /**
* 设置 开始 房间类型(0.会议室,1.办公室) * 设置 开始 房间类型(0.会议室,1.办公室)
* @param roomTypeStart * @param roomTypeStart
*/ */
public RoomQuery roomTypeStart(Integer roomTypeStart){ public RoomQuery roomTypeStart(Integer roomTypeStart){
this.roomTypeStart = roomTypeStart; this.roomTypeStart = roomTypeStart;
return this; return this;
} }
/** /**
* 设置 结束 房间类型(0.会议室,1.办公室) * 设置 结束 房间类型(0.会议室,1.办公室)
* @param roomTypeEnd * @param roomTypeEnd
*/ */
public RoomQuery roomTypeEnd(Integer roomTypeEnd){ public RoomQuery roomTypeEnd(Integer roomTypeEnd){
this.roomTypeEnd = roomTypeEnd; this.roomTypeEnd = roomTypeEnd;
return this; return this;
} }
/** /**
* 设置 增加 房间类型(0.会议室,1.办公室) * 设置 增加 房间类型(0.会议室,1.办公室)
* @param roomTypeIncrement * @param roomTypeIncrement
*/ */
public RoomQuery roomTypeIncrement(Integer roomTypeIncrement){ public RoomQuery roomTypeIncrement(Integer roomTypeIncrement){
this.roomTypeIncrement = roomTypeIncrement; this.roomTypeIncrement = roomTypeIncrement;
return this; return this;
} }
/** /**
* 设置 房间类型(0.会议室,1.办公室) * 设置 房间类型(0.会议室,1.办公室)
* @param roomTypeList * @param roomTypeList
*/ */
public RoomQuery roomTypeList(List<Integer> roomTypeList){ public RoomQuery roomTypeList(List<Integer> roomTypeList){
this.roomTypeList = roomTypeList; this.roomTypeList = roomTypeList;
return this; return this;
} }
/** /**
* 设置 房间类型(0.会议室,1.办公室) * 设置 房间类型(0.会议室,1.办公室)
* @param roomTypeNotList * @param roomTypeNotList
*/ */
public RoomQuery roomTypeNotList(List<Integer> roomTypeNotList){ public RoomQuery roomTypeNotList(List<Integer> roomTypeNotList){
this.roomTypeNotList = roomTypeNotList; this.roomTypeNotList = roomTypeNotList;
return this; return this;
} }
/** /**
* 设置 绑定的电子门牌的设备ID * 设置 绑定的电子门牌的设备ID
* @param deviceId * @param deviceId
*/ */
public RoomQuery deviceId(Long deviceId){ public RoomQuery deviceId(Long deviceId){
setDeviceId(deviceId); setDeviceId(deviceId);
return this; return this;
} }
/** /**
* 设置 开始 绑定的电子门牌的设备ID * 设置 开始 绑定的电子门牌的设备ID
* @param deviceIdStart * @param deviceIdStart
*/ */
public RoomQuery deviceIdStart(Long deviceIdStart){ public RoomQuery deviceIdStart(Long deviceIdStart){
this.deviceIdStart = deviceIdStart; this.deviceIdStart = deviceIdStart;
return this; return this;
} }
/** /**
* 设置 结束 绑定的电子门牌的设备ID * 设置 结束 绑定的电子门牌的设备ID
* @param deviceIdEnd * @param deviceIdEnd
*/ */
public RoomQuery deviceIdEnd(Long deviceIdEnd){ public RoomQuery deviceIdEnd(Long deviceIdEnd){
this.deviceIdEnd = deviceIdEnd; this.deviceIdEnd = deviceIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 绑定的电子门牌的设备ID * 设置 增加 绑定的电子门牌的设备ID
* @param deviceIdIncrement * @param deviceIdIncrement
*/ */
public RoomQuery deviceIdIncrement(Long deviceIdIncrement){ public RoomQuery deviceIdIncrement(Long deviceIdIncrement){
this.deviceIdIncrement = deviceIdIncrement; this.deviceIdIncrement = deviceIdIncrement;
return this; return this;
} }
/** /**
* 设置 绑定的电子门牌的设备ID * 设置 绑定的电子门牌的设备ID
* @param deviceIdList * @param deviceIdList
*/ */
public RoomQuery deviceIdList(List<Long> deviceIdList){ public RoomQuery deviceIdList(List<Long> deviceIdList){
this.deviceIdList = deviceIdList; this.deviceIdList = deviceIdList;
return this; return this;
} }
/** /**
* 设置 绑定的电子门牌的设备ID * 设置 绑定的电子门牌的设备ID
* @param deviceIdNotList * @param deviceIdNotList
*/ */
public RoomQuery deviceIdNotList(List<Long> deviceIdNotList){ public RoomQuery deviceIdNotList(List<Long> deviceIdNotList){
this.deviceIdNotList = deviceIdNotList; this.deviceIdNotList = deviceIdNotList;
return this; return this;
} }
/** /**
* 设置 绑定的设备名称 * 设置 绑定的设备名称
* @param deviceName * @param deviceName
*/ */
public RoomQuery deviceName(String deviceName){ public RoomQuery deviceName(String deviceName){
setDeviceName(deviceName); setDeviceName(deviceName);
return this; return this;
} }
/** /**
* 设置 绑定的设备名称 * 设置 绑定的设备名称
* @param deviceNameList * @param deviceNameList
*/ */
public RoomQuery deviceNameList(List<String> deviceNameList){ public RoomQuery deviceNameList(List<String> deviceNameList){
this.deviceNameList = deviceNameList; this.deviceNameList = deviceNameList;
return this; return this;
} }
/** /**
* 设置 员工人数 * 设置 员工人数
* @param countPerson * @param countPerson
*/ */
public RoomQuery countPerson(Long countPerson){ public RoomQuery countPerson(Long countPerson){
setCountPerson(countPerson); setCountPerson(countPerson);
return this; return this;
} }
/** /**
* 设置 开始 员工人数 * 设置 开始 员工人数
* @param countPersonStart * @param countPersonStart
*/ */
public RoomQuery countPersonStart(Long countPersonStart){ public RoomQuery countPersonStart(Long countPersonStart){
this.countPersonStart = countPersonStart; this.countPersonStart = countPersonStart;
return this; return this;
} }
/** /**
* 设置 结束 员工人数 * 设置 结束 员工人数
* @param countPersonEnd * @param countPersonEnd
*/ */
public RoomQuery countPersonEnd(Long countPersonEnd){ public RoomQuery countPersonEnd(Long countPersonEnd){
this.countPersonEnd = countPersonEnd; this.countPersonEnd = countPersonEnd;
return this; return this;
} }
/** /**
* 设置 增加 员工人数 * 设置 增加 员工人数
* @param countPersonIncrement * @param countPersonIncrement
*/ */
public RoomQuery countPersonIncrement(Long countPersonIncrement){ public RoomQuery countPersonIncrement(Long countPersonIncrement){
this.countPersonIncrement = countPersonIncrement; this.countPersonIncrement = countPersonIncrement;
return this; return this;
} }
/** /**
* 设置 员工人数 * 设置 员工人数
* @param countPersonList * @param countPersonList
*/ */
public RoomQuery countPersonList(List<Long> countPersonList){ public RoomQuery countPersonList(List<Long> countPersonList){
this.countPersonList = countPersonList; this.countPersonList = countPersonList;
return this; return this;
} }
/** /**
* 设置 员工人数 * 设置 员工人数
* @param countPersonNotList * @param countPersonNotList
*/ */
public RoomQuery countPersonNotList(List<Long> countPersonNotList){ public RoomQuery countPersonNotList(List<Long> countPersonNotList){
this.countPersonNotList = countPersonNotList; this.countPersonNotList = countPersonNotList;
return this; return this;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remark * @param remark
*/ */
public RoomQuery remark(String remark){ public RoomQuery remark(String remark){
setRemark(remark); setRemark(remark);
return this; return this;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remarkList * @param remarkList
*/ */
public RoomQuery remarkList(List<String> remarkList){ public RoomQuery remarkList(List<String> remarkList){
this.remarkList = remarkList; this.remarkList = remarkList;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
*/ */
public RoomQuery createUserId(Long createUserId){ public RoomQuery createUserId(Long createUserId){
setCreateUserId(createUserId); setCreateUserId(createUserId);
return this; return this;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public RoomQuery createUserIdStart(Long createUserIdStart){ public RoomQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public RoomQuery createUserIdEnd(Long createUserIdEnd){ public RoomQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public RoomQuery createUserIdIncrement(Long createUserIdIncrement){ public RoomQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public RoomQuery createUserIdList(List<Long> createUserIdList){ public RoomQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdNotList * @param createUserIdNotList
*/ */
public RoomQuery createUserIdNotList(List<Long> createUserIdNotList){ public RoomQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList; this.createUserIdNotList = createUserIdNotList;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserId * @param updateUserId
*/ */
public RoomQuery updateUserId(Long updateUserId){ public RoomQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId); setUpdateUserId(updateUserId);
return this; return this;
} }
/** /**
* 设置 开始 更新用户 * 设置 开始 更新用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public RoomQuery updateUserIdStart(Long updateUserIdStart){ public RoomQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 更新用户 * 设置 结束 更新用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public RoomQuery updateUserIdEnd(Long updateUserIdEnd){ public RoomQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 更新用户 * 设置 增加 更新用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public RoomQuery updateUserIdIncrement(Long updateUserIdIncrement){ public RoomQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public RoomQuery updateUserIdList(List<Long> updateUserIdList){ public RoomQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdNotList * @param updateUserIdNotList
*/ */
public RoomQuery updateUserIdNotList(List<Long> updateUserIdNotList){ public RoomQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList; this.updateUserIdNotList = updateUserIdNotList;
return this; return this;
} }
/**
* 设置 绑定的设备编码
* @param deviceCode
*/
public RoomQuery deviceCode(String deviceCode){
setDeviceCode(deviceCode);
return this;
}
/**
* 设置 绑定的设备编码
* @param deviceCodeList
*/
public RoomQuery deviceCodeList(List<String> deviceCodeList){
this.deviceCodeList = deviceCodeList;
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
*/ */
public List<RoomQuery> getOrConditionList(){ public List<RoomQuery> getOrConditionList(){
return this.orConditionList; return this.orConditionList;
} }
/** /**
* 设置 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)
* @param orConditionList * @param orConditionList
*/ */
public void setOrConditionList(List<RoomQuery> orConditionList){ public void setOrConditionList(List<RoomQuery> orConditionList){
this.orConditionList = orConditionList; this.orConditionList = 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)
* @return andConditionList * @return andConditionList
*/ */
public List<RoomQuery> getAndConditionList(){ public List<RoomQuery> getAndConditionList(){
return this.andConditionList; return this.andConditionList;
} }
/** /**
* 设置 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)
* @param andConditionList * @param andConditionList
*/ */
public void setAndConditionList(List<RoomQuery> andConditionList){ public void setAndConditionList(List<RoomQuery> andConditionList){
this.andConditionList = andConditionList; this.andConditionList = andConditionList;
} }
......
package com.mortals.xhx.module.room.service.impl; package com.mortals.xhx.module.room.service.impl;
import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.device.service.DeviceService;
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.framework.exception.AppException; import com.mortals.framework.exception.AppException;
...@@ -7,6 +10,8 @@ import com.mortals.xhx.module.room.dao.RoomDao; ...@@ -7,6 +10,8 @@ import com.mortals.xhx.module.room.dao.RoomDao;
import com.mortals.xhx.module.room.model.RoomEntity; import com.mortals.xhx.module.room.model.RoomEntity;
import com.mortals.xhx.module.room.service.RoomService; import com.mortals.xhx.module.room.service.RoomService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils;
/** /**
* RoomService * RoomService
* 房间管理 service实现 * 房间管理 service实现
...@@ -17,5 +22,20 @@ import lombok.extern.slf4j.Slf4j; ...@@ -17,5 +22,20 @@ import lombok.extern.slf4j.Slf4j;
@Service("roomService") @Service("roomService")
@Slf4j @Slf4j
public class RoomServiceImpl extends AbstractCRUDServiceImpl<RoomDao, RoomEntity, Long> implements RoomService { public class RoomServiceImpl extends AbstractCRUDServiceImpl<RoomDao, RoomEntity, Long> implements RoomService {
@Autowired
private DeviceService deviceService;
@Override
protected void validData(RoomEntity entity, Context context) throws AppException {
super.validData(entity, context);
if(!ObjectUtils.isEmpty(entity.getDeviceId())){
DeviceEntity deviceEntity = deviceService.get(entity.getDeviceId(), context);
if(!ObjectUtils.isEmpty(deviceEntity)){
entity.setDeviceCode(deviceEntity.getDeviceCode());
entity.setDeviceName(deviceEntity.getDeviceName());
}
}
}
} }
\ No newline at end of file
...@@ -7,62 +7,70 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -7,62 +7,70 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.workman.model.vo.WorkmanVo; import com.mortals.xhx.module.workman.model.vo.WorkmanVo;
import lombok.Data; import lombok.Data;
/** /**
* 工作人员实体对象 * 工作人员实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-22 * @date 2023-05-25
*/ */
@Data @Data
public class WorkmanEntity extends WorkmanVo { public class WorkmanEntity extends WorkmanVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 所属房间id * 所属房间id
*/ */
private Long roomId; private Long roomId;
/** /**
* 所属房间名称 * 所属房间名称
*/ */
private String roomName; private String roomName;
/** /**
* 所属部门 * 所属部门
*/ */
private String deptName; private String deptName;
/** /**
* 姓名 * 姓名
*/ */
private String name; private String name;
/** /**
* 性别(0.男,1.女) * 性别(0.男,1.女)
*/ */
private Integer sex; private Integer sex;
/** /**
* 职务 * 职务
*/ */
private String userPost; private String userPost;
/** /**
* 电话 * 电话
*/ */
private String phone; private String phone;
/** /**
* 手机 * 手机
*/ */
private String mobile; private String mobile;
/** /**
* 简介 * 简介
*/ */
private String summary; private String summary;
/** /**
* 照片 * 照片
*/ */
private String photoPath; private String photoPath;
/** /**
* 工作状态,来源基础设置 * 工作状态,来源基础设置
*/ */
private String workStatus; private String workStatus;
/**
* 登录用户名
*/
private String loginName;
/**
* 密码
*/
private String loginPwd;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -70,7 +78,7 @@ public class WorkmanEntity extends WorkmanVo { ...@@ -70,7 +78,7 @@ public class WorkmanEntity extends WorkmanVo {
if (obj instanceof WorkmanEntity) { if (obj instanceof WorkmanEntity) {
WorkmanEntity tmp = (WorkmanEntity) obj; WorkmanEntity tmp = (WorkmanEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -78,26 +86,30 @@ public class WorkmanEntity extends WorkmanVo { ...@@ -78,26 +86,30 @@ public class WorkmanEntity extends WorkmanVo {
public void initAttrValue(){ public void initAttrValue(){
this.roomId = -1L; this.roomId = null;
this.roomName = "";
this.deptName = "";
this.roomName = ""; this.name = "";
this.deptName = ""; this.sex = 0;
this.name = ""; this.userPost = "";
this.sex = 0; this.phone = "";
this.userPost = ""; this.mobile = "";
this.phone = ""; this.summary = "";
this.mobile = ""; this.photoPath = "";
this.summary = ""; this.workStatus = "";
this.photoPath = ""; this.loginName = "";
this.workStatus = ""; this.loginPwd = "";
} }
} }
\ No newline at end of file
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.workman.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.workman.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.workman.model.WorkmanEntity; import com.mortals.xhx.module.workman.model.WorkmanEntity;
/** /**
* 工作人员查询对象 * 工作人员查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-22 * @date 2023-05-25
*/ */
public class WorkmanQuery extends WorkmanEntity { public class WorkmanQuery extends WorkmanEntity {
/** 开始 序号,主键,自增长 */ /** 开始 序号,主键,自增长 */
private Long idStart; private Long idStart;
...@@ -126,6 +126,16 @@ public class WorkmanQuery extends WorkmanEntity { ...@@ -126,6 +126,16 @@ public class WorkmanQuery extends WorkmanEntity {
/** 结束 修改时间 */ /** 结束 修改时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 登录用户名 */
private List<String> loginNameList;
/** 登录用户名排除列表 */
private List <String> loginNameNotList;
/** 密码 */
private List<String> loginPwdList;
/** 密码排除列表 */
private List <String> loginPwdNotList;
/** 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<WorkmanQuery> orConditionList; private List<WorkmanQuery> orConditionList;
...@@ -135,1098 +145,1200 @@ public class WorkmanQuery extends WorkmanEntity { ...@@ -135,1098 +145,1200 @@ public class WorkmanQuery extends WorkmanEntity {
public WorkmanQuery(){} public WorkmanQuery(){}
/** /**
* 获取 开始 序号,主键,自增长 * 获取 开始 序号,主键,自增长
* @return idStart * @return idStart
*/ */
public Long getIdStart(){ public Long getIdStart(){
return this.idStart; return this.idStart;
} }
/** /**
* 设置 开始 序号,主键,自增长 * 设置 开始 序号,主键,自增长
* @param idStart * @param idStart
*/ */
public void setIdStart(Long idStart){ public void setIdStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
} }
/** /**
* 获取 结束 序号,主键,自增长 * 获取 结束 序号,主键,自增长
* @return $idEnd * @return $idEnd
*/ */
public Long getIdEnd(){ public Long getIdEnd(){
return this.idEnd; return this.idEnd;
} }
/** /**
* 设置 结束 序号,主键,自增长 * 设置 结束 序号,主键,自增长
* @param idEnd * @param idEnd
*/ */
public void setIdEnd(Long idEnd){ public void setIdEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
} }
/** /**
* 获取 增加 序号,主键,自增长 * 获取 增加 序号,主键,自增长
* @return idIncrement * @return idIncrement
*/ */
public Long getIdIncrement(){ public Long getIdIncrement(){
return this.idIncrement; return this.idIncrement;
} }
/** /**
* 设置 增加 序号,主键,自增长 * 设置 增加 序号,主键,自增长
* @param idIncrement * @param idIncrement
*/ */
public void setIdIncrement(Long idIncrement){ public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
} }
/** /**
* 获取 序号,主键,自增长 * 获取 序号,主键,自增长
* @return idList * @return idList
*/ */
public List<Long> getIdList(){ public List<Long> getIdList(){
return this.idList; return this.idList;
} }
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param idList * @param idList
*/ */
public void setIdList(List<Long> idList){ public void setIdList(List<Long> idList){
this.idList = idList; this.idList = idList;
} }
/** /**
* 获取 序号,主键,自增长 * 获取 序号,主键,自增长
* @return idNotList * @return idNotList
*/ */
public List<Long> getIdNotList(){ public List<Long> getIdNotList(){
return this.idNotList; return this.idNotList;
} }
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param idNotList * @param idNotList
*/ */
public void setIdNotList(List<Long> idNotList){ public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList; this.idNotList = idNotList;
} }
/** /**
* 获取 开始 所属房间id * 获取 开始 所属房间id
* @return roomIdStart * @return roomIdStart
*/ */
public Long getRoomIdStart(){ public Long getRoomIdStart(){
return this.roomIdStart; return this.roomIdStart;
} }
/** /**
* 设置 开始 所属房间id * 设置 开始 所属房间id
* @param roomIdStart * @param roomIdStart
*/ */
public void setRoomIdStart(Long roomIdStart){ public void setRoomIdStart(Long roomIdStart){
this.roomIdStart = roomIdStart; this.roomIdStart = roomIdStart;
} }
/** /**
* 获取 结束 所属房间id * 获取 结束 所属房间id
* @return $roomIdEnd * @return $roomIdEnd
*/ */
public Long getRoomIdEnd(){ public Long getRoomIdEnd(){
return this.roomIdEnd; return this.roomIdEnd;
} }
/** /**
* 设置 结束 所属房间id * 设置 结束 所属房间id
* @param roomIdEnd * @param roomIdEnd
*/ */
public void setRoomIdEnd(Long roomIdEnd){ public void setRoomIdEnd(Long roomIdEnd){
this.roomIdEnd = roomIdEnd; this.roomIdEnd = roomIdEnd;
} }
/** /**
* 获取 增加 所属房间id * 获取 增加 所属房间id
* @return roomIdIncrement * @return roomIdIncrement
*/ */
public Long getRoomIdIncrement(){ public Long getRoomIdIncrement(){
return this.roomIdIncrement; return this.roomIdIncrement;
} }
/** /**
* 设置 增加 所属房间id * 设置 增加 所属房间id
* @param roomIdIncrement * @param roomIdIncrement
*/ */
public void setRoomIdIncrement(Long roomIdIncrement){ public void setRoomIdIncrement(Long roomIdIncrement){
this.roomIdIncrement = roomIdIncrement; this.roomIdIncrement = roomIdIncrement;
} }
/** /**
* 获取 所属房间id * 获取 所属房间id
* @return roomIdList * @return roomIdList
*/ */
public List<Long> getRoomIdList(){ public List<Long> getRoomIdList(){
return this.roomIdList; return this.roomIdList;
} }
/** /**
* 设置 所属房间id * 设置 所属房间id
* @param roomIdList * @param roomIdList
*/ */
public void setRoomIdList(List<Long> roomIdList){ public void setRoomIdList(List<Long> roomIdList){
this.roomIdList = roomIdList; this.roomIdList = roomIdList;
} }
/** /**
* 获取 所属房间id * 获取 所属房间id
* @return roomIdNotList * @return roomIdNotList
*/ */
public List<Long> getRoomIdNotList(){ public List<Long> getRoomIdNotList(){
return this.roomIdNotList; return this.roomIdNotList;
} }
/** /**
* 设置 所属房间id * 设置 所属房间id
* @param roomIdNotList * @param roomIdNotList
*/ */
public void setRoomIdNotList(List<Long> roomIdNotList){ public void setRoomIdNotList(List<Long> roomIdNotList){
this.roomIdNotList = roomIdNotList; this.roomIdNotList = roomIdNotList;
} }
/** /**
* 获取 所属房间名称 * 获取 所属房间名称
* @return roomNameList * @return roomNameList
*/ */
public List<String> getRoomNameList(){ public List<String> getRoomNameList(){
return this.roomNameList; return this.roomNameList;
} }
/** /**
* 设置 所属房间名称 * 设置 所属房间名称
* @param roomNameList * @param roomNameList
*/ */
public void setRoomNameList(List<String> roomNameList){ public void setRoomNameList(List<String> roomNameList){
this.roomNameList = roomNameList; this.roomNameList = roomNameList;
} }
/** /**
* 获取 所属房间名称 * 获取 所属房间名称
* @return roomNameNotList * @return roomNameNotList
*/ */
public List<String> getRoomNameNotList(){ public List<String> getRoomNameNotList(){
return this.roomNameNotList; return this.roomNameNotList;
} }
/** /**
* 设置 所属房间名称 * 设置 所属房间名称
* @param roomNameNotList * @param roomNameNotList
*/ */
public void setRoomNameNotList(List<String> roomNameNotList){ public void setRoomNameNotList(List<String> roomNameNotList){
this.roomNameNotList = roomNameNotList; this.roomNameNotList = roomNameNotList;
} }
/** /**
* 获取 所属部门 * 获取 所属部门
* @return deptNameList * @return deptNameList
*/ */
public List<String> getDeptNameList(){ public List<String> getDeptNameList(){
return this.deptNameList; return this.deptNameList;
} }
/** /**
* 设置 所属部门 * 设置 所属部门
* @param deptNameList * @param deptNameList
*/ */
public void setDeptNameList(List<String> deptNameList){ public void setDeptNameList(List<String> deptNameList){
this.deptNameList = deptNameList; this.deptNameList = deptNameList;
} }
/** /**
* 获取 所属部门 * 获取 所属部门
* @return deptNameNotList * @return deptNameNotList
*/ */
public List<String> getDeptNameNotList(){ public List<String> getDeptNameNotList(){
return this.deptNameNotList; return this.deptNameNotList;
} }
/** /**
* 设置 所属部门 * 设置 所属部门
* @param deptNameNotList * @param deptNameNotList
*/ */
public void setDeptNameNotList(List<String> deptNameNotList){ public void setDeptNameNotList(List<String> deptNameNotList){
this.deptNameNotList = deptNameNotList; this.deptNameNotList = deptNameNotList;
} }
/** /**
* 获取 姓名 * 获取 姓名
* @return nameList * @return nameList
*/ */
public List<String> getNameList(){ public List<String> getNameList(){
return this.nameList; return this.nameList;
} }
/** /**
* 设置 姓名 * 设置 姓名
* @param nameList * @param nameList
*/ */
public void setNameList(List<String> nameList){ public void setNameList(List<String> nameList){
this.nameList = nameList; this.nameList = nameList;
} }
/** /**
* 获取 姓名 * 获取 姓名
* @return nameNotList * @return nameNotList
*/ */
public List<String> getNameNotList(){ public List<String> getNameNotList(){
return this.nameNotList; return this.nameNotList;
} }
/** /**
* 设置 姓名 * 设置 姓名
* @param nameNotList * @param nameNotList
*/ */
public void setNameNotList(List<String> nameNotList){ public void setNameNotList(List<String> nameNotList){
this.nameNotList = nameNotList; this.nameNotList = nameNotList;
} }
/** /**
* 获取 开始 性别(0.男,1.女) * 获取 开始 性别(0.男,1.女)
* @return sexStart * @return sexStart
*/ */
public Integer getSexStart(){ public Integer getSexStart(){
return this.sexStart; return this.sexStart;
} }
/** /**
* 设置 开始 性别(0.男,1.女) * 设置 开始 性别(0.男,1.女)
* @param sexStart * @param sexStart
*/ */
public void setSexStart(Integer sexStart){ public void setSexStart(Integer sexStart){
this.sexStart = sexStart; this.sexStart = sexStart;
} }
/** /**
* 获取 结束 性别(0.男,1.女) * 获取 结束 性别(0.男,1.女)
* @return $sexEnd * @return $sexEnd
*/ */
public Integer getSexEnd(){ public Integer getSexEnd(){
return this.sexEnd; return this.sexEnd;
} }
/** /**
* 设置 结束 性别(0.男,1.女) * 设置 结束 性别(0.男,1.女)
* @param sexEnd * @param sexEnd
*/ */
public void setSexEnd(Integer sexEnd){ public void setSexEnd(Integer sexEnd){
this.sexEnd = sexEnd; this.sexEnd = sexEnd;
} }
/** /**
* 获取 增加 性别(0.男,1.女) * 获取 增加 性别(0.男,1.女)
* @return sexIncrement * @return sexIncrement
*/ */
public Integer getSexIncrement(){ public Integer getSexIncrement(){
return this.sexIncrement; return this.sexIncrement;
} }
/** /**
* 设置 增加 性别(0.男,1.女) * 设置 增加 性别(0.男,1.女)
* @param sexIncrement * @param sexIncrement
*/ */
public void setSexIncrement(Integer sexIncrement){ public void setSexIncrement(Integer sexIncrement){
this.sexIncrement = sexIncrement; this.sexIncrement = sexIncrement;
} }
/** /**
* 获取 性别(0.男,1.女) * 获取 性别(0.男,1.女)
* @return sexList * @return sexList
*/ */
public List<Integer> getSexList(){ public List<Integer> getSexList(){
return this.sexList; return this.sexList;
} }
/** /**
* 设置 性别(0.男,1.女) * 设置 性别(0.男,1.女)
* @param sexList * @param sexList
*/ */
public void setSexList(List<Integer> sexList){ public void setSexList(List<Integer> sexList){
this.sexList = sexList; this.sexList = sexList;
} }
/** /**
* 获取 性别(0.男,1.女) * 获取 性别(0.男,1.女)
* @return sexNotList * @return sexNotList
*/ */
public List<Integer> getSexNotList(){ public List<Integer> getSexNotList(){
return this.sexNotList; return this.sexNotList;
} }
/** /**
* 设置 性别(0.男,1.女) * 设置 性别(0.男,1.女)
* @param sexNotList * @param sexNotList
*/ */
public void setSexNotList(List<Integer> sexNotList){ public void setSexNotList(List<Integer> sexNotList){
this.sexNotList = sexNotList; this.sexNotList = sexNotList;
} }
/** /**
* 获取 职务 * 获取 职务
* @return userPostList * @return userPostList
*/ */
public List<String> getUserPostList(){ public List<String> getUserPostList(){
return this.userPostList; return this.userPostList;
} }
/** /**
* 设置 职务 * 设置 职务
* @param userPostList * @param userPostList
*/ */
public void setUserPostList(List<String> userPostList){ public void setUserPostList(List<String> userPostList){
this.userPostList = userPostList; this.userPostList = userPostList;
} }
/** /**
* 获取 职务 * 获取 职务
* @return userPostNotList * @return userPostNotList
*/ */
public List<String> getUserPostNotList(){ public List<String> getUserPostNotList(){
return this.userPostNotList; return this.userPostNotList;
} }
/** /**
* 设置 职务 * 设置 职务
* @param userPostNotList * @param userPostNotList
*/ */
public void setUserPostNotList(List<String> userPostNotList){ public void setUserPostNotList(List<String> userPostNotList){
this.userPostNotList = userPostNotList; this.userPostNotList = userPostNotList;
} }
/** /**
* 获取 电话 * 获取 电话
* @return phoneList * @return phoneList
*/ */
public List<String> getPhoneList(){ public List<String> getPhoneList(){
return this.phoneList; return this.phoneList;
} }
/** /**
* 设置 电话 * 设置 电话
* @param phoneList * @param phoneList
*/ */
public void setPhoneList(List<String> phoneList){ public void setPhoneList(List<String> phoneList){
this.phoneList = phoneList; this.phoneList = phoneList;
} }
/** /**
* 获取 电话 * 获取 电话
* @return phoneNotList * @return phoneNotList
*/ */
public List<String> getPhoneNotList(){ public List<String> getPhoneNotList(){
return this.phoneNotList; return this.phoneNotList;
} }
/** /**
* 设置 电话 * 设置 电话
* @param phoneNotList * @param phoneNotList
*/ */
public void setPhoneNotList(List<String> phoneNotList){ public void setPhoneNotList(List<String> phoneNotList){
this.phoneNotList = phoneNotList; this.phoneNotList = phoneNotList;
} }
/** /**
* 获取 手机 * 获取 手机
* @return mobileList * @return mobileList
*/ */
public List<String> getMobileList(){ public List<String> getMobileList(){
return this.mobileList; return this.mobileList;
} }
/** /**
* 设置 手机 * 设置 手机
* @param mobileList * @param mobileList
*/ */
public void setMobileList(List<String> mobileList){ public void setMobileList(List<String> mobileList){
this.mobileList = mobileList; this.mobileList = mobileList;
} }
/** /**
* 获取 手机 * 获取 手机
* @return mobileNotList * @return mobileNotList
*/ */
public List<String> getMobileNotList(){ public List<String> getMobileNotList(){
return this.mobileNotList; return this.mobileNotList;
} }
/** /**
* 设置 手机 * 设置 手机
* @param mobileNotList * @param mobileNotList
*/ */
public void setMobileNotList(List<String> mobileNotList){ public void setMobileNotList(List<String> mobileNotList){
this.mobileNotList = mobileNotList; this.mobileNotList = mobileNotList;
} }
/** /**
* 获取 简介 * 获取 简介
* @return summaryList * @return summaryList
*/ */
public List<String> getSummaryList(){ public List<String> getSummaryList(){
return this.summaryList; return this.summaryList;
} }
/** /**
* 设置 简介 * 设置 简介
* @param summaryList * @param summaryList
*/ */
public void setSummaryList(List<String> summaryList){ public void setSummaryList(List<String> summaryList){
this.summaryList = summaryList; this.summaryList = summaryList;
} }
/** /**
* 获取 简介 * 获取 简介
* @return summaryNotList * @return summaryNotList
*/ */
public List<String> getSummaryNotList(){ public List<String> getSummaryNotList(){
return this.summaryNotList; return this.summaryNotList;
} }
/** /**
* 设置 简介 * 设置 简介
* @param summaryNotList * @param summaryNotList
*/ */
public void setSummaryNotList(List<String> summaryNotList){ public void setSummaryNotList(List<String> summaryNotList){
this.summaryNotList = summaryNotList; this.summaryNotList = summaryNotList;
} }
/** /**
* 获取 照片 * 获取 照片
* @return photoPathList * @return photoPathList
*/ */
public List<String> getPhotoPathList(){ public List<String> getPhotoPathList(){
return this.photoPathList; return this.photoPathList;
} }
/** /**
* 设置 照片 * 设置 照片
* @param photoPathList * @param photoPathList
*/ */
public void setPhotoPathList(List<String> photoPathList){ public void setPhotoPathList(List<String> photoPathList){
this.photoPathList = photoPathList; this.photoPathList = photoPathList;
} }
/** /**
* 获取 照片 * 获取 照片
* @return photoPathNotList * @return photoPathNotList
*/ */
public List<String> getPhotoPathNotList(){ public List<String> getPhotoPathNotList(){
return this.photoPathNotList; return this.photoPathNotList;
} }
/** /**
* 设置 照片 * 设置 照片
* @param photoPathNotList * @param photoPathNotList
*/ */
public void setPhotoPathNotList(List<String> photoPathNotList){ public void setPhotoPathNotList(List<String> photoPathNotList){
this.photoPathNotList = photoPathNotList; this.photoPathNotList = photoPathNotList;
} }
/** /**
* 获取 工作状态,来源基础设置 * 获取 工作状态,来源基础设置
* @return workStatusList * @return workStatusList
*/ */
public List<String> getWorkStatusList(){ public List<String> getWorkStatusList(){
return this.workStatusList; return this.workStatusList;
} }
/** /**
* 设置 工作状态,来源基础设置 * 设置 工作状态,来源基础设置
* @param workStatusList * @param workStatusList
*/ */
public void setWorkStatusList(List<String> workStatusList){ public void setWorkStatusList(List<String> workStatusList){
this.workStatusList = workStatusList; this.workStatusList = workStatusList;
} }
/** /**
* 获取 工作状态,来源基础设置 * 获取 工作状态,来源基础设置
* @return workStatusNotList * @return workStatusNotList
*/ */
public List<String> getWorkStatusNotList(){ public List<String> getWorkStatusNotList(){
return this.workStatusNotList; return this.workStatusNotList;
} }
/** /**
* 设置 工作状态,来源基础设置 * 设置 工作状态,来源基础设置
* @param workStatusNotList * @param workStatusNotList
*/ */
public void setWorkStatusNotList(List<String> workStatusNotList){ public void setWorkStatusNotList(List<String> workStatusNotList){
this.workStatusNotList = workStatusNotList; this.workStatusNotList = workStatusNotList;
} }
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
*/ */
public String getCreateTimeStart(){ public String getCreateTimeStart(){
return this.createTimeStart; return this.createTimeStart;
} }
/** /**
* 设置 开始 创建时间 * 设置 开始 创建时间
* @param createTimeStart * @param createTimeStart
*/ */
public void setCreateTimeStart(String createTimeStart){ public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart; this.createTimeStart = createTimeStart;
} }
/** /**
* 获取 结束 创建时间 * 获取 结束 创建时间
* @return createTimeEnd * @return createTimeEnd
*/ */
public String getCreateTimeEnd(){ public String getCreateTimeEnd(){
return this.createTimeEnd; return this.createTimeEnd;
} }
/** /**
* 设置 结束 创建时间 * 设置 结束 创建时间
* @param createTimeEnd * @param createTimeEnd
*/ */
public void setCreateTimeEnd(String createTimeEnd){ public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd; this.createTimeEnd = createTimeEnd;
} }
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
*/ */
public Long getCreateUserIdStart(){ public Long getCreateUserIdStart(){
return this.createUserIdStart; return this.createUserIdStart;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public void setCreateUserIdStart(Long createUserIdStart){ public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
} }
/** /**
* 获取 结束 创建用户 * 获取 结束 创建用户
* @return $createUserIdEnd * @return $createUserIdEnd
*/ */
public Long getCreateUserIdEnd(){ public Long getCreateUserIdEnd(){
return this.createUserIdEnd; return this.createUserIdEnd;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public void setCreateUserIdEnd(Long createUserIdEnd){ public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
} }
/** /**
* 获取 增加 创建用户 * 获取 增加 创建用户
* @return createUserIdIncrement * @return createUserIdIncrement
*/ */
public Long getCreateUserIdIncrement(){ public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement; return this.createUserIdIncrement;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public void setCreateUserIdIncrement(Long createUserIdIncrement){ public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
} }
/** /**
* 获取 创建用户 * 获取 创建用户
* @return createUserIdList * @return createUserIdList
*/ */
public List<Long> getCreateUserIdList(){ public List<Long> getCreateUserIdList(){
return this.createUserIdList; return this.createUserIdList;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public void setCreateUserIdList(List<Long> createUserIdList){ public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/** /**
* 获取 创建用户 * 获取 创建用户
* @return createUserIdNotList * @return createUserIdNotList
*/ */
public List<Long> getCreateUserIdNotList(){ public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList; return this.createUserIdNotList;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdNotList * @param createUserIdNotList
*/ */
public void setCreateUserIdNotList(List<Long> createUserIdNotList){ public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList; this.createUserIdNotList = createUserIdNotList;
} }
/** /**
* 获取 开始 修改时间 * 获取 开始 修改时间
* @return updateTimeStart * @return updateTimeStart
*/ */
public String getUpdateTimeStart(){ public String getUpdateTimeStart(){
return this.updateTimeStart; return this.updateTimeStart;
} }
/** /**
* 设置 开始 修改时间 * 设置 开始 修改时间
* @param updateTimeStart * @param updateTimeStart
*/ */
public void setUpdateTimeStart(String updateTimeStart){ public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart; this.updateTimeStart = updateTimeStart;
} }
/** /**
* 获取 结束 修改时间 * 获取 结束 修改时间
* @return updateTimeEnd * @return updateTimeEnd
*/ */
public String getUpdateTimeEnd(){ public String getUpdateTimeEnd(){
return this.updateTimeEnd; return this.updateTimeEnd;
} }
/** /**
* 设置 结束 修改时间 * 设置 结束 修改时间
* @param updateTimeEnd * @param updateTimeEnd
*/ */
public void setUpdateTimeEnd(String updateTimeEnd){ public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/** /**
* 设置 序号,主键,自增长 * 获取 登录用户名
* @param id * @return loginNameList
*/ */
public List<String> getLoginNameList(){
return this.loginNameList;
}
/**
* 设置 登录用户名
* @param loginNameList
*/
public void setLoginNameList(List<String> loginNameList){
this.loginNameList = loginNameList;
}
/**
* 获取 登录用户名
* @return loginNameNotList
*/
public List<String> getLoginNameNotList(){
return this.loginNameNotList;
}
/**
* 设置 登录用户名
* @param loginNameNotList
*/
public void setLoginNameNotList(List<String> loginNameNotList){
this.loginNameNotList = loginNameNotList;
}
/**
* 获取 密码
* @return loginPwdList
*/
public List<String> getLoginPwdList(){
return this.loginPwdList;
}
/**
* 设置 密码
* @param loginPwdList
*/
public void setLoginPwdList(List<String> loginPwdList){
this.loginPwdList = loginPwdList;
}
/**
* 获取 密码
* @return loginPwdNotList
*/
public List<String> getLoginPwdNotList(){
return this.loginPwdNotList;
}
/**
* 设置 密码
* @param loginPwdNotList
*/
public void setLoginPwdNotList(List<String> loginPwdNotList){
this.loginPwdNotList = loginPwdNotList;
}
/**
* 设置 序号,主键,自增长
* @param id
*/
public WorkmanQuery id(Long id){ public WorkmanQuery id(Long id){
setId(id); setId(id);
return this; return this;
} }
/** /**
* 设置 开始 序号,主键,自增长 * 设置 开始 序号,主键,自增长
* @param idStart * @param idStart
*/ */
public WorkmanQuery idStart(Long idStart){ public WorkmanQuery idStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
return this; return this;
} }
/** /**
* 设置 结束 序号,主键,自增长 * 设置 结束 序号,主键,自增长
* @param idEnd * @param idEnd
*/ */
public WorkmanQuery idEnd(Long idEnd){ public WorkmanQuery idEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
return this; return this;
} }
/** /**
* 设置 增加 序号,主键,自增长 * 设置 增加 序号,主键,自增长
* @param idIncrement * @param idIncrement
*/ */
public WorkmanQuery idIncrement(Long idIncrement){ public WorkmanQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
return this; return this;
} }
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param idList * @param idList
*/ */
public WorkmanQuery idList(List<Long> idList){ public WorkmanQuery idList(List<Long> idList){
this.idList = idList; this.idList = idList;
return this; return this;
} }
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param idNotList * @param idNotList
*/ */
public WorkmanQuery idNotList(List<Long> idNotList){ public WorkmanQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList; this.idNotList = idNotList;
return this; return this;
} }
/** /**
* 设置 所属房间id * 设置 所属房间id
* @param roomId * @param roomId
*/ */
public WorkmanQuery roomId(Long roomId){ public WorkmanQuery roomId(Long roomId){
setRoomId(roomId); setRoomId(roomId);
return this; return this;
} }
/** /**
* 设置 开始 所属房间id * 设置 开始 所属房间id
* @param roomIdStart * @param roomIdStart
*/ */
public WorkmanQuery roomIdStart(Long roomIdStart){ public WorkmanQuery roomIdStart(Long roomIdStart){
this.roomIdStart = roomIdStart; this.roomIdStart = roomIdStart;
return this; return this;
} }
/** /**
* 设置 结束 所属房间id * 设置 结束 所属房间id
* @param roomIdEnd * @param roomIdEnd
*/ */
public WorkmanQuery roomIdEnd(Long roomIdEnd){ public WorkmanQuery roomIdEnd(Long roomIdEnd){
this.roomIdEnd = roomIdEnd; this.roomIdEnd = roomIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 所属房间id * 设置 增加 所属房间id
* @param roomIdIncrement * @param roomIdIncrement
*/ */
public WorkmanQuery roomIdIncrement(Long roomIdIncrement){ public WorkmanQuery roomIdIncrement(Long roomIdIncrement){
this.roomIdIncrement = roomIdIncrement; this.roomIdIncrement = roomIdIncrement;
return this; return this;
} }
/** /**
* 设置 所属房间id * 设置 所属房间id
* @param roomIdList * @param roomIdList
*/ */
public WorkmanQuery roomIdList(List<Long> roomIdList){ public WorkmanQuery roomIdList(List<Long> roomIdList){
this.roomIdList = roomIdList; this.roomIdList = roomIdList;
return this; return this;
} }
/** /**
* 设置 所属房间id * 设置 所属房间id
* @param roomIdNotList * @param roomIdNotList
*/ */
public WorkmanQuery roomIdNotList(List<Long> roomIdNotList){ public WorkmanQuery roomIdNotList(List<Long> roomIdNotList){
this.roomIdNotList = roomIdNotList; this.roomIdNotList = roomIdNotList;
return this; return this;
} }
/** /**
* 设置 所属房间名称 * 设置 所属房间名称
* @param roomName * @param roomName
*/ */
public WorkmanQuery roomName(String roomName){ public WorkmanQuery roomName(String roomName){
setRoomName(roomName); setRoomName(roomName);
return this; return this;
} }
/** /**
* 设置 所属房间名称 * 设置 所属房间名称
* @param roomNameList * @param roomNameList
*/ */
public WorkmanQuery roomNameList(List<String> roomNameList){ public WorkmanQuery roomNameList(List<String> roomNameList){
this.roomNameList = roomNameList; this.roomNameList = roomNameList;
return this; return this;
} }
/** /**
* 设置 所属部门 * 设置 所属部门
* @param deptName * @param deptName
*/ */
public WorkmanQuery deptName(String deptName){ public WorkmanQuery deptName(String deptName){
setDeptName(deptName); setDeptName(deptName);
return this; return this;
} }
/** /**
* 设置 所属部门 * 设置 所属部门
* @param deptNameList * @param deptNameList
*/ */
public WorkmanQuery deptNameList(List<String> deptNameList){ public WorkmanQuery deptNameList(List<String> deptNameList){
this.deptNameList = deptNameList; this.deptNameList = deptNameList;
return this; return this;
} }
/** /**
* 设置 姓名 * 设置 姓名
* @param name * @param name
*/ */
public WorkmanQuery name(String name){ public WorkmanQuery name(String name){
setName(name); setName(name);
return this; return this;
} }
/** /**
* 设置 姓名 * 设置 姓名
* @param nameList * @param nameList
*/ */
public WorkmanQuery nameList(List<String> nameList){ public WorkmanQuery nameList(List<String> nameList){
this.nameList = nameList; this.nameList = nameList;
return this; return this;
} }
/** /**
* 设置 性别(0.男,1.女) * 设置 性别(0.男,1.女)
* @param sex * @param sex
*/ */
public WorkmanQuery sex(Integer sex){ public WorkmanQuery sex(Integer sex){
setSex(sex); setSex(sex);
return this; return this;
} }
/** /**
* 设置 开始 性别(0.男,1.女) * 设置 开始 性别(0.男,1.女)
* @param sexStart * @param sexStart
*/ */
public WorkmanQuery sexStart(Integer sexStart){ public WorkmanQuery sexStart(Integer sexStart){
this.sexStart = sexStart; this.sexStart = sexStart;
return this; return this;
} }
/** /**
* 设置 结束 性别(0.男,1.女) * 设置 结束 性别(0.男,1.女)
* @param sexEnd * @param sexEnd
*/ */
public WorkmanQuery sexEnd(Integer sexEnd){ public WorkmanQuery sexEnd(Integer sexEnd){
this.sexEnd = sexEnd; this.sexEnd = sexEnd;
return this; return this;
} }
/** /**
* 设置 增加 性别(0.男,1.女) * 设置 增加 性别(0.男,1.女)
* @param sexIncrement * @param sexIncrement
*/ */
public WorkmanQuery sexIncrement(Integer sexIncrement){ public WorkmanQuery sexIncrement(Integer sexIncrement){
this.sexIncrement = sexIncrement; this.sexIncrement = sexIncrement;
return this; return this;
} }
/** /**
* 设置 性别(0.男,1.女) * 设置 性别(0.男,1.女)
* @param sexList * @param sexList
*/ */
public WorkmanQuery sexList(List<Integer> sexList){ public WorkmanQuery sexList(List<Integer> sexList){
this.sexList = sexList; this.sexList = sexList;
return this; return this;
} }
/** /**
* 设置 性别(0.男,1.女) * 设置 性别(0.男,1.女)
* @param sexNotList * @param sexNotList
*/ */
public WorkmanQuery sexNotList(List<Integer> sexNotList){ public WorkmanQuery sexNotList(List<Integer> sexNotList){
this.sexNotList = sexNotList; this.sexNotList = sexNotList;
return this; return this;
} }
/** /**
* 设置 职务 * 设置 职务
* @param userPost * @param userPost
*/ */
public WorkmanQuery userPost(String userPost){ public WorkmanQuery userPost(String userPost){
setUserPost(userPost); setUserPost(userPost);
return this; return this;
} }
/** /**
* 设置 职务 * 设置 职务
* @param userPostList * @param userPostList
*/ */
public WorkmanQuery userPostList(List<String> userPostList){ public WorkmanQuery userPostList(List<String> userPostList){
this.userPostList = userPostList; this.userPostList = userPostList;
return this; return this;
} }
/** /**
* 设置 电话 * 设置 电话
* @param phone * @param phone
*/ */
public WorkmanQuery phone(String phone){ public WorkmanQuery phone(String phone){
setPhone(phone); setPhone(phone);
return this; return this;
} }
/** /**
* 设置 电话 * 设置 电话
* @param phoneList * @param phoneList
*/ */
public WorkmanQuery phoneList(List<String> phoneList){ public WorkmanQuery phoneList(List<String> phoneList){
this.phoneList = phoneList; this.phoneList = phoneList;
return this; return this;
} }
/** /**
* 设置 手机 * 设置 手机
* @param mobile * @param mobile
*/ */
public WorkmanQuery mobile(String mobile){ public WorkmanQuery mobile(String mobile){
setMobile(mobile); setMobile(mobile);
return this; return this;
} }
/** /**
* 设置 手机 * 设置 手机
* @param mobileList * @param mobileList
*/ */
public WorkmanQuery mobileList(List<String> mobileList){ public WorkmanQuery mobileList(List<String> mobileList){
this.mobileList = mobileList; this.mobileList = mobileList;
return this; return this;
} }
/** /**
* 设置 简介 * 设置 简介
* @param summary * @param summary
*/ */
public WorkmanQuery summary(String summary){ public WorkmanQuery summary(String summary){
setSummary(summary); setSummary(summary);
return this; return this;
} }
/** /**
* 设置 简介 * 设置 简介
* @param summaryList * @param summaryList
*/ */
public WorkmanQuery summaryList(List<String> summaryList){ public WorkmanQuery summaryList(List<String> summaryList){
this.summaryList = summaryList; this.summaryList = summaryList;
return this; return this;
} }
/** /**
* 设置 照片 * 设置 照片
* @param photoPath * @param photoPath
*/ */
public WorkmanQuery photoPath(String photoPath){ public WorkmanQuery photoPath(String photoPath){
setPhotoPath(photoPath); setPhotoPath(photoPath);
return this; return this;
} }
/** /**
* 设置 照片 * 设置 照片
* @param photoPathList * @param photoPathList
*/ */
public WorkmanQuery photoPathList(List<String> photoPathList){ public WorkmanQuery photoPathList(List<String> photoPathList){
this.photoPathList = photoPathList; this.photoPathList = photoPathList;
return this; return this;
} }
/** /**
* 设置 工作状态,来源基础设置 * 设置 工作状态,来源基础设置
* @param workStatus * @param workStatus
*/ */
public WorkmanQuery workStatus(String workStatus){ public WorkmanQuery workStatus(String workStatus){
setWorkStatus(workStatus); setWorkStatus(workStatus);
return this; return this;
} }
/** /**
* 设置 工作状态,来源基础设置 * 设置 工作状态,来源基础设置
* @param workStatusList * @param workStatusList
*/ */
public WorkmanQuery workStatusList(List<String> workStatusList){ public WorkmanQuery workStatusList(List<String> workStatusList){
this.workStatusList = workStatusList; this.workStatusList = workStatusList;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
*/ */
public WorkmanQuery createUserId(Long createUserId){ public WorkmanQuery createUserId(Long createUserId){
setCreateUserId(createUserId); setCreateUserId(createUserId);
return this; return this;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public WorkmanQuery createUserIdStart(Long createUserIdStart){ public WorkmanQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public WorkmanQuery createUserIdEnd(Long createUserIdEnd){ public WorkmanQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public WorkmanQuery createUserIdIncrement(Long createUserIdIncrement){ public WorkmanQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public WorkmanQuery createUserIdList(List<Long> createUserIdList){ public WorkmanQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdNotList * @param createUserIdNotList
*/ */
public WorkmanQuery createUserIdNotList(List<Long> createUserIdNotList){ public WorkmanQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList; this.createUserIdNotList = createUserIdNotList;
return this; return this;
} }
/**
* 设置 登录用户名
* @param loginName
*/
public WorkmanQuery loginName(String loginName){
setLoginName(loginName);
return this;
}
/**
* 设置 登录用户名
* @param loginNameList
*/
public WorkmanQuery loginNameList(List<String> loginNameList){
this.loginNameList = loginNameList;
return this;
}
/**
* 设置 密码
* @param loginPwd
*/
public WorkmanQuery loginPwd(String loginPwd){
setLoginPwd(loginPwd);
return this;
}
/**
* 设置 密码
* @param loginPwdList
*/
public WorkmanQuery loginPwdList(List<String> loginPwdList){
this.loginPwdList = loginPwdList;
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
*/ */
public List<WorkmanQuery> getOrConditionList(){ public List<WorkmanQuery> getOrConditionList(){
return this.orConditionList; return this.orConditionList;
} }
/** /**
* 设置 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)
* @param orConditionList * @param orConditionList
*/ */
public void setOrConditionList(List<WorkmanQuery> orConditionList){ public void setOrConditionList(List<WorkmanQuery> orConditionList){
this.orConditionList = orConditionList; this.orConditionList = 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)
* @return andConditionList * @return andConditionList
*/ */
public List<WorkmanQuery> getAndConditionList(){ public List<WorkmanQuery> getAndConditionList(){
return this.andConditionList; return this.andConditionList;
} }
/** /**
* 设置 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)
* @param andConditionList * @param andConditionList
*/ */
public void setAndConditionList(List<WorkmanQuery> andConditionList){ public void setAndConditionList(List<WorkmanQuery> andConditionList){
this.andConditionList = andConditionList; this.andConditionList = andConditionList;
} }
......
...@@ -19,15 +19,6 @@ public class WorkmanVo extends BaseEntityLong { ...@@ -19,15 +19,6 @@ public class WorkmanVo extends BaseEntityLong {
private String oldPwd; private String oldPwd;
private String newPwd; private String newPwd;
/** private String deviceCode;
* 登录用户名
*/
@Excel(name = "用户名")
private String loginName;
/**
* 密码
*/
@Excel(name = "密码")
private String loginPwd;
} }
\ No newline at end of file
...@@ -2,6 +2,7 @@ package com.mortals.xhx.module.workman.service.impl; ...@@ -2,6 +2,7 @@ package com.mortals.xhx.module.workman.service.impl;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.util.SecurityUtil; import com.mortals.framework.util.SecurityUtil;
import com.mortals.framework.util.StringUtils;
import com.mortals.xhx.module.gocome.model.GocomeRecordEntity; import com.mortals.xhx.module.gocome.model.GocomeRecordEntity;
import com.mortals.xhx.module.gocome.service.GocomeRecordService; import com.mortals.xhx.module.gocome.service.GocomeRecordService;
import com.mortals.xhx.module.room.model.RoomQuery; import com.mortals.xhx.module.room.model.RoomQuery;
...@@ -37,6 +38,25 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work ...@@ -37,6 +38,25 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work
private RoomService roomService; private RoomService roomService;
@Override
protected void saveBefore(WorkmanEntity entity, Context context) throws AppException {
super.saveBefore(entity, context);
if (StringUtils.isNotEmpty(entity.getLoginPwd())) {
try {
entity.setLoginPwd(SecurityUtil.md5DoubleEncoding(entity.getLoginPwd()));
} catch (Exception e) {
throw new AppException("密码转换异常");
}
} else {
entity.setLoginPwd(null);
}
WorkmanEntity workmanEntity = this.selectOne(new WorkmanQuery().loginName(entity.getLoginName()));
if(!ObjectUtils.isEmpty(workmanEntity)){
throw new AppException("当前登录用户名已存在!");
}
}
@Override @Override
protected void saveAfter(WorkmanEntity entity, Context context) throws AppException { protected void saveAfter(WorkmanEntity entity, Context context) throws AppException {
super.saveAfter(entity, context); super.saveAfter(entity, context);
...@@ -64,9 +84,6 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work ...@@ -64,9 +84,6 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work
} catch (Exception e) { } catch (Exception e) {
throw new AppException("密码验认出错!", e); throw new AppException("密码验认出错!", e);
} }
// WorkmanEntity update = new WorkmanEntity();
// update.setId(workmanEntity.getId());
// this.dao.update(update);
return workmanEntity; return workmanEntity;
} }
...@@ -146,7 +163,12 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work ...@@ -146,7 +163,12 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work
recordEntity.setCreateUserId(this.getContextUserId(context)); recordEntity.setCreateUserId(this.getContextUserId(context));
gocomeRecordService.save(recordEntity, context); gocomeRecordService.save(recordEntity, context);
return Rest.ok(); return Rest.ok();
} }
@Override
protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
super.removeAfter(ids, context, result);
}
} }
\ No newline at end of file
package com.mortals.xhx.module.workman.web; package com.mortals.xhx.module.workman.web;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.mortals.framework.annotation.UnAuth; import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
...@@ -8,16 +9,20 @@ import com.mortals.xhx.base.system.param.service.ParamService; ...@@ -8,16 +9,20 @@ import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.basic.model.BasicStatusQuery; import com.mortals.xhx.module.basic.model.BasicStatusQuery;
import com.mortals.xhx.module.basic.service.BasicStatusService; import com.mortals.xhx.module.basic.service.BasicStatusService;
import com.mortals.xhx.module.device.model.DeviceEntity; import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.room.model.RoomEntity;
import com.mortals.xhx.module.room.model.RoomQuery; import com.mortals.xhx.module.room.model.RoomQuery;
import com.mortals.xhx.module.room.service.RoomService; import com.mortals.xhx.module.room.service.RoomService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.workman.model.WorkmanEntity; import com.mortals.xhx.module.workman.model.WorkmanEntity;
import com.mortals.xhx.module.workman.service.WorkmanService; import com.mortals.xhx.module.workman.service.WorkmanService;
...@@ -26,21 +31,23 @@ import com.mortals.framework.util.StringUtils; ...@@ -26,21 +31,23 @@ import com.mortals.framework.util.StringUtils;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*; import static com.mortals.framework.ap.SysConstains.*;
/** /**
* * 工作人员
* 工作人员 *
* * @author zxfei
* @author zxfei * @date 2023-05-22
* @date 2023-05-22 */
*/
@RestController @RestController
@RequestMapping("workman") @RequestMapping("workman")
@Slf4j @Slf4j
public class WorkmanController extends BaseCRUDJsonBodyMappingController<WorkmanService,WorkmanEntity,Long> { public class WorkmanController extends BaseCRUDJsonBodyMappingController<WorkmanService, WorkmanEntity, Long> {
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
...@@ -50,32 +57,46 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman ...@@ -50,32 +57,46 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
private BasicStatusService statusService; private BasicStatusService statusService;
public WorkmanController(){ public WorkmanController() {
super.setModuleDesc( "工作人员"); super.setModuleDesc("工作人员");
} }
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "sex", paramService.getParamBySecondOrganize("Workman","sex")); this.addDict(model, "sex", paramService.getParamBySecondOrganize("Workman", "sex"));
this.addDict(model, "roomId", roomService.find(new RoomQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRoomName(), (o, n) -> n))); this.addDict(model, "roomId", roomService.find(new RoomQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRoomName(), (o, n) -> n)));
this.addDict(model, "workStatus", statusService.find(new BasicStatusQuery()).stream().collect(Collectors.toMap(x -> x.getStatusName(), y -> y.getStatusName(), (o, n) -> n))); this.addDict(model, "workStatus", statusService.find(new BasicStatusQuery()).stream().collect(Collectors.toMap(x -> x.getStatusName(), y -> y.getStatusName(), (o, n) -> n)));
super.init(model, context); super.init(model, context);
} }
@Override
protected void doListBefore(WorkmanEntity query, Map<String, Object> model, Context context) throws AppException {
super.doListBefore(query, model, context);
if (!ObjectUtils.isEmpty(query.getDeviceCode())) {
//根据设备编码 查询房间room
RoomEntity roomEntity = roomService.selectOne(new RoomQuery().deviceCode(query.getDeviceCode()));
if (!ObjectUtils.isEmpty(roomEntity)) {
query.setRoomId(roomEntity.getId());
}
}
}
/** /**
* 工作人员更新状态 * 工作人员更新状态
*/ */
@PostMapping(value = "change/status") @PostMapping(value = "change/status")
@UnAuth
public Rest<Void> changeStatus(@RequestBody WorkmanEntity workmanEntity) { public Rest<Void> changeStatus(@RequestBody WorkmanEntity workmanEntity) {
String busiDesc = this.getModuleDesc() + "设备激活"; String busiDesc = this.getModuleDesc() + "更新状态";
Rest<Void> rest = Rest.ok(busiDesc + " 【成功】"); Rest<Void> rest = Rest.ok(busiDesc + " 【成功】");
try { try {
this.service.changeStatus(workmanEntity, getContext()); this.service.changeStatus(workmanEntity, getContext());
recordSysLog(request, busiDesc + " 【成功】"); recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) { } catch (Exception e) {
log.error("设备激活消息", e); log.error("工作人员更新状态消息", e);
rest = Rest.fail(super.convertException(e)); rest = Rest.fail(super.convertException(e));
} }
return rest; return rest;
...@@ -93,7 +114,6 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman ...@@ -93,7 +114,6 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
try { try {
String ip = super.getRequestIP(request); String ip = super.getRequestIP(request);
WorkmanEntity workmanEntity = this.service.doLogin(query.getLoginName(), query.getLoginPwd(), ip); WorkmanEntity workmanEntity = this.service.doLogin(query.getLoginName(), query.getLoginPwd(), ip);
this.service.getDao().update(workmanEntity);
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS); ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
ret.put(KEY_RESULT_MSG, "工作人员登录成功!"); ret.put(KEY_RESULT_MSG, "工作人员登录成功!");
ret.put(KEY_RESULT_DATA, workmanEntity); ret.put(KEY_RESULT_DATA, workmanEntity);
...@@ -149,5 +169,18 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman ...@@ -149,5 +169,18 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
} }
@Override
protected void deleteBefore(Long[] ids, Context context) throws AppException {
super.deleteBefore(ids, context);
List<WorkmanEntity> workmanEntities = this.service.get(ids, context);
for (WorkmanEntity workmanEntity : workmanEntities) {
RoomQuery roomQuery = new RoomQuery();
roomQuery.setId(workmanEntity.getRoomId());
RoomEntity roomEntity = roomService.selectOne(roomQuery, context);
if(!ObjectUtils.isEmpty(roomEntity)){
roomEntity.setCountPerson(roomEntity.getCountPerson()-1);
roomService.update(roomEntity);
}
}
}
} }
\ No newline at end of file
<?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.room.dao.ibatis.RoomDaoImpl"> <mapper namespace="com.mortals.xhx.module.room.dao.ibatis.RoomDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="RoomEntity" id="RoomEntity-Map"> <resultMap type="RoomEntity" id="RoomEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="roomName" column="roomName" /> <result property="roomName" column="roomName" />
<result property="roomCode" column="roomCode" /> <result property="roomCode" column="roomCode" />
<result property="roomType" column="roomType" /> <result property="roomType" column="roomType" />
<result property="deviceId" column="deviceId" /> <result property="deviceId" column="deviceId" />
<result property="deviceName" column="deviceName" /> <result property="deviceName" column="deviceName" />
<result property="countPerson" column="countPerson" /> <result property="countPerson" column="countPerson" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="deviceCode" column="deviceCode" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
<sql id="_columns"> <sql id="_columns">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<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('roomName') or colPickMode == 1 and data.containsKey('roomName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roomName') or colPickMode == 1 and data.containsKey('roomName')))">
a.roomName, a.roomName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roomCode') or colPickMode == 1 and data.containsKey('roomCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roomCode') or colPickMode == 1 and data.containsKey('roomCode')))">
a.roomCode, a.roomCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roomType') or colPickMode == 1 and data.containsKey('roomType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roomType') or colPickMode == 1 and data.containsKey('roomType')))">
a.roomType, a.roomType,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceId') or colPickMode == 1 and data.containsKey('deviceId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceId') or colPickMode == 1 and data.containsKey('deviceId')))">
a.deviceId, a.deviceId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceName') or colPickMode == 1 and data.containsKey('deviceName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceName') or colPickMode == 1 and data.containsKey('deviceName')))">
a.deviceName, a.deviceName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('countPerson') or colPickMode == 1 and data.containsKey('countPerson')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('countPerson') or colPickMode == 1 and data.containsKey('countPerson')))">
a.countPerson, a.countPerson,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
a.remark, a.remark,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId, a.createUserId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
a.updateUserId, a.updateUserId,
</if> </if>
<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('deviceCode') or colPickMode == 1 and data.containsKey('deviceCode')))">
a.deviceCode,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="RoomEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="RoomEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_room insert into mortals_xhx_room
(roomName,roomCode,roomType,deviceId,deviceName,countPerson,remark,createUserId,createTime,updateUserId,updateTime) (roomName,roomCode,roomType,deviceId,deviceName,countPerson,remark,createUserId,createTime,updateUserId,updateTime,deviceCode)
VALUES VALUES
(#{roomName},#{roomCode},#{roomType},#{deviceId},#{deviceName},#{countPerson},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{roomName},#{roomCode},#{roomType},#{deviceId},#{deviceName},#{countPerson},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{deviceCode})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_room insert into mortals_xhx_room
(roomName,roomCode,roomType,deviceId,deviceName,countPerson,remark,createUserId,createTime,updateUserId,updateTime) (roomName,roomCode,roomType,deviceId,deviceName,countPerson,remark,createUserId,createTime,updateUserId,updateTime,deviceCode)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.roomName},#{item.roomCode},#{item.roomType},#{item.deviceId},#{item.deviceName},#{item.countPerson},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.roomName},#{item.roomCode},#{item.roomType},#{item.deviceId},#{item.deviceName},#{item.countPerson},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.deviceCode})
</foreach> </foreach>
</insert> </insert>
...@@ -134,6 +138,9 @@ ...@@ -134,6 +138,9 @@
<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('deviceCode')) or (colPickMode==1 and !data.containsKey('deviceCode'))">
a.deviceCode=#{data.deviceCode},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -146,108 +153,115 @@ ...@@ -146,108 +153,115 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_xhx_room as a update mortals_xhx_room as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="roomName=(case" suffix="ELSE roomName end),"> <trim prefix="roomName=(case" suffix="ELSE roomName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('roomName')) or (colPickMode==1 and !item.containsKey('roomName'))"> <if test="(colPickMode==0 and item.containsKey('roomName')) or (colPickMode==1 and !item.containsKey('roomName'))">
when a.id=#{item.id} then #{item.roomName} when a.id=#{item.id} then #{item.roomName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="roomCode=(case" suffix="ELSE roomCode end),"> <trim prefix="roomCode=(case" suffix="ELSE roomCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('roomCode')) or (colPickMode==1 and !item.containsKey('roomCode'))"> <if test="(colPickMode==0 and item.containsKey('roomCode')) or (colPickMode==1 and !item.containsKey('roomCode'))">
when a.id=#{item.id} then #{item.roomCode} when a.id=#{item.id} then #{item.roomCode}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="roomType=(case" suffix="ELSE roomType end),"> <trim prefix="roomType=(case" suffix="ELSE roomType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('roomType')) or (colPickMode==1 and !item.containsKey('roomType'))"> <when test="(colPickMode==0 and item.containsKey('roomType')) or (colPickMode==1 and !item.containsKey('roomType'))">
when a.id=#{item.id} then #{item.roomType} when a.id=#{item.id} then #{item.roomType}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('roomTypeIncrement')) or (colPickMode==1 and !item.containsKey('roomTypeIncrement'))"> <when test="(colPickMode==0 and item.containsKey('roomTypeIncrement')) or (colPickMode==1 and !item.containsKey('roomTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.roomType,0) + #{item.roomTypeIncrement} when a.id=#{item.id} then ifnull(a.roomType,0) + #{item.roomTypeIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deviceId=(case" suffix="ELSE deviceId end),"> <trim prefix="deviceId=(case" suffix="ELSE deviceId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('deviceId')) or (colPickMode==1 and !item.containsKey('deviceId'))"> <when test="(colPickMode==0 and item.containsKey('deviceId')) or (colPickMode==1 and !item.containsKey('deviceId'))">
when a.id=#{item.id} then #{item.deviceId} when a.id=#{item.id} then #{item.deviceId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('deviceIdIncrement')) or (colPickMode==1 and !item.containsKey('deviceIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('deviceIdIncrement')) or (colPickMode==1 and !item.containsKey('deviceIdIncrement'))">
when a.id=#{item.id} then ifnull(a.deviceId,0) + #{item.deviceIdIncrement} when a.id=#{item.id} then ifnull(a.deviceId,0) + #{item.deviceIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deviceName=(case" suffix="ELSE deviceName end),"> <trim prefix="deviceName=(case" suffix="ELSE deviceName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deviceName')) or (colPickMode==1 and !item.containsKey('deviceName'))"> <if test="(colPickMode==0 and item.containsKey('deviceName')) or (colPickMode==1 and !item.containsKey('deviceName'))">
when a.id=#{item.id} then #{item.deviceName} when a.id=#{item.id} then #{item.deviceName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="countPerson=(case" suffix="ELSE countPerson end),"> <trim prefix="countPerson=(case" suffix="ELSE countPerson end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('countPerson')) or (colPickMode==1 and !item.containsKey('countPerson'))"> <when test="(colPickMode==0 and item.containsKey('countPerson')) or (colPickMode==1 and !item.containsKey('countPerson'))">
when a.id=#{item.id} then #{item.countPerson} when a.id=#{item.id} then #{item.countPerson}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('countPersonIncrement')) or (colPickMode==1 and !item.containsKey('countPersonIncrement'))"> <when test="(colPickMode==0 and item.containsKey('countPersonIncrement')) or (colPickMode==1 and !item.containsKey('countPersonIncrement'))">
when a.id=#{item.id} then ifnull(a.countPerson,0) + #{item.countPersonIncrement} when a.id=#{item.id} then ifnull(a.countPerson,0) + #{item.countPersonIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="remark=(case" suffix="ELSE remark end),"> <trim prefix="remark=(case" suffix="ELSE remark end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))"> <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
when a.id=#{item.id} then #{item.remark} when a.id=#{item.id} then #{item.remark}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),"> <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))"> <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId} when a.id=#{item.id} then #{item.createUserId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement} when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime} when a.id=#{item.id} then #{item.createTime}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),"> <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))"> <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
when a.id=#{item.id} then #{item.updateUserId} when a.id=#{item.id} then #{item.updateUserId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement} when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),"> <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))"> <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime} when a.id=#{item.id} then #{item.updateTime}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deviceCode=(case" suffix="ELSE deviceCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deviceCode')) or (colPickMode==1 and !item.containsKey('deviceCode'))">
when a.id=#{item.id} then #{item.deviceCode}
</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=")">
...@@ -364,355 +378,381 @@ ...@@ -364,355 +378,381 @@
${_conditionType_} a.id=#{${_conditionParam_}.id} ${_conditionType_} a.id=#{${_conditionParam_}.id}
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('id')"> <if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null "> <if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id} ${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null"> <if test="conditionParamRef.id == null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.id is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('roomName')"> <if test="conditionParamRef.containsKey('roomName')">
<if test="conditionParamRef.roomName != null and conditionParamRef.roomName != ''"> <if test="conditionParamRef.roomName != null and conditionParamRef.roomName != ''">
${_conditionType_} a.roomName like #{${_conditionParam_}.roomName} ${_conditionType_} a.roomName like #{${_conditionParam_}.roomName}
</if>
<if test="conditionParamRef.roomName == null">
${_conditionType_} a.roomName is null
</if>
</if>
<if test="conditionParamRef.containsKey('roomNameList') and conditionParamRef.roomNameList.size() > 0">
${_conditionType_} a.roomName in
<foreach collection="conditionParamRef.roomNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('roomNameNotList') and conditionParamRef.roomNameNotList.size() > 0"> <if test="conditionParamRef.roomName == null">
${_conditionType_} a.roomName not in ${_conditionType_} a.roomName is null
<foreach collection="conditionParamRef.roomNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('roomNameList') and conditionParamRef.roomNameList.size() > 0">
${_conditionType_} a.roomName in
<foreach collection="conditionParamRef.roomNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roomNameNotList') and conditionParamRef.roomNameNotList.size() > 0">
${_conditionType_} a.roomName not in
<foreach collection="conditionParamRef.roomNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roomCode')"> <if test="conditionParamRef.containsKey('roomCode')">
<if test="conditionParamRef.roomCode != null and conditionParamRef.roomCode != ''"> <if test="conditionParamRef.roomCode != null and conditionParamRef.roomCode != ''">
${_conditionType_} a.roomCode like #{${_conditionParam_}.roomCode} ${_conditionType_} a.roomCode like #{${_conditionParam_}.roomCode}
</if>
<if test="conditionParamRef.roomCode == null">
${_conditionType_} a.roomCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('roomCodeList') and conditionParamRef.roomCodeList.size() > 0">
${_conditionType_} a.roomCode in
<foreach collection="conditionParamRef.roomCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roomCodeNotList') and conditionParamRef.roomCodeNotList.size() > 0">
${_conditionType_} a.roomCode not in
<foreach collection="conditionParamRef.roomCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roomType')">
<if test="conditionParamRef.roomType != null ">
${_conditionType_} a.roomType = #{${_conditionParam_}.roomType}
</if>
<if test="conditionParamRef.roomType == null">
${_conditionType_} a.roomType is null
</if>
</if>
<if test="conditionParamRef.containsKey('roomTypeList') and conditionParamRef.roomTypeList.size() > 0">
${_conditionType_} a.roomType in
<foreach collection="conditionParamRef.roomTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('roomTypeNotList') and conditionParamRef.roomTypeNotList.size() > 0"> <if test="conditionParamRef.roomCode == null">
${_conditionType_} a.roomType not in ${_conditionType_} a.roomCode is null
<foreach collection="conditionParamRef.roomTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('roomTypeStart') and conditionParamRef.roomTypeStart != null"> </if>
${_conditionType_} a.roomType <![CDATA[ >= ]]> #{${_conditionParam_}.roomTypeStart} <if test="conditionParamRef.containsKey('roomCodeList') and conditionParamRef.roomCodeList.size() > 0">
${_conditionType_} a.roomCode in
<foreach collection="conditionParamRef.roomCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roomCodeNotList') and conditionParamRef.roomCodeNotList.size() > 0">
${_conditionType_} a.roomCode not in
<foreach collection="conditionParamRef.roomCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roomType')">
<if test="conditionParamRef.roomType != null ">
${_conditionType_} a.roomType = #{${_conditionParam_}.roomType}
</if> </if>
<if test="conditionParamRef.containsKey('roomTypeEnd') and conditionParamRef.roomTypeEnd != null"> <if test="conditionParamRef.roomType == null">
${_conditionType_} a.roomType <![CDATA[ <= ]]> #{${_conditionParam_}.roomTypeEnd} ${_conditionType_} a.roomType is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('roomTypeList') and conditionParamRef.roomTypeList.size() > 0">
${_conditionType_} a.roomType in
<foreach collection="conditionParamRef.roomTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roomTypeNotList') and conditionParamRef.roomTypeNotList.size() > 0">
${_conditionType_} a.roomType not in
<foreach collection="conditionParamRef.roomTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roomTypeStart') and conditionParamRef.roomTypeStart != null">
${_conditionType_} a.roomType <![CDATA[ >= ]]> #{${_conditionParam_}.roomTypeStart}
</if>
<if test="conditionParamRef.containsKey('roomTypeEnd') and conditionParamRef.roomTypeEnd != null">
${_conditionType_} a.roomType <![CDATA[ <= ]]> #{${_conditionParam_}.roomTypeEnd}
</if>
<if test="conditionParamRef.containsKey('deviceId')"> <if test="conditionParamRef.containsKey('deviceId')">
<if test="conditionParamRef.deviceId != null "> <if test="conditionParamRef.deviceId != null ">
${_conditionType_} a.deviceId = #{${_conditionParam_}.deviceId} ${_conditionType_} a.deviceId = #{${_conditionParam_}.deviceId}
</if>
<if test="conditionParamRef.deviceId == null">
${_conditionType_} a.deviceId is null
</if>
</if>
<if test="conditionParamRef.containsKey('deviceIdList') and conditionParamRef.deviceIdList.size() > 0">
${_conditionType_} a.deviceId in
<foreach collection="conditionParamRef.deviceIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceIdNotList') and conditionParamRef.deviceIdNotList.size() > 0">
${_conditionType_} a.deviceId not in
<foreach collection="conditionParamRef.deviceIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceIdStart') and conditionParamRef.deviceIdStart != null"> <if test="conditionParamRef.deviceId == null">
${_conditionType_} a.deviceId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceIdStart} ${_conditionType_} a.deviceId is null
</if>
<if test="conditionParamRef.containsKey('deviceIdEnd') and conditionParamRef.deviceIdEnd != null">
${_conditionType_} a.deviceId <![CDATA[ <= ]]> #{${_conditionParam_}.deviceIdEnd}
</if> </if>
</if>
<if test="conditionParamRef.containsKey('deviceIdList') and conditionParamRef.deviceIdList.size() > 0">
${_conditionType_} a.deviceId in
<foreach collection="conditionParamRef.deviceIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceIdNotList') and conditionParamRef.deviceIdNotList.size() > 0">
${_conditionType_} a.deviceId not in
<foreach collection="conditionParamRef.deviceIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceIdStart') and conditionParamRef.deviceIdStart != null">
${_conditionType_} a.deviceId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceIdStart}
</if>
<if test="conditionParamRef.containsKey('deviceIdEnd') and conditionParamRef.deviceIdEnd != null">
${_conditionType_} a.deviceId <![CDATA[ <= ]]> #{${_conditionParam_}.deviceIdEnd}
</if>
<if test="conditionParamRef.containsKey('deviceName')"> <if test="conditionParamRef.containsKey('deviceName')">
<if test="conditionParamRef.deviceName != null and conditionParamRef.deviceName != ''"> <if test="conditionParamRef.deviceName != null and conditionParamRef.deviceName != ''">
${_conditionType_} a.deviceName like #{${_conditionParam_}.deviceName} ${_conditionType_} a.deviceName like #{${_conditionParam_}.deviceName}
</if>
<if test="conditionParamRef.deviceName == null">
${_conditionType_} a.deviceName is null
</if>
</if>
<if test="conditionParamRef.containsKey('deviceNameList') and conditionParamRef.deviceNameList.size() > 0">
${_conditionType_} a.deviceName in
<foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceNameNotList') and conditionParamRef.deviceNameNotList.size() > 0">
${_conditionType_} a.deviceName not in
<foreach collection="conditionParamRef.deviceNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('countPerson')">
<if test="conditionParamRef.countPerson != null ">
${_conditionType_} a.countPerson = #{${_conditionParam_}.countPerson}
</if>
<if test="conditionParamRef.countPerson == null">
${_conditionType_} a.countPerson is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('countPersonList') and conditionParamRef.countPersonList.size() > 0"> <if test="conditionParamRef.deviceName == null">
${_conditionType_} a.countPerson in ${_conditionType_} a.deviceName is null
<foreach collection="conditionParamRef.countPersonList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('countPersonNotList') and conditionParamRef.countPersonNotList.size() > 0">
${_conditionType_} a.countPerson not in
<foreach collection="conditionParamRef.countPersonNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('countPersonStart') and conditionParamRef.countPersonStart != null"> </if>
${_conditionType_} a.countPerson <![CDATA[ >= ]]> #{${_conditionParam_}.countPersonStart} <if test="conditionParamRef.containsKey('deviceNameList') and conditionParamRef.deviceNameList.size() > 0">
${_conditionType_} a.deviceName in
<foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceNameNotList') and conditionParamRef.deviceNameNotList.size() > 0">
${_conditionType_} a.deviceName not in
<foreach collection="conditionParamRef.deviceNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('countPerson')">
<if test="conditionParamRef.countPerson != null ">
${_conditionType_} a.countPerson = #{${_conditionParam_}.countPerson}
</if> </if>
<if test="conditionParamRef.containsKey('countPersonEnd') and conditionParamRef.countPersonEnd != null"> <if test="conditionParamRef.countPerson == null">
${_conditionType_} a.countPerson <![CDATA[ <= ]]> #{${_conditionParam_}.countPersonEnd} ${_conditionType_} a.countPerson is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('countPersonList') and conditionParamRef.countPersonList.size() > 0">
${_conditionType_} a.countPerson in
<foreach collection="conditionParamRef.countPersonList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('countPersonNotList') and conditionParamRef.countPersonNotList.size() > 0">
${_conditionType_} a.countPerson not in
<foreach collection="conditionParamRef.countPersonNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('countPersonStart') and conditionParamRef.countPersonStart != null">
${_conditionType_} a.countPerson <![CDATA[ >= ]]> #{${_conditionParam_}.countPersonStart}
</if>
<if test="conditionParamRef.containsKey('countPersonEnd') and conditionParamRef.countPersonEnd != null">
${_conditionType_} a.countPerson <![CDATA[ <= ]]> #{${_conditionParam_}.countPersonEnd}
</if>
<if test="conditionParamRef.containsKey('remark')"> <if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.remark != null and conditionParamRef.remark != ''"> <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
${_conditionType_} a.remark like #{${_conditionParam_}.remark} ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
</if>
<if test="conditionParamRef.remark == null">
${_conditionType_} a.remark is null
</if>
</if>
<if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
${_conditionType_} a.remark not in
<foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
<if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0"> <if test="conditionParamRef.remark == null">
${_conditionType_} a.createUserId not in ${_conditionType_} a.remark is null
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> </if>
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
${_conditionType_} a.remark not in
<foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null"> <if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd} ${_conditionType_} a.createUserId is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateUserId')">
<if test="conditionParamRef.updateUserId != null ">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if>
<if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0"> <if test="conditionParamRef.createTime == null">
${_conditionType_} a.updateUserId not in ${_conditionType_} a.createTime is null
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> </if>
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateUserId')">
<if test="conditionParamRef.updateUserId != null ">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null"> <if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd} ${_conditionType_} a.updateUserId is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('updateTime')"> <if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null "> <if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime} ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
<if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''"> <if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<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('deviceCode')">
<if test="conditionParamRef.deviceCode != null and conditionParamRef.deviceCode != ''">
${_conditionType_} a.deviceCode like #{${_conditionParam_}.deviceCode}
</if> </if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.deviceCode == null">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.deviceCode is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('deviceCodeList') and conditionParamRef.deviceCodeList.size() > 0">
${_conditionType_} a.deviceCode in
<foreach collection="conditionParamRef.deviceCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceCodeNotList') and conditionParamRef.deviceCodeNotList.size() > 0">
${_conditionType_} a.deviceCode not in
<foreach collection="conditionParamRef.deviceCodeNotList" 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()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} ${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
<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('roomName')"> <if test="orderCol.containsKey('roomName')">
a.roomName a.roomName
<if test='orderCol.roomName != null and "DESC".equalsIgnoreCase(orderCol.roomName)'>DESC</if> <if test='orderCol.roomName != null and "DESC".equalsIgnoreCase(orderCol.roomName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('roomCode')"> <if test="orderCol.containsKey('roomCode')">
a.roomCode a.roomCode
<if test='orderCol.roomCode != null and "DESC".equalsIgnoreCase(orderCol.roomCode)'>DESC</if> <if test='orderCol.roomCode != null and "DESC".equalsIgnoreCase(orderCol.roomCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('roomType')"> <if test="orderCol.containsKey('roomType')">
a.roomType a.roomType
<if test='orderCol.roomType != null and "DESC".equalsIgnoreCase(orderCol.roomType)'>DESC</if> <if test='orderCol.roomType != null and "DESC".equalsIgnoreCase(orderCol.roomType)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deviceId')"> <if test="orderCol.containsKey('deviceId')">
a.deviceId a.deviceId
<if test='orderCol.deviceId != null and "DESC".equalsIgnoreCase(orderCol.deviceId)'>DESC</if> <if test='orderCol.deviceId != null and "DESC".equalsIgnoreCase(orderCol.deviceId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deviceName')"> <if test="orderCol.containsKey('deviceName')">
a.deviceName a.deviceName
<if test='orderCol.deviceName != null and "DESC".equalsIgnoreCase(orderCol.deviceName)'>DESC</if> <if test='orderCol.deviceName != null and "DESC".equalsIgnoreCase(orderCol.deviceName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('countPerson')"> <if test="orderCol.containsKey('countPerson')">
a.countPerson a.countPerson
<if test='orderCol.countPerson != null and "DESC".equalsIgnoreCase(orderCol.countPerson)'>DESC</if> <if test='orderCol.countPerson != null and "DESC".equalsIgnoreCase(orderCol.countPerson)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('remark')"> <if test="orderCol.containsKey('remark')">
a.remark a.remark
<if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if> <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createUserId')"> <if test="orderCol.containsKey('createUserId')">
a.createUserId a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if> <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
a.createTime a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateUserId')"> <if test="orderCol.containsKey('updateUserId')">
a.updateUserId a.updateUserId
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if> <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateTime')"> <if test="orderCol.containsKey('updateTime')">
a.updateTime a.updateTime
<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('deviceCode')">
a.deviceCode
<if test='orderCol.deviceCode != null and "DESC".equalsIgnoreCase(orderCol.deviceCode)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
<?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.workman.dao.ibatis.WorkmanDaoImpl"> <mapper namespace="com.mortals.xhx.module.workman.dao.ibatis.WorkmanDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="WorkmanEntity" id="WorkmanEntity-Map"> <resultMap type="WorkmanEntity" id="WorkmanEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="roomId" column="roomId" /> <result property="roomId" column="roomId" />
<result property="roomName" column="roomName" /> <result property="roomName" column="roomName" />
<result property="deptName" column="deptName" /> <result property="deptName" column="deptName" />
<result property="name" column="name" /> <result property="name" column="name" />
<result property="sex" column="sex" /> <result property="sex" column="sex" />
<result property="userPost" column="userPost" /> <result property="userPost" column="userPost" />
<result property="phone" column="phone" /> <result property="phone" column="phone" />
<result property="mobile" column="mobile" /> <result property="mobile" column="mobile" />
<result property="summary" column="summary" /> <result property="summary" column="summary" />
<result property="photoPath" column="photoPath" /> <result property="photoPath" column="photoPath" />
<result property="workStatus" column="workStatus" /> <result property="workStatus" column="workStatus" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="loginName" column="loginName" />
<result property="loginPwd" column="loginPwd" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
<sql id="_columns"> <sql id="_columns">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<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('roomId') or colPickMode == 1 and data.containsKey('roomId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roomId') or colPickMode == 1 and data.containsKey('roomId')))">
a.roomId, a.roomId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roomName') or colPickMode == 1 and data.containsKey('roomName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roomName') or colPickMode == 1 and data.containsKey('roomName')))">
a.roomName, a.roomName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
a.deptName, a.deptName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
a.name, a.name,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sex') or colPickMode == 1 and data.containsKey('sex')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sex') or colPickMode == 1 and data.containsKey('sex')))">
a.sex, a.sex,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('userPost') or colPickMode == 1 and data.containsKey('userPost')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('userPost') or colPickMode == 1 and data.containsKey('userPost')))">
a.userPost, a.userPost,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('phone') or colPickMode == 1 and data.containsKey('phone')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('phone') or colPickMode == 1 and data.containsKey('phone')))">
a.phone, a.phone,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('mobile') or colPickMode == 1 and data.containsKey('mobile')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('mobile') or colPickMode == 1 and data.containsKey('mobile')))">
a.mobile, a.mobile,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('summary') or colPickMode == 1 and data.containsKey('summary')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('summary') or colPickMode == 1 and data.containsKey('summary')))">
a.summary, a.summary,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('photoPath') or colPickMode == 1 and data.containsKey('photoPath')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('photoPath') or colPickMode == 1 and data.containsKey('photoPath')))">
a.photoPath, a.photoPath,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workStatus') or colPickMode == 1 and data.containsKey('workStatus')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workStatus') or colPickMode == 1 and data.containsKey('workStatus')))">
a.workStatus, a.workStatus,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId, a.createUserId,
</if> </if>
<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('loginName') or colPickMode == 1 and data.containsKey('loginName')))">
a.loginName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginPwd') or colPickMode == 1 and data.containsKey('loginPwd')))">
a.loginPwd,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="WorkmanEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="WorkmanEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_workman insert into mortals_xhx_workman
(roomId,roomName,deptName,name,sex,userPost,phone,mobile,summary,photoPath,workStatus,createTime,createUserId,updateTime) (roomId,roomName,deptName,name,sex,userPost,phone,mobile,summary,photoPath,workStatus,createTime,createUserId,updateTime,loginName,loginPwd)
VALUES VALUES
(#{roomId},#{roomName},#{deptName},#{name},#{sex},#{userPost},#{phone},#{mobile},#{summary},#{photoPath},#{workStatus},#{createTime},#{createUserId},#{updateTime}) (#{roomId},#{roomName},#{deptName},#{name},#{sex},#{userPost},#{phone},#{mobile},#{summary},#{photoPath},#{workStatus},#{createTime},#{createUserId},#{updateTime},#{loginName},#{loginPwd})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_workman insert into mortals_xhx_workman
(roomId,roomName,deptName,name,sex,userPost,phone,mobile,summary,photoPath,workStatus,createTime,createUserId,updateTime) (roomId,roomName,deptName,name,sex,userPost,phone,mobile,summary,photoPath,workStatus,createTime,createUserId,updateTime,loginName,loginPwd)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.roomId},#{item.roomName},#{item.deptName},#{item.name},#{item.sex},#{item.userPost},#{item.phone},#{item.mobile},#{item.summary},#{item.photoPath},#{item.workStatus},#{item.createTime},#{item.createUserId},#{item.updateTime}) (#{item.roomId},#{item.roomName},#{item.deptName},#{item.name},#{item.sex},#{item.userPost},#{item.phone},#{item.mobile},#{item.summary},#{item.photoPath},#{item.workStatus},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.loginName},#{item.loginPwd})
</foreach> </foreach>
</insert> </insert>
...@@ -149,6 +157,12 @@ ...@@ -149,6 +157,12 @@
<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('loginName')) or (colPickMode==1 and !data.containsKey('loginName'))">
a.loginName=#{data.loginName},
</if>
<if test="(colPickMode==0 and data.containsKey('loginPwd')) or (colPickMode==1 and !data.containsKey('loginPwd'))">
a.loginPwd=#{data.loginPwd},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -161,119 +175,133 @@ ...@@ -161,119 +175,133 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_xhx_workman as a update mortals_xhx_workman as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="roomId=(case" suffix="ELSE roomId end),"> <trim prefix="roomId=(case" suffix="ELSE roomId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('roomId')) or (colPickMode==1 and !item.containsKey('roomId'))"> <when test="(colPickMode==0 and item.containsKey('roomId')) or (colPickMode==1 and !item.containsKey('roomId'))">
when a.id=#{item.id} then #{item.roomId} when a.id=#{item.id} then #{item.roomId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('roomIdIncrement')) or (colPickMode==1 and !item.containsKey('roomIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('roomIdIncrement')) or (colPickMode==1 and !item.containsKey('roomIdIncrement'))">
when a.id=#{item.id} then ifnull(a.roomId,0) + #{item.roomIdIncrement} when a.id=#{item.id} then ifnull(a.roomId,0) + #{item.roomIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="roomName=(case" suffix="ELSE roomName end),"> <trim prefix="roomName=(case" suffix="ELSE roomName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('roomName')) or (colPickMode==1 and !item.containsKey('roomName'))"> <if test="(colPickMode==0 and item.containsKey('roomName')) or (colPickMode==1 and !item.containsKey('roomName'))">
when a.id=#{item.id} then #{item.roomName} when a.id=#{item.id} then #{item.roomName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deptName=(case" suffix="ELSE deptName end),"> <trim prefix="deptName=(case" suffix="ELSE deptName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deptName')) or (colPickMode==1 and !item.containsKey('deptName'))"> <if test="(colPickMode==0 and item.containsKey('deptName')) or (colPickMode==1 and !item.containsKey('deptName'))">
when a.id=#{item.id} then #{item.deptName} when a.id=#{item.id} then #{item.deptName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="name=(case" suffix="ELSE name end),"> <trim prefix="name=(case" suffix="ELSE name end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))"> <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
when a.id=#{item.id} then #{item.name} when a.id=#{item.id} then #{item.name}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="sex=(case" suffix="ELSE sex end),"> <trim prefix="sex=(case" suffix="ELSE sex end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('sex')) or (colPickMode==1 and !item.containsKey('sex'))"> <when test="(colPickMode==0 and item.containsKey('sex')) or (colPickMode==1 and !item.containsKey('sex'))">
when a.id=#{item.id} then #{item.sex} when a.id=#{item.id} then #{item.sex}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('sexIncrement')) or (colPickMode==1 and !item.containsKey('sexIncrement'))"> <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 a.id=#{item.id} then ifnull(a.sex,0) + #{item.sexIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="userPost=(case" suffix="ELSE userPost end),"> <trim prefix="userPost=(case" suffix="ELSE userPost end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('userPost')) or (colPickMode==1 and !item.containsKey('userPost'))"> <if test="(colPickMode==0 and item.containsKey('userPost')) or (colPickMode==1 and !item.containsKey('userPost'))">
when a.id=#{item.id} then #{item.userPost} when a.id=#{item.id} then #{item.userPost}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="phone=(case" suffix="ELSE phone end),"> <trim prefix="phone=(case" suffix="ELSE phone end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('phone')) or (colPickMode==1 and !item.containsKey('phone'))"> <if test="(colPickMode==0 and item.containsKey('phone')) or (colPickMode==1 and !item.containsKey('phone'))">
when a.id=#{item.id} then #{item.phone} when a.id=#{item.id} then #{item.phone}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="mobile=(case" suffix="ELSE mobile end),"> <trim prefix="mobile=(case" suffix="ELSE mobile end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('mobile')) or (colPickMode==1 and !item.containsKey('mobile'))"> <if test="(colPickMode==0 and item.containsKey('mobile')) or (colPickMode==1 and !item.containsKey('mobile'))">
when a.id=#{item.id} then #{item.mobile} when a.id=#{item.id} then #{item.mobile}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="summary=(case" suffix="ELSE summary end),"> <trim prefix="summary=(case" suffix="ELSE summary end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('summary')) or (colPickMode==1 and !item.containsKey('summary'))"> <if test="(colPickMode==0 and item.containsKey('summary')) or (colPickMode==1 and !item.containsKey('summary'))">
when a.id=#{item.id} then #{item.summary} when a.id=#{item.id} then #{item.summary}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="photoPath=(case" suffix="ELSE photoPath end),"> <trim prefix="photoPath=(case" suffix="ELSE photoPath end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('photoPath')) or (colPickMode==1 and !item.containsKey('photoPath'))"> <if test="(colPickMode==0 and item.containsKey('photoPath')) or (colPickMode==1 and !item.containsKey('photoPath'))">
when a.id=#{item.id} then #{item.photoPath} when a.id=#{item.id} then #{item.photoPath}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="workStatus=(case" suffix="ELSE workStatus end),"> <trim prefix="workStatus=(case" suffix="ELSE workStatus end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('workStatus')) or (colPickMode==1 and !item.containsKey('workStatus'))"> <if test="(colPickMode==0 and item.containsKey('workStatus')) or (colPickMode==1 and !item.containsKey('workStatus'))">
when a.id=#{item.id} then #{item.workStatus} when a.id=#{item.id} then #{item.workStatus}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime} when a.id=#{item.id} then #{item.createTime}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),"> <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))"> <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId} when a.id=#{item.id} then #{item.createUserId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement} when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),"> <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))"> <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime} when a.id=#{item.id} then #{item.updateTime}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="loginName=(case" suffix="ELSE loginName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('loginName')) or (colPickMode==1 and !item.containsKey('loginName'))">
when a.id=#{item.id} then #{item.loginName}
</if>
</foreach>
</trim>
<trim prefix="loginPwd=(case" suffix="ELSE loginPwd end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('loginPwd')) or (colPickMode==1 and !item.containsKey('loginPwd'))">
when a.id=#{item.id} then #{item.loginPwd}
</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=")">
...@@ -390,421 +418,473 @@ ...@@ -390,421 +418,473 @@
${_conditionType_} a.id=#{${_conditionParam_}.id} ${_conditionType_} a.id=#{${_conditionParam_}.id}
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('id')"> <if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null "> <if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id} ${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null"> <if test="conditionParamRef.id == null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.id is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('roomId')"> <if test="conditionParamRef.containsKey('roomId')">
<if test="conditionParamRef.roomId != null "> <if test="conditionParamRef.roomId != null ">
${_conditionType_} a.roomId = #{${_conditionParam_}.roomId} ${_conditionType_} a.roomId = #{${_conditionParam_}.roomId}
</if>
<if test="conditionParamRef.roomId == null">
${_conditionType_} a.roomId is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('roomIdList') and conditionParamRef.roomIdList.size() > 0"> <if test="conditionParamRef.roomId == null">
${_conditionType_} a.roomId in ${_conditionType_} a.roomId is null
<foreach collection="conditionParamRef.roomIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roomIdNotList') and conditionParamRef.roomIdNotList.size() > 0">
${_conditionType_} a.roomId not in
<foreach collection="conditionParamRef.roomIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roomIdStart') and conditionParamRef.roomIdStart != null">
${_conditionType_} a.roomId <![CDATA[ >= ]]> #{${_conditionParam_}.roomIdStart}
</if>
<if test="conditionParamRef.containsKey('roomIdEnd') and conditionParamRef.roomIdEnd != null">
${_conditionType_} a.roomId <![CDATA[ <= ]]> #{${_conditionParam_}.roomIdEnd}
</if> </if>
</if>
<if test="conditionParamRef.containsKey('roomIdList') and conditionParamRef.roomIdList.size() > 0">
${_conditionType_} a.roomId in
<foreach collection="conditionParamRef.roomIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roomIdNotList') and conditionParamRef.roomIdNotList.size() > 0">
${_conditionType_} a.roomId not in
<foreach collection="conditionParamRef.roomIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roomIdStart') and conditionParamRef.roomIdStart != null">
${_conditionType_} a.roomId <![CDATA[ >= ]]> #{${_conditionParam_}.roomIdStart}
</if>
<if test="conditionParamRef.containsKey('roomIdEnd') and conditionParamRef.roomIdEnd != null">
${_conditionType_} a.roomId <![CDATA[ <= ]]> #{${_conditionParam_}.roomIdEnd}
</if>
<if test="conditionParamRef.containsKey('roomName')"> <if test="conditionParamRef.containsKey('roomName')">
<if test="conditionParamRef.roomName != null and conditionParamRef.roomName != ''"> <if test="conditionParamRef.roomName != null and conditionParamRef.roomName != ''">
${_conditionType_} a.roomName like #{${_conditionParam_}.roomName} ${_conditionType_} a.roomName like #{${_conditionParam_}.roomName}
</if>
<if test="conditionParamRef.roomName == null">
${_conditionType_} a.roomName is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('roomNameList') and conditionParamRef.roomNameList.size() > 0"> <if test="conditionParamRef.roomName == null">
${_conditionType_} a.roomName in ${_conditionType_} a.roomName is null
<foreach collection="conditionParamRef.roomNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roomNameNotList') and conditionParamRef.roomNameNotList.size() > 0">
${_conditionType_} a.roomName not in
<foreach collection="conditionParamRef.roomNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('roomNameList') and conditionParamRef.roomNameList.size() > 0">
${_conditionType_} a.roomName in
<foreach collection="conditionParamRef.roomNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roomNameNotList') and conditionParamRef.roomNameNotList.size() > 0">
${_conditionType_} a.roomName not in
<foreach collection="conditionParamRef.roomNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptName')"> <if test="conditionParamRef.containsKey('deptName')">
<if test="conditionParamRef.deptName != null and conditionParamRef.deptName != ''"> <if test="conditionParamRef.deptName != null and conditionParamRef.deptName != ''">
${_conditionType_} a.deptName like #{${_conditionParam_}.deptName} ${_conditionType_} a.deptName like #{${_conditionParam_}.deptName}
</if>
<if test="conditionParamRef.deptName == null">
${_conditionType_} a.deptName is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0"> <if test="conditionParamRef.deptName == null">
${_conditionType_} a.deptName in ${_conditionType_} a.deptName is null
<foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
${_conditionType_} a.deptName not in
<foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0">
${_conditionType_} a.deptName in
<foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
${_conditionType_} a.deptName not in
<foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('name')"> <if test="conditionParamRef.containsKey('name')">
<if test="conditionParamRef.name != null and conditionParamRef.name != ''"> <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
${_conditionType_} a.name like #{${_conditionParam_}.name} ${_conditionType_} a.name like #{${_conditionParam_}.name}
</if>
<if test="conditionParamRef.name == null">
${_conditionType_} a.name is null
</if>
</if>
<if test="conditionParamRef.containsKey('nameList') and conditionParamRef.nameList.size() > 0">
${_conditionType_} a.name in
<foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('nameNotList') and conditionParamRef.nameNotList.size() > 0"> <if test="conditionParamRef.name == null">
${_conditionType_} a.name not in ${_conditionType_} a.name is null
<foreach collection="conditionParamRef.nameNotList" 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') and conditionParamRef.sexList.size() > 0">
${_conditionType_} a.sex in
<foreach collection="conditionParamRef.sexList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sexNotList') and conditionParamRef.sexNotList.size() > 0">
${_conditionType_} a.sex not in
<foreach collection="conditionParamRef.sexNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('sexStart') and conditionParamRef.sexStart != null"> </if>
${_conditionType_} a.sex <![CDATA[ >= ]]> #{${_conditionParam_}.sexStart} <if test="conditionParamRef.containsKey('nameList') and conditionParamRef.nameList.size() > 0">
${_conditionType_} a.name in
<foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('nameNotList') and conditionParamRef.nameNotList.size() > 0">
${_conditionType_} a.name not in
<foreach collection="conditionParamRef.nameNotList" 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>
<if test="conditionParamRef.containsKey('sexEnd') and conditionParamRef.sexEnd != null"> <if test="conditionParamRef.sex == null">
${_conditionType_} a.sex <![CDATA[ <= ]]> #{${_conditionParam_}.sexEnd} ${_conditionType_} a.sex is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('sexList') and conditionParamRef.sexList.size() > 0">
${_conditionType_} a.sex in
<foreach collection="conditionParamRef.sexList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sexNotList') and conditionParamRef.sexNotList.size() > 0">
${_conditionType_} a.sex not in
<foreach collection="conditionParamRef.sexNotList" 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('userPost')"> <if test="conditionParamRef.containsKey('userPost')">
<if test="conditionParamRef.userPost != null and conditionParamRef.userPost != ''"> <if test="conditionParamRef.userPost != null and conditionParamRef.userPost != ''">
${_conditionType_} a.userPost like #{${_conditionParam_}.userPost} ${_conditionType_} a.userPost like #{${_conditionParam_}.userPost}
</if>
<if test="conditionParamRef.userPost == null">
${_conditionType_} a.userPost is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('userPostList') and conditionParamRef.userPostList.size() > 0"> <if test="conditionParamRef.userPost == null">
${_conditionType_} a.userPost in ${_conditionType_} a.userPost is null
<foreach collection="conditionParamRef.userPostList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('userPostNotList') and conditionParamRef.userPostNotList.size() > 0">
${_conditionType_} a.userPost not in
<foreach collection="conditionParamRef.userPostNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('userPostList') and conditionParamRef.userPostList.size() > 0">
${_conditionType_} a.userPost in
<foreach collection="conditionParamRef.userPostList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('userPostNotList') and conditionParamRef.userPostNotList.size() > 0">
${_conditionType_} a.userPost not in
<foreach collection="conditionParamRef.userPostNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('phone')"> <if test="conditionParamRef.containsKey('phone')">
<if test="conditionParamRef.phone != null and conditionParamRef.phone != ''"> <if test="conditionParamRef.phone != null and conditionParamRef.phone != ''">
${_conditionType_} a.phone like #{${_conditionParam_}.phone} ${_conditionType_} a.phone like #{${_conditionParam_}.phone}
</if>
<if test="conditionParamRef.phone == null">
${_conditionType_} a.phone is null
</if>
</if>
<if test="conditionParamRef.containsKey('phoneList') and conditionParamRef.phoneList.size() > 0">
${_conditionType_} a.phone in
<foreach collection="conditionParamRef.phoneList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('phoneNotList') and conditionParamRef.phoneNotList.size() > 0"> <if test="conditionParamRef.phone == null">
${_conditionType_} a.phone not in ${_conditionType_} a.phone is null
<foreach collection="conditionParamRef.phoneNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('phoneList') and conditionParamRef.phoneList.size() > 0">
${_conditionType_} a.phone in
<foreach collection="conditionParamRef.phoneList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('phoneNotList') and conditionParamRef.phoneNotList.size() > 0">
${_conditionType_} a.phone not in
<foreach collection="conditionParamRef.phoneNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('mobile')"> <if test="conditionParamRef.containsKey('mobile')">
<if test="conditionParamRef.mobile != null and conditionParamRef.mobile != ''"> <if test="conditionParamRef.mobile != null and conditionParamRef.mobile != ''">
${_conditionType_} a.mobile like #{${_conditionParam_}.mobile} ${_conditionType_} a.mobile like #{${_conditionParam_}.mobile}
</if>
<if test="conditionParamRef.mobile == null">
${_conditionType_} a.mobile is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('mobileList') and conditionParamRef.mobileList.size() > 0"> <if test="conditionParamRef.mobile == null">
${_conditionType_} a.mobile in ${_conditionType_} a.mobile is null
<foreach collection="conditionParamRef.mobileList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('mobileNotList') and conditionParamRef.mobileNotList.size() > 0">
${_conditionType_} a.mobile not in
<foreach collection="conditionParamRef.mobileNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('mobileList') and conditionParamRef.mobileList.size() > 0">
${_conditionType_} a.mobile in
<foreach collection="conditionParamRef.mobileList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('mobileNotList') and conditionParamRef.mobileNotList.size() > 0">
${_conditionType_} a.mobile not in
<foreach collection="conditionParamRef.mobileNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('summary')"> <if test="conditionParamRef.containsKey('summary')">
<if test="conditionParamRef.summary != null and conditionParamRef.summary != ''"> <if test="conditionParamRef.summary != null and conditionParamRef.summary != ''">
${_conditionType_} a.summary like #{${_conditionParam_}.summary} ${_conditionType_} a.summary like #{${_conditionParam_}.summary}
</if>
<if test="conditionParamRef.summary == null">
${_conditionType_} a.summary is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('summaryList') and conditionParamRef.summaryList.size() > 0"> <if test="conditionParamRef.summary == null">
${_conditionType_} a.summary in ${_conditionType_} a.summary is null
<foreach collection="conditionParamRef.summaryList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('summaryNotList') and conditionParamRef.summaryNotList.size() > 0">
${_conditionType_} a.summary not in
<foreach collection="conditionParamRef.summaryNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('summaryList') and conditionParamRef.summaryList.size() > 0">
${_conditionType_} a.summary in
<foreach collection="conditionParamRef.summaryList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('summaryNotList') and conditionParamRef.summaryNotList.size() > 0">
${_conditionType_} a.summary not in
<foreach collection="conditionParamRef.summaryNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('photoPath')"> <if test="conditionParamRef.containsKey('photoPath')">
<if test="conditionParamRef.photoPath != null and conditionParamRef.photoPath != ''"> <if test="conditionParamRef.photoPath != null and conditionParamRef.photoPath != ''">
${_conditionType_} a.photoPath like #{${_conditionParam_}.photoPath} ${_conditionType_} a.photoPath like #{${_conditionParam_}.photoPath}
</if>
<if test="conditionParamRef.photoPath == null">
${_conditionType_} a.photoPath is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('photoPathList') and conditionParamRef.photoPathList.size() > 0"> <if test="conditionParamRef.photoPath == null">
${_conditionType_} a.photoPath in ${_conditionType_} a.photoPath is null
<foreach collection="conditionParamRef.photoPathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('photoPathNotList') and conditionParamRef.photoPathNotList.size() > 0">
${_conditionType_} a.photoPath not in
<foreach collection="conditionParamRef.photoPathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('photoPathList') and conditionParamRef.photoPathList.size() > 0">
${_conditionType_} a.photoPath in
<foreach collection="conditionParamRef.photoPathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('photoPathNotList') and conditionParamRef.photoPathNotList.size() > 0">
${_conditionType_} a.photoPath not in
<foreach collection="conditionParamRef.photoPathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('workStatus')"> <if test="conditionParamRef.containsKey('workStatus')">
<if test="conditionParamRef.workStatus != null and conditionParamRef.workStatus != ''"> <if test="conditionParamRef.workStatus != null and conditionParamRef.workStatus != ''">
${_conditionType_} a.workStatus like #{${_conditionParam_}.workStatus} ${_conditionType_} a.workStatus like #{${_conditionParam_}.workStatus}
</if>
<if test="conditionParamRef.workStatus == null">
${_conditionType_} a.workStatus is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('workStatusList') and conditionParamRef.workStatusList.size() > 0"> <if test="conditionParamRef.workStatus == null">
${_conditionType_} a.workStatus in ${_conditionType_} a.workStatus is null
<foreach collection="conditionParamRef.workStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('workStatusNotList') and conditionParamRef.workStatusNotList.size() > 0">
${_conditionType_} a.workStatus not in
<foreach collection="conditionParamRef.workStatusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('workStatusList') and conditionParamRef.workStatusList.size() > 0">
${_conditionType_} a.workStatus in
<foreach collection="conditionParamRef.workStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('workStatusNotList') and conditionParamRef.workStatusNotList.size() > 0">
${_conditionType_} a.workStatus not in
<foreach collection="conditionParamRef.workStatusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''"> <if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.createTime is null
</if> </if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''"> </if>
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if> </if>
<if test="conditionParamRef.containsKey('createUserId')"> <if test="conditionParamRef.createUserId == null">
<if test="conditionParamRef.createUserId != null "> ${_conditionType_} a.createUserId is null
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
<if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0"> </if>
${_conditionType_} a.createUserId in <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> ${_conditionType_} a.createUserId in
#{item} <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
</foreach> #{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0"> <if test="conditionParamRef.updateTime == null">
${_conditionType_} a.createUserId not in ${_conditionType_} a.updateTime is null
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> </if>
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<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('loginName')">
<if test="conditionParamRef.loginName != null and conditionParamRef.loginName != ''">
${_conditionType_} a.loginName like #{${_conditionParam_}.loginName}
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null"> <if test="conditionParamRef.loginName == null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd} ${_conditionType_} a.loginName is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('loginNameList') and conditionParamRef.loginNameList.size() > 0">
${_conditionType_} a.loginName in
<foreach collection="conditionParamRef.loginNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginNameNotList') and conditionParamRef.loginNameNotList.size() > 0">
${_conditionType_} a.loginName not in
<foreach collection="conditionParamRef.loginNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginPwd')">
<if test="conditionParamRef.containsKey('updateTime')"> <if test="conditionParamRef.loginPwd != null and conditionParamRef.loginPwd != ''">
<if test="conditionParamRef.updateTime != null "> ${_conditionType_} a.loginPwd like #{${_conditionParam_}.loginPwd}
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
<if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.loginPwd == null">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.loginPwd is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('loginPwdList') and conditionParamRef.loginPwdList.size() > 0">
${_conditionType_} a.loginPwd in
<foreach collection="conditionParamRef.loginPwdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginPwdNotList') and conditionParamRef.loginPwdNotList.size() > 0">
${_conditionType_} a.loginPwd not in
<foreach collection="conditionParamRef.loginPwdNotList" 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()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} ${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
<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('roomId')"> <if test="orderCol.containsKey('roomId')">
a.roomId a.roomId
<if test='orderCol.roomId != null and "DESC".equalsIgnoreCase(orderCol.roomId)'>DESC</if> <if test='orderCol.roomId != null and "DESC".equalsIgnoreCase(orderCol.roomId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('roomName')"> <if test="orderCol.containsKey('roomName')">
a.roomName a.roomName
<if test='orderCol.roomName != null and "DESC".equalsIgnoreCase(orderCol.roomName)'>DESC</if> <if test='orderCol.roomName != null and "DESC".equalsIgnoreCase(orderCol.roomName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deptName')"> <if test="orderCol.containsKey('deptName')">
a.deptName a.deptName
<if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if> <if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('name')"> <if test="orderCol.containsKey('name')">
a.name a.name
<if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if> <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('sex')"> <if test="orderCol.containsKey('sex')">
a.sex a.sex
<if test='orderCol.sex != null and "DESC".equalsIgnoreCase(orderCol.sex)'>DESC</if> <if test='orderCol.sex != null and "DESC".equalsIgnoreCase(orderCol.sex)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('userPost')"> <if test="orderCol.containsKey('userPost')">
a.userPost a.userPost
<if test='orderCol.userPost != null and "DESC".equalsIgnoreCase(orderCol.userPost)'>DESC</if> <if test='orderCol.userPost != null and "DESC".equalsIgnoreCase(orderCol.userPost)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('phone')"> <if test="orderCol.containsKey('phone')">
a.phone a.phone
<if test='orderCol.phone != null and "DESC".equalsIgnoreCase(orderCol.phone)'>DESC</if> <if test='orderCol.phone != null and "DESC".equalsIgnoreCase(orderCol.phone)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('mobile')"> <if test="orderCol.containsKey('mobile')">
a.mobile a.mobile
<if test='orderCol.mobile != null and "DESC".equalsIgnoreCase(orderCol.mobile)'>DESC</if> <if test='orderCol.mobile != null and "DESC".equalsIgnoreCase(orderCol.mobile)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('summary')"> <if test="orderCol.containsKey('summary')">
a.summary a.summary
<if test='orderCol.summary != null and "DESC".equalsIgnoreCase(orderCol.summary)'>DESC</if> <if test='orderCol.summary != null and "DESC".equalsIgnoreCase(orderCol.summary)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('photoPath')"> <if test="orderCol.containsKey('photoPath')">
a.photoPath a.photoPath
<if test='orderCol.photoPath != null and "DESC".equalsIgnoreCase(orderCol.photoPath)'>DESC</if> <if test='orderCol.photoPath != null and "DESC".equalsIgnoreCase(orderCol.photoPath)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('workStatus')"> <if test="orderCol.containsKey('workStatus')">
a.workStatus a.workStatus
<if test='orderCol.workStatus != null and "DESC".equalsIgnoreCase(orderCol.workStatus)'>DESC</if> <if test='orderCol.workStatus != null and "DESC".equalsIgnoreCase(orderCol.workStatus)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
a.createTime a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createUserId')"> <if test="orderCol.containsKey('createUserId')">
a.createUserId a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if> <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateTime')"> <if test="orderCol.containsKey('updateTime')">
a.updateTime a.updateTime
<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('loginName')">
a.loginName
<if test='orderCol.loginName != null and "DESC".equalsIgnoreCase(orderCol.loginName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('loginPwd')">
a.loginPwd
<if test='orderCol.loginPwd != null and "DESC".equalsIgnoreCase(orderCol.loginPwd)'>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