Skip to content

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

添加窗口无人值守

parent 179b1589
Show whitespace changes
Inline Side-by-side
Showing with 2014 additions and 1073 deletions
base-manager/db/add.sql 0 → 100644
View file @ ea0c43ae
-- ----------------------------
2023-2-21
-- ----------------------------
ALTER TABLE mortals_sys_window ADD COLUMN `duty` tinyint (1) COMMENT '无人值守(1.是，0.否)' AFTER hongqi;
ALTER TABLE mortals_sys_window ADD COLUMN `dutyContent` varchar (256) COMMENT '显示内容' AFTER duty;
ALTER TABLE mortals_sys_window ADD COLUMN `dutyEnglish` varchar (256) COMMENT '显示英文' AFTER dutyContent;
base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowEntity.java
View file @ ea0c43ae
......@@ -12,7 +12,7 @@ import com.mortals.xhx.module.window.model.vo.WindowVo;
* 站点部门窗口实体对象
*
* @author zxfei
* @date 2022-01-12
* @date 2023-02-21
*/
public class WindowEntity extends WindowVo {
......@@ -58,6 +58,18 @@ public class WindowEntity extends WindowVo {
* 红旗窗口 (1.是，0.否)
*/
private Integer hongqi;
/**
* 无人值守(1.是，)
*/
private Integer duty;
/**
* 显示内容
*/
private String dutyContent;
/**
* 显示英文
*/
private String dutyEnglish;
/**
* 备注
*/
......@@ -255,6 +267,60 @@ public class WindowEntity extends WindowVo {
this.hongqi = hongqi;
}
/**
* 获取 无人值守(1.是，)
*
* @return Integer
*/
public Integer getDuty() {
return duty;
}
/**
* 设置 无人值守(1.是，)
*
* @param duty
*/
public void setDuty(Integer duty) {
this.duty = duty;
}
/**
* 获取 显示内容
*
* @return String
*/
public String getDutyContent() {
return dutyContent;
}
/**
* 设置 显示内容
*
* @param dutyContent
*/
public void setDutyContent(String dutyContent) {
this.dutyContent = dutyContent;
}
/**
* 获取 显示英文
*
* @return String
*/
public String getDutyEnglish() {
return dutyEnglish;
}
/**
* 设置 显示英文
*
* @param dutyEnglish
*/
public void setDutyEnglish(String dutyEnglish) {
this.dutyEnglish = dutyEnglish;
}
/**
* 获取 备注
*
......@@ -339,6 +405,9 @@ public class WindowEntity extends WindowVo {
sb.append(",englishRegion:").append(getEnglishRegion());
sb.append(",fromnum:").append(getFromnum());
sb.append(",hongqi:").append(getHongqi());
sb.append(",duty:").append(getDuty());
sb.append(",dutyContent:").append(getDutyContent());
sb.append(",dutyEnglish:").append(getDutyEnglish());
sb.append(",summary:").append(getSummary());
sb.append(",building:").append(getBuilding());
sb.append(",level:").append(getLevel());
......@@ -351,7 +420,7 @@ public class WindowEntity extends WindowVo {
this.siteName = "";
this.deptId = 0L;
this.deptId = null;
this.deptName = "";
......@@ -367,6 +436,12 @@ public class WindowEntity extends WindowVo {
this.hongqi = 1;
this.duty = 0;
this.dutyContent = "";
this.dutyEnglish = "";
this.summary = "";
this.building = 1;
......
base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowQuery.java
View file @ ea0c43ae
......@@ -3,11 +3,11 @@ package com.mortals.xhx.module.window.model;
import java.util.List;
import com.mortals.xhx.module.window.model.WindowEntity;
/**
* 站点部门窗口查询对象
*
* @author zxfei
* @date 2022-01-12
*/
* 站点部门窗口查询对象
*
* @author zxfei
* @date 2023-02-21
*/
public class WindowQuery extends WindowEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -21,6 +21,9 @@ public class WindowQuery extends WindowEntity {
/** 序号，主键，自增长列表 */
private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 站点ID */
private Long siteIdStart;
......@@ -33,9 +36,14 @@ public class WindowQuery extends WindowEntity {
/** 站点ID列表 */
private List <Long> siteIdList;
/** 站点ID排除列表 */
private List <Long> siteIdNotList;
/** 站点名称 */
private List<String> siteNameList;
/** 站点名称排除列表 */
private List <String> siteNameNotList;
/** 开始 部门ID */
private Long deptIdStart;
......@@ -48,24 +56,39 @@ public class WindowQuery extends WindowEntity {
/** 部门ID列表 */
private List <Long> deptIdList;
/** 部门ID排除列表 */
private List <Long> deptIdNotList;
/** 部门名称 */
private List<String> deptNameList;
/** 部门名称排除列表 */
private List <String> deptNameNotList;
/** 窗口名称 */
private List<String> nameList;
/** 窗口名称排除列表 */
private List <String> nameNotList;
/** 英语窗口名 */
private List<String> englishNameList;
/** 英语窗口名排除列表 */
private List <String> englishNameNotList;
/** 区域 */
private List<String> regionList;
/** 区域排除列表 */
private List <String> regionNotList;
/** 英语区域 */
private List<String> englishRegionList;
/** 英语区域排除列表 */
private List <String> englishRegionNotList;
/** 窗口编号 */
private List<String> fromnumList;
/** 窗口编号排除列表 */
private List <String> fromnumNotList;
/** 开始 红旗窗口 (1.是，0.否) */
private Integer hongqiStart;
......@@ -78,9 +101,39 @@ public class WindowQuery extends WindowEntity {
/** 红旗窗口 (1.是，0.否)列表 */
private List <Integer> hongqiList;
/** 红旗窗口 (1.是，0.否)排除列表 */
private List <Integer> hongqiNotList;
/** 开始 无人值守(1.是，) */
private Integer dutyStart;
/** 结束 无人值守(1.是，) */
private Integer dutyEnd;
/** 增加 无人值守(1.是，) */
private Integer dutyIncrement;
/** 无人值守(1.是，)列表 */
private List <Integer> dutyList;
/** 无人值守(1.是，)排除列表 */
private List <Integer> dutyNotList;
/** 显示内容 */
private List<String> dutyContentList;
/** 显示内容排除列表 */
private List <String> dutyContentNotList;
/** 显示英文 */
private List<String> dutyEnglishList;
/** 显示英文排除列表 */
private List <String> dutyEnglishNotList;
/** 备注 */
private List<String> summaryList;
/** 备注排除列表 */
private List <String> summaryNotList;
/** 开始 楼栋 */
private Integer buildingStart;
......@@ -93,6 +146,9 @@ public class WindowQuery extends WindowEntity {
/** 楼栋列表 */
private List <Integer> buildingList;
/** 楼栋排除列表 */
private List <Integer> buildingNotList;
/** 开始 楼层 */
private Integer levelStart;
......@@ -105,6 +161,9 @@ public class WindowQuery extends WindowEntity {
/** 楼层列表 */
private List <Integer> levelList;
/** 楼层排除列表 */
private List <Integer> levelNotList;
/** 开始 创建时间 */
private String createTimeStart;
......@@ -123,6 +182,9 @@ public class WindowQuery extends WindowEntity {
/** 创建用户列表 */
private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 修改时间 */
private String updateTimeStart;
......@@ -201,6 +263,23 @@ public class WindowQuery extends WindowEntity {
this.idList = idList;
}
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/**
* 获取 开始 站点ID
* @return siteIdStart
......@@ -265,6 +344,23 @@ public class WindowQuery extends WindowEntity {
this.siteIdList = siteIdList;
}
/**
* 获取 站点ID
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点ID
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 获取 站点名称
* @return siteNameList
......@@ -280,6 +376,23 @@ public class WindowQuery extends WindowEntity {
public void setSiteNameList(List<String> siteNameList){
this.siteNameList = siteNameList;
}
/**
* 获取 站点名称
* @return siteNameNotList
*/
public List<String> getSiteNameNotList(){
return this.siteNameNotList;
}
/**
* 设置 站点名称
* @param siteNameNotList
*/
public void setSiteNameNotList(List<String> siteNameNotList){
this.siteNameNotList = siteNameNotList;
}
/**
* 获取 开始 部门ID
* @return deptIdStart
......@@ -344,6 +457,23 @@ public class WindowQuery extends WindowEntity {
this.deptIdList = deptIdList;
}
/**
* 获取 部门ID
* @return deptIdNotList
*/
public List<Long> getDeptIdNotList(){
return this.deptIdNotList;
}
/**
* 设置 部门ID
* @param deptIdNotList
*/
public void setDeptIdNotList(List<Long> deptIdNotList){
this.deptIdNotList = deptIdNotList;
}
/**
* 获取 部门名称
* @return deptNameList
......@@ -359,6 +489,23 @@ public class WindowQuery extends WindowEntity {
public void setDeptNameList(List<String> deptNameList){
this.deptNameList = deptNameList;
}
/**
* 获取 部门名称
* @return deptNameNotList
*/
public List<String> getDeptNameNotList(){
return this.deptNameNotList;
}
/**
* 设置 部门名称
* @param deptNameNotList
*/
public void setDeptNameNotList(List<String> deptNameNotList){
this.deptNameNotList = deptNameNotList;
}
/**
* 获取 窗口名称
* @return nameList
......@@ -374,6 +521,23 @@ public class WindowQuery extends WindowEntity {
public void setNameList(List<String> nameList){
this.nameList = nameList;
}
/**
* 获取 窗口名称
* @return nameNotList
*/
public List<String> getNameNotList(){
return this.nameNotList;
}
/**
* 设置 窗口名称
* @param nameNotList
*/
public void setNameNotList(List<String> nameNotList){
this.nameNotList = nameNotList;
}
/**
* 获取 英语窗口名
* @return englishNameList
......@@ -389,6 +553,23 @@ public class WindowQuery extends WindowEntity {
public void setEnglishNameList(List<String> englishNameList){
this.englishNameList = englishNameList;
}
/**
* 获取 英语窗口名
* @return englishNameNotList
*/
public List<String> getEnglishNameNotList(){
return this.englishNameNotList;
}
/**
* 设置 英语窗口名
* @param englishNameNotList
*/
public void setEnglishNameNotList(List<String> englishNameNotList){
this.englishNameNotList = englishNameNotList;
}
/**
* 获取 区域
* @return regionList
......@@ -404,6 +585,23 @@ public class WindowQuery extends WindowEntity {
public void setRegionList(List<String> regionList){
this.regionList = regionList;
}
/**
* 获取 区域
* @return regionNotList
*/
public List<String> getRegionNotList(){
return this.regionNotList;
}
/**
* 设置 区域
* @param regionNotList
*/
public void setRegionNotList(List<String> regionNotList){
this.regionNotList = regionNotList;
}
/**
* 获取 英语区域
* @return englishRegionList
......@@ -419,6 +617,23 @@ public class WindowQuery extends WindowEntity {
public void setEnglishRegionList(List<String> englishRegionList){
this.englishRegionList = englishRegionList;
}
/**
* 获取 英语区域
* @return englishRegionNotList
*/
public List<String> getEnglishRegionNotList(){
return this.englishRegionNotList;
}
/**
* 设置 英语区域
* @param englishRegionNotList
*/
public void setEnglishRegionNotList(List<String> englishRegionNotList){
this.englishRegionNotList = englishRegionNotList;
}
/**
* 获取 窗口编号
* @return fromnumList
......@@ -434,6 +649,23 @@ public class WindowQuery extends WindowEntity {
public void setFromnumList(List<String> fromnumList){
this.fromnumList = fromnumList;
}
/**
* 获取 窗口编号
* @return fromnumNotList
*/
public List<String> getFromnumNotList(){
return this.fromnumNotList;
}
/**
* 设置 窗口编号
* @param fromnumNotList
*/
public void setFromnumNotList(List<String> fromnumNotList){
this.fromnumNotList = fromnumNotList;
}
/**
* 获取 开始 红旗窗口 (1.是，0.否)
* @return hongqiStart
......@@ -498,6 +730,168 @@ public class WindowQuery extends WindowEntity {
this.hongqiList = hongqiList;
}
/**
* 获取 红旗窗口 (1.是，0.否)
* @return hongqiNotList
*/
public List<Integer> getHongqiNotList(){
return this.hongqiNotList;
}
/**
* 设置 红旗窗口 (1.是，0.否)
* @param hongqiNotList
*/
public void setHongqiNotList(List<Integer> hongqiNotList){
this.hongqiNotList = hongqiNotList;
}
/**
* 获取 开始 无人值守(1.是，)
* @return dutyStart
*/
public Integer getDutyStart(){
return this.dutyStart;
}
/**
* 设置 开始 无人值守(1.是，)
* @param dutyStart
*/
public void setDutyStart(Integer dutyStart){
this.dutyStart = dutyStart;
}
/**
* 获取 结束 无人值守(1.是，)
* @return $dutyEnd
*/
public Integer getDutyEnd(){
return this.dutyEnd;
}
/**
* 设置 结束 无人值守(1.是，)
* @param dutyEnd
*/
public void setDutyEnd(Integer dutyEnd){
this.dutyEnd = dutyEnd;
}
/**
* 获取 增加 无人值守(1.是，)
* @return dutyIncrement
*/
public Integer getDutyIncrement(){
return this.dutyIncrement;
}
/**
* 设置 增加 无人值守(1.是，)
* @param dutyIncrement
*/
public void setDutyIncrement(Integer dutyIncrement){
this.dutyIncrement = dutyIncrement;
}
/**
* 获取 无人值守(1.是，)
* @return dutyList
*/
public List<Integer> getDutyList(){
return this.dutyList;
}
/**
* 设置 无人值守(1.是，)
* @param dutyList
*/
public void setDutyList(List<Integer> dutyList){
this.dutyList = dutyList;
}
/**
* 获取 无人值守(1.是，)
* @return dutyNotList
*/
public List<Integer> getDutyNotList(){
return this.dutyNotList;
}
/**
* 设置 无人值守(1.是，)
* @param dutyNotList
*/
public void setDutyNotList(List<Integer> dutyNotList){
this.dutyNotList = dutyNotList;
}
/**
* 获取 显示内容
* @return dutyContentList
*/
public List<String> getDutyContentList(){
return this.dutyContentList;
}
/**
* 设置 显示内容
* @param dutyContentList
*/
public void setDutyContentList(List<String> dutyContentList){
this.dutyContentList = dutyContentList;
}
/**
* 获取 显示内容
* @return dutyContentNotList
*/
public List<String> getDutyContentNotList(){
return this.dutyContentNotList;
}
/**
* 设置 显示内容
* @param dutyContentNotList
*/
public void setDutyContentNotList(List<String> dutyContentNotList){
this.dutyContentNotList = dutyContentNotList;
}
/**
* 获取 显示英文
* @return dutyEnglishList
*/
public List<String> getDutyEnglishList(){
return this.dutyEnglishList;
}
/**
* 设置 显示英文
* @param dutyEnglishList
*/
public void setDutyEnglishList(List<String> dutyEnglishList){
this.dutyEnglishList = dutyEnglishList;
}
/**
* 获取 显示英文
* @return dutyEnglishNotList
*/
public List<String> getDutyEnglishNotList(){
return this.dutyEnglishNotList;
}
/**
* 设置 显示英文
* @param dutyEnglishNotList
*/
public void setDutyEnglishNotList(List<String> dutyEnglishNotList){
this.dutyEnglishNotList = dutyEnglishNotList;
}
/**
* 获取 备注
* @return summaryList
......@@ -513,6 +907,23 @@ public class WindowQuery extends WindowEntity {
public void setSummaryList(List<String> summaryList){
this.summaryList = summaryList;
}
/**
* 获取 备注
* @return summaryNotList
*/
public List<String> getSummaryNotList(){
return this.summaryNotList;
}
/**
* 设置 备注
* @param summaryNotList
*/
public void setSummaryNotList(List<String> summaryNotList){
this.summaryNotList = summaryNotList;
}
/**
* 获取 开始 楼栋
* @return buildingStart
......@@ -577,6 +988,23 @@ public class WindowQuery extends WindowEntity {
this.buildingList = buildingList;
}
/**
* 获取 楼栋
* @return buildingNotList
*/
public List<Integer> getBuildingNotList(){
return this.buildingNotList;
}
/**
* 设置 楼栋
* @param buildingNotList
*/
public void setBuildingNotList(List<Integer> buildingNotList){
this.buildingNotList = buildingNotList;
}
/**
* 获取 开始 楼层
* @return levelStart
......@@ -641,6 +1069,23 @@ public class WindowQuery extends WindowEntity {
this.levelList = levelList;
}
/**
* 获取 楼层
* @return levelNotList
*/
public List<Integer> getLevelNotList(){
return this.levelNotList;
}
/**
* 设置 楼层
* @param levelNotList
*/
public void setLevelNotList(List<Integer> levelNotList){
this.levelNotList = levelNotList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
......@@ -737,6 +1182,23 @@ public class WindowQuery extends WindowEntity {
this.createUserIdList = createUserIdList;
}
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/**
* 获取 开始 修改时间
* @return updateTimeStart
......@@ -814,6 +1276,15 @@ public class WindowQuery extends WindowEntity {
return this;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public WindowQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 站点ID
* @param siteId
......@@ -859,6 +1330,15 @@ public class WindowQuery extends WindowEntity {
return this;
}
/**
* 设置 站点ID
* @param siteIdNotList
*/
public WindowQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 设置 站点名称
......@@ -923,6 +1403,15 @@ public class WindowQuery extends WindowEntity {
return this;
}
/**
* 设置 部门ID
* @param deptIdNotList
*/
public WindowQuery deptIdNotList(List<Long> deptIdNotList){
this.deptIdNotList = deptIdNotList;
return this;
}
/**
* 设置 部门名称
......@@ -1082,6 +1571,107 @@ public class WindowQuery extends WindowEntity {
return this;
}
/**
* 设置 红旗窗口 (1.是，0.否)
* @param hongqiNotList
*/
public WindowQuery hongqiNotList(List<Integer> hongqiNotList){
this.hongqiNotList = hongqiNotList;
return this;
}
/**
* 设置 无人值守(1.是，)
* @param duty
*/
public WindowQuery duty(Integer duty){
setDuty(duty);
return this;
}
/**
* 设置 开始 无人值守(1.是，)
* @param dutyStart
*/
public WindowQuery dutyStart(Integer dutyStart){
this.dutyStart = dutyStart;
return this;
}
/**
* 设置 结束 无人值守(1.是，)
* @param dutyEnd
*/
public WindowQuery dutyEnd(Integer dutyEnd){
this.dutyEnd = dutyEnd;
return this;
}
/**
* 设置 增加 无人值守(1.是，)
* @param dutyIncrement
*/
public WindowQuery dutyIncrement(Integer dutyIncrement){
this.dutyIncrement = dutyIncrement;
return this;
}
/**
* 设置 无人值守(1.是，)
* @param dutyList
*/
public WindowQuery dutyList(List<Integer> dutyList){
this.dutyList = dutyList;
return this;
}
/**
* 设置 无人值守(1.是，)
* @param dutyNotList
*/
public WindowQuery dutyNotList(List<Integer> dutyNotList){
this.dutyNotList = dutyNotList;
return this;
}
/**
* 设置 显示内容
* @param dutyContent
*/
public WindowQuery dutyContent(String dutyContent){
setDutyContent(dutyContent);
return this;
}
/**
* 设置 显示内容
* @param dutyContentList
*/
public WindowQuery dutyContentList(List<String> dutyContentList){
this.dutyContentList = dutyContentList;
return this;
}
/**
* 设置 显示英文
* @param dutyEnglish
*/
public WindowQuery dutyEnglish(String dutyEnglish){
setDutyEnglish(dutyEnglish);
return this;
}
/**
* 设置 显示英文
* @param dutyEnglishList
*/
public WindowQuery dutyEnglishList(List<String> dutyEnglishList){
this.dutyEnglishList = dutyEnglishList;
return this;
}
/**
* 设置 备注
......@@ -1146,6 +1736,15 @@ public class WindowQuery extends WindowEntity {
return this;
}
/**
* 设置 楼栋
* @param buildingNotList
*/
public WindowQuery buildingNotList(List<Integer> buildingNotList){
this.buildingNotList = buildingNotList;
return this;
}
/**
* 设置 楼层
* @param level
......@@ -1191,6 +1790,15 @@ public class WindowQuery extends WindowEntity {
return this;
}
/**
* 设置 楼层
* @param levelNotList
*/
public WindowQuery levelNotList(List<Integer> levelNotList){
this.levelNotList = levelNotList;
return this;
}
/**
* 设置 创建用户
......@@ -1237,6 +1845,15 @@ public class WindowQuery extends WindowEntity {
return this;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public WindowQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
......
base-manager/src/main/resources/sqlmap/module/window/WindowMapper.xml
View file @ ea0c43ae
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.window.dao.ibatis.WindowDaoImpl">
<!-- 字段和属性映射 -->
......@@ -16,6 +16,9 @@
<result property="englishRegion" column="englishRegion" />
<result property="fromnum" column="fromnum" />
<result property="hongqi" column="hongqi" />
<result property="duty" column="duty" />
<result property="dutyContent" column="dutyContent" />
<result property="dutyEnglish" column="dutyEnglish" />
<result property="summary" column="summary" />
<result property="building" column="building" />
<result property="level" column="level" />
......@@ -30,73 +33,82 @@
<sql id="_columns">
<trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id as id,
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId as siteId,
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
a.siteName as siteName,
a.siteName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))">
a.deptId as deptId,
a.deptId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
a.deptName as deptName,
a.deptName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
a.name as name,
a.name,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('englishName') or colPickMode == 1 and data.containsKey('englishName')))">
a.englishName as englishName,
a.englishName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('region') or colPickMode == 1 and data.containsKey('region')))">
a.region as region,
a.region,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('englishRegion') or colPickMode == 1 and data.containsKey('englishRegion')))">
a.englishRegion as englishRegion,
a.englishRegion,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fromnum') or colPickMode == 1 and data.containsKey('fromnum')))">
a.fromnum as fromnum,
a.fromnum,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hongqi') or colPickMode == 1 and data.containsKey('hongqi')))">
a.hongqi as hongqi,
a.hongqi,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('duty') or colPickMode == 1 and data.containsKey('duty')))">
a.duty,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dutyContent') or colPickMode == 1 and data.containsKey('dutyContent')))">
a.dutyContent,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dutyEnglish') or colPickMode == 1 and data.containsKey('dutyEnglish')))">
a.dutyEnglish,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('summary') or colPickMode == 1 and data.containsKey('summary')))">
a.summary as summary,
a.summary,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('building') or colPickMode == 1 and data.containsKey('building')))">
a.building as building,
a.building,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('level') or colPickMode == 1 and data.containsKey('level')))">
a.level as level,
a.level,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime as createTime,
a.createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId as createUserId,
a.createUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime as updateTime,
a.updateTime,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="WindowEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_window
(siteId,siteName,deptId,deptName,name,englishName,region,englishRegion,fromnum,hongqi,summary,building,level,createTime,createUserId,updateTime)
(siteId,siteName,deptId,deptName,name,englishName,region,englishRegion,fromnum,hongqi,duty,dutyContent,dutyEnglish,summary,building,level,createTime,createUserId,updateTime)
VALUES
(#{siteId},#{siteName},#{deptId},#{deptName},#{name},#{englishName},#{region},#{englishRegion},#{fromnum},#{hongqi},#{summary},#{building},#{level},#{createTime},#{createUserId},#{updateTime})
(#{siteId},#{siteName},#{deptId},#{deptName},#{name},#{englishName},#{region},#{englishRegion},#{fromnum},#{hongqi},#{duty},#{dutyContent},#{dutyEnglish},#{summary},#{building},#{level},#{createTime},#{createUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_window
(siteId,siteName,deptId,deptName,name,englishName,region,englishRegion,fromnum,hongqi,summary,building,level,createTime,createUserId,updateTime)
(siteId,siteName,deptId,deptName,name,englishName,region,englishRegion,fromnum,hongqi,duty,dutyContent,dutyEnglish,summary,building,level,createTime,createUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.siteName},#{item.deptId},#{item.deptName},#{item.name},#{item.englishName},#{item.region},#{item.englishRegion},#{item.fromnum},#{item.hongqi},#{item.summary},#{item.building},#{item.level},#{item.createTime},#{item.createUserId},#{item.updateTime})
(#{item.siteId},#{item.siteName},#{item.deptId},#{item.deptName},#{item.name},#{item.englishName},#{item.region},#{item.englishRegion},#{item.fromnum},#{item.hongqi},#{item.duty},#{item.dutyContent},#{item.dutyEnglish},#{item.summary},#{item.building},#{item.level},#{item.createTime},#{item.createUserId},#{item.updateTime})
</foreach>
</insert>
......@@ -145,6 +157,18 @@
<if test="(colPickMode==0 and data.containsKey('hongqiIncrement')) or (colPickMode==1 and !data.containsKey('hongqiIncrement'))">
a.hongqi=ifnull(a.hongqi,0) + #{data.hongqiIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('duty')) or (colPickMode==1 and !data.containsKey('duty'))">
a.duty=#{data.duty},
</if>
<if test="(colPickMode==0 and data.containsKey('dutyIncrement')) or (colPickMode==1 and !data.containsKey('dutyIncrement'))">
a.duty=ifnull(a.duty,0) + #{data.dutyIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('dutyContent')) or (colPickMode==1 and !data.containsKey('dutyContent'))">
a.dutyContent=#{data.dutyContent},
</if>
<if test="(colPickMode==0 and data.containsKey('dutyEnglish')) or (colPickMode==1 and !data.containsKey('dutyEnglish'))">
a.dutyEnglish=#{data.dutyEnglish},
</if>
<if test="(colPickMode==0 and data.containsKey('summary')) or (colPickMode==1 and !data.containsKey('summary'))">
a.summary=#{data.summary},
</if>
......@@ -269,6 +293,32 @@
</choose>
</foreach>
</trim>
<trim prefix="duty=(case" suffix="ELSE duty end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('duty')) or (colPickMode==1 and !item.containsKey('duty'))">
when a.id=#{item.id} then #{item.duty}
</when>
<when test="(colPickMode==0 and item.containsKey('dutyIncrement')) or (colPickMode==1 and !item.containsKey('dutyIncrement'))">
when a.id=#{item.id} then ifnull(a.duty,0) + #{item.dutyIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="dutyContent=(case" suffix="ELSE dutyContent end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('dutyContent')) or (colPickMode==1 and !item.containsKey('dutyContent'))">
when a.id=#{item.id} then #{item.dutyContent}
</if>
</foreach>
</trim>
<trim prefix="dutyEnglish=(case" suffix="ELSE dutyEnglish end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('dutyEnglish')) or (colPickMode==1 and !item.containsKey('dutyEnglish'))">
when a.id=#{item.id} then #{item.dutyEnglish}
</if>
</foreach>
</trim>
<trim prefix="summary=(case" suffix="ELSE summary end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('summary')) or (colPickMode==1 and !item.containsKey('summary'))">
......@@ -349,6 +399,21 @@
#{item}
</foreach>
</delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_sys_window where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_sys_window 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_window as a
......@@ -441,6 +506,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList')">
${_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>
......@@ -462,6 +533,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList')">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
......@@ -484,6 +561,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteNameNotList')">
${_conditionType_} a.siteName not in
<foreach collection="conditionParamRef.siteNameNotList" 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}
......@@ -498,6 +581,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptIdNotList')">
${_conditionType_} a.deptId not in
<foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptIdStart') and conditionParamRef.deptIdStart != null">
${_conditionType_} a.deptId <![CDATA[ >= ]]> #{${_conditionParam_}.deptIdStart}
</if>
......@@ -520,6 +609,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptNameNotList')">
${_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.name != null and conditionParamRef.name != ''">
......@@ -535,6 +630,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('nameNotList')">
${_conditionType_} a.name not in
<foreach collection="conditionParamRef.nameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('englishName')">
<if test="conditionParamRef.englishName != null and conditionParamRef.englishName != ''">
......@@ -550,6 +651,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('englishNameNotList')">
${_conditionType_} a.englishName not in
<foreach collection="conditionParamRef.englishNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('region')">
<if test="conditionParamRef.region != null and conditionParamRef.region != ''">
......@@ -565,6 +672,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('regionNotList')">
${_conditionType_} a.region not in
<foreach collection="conditionParamRef.regionNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('englishRegion')">
<if test="conditionParamRef.englishRegion != null and conditionParamRef.englishRegion != ''">
......@@ -580,6 +693,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('englishRegionNotList')">
${_conditionType_} a.englishRegion not in
<foreach collection="conditionParamRef.englishRegionNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fromnum')">
<if test="conditionParamRef.fromnum != null and conditionParamRef.fromnum != ''">
......@@ -595,6 +714,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fromnumNotList')">
${_conditionType_} a.fromnum not in
<foreach collection="conditionParamRef.fromnumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('hongqi')">
<if test="conditionParamRef.hongqi != null ">
${_conditionType_} a.hongqi = #{${_conditionParam_}.hongqi}
......@@ -609,6 +734,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('hongqiNotList')">
${_conditionType_} a.hongqi not in
<foreach collection="conditionParamRef.hongqiNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('hongqiStart') and conditionParamRef.hongqiStart != null">
${_conditionType_} a.hongqi <![CDATA[ >= ]]> #{${_conditionParam_}.hongqiStart}
</if>
......@@ -616,6 +747,75 @@
${_conditionType_} a.hongqi <![CDATA[ <= ]]> #{${_conditionParam_}.hongqiEnd}
</if>
<if test="conditionParamRef.containsKey('duty')">
<if test="conditionParamRef.duty != null ">
${_conditionType_} a.duty = #{${_conditionParam_}.duty}
</if>
<if test="conditionParamRef.duty == null">
${_conditionType_} a.duty is null
</if>
</if>
<if test="conditionParamRef.containsKey('dutyList')">
${_conditionType_} a.duty in
<foreach collection="conditionParamRef.dutyList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dutyNotList')">
${_conditionType_} a.duty not in
<foreach collection="conditionParamRef.dutyNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dutyStart') and conditionParamRef.dutyStart != null">
${_conditionType_} a.duty <![CDATA[ >= ]]> #{${_conditionParam_}.dutyStart}
</if>
<if test="conditionParamRef.containsKey('dutyEnd') and conditionParamRef.dutyEnd != null">
${_conditionType_} a.duty <![CDATA[ <= ]]> #{${_conditionParam_}.dutyEnd}
</if>
<if test="conditionParamRef.containsKey('dutyContent')">
<if test="conditionParamRef.dutyContent != null and conditionParamRef.dutyContent != ''">
${_conditionType_} a.dutyContent like #{${_conditionParam_}.dutyContent}
</if>
<if test="conditionParamRef.dutyContent == null">
${_conditionType_} a.dutyContent is null
</if>
</if>
<if test="conditionParamRef.containsKey('dutyContentList')">
${_conditionType_} a.dutyContent in
<foreach collection="conditionParamRef.dutyContentList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dutyContentNotList')">
${_conditionType_} a.dutyContent not in
<foreach collection="conditionParamRef.dutyContentNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dutyEnglish')">
<if test="conditionParamRef.dutyEnglish != null and conditionParamRef.dutyEnglish != ''">
${_conditionType_} a.dutyEnglish like #{${_conditionParam_}.dutyEnglish}
</if>
<if test="conditionParamRef.dutyEnglish == null">
${_conditionType_} a.dutyEnglish is null
</if>
</if>
<if test="conditionParamRef.containsKey('dutyEnglishList')">
${_conditionType_} a.dutyEnglish in
<foreach collection="conditionParamRef.dutyEnglishList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dutyEnglishNotList')">
${_conditionType_} a.dutyEnglish not in
<foreach collection="conditionParamRef.dutyEnglishNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('summary')">
<if test="conditionParamRef.summary != null and conditionParamRef.summary != ''">
......@@ -631,6 +831,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('summaryNotList')">
${_conditionType_} a.summary not in
<foreach collection="conditionParamRef.summaryNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('building')">
<if test="conditionParamRef.building != null ">
${_conditionType_} a.building = #{${_conditionParam_}.building}
......@@ -645,6 +851,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('buildingNotList')">
${_conditionType_} a.building not in
<foreach collection="conditionParamRef.buildingNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('buildingStart') and conditionParamRef.buildingStart != null">
${_conditionType_} a.building <![CDATA[ >= ]]> #{${_conditionParam_}.buildingStart}
</if>
......@@ -666,6 +878,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('levelNotList')">
${_conditionType_} a.level not in
<foreach collection="conditionParamRef.levelNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('levelStart') and conditionParamRef.levelStart != null">
${_conditionType_} a.level <![CDATA[ >= ]]> #{${_conditionParam_}.levelStart}
</if>
......@@ -702,6 +920,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdNotList')">
${_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>
......@@ -792,6 +1016,21 @@
<if test='orderCol.hongqi != null and "DESC".equalsIgnoreCase(orderCol.hongqi)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('duty')">
a.duty
<if test='orderCol.duty != null and "DESC".equalsIgnoreCase(orderCol.duty)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('dutyContent')">
a.dutyContent
<if test='orderCol.dutyContent != null and "DESC".equalsIgnoreCase(orderCol.dutyContent)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('dutyEnglish')">
a.dutyEnglish
<if test='orderCol.dutyEnglish != null and "DESC".equalsIgnoreCase(orderCol.dutyEnglish)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('summary')">
a.summary
<if test='orderCol.summary != null and "DESC".equalsIgnoreCase(orderCol.summary)'>DESC</if>
......
base-manager/src/test/java/com/mortals/httpclient/window/WindowController.http
View file @ ea0c43ae
......@@ -4,9 +4,11 @@ POST {{baseUrl}}/window/list
Content-Type: application/json
{
"siteId":8,
"siteId":1,
"page":1,
"size":10
"size":10,
"name": "",
"fromnum": "1E%"
}
......
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