Skip to content

S
smart_gov_platform
Commit 35d4afc3 authored by “yiyousong”'s avatar “yiyousong”
Browse files
Options

Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

parents 10a9ec99 98daeee4
Show whitespace changes
Inline Side-by-side
Showing with 1204 additions and 757 deletions
base-manager/db/add.sql
View file @ 35d4afc3
...@@ -218,3 +218,12 @@ ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN `serviceApiParams` v ...@@ -218,3 +218,12 @@ ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN `serviceApiParams` v
-- ---------------------------- -- ----------------------------
ALTER TABLE mortals_sys_window_hall ADD COLUMN `siteId` bigint(20) default '1' COMMENT '站点Id'; ALTER TABLE mortals_sys_window_hall ADD COLUMN `siteId` bigint(20) default '1' COMMENT '站点Id';
-- ----------------------------
2024-01-03
-- ----------------------------
ALTER TABLE mortals_sys_site_matter ADD COLUMN `agent` tinyint(2) DEFAULT '0' COMMENT '代办帮办(0.否,1.是)';
ALTER TABLE mortals_sys_site_matter ADD COLUMN `agentName` varchar(64) COMMENT '代办姓名';
ALTER TABLE mortals_sys_site_matter ADD COLUMN `agentPhone` varchar(32) COMMENT '代办电话';
ALTER TABLE mortals_sys_site_matter ADD COLUMN `agentPost` varchar(64) COMMENT '职务';
base-manager/src/main/java/com/mortals/xhx/base/system/upload/web/UploadController.java
View file @ 35d4afc3
...@@ -52,7 +52,7 @@ public class UploadController extends BaseController { ...@@ -52,7 +52,7 @@ public class UploadController extends BaseController {
@RequestMapping(value = "commonupload") @RequestMapping(value = "commonupload")
public String doFileUpload(MultipartFile file, @RequestParam(value = "prePath",defaultValue = "file/fileupload") String prePath) { public String doFileUpload(MultipartFile file, @RequestParam(value = "prePath",defaultValue = "/file/fileupload") String prePath) {
Map<String, Object> model = new HashMap<>(); Map<String, Object> model = new HashMap<>();
String jsonStr = ""; String jsonStr = "";
try { try {
......
base-manager/src/main/java/com/mortals/xhx/common/utils/MatterHtmlParseUtil.java
View file @ 35d4afc3
...@@ -237,13 +237,13 @@ public class MatterHtmlParseUtil { ...@@ -237,13 +237,13 @@ public class MatterHtmlParseUtil {
public static void main(String[] args) { public static void main(String[] args) {
/* String url = "http://www.sczwfw.gov.cn/jiq/interface/item/tags"; String url = "http://www.sczwfw.gov.cn/jiq/interface/item/tags";
HashMap<String, String> params = new HashMap<>(); HashMap<String, String> params = new HashMap<>();
params.put("dxType", "21"); params.put("dxType", "54");
params.put("areaCode", "510107000000"); params.put("areaCode", "511503003999");
params.put("deptCode", ""); params.put("deptCode", "");
params.put("searchtext", ""); params.put("searchtext", "");
params.put("pageno", "5"); params.put("pageno", "1");
params.put("taskType", ""); params.put("taskType", "");
Rest<List<MatterEntity>> rest = MatterHtmlParseUtil.getMatterList(params, url); Rest<List<MatterEntity>> rest = MatterHtmlParseUtil.getMatterList(params, url);
......
base-manager/src/main/java/com/mortals/xhx/common/utils/SyncGovMatterDetailThread.java
View file @ 35d4afc3
...@@ -152,8 +152,13 @@ public class SyncGovMatterDetailThread implements Runnable { ...@@ -152,8 +152,13 @@ public class SyncGovMatterDetailThread implements Runnable {
Rest<String> townThemeRest = siteThemeMatterService.syncTownThemeMatterBySiteId(siteEntity, dxType, context); Rest<String> townThemeRest = siteThemeMatterService.syncTownThemeMatterBySiteId(siteEntity, dxType, context);
log.info("同步站点乡镇主题事项:" + JSON.toJSONString(townThemeRest)); log.info("同步站点乡镇主题事项:" + JSON.toJSONString(townThemeRest));
} else { } else {
cacheService.hdel(RedisCacheKeys.getSyncMatterLockKey() + siteEntity.getAreaCode(), siteEntity.getAreaCode()); try {
cacheService.del(RedisCacheKeys.getSyncMatterLockKey() + siteEntity.getAreaCode(), siteEntity.getAreaCode());
log.info("同步站点乡镇主题事项失败:" + themeTownRest.getData()); log.info("同步站点乡镇主题事项失败:" + themeTownRest.getData());
}catch (Exception e){
log.error("同步站点乡镇主题事项失败",e);
}
} }
} }
log.info("同步站点事项结束....."); log.info("同步站点事项结束.....");
......
base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncHolidayTaskImpl.java
View file @ 35d4afc3
...@@ -50,7 +50,7 @@ public class SyncHolidayTaskImpl implements ITaskExcuteService { ...@@ -50,7 +50,7 @@ public class SyncHolidayTaskImpl implements ITaskExcuteService {
@Autowired @Autowired
private HolidayService holidayService; private HolidayService holidayService;
@Value("${holidayUrl:https://timor.tech/api/holiday/year/2023}") @Value("${holidayUrl:https://timor.tech/api/holiday/year/2024}")
private String holidayUrl; private String holidayUrl;
...@@ -63,6 +63,7 @@ public class SyncHolidayTaskImpl implements ITaskExcuteService { ...@@ -63,6 +63,7 @@ public class SyncHolidayTaskImpl implements ITaskExcuteService {
private void syncHoliday() throws AppException { private void syncHoliday() throws AppException {
holidayUrl += DateUtil.year(new Date()); holidayUrl += DateUtil.year(new Date());
log.info("holidayUrl:{}", holidayUrl);
String holidayJson = HttpUtil.get(holidayUrl); String holidayJson = HttpUtil.get(holidayUrl);
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
......
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteMatterEntity.java
View file @ 35d4afc3
package com.mortals.xhx.module.site.model; package com.mortals.xhx.module.site.model;
import java.util.List; import java.util.List;
import java.util.ArrayList; 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.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.site.model.vo.SiteMatterVo; import com.mortals.xhx.module.site.model.vo.SiteMatterVo;
import lombok.Data;
/** /**
* 站点事项实体对象 * 站点事项实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-12 * @date 2024-01-04
*/ */
@Data
public class SiteMatterEntity extends SiteMatterVo { public class SiteMatterEntity extends SiteMatterVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -32,10 +35,6 @@ public class SiteMatterEntity extends SiteMatterVo { ...@@ -32,10 +35,6 @@ public class SiteMatterEntity extends SiteMatterVo {
* 事项名称 * 事项名称
*/ */
private String matterName; private String matterName;
/**
* 事项编码
*/
private String matterCode;
/** /**
* 部门ID * 部门ID
*/ */
...@@ -44,6 +43,10 @@ public class SiteMatterEntity extends SiteMatterVo { ...@@ -44,6 +43,10 @@ public class SiteMatterEntity extends SiteMatterVo {
* 部门名称 * 部门名称
*/ */
private String deptName; private String deptName;
/**
* 事项编码
*/
private String matterCode;
/** /**
* 事项类型 * 事项类型
*/ */
...@@ -52,10 +55,6 @@ public class SiteMatterEntity extends SiteMatterVo { ...@@ -52,10 +55,6 @@ public class SiteMatterEntity extends SiteMatterVo {
* 事项来源 * 事项来源
*/ */
private Integer source; private Integer source;
/**
* 部门编号
*/
private String deptCode;
/** /**
* 热门(0.否,1.是) * 热门(0.否,1.是)
*/ */
...@@ -64,182 +63,26 @@ public class SiteMatterEntity extends SiteMatterVo { ...@@ -64,182 +63,26 @@ public class SiteMatterEntity extends SiteMatterVo {
* 显示(0.否,1.是) * 显示(0.否,1.是)
*/ */
private Integer display; private Integer display;
public SiteMatterEntity(){}
/**
* 获取 站点ID
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点ID
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
/**
* 获取 站点名称
* @return String
*/
public String getSiteName(){
return siteName;
}
/**
* 设置 站点名称
* @param siteName
*/
public void setSiteName(String siteName){
this.siteName = siteName;
}
/**
* 获取 事项ID
* @return Long
*/
public Long getMatterId(){
return matterId;
}
/**
* 设置 事项ID
* @param matterId
*/
public void setMatterId(Long matterId){
this.matterId = matterId;
}
/**
* 获取 事项名称
* @return String
*/
public String getMatterName(){
return matterName;
}
/**
* 设置 事项名称
* @param matterName
*/
public void setMatterName(String matterName){
this.matterName = matterName;
}
/**
* 获取 事项编码
* @return String
*/
public String getMatterCode(){
return matterCode;
}
/**
* 设置 事项编码
* @param matterCode
*/
public void setMatterCode(String matterCode){
this.matterCode = matterCode;
}
/**
* 获取 部门ID
* @return Long
*/
public Long getDeptId(){
return deptId;
}
/** /**
* 设置 部门ID * 部门编号
* @param deptId
*/
public void setDeptId(Long deptId){
this.deptId = deptId;
}
/**
* 获取 部门名称
* @return String
*/
public String getDeptName(){
return deptName;
}
/**
* 设置 部门名称
* @param deptName
*/
public void setDeptName(String deptName){
this.deptName = deptName;
}
/**
* 获取 事项类型
* @return String
*/
public String getEventTypeShow(){
return eventTypeShow;
}
/**
* 设置 事项类型
* @param eventTypeShow
*/
public void setEventTypeShow(String eventTypeShow){
this.eventTypeShow = eventTypeShow;
}
/**
* 获取 事项来源
* @return Integer
*/
public Integer getSource(){
return source;
}
/**
* 设置 事项来源
* @param source
*/
public void setSource(Integer source){
this.source = source;
}
/**
* 获取 部门编号
* @return String
*/
public String getDeptCode(){
return deptCode;
}
/**
* 设置 部门编号
* @param deptCode
*/ */
public void setDeptCode(String deptCode){ private String deptCode;
this.deptCode = deptCode;
}
/** /**
* 获取 热门(0.否,1.是) * 代办帮办(0.否,1.是)
* @return Integer
*/ */
public Integer getHot(){ private Integer agent;
return hot;
}
/** /**
* 设置 热门(0.否,1.是) * 代办姓名
* @param hot
*/ */
public void setHot(Integer hot){ private String agentName;
this.hot = hot;
}
/** /**
* 获取 显示(0.否,1.是) * 代办电话
* @return Integer
*/ */
public Integer getDisplay(){ private String agentPhone;
return display;
}
/** /**
* 设置 显示(0.否,1.是) * 职务
* @param display
*/ */
public void setDisplay(Integer display){ private String agentPost;
this.display = display;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -256,47 +99,22 @@ public class SiteMatterEntity extends SiteMatterVo { ...@@ -256,47 +99,22 @@ public class SiteMatterEntity extends SiteMatterVo {
return false; return false;
} }
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",siteId:").append(getSiteId());
sb.append(",siteName:").append(getSiteName());
sb.append(",matterId:").append(getMatterId());
sb.append(",matterName:").append(getMatterName());
sb.append(",matterCode:").append(getMatterCode());
sb.append(",deptId:").append(getDeptId());
sb.append(",deptName:").append(getDeptName());
sb.append(",eventTypeShow:").append(getEventTypeShow());
sb.append(",source:").append(getSource());
sb.append(",deptCode:").append(getDeptCode());
sb.append(",hot:").append(getHot());
sb.append(",display:").append(getDisplay());
return sb.toString();
}
public void initAttrValue(){ public void initAttrValue(){
this.siteId = null; this.siteId = null;
this.siteName = "";
this.siteName = null;
this.matterId = null; this.matterId = null;
this.matterName = "";
this.matterName = null;
this.matterCode = null;
this.deptId = null; this.deptId = null;
this.deptName = "";
this.deptName = null; this.matterCode = "";
this.eventTypeShow = "";
this.eventTypeShow = null;
this.source = 0; this.source = 0;
this.deptCode = null;
this.hot = 0; this.hot = 0;
this.display = 0;
this.display =1; this.deptCode = "";
this.agent = 0;
this.agentName = "";
this.agentPhone = "";
this.agentPost = "";
} }
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteMatterQuery.java
View file @ 35d4afc3
...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.site.model.SiteMatterEntity; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.site.model.SiteMatterEntity;
* 站点事项查询对象 * 站点事项查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-12 * @date 2024-01-04
*/ */
public class SiteMatterQuery extends SiteMatterEntity { public class SiteMatterQuery extends SiteMatterEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -64,11 +64,33 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -64,11 +64,33 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** 事项名称排除列表 */ /** 事项名称排除列表 */
private List <String> matterNameNotList; private List <String> matterNameNotList;
/** 事项编码 */ /** 开始 创建时间 */
private List<String> matterCodeList; private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
/** 开始 创建用户 */
private Long createUserIdStart;
/** 结束 创建用户 */
private Long createUserIdEnd;
/** 增加 创建用户 */
private Long createUserIdIncrement;
/** 创建用户列表 */
private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 修改时间 */
private String updateTimeStart;
/** 结束 修改时间 */
private String updateTimeEnd;
/** 事项编码排除列表 */
private List <String> matterCodeNotList;
/** 开始 部门ID */ /** 开始 部门ID */
private Long deptIdStart; private Long deptIdStart;
...@@ -89,6 +111,11 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -89,6 +111,11 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** 部门名称排除列表 */ /** 部门名称排除列表 */
private List <String> deptNameNotList; private List <String> deptNameNotList;
/** 事项编码 */
private List<String> matterCodeList;
/** 事项编码排除列表 */
private List <String> matterCodeNotList;
/** 事项类型 */ /** 事项类型 */
private List<String> eventTypeShowList; private List<String> eventTypeShowList;
...@@ -109,38 +136,6 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -109,38 +136,6 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** 事项来源排除列表 */ /** 事项来源排除列表 */
private List <Integer> sourceNotList; private List <Integer> sourceNotList;
/** 部门编号 */
private List<String> deptCodeList;
/** 部门编号排除列表 */
private List <String> deptCodeNotList;
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
/** 开始 创建用户 */
private Long createUserIdStart;
/** 结束 创建用户 */
private Long createUserIdEnd;
/** 增加 创建用户 */
private Long createUserIdIncrement;
/** 创建用户列表 */
private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 修改时间 */
private String updateTimeStart;
/** 结束 修改时间 */
private String updateTimeEnd;
/** 开始 热门(0.否,1.是) */ /** 开始 热门(0.否,1.是) */
private Integer hotStart; private Integer hotStart;
...@@ -171,6 +166,41 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -171,6 +166,41 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** 显示(0.否,1.是)排除列表 */ /** 显示(0.否,1.是)排除列表 */
private List <Integer> displayNotList; private List <Integer> displayNotList;
/** 部门编号 */
private List<String> deptCodeList;
/** 部门编号排除列表 */
private List <String> deptCodeNotList;
/** 开始 代办帮办(0.否,1.是) */
private Integer agentStart;
/** 结束 代办帮办(0.否,1.是) */
private Integer agentEnd;
/** 增加 代办帮办(0.否,1.是) */
private Integer agentIncrement;
/** 代办帮办(0.否,1.是)列表 */
private List <Integer> agentList;
/** 代办帮办(0.否,1.是)排除列表 */
private List <Integer> agentNotList;
/** 代办姓名 */
private List<String> agentNameList;
/** 代办姓名排除列表 */
private List <String> agentNameNotList;
/** 代办电话 */
private List<String> agentPhoneList;
/** 代办电话排除列表 */
private List <String> agentPhoneNotList;
/** 职务 */
private List<String> agentPostList;
/** 职务排除列表 */
private List <String> agentPostNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<SiteMatterQuery> orConditionList; private List<SiteMatterQuery> orConditionList;
...@@ -487,35 +517,148 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -487,35 +517,148 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 获取 事项编码 * 获取 开始 创建时间
* @return matterCodeList * @return createTimeStart
*/ */
public List<String> getMatterCodeList(){ public String getCreateTimeStart(){
return this.matterCodeList; return this.createTimeStart;
} }
/** /**
* 设置 事项编码 * 设置 开始 创建时间
* @param matterCodeList * @param createTimeStart
*/ */
public void setMatterCodeList(List<String> matterCodeList){ public void setCreateTimeStart(String createTimeStart){
this.matterCodeList = matterCodeList; this.createTimeStart = createTimeStart;
} }
/** /**
* 获取 事项编码 * 获取 结束 创建时间
* @return matterCodeNotList * @return createTimeEnd
*/ */
public List<String> getMatterCodeNotList(){ public String getCreateTimeEnd(){
return this.matterCodeNotList; return this.createTimeEnd;
} }
/** /**
* 设置 事项编码 * 设置 结束 创建时间
* @param matterCodeNotList * @param createTimeEnd
*/ */
public void setMatterCodeNotList(List<String> matterCodeNotList){ public void setCreateTimeEnd(String createTimeEnd){
this.matterCodeNotList = matterCodeNotList; this.createTimeEnd = createTimeEnd;
}
/**
* 获取 开始 创建用户
* @return createUserIdStart
*/
public Long getCreateUserIdStart(){
return this.createUserIdStart;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
}
/**
* 获取 结束 创建用户
* @return $createUserIdEnd
*/
public Long getCreateUserIdEnd(){
return this.createUserIdEnd;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
}
/**
* 获取 增加 创建用户
* @return createUserIdIncrement
*/
public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
}
/**
* 获取 创建用户
* @return createUserIdList
*/
public List<Long> getCreateUserIdList(){
return this.createUserIdList;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public void setCreateUserIdList(List<Long> createUserIdList){
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
*/
public String getUpdateTimeStart(){
return this.updateTimeStart;
}
/**
* 设置 开始 修改时间
* @param updateTimeStart
*/
public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart;
}
/**
* 获取 结束 修改时间
* @return updateTimeEnd
*/
public String getUpdateTimeEnd(){
return this.updateTimeEnd;
}
/**
* 设置 结束 修改时间
* @param updateTimeEnd
*/
public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd;
} }
/** /**
...@@ -632,36 +775,68 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -632,36 +775,68 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 获取 事项类型 * 获取 事项编码
* @return eventTypeShowList * @return matterCodeList
*/ */
public List<String> getEventTypeShowList(){ public List<String> getMatterCodeList(){
return this.eventTypeShowList; return this.matterCodeList;
} }
/** /**
* 设置 事项类型 * 设置 事项编码
* @param eventTypeShowList * @param matterCodeList
*/ */
public void setEventTypeShowList(List<String> eventTypeShowList){ public void setMatterCodeList(List<String> matterCodeList){
this.eventTypeShowList = eventTypeShowList; this.matterCodeList = matterCodeList;
} }
/** /**
* 获取 事项类型 * 获取 事项编码
* @return eventTypeShowNotList * @return matterCodeNotList
*/ */
public List<String> getEventTypeShowNotList(){ public List<String> getMatterCodeNotList(){
return this.eventTypeShowNotList; return this.matterCodeNotList;
} }
/** /**
* 设置 事项类型 * 设置 事项编码
* @param eventTypeShowNotList * @param matterCodeNotList
*/ */
public void setEventTypeShowNotList(List<String> eventTypeShowNotList){ public void setMatterCodeNotList(List<String> matterCodeNotList){
this.eventTypeShowNotList = eventTypeShowNotList; this.matterCodeNotList = matterCodeNotList;
} }
/**
* 获取 事项类型
* @return eventTypeShowList
*/
public List<String> getEventTypeShowList(){
return this.eventTypeShowList;
}
/**
* 设置 事项类型
* @param eventTypeShowList
*/
public void setEventTypeShowList(List<String> eventTypeShowList){
this.eventTypeShowList = eventTypeShowList;
}
/**
* 获取 事项类型
* @return eventTypeShowNotList
*/
public List<String> getEventTypeShowNotList(){
return this.eventTypeShowNotList;
}
/**
* 设置 事项类型
* @param eventTypeShowNotList
*/
public void setEventTypeShowNotList(List<String> eventTypeShowNotList){
this.eventTypeShowNotList = eventTypeShowNotList;
}
/** /**
* 获取 开始 事项来源 * 获取 开始 事项来源
...@@ -745,343 +920,375 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -745,343 +920,375 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** /**
* 获取 部门编号 * 获取 开始 热门(0.否,1.是)
* @return deptCodeList * @return hotStart
*/ */
public List<String> getDeptCodeList(){ public Integer getHotStart(){
return this.deptCodeList; return this.hotStart;
} }
/** /**
* 设置 部门编号 * 设置 开始 热门(0.否,1.是)
* @param deptCodeList * @param hotStart
*/ */
public void setDeptCodeList(List<String> deptCodeList){ public void setHotStart(Integer hotStart){
this.deptCodeList = deptCodeList; this.hotStart = hotStart;
} }
/** /**
* 获取 部门编号 * 获取 结束 热门(0.否,1.是)
* @return deptCodeNotList * @return $hotEnd
*/ */
public List<String> getDeptCodeNotList(){ public Integer getHotEnd(){
return this.deptCodeNotList; return this.hotEnd;
} }
/** /**
* 设置 部门编号 * 设置 结束 热门(0.否,1.是)
* @param deptCodeNotList * @param hotEnd
*/ */
public void setDeptCodeNotList(List<String> deptCodeNotList){ public void setHotEnd(Integer hotEnd){
this.deptCodeNotList = deptCodeNotList; this.hotEnd = hotEnd;
} }
/** /**
* 获取 开始 创建时间 * 获取 增加 热门(0.否,1.是)
* @return createTimeStart * @return hotIncrement
*/ */
public String getCreateTimeStart(){ public Integer getHotIncrement(){
return this.createTimeStart; return this.hotIncrement;
} }
/** /**
* 设置 开始 创建时间 * 设置 增加 热门(0.否,1.是)
* @param createTimeStart * @param hotIncrement
*/ */
public void setCreateTimeStart(String createTimeStart){ public void setHotIncrement(Integer hotIncrement){
this.createTimeStart = createTimeStart; this.hotIncrement = hotIncrement;
} }
/** /**
* 获取 结束 创建时间 * 获取 热门(0.否,1.是)
* @return createTimeEnd * @return hotList
*/ */
public String getCreateTimeEnd(){ public List<Integer> getHotList(){
return this.createTimeEnd; return this.hotList;
} }
/** /**
* 设置 结束 创建时间 * 设置 热门(0.否,1.是)
* @param createTimeEnd * @param hotList
*/ */
public void setCreateTimeEnd(String createTimeEnd){ public void setHotList(List<Integer> hotList){
this.createTimeEnd = createTimeEnd; this.hotList = hotList;
} }
/** /**
* 获取 开始 创建用户 * 获取 热门(0.否,1.是)
* @return createUserIdStart * @return hotNotList
*/ */
public Long getCreateUserIdStart(){ public List<Integer> getHotNotList(){
return this.createUserIdStart; return this.hotNotList;
} }
/** /**
* 设置 开始 创建用户 * 设置 热门(0.否,1.是)
* @param createUserIdStart * @param hotNotList
*/ */
public void setCreateUserIdStart(Long createUserIdStart){ public void setHotNotList(List<Integer> hotNotList){
this.createUserIdStart = createUserIdStart; this.hotNotList = hotNotList;
} }
/** /**
* 获取 结束 创建用户 * 获取 开始 显示(0.否,1.是)
* @return $createUserIdEnd * @return displayStart
*/ */
public Long getCreateUserIdEnd(){ public Integer getDisplayStart(){
return this.createUserIdEnd; return this.displayStart;
} }
/** /**
* 设置 结束 创建用户 * 设置 开始 显示(0.否,1.是)
* @param createUserIdEnd * @param displayStart
*/ */
public void setCreateUserIdEnd(Long createUserIdEnd){ public void setDisplayStart(Integer displayStart){
this.createUserIdEnd = createUserIdEnd; this.displayStart = displayStart;
} }
/** /**
* 获取 增加 创建用户 * 获取 结束 显示(0.否,1.是)
* @return createUserIdIncrement * @return $displayEnd
*/ */
public Long getCreateUserIdIncrement(){ public Integer getDisplayEnd(){
return this.createUserIdIncrement; return this.displayEnd;
} }
/** /**
* 设置 增加 创建用户 * 设置 结束 显示(0.否,1.是)
* @param createUserIdIncrement * @param displayEnd
*/ */
public void setCreateUserIdIncrement(Long createUserIdIncrement){ public void setDisplayEnd(Integer displayEnd){
this.createUserIdIncrement = createUserIdIncrement; this.displayEnd = displayEnd;
} }
/** /**
* 获取 创建用户 * 获取 增加 显示(0.否,1.是)
* @return createUserIdList * @return displayIncrement
*/ */
public List<Long> getCreateUserIdList(){ public Integer getDisplayIncrement(){
return this.createUserIdList; return this.displayIncrement;
} }
/** /**
* 设置 创建用户 * 设置 增加 显示(0.否,1.是)
* @param createUserIdList * @param displayIncrement
*/ */
public void setCreateUserIdList(List<Long> createUserIdList){ public void setDisplayIncrement(Integer displayIncrement){
this.createUserIdList = createUserIdList; this.displayIncrement = displayIncrement;
} }
/** /**
* 获取 创建用户 * 获取 显示(0.否,1.是)
* @return createUserIdNotList * @return displayList
*/ */
public List<Long> getCreateUserIdNotList(){ public List<Integer> getDisplayList(){
return this.createUserIdNotList; return this.displayList;
} }
/** /**
* 设置 创建用户 * 设置 显示(0.否,1.是)
* @param createUserIdNotList * @param displayList
*/ */
public void setCreateUserIdNotList(List<Long> createUserIdNotList){ public void setDisplayList(List<Integer> displayList){
this.createUserIdNotList = createUserIdNotList; this.displayList = displayList;
} }
/**
* 获取 显示(0.否,1.是)
* @return displayNotList
*/
public List<Integer> getDisplayNotList(){
return this.displayNotList;
}
/** /**
* 获取 开始 修改时间 * 设置 显示(0.否,1.是)
* @return updateTimeStart * @param displayNotList
*/ */
public String getUpdateTimeStart(){ public void setDisplayNotList(List<Integer> displayNotList){
return this.updateTimeStart; this.displayNotList = displayNotList;
} }
/** /**
* 设置 开始 修改时间 * 获取 部门编号
* @param updateTimeStart * @return deptCodeList
*/ */
public void setUpdateTimeStart(String updateTimeStart){ public List<String> getDeptCodeList(){
this.updateTimeStart = updateTimeStart; return this.deptCodeList;
} }
/** /**
* 获取 结束 修改时间 * 设置 部门编号
* @return updateTimeEnd * @param deptCodeList
*/ */
public String getUpdateTimeEnd(){ public void setDeptCodeList(List<String> deptCodeList){
return this.updateTimeEnd; this.deptCodeList = deptCodeList;
} }
/** /**
* 设置 结束 修改时间 * 获取 部门编号
* @param updateTimeEnd * @return deptCodeNotList
*/ */
public void setUpdateTimeEnd(String updateTimeEnd){ public List<String> getDeptCodeNotList(){
this.updateTimeEnd = updateTimeEnd; return this.deptCodeNotList;
} }
/** /**
* 获取 开始 热门(0.否,1.是) * 设置 部门编号
* @return hotStart * @param deptCodeNotList
*/ */
public Integer getHotStart(){ public void setDeptCodeNotList(List<String> deptCodeNotList){
return this.hotStart; this.deptCodeNotList = deptCodeNotList;
} }
/** /**
* 设置 开始 热门(0.否,1.是) * 获取 开始 代办帮办(0.否,1.是)
* @param hotStart * @return agentStart
*/ */
public void setHotStart(Integer hotStart){ public Integer getAgentStart(){
this.hotStart = hotStart; return this.agentStart;
} }
/** /**
* 获取 结束 热门(0.否,1.是) * 设置 开始 代办帮办(0.否,1.是)
* @return $hotEnd * @param agentStart
*/ */
public Integer getHotEnd(){ public void setAgentStart(Integer agentStart){
return this.hotEnd; this.agentStart = agentStart;
} }
/** /**
* 设置 结束 热门(0.否,1.是) * 获取 结束 代办帮办(0.否,1.是)
* @param hotEnd * @return $agentEnd
*/ */
public void setHotEnd(Integer hotEnd){ public Integer getAgentEnd(){
this.hotEnd = hotEnd; return this.agentEnd;
} }
/** /**
* 获取 增加 热门(0.否,1.是) * 设置 结束 代办帮办(0.否,1.是)
* @return hotIncrement * @param agentEnd
*/ */
public Integer getHotIncrement(){ public void setAgentEnd(Integer agentEnd){
return this.hotIncrement; this.agentEnd = agentEnd;
} }
/** /**
* 设置 增加 热门(0.否,1.是) * 获取 增加 代办帮办(0.否,1.是)
* @param hotIncrement * @return agentIncrement
*/ */
public void setHotIncrement(Integer hotIncrement){ public Integer getAgentIncrement(){
this.hotIncrement = hotIncrement; return this.agentIncrement;
} }
/** /**
* 获取 热门(0.否,1.是) * 设置 增加 代办帮办(0.否,1.是)
* @return hotList * @param agentIncrement
*/ */
public List<Integer> getHotList(){ public void setAgentIncrement(Integer agentIncrement){
return this.hotList; this.agentIncrement = agentIncrement;
} }
/** /**
* 设置 热门(0.否,1.是) * 获取 代办帮办(0.否,1.是)
* @param hotList * @return agentList
*/ */
public void setHotList(List<Integer> hotList){ public List<Integer> getAgentList(){
this.hotList = hotList; return this.agentList;
} }
/** /**
* 获取 热门(0.否,1.是) * 设置 代办帮办(0.否,1.是)
* @return hotNotList * @param agentList
*/ */
public List<Integer> getHotNotList(){ public void setAgentList(List<Integer> agentList){
return this.hotNotList; this.agentList = agentList;
} }
/** /**
* 设置 热门(0.否,1.是) * 获取 代办帮办(0.否,1.是)
* @param hotNotList * @return agentNotList
*/ */
public void setHotNotList(List<Integer> hotNotList){ public List<Integer> getAgentNotList(){
this.hotNotList = hotNotList; return this.agentNotList;
}
/**
* 设置 代办帮办(0.否,1.是)
* @param agentNotList
*/
public void setAgentNotList(List<Integer> agentNotList){
this.agentNotList = agentNotList;
} }
/** /**
* 获取 开始 显示(0.否,1.是) * 获取 代办姓名
* @return displayStart * @return agentNameList
*/ */
public Integer getDisplayStart(){ public List<String> getAgentNameList(){
return this.displayStart; return this.agentNameList;
} }
/** /**
* 设置 开始 显示(0.否,1.是) * 设置 代办姓名
* @param displayStart * @param agentNameList
*/ */
public void setDisplayStart(Integer displayStart){ public void setAgentNameList(List<String> agentNameList){
this.displayStart = displayStart; this.agentNameList = agentNameList;
} }
/** /**
* 获取 结束 显示(0.否,1.是) * 获取 代办姓名
* @return $displayEnd * @return agentNameNotList
*/ */
public Integer getDisplayEnd(){ public List<String> getAgentNameNotList(){
return this.displayEnd; return this.agentNameNotList;
} }
/** /**
* 设置 结束 显示(0.否,1.是) * 设置 代办姓名
* @param displayEnd * @param agentNameNotList
*/ */
public void setDisplayEnd(Integer displayEnd){ public void setAgentNameNotList(List<String> agentNameNotList){
this.displayEnd = displayEnd; this.agentNameNotList = agentNameNotList;
}
/**
* 获取 代办电话
* @return agentPhoneList
*/
public List<String> getAgentPhoneList(){
return this.agentPhoneList;
} }
/** /**
* 获取 增加 显示(0.否,1.是) * 设置 代办电话
* @return displayIncrement * @param agentPhoneList
*/ */
public Integer getDisplayIncrement(){ public void setAgentPhoneList(List<String> agentPhoneList){
return this.displayIncrement; this.agentPhoneList = agentPhoneList;
} }
/** /**
* 设置 增加 显示(0.否,1.是) * 获取 代办电话
* @param displayIncrement * @return agentPhoneNotList
*/ */
public void setDisplayIncrement(Integer displayIncrement){ public List<String> getAgentPhoneNotList(){
this.displayIncrement = displayIncrement; return this.agentPhoneNotList;
} }
/** /**
* 获取 显示(0.否,1.是) * 设置 代办电话
* @return displayList * @param agentPhoneNotList
*/ */
public List<Integer> getDisplayList(){ public void setAgentPhoneNotList(List<String> agentPhoneNotList){
return this.displayList; this.agentPhoneNotList = agentPhoneNotList;
} }
/** /**
* 设置 显示(0.否,1.是) * 获取 职务
* @param displayList * @return agentPostList
*/ */
public void setDisplayList(List<Integer> displayList){ public List<String> getAgentPostList(){
this.displayList = displayList; return this.agentPostList;
} }
/** /**
* 获取 显示(0.否,1.是) * 设置 职务
* @return displayNotList * @param agentPostList
*/ */
public List<Integer> getDisplayNotList(){ public void setAgentPostList(List<String> agentPostList){
return this.displayNotList; this.agentPostList = agentPostList;
} }
/** /**
* 设置 显示(0.否,1.是) * 获取 职务
* @param displayNotList * @return agentPostNotList
*/ */
public void setDisplayNotList(List<Integer> displayNotList){ public List<String> getAgentPostNotList(){
this.displayNotList = displayNotList; return this.agentPostNotList;
} }
/**
* 设置 职务
* @param agentPostNotList
*/
public void setAgentPostNotList(List<String> agentPostNotList){
this.agentPostNotList = agentPostNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
...@@ -1285,23 +1492,60 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -1285,23 +1492,60 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** /**
* 设置 事项编码 * 设置 创建用户
* @param matterCode * @param createUserId
*/ */
public SiteMatterQuery matterCode(String matterCode){ public SiteMatterQuery createUserId(Long createUserId){
setMatterCode(matterCode); setCreateUserId(createUserId);
return this; return this;
} }
/** /**
* 设置 事项编码 * 设置 开始 创建用户
* @param matterCodeList * @param createUserIdStart
*/ */
public SiteMatterQuery matterCodeList(List<String> matterCodeList){ public SiteMatterQuery createUserIdStart(Long createUserIdStart){
this.matterCodeList = matterCodeList; this.createUserIdStart = createUserIdStart;
return this;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public SiteMatterQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
return this;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public SiteMatterQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
return this;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public SiteMatterQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
return this;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public SiteMatterQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this; return this;
} }
/** /**
* 设置 部门ID * 设置 部门ID
* @param deptId * @param deptId
...@@ -1376,6 +1620,25 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -1376,6 +1620,25 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/**
* 设置 事项编码
* @param matterCode
*/
public SiteMatterQuery matterCode(String matterCode){
setMatterCode(matterCode);
return this;
}
/**
* 设置 事项编码
* @param matterCodeList
*/
public SiteMatterQuery matterCodeList(List<String> matterCodeList){
this.matterCodeList = matterCodeList;
return this;
}
/** /**
* 设置 事项类型 * 设置 事项类型
* @param eventTypeShow * @param eventTypeShow
...@@ -1448,81 +1711,6 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -1448,81 +1711,6 @@ public class SiteMatterQuery extends SiteMatterEntity {
return this; return this;
} }
/**
* 设置 部门编号
* @param deptCode
*/
public SiteMatterQuery deptCode(String deptCode){
setDeptCode(deptCode);
return this;
}
/**
* 设置 部门编号
* @param deptCodeList
*/
public SiteMatterQuery deptCodeList(List<String> deptCodeList){
this.deptCodeList = deptCodeList;
return this;
}
/**
* 设置 创建用户
* @param createUserId
*/
public SiteMatterQuery createUserId(Long createUserId){
setCreateUserId(createUserId);
return this;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public SiteMatterQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
return this;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public SiteMatterQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
return this;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public SiteMatterQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
return this;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public SiteMatterQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
return this;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public SiteMatterQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 设置 热门(0.否,1.是) * 设置 热门(0.否,1.是)
* @param hot * @param hot
...@@ -1631,6 +1819,136 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -1631,6 +1819,136 @@ public class SiteMatterQuery extends SiteMatterEntity {
return this; return this;
} }
/**
* 设置 部门编号
* @param deptCode
*/
public SiteMatterQuery deptCode(String deptCode){
setDeptCode(deptCode);
return this;
}
/**
* 设置 部门编号
* @param deptCodeList
*/
public SiteMatterQuery deptCodeList(List<String> deptCodeList){
this.deptCodeList = deptCodeList;
return this;
}
/**
* 设置 代办帮办(0.否,1.是)
* @param agent
*/
public SiteMatterQuery agent(Integer agent){
setAgent(agent);
return this;
}
/**
* 设置 开始 代办帮办(0.否,1.是)
* @param agentStart
*/
public SiteMatterQuery agentStart(Integer agentStart){
this.agentStart = agentStart;
return this;
}
/**
* 设置 结束 代办帮办(0.否,1.是)
* @param agentEnd
*/
public SiteMatterQuery agentEnd(Integer agentEnd){
this.agentEnd = agentEnd;
return this;
}
/**
* 设置 增加 代办帮办(0.否,1.是)
* @param agentIncrement
*/
public SiteMatterQuery agentIncrement(Integer agentIncrement){
this.agentIncrement = agentIncrement;
return this;
}
/**
* 设置 代办帮办(0.否,1.是)
* @param agentList
*/
public SiteMatterQuery agentList(List<Integer> agentList){
this.agentList = agentList;
return this;
}
/**
* 设置 代办帮办(0.否,1.是)
* @param agentNotList
*/
public SiteMatterQuery agentNotList(List<Integer> agentNotList){
this.agentNotList = agentNotList;
return this;
}
/**
* 设置 代办姓名
* @param agentName
*/
public SiteMatterQuery agentName(String agentName){
setAgentName(agentName);
return this;
}
/**
* 设置 代办姓名
* @param agentNameList
*/
public SiteMatterQuery agentNameList(List<String> agentNameList){
this.agentNameList = agentNameList;
return this;
}
/**
* 设置 代办电话
* @param agentPhone
*/
public SiteMatterQuery agentPhone(String agentPhone){
setAgentPhone(agentPhone);
return this;
}
/**
* 设置 代办电话
* @param agentPhoneList
*/
public SiteMatterQuery agentPhoneList(List<String> agentPhoneList){
this.agentPhoneList = agentPhoneList;
return this;
}
/**
* 设置 职务
* @param agentPost
*/
public SiteMatterQuery agentPost(String agentPost){
setAgentPost(agentPost);
return this;
}
/**
* 设置 职务
* @param agentPostList
*/
public SiteMatterQuery agentPostList(List<String> agentPostList){
this.agentPostList = agentPostList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
base-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SiteBusinessVo.java
View file @ 35d4afc3
...@@ -53,4 +53,10 @@ public class SiteBusinessVo extends BaseEntityLong { ...@@ -53,4 +53,10 @@ public class SiteBusinessVo extends BaseEntityLong {
private List<Long> idNotList; private List<Long> idNotList;
/** 业务ID列表 */
private List <Long> businessIdList;
/** 业务ID排除列表 */
private List <Long> businessIdNotList;
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
View file @ 35d4afc3
...@@ -435,8 +435,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -435,8 +435,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
PageInfo pageInfo = new PageInfo(); PageInfo pageInfo = new PageInfo();
pageInfo.setCurrPage(1); pageInfo.setCurrPage(1);
pageInfo.setPrePageResult(10); pageInfo.setPrePageResult(10);
return siteEntities; return siteEntities;
} }
......
base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
View file @ 35d4afc3
...@@ -160,27 +160,18 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic ...@@ -160,27 +160,18 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
String busiDesc = "根据区域编码查询站点列表" + this.getModuleDesc(); String busiDesc = "根据区域编码查询站点列表" + this.getModuleDesc();
try { try {
if (!ObjectUtils.isEmpty(site.getSiteName())) { if (!ObjectUtils.isEmpty(site.getSiteName())) {
// SiteEntity siteEntity = this.service.selectOne(new SiteQuery().siteName(site.getSiteName()));
List<SiteEntity> siteEntities = this.service.find(new SiteQuery().siteName(site.getSiteName())); List<SiteEntity> siteEntities = this.service.find(new SiteQuery().siteName(site.getSiteName()));
if (!ObjectUtils.isEmpty(siteEntities)) { if (!ObjectUtils.isEmpty(siteEntities)) {
site.setAreaCodeList(siteEntities.stream().map(i -> i.getAreaCode()).collect(Collectors.toList())); site.setAreaCodeList(siteEntities.stream().map(i -> i.getAreaCode()).collect(Collectors.toList()));
} }
/* if (!ObjectUtils.isEmpty(siteEntity)) {
site.setAreaCode(siteEntity.getAreaCode());
}*/
} }
if (!ObjectUtils.isEmpty(site.getAreaName())) { if (!ObjectUtils.isEmpty(site.getAreaName())) {
//AreaEntity areaEntity = areaService.selectOne(new AreaQuery().name(site.getAreaName()));
List<AreaEntity> areaEntities = areaService.find(new AreaQuery().name(site.getAreaName())); List<AreaEntity> areaEntities = areaService.find(new AreaQuery().name(site.getAreaName()));
if (!ObjectUtils.isEmpty(areaEntities)) { if (!ObjectUtils.isEmpty(areaEntities)) {
// site.setAreaCode(areaEntity.getAreaCode());
site.setAreaCodeList(areaEntities.stream().map(i -> i.getAreaCode()).collect(Collectors.toList())); site.setAreaCodeList(areaEntities.stream().map(i -> i.getAreaCode()).collect(Collectors.toList()));
} }
} }
if (ObjectUtils.isEmpty(site.getAreaCodeList())) { if (ObjectUtils.isEmpty(site.getAreaCodeList())) {
site.setAreaCodeList(Arrays.asList(site.getAreaCode())); site.setAreaCodeList(Arrays.asList(site.getAreaCode()));
} }
...@@ -189,9 +180,9 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic ...@@ -189,9 +180,9 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
}).distinct().collect(Collectors.toList()); }).distinct().collect(Collectors.toList());
//List<SiteEntity> siteEntityList = this.service.getFlatSitesByAreaCode(site.getAreaCode(), getContext()); //List<SiteEntity> siteEntityList = this.service.getFlatSitesByAreaCode(site.getAreaCode(), getContext());
if (!ObjectUtils.isEmpty(site.getSiteName())) { /* if (!ObjectUtils.isEmpty(site.getSiteName())) {
siteEntityList = siteEntityList.stream().filter(item -> site.getSiteName().equals(item.getSiteName())).collect(Collectors.toList()); siteEntityList = siteEntityList.stream().filter(item -> site.getSiteName().equals(item.getSiteName())).collect(Collectors.toList());
} }*/
if (!ObjectUtils.isEmpty(getContext()) && !ObjectUtils.isEmpty(getContext().getUser())) { if (!ObjectUtils.isEmpty(getContext()) && !ObjectUtils.isEmpty(getContext().getUser())) {
recordSysLog(request, busiDesc + " 【成功】"); recordSysLog(request, busiDesc + " 【成功】");
} }
......
base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinBaseServiceImpl.java
View file @ 35d4afc3
...@@ -155,7 +155,9 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk ...@@ -155,7 +155,9 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
@Override @Override
protected void updateAfter(SkinBaseEntity entity, Context context) throws AppException { protected void updateAfter(SkinBaseEntity entity, Context context) throws AppException {
saveSkinFields(entity, context); saveSkinFields(entity, context);
super.updateBefore(entity, context);
SendSkinRefreshTask sendSkinRefreshTask = new SendSkinRefreshTask();
ThreadPool.getInstance().execute(sendSkinRefreshTask);
} }
private void saveSkinFields(SkinBaseEntity entity, Context context) { private void saveSkinFields(SkinBaseEntity entity, Context context) {
...@@ -202,6 +204,8 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk ...@@ -202,6 +204,8 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
} }
private void genTemplateCss(SkinBaseEntity entity, Context context) { private void genTemplateCss(SkinBaseEntity entity, Context context) {
//加载模板，合成模板数据 //加载模板，合成模板数据
Map data = new HashMap(); Map data = new HashMap();
...@@ -222,7 +226,7 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk ...@@ -222,7 +226,7 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
InputStream inputStream = new ByteArrayInputStream(sw.toString().getBytes(Constant.UTF8)); InputStream inputStream = new ByteArrayInputStream(sw.toString().getBytes(Constant.UTF8));
MultipartFile file = getMultipartFile(inputStream, "file.css"); MultipartFile file = getMultipartFile(inputStream, "file.css");
String filePath = uploadService.saveFileUpload(file, "file/fileupload", context.getUser()); String filePath = uploadService.saveFileUpload(file, "/file/fileupload", context.getUser());
entity.setCssFilePath(filePath); entity.setCssFilePath(filePath);
} catch (Exception e) { } catch (Exception e) {
......
base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowBusinessServiceImpl.java
View file @ 35d4afc3
...@@ -93,7 +93,6 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus ...@@ -93,7 +93,6 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
this.findAfter(entity, pageInfo, context, result.getList()); this.findAfter(entity, pageInfo, context, result.getList());
if (!ObjectUtils.isEmpty(result.getList())) { if (!ObjectUtils.isEmpty(result.getList())) {
cacheService.set(KEY_SEARCH_SITEBUSINESSID_CACHE + siteBusinessId, JSON.toJSONString(result), KEY_SEARCH_TIMEOUTT_CACHE); cacheService.set(KEY_SEARCH_SITEBUSINESSID_CACHE + siteBusinessId, JSON.toJSONString(result), KEY_SEARCH_TIMEOUTT_CACHE);
} }
} }
} else if (!ObjectUtils.isEmpty(query.getWindowId())) { } else if (!ObjectUtils.isEmpty(query.getWindowId())) {
...@@ -134,14 +133,15 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus ...@@ -134,14 +133,15 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
@Override @Override
protected void findAfter(WindowBusinessEntity entity, PageInfo pageInfo, Context context, List<WindowBusinessEntity> list) throws AppException { protected void findAfter(WindowBusinessEntity entity, PageInfo pageInfo, Context context, List<WindowBusinessEntity> list) throws AppException {
Map<Long, WindowEntity> collect = windowService.getCacheList().stream().collect(Collectors.toMap(x -> x.getId(), y -> y, (o, n) -> n)); // Map<Long, WindowEntity> collect = windowService.getCacheList().stream().collect(Collectors.toMap(x -> x.getId(), y -> y, (o, n) -> n));
//Map<Long, WindowEntity> collect = windowService.findToMap(new WindowQuery(), context); //Map<Long, WindowEntity> collect = windowService.findToMap(new WindowQuery(), context);
Map<Long, WindowHallEntity> windowHallEntityMap = windowHallService.getCacheList().stream().collect(Collectors.toMap(x -> x.getId(), y -> y, (o, n) -> n)); Map<Long, WindowHallEntity> windowHallEntityMap = windowHallService.getCacheList().stream().collect(Collectors.toMap(x -> x.getWindowId(), y -> y, (o, n) -> n));
//Map<Long, WindowHallEntity> windowHallEntityMap = windowHallService.find(new WindowHallQuery(), context).parallelStream().collect(Collectors.toMap(x -> x.getWindowId(), Function.identity())); // Map<Long, WindowHallEntity> windowHallEntityMap = windowHallService.find(new WindowHallQuery(), context).parallelStream().collect(Collectors.toMap(x -> x.getWindowId(), Function.identity()));
Iterator iterator = list.iterator(); Iterator iterator = list.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
WindowBusinessEntity item = (WindowBusinessEntity) iterator.next(); WindowBusinessEntity item = (WindowBusinessEntity) iterator.next();
WindowEntity windowEntity = collect.get(item.getWindowId()); //WindowEntity windowEntity = collect.get(item.getWindowId());
WindowEntity windowEntity = windowService.getCache(item.getWindowId().toString());
if (!ObjectUtils.isEmpty(item.getWindowId()) && !ObjectUtils.isEmpty(windowEntity)) { if (!ObjectUtils.isEmpty(item.getWindowId()) && !ObjectUtils.isEmpty(windowEntity)) {
item.setDeptId(windowEntity.getDeptId()); item.setDeptId(windowEntity.getDeptId());
item.setDeptName(windowEntity.getDeptName()); item.setDeptName(windowEntity.getDeptName());
......
base-manager/src/main/resources/config/mybatis-sqlmap-config.xml
View file @ 35d4afc3
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</plugin> </plugin>
<plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor"> <plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor">
<property name="enableExecutorTime" value="true" /> <property name="enableExecutorTime" value="true" />
<property name="showSql" value="true" /> <property name="showSql" value="false" />
</plugin> </plugin>
</plugins> </plugins>
</configuration> </configuration>
\ No newline at end of file
base-manager/src/main/resources/sqlmap/module/site/SiteMatterMapper.xml
View file @ 35d4afc3
...@@ -10,17 +10,21 @@ ...@@ -10,17 +10,21 @@
<result property="siteName" column="siteName" /> <result property="siteName" column="siteName" />
<result property="matterId" column="matterId" /> <result property="matterId" column="matterId" />
<result property="matterName" column="matterName" /> <result property="matterName" column="matterName" />
<result property="matterCode" column="matterCode" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" />
<result property="deptId" column="deptId" /> <result property="deptId" column="deptId" />
<result property="deptName" column="deptName" /> <result property="deptName" column="deptName" />
<result property="matterCode" column="matterCode" />
<result property="eventTypeShow" column="eventTypeShow" /> <result property="eventTypeShow" column="eventTypeShow" />
<result property="source" column="source" /> <result property="source" column="source" />
<result property="deptCode" column="deptCode" />
<result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" />
<result property="hot" column="hot" /> <result property="hot" column="hot" />
<result property="display" column="display" /> <result property="display" column="display" />
<result property="deptCode" column="deptCode" />
<result property="agent" column="agent" />
<result property="agentName" column="agentName" />
<result property="agentPhone" column="agentPhone" />
<result property="agentPost" column="agentPost" />
</resultMap> </resultMap>
...@@ -43,8 +47,14 @@ ...@@ -43,8 +47,14 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterName') or colPickMode == 1 and data.containsKey('matterName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterName') or colPickMode == 1 and data.containsKey('matterName')))">
a.matterName, a.matterName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterCode') or colPickMode == 1 and data.containsKey('matterCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.matterCode, 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,
</if>
<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>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))">
a.deptId, a.deptId,
...@@ -52,47 +62,53 @@ ...@@ -52,47 +62,53 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
a.deptName, a.deptName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterCode') or colPickMode == 1 and data.containsKey('matterCode')))">
a.matterCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('eventTypeShow') or colPickMode == 1 and data.containsKey('eventTypeShow')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('eventTypeShow') or colPickMode == 1 and data.containsKey('eventTypeShow')))">
a.eventTypeShow, a.eventTypeShow,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
a.source, a.source,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hot') or colPickMode == 1 and data.containsKey('hot')))">
a.hot,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('display') or colPickMode == 1 and data.containsKey('display')))">
a.display,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptCode') or colPickMode == 1 and data.containsKey('deptCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptCode') or colPickMode == 1 and data.containsKey('deptCode')))">
a.deptCode, a.deptCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('agent') or colPickMode == 1 and data.containsKey('agent')))">
a.createTime, a.agent,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('agentName') or colPickMode == 1 and data.containsKey('agentName')))">
a.updateTime, a.agentName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hot') or colPickMode == 1 and data.containsKey('hot')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('agentPhone') or colPickMode == 1 and data.containsKey('agentPhone')))">
a.hot, a.agentPhone,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('display') or colPickMode == 1 and data.containsKey('display')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('agentPost') or colPickMode == 1 and data.containsKey('agentPost')))">
a.display, a.agentPost,
</if> </if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="SiteMatterEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="SiteMatterEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_site_matter insert into mortals_sys_site_matter
(siteId,siteName,matterId,matterName,matterCode,deptId,deptName,eventTypeShow,source,deptCode,createTime,createUserId,updateTime,hot,display) (siteId,siteName,matterId,matterName,createTime,createUserId,updateTime,deptId,deptName,matterCode,eventTypeShow,source,hot,display,deptCode,agent,agentName,agentPhone,agentPost)
VALUES VALUES
(#{siteId},#{siteName},#{matterId},#{matterName},#{matterCode},#{deptId},#{deptName},#{eventTypeShow},#{source},#{deptCode},#{createTime},#{createUserId},#{updateTime},#{hot},#{display}) (#{siteId},#{siteName},#{matterId},#{matterName},#{createTime},#{createUserId},#{updateTime},#{deptId},#{deptName},#{matterCode},#{eventTypeShow},#{source},#{hot},#{display},#{deptCode},#{agent},#{agentName},#{agentPhone},#{agentPost})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_site_matter insert into mortals_sys_site_matter
(siteId,siteName,matterId,matterName,matterCode,deptId,deptName,eventTypeShow,source,deptCode,createTime,createUserId,updateTime,hot,display) (siteId,siteName,matterId,matterName,createTime,createUserId,updateTime,deptId,deptName,matterCode,eventTypeShow,source,hot,display,deptCode,agent,agentName,agentPhone,agentPost)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.siteName},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.deptId},#{item.deptName},#{item.eventTypeShow},#{item.source},#{item.deptCode},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.hot},#{item.display}) (#{item.siteId},#{item.siteName},#{item.matterId},#{item.matterName},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.deptId},#{item.deptName},#{item.matterCode},#{item.eventTypeShow},#{item.source},#{item.hot},#{item.display},#{item.deptCode},#{item.agent},#{item.agentName},#{item.agentPhone},#{item.agentPost})
</foreach> </foreach>
</insert> </insert>
...@@ -120,8 +136,17 @@ ...@@ -120,8 +136,17 @@
<if test="(colPickMode==0 and data.containsKey('matterName')) or (colPickMode==1 and !data.containsKey('matterName'))"> <if test="(colPickMode==0 and data.containsKey('matterName')) or (colPickMode==1 and !data.containsKey('matterName'))">
a.matterName=#{data.matterName}, a.matterName=#{data.matterName},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('matterCode')) or (colPickMode==1 and !data.containsKey('matterCode'))"> <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.matterCode=#{data.matterCode}, a.createTime=#{data.createTime},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('deptId')) or (colPickMode==1 and !data.containsKey('deptId'))"> <if test="(colPickMode==0 and data.containsKey('deptId')) or (colPickMode==1 and !data.containsKey('deptId'))">
a.deptId=#{data.deptId}, a.deptId=#{data.deptId},
...@@ -132,6 +157,9 @@ ...@@ -132,6 +157,9 @@
<if test="(colPickMode==0 and data.containsKey('deptName')) or (colPickMode==1 and !data.containsKey('deptName'))"> <if test="(colPickMode==0 and data.containsKey('deptName')) or (colPickMode==1 and !data.containsKey('deptName'))">
a.deptName=#{data.deptName}, a.deptName=#{data.deptName},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('matterCode')) or (colPickMode==1 and !data.containsKey('matterCode'))">
a.matterCode=#{data.matterCode},
</if>
<if test="(colPickMode==0 and data.containsKey('eventTypeShow')) or (colPickMode==1 and !data.containsKey('eventTypeShow'))"> <if test="(colPickMode==0 and data.containsKey('eventTypeShow')) or (colPickMode==1 and !data.containsKey('eventTypeShow'))">
a.eventTypeShow=#{data.eventTypeShow}, a.eventTypeShow=#{data.eventTypeShow},
</if> </if>
...@@ -141,21 +169,6 @@ ...@@ -141,21 +169,6 @@
<if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))"> <if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))">
a.source=ifnull(a.source,0) + #{data.sourceIncrement}, a.source=ifnull(a.source,0) + #{data.sourceIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('deptCode')) or (colPickMode==1 and !data.containsKey('deptCode'))">
a.deptCode=#{data.deptCode},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
</if>
<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('hot')) or (colPickMode==1 and !data.containsKey('hot'))"> <if test="(colPickMode==0 and data.containsKey('hot')) or (colPickMode==1 and !data.containsKey('hot'))">
a.hot=#{data.hot}, a.hot=#{data.hot},
</if> </if>
...@@ -168,6 +181,24 @@ ...@@ -168,6 +181,24 @@
<if test="(colPickMode==0 and data.containsKey('displayIncrement')) or (colPickMode==1 and !data.containsKey('displayIncrement'))"> <if test="(colPickMode==0 and data.containsKey('displayIncrement')) or (colPickMode==1 and !data.containsKey('displayIncrement'))">
a.display=ifnull(a.display,0) + #{data.displayIncrement}, a.display=ifnull(a.display,0) + #{data.displayIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('deptCode')) or (colPickMode==1 and !data.containsKey('deptCode'))">
a.deptCode=#{data.deptCode},
</if>
<if test="(colPickMode==0 and data.containsKey('agent')) or (colPickMode==1 and !data.containsKey('agent'))">
a.agent=#{data.agent},
</if>
<if test="(colPickMode==0 and data.containsKey('agentIncrement')) or (colPickMode==1 and !data.containsKey('agentIncrement'))">
a.agent=ifnull(a.agent,0) + #{data.agentIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('agentName')) or (colPickMode==1 and !data.containsKey('agentName'))">
a.agentName=#{data.agentName},
</if>
<if test="(colPickMode==0 and data.containsKey('agentPhone')) or (colPickMode==1 and !data.containsKey('agentPhone'))">
a.agentPhone=#{data.agentPhone},
</if>
<if test="(colPickMode==0 and data.containsKey('agentPost')) or (colPickMode==1 and !data.containsKey('agentPost'))">
a.agentPost=#{data.agentPost},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -218,10 +249,29 @@ ...@@ -218,10 +249,29 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="matterCode=(case" suffix="ELSE matterCode end),"> <trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('matterCode')) or (colPickMode==1 and !item.containsKey('matterCode'))"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.matterCode} when a.id=#{item.id} then #{item.createTime}
</if>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime}
</if> </if>
</foreach> </foreach>
</trim> </trim>
...@@ -244,6 +294,13 @@ ...@@ -244,6 +294,13 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="matterCode=(case" suffix="ELSE matterCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('matterCode')) or (colPickMode==1 and !item.containsKey('matterCode'))">
when a.id=#{item.id} then #{item.matterCode}
</if>
</foreach>
</trim>
<trim prefix="eventTypeShow=(case" suffix="ELSE eventTypeShow end),"> <trim prefix="eventTypeShow=(case" suffix="ELSE eventTypeShow end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('eventTypeShow')) or (colPickMode==1 and !item.containsKey('eventTypeShow'))"> <if test="(colPickMode==0 and item.containsKey('eventTypeShow')) or (colPickMode==1 and !item.containsKey('eventTypeShow'))">
...@@ -263,39 +320,6 @@ ...@@ -263,39 +320,6 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deptCode=(case" suffix="ELSE deptCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deptCode')) or (colPickMode==1 and !item.containsKey('deptCode'))">
when a.id=#{item.id} then #{item.deptCode}
</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'))">
when a.id=#{item.id} then #{item.createTime}
</if>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime}
</if>
</foreach>
</trim>
<trim prefix="hot=(case" suffix="ELSE hot end),"> <trim prefix="hot=(case" suffix="ELSE hot end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -320,6 +344,46 @@ ...@@ -320,6 +344,46 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deptCode=(case" suffix="ELSE deptCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deptCode')) or (colPickMode==1 and !item.containsKey('deptCode'))">
when a.id=#{item.id} then #{item.deptCode}
</if>
</foreach>
</trim>
<trim prefix="agent=(case" suffix="ELSE agent end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('agent')) or (colPickMode==1 and !item.containsKey('agent'))">
when a.id=#{item.id} then #{item.agent}
</when>
<when test="(colPickMode==0 and item.containsKey('agentIncrement')) or (colPickMode==1 and !item.containsKey('agentIncrement'))">
when a.id=#{item.id} then ifnull(a.agent,0) + #{item.agentIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="agentName=(case" suffix="ELSE agentName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('agentName')) or (colPickMode==1 and !item.containsKey('agentName'))">
when a.id=#{item.id} then #{item.agentName}
</if>
</foreach>
</trim>
<trim prefix="agentPhone=(case" suffix="ELSE agentPhone end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('agentPhone')) or (colPickMode==1 and !item.containsKey('agentPhone'))">
when a.id=#{item.id} then #{item.agentPhone}
</if>
</foreach>
</trim>
<trim prefix="agentPost=(case" suffix="ELSE agentPost end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('agentPost')) or (colPickMode==1 and !item.containsKey('agentPost'))">
when a.id=#{item.id} then #{item.agentPost}
</if>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -560,26 +624,62 @@ ...@@ -560,26 +624,62 @@
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('matterCode')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.matterCode != null and conditionParamRef.matterCode != ''"> <if test="conditionParamRef.createTime != null ">
${_conditionType_} a.matterCode like #{${_conditionParam_}.matterCode} ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if> </if>
<if test="conditionParamRef.matterCode == null"> <if test="conditionParamRef.createTime == null">
${_conditionType_} a.matterCode is null ${_conditionType_} a.createTime is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('matterCodeList') and conditionParamRef.matterCodeList.size() > 0"> <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.matterCode in ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
<foreach collection="conditionParamRef.matterCodeList" open="(" close=")" index="index" item="item" separator=","> </if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
<if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('matterCodeNotList') and conditionParamRef.matterCodeNotList.size() > 0"> <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.matterCode not in ${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.matterCodeNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
<if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('deptId')"> <if test="conditionParamRef.containsKey('deptId')">
<if test="conditionParamRef.deptId != null "> <if test="conditionParamRef.deptId != null ">
${_conditionType_} a.deptId = #{${_conditionParam_}.deptId} ${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
...@@ -629,6 +729,27 @@ ...@@ -629,6 +729,27 @@
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('matterCode')">
<if test="conditionParamRef.matterCode != null and conditionParamRef.matterCode != ''">
${_conditionType_} a.matterCode like #{${_conditionParam_}.matterCode}
</if>
<if test="conditionParamRef.matterCode == null">
${_conditionType_} a.matterCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('matterCodeList') and conditionParamRef.matterCodeList.size() > 0">
${_conditionType_} a.matterCode in
<foreach collection="conditionParamRef.matterCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterCodeNotList') and conditionParamRef.matterCodeNotList.size() > 0">
${_conditionType_} a.matterCode not in
<foreach collection="conditionParamRef.matterCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('eventTypeShow')"> <if test="conditionParamRef.containsKey('eventTypeShow')">
<if test="conditionParamRef.eventTypeShow != null and conditionParamRef.eventTypeShow != ''"> <if test="conditionParamRef.eventTypeShow != null and conditionParamRef.eventTypeShow != ''">
${_conditionType_} a.eventTypeShow like #{${_conditionParam_}.eventTypeShow} ${_conditionType_} a.eventTypeShow like #{${_conditionParam_}.eventTypeShow}
...@@ -676,10 +797,64 @@ ...@@ -676,10 +797,64 @@
${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd} ${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
</if> </if>
<if test="conditionParamRef.containsKey('hot')">
<if test="conditionParamRef.containsKey('deptCode')"> <if test="conditionParamRef.hot != null ">
<if test="conditionParamRef.deptCode != null and conditionParamRef.deptCode != ''"> ${_conditionType_} a.hot = #{${_conditionParam_}.hot}
${_conditionType_} a.deptCode like #{${_conditionParam_}.deptCode} </if>
<if test="conditionParamRef.hot == null">
${_conditionType_} a.hot is null
</if>
</if>
<if test="conditionParamRef.containsKey('hotList') and conditionParamRef.hotList.size() > 0">
${_conditionType_} a.hot in
<foreach collection="conditionParamRef.hotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('hotNotList') and conditionParamRef.hotNotList.size() > 0">
${_conditionType_} a.hot not in
<foreach collection="conditionParamRef.hotNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('hotStart') and conditionParamRef.hotStart != null">
${_conditionType_} a.hot <![CDATA[ >= ]]> #{${_conditionParam_}.hotStart}
</if>
<if test="conditionParamRef.containsKey('hotEnd') and conditionParamRef.hotEnd != null">
${_conditionType_} a.hot <![CDATA[ <= ]]> #{${_conditionParam_}.hotEnd}
</if>
<if test="conditionParamRef.containsKey('display')">
<if test="conditionParamRef.display != null ">
${_conditionType_} a.display = #{${_conditionParam_}.display}
</if>
<if test="conditionParamRef.display == null">
${_conditionType_} a.display is null
</if>
</if>
<if test="conditionParamRef.containsKey('displayList') and conditionParamRef.displayList.size() > 0">
${_conditionType_} a.display in
<foreach collection="conditionParamRef.displayList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('displayNotList') and conditionParamRef.displayNotList.size() > 0">
${_conditionType_} a.display not in
<foreach collection="conditionParamRef.displayNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('displayStart') and conditionParamRef.displayStart != null">
${_conditionType_} a.display <![CDATA[ >= ]]> #{${_conditionParam_}.displayStart}
</if>
<if test="conditionParamRef.containsKey('displayEnd') and conditionParamRef.displayEnd != null">
${_conditionType_} a.display <![CDATA[ <= ]]> #{${_conditionParam_}.displayEnd}
</if>
<if test="conditionParamRef.containsKey('deptCode')">
<if test="conditionParamRef.deptCode != null and conditionParamRef.deptCode != ''">
${_conditionType_} a.deptCode like #{${_conditionParam_}.deptCode}
</if> </if>
<if test="conditionParamRef.deptCode == null"> <if test="conditionParamRef.deptCode == null">
${_conditionType_} a.deptCode is null ${_conditionType_} a.deptCode is null
...@@ -697,129 +872,234 @@ ...@@ -697,129 +872,234 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('agent')">
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.agent != null ">
<if test="conditionParamRef.createTime != null "> ${_conditionType_} a.agent = #{${_conditionParam_}.agent}
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if> </if>
<if test="conditionParamRef.createTime == null"> <if test="conditionParamRef.agent == null">
${_conditionType_} a.createTime is null ${_conditionType_} a.agent is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''"> <if test="conditionParamRef.containsKey('agentList') and conditionParamRef.agentList.size() > 0">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.agent in
<foreach collection="conditionParamRef.agentList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''"> <if test="conditionParamRef.containsKey('agentNotList') and conditionParamRef.agentNotList.size() > 0">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.agent not in
<foreach collection="conditionParamRef.agentNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserId')"> <if test="conditionParamRef.containsKey('agentStart') and conditionParamRef.agentStart != null">
<if test="conditionParamRef.createUserId != null "> ${_conditionType_} a.agent <![CDATA[ >= ]]> #{${_conditionParam_}.agentStart}
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if> </if>
<if test="conditionParamRef.createUserId == null"> <if test="conditionParamRef.containsKey('agentEnd') and conditionParamRef.agentEnd != null">
${_conditionType_} a.createUserId is null ${_conditionType_} a.agent <![CDATA[ <= ]]> #{${_conditionParam_}.agentEnd}
</if> </if>
<if test="conditionParamRef.containsKey('agentName')">
<if test="conditionParamRef.agentName != null and conditionParamRef.agentName != ''">
${_conditionType_} a.agentName like #{${_conditionParam_}.agentName}
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0"> <if test="conditionParamRef.agentName == null">
${_conditionType_} a.createUserId in ${_conditionType_} a.agentName is null
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> </if>
</if>
<if test="conditionParamRef.containsKey('agentNameList') and conditionParamRef.agentNameList.size() > 0">
${_conditionType_} a.agentName in
<foreach collection="conditionParamRef.agentNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0"> <if test="conditionParamRef.containsKey('agentNameNotList') and conditionParamRef.agentNameNotList.size() > 0">
${_conditionType_} a.createUserId not in ${_conditionType_} a.agentName not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.agentNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('agentPhone')">
<if test="conditionParamRef.containsKey('updateTime')"> <if test="conditionParamRef.agentPhone != null and conditionParamRef.agentPhone != ''">
<if test="conditionParamRef.updateTime != null "> ${_conditionType_} a.agentPhone like #{${_conditionParam_}.agentPhone}
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if> </if>
<if test="conditionParamRef.updateTime == null"> <if test="conditionParamRef.agentPhone == null">
${_conditionType_} a.updateTime is null ${_conditionType_} a.agentPhone is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''"> <if test="conditionParamRef.containsKey('agentPhoneList') and conditionParamRef.agentPhoneList.size() > 0">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.agentPhone in
<foreach collection="conditionParamRef.agentPhoneList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('agentPhoneNotList') and conditionParamRef.agentPhoneNotList.size() > 0">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.agentPhone not in
<foreach collection="conditionParamRef.agentPhoneNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('hot')">
<if test="conditionParamRef.hot != null "> <if test="conditionParamRef.containsKey('agentPost')">
${_conditionType_} a.hot = #{${_conditionParam_}.hot} <if test="conditionParamRef.agentPost != null and conditionParamRef.agentPost != ''">
${_conditionType_} a.agentPost like #{${_conditionParam_}.agentPost}
</if> </if>
<if test="conditionParamRef.hot == null"> <if test="conditionParamRef.agentPost == null">
${_conditionType_} a.hot is null ${_conditionType_} a.agentPost is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('hotList') and conditionParamRef.hotList.size() > 0"> <if test="conditionParamRef.containsKey('agentPostList') and conditionParamRef.agentPostList.size() > 0">
${_conditionType_} a.hot in ${_conditionType_} a.agentPost in
<foreach collection="conditionParamRef.hotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.agentPostList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('hotNotList') and conditionParamRef.hotNotList.size() > 0"> <if test="conditionParamRef.containsKey('agentPostNotList') and conditionParamRef.agentPostNotList.size() > 0">
${_conditionType_} a.hot not in ${_conditionType_} a.agentPost not in
<foreach collection="conditionParamRef.hotNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.agentPostNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('hotStart') and conditionParamRef.hotStart != null"> </sql>
${_conditionType_} a.hot <![CDATA[ >= ]]> #{${_conditionParam_}.hotStart} <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>
<if test="conditionParamRef.containsKey('hotEnd') and conditionParamRef.hotEnd != null"> <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.hot <![CDATA[ <= ]]> #{${_conditionParam_}.hotEnd} field(a.siteId,
<foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if> </if>
<if test="conditionParamRef.containsKey('matterIdList') and conditionParamRef.matterIdList.size() > 0">
<if test="conditionParamRef.containsKey('display')"> field(a.matterId,
<if test="conditionParamRef.display != null "> <foreach collection="conditionParamRef.matterIdList" open="" close=")" index="index" item="item" separator=",">
${_conditionType_} a.display = #{${_conditionParam_}.display} #{item}
</foreach>
,
</if> </if>
<if test="conditionParamRef.display == null"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.display is null field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if> </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>
<if test="conditionParamRef.containsKey('displayList') and conditionParamRef.displayList.size() > 0"> <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
${_conditionType_} a.display in field(a.source,
<foreach collection="conditionParamRef.displayList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
,
</if> </if>
<if test="conditionParamRef.containsKey('displayNotList') and conditionParamRef.displayNotList.size() > 0"> <if test="conditionParamRef.containsKey('hotList') and conditionParamRef.hotList.size() > 0">
${_conditionType_} a.display not in field(a.hot,
<foreach collection="conditionParamRef.displayNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.hotList" open="" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
,
</if> </if>
<if test="conditionParamRef.containsKey('displayStart') and conditionParamRef.displayStart != null"> <if test="conditionParamRef.containsKey('displayList') and conditionParamRef.displayList.size() > 0">
${_conditionType_} a.display <![CDATA[ >= ]]> #{${_conditionParam_}.displayStart} field(a.display,
<foreach collection="conditionParamRef.displayList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if> </if>
<if test="conditionParamRef.containsKey('displayEnd') and conditionParamRef.displayEnd != null"> <if test="conditionParamRef.containsKey('agentList') and conditionParamRef.agentList.size() > 0">
${_conditionType_} a.display <![CDATA[ <= ]]> #{${_conditionParam_}.displayEnd} field(a.agent,
<foreach collection="conditionParamRef.agentList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if> </if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} a.${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<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('matterIdList') and conditionParamRef.matterIdList.size() > 0">
field(a.matterId,
<foreach collection="conditionParamRef.matterIdList" 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('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('sourceList') and conditionParamRef.sourceList.size() > 0">
field(a.source,
<foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('hotList') and conditionParamRef.hotList.size() > 0">
field(a.hot,
<foreach collection="conditionParamRef.hotList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('displayList') and conditionParamRef.displayList.size() > 0">
field(a.display,
<foreach collection="conditionParamRef.displayList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('agentList') and conditionParamRef.agentList.size() > 0">
field(a.agent,
<foreach collection="conditionParamRef.agentList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
...@@ -846,9 +1126,19 @@ ...@@ -846,9 +1126,19 @@
<if test='orderCol.matterName != null and "DESC".equalsIgnoreCase(orderCol.matterName)'>DESC</if> <if test='orderCol.matterName != null and "DESC".equalsIgnoreCase(orderCol.matterName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('matterCode')"> <if test="orderCol.containsKey('createTime')">
a.matterCode a.createTime
<if test='orderCol.matterCode != null and "DESC".equalsIgnoreCase(orderCol.matterCode)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateTime')">
a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deptId')"> <if test="orderCol.containsKey('deptId')">
...@@ -861,6 +1151,11 @@ ...@@ -861,6 +1151,11 @@
<if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if> <if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('matterCode')">
a.matterCode
<if test='orderCol.matterCode != null and "DESC".equalsIgnoreCase(orderCol.matterCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('eventTypeShow')"> <if test="orderCol.containsKey('eventTypeShow')">
a.eventTypeShow a.eventTypeShow
<if test='orderCol.eventTypeShow != null and "DESC".equalsIgnoreCase(orderCol.eventTypeShow)'>DESC</if> <if test='orderCol.eventTypeShow != null and "DESC".equalsIgnoreCase(orderCol.eventTypeShow)'>DESC</if>
...@@ -871,44 +1166,51 @@ ...@@ -871,44 +1166,51 @@
<if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if> <if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('hot')">
a.hot
<if test='orderCol.hot != null and "DESC".equalsIgnoreCase(orderCol.hot)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('display')">
a.display
<if test='orderCol.display != null and "DESC".equalsIgnoreCase(orderCol.display)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deptCode')"> <if test="orderCol.containsKey('deptCode')">
a.deptCode a.deptCode
<if test='orderCol.deptCode != null and "DESC".equalsIgnoreCase(orderCol.deptCode)'>DESC</if> <if test='orderCol.deptCode != null and "DESC".equalsIgnoreCase(orderCol.deptCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('agent')">
a.createTime a.agent
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.agent != null and "DESC".equalsIgnoreCase(orderCol.agent)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createUserId')"> <if test="orderCol.containsKey('agentName')">
a.createUserId a.agentName
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if> <if test='orderCol.agentName != null and "DESC".equalsIgnoreCase(orderCol.agentName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateTime')">
a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('hot')"> <if test="orderCol.containsKey('agentPhone')">
a.hot a.agentPhone
<if test='orderCol.hot != null and "DESC".equalsIgnoreCase(orderCol.hot)'>DESC</if> <if test='orderCol.agentPhone != null and "DESC".equalsIgnoreCase(orderCol.agentPhone)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('display')"> <if test="orderCol.containsKey('agentPost')">
a.display a.agentPost
<if test='orderCol.display != null and "DESC".equalsIgnoreCase(orderCol.display)'>DESC</if> <if test='orderCol.agentPost != null and "DESC".equalsIgnoreCase(orderCol.agentPost)'>DESC</if>
, ,
</if> </if>
</trim> </trim>
</if> </if>
</sql> </sql>
<sql id="_group_by_"> <sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()"> <if test="groupList != null and !groupList.isEmpty()">
GROUP BY GROUP BY
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="gr·oupList" open="" close="" index="index" item="item" separator=","> <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
${item} ${item}
</foreach> </foreach>
</trim> </trim>
......
base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http
View file @ 35d4afc3
...@@ -90,7 +90,7 @@ POST {{baseUrl}}/site/getFlatSitesByAreaCode ...@@ -90,7 +90,7 @@ POST {{baseUrl}}/site/getFlatSitesByAreaCode
Content-Type: application/json Content-Type: application/json
{ {
"areaCode":"511502000000" "siteName": "%高新%"
} }
###根据区域等级获取站点列表 ###根据区域等级获取站点列表
...@@ -98,7 +98,7 @@ POST {{baseUrl}}/site/getAreaSitesByAreaLevel ...@@ -98,7 +98,7 @@ POST {{baseUrl}}/site/getAreaSitesByAreaLevel
Content-Type: application/json Content-Type: application/json
{ {
"siteName":"徐州区办事处" "siteName":"%高新%"
} }
###站点列表 ###站点列表
...@@ -115,7 +115,7 @@ POST {{baseUrl}}/site/syncGovMatterBySiteId ...@@ -115,7 +115,7 @@ POST {{baseUrl}}/site/syncGovMatterBySiteId
Content-Type: application/json Content-Type: application/json
{ {
"id":1 "id":23
} }
......
base-manager/src/test/java/com/mortals/httpclient/window/WindowBusinessController.http
View file @ 35d4afc3
...@@ -11,7 +11,7 @@ Content-Type: application/json ...@@ -11,7 +11,7 @@ Content-Type: application/json
POST {{baseUrl}}/window/business/interlist POST {{baseUrl}}/window/business/interlist
Content-Type: application/json Content-Type: application/json
{"siteBusinessId":2,"size":-1,"searchCache": 1} {"siteBusinessId":212,"searchCache": 1}
###窗口业务列表缓存2 ###窗口业务列表缓存2
POST {{baseUrl}}/window/business/interlist POST {{baseUrl}}/window/business/interlist
......
smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/AccessLogFilter.java
View file @ 35d4afc3
package com.mortals.xhx.base.framework.filter; package com.mortals.xhx.base.framework.filter;
import cn.hutool.core.net.NetUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.model.AccessLogPdu; import com.mortals.framework.model.AccessLogPdu;
...@@ -22,8 +20,6 @@ import org.springframework.cloud.gateway.support.ServerWebExchangeUtils; ...@@ -22,8 +20,6 @@ import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.DataBufferFactory; import org.springframework.core.io.buffer.DataBufferFactory;
import org.springframework.core.io.buffer.DataBufferUtils;
import org.springframework.core.io.buffer.DefaultDataBufferFactory;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
...@@ -42,7 +38,6 @@ import org.springframework.web.server.ServerWebExchange; ...@@ -42,7 +38,6 @@ import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import java.nio.charset.StandardCharsets;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -53,7 +48,7 @@ import java.util.Map; ...@@ -53,7 +48,7 @@ import java.util.Map;
* @description: * @description:
**/ **/
@Slf4j @Slf4j
//@Component @Component
public class AccessLogFilter implements GlobalFilter, Ordered { public class AccessLogFilter implements GlobalFilter, Ordered {
@Value("${spring.application.name:gateway}") @Value("${spring.application.name:gateway}")
private String appName; private String appName;
...@@ -106,7 +101,7 @@ public class AccessLogFilter implements GlobalFilter, Ordered { ...@@ -106,7 +101,7 @@ public class AccessLogFilter implements GlobalFilter, Ordered {
accessLogPdu.setLogTime(new Date()); accessLogPdu.setLogTime(new Date());
accessLogPdu.setMethod(request.getMethodValue()); accessLogPdu.setMethod(request.getMethodValue());
log.info("origin uri:{} host:{} port:{},contentLens", requestPath, request.getHeaders().getHost().getHostName(), request.getHeaders().getHost().getPort(),request.getHeaders().getContentLength()); // log.info("origin uri:{} host:{} port:{},contentLens", requestPath, request.getHeaders().getHost().getHostName(), request.getHeaders().getHost().getPort(),request.getHeaders().getContentLength());
MediaType mediaType = request.getHeaders().getContentType(); MediaType mediaType = request.getHeaders().getContentType();
if (request.getHeaders().getContentLength() > 1024 * 64) { if (request.getHeaders().getContentLength() > 1024 * 64) {
...@@ -226,7 +221,7 @@ public class AccessLogFilter implements GlobalFilter, Ordered { ...@@ -226,7 +221,7 @@ public class AccessLogFilter implements GlobalFilter, Ordered {
@Override @Override
public Flux<DataBuffer> getBody() { public Flux<DataBuffer> getBody() {
log.info("outputMessage.getBody() contentLength:"); // log.info("outputMessage.getBody() contentLength:");
return outputMessage.getBody(); return outputMessage.getBody();
} }
}; };
......
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