Skip to content

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

添加事项备注字段

parent 39799ccd
Show whitespace changes
Inline Side-by-side
Showing with 1623 additions and 1113 deletions
base-manager/db/add.sql
View file @ 53e6a34e
...@@ -348,6 +348,11 @@ CREATE TABLE `mortals_sys_social_security_set` ( ...@@ -348,6 +348,11 @@ CREATE TABLE `mortals_sys_social_security_set` (
`az400` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '机具编码', `az400` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '机具编码',
`sm4key` varchar(2048) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '私钥', `sm4key` varchar(2048) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '私钥',
`serviceCode` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '政务排号认证', `serviceCode` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '政务排号认证',
`bus_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '政务业务认证码',
`orgName` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '机构名称',
`address` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '机具使用地址',
`regionCode` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '区域码',
`orgCode` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '统一社会信用代码',
`enabled` tinyint(1) NULL DEFAULT 1 COMMENT '启用开关', `enabled` tinyint(1) NULL DEFAULT 1 COMMENT '启用开关',
`remark` varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '短信签名', `remark` varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '短信签名',
`createTime` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '创建时间', `createTime` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '创建时间',
......
base-manager/src/main/java/com/mortals/xhx/module/social/model/SocialSecuritySetEntity.java
View file @ 53e6a34e
...@@ -10,11 +10,11 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -10,11 +10,11 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.social.model.vo.SocialSecuritySetVo; import com.mortals.xhx.module.social.model.vo.SocialSecuritySetVo;
import lombok.Data; import lombok.Data;
/** /**
* 社保配置实体对象 * 社保配置实体对象
* *
* @author zxfei * @author zxfei
* @date 2025-03-21 * @date 2025-03-21
*/ */
@Data @Data
public class SocialSecuritySetEntity extends SocialSecuritySetVo { public class SocialSecuritySetEntity extends SocialSecuritySetVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -63,6 +63,26 @@ public class SocialSecuritySetEntity extends SocialSecuritySetVo { ...@@ -63,6 +63,26 @@ public class SocialSecuritySetEntity extends SocialSecuritySetVo {
* 短信签名 * 短信签名
*/ */
private String remark; private String remark;
/**
* 政务业务认证码
*/
private String busCode;
/**
* 机构名称
*/
private String orgName;
/**
* 机具使用地址
*/
private String address;
/**
* 区域码
*/
private String regionCode;
/**
* 统一社会信用代码
*/
private String orgCode;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -91,5 +111,10 @@ public class SocialSecuritySetEntity extends SocialSecuritySetVo { ...@@ -91,5 +111,10 @@ public class SocialSecuritySetEntity extends SocialSecuritySetVo {
this.serviceCode = ""; this.serviceCode = "";
this.enabled = 1; this.enabled = 1;
this.remark = ""; this.remark = "";
this.busCode = "";
this.orgName = "";
this.address = "";
this.regionCode = "";
this.orgCode = "";
} }
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/social/model/SocialSecuritySetQuery.java
View file @ 53e6a34e
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.social.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.social.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.social.model.SocialSecuritySetEntity; import com.mortals.xhx.module.social.model.SocialSecuritySetEntity;
/** /**
* 社保配置查询对象 * 社保配置查询对象
* *
* @author zxfei * @author zxfei
* @date 2025-03-21 * @date 2025-03-21
*/ */
public class SocialSecuritySetQuery extends SocialSecuritySetEntity { public class SocialSecuritySetQuery extends SocialSecuritySetEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -126,6 +126,31 @@ public class SocialSecuritySetQuery extends SocialSecuritySetEntity { ...@@ -126,6 +126,31 @@ public class SocialSecuritySetQuery extends SocialSecuritySetEntity {
/** 结束 修改时间 */ /** 结束 修改时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 政务业务认证码 */
private List<String> busCodeList;
/** 政务业务认证码排除列表 */
private List <String> busCodeNotList;
/** 机构名称 */
private List<String> orgNameList;
/** 机构名称排除列表 */
private List <String> orgNameNotList;
/** 机具使用地址 */
private List<String> addressList;
/** 机具使用地址排除列表 */
private List <String> addressNotList;
/** 区域码 */
private List<String> regionCodeList;
/** 区域码排除列表 */
private List <String> regionCodeNotList;
/** 统一社会信用代码 */
private List<String> orgCodeList;
/** 统一社会信用代码排除列表 */
private List <String> orgCodeNotList;
/** 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<SocialSecuritySetQuery> orConditionList; private List<SocialSecuritySetQuery> orConditionList;
...@@ -810,6 +835,166 @@ public class SocialSecuritySetQuery extends SocialSecuritySetEntity { ...@@ -810,6 +835,166 @@ public class SocialSecuritySetQuery extends SocialSecuritySetEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 政务业务认证码
* @return busCodeList
*/
public List<String> getBusCodeList(){
return this.busCodeList;
}
/**
* 设置 政务业务认证码
* @param busCodeList
*/
public void setBusCodeList(List<String> busCodeList){
this.busCodeList = busCodeList;
}
/**
* 获取 政务业务认证码
* @return busCodeNotList
*/
public List<String> getBusCodeNotList(){
return this.busCodeNotList;
}
/**
* 设置 政务业务认证码
* @param busCodeNotList
*/
public void setBusCodeNotList(List<String> busCodeNotList){
this.busCodeNotList = busCodeNotList;
}
/**
* 获取 机构名称
* @return orgNameList
*/
public List<String> getOrgNameList(){
return this.orgNameList;
}
/**
* 设置 机构名称
* @param orgNameList
*/
public void setOrgNameList(List<String> orgNameList){
this.orgNameList = orgNameList;
}
/**
* 获取 机构名称
* @return orgNameNotList
*/
public List<String> getOrgNameNotList(){
return this.orgNameNotList;
}
/**
* 设置 机构名称
* @param orgNameNotList
*/
public void setOrgNameNotList(List<String> orgNameNotList){
this.orgNameNotList = orgNameNotList;
}
/**
* 获取 机具使用地址
* @return addressList
*/
public List<String> getAddressList(){
return this.addressList;
}
/**
* 设置 机具使用地址
* @param addressList
*/
public void setAddressList(List<String> addressList){
this.addressList = addressList;
}
/**
* 获取 机具使用地址
* @return addressNotList
*/
public List<String> getAddressNotList(){
return this.addressNotList;
}
/**
* 设置 机具使用地址
* @param addressNotList
*/
public void setAddressNotList(List<String> addressNotList){
this.addressNotList = addressNotList;
}
/**
* 获取 区域码
* @return regionCodeList
*/
public List<String> getRegionCodeList(){
return this.regionCodeList;
}
/**
* 设置 区域码
* @param regionCodeList
*/
public void setRegionCodeList(List<String> regionCodeList){
this.regionCodeList = regionCodeList;
}
/**
* 获取 区域码
* @return regionCodeNotList
*/
public List<String> getRegionCodeNotList(){
return this.regionCodeNotList;
}
/**
* 设置 区域码
* @param regionCodeNotList
*/
public void setRegionCodeNotList(List<String> regionCodeNotList){
this.regionCodeNotList = regionCodeNotList;
}
/**
* 获取 统一社会信用代码
* @return orgCodeList
*/
public List<String> getOrgCodeList(){
return this.orgCodeList;
}
/**
* 设置 统一社会信用代码
* @param orgCodeList
*/
public void setOrgCodeList(List<String> orgCodeList){
this.orgCodeList = orgCodeList;
}
/**
* 获取 统一社会信用代码
* @return orgCodeNotList
*/
public List<String> getOrgCodeNotList(){
return this.orgCodeNotList;
}
/**
* 设置 统一社会信用代码
* @param orgCodeNotList
*/
public void setOrgCodeNotList(List<String> orgCodeNotList){
this.orgCodeNotList = orgCodeNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -1199,6 +1384,101 @@ public class SocialSecuritySetQuery extends SocialSecuritySetEntity { ...@@ -1199,6 +1384,101 @@ public class SocialSecuritySetQuery extends SocialSecuritySetEntity {
} }
/**
* 设置 政务业务认证码
* @param busCode
*/
public SocialSecuritySetQuery busCode(String busCode){
setBusCode(busCode);
return this;
}
/**
* 设置 政务业务认证码
* @param busCodeList
*/
public SocialSecuritySetQuery busCodeList(List<String> busCodeList){
this.busCodeList = busCodeList;
return this;
}
/**
* 设置 机构名称
* @param orgName
*/
public SocialSecuritySetQuery orgName(String orgName){
setOrgName(orgName);
return this;
}
/**
* 设置 机构名称
* @param orgNameList
*/
public SocialSecuritySetQuery orgNameList(List<String> orgNameList){
this.orgNameList = orgNameList;
return this;
}
/**
* 设置 机具使用地址
* @param address
*/
public SocialSecuritySetQuery address(String address){
setAddress(address);
return this;
}
/**
* 设置 机具使用地址
* @param addressList
*/
public SocialSecuritySetQuery addressList(List<String> addressList){
this.addressList = addressList;
return this;
}
/**
* 设置 区域码
* @param regionCode
*/
public SocialSecuritySetQuery regionCode(String regionCode){
setRegionCode(regionCode);
return this;
}
/**
* 设置 区域码
* @param regionCodeList
*/
public SocialSecuritySetQuery regionCodeList(List<String> regionCodeList){
this.regionCodeList = regionCodeList;
return this;
}
/**
* 设置 统一社会信用代码
* @param orgCode
*/
public SocialSecuritySetQuery orgCode(String orgCode){
setOrgCode(orgCode);
return this;
}
/**
* 设置 统一社会信用代码
* @param orgCodeList
*/
public SocialSecuritySetQuery orgCodeList(List<String> orgCodeList){
this.orgCodeList = orgCodeList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
base-manager/src/main/resources/sqlmap/module/social/SocialSecuritySetMapper.xml
View file @ 53e6a34e
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.social.dao.ibatis.SocialSecuritySetDaoImpl"> <mapper namespace="com.mortals.xhx.module.social.dao.ibatis.SocialSecuritySetDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -20,6 +20,11 @@ ...@@ -20,6 +20,11 @@
<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="busCode" column="bus_code" />
<result property="orgName" column="orgName" />
<result property="address" column="address" />
<result property="regionCode" column="regionCode" />
<result property="orgCode" column="orgCode" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
...@@ -70,23 +75,38 @@ ...@@ -70,23 +75,38 @@
<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('busCode') or colPickMode == 1 and data.containsKey('busCode')))">
a.bus_code,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('orgName') or colPickMode == 1 and data.containsKey('orgName')))">
a.orgName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('address') or colPickMode == 1 and data.containsKey('address')))">
a.address,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('regionCode') or colPickMode == 1 and data.containsKey('regionCode')))">
a.regionCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('orgCode') or colPickMode == 1 and data.containsKey('orgCode')))">
a.orgCode,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="SocialSecuritySetEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="SocialSecuritySetEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_social_security_set insert into mortals_sys_social_security_set
(siteId,siteName,appid,access_key,privat_key,`key`,az400,sm4key,serviceCode,enabled,remark,createTime,createUserId,updateTime) (siteId,siteName,appid,access_key,privat_key,`key`,az400,sm4key,serviceCode,enabled,remark,createTime,createUserId,updateTime,bus_code,orgName,address,regionCode,orgCode)
VALUES VALUES
(#{siteId},#{siteName},#{appid},#{accessKey},#{privatKey},#{key},#{az400},#{sm4key},#{serviceCode},#{enabled},#{remark},#{createTime},#{createUserId},#{updateTime}) (#{siteId},#{siteName},#{appid},#{accessKey},#{privatKey},#{key},#{az400},#{sm4key},#{serviceCode},#{enabled},#{remark},#{createTime},#{createUserId},#{updateTime},#{busCode},#{orgName},#{address},#{regionCode},#{orgCode})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_social_security_set insert into mortals_sys_social_security_set
(siteId,siteName,appid,access_key,privat_key,`key`,az400,sm4key,serviceCode,enabled,remark,createTime,createUserId,updateTime) (siteId,siteName,appid,access_key,privat_key,`key`,az400,sm4key,serviceCode,enabled,remark,createTime,createUserId,updateTime,bus_code,orgName,address,regionCode,orgCode)
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.appid},#{item.accessKey},#{item.privatKey},#{item.key},#{item.az400},#{item.sm4key},#{item.serviceCode},#{item.enabled},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateTime}) (#{item.siteId},#{item.siteName},#{item.appid},#{item.accessKey},#{item.privatKey},#{item.key},#{item.az400},#{item.sm4key},#{item.serviceCode},#{item.enabled},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.busCode},#{item.orgName},#{item.address},#{item.regionCode},#{item.orgCode})
</foreach> </foreach>
</insert> </insert>
...@@ -147,6 +167,21 @@ ...@@ -147,6 +167,21 @@
<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('busCode')) or (colPickMode==1 and !data.containsKey('busCode'))">
a.bus_code=#{data.busCode},
</if>
<if test="(colPickMode==0 and data.containsKey('orgName')) or (colPickMode==1 and !data.containsKey('orgName'))">
a.orgName=#{data.orgName},
</if>
<if test="(colPickMode==0 and data.containsKey('address')) or (colPickMode==1 and !data.containsKey('address'))">
a.address=#{data.address},
</if>
<if test="(colPickMode==0 and data.containsKey('regionCode')) or (colPickMode==1 and !data.containsKey('regionCode'))">
a.regionCode=#{data.regionCode},
</if>
<if test="(colPickMode==0 and data.containsKey('orgCode')) or (colPickMode==1 and !data.containsKey('orgCode'))">
a.orgCode=#{data.orgCode},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -272,6 +307,41 @@ ...@@ -272,6 +307,41 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="bus_code=(case" suffix="ELSE bus_code end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('busCode')) or (colPickMode==1 and !item.containsKey('busCode'))">
when a.id=#{item.id} then #{item.busCode}
</if>
</foreach>
</trim>
<trim prefix="orgName=(case" suffix="ELSE orgName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('orgName')) or (colPickMode==1 and !item.containsKey('orgName'))">
when a.id=#{item.id} then #{item.orgName}
</if>
</foreach>
</trim>
<trim prefix="address=(case" suffix="ELSE address end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('address')) or (colPickMode==1 and !item.containsKey('address'))">
when a.id=#{item.id} then #{item.address}
</if>
</foreach>
</trim>
<trim prefix="regionCode=(case" suffix="ELSE regionCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('regionCode')) or (colPickMode==1 and !item.containsKey('regionCode'))">
when a.id=#{item.id} then #{item.regionCode}
</if>
</foreach>
</trim>
<trim prefix="orgCode=(case" suffix="ELSE orgCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('orgCode')) or (colPickMode==1 and !item.containsKey('orgCode'))">
when a.id=#{item.id} then #{item.orgCode}
</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=")">
...@@ -719,6 +789,111 @@ ...@@ -719,6 +789,111 @@
<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('busCode')">
<if test="conditionParamRef.busCode != null and conditionParamRef.busCode != ''">
${_conditionType_} a.bus_code like #{${_conditionParam_}.busCode}
</if>
<if test="conditionParamRef.busCode == null">
${_conditionType_} a.bus_code is null
</if>
</if>
<if test="conditionParamRef.containsKey('busCodeList') and conditionParamRef.busCodeList.size() > 0">
${_conditionType_} a.bus_code in
<foreach collection="conditionParamRef.busCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('busCodeNotList') and conditionParamRef.busCodeNotList.size() > 0">
${_conditionType_} a.bus_code not in
<foreach collection="conditionParamRef.busCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('orgName')">
<if test="conditionParamRef.orgName != null and conditionParamRef.orgName != ''">
${_conditionType_} a.orgName like #{${_conditionParam_}.orgName}
</if>
<if test="conditionParamRef.orgName == null">
${_conditionType_} a.orgName is null
</if>
</if>
<if test="conditionParamRef.containsKey('orgNameList') and conditionParamRef.orgNameList.size() > 0">
${_conditionType_} a.orgName in
<foreach collection="conditionParamRef.orgNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('orgNameNotList') and conditionParamRef.orgNameNotList.size() > 0">
${_conditionType_} a.orgName not in
<foreach collection="conditionParamRef.orgNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('address')">
<if test="conditionParamRef.address != null and conditionParamRef.address != ''">
${_conditionType_} a.address like #{${_conditionParam_}.address}
</if>
<if test="conditionParamRef.address == null">
${_conditionType_} a.address is null
</if>
</if>
<if test="conditionParamRef.containsKey('addressList') and conditionParamRef.addressList.size() > 0">
${_conditionType_} a.address in
<foreach collection="conditionParamRef.addressList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('addressNotList') and conditionParamRef.addressNotList.size() > 0">
${_conditionType_} a.address not in
<foreach collection="conditionParamRef.addressNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('regionCode')">
<if test="conditionParamRef.regionCode != null and conditionParamRef.regionCode != ''">
${_conditionType_} a.regionCode like #{${_conditionParam_}.regionCode}
</if>
<if test="conditionParamRef.regionCode == null">
${_conditionType_} a.regionCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('regionCodeList') and conditionParamRef.regionCodeList.size() > 0">
${_conditionType_} a.regionCode in
<foreach collection="conditionParamRef.regionCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('regionCodeNotList') and conditionParamRef.regionCodeNotList.size() > 0">
${_conditionType_} a.regionCode not in
<foreach collection="conditionParamRef.regionCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('orgCode')">
<if test="conditionParamRef.orgCode != null and conditionParamRef.orgCode != ''">
${_conditionType_} a.orgCode like #{${_conditionParam_}.orgCode}
</if>
<if test="conditionParamRef.orgCode == null">
${_conditionType_} a.orgCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('orgCodeList') and conditionParamRef.orgCodeList.size() > 0">
${_conditionType_} a.orgCode in
<foreach collection="conditionParamRef.orgCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('orgCodeNotList') and conditionParamRef.orgCodeNotList.size() > 0">
${_conditionType_} a.orgCode not in
<foreach collection="conditionParamRef.orgCodeNotList" 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()">
...@@ -863,6 +1038,31 @@ ...@@ -863,6 +1038,31 @@
<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('busCode')">
a.bus_code
<if test='orderCol.busCode != null and "DESC".equalsIgnoreCase(orderCol.busCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('orgName')">
a.orgName
<if test='orderCol.orgName != null and "DESC".equalsIgnoreCase(orderCol.orgName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('address')">
a.address
<if test='orderCol.address != null and "DESC".equalsIgnoreCase(orderCol.address)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('regionCode')">
a.regionCode
<if test='orderCol.regionCode != null and "DESC".equalsIgnoreCase(orderCol.regionCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('orgCode')">
a.orgCode
<if test='orderCol.orgCode != null and "DESC".equalsIgnoreCase(orderCol.orgCode)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
......
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