Skip to content

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

添加窗口文件字段

parent 24934f32
Show whitespace changes
Inline Side-by-side
Showing with 826 additions and 541 deletions
base-manager/db/add.sql
View file @ e0d31bc2
-- ----------------------------
2023-2-21
-- 2023-2-21
-- ----------------------------
ALTER TABLE mortals_sys_window ADD COLUMN `duty` tinyint (1) default 0 COMMENT '无人值守(1.是，0.否)' AFTER hongqi;
ALTER TABLE mortals_sys_window ADD COLUMN `dutyContent` varchar (256) default "" COMMENT '显示内容' AFTER duty;
......@@ -21,7 +21,7 @@ ALTER TABLE mortals_sys_workman ADD COLUMN `operatorId` varchar (128) default "
-- ----------------------------
2023-3-28
-- 2023-3-28
-- ----------------------------
ALTER TABLE mortals_sys_app_info_field ADD COLUMN `fieldTypeValue` varchar (255) default "" COMMENT '字段类型值，当字段类型为多选，单选时候，预设复选值' AFTER fieldType;
ALTER TABLE mortals_sys_app_info_field ADD COLUMN `defaultValue` varchar (255) default "" COMMENT '字段默认值' AFTER fieldValue;
......@@ -44,14 +44,14 @@ ALTER TABLE mortals_sys_site_matter ADD COLUMN `hot` tinyint(2) DEFAULT '0'
ALTER TABLE mortals_sys_site_matter ADD COLUMN `display` tinyint(2) DEFAULT '1' COMMENT '显示(0.否,1.是)' AFTER hot;
-- ----------------------------
2023-4-23
-- 2023-4-23
-- ----------------------------
ALTER TABLE mortals_sys_site_theme_matter ADD COLUMN `hot` tinyint(2) DEFAULT '0' COMMENT '热门(0.否,1.是)' AFTER userType;
ALTER TABLE mortals_sys_site_theme_matter ADD COLUMN `display` tinyint(2) DEFAULT '1' COMMENT '显示(0.否,1.是)' AFTER hot;
-- ----------------------------
2023-4-25
-- 2023-4-25
-- ----------------------------
-- ----------------------------
-- 站点大厅信息表
......@@ -100,14 +100,14 @@ INSERT INTO `mortals_xhx_resource` VALUES (null, '大厅窗口-菜单管理-维
-- ----------------------------
2023-5-04
-- 2023-5-04
-- ----------------------------
ALTER TABLE mortals_sys_window ADD COLUMN `nameDesc` varchar (256) default "" COMMENT '名称描述' AFTER englishName;
ALTER TABLE mortals_sys_window ADD COLUMN `englishNameDesc` varchar (256) default "" COMMENT '英文名称描述' AFTER nameDesc;
-- ----------------------------
2023-5-06
-- 2023-5-06
-- ----------------------------
-- ----------------------------
-- 设备表
......@@ -282,3 +282,10 @@ ALTER TABLE mortals_sys_site ADD COLUMN `complaintHotline` varchar(64) COM
-- ----------------------------
ALTER TABLE mortals_sys_workman ADD COLUMN `deleted` tinyint(2) DEFAULT '0' COMMENT '是否删除（0.否，1.是）' AFTER modelIds;
-- ----------------------------
-- 2025-3-14
-- ----------------------------
ALTER TABLE mortals_sys_window ADD COLUMN `fileName` varchar (256) default "" COMMENT '附件名称' AFTER englishNameDesc;
ALTER TABLE mortals_sys_window ADD COLUMN `filePath` varchar (256) default "" COMMENT '附件地址' AFTER fileName;
base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
View file @ e0d31bc2
......@@ -1424,18 +1424,19 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
//基本属性
sb.append(matterEntity.getMatterName()).append("-基本信息,");
sb.append("事项名称:").append(matterEntity.getMatterName()).append(" ");
sb.append("事项名称:").append(matterEntity.getMatterName());
Map<String, String> baseInfoMap = MatterDetailHtmlParseUtil.getbaseInfoMapByHtml(dom);
StringBuilder sb1 = new StringBuilder();
for (Map.Entry<String, String> entry : baseInfoMap.entrySet()) {
if (sb1.length() > 300) {
if (sb1.length() > 280) {
sb.append(sb1);
sb.append("\n");
sb1 = new StringBuilder();
sb.append(matterEntity.getMatterName()).append("-基本信息,");
sb.append("事项名称:").append(matterEntity.getMatterName());
}
sb1.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue(), ",", "，")).append(" ");
sb1.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue(), ",", "，")).append(";");
}
sb.append(sb1);
......@@ -1450,7 +1451,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
if (!"材料名称".equals(entry.getKey())) {
continue;
}
sb.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue(), ",", "，")).append(" ");
sb.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue(), ",", "，")).append(";");
}
/* List<MatterDatumFileEntity> datumFileEntities = (List<MatterDatumFileEntity>) sqclMap.get("blankList");
for (MatterDatumFileEntity datumFileEntity : datumFileEntities) {
......@@ -1461,25 +1462,25 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
//更新受理条件
sb.append("\n");
sb.append(matterEntity.getMatterName()).append("-受理条件,");
sb.append("事项名称:").append(matterEntity.getMatterName()).append(" ");
sb.append("事项名称:").append(matterEntity.getMatterName());
Map<String, String> sltjMap = MatterDetailHtmlParseUtil.getSltjMapByHtml(dom);
String sltjStr = sltjMap.getOrDefault("sltj", " ");
sb.append(sltjStr);
//更新办理流程
sb.append("\n");
sb.append(matterEntity.getMatterName()).append("-办理流程,");
sb.append("事项名称:").append(matterEntity.getMatterName()).append(" ");
sb.append("事项名称:").append(matterEntity.getMatterName());
List<Map<String, Object>> bllcMapList = MatterDetailHtmlParseUtil.getbllcMapByHtml(dom);
for (Map<String, Object> bllcMap : bllcMapList) {
for (Map.Entry<String, Object> entry : bllcMap.entrySet()) {
sb.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue().toString(), ",", "，")).append(" ");
sb.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue().toString(), ",", "，")).append(";");
}
}
//更新收费标准
sb.append("\n");
sb.append(matterEntity.getMatterName()).append("-收费标准,");
sb.append("事项名称:").append(matterEntity.getMatterName()).append(" ");
sb.append("事项名称:").append(matterEntity.getMatterName());
Map<String, String> sfbzMap = MatterDetailHtmlParseUtil.getSfbzMapByHtml(dom);
String sfbzStr = sfbzMap.getOrDefault("sfbz", " ");
......@@ -1505,26 +1506,27 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
//中介服务
sb.append("\n");
sb.append(matterEntity.getMatterName()).append("-中介服务,");
sb.append("事项名称:").append(matterEntity.getMatterName()).append(" ");
sb.append("事项名称:").append(matterEntity.getMatterName());
Map<String, String> zjfwMap = MatterDetailHtmlParseUtil.getZjfwMapByHtml(dom);
for (Map.Entry<String, String> entry : zjfwMap.entrySet()) {
sb.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue(), ",", "，")).append(" ");
sb.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue(), ",", "，")).append(";");
}
//常见问题
sb.append("\n");
sb.append(matterEntity.getMatterName()).append("-常见问题,");
sb.append("事项名称:").append(matterEntity.getMatterName()).append(" ");
sb.append("事项名称:").append(matterEntity.getMatterName());
StringBuilder sb3 = new StringBuilder();
List<Map<String, Object>> cjwtMapList = MatterDetailHtmlParseUtil.getCjwtMapByHtml(dom);
for (Map<String, Object> bllcMap : cjwtMapList) {
for (Map.Entry<String, Object> entry : bllcMap.entrySet()) {
if (sb3.length() > 360) {
if (sb3.length() > 280) {
sb.append(sb3);
sb.append("\n");
sb3 = new StringBuilder();
sb.append(matterEntity.getMatterName()).append("-常见问题,");
sb.append("事项名称:").append(matterEntity.getMatterName());
}
sb3.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue().toString(), ",", "，")).append(" ");
sb3.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue().toString(), ",", "，")).append(";");
}
}
......
base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java
View file @ e0d31bc2
......@@ -208,19 +208,6 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
String busiDesc = "生成文本" + this.getModuleDesc();
int code = VALUE_RESULT_SUCCESS;
try {
/* Runnable runnable = new Runnable() {
*//**
*
*//*
@Override
public void run() {
matterService.genMatterTxt(query, getContext());
}
};
ThreadPool.getInstance().execute(runnable);*/
this.service.genMatterTxt(query, getContext());
model.put(MESSAGE_INFO, busiDesc + "成功");
......
base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowEntity.java
View file @ e0d31bc2
package com.mortals.xhx.module.window.model;
import java.util.List;
import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
......@@ -10,7 +13,7 @@ import lombok.Data;
* 站点部门窗口实体对象
*
* @author zxfei
* @date 2023-05-04
* @date 2025-03-14
*/
@Data
public class WindowEntity extends WindowVo {
......@@ -31,53 +34,31 @@ public class WindowEntity extends WindowVo {
/**
* 部门名称
*/
@Excel(name = "部门名称")
private String deptName;
/**
* 窗口名称
*/
@Excel(name = "窗口名称")
private String name;
/**
* 英语窗口名
*/
@Excel(name = "窗口英语名")
private String englishName;
/**
* 区域
*/
@Excel(name = "区域")
private String region;
/**
* 英语区域
*/
@Excel(name = "英语区域")
private String englishRegion;
/**
* 窗口编号
*/
@Excel(name = "窗口编号")
private String fromnum;
/**
* 红旗窗口 (1.是，0.否)
*/
@Excel(name = "红旗窗口",combo={"是","否"}, readConverterExp = "1=是,0=否")
private Integer hongqi;
/**
* 无人值守(1.是)
*/
@Excel(name = "无人值守",combo={"是","否"}, readConverterExp = "1=是,0=否")
private Integer duty;
/**
* 显示内容
*/
@Excel(name = "显示内容")
private String dutyContent;
/**
* 显示英文
*/
@Excel(name = "显示英文")
private String dutyEnglish;
/**
* 备注
*/
......@@ -85,23 +66,39 @@ public class WindowEntity extends WindowVo {
/**
* 楼栋
*/
@Excel(name = "楼栋",cellType= Excel.ColumnType.NUMERIC)
private Integer building;
/**
* 楼层
*/
@Excel(name = "楼层",cellType= Excel.ColumnType.NUMERIC)
private Integer level;
/**
* 名称描述
*/
@Excel(name = "名称描述")
private String nameDesc;
/**
* 英文名称描述
*/
@Excel(name = "英文名称描述")
private String englishNameDesc;
/**
* 附件名称
*/
private String fileName;
/**
* 附件地址
*/
private String filePath;
/**
* 无人值守(1.是，)
*/
private Integer duty;
/**
* 显示内容
*/
private String dutyContent;
/**
* 显示英文
*/
private String dutyEnglish;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -119,41 +116,25 @@ public class WindowEntity extends WindowVo {
}
public void initAttrValue(){
this.siteId = null;
this.siteName = "";
this.deptId = null;
this.deptName = "";
this.name = "";
this.englishName = "";
this.region = "";
this.englishRegion = "";
this.fromnum = "";
this.hongqi = 1;
this.duty = 0;
this.dutyContent = "";
this.dutyEnglish = "";
this.summary = "";
this.building = 1;
this.level = 1;
this.nameDesc = "";
this.englishNameDesc = "";
this.fileName = "";
this.filePath = "";
this.duty = 0;
this.dutyContent = "";
this.dutyEnglish = "";
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowQuery.java
View file @ e0d31bc2
......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.window.model.WindowEntity;
* 站点部门窗口查询对象
*
* @author zxfei
* @date 2023-05-04
* @date 2025-03-14
*/
public class WindowQuery extends WindowEntity {
/** 开始 序号，主键，自增长 */
......@@ -104,31 +104,6 @@ public class WindowQuery extends WindowEntity {
/** 红旗窗口 (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;
......@@ -201,6 +176,41 @@ public class WindowQuery extends WindowEntity {
/** 英文名称描述排除列表 */
private List <String> englishNameDescNotList;
/** 附件名称 */
private List<String> fileNameList;
/** 附件名称排除列表 */
private List <String> fileNameNotList;
/** 附件地址 */
private List<String> filePathList;
/** 附件地址排除列表 */
private List <String> filePathNotList;
/** 开始 无人值守(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;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<WindowQuery> orConditionList;
......@@ -757,151 +767,6 @@ public class WindowQuery extends WindowEntity {
}
/**
* 获取 开始 无人值守(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
......@@ -1306,97 +1171,306 @@ public class WindowQuery extends WindowEntity {
}
/**
* 设置 序号，主键，自增长
* @param id
* 获取 附件名称
* @return fileNameList
*/
public WindowQuery id(Long id){
setId(id);
return this;
public List<String> getFileNameList(){
return this.fileNameList;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
* 设置 附件名称
* @param fileNameList
*/
public WindowQuery idStart(Long idStart){
this.idStart = idStart;
return this;
public void setFileNameList(List<String> fileNameList){
this.fileNameList = fileNameList;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
* 获取 附件名称
* @return fileNameNotList
*/
public WindowQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
public List<String> getFileNameNotList(){
return this.fileNameNotList;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
* 设置 附件名称
* @param fileNameNotList
*/
public WindowQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
public void setFileNameNotList(List<String> fileNameNotList){
this.fileNameNotList = fileNameNotList;
}
/**
* 设置 序号，主键，自增长
* @param idList
* 获取 附件地址
* @return filePathList
*/
public WindowQuery idList(List<Long> idList){
this.idList = idList;
return this;
public List<String> getFilePathList(){
return this.filePathList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
* 设置 附件地址
* @param filePathList
*/
public WindowQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
public void setFilePathList(List<String> filePathList){
this.filePathList = filePathList;
}
/**
* 设置 站点ID
* @param siteId
* 获取 附件地址
* @return filePathNotList
*/
public WindowQuery siteId(Long siteId){
setSiteId(siteId);
return this;
public List<String> getFilePathNotList(){
return this.filePathNotList;
}
/**
* 设置 开始 站点ID
* @param siteIdStart
* 设置 附件地址
* @param filePathNotList
*/
public WindowQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
public void setFilePathNotList(List<String> filePathNotList){
this.filePathNotList = filePathNotList;
}
/**
* 设置 结束 站点ID
* @param siteIdEnd
* 获取 开始 无人值守(1.是，)
* @return dutyStart
*/
public WindowQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
public Integer getDutyStart(){
return this.dutyStart;
}
/**
* 设置 增加 站点ID
* @param siteIdIncrement
* 设置 开始 无人值守(1.是，)
* @param dutyStart
*/
public WindowQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
public void setDutyStart(Integer dutyStart){
this.dutyStart = dutyStart;
}
/**
* 设置 站点ID
* 获取 结束 无人值守(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;
}
/**
* 设置 序号，主键，自增长
* @param id
*/
public WindowQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public WindowQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public WindowQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public WindowQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
public WindowQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public WindowQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 站点ID
* @param siteId
*/
public WindowQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点ID
* @param siteIdStart
*/
public WindowQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点ID
* @param siteIdEnd
*/
public WindowQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点ID
* @param siteIdIncrement
*/
public WindowQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点ID
* @param siteIdList
*/
public WindowQuery siteIdList(List<Long> siteIdList){
......@@ -1654,98 +1728,6 @@ public class WindowQuery extends WindowEntity {
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;
}
/**
* 设置 备注
......@@ -1967,6 +1949,136 @@ public class WindowQuery extends WindowEntity {
return this;
}
/**
* 设置 附件名称
* @param fileName
*/
public WindowQuery fileName(String fileName){
setFileName(fileName);
return this;
}
/**
* 设置 附件名称
* @param fileNameList
*/
public WindowQuery fileNameList(List<String> fileNameList){
this.fileNameList = fileNameList;
return this;
}
/**
* 设置 附件地址
* @param filePath
*/
public WindowQuery filePath(String filePath){
setFilePath(filePath);
return this;
}
/**
* 设置 附件地址
* @param filePathList
*/
public WindowQuery filePathList(List<String> filePathList){
this.filePathList = filePathList;
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;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
base-manager/src/main/resources/sqlmap/module/window/WindowMapper.xml
View file @ e0d31bc2
......@@ -16,9 +16,6 @@
<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" />
......@@ -27,10 +24,13 @@
<result property="updateTime" column="updateTime" />
<result property="nameDesc" column="nameDesc" />
<result property="englishNameDesc" column="englishNameDesc" />
<result property="fileName" column="fileName" />
<result property="filePath" column="filePath" />
<result property="duty" column="duty" />
<result property="dutyContent" column="dutyContent" />
<result property="dutyEnglish" column="dutyEnglish" />
</resultMap>
<!-- 表所有列 -->
<sql id="_columns">
<trim suffixOverrides="," suffix="">
......@@ -67,15 +67,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hongqi') or colPickMode == 1 and data.containsKey('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,
</if>
......@@ -100,23 +91,38 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('englishNameDesc') or colPickMode == 1 and data.containsKey('englishNameDesc')))">
a.englishNameDesc,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileName') or colPickMode == 1 and data.containsKey('fileName')))">
a.fileName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePath') or colPickMode == 1 and data.containsKey('filePath')))">
a.filePath,
</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>
</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,duty,dutyContent,dutyEnglish,summary,building,level,createTime,createUserId,updateTime,nameDesc,englishNameDesc)
(siteId,siteName,deptId,deptName,name,englishName,region,englishRegion,fromnum,hongqi,summary,building,level,createTime,createUserId,updateTime,nameDesc,englishNameDesc,fileName,filePath,duty,dutyContent,dutyEnglish)
VALUES
(#{siteId},#{siteName},#{deptId},#{deptName},#{name},#{englishName},#{region},#{englishRegion},#{fromnum},#{hongqi},#{duty},#{dutyContent},#{dutyEnglish},#{summary},#{building},#{level},#{createTime},#{createUserId},#{updateTime},#{nameDesc},#{englishNameDesc})
(#{siteId},#{siteName},#{deptId},#{deptName},#{name},#{englishName},#{region},#{englishRegion},#{fromnum},#{hongqi},#{summary},#{building},#{level},#{createTime},#{createUserId},#{updateTime},#{nameDesc},#{englishNameDesc},#{fileName},#{filePath},#{duty},#{dutyContent},#{dutyEnglish})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_window
(siteId,siteName,deptId,deptName,name,englishName,region,englishRegion,fromnum,hongqi,duty,dutyContent,dutyEnglish,summary,building,level,createTime,createUserId,updateTime,nameDesc,englishNameDesc)
(siteId,siteName,deptId,deptName,name,englishName,region,englishRegion,fromnum,hongqi,summary,building,level,createTime,createUserId,updateTime,nameDesc,englishNameDesc,fileName,filePath,duty,dutyContent,dutyEnglish)
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.duty},#{item.dutyContent},#{item.dutyEnglish},#{item.summary},#{item.building},#{item.level},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.nameDesc},#{item.englishNameDesc})
(#{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.nameDesc},#{item.englishNameDesc},#{item.fileName},#{item.filePath},#{item.duty},#{item.dutyContent},#{item.dutyEnglish})
</foreach>
</insert>
......@@ -165,18 +171,6 @@
<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>
......@@ -210,6 +204,24 @@
<if test="(colPickMode==0 and data.containsKey('englishNameDesc')) or (colPickMode==1 and !data.containsKey('englishNameDesc'))">
a.englishNameDesc=#{data.englishNameDesc},
</if>
<if test="(colPickMode==0 and data.containsKey('fileName')) or (colPickMode==1 and !data.containsKey('fileName'))">
a.fileName=#{data.fileName},
</if>
<if test="(colPickMode==0 and data.containsKey('filePath')) or (colPickMode==1 and !data.containsKey('filePath'))">
a.filePath=#{data.filePath},
</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>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -307,32 +319,6 @@
</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'))">
......@@ -404,6 +390,46 @@
</if>
</foreach>
</trim>
<trim prefix="fileName=(case" suffix="ELSE fileName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fileName')) or (colPickMode==1 and !item.containsKey('fileName'))">
when a.id=#{item.id} then #{item.fileName}
</if>
</foreach>
</trim>
<trim prefix="filePath=(case" suffix="ELSE filePath end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('filePath')) or (colPickMode==1 and !item.containsKey('filePath'))">
when a.id=#{item.id} then #{item.filePath}
</if>
</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>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -515,6 +541,10 @@
<!-- 条件映射-代参数 -->
<sql id="_condition_param_">
<bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="permissionSql != null and permissionSql != ''">
${permissionSql}
</if>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null">
${_conditionType_} a.id=#{${_conditionParam_}.id}
......@@ -775,75 +805,6 @@
${_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') and conditionParamRef.dutyList.size() > 0">
${_conditionType_} a.duty in
<foreach collection="conditionParamRef.dutyList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dutyNotList') and conditionParamRef.dutyNotList.size() > 0">
${_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') and conditionParamRef.dutyContentList.size() > 0">
${_conditionType_} a.dutyContent in
<foreach collection="conditionParamRef.dutyContentList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dutyContentNotList') and conditionParamRef.dutyContentNotList.size() > 0">
${_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') and conditionParamRef.dutyEnglishList.size() > 0">
${_conditionType_} a.dutyEnglish in
<foreach collection="conditionParamRef.dutyEnglishList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dutyEnglishNotList') and conditionParamRef.dutyEnglishNotList.size() > 0">
${_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 != ''">
......@@ -1018,18 +979,241 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fileName')">
<if test="conditionParamRef.fileName != null and conditionParamRef.fileName != ''">
${_conditionType_} a.fileName like #{${_conditionParam_}.fileName}
</if>
<if test="conditionParamRef.fileName == null">
${_conditionType_} a.fileName is null
</if>
</if>
<if test="conditionParamRef.containsKey('fileNameList') and conditionParamRef.fileNameList.size() > 0">
${_conditionType_} a.fileName in
<foreach collection="conditionParamRef.fileNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fileNameNotList') and conditionParamRef.fileNameNotList.size() > 0">
${_conditionType_} a.fileName not in
<foreach collection="conditionParamRef.fileNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePath')">
<if test="conditionParamRef.filePath != null and conditionParamRef.filePath != ''">
${_conditionType_} a.filePath like #{${_conditionParam_}.filePath}
</if>
<if test="conditionParamRef.filePath == null">
${_conditionType_} a.filePath is null
</if>
</if>
<if test="conditionParamRef.containsKey('filePathList') and conditionParamRef.filePathList.size() > 0">
${_conditionType_} a.filePath in
<foreach collection="conditionParamRef.filePathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePathNotList') and conditionParamRef.filePathNotList.size() > 0">
${_conditionType_} a.filePath not in
<foreach collection="conditionParamRef.filePathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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') and conditionParamRef.dutyList.size() > 0">
${_conditionType_} a.duty in
<foreach collection="conditionParamRef.dutyList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dutyNotList') and conditionParamRef.dutyNotList.size() > 0">
${_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') and conditionParamRef.dutyContentList.size() > 0">
${_conditionType_} a.dutyContent in
<foreach collection="conditionParamRef.dutyContentList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dutyContentNotList') and conditionParamRef.dutyContentNotList.size() > 0">
${_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') and conditionParamRef.dutyEnglishList.size() > 0">
${_conditionType_} a.dutyEnglish in
<foreach collection="conditionParamRef.dutyEnglishList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dutyEnglishNotList') and conditionParamRef.dutyEnglishNotList.size() > 0">
${_conditionType_} a.dutyEnglish not in
<foreach collection="conditionParamRef.dutyEnglishNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
field(a.siteId,
<foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
field(a.deptId,
<foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('hongqiList') and conditionParamRef.hongqiList.size() > 0">
field(a.hongqi,
<foreach collection="conditionParamRef.hongqiList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('buildingList') and conditionParamRef.buildingList.size() > 0">
field(a.building,
<foreach collection="conditionParamRef.buildingList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('levelList') and conditionParamRef.levelList.size() > 0">
field(a.level,
<foreach collection="conditionParamRef.levelList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('dutyList') and conditionParamRef.dutyList.size() > 0">
field(a.duty,
<foreach collection="conditionParamRef.dutyList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
a.${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
field(a.siteId,
<foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
field(a.deptId,
<foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('hongqiList') and conditionParamRef.hongqiList.size() > 0">
field(a.hongqi,
<foreach collection="conditionParamRef.hongqiList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('buildingList') and conditionParamRef.buildingList.size() > 0">
field(a.building,
<foreach collection="conditionParamRef.buildingList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('levelList') and conditionParamRef.levelList.size() > 0">
field(a.level,
<foreach collection="conditionParamRef.levelList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('dutyList') and conditionParamRef.dutyList.size() > 0">
field(a.duty,
<foreach collection="conditionParamRef.dutyList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')">
a.id
......@@ -1086,21 +1270,6 @@
<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>
......@@ -1141,8 +1310,35 @@
<if test='orderCol.englishNameDesc != null and "DESC".equalsIgnoreCase(orderCol.englishNameDesc)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('fileName')">
a.fileName
<if test='orderCol.fileName != null and "DESC".equalsIgnoreCase(orderCol.fileName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('filePath')">
a.filePath
<if test='orderCol.filePath != null and "DESC".equalsIgnoreCase(orderCol.filePath)'>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>
</trim>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment