Skip to content

C
chuanshan_gov_platform
Commit 7f4890cc authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

测试bug修改

parent 02626ec6
Hide whitespace changes
Inline Side-by-side
Showing with 454 additions and 229 deletions
knowledge-base/src/main/java/com/mortals/xhx/module/site/model/SiteMatterAssistEntity.java
View file @ 7f4890cc
...@@ -60,14 +60,18 @@ public class SiteMatterAssistEntity extends SiteMatterAssistVo { ...@@ -60,14 +60,18 @@ public class SiteMatterAssistEntity extends SiteMatterAssistVo {
* 联系电话 * 联系电话
*/ */
private String telephone; private String telephone;
/**
* 政务网地址
*/
private String govUrl;
/** /**
* 事项来源 * 事项来源
*/ */
private Integer source; private Integer source;
/**
* 浏览次数
*/
private Long viewsCount;
/**
* 政务网地址
*/
private String govUrl;
...@@ -226,20 +230,6 @@ public class SiteMatterAssistEntity extends SiteMatterAssistVo { ...@@ -226,20 +230,6 @@ public class SiteMatterAssistEntity extends SiteMatterAssistVo {
public void setTelephone(String telephone){ public void setTelephone(String telephone){
this.telephone = telephone; this.telephone = telephone;
} }
/**
* 获取 政务网地址
* @return String
*/
public String getGovUrl(){
return govUrl;
}
/**
* 设置 政务网地址
* @param govUrl
*/
public void setGovUrl(String govUrl){
this.govUrl = govUrl;
}
/** /**
* 获取 事项来源 * 获取 事项来源
* @return Integer * @return Integer
...@@ -254,6 +244,34 @@ public class SiteMatterAssistEntity extends SiteMatterAssistVo { ...@@ -254,6 +244,34 @@ public class SiteMatterAssistEntity extends SiteMatterAssistVo {
public void setSource(Integer source){ public void setSource(Integer source){
this.source = source; this.source = source;
} }
/**
* 获取 浏览次数
* @return Long
*/
public Long getViewsCount(){
return viewsCount;
}
/**
* 设置 浏览次数
* @param viewsCount
*/
public void setViewsCount(Long viewsCount){
this.viewsCount = viewsCount;
}
/**
* 获取 政务网地址
* @return String
*/
public String getGovUrl(){
return govUrl;
}
/**
* 设置 政务网地址
* @param govUrl
*/
public void setGovUrl(String govUrl){
this.govUrl = govUrl;
}
...@@ -287,8 +305,9 @@ public class SiteMatterAssistEntity extends SiteMatterAssistVo { ...@@ -287,8 +305,9 @@ public class SiteMatterAssistEntity extends SiteMatterAssistVo {
sb.append(",officeName:").append(getOfficeName()); sb.append(",officeName:").append(getOfficeName());
sb.append(",dutyer:").append(getDutyer()); sb.append(",dutyer:").append(getDutyer());
sb.append(",telephone:").append(getTelephone()); sb.append(",telephone:").append(getTelephone());
sb.append(",govUrl:").append(getGovUrl());
sb.append(",source:").append(getSource()); sb.append(",source:").append(getSource());
sb.append(",viewsCount:").append(getViewsCount());
sb.append(",govUrl:").append(getGovUrl());
return sb.toString(); return sb.toString();
} }
...@@ -316,8 +335,10 @@ public class SiteMatterAssistEntity extends SiteMatterAssistVo { ...@@ -316,8 +335,10 @@ public class SiteMatterAssistEntity extends SiteMatterAssistVo {
this.telephone = ""; this.telephone = "";
this.govUrl = "";
this.source = null; this.source = null;
this.viewsCount = 0L;
this.govUrl = "";
} }
} }
\ No newline at end of file
knowledge-base/src/main/java/com/mortals/xhx/module/site/model/SiteMatterAssistQuery.java
View file @ 7f4890cc
...@@ -119,6 +119,36 @@ public class SiteMatterAssistQuery extends SiteMatterAssistEntity { ...@@ -119,6 +119,36 @@ public class SiteMatterAssistQuery extends SiteMatterAssistEntity {
/** 联系电话排除列表 */ /** 联系电话排除列表 */
private List <String> telephoneNotList; private List <String> telephoneNotList;
/** 开始 事项来源 */
private Integer sourceStart;
/** 结束 事项来源 */
private Integer sourceEnd;
/** 增加 事项来源 */
private Integer sourceIncrement;
/** 事项来源列表 */
private List <Integer> sourceList;
/** 事项来源排除列表 */
private List <Integer> sourceNotList;
/** 开始 浏览次数 */
private Long viewsCountStart;
/** 结束 浏览次数 */
private Long viewsCountEnd;
/** 增加 浏览次数 */
private Long viewsCountIncrement;
/** 浏览次数列表 */
private List <Long> viewsCountList;
/** 浏览次数排除列表 */
private List <Long> viewsCountNotList;
/** 政务网地址 */ /** 政务网地址 */
private List<String> govUrlList; private List<String> govUrlList;
...@@ -166,21 +196,6 @@ public class SiteMatterAssistQuery extends SiteMatterAssistEntity { ...@@ -166,21 +196,6 @@ public class SiteMatterAssistQuery extends SiteMatterAssistEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 开始 事项来源 */
private Integer sourceStart;
/** 结束 事项来源 */
private Integer sourceEnd;
/** 增加 事项来源 */
private Integer sourceIncrement;
/** 事项来源列表 */
private List <Integer> sourceList;
/** 事项来源排除列表 */
private List <Integer> sourceNotList;
/** 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<SiteMatterAssistQuery> orConditionList; private List<SiteMatterAssistQuery> orConditionList;
...@@ -818,6 +833,168 @@ public class SiteMatterAssistQuery extends SiteMatterAssistEntity { ...@@ -818,6 +833,168 @@ public class SiteMatterAssistQuery extends SiteMatterAssistEntity {
this.telephoneNotList = telephoneNotList; this.telephoneNotList = telephoneNotList;
} }
/**
* 获取 开始 事项来源
* @return sourceStart
*/
public Integer getSourceStart(){
return this.sourceStart;
}
/**
* 设置 开始 事项来源
* @param sourceStart
*/
public void setSourceStart(Integer sourceStart){
this.sourceStart = sourceStart;
}
/**
* 获取 结束 事项来源
* @return $sourceEnd
*/
public Integer getSourceEnd(){
return this.sourceEnd;
}
/**
* 设置 结束 事项来源
* @param sourceEnd
*/
public void setSourceEnd(Integer sourceEnd){
this.sourceEnd = sourceEnd;
}
/**
* 获取 增加 事项来源
* @return sourceIncrement
*/
public Integer getSourceIncrement(){
return this.sourceIncrement;
}
/**
* 设置 增加 事项来源
* @param sourceIncrement
*/
public void setSourceIncrement(Integer sourceIncrement){
this.sourceIncrement = sourceIncrement;
}
/**
* 获取 事项来源
* @return sourceList
*/
public List<Integer> getSourceList(){
return this.sourceList;
}
/**
* 设置 事项来源
* @param sourceList
*/
public void setSourceList(List<Integer> sourceList){
this.sourceList = sourceList;
}
/**
* 获取 事项来源
* @return sourceNotList
*/
public List<Integer> getSourceNotList(){
return this.sourceNotList;
}
/**
* 设置 事项来源
* @param sourceNotList
*/
public void setSourceNotList(List<Integer> sourceNotList){
this.sourceNotList = sourceNotList;
}
/**
* 获取 开始 浏览次数
* @return viewsCountStart
*/
public Long getViewsCountStart(){
return this.viewsCountStart;
}
/**
* 设置 开始 浏览次数
* @param viewsCountStart
*/
public void setViewsCountStart(Long viewsCountStart){
this.viewsCountStart = viewsCountStart;
}
/**
* 获取 结束 浏览次数
* @return $viewsCountEnd
*/
public Long getViewsCountEnd(){
return this.viewsCountEnd;
}
/**
* 设置 结束 浏览次数
* @param viewsCountEnd
*/
public void setViewsCountEnd(Long viewsCountEnd){
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 govUrlList * @return govUrlList
...@@ -1076,87 +1253,6 @@ public class SiteMatterAssistQuery extends SiteMatterAssistEntity { ...@@ -1076,87 +1253,6 @@ public class SiteMatterAssistQuery extends SiteMatterAssistEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 事项来源
* @return sourceStart
*/
public Integer getSourceStart(){
return this.sourceStart;
}
/**
* 设置 开始 事项来源
* @param sourceStart
*/
public void setSourceStart(Integer sourceStart){
this.sourceStart = sourceStart;
}
/**
* 获取 结束 事项来源
* @return $sourceEnd
*/
public Integer getSourceEnd(){
return this.sourceEnd;
}
/**
* 设置 结束 事项来源
* @param sourceEnd
*/
public void setSourceEnd(Integer sourceEnd){
this.sourceEnd = sourceEnd;
}
/**
* 获取 增加 事项来源
* @return sourceIncrement
*/
public Integer getSourceIncrement(){
return this.sourceIncrement;
}
/**
* 设置 增加 事项来源
* @param sourceIncrement
*/
public void setSourceIncrement(Integer sourceIncrement){
this.sourceIncrement = sourceIncrement;
}
/**
* 获取 事项来源
* @return sourceList
*/
public List<Integer> getSourceList(){
return this.sourceList;
}
/**
* 设置 事项来源
* @param sourceList
*/
public void setSourceList(List<Integer> sourceList){
this.sourceList = sourceList;
}
/**
* 获取 事项来源
* @return sourceNotList
*/
public List<Integer> getSourceNotList(){
return this.sourceNotList;
}
/**
* 设置 事项来源
* @param sourceNotList
*/
public void setSourceNotList(List<Integer> sourceNotList){
this.sourceNotList = sourceNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -1560,6 +1656,114 @@ public class SiteMatterAssistQuery extends SiteMatterAssistEntity { ...@@ -1560,6 +1656,114 @@ public class SiteMatterAssistQuery extends SiteMatterAssistEntity {
return this; return this;
} }
/**
* 设置 事项来源
* @param source
*/
public SiteMatterAssistQuery source(Integer source){
setSource(source);
return this;
}
/**
* 设置 开始 事项来源
* @param sourceStart
*/
public SiteMatterAssistQuery sourceStart(Integer sourceStart){
this.sourceStart = sourceStart;
return this;
}
/**
* 设置 结束 事项来源
* @param sourceEnd
*/
public SiteMatterAssistQuery sourceEnd(Integer sourceEnd){
this.sourceEnd = sourceEnd;
return this;
}
/**
* 设置 增加 事项来源
* @param sourceIncrement
*/
public SiteMatterAssistQuery sourceIncrement(Integer sourceIncrement){
this.sourceIncrement = sourceIncrement;
return this;
}
/**
* 设置 事项来源
* @param sourceList
*/
public SiteMatterAssistQuery sourceList(List<Integer> sourceList){
this.sourceList = sourceList;
return this;
}
/**
* 设置 事项来源
* @param sourceNotList
*/
public SiteMatterAssistQuery sourceNotList(List<Integer> sourceNotList){
this.sourceNotList = sourceNotList;
return this;
}
/**
* 设置 浏览次数
* @param viewsCount
*/
public SiteMatterAssistQuery viewsCount(Long viewsCount){
setViewsCount(viewsCount);
return this;
}
/**
* 设置 开始 浏览次数
* @param viewsCountStart
*/
public SiteMatterAssistQuery viewsCountStart(Long viewsCountStart){
this.viewsCountStart = viewsCountStart;
return this;
}
/**
* 设置 结束 浏览次数
* @param viewsCountEnd
*/
public SiteMatterAssistQuery viewsCountEnd(Long viewsCountEnd){
this.viewsCountEnd = viewsCountEnd;
return this;
}
/**
* 设置 增加 浏览次数
* @param viewsCountIncrement
*/
public SiteMatterAssistQuery viewsCountIncrement(Long viewsCountIncrement){
this.viewsCountIncrement = viewsCountIncrement;
return this;
}
/**
* 设置 浏览次数
* @param viewsCountList
*/
public SiteMatterAssistQuery viewsCountList(List<Long> viewsCountList){
this.viewsCountList = viewsCountList;
return this;
}
/**
* 设置 浏览次数
* @param viewsCountNotList
*/
public SiteMatterAssistQuery viewsCountNotList(List<Long> viewsCountNotList){
this.viewsCountNotList = viewsCountNotList;
return this;
}
/** /**
* 设置 政务网地址 * 设置 政务网地址
...@@ -1689,60 +1893,6 @@ public class SiteMatterAssistQuery extends SiteMatterAssistEntity { ...@@ -1689,60 +1893,6 @@ public class SiteMatterAssistQuery extends SiteMatterAssistEntity {
} }
/**
* 设置 事项来源
* @param source
*/
public SiteMatterAssistQuery source(Integer source){
setSource(source);
return this;
}
/**
* 设置 开始 事项来源
* @param sourceStart
*/
public SiteMatterAssistQuery sourceStart(Integer sourceStart){
this.sourceStart = sourceStart;
return this;
}
/**
* 设置 结束 事项来源
* @param sourceEnd
*/
public SiteMatterAssistQuery sourceEnd(Integer sourceEnd){
this.sourceEnd = sourceEnd;
return this;
}
/**
* 设置 增加 事项来源
* @param sourceIncrement
*/
public SiteMatterAssistQuery sourceIncrement(Integer sourceIncrement){
this.sourceIncrement = sourceIncrement;
return this;
}
/**
* 设置 事项来源
* @param sourceList
*/
public SiteMatterAssistQuery sourceList(List<Integer> sourceList){
this.sourceList = sourceList;
return this;
}
/**
* 设置 事项来源
* @param sourceNotList
*/
public SiteMatterAssistQuery sourceNotList(List<Integer> sourceNotList){
this.sourceNotList = sourceNotList;
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/resources/sqlmap/module/site/SiteMatterAssistMapper.xml
View file @ 7f4890cc
...@@ -17,12 +17,13 @@ ...@@ -17,12 +17,13 @@
<result property="officeName" column="officeName" /> <result property="officeName" column="officeName" />
<result property="dutyer" column="dutyer" /> <result property="dutyer" column="dutyer" />
<result property="telephone" column="telephone" /> <result property="telephone" column="telephone" />
<result property="source" column="source" />
<result property="viewsCount" column="viewsCount" />
<result property="govUrl" column="govUrl" /> <result property="govUrl" column="govUrl" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="source" column="source" />
</resultMap> </resultMap>
...@@ -66,6 +67,12 @@ ...@@ -66,6 +67,12 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('telephone') or colPickMode == 1 and data.containsKey('telephone')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('telephone') or colPickMode == 1 and data.containsKey('telephone')))">
a.telephone, a.telephone,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
a.source,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('viewsCount') or colPickMode == 1 and data.containsKey('viewsCount')))">
a.viewsCount,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('govUrl') or colPickMode == 1 and data.containsKey('govUrl')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('govUrl') or colPickMode == 1 and data.containsKey('govUrl')))">
a.govUrl, a.govUrl,
</if> </if>
...@@ -81,26 +88,23 @@ ...@@ -81,26 +88,23 @@
<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('source') or colPickMode == 1 and data.containsKey('source')))">
a.source,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="SiteMatterAssistEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="SiteMatterAssistEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_site_matter_assist insert into mortals_sys_site_matter_assist
(siteMatterId,matterId,matterName,matterCode,deptId,deptName,deptCode,officeId,officeName,dutyer,telephone,govUrl,createUserId,createTime,updateUserId,updateTime,source) (siteMatterId,matterId,matterName,matterCode,deptId,deptName,deptCode,officeId,officeName,dutyer,telephone,source,viewsCount,govUrl,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
(#{siteMatterId},#{matterId},#{matterName},#{matterCode},#{deptId},#{deptName},#{deptCode},#{officeId},#{officeName},#{dutyer},#{telephone},#{govUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{source}) (#{siteMatterId},#{matterId},#{matterName},#{matterCode},#{deptId},#{deptName},#{deptCode},#{officeId},#{officeName},#{dutyer},#{telephone},#{source},#{viewsCount},#{govUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_site_matter_assist insert into mortals_sys_site_matter_assist
(siteMatterId,matterId,matterName,matterCode,deptId,deptName,deptCode,officeId,officeName,dutyer,telephone,govUrl,createUserId,createTime,updateUserId,updateTime,source) (siteMatterId,matterId,matterName,matterCode,deptId,deptName,deptCode,officeId,officeName,dutyer,telephone,source,viewsCount,govUrl,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteMatterId},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.deptId},#{item.deptName},#{item.deptCode},#{item.officeId},#{item.officeName},#{item.dutyer},#{item.telephone},#{item.govUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.source}) (#{item.siteMatterId},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.deptId},#{item.deptName},#{item.deptCode},#{item.officeId},#{item.officeName},#{item.dutyer},#{item.telephone},#{item.source},#{item.viewsCount},#{item.govUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -155,6 +159,18 @@ ...@@ -155,6 +159,18 @@
<if test="(colPickMode==0 and data.containsKey('telephone')) or (colPickMode==1 and !data.containsKey('telephone'))"> <if test="(colPickMode==0 and data.containsKey('telephone')) or (colPickMode==1 and !data.containsKey('telephone'))">
a.telephone=#{data.telephone}, a.telephone=#{data.telephone},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))">
a.source=#{data.source},
</if>
<if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))">
a.source=ifnull(a.source,0) + #{data.sourceIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('viewsCount')) or (colPickMode==1 and !data.containsKey('viewsCount'))">
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('govUrl')) or (colPickMode==1 and !data.containsKey('govUrl'))"> <if test="(colPickMode==0 and data.containsKey('govUrl')) or (colPickMode==1 and !data.containsKey('govUrl'))">
a.govUrl=#{data.govUrl}, a.govUrl=#{data.govUrl},
</if> </if>
...@@ -176,12 +192,6 @@ ...@@ -176,12 +192,6 @@
<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('source')) or (colPickMode==1 and !data.containsKey('source'))">
a.source=#{data.source},
</if>
<if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))">
a.source=ifnull(a.source,0) + #{data.sourceIncrement},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -291,6 +301,30 @@ ...@@ -291,6 +301,30 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="source=(case" suffix="ELSE source end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('source')) or (colPickMode==1 and !item.containsKey('source'))">
when a.id=#{item.id} then #{item.source}
</when>
<when test="(colPickMode==0 and item.containsKey('sourceIncrement')) or (colPickMode==1 and !item.containsKey('sourceIncrement'))">
when a.id=#{item.id} then ifnull(a.source,0) + #{item.sourceIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="viewsCount=(case" suffix="ELSE viewsCount end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('viewsCount')) or (colPickMode==1 and !item.containsKey('viewsCount'))">
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="govUrl=(case" suffix="ELSE govUrl end),"> <trim prefix="govUrl=(case" suffix="ELSE govUrl 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('govUrl')) or (colPickMode==1 and !item.containsKey('govUrl'))"> <if test="(colPickMode==0 and item.containsKey('govUrl')) or (colPickMode==1 and !item.containsKey('govUrl'))">
...@@ -336,18 +370,6 @@ ...@@ -336,18 +370,6 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="source=(case" suffix="ELSE source end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('source')) or (colPickMode==1 and !item.containsKey('source'))">
when a.id=#{item.id} then #{item.source}
</when>
<when test="(colPickMode==0 and item.containsKey('sourceIncrement')) or (colPickMode==1 and !item.containsKey('sourceIncrement'))">
when a.id=#{item.id} then ifnull(a.source,0) + #{item.sourceIncrement}
</when>
</choose>
</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=")">
...@@ -746,6 +768,60 @@ ...@@ -746,6 +768,60 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('source')">
<if test="conditionParamRef.source != null ">
${_conditionType_} a.source = #{${_conditionParam_}.source}
</if>
<if test="conditionParamRef.source == null">
${_conditionType_} a.source is null
</if>
</if>
<if test="conditionParamRef.containsKey('sourceList')">
${_conditionType_} a.source in
<foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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">
${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
</if>
<if test="conditionParamRef.containsKey('sourceEnd') and conditionParamRef.sourceEnd != null">
${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
</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}
</foreach>
</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('govUrl')"> <if test="conditionParamRef.containsKey('govUrl')">
<if test="conditionParamRef.govUrl != null and conditionParamRef.govUrl != ''"> <if test="conditionParamRef.govUrl != null and conditionParamRef.govUrl != ''">
...@@ -851,33 +927,6 @@ ...@@ -851,33 +927,6 @@
<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('source')">
<if test="conditionParamRef.source != null ">
${_conditionType_} a.source = #{${_conditionParam_}.source}
</if>
<if test="conditionParamRef.source == null">
${_conditionType_} a.source is null
</if>
</if>
<if test="conditionParamRef.containsKey('sourceList')">
${_conditionType_} a.source in
<foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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">
${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
</if>
<if test="conditionParamRef.containsKey('sourceEnd') and conditionParamRef.sourceEnd != null">
${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -951,6 +1000,16 @@ ...@@ -951,6 +1000,16 @@
<if test='orderCol.telephone != null and "DESC".equalsIgnoreCase(orderCol.telephone)'>DESC</if> <if test='orderCol.telephone != null and "DESC".equalsIgnoreCase(orderCol.telephone)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('source')">
a.source
<if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('viewsCount')">
a.viewsCount
<if test='orderCol.viewsCount != null and "DESC".equalsIgnoreCase(orderCol.viewsCount)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('govUrl')"> <if test="orderCol.containsKey('govUrl')">
a.govUrl a.govUrl
<if test='orderCol.govUrl != null and "DESC".equalsIgnoreCase(orderCol.govUrl)'>DESC</if> <if test='orderCol.govUrl != null and "DESC".equalsIgnoreCase(orderCol.govUrl)'>DESC</if>
...@@ -976,11 +1035,6 @@ ...@@ -976,11 +1035,6 @@
<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('source')">
a.source
<if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>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