Skip to content

S
smart_gov_platform
Commit 4266f4c7 authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加动态列表查询接口

parent b09835a0
Hide whitespace changes
Inline Side-by-side
Showing with 631 additions and 367 deletions
base-manager/db/base_modules.sql
View file @ 4266f4c7
......@@ -288,41 +288,43 @@ CREATE TABLE mortals_sys_window_matter
-- 工作人员表
-- ----------------------------
DROP TABLE IF EXISTS `mortals_sys_workman`;
CREATE TABLE `mortals_sys_workman`
(
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '序号，主键，自增长',
`loginName` varchar(64) DEFAULT NULL COMMENT '登录用户名',
`loginPwd` varchar(255) DEFAULT NULL COMMENT '密码',
`deptId` bigint(20) DEFAULT NULL COMMENT '部门id号',
`deptName` varchar(64) DEFAULT NULL COMMENT '部门名称',
`windowId` bigint(20) DEFAULT NULL COMMENT '窗口id号',
`windowName` varchar(64) DEFAULT NULL COMMENT '窗口名称',
`siteId` bigint(20) DEFAULT NULL COMMENT '站点ID',
`siteName` varchar(255) DEFAULT NULL COMMENT '站点名称',
`name` varchar(64) DEFAULT NULL COMMENT '姓名',
`number` varchar(64) DEFAULT NULL COMMENT '工号',
`userpost` varchar(64) DEFAULT NULL COMMENT '职务',
`posttitle` varchar(64) DEFAULT NULL COMMENT '职称',
`politicalstatus` tinyint(2) DEFAULT '0' COMMENT '政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)',
`dangyuan` tinyint(2) DEFAULT '0' COMMENT '党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)',
`dangyuanext` varchar(64) DEFAULT NULL COMMENT '党员扩展',
`phone` varchar(64) DEFAULT NULL COMMENT '电话',
`mobile` varchar(64) DEFAULT NULL COMMENT '手机',
`starlevel` tinyint(2) DEFAULT NULL COMMENT '星级',
`summary` varchar(255) DEFAULT NULL COMMENT '个人简介',
`photoPath` varchar(255) DEFAULT NULL COMMENT '照片',
`duty` mediumtext COMMENT '岗位职责',
`promise` mediumtext COMMENT '服务承诺',
`business` mediumtext COMMENT '办理事项',
`online` tinyint(2) DEFAULT '1' COMMENT '是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）',
`modelIds` varchar(256) DEFAULT '' COMMENT '配置站点模块，逗号分隔',
`createTime` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间',
`createUserId` bigint(20) DEFAULT NULL COMMENT '创建用户',
`updateTime` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
`lastLoginTime` datetime DEFAULT NULL COMMENT '最后一次登录时间',
`lastLoginAddress` varchar(21) DEFAULT NULL COMMENT '最后一次登录地址',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='工作人员表';
CREATE TABLE mortals_sys_workman(
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`loginName` varchar(64) COMMENT '登录用户名',
`loginPwd` varchar(255) COMMENT '密码',
`deptId` bigint(20) COMMENT '部门id号',
`deptName` varchar(64) COMMENT '部门名称',
`windowId` bigint(20) COMMENT '窗口id号',
`windowName` varchar(64) COMMENT '窗口名称',
`siteId` bigint(20) COMMENT '站点ID',
`siteName` varchar(255) COMMENT '站点名称',
`name` varchar(64) COMMENT '姓名',
`number` varchar(64) COMMENT '工号',
`userpost` varchar(64) COMMENT '职务',
`posttitle` varchar(64) COMMENT '职称',
`politicalstatus` tinyint(2) DEFAULT '0' COMMENT '政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)',
`dangyuan` tinyint(2) DEFAULT '0' COMMENT '党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)',
`dangyuanext` varchar(64) COMMENT '党员扩展',
`idCard` varchar(32) COMMENT '身份证',
`phone` varchar(64) COMMENT '电话',
`mobile` varchar(64) COMMENT '手机',
`starlevel` tinyint(2) DEFAULT '0' COMMENT '星级',
`summary` varchar(255) COMMENT '个人简介',
`photoPath` varchar(255) COMMENT '照片',
`duty` mediumtext COMMENT '岗位职责',
`promise` mediumtext COMMENT '服务承诺',
`business` mediumtext COMMENT '办理事项',
`online` tinyint(2) DEFAULT '1' COMMENT '是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）',
`modelIds` varchar(256) COMMENT '配置站点模块，逗号分隔',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间',
`lastLoginTime` datetime COMMENT '最后一次登录时间',
`lastLoginAddress` varchar(21) COMMENT '最后一次登录地址',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='工作人员';
-- ----------------------------
-- 基础事项表
......
base-manager/doc/api.md
View file @ 4266f4c7
......@@ -5286,6 +5286,7 @@ data|object|数据对象|-
  politicalstatus|Integer|政治面貌 (0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)|-
  dangyuan|Integer|党员 (0.非党员，1.党员，2.党员示范岗，3.党员先锋岗，99.其它)|-
  dangyuanext|String|扩展信息|-
  idCard|String|身份证
  phone|String|电话|-
  mobile|String|手机|-
  modelIds|String|模块id,逗号分隔|-
......@@ -5365,6 +5366,7 @@ data|object|数据对象|-
 posttitle|String|职称|-
 politicalstatus|Integer|政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)|-
 dangyuan|Integer|党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)|-
 idCard|String|身份证
 phone|String|电话|-
 mobile|String|手机|-
 starlevel|Integer|星级|-
