Skip to content

C
chuanshan_gov_platform
Commit 55c35bdf authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

纠错管理bug修改

parent 920d332c
Show whitespace changes
Inline Side-by-side
Showing with 1730 additions and 352 deletions
knowledge-base/src/main/java/com/mortals/xhx/module/error/service/impl/ErrorRecoveryServiceImpl.java
View file @ 55c35bdf
...@@ -38,6 +38,7 @@ public class ErrorRecoveryServiceImpl extends AbstractCRUDServiceImpl<ErrorRecov ...@@ -38,6 +38,7 @@ public class ErrorRecoveryServiceImpl extends AbstractCRUDServiceImpl<ErrorRecov
entity.setAnswerUserId(context.getUser().getId()); entity.setAnswerUserId(context.getUser().getId());
entity.setAnswerUserName(context.getUser().getRealName()); entity.setAnswerUserName(context.getUser().getRealName());
} }
entity.setAnswerDate(new Date());
} }
super.updateBefore(entity,context); super.updateBefore(entity,context);
} }
......
knowledge-base/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumFileEntity.java
View file @ 55c35bdf
...@@ -7,10 +7,10 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,10 +7,10 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.matter.model.vo.MatterDatumFileVo; import com.mortals.xhx.module.matter.model.vo.MatterDatumFileVo;
/** /**
* 材料附件实体对象 * 材料附件业务实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-16 * @date 2023-03-11
*/ */
public class MatterDatumFileEntity extends MatterDatumFileVo { public class MatterDatumFileEntity extends MatterDatumFileVo {
...@@ -37,17 +37,21 @@ public class MatterDatumFileEntity extends MatterDatumFileVo { ...@@ -37,17 +37,21 @@ public class MatterDatumFileEntity extends MatterDatumFileVo {
*/ */
private String fileUrl; private String fileUrl;
/** /**
* 附件本地下载地址 * 本地文件地址
*/ */
private String localFileUrl; private String localFileUrl;
/** /**
* 附件类型 (示例样表.示例样表，空白表格.空白表格) * 附件类型 (1.示例样表，2.空白表格)
*/ */
private String filetype; private String filetype;
/** /**
* 附件来源 (0.政务网，1.自定义) * 附件来源 (0.政务网，1.自定义)
*/ */
private Integer source; private Integer source;
/**
* 预览地址
*/
private String previewUrl;
...@@ -123,28 +127,28 @@ public class MatterDatumFileEntity extends MatterDatumFileVo { ...@@ -123,28 +127,28 @@ public class MatterDatumFileEntity extends MatterDatumFileVo {
this.fileUrl = fileUrl; this.fileUrl = fileUrl;
} }
/** /**
* 获取 附件本地下载地址 * 获取 本地文件地址
* @return String * @return String
*/ */
public String getLocalFileUrl(){ public String getLocalFileUrl(){
return localFileUrl; return localFileUrl;
} }
/** /**
* 设置 附件本地下载地址 * 设置 本地文件地址
* @param localFileUrl * @param localFileUrl
*/ */
public void setLocalFileUrl(String localFileUrl){ public void setLocalFileUrl(String localFileUrl){
this.localFileUrl = localFileUrl; this.localFileUrl = localFileUrl;
} }
/** /**
* 获取 附件类型 (示例样表.示例样表，空白表格.空白表格) * 获取 附件类型 (1.示例样表，2.空白表格)
* @return String * @return String
*/ */
public String getFiletype(){ public String getFiletype(){
return filetype; return filetype;
} }
/** /**
* 设置 附件类型 (示例样表.示例样表，空白表格.空白表格) * 设置 附件类型 (1.示例样表，2.空白表格)
* @param filetype * @param filetype
*/ */
public void setFiletype(String filetype){ public void setFiletype(String filetype){
...@@ -164,6 +168,20 @@ public class MatterDatumFileEntity extends MatterDatumFileVo { ...@@ -164,6 +168,20 @@ public class MatterDatumFileEntity extends MatterDatumFileVo {
public void setSource(Integer source){ public void setSource(Integer source){
this.source = source; this.source = source;
} }
/**
* 获取 预览地址
* @return String
*/
public String getPreviewUrl(){
return previewUrl;
}
/**
* 设置 预览地址
* @param previewUrl
*/
public void setPreviewUrl(String previewUrl){
this.previewUrl = previewUrl;
}
...@@ -194,6 +212,7 @@ public class MatterDatumFileEntity extends MatterDatumFileVo { ...@@ -194,6 +212,7 @@ public class MatterDatumFileEntity extends MatterDatumFileVo {
sb.append(",localFileUrl:").append(getLocalFileUrl()); sb.append(",localFileUrl:").append(getLocalFileUrl());
sb.append(",filetype:").append(getFiletype()); sb.append(",filetype:").append(getFiletype());
sb.append(",source:").append(getSource()); sb.append(",source:").append(getSource());
sb.append(",previewUrl:").append(getPreviewUrl());
return sb.toString(); return sb.toString();
} }
...@@ -211,8 +230,10 @@ public class MatterDatumFileEntity extends MatterDatumFileVo { ...@@ -211,8 +230,10 @@ public class MatterDatumFileEntity extends MatterDatumFileVo {
this.localFileUrl = ""; this.localFileUrl = "";
this.filetype = "示例样表"; this.filetype = "";
this.source = 0;
this.source = 1; this.previewUrl = "";
} }
} }
\ No newline at end of file
knowledge-base/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumFileQuery.java
View file @ 55c35bdf
...@@ -3,10 +3,10 @@ package com.mortals.xhx.module.matter.model; ...@@ -3,10 +3,10 @@ package com.mortals.xhx.module.matter.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.matter.model.MatterDatumFileEntity; import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
/** /**
* 材料附件查询对象 * 材料附件业务查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-16 * @date 2023-03-11
*/ */
public class MatterDatumFileQuery extends MatterDatumFileEntity { public class MatterDatumFileQuery extends MatterDatumFileEntity {
/** 开始 主键，自增长 */ /** 开始 主键，自增长 */
...@@ -21,6 +21,9 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -21,6 +21,9 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
/** 主键，自增长列表 */ /** 主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 材料id */ /** 开始 材料id */
private Long datumIdStart; private Long datumIdStart;
...@@ -33,24 +36,39 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -33,24 +36,39 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
/** 材料id列表 */ /** 材料id列表 */
private List <Long> datumIdList; private List <Long> datumIdList;
/** 材料id排除列表 */
private List <Long> datumIdNotList;
/** 事项编码 */ /** 事项编码 */
private List<String> matterCodeList; private List<String> matterCodeList;
/** 事项编码排除列表 */
private List <String> matterCodeNotList;
/** 材料名 */ /** 材料名 */
private List<String> materialNameList; private List<String> materialNameList;
/** 材料名排除列表 */
private List <String> materialNameNotList;
/** 附件名称 */ /** 附件名称 */
private List<String> fileNameList; private List<String> fileNameList;
/** 附件名称排除列表 */
private List <String> fileNameNotList;
/** 附件下载地址 */ /** 附件下载地址 */
private List<String> fileUrlList; private List<String> fileUrlList;
/** 附件本地下载地址 */ /** 附件下载地址排除列表 */
private List <String> fileUrlNotList;
/** 本地文件地址 */
private List<String> localFileUrlList; private List<String> localFileUrlList;
/** 附件类型 (示例样表.示例样表，空白表格.空白表格) */ /** 本地文件地址排除列表 */
private List <String> localFileUrlNotList;
/** 附件类型 (1.示例样表，2.空白表格) */
private List<String> filetypeList; private List<String> filetypeList;
/** 附件类型 (1.示例样表，2.空白表格)排除列表 */
private List <String> filetypeNotList;
/** 开始 附件来源 (0.政务网，1.自定义) */ /** 开始 附件来源 (0.政务网，1.自定义) */
private Integer sourceStart; private Integer sourceStart;
...@@ -63,6 +81,14 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -63,6 +81,14 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
/** 附件来源 (0.政务网，1.自定义)列表 */ /** 附件来源 (0.政务网，1.自定义)列表 */
private List <Integer> sourceList; private List <Integer> sourceList;
/** 附件来源 (0.政务网，1.自定义)排除列表 */
private List <Integer> sourceNotList;
/** 预览地址 */
private List<String> previewUrlList;
/** 预览地址排除列表 */
private List <String> previewUrlNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -81,6 +107,9 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -81,6 +107,9 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 修改时间 */ /** 开始 修改时间 */
private String updateTimeStart; private String updateTimeStart;
...@@ -159,6 +188,23 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -159,6 +188,23 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 开始 材料id * 获取 开始 材料id
* @return datumIdStart * @return datumIdStart
...@@ -223,6 +269,23 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -223,6 +269,23 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
this.datumIdList = datumIdList; this.datumIdList = datumIdList;
} }
/**
* 获取 材料id
* @return datumIdNotList
*/
public List<Long> getDatumIdNotList(){
return this.datumIdNotList;
}
/**
* 设置 材料id
* @param datumIdNotList
*/
public void setDatumIdNotList(List<Long> datumIdNotList){
this.datumIdNotList = datumIdNotList;
}
/** /**
* 获取 事项编码 * 获取 事项编码
* @return matterCodeList * @return matterCodeList
...@@ -238,6 +301,23 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -238,6 +301,23 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
public void setMatterCodeList(List<String> matterCodeList){ public void setMatterCodeList(List<String> matterCodeList){
this.matterCodeList = matterCodeList; this.matterCodeList = matterCodeList;
} }
/**
* 获取 事项编码
* @return matterCodeNotList
*/
public List<String> getMatterCodeNotList(){
return this.matterCodeNotList;
}
/**
* 设置 事项编码
* @param matterCodeNotList
*/
public void setMatterCodeNotList(List<String> matterCodeNotList){
this.matterCodeNotList = matterCodeNotList;
}
/** /**
* 获取 材料名 * 获取 材料名
* @return materialNameList * @return materialNameList
...@@ -253,6 +333,23 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -253,6 +333,23 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
public void setMaterialNameList(List<String> materialNameList){ public void setMaterialNameList(List<String> materialNameList){
this.materialNameList = materialNameList; this.materialNameList = materialNameList;
} }
/**
* 获取 材料名
* @return materialNameNotList
*/
public List<String> getMaterialNameNotList(){
return this.materialNameNotList;
}
/**
* 设置 材料名
* @param materialNameNotList
*/
public void setMaterialNameNotList(List<String> materialNameNotList){
this.materialNameNotList = materialNameNotList;
}
/** /**
* 获取 附件名称 * 获取 附件名称
* @return fileNameList * @return fileNameList
...@@ -268,6 +365,23 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -268,6 +365,23 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
public void setFileNameList(List<String> fileNameList){ public void setFileNameList(List<String> fileNameList){
this.fileNameList = fileNameList; this.fileNameList = fileNameList;
} }
/**
* 获取 附件名称
* @return fileNameNotList
*/
public List<String> getFileNameNotList(){
return this.fileNameNotList;
}
/**
* 设置 附件名称
* @param fileNameNotList
*/
public void setFileNameNotList(List<String> fileNameNotList){
this.fileNameNotList = fileNameNotList;
}
/** /**
* 获取 附件下载地址 * 获取 附件下载地址
* @return fileUrlList * @return fileUrlList
...@@ -283,8 +397,25 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -283,8 +397,25 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
public void setFileUrlList(List<String> fileUrlList){ public void setFileUrlList(List<String> fileUrlList){
this.fileUrlList = fileUrlList; this.fileUrlList = fileUrlList;
} }
/**
* 获取 附件下载地址
* @return fileUrlNotList
*/
public List<String> getFileUrlNotList(){
return this.fileUrlNotList;
}
/**
* 设置 附件下载地址
* @param fileUrlNotList
*/
public void setFileUrlNotList(List<String> fileUrlNotList){
this.fileUrlNotList = fileUrlNotList;
}
/** /**
* 获取 附件本地下载地址 * 获取 本地文件地址
* @return localFileUrlList * @return localFileUrlList
*/ */
public List<String> getLocalFileUrlList(){ public List<String> getLocalFileUrlList(){
...@@ -292,14 +423,31 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -292,14 +423,31 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
} }
/** /**
* 设置 附件本地下载地址 * 设置 本地文件地址
* @param localFileUrlList * @param localFileUrlList
*/ */
public void setLocalFileUrlList(List<String> localFileUrlList){ public void setLocalFileUrlList(List<String> localFileUrlList){
this.localFileUrlList = localFileUrlList; this.localFileUrlList = localFileUrlList;
} }
/**
* 获取 本地文件地址
* @return localFileUrlNotList
*/
public List<String> getLocalFileUrlNotList(){
return this.localFileUrlNotList;
}
/** /**
* 获取 附件类型 (示例样表.示例样表，空白表格.空白表格) * 设置 本地文件地址
* @param localFileUrlNotList
*/
public void setLocalFileUrlNotList(List<String> localFileUrlNotList){
this.localFileUrlNotList = localFileUrlNotList;
}
/**
* 获取 附件类型 (1.示例样表，2.空白表格)
* @return filetypeList * @return filetypeList
*/ */
public List<String> getFiletypeList(){ public List<String> getFiletypeList(){
...@@ -307,12 +455,29 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -307,12 +455,29 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
} }
/** /**
* 设置 附件类型 (示例样表.示例样表，空白表格.空白表格) * 设置 附件类型 (1.示例样表，2.空白表格)
* @param filetypeList * @param filetypeList
*/ */
public void setFiletypeList(List<String> filetypeList){ public void setFiletypeList(List<String> filetypeList){
this.filetypeList = filetypeList; this.filetypeList = filetypeList;
} }
/**
* 获取 附件类型 (1.示例样表，2.空白表格)
* @return filetypeNotList
*/
public List<String> getFiletypeNotList(){
return this.filetypeNotList;
}
/**
* 设置 附件类型 (1.示例样表，2.空白表格)
* @param filetypeNotList
*/
public void setFiletypeNotList(List<String> filetypeNotList){
this.filetypeNotList = filetypeNotList;
}
/** /**
* 获取 开始 附件来源 (0.政务网，1.自定义) * 获取 开始 附件来源 (0.政务网，1.自定义)
* @return sourceStart * @return sourceStart
...@@ -377,6 +542,55 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -377,6 +542,55 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
this.sourceList = sourceList; this.sourceList = sourceList;
} }
/**
* 获取 附件来源 (0.政务网，1.自定义)
* @return sourceNotList
*/
public List<Integer> getSourceNotList(){
return this.sourceNotList;
}
/**
* 设置 附件来源 (0.政务网，1.自定义)
* @param sourceNotList
*/
public void setSourceNotList(List<Integer> sourceNotList){
this.sourceNotList = sourceNotList;
}
/**
* 获取 预览地址
* @return previewUrlList
*/
public List<String> getPreviewUrlList(){
return this.previewUrlList;
}
/**
* 设置 预览地址
* @param previewUrlList
*/
public void setPreviewUrlList(List<String> previewUrlList){
this.previewUrlList = previewUrlList;
}
/**
* 获取 预览地址
* @return previewUrlNotList
*/
public List<String> getPreviewUrlNotList(){
return this.previewUrlNotList;
}
/**
* 设置 预览地址
* @param previewUrlNotList
*/
public void setPreviewUrlNotList(List<String> previewUrlNotList){
this.previewUrlNotList = previewUrlNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -473,6 +687,23 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -473,6 +687,23 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
this.createUserIdList = 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 * @return updateTimeStart
...@@ -550,6 +781,15 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -550,6 +781,15 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
return this; return this;
} }
/**
* 设置 主键，自增长
* @param idNotList
*/
public MatterDatumFileQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 材料id * 设置 材料id
* @param datumId * @param datumId
...@@ -595,6 +835,15 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -595,6 +835,15 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
return this; return this;
} }
/**
* 设置 材料id
* @param datumIdNotList
*/
public MatterDatumFileQuery datumIdNotList(List<Long> datumIdNotList){
this.datumIdNotList = datumIdNotList;
return this;
}
/** /**
* 设置 事项编码 * 设置 事项编码
...@@ -673,7 +922,7 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -673,7 +922,7 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
/** /**
* 设置 附件本地下载地址 * 设置 本地文件地址
* @param localFileUrl * @param localFileUrl
*/ */
public MatterDatumFileQuery localFileUrl(String localFileUrl){ public MatterDatumFileQuery localFileUrl(String localFileUrl){
...@@ -682,7 +931,7 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -682,7 +931,7 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
} }
/** /**
* 设置 附件本地下载地址 * 设置 本地文件地址
* @param localFileUrlList * @param localFileUrlList
*/ */
public MatterDatumFileQuery localFileUrlList(List<String> localFileUrlList){ public MatterDatumFileQuery localFileUrlList(List<String> localFileUrlList){
...@@ -692,7 +941,7 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -692,7 +941,7 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
/** /**
* 设置 附件类型 (示例样表.示例样表，空白表格.空白表格) * 设置 附件类型 (1.示例样表，2.空白表格)
* @param filetype * @param filetype
*/ */
public MatterDatumFileQuery filetype(String filetype){ public MatterDatumFileQuery filetype(String filetype){
...@@ -701,7 +950,7 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -701,7 +950,7 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
} }
/** /**
* 设置 附件类型 (示例样表.示例样表，空白表格.空白表格) * 设置 附件类型 (1.示例样表，2.空白表格)
* @param filetypeList * @param filetypeList
*/ */
public MatterDatumFileQuery filetypeList(List<String> filetypeList){ public MatterDatumFileQuery filetypeList(List<String> filetypeList){
...@@ -754,6 +1003,34 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -754,6 +1003,34 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
return this; return this;
} }
/**
* 设置 附件来源 (0.政务网，1.自定义)
* @param sourceNotList
*/
public MatterDatumFileQuery sourceNotList(List<Integer> sourceNotList){
this.sourceNotList = sourceNotList;
return this;
}
/**
* 设置 预览地址
* @param previewUrl
*/
public MatterDatumFileQuery previewUrl(String previewUrl){
setPreviewUrl(previewUrl);
return this;
}
/**
* 设置 预览地址
* @param previewUrlList
*/
public MatterDatumFileQuery previewUrlList(List<String> previewUrlList){
this.previewUrlList = previewUrlList;
return this;
}
/** /**
* 设置 创建用户 * 设置 创建用户
...@@ -800,6 +1077,15 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity { ...@@ -800,6 +1077,15 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public MatterDatumFileQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
......
knowledge-base/src/main/java/com/mortals/xhx/module/matter/service/MatterDatumService.java
View file @ 55c35bdf
package com.mortals.xhx.module.matter.service; package com.mortals.xhx.module.matter.service;
import com.mortals.framework.common.Rest;
import com.mortals.framework.model.Context;
import com.mortals.framework.service.ICRUDService; import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.matter.model.MatterDatumEntity; import com.mortals.xhx.module.matter.model.MatterDatumEntity;
/** /**
...@@ -11,4 +13,12 @@ import com.mortals.xhx.module.matter.model.MatterDatumEntity; ...@@ -11,4 +13,12 @@ import com.mortals.xhx.module.matter.model.MatterDatumEntity;
*/ */
public interface MatterDatumService extends ICRUDService<MatterDatumEntity,Long>{ public interface MatterDatumService extends ICRUDService<MatterDatumEntity,Long>{
/**
* 添加材料到公共库
*
* @param datumIds
* @param siteId
* @param context
*/
Rest<String> addToLibrary(String datumIds, Long siteId, Context context);
} }
\ No newline at end of file
knowledge-base/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumFileServiceImpl.java
View file @ 55c35bdf
package com.mortals.xhx.module.matter.service.impl; package com.mortals.xhx.module.matter.service.impl;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.RandomUtil;
import com.mortals.framework.exception.AppException;
import com.mortals.xhx.common.utils.HttpDownloadUtil;
import com.mortals.xhx.common.utils.WordUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.module.matter.dao.MatterDatumFileDao; import com.mortals.xhx.module.matter.dao.MatterDatumFileDao;
...@@ -6,6 +12,8 @@ import com.mortals.xhx.module.matter.model.MatterDatumFileEntity; ...@@ -6,6 +12,8 @@ import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
import com.mortals.xhx.module.matter.service.MatterDatumFileService; import com.mortals.xhx.module.matter.service.MatterDatumFileService;
import javax.naming.Context; import javax.naming.Context;
import java.io.File;
import java.io.FileNotFoundException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
...@@ -19,10 +27,71 @@ import java.util.Map; ...@@ -19,10 +27,71 @@ import java.util.Map;
@Service("matterDatumFileService") @Service("matterDatumFileService")
public class MatterDatumFileServiceImpl extends AbstractCRUDServiceImpl<MatterDatumFileDao, MatterDatumFileEntity, Long> implements MatterDatumFileService { public class MatterDatumFileServiceImpl extends AbstractCRUDServiceImpl<MatterDatumFileDao, MatterDatumFileEntity, Long> implements MatterDatumFileService {
@Value("${upload.path}")
private String filePath;
public static String word[] = {"doc", "dot", "wps", "wpt", "docx", "dotx", "docm", "dotm"};
public static String imgs[] = {"jpg", "png", "jpeg", "gif"};
public static String pdf[] = {"pdf"};
@Override @Override
public void deleteFileByDatumId(Long datumId, Context context) { public void deleteFileByDatumId(Long datumId, Context context) {
Map<String, Object> condition = new HashMap<>(); Map<String, Object> condition = new HashMap<>();
condition.put("datumId", datumId); condition.put("datumId", datumId);
this.dao.delete(condition); this.dao.delete(condition);
} }
@Override
protected void saveBefore(MatterDatumFileEntity entity, com.mortals.framework.model.Context context) throws AppException {
this.validData(entity, context);
String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
String prePath = "file/preview/";
String savePath = entity.getLocalFileUrl();
String newName = genPreviewPath(rootPath, prePath, savePath);
entity.setPreviewUrl(prePath+newName);
}
protected void updateBefore(MatterDatumFileEntity entity, com.mortals.framework.model.Context context) throws AppException {
this.validData(entity, context);
String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
String prePath = "file/preview/";
String savePath = entity.getLocalFileUrl();
String newName = genPreviewPath(rootPath, prePath, savePath);
entity.setPreviewUrl(prePath+newName);
}
private String genPreviewPath(String rootPath, String prePath, String tempPath) {
//生成样表预览图片
String samplePath = rootPath + tempPath;
String filePath = rootPath + prePath;
File pathDir = new File(filePath);
if (!pathDir.exists()) {
pathDir.mkdirs();
}
String newName = RandomUtil.randomNumbers(12) + ".jpg";
String filePathAll = filePath + newName;
//判断文件类型是否为doc pdf jpg png 等
String extName = FileUtil.getSuffix(samplePath);
if (this.isExsitArry(extName, word)) {
WordUtil.convertWordToJPEG(samplePath, filePathAll);
} else if (this.isExsitArry(extName, pdf)) {
WordUtil.pdfToImages(samplePath, filePathAll);
} else if (this.isExsitArry(extName, imgs)) {
try {
com.mortals.framework.util.FileUtil.copyFile(samplePath, filePathAll);
} catch (FileNotFoundException e) {
throw new RuntimeException(e);
}
}
return newName;
}
public boolean isExsitArry(String chex, String arry[]) {
for (String ex : arry) {
if (chex.equalsIgnoreCase(ex)) {
return true;
}
}
return false;
}
} }
\ No newline at end of file
knowledge-base/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java
View file @ 55c35bdf
package com.mortals.xhx.module.matter.service.impl; package com.mortals.xhx.module.matter.service.impl;
import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.xhx.base.system.upload.service.UploadService; import com.mortals.xhx.base.system.upload.service.UploadService;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.module.matter.model.*; import com.mortals.xhx.module.matter.model.*;
import com.mortals.xhx.module.matter.service.MatterDatumFileService; import com.mortals.xhx.module.matter.service.MatterDatumFileService;
import com.mortals.xhx.module.matter.service.MatterService; import com.mortals.xhx.module.matter.service.MatterService;
import com.mortals.xhx.module.site.model.*;
import com.mortals.xhx.module.site.service.SiteDatumLibraryService;
import com.mortals.xhx.module.site.service.SiteService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
...@@ -13,7 +19,11 @@ import com.mortals.xhx.module.matter.dao.MatterDatumDao; ...@@ -13,7 +19,11 @@ import com.mortals.xhx.module.matter.dao.MatterDatumDao;
import com.mortals.xhx.module.matter.service.MatterDatumService; import com.mortals.xhx.module.matter.service.MatterDatumService;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
/** /**
* MatterDatumService * MatterDatumService
...@@ -31,6 +41,10 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD ...@@ -31,6 +41,10 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
private MatterDatumFileService matterDatumFileService; private MatterDatumFileService matterDatumFileService;
@Autowired @Autowired
private UploadService uploadService; private UploadService uploadService;
@Autowired
private SiteDatumLibraryService siteDatumLibraryService;
@Autowired
private SiteService siteService;
@Override @Override
...@@ -83,4 +97,63 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD ...@@ -83,4 +97,63 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
} }
@Override
public Rest<String> addToLibrary(String datumIds, Long siteId, Context context) {
if (ObjectUtils.isEmpty(siteId)) {
throw new AppException("请选择对应站点");
}
List<Long> datumIdList = Arrays.asList(datumIds.split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
MatterDatumQuery datumQuery = new MatterDatumQuery();
datumQuery.setIdList(datumIdList);
List<MatterDatumEntity> entities = this.find(datumQuery);
int success = 0;
int fail = 0;
List<SiteDatumLibraryEntity> addEntities = new ArrayList<>();
for (MatterDatumEntity datum : entities) {
SiteDatumLibraryEntity datumLibrary = updateOrSave(datum, siteId, context);
//SiteMatterEntity siteMatterEntity = updateOrSave(matterEntity, siteId, context);
if (!ObjectUtils.isEmpty(datumLibrary)) {
addEntities.add(datumLibrary);
success++;
} else {
fail++;
}
}
if (!ObjectUtils.isEmpty(addEntities)) {
siteDatumLibraryService.save(addEntities, context);
}
String msg = "当前加入材料已存在！";
if (datumIdList.size() == 1) {
if (success > 0) {
msg = "加入材料成功！";
}
} else if (datumIdList.size() > 1) {
if (success > 0 && fail == 0) {
msg = String.format("加入材料成功%d条!", success);
} else if (success > 0 && fail > 0) {
msg = String.format("加入材料成功%d条，重复加入材料%d条！", success, fail);
} else if (success == 0 && fail > 0) {
msg = String.format("重复加入材料%d条！", fail);
}
}
return Rest.ok(msg);
}
private SiteDatumLibraryEntity updateOrSave(MatterDatumEntity item, Long siteId, Context context) {
SiteDatumLibraryEntity siteDatumLibraryEntity = siteDatumLibraryService.selectOne(new SiteDatumLibraryQuery().siteId(siteId).datumId(item.getId()));
if (ObjectUtils.isEmpty(siteDatumLibraryEntity)) {
SiteEntity siteEntity = siteService.getCache(siteId.toString());
SiteDatumLibraryEntity datumLibraryEntity = BeanUtil.covert(item,SiteDatumLibraryEntity.class);
datumLibraryEntity.setDatumId(item.getId());
datumLibraryEntity.setSiteId(siteId);
datumLibraryEntity.setSiteName(siteEntity==null?"":siteEntity.getSiteName());
datumLibraryEntity.setCreateTime(new Date());
if(context!=null&&context.getUser()!=null) {
datumLibraryEntity.setCreateUserId(context.getUser().getId());
}
return datumLibraryEntity;
}
return null;
}
} }
\ No newline at end of file
knowledge-base/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
View file @ 55c35bdf
...@@ -259,9 +259,13 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -259,9 +259,13 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
siteMatterEntity.setMatterId(item.getId()); siteMatterEntity.setMatterId(item.getId());
siteMatterEntity.setMatterCode(item.getMatterNo()); siteMatterEntity.setMatterCode(item.getMatterNo());
siteMatterEntity.setMatterName(item.getMatterName()); siteMatterEntity.setMatterName(item.getMatterName());
siteMatterEntity.setMatterCode(item.getTcode());
siteMatterEntity.setDeptCode(item.getDeptCode()); siteMatterEntity.setDeptCode(item.getDeptCode());
siteMatterEntity.setSource(item.getSource()); siteMatterEntity.setSource(item.getSource());
siteMatterEntity.setEventTypeShow(item.getEventTypeShow()); siteMatterEntity.setEventTypeShow(item.getEventTypeShow());
siteMatterEntity.setViewsCount(0l);
siteMatterEntity.setIsConvert(0);
siteMatterEntity.setUrl(item.getUrl());
siteMatterEntity.setDeptName(deptEntity == null ? "" : deptEntity.getName()); siteMatterEntity.setDeptName(deptEntity == null ? "" : deptEntity.getName());
siteMatterEntity.setDeptId(deptEntity == null ? -1L : deptEntity.getId()); siteMatterEntity.setDeptId(deptEntity == null ? -1L : deptEntity.getId());
siteMatterEntity.setCreateUserId(context == null ? 1L : context.getUser() == null ? 1L : context.getUser().getId()); siteMatterEntity.setCreateUserId(context == null ? 1L : context.getUser() == null ? 1L : context.getUser().getId());
......
knowledge-base/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java
View file @ 55c35bdf
...@@ -165,6 +165,11 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe ...@@ -165,6 +165,11 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
int code=VALUE_RESULT_SUCCESS; int code=VALUE_RESULT_SUCCESS;
try { try {
PageInfo pageInfo = buildPageInfo(query); PageInfo pageInfo = buildPageInfo(query);
if(ObjectUtils.isEmpty(query.getEventTypeShowNotList())){
ArrayList<String> notList = new ArrayList<>();
notList.add("行政处罚");
query.setEventTypeShowNotList(notList);
}
Result<MatterEntity> result = this.getService().findSubList(query, pageInfo, context); Result<MatterEntity> result = this.getService().findSubList(query, pageInfo, context);
model.put(KEY_RESULT_DATA, result.getList()); model.put(KEY_RESULT_DATA, result.getList());
model.put(PAGEINFO_KEY, result.getPageInfo()); model.put(PAGEINFO_KEY, result.getPageInfo());
......
knowledge-base/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java
View file @ 55c35bdf
package com.mortals.xhx.module.matter.web; package com.mortals.xhx.module.matter.web;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.util.DataUtil;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.framework.web.BasePhpCRUDJsonMappingController; import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
...@@ -11,9 +14,12 @@ import com.mortals.xhx.module.matter.model.MatterDatumFileQuery; ...@@ -11,9 +14,12 @@ import com.mortals.xhx.module.matter.model.MatterDatumFileQuery;
import com.mortals.xhx.module.matter.service.MatterDatumFileService; import com.mortals.xhx.module.matter.service.MatterDatumFileService;
import com.mortals.xhx.module.matter.service.MatterDatumService; import com.mortals.xhx.module.matter.service.MatterDatumService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -59,4 +65,28 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat ...@@ -59,4 +65,28 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
entity.setDatumFileList(matterDatumFileEntities); entity.setDatumFileList(matterDatumFileEntities);
return super.viewAfter(id, model, entity, context); return super.viewAfter(id, model, entity, context);
} }
/**
* 添加事项到站点
*/
@PostMapping(value = "addToLibrary")
public String addToLibrary(@RequestBody Map<String, Object> map) {
JSONObject jsonObject = new JSONObject();
Map<String, Object> model = new HashMap<String, Object>();
String datumIds = (String) map.get("datumIds");
Long siteId = DataUtil.converStr2Long(map.get("siteId").toString(), 0L);
try {
Rest<String> rest = this.service.addToLibrary(datumIds, siteId, getContext());
jsonObject.put(KEY_RESULT_MSG, rest.getMsg());
jsonObject.put(KEY_RESULT_DATA, model);
jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
this.recordSysLog(this.request, rest.getMsg());
} catch (Exception e) {
log.error("获取异常", e);
jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
jsonObject.put(KEY_RESULT_MSG, super.convertException(e));
}
return jsonObject.toJSONString();
}
} }
\ No newline at end of file
knowledge-base/src/main/java/com/mortals/xhx/module/site/dao/SiteMatterDao.java
View file @ 55c35bdf
...@@ -8,8 +8,9 @@ import java.util.List; ...@@ -8,8 +8,9 @@ import java.util.List;
* 站点事项 DAO接口 * 站点事项 DAO接口
* *
* @author zxfei * @author zxfei
* @date 2022-01-12 * @date 2023-03-10
*/ */
public interface SiteMatterDao extends ICRUDDao<SiteMatterEntity,Long>{ public interface SiteMatterDao extends ICRUDDao<SiteMatterEntity,Long>{
......
knowledge-base/src/main/java/com/mortals/xhx/module/site/dao/ibatis/SiteMatterDaoImpl.java
View file @ 55c35bdf
...@@ -11,7 +11,7 @@ import java.util.List; ...@@ -11,7 +11,7 @@ import java.util.List;
* 站点事项DaoImpl DAO接口 * 站点事项DaoImpl DAO接口
* *
* @author zxfei * @author zxfei
* @date 2022-01-12 * @date 2023-03-10
*/ */
@Repository("siteMatterDao") @Repository("siteMatterDao")
public class SiteMatterDaoImpl extends BaseCRUDDaoMybatis<SiteMatterEntity,Long> implements SiteMatterDao { public class SiteMatterDaoImpl extends BaseCRUDDaoMybatis<SiteMatterEntity,Long> implements SiteMatterDao {
......
knowledge-base/src/main/java/com/mortals/xhx/module/site/model/SiteMatterEntity.java
View file @ 55c35bdf
package com.mortals.xhx.module.site.model; package com.mortals.xhx.module.site.model;
import com.mortals.xhx.common.code.SourceEnum; import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.site.model.vo.SiteMatterVo; import com.mortals.xhx.module.site.model.vo.SiteMatterVo;
/** /**
* 站点事项实体对象 * 站点事项实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-16 * @date 2023-03-11
*/ */
public class SiteMatterEntity extends SiteMatterVo { public class SiteMatterEntity extends SiteMatterVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 站点ID * 站点id
*/ */
private Long siteId; private Long siteId;
/** /**
...@@ -41,30 +45,42 @@ public class SiteMatterEntity extends SiteMatterVo { ...@@ -41,30 +45,42 @@ public class SiteMatterEntity extends SiteMatterVo {
*/ */
private String deptName; private String deptName;
/** /**
* 事项类型 * 部门编码
*/ */
private String eventTypeShow; private String deptCode;
/** /**
* 事项来源 * 事项来源
*/ */
private Integer source; private Integer source;
/** /**
* 部门编号 * 事项类型
*/ */
private String deptCode; private String eventTypeShow;
/**
* 浏览次数
*/
private Long viewsCount;
/**
* 是否生成本地附件
*/
private Integer isConvert;
/**
* 事项详情链接
*/
private String url;
public SiteMatterEntity(){} public SiteMatterEntity(){}
/** /**
* 获取 站点ID * 获取 站点id
* @return Long * @return Long
*/ */
public Long getSiteId(){ public Long getSiteId(){
return siteId; return siteId;
} }
/** /**
* 设置 站点ID * 设置 站点id
* @param siteId * @param siteId
*/ */
public void setSiteId(Long siteId){ public void setSiteId(Long siteId){
...@@ -155,25 +171,24 @@ public class SiteMatterEntity extends SiteMatterVo { ...@@ -155,25 +171,24 @@ public class SiteMatterEntity extends SiteMatterVo {
this.deptName = deptName; this.deptName = deptName;
} }
/** /**
* 获取 事项类型 * 获取 部门编码
* @return String * @return String
*/ */
public String getEventTypeShow(){ public String getDeptCode(){
return eventTypeShow; return deptCode;
} }
/** /**
* 设置 事项类型 * 设置 部门编码
* @param eventTypeShow * @param deptCode
*/ */
public void setEventTypeShow(String eventTypeShow){ public void setDeptCode(String deptCode){
this.eventTypeShow = eventTypeShow; this.deptCode = deptCode;
} }
/** /**
* 获取 事项来源 * 获取 事项来源
* @return Integer * @return Integer
*/ */
public Integer getSource(){ public Integer getSource(){
return source; return source;
} }
/** /**
...@@ -184,18 +199,60 @@ public class SiteMatterEntity extends SiteMatterVo { ...@@ -184,18 +199,60 @@ public class SiteMatterEntity extends SiteMatterVo {
this.source = source; this.source = source;
} }
/** /**
* 获取 部门编号 * 获取 事项类型
* @return String * @return String
*/ */
public String getDeptCode(){ public String getEventTypeShow(){
return deptCode; return eventTypeShow;
} }
/** /**
* 设置 部门编号 * 设置 事项类型
* @param deptCode * @param eventTypeShow
*/ */
public void setDeptCode(String deptCode){ public void setEventTypeShow(String eventTypeShow){
this.deptCode = deptCode; this.eventTypeShow = eventTypeShow;
}
/**
* 获取 浏览次数
* @return Long
*/
public Long getViewsCount(){
return viewsCount;
}
/**
* 设置 浏览次数
* @param viewsCount
*/
public void setViewsCount(Long viewsCount){
this.viewsCount = viewsCount;
}
/**
* 获取 是否生成本地附件
* @return Integer
*/
public Integer getIsConvert(){
return isConvert;
}
/**
* 设置 是否生成本地附件
* @param isConvert
*/
public void setIsConvert(Integer isConvert){
this.isConvert = isConvert;
}
/**
* 获取 事项详情链接
* @return String
*/
public String getUrl(){
return url;
}
/**
* 设置 事项详情链接
* @param url
*/
public void setUrl(String url){
this.url = url;
} }
...@@ -226,9 +283,12 @@ public class SiteMatterEntity extends SiteMatterVo { ...@@ -226,9 +283,12 @@ public class SiteMatterEntity extends SiteMatterVo {
sb.append(",matterCode:").append(getMatterCode()); sb.append(",matterCode:").append(getMatterCode());
sb.append(",deptId:").append(getDeptId()); sb.append(",deptId:").append(getDeptId());
sb.append(",deptName:").append(getDeptName()); sb.append(",deptName:").append(getDeptName());
sb.append(",eventTypeShow:").append(getEventTypeShow());
sb.append(",source:").append(getSource());
sb.append(",deptCode:").append(getDeptCode()); sb.append(",deptCode:").append(getDeptCode());
sb.append(",source:").append(getSource());
sb.append(",eventTypeShow:").append(getEventTypeShow());
sb.append(",viewsCount:").append(getViewsCount());
sb.append(",isConvert:").append(getIsConvert());
sb.append(",url:").append(getUrl());
return sb.toString(); return sb.toString();
} }
...@@ -248,10 +308,16 @@ public class SiteMatterEntity extends SiteMatterVo { ...@@ -248,10 +308,16 @@ public class SiteMatterEntity extends SiteMatterVo {
this.deptName = ""; this.deptName = "";
this.deptCode = "";
this.source = null;
this.eventTypeShow = ""; this.eventTypeShow = "";
this.source = 0; this.viewsCount = 0L;
this.deptCode = ""; this.isConvert = 0;
this.url = "";
} }
} }
\ No newline at end of file
knowledge-base/src/main/java/com/mortals/xhx/module/site/model/SiteMatterQuery.java
View file @ 55c35bdf
...@@ -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-02-21 * @date 2023-03-11
*/ */
public class SiteMatterQuery extends SiteMatterEntity { public class SiteMatterQuery extends SiteMatterEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -24,19 +24,19 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -24,19 +24,19 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** 序号，主键，自增长排除列表 */ /** 序号，主键，自增长排除列表 */
private List <Long> idNotList; private List <Long> idNotList;
/** 开始 站点ID */ /** 开始 站点id */
private Long siteIdStart; private Long siteIdStart;
/** 结束 站点ID */ /** 结束 站点id */
private Long siteIdEnd; private Long siteIdEnd;
/** 增加 站点ID */ /** 增加 站点id */
private Long siteIdIncrement; private Long siteIdIncrement;
/** 站点ID列表 */ /** 站点id列表 */
private List <Long> siteIdList; private List <Long> siteIdList;
/** 站点ID排除列表 */ /** 站点id排除列表 */
private List <Long> siteIdNotList; private List <Long> siteIdNotList;
/** 站点名称 */ /** 站点名称 */
...@@ -89,11 +89,11 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -89,11 +89,11 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** 部门名称排除列表 */ /** 部门名称排除列表 */
private List <String> deptNameNotList; private List <String> deptNameNotList;
/** 事项类型 */ /** 部门编码 */
private List<String> eventTypeShowList; private List<String> deptCodeList;
/** 事项类型排除列表 */ /** 部门编码排除列表 */
private List <String> eventTypeShowNotList; private List <String> deptCodeNotList;
/** 开始 事项来源 */ /** 开始 事项来源 */
private Integer sourceStart; private Integer sourceStart;
...@@ -109,16 +109,40 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -109,16 +109,40 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** 事项来源排除列表 */ /** 事项来源排除列表 */
private List <Integer> sourceNotList; private List <Integer> sourceNotList;
/** 部门编号 */ /** 事项类型 */
private List<String> deptCodeList; private List<String> eventTypeShowList;
/** 部门编号排除列表 */ /** 事项类型排除列表 */
private List <String> deptCodeNotList; private List <String> eventTypeShowNotList;
/** 开始 创建时间 */ /** 开始 浏览次数 */
private String createTimeStart; private Long viewsCountStart;
/** 结束 创建时间 */ /** 结束 浏览次数 */
private String createTimeEnd; private Long viewsCountEnd;
/** 增加 浏览次数 */
private Long viewsCountIncrement;
/** 浏览次数列表 */
private List <Long> viewsCountList;
/** 浏览次数排除列表 */
private List <Long> viewsCountNotList;
/** 开始 是否生成本地附件 */
private Integer isConvertStart;
/** 结束 是否生成本地附件 */
private Integer isConvertEnd;
/** 增加 是否生成本地附件 */
private Integer isConvertIncrement;
/** 是否生成本地附件列表 */
private List <Integer> isConvertList;
/** 是否生成本地附件排除列表 */
private List <Integer> isConvertNotList;
/** 开始 创建用户 */ /** 开始 创建用户 */
private Long createUserIdStart; private Long createUserIdStart;
...@@ -135,12 +159,38 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -135,12 +159,38 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** 创建用户排除列表 */ /** 创建用户排除列表 */
private List <Long> createUserIdNotList; private List <Long> createUserIdNotList;
/** 开始 修改时间 */ /** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
/** 开始 更新用户 */
private Long updateUserIdStart;
/** 结束 更新用户 */
private Long updateUserIdEnd;
/** 增加 更新用户 */
private Long updateUserIdIncrement;
/** 更新用户列表 */
private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */
private String updateTimeStart; private String updateTimeStart;
/** 结束 修改时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 事项详情链接 */
private List<String> urlList;
/** 事项详情链接排除列表 */
private List <String> urlNotList;
/** 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;
...@@ -231,7 +281,7 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -231,7 +281,7 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** /**
* 获取 开始 站点ID * 获取 开始 站点id
* @return siteIdStart * @return siteIdStart
*/ */
public Long getSiteIdStart(){ public Long getSiteIdStart(){
...@@ -239,7 +289,7 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -239,7 +289,7 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 设置 开始 站点ID * 设置 开始 站点id
* @param siteIdStart * @param siteIdStart
*/ */
public void setSiteIdStart(Long siteIdStart){ public void setSiteIdStart(Long siteIdStart){
...@@ -247,7 +297,7 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -247,7 +297,7 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 获取 结束 站点ID * 获取 结束 站点id
* @return $siteIdEnd * @return $siteIdEnd
*/ */
public Long getSiteIdEnd(){ public Long getSiteIdEnd(){
...@@ -255,7 +305,7 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -255,7 +305,7 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 设置 结束 站点ID * 设置 结束 站点id
* @param siteIdEnd * @param siteIdEnd
*/ */
public void setSiteIdEnd(Long siteIdEnd){ public void setSiteIdEnd(Long siteIdEnd){
...@@ -263,7 +313,7 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -263,7 +313,7 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 获取 增加 站点ID * 获取 增加 站点id
* @return siteIdIncrement * @return siteIdIncrement
*/ */
public Long getSiteIdIncrement(){ public Long getSiteIdIncrement(){
...@@ -271,7 +321,7 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -271,7 +321,7 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 设置 增加 站点ID * 设置 增加 站点id
* @param siteIdIncrement * @param siteIdIncrement
*/ */
public void setSiteIdIncrement(Long siteIdIncrement){ public void setSiteIdIncrement(Long siteIdIncrement){
...@@ -279,7 +329,7 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -279,7 +329,7 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 获取 站点ID * 获取 站点id
* @return siteIdList * @return siteIdList
*/ */
public List<Long> getSiteIdList(){ public List<Long> getSiteIdList(){
...@@ -287,7 +337,7 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -287,7 +337,7 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 设置 站点ID * 设置 站点id
* @param siteIdList * @param siteIdList
*/ */
public void setSiteIdList(List<Long> siteIdList){ public void setSiteIdList(List<Long> siteIdList){
...@@ -295,7 +345,7 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -295,7 +345,7 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 获取 站点ID * 获取 站点id
* @return siteIdNotList * @return siteIdNotList
*/ */
public List<Long> getSiteIdNotList(){ public List<Long> getSiteIdNotList(){
...@@ -303,7 +353,7 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -303,7 +353,7 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 设置 站点ID * 设置 站点id
* @param siteIdNotList * @param siteIdNotList
*/ */
public void setSiteIdNotList(List<Long> siteIdNotList){ public void setSiteIdNotList(List<Long> siteIdNotList){
...@@ -602,35 +652,35 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -602,35 +652,35 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 获取 事项类型 * 获取 部门编码
* @return eventTypeShowList * @return deptCodeList
*/ */
public List<String> getEventTypeShowList(){ public List<String> getDeptCodeList(){
return this.eventTypeShowList; return this.deptCodeList;
} }
/** /**
* 设置 事项类型 * 设置 部门编码
* @param eventTypeShowList * @param deptCodeList
*/ */
public void setEventTypeShowList(List<String> eventTypeShowList){ public void setDeptCodeList(List<String> deptCodeList){
this.eventTypeShowList = eventTypeShowList; this.deptCodeList = deptCodeList;
} }
/** /**
* 获取 事项类型 * 获取 部门编码
* @return eventTypeShowNotList * @return deptCodeNotList
*/ */
public List<String> getEventTypeShowNotList(){ public List<String> getDeptCodeNotList(){
return this.eventTypeShowNotList; return this.deptCodeNotList;
} }
/** /**
* 设置 事项类型 * 设置 部门编码
* @param eventTypeShowNotList * @param deptCodeNotList
*/ */
public void setEventTypeShowNotList(List<String> eventTypeShowNotList){ public void setDeptCodeNotList(List<String> deptCodeNotList){
this.eventTypeShowNotList = eventTypeShowNotList; this.deptCodeNotList = deptCodeNotList;
} }
/** /**
...@@ -715,69 +765,199 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -715,69 +765,199 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** /**
* 获取 部门编号 * 获取 事项类型
* @return deptCodeList * @return eventTypeShowList
*/ */
public List<String> getDeptCodeList(){ public List<String> getEventTypeShowList(){
return this.deptCodeList; return this.eventTypeShowList;
} }
/** /**
* 设置 部门编号 * 设置 事项类型
* @param deptCodeList * @param eventTypeShowList
*/ */
public void setDeptCodeList(List<String> deptCodeList){ public void setEventTypeShowList(List<String> eventTypeShowList){
this.deptCodeList = deptCodeList; this.eventTypeShowList = eventTypeShowList;
} }
/** /**
* 获取 部门编号 * 获取 事项类型
* @return deptCodeNotList * @return eventTypeShowNotList
*/ */
public List<String> getDeptCodeNotList(){ public List<String> getEventTypeShowNotList(){
return this.deptCodeNotList; return this.eventTypeShowNotList;
} }
/** /**
* 设置 部门编号 * 设置 事项类型
* @param deptCodeNotList * @param eventTypeShowNotList
*/ */
public void setDeptCodeNotList(List<String> deptCodeNotList){ public void setEventTypeShowNotList(List<String> eventTypeShowNotList){
this.deptCodeNotList = deptCodeNotList; this.eventTypeShowNotList = eventTypeShowNotList;
} }
/** /**
* 获取 开始 创建时间 * 获取 开始 浏览次数
* @return createTimeStart * @return viewsCountStart
*/ */
public String getCreateTimeStart(){ public Long getViewsCountStart(){
return this.createTimeStart; return this.viewsCountStart;
} }
/** /**
* 设置 开始 创建时间 * 设置 开始 浏览次数
* @param createTimeStart * @param viewsCountStart
*/ */
public void setCreateTimeStart(String createTimeStart){ public void setViewsCountStart(Long viewsCountStart){
this.createTimeStart = createTimeStart; this.viewsCountStart = viewsCountStart;
} }
/** /**
* 获取 结束 创建时间 * 获取 结束 浏览次数
* @return createTimeEnd * @return $viewsCountEnd
*/ */
public String getCreateTimeEnd(){ public Long getViewsCountEnd(){
return this.createTimeEnd; return this.viewsCountEnd;
} }
/** /**
* 设置 结束 创建时间 * 设置 结束 浏览次数
* @param createTimeEnd * @param viewsCountEnd
*/ */
public void setCreateTimeEnd(String createTimeEnd){ public void setViewsCountEnd(Long viewsCountEnd){
this.createTimeEnd = createTimeEnd; this.viewsCountEnd = viewsCountEnd;
}
/**
* 获取 增加 浏览次数
* @return viewsCountIncrement
*/
public Long getViewsCountIncrement(){
return this.viewsCountIncrement;
}
/**
* 设置 增加 浏览次数
* @param viewsCountIncrement
*/
public void setViewsCountIncrement(Long viewsCountIncrement){
this.viewsCountIncrement = viewsCountIncrement;
}
/**
* 获取 浏览次数
* @return viewsCountList
*/
public List<Long> getViewsCountList(){
return this.viewsCountList;
}
/**
* 设置 浏览次数
* @param viewsCountList
*/
public void setViewsCountList(List<Long> viewsCountList){
this.viewsCountList = viewsCountList;
}
/**
* 获取 浏览次数
* @return viewsCountNotList
*/
public List<Long> getViewsCountNotList(){
return this.viewsCountNotList;
}
/**
* 设置 浏览次数
* @param viewsCountNotList
*/
public void setViewsCountNotList(List<Long> viewsCountNotList){
this.viewsCountNotList = viewsCountNotList;
}
/**
* 获取 开始 是否生成本地附件
* @return isConvertStart
*/
public Integer getIsConvertStart(){
return this.isConvertStart;
}
/**
* 设置 开始 是否生成本地附件
* @param isConvertStart
*/
public void setIsConvertStart(Integer isConvertStart){
this.isConvertStart = isConvertStart;
}
/**
* 获取 结束 是否生成本地附件
* @return $isConvertEnd
*/
public Integer getIsConvertEnd(){
return this.isConvertEnd;
}
/**
* 设置 结束 是否生成本地附件
* @param isConvertEnd
*/
public void setIsConvertEnd(Integer isConvertEnd){
this.isConvertEnd = isConvertEnd;
} }
/**
* 获取 增加 是否生成本地附件
* @return isConvertIncrement
*/
public Integer getIsConvertIncrement(){
return this.isConvertIncrement;
}
/**
* 设置 增加 是否生成本地附件
* @param isConvertIncrement
*/
public void setIsConvertIncrement(Integer isConvertIncrement){
this.isConvertIncrement = isConvertIncrement;
}
/**
* 获取 是否生成本地附件
* @return isConvertList
*/
public List<Integer> getIsConvertList(){
return this.isConvertList;
}
/**
* 设置 是否生成本地附件
* @param isConvertList
*/
public void setIsConvertList(List<Integer> isConvertList){
this.isConvertList = isConvertList;
}
/**
* 获取 是否生成本地附件
* @return isConvertNotList
*/
public List<Integer> getIsConvertNotList(){
return this.isConvertNotList;
}
/**
* 设置 是否生成本地附件
* @param isConvertNotList
*/
public void setIsConvertNotList(List<Integer> isConvertNotList){
this.isConvertNotList = isConvertNotList;
}
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
...@@ -860,7 +1040,120 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -860,7 +1040,120 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** /**
* 获取 开始 修改时间 * 获取 开始 创建时间
* @return createTimeStart
*/
public String getCreateTimeStart(){
return this.createTimeStart;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
}
/**
* 获取 结束 创建时间
* @return createTimeEnd
*/
public String getCreateTimeEnd(){
return this.createTimeEnd;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/**
* 获取 开始 更新用户
* @return updateUserIdStart
*/
public Long getUpdateUserIdStart(){
return this.updateUserIdStart;
}
/**
* 设置 开始 更新用户
* @param updateUserIdStart
*/
public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
}
/**
* 获取 结束 更新用户
* @return $updateUserIdEnd
*/
public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd;
}
/**
* 设置 结束 更新用户
* @param updateUserIdEnd
*/
public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
}
/**
* 获取 增加 更新用户
* @return updateUserIdIncrement
*/
public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement;
}
/**
* 设置 增加 更新用户
* @param updateUserIdIncrement
*/
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
}
/**
* 获取 更新用户
* @return updateUserIdList
*/
public List<Long> getUpdateUserIdList(){
return this.updateUserIdList;
}
/**
* 设置 更新用户
* @param updateUserIdList
*/
public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
}
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/**
* 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
*/ */
public String getUpdateTimeStart(){ public String getUpdateTimeStart(){
...@@ -868,7 +1161,7 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -868,7 +1161,7 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 设置 开始 修改时间 * 设置 开始 更新时间
* @param updateTimeStart * @param updateTimeStart
*/ */
public void setUpdateTimeStart(String updateTimeStart){ public void setUpdateTimeStart(String updateTimeStart){
...@@ -876,7 +1169,7 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -876,7 +1169,7 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 获取 结束 修改时间 * 获取 结束 更新时间
* @return updateTimeEnd * @return updateTimeEnd
*/ */
public String getUpdateTimeEnd(){ public String getUpdateTimeEnd(){
...@@ -884,13 +1177,45 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -884,13 +1177,45 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 设置 结束 修改时间 * 设置 结束 更新时间
* @param updateTimeEnd * @param updateTimeEnd
*/ */
public void setUpdateTimeEnd(String updateTimeEnd){ public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 事项详情链接
* @return urlList
*/
public List<String> getUrlList(){
return this.urlList;
}
/**
* 设置 事项详情链接
* @param urlList
*/
public void setUrlList(List<String> urlList){
this.urlList = urlList;
}
/**
* 获取 事项详情链接
* @return urlNotList
*/
public List<String> getUrlNotList(){
return this.urlNotList;
}
/**
* 设置 事项详情链接
* @param urlNotList
*/
public void setUrlNotList(List<String> urlNotList){
this.urlNotList = urlNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -946,7 +1271,7 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -946,7 +1271,7 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 设置 站点ID * 设置 站点id
* @param siteId * @param siteId
*/ */
public SiteMatterQuery siteId(Long siteId){ public SiteMatterQuery siteId(Long siteId){
...@@ -955,7 +1280,7 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -955,7 +1280,7 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 设置 开始 站点ID * 设置 开始 站点id
* @param siteIdStart * @param siteIdStart
*/ */
public SiteMatterQuery siteIdStart(Long siteIdStart){ public SiteMatterQuery siteIdStart(Long siteIdStart){
...@@ -964,7 +1289,7 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -964,7 +1289,7 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 设置 结束 站点ID * 设置 结束 站点id
* @param siteIdEnd * @param siteIdEnd
*/ */
public SiteMatterQuery siteIdEnd(Long siteIdEnd){ public SiteMatterQuery siteIdEnd(Long siteIdEnd){
...@@ -973,7 +1298,7 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -973,7 +1298,7 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 设置 增加 站点ID * 设置 增加 站点id
* @param siteIdIncrement * @param siteIdIncrement
*/ */
public SiteMatterQuery siteIdIncrement(Long siteIdIncrement){ public SiteMatterQuery siteIdIncrement(Long siteIdIncrement){
...@@ -982,7 +1307,7 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -982,7 +1307,7 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 设置 站点ID * 设置 站点id
* @param siteIdList * @param siteIdList
*/ */
public SiteMatterQuery siteIdList(List<Long> siteIdList){ public SiteMatterQuery siteIdList(List<Long> siteIdList){
...@@ -991,7 +1316,7 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -991,7 +1316,7 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/** /**
* 设置 站点ID * 设置 站点id
* @param siteIdNotList * @param siteIdNotList
*/ */
public SiteMatterQuery siteIdNotList(List<Long> siteIdNotList){ public SiteMatterQuery siteIdNotList(List<Long> siteIdNotList){
...@@ -1185,20 +1510,20 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -1185,20 +1510,20 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** /**
* 设置 事项类型 * 设置 部门编码
* @param eventTypeShow * @param deptCode
*/ */
public SiteMatterQuery eventTypeShow(String eventTypeShow){ public SiteMatterQuery deptCode(String deptCode){
setEventTypeShow(eventTypeShow); setDeptCode(deptCode);
return this; return this;
} }
/** /**
* 设置 事项类型 * 设置 部门编码
* @param eventTypeShowList * @param deptCodeList
*/ */
public SiteMatterQuery eventTypeShowList(List<String> eventTypeShowList){ public SiteMatterQuery deptCodeList(List<String> deptCodeList){
this.eventTypeShowList = eventTypeShowList; this.deptCodeList = deptCodeList;
return this; return this;
} }
...@@ -1258,23 +1583,130 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -1258,23 +1583,130 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** /**
* 设置 部门编号 * 设置 事项类型
* @param deptCode * @param eventTypeShow
*/ */
public SiteMatterQuery deptCode(String deptCode){ public SiteMatterQuery eventTypeShow(String eventTypeShow){
setDeptCode(deptCode); setEventTypeShow(eventTypeShow);
return this; return this;
} }
/** /**
* 设置 部门编号 * 设置 事项类型
* @param deptCodeList * @param eventTypeShowList
*/ */
public SiteMatterQuery deptCodeList(List<String> deptCodeList){ public SiteMatterQuery eventTypeShowList(List<String> eventTypeShowList){
this.deptCodeList = deptCodeList; this.eventTypeShowList = eventTypeShowList;
return this;
}
/**
* 设置 浏览次数
* @param viewsCount
*/
public SiteMatterQuery viewsCount(Long viewsCount){
setViewsCount(viewsCount);
return this;
}
/**
* 设置 开始 浏览次数
* @param viewsCountStart
*/
public SiteMatterQuery viewsCountStart(Long viewsCountStart){
this.viewsCountStart = viewsCountStart;
return this;
}
/**
* 设置 结束 浏览次数
* @param viewsCountEnd
*/
public SiteMatterQuery viewsCountEnd(Long viewsCountEnd){
this.viewsCountEnd = viewsCountEnd;
return this;
}
/**
* 设置 增加 浏览次数
* @param viewsCountIncrement
*/
public SiteMatterQuery viewsCountIncrement(Long viewsCountIncrement){
this.viewsCountIncrement = viewsCountIncrement;
return this;
}
/**
* 设置 浏览次数
* @param viewsCountList
*/
public SiteMatterQuery viewsCountList(List<Long> viewsCountList){
this.viewsCountList = viewsCountList;
return this;
}
/**
* 设置 浏览次数
* @param viewsCountNotList
*/
public SiteMatterQuery viewsCountNotList(List<Long> viewsCountNotList){
this.viewsCountNotList = viewsCountNotList;
return this;
}
/**
* 设置 是否生成本地附件
* @param isConvert
*/
public SiteMatterQuery isConvert(Integer isConvert){
setIsConvert(isConvert);
return this;
}
/**
* 设置 开始 是否生成本地附件
* @param isConvertStart
*/
public SiteMatterQuery isConvertStart(Integer isConvertStart){
this.isConvertStart = isConvertStart;
return this;
}
/**
* 设置 结束 是否生成本地附件
* @param isConvertEnd
*/
public SiteMatterQuery isConvertEnd(Integer isConvertEnd){
this.isConvertEnd = isConvertEnd;
return this;
}
/**
* 设置 增加 是否生成本地附件
* @param isConvertIncrement
*/
public SiteMatterQuery isConvertIncrement(Integer isConvertIncrement){
this.isConvertIncrement = isConvertIncrement;
return this;
}
/**
* 设置 是否生成本地附件
* @param isConvertList
*/
public SiteMatterQuery isConvertList(List<Integer> isConvertList){
this.isConvertList = isConvertList;
return this; return this;
} }
/**
* 设置 是否生成本地附件
* @param isConvertNotList
*/
public SiteMatterQuery isConvertNotList(List<Integer> isConvertNotList){
this.isConvertNotList = isConvertNotList;
return this;
}
/** /**
* 设置 创建用户 * 设置 创建用户
...@@ -1331,6 +1763,80 @@ public class SiteMatterQuery extends SiteMatterEntity { ...@@ -1331,6 +1763,80 @@ public class SiteMatterQuery extends SiteMatterEntity {
} }
/**
* 设置 更新用户
* @param updateUserId
*/
public SiteMatterQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId);
return this;
}
/**
* 设置 开始 更新用户
* @param updateUserIdStart
*/
public SiteMatterQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
return this;
}
/**
* 设置 结束 更新用户
* @param updateUserIdEnd
*/
public SiteMatterQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
return this;
}
/**
* 设置 增加 更新用户
* @param updateUserIdIncrement
*/
public SiteMatterQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
return this;
}
/**
* 设置 更新用户
* @param updateUserIdList
*/
public SiteMatterQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
return this;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public SiteMatterQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/**
* 设置 事项详情链接
* @param url
*/
public SiteMatterQuery url(String url){
setUrl(url);
return this;
}
/**
* 设置 事项详情链接
* @param urlList
*/
public SiteMatterQuery urlList(List<String> urlList){
this.urlList = urlList;
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
......
knowledge-base/src/main/java/com/mortals/xhx/module/site/model/vo/SiteMatterVo.java
View file @ 55c35bdf
package com.mortals.xhx.module.site.model.vo; package com.mortals.xhx.module.site.model.vo;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.site.model.SiteMatterEntity; import com.mortals.xhx.module.site.model.SiteMatterEntity;
import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
* 站点事项视图对象 * 站点事项视图对象
* *
* @author zxfei * @author zxfei
* @date 2022-01-12 * @date 2023-03-10
*/ */
@Data
public class SiteMatterVo extends BaseEntityLong { public class SiteMatterVo extends BaseEntityLong {
/** /** 材料数量 */
* 所属部门 private Integer datumCount;
*/
private String belongDept;
/**
* 窗口到现场次数
*/
private Integer windowToTheSceneNum;
/**
* 网办到现场次数
*/
private Integer onlineToTheSceneNum;
/**
* 区域编码
*/
private String areaCode;
/** 事项类型排除列表 */ public Integer getDatumCount() {
private List <String> eventTypeShowNotList; return datumCount;
}
public void setDatumCount(Integer datumCount) {
this.datumCount = datumCount;
}
} }
\ No newline at end of file
knowledge-base/src/main/java/com/mortals/xhx/module/site/service/SiteMatterService.java
View file @ 55c35bdf
package com.mortals.xhx.module.site.service; package com.mortals.xhx.module.site.service;
import com.mortals.framework.model.Context;
import com.mortals.framework.service.ICRUDService; import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.site.dao.SiteMatterDao;
import com.mortals.xhx.module.site.model.SiteMatterEntity; import com.mortals.xhx.module.site.model.SiteMatterEntity;
/** /**
* SiteMatterService * SiteMatterService
* <p> *
* 站点事项 service接口 * 站点事项 service接口
* *
* @author zxfei * @author zxfei
* @date 2022-01-12 * @date 2023-03-10
*/ */
public interface SiteMatterService extends ICRUDService<SiteMatterEntity, Long> { public interface SiteMatterService extends ICRUDService<SiteMatterEntity,Long>{
SiteMatterDao getDao(); /**
* 增加浏览次数
void deleteBysiteIdAndSource(Long siteId, Integer source, Context context); * @param id
*/
void addViewsCount(Long id);
} }
\ No newline at end of file
knowledge-base/src/main/java/com/mortals/xhx/module/site/service/impl/SiteMatterServiceImpl.java
View file @ 55c35bdf
package com.mortals.xhx.module.site.service.impl; package com.mortals.xhx.module.site.service.impl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.xhx.module.matter.model.MatterEntity; import com.mortals.xhx.module.matter.model.MatterDatumEntity;
import com.mortals.xhx.module.matter.model.MatterQuery; import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
import com.mortals.xhx.module.matter.service.MatterService; import com.mortals.xhx.module.matter.model.MatterDatumFileQuery;
import com.mortals.xhx.module.matter.model.MatterDatumQuery;
import com.mortals.xhx.module.matter.service.MatterDatumService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.xhx.module.site.dao.SiteMatterDao; import com.mortals.xhx.module.site.dao.SiteMatterDao;
import com.mortals.xhx.module.site.model.SiteMatterEntity; import com.mortals.xhx.module.site.model.SiteMatterEntity;
import com.mortals.xhx.module.site.service.SiteMatterService; import com.mortals.xhx.module.site.service.SiteMatterService;
import org.springframework.util.ObjectUtils;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
/** /**
* SiteMatterService * SiteMatterService
* 站点事项 service实现 * 站点事项 service实现
* *
* @author zxfei * @author zxfei
* @date 2022-01-12 * @date 2023-03-10
*/ */
@Service("siteMatterService") @Service("siteMatterService")
public class SiteMatterServiceImpl extends AbstractCRUDServiceImpl<SiteMatterDao, SiteMatterEntity, Long> implements SiteMatterService { public class SiteMatterServiceImpl extends AbstractCRUDServiceImpl<SiteMatterDao, SiteMatterEntity, Long> implements SiteMatterService {
@Autowired @Autowired
private MatterService matterService; private MatterDatumService matterDatumService;
@Override @Override
protected void findAfter(SiteMatterEntity params, PageInfo pageInfo, Context context, List<SiteMatterEntity> list) throws AppException { protected void findAfter(SiteMatterEntity params, PageInfo pageInfo, Context context, List<SiteMatterEntity> list) throws AppException {
// List<Long> matterIdlist = list.parallelStream().map(item -> item.getMatterId()).collect(Collectors.toList()); list.stream().peek(item->{
//Map<Long, MatterEntity> matterEntityMap = matterService.find(new MatterQuery().idList(matterIdlist)).parallelStream().collect(Collectors.toMap(x -> x.getId(), y -> y, (o, n) -> n)); List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
list.forEach(item -> { if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
if (!ObjectUtils.isEmpty(item.getMatterId())) { item.setDatumCount(matterDatumFileEntities.size());
MatterEntity matterEntity = matterService.get(item.getMatterId()); }else {
if (!ObjectUtils.isEmpty(matterEntity)) { item.setDatumCount(0);
item.setBelongDept(matterEntity.getBelongDept());
item.setWindowToTheSceneNum(matterEntity.getWindowToTheSceneNum());
item.setOnlineToTheSceneNum(matterEntity.getOnlineToTheSceneNum());
item.setDeptCode(matterEntity.getDeptCode());
item.setAreaCode(matterEntity.getAreaCode());
}
} }
}); }).count();
super.findAfter(params, pageInfo, context, list); super.findAfter(params, context, list);
} }
/**
* @param entity
* @param context
* @throws AppException
*/
@Override @Override
protected void updateBefore(SiteMatterEntity entity, Context context) throws AppException { protected void findAfter(SiteMatterEntity params, Context context, List<SiteMatterEntity> list) throws AppException {
super.updateBefore(entity, context); list.stream().peek(item->{
SiteMatterEntity beforeSiteMatterEntity = this.get(entity.getId(), context); List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
if (!ObjectUtils.isEmpty(beforeSiteMatterEntity.getDeptId()) && !beforeSiteMatterEntity.getDeptId().equals(entity.getDeptId())) { if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
//更新事项中的部门编号 item.setDatumCount(matterDatumFileEntities.size());
MatterEntity matterEntity = matterService.get(entity.getMatterId(), context); }else {
if (!ObjectUtils.isEmpty(matterEntity)) { item.setDatumCount(0);
matterEntity.setDeptCode(entity.getDeptCode());
matterEntity.setDeptName(entity.getDeptName());
matterService.update(matterEntity, context);
}
} }
}).count();
super.findAfter(params, context, list);
} }
@Override @Override
public void deleteBysiteIdAndSource(Long siteId, Integer source, Context context) { public void addViewsCount(Long id) {
Map<String, Object> condition = new HashMap<>(); Map<String,Object> data = new HashMap<>();
condition.put("siteId", siteId); data.put("viewsCountIncrement",1);
condition.put("source", source); Map<String,Object> condition = new HashMap<>();
this.dao.delete(condition); condition.put("id",id);
dao.update(data,condition);
} }
} }
\ No newline at end of file
knowledge-base/src/main/java/com/mortals/xhx/module/site/web/SiteMatterController.java
View file @ 55c35bdf
...@@ -3,49 +3,51 @@ package com.mortals.xhx.module.site.web; ...@@ -3,49 +3,51 @@ package com.mortals.xhx.module.site.web;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.site.model.SiteMatterEntity; import com.mortals.xhx.module.site.model.SiteMatterEntity;
import com.mortals.xhx.module.site.model.SiteMatterQuery;
import com.mortals.xhx.module.site.service.SiteMatterService; import com.mortals.xhx.module.site.service.SiteMatterService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList; import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
* 站点事项 *
* * 站点事项
* @author zxfei *
* @date 2022-01-20 * @author zxfei
*/ * @date 2023-03-10
*/
@RestController @RestController
@RequestMapping("site/matter") @RequestMapping("site/matter")
public class SiteMatterController extends BaseCRUDJsonBodyMappingController<SiteMatterService, SiteMatterEntity, Long> { public class SiteMatterController extends BaseCRUDJsonBodyMappingController<SiteMatterService,SiteMatterEntity,Long> {
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
public SiteMatterController() { public SiteMatterController(){
super.setFormClass(SiteMatterForm.class); super.setModuleDesc( "站点事项");
super.setModuleDesc("站点事项"); }
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "source", paramService.getParamBySecondOrganize("SiteMatter","source"));
super.init(model, context);
} }
/**
* @param query
* @param model
* @param context
* @throws AppException
*/
@Override @Override
protected void doListBefore(SiteMatterEntity query, Map<String, Object> model, Context context) throws AppException { protected void doListBefore(SiteMatterEntity query, Map<String, Object> model, Context context) throws AppException {
super.doListBefore(query, model, context); Map<String,String> orderMap = new HashMap<>();
if(ObjectUtils.isEmpty(query.getEventTypeShowNotList())){ orderMap.put("viewsCount","DESC");
ArrayList<String> notList = new ArrayList<>(); query.setOrderCols(orderMap);
notList.add("行政处罚"); super.doListBefore(query,model,context);
query.setEventTypeShowNotList(notList);
} }
@Override
protected int viewAfter(Long id, Map<String, Object> model, SiteMatterEntity entity, Context context) throws AppException {
this.service.addViewsCount(id);
return 1;
} }
} }
\ No newline at end of file
knowledge-base/src/main/resources/sqlmap/module/matter/MatterDatumFileMapper.xml
View file @ 55c35bdf
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<result property="localFileUrl" column="localFileUrl" /> <result property="localFileUrl" column="localFileUrl" />
<result property="filetype" column="filetype" /> <result property="filetype" column="filetype" />
<result property="source" column="source" /> <result property="source" column="source" />
<result property="previewUrl" column="previewUrl" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
...@@ -51,6 +52,9 @@ ...@@ -51,6 +52,9 @@
<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('previewUrl') or colPickMode == 1 and data.containsKey('previewUrl')))">
a.previewUrl,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
</if> </if>
...@@ -65,18 +69,18 @@ ...@@ -65,18 +69,18 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="MatterDatumFileEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="MatterDatumFileEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_matter_datum_file insert into mortals_sys_matter_datum_file
(datumId,matterCode,materialName,fileName,fileUrl,localFileUrl,filetype,source,createTime,createUserId,updateTime) (datumId,matterCode,materialName,fileName,fileUrl,localFileUrl,filetype,source,previewUrl,createTime,createUserId,updateTime)
VALUES VALUES
(#{datumId},#{matterCode},#{materialName},#{fileName},#{fileUrl},#{localFileUrl},#{filetype},#{source},#{createTime},#{createUserId},#{updateTime}) (#{datumId},#{matterCode},#{materialName},#{fileName},#{fileUrl},#{localFileUrl},#{filetype},#{source},#{previewUrl},#{createTime},#{createUserId},#{updateTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_matter_datum_file insert into mortals_sys_matter_datum_file
(datumId,matterCode,materialName,fileName,fileUrl,localFileUrl,filetype,source,createTime,createUserId,updateTime) (datumId,matterCode,materialName,fileName,fileUrl,localFileUrl,filetype,source,previewUrl,createTime,createUserId,updateTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.datumId},#{item.matterCode},#{item.materialName},#{item.fileName},#{item.fileUrl},#{item.localFileUrl},#{item.filetype},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime}) (#{item.datumId},#{item.matterCode},#{item.materialName},#{item.fileName},#{item.fileUrl},#{item.localFileUrl},#{item.filetype},#{item.source},#{item.previewUrl},#{item.createTime},#{item.createUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -110,12 +114,18 @@ ...@@ -110,12 +114,18 @@
<if test="(colPickMode==0 and data.containsKey('filetype')) or (colPickMode==1 and !data.containsKey('filetype'))"> <if test="(colPickMode==0 and data.containsKey('filetype')) or (colPickMode==1 and !data.containsKey('filetype'))">
a.filetype=#{data.filetype}, a.filetype=#{data.filetype},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('filetypeIncrement')) or (colPickMode==1 and !data.containsKey('filetypeIncrement'))">
a.filetype=ifnull(a.filetype,0) + #{data.filetypeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))"> <if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))">
a.source=#{data.source}, a.source=#{data.source},
</if> </if>
<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('previewUrl')) or (colPickMode==1 and !data.containsKey('previewUrl'))">
a.previewUrl=#{data.previewUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))"> <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime}, a.createTime=#{data.createTime},
</if> </if>
...@@ -189,9 +199,14 @@ ...@@ -189,9 +199,14 @@
</trim> </trim>
<trim prefix="filetype=(case" suffix="ELSE filetype end),"> <trim prefix="filetype=(case" suffix="ELSE filetype 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('filetype')) or (colPickMode==1 and !item.containsKey('filetype'))"> <choose>
<when test="(colPickMode==0 and item.containsKey('filetype')) or (colPickMode==1 and !item.containsKey('filetype'))">
when a.id=#{item.id} then #{item.filetype} when a.id=#{item.id} then #{item.filetype}
</if> </when>
<when test="(colPickMode==0 and item.containsKey('filetypeIncrement')) or (colPickMode==1 and !item.containsKey('filetypeIncrement'))">
when a.id=#{item.id} then ifnull(a.filetype,0) + #{item.filetypeIncrement}
</when>
</choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="source=(case" suffix="ELSE source end),"> <trim prefix="source=(case" suffix="ELSE source end),">
...@@ -206,6 +221,13 @@ ...@@ -206,6 +221,13 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="previewUrl=(case" suffix="ELSE previewUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('previewUrl')) or (colPickMode==1 and !item.containsKey('previewUrl'))">
when a.id=#{item.id} then #{item.previewUrl}
</if>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
...@@ -255,6 +277,21 @@ ...@@ -255,6 +277,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_sys_matter_datum_file where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_sys_matter_datum_file where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_sys_matter_datum_file as a delete a.* from mortals_sys_matter_datum_file as a
...@@ -347,6 +384,12 @@ ...@@ -347,6 +384,12 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('idNotList')">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -368,6 +411,12 @@ ...@@ -368,6 +411,12 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('datumIdNotList')">
${_conditionType_} a.datumId not in
<foreach collection="conditionParamRef.datumIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('datumIdStart') and conditionParamRef.datumIdStart != null"> <if test="conditionParamRef.containsKey('datumIdStart') and conditionParamRef.datumIdStart != null">
${_conditionType_} a.datumId <![CDATA[ >= ]]> #{${_conditionParam_}.datumIdStart} ${_conditionType_} a.datumId <![CDATA[ >= ]]> #{${_conditionParam_}.datumIdStart}
</if> </if>
...@@ -390,6 +439,12 @@ ...@@ -390,6 +439,12 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('matterCodeNotList')">
${_conditionType_} a.matterCode not in
<foreach collection="conditionParamRef.matterCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('materialName')"> <if test="conditionParamRef.containsKey('materialName')">
<if test="conditionParamRef.materialName != null and conditionParamRef.materialName != ''"> <if test="conditionParamRef.materialName != null and conditionParamRef.materialName != ''">
...@@ -405,6 +460,12 @@ ...@@ -405,6 +460,12 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('materialNameNotList')">
${_conditionType_} a.materialName not in
<foreach collection="conditionParamRef.materialNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fileName')"> <if test="conditionParamRef.containsKey('fileName')">
<if test="conditionParamRef.fileName != null and conditionParamRef.fileName != ''"> <if test="conditionParamRef.fileName != null and conditionParamRef.fileName != ''">
...@@ -420,6 +481,12 @@ ...@@ -420,6 +481,12 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('fileNameNotList')">
${_conditionType_} a.fileName not in
<foreach collection="conditionParamRef.fileNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fileUrl')"> <if test="conditionParamRef.containsKey('fileUrl')">
<if test="conditionParamRef.fileUrl != null and conditionParamRef.fileUrl != ''"> <if test="conditionParamRef.fileUrl != null and conditionParamRef.fileUrl != ''">
...@@ -435,6 +502,12 @@ ...@@ -435,6 +502,12 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('fileUrlNotList')">
${_conditionType_} a.fileUrl not in
<foreach collection="conditionParamRef.fileUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('localFileUrl')"> <if test="conditionParamRef.containsKey('localFileUrl')">
<if test="conditionParamRef.localFileUrl != null and conditionParamRef.localFileUrl != ''"> <if test="conditionParamRef.localFileUrl != null and conditionParamRef.localFileUrl != ''">
...@@ -450,10 +523,15 @@ ...@@ -450,10 +523,15 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('localFileUrlNotList')">
${_conditionType_} a.localFileUrl not in
<foreach collection="conditionParamRef.localFileUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filetype')"> <if test="conditionParamRef.containsKey('filetype')">
<if test="conditionParamRef.filetype != null and conditionParamRef.filetype != ''"> <if test="conditionParamRef.filetype != null ">
${_conditionType_} a.filetype like #{${_conditionParam_}.filetype} ${_conditionType_} a.filetype = #{${_conditionParam_}.filetype}
</if> </if>
<if test="conditionParamRef.filetype == null"> <if test="conditionParamRef.filetype == null">
${_conditionType_} a.filetype is null ${_conditionType_} a.filetype is null
...@@ -465,6 +543,19 @@ ...@@ -465,6 +543,19 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('filetypeNotList')">
${_conditionType_} a.filetype not in
<foreach collection="conditionParamRef.filetypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filetypeStart') and conditionParamRef.filetypeStart != null">
${_conditionType_} a.filetype <![CDATA[ >= ]]> #{${_conditionParam_}.filetypeStart}
</if>
<if test="conditionParamRef.containsKey('filetypeEnd') and conditionParamRef.filetypeEnd != null">
${_conditionType_} a.filetype <![CDATA[ <= ]]> #{${_conditionParam_}.filetypeEnd}
</if>
<if test="conditionParamRef.containsKey('source')"> <if test="conditionParamRef.containsKey('source')">
<if test="conditionParamRef.source != null "> <if test="conditionParamRef.source != null ">
${_conditionType_} a.source = #{${_conditionParam_}.source} ${_conditionType_} a.source = #{${_conditionParam_}.source}
...@@ -479,6 +570,12 @@ ...@@ -479,6 +570,12 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('sourceNotList')">
${_conditionType_} a.source not in
<foreach collection="conditionParamRef.sourceNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null"> <if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart} ${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
</if> </if>
...@@ -487,6 +584,27 @@ ...@@ -487,6 +584,27 @@
</if> </if>
<if test="conditionParamRef.containsKey('previewUrl')">
<if test="conditionParamRef.previewUrl != null and conditionParamRef.previewUrl != ''">
${_conditionType_} a.previewUrl like #{${_conditionParam_}.previewUrl}
</if>
<if test="conditionParamRef.previewUrl == null">
${_conditionType_} a.previewUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('previewUrlList')">
${_conditionType_} a.previewUrl in
<foreach collection="conditionParamRef.previewUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('previewUrlNotList')">
${_conditionType_} a.previewUrl not in
<foreach collection="conditionParamRef.previewUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
...@@ -515,6 +633,12 @@ ...@@ -515,6 +633,12 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList')">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if> </if>
...@@ -595,6 +719,11 @@ ...@@ -595,6 +719,11 @@
<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('previewUrl')">
a.previewUrl
<if test='orderCol.previewUrl != null and "DESC".equalsIgnoreCase(orderCol.previewUrl)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
a.createTime a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
......
knowledge-base/src/main/resources/sqlmap/module/matter/MatterDatumMapper.xml
View file @ 55c35bdf
...@@ -36,14 +36,17 @@ ...@@ -36,14 +36,17 @@
<resultMap type="MatterDatumFileEntity" id="MatterDatumFileEntity-Map"> <resultMap type="MatterDatumFileEntity" id="MatterDatumFileEntity-Map">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="datumId" column="datumId" /> <result property="datumId" column="datumId" />
<result property="matterCode" column="matterCode" />
<result property="materialName" column="materialName" />
<result property="fileName" column="fileName" /> <result property="fileName" column="fileName" />
<result property="fileUrl" column="fileUrl" /> <result property="fileUrl" column="fileUrl" />
<result property="localFileUrl" column="localFileUrl" />
<result property="filetype" column="filetype" /> <result property="filetype" column="filetype" />
<result property="source" column="source" /> <result property="source" column="source" />
<result property="previewUrl" column="previewUrl" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="materialName" column="materialName" />
</resultMap> </resultMap>
...@@ -133,7 +136,7 @@ ...@@ -133,7 +136,7 @@
<!-- 子表所有列 --> <!-- 子表所有列 -->
<sql id="_columns_sub"> <sql id="_columns_sub">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
b.id,b.datumId,b.fileName,b.fileUrl,b.filetype,b.source,b.createTime,b.createUserId,b.updateTime,b.materialName, b.id,b.datumId,b.matterCode,b.materialName,b.fileName,b.fileUrl,b.filetype,b.source,b.localFileUrl,b.previewUrl,b.createTime,b.createUserId,b.updateTime,b.materialName,
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
......
knowledge-base/src/main/resources/sqlmap/module/site/SiteMatterMapper.xml
View file @ 55c35bdf
...@@ -13,12 +13,16 @@ ...@@ -13,12 +13,16 @@
<result property="matterCode" column="matterCode" /> <result property="matterCode" column="matterCode" />
<result property="deptId" column="deptId" /> <result property="deptId" column="deptId" />
<result property="deptName" column="deptName" /> <result property="deptName" column="deptName" />
<result property="eventTypeShow" column="eventTypeShow" />
<result property="source" column="source" />
<result property="deptCode" column="deptCode" /> <result property="deptCode" column="deptCode" />
<result property="createTime" column="createTime" /> <result property="source" column="source" />
<result property="eventTypeShow" column="eventTypeShow" />
<result property="viewsCount" column="viewsCount" />
<result property="isConvert" column="isConvert" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="url" column="url" />
</resultMap> </resultMap>
...@@ -50,41 +54,53 @@ ...@@ -50,41 +54,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('eventTypeShow') or colPickMode == 1 and data.containsKey('eventTypeShow')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptCode') or colPickMode == 1 and data.containsKey('deptCode')))">
a.eventTypeShow, a.deptCode,
</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('deptCode') or colPickMode == 1 and data.containsKey('deptCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('eventTypeShow') or colPickMode == 1 and data.containsKey('eventTypeShow')))">
a.deptCode, a.eventTypeShow,
</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('viewsCount') or colPickMode == 1 and data.containsKey('viewsCount')))">
a.createTime, a.viewsCount,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isConvert') or colPickMode == 1 and data.containsKey('isConvert')))">
a.isConvert,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId, a.createUserId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
a.updateUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('url') or colPickMode == 1 and data.containsKey('url')))">
a.url,
</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) (siteId,siteName,matterId,matterName,matterCode,deptId,deptName,deptCode,source,eventTypeShow,viewsCount,isConvert,createUserId,createTime,updateUserId,updateTime,url)
VALUES VALUES
(#{siteId},#{siteName},#{matterId},#{matterName},#{matterCode},#{deptId},#{deptName},#{eventTypeShow},#{source},#{deptCode},#{createTime},#{createUserId},#{updateTime}) (#{siteId},#{siteName},#{matterId},#{matterName},#{matterCode},#{deptId},#{deptName},#{deptCode},#{source},#{eventTypeShow},#{viewsCount},#{isConvert},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{url})
</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) (siteId,siteName,matterId,matterName,matterCode,deptId,deptName,deptCode,source,eventTypeShow,viewsCount,isConvert,createUserId,createTime,updateUserId,updateTime,url)
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.siteId},#{item.siteName},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.deptId},#{item.deptName},#{item.deptCode},#{item.source},#{item.eventTypeShow},#{item.viewsCount},#{item.isConvert},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.url})
</foreach> </foreach>
</insert> </insert>
...@@ -124,8 +140,8 @@ ...@@ -124,8 +140,8 @@
<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('eventTypeShow')) or (colPickMode==1 and !data.containsKey('eventTypeShow'))"> <if test="(colPickMode==0 and data.containsKey('deptCode')) or (colPickMode==1 and !data.containsKey('deptCode'))">
a.eventTypeShow=#{data.eventTypeShow}, a.deptCode=#{data.deptCode},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))"> <if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))">
a.source=#{data.source}, a.source=#{data.source},
...@@ -133,11 +149,20 @@ ...@@ -133,11 +149,20 @@
<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'))"> <if test="(colPickMode==0 and data.containsKey('eventTypeShow')) or (colPickMode==1 and !data.containsKey('eventTypeShow'))">
a.deptCode=#{data.deptCode}, a.eventTypeShow=#{data.eventTypeShow},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))"> <if test="(colPickMode==0 and data.containsKey('viewsCount')) or (colPickMode==1 and !data.containsKey('viewsCount'))">
a.createTime=#{data.createTime}, a.viewsCount=#{data.viewsCount},
</if>
<if test="(colPickMode==0 and data.containsKey('viewsCountIncrement')) or (colPickMode==1 and !data.containsKey('viewsCountIncrement'))">
a.viewsCount=ifnull(a.viewsCount,0) + #{data.viewsCountIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('isConvert')) or (colPickMode==1 and !data.containsKey('isConvert'))">
a.isConvert=#{data.isConvert},
</if>
<if test="(colPickMode==0 and data.containsKey('isConvertIncrement')) or (colPickMode==1 and !data.containsKey('isConvertIncrement'))">
a.isConvert=ifnull(a.isConvert,0) + #{data.isConvertIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))"> <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId}, a.createUserId=#{data.createUserId},
...@@ -145,9 +170,21 @@ ...@@ -145,9 +170,21 @@
<if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))"> <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement}, a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
</if> </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('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
a.updateUserId=#{data.updateUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('url')) or (colPickMode==1 and !data.containsKey('url'))">
a.url=#{data.url},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -224,10 +261,10 @@ ...@@ -224,10 +261,10 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="eventTypeShow=(case" suffix="ELSE eventTypeShow end),"> <trim prefix="deptCode=(case" suffix="ELSE deptCode 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('deptCode')) or (colPickMode==1 and !item.containsKey('deptCode'))">
when a.id=#{item.id} then #{item.eventTypeShow} when a.id=#{item.id} then #{item.deptCode}
</if> </if>
</foreach> </foreach>
</trim> </trim>
...@@ -243,18 +280,35 @@ ...@@ -243,18 +280,35 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deptCode=(case" suffix="ELSE deptCode 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('deptCode')) or (colPickMode==1 and !item.containsKey('deptCode'))"> <if test="(colPickMode==0 and item.containsKey('eventTypeShow')) or (colPickMode==1 and !item.containsKey('eventTypeShow'))">
when a.id=#{item.id} then #{item.deptCode} when a.id=#{item.id} then #{item.eventTypeShow}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="viewsCount=(case" suffix="ELSE viewsCount end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <choose>
when a.id=#{item.id} then #{item.createTime} <when test="(colPickMode==0 and item.containsKey('viewsCount')) or (colPickMode==1 and !item.containsKey('viewsCount'))">
</if> when a.id=#{item.id} then #{item.viewsCount}
</when>
<when test="(colPickMode==0 and item.containsKey('viewsCountIncrement')) or (colPickMode==1 and !item.containsKey('viewsCountIncrement'))">
when a.id=#{item.id} then ifnull(a.viewsCount,0) + #{item.viewsCountIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="isConvert=(case" suffix="ELSE isConvert end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('isConvert')) or (colPickMode==1 and !item.containsKey('isConvert'))">
when a.id=#{item.id} then #{item.isConvert}
</when>
<when test="(colPickMode==0 and item.containsKey('isConvertIncrement')) or (colPickMode==1 and !item.containsKey('isConvertIncrement'))">
when a.id=#{item.id} then ifnull(a.isConvert,0) + #{item.isConvertIncrement}
</when>
</choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),"> <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
...@@ -269,6 +323,25 @@ ...@@ -269,6 +323,25 @@
</choose> </choose>
</foreach> </foreach>
</trim> </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="updateUserId=(case" suffix="ELSE updateUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
when a.id=#{item.id} then #{item.updateUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),"> <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))"> <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
...@@ -276,6 +349,13 @@ ...@@ -276,6 +349,13 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="url=(case" suffix="ELSE url end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('url')) or (colPickMode==1 and !item.containsKey('url'))">
when a.id=#{item.id} then #{item.url}
</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=")">
...@@ -585,23 +665,23 @@ ...@@ -585,23 +665,23 @@
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('eventTypeShow')"> <if test="conditionParamRef.containsKey('deptCode')">
<if test="conditionParamRef.eventTypeShow != null and conditionParamRef.eventTypeShow != ''"> <if test="conditionParamRef.deptCode != null and conditionParamRef.deptCode != ''">
${_conditionType_} a.eventTypeShow like #{${_conditionParam_}.eventTypeShow} ${_conditionType_} a.deptCode like #{${_conditionParam_}.deptCode}
</if> </if>
<if test="conditionParamRef.eventTypeShow == null"> <if test="conditionParamRef.deptCode == null">
${_conditionType_} a.eventTypeShow is null ${_conditionType_} a.deptCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('eventTypeShowList')"> <if test="conditionParamRef.containsKey('deptCodeList')">
${_conditionType_} a.eventTypeShow in ${_conditionType_} a.deptCode in
<foreach collection="conditionParamRef.eventTypeShowList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('eventTypeShowNotList')"> <if test="conditionParamRef.containsKey('deptCodeNotList')">
${_conditionType_} a.eventTypeShow not in ${_conditionType_} a.deptCode not in
<foreach collection="conditionParamRef.eventTypeShowNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
...@@ -633,41 +713,80 @@ ...@@ -633,41 +713,80 @@
</if> </if>
<if test="conditionParamRef.containsKey('deptCode')"> <if test="conditionParamRef.containsKey('eventTypeShow')">
<if test="conditionParamRef.deptCode != null and conditionParamRef.deptCode != ''"> <if test="conditionParamRef.eventTypeShow != null and conditionParamRef.eventTypeShow != ''">
${_conditionType_} a.deptCode like #{${_conditionParam_}.deptCode} ${_conditionType_} a.eventTypeShow like #{${_conditionParam_}.eventTypeShow}
</if> </if>
<if test="conditionParamRef.deptCode == null"> <if test="conditionParamRef.eventTypeShow == null">
${_conditionType_} a.deptCode is null ${_conditionType_} a.eventTypeShow is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deptCodeList')"> <if test="conditionParamRef.containsKey('eventTypeShowList')">
${_conditionType_} a.deptCode in ${_conditionType_} a.eventTypeShow in
<foreach collection="conditionParamRef.deptCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.eventTypeShowList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deptCodeNotList')"> <if test="conditionParamRef.containsKey('eventTypeShowNotList')">
${_conditionType_} a.deptCode not in ${_conditionType_} a.eventTypeShow not in
<foreach collection="conditionParamRef.deptCodeNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.eventTypeShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('viewsCount')">
<if test="conditionParamRef.viewsCount != null ">
${_conditionType_} a.viewsCount = #{${_conditionParam_}.viewsCount}
</if>
<if test="conditionParamRef.viewsCount == null">
${_conditionType_} a.viewsCount is null
</if>
</if>
<if test="conditionParamRef.containsKey('viewsCountList')">
${_conditionType_} a.viewsCount in
<foreach collection="conditionParamRef.viewsCountList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('viewsCountNotList')">
${_conditionType_} a.viewsCount not in
<foreach collection="conditionParamRef.viewsCountNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('viewsCountStart') and conditionParamRef.viewsCountStart != null">
${_conditionType_} a.viewsCount <![CDATA[ >= ]]> #{${_conditionParam_}.viewsCountStart}
</if>
<if test="conditionParamRef.containsKey('viewsCountEnd') and conditionParamRef.viewsCountEnd != null">
${_conditionType_} a.viewsCount <![CDATA[ <= ]]> #{${_conditionParam_}.viewsCountEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('isConvert')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.isConvert != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_conditionType_} a.isConvert = #{${_conditionParam_}.isConvert}
</if> </if>
<if test="conditionParamRef.createTime == null"> <if test="conditionParamRef.isConvert == null">
${_conditionType_} a.createTime is null ${_conditionType_} a.isConvert is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''"> <if test="conditionParamRef.containsKey('isConvertList')">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.isConvert in
<foreach collection="conditionParamRef.isConvertList" 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('isConvertNotList')">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.isConvert not in
<foreach collection="conditionParamRef.isConvertNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isConvertStart') and conditionParamRef.isConvertStart != null">
${_conditionType_} a.isConvert <![CDATA[ >= ]]> #{${_conditionParam_}.isConvertStart}
</if>
<if test="conditionParamRef.containsKey('isConvertEnd') and conditionParamRef.isConvertEnd != null">
${_conditionType_} a.isConvert <![CDATA[ <= ]]> #{${_conditionParam_}.isConvertEnd}
</if> </if>
<if test="conditionParamRef.containsKey('createUserId')"> <if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null "> <if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId} ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
...@@ -696,6 +815,48 @@ ...@@ -696,6 +815,48 @@
</if> </if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateUserId')">
<if test="conditionParamRef.updateUserId != null ">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if>
<if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList')">
${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdNotList')">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('updateTime')"> <if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null "> <if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime} ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
...@@ -710,6 +871,27 @@ ...@@ -710,6 +871,27 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <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') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('url')">
<if test="conditionParamRef.url != null and conditionParamRef.url != ''">
${_conditionType_} a.url like #{${_conditionParam_}.url}
</if>
<if test="conditionParamRef.url == null">
${_conditionType_} a.url is null
</if>
</if>
<if test="conditionParamRef.containsKey('urlList')">
${_conditionType_} a.url in
<foreach collection="conditionParamRef.urlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('urlNotList')">
${_conditionType_} a.url not in
<foreach collection="conditionParamRef.urlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -763,9 +945,9 @@ ...@@ -763,9 +945,9 @@
<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('eventTypeShow')"> <if test="orderCol.containsKey('deptCode')">
a.eventTypeShow a.deptCode
<if test='orderCol.eventTypeShow != null and "DESC".equalsIgnoreCase(orderCol.eventTypeShow)'>DESC</if> <if test='orderCol.deptCode != null and "DESC".equalsIgnoreCase(orderCol.deptCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('source')"> <if test="orderCol.containsKey('source')">
...@@ -773,14 +955,19 @@ ...@@ -773,14 +955,19 @@
<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('deptCode')"> <if test="orderCol.containsKey('eventTypeShow')">
a.deptCode a.eventTypeShow
<if test='orderCol.deptCode != null and "DESC".equalsIgnoreCase(orderCol.deptCode)'>DESC</if> <if test='orderCol.eventTypeShow != null and "DESC".equalsIgnoreCase(orderCol.eventTypeShow)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('viewsCount')">
a.createTime a.viewsCount
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.viewsCount != null and "DESC".equalsIgnoreCase(orderCol.viewsCount)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('isConvert')">
a.isConvert
<if test='orderCol.isConvert != null and "DESC".equalsIgnoreCase(orderCol.isConvert)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createUserId')"> <if test="orderCol.containsKey('createUserId')">
...@@ -788,11 +975,26 @@ ...@@ -788,11 +975,26 @@
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if> <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateUserId')">
a.updateUserId
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateTime')"> <if test="orderCol.containsKey('updateTime')">
a.updateTime a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('url')">
a.url
<if test='orderCol.url != null and "DESC".equalsIgnoreCase(orderCol.url)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment