批量增加isValid和isAudit检索条件
This commit is contained in:
@@ -63,6 +63,10 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
|
||||
protected String hColumns;//导出隐藏列
|
||||
|
||||
protected String compileIdNew;// 查询 配置ID 范围
|
||||
|
||||
//批量操作时,记录isAudit和isValid检索条件
|
||||
protected String batchAuditValue;
|
||||
protected String batchValidValue;
|
||||
|
||||
/**
|
||||
* 定时任务信息
|
||||
@@ -1004,6 +1008,17 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
|
||||
public void setSchedule(ScheduleCfg schedule) {
|
||||
this.schedule = schedule;
|
||||
}
|
||||
|
||||
public String getBatchAuditValue() {
|
||||
return batchAuditValue;
|
||||
}
|
||||
public String getBatchValidValue() {
|
||||
return batchValidValue;
|
||||
}
|
||||
public void setBatchAuditValue(String batchAuditValue) {
|
||||
this.batchAuditValue = batchAuditValue;
|
||||
}
|
||||
public void setBatchValidValue(String batchValidValue) {
|
||||
this.batchValidValue = batchValidValue;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -2749,45 +2749,6 @@ public class BaseController {
|
||||
|
||||
//全部审核通过,只查询当前条件下的所有未审核的配置 -批量审核通过/不通过
|
||||
if(auditType.equals(1) || auditType.equals(2)) {
|
||||
searchCfg.setIsValid(0);
|
||||
searchCfg.setIsAudit(0);
|
||||
searchAppCfg.setIsValid(0);
|
||||
searchAppCfg.setIsAudit(0);
|
||||
searchDigestCfg.setIsValid(0);
|
||||
searchDigestCfg.setIsAudit(0);
|
||||
searchFileSampleCfg.setIsValid(0);
|
||||
searchFileSampleCfg.setIsAudit(0);
|
||||
searchObjKeyringCfg.setIsValid(0);
|
||||
searchObjKeyringCfg.setIsAudit(0);
|
||||
searchTrustedCaCertCfg.setIsValid(0);
|
||||
searchTrustedCaCertCfg.setIsAudit(0);
|
||||
searchTrustedCaCrlCfg.setIsValid(0);
|
||||
searchTrustedCaCrlCfg.setIsAudit(0);
|
||||
searchDnsResStrategy.setIsValid(0);
|
||||
searchDnsResStrategy.setIsAudit(0);
|
||||
searchDnsIpCfg.setIsValid(0);
|
||||
searchDnsIpCfg.setIsAudit(0);
|
||||
searchIpPortCfg.setIsValid(0);
|
||||
searchIpPortCfg.setIsAudit(0);
|
||||
searchSignSampleCfg.setIsValid(0);
|
||||
searchSignSampleCfg.setIsAudit(0);
|
||||
searchDdosIpCfg.setIsValid(0);
|
||||
searchDdosIpCfg.setIsAudit(0);
|
||||
searchAppIpCfg.setIsValid(0);
|
||||
searchAppIpCfg.setIsAudit(0);
|
||||
searchAppHttpCfg.setIsValid(0);
|
||||
searchAppHttpCfg.setIsAudit(0);
|
||||
searchAppDomainCfg.setIsValid(0);
|
||||
searchAppDomainCfg.setIsAudit(0);
|
||||
searchAppTopicCfg.setIsValid(0);
|
||||
searchAppTopicCfg.setIsAudit(0);
|
||||
searchAppFeatureIndex.setIsValid(0);
|
||||
searchAppFeatureIndex.setIsAudit(0);
|
||||
searchAppSslCertCfg.setIsValid(0);
|
||||
searchAppSslCertCfg.setIsAudit(0);
|
||||
searchAsnIpCfg.setIsValid(0);
|
||||
searchAsnIpCfg.setIsAudit(0);
|
||||
|
||||
if(auditType.equals(1)) {
|
||||
auditBatchCfg.setIsAudit(1);
|
||||
auditBatchCfg.setIsValid(1);
|
||||
@@ -2798,45 +2759,6 @@ public class BaseController {
|
||||
auditBatchCfg.setAuditTime(new Date());
|
||||
auditBatchCfg.setAuditorId(UserUtils.getUser().getId());
|
||||
}else {
|
||||
//全部取消通过,只查询当前条件下的所有审核通过的配置
|
||||
searchCfg.setIsValid(1);
|
||||
searchCfg.setIsAudit(1);
|
||||
searchAppCfg.setIsValid(1);
|
||||
searchAppCfg.setIsAudit(1);
|
||||
searchDigestCfg.setIsValid(1);
|
||||
searchDigestCfg.setIsAudit(1);
|
||||
searchFileSampleCfg.setIsValid(1);
|
||||
searchFileSampleCfg.setIsAudit(1);
|
||||
searchObjKeyringCfg.setIsValid(1);
|
||||
searchObjKeyringCfg.setIsAudit(1);
|
||||
searchTrustedCaCertCfg.setIsValid(1);
|
||||
searchTrustedCaCertCfg.setIsAudit(1);
|
||||
searchTrustedCaCrlCfg.setIsValid(1);
|
||||
searchTrustedCaCrlCfg.setIsAudit(1);
|
||||
searchDnsResStrategy.setIsValid(1);
|
||||
searchDnsResStrategy.setIsAudit(1);
|
||||
searchDnsIpCfg.setIsValid(1);
|
||||
searchDnsIpCfg.setIsAudit(1);
|
||||
searchIpPortCfg.setIsValid(1);
|
||||
searchIpPortCfg.setIsAudit(1);
|
||||
searchSignSampleCfg.setIsValid(1);
|
||||
searchSignSampleCfg.setIsAudit(1);
|
||||
searchDdosIpCfg.setIsValid(1);
|
||||
searchDdosIpCfg.setIsAudit(1);
|
||||
searchAppIpCfg.setIsValid(1);
|
||||
searchAppIpCfg.setIsAudit(1);
|
||||
searchAppHttpCfg.setIsValid(1);
|
||||
searchAppHttpCfg.setIsAudit(1);
|
||||
searchAppDomainCfg.setIsValid(1);
|
||||
searchAppDomainCfg.setIsAudit(1);
|
||||
searchAppTopicCfg.setIsValid(1);
|
||||
searchAppTopicCfg.setIsAudit(1);
|
||||
searchAppFeatureIndex.setIsValid(1);
|
||||
searchAppFeatureIndex.setIsAudit(1);
|
||||
searchAppSslCertCfg.setIsValid(1);
|
||||
searchAppSslCertCfg.setIsAudit(1);
|
||||
searchAsnIpCfg.setIsValid(1);
|
||||
searchAsnIpCfg.setIsAudit(1);
|
||||
|
||||
auditBatchCfg.setIsAudit(3);
|
||||
auditBatchCfg.setIsValid(0);
|
||||
@@ -3296,11 +3218,42 @@ public class BaseController {
|
||||
//批量审核通过时,如果没有携带isValid检索条件,返回界面需要将isValid置为null
|
||||
if(!StringUtil.isEmpty(entity)) {
|
||||
BaseCfg base=(BaseCfg)entity ;
|
||||
if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) {
|
||||
base.setIsValid(null);
|
||||
BeanUtils.copyProperties(base, entity);
|
||||
base.setBatchAuditValue("");
|
||||
base.setBatchValidValue("");
|
||||
//配置目标状态:1 1 生效,isAudit条件置为1,有selType条件,且不是isValid不改,没有sel改为isValid并且为1
|
||||
if(base.getIsAudit()==1 && base.getIsValid()==1){
|
||||
base.setIsAudit(1);
|
||||
if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) {
|
||||
base.setIsValid(null);
|
||||
}else{
|
||||
base.setIsValid(1);
|
||||
base.setSeltype("isValid");
|
||||
}
|
||||
}
|
||||
//配置目标状态:2 0 不通过,isAudit条件置为2,有selType条件,且不是isValid不改,没有sel改为isValid并且为0
|
||||
if(base.getIsAudit()==2 && base.getIsValid()==0){
|
||||
base.setIsAudit(2);
|
||||
if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) {
|
||||
base.setIsValid(null);
|
||||
}else{
|
||||
base.setIsValid(0);
|
||||
base.setSeltype("isValid");
|
||||
}
|
||||
}
|
||||
//配置目标状态:3 0 取消
|
||||
if(base.getIsAudit()==3 && base.getIsValid()==0){
|
||||
base.setIsAudit(3);
|
||||
if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) {
|
||||
base.setIsValid(null);
|
||||
}else{
|
||||
base.setIsValid(0);
|
||||
base.setSeltype("isValid");
|
||||
}
|
||||
}
|
||||
|
||||
BeanUtils.copyProperties(base, entity);
|
||||
}
|
||||
|
||||
long end=System.currentTimeMillis();
|
||||
logger.warn("配置批量生效/失效耗时:"+(end-start));
|
||||
}
|
||||
@@ -3338,117 +3291,73 @@ public class BaseController {
|
||||
PxyObjTrustedCaCert searchTrustedCaCertCfg=new PxyObjTrustedCaCert();
|
||||
AsnIpCfg searchAsnIpCfg=new AsnIpCfg();
|
||||
|
||||
// 未审核或取消审核通过的配置可删除
|
||||
Integer searchAuditValue = (Integer)Reflections.invokeGetter(entity, "isAudit");
|
||||
if(searchAuditValue != null) {
|
||||
if(searchAuditValue != 3 && searchAuditValue != 0) {
|
||||
searchAuditValue = 30;
|
||||
}
|
||||
}else {
|
||||
searchAuditValue = 30;
|
||||
}
|
||||
|
||||
// 传递检索条件
|
||||
if(entity != null && (entity instanceof CfgIndexInfo)) {
|
||||
BeanUtils.copyProperties(entity, searchCfg);
|
||||
searchCfg.setIsValid(0);
|
||||
searchCfg.setIsAudit(searchAuditValue); // 检索isValid = 0 AND (isAudit = 0 OR 3)
|
||||
searchCfg.setFunctionId(functionId);
|
||||
}
|
||||
if(entity != null && (entity instanceof AppPolicyCfg)) {
|
||||
BeanUtils.copyProperties(entity, searchAppCfg);
|
||||
searchAppCfg.setIsValid(0);
|
||||
searchAppCfg.setIsAudit(searchAuditValue);
|
||||
searchAppCfg.setFunctionId(functionId);
|
||||
}
|
||||
if(entity != null && (entity instanceof FileDigestCfg)) {
|
||||
BeanUtils.copyProperties(entity, searchDigestCfg);
|
||||
searchDigestCfg.setIsValid(0);
|
||||
searchDigestCfg.setIsAudit(searchAuditValue);
|
||||
searchDigestCfg.setFunctionId(functionId);
|
||||
}
|
||||
if(entity != null && (entity instanceof AvFileSampleCfg)) {
|
||||
BeanUtils.copyProperties(entity, searchFileSampleCfg);
|
||||
searchFileSampleCfg.setIsValid(0);
|
||||
searchFileSampleCfg.setIsAudit(searchAuditValue);
|
||||
searchFileSampleCfg.setFunctionId(functionId);
|
||||
}
|
||||
if(entity != null && (entity instanceof DdosIpCfg)) {
|
||||
BeanUtils.copyProperties(entity, searchDdosIpCfg);
|
||||
searchDdosIpCfg.setIsValid(0);
|
||||
searchDdosIpCfg.setIsAudit(searchAuditValue);
|
||||
searchDdosIpCfg.setFunctionId(functionId);
|
||||
}
|
||||
if(entity != null && (entity instanceof AppHttpCfg)) {
|
||||
BeanUtils.copyProperties(entity, searchAppHttpCfg);
|
||||
searchAppHttpCfg.setIsValid(0);
|
||||
searchAppHttpCfg.setIsAudit(searchAuditValue);
|
||||
searchAppHttpCfg.setFunctionId(functionId);
|
||||
}
|
||||
if(entity != null && (entity instanceof AppHttpCfg)) {
|
||||
BeanUtils.copyProperties(entity, searchAppHttpCfg);
|
||||
searchAppHttpCfg.setIsValid(0);
|
||||
searchAppHttpCfg.setIsAudit(searchAuditValue);
|
||||
searchAppHttpCfg.setFunctionId(functionId);
|
||||
}
|
||||
if(entity != null && (entity instanceof AppDomainCfg)) {
|
||||
BeanUtils.copyProperties(entity, searchAppDomainCfg);
|
||||
searchAppDomainCfg.setIsValid(0);
|
||||
searchAppDomainCfg.setIsAudit(searchAuditValue);
|
||||
searchAppDomainCfg.setFunctionId(functionId);
|
||||
}
|
||||
if(entity != null && (entity instanceof AppTopicDomainCfg)) {
|
||||
BeanUtils.copyProperties(entity, searchAppTopicCfg);
|
||||
searchAppTopicCfg.setIsValid(0);
|
||||
searchAppTopicCfg.setIsAudit(searchAuditValue);
|
||||
searchAppTopicCfg.setFunctionId(functionId);
|
||||
}
|
||||
if(entity != null && (entity instanceof AppSslCertCfg)) {
|
||||
BeanUtils.copyProperties(entity, searchAppSslCertCfg);
|
||||
searchAppSslCertCfg.setIsValid(0);
|
||||
searchAppSslCertCfg.setIsAudit(searchAuditValue);
|
||||
searchAppSslCertCfg.setFunctionId(functionId);
|
||||
}
|
||||
if(entity != null && (entity instanceof AppIpCfg)) {
|
||||
BeanUtils.copyProperties(entity, searchAppIpCfg);
|
||||
searchAppIpCfg.setIsValid(0);
|
||||
searchAppIpCfg.setIsAudit(searchAuditValue);
|
||||
searchAppIpCfg.setFunctionId(functionId);
|
||||
}
|
||||
if(entity != null && (entity instanceof AppFeatureIndex)) {
|
||||
BeanUtils.copyProperties(entity, searchAppFeatureIndex);
|
||||
searchAppFeatureIndex.setIsValid(0);
|
||||
searchAppFeatureIndex.setIsAudit(searchAuditValue);
|
||||
searchAppFeatureIndex.setFunctionId(functionId);
|
||||
}
|
||||
if(entity != null && (entity instanceof DnsResStrategy)) {
|
||||
BeanUtils.copyProperties(entity, searchDnsResStrategy);
|
||||
searchDnsResStrategy.setIsValid(0);
|
||||
searchDnsResStrategy.setIsAudit(searchAuditValue);
|
||||
searchDnsResStrategy.setFunctionId(functionId);
|
||||
}
|
||||
if(entity != null && (entity instanceof DnsIpCfg)) {
|
||||
BeanUtils.copyProperties(entity, searchDnsIpCfg);
|
||||
searchDnsIpCfg.setIsValid(0);
|
||||
searchDnsIpCfg.setIsAudit(searchAuditValue);
|
||||
searchDnsIpCfg.setFunctionId(functionId);
|
||||
}
|
||||
if(entity != null && (entity instanceof PxyObjKeyring)) {
|
||||
BeanUtils.copyProperties(entity, searchObjKeyringCfg);
|
||||
searchObjKeyringCfg.setIsValid(0);
|
||||
searchObjKeyringCfg.setIsAudit(searchAuditValue);
|
||||
searchObjKeyringCfg.setFunctionId(functionId);
|
||||
}
|
||||
if(entity != null && (entity instanceof PxyObjTrustedCaCert)) {
|
||||
BeanUtils.copyProperties(entity, searchTrustedCaCertCfg);
|
||||
searchTrustedCaCertCfg.setIsValid(0);
|
||||
searchTrustedCaCertCfg.setIsAudit(searchAuditValue);
|
||||
searchTrustedCaCertCfg.setFunctionId(functionId);
|
||||
}
|
||||
if(entity != null && (entity instanceof AsnIpCfg)) {
|
||||
BeanUtils.copyProperties(entity, searchAsnIpCfg);
|
||||
searchAsnIpCfg.setIsValid(0);
|
||||
searchAsnIpCfg.setIsAudit(searchAuditValue);
|
||||
searchAsnIpCfg.setFunctionId(functionId);
|
||||
}
|
||||
|
||||
|
||||
@@ -128,20 +128,34 @@
|
||||
<if test="action != null">
|
||||
AND r.ACTION=#{action,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND r.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
|
||||
<if test="creatorName != null and creatorName !=''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
|
||||
@@ -727,20 +727,33 @@
|
||||
<if test="action != null">
|
||||
AND r.ACTION=#{action,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND r.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="creatorName != null and creatorName != ''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
@@ -927,20 +940,33 @@
|
||||
<if test="action != null">
|
||||
AND r.ACTION=#{action,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND r.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="creatorName != null and creatorName != ''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
@@ -1060,20 +1086,33 @@
|
||||
<if test="action != null">
|
||||
AND r.ACTION=#{action,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND r.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="creatorName != null and creatorName != ''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
@@ -1165,20 +1204,33 @@
|
||||
<if test="action != null">
|
||||
AND r.ACTION=#{action,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND r.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="creatorName != null and creatorName != ''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
@@ -1290,20 +1342,33 @@
|
||||
<if test="action != null">
|
||||
AND r.ACTION=#{action,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND r.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="creatorName != null and creatorName != ''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
@@ -1612,20 +1677,33 @@
|
||||
<if test="action != null">
|
||||
AND r.ACTION=#{action,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND r.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="creatorName != null and creatorName != ''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
|
||||
@@ -273,20 +273,33 @@
|
||||
<if test="action != null">
|
||||
AND r.ACTION=#{action,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND r.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="creatorName != null and creatorName != ''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
|
||||
@@ -128,20 +128,33 @@
|
||||
<if test="action != null">
|
||||
AND a.ACTION=#{action,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid != null">
|
||||
AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND a.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND a.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND a.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND a.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND a.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="creatorName != null and creatorName != ''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
|
||||
@@ -310,20 +310,33 @@
|
||||
<if test="action != null">
|
||||
AND r.ACTION=#{action,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND r.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="creatorName != null and creatorName != ''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
|
||||
@@ -208,20 +208,33 @@
|
||||
<if test="action != null">
|
||||
AND a.ACTION=#{action,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid != null">
|
||||
AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND a.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND a.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND a.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND a.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND a.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="creatorName != null and creatorName != ''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
|
||||
@@ -219,20 +219,33 @@
|
||||
<if test="action != null">
|
||||
AND a.ACTION=#{action,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid != null">
|
||||
AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND a.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND a.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND a.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND a.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND a.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="creatorName != null and creatorName != ''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
|
||||
@@ -117,20 +117,33 @@
|
||||
<if test="action != null">
|
||||
AND r.ACTION=#{action,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND r.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="creatorName != null and creatorName !=''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
|
||||
@@ -120,20 +120,33 @@
|
||||
<if test="action != null">
|
||||
AND r.ACTION=#{action,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND r.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="creatorName != null and creatorName !=''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
|
||||
@@ -85,20 +85,33 @@
|
||||
<if test="action != null">
|
||||
AND r.ACTION=#{action,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND r.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="creatorName != null and creatorName != ''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
|
||||
@@ -232,14 +232,33 @@
|
||||
<if test="isValid == null">
|
||||
AND a.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND a.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND a.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND a.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND a.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="creatorName != null and creatorName != ''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
@@ -1145,20 +1164,33 @@
|
||||
<if test="action != null">
|
||||
AND a.ACTION=#{action,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid != null">
|
||||
AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND a.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND a.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND a.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND a.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND a.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="creatorName != null and creatorName != ''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
|
||||
@@ -1098,20 +1098,33 @@
|
||||
<if test="action != null">
|
||||
AND a.ACTION=#{action,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid != null">
|
||||
AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND a.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND a.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND a.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND a.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND a.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="creatorName != null and creatorName != ''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
|
||||
@@ -171,20 +171,33 @@
|
||||
<if test="action != null">
|
||||
AND r.ACTION=#{action,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND r.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="creatorName != null and creatorName != ''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
@@ -259,20 +272,33 @@
|
||||
<if test="action != null">
|
||||
AND r.ACTION=#{action,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND r.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND r.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND r.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="creatorName != null and creatorName != ''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
|
||||
@@ -189,20 +189,33 @@
|
||||
<if test="action != null">
|
||||
AND a.ACTION=#{action,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid != null">
|
||||
AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND a.IS_VALID != -1
|
||||
</if>
|
||||
<if test="isAudit != null">
|
||||
<if test="isAudit > 9">
|
||||
AND a.IS_AUDIT IN(LEFT(#{isAudit,jdbcType=INTEGER},1),RIGHT(#{isAudit,jdbcType=INTEGER},1))
|
||||
</if>
|
||||
<if test="isAudit < 9">
|
||||
AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</if>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchValidValue != null and batchValidValue != ''">
|
||||
AND a.IS_VALID in (${batchValidValue})
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isValid != null">
|
||||
AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
|
||||
</if>
|
||||
<if test="isValid == null">
|
||||
AND a.IS_VALID != -1
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<choose>
|
||||
<!-- 判断是否批量操作 -->
|
||||
<when test="batchAuditValue != null and batchAuditValue != ''">
|
||||
<if test="isAudit != null">
|
||||
AND a.IS_AUDIT in(${batchAuditValue})
|
||||
</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
<if test="isAudit != null">
|
||||
AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
|
||||
</if>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="creatorName != null and creatorName != ''">
|
||||
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
|
||||
</if>
|
||||
|
||||
@@ -167,13 +167,23 @@ function del(url){
|
||||
var isAudit=$("#isAudit").val();
|
||||
var isValid=$("#isValid").val();
|
||||
|
||||
// 批量删除:is_audit 3/0/null && is_valid 0/null 此条件下允许
|
||||
// 批量删除:is_audit 3/0/null && is_valid 0/null 此条件下允许(取反提示)
|
||||
if(!((isAudit==null || isAudit=='' || isAudit==3 || isAudit==0 )
|
||||
&& (isValid=null || isValid==0))){
|
||||
&& (isValid==null || isValid==''|| isValid==0))){
|
||||
top.$.jBox.tip("<spring:message code='has_prohibit_delete'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}
|
||||
|
||||
if(isAudit==null || isAudit==''){
|
||||
isAudit="3,0";
|
||||
}
|
||||
if(isValid==null || isValid==''){
|
||||
isValid="0";
|
||||
}
|
||||
|
||||
url=url+"&batchAuditValue="+isAudit;
|
||||
url=url+"&batchValidValue="+isValid;
|
||||
|
||||
url = url+"&"
|
||||
if(isBatch(url)) {
|
||||
top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='delete_all'/>",function(v,h,f){
|
||||
@@ -240,13 +250,21 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
|
||||
var isAudit=$("#isAudit").val();
|
||||
var isValid=$("#isValid").val();
|
||||
|
||||
// 审核通过:is_audit 0/null && is_valid 0 此条件下允许
|
||||
// 审核通过:is_audit 0/null && is_valid 0 此条件下允许(取反提示)
|
||||
if(!((isAudit==null || isAudit=='' || isAudit==0 )
|
||||
&& (isValid=null || isValid==0))){
|
||||
&& (isValid==null || isValid==''|| isValid==0))){
|
||||
top.$.jBox.tip("<spring:message code='has_prohibit_pass'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}
|
||||
|
||||
if(isAudit==null || isAudit==''){
|
||||
isAudit="0";
|
||||
}
|
||||
if(isValid==null || isValid==''){
|
||||
isValid="0";
|
||||
}
|
||||
url=url+"&batchAuditValue="+isAudit;
|
||||
url=url+"&batchValidValue="+isValid;
|
||||
url = url+"&"
|
||||
//配置批量下发
|
||||
if(isBatch(url)){
|
||||
@@ -279,13 +297,23 @@ function noPassOpt(url){
|
||||
var isAudit=$("#isAudit").val();
|
||||
var isValid=$("#isValid").val();
|
||||
|
||||
// 审核不通过:is_audit 0/null && is_valid 0/null 此条件下允许
|
||||
// 审核不通过:is_audit 0/null && is_valid 0/null 此条件下允许(取反提示)
|
||||
if(!((isAudit==null || isAudit=='' || isAudit==0 )
|
||||
&& (isValid=null || isValid==0))){
|
||||
&& (isValid==null || isValid==''|| isValid==0))){
|
||||
top.$.jBox.tip("<spring:message code='has_prohibit_nopass'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}
|
||||
|
||||
if(isAudit==null || isAudit==''){
|
||||
isAudit="0";
|
||||
}
|
||||
if(isValid==null || isValid==''){
|
||||
isValid="0";
|
||||
}
|
||||
|
||||
url=url+"&batchAuditValue="+isAudit;
|
||||
url=url+"&batchValidValue="+isValid;
|
||||
|
||||
url = url+"&"
|
||||
//配置批量审核(未通过)
|
||||
if(isBatch(url)){
|
||||
@@ -366,14 +394,22 @@ function cancelPassOpt(url){
|
||||
}else{
|
||||
var isAudit=$("#isAudit").val();
|
||||
var isValid=$("#isValid").val();
|
||||
|
||||
// 取消审核通过:is_audit 1/null && is_valid 0(定时任务)/1/null 此条件下允许
|
||||
// 取消审核通过:is_audit 1/null && is_valid 0(定时任务)/1/null 此条件下允许(取反提示)
|
||||
if(!((isAudit==null || isAudit=='' || isAudit==1 )
|
||||
&& (isValid=null || isValid==1 || isValid==0))){
|
||||
&& (isValid==null || isValid=='' || isValid==1 || isValid==0))){
|
||||
top.$.jBox.tip("<spring:message code='hasnot_approved'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}
|
||||
|
||||
if(isAudit==null || isAudit==''){
|
||||
isAudit="1";
|
||||
}
|
||||
if(isValid==null || isValid==''){
|
||||
isValid="1,0";
|
||||
}
|
||||
url=url+"&batchAuditValue="+isAudit;
|
||||
url=url+"&batchValidValue="+isValid;
|
||||
|
||||
url = url+"&"
|
||||
//配置批量取消
|
||||
if(isBatch(url)){
|
||||
|
||||
Reference in New Issue
Block a user