......@@ -5415,6 +5417,7 @@ userpost| String | 职务 | 是 |-
posttitle| String | 职称 | 是 |-
politicalstatus| Integer | 政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它) | 是 |-
dangyuan| Integer | 党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗，99.其它) | 是 |-
idCard|String|否|身份证
dangyuanext| String | 党员扩展 | 否 |-
phone| String | 电话 | 是 |-
mobile| String | 手机 | 是 |-
......
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppDatasetServiceImpl.java
View file @ 4266f4c7
......@@ -36,11 +36,6 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao
@Autowired
private AppInfoFieldService appInfoFieldService;
@Autowired
private AppService appService;
@Autowired
private AppVersionService appVersionService;
@Override
protected void saveAfter(AppDatasetEntity entity, Context context) throws AppException {
......@@ -54,9 +49,6 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao
appInfoFieldService.save(entity.getAppInfoFieldList());
}
//更新版本号
/* AppEntity appEntity = appService.get(entity.getAppId(), context);
saveOrUpdateAppVersion(appEntity, context);*/
super.saveAfter(entity, context);
}
......@@ -93,26 +85,4 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao
public Result<AppInfoFieldEntity> findCustomList(AppDatasetQuery appDatasetQuery, PageInfo pageInfo, Context context) throws AppException {
return this.dao.getCustomList(appDatasetQuery, pageInfo);
}
/* private void saveOrUpdateAppVersion(AppEntity appEntity, Context context) {
if (!ObjectUtils.isEmpty(appEntity)) {
String version = appEntity.getVersion();
String versionNum = StrUtil.subAfter(version, Constant.VERSION_PREFIX, false);
String newVersionNum = NumberUtil.add(versionNum, "0.1").setScale(1).toString();
AppVersionEntity appVersionEntity = new AppVersionEntity();
appVersionEntity.initAttrValue();
AppVersionEntity versionEntity = new AppVersionEntity();
versionEntity.initAttrValue();
versionEntity.setAppId(appEntity.getId());
versionEntity.setVersion(Constant.VERSION_PREFIX + newVersionNum);
versionEntity.setNotes("应用数据更新！");
versionEntity.setFileName(appEntity.getFileName());
versionEntity.setDistributeFilePath(appVersionEntity.getDistributeFilePath());
versionEntity.setCreateTime(new Date());
versionEntity.setCreateUserId(this.getContextUserId(context));
appVersionService.save(versionEntity, context);
appEntity.setVersion(versionEntity.getVersion());
appService.update(appEntity, context);
}
}*/
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java
View file @ 4266f4c7
......@@ -172,25 +172,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
if (!ObjectUtils.isEmpty(appInfoTempleteFieldCloneList)) {
appInfoTempleteFieldService.save(appInfoTempleteFieldCloneList, context);
}
}
//克隆版本历史
/* List<AppVersionEntity> appVersionEntities = appVersionService.find(new AppVersionQuery().appId(appEntity.getId()));
if (!ObjectUtils.isEmpty(appVersionEntities)) {
List<AppVersionEntity> appVersionCloneList = new ArrayList<>();
for (AppVersionEntity appVersionEntity : appVersionEntities) {
AppVersionEntity appVersionClone = new AppVersionEntity();
appVersionClone.initAttrValue();
BeanUtils.copyProperties(appVersionEntity, appVersionClone, BeanUtil.getNullPropertyNames(appVersionEntity));
appVersionClone.setAppId(appClone.getId());
appVersionCloneList.add(appVersionClone);
}
if (!ObjectUtils.isEmpty(appVersionCloneList)) {
appVersionService.save(appVersionCloneList, context);
}
}*/
}
}
}
......@@ -298,8 +280,6 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
@Override
protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
//级联删除 appids 相关数据
//删除模板属性
List<AppInfoTempleteFieldEntity> appInfoTempleteFieldDeleteList = appInfoTempleteFieldService.find(new AppInfoTempleteFieldQuery().appIdList(Arrays.asList(ids)));
if (!ObjectUtils.isEmpty(appInfoTempleteFieldDeleteList)) {
......@@ -324,69 +304,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
super.removeAfter(ids, context, result);
}
/* @Override
public int removeList(List<AppEntity> list, Context context) throws AppException {
return super.removeList(list, context);
}*/
public static void main(String[] args) {
AppEntity appEntity = new AppEntity();
appEntity.initAttrValue();
ArrayList<AppDatasetEntity> appDatasetEntities = new ArrayList<>();
AppDatasetEntity appDatasetEntity = new AppDatasetEntity();
appDatasetEntity.setAppId(0L);
appDatasetEntity.setId(1L);
appDatasetEntity.setCreateTime(new Date());
appDatasetEntity.setCreateUser("");
appDatasetEntity.setCreateUserName("");
appDatasetEntity.setGroupList(Lists.newArrayList());
appDatasetEntity.setCreateUserId(0L);
appDatasetEntity.setCreateUserDeptId(0L);
appDatasetEntity.setCreateUserDeptName("");
AppInfoFieldEntity appInfoFieldEntity = new AppInfoFieldEntity();
appInfoFieldEntity.setDatasetId(0L);
appInfoFieldEntity.setFieldCode("12313");
appInfoFieldEntity.setFieldName("1313");
appInfoFieldEntity.setFieldType("1");
appInfoFieldEntity.setDataType("1");
appInfoFieldEntity.setFieldValue("");
appInfoFieldEntity.setFieldLen(0);
appInfoFieldEntity.setFieldNull(0);
appInfoFieldEntity.setIsList(0);
appInfoFieldEntity.setFieldOrderNo(1);
appInfoFieldEntity.setRemark("");
appInfoFieldEntity.setId(0L);
appInfoFieldEntity.setColPickMode(0);
appInfoFieldEntity.setCreateTime(new Date());
appInfoFieldEntity.setCreateUser("");
appInfoFieldEntity.setCreateUserName("");
appInfoFieldEntity.setUpdateTime(new Date());
appInfoFieldEntity.setUpdateUser("");
appInfoFieldEntity.setUpdateUserName("");
ArrayList<AppInfoFieldEntity> appInfoFieldEntities = new ArrayList<>();
appInfoFieldEntities.add(appInfoFieldEntity);
appDatasetEntity.setAppInfoFieldList(appInfoFieldEntities);
appDatasetEntities.add(appDatasetEntity);
appEntity.setAppDatasetList(appDatasetEntities);
AppEntity appClone = new AppEntity();
BeanUtils.copyProperties(appEntity, appClone, BeanUtil.getNullPropertyNames(appEntity));
System.out.println(JSON.toJSONString(appClone));
System.out.println(NumberUtil.add("1.0", "0.1").setScale(1).toString());
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppVersionServiceImpl.java
View file @ 4266f4c7
......@@ -86,9 +86,7 @@ public class AppVersionServiceImpl extends AbstractCRUDServiceImpl<AppVersionDao
AppVersionEntity model = new AppVersionEntity();
model.setUsed(YesNoEnum.NO.getValue());
AppVersionQuery condition = new AppVersionQuery().appId(appVersionEntity.getAppId());
this.getDao().update(model,condition);
this.update(appVersionEntity, context);
......
base-manager/src/main/java/com/mortals/xhx/module/workman/model/WorkmanEntity.java
View file @ 4266f4c7
package com.mortals.xhx.module.workman.model;
import com.alibaba.fastjson.JSON;
import com.mortals.xhx.common.utils.BeanUtil;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.workman.model.vo.WorkmanVo;
import org.springframework.beans.BeanUtils;
/**
* 工作人员实体对象
*
* @author zxfei
* @date 2022-09-19
* @date 2022-12-23
*/
public class WorkmanEntity extends WorkmanVo {
private static final long serialVersionUID = 1L;
/**
* 登录用户名
*/
private String loginName;
/**
* 密码
*/
private String loginPwd;
/**
* 部门id号
*/
......@@ -63,6 +73,14 @@ public class WorkmanEntity extends WorkmanVo {
* 党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)
*/
private Integer dangyuan;
/**
* 党员扩展
*/
private String dangyuanext;
/**
* 身份证
*/
private String idCard;
/**
* 电话
*/
......@@ -100,21 +118,49 @@ public class WorkmanEntity extends WorkmanVo {
*/
private Integer online;
/**
* 用户登录名
* 配置站点模块，逗号分隔
*/
private String loginName;
private String modelIds;
/**
* 密码
* 最后一次登录时间
*/
private String loginPwd;
private Date lastLoginTime;
/**
* 党员扩展信息
* 最后一次登录地址
*/
private String dangyuanext;
private String lastLoginAddress;
public WorkmanEntity(){}
/**
* 获取 登录用户名
* @return String
*/
public String getLoginName(){
return loginName;
}
/**
* 设置 登录用户名
* @param loginName
*/
public void setLoginName(String loginName){
this.loginName = loginName;
}
/**
* 获取 密码
* @return String
*/
public String getLoginPwd(){
return loginPwd;
}
/**
* 设置 密码
* @param loginPwd
*/
public void setLoginPwd(String loginPwd){
this.loginPwd = loginPwd;
}
/**
* 获取 部门id号
* @return Long
......@@ -283,6 +329,34 @@ public class WorkmanEntity extends WorkmanVo {
public void setDangyuan(Integer dangyuan){
this.dangyuan = dangyuan;
}
/**
* 获取 党员扩展
* @return String
*/
public String getDangyuanext(){
return dangyuanext;
}
/**
* 设置 党员扩展
* @param dangyuanext
*/
public void setDangyuanext(String dangyuanext){
this.dangyuanext = dangyuanext;
}
/**
* 获取 身份证
* @return String
*/
public String getIdCard(){
return idCard;
}
/**
* 设置 身份证
* @param idCard
*/
public void setIdCard(String idCard){
this.idCard = idCard;
}
/**
* 获取 电话
* @return String
......@@ -410,46 +484,46 @@ public class WorkmanEntity extends WorkmanVo {
this.online = online;
}
/**
* 获取 用户登录名
* 获取 配置站点模块，逗号分隔
* @return String
*/
public String getLoginName(){
return loginName;
public String getModelIds(){
return modelIds;
}
/**
* 设置 用户登录名
* @param loginName
* 设置 配置站点模块，逗号分隔
* @param modelIds
*/
public void setLoginName(String loginName){
this.loginName = loginName;
public void setModelIds(String modelIds){
this.modelIds = modelIds;
}
/**
* 获取 密码
* @return String
* 获取 最后一次登录时间
* @return Date
*/
public String getLoginPwd(){
return loginPwd;
public Date getLastLoginTime(){
return lastLoginTime;
}
/**
* 设置 密码
* @param loginPwd
* 设置 最后一次登录时间
* @param lastLoginTime
*/
public void setLoginPwd(String loginPwd){
this.loginPwd = loginPwd;
public void setLastLoginTime(Date lastLoginTime){
this.lastLoginTime = lastLoginTime;
}
/**
* 获取 党员扩展信息
* 获取 最后一次登录地址
* @return String
*/
public String getDangyuanext(){
return dangyuanext;
public String getLastLoginAddress(){
return lastLoginAddress;
}
/**
* 设置 党员扩展信息
* @param dangyuanext
* 设置 最后一次登录地址
* @param lastLoginAddress
*/
public void setDangyuanext(String dangyuanext){
this.dangyuanext = dangyuanext;
public void setLastLoginAddress(String lastLoginAddress){
this.lastLoginAddress = lastLoginAddress;
}
......@@ -473,6 +547,8 @@ public class WorkmanEntity extends WorkmanVo {
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",loginName:").append(getLoginName());
sb.append(",loginPwd:").append(getLoginPwd());
sb.append(",deptId:").append(getDeptId());
sb.append(",deptName:").append(getDeptName());
sb.append(",windowId:").append(getWindowId());
......@@ -485,6 +561,8 @@ public class WorkmanEntity extends WorkmanVo {
sb.append(",posttitle:").append(getPosttitle());
sb.append(",politicalstatus:").append(getPoliticalstatus());
sb.append(",dangyuan:").append(getDangyuan());
sb.append(",dangyuanext:").append(getDangyuanext());
sb.append(",idCard:").append(getIdCard());
sb.append(",phone:").append(getPhone());
sb.append(",mobile:").append(getMobile());
sb.append(",starlevel:").append(getStarlevel());
......@@ -494,23 +572,27 @@ public class WorkmanEntity extends WorkmanVo {
sb.append(",promise:").append(getPromise());
sb.append(",business:").append(getBusiness());
sb.append(",online:").append(getOnline());
sb.append(",loginName:").append(getLoginName());
sb.append(",loginPwd:").append(getLoginPwd());
sb.append(",dangyuanext:").append(getDangyuanext());
sb.append(",modelIds:").append(getModelIds());
sb.append(",lastLoginTime:").append(getLastLoginTime());
sb.append(",lastLoginAddress:").append(getLastLoginAddress());
return sb.toString();
}
public void initAttrValue(){
this.deptId = 0L;
this.loginName = "";
this.loginPwd = "";
this.deptId = null;
this.deptName = "";
this.windowId = 0L;
this.windowId = null;
this.windowName = "";
this.siteId = 0L;
this.siteId = null;
this.siteName = "";
......@@ -526,6 +608,10 @@ public class WorkmanEntity extends WorkmanVo {
this.dangyuan = 0;
this.dangyuanext = "";
this.idCard = "";
this.phone = "";
this.mobile = "";
......@@ -536,34 +622,18 @@ public class WorkmanEntity extends WorkmanVo {
this.photoPath = "";
this.duty = "";
this.duty = null;
this.promise = "";
this.promise = null;
this.business = "";
this.business = null;
this.online = 1;
this.loginName = "";
this.loginPwd = "";
this.dangyuanext = "";
}
public static void main(String[] args) {
WorkmanEntity source = new WorkmanEntity();
source.setLoginName("admin");
source.setLoginPwd("123456");
WorkmanEntity workmanEntity = new WorkmanEntity();
workmanEntity.initAttrValue();
this.modelIds = "";
//BeanUtils.copyProperties(source,workmanEntity, BeanUtil.getNullPropertyNames(source));
BeanUtils.copyProperties(workmanEntity,source, BeanUtil.getNullPropertyNames(workmanEntity));
this.lastLoginTime = null;
System.out.println(JSON.toJSONString(source));
this.lastLoginAddress = null;
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/workman/model/WorkmanQuery.java
View file @ 4266f4c7
package com.mortals.xhx.module.workman.model;
import java.util.Date;
import java.util.List;
import com.mortals.xhx.module.workman.model.WorkmanEntity;
/**
* 工作人员查询对象
*
* @author zxfei
* @date 2022-09-19
* @date 2022-12-23
*/
public class WorkmanQuery extends WorkmanEntity {
/** 开始 序号，主键，自增长 */
......@@ -21,6 +22,12 @@ public class WorkmanQuery extends WorkmanEntity {
/** 序号，主键，自增长列表 */
private List <Long> idList;
/** 登录用户名 */
private List<String> loginNameList;
/** 密码 */
private List<String> loginPwdList;
/** 开始 部门id号 */
private Long deptIdStart;
......@@ -102,6 +109,12 @@ public class WorkmanQuery extends WorkmanEntity {
/** 党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)列表 */
private List <Integer> dangyuanList;
/** 党员扩展 */
private List<String> dangyuanextList;
/** 身份证 */
private List<String> idCardList;
/** 电话 */
private List<String> phoneList;
......@@ -147,6 +160,9 @@ public class WorkmanQuery extends WorkmanEntity {
/** 是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）列表 */
private List <Integer> onlineList;
/** 配置站点模块，逗号分隔 */
private List<String> modelIdsList;
/** 开始 创建时间 */
private String createTimeStart;
......@@ -171,14 +187,14 @@ public class WorkmanQuery extends WorkmanEntity {
/** 结束 修改时间 */
private String updateTimeEnd;
/** 用户登录名 */
private List<String> loginNameList;
/** 开始 最后一次登录时间 */
private String lastLoginTimeStart;
/** 密码 */
private List<String> loginPwdList;
/** 结束 最后一次登录时间 */
private String lastLoginTimeEnd;
/** 党员扩展信息 */
private List<String> dangyuanextList;
/** 最后一次登录地址 */
private List<String> lastLoginAddressList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<WorkmanQuery> orConditionList;
......@@ -252,6 +268,36 @@ public class WorkmanQuery extends WorkmanEntity {
this.idList = idList;
}
/**
* 获取 登录用户名
* @return loginNameList
*/
public List<String> getLoginNameList(){
return this.loginNameList;
}
/**
* 设置 登录用户名
* @param loginNameList
*/
public void setLoginNameList(List<String> loginNameList){
this.loginNameList = loginNameList;
}
/**
* 获取 密码
* @return loginPwdList
*/
public List<String> getLoginPwdList(){
return this.loginPwdList;
}
/**
* 设置 密码
* @param loginPwdList
*/
public void setLoginPwdList(List<String> loginPwdList){
this.loginPwdList = loginPwdList;
}
/**
* 获取 开始 部门id号
* @return deptIdStart
......@@ -677,6 +723,36 @@ public class WorkmanQuery extends WorkmanEntity {
this.dangyuanList = dangyuanList;
}
/**
* 获取 党员扩展
* @return dangyuanextList
*/
public List<String> getDangyuanextList(){
return this.dangyuanextList;
}
/**
* 设置 党员扩展
* @param dangyuanextList
*/
public void setDangyuanextList(List<String> dangyuanextList){
this.dangyuanextList = dangyuanextList;
}
/**
* 获取 身份证
* @return idCardList
*/
public List<String> getIdCardList(){
return this.idCardList;
}
/**
* 设置 身份证
* @param idCardList
*/
public void setIdCardList(List<String> idCardList){
this.idCardList = idCardList;
}
/**
* 获取 电话
* @return phoneList
......@@ -910,6 +986,21 @@ public class WorkmanQuery extends WorkmanEntity {
this.onlineList = onlineList;
}
/**
* 获取 配置站点模块，逗号分隔
* @return modelIdsList
*/
public List<String> getModelIdsList(){
return this.modelIdsList;
}
/**
* 设置 配置站点模块，逗号分隔
* @param modelIdsList
*/
public void setModelIdsList(List<String> modelIdsList){
this.modelIdsList = modelIdsList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
......@@ -1039,49 +1130,51 @@ public class WorkmanQuery extends WorkmanEntity {
}
/**
* 获取 用户登录名
* @return loginNameList
* 获取 开始 最后一次登录时间
* @return lastLoginTimeStart
*/
public List<String> getLoginNameList(){
return this.loginNameList;
public String getLastLoginTimeStart(){
return this.lastLoginTimeStart;
}
/**
* 设置 用户登录名
* @param loginNameList
* 设置 开始 最后一次登录时间
* @param lastLoginTimeStart
*/
public void setLoginNameList(List<String> loginNameList){
this.loginNameList = loginNameList;
public void setLastLoginTimeStart(String lastLoginTimeStart){
this.lastLoginTimeStart = lastLoginTimeStart;
}
/**
* 获取 密码
* @return loginPwdList
* 获取 结束 最后一次登录时间
* @return lastLoginTimeEnd
*/
public List<String> getLoginPwdList(){
return this.loginPwdList;
public String getLastLoginTimeEnd(){
return this.lastLoginTimeEnd;
}
/**
* 设置 密码
* @param loginPwdList
* 设置 结束 最后一次登录时间
* @param lastLoginTimeEnd
*/
public void setLoginPwdList(List<String> loginPwdList){
this.loginPwdList = loginPwdList;
public void setLastLoginTimeEnd(String lastLoginTimeEnd){
this.lastLoginTimeEnd = lastLoginTimeEnd;
}
/**
* 获取 党员扩展信息
* @return dangyuanextList
* 获取 最后一次登录地址
* @return lastLoginAddressList
*/
public List<String> getDangyuanextList(){
return this.dangyuanextList;
public List<String> getLastLoginAddressList(){
return this.lastLoginAddressList;
}
/**
* 设置 党员扩展信息
* @param dangyuanextList
* 设置 最后一次登录地址
* @param lastLoginAddressList
*/
public void setDangyuanextList(List<String> dangyuanextList){
this.dangyuanextList = dangyuanextList;
public void setLastLoginAddressList(List<String> lastLoginAddressList){
this.lastLoginAddressList = lastLoginAddressList;
}
/**
* 设置 序号，主键，自增长
......@@ -1128,6 +1221,44 @@ public class WorkmanQuery extends WorkmanEntity {
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;
}
/**
* 设置 部门id号
* @param deptId
......@@ -1487,6 +1618,44 @@ public class WorkmanQuery extends WorkmanEntity {
}
/**
* 设置 党员扩展
* @param dangyuanext
*/
public WorkmanQuery dangyuanext(String dangyuanext){
setDangyuanext(dangyuanext);
return this;
}
/**
* 设置 党员扩展
* @param dangyuanextList
*/
public WorkmanQuery dangyuanextList(List<String> dangyuanextList){
this.dangyuanextList = dangyuanextList;
return this;
}
/**
* 设置 身份证
* @param idCard
*/
public WorkmanQuery idCard(String idCard){
setIdCard(idCard);
return this;
}
/**
* 设置 身份证
* @param idCardList
*/
public WorkmanQuery idCardList(List<String> idCardList){
this.idCardList = idCardList;
return this;
}
/**
* 设置 电话
* @param phone
......@@ -1710,6 +1879,25 @@ public class WorkmanQuery extends WorkmanEntity {
}
/**
* 设置 配置站点模块，逗号分隔
* @param modelIds
*/
public WorkmanQuery modelIds(String modelIds){
setModelIds(modelIds);
return this;
}
/**
* 设置 配置站点模块，逗号分隔
* @param modelIdsList
*/
public WorkmanQuery modelIdsList(List<String> modelIdsList){
this.modelIdsList = modelIdsList;
return this;
}
/**
* 设置 创建用户
* @param createUserId
......@@ -1757,59 +1945,22 @@ public class WorkmanQuery extends WorkmanEntity {
/**
* 设置 用户登录名
* @param loginName
*/
public WorkmanQuery loginName(String loginName){
setLoginName(loginName);
return this;
}
/**
* 设置 用户登录名
* @param loginNameList
* 设置 最后一次登录地址
* @param lastLoginAddress
*/
public WorkmanQuery loginNameList(List<String> loginNameList){
this.loginNameList = loginNameList;
public WorkmanQuery lastLoginAddress(String lastLoginAddress){
setLastLoginAddress(lastLoginAddress);
return this;
}
/**
* 设置 密码
* @param loginPwd
* 设置 最后一次登录地址
* @param lastLoginAddressList
*/
public WorkmanQuery loginPwd(String loginPwd){
setLoginPwd(loginPwd);
return this;
}
/**
* 设置 密码
* @param loginPwdList
*/
public WorkmanQuery loginPwdList(List<String> loginPwdList){
this.loginPwdList = loginPwdList;
return this;
}
/**
* 设置 党员扩展信息
* @param dangyuanext
*/
public WorkmanQuery dangyuanext(String dangyuanext){
setDangyuanext(dangyuanext);
return this;
}
/**
* 设置 党员扩展信息
* @param dangyuanextList
*/
public WorkmanQuery dangyuanextList(List<String> dangyuanextList){
this.dangyuanextList = dangyuanextList;
public WorkmanQuery lastLoginAddressList(List<String> lastLoginAddressList){
this.lastLoginAddressList = lastLoginAddressList;
return this;
}
......
base-manager/src/main/resources/logback-spring.xml
View file @ 4266f4c7
......@@ -62,13 +62,12 @@
<appender-ref ref="fileError"/>
</logger>
<logger name="com.mortals.xhx.module" level="info" additivity="false">
<logger name="com.mortals.xhx.module" level="debug" additivity="false">
<appender-ref ref="console"/>
<appender-ref ref="fileInfo"/>
<appender-ref ref="fileError"/>
</logger>
<!-- <logger name="com.mortals.xhx.module">
<level value="debug"/>
</logger>-->
......
base-manager/src/main/resources/sqlmap/module/workman/WorkmanMapper.xml
View file @ 4266f4c7
......@@ -6,6 +6,8 @@
<!-- 字段和属性映射 -->
<resultMap type="WorkmanEntity" id="WorkmanEntity-Map">
<id property="id" column="id" />
<result property="loginName" column="loginName" />
<result property="loginPwd" column="loginPwd" />
<result property="deptId" column="deptId" />
<result property="deptName" column="deptName" />
<result property="windowId" column="windowId" />
......@@ -18,6 +20,8 @@
<result property="posttitle" column="posttitle" />
<result property="politicalstatus" column="politicalstatus" />
<result property="dangyuan" column="dangyuan" />
<result property="dangyuanext" column="dangyuanext" />
<result property="idCard" column="idCard" />
<result property="phone" column="phone" />
<result property="mobile" column="mobile" />
<result property="starlevel" column="starlevel" />
......@@ -27,12 +31,12 @@
<result property="promise" column="promise" />
<result property="business" column="business" />
<result property="online" column="online" />
<result property="modelIds" column="modelIds" />
<result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" />
<result property="loginName" column="loginName" />
<result property="loginPwd" column="loginPwd" />
<result property="dangyuanext" column="dangyuanext" />
<result property="lastLoginTime" column="lastLoginTime" />
<result property="lastLoginAddress" column="lastLoginAddress" />
</resultMap>
......@@ -43,6 +47,12 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id,
</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>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))">
a.deptId,
</if>
......@@ -79,6 +89,12 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dangyuan') or colPickMode == 1 and data.containsKey('dangyuan')))">
a.dangyuan,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dangyuanext') or colPickMode == 1 and data.containsKey('dangyuanext')))">
a.dangyuanext,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('idCard') or colPickMode == 1 and data.containsKey('idCard')))">
a.idCard,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('phone') or colPickMode == 1 and data.containsKey('phone')))">
a.phone,
</if>
......@@ -106,6 +122,9 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('online') or colPickMode == 1 and data.containsKey('online')))">
a.online,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelIds') or colPickMode == 1 and data.containsKey('modelIds')))">
a.modelIds,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime,
</if>
......@@ -115,32 +134,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginName') or colPickMode == 1 and data.containsKey('loginName')))">
a.loginName,
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lastLoginTime') or colPickMode == 1 and data.containsKey('lastLoginTime')))">
a.lastLoginTime,
</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>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dangyuanext') or colPickMode == 1 and data.containsKey('dangyuanext')))">
a.dangyuanext,
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lastLoginAddress') or colPickMode == 1 and data.containsKey('lastLoginAddress')))">
a.lastLoginAddress,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="WorkmanEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_workman
(deptId,deptName,windowId,windowName,siteId,siteName,name,number,userpost,posttitle,politicalstatus,dangyuan,phone,mobile,starlevel,summary,photoPath,duty,promise,business,online,createTime,createUserId,updateTime,loginName,loginPwd,dangyuanext)
(loginName,loginPwd,deptId,deptName,windowId,windowName,siteId,siteName,name,number,userpost,posttitle,politicalstatus,dangyuan,dangyuanext,idCard,phone,mobile,starlevel,summary,photoPath,duty,promise,business,online,modelIds,createTime,createUserId,updateTime,lastLoginTime,lastLoginAddress)
VALUES
(#{deptId},#{deptName},#{windowId},#{windowName},#{siteId},#{siteName},#{name},#{number},#{userpost},#{posttitle},#{politicalstatus},#{dangyuan},#{phone},#{mobile},#{starlevel},#{summary},#{photoPath},#{duty},#{promise},#{business},#{online},#{createTime},#{createUserId},#{updateTime},#{loginName},#{loginPwd},#{dangyuanext})
(#{loginName},#{loginPwd},#{deptId},#{deptName},#{windowId},#{windowName},#{siteId},#{siteName},#{name},#{number},#{userpost},#{posttitle},#{politicalstatus},#{dangyuan},#{dangyuanext},#{idCard},#{phone},#{mobile},#{starlevel},#{summary},#{photoPath},#{duty},#{promise},#{business},#{online},#{modelIds},#{createTime},#{createUserId},#{updateTime},#{lastLoginTime},#{lastLoginAddress})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_workman
(deptId,deptName,windowId,windowName,siteId,siteName,name,number,userpost,posttitle,politicalstatus,dangyuan,phone,mobile,starlevel,summary,photoPath,duty,promise,business,online,createTime,createUserId,updateTime,loginName,loginPwd,dangyuanext)
(loginName,loginPwd,deptId,deptName,windowId,windowName,siteId,siteName,name,number,userpost,posttitle,politicalstatus,dangyuan,dangyuanext,idCard,phone,mobile,starlevel,summary,photoPath,duty,promise,business,online,modelIds,createTime,createUserId,updateTime,lastLoginTime,lastLoginAddress)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.deptId},#{item.deptName},#{item.windowId},#{item.windowName},#{item.siteId},#{item.siteName},#{item.name},#{item.number},#{item.userpost},#{item.posttitle},#{item.politicalstatus},#{item.dangyuan},#{item.phone},#{item.mobile},#{item.starlevel},#{item.summary},#{item.photoPath},#{item.duty},#{item.promise},#{item.business},#{item.online},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.loginName},#{item.loginPwd},#{item.dangyuanext})
(#{item.loginName},#{item.loginPwd},#{item.deptId},#{item.deptName},#{item.windowId},#{item.windowName},#{item.siteId},#{item.siteName},#{item.name},#{item.number},#{item.userpost},#{item.posttitle},#{item.politicalstatus},#{item.dangyuan},#{item.dangyuanext},#{item.idCard},#{item.phone},#{item.mobile},#{item.starlevel},#{item.summary},#{item.photoPath},#{item.duty},#{item.promise},#{item.business},#{item.online},#{item.modelIds},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.lastLoginTime},#{item.lastLoginAddress})
</foreach>
</insert>
......@@ -150,6 +166,12 @@
update mortals_sys_workman as a
set
<trim suffixOverrides="," suffix="">
<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>
<if test="(colPickMode==0 and data.containsKey('deptId')) or (colPickMode==1 and !data.containsKey('deptId'))">
a.deptId=#{data.deptId},
</if>
......@@ -201,6 +223,12 @@
<if test="(colPickMode==0 and data.containsKey('dangyuanIncrement')) or (colPickMode==1 and !data.containsKey('dangyuanIncrement'))">
a.dangyuan=ifnull(a.dangyuan,0) + #{data.dangyuanIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('dangyuanext')) or (colPickMode==1 and !data.containsKey('dangyuanext'))">
a.dangyuanext=#{data.dangyuanext},
</if>
<if test="(colPickMode==0 and data.containsKey('idCard')) or (colPickMode==1 and !data.containsKey('idCard'))">
a.idCard=#{data.idCard},
</if>
<if test="(colPickMode==0 and data.containsKey('phone')) or (colPickMode==1 and !data.containsKey('phone'))">
a.phone=#{data.phone},
</if>
......@@ -234,6 +262,9 @@
<if test="(colPickMode==0 and data.containsKey('onlineIncrement')) or (colPickMode==1 and !data.containsKey('onlineIncrement'))">
a.online=ifnull(a.online,0) + #{data.onlineIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('modelIds')) or (colPickMode==1 and !data.containsKey('modelIds'))">
a.modelIds=#{data.modelIds},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime},
</if>
......@@ -246,14 +277,11 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('loginName')) or (colPickMode==1 and !data.containsKey('loginName'))">
a.loginName=#{data.loginName},
<if test="(colPickMode==0 and data.containsKey('lastLoginTime')) or (colPickMode==1 and !data.containsKey('lastLoginTime'))">
a.lastLoginTime=#{data.lastLoginTime},
</if>
<if test="(colPickMode==0 and data.containsKey('loginPwd')) or (colPickMode==1 and !data.containsKey('loginPwd'))">
a.loginPwd=#{data.loginPwd},
</if>
<if test="(colPickMode==0 and data.containsKey('dangyuanext')) or (colPickMode==1 and !data.containsKey('dangyuanext'))">
a.dangyuanext=#{data.dangyuanext},
<if test="(colPickMode==0 and data.containsKey('lastLoginAddress')) or (colPickMode==1 and !data.containsKey('lastLoginAddress'))">
a.lastLoginAddress=#{data.lastLoginAddress},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
......@@ -267,6 +295,20 @@
<update id="updateBatch" parameterType="paramDto">
update mortals_sys_workman as a
<trim prefix="set" suffixOverrides=",">
<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 prefix="deptId=(case" suffix="ELSE deptId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -376,6 +418,20 @@
</choose>
</foreach>
</trim>
<trim prefix="dangyuanext=(case" suffix="ELSE dangyuanext end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('dangyuanext')) or (colPickMode==1 and !item.containsKey('dangyuanext'))">
when a.id=#{item.id} then #{item.dangyuanext}
</if>
</foreach>
</trim>
<trim prefix="idCard=(case" suffix="ELSE idCard end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('idCard')) or (colPickMode==1 and !item.containsKey('idCard'))">
when a.id=#{item.id} then #{item.idCard}
</if>
</foreach>
</trim>
<trim prefix="phone=(case" suffix="ELSE phone end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('phone')) or (colPickMode==1 and !item.containsKey('phone'))">
......@@ -449,6 +505,13 @@
</choose>
</foreach>
</trim>
<trim prefix="modelIds=(case" suffix="ELSE modelIds end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('modelIds')) or (colPickMode==1 and !item.containsKey('modelIds'))">
when a.id=#{item.id} then #{item.modelIds}
</if>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
......@@ -475,24 +538,17 @@
</if>
</foreach>
</trim>
<trim prefix="loginName=(case" suffix="ELSE loginName end),">
<trim prefix="lastLoginTime=(case" suffix="ELSE lastLoginTime 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 test="(colPickMode==0 and item.containsKey('lastLoginTime')) or (colPickMode==1 and !item.containsKey('lastLoginTime'))">
when a.id=#{item.id} then #{item.lastLoginTime}
</if>
</foreach>
</trim>
<trim prefix="loginPwd=(case" suffix="ELSE loginPwd end),">
<trim prefix="lastLoginAddress=(case" suffix="ELSE lastLoginAddress 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 prefix="dangyuanext=(case" suffix="ELSE dangyuanext end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('dangyuanext')) or (colPickMode==1 and !item.containsKey('dangyuanext'))">
when a.id=#{item.id} then #{item.dangyuanext}
<if test="(colPickMode==0 and item.containsKey('lastLoginAddress')) or (colPickMode==1 and !item.containsKey('lastLoginAddress'))">
when a.id=#{item.id} then #{item.lastLoginAddress}
</if>
</foreach>
</trim>
......@@ -519,6 +575,21 @@
#{item}
</foreach>
</delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_sys_workman where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_sys_workman where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_sys_workman as a
......@@ -618,6 +689,36 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('loginName')">
<if test="conditionParamRef.loginName != null and conditionParamRef.loginName != ''">
${_conditionType_} a.loginName like #{${_conditionParam_}.loginName}
</if>
<if test="conditionParamRef.loginName == null">
${_conditionType_} a.loginName is null
</if>
</if>
<if test="conditionParamRef.containsKey('loginNameList')">
${_conditionType_} a.loginName in
<foreach collection="conditionParamRef.loginNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginPwd')">
<if test="conditionParamRef.loginPwd != null and conditionParamRef.loginPwd != ''">
${_conditionType_} a.loginPwd like #{${_conditionParam_}.loginPwd}
</if>
<if test="conditionParamRef.loginPwd == null">
${_conditionType_} a.loginPwd is null
</if>
</if>
<if test="conditionParamRef.containsKey('loginPwdList')">
${_conditionType_} a.loginPwd in
<foreach collection="conditionParamRef.loginPwdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptId')">
<if test="conditionParamRef.deptId != null ">
${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
......@@ -829,6 +930,36 @@
</if>
<if test="conditionParamRef.containsKey('dangyuanext')">
<if test="conditionParamRef.dangyuanext != null and conditionParamRef.dangyuanext != ''">
${_conditionType_} a.dangyuanext like #{${_conditionParam_}.dangyuanext}
</if>
<if test="conditionParamRef.dangyuanext == null">
${_conditionType_} a.dangyuanext is null
</if>
</if>
<if test="conditionParamRef.containsKey('dangyuanextList')">
${_conditionType_} a.dangyuanext in
<foreach collection="conditionParamRef.dangyuanextList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idCard')">
<if test="conditionParamRef.idCard != null and conditionParamRef.idCard != ''">
${_conditionType_} a.idCard like #{${_conditionParam_}.idCard}
</if>
<if test="conditionParamRef.idCard == null">
${_conditionType_} a.idCard is null
</if>
</if>
<if test="conditionParamRef.containsKey('idCardList')">
${_conditionType_} a.idCard in
<foreach collection="conditionParamRef.idCardList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('phone')">
<if test="conditionParamRef.phone != null and conditionParamRef.phone != ''">
${_conditionType_} a.phone like #{${_conditionParam_}.phone}
......@@ -976,6 +1107,21 @@
</if>
<if test="conditionParamRef.containsKey('modelIds')">
<if test="conditionParamRef.modelIds != null and conditionParamRef.modelIds != ''">
${_conditionType_} a.modelIds like #{${_conditionParam_}.modelIds}
</if>
<if test="conditionParamRef.modelIds == null">
${_conditionType_} a.modelIds is null
</if>
</if>
<if test="conditionParamRef.containsKey('modelIdsList')">
${_conditionType_} a.modelIds in
<foreach collection="conditionParamRef.modelIdsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
......@@ -1027,47 +1173,32 @@
${_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 test="conditionParamRef.containsKey('lastLoginTime')">
<if test="conditionParamRef.lastLoginTime != null ">
${_conditionType_} a.lastLoginTime = #{${_conditionParam_}.lastLoginTime}
</if>
<if test="conditionParamRef.loginName == null">
${_conditionType_} a.loginName is null
<if test="conditionParamRef.lastLoginTime == null">
${_conditionType_} a.lastLoginTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('loginNameList')">
${_conditionType_} a.loginName in
<foreach collection="conditionParamRef.loginNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
<if test="conditionParamRef.containsKey('lastLoginTimeStart') and conditionParamRef.lastLoginTimeStart != null and conditionParamRef.lastLoginTimeStart!=''">
${_conditionType_} a.lastLoginTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.lastLoginTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('loginPwd')">
<if test="conditionParamRef.loginPwd != null and conditionParamRef.loginPwd != ''">
${_conditionType_} a.loginPwd like #{${_conditionParam_}.loginPwd}
</if>
<if test="conditionParamRef.loginPwd == null">
${_conditionType_} a.loginPwd is null
</if>
</if>
<if test="conditionParamRef.containsKey('loginPwdList')">
${_conditionType_} a.loginPwd in
<foreach collection="conditionParamRef.loginPwdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
<if test="conditionParamRef.containsKey('lastLoginTimeEnd') and conditionParamRef.lastLoginTimeEnd != null and conditionParamRef.lastLoginTimeEnd!=''">
${_conditionType_} a.lastLoginTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.lastLoginTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('dangyuanext')">
<if test="conditionParamRef.dangyuanext != null and conditionParamRef.dangyuanext != ''">
${_conditionType_} a.dangyuanext like #{${_conditionParam_}.dangyuanext}
<if test="conditionParamRef.containsKey('lastLoginAddress')">
<if test="conditionParamRef.lastLoginAddress != null and conditionParamRef.lastLoginAddress != ''">
${_conditionType_} a.lastLoginAddress like #{${_conditionParam_}.lastLoginAddress}
</if>
<if test="conditionParamRef.dangyuanext == null">
${_conditionType_} a.dangyuanext is null
<if test="conditionParamRef.lastLoginAddress == null">
${_conditionType_} a.lastLoginAddress is null
</if>
</if>
<if test="conditionParamRef.containsKey('dangyuanextList')">
${_conditionType_} a.dangyuanext in
<foreach collection="conditionParamRef.dangyuanextList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.containsKey('lastLoginAddressList')">
${_conditionType_} a.lastLoginAddress in
<foreach collection="conditionParamRef.lastLoginAddressList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
......@@ -1089,6 +1220,16 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</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>
<if test="orderCol.containsKey('deptId')">
a.deptId
<if test='orderCol.deptId != null and "DESC".equalsIgnoreCase(orderCol.deptId)'>DESC</if>
......@@ -1149,6 +1290,16 @@
<if test='orderCol.dangyuan != null and "DESC".equalsIgnoreCase(orderCol.dangyuan)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('dangyuanext')">
a.dangyuanext
<if test='orderCol.dangyuanext != null and "DESC".equalsIgnoreCase(orderCol.dangyuanext)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('idCard')">
a.idCard
<if test='orderCol.idCard != null and "DESC".equalsIgnoreCase(orderCol.idCard)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('phone')">
a.phone
<if test='orderCol.phone != null and "DESC".equalsIgnoreCase(orderCol.phone)'>DESC</if>
......@@ -1194,6 +1345,11 @@
<if test='orderCol.online != null and "DESC".equalsIgnoreCase(orderCol.online)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('modelIds')">
a.modelIds
<if test='orderCol.modelIds != null and "DESC".equalsIgnoreCase(orderCol.modelIds)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
......@@ -1209,19 +1365,14 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('loginName')">
a.loginName
<if test='orderCol.loginName != null and "DESC".equalsIgnoreCase(orderCol.loginName)'>DESC</if>
<if test="orderCol.containsKey('lastLoginTime')">
a.lastLoginTime
<if test='orderCol.lastLoginTime != null and "DESC".equalsIgnoreCase(orderCol.lastLoginTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('loginPwd')">
a.loginPwd
<if test='orderCol.loginPwd != null and "DESC".equalsIgnoreCase(orderCol.loginPwd)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('dangyuanext')">
a.dangyuanext
<if test='orderCol.dangyuanext != null and "DESC".equalsIgnoreCase(orderCol.dangyuanext)'>DESC</if>
<if test="orderCol.containsKey('lastLoginAddress')">
a.lastLoginAddress
<if test='orderCol.lastLoginAddress != null and "DESC".equalsIgnoreCase(orderCol.lastLoginAddress)'>DESC</if>
,
</if>
</trim>
......
base-manager/src/test/java/com/mortals/httpclient/app/AppDatasetController.http
View file @ 4266f4c7
......@@ -19,7 +19,9 @@ Authorization: {{authToken}}
Content-Type: application/json
{
"appId":1,
"appId":20,
"fieldName": "标题",
"fieldValue": "管理办法",
"page":1,
"size":10
}
......
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