Skip to content

S
smart_gov_platform
Commit a9d6544d authored by 王启林's avatar 王启林
Browse files
Options

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

parents 00eb684e 698b1537
Show whitespace changes
Inline Side-by-side
Showing with 5036 additions and 1255 deletions
base-manager-ui/admin/public/favicon.ico
View replaced file @ 00eb684e View file @ a9d6544d
base-manager-ui/admin/public/favicon.ico

5.34 KB | W: 45px | H: 46px

base-manager-ui/admin/public/favicon.ico

4.19 KB | W: 32px | H: 32px

  • 2-up
  • Swipe
  • Onion skin
base-manager-ui/admin/src/components/yswitch/YSwitch.vue
View file @ a9d6544d
......@@ -41,6 +41,7 @@ export default {
methods: {
onChange(checked) {
this.$emit("change", checked ? 1 : 0);
this.$emit("onChange", checked ? 1 : 0);
},
},
};
......
base-manager-ui/admin/src/layouts/Layouts.vue
View file @ a9d6544d
......@@ -4,8 +4,8 @@
<a-layout-header class="header">
<div class="flex aic">
<router-link to="/" class="flex aic">
<img width="32" src="@/assets/img/logo.png" />
<h1 style="padding-left: 10px">{{ systemName }}</h1>
<!-- <img width="32" src="@/assets/img/logo.png" /> -->
<h1>{{ systemName }}</h1>
</router-link>
<HeaderSite class="ml20"></HeaderSite>
</div>
......
base-manager-ui/admin/src/pages/basicset/business/components/businessTabs1.vue
View file @ a9d6544d
......@@ -354,19 +354,17 @@ export default {
onSelectLeftRow(record, selected) {
if (selected && record.children && record.children.length) {
record.children.forEach((v) => {
this.selectedLeftRowKeys.push(v.id);
this.deleteData.push(v);
this.selectedLeftRowKeys= [...new Set([...this.selectedLeftRowKeys,v.id])]
this.deleteData=[...new Set([...this.deleteData,v])];
});
} else if (selected) {
this.selectedLeftRowKeys.push(record.id);
this.deleteData.push(record);
} else {
} else if (!selected) {
this.selectedLeftRowKeys = this.selectedLeftRowKeys.filter(
(v) => v != record.id
);
this.deleteData = this.deleteData.filter((v) => {
return this.selectedLeftRowKeys.some((val) => v.id == val);
return v.id !=record.id
});
}
},
// 批量删除
......
base-manager-ui/admin/src/pages/basicset/dept/components/addWindowBusiness.vue
View file @ a9d6544d
......@@ -190,11 +190,18 @@ export default {
},
changePage() {},
onSelectRow(record, selected) {
if (selected && record.children.length) {
if (selected && record.children && record.children.length) {
record.children.forEach((v) => {
this.rowKeys.push(v.id);
this.rowKeys = [...new Set([...this.rowKeys, v.id])];
});
} else {
} else if (!selected && record.children && record.children.length) {
this.rowKeys = this.rowKeys.filter((v) => v != record.id);
record.children.forEach((v) => {
this.rowKeys = this.rowKeys.filter((val) => val != v.id);
});
} else if (selected && record.parentId) {
this.rowKeys = [...new Set([...this.rowKeys, record.parentId])];
} else if (!selected) {
this.rowKeys = this.rowKeys.filter((v) => v != record.id);
}
},
......
base-manager-ui/admin/src/pages/basicset/dept/components/addwindow.vue
View file @ a9d6544d
......@@ -5,6 +5,7 @@
:visible="Visible"
@cancel="handleClose"
:maskClosable="false"
:destroyOnClose="true"
>
<a-form-model
ref="formData"
......@@ -43,20 +44,6 @@
{{ v.name }}</a-select-option
>
</a-select>
<!-- <a-select
placeholder="请选择部门"
v-model="form.deptId"
@change="handleChange"
>
<a-select-option
:data-deptNum="v.deptNumber"
v-for="v in deptList"
:key="v.id"
:value="v.id"
>
{{ v.name }}
</a-select-option>
</a-select> -->
</a-form-model-item>
</a-col>
</a-row>
......@@ -96,14 +83,43 @@
<a-input v-model="form.fromnum" placeholder="请输入窗口编号" />
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="12">
<a-form-model-item label="红旗窗口" prop="hongqi">
<y-switch v-model="form.hongqi"></y-switch>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col span="12">
<a-form-model-item label="无人值守" prop="duty">
<y-switch v-model="form.duty" @onChange="changeDuty"></y-switch>
<a-tooltip>
<template slot="title">
该功能用于窗口无工作人员入驻，无需叫号、评价的情况下，定义窗口屏显示内容。
</template>
<a-icon class="question-icon" type="question-circle" />
</a-tooltip>
</a-form-model-item>
</a-col>
</a-row>
<a-row v-if="form.duty">
<a-col :span="12">
<a-form-model-item label="显示内容" prop="dutyContent">
<a-input
v-model="form.dutyContent"
placeholder="请输入窗口屏显示内容"
/>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="显示英文" prop="dutyEnglish">
<a-input
v-model="form.dutyEnglish"
placeholder="请输入窗口屏显示英文"
/>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="24">
<a-form-model-item
......@@ -205,6 +221,9 @@ export default {
summary: "", // 备注
building: 1, // 楼栋
level: 1, // 楼层
duty: "", // 无人值守
dutyContent: "", // 无人值守显示内容
dutyEnglish: "", // 无人值守显示英文内容
},
rules: {
siteName: [
......@@ -302,11 +321,24 @@ export default {
this.$refs.formData.resetFields();
this.Visible = false;
},
// 改变无人值守
changeDuty(val) {
if (!val) {
this.form.dutyContent = "";
this.form.dutyEnglish = "";
}
},
},
};
</script>
<style lang="less" scoped>
.question-icon {
margin-left: 10px;
font-size: 20px;
cursor: pointer;
color: #999;
}
/deep/.ant-modal-content {
width: 800px;
}
......
base-manager-ui/admin/src/pages/basicset/surface/components/ShowBox.vue
View file @ a9d6544d
......@@ -53,6 +53,7 @@ import AppraiseSkin from "../appraiseskin/AppraiseSkin.vue";
import SampleFormSkin from "../sampleFormSkin/SampleFormSkin.vue";
import WriteFormSkin from "../writeFormSkin/WriteFormSkin.vue";
import InformationSkin from "../informationskin/InformationSkin.vue";
import SelfService from "../selfservice/SelfService.vue";
export default {
components: {
LandscapeMode,
......@@ -63,6 +64,7 @@ export default {
SampleFormSkin,
WriteFormSkin,
InformationSkin,
SelfService,
},
props: {},
data() {
......@@ -76,40 +78,41 @@ export default {
this.$bus.$on("selectPreview", (row, index) => {
this.skinInfo = { ...row };
this.index = index;
console.log(this.skinInfo);
});
},
computed: {
component() {
let str = "";
switch (this.skinInfo.productId) {
case 1:
switch (this.skinInfo.productName) {
case "排号机":
str = "LandscapeMode";
break;
case 2:
case "窗口屏":
str = "WindowSkin";
break;
case 3:
case "呼叫器":
str = "CallOutSkin";
break;
case 4:
case "集中显示屏":
str = "CentralizeSkin";
break;
case 5:
case "导视机":
// str = "CentralizeSkin";
break;
case 6:
case "评价器":
str = "AppraiseSkin";
break;
case 7:
// str = "AppraiseSkin";
case "自助服务终端":
str = "SelfService";
break;
case 8:
case "填单机":
str = "WriteFormSkin";
break;
case 9:
case "样表机":
str = "SampleFormSkin";
break;
case 10:
case "信息发布终端":
str = "InformationSkin";
break;
}
......
base-manager-ui/admin/src/pages/basicset/surface/modal/AddSurface.vue
View file @ a9d6544d
......@@ -187,6 +187,7 @@ import AppraiseSkin from "../appraiseskin/AppraiseSkin.vue";
import SampleFormSkin from "../sampleFormSkin/SampleFormSkin.vue";
import WriteFormSkin from "../writeFormSkin/WriteFormSkin.vue";
import InformationSkin from "../informationskin/InformationSkin.vue";
import SelfService from "../selfservice/SelfService.vue"
import { uploadFile, skinSave, getTemplateList } from "@/services/surface";
import html2canvas from "html2canvas";
import { Empty } from "ant-design-vue";
......@@ -201,6 +202,7 @@ export default {
SampleFormSkin,
WriteFormSkin,
InformationSkin,
SelfService
},
props: {
isShow: {
......@@ -262,35 +264,35 @@ export default {
},
component() {
let str = "";
switch (this.facilityInfo.productId) {
case 1:
switch (this.facilityInfo.productName) {
case "排号机":
str = "LandscapeMode";
break;
case 2:
case "窗口屏":
str = "WindowSkin";
break;
case 3:
case "呼叫器":
str = "CallOutSkin";
break;
case 4:
case "集中显示屏":
str = "CentralizeSkin";
break;
case 5:
case "导视机":
// str = "CentralizeSkin";
break;
case 6:
case "评价器":
str = "AppraiseSkin";
break;
case 7:
// str = "AppraiseSkin";
case "自助服务终端":
str = "SelfService";
break;
case 8:
case "填单机":
str = "WriteFormSkin";
break;
case 9:
case "样表机":
str = "SampleFormSkin";
break;
case 10:
case "信息发布终端":
str = "InformationSkin";
break;
}
......
base-manager-ui/admin/src/pages/basicset/surface/selfservice/SelfService.vue 0 → 100644
View file @ a9d6544d
<template>
<div class="skin-box">
<!-- 自助服务终端 横板 -->
<div
:id="conponentsId"
v-if="imageResolution === '1'"
class="across-skin flex flexc aic"
:style="{
background: filterItem('1', 0),
}"
>
<!-- 头部 -->
<div class="header flex aic jcb">
<div class="left flex aic">
<div
class="title"
:style="{
color: filterItem('2', 0),
}"
>
自助服务终端
</div>
</div>
<div
class="right flex aic"
:style="{
color: filterItem('3', 0),
}"
>
<div class="time">10:32</div>
<div class="flex flexc">
<span>2023/02/16</span>
<span>星期四</span>
</div>
</div>
</div>
<div class="main flex aic jcb flex1">
<div class="left">
<div class="top">
<div class="search-box">
<div class="search">请输入你想查询的内容关键字</div>
<div
class="search_btn"
:style="{
color: filterItem('7', 0),
background: filterItem('8', 0),
}"
>
搜索
</div>
</div>
<div class="banner flex aic jcc">banner</div>
</div>
<div class="bottom">新闻区</div>
</div>
<div class="right flex aic jcc">应用展示区</div>
</div>
<!-- 底部 -->
<div class="footer mt20">
<div
class="footer-item footer-item1"
:style="{
background: filterItem('7', 0),
}"
>
首页
</div>
<div class="footer-item">服务</div>
<div class="footer-item">互动</div>
<div class="footer-item">我的</div>
<div
class="footer-item footer-item5"
:style="{
color: filterItem('7', 0),
background: filterItem('8', 0),
}"
>
登录/注册
</div>
</div>
</div>
<!-- 空数据显示 -->
<div class="empty flex aic jcc" v-else>
<a-empty
:image="require('../../../../assets/img/original.png')"
:image-style="{
height: '80px',
}"
>
<span slot="description"> <a href="#API">暂无皮肤模板</a> </span>
</a-empty>
</div>
</div>
</template>
<script>
export default {
props: {
skinFieldList: {
type: Array,
required: true,
default: () => {
return [];
},
},
imageResolution: {
required: true,
default: "1",
},
conponentsId: {
required: true,
type: String,
},
},
data() {
return {
api: process.env.VUE_APP_API_IMG_URL,
};
},
methods: {
// 过滤属性类型
filterItem(type, index) {
let arr = this.skinFieldList.filter((v) => {
return v.remark == type;
});
if (arr.length) {
return this.filterValueType(arr[index]);
} else {
return "";
}
},
// 过滤属性值类型
filterValueType(info = {}) {
let value = "";
if (info.fieldType !== "" && info.fieldType === "1" && info.fieldValue) {
value = info.fieldValue;
} else if (
info.fieldType !== "" &&
info.fieldType === "2" &&
info.fieldValue
) {
value = `url(${this.api + info.fieldValue})`;
}
return value;
},
},
};
</script>
<style lang="less" scoped>
.across-skin {
width: 1000px;
height: 562.5px;
background: linear-gradient(#26c5ff, #2c66ff);
background-repeat: no-repeat !important ;
background-position: center !important ;
background-size: cover !important ;
.header {
width: 100%;
color: #fff;
padding: 20px;
.title {
font-size: 30px;
font-weight: 600;
}
.right {
.time {
font-size: 26px;
font-weight: 600;
margin-right: 10px;
}
}
}
.main {
width: 100%;
padding: 20px;
margin-top: 10px;
color: #fff;
.left {
width: 39%;
height: 100%;
padding: 10px;
border-radius: 4px;
border: 1px dashed #ececec;
.top {
height: 59%;
display: flex;
flex-direction: column;
.search-box {
height: 40px;
padding: 0px 4px;
margin-bottom: 10px;
border-radius: 4px;
background-color: #fff;
display: flex;
align-items: center;
justify-content: space-between;
.search {
color: #ccc;
}
.search_btn {
width: 60px;
height: 36px;
border-radius: 4px;
background-color: #dee9ff;
display: flex;
justify-content: center;
align-items: center;
color: #206eff;
}
}
.banner {
flex: 0.9;
border: 1px dashed #ececec;
border-radius: 4px;
}
}
.bottom {
height: 39%;
display: flex;
align-items: center;
justify-content: center;
border: 1px dashed #ececec;
}
}
.right {
width: 59%;
height: 100%;
border-radius: 4px;
border: 1px dashed #ececec;
}
}
.footer {
width: 100%;
height: 60px;
display: flex;
justify-content: flex-end;
background-color: #fff;
.footer-item1 {
color: #fff;
background-color: #206eff;
}
.footer-item {
display: flex;
align-items: center;
justify-content: center;
width: 160px;
height: 100%;
border-left: 1px solid #ececec;
border-right: 1px solid #ececec;
font-size: 20px;
}
.footer-item5 {
color: #206eff;
background-color: #dee9ff;
}
}
}
</style>
\ No newline at end of file
base-manager/db/add.sql 0 → 100644
View file @ a9d6544d
-- ----------------------------
2023-2-21
-- ----------------------------
ALTER TABLE mortals_sys_window ADD COLUMN `duty` tinyint (1) default 0 COMMENT '无人值守(1.是，0.否)' AFTER hongqi;
ALTER TABLE mortals_sys_window ADD COLUMN `dutyContent` varchar (256) default "" COMMENT '显示内容' AFTER duty;
ALTER TABLE mortals_sys_window ADD COLUMN `dutyEnglish` varchar (256) default "" COMMENT '显示英文' AFTER dutyContent;
base-manager/src/main/java/com/mortals/xhx/base/framework/exception/ExceptionHandle.java
View file @ a9d6544d
package com.mortals.xhx.base.framework.exception;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.ControllerAdvice;
......@@ -13,10 +14,9 @@ import com.mortals.framework.exception.AppException;
* 统一异常处理
*/
@ControllerAdvice
@Slf4j
public class ExceptionHandle {
private final static Logger log = LoggerFactory.getLogger(ExceptionHandle.class);
public static final String KEY_RESULT_CODE = "code";
public static final String KEY_RESULT_MSG = "msg";
public static final String KEY_RESULT_DATA = "data";
......
base-manager/src/main/java/com/mortals/xhx/base/system/upload/service/UploadService.java
View file @ a9d6544d
......@@ -46,12 +46,24 @@ public interface UploadService extends IService {
*/
void fileDownload(String fileName, Boolean delete, HttpServletResponse response);
/**
* 预览
* @param fileName
* @param response
*/
void preview(String fileName, HttpServletResponse response);
/**
* 上传
* @param fileName
* @param response
*/
void uploadDownload(String fileName, HttpServletResponse response);
/**
* 刪除
* @param fileName
*/
void deleteFile(String fileName);
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/busiz/web/DemoWebApiController.java
View file @ a9d6544d
......@@ -12,6 +12,7 @@ import com.mortals.framework.web.BaseJsonBodyController;
import com.mortals.xhx.module.dept.model.DeptEntity;
import com.mortals.xhx.module.dept.model.DeptQuery;
import com.mortals.xhx.module.dept.service.DeptService;
import com.mortals.xhx.module.matter.model.MatterEntity;
import com.mortals.xhx.module.matter.model.MatterQuery;
import com.mortals.xhx.module.matter.model.vo.MatterInfo;
import com.mortals.xhx.module.matter.service.MatterService;
......@@ -66,6 +67,8 @@ public class DemoWebApiController {
private WindowMatterService windowMatterService;
@Autowired
private DeptService deptService;
@Autowired
private MatterService matterService;
@PostMapping(value = "testGov")
......@@ -103,6 +106,23 @@ public class DemoWebApiController {
return Rest.ok(cookieStr);
}
@PostMapping(value = "reEventShow")
@UnAuth
public Rest<String> reEventShow() {
List<SiteMatterEntity> siteMatterEntities = siteMatterService.find(new SiteMatterQuery());
for (SiteMatterEntity siteMatterEntity : siteMatterEntities) {
if(ObjectUtils.isEmpty(siteMatterEntity.getEventTypeShow())){
MatterEntity matterEntity = matterService.get(siteMatterEntity.getMatterId());
if(!ObjectUtils.isEmpty(matterEntity)&&!ObjectUtils.isEmpty(matterEntity.getEventTypeShow())){
siteMatterEntity.setEventTypeShow(matterEntity.getEventTypeShow());
siteMatterService.update(siteMatterEntity);
}
}
}
return Rest.ok();
}
@PostMapping(value = "reDepts")
@UnAuth
......
base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterQuery.java
View file @ a9d6544d
......@@ -8,7 +8,7 @@ import com.mortals.xhx.module.matter.model.MatterEntity;
* 基础事项查询对象
*
* @author zxfei
* @date 2022-12-28
* @date 2023-02-20
*/
public class MatterQuery extends MatterEntity {
/** 开始 序号，主键，自增长 */
......@@ -23,6 +23,9 @@ public class MatterQuery extends MatterEntity {
/** 序号，主键，自增长列表 */
private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 站点ID */
private Long siteIdStart;
......@@ -35,84 +38,139 @@ public class MatterQuery extends MatterEntity {
/** 站点ID列表 */
private List <Long> siteIdList;
/** 站点ID排除列表 */
private List <Long> siteIdNotList;
/** 从政务系统来的事项id */
private List<String> tidList;
/** 从政务系统来的事项id排除列表 */
private List <String> tidNotList;
/** 从政务系统来的事项code */
private List<String> tcodeList;
/** 从政务系统来的事项code排除列表 */
private List <String> tcodeNotList;
/** 从政务系统来的事项name */
private List<String> tnameList;
/** 从政务系统来的事项name排除列表 */
private List <String> tnameNotList;
/** 事项名称 */
private List<String> matterNameList;
/** 事项名称排除列表 */
private List <String> matterNameNotList;
/** 英语事项名 */
private List<String> englishNameList;
/** 英语事项名排除列表 */
private List <String> englishNameNotList;
/** 事项编号 */
private List<String> matterNoList;
/** 事项编号排除列表 */
private List <String> matterNoNotList;
/** 区域编码 */
private List<String> areaCodeList;
/** 区域编码排除列表 */
private List <String> areaCodeNotList;
/** 部门编号 */
private List<String> deptCodeList;
/** 部门编号排除列表 */
private List <String> deptCodeNotList;
/** 部门名称 */
private List<String> deptNameList;
/** 部门名称排除列表 */
private List <String> deptNameNotList;
/** 行政权力编号 */
private List<String> powerCodeList;
/** 行政权力编号排除列表 */
private List <String> powerCodeNotList;
/** 主题编号 */
private List<String> themeCodeList;
/** 主题编号排除列表 */
private List <String> themeCodeNotList;
/** 服务类型编号 */
private List<String> usertypeCodeList;
/** 服务类型编号排除列表 */
private List <String> usertypeCodeNotList;
/** 事项组名 */
private List<String> groupNameList;
/** 事项组名排除列表 */
private List <String> groupNameNotList;
/** 事项详情链接 */
private List<String> urlList;
/** 事项详情链接排除列表 */
private List <String> urlNotList;
/** 是否获取事项详情 */
private List<String> haveGetMatterInfoList;
/** 是否获取事项详情排除列表 */
private List <String> haveGetMatterInfoNotList;
/** 所属部门 */
private List<String> belongDeptList;
/** 所属部门排除列表 */
private List <String> belongDeptNotList;
/** 服务对象 （事业法人.事业法人，社会组织法人.社会组织法人，非法人企业.非法人企业，企业法人.企业法人，自然人.自然人，其他组织.其他组织） */
private List<String> appoveObjectShowList;
/** 服务对象 （事业法人.事业法人，社会组织法人.社会组织法人，非法人企业.非法人企业，企业法人.企业法人，自然人.自然人，其他组织.其他组织）排除列表 */
private List <String> appoveObjectShowNotList;
/** 通办范围 （无.无，全国.全国，全市.全市，全县.全县，全镇[乡 街道].全镇[乡 街道]，跨村[社区].跨村[社区]） */
private List<String> operatScopeShowList;
/** 通办范围 （无.无，全国.全国，全市.全市，全县.全县，全镇[乡 街道].全镇[乡 街道]，跨村[社区].跨村[社区]）排除列表 */
private List <String> operatScopeShowNotList;
/** 办件类型（网络办件.网络办件，行政审批一般件.行政审批一般件，综合窗口件.综合窗口件） */
private List<String> appoveTimeLimitShowList;
/** 办件类型（网络办件.网络办件，行政审批一般件.行政审批一般件，综合窗口件.综合窗口件）排除列表 */
private List <String> appoveTimeLimitShowNotList;
/** 办理形式（窗口办理.窗口办理，网上办理.网上办理） */
private List<String> handleTypeList;
/** 办理形式（窗口办理.窗口办理，网上办理.网上办理） 排除列表 */
private List <String> handleTypeNotList;
/** 法定办结时限 */
private List<String> legalTimeLimitShowList;
/** 法定办结时限排除列表 */
private List <String> legalTimeLimitShowNotList;
/** 法定时限办结说明 */
private List<String> legalEndExplainList;
/** 法定时限办结说明排除列表 */
private List <String> legalEndExplainNotList;
/** 承诺办结时限 */
private List<String> promiseTimeLimitShowList;
/** 承诺办结时限排除列表 */
private List <String> promiseTimeLimitShowNotList;
/** 承诺时限办结说明 */
private List<String> promiseEndExplainList;
/** 承诺时限办结说明排除列表 */
private List <String> promiseEndExplainNotList;
/** 是否收费（否.否，是.是） */
private List<String> isChargesShowList;
/** 是否收费（否.否，是.是）排除列表 */
private List <String> isChargesShowNotList;
/** 认证等级需求（实名认证.实名认证，单次面签.单次面签，每次面签.每次面签） */
private List<String> certificationLevelsShowList;
/** 认证等级需求（实名认证.实名认证，单次面签.单次面签，每次面签.每次面签）排除列表 */
private List <String> certificationLevelsShowNotList;
/** 开始 计划生效日期 */
private String planTakeTimeStart;
......@@ -128,6 +186,8 @@ public class MatterQuery extends MatterEntity {
/** 特别程序 */
private List<String> specialProcedureList;
/** 特别程序排除列表 */
private List <String> specialProcedureNotList;
/** 开始 窗口到现场次数 */
private Integer windowToTheSceneNumStart;
......@@ -140,24 +200,39 @@ public class MatterQuery extends MatterEntity {
/** 窗口到现场次数列表 */
private List <Integer> windowToTheSceneNumList;
/** 窗口到现场次数排除列表 */
private List <Integer> windowToTheSceneNumNotList;
/** 是否网上预约,窗口办理选（否.否，是.是） */
private List<String> isOnlineSubscribeShowList;
/** 是否网上预约,窗口办理选（否.否，是.是）排除列表 */
private List <String> isOnlineSubscribeShowNotList;
/** 物流快递,窗口办理选（否.否，是.是） */
private List<String> isExpressTakeShowList;
/** 物流快递,窗口办理选（否.否，是.是）排除列表 */
private List <String> isExpressTakeShowNotList;
/** 是否支持全省范围就近取件（否.否，是.是） */
private List<String> isProvinceAcquisitionShowList;
/** 是否支持全省范围就近取件（否.否，是.是）排除列表 */
private List <String> isProvinceAcquisitionShowNotList;
/** 是否支持全省范围就近办理（否.否，是.是） */
private List<String> isApplyProvinceShowList;
/** 是否支持全省范围就近办理（否.否，是.是）排除列表 */
private List <String> isApplyProvinceShowNotList;
/** 必须到现场原因 */
private List<String> mustSceneExplainList;
/** 必须到现场原因排除列表 */
private List <String> mustSceneExplainNotList;
/** 网办类型（原件预审.原件预审，原件核验.原件核验，全程网办.全程网办） */
private List<String> onlineTypeList;
/** 网办类型（原件预审.原件预审，原件核验.原件核验，全程网办.全程网办）排除列表 */
private List <String> onlineTypeNotList;
/** 开始 网办到现场次数 */
private Integer onlineToTheSceneNumStart;
......@@ -170,60 +245,99 @@ public class MatterQuery extends MatterEntity {
/** 网办到现场次数列表 */
private List <Integer> onlineToTheSceneNumList;
/** 网办到现场次数排除列表 */
private List <Integer> onlineToTheSceneNumNotList;
/** 网络办理深度（互联网咨询.互联网咨询，互联网收件.互联网收件，互联网预审.互联网预审，互联网受理.互联网受理，互联网办理.互联网办理，互联网办理结果信息反馈.互联网办理结果信息反馈，其他.其他） */
private List<String> onlineOperatDeepList;
/** 网络办理深度（互联网咨询.互联网咨询，互联网收件.互联网收件，互联网预审.互联网预审，互联网受理.互联网受理，互联网办理.互联网办理，互联网办理结果信息反馈.互联网办理结果信息反馈，其他.其他）排除列表 */
private List <String> onlineOperatDeepNotList;
/** 物流快递，网上办理选（否.否，是.是） */
private List<String> isExpressTakeOnlineShowList;
/** 物流快递，网上办理选（否.否，是.是）排除列表 */
private List <String> isExpressTakeOnlineShowNotList;
/** 是否支持上门收取申请（否.否，是.是） */
private List<String> isDoorTakeShowList;
/** 是否支持上门收取申请（否.否，是.是）排除列表 */
private List <String> isDoorTakeShowNotList;
/** 网上必须到现场原因 */
private List<String> onlineMustSceneExplainList;
/** 网上必须到现场原因排除列表 */
private List <String> onlineMustSceneExplainNotList;
/** 实施主体 */
private List<String> performDeptTypeList;
/** 实施主体排除列表 */
private List <String> performDeptTypeNotList;
/** 事项版本 */
private List<String> matterEditionList;
/** 事项版本排除列表 */
private List <String> matterEditionNotList;
/** 事项类型名称（行政许可.行政许可，行政处罚.行政处罚，行政强制.行政强制，行政征收.行政征收，行政给付.行政给付，行政检查.行政检查，行政确认.行政确认，行政奖励.行政奖励，行政裁决.行政裁决，其他行政权力.其他行政权力，主动服务.主动服务，依申请服务.依申请服务，咨询查询.咨询查询，未归类事项.未归类事项） */
private List<String> eventTypeShowList;
/** 事项类型名称（行政许可.行政许可，行政处罚.行政处罚，行政强制.行政强制，行政征收.行政征收，行政给付.行政给付，行政检查.行政检查，行政确认.行政确认，行政奖励.行政奖励，行政裁决.行政裁决，其他行政权力.其他行政权力，主动服务.主动服务，依申请服务.依申请服务，咨询查询.咨询查询，未归类事项.未归类事项）排除列表 */
private List <String> eventTypeShowNotList;
/** 行使层级名称（省级.省级，市级.市级，县级.县级，镇[乡 街道].镇[乡 街道]，村[社区]级.村[社区]级） */
private List<String> performHierarchyShowList;
/** 行使层级名称（省级.省级，市级.市级，县级.县级，镇[乡 街道].镇[乡 街道]，村[社区]级.村[社区]级）排除列表 */
private List <String> performHierarchyShowNotList;
/** 权力来源（法定本级行使.法定本级行使，上级下放.上级下放，上级授权.上级授权，同级授权.同级授权，上级委托.上级委托，同级委托.同级委托） */
private List<String> powerSourceShowList;
/** 权力来源（法定本级行使.法定本级行使，上级下放.上级下放，上级授权.上级授权，同级授权.同级授权，上级委托.上级委托，同级委托.同级委托）排除列表 */
private List <String> powerSourceShowNotList;
/** 实施主体性质（法定机关.法定机关，授权组织.授权组织，受委托组织.受委托组织） */
private List<String> performDeptTypeShowList;
/** 实施主体性质（法定机关.法定机关，授权组织.授权组织，受委托组织.受委托组织）排除列表 */
private List <String> performDeptTypeShowNotList;
/** 是否进驻中心（否.否，是.是） */
private List<String> goveServiceCenterShowList;
/** 是否进驻中心（否.否，是.是）排除列表 */
private List <String> goveServiceCenterShowNotList;
/** 是否纳入便民服务中心（否.否，是.是） */
private List<String> isConvenientCenterShowList;
/** 是否纳入便民服务中心（否.否，是.是）排除列表 */
private List <String> isConvenientCenterShowNotList;
/** 自助终端办理 （否.否，是.是） */
private List<String> terminalHandleList;
/** 自助终端办理 （否.否，是.是）排除列表 */
private List <String> terminalHandleNotList;
/** 是否网办 （否.否，是.是） */
private List<String> isOnlineList;
/** 是否网办 （否.否，是.是）排除列表 */
private List <String> isOnlineNotList;
/** 支持网上支付（否.否，是.是） */
private List<String> isOnlinePayShowList;
/** 支持网上支付（否.否，是.是）排除列表 */
private List <String> isOnlinePayShowNotList;
/** 委托部门（否.否，是.是） */
private List<String> entrustmentDepartmenList;
/** 委托部门（否.否，是.是）排除列表 */
private List <String> entrustmentDepartmenNotList;
/** 联办机构 */
private List<String> jointInfoShowList;
/** 联办机构排除列表 */
private List <String> jointInfoShowNotList;
/** 事项状态（停用.停用，在用.在用） */
private List<String> matterStatusList;
/** 事项状态（停用.停用，在用.在用）排除列表 */
private List <String> matterStatusNotList;
/** 开始 数量限制 */
private Long numberLimitStart;
......@@ -236,48 +350,79 @@ public class MatterQuery extends MatterEntity {
/** 数量限制列表 */
private List <Long> numberLimitList;
/** 数量限制排除列表 */
private List <Long> numberLimitNotList;
/** 主题类型 */
private List<String> typeList;
/** 主题类型排除列表 */
private List <String> typeNotList;
/** 基本编码 */
private List<String> baseCodeList;
/** 基本编码排除列表 */
private List <String> baseCodeNotList;
/** 实施编码 */
private List<String> implementCodeList;
/** 实施编码排除列表 */
private List <String> implementCodeNotList;
/** 实施主体编码 */
private List<String> implementBodyCodeList;
/** 实施主体编码排除列表 */
private List <String> implementBodyCodeNotList;
/** 办理项编码 */
private List<String> operateItemCodeList;
/** 办理项编码排除列表 */
private List <String> operateItemCodeNotList;
/** 乡镇街道名称 */
private List<String> townshipNameList;
/** 乡镇街道名称排除列表 */
private List <String> townshipNameNotList;
/** 乡镇街道代码 */
private List<String> townshipCodeList;
/** 乡镇街道代码排除列表 */
private List <String> townshipCodeNotList;
/** 村居社区名称 */
private List<String> villageNameList;
/** 村居社区名称排除列表 */
private List <String> villageNameNotList;
/** 村居社区代码 */
private List<String> villageCodeList;
/** 村居社区代码排除列表 */
private List <String> villageCodeNotList;
/** 办理时间 */
private List<String> operateTimeList;
/** 办理时间排除列表 */
private List <String> operateTimeNotList;
/** 办理地点 */
private List<String> operateSiteList;
/** 办理地点排除列表 */
private List <String> operateSiteNotList;
/** 咨询方式 */
private List<String> cousultingShowList;
/** 咨询方式排除列表 */
private List <String> cousultingShowNotList;
/** 咨询电话 */
private List<String> cousultingTelephoneShowList;
/** 咨询电话排除列表 */
private List <String> cousultingTelephoneShowNotList;
/** 监督投诉方式 */
private List<String> superviseShowList;
/** 监督投诉方式排除列表 */
private List <String> superviseShowNotList;
/** 开始 排序 */
private Integer sortStart;
......@@ -290,6 +435,9 @@ public class MatterQuery extends MatterEntity {
/** 排序列表 */
private List <Integer> sortList;
/** 排序排除列表 */
private List <Integer> sortNotList;
/** 开始 事项来源(0.政务网，1.自定义) */
private Integer sourceStart;
......@@ -302,6 +450,9 @@ public class MatterQuery extends MatterEntity {
/** 事项来源(0.政务网，1.自定义)列表 */
private List <Integer> sourceList;
/** 事项来源(0.政务网，1.自定义)排除列表 */
private List <Integer> sourceNotList;
/** 开始 创建时间 */
private String createTimeStart;
......@@ -320,6 +471,9 @@ public class MatterQuery extends MatterEntity {
/** 创建用户列表 */
private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 修改时间 */
private String updateTimeStart;
......@@ -329,9 +483,13 @@ public class MatterQuery extends MatterEntity {
/** 评价地址 */
private List<String> evaluationUrlList;
/** 评价地址排除列表 */
private List <String> evaluationUrlNotList;
/** 申请地址 */
private List<String> netApplyUrlList;
/** 申请地址排除列表 */
private List <String> netApplyUrlNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<MatterQuery> orConditionList;
......@@ -404,6 +562,23 @@ public class MatterQuery extends MatterEntity {
this.idList = idList;
}
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/**
* 获取 开始 站点ID
* @return siteIdStart
......@@ -468,6 +643,23 @@ public class MatterQuery extends MatterEntity {
this.siteIdList = siteIdList;
}
/**
* 获取 站点ID
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点ID
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 获取 从政务系统来的事项id
* @return tidList
......@@ -483,6 +675,23 @@ public class MatterQuery extends MatterEntity {
public void setTidList(List<String> tidList){
this.tidList = tidList;
}
/**
* 获取 从政务系统来的事项id
* @return tidNotList
*/
public List<String> getTidNotList(){
return this.tidNotList;
}
/**
* 设置 从政务系统来的事项id
* @param tidNotList
*/
public void setTidNotList(List<String> tidNotList){
this.tidNotList = tidNotList;
}
/**
* 获取 从政务系统来的事项code
* @return tcodeList
......@@ -498,6 +707,23 @@ public class MatterQuery extends MatterEntity {
public void setTcodeList(List<String> tcodeList){
this.tcodeList = tcodeList;
}
/**
* 获取 从政务系统来的事项code
* @return tcodeNotList
*/
public List<String> getTcodeNotList(){
return this.tcodeNotList;
}
/**
* 设置 从政务系统来的事项code
* @param tcodeNotList
*/
public void setTcodeNotList(List<String> tcodeNotList){
this.tcodeNotList = tcodeNotList;
}
/**
* 获取 从政务系统来的事项name
* @return tnameList
......@@ -513,6 +739,23 @@ public class MatterQuery extends MatterEntity {
public void setTnameList(List<String> tnameList){
this.tnameList = tnameList;
}
/**
* 获取 从政务系统来的事项name
* @return tnameNotList
*/
public List<String> getTnameNotList(){
return this.tnameNotList;
}
/**
* 设置 从政务系统来的事项name
* @param tnameNotList
*/
public void setTnameNotList(List<String> tnameNotList){
this.tnameNotList = tnameNotList;
}
/**
* 获取 事项名称
* @return matterNameList
......@@ -528,6 +771,23 @@ public class MatterQuery extends MatterEntity {
public void setMatterNameList(List<String> matterNameList){
this.matterNameList = matterNameList;
}
/**
* 获取 事项名称
* @return matterNameNotList
*/
public List<String> getMatterNameNotList(){
return this.matterNameNotList;
}
/**
* 设置 事项名称
* @param matterNameNotList
*/
public void setMatterNameNotList(List<String> matterNameNotList){
this.matterNameNotList = matterNameNotList;
}
/**
* 获取 英语事项名
* @return englishNameList
......@@ -543,6 +803,23 @@ public class MatterQuery extends MatterEntity {
public void setEnglishNameList(List<String> englishNameList){
this.englishNameList = englishNameList;
}
/**
* 获取 英语事项名
* @return englishNameNotList
*/
public List<String> getEnglishNameNotList(){
return this.englishNameNotList;
}
/**
* 设置 英语事项名
* @param englishNameNotList
*/
public void setEnglishNameNotList(List<String> englishNameNotList){
this.englishNameNotList = englishNameNotList;
}
/**
* 获取 事项编号
* @return matterNoList
......@@ -558,6 +835,23 @@ public class MatterQuery extends MatterEntity {
public void setMatterNoList(List<String> matterNoList){
this.matterNoList = matterNoList;
}
/**
* 获取 事项编号
* @return matterNoNotList
*/
public List<String> getMatterNoNotList(){
return this.matterNoNotList;
}
/**
* 设置 事项编号
* @param matterNoNotList
*/
public void setMatterNoNotList(List<String> matterNoNotList){
this.matterNoNotList = matterNoNotList;
}
/**
* 获取 区域编码
* @return areaCodeList
......@@ -573,6 +867,23 @@ public class MatterQuery extends MatterEntity {
public void setAreaCodeList(List<String> areaCodeList){
this.areaCodeList = areaCodeList;
}
/**
* 获取 区域编码
* @return areaCodeNotList
*/
public List<String> getAreaCodeNotList(){
return this.areaCodeNotList;
}
/**
* 设置 区域编码
* @param areaCodeNotList
*/
public void setAreaCodeNotList(List<String> areaCodeNotList){
this.areaCodeNotList = areaCodeNotList;
}
/**
* 获取 部门编号
* @return deptCodeList
......@@ -588,6 +899,23 @@ public class MatterQuery extends MatterEntity {
public void setDeptCodeList(List<String> deptCodeList){
this.deptCodeList = deptCodeList;
}
/**
* 获取 部门编号
* @return deptCodeNotList
*/
public List<String> getDeptCodeNotList(){
return this.deptCodeNotList;
}
/**
* 设置 部门编号
* @param deptCodeNotList
*/
public void setDeptCodeNotList(List<String> deptCodeNotList){
this.deptCodeNotList = deptCodeNotList;
}
/**
* 获取 部门名称
* @return deptNameList
......@@ -603,6 +931,23 @@ public class MatterQuery extends MatterEntity {
public void setDeptNameList(List<String> deptNameList){
this.deptNameList = deptNameList;
}
/**
* 获取 部门名称
* @return deptNameNotList
*/
public List<String> getDeptNameNotList(){
return this.deptNameNotList;
}
/**
* 设置 部门名称
* @param deptNameNotList
*/
public void setDeptNameNotList(List<String> deptNameNotList){
this.deptNameNotList = deptNameNotList;
}
/**
* 获取 行政权力编号
* @return powerCodeList
......@@ -618,6 +963,23 @@ public class MatterQuery extends MatterEntity {
public void setPowerCodeList(List<String> powerCodeList){
this.powerCodeList = powerCodeList;
}
/**
* 获取 行政权力编号
* @return powerCodeNotList
*/
public List<String> getPowerCodeNotList(){
return this.powerCodeNotList;
}
/**
* 设置 行政权力编号
* @param powerCodeNotList
*/
public void setPowerCodeNotList(List<String> powerCodeNotList){
this.powerCodeNotList = powerCodeNotList;
}
/**
* 获取 主题编号
* @return themeCodeList
......@@ -633,6 +995,23 @@ public class MatterQuery extends MatterEntity {
public void setThemeCodeList(List<String> themeCodeList){
this.themeCodeList = themeCodeList;
}
/**
* 获取 主题编号
* @return themeCodeNotList
*/
public List<String> getThemeCodeNotList(){
return this.themeCodeNotList;
}
/**
* 设置 主题编号
* @param themeCodeNotList
*/
public void setThemeCodeNotList(List<String> themeCodeNotList){
this.themeCodeNotList = themeCodeNotList;
}
/**
* 获取 服务类型编号
* @return usertypeCodeList
......@@ -648,6 +1027,23 @@ public class MatterQuery extends MatterEntity {
public void setUsertypeCodeList(List<String> usertypeCodeList){
this.usertypeCodeList = usertypeCodeList;
}
/**
* 获取 服务类型编号
* @return usertypeCodeNotList
*/
public List<String> getUsertypeCodeNotList(){
return this.usertypeCodeNotList;
}
/**
* 设置 服务类型编号
* @param usertypeCodeNotList
*/
public void setUsertypeCodeNotList(List<String> usertypeCodeNotList){
this.usertypeCodeNotList = usertypeCodeNotList;
}
/**
* 获取 事项组名
* @return groupNameList
......@@ -663,6 +1059,23 @@ public class MatterQuery extends MatterEntity {
public void setGroupNameList(List<String> groupNameList){
this.groupNameList = groupNameList;
}
/**
* 获取 事项组名
* @return groupNameNotList
*/
public List<String> getGroupNameNotList(){
return this.groupNameNotList;
}
/**
* 设置 事项组名
* @param groupNameNotList
*/
public void setGroupNameNotList(List<String> groupNameNotList){
this.groupNameNotList = groupNameNotList;
}
/**
* 获取 事项详情链接
* @return urlList
......@@ -678,6 +1091,23 @@ public class MatterQuery extends MatterEntity {
public void setUrlList(List<String> urlList){
this.urlList = urlList;
}
/**
* 获取 事项详情链接
* @return urlNotList
*/
public List<String> getUrlNotList(){
return this.urlNotList;
}
/**
* 设置 事项详情链接
* @param urlNotList
*/
public void setUrlNotList(List<String> urlNotList){
this.urlNotList = urlNotList;
}
/**
* 获取 是否获取事项详情
* @return haveGetMatterInfoList
......@@ -693,6 +1123,23 @@ public class MatterQuery extends MatterEntity {
public void setHaveGetMatterInfoList(List<String> haveGetMatterInfoList){
this.haveGetMatterInfoList = haveGetMatterInfoList;
}
/**
* 获取 是否获取事项详情
* @return haveGetMatterInfoNotList
*/
public List<String> getHaveGetMatterInfoNotList(){
return this.haveGetMatterInfoNotList;
}
/**
* 设置 是否获取事项详情
* @param haveGetMatterInfoNotList
*/
public void setHaveGetMatterInfoNotList(List<String> haveGetMatterInfoNotList){
this.haveGetMatterInfoNotList = haveGetMatterInfoNotList;
}
/**
* 获取 所属部门
* @return belongDeptList
......@@ -708,6 +1155,23 @@ public class MatterQuery extends MatterEntity {
public void setBelongDeptList(List<String> belongDeptList){
this.belongDeptList = belongDeptList;
}
/**
* 获取 所属部门
* @return belongDeptNotList
*/
public List<String> getBelongDeptNotList(){
return this.belongDeptNotList;
}
/**
* 设置 所属部门
* @param belongDeptNotList
*/
public void setBelongDeptNotList(List<String> belongDeptNotList){
this.belongDeptNotList = belongDeptNotList;
}
/**
* 获取 服务对象 （事业法人.事业法人，社会组织法人.社会组织法人，非法人企业.非法人企业，企业法人.企业法人，自然人.自然人，其他组织.其他组织）
* @return appoveObjectShowList
......@@ -723,6 +1187,23 @@ public class MatterQuery extends MatterEntity {
public void setAppoveObjectShowList(List<String> appoveObjectShowList){
this.appoveObjectShowList = appoveObjectShowList;
}
/**
* 获取 服务对象 （事业法人.事业法人，社会组织法人.社会组织法人，非法人企业.非法人企业，企业法人.企业法人，自然人.自然人，其他组织.其他组织）
* @return appoveObjectShowNotList
*/
public List<String> getAppoveObjectShowNotList(){
return this.appoveObjectShowNotList;
}
/**
* 设置 服务对象 （事业法人.事业法人，社会组织法人.社会组织法人，非法人企业.非法人企业，企业法人.企业法人，自然人.自然人，其他组织.其他组织）
* @param appoveObjectShowNotList
*/
public void setAppoveObjectShowNotList(List<String> appoveObjectShowNotList){
this.appoveObjectShowNotList = appoveObjectShowNotList;
}
/**
* 获取 通办范围 （无.无，全国.全国，全市.全市，全县.全县，全镇[乡 街道].全镇[乡 街道]，跨村[社区].跨村[社区]）
* @return operatScopeShowList
......@@ -738,6 +1219,23 @@ public class MatterQuery extends MatterEntity {
public void setOperatScopeShowList(List<String> operatScopeShowList){
this.operatScopeShowList = operatScopeShowList;
}
/**
* 获取 通办范围 （无.无，全国.全国，全市.全市，全县.全县，全镇[乡 街道].全镇[乡 街道]，跨村[社区].跨村[社区]）
* @return operatScopeShowNotList
*/
public List<String> getOperatScopeShowNotList(){
return this.operatScopeShowNotList;
}
/**
* 设置 通办范围 （无.无，全国.全国，全市.全市，全县.全县，全镇[乡 街道].全镇[乡 街道]，跨村[社区].跨村[社区]）
* @param operatScopeShowNotList
*/
public void setOperatScopeShowNotList(List<String> operatScopeShowNotList){
this.operatScopeShowNotList = operatScopeShowNotList;
}
/**
* 获取 办件类型（网络办件.网络办件，行政审批一般件.行政审批一般件，综合窗口件.综合窗口件）
* @return appoveTimeLimitShowList
......@@ -753,6 +1251,23 @@ public class MatterQuery extends MatterEntity {
public void setAppoveTimeLimitShowList(List<String> appoveTimeLimitShowList){
this.appoveTimeLimitShowList = appoveTimeLimitShowList;
}
/**
* 获取 办件类型（网络办件.网络办件，行政审批一般件.行政审批一般件，综合窗口件.综合窗口件）
* @return appoveTimeLimitShowNotList
*/
public List<String> getAppoveTimeLimitShowNotList(){
return this.appoveTimeLimitShowNotList;
}
/**
* 设置 办件类型（网络办件.网络办件，行政审批一般件.行政审批一般件，综合窗口件.综合窗口件）
* @param appoveTimeLimitShowNotList
*/
public void setAppoveTimeLimitShowNotList(List<String> appoveTimeLimitShowNotList){
this.appoveTimeLimitShowNotList = appoveTimeLimitShowNotList;
}
/**
* 获取 办理形式（窗口办理.窗口办理，网上办理.网上办理）
* @return handleTypeList
......@@ -768,6 +1283,23 @@ public class MatterQuery extends MatterEntity {
public void setHandleTypeList(List<String> handleTypeList){
this.handleTypeList = handleTypeList;
}
/**
* 获取 办理形式（窗口办理.窗口办理，网上办理.网上办理）
* @return handleTypeNotList
*/
public List<String> getHandleTypeNotList(){
return this.handleTypeNotList;
}
/**
* 设置 办理形式（窗口办理.窗口办理，网上办理.网上办理）
* @param handleTypeNotList
*/
public void setHandleTypeNotList(List<String> handleTypeNotList){
this.handleTypeNotList = handleTypeNotList;
}
/**
* 获取 法定办结时限
* @return legalTimeLimitShowList
......@@ -783,12 +1315,29 @@ public class MatterQuery extends MatterEntity {
public void setLegalTimeLimitShowList(List<String> legalTimeLimitShowList){
this.legalTimeLimitShowList = legalTimeLimitShowList;
}
/**
* 获取 法定时限办结说明
* @return legalEndExplainList
* 获取 法定办结时限
* @return legalTimeLimitShowNotList
*/
public List<String> getLegalEndExplainList(){
return this.legalEndExplainList;
public List<String> getLegalTimeLimitShowNotList(){
return this.legalTimeLimitShowNotList;
}
/**
* 设置 法定办结时限
* @param legalTimeLimitShowNotList
*/
public void setLegalTimeLimitShowNotList(List<String> legalTimeLimitShowNotList){
this.legalTimeLimitShowNotList = legalTimeLimitShowNotList;
}
/**
* 获取 法定时限办结说明
* @return legalEndExplainList
*/
public List<String> getLegalEndExplainList(){
return this.legalEndExplainList;
}
/**
......@@ -798,6 +1347,23 @@ public class MatterQuery extends MatterEntity {
public void setLegalEndExplainList(List<String> legalEndExplainList){
this.legalEndExplainList = legalEndExplainList;
}
/**
* 获取 法定时限办结说明
* @return legalEndExplainNotList
*/
public List<String> getLegalEndExplainNotList(){
return this.legalEndExplainNotList;
}
/**
* 设置 法定时限办结说明
* @param legalEndExplainNotList
*/
public void setLegalEndExplainNotList(List<String> legalEndExplainNotList){
this.legalEndExplainNotList = legalEndExplainNotList;
}
/**
* 获取 承诺办结时限
* @return promiseTimeLimitShowList
......@@ -813,6 +1379,23 @@ public class MatterQuery extends MatterEntity {
public void setPromiseTimeLimitShowList(List<String> promiseTimeLimitShowList){
this.promiseTimeLimitShowList = promiseTimeLimitShowList;
}
/**
* 获取 承诺办结时限
* @return promiseTimeLimitShowNotList
*/
public List<String> getPromiseTimeLimitShowNotList(){
return this.promiseTimeLimitShowNotList;
}
/**
* 设置 承诺办结时限
* @param promiseTimeLimitShowNotList
*/
public void setPromiseTimeLimitShowNotList(List<String> promiseTimeLimitShowNotList){
this.promiseTimeLimitShowNotList = promiseTimeLimitShowNotList;
}
/**
* 获取 承诺时限办结说明
* @return promiseEndExplainList
......@@ -828,6 +1411,23 @@ public class MatterQuery extends MatterEntity {
public void setPromiseEndExplainList(List<String> promiseEndExplainList){
this.promiseEndExplainList = promiseEndExplainList;
}
/**
* 获取 承诺时限办结说明
* @return promiseEndExplainNotList
*/
public List<String> getPromiseEndExplainNotList(){
return this.promiseEndExplainNotList;
}
/**
* 设置 承诺时限办结说明
* @param promiseEndExplainNotList
*/
public void setPromiseEndExplainNotList(List<String> promiseEndExplainNotList){
this.promiseEndExplainNotList = promiseEndExplainNotList;
}
/**
* 获取 是否收费（否.否，是.是）
* @return isChargesShowList
......@@ -843,6 +1443,23 @@ public class MatterQuery extends MatterEntity {
public void setIsChargesShowList(List<String> isChargesShowList){
this.isChargesShowList = isChargesShowList;
}
/**
* 获取 是否收费（否.否，是.是）
* @return isChargesShowNotList
*/
public List<String> getIsChargesShowNotList(){
return this.isChargesShowNotList;
}
/**
* 设置 是否收费（否.否，是.是）
* @param isChargesShowNotList
*/
public void setIsChargesShowNotList(List<String> isChargesShowNotList){
this.isChargesShowNotList = isChargesShowNotList;
}
/**
* 获取 认证等级需求（实名认证.实名认证，单次面签.单次面签，每次面签.每次面签）
* @return certificationLevelsShowList
......@@ -858,6 +1475,23 @@ public class MatterQuery extends MatterEntity {
public void setCertificationLevelsShowList(List<String> certificationLevelsShowList){
this.certificationLevelsShowList = certificationLevelsShowList;
}
/**
* 获取 认证等级需求（实名认证.实名认证，单次面签.单次面签，每次面签.每次面签）
* @return certificationLevelsShowNotList
*/
public List<String> getCertificationLevelsShowNotList(){
return this.certificationLevelsShowNotList;
}
/**
* 设置 认证等级需求（实名认证.实名认证，单次面签.单次面签，每次面签.每次面签）
* @param certificationLevelsShowNotList
*/
public void setCertificationLevelsShowNotList(List<String> certificationLevelsShowNotList){
this.certificationLevelsShowNotList = certificationLevelsShowNotList;
}
/**
* 获取 开始 计划生效日期
* @return planTakeTimeStart
......@@ -937,6 +1571,23 @@ public class MatterQuery extends MatterEntity {
public void setSpecialProcedureList(List<String> specialProcedureList){
this.specialProcedureList = specialProcedureList;
}
/**
* 获取 特别程序
* @return specialProcedureNotList
*/
public List<String> getSpecialProcedureNotList(){
return this.specialProcedureNotList;
}
/**
* 设置 特别程序
* @param specialProcedureNotList
*/
public void setSpecialProcedureNotList(List<String> specialProcedureNotList){
this.specialProcedureNotList = specialProcedureNotList;
}
/**
* 获取 开始 窗口到现场次数
* @return windowToTheSceneNumStart
......@@ -1001,6 +1652,23 @@ public class MatterQuery extends MatterEntity {
this.windowToTheSceneNumList = windowToTheSceneNumList;
}
/**
* 获取 窗口到现场次数
* @return windowToTheSceneNumNotList
*/
public List<Integer> getWindowToTheSceneNumNotList(){
return this.windowToTheSceneNumNotList;
}
/**
* 设置 窗口到现场次数
* @param windowToTheSceneNumNotList
*/
public void setWindowToTheSceneNumNotList(List<Integer> windowToTheSceneNumNotList){
this.windowToTheSceneNumNotList = windowToTheSceneNumNotList;
}
/**
* 获取 是否网上预约,窗口办理选（否.否，是.是）
* @return isOnlineSubscribeShowList
......@@ -1016,6 +1684,23 @@ public class MatterQuery extends MatterEntity {
public void setIsOnlineSubscribeShowList(List<String> isOnlineSubscribeShowList){
this.isOnlineSubscribeShowList = isOnlineSubscribeShowList;
}
/**
* 获取 是否网上预约,窗口办理选（否.否，是.是）
* @return isOnlineSubscribeShowNotList
*/
public List<String> getIsOnlineSubscribeShowNotList(){
return this.isOnlineSubscribeShowNotList;
}
/**
* 设置 是否网上预约,窗口办理选（否.否，是.是）
* @param isOnlineSubscribeShowNotList
*/
public void setIsOnlineSubscribeShowNotList(List<String> isOnlineSubscribeShowNotList){
this.isOnlineSubscribeShowNotList = isOnlineSubscribeShowNotList;
}
/**
* 获取 物流快递,窗口办理选（否.否，是.是）
* @return isExpressTakeShowList
......@@ -1031,6 +1716,23 @@ public class MatterQuery extends MatterEntity {
public void setIsExpressTakeShowList(List<String> isExpressTakeShowList){
this.isExpressTakeShowList = isExpressTakeShowList;
}
/**
* 获取 物流快递,窗口办理选（否.否，是.是）
* @return isExpressTakeShowNotList
*/
public List<String> getIsExpressTakeShowNotList(){
return this.isExpressTakeShowNotList;
}
/**
* 设置 物流快递,窗口办理选（否.否，是.是）
* @param isExpressTakeShowNotList
*/
public void setIsExpressTakeShowNotList(List<String> isExpressTakeShowNotList){
this.isExpressTakeShowNotList = isExpressTakeShowNotList;
}
/**
* 获取 是否支持全省范围就近取件（否.否，是.是）
* @return isProvinceAcquisitionShowList
......@@ -1046,6 +1748,23 @@ public class MatterQuery extends MatterEntity {
public void setIsProvinceAcquisitionShowList(List<String> isProvinceAcquisitionShowList){
this.isProvinceAcquisitionShowList = isProvinceAcquisitionShowList;
}
/**
* 获取 是否支持全省范围就近取件（否.否，是.是）
* @return isProvinceAcquisitionShowNotList
*/
public List<String> getIsProvinceAcquisitionShowNotList(){
return this.isProvinceAcquisitionShowNotList;
}
/**
* 设置 是否支持全省范围就近取件（否.否，是.是）
* @param isProvinceAcquisitionShowNotList
*/
public void setIsProvinceAcquisitionShowNotList(List<String> isProvinceAcquisitionShowNotList){
this.isProvinceAcquisitionShowNotList = isProvinceAcquisitionShowNotList;
}
/**
* 获取 是否支持全省范围就近办理（否.否，是.是）
* @return isApplyProvinceShowList
......@@ -1061,6 +1780,23 @@ public class MatterQuery extends MatterEntity {
public void setIsApplyProvinceShowList(List<String> isApplyProvinceShowList){
this.isApplyProvinceShowList = isApplyProvinceShowList;
}
/**
* 获取 是否支持全省范围就近办理（否.否，是.是）
* @return isApplyProvinceShowNotList
*/
public List<String> getIsApplyProvinceShowNotList(){
return this.isApplyProvinceShowNotList;
}
/**
* 设置 是否支持全省范围就近办理（否.否，是.是）
* @param isApplyProvinceShowNotList
*/
public void setIsApplyProvinceShowNotList(List<String> isApplyProvinceShowNotList){
this.isApplyProvinceShowNotList = isApplyProvinceShowNotList;
}
/**
* 获取 必须到现场原因
* @return mustSceneExplainList
......@@ -1076,6 +1812,23 @@ public class MatterQuery extends MatterEntity {
public void setMustSceneExplainList(List<String> mustSceneExplainList){
this.mustSceneExplainList = mustSceneExplainList;
}
/**
* 获取 必须到现场原因
* @return mustSceneExplainNotList
*/
public List<String> getMustSceneExplainNotList(){
return this.mustSceneExplainNotList;
}
/**
* 设置 必须到现场原因
* @param mustSceneExplainNotList
*/
public void setMustSceneExplainNotList(List<String> mustSceneExplainNotList){
this.mustSceneExplainNotList = mustSceneExplainNotList;
}
/**
* 获取 网办类型（原件预审.原件预审，原件核验.原件核验，全程网办.全程网办）
* @return onlineTypeList
......@@ -1091,6 +1844,23 @@ public class MatterQuery extends MatterEntity {
public void setOnlineTypeList(List<String> onlineTypeList){
this.onlineTypeList = onlineTypeList;
}
/**
* 获取 网办类型（原件预审.原件预审，原件核验.原件核验，全程网办.全程网办）
* @return onlineTypeNotList
*/
public List<String> getOnlineTypeNotList(){
return this.onlineTypeNotList;
}
/**
* 设置 网办类型（原件预审.原件预审，原件核验.原件核验，全程网办.全程网办）
* @param onlineTypeNotList
*/
public void setOnlineTypeNotList(List<String> onlineTypeNotList){
this.onlineTypeNotList = onlineTypeNotList;
}
/**
* 获取 开始 网办到现场次数
* @return onlineToTheSceneNumStart
......@@ -1155,6 +1925,23 @@ public class MatterQuery extends MatterEntity {
this.onlineToTheSceneNumList = onlineToTheSceneNumList;
}
/**
* 获取 网办到现场次数
* @return onlineToTheSceneNumNotList
*/
public List<Integer> getOnlineToTheSceneNumNotList(){
return this.onlineToTheSceneNumNotList;
}
/**
* 设置 网办到现场次数
* @param onlineToTheSceneNumNotList
*/
public void setOnlineToTheSceneNumNotList(List<Integer> onlineToTheSceneNumNotList){
this.onlineToTheSceneNumNotList = onlineToTheSceneNumNotList;
}
/**
* 获取 网络办理深度（互联网咨询.互联网咨询，互联网收件.互联网收件，互联网预审.互联网预审，互联网受理.互联网受理，互联网办理.互联网办理，互联网办理结果信息反馈.互联网办理结果信息反馈，其他.其他）
* @return onlineOperatDeepList
......@@ -1170,6 +1957,23 @@ public class MatterQuery extends MatterEntity {
public void setOnlineOperatDeepList(List<String> onlineOperatDeepList){
this.onlineOperatDeepList = onlineOperatDeepList;
}
/**
* 获取 网络办理深度（互联网咨询.互联网咨询，互联网收件.互联网收件，互联网预审.互联网预审，互联网受理.互联网受理，互联网办理.互联网办理，互联网办理结果信息反馈.互联网办理结果信息反馈，其他.其他）
* @return onlineOperatDeepNotList
*/
public List<String> getOnlineOperatDeepNotList(){
return this.onlineOperatDeepNotList;
}
/**
* 设置 网络办理深度（互联网咨询.互联网咨询，互联网收件.互联网收件，互联网预审.互联网预审，互联网受理.互联网受理，互联网办理.互联网办理，互联网办理结果信息反馈.互联网办理结果信息反馈，其他.其他）
* @param onlineOperatDeepNotList
*/
public void setOnlineOperatDeepNotList(List<String> onlineOperatDeepNotList){
this.onlineOperatDeepNotList = onlineOperatDeepNotList;
}
/**
* 获取 物流快递，网上办理选（否.否，是.是）
* @return isExpressTakeOnlineShowList
......@@ -1185,6 +1989,23 @@ public class MatterQuery extends MatterEntity {
public void setIsExpressTakeOnlineShowList(List<String> isExpressTakeOnlineShowList){
this.isExpressTakeOnlineShowList = isExpressTakeOnlineShowList;
}
/**
* 获取 物流快递，网上办理选（否.否，是.是）
* @return isExpressTakeOnlineShowNotList
*/
public List<String> getIsExpressTakeOnlineShowNotList(){
return this.isExpressTakeOnlineShowNotList;
}
/**
* 设置 物流快递，网上办理选（否.否，是.是）
* @param isExpressTakeOnlineShowNotList
*/
public void setIsExpressTakeOnlineShowNotList(List<String> isExpressTakeOnlineShowNotList){
this.isExpressTakeOnlineShowNotList = isExpressTakeOnlineShowNotList;
}
/**
* 获取 是否支持上门收取申请（否.否，是.是）
* @return isDoorTakeShowList
......@@ -1200,6 +2021,23 @@ public class MatterQuery extends MatterEntity {
public void setIsDoorTakeShowList(List<String> isDoorTakeShowList){
this.isDoorTakeShowList = isDoorTakeShowList;
}
/**
* 获取 是否支持上门收取申请（否.否，是.是）
* @return isDoorTakeShowNotList
*/
public List<String> getIsDoorTakeShowNotList(){
return this.isDoorTakeShowNotList;
}
/**
* 设置 是否支持上门收取申请（否.否，是.是）
* @param isDoorTakeShowNotList
*/
public void setIsDoorTakeShowNotList(List<String> isDoorTakeShowNotList){
this.isDoorTakeShowNotList = isDoorTakeShowNotList;
}
/**
* 获取 网上必须到现场原因
* @return onlineMustSceneExplainList
......@@ -1215,6 +2053,23 @@ public class MatterQuery extends MatterEntity {
public void setOnlineMustSceneExplainList(List<String> onlineMustSceneExplainList){
this.onlineMustSceneExplainList = onlineMustSceneExplainList;
}
/**
* 获取 网上必须到现场原因
* @return onlineMustSceneExplainNotList
*/
public List<String> getOnlineMustSceneExplainNotList(){
return this.onlineMustSceneExplainNotList;
}
/**
* 设置 网上必须到现场原因
* @param onlineMustSceneExplainNotList
*/
public void setOnlineMustSceneExplainNotList(List<String> onlineMustSceneExplainNotList){
this.onlineMustSceneExplainNotList = onlineMustSceneExplainNotList;
}
/**
* 获取 实施主体
* @return performDeptTypeList
......@@ -1230,6 +2085,23 @@ public class MatterQuery extends MatterEntity {
public void setPerformDeptTypeList(List<String> performDeptTypeList){
this.performDeptTypeList = performDeptTypeList;
}
/**
* 获取 实施主体
* @return performDeptTypeNotList
*/
public List<String> getPerformDeptTypeNotList(){
return this.performDeptTypeNotList;
}
/**
* 设置 实施主体
* @param performDeptTypeNotList
*/
public void setPerformDeptTypeNotList(List<String> performDeptTypeNotList){
this.performDeptTypeNotList = performDeptTypeNotList;
}
/**
* 获取 事项版本
* @return matterEditionList
......@@ -1245,6 +2117,23 @@ public class MatterQuery extends MatterEntity {
public void setMatterEditionList(List<String> matterEditionList){
this.matterEditionList = matterEditionList;
}
/**
* 获取 事项版本
* @return matterEditionNotList
*/
public List<String> getMatterEditionNotList(){
return this.matterEditionNotList;
}
/**
* 设置 事项版本
* @param matterEditionNotList
*/
public void setMatterEditionNotList(List<String> matterEditionNotList){
this.matterEditionNotList = matterEditionNotList;
}
/**
* 获取 事项类型名称（行政许可.行政许可，行政处罚.行政处罚，行政强制.行政强制，行政征收.行政征收，行政给付.行政给付，行政检查.行政检查，行政确认.行政确认，行政奖励.行政奖励，行政裁决.行政裁决，其他行政权力.其他行政权力，主动服务.主动服务，依申请服务.依申请服务，咨询查询.咨询查询，未归类事项.未归类事项）
* @return eventTypeShowList
......@@ -1260,6 +2149,23 @@ public class MatterQuery extends MatterEntity {
public void setEventTypeShowList(List<String> eventTypeShowList){
this.eventTypeShowList = eventTypeShowList;
}
/**
* 获取 事项类型名称（行政许可.行政许可，行政处罚.行政处罚，行政强制.行政强制，行政征收.行政征收，行政给付.行政给付，行政检查.行政检查，行政确认.行政确认，行政奖励.行政奖励，行政裁决.行政裁决，其他行政权力.其他行政权力，主动服务.主动服务，依申请服务.依申请服务，咨询查询.咨询查询，未归类事项.未归类事项）
* @return eventTypeShowNotList
*/
public List<String> getEventTypeShowNotList(){
return this.eventTypeShowNotList;
}
/**
* 设置 事项类型名称（行政许可.行政许可，行政处罚.行政处罚，行政强制.行政强制，行政征收.行政征收，行政给付.行政给付，行政检查.行政检查，行政确认.行政确认，行政奖励.行政奖励，行政裁决.行政裁决，其他行政权力.其他行政权力，主动服务.主动服务，依申请服务.依申请服务，咨询查询.咨询查询，未归类事项.未归类事项）
* @param eventTypeShowNotList
*/
public void setEventTypeShowNotList(List<String> eventTypeShowNotList){
this.eventTypeShowNotList = eventTypeShowNotList;
}
/**
* 获取 行使层级名称（省级.省级，市级.市级，县级.县级，镇[乡 街道].镇[乡 街道]，村[社区]级.村[社区]级）
* @return performHierarchyShowList
......@@ -1275,6 +2181,23 @@ public class MatterQuery extends MatterEntity {
public void setPerformHierarchyShowList(List<String> performHierarchyShowList){
this.performHierarchyShowList = performHierarchyShowList;
}
/**
* 获取 行使层级名称（省级.省级，市级.市级，县级.县级，镇[乡 街道].镇[乡 街道]，村[社区]级.村[社区]级）
* @return performHierarchyShowNotList
*/
public List<String> getPerformHierarchyShowNotList(){
return this.performHierarchyShowNotList;
}
/**
* 设置 行使层级名称（省级.省级，市级.市级，县级.县级，镇[乡 街道].镇[乡 街道]，村[社区]级.村[社区]级）
* @param performHierarchyShowNotList
*/
public void setPerformHierarchyShowNotList(List<String> performHierarchyShowNotList){
this.performHierarchyShowNotList = performHierarchyShowNotList;
}
/**
* 获取 权力来源（法定本级行使.法定本级行使，上级下放.上级下放，上级授权.上级授权，同级授权.同级授权，上级委托.上级委托，同级委托.同级委托）
* @return powerSourceShowList
......@@ -1290,6 +2213,23 @@ public class MatterQuery extends MatterEntity {
public void setPowerSourceShowList(List<String> powerSourceShowList){
this.powerSourceShowList = powerSourceShowList;
}
/**
* 获取 权力来源（法定本级行使.法定本级行使，上级下放.上级下放，上级授权.上级授权，同级授权.同级授权，上级委托.上级委托，同级委托.同级委托）
* @return powerSourceShowNotList
*/
public List<String> getPowerSourceShowNotList(){
return this.powerSourceShowNotList;
}
/**
* 设置 权力来源（法定本级行使.法定本级行使，上级下放.上级下放，上级授权.上级授权，同级授权.同级授权，上级委托.上级委托，同级委托.同级委托）
* @param powerSourceShowNotList
*/
public void setPowerSourceShowNotList(List<String> powerSourceShowNotList){
this.powerSourceShowNotList = powerSourceShowNotList;
}
/**
* 获取 实施主体性质（法定机关.法定机关，授权组织.授权组织，受委托组织.受委托组织）
* @return performDeptTypeShowList
......@@ -1305,6 +2245,23 @@ public class MatterQuery extends MatterEntity {
public void setPerformDeptTypeShowList(List<String> performDeptTypeShowList){
this.performDeptTypeShowList = performDeptTypeShowList;
}
/**
* 获取 实施主体性质（法定机关.法定机关，授权组织.授权组织，受委托组织.受委托组织）
* @return performDeptTypeShowNotList
*/
public List<String> getPerformDeptTypeShowNotList(){
return this.performDeptTypeShowNotList;
}
/**
* 设置 实施主体性质（法定机关.法定机关，授权组织.授权组织，受委托组织.受委托组织）
* @param performDeptTypeShowNotList
*/
public void setPerformDeptTypeShowNotList(List<String> performDeptTypeShowNotList){
this.performDeptTypeShowNotList = performDeptTypeShowNotList;
}
/**
* 获取 是否进驻中心（否.否，是.是）
* @return goveServiceCenterShowList
......@@ -1320,6 +2277,23 @@ public class MatterQuery extends MatterEntity {
public void setGoveServiceCenterShowList(List<String> goveServiceCenterShowList){
this.goveServiceCenterShowList = goveServiceCenterShowList;
}
/**
* 获取 是否进驻中心（否.否，是.是）
* @return goveServiceCenterShowNotList
*/
public List<String> getGoveServiceCenterShowNotList(){
return this.goveServiceCenterShowNotList;
}
/**
* 设置 是否进驻中心（否.否，是.是）
* @param goveServiceCenterShowNotList
*/
public void setGoveServiceCenterShowNotList(List<String> goveServiceCenterShowNotList){
this.goveServiceCenterShowNotList = goveServiceCenterShowNotList;
}
/**
* 获取 是否纳入便民服务中心（否.否，是.是）
* @return isConvenientCenterShowList
......@@ -1335,6 +2309,23 @@ public class MatterQuery extends MatterEntity {
public void setIsConvenientCenterShowList(List<String> isConvenientCenterShowList){
this.isConvenientCenterShowList = isConvenientCenterShowList;
}
/**
* 获取 是否纳入便民服务中心（否.否，是.是）
* @return isConvenientCenterShowNotList
*/
public List<String> getIsConvenientCenterShowNotList(){
return this.isConvenientCenterShowNotList;
}
/**
* 设置 是否纳入便民服务中心（否.否，是.是）
* @param isConvenientCenterShowNotList
*/
public void setIsConvenientCenterShowNotList(List<String> isConvenientCenterShowNotList){
this.isConvenientCenterShowNotList = isConvenientCenterShowNotList;
}
/**
* 获取 自助终端办理 （否.否，是.是）
* @return terminalHandleList
......@@ -1350,6 +2341,23 @@ public class MatterQuery extends MatterEntity {
public void setTerminalHandleList(List<String> terminalHandleList){
this.terminalHandleList = terminalHandleList;
}
/**
* 获取 自助终端办理 （否.否，是.是）
* @return terminalHandleNotList
*/
public List<String> getTerminalHandleNotList(){
return this.terminalHandleNotList;
}
/**
* 设置 自助终端办理 （否.否，是.是）
* @param terminalHandleNotList
*/
public void setTerminalHandleNotList(List<String> terminalHandleNotList){
this.terminalHandleNotList = terminalHandleNotList;
}
/**
* 获取 是否网办 （否.否，是.是）
* @return isOnlineList
......@@ -1365,6 +2373,23 @@ public class MatterQuery extends MatterEntity {
public void setIsOnlineList(List<String> isOnlineList){
this.isOnlineList = isOnlineList;
}
/**
* 获取 是否网办 （否.否，是.是）
* @return isOnlineNotList
*/
public List<String> getIsOnlineNotList(){
return this.isOnlineNotList;
}
/**
* 设置 是否网办 （否.否，是.是）
* @param isOnlineNotList
*/
public void setIsOnlineNotList(List<String> isOnlineNotList){
this.isOnlineNotList = isOnlineNotList;
}
/**
* 获取 支持网上支付（否.否，是.是）
* @return isOnlinePayShowList
......@@ -1380,6 +2405,23 @@ public class MatterQuery extends MatterEntity {
public void setIsOnlinePayShowList(List<String> isOnlinePayShowList){
this.isOnlinePayShowList = isOnlinePayShowList;
}
/**
* 获取 支持网上支付（否.否，是.是）
* @return isOnlinePayShowNotList
*/
public List<String> getIsOnlinePayShowNotList(){
return this.isOnlinePayShowNotList;
}
/**
* 设置 支持网上支付（否.否，是.是）
* @param isOnlinePayShowNotList
*/
public void setIsOnlinePayShowNotList(List<String> isOnlinePayShowNotList){
this.isOnlinePayShowNotList = isOnlinePayShowNotList;
}
/**
* 获取 委托部门（否.否，是.是）
* @return entrustmentDepartmenList
......@@ -1395,6 +2437,23 @@ public class MatterQuery extends MatterEntity {
public void setEntrustmentDepartmenList(List<String> entrustmentDepartmenList){
this.entrustmentDepartmenList = entrustmentDepartmenList;
}
/**
* 获取 委托部门（否.否，是.是）
* @return entrustmentDepartmenNotList
*/
public List<String> getEntrustmentDepartmenNotList(){
return this.entrustmentDepartmenNotList;
}
/**
* 设置 委托部门（否.否，是.是）
* @param entrustmentDepartmenNotList
*/
public void setEntrustmentDepartmenNotList(List<String> entrustmentDepartmenNotList){
this.entrustmentDepartmenNotList = entrustmentDepartmenNotList;
}
/**
* 获取 联办机构
* @return jointInfoShowList
......@@ -1410,6 +2469,23 @@ public class MatterQuery extends MatterEntity {
public void setJointInfoShowList(List<String> jointInfoShowList){
this.jointInfoShowList = jointInfoShowList;
}
/**
* 获取 联办机构
* @return jointInfoShowNotList
*/
public List<String> getJointInfoShowNotList(){
return this.jointInfoShowNotList;
}
/**
* 设置 联办机构
* @param jointInfoShowNotList
*/
public void setJointInfoShowNotList(List<String> jointInfoShowNotList){
this.jointInfoShowNotList = jointInfoShowNotList;
}
/**
* 获取 事项状态（停用.停用，在用.在用）
* @return matterStatusList
......@@ -1425,6 +2501,23 @@ public class MatterQuery extends MatterEntity {
public void setMatterStatusList(List<String> matterStatusList){
this.matterStatusList = matterStatusList;
}
/**
* 获取 事项状态（停用.停用，在用.在用）
* @return matterStatusNotList
*/
public List<String> getMatterStatusNotList(){
return this.matterStatusNotList;
}
/**
* 设置 事项状态（停用.停用，在用.在用）
* @param matterStatusNotList
*/
public void setMatterStatusNotList(List<String> matterStatusNotList){
this.matterStatusNotList = matterStatusNotList;
}
/**
* 获取 开始 数量限制
* @return numberLimitStart
......@@ -1489,21 +2582,55 @@ public class MatterQuery extends MatterEntity {
this.numberLimitList = numberLimitList;
}
/**
* 获取 数量限制
* @return numberLimitNotList
*/
public List<Long> getNumberLimitNotList(){
return this.numberLimitNotList;
}
/**
* 设置 数量限制
* @param numberLimitNotList
*/
public void setNumberLimitNotList(List<Long> numberLimitNotList){
this.numberLimitNotList = numberLimitNotList;
}
/**
* 获取 主题类型
* @return typeList
*/
public List<String> getTypeList(){
return this.typeList;
}
/**
* 设置 主题类型
* @param typeList
*/
public void setTypeList(List<String> typeList){
this.typeList = typeList;
}
/**
* 获取 主题类型
* @return typeList
* @return typeNotList
*/
public List<String> getTypeList(){
return this.typeList;
public List<String> getTypeNotList(){
return this.typeNotList;
}
/**
* 设置 主题类型
* @param typeList
* @param typeNotList
*/
public void setTypeList(List<String> typeList){
this.typeList = typeList;
public void setTypeNotList(List<String> typeNotList){
this.typeNotList = typeNotList;
}
/**
* 获取 基本编码
* @return baseCodeList
......@@ -1519,6 +2646,23 @@ public class MatterQuery extends MatterEntity {
public void setBaseCodeList(List<String> baseCodeList){
this.baseCodeList = baseCodeList;
}
/**
* 获取 基本编码
* @return baseCodeNotList
*/
public List<String> getBaseCodeNotList(){
return this.baseCodeNotList;
}
/**
* 设置 基本编码
* @param baseCodeNotList
*/
public void setBaseCodeNotList(List<String> baseCodeNotList){
this.baseCodeNotList = baseCodeNotList;
}
/**
* 获取 实施编码
* @return implementCodeList
......@@ -1534,6 +2678,23 @@ public class MatterQuery extends MatterEntity {
public void setImplementCodeList(List<String> implementCodeList){
this.implementCodeList = implementCodeList;
}
/**
* 获取 实施编码
* @return implementCodeNotList
*/
public List<String> getImplementCodeNotList(){
return this.implementCodeNotList;
}
/**
* 设置 实施编码
* @param implementCodeNotList
*/
public void setImplementCodeNotList(List<String> implementCodeNotList){
this.implementCodeNotList = implementCodeNotList;
}
/**
* 获取 实施主体编码
* @return implementBodyCodeList
......@@ -1549,6 +2710,23 @@ public class MatterQuery extends MatterEntity {
public void setImplementBodyCodeList(List<String> implementBodyCodeList){
this.implementBodyCodeList = implementBodyCodeList;
}
/**
* 获取 实施主体编码
* @return implementBodyCodeNotList
*/
public List<String> getImplementBodyCodeNotList(){
return this.implementBodyCodeNotList;
}
/**
* 设置 实施主体编码
* @param implementBodyCodeNotList
*/
public void setImplementBodyCodeNotList(List<String> implementBodyCodeNotList){
this.implementBodyCodeNotList = implementBodyCodeNotList;
}
/**
* 获取 办理项编码
* @return operateItemCodeList
......@@ -1564,6 +2742,23 @@ public class MatterQuery extends MatterEntity {
public void setOperateItemCodeList(List<String> operateItemCodeList){
this.operateItemCodeList = operateItemCodeList;
}
/**
* 获取 办理项编码
* @return operateItemCodeNotList
*/
public List<String> getOperateItemCodeNotList(){
return this.operateItemCodeNotList;
}
/**
* 设置 办理项编码
* @param operateItemCodeNotList
*/
public void setOperateItemCodeNotList(List<String> operateItemCodeNotList){
this.operateItemCodeNotList = operateItemCodeNotList;
}
/**
* 获取 乡镇街道名称
* @return townshipNameList
......@@ -1579,6 +2774,23 @@ public class MatterQuery extends MatterEntity {
public void setTownshipNameList(List<String> townshipNameList){
this.townshipNameList = townshipNameList;
}
/**
* 获取 乡镇街道名称
* @return townshipNameNotList
*/
public List<String> getTownshipNameNotList(){
return this.townshipNameNotList;
}
/**
* 设置 乡镇街道名称
* @param townshipNameNotList
*/
public void setTownshipNameNotList(List<String> townshipNameNotList){
this.townshipNameNotList = townshipNameNotList;
}
/**
* 获取 乡镇街道代码
* @return townshipCodeList
......@@ -1594,6 +2806,23 @@ public class MatterQuery extends MatterEntity {
public void setTownshipCodeList(List<String> townshipCodeList){
this.townshipCodeList = townshipCodeList;
}
/**
* 获取 乡镇街道代码
* @return townshipCodeNotList
*/
public List<String> getTownshipCodeNotList(){
return this.townshipCodeNotList;
}
/**
* 设置 乡镇街道代码
* @param townshipCodeNotList
*/
public void setTownshipCodeNotList(List<String> townshipCodeNotList){
this.townshipCodeNotList = townshipCodeNotList;
}
/**
* 获取 村居社区名称
* @return villageNameList
......@@ -1609,6 +2838,23 @@ public class MatterQuery extends MatterEntity {
public void setVillageNameList(List<String> villageNameList){
this.villageNameList = villageNameList;
}
/**
* 获取 村居社区名称
* @return villageNameNotList
*/
public List<String> getVillageNameNotList(){
return this.villageNameNotList;
}
/**
* 设置 村居社区名称
* @param villageNameNotList
*/
public void setVillageNameNotList(List<String> villageNameNotList){
this.villageNameNotList = villageNameNotList;
}
/**
* 获取 村居社区代码
* @return villageCodeList
......@@ -1624,6 +2870,23 @@ public class MatterQuery extends MatterEntity {
public void setVillageCodeList(List<String> villageCodeList){
this.villageCodeList = villageCodeList;
}
/**
* 获取 村居社区代码
* @return villageCodeNotList
*/
public List<String> getVillageCodeNotList(){
return this.villageCodeNotList;
}
/**
* 设置 村居社区代码
* @param villageCodeNotList
*/
public void setVillageCodeNotList(List<String> villageCodeNotList){
this.villageCodeNotList = villageCodeNotList;
}
/**
* 获取 办理时间
* @return operateTimeList
......@@ -1639,6 +2902,23 @@ public class MatterQuery extends MatterEntity {
public void setOperateTimeList(List<String> operateTimeList){
this.operateTimeList = operateTimeList;
}
/**
* 获取 办理时间
* @return operateTimeNotList
*/
public List<String> getOperateTimeNotList(){
return this.operateTimeNotList;
}
/**
* 设置 办理时间
* @param operateTimeNotList
*/
public void setOperateTimeNotList(List<String> operateTimeNotList){
this.operateTimeNotList = operateTimeNotList;
}
/**
* 获取 办理地点
* @return operateSiteList
......@@ -1654,6 +2934,23 @@ public class MatterQuery extends MatterEntity {
public void setOperateSiteList(List<String> operateSiteList){
this.operateSiteList = operateSiteList;
}
/**
* 获取 办理地点
* @return operateSiteNotList
*/
public List<String> getOperateSiteNotList(){
return this.operateSiteNotList;
}
/**
* 设置 办理地点
* @param operateSiteNotList
*/
public void setOperateSiteNotList(List<String> operateSiteNotList){
this.operateSiteNotList = operateSiteNotList;
}
/**
* 获取 咨询方式
* @return cousultingShowList
......@@ -1669,6 +2966,23 @@ public class MatterQuery extends MatterEntity {
public void setCousultingShowList(List<String> cousultingShowList){
this.cousultingShowList = cousultingShowList;
}
/**
* 获取 咨询方式
* @return cousultingShowNotList
*/
public List<String> getCousultingShowNotList(){
return this.cousultingShowNotList;
}
/**
* 设置 咨询方式
* @param cousultingShowNotList
*/
public void setCousultingShowNotList(List<String> cousultingShowNotList){
this.cousultingShowNotList = cousultingShowNotList;
}
/**
* 获取 咨询电话
* @return cousultingTelephoneShowList
......@@ -1684,6 +2998,23 @@ public class MatterQuery extends MatterEntity {
public void setCousultingTelephoneShowList(List<String> cousultingTelephoneShowList){
this.cousultingTelephoneShowList = cousultingTelephoneShowList;
}
/**
* 获取 咨询电话
* @return cousultingTelephoneShowNotList
*/
public List<String> getCousultingTelephoneShowNotList(){
return this.cousultingTelephoneShowNotList;
}
/**
* 设置 咨询电话
* @param cousultingTelephoneShowNotList
*/
public void setCousultingTelephoneShowNotList(List<String> cousultingTelephoneShowNotList){
this.cousultingTelephoneShowNotList = cousultingTelephoneShowNotList;
}
/**
* 获取 监督投诉方式
* @return superviseShowList
......@@ -1699,6 +3030,23 @@ public class MatterQuery extends MatterEntity {
public void setSuperviseShowList(List<String> superviseShowList){
this.superviseShowList = superviseShowList;
}
/**
* 获取 监督投诉方式
* @return superviseShowNotList
*/
public List<String> getSuperviseShowNotList(){
return this.superviseShowNotList;
}
/**
* 设置 监督投诉方式
* @param superviseShowNotList
*/
public void setSuperviseShowNotList(List<String> superviseShowNotList){
this.superviseShowNotList = superviseShowNotList;
}
/**
* 获取 开始 排序
* @return sortStart
......@@ -1763,6 +3111,23 @@ public class MatterQuery extends MatterEntity {
this.sortList = sortList;
}
/**
* 获取 排序
* @return sortNotList
*/
public List<Integer> getSortNotList(){
return this.sortNotList;
}
/**
* 设置 排序
* @param sortNotList
*/
public void setSortNotList(List<Integer> sortNotList){
this.sortNotList = sortNotList;
}
/**
* 获取 开始 事项来源(0.政务网，1.自定义)
* @return sourceStart
......@@ -1827,6 +3192,23 @@ public class MatterQuery extends MatterEntity {
this.sourceList = sourceList;
}
/**
* 获取 事项来源(0.政务网，1.自定义)
* @return sourceNotList
*/
public List<Integer> getSourceNotList(){
return this.sourceNotList;
}
/**
* 设置 事项来源(0.政务网，1.自定义)
* @param sourceNotList
*/
public void setSourceNotList(List<Integer> sourceNotList){
this.sourceNotList = sourceNotList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
......@@ -1923,6 +3305,23 @@ public class MatterQuery extends MatterEntity {
this.createUserIdList = createUserIdList;
}
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/**
* 获取 开始 修改时间
* @return updateTimeStart
......@@ -1970,6 +3369,23 @@ public class MatterQuery extends MatterEntity {
public void setEvaluationUrlList(List<String> evaluationUrlList){
this.evaluationUrlList = evaluationUrlList;
}
/**
* 获取 评价地址
* @return evaluationUrlNotList
*/
public List<String> getEvaluationUrlNotList(){
return this.evaluationUrlNotList;
}
/**
* 设置 评价地址
* @param evaluationUrlNotList
*/
public void setEvaluationUrlNotList(List<String> evaluationUrlNotList){
this.evaluationUrlNotList = evaluationUrlNotList;
}
/**
* 获取 申请地址
* @return netApplyUrlList
......@@ -1985,6 +3401,23 @@ public class MatterQuery extends MatterEntity {
public void setNetApplyUrlList(List<String> netApplyUrlList){
this.netApplyUrlList = netApplyUrlList;
}
/**
* 获取 申请地址
* @return netApplyUrlNotList
*/
public List<String> getNetApplyUrlNotList(){
return this.netApplyUrlNotList;
}
/**
* 设置 申请地址
* @param netApplyUrlNotList
*/
public void setNetApplyUrlNotList(List<String> netApplyUrlNotList){
this.netApplyUrlNotList = netApplyUrlNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
......@@ -2030,6 +3463,15 @@ public class MatterQuery extends MatterEntity {
return this;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public MatterQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 站点ID
* @param siteId
......@@ -2075,6 +3517,15 @@ public class MatterQuery extends MatterEntity {
return this;
}
/**
* 设置 站点ID
* @param siteIdNotList
*/
public MatterQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 设置 从政务系统来的事项id
......@@ -2635,6 +4086,15 @@ public class MatterQuery extends MatterEntity {
return this;
}
/**
* 设置 窗口到现场次数
* @param windowToTheSceneNumNotList
*/
public MatterQuery windowToTheSceneNumNotList(List<Integer> windowToTheSceneNumNotList){
this.windowToTheSceneNumNotList = windowToTheSceneNumNotList;
return this;
}
/**
* 设置 是否网上预约,窗口办理选（否.否，是.是）
......@@ -2794,6 +4254,15 @@ public class MatterQuery extends MatterEntity {
return this;
}
/**
* 设置 网办到现场次数
* @param onlineToTheSceneNumNotList
*/
public MatterQuery onlineToTheSceneNumNotList(List<Integer> onlineToTheSceneNumNotList){
this.onlineToTheSceneNumNotList = onlineToTheSceneNumNotList;
return this;
}
/**
* 设置 网络办理深度（互联网咨询.互联网咨询，互联网收件.互联网收件，互联网预审.互联网预审，互联网受理.互联网受理，互联网办理.互联网办理，互联网办理结果信息反馈.互联网办理结果信息反馈，其他.其他）
......@@ -3181,6 +4650,15 @@ public class MatterQuery extends MatterEntity {
return this;
}
/**
* 设置 数量限制
* @param numberLimitNotList
*/
public MatterQuery numberLimitNotList(List<Long> numberLimitNotList){
this.numberLimitNotList = numberLimitNotList;
return this;
}
/**
* 设置 主题类型
......@@ -3492,6 +4970,15 @@ public class MatterQuery extends MatterEntity {
return this;
}
/**
* 设置 排序
* @param sortNotList
*/
public MatterQuery sortNotList(List<Integer> sortNotList){
this.sortNotList = sortNotList;
return this;
}
/**
* 设置 事项来源(0.政务网，1.自定义)
* @param source
......@@ -3537,6 +5024,15 @@ public class MatterQuery extends MatterEntity {
return this;
}
/**
* 设置 事项来源(0.政务网，1.自定义)
* @param sourceNotList
*/
public MatterQuery sourceNotList(List<Integer> sourceNotList){
this.sourceNotList = sourceNotList;
return this;
}
/**
* 设置 创建用户
......@@ -3583,6 +5079,15 @@ public class MatterQuery extends MatterEntity {
return this;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public MatterQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/**
......
base-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterInfo.java
View file @ a9d6544d
......@@ -54,4 +54,5 @@ public class MatterInfo {
*/
private String promiseTimeLimitShow;
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterVo.java
View file @ a9d6544d
......@@ -16,4 +16,9 @@ public class MatterVo extends BaseEntityLong {
private List<Long> idList;
/**
* 行政处罚排除
*/
private List <String> eventTypeShowNotList;
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java
View file @ a9d6544d
......@@ -4,6 +4,7 @@ import cn.hutool.setting.Setting;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
......@@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors;
......@@ -54,6 +56,23 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
super.setModuleDesc("基础事项");
}
/**
* @param query
* @param model
* @param context
* @throws AppException
*/
@Override
protected void doListBefore(MatterEntity query, Map<String, Object> model, Context context) throws AppException {
if(ObjectUtils.isEmpty(query.getEventTypeShowNotList())){
ArrayList<String> notList = new ArrayList<>();
notList.add("行政处罚");
query.setEventTypeShowNotList(notList);
}
super.doListBefore(query, model, context);
}
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "appoveObjectShow", paramService.getParamBySecondOrganize("Matter", "appoveObjectShow"));
......
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteMatterQuery.java
View file @ a9d6544d
......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.site.model.SiteMatterEntity;
* 站点事项查询对象
*
* @author zxfei
* @date 2022-11-16
* @date 2023-02-21
*/
public class SiteMatterQuery extends SiteMatterEntity {
/** 开始 序号，主键，自增长 */
......@@ -21,6 +21,9 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** 序号，主键，自增长列表 */
private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 站点ID */
private Long siteIdStart;
......@@ -33,9 +36,14 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** 站点ID列表 */
private List <Long> siteIdList;
/** 站点ID排除列表 */
private List <Long> siteIdNotList;
/** 站点名称 */
private List<String> siteNameList;
/** 站点名称排除列表 */
private List <String> siteNameNotList;
/** 开始 事项ID */
private Long matterIdStart;
......@@ -48,12 +56,19 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** 事项ID列表 */
private List <Long> matterIdList;
/** 事项ID排除列表 */
private List <Long> matterIdNotList;
/** 事项名称 */
private List<String> matterNameList;
/** 事项名称排除列表 */
private List <String> matterNameNotList;
/** 事项编码 */
private List<String> matterCodeList;
/** 事项编码排除列表 */
private List <String> matterCodeNotList;
/** 开始 部门ID */
private Long deptIdStart;
......@@ -66,9 +81,19 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** 部门ID列表 */
private List <Long> deptIdList;
/** 部门ID排除列表 */
private List <Long> deptIdNotList;
/** 部门名称 */
private List<String> deptNameList;
/** 部门名称排除列表 */
private List <String> deptNameNotList;
/** 事项类型 */
private List<String> eventTypeShowList;
/** 事项类型排除列表 */
private List <String> eventTypeShowNotList;
/** 开始 事项来源 */
private Integer sourceStart;
......@@ -81,9 +106,14 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** 事项来源列表 */
private List <Integer> sourceList;
/** 事项来源排除列表 */
private List <Integer> sourceNotList;
/** 部门编号 */
private List<String> deptCodeList;
/** 部门编号排除列表 */
private List <String> deptCodeNotList;
/** 开始 创建时间 */
private String createTimeStart;
......@@ -102,6 +132,9 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** 创建用户列表 */
private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 修改时间 */
private String updateTimeStart;
......@@ -180,6 +213,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
this.idList = idList;
}
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/**
* 获取 开始 站点ID
* @return siteIdStart
......@@ -244,6 +294,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
this.siteIdList = siteIdList;
}
/**
* 获取 站点ID
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点ID
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 获取 站点名称
* @return siteNameList
......@@ -259,6 +326,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
public void setSiteNameList(List<String> siteNameList){
this.siteNameList = siteNameList;
}
/**
* 获取 站点名称
* @return siteNameNotList
*/
public List<String> getSiteNameNotList(){
return this.siteNameNotList;
}
/**
* 设置 站点名称
* @param siteNameNotList
*/
public void setSiteNameNotList(List<String> siteNameNotList){
this.siteNameNotList = siteNameNotList;
}
/**
* 获取 开始 事项ID
* @return matterIdStart
......@@ -323,6 +407,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
this.matterIdList = matterIdList;
}
/**
* 获取 事项ID
* @return matterIdNotList
*/
public List<Long> getMatterIdNotList(){
return this.matterIdNotList;
}
/**
* 设置 事项ID
* @param matterIdNotList
*/
public void setMatterIdNotList(List<Long> matterIdNotList){
this.matterIdNotList = matterIdNotList;
}
/**
* 获取 事项名称
* @return matterNameList
......@@ -338,6 +439,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
public void setMatterNameList(List<String> matterNameList){
this.matterNameList = matterNameList;
}
/**
* 获取 事项名称
* @return matterNameNotList
*/
public List<String> getMatterNameNotList(){
return this.matterNameNotList;
}
/**
* 设置 事项名称
* @param matterNameNotList
*/
public void setMatterNameNotList(List<String> matterNameNotList){
this.matterNameNotList = matterNameNotList;
}
/**
* 获取 事项编码
* @return matterCodeList
......@@ -353,6 +471,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
public void setMatterCodeList(List<String> matterCodeList){
this.matterCodeList = matterCodeList;
}
/**
* 获取 事项编码
* @return matterCodeNotList
*/
public List<String> getMatterCodeNotList(){
return this.matterCodeNotList;
}
/**
* 设置 事项编码
* @param matterCodeNotList
*/
public void setMatterCodeNotList(List<String> matterCodeNotList){
this.matterCodeNotList = matterCodeNotList;
}
/**
* 获取 开始 部门ID
* @return deptIdStart
......@@ -417,6 +552,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
this.deptIdList = deptIdList;
}
/**
* 获取 部门ID
* @return deptIdNotList
*/
public List<Long> getDeptIdNotList(){
return this.deptIdNotList;
}
/**
* 设置 部门ID
* @param deptIdNotList
*/
public void setDeptIdNotList(List<Long> deptIdNotList){
this.deptIdNotList = deptIdNotList;
}
/**
* 获取 部门名称
* @return deptNameList
......@@ -432,6 +584,55 @@ public class SiteMatterQuery extends SiteMatterEntity {
public void setDeptNameList(List<String> deptNameList){
this.deptNameList = deptNameList;
}
/**
* 获取 部门名称
* @return deptNameNotList
*/
public List<String> getDeptNameNotList(){
return this.deptNameNotList;
}
/**
* 设置 部门名称
* @param deptNameNotList
*/
public void setDeptNameNotList(List<String> deptNameNotList){
this.deptNameNotList = deptNameNotList;
}
/**
* 获取 事项类型
* @return eventTypeShowList
*/
public List<String> getEventTypeShowList(){
return this.eventTypeShowList;
}
/**
* 设置 事项类型
* @param eventTypeShowList
*/
public void setEventTypeShowList(List<String> eventTypeShowList){
this.eventTypeShowList = eventTypeShowList;
}
/**
* 获取 事项类型
* @return eventTypeShowNotList
*/
public List<String> getEventTypeShowNotList(){
return this.eventTypeShowNotList;
}
/**
* 设置 事项类型
* @param eventTypeShowNotList
*/
public void setEventTypeShowNotList(List<String> eventTypeShowNotList){
this.eventTypeShowNotList = eventTypeShowNotList;
}
/**
* 获取 开始 事项来源
* @return sourceStart
......@@ -496,6 +697,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
this.sourceList = sourceList;
}
/**
* 获取 事项来源
* @return sourceNotList
*/
public List<Integer> getSourceNotList(){
return this.sourceNotList;
}
/**
* 设置 事项来源
* @param sourceNotList
*/
public void setSourceNotList(List<Integer> sourceNotList){
this.sourceNotList = sourceNotList;
}
/**
* 获取 部门编号
* @return deptCodeList
......@@ -511,6 +729,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
public void setDeptCodeList(List<String> deptCodeList){
this.deptCodeList = deptCodeList;
}
/**
* 获取 部门编号
* @return deptCodeNotList
*/
public List<String> getDeptCodeNotList(){
return this.deptCodeNotList;
}
/**
* 设置 部门编号
* @param deptCodeNotList
*/
public void setDeptCodeNotList(List<String> deptCodeNotList){
this.deptCodeNotList = deptCodeNotList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
......@@ -607,6 +842,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
this.createUserIdList = createUserIdList;
}
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/**
* 获取 开始 修改时间
* @return updateTimeStart
......@@ -684,6 +936,15 @@ public class SiteMatterQuery extends SiteMatterEntity {
return this;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public SiteMatterQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 站点ID
* @param siteId
......@@ -729,6 +990,15 @@ public class SiteMatterQuery extends SiteMatterEntity {
return this;
}
/**
* 设置 站点ID
* @param siteIdNotList
*/
public SiteMatterQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 设置 站点名称
......@@ -793,6 +1063,15 @@ public class SiteMatterQuery extends SiteMatterEntity {
return this;
}
/**
* 设置 事项ID
* @param matterIdNotList
*/
public SiteMatterQuery matterIdNotList(List<Long> matterIdNotList){
this.matterIdNotList = matterIdNotList;
return this;
}
/**
* 设置 事项名称
......@@ -876,6 +1155,15 @@ public class SiteMatterQuery extends SiteMatterEntity {
return this;
}
/**
* 设置 部门ID
* @param deptIdNotList
*/
public SiteMatterQuery deptIdNotList(List<Long> deptIdNotList){
this.deptIdNotList = deptIdNotList;
return this;
}
/**
* 设置 部门名称
......@@ -895,6 +1183,25 @@ public class SiteMatterQuery extends SiteMatterEntity {
return this;
}
/**
* 设置 事项类型
* @param eventTypeShow
*/
public SiteMatterQuery eventTypeShow(String eventTypeShow){
setEventTypeShow(eventTypeShow);
return this;
}
/**
* 设置 事项类型
* @param eventTypeShowList
*/
public SiteMatterQuery eventTypeShowList(List<String> eventTypeShowList){
this.eventTypeShowList = eventTypeShowList;
return this;
}
/**
* 设置 事项来源
* @param source
......@@ -940,6 +1247,15 @@ public class SiteMatterQuery extends SiteMatterEntity {
return this;
}
/**
* 设置 事项来源
* @param sourceNotList
*/
public SiteMatterQuery sourceNotList(List<Integer> sourceNotList){
this.sourceNotList = sourceNotList;
return this;
}
/**
* 设置 部门编号
......@@ -1005,6 +1321,15 @@ public class SiteMatterQuery extends SiteMatterEntity {
return this;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public SiteMatterQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
......
base-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SiteMatterVo.java
View file @ a9d6544d
......@@ -34,4 +34,7 @@ public class SiteMatterVo extends BaseEntityLong {
*/
private String areaCode;
/** 事项类型排除列表 */
private List <String> eventTypeShowNotList;
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteBusinessServiceImpl.java
View file @ a9d6544d
package com.mortals.xhx.module.site.service.impl;
import com.alibaba.fastjson.JSON;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
import com.mortals.xhx.common.code.BusinessTypeEnum;
import com.mortals.xhx.common.code.IsBusinessEnum;
import com.mortals.xhx.module.business.model.BusinessEntity;
import com.mortals.xhx.module.business.model.BusinessMatterEntity;
......@@ -10,18 +14,15 @@ import com.mortals.xhx.module.business.model.BusinessMatterQuery;
import com.mortals.xhx.module.business.model.BusinessQuery;
import com.mortals.xhx.module.business.service.BusinessMatterService;
import com.mortals.xhx.module.business.service.BusinessService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.xhx.common.code.SatusEnum;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.module.site.dao.SiteBusinessDao;
import com.mortals.xhx.module.site.model.SiteBusinessEntity;
import com.mortals.xhx.module.site.model.SiteBusinessQuery;
import com.mortals.xhx.module.site.service.SiteBusinessService;
import com.mortals.xhx.module.site.model.SiteBusinessTreeSelect;
import com.mortals.xhx.module.site.service.SiteBusinessService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import java.util.*;
......@@ -35,6 +36,7 @@ import java.util.stream.Collectors;
* @date 2022-01-13
*/
@Service("siteBusinessService")
@Slf4j
public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBusinessDao, SiteBusinessEntity, Long> implements SiteBusinessService {
@Autowired
......@@ -43,13 +45,56 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
@Autowired
private BusinessMatterService businessMatterService;
/**
* @param params
* @param pageInfo
* @param context
* @return
* @throws AppException
*/
@Override
protected void findAfter(SiteBusinessEntity params, PageInfo pageInfo, Context context, List<SiteBusinessEntity> list) throws AppException {
protected SiteBusinessEntity findBefore(SiteBusinessEntity params, PageInfo pageInfo, Context context) throws AppException {
if (!ObjectUtils.isEmpty(params.getIdNotList())) {
Set<Long> notIdSet = params.getIdNotList().stream().collect(Collectors.toSet());
//排除掉了父级，但是子集存在，需要吧父id排除到notlist外
SiteBusinessQuery siteBusinessQuery = new SiteBusinessQuery();
siteBusinessQuery.setIdList(params.getIdNotList());
List<SiteBusinessEntity> rootSiteBusiness = this.find(siteBusinessQuery).stream().filter(f -> f.getIsBusiness() == IsBusinessEnum.一级业务.getValue()).collect(Collectors.toList());
for (SiteBusinessEntity root : rootSiteBusiness) {
SiteBusinessQuery query = new SiteBusinessQuery();
query.setParentId(root.getId());
List<SiteBusinessEntity> childSiteBusiness = this.find(query, context);
//判断排除的id是否包含所有
Boolean bool = false;
for (SiteBusinessEntity child : childSiteBusiness) {
if (!notIdSet.contains(child.getId())) {
bool = true;
break;
}
}
if (bool) {
//排除掉父id
notIdSet.remove(root.getId());
}
}
params.setIdNotList(notIdSet.stream().collect(Collectors.toList()));
}
return super.findBefore(params, pageInfo, context);
}
@Override
protected void findAfter(SiteBusinessEntity params, PageInfo pageInfo, Context context, List<SiteBusinessEntity> list) throws AppException {
if (!ObjectUtils.isEmpty(params.getIdNotList())) {
//排除掉已经存在的ids
log.info("idNotList:{}", JSON.toJSONString(params.getIdNotList()));
Iterator<SiteBusinessEntity> iterator = list.iterator();
while (iterator.hasNext()) {
SiteBusinessQuery siteBusinessQuery = new SiteBusinessQuery();
SiteBusinessEntity item = iterator.next();
siteBusinessQuery.siteId(item.getSiteId());
siteBusinessQuery.setParentId(item.getBusinessId());
......@@ -60,6 +105,8 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
if (ObjectUtils.isEmpty(childs)) {
//子节点已经全部选中，删除父节点
iterator.remove();
pageInfo.setTotalResult(pageInfo.getTotalResult() - 1);
} else {
childs.stream().forEach(item1 -> {
buildChildBusiness(item1);
......@@ -71,6 +118,7 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
}
} else {
list.stream().peek(item -> {
SiteBusinessQuery siteBusinessQuery = new SiteBusinessQuery();
List<SiteBusinessEntity> childs = this.find(siteBusinessQuery.siteId(item.getSiteId()).parentId(item.getBusinessId()));
childs.stream().forEach(item1 -> {
buildChildBusiness(item1);
......
base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteMatterController.java
View file @ a9d6544d
package com.mortals.xhx.module.site.web;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.site.model.SiteMatterEntity;
import com.mortals.xhx.module.site.service.SiteMatterService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.Map;
/**
* 站点事项
*
......@@ -27,4 +33,19 @@ public class SiteMatterController extends BaseCRUDJsonBodyMappingController<Site
super.setModuleDesc("站点事项");
}
/**
* @param query
* @param model
* @param context
* @throws AppException
*/
@Override
protected void doListBefore(SiteMatterEntity query, Map<String, Object> model, Context context) throws AppException {
super.doListBefore(query, model, context);
if(ObjectUtils.isEmpty(query.getEventTypeShowNotList())){
ArrayList<String> notList = new ArrayList<>();
notList.add("行政处罚");
query.setEventTypeShowNotList(notList);
}
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowEntity.java
View file @ a9d6544d
......@@ -12,7 +12,7 @@ import com.mortals.xhx.module.window.model.vo.WindowVo;
* 站点部门窗口实体对象
*
* @author zxfei
* @date 2022-01-12
* @date 2023-02-21
*/
public class WindowEntity extends WindowVo {
......@@ -58,6 +58,18 @@ public class WindowEntity extends WindowVo {
* 红旗窗口 (1.是，0.否)
*/
private Integer hongqi;
/**
* 无人值守(1.是，)
*/
private Integer duty;
/**
* 显示内容
*/
private String dutyContent;
/**
* 显示英文
*/
private String dutyEnglish;
/**
* 备注
*/
......@@ -255,6 +267,60 @@ public class WindowEntity extends WindowVo {
this.hongqi = hongqi;
}
/**
* 获取 无人值守(1.是，)
*
* @return Integer
*/
public Integer getDuty() {
return duty;
}
/**
* 设置 无人值守(1.是，)
*
* @param duty
*/
public void setDuty(Integer duty) {
this.duty = duty;
}
/**
* 获取 显示内容
*
* @return String
*/
public String getDutyContent() {
return dutyContent;
}
/**
* 设置 显示内容
*
* @param dutyContent
*/
public void setDutyContent(String dutyContent) {
this.dutyContent = dutyContent;
}
/**
* 获取 显示英文
*
* @return String
*/
public String getDutyEnglish() {
return dutyEnglish;
}
/**
* 设置 显示英文
*
* @param dutyEnglish
*/
public void setDutyEnglish(String dutyEnglish) {
this.dutyEnglish = dutyEnglish;
}
/**
* 获取 备注
*
......@@ -339,6 +405,9 @@ public class WindowEntity extends WindowVo {
sb.append(",englishRegion:").append(getEnglishRegion());
sb.append(",fromnum:").append(getFromnum());
sb.append(",hongqi:").append(getHongqi());
sb.append(",duty:").append(getDuty());
sb.append(",dutyContent:").append(getDutyContent());
sb.append(",dutyEnglish:").append(getDutyEnglish());
sb.append(",summary:").append(getSummary());
sb.append(",building:").append(getBuilding());
sb.append(",level:").append(getLevel());
......@@ -351,7 +420,7 @@ public class WindowEntity extends WindowVo {
this.siteName = "";
this.deptId = 0L;
this.deptId = null;
this.deptName = "";
......@@ -367,6 +436,12 @@ public class WindowEntity extends WindowVo {
this.hongqi = 1;
this.duty = 0;
this.dutyContent = "";
this.dutyEnglish = "";
this.summary = "";
this.building = 1;
......
base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowQuery.java
View file @ a9d6544d
......@@ -3,11 +3,11 @@ package com.mortals.xhx.module.window.model;
import java.util.List;
import com.mortals.xhx.module.window.model.WindowEntity;
/**
* 站点部门窗口查询对象
*
* @author zxfei
* @date 2022-01-12
*/
* 站点部门窗口查询对象
*
* @author zxfei
* @date 2023-02-21
*/
public class WindowQuery extends WindowEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -21,6 +21,9 @@ public class WindowQuery extends WindowEntity {
/** 序号，主键，自增长列表 */
private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 站点ID */
private Long siteIdStart;
......@@ -33,9 +36,14 @@ public class WindowQuery extends WindowEntity {
/** 站点ID列表 */
private List <Long> siteIdList;
/** 站点ID排除列表 */
private List <Long> siteIdNotList;
/** 站点名称 */
private List<String> siteNameList;
/** 站点名称排除列表 */
private List <String> siteNameNotList;
/** 开始 部门ID */
private Long deptIdStart;
......@@ -48,24 +56,39 @@ public class WindowQuery extends WindowEntity {
/** 部门ID列表 */
private List <Long> deptIdList;
/** 部门ID排除列表 */
private List <Long> deptIdNotList;
/** 部门名称 */
private List<String> deptNameList;
/** 部门名称排除列表 */
private List <String> deptNameNotList;
/** 窗口名称 */
private List<String> nameList;
/** 窗口名称排除列表 */
private List <String> nameNotList;
/** 英语窗口名 */
private List<String> englishNameList;
/** 英语窗口名排除列表 */
private List <String> englishNameNotList;
/** 区域 */
private List<String> regionList;
/** 区域排除列表 */
private List <String> regionNotList;
/** 英语区域 */
private List<String> englishRegionList;
/** 英语区域排除列表 */
private List <String> englishRegionNotList;
/** 窗口编号 */
private List<String> fromnumList;
/** 窗口编号排除列表 */
private List <String> fromnumNotList;
/** 开始 红旗窗口 (1.是，0.否) */
private Integer hongqiStart;
......@@ -78,9 +101,39 @@ public class WindowQuery extends WindowEntity {
/** 红旗窗口 (1.是，0.否)列表 */
private List <Integer> hongqiList;
/** 红旗窗口 (1.是，0.否)排除列表 */
private List <Integer> hongqiNotList;
/** 开始 无人值守(1.是，) */
private Integer dutyStart;
/** 结束 无人值守(1.是，) */
private Integer dutyEnd;
/** 增加 无人值守(1.是，) */
private Integer dutyIncrement;
/** 无人值守(1.是，)列表 */
private List <Integer> dutyList;
/** 无人值守(1.是，)排除列表 */
private List <Integer> dutyNotList;
/** 显示内容 */
private List<String> dutyContentList;
/** 显示内容排除列表 */
private List <String> dutyContentNotList;
/** 显示英文 */
private List<String> dutyEnglishList;
/** 显示英文排除列表 */
private List <String> dutyEnglishNotList;
/** 备注 */
private List<String> summaryList;
/** 备注排除列表 */
private List <String> summaryNotList;
/** 开始 楼栋 */
private Integer buildingStart;
......@@ -93,6 +146,9 @@ public class WindowQuery extends WindowEntity {
/** 楼栋列表 */
private List <Integer> buildingList;
/** 楼栋排除列表 */
private List <Integer> buildingNotList;
/** 开始 楼层 */
private Integer levelStart;
......@@ -105,6 +161,9 @@ public class WindowQuery extends WindowEntity {
/** 楼层列表 */
private List <Integer> levelList;
/** 楼层排除列表 */
private List <Integer> levelNotList;
/** 开始 创建时间 */
private String createTimeStart;
......@@ -123,6 +182,9 @@ public class WindowQuery extends WindowEntity {
/** 创建用户列表 */
private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 修改时间 */
private String updateTimeStart;
......@@ -201,6 +263,23 @@ public class WindowQuery extends WindowEntity {
this.idList = idList;
}
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/**
* 获取 开始 站点ID
* @return siteIdStart
......@@ -265,6 +344,23 @@ public class WindowQuery extends WindowEntity {
this.siteIdList = siteIdList;
}
/**
* 获取 站点ID
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点ID
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 获取 站点名称
* @return siteNameList
......@@ -280,6 +376,23 @@ public class WindowQuery extends WindowEntity {
public void setSiteNameList(List<String> siteNameList){
this.siteNameList = siteNameList;
}
/**
* 获取 站点名称
* @return siteNameNotList
*/
public List<String> getSiteNameNotList(){
return this.siteNameNotList;
}
/**
* 设置 站点名称
* @param siteNameNotList
*/
public void setSiteNameNotList(List<String> siteNameNotList){
this.siteNameNotList = siteNameNotList;
}
/**
* 获取 开始 部门ID
* @return deptIdStart
......@@ -344,6 +457,23 @@ public class WindowQuery extends WindowEntity {
this.deptIdList = deptIdList;
}
/**
* 获取 部门ID
* @return deptIdNotList
*/
public List<Long> getDeptIdNotList(){
return this.deptIdNotList;
}
/**
* 设置 部门ID
* @param deptIdNotList
*/
public void setDeptIdNotList(List<Long> deptIdNotList){
this.deptIdNotList = deptIdNotList;
}
/**
* 获取 部门名称
* @return deptNameList
......@@ -359,6 +489,23 @@ public class WindowQuery extends WindowEntity {
public void setDeptNameList(List<String> deptNameList){
this.deptNameList = deptNameList;
}
/**
* 获取 部门名称
* @return deptNameNotList
*/
public List<String> getDeptNameNotList(){
return this.deptNameNotList;
}
/**
* 设置 部门名称
* @param deptNameNotList
*/
public void setDeptNameNotList(List<String> deptNameNotList){
this.deptNameNotList = deptNameNotList;
}
/**
* 获取 窗口名称
* @return nameList
......@@ -374,6 +521,23 @@ public class WindowQuery extends WindowEntity {
public void setNameList(List<String> nameList){
this.nameList = nameList;
}
/**
* 获取 窗口名称
* @return nameNotList
*/
public List<String> getNameNotList(){
return this.nameNotList;
}
/**
* 设置 窗口名称
* @param nameNotList
*/
public void setNameNotList(List<String> nameNotList){
this.nameNotList = nameNotList;
}
/**
* 获取 英语窗口名
* @return englishNameList
......@@ -389,6 +553,23 @@ public class WindowQuery extends WindowEntity {
public void setEnglishNameList(List<String> englishNameList){
this.englishNameList = englishNameList;
}
/**
* 获取 英语窗口名
* @return englishNameNotList
*/
public List<String> getEnglishNameNotList(){
return this.englishNameNotList;
}
/**
* 设置 英语窗口名
* @param englishNameNotList
*/
public void setEnglishNameNotList(List<String> englishNameNotList){
this.englishNameNotList = englishNameNotList;
}
/**
* 获取 区域
* @return regionList
......@@ -404,6 +585,23 @@ public class WindowQuery extends WindowEntity {
public void setRegionList(List<String> regionList){
this.regionList = regionList;
}
/**
* 获取 区域
* @return regionNotList
*/
public List<String> getRegionNotList(){
return this.regionNotList;
}
/**
* 设置 区域
* @param regionNotList
*/
public void setRegionNotList(List<String> regionNotList){
this.regionNotList = regionNotList;
}
/**
* 获取 英语区域
* @return englishRegionList
......@@ -419,6 +617,23 @@ public class WindowQuery extends WindowEntity {
public void setEnglishRegionList(List<String> englishRegionList){
this.englishRegionList = englishRegionList;
}
/**
* 获取 英语区域
* @return englishRegionNotList
*/
public List<String> getEnglishRegionNotList(){
return this.englishRegionNotList;
}
/**
* 设置 英语区域
* @param englishRegionNotList
*/
public void setEnglishRegionNotList(List<String> englishRegionNotList){
this.englishRegionNotList = englishRegionNotList;
}
/**
* 获取 窗口编号
* @return fromnumList
......@@ -434,6 +649,23 @@ public class WindowQuery extends WindowEntity {
public void setFromnumList(List<String> fromnumList){
this.fromnumList = fromnumList;
}
/**
* 获取 窗口编号
* @return fromnumNotList
*/
public List<String> getFromnumNotList(){
return this.fromnumNotList;
}
/**
* 设置 窗口编号
* @param fromnumNotList
*/
public void setFromnumNotList(List<String> fromnumNotList){
this.fromnumNotList = fromnumNotList;
}
/**
* 获取 开始 红旗窗口 (1.是，0.否)
* @return hongqiStart
......@@ -498,6 +730,168 @@ public class WindowQuery extends WindowEntity {
this.hongqiList = hongqiList;
}
/**
* 获取 红旗窗口 (1.是，0.否)
* @return hongqiNotList
*/
public List<Integer> getHongqiNotList(){
return this.hongqiNotList;
}
/**
* 设置 红旗窗口 (1.是，0.否)
* @param hongqiNotList
*/
public void setHongqiNotList(List<Integer> hongqiNotList){
this.hongqiNotList = hongqiNotList;
}
/**
* 获取 开始 无人值守(1.是，)
* @return dutyStart
*/
public Integer getDutyStart(){
return this.dutyStart;
}
/**
* 设置 开始 无人值守(1.是，)
* @param dutyStart
*/
public void setDutyStart(Integer dutyStart){
this.dutyStart = dutyStart;
}
/**
* 获取 结束 无人值守(1.是，)
* @return $dutyEnd
*/
public Integer getDutyEnd(){
return this.dutyEnd;
}
/**
* 设置 结束 无人值守(1.是，)
* @param dutyEnd
*/
public void setDutyEnd(Integer dutyEnd){
this.dutyEnd = dutyEnd;
}
/**
* 获取 增加 无人值守(1.是，)
* @return dutyIncrement
*/
public Integer getDutyIncrement(){
return this.dutyIncrement;
}
/**
* 设置 增加 无人值守(1.是，)
* @param dutyIncrement
*/
public void setDutyIncrement(Integer dutyIncrement){
this.dutyIncrement = dutyIncrement;
}
/**
* 获取 无人值守(1.是，)
* @return dutyList
*/
public List<Integer> getDutyList(){
return this.dutyList;
}
/**
* 设置 无人值守(1.是，)
* @param dutyList
*/
public void setDutyList(List<Integer> dutyList){
this.dutyList = dutyList;
}
/**
* 获取 无人值守(1.是，)
* @return dutyNotList
*/
public List<Integer> getDutyNotList(){
return this.dutyNotList;
}
/**
* 设置 无人值守(1.是，)
* @param dutyNotList
*/
public void setDutyNotList(List<Integer> dutyNotList){
this.dutyNotList = dutyNotList;
}
/**
* 获取 显示内容
* @return dutyContentList
*/
public List<String> getDutyContentList(){
return this.dutyContentList;
}
/**
* 设置 显示内容
* @param dutyContentList
*/
public void setDutyContentList(List<String> dutyContentList){
this.dutyContentList = dutyContentList;
}
/**
* 获取 显示内容
* @return dutyContentNotList
*/
public List<String> getDutyContentNotList(){
return this.dutyContentNotList;
}
/**
* 设置 显示内容
* @param dutyContentNotList
*/
public void setDutyContentNotList(List<String> dutyContentNotList){
this.dutyContentNotList = dutyContentNotList;
}
/**
* 获取 显示英文
* @return dutyEnglishList
*/
public List<String> getDutyEnglishList(){
return this.dutyEnglishList;
}
/**
* 设置 显示英文
* @param dutyEnglishList
*/
public void setDutyEnglishList(List<String> dutyEnglishList){
this.dutyEnglishList = dutyEnglishList;
}
/**
* 获取 显示英文
* @return dutyEnglishNotList
*/
public List<String> getDutyEnglishNotList(){
return this.dutyEnglishNotList;
}
/**
* 设置 显示英文
* @param dutyEnglishNotList
*/
public void setDutyEnglishNotList(List<String> dutyEnglishNotList){
this.dutyEnglishNotList = dutyEnglishNotList;
}
/**
* 获取 备注
* @return summaryList
......@@ -513,6 +907,23 @@ public class WindowQuery extends WindowEntity {
public void setSummaryList(List<String> summaryList){
this.summaryList = summaryList;
}
/**
* 获取 备注
* @return summaryNotList
*/
public List<String> getSummaryNotList(){
return this.summaryNotList;
}
/**
* 设置 备注
* @param summaryNotList
*/
public void setSummaryNotList(List<String> summaryNotList){
this.summaryNotList = summaryNotList;
}
/**
* 获取 开始 楼栋
* @return buildingStart
......@@ -577,6 +988,23 @@ public class WindowQuery extends WindowEntity {
this.buildingList = buildingList;
}
/**
* 获取 楼栋
* @return buildingNotList
*/
public List<Integer> getBuildingNotList(){
return this.buildingNotList;
}
/**
* 设置 楼栋
* @param buildingNotList
*/
public void setBuildingNotList(List<Integer> buildingNotList){
this.buildingNotList = buildingNotList;
}
/**
* 获取 开始 楼层
* @return levelStart
......@@ -641,6 +1069,23 @@ public class WindowQuery extends WindowEntity {
this.levelList = levelList;
}
/**
* 获取 楼层
* @return levelNotList
*/
public List<Integer> getLevelNotList(){
return this.levelNotList;
}
/**
* 设置 楼层
* @param levelNotList
*/
public void setLevelNotList(List<Integer> levelNotList){
this.levelNotList = levelNotList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
......@@ -737,6 +1182,23 @@ public class WindowQuery extends WindowEntity {
this.createUserIdList = createUserIdList;
}
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/**
* 获取 开始 修改时间
* @return updateTimeStart
......@@ -814,6 +1276,15 @@ public class WindowQuery extends WindowEntity {
return this;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public WindowQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 站点ID
* @param siteId
......@@ -859,6 +1330,15 @@ public class WindowQuery extends WindowEntity {
return this;
}
/**
* 设置 站点ID
* @param siteIdNotList
*/
public WindowQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 设置 站点名称
......@@ -923,6 +1403,15 @@ public class WindowQuery extends WindowEntity {
return this;
}
/**
* 设置 部门ID
* @param deptIdNotList
*/
public WindowQuery deptIdNotList(List<Long> deptIdNotList){
this.deptIdNotList = deptIdNotList;
return this;
}
/**
* 设置 部门名称
......@@ -1082,6 +1571,107 @@ public class WindowQuery extends WindowEntity {
return this;
}
/**
* 设置 红旗窗口 (1.是，0.否)
* @param hongqiNotList
*/
public WindowQuery hongqiNotList(List<Integer> hongqiNotList){
this.hongqiNotList = hongqiNotList;
return this;
}
/**
* 设置 无人值守(1.是，)
* @param duty
*/
public WindowQuery duty(Integer duty){
setDuty(duty);
return this;
}
/**
* 设置 开始 无人值守(1.是，)
* @param dutyStart
*/
public WindowQuery dutyStart(Integer dutyStart){
this.dutyStart = dutyStart;
return this;
}
/**
* 设置 结束 无人值守(1.是，)
* @param dutyEnd
*/
public WindowQuery dutyEnd(Integer dutyEnd){
this.dutyEnd = dutyEnd;
return this;
}
/**
* 设置 增加 无人值守(1.是，)
* @param dutyIncrement
*/
public WindowQuery dutyIncrement(Integer dutyIncrement){
this.dutyIncrement = dutyIncrement;
return this;
}
/**
* 设置 无人值守(1.是，)
* @param dutyList
*/
public WindowQuery dutyList(List<Integer> dutyList){
this.dutyList = dutyList;
return this;
}
/**
* 设置 无人值守(1.是，)
* @param dutyNotList
*/
public WindowQuery dutyNotList(List<Integer> dutyNotList){
this.dutyNotList = dutyNotList;
return this;
}
/**
* 设置 显示内容
* @param dutyContent
*/
public WindowQuery dutyContent(String dutyContent){
setDutyContent(dutyContent);
return this;
}
/**
* 设置 显示内容
* @param dutyContentList
*/
public WindowQuery dutyContentList(List<String> dutyContentList){
this.dutyContentList = dutyContentList;
return this;
}
/**
* 设置 显示英文
* @param dutyEnglish
*/
public WindowQuery dutyEnglish(String dutyEnglish){
setDutyEnglish(dutyEnglish);
return this;
}
/**
* 设置 显示英文
* @param dutyEnglishList
*/
public WindowQuery dutyEnglishList(List<String> dutyEnglishList){
this.dutyEnglishList = dutyEnglishList;
return this;
}
/**
* 设置 备注
......@@ -1146,6 +1736,15 @@ public class WindowQuery extends WindowEntity {
return this;
}
/**
* 设置 楼栋
* @param buildingNotList
*/
public WindowQuery buildingNotList(List<Integer> buildingNotList){
this.buildingNotList = buildingNotList;
return this;
}
/**
* 设置 楼层
* @param level
......@@ -1191,6 +1790,15 @@ public class WindowQuery extends WindowEntity {
return this;
}
/**
* 设置 楼层
* @param levelNotList
*/
public WindowQuery levelNotList(List<Integer> levelNotList){
this.levelNotList = levelNotList;
return this;
}
/**
* 设置 创建用户
......@@ -1237,6 +1845,15 @@ public class WindowQuery extends WindowEntity {
return this;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public WindowQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
......
base-manager/src/main/resources/sqlmap/module/matter/MatterMapper.xml
View file @ a9d6544d
......@@ -1361,6 +1361,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList')">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
......@@ -1382,6 +1388,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList')">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
......@@ -1404,6 +1416,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('tidNotList')">
${_conditionType_} a.tid not in
<foreach collection="conditionParamRef.tidNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('tcode')">
<if test="conditionParamRef.tcode != null and conditionParamRef.tcode != ''">
......@@ -1419,6 +1437,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('tcodeNotList')">
${_conditionType_} a.tcode not in
<foreach collection="conditionParamRef.tcodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('tname')">
<if test="conditionParamRef.tname != null and conditionParamRef.tname != ''">
......@@ -1434,6 +1458,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('tnameNotList')">
${_conditionType_} a.tname not in
<foreach collection="conditionParamRef.tnameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterName')">
<if test="conditionParamRef.matterName != null and conditionParamRef.matterName != ''">
......@@ -1449,6 +1479,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterNameNotList')">
${_conditionType_} a.matterName not in
<foreach collection="conditionParamRef.matterNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('englishName')">
<if test="conditionParamRef.englishName != null and conditionParamRef.englishName != ''">
......@@ -1464,6 +1500,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('englishNameNotList')">
${_conditionType_} a.englishName not in
<foreach collection="conditionParamRef.englishNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterNo')">
<if test="conditionParamRef.matterNo != null and conditionParamRef.matterNo != ''">
......@@ -1479,6 +1521,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterNoNotList')">
${_conditionType_} a.matterNo not in
<foreach collection="conditionParamRef.matterNoNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('areaCode')">
<if test="conditionParamRef.areaCode != null and conditionParamRef.areaCode != ''">
......@@ -1494,6 +1542,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('areaCodeNotList')">
${_conditionType_} a.areaCode not in
<foreach collection="conditionParamRef.areaCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptCode')">
<if test="conditionParamRef.deptCode != null and conditionParamRef.deptCode != ''">
......@@ -1509,6 +1563,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptCodeNotList')">
${_conditionType_} a.deptCode not in
<foreach collection="conditionParamRef.deptCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptName')">
<if test="conditionParamRef.deptName != null and conditionParamRef.deptName != ''">
......@@ -1524,6 +1584,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptNameNotList')">
${_conditionType_} a.deptName not in
<foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('powerCode')">
<if test="conditionParamRef.powerCode != null and conditionParamRef.powerCode != ''">
......@@ -1539,6 +1605,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('powerCodeNotList')">
${_conditionType_} a.powerCode not in
<foreach collection="conditionParamRef.powerCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('themeCode')">
<if test="conditionParamRef.themeCode != null and conditionParamRef.themeCode != ''">
......@@ -1554,6 +1626,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('themeCodeNotList')">
${_conditionType_} a.themeCode not in
<foreach collection="conditionParamRef.themeCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('usertypeCode')">
<if test="conditionParamRef.usertypeCode != null and conditionParamRef.usertypeCode != ''">
......@@ -1569,6 +1647,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('usertypeCodeNotList')">
${_conditionType_} a.usertypeCode not in
<foreach collection="conditionParamRef.usertypeCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('groupName')">
<if test="conditionParamRef.groupName != null and conditionParamRef.groupName != ''">
......@@ -1584,6 +1668,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('groupNameNotList')">
${_conditionType_} a.groupName not in
<foreach collection="conditionParamRef.groupNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('url')">
<if test="conditionParamRef.url != null and conditionParamRef.url != ''">
......@@ -1599,6 +1689,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('urlNotList')">
${_conditionType_} a.url not in
<foreach collection="conditionParamRef.urlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('haveGetMatterInfo')">
<if test="conditionParamRef.haveGetMatterInfo != null and conditionParamRef.haveGetMatterInfo != ''">
......@@ -1614,6 +1710,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('haveGetMatterInfoNotList')">
${_conditionType_} a.haveGetMatterInfo not in
<foreach collection="conditionParamRef.haveGetMatterInfoNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('belongDept')">
<if test="conditionParamRef.belongDept != null and conditionParamRef.belongDept != ''">
......@@ -1629,6 +1731,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('belongDeptNotList')">
${_conditionType_} a.belongDept not in
<foreach collection="conditionParamRef.belongDeptNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appoveObjectShow')">
<if test="conditionParamRef.appoveObjectShow != null and conditionParamRef.appoveObjectShow != ''">
......@@ -1644,6 +1752,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appoveObjectShowNotList')">
${_conditionType_} a.appoveObjectShow not in
<foreach collection="conditionParamRef.appoveObjectShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('operatScopeShow')">
<if test="conditionParamRef.operatScopeShow != null and conditionParamRef.operatScopeShow != ''">
......@@ -1659,6 +1773,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('operatScopeShowNotList')">
${_conditionType_} a.operatScopeShow not in
<foreach collection="conditionParamRef.operatScopeShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appoveTimeLimitShow')">
<if test="conditionParamRef.appoveTimeLimitShow != null and conditionParamRef.appoveTimeLimitShow != ''">
......@@ -1674,6 +1794,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appoveTimeLimitShowNotList')">
${_conditionType_} a.appoveTimeLimitShow not in
<foreach collection="conditionParamRef.appoveTimeLimitShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('handleType')">
<if test="conditionParamRef.handleType != null and conditionParamRef.handleType != ''">
......@@ -1689,6 +1815,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('handleTypeNotList')">
${_conditionType_} a.handleType not in
<foreach collection="conditionParamRef.handleTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('legalTimeLimitShow')">
<if test="conditionParamRef.legalTimeLimitShow != null and conditionParamRef.legalTimeLimitShow != ''">
......@@ -1704,6 +1836,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('legalTimeLimitShowNotList')">
${_conditionType_} a.legalTimeLimitShow not in
<foreach collection="conditionParamRef.legalTimeLimitShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('legalEndExplain')">
<if test="conditionParamRef.legalEndExplain != null and conditionParamRef.legalEndExplain != ''">
......@@ -1719,6 +1857,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('legalEndExplainNotList')">
${_conditionType_} a.legalEndExplain not in
<foreach collection="conditionParamRef.legalEndExplainNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('promiseTimeLimitShow')">
<if test="conditionParamRef.promiseTimeLimitShow != null and conditionParamRef.promiseTimeLimitShow != ''">
......@@ -1734,6 +1878,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('promiseTimeLimitShowNotList')">
${_conditionType_} a.promiseTimeLimitShow not in
<foreach collection="conditionParamRef.promiseTimeLimitShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('promiseEndExplain')">
<if test="conditionParamRef.promiseEndExplain != null and conditionParamRef.promiseEndExplain != ''">
......@@ -1749,6 +1899,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('promiseEndExplainNotList')">
${_conditionType_} a.promiseEndExplain not in
<foreach collection="conditionParamRef.promiseEndExplainNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isChargesShow')">
<if test="conditionParamRef.isChargesShow != null and conditionParamRef.isChargesShow != ''">
......@@ -1764,6 +1920,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isChargesShowNotList')">
${_conditionType_} a.isChargesShow not in
<foreach collection="conditionParamRef.isChargesShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificationLevelsShow')">
<if test="conditionParamRef.certificationLevelsShow != null and conditionParamRef.certificationLevelsShow != ''">
......@@ -1779,6 +1941,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificationLevelsShowNotList')">
${_conditionType_} a.certificationLevelsShow not in
<foreach collection="conditionParamRef.certificationLevelsShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('planTakeTime')">
<if test="conditionParamRef.planTakeTime != null ">
......@@ -1824,6 +1992,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('specialProcedureNotList')">
${_conditionType_} a.specialProcedure not in
<foreach collection="conditionParamRef.specialProcedureNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('windowToTheSceneNum')">
<if test="conditionParamRef.windowToTheSceneNum != null ">
${_conditionType_} a.windowToTheSceneNum = #{${_conditionParam_}.windowToTheSceneNum}
......@@ -1838,6 +2012,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('windowToTheSceneNumNotList')">
${_conditionType_} a.windowToTheSceneNum not in
<foreach collection="conditionParamRef.windowToTheSceneNumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('windowToTheSceneNumStart') and conditionParamRef.windowToTheSceneNumStart != null">
${_conditionType_} a.windowToTheSceneNum <![CDATA[ >= ]]> #{${_conditionParam_}.windowToTheSceneNumStart}
</if>
......@@ -1860,6 +2040,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isOnlineSubscribeShowNotList')">
${_conditionType_} a.isOnlineSubscribeShow not in
<foreach collection="conditionParamRef.isOnlineSubscribeShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isExpressTakeShow')">
<if test="conditionParamRef.isExpressTakeShow != null and conditionParamRef.isExpressTakeShow != ''">
......@@ -1875,6 +2061,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isExpressTakeShowNotList')">
${_conditionType_} a.isExpressTakeShow not in
<foreach collection="conditionParamRef.isExpressTakeShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isProvinceAcquisitionShow')">
<if test="conditionParamRef.isProvinceAcquisitionShow != null and conditionParamRef.isProvinceAcquisitionShow != ''">
......@@ -1890,6 +2082,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isProvinceAcquisitionShowNotList')">
${_conditionType_} a.isProvinceAcquisitionShow not in
<foreach collection="conditionParamRef.isProvinceAcquisitionShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isApplyProvinceShow')">
<if test="conditionParamRef.isApplyProvinceShow != null and conditionParamRef.isApplyProvinceShow != ''">
......@@ -1905,6 +2103,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isApplyProvinceShowNotList')">
${_conditionType_} a.isApplyProvinceShow not in
<foreach collection="conditionParamRef.isApplyProvinceShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('mustSceneExplain')">
<if test="conditionParamRef.mustSceneExplain != null and conditionParamRef.mustSceneExplain != ''">
......@@ -1920,6 +2124,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('mustSceneExplainNotList')">
${_conditionType_} a.mustSceneExplain not in
<foreach collection="conditionParamRef.mustSceneExplainNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('onlineType')">
<if test="conditionParamRef.onlineType != null and conditionParamRef.onlineType != ''">
......@@ -1935,6 +2145,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('onlineTypeNotList')">
${_conditionType_} a.onlineType not in
<foreach collection="conditionParamRef.onlineTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('onlineToTheSceneNum')">
<if test="conditionParamRef.onlineToTheSceneNum != null ">
${_conditionType_} a.onlineToTheSceneNum = #{${_conditionParam_}.onlineToTheSceneNum}
......@@ -1949,6 +2165,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('onlineToTheSceneNumNotList')">
${_conditionType_} a.onlineToTheSceneNum not in
<foreach collection="conditionParamRef.onlineToTheSceneNumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('onlineToTheSceneNumStart') and conditionParamRef.onlineToTheSceneNumStart != null">
${_conditionType_} a.onlineToTheSceneNum <![CDATA[ >= ]]> #{${_conditionParam_}.onlineToTheSceneNumStart}
</if>
......@@ -1971,6 +2193,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('onlineOperatDeepNotList')">
${_conditionType_} a.onlineOperatDeep not in
<foreach collection="conditionParamRef.onlineOperatDeepNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isExpressTakeOnlineShow')">
<if test="conditionParamRef.isExpressTakeOnlineShow != null and conditionParamRef.isExpressTakeOnlineShow != ''">
......@@ -1986,6 +2214,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isExpressTakeOnlineShowNotList')">
${_conditionType_} a.isExpressTakeOnlineShow not in
<foreach collection="conditionParamRef.isExpressTakeOnlineShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isDoorTakeShow')">
<if test="conditionParamRef.isDoorTakeShow != null and conditionParamRef.isDoorTakeShow != ''">
......@@ -2001,6 +2235,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isDoorTakeShowNotList')">
${_conditionType_} a.isDoorTakeShow not in
<foreach collection="conditionParamRef.isDoorTakeShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('onlineMustSceneExplain')">
<if test="conditionParamRef.onlineMustSceneExplain != null and conditionParamRef.onlineMustSceneExplain != ''">
......@@ -2016,6 +2256,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('onlineMustSceneExplainNotList')">
${_conditionType_} a.onlineMustSceneExplain not in
<foreach collection="conditionParamRef.onlineMustSceneExplainNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('performDeptType')">
<if test="conditionParamRef.performDeptType != null and conditionParamRef.performDeptType != ''">
......@@ -2031,6 +2277,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('performDeptTypeNotList')">
${_conditionType_} a.performDeptType not in
<foreach collection="conditionParamRef.performDeptTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterEdition')">
<if test="conditionParamRef.matterEdition != null and conditionParamRef.matterEdition != ''">
......@@ -2046,6 +2298,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterEditionNotList')">
${_conditionType_} a.matterEdition not in
<foreach collection="conditionParamRef.matterEditionNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('eventTypeShow')">
<if test="conditionParamRef.eventTypeShow != null and conditionParamRef.eventTypeShow != ''">
......@@ -2061,6 +2319,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('eventTypeShowNotList')">
${_conditionType_} a.eventTypeShow not in
<foreach collection="conditionParamRef.eventTypeShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('performHierarchyShow')">
<if test="conditionParamRef.performHierarchyShow != null and conditionParamRef.performHierarchyShow != ''">
......@@ -2076,6 +2340,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('performHierarchyShowNotList')">
${_conditionType_} a.performHierarchyShow not in
<foreach collection="conditionParamRef.performHierarchyShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('powerSourceShow')">
<if test="conditionParamRef.powerSourceShow != null and conditionParamRef.powerSourceShow != ''">
......@@ -2091,6 +2361,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('powerSourceShowNotList')">
${_conditionType_} a.powerSourceShow not in
<foreach collection="conditionParamRef.powerSourceShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('performDeptTypeShow')">
<if test="conditionParamRef.performDeptTypeShow != null and conditionParamRef.performDeptTypeShow != ''">
......@@ -2106,6 +2382,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('performDeptTypeShowNotList')">
${_conditionType_} a.performDeptTypeShow not in
<foreach collection="conditionParamRef.performDeptTypeShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('goveServiceCenterShow')">
<if test="conditionParamRef.goveServiceCenterShow != null and conditionParamRef.goveServiceCenterShow != ''">
......@@ -2121,6 +2403,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('goveServiceCenterShowNotList')">
${_conditionType_} a.goveServiceCenterShow not in
<foreach collection="conditionParamRef.goveServiceCenterShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isConvenientCenterShow')">
<if test="conditionParamRef.isConvenientCenterShow != null and conditionParamRef.isConvenientCenterShow != ''">
......@@ -2136,6 +2424,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isConvenientCenterShowNotList')">
${_conditionType_} a.isConvenientCenterShow not in
<foreach collection="conditionParamRef.isConvenientCenterShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('terminalHandle')">
<if test="conditionParamRef.terminalHandle != null and conditionParamRef.terminalHandle != ''">
......@@ -2151,6 +2445,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('terminalHandleNotList')">
${_conditionType_} a.terminalHandle not in
<foreach collection="conditionParamRef.terminalHandleNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isOnline')">
<if test="conditionParamRef.isOnline != null and conditionParamRef.isOnline != ''">
......@@ -2166,6 +2466,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isOnlineNotList')">
${_conditionType_} a.isOnline not in
<foreach collection="conditionParamRef.isOnlineNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isOnlinePayShow')">
<if test="conditionParamRef.isOnlinePayShow != null and conditionParamRef.isOnlinePayShow != ''">
......@@ -2181,6 +2487,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isOnlinePayShowNotList')">
${_conditionType_} a.isOnlinePayShow not in
<foreach collection="conditionParamRef.isOnlinePayShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('entrustmentDepartmen')">
<if test="conditionParamRef.entrustmentDepartmen != null and conditionParamRef.entrustmentDepartmen != ''">
......@@ -2196,6 +2508,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('entrustmentDepartmenNotList')">
${_conditionType_} a.entrustmentDepartmen not in
<foreach collection="conditionParamRef.entrustmentDepartmenNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('jointInfoShow')">
<if test="conditionParamRef.jointInfoShow != null and conditionParamRef.jointInfoShow != ''">
......@@ -2211,6 +2529,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('jointInfoShowNotList')">
${_conditionType_} a.jointInfoShow not in
<foreach collection="conditionParamRef.jointInfoShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterStatus')">
<if test="conditionParamRef.matterStatus != null and conditionParamRef.matterStatus != ''">
......@@ -2226,6 +2550,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterStatusNotList')">
${_conditionType_} a.matterStatus not in
<foreach collection="conditionParamRef.matterStatusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('numberLimit')">
<if test="conditionParamRef.numberLimit != null ">
${_conditionType_} a.numberLimit = #{${_conditionParam_}.numberLimit}
......@@ -2240,6 +2570,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('numberLimitNotList')">
${_conditionType_} a.numberLimit not in
<foreach collection="conditionParamRef.numberLimitNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('numberLimitStart') and conditionParamRef.numberLimitStart != null">
${_conditionType_} a.numberLimit <![CDATA[ >= ]]> #{${_conditionParam_}.numberLimitStart}
</if>
......@@ -2262,6 +2598,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('typeNotList')">
${_conditionType_} a.type not in
<foreach collection="conditionParamRef.typeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('baseCode')">
<if test="conditionParamRef.baseCode != null and conditionParamRef.baseCode != ''">
......@@ -2277,6 +2619,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('baseCodeNotList')">
${_conditionType_} a.baseCode not in
<foreach collection="conditionParamRef.baseCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('implementCode')">
<if test="conditionParamRef.implementCode != null and conditionParamRef.implementCode != ''">
......@@ -2292,6 +2640,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('implementCodeNotList')">
${_conditionType_} a.implementCode not in
<foreach collection="conditionParamRef.implementCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('implementBodyCode')">
<if test="conditionParamRef.implementBodyCode != null and conditionParamRef.implementBodyCode != ''">
......@@ -2307,6 +2661,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('implementBodyCodeNotList')">
${_conditionType_} a.implementBodyCode not in
<foreach collection="conditionParamRef.implementBodyCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('operateItemCode')">
<if test="conditionParamRef.operateItemCode != null and conditionParamRef.operateItemCode != ''">
......@@ -2322,6 +2682,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('operateItemCodeNotList')">
${_conditionType_} a.operateItemCode not in
<foreach collection="conditionParamRef.operateItemCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('townshipName')">
<if test="conditionParamRef.townshipName != null and conditionParamRef.townshipName != ''">
......@@ -2337,6 +2703,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('townshipNameNotList')">
${_conditionType_} a.townshipName not in
<foreach collection="conditionParamRef.townshipNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('townshipCode')">
<if test="conditionParamRef.townshipCode != null and conditionParamRef.townshipCode != ''">
......@@ -2352,6 +2724,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('townshipCodeNotList')">
${_conditionType_} a.townshipCode not in
<foreach collection="conditionParamRef.townshipCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('villageName')">
<if test="conditionParamRef.villageName != null and conditionParamRef.villageName != ''">
......@@ -2367,6 +2745,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('villageNameNotList')">
${_conditionType_} a.villageName not in
<foreach collection="conditionParamRef.villageNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('villageCode')">
<if test="conditionParamRef.villageCode != null and conditionParamRef.villageCode != ''">
......@@ -2382,6 +2766,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('villageCodeNotList')">
${_conditionType_} a.villageCode not in
<foreach collection="conditionParamRef.villageCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('operateTime')">
<if test="conditionParamRef.operateTime != null and conditionParamRef.operateTime != ''">
......@@ -2397,6 +2787,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('operateTimeNotList')">
${_conditionType_} a.operateTime not in
<foreach collection="conditionParamRef.operateTimeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('operateSite')">
<if test="conditionParamRef.operateSite != null and conditionParamRef.operateSite != ''">
......@@ -2412,6 +2808,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('operateSiteNotList')">
${_conditionType_} a.operateSite not in
<foreach collection="conditionParamRef.operateSiteNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('cousultingShow')">
<if test="conditionParamRef.cousultingShow != null and conditionParamRef.cousultingShow != ''">
......@@ -2427,6 +2829,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('cousultingShowNotList')">
${_conditionType_} a.cousultingShow not in
<foreach collection="conditionParamRef.cousultingShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('cousultingTelephoneShow')">
<if test="conditionParamRef.cousultingTelephoneShow != null and conditionParamRef.cousultingTelephoneShow != ''">
......@@ -2442,6 +2850,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('cousultingTelephoneShowNotList')">
${_conditionType_} a.cousultingTelephoneShow not in
<foreach collection="conditionParamRef.cousultingTelephoneShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('superviseShow')">
<if test="conditionParamRef.superviseShow != null and conditionParamRef.superviseShow != ''">
......@@ -2457,6 +2871,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('superviseShowNotList')">
${_conditionType_} a.superviseShow not in
<foreach collection="conditionParamRef.superviseShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sort')">
<if test="conditionParamRef.sort != null ">
${_conditionType_} a.sort = #{${_conditionParam_}.sort}
......@@ -2471,6 +2891,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sortNotList')">
${_conditionType_} a.sort not in
<foreach collection="conditionParamRef.sortNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sortStart') and conditionParamRef.sortStart != null">
${_conditionType_} a.sort <![CDATA[ >= ]]> #{${_conditionParam_}.sortStart}
</if>
......@@ -2492,6 +2918,12 @@
#{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>
......@@ -2528,6 +2960,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdNotList')">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
......@@ -2565,6 +3003,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('evaluationUrlNotList')">
${_conditionType_} a.evaluationUrl not in
<foreach collection="conditionParamRef.evaluationUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('netApplyUrl')">
<if test="conditionParamRef.netApplyUrl != null and conditionParamRef.netApplyUrl != ''">
......@@ -2580,6 +3024,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('netApplyUrlNotList')">
${_conditionType_} a.netApplyUrl not in
<foreach collection="conditionParamRef.netApplyUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......
base-manager/src/main/resources/sqlmap/module/site/SiteBusinessMapper.xml
View file @ a9d6544d
......@@ -386,7 +386,7 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList')">
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
......
base-manager/src/main/resources/sqlmap/module/site/SiteMatterMapper.xml
View file @ a9d6544d
......@@ -13,6 +13,7 @@
<result property="matterCode" column="matterCode" />
<result property="deptId" column="deptId" />
<result property="deptName" column="deptName" />
<result property="eventTypeShow" column="eventTypeShow" />
<result property="source" column="source" />
<result property="deptCode" column="deptCode" />
<result property="createTime" column="createTime" />
......@@ -49,6 +50,9 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
a.deptName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('eventTypeShow') or colPickMode == 1 and data.containsKey('eventTypeShow')))">
a.eventTypeShow,
</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>
......@@ -69,18 +73,18 @@
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="SiteMatterEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_site_matter
(siteId,siteName,matterId,matterName,matterCode,deptId,deptName,source,deptCode,createTime,createUserId,updateTime)
(siteId,siteName,matterId,matterName,matterCode,deptId,deptName,eventTypeShow,source,deptCode,createTime,createUserId,updateTime)
VALUES
(#{siteId},#{siteName},#{matterId},#{matterName},#{matterCode},#{deptId},#{deptName},#{source},#{deptCode},#{createTime},#{createUserId},#{updateTime})
(#{siteId},#{siteName},#{matterId},#{matterName},#{matterCode},#{deptId},#{deptName},#{eventTypeShow},#{source},#{deptCode},#{createTime},#{createUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_site_matter
(siteId,siteName,matterId,matterName,matterCode,deptId,deptName,source,deptCode,createTime,createUserId,updateTime)
(siteId,siteName,matterId,matterName,matterCode,deptId,deptName,eventTypeShow,source,deptCode,createTime,createUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.siteName},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.deptId},#{item.deptName},#{item.source},#{item.deptCode},#{item.createTime},#{item.createUserId},#{item.updateTime})
(#{item.siteId},#{item.siteName},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.deptId},#{item.deptName},#{item.eventTypeShow},#{item.source},#{item.deptCode},#{item.createTime},#{item.createUserId},#{item.updateTime})
</foreach>
</insert>
......@@ -120,6 +124,9 @@
<if test="(colPickMode==0 and data.containsKey('deptName')) or (colPickMode==1 and !data.containsKey('deptName'))">
a.deptName=#{data.deptName},
</if>
<if test="(colPickMode==0 and data.containsKey('eventTypeShow')) or (colPickMode==1 and !data.containsKey('eventTypeShow'))">
a.eventTypeShow=#{data.eventTypeShow},
</if>
<if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))">
a.source=#{data.source},
</if>
......@@ -217,6 +224,13 @@
</if>
</foreach>
</trim>
<trim prefix="eventTypeShow=(case" suffix="ELSE eventTypeShow end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('eventTypeShow')) or (colPickMode==1 and !item.containsKey('eventTypeShow'))">
when a.id=#{item.id} then #{item.eventTypeShow}
</if>
</foreach>
</trim>
<trim prefix="source=(case" suffix="ELSE source end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -285,6 +299,21 @@
#{item}
</foreach>
</delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_sys_site_matter where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_sys_site_matter where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_sys_site_matter as a
......@@ -377,6 +406,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList')">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
......@@ -398,6 +433,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList')">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
......@@ -420,6 +461,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteNameNotList')">
${_conditionType_} a.siteName not in
<foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterId')">
<if test="conditionParamRef.matterId != null ">
${_conditionType_} a.matterId = #{${_conditionParam_}.matterId}
......@@ -434,6 +481,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterIdNotList')">
${_conditionType_} a.matterId not in
<foreach collection="conditionParamRef.matterIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterIdStart') and conditionParamRef.matterIdStart != null">
${_conditionType_} a.matterId <![CDATA[ >= ]]> #{${_conditionParam_}.matterIdStart}
</if>
......@@ -456,6 +509,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterNameNotList')">
${_conditionType_} a.matterName not in
<foreach collection="conditionParamRef.matterNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterCode')">
<if test="conditionParamRef.matterCode != null and conditionParamRef.matterCode != ''">
......@@ -471,6 +530,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterCodeNotList')">
${_conditionType_} a.matterCode not in
<foreach collection="conditionParamRef.matterCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptId')">
<if test="conditionParamRef.deptId != null ">
${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
......@@ -485,6 +550,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptIdNotList')">
${_conditionType_} a.deptId not in
<foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptIdStart') and conditionParamRef.deptIdStart != null">
${_conditionType_} a.deptId <![CDATA[ >= ]]> #{${_conditionParam_}.deptIdStart}
</if>
......@@ -507,6 +578,33 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptNameNotList')">
${_conditionType_} a.deptName not in
<foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('eventTypeShow')">
<if test="conditionParamRef.eventTypeShow != null and conditionParamRef.eventTypeShow != ''">
${_conditionType_} a.eventTypeShow like #{${_conditionParam_}.eventTypeShow}
</if>
<if test="conditionParamRef.eventTypeShow == null">
${_conditionType_} a.eventTypeShow is null
</if>
</if>
<if test="conditionParamRef.containsKey('eventTypeShowList')">
${_conditionType_} a.eventTypeShow in
<foreach collection="conditionParamRef.eventTypeShowList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('eventTypeShowNotList')">
${_conditionType_} a.eventTypeShow not in
<foreach collection="conditionParamRef.eventTypeShowNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('source')">
<if test="conditionParamRef.source != null ">
${_conditionType_} a.source = #{${_conditionParam_}.source}
......@@ -521,6 +619,12 @@
#{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>
......@@ -543,6 +647,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptCodeNotList')">
${_conditionType_} a.deptCode not in
<foreach collection="conditionParamRef.deptCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
......@@ -572,6 +682,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdNotList')">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
......@@ -647,6 +763,11 @@
<if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('eventTypeShow')">
a.eventTypeShow
<if test='orderCol.eventTypeShow != null and "DESC".equalsIgnoreCase(orderCol.eventTypeShow)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('source')">
a.source
<if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if>
......
base-manager/src/main/resources/sqlmap/module/window/WindowMapper.xml
View file @ a9d6544d
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.window.dao.ibatis.WindowDaoImpl">
<!-- 字段和属性映射 -->
......@@ -16,6 +16,9 @@
<result property="englishRegion" column="englishRegion" />
<result property="fromnum" column="fromnum" />
<result property="hongqi" column="hongqi" />
<result property="duty" column="duty" />
<result property="dutyContent" column="dutyContent" />
<result property="dutyEnglish" column="dutyEnglish" />
<result property="summary" column="summary" />
<result property="building" column="building" />
<result property="level" column="level" />
......@@ -30,73 +33,82 @@
<sql id="_columns">
<trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id as id,
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId as siteId,
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
a.siteName as siteName,
a.siteName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))">
a.deptId as deptId,
a.deptId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
a.deptName as deptName,
a.deptName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
a.name as name,
a.name,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('englishName') or colPickMode == 1 and data.containsKey('englishName')))">
a.englishName as englishName,
a.englishName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('region') or colPickMode == 1 and data.containsKey('region')))">
a.region as region,
a.region,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('englishRegion') or colPickMode == 1 and data.containsKey('englishRegion')))">
a.englishRegion as englishRegion,
a.englishRegion,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fromnum') or colPickMode == 1 and data.containsKey('fromnum')))">
a.fromnum as fromnum,
a.fromnum,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hongqi') or colPickMode == 1 and data.containsKey('hongqi')))">
a.hongqi as hongqi,
a.hongqi,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('duty') or colPickMode == 1 and data.containsKey('duty')))">
a.duty,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dutyContent') or colPickMode == 1 and data.containsKey('dutyContent')))">
a.dutyContent,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dutyEnglish') or colPickMode == 1 and data.containsKey('dutyEnglish')))">
a.dutyEnglish,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('summary') or colPickMode == 1 and data.containsKey('summary')))">
a.summary as summary,
a.summary,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('building') or colPickMode == 1 and data.containsKey('building')))">
a.building as building,
a.building,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('level') or colPickMode == 1 and data.containsKey('level')))">
a.level as level,
a.level,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime as createTime,
a.createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId as createUserId,
a.createUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime as updateTime,
a.updateTime,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="WindowEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_window
(siteId,siteName,deptId,deptName,name,englishName,region,englishRegion,fromnum,hongqi,summary,building,level,createTime,createUserId,updateTime)
(siteId,siteName,deptId,deptName,name,englishName,region,englishRegion,fromnum,hongqi,duty,dutyContent,dutyEnglish,summary,building,level,createTime,createUserId,updateTime)
VALUES
(#{siteId},#{siteName},#{deptId},#{deptName},#{name},#{englishName},#{region},#{englishRegion},#{fromnum},#{hongqi},#{summary},#{building},#{level},#{createTime},#{createUserId},#{updateTime})
(#{siteId},#{siteName},#{deptId},#{deptName},#{name},#{englishName},#{region},#{englishRegion},#{fromnum},#{hongqi},#{duty},#{dutyContent},#{dutyEnglish},#{summary},#{building},#{level},#{createTime},#{createUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_window
(siteId,siteName,deptId,deptName,name,englishName,region,englishRegion,fromnum,hongqi,summary,building,level,createTime,createUserId,updateTime)
(siteId,siteName,deptId,deptName,name,englishName,region,englishRegion,fromnum,hongqi,duty,dutyContent,dutyEnglish,summary,building,level,createTime,createUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.siteName},#{item.deptId},#{item.deptName},#{item.name},#{item.englishName},#{item.region},#{item.englishRegion},#{item.fromnum},#{item.hongqi},#{item.summary},#{item.building},#{item.level},#{item.createTime},#{item.createUserId},#{item.updateTime})
(#{item.siteId},#{item.siteName},#{item.deptId},#{item.deptName},#{item.name},#{item.englishName},#{item.region},#{item.englishRegion},#{item.fromnum},#{item.hongqi},#{item.duty},#{item.dutyContent},#{item.dutyEnglish},#{item.summary},#{item.building},#{item.level},#{item.createTime},#{item.createUserId},#{item.updateTime})
</foreach>
</insert>
......@@ -145,6 +157,18 @@
<if test="(colPickMode==0 and data.containsKey('hongqiIncrement')) or (colPickMode==1 and !data.containsKey('hongqiIncrement'))">
a.hongqi=ifnull(a.hongqi,0) + #{data.hongqiIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('duty')) or (colPickMode==1 and !data.containsKey('duty'))">
a.duty=#{data.duty},
</if>
<if test="(colPickMode==0 and data.containsKey('dutyIncrement')) or (colPickMode==1 and !data.containsKey('dutyIncrement'))">
a.duty=ifnull(a.duty,0) + #{data.dutyIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('dutyContent')) or (colPickMode==1 and !data.containsKey('dutyContent'))">
a.dutyContent=#{data.dutyContent},
</if>
<if test="(colPickMode==0 and data.containsKey('dutyEnglish')) or (colPickMode==1 and !data.containsKey('dutyEnglish'))">
a.dutyEnglish=#{data.dutyEnglish},
</if>
<if test="(colPickMode==0 and data.containsKey('summary')) or (colPickMode==1 and !data.containsKey('summary'))">
a.summary=#{data.summary},
</if>
......@@ -269,6 +293,32 @@
</choose>
</foreach>
</trim>
<trim prefix="duty=(case" suffix="ELSE duty end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('duty')) or (colPickMode==1 and !item.containsKey('duty'))">
when a.id=#{item.id} then #{item.duty}
</when>
<when test="(colPickMode==0 and item.containsKey('dutyIncrement')) or (colPickMode==1 and !item.containsKey('dutyIncrement'))">
when a.id=#{item.id} then ifnull(a.duty,0) + #{item.dutyIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="dutyContent=(case" suffix="ELSE dutyContent end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('dutyContent')) or (colPickMode==1 and !item.containsKey('dutyContent'))">
when a.id=#{item.id} then #{item.dutyContent}
</if>
</foreach>
</trim>
<trim prefix="dutyEnglish=(case" suffix="ELSE dutyEnglish end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('dutyEnglish')) or (colPickMode==1 and !item.containsKey('dutyEnglish'))">
when a.id=#{item.id} then #{item.dutyEnglish}
</if>
</foreach>
</trim>
<trim prefix="summary=(case" suffix="ELSE summary end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('summary')) or (colPickMode==1 and !item.containsKey('summary'))">
......@@ -349,6 +399,21 @@
#{item}
</foreach>
</delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_sys_window where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_sys_window where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_sys_window as a
......@@ -441,6 +506,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList')">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
......@@ -462,6 +533,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList')">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
......@@ -484,6 +561,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteNameNotList')">
${_conditionType_} a.siteName not in
<foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptId')">
<if test="conditionParamRef.deptId != null ">
${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
......@@ -498,6 +581,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptIdNotList')">
${_conditionType_} a.deptId not in
<foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptIdStart') and conditionParamRef.deptIdStart != null">
${_conditionType_} a.deptId <![CDATA[ >= ]]> #{${_conditionParam_}.deptIdStart}
</if>
......@@ -520,6 +609,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptNameNotList')">
${_conditionType_} a.deptName not in
<foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('name')">
<if test="conditionParamRef.name != null and conditionParamRef.name != ''">
......@@ -535,6 +630,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('nameNotList')">
${_conditionType_} a.name not in
<foreach collection="conditionParamRef.nameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('englishName')">
<if test="conditionParamRef.englishName != null and conditionParamRef.englishName != ''">
......@@ -550,6 +651,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('englishNameNotList')">
${_conditionType_} a.englishName not in
<foreach collection="conditionParamRef.englishNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('region')">
<if test="conditionParamRef.region != null and conditionParamRef.region != ''">
......@@ -565,6 +672,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('regionNotList')">
${_conditionType_} a.region not in
<foreach collection="conditionParamRef.regionNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('englishRegion')">
<if test="conditionParamRef.englishRegion != null and conditionParamRef.englishRegion != ''">
......@@ -580,6 +693,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('englishRegionNotList')">
${_conditionType_} a.englishRegion not in
<foreach collection="conditionParamRef.englishRegionNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fromnum')">
<if test="conditionParamRef.fromnum != null and conditionParamRef.fromnum != ''">
......@@ -595,6 +714,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fromnumNotList')">
${_conditionType_} a.fromnum not in
<foreach collection="conditionParamRef.fromnumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('hongqi')">
<if test="conditionParamRef.hongqi != null ">
${_conditionType_} a.hongqi = #{${_conditionParam_}.hongqi}
......@@ -609,6 +734,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('hongqiNotList')">
${_conditionType_} a.hongqi not in
<foreach collection="conditionParamRef.hongqiNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('hongqiStart') and conditionParamRef.hongqiStart != null">
${_conditionType_} a.hongqi <![CDATA[ >= ]]> #{${_conditionParam_}.hongqiStart}
</if>
......@@ -616,6 +747,75 @@
${_conditionType_} a.hongqi <![CDATA[ <= ]]> #{${_conditionParam_}.hongqiEnd}
</if>
<if test="conditionParamRef.containsKey('duty')">
<if test="conditionParamRef.duty != null ">
${_conditionType_} a.duty = #{${_conditionParam_}.duty}
</if>
<if test="conditionParamRef.duty == null">
${_conditionType_} a.duty is null
</if>
</if>
<if test="conditionParamRef.containsKey('dutyList')">
${_conditionType_} a.duty in
<foreach collection="conditionParamRef.dutyList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dutyNotList')">
${_conditionType_} a.duty not in
<foreach collection="conditionParamRef.dutyNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dutyStart') and conditionParamRef.dutyStart != null">
${_conditionType_} a.duty <![CDATA[ >= ]]> #{${_conditionParam_}.dutyStart}
</if>
<if test="conditionParamRef.containsKey('dutyEnd') and conditionParamRef.dutyEnd != null">
${_conditionType_} a.duty <![CDATA[ <= ]]> #{${_conditionParam_}.dutyEnd}
</if>
<if test="conditionParamRef.containsKey('dutyContent')">
<if test="conditionParamRef.dutyContent != null and conditionParamRef.dutyContent != ''">
${_conditionType_} a.dutyContent like #{${_conditionParam_}.dutyContent}
</if>
<if test="conditionParamRef.dutyContent == null">
${_conditionType_} a.dutyContent is null
</if>
</if>
<if test="conditionParamRef.containsKey('dutyContentList')">
${_conditionType_} a.dutyContent in
<foreach collection="conditionParamRef.dutyContentList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dutyContentNotList')">
${_conditionType_} a.dutyContent not in
<foreach collection="conditionParamRef.dutyContentNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dutyEnglish')">
<if test="conditionParamRef.dutyEnglish != null and conditionParamRef.dutyEnglish != ''">
${_conditionType_} a.dutyEnglish like #{${_conditionParam_}.dutyEnglish}
</if>
<if test="conditionParamRef.dutyEnglish == null">
${_conditionType_} a.dutyEnglish is null
</if>
</if>
<if test="conditionParamRef.containsKey('dutyEnglishList')">
${_conditionType_} a.dutyEnglish in
<foreach collection="conditionParamRef.dutyEnglishList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dutyEnglishNotList')">
${_conditionType_} a.dutyEnglish not in
<foreach collection="conditionParamRef.dutyEnglishNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('summary')">
<if test="conditionParamRef.summary != null and conditionParamRef.summary != ''">
......@@ -631,6 +831,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('summaryNotList')">
${_conditionType_} a.summary not in
<foreach collection="conditionParamRef.summaryNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('building')">
<if test="conditionParamRef.building != null ">
${_conditionType_} a.building = #{${_conditionParam_}.building}
......@@ -645,6 +851,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('buildingNotList')">
${_conditionType_} a.building not in
<foreach collection="conditionParamRef.buildingNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('buildingStart') and conditionParamRef.buildingStart != null">
${_conditionType_} a.building <![CDATA[ >= ]]> #{${_conditionParam_}.buildingStart}
</if>
......@@ -666,6 +878,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('levelNotList')">
${_conditionType_} a.level not in
<foreach collection="conditionParamRef.levelNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('levelStart') and conditionParamRef.levelStart != null">
${_conditionType_} a.level <![CDATA[ >= ]]> #{${_conditionParam_}.levelStart}
</if>
......@@ -702,6 +920,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdNotList')">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
......@@ -792,6 +1016,21 @@
<if test='orderCol.hongqi != null and "DESC".equalsIgnoreCase(orderCol.hongqi)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('duty')">
a.duty
<if test='orderCol.duty != null and "DESC".equalsIgnoreCase(orderCol.duty)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('dutyContent')">
a.dutyContent
<if test='orderCol.dutyContent != null and "DESC".equalsIgnoreCase(orderCol.dutyContent)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('dutyEnglish')">
a.dutyEnglish
<if test='orderCol.dutyEnglish != null and "DESC".equalsIgnoreCase(orderCol.dutyEnglish)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('summary')">
a.summary
<if test='orderCol.summary != null and "DESC".equalsIgnoreCase(orderCol.summary)'>DESC</if>
......
base-manager/src/test/java/com/mortals/httpclient/app/AppController.http
View file @ a9d6544d
......@@ -77,8 +77,7 @@ client.global.set("App_id", JSON.parse(response.body).data.id);
%}
###自助终端应用查看
GET {{baseUrl}}/app/info?id={{App_id}}
Authorization: {{authToken}}
GET {{baseUrl}}/app/info?id=1
Accept: application/json
###自助终端应用编辑
......
base-manager/src/test/java/com/mortals/httpclient/matter/MatterController.http
View file @ a9d6544d
......@@ -20,11 +20,9 @@ POST {{baseUrl}}/matter/list
Content-Type: application/json
{
"siteId": "",
"matterName": "%对墓穴占地面积超过标准的处罚%",
"deptCode":"",
"siteId": 1,
"page": 1,
"size": 10
"size": 100
}
###微官网事项列表
......
base-manager/src/test/java/com/mortals/httpclient/site/SiteBusinessController.http
View file @ a9d6544d
......@@ -4,10 +4,10 @@ POST {{baseUrl}}/site/business/list
Content-Type: application/json
{
"idNotList": [11,12,17,18,19,20],
"idNotList": [11,18,17,14,27,26],
"siteId": 1,
"page":1,
"size":5
"size":10
}
###站点业务列表
......
base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http
View file @ a9d6544d
###站点列表
POST {{baseUrl}}/site/list
Authorization: {{authToken}}
Content-Type: application/json
{
......
base-manager/src/test/java/com/mortals/httpclient/site/SiteMatterController.http
View file @ a9d6544d
......@@ -6,7 +6,8 @@ Content-Type: application/json
{
"siteId":1,
"page":1,
"size":-1
"matterName":"加处罚款",
"size":10
}
......
base-manager/src/test/java/com/mortals/httpclient/system/system.http
View file @ a9d6544d
......@@ -77,6 +77,11 @@ Content-Type: application/json
{}
###testre
POST {{baseUrl}}/test/reEventShow
Content-Type: application/json
{}
###短信设置编辑
......
base-manager/src/test/java/com/mortals/httpclient/window/WindowController.http
View file @ a9d6544d
......@@ -4,9 +4,11 @@ POST {{baseUrl}}/window/list
Content-Type: application/json
{
"siteId":8,
"siteId":1,
"page":1,
"size":10
"size":10,
"name": "",
"fromnum": "1E%"
}
......
portal-manager-ui/admin/public/favicon.ico
View replaced file @ 00eb684e View file @ a9d6544d
portal-manager-ui/admin/public/favicon.ico

5.34 KB | W: 45px | H: 46px

portal-manager-ui/admin/public/favicon.ico

4.19 KB | W: 32px | H: 32px

portal-manager-ui/admin/public/favicon.ico
portal-manager-ui/admin/public/favicon.ico
portal-manager-ui/admin/public/favicon.ico
portal-manager-ui/admin/public/favicon.ico
  • 2-up
  • Swipe
  • Onion skin
portal-manager-ui/admin/src/utils/js/validate.js
View file @ a9d6544d
// 只能为数字验证
export function isNumber (rule, value, callback) {
var number = /^\d+$/
export function isNumber(rule, value, callback) {
var number = /^\d+$/;
if (!number.test(value)) {
callback(new Error("格式有误,只能为数字"))
callback(new Error("格式有误,只能为数字"));
} else {
callback()
callback();
}
}
// 验证流水编号
export const checkFlowNum = (rule,value,callback)=>{
let reg = /^[A-Z][a-zA-Z0-9]{3,32}$/
if(!value){
callback(new Error('请输入流水编号'))
}else if(!reg.test(value)){
callback(new Error('格式为大写字母开头,4~32位'))
}else{
callback()
export const checkFlowNum = (rule, value, callback) => {
let reg = /^[A-Z][a-zA-Z0-9]{3,32}$/;
if (!value) {
callback(new Error("请输入流水编号"));
} else if (!reg.test(value)) {
callback(new Error("格式为大写字母开头,4~32位"));
} else {
callback();
}
}
};
// 验证英文
export const checkEn = (rule,value,callback)=>{
let reg = /^[a-zA-Z]{2,15}$/
if(!value){
callback(new Error('请输入英文名称'))
}else if(!reg.test(value)){
callback(new Error('格式为字母a-z,A-Z,2~15位'))
}else{
callback()
export const checkEn = (rule, value, callback) => {
let reg = /^[a-zA-Z]{2,15}$/;
if (!value) {
callback(new Error("请输入英文名称"));
} else if (!reg.test(value)) {
callback(new Error("格式为字母a-z,A-Z,2~15位"));
} else {
callback();
}
}
};
// 验证账号
export const changeAccount = (rule, value, callback) => {
if (!value) {
......@@ -45,8 +45,8 @@ export const changeAccount = (rule, value, callback) => {
export const changePassWord = (rule, value, callback) => {
if (!value) {
callback(new Error("请输入密码"));
} else if (!/^[a-zA-Z0-9_-]{5,18}$/.test(value)) {
callback(new Error("5到18位(字母,数字,下划线,中横线)"));
} else if (!/^[a-zA-Z0-9_!@#$%^&*`~()-+=]{5,18}$/.test(value)) {
callback(new Error("5到18位(字母、数字、特殊字符)"));
} else {
callback();
}
......
portal-manager-ui/admin/src/views/dataAdmin/dataAdmin.vue
View file @ a9d6544d
......@@ -76,9 +76,7 @@
<li class="content_list" @click="pushRouter13">微官网注册报表</li>
<li class="content_list" @click="pushRouter14">网络理政报表</li>
</ul>
<p class="bottom" @click="handleCkeck(11)">
协同类数据分析<a-icon type="swap-right" />
</p>
<p class="bottom">协同类数据分析<a-icon type="swap-right" /></p>
</li>
</ul>
<ul class="list">
......@@ -95,9 +93,7 @@
</li>
</template>
</ul>
<p class="bottom" @click="handleCkeck(11)">
监管类数据分析<a-icon type="swap-right" />
</p>
<p class="bottom">监管类数据分析<a-icon type="swap-right" /></p>
</li>
</ul>
<ul class="list">
......@@ -114,9 +110,7 @@
</li>
</template>
</ul>
<p class="bottom" @click="handleCkeck(11)">
数据驾驶一体化<a-icon type="swap-right" />
</p>
<p class="bottom">数据驾驶一体化<a-icon type="swap-right" /></p>
</li>
</ul>
<ul class="list">
......@@ -133,9 +127,7 @@
</li>
</template>
</ul>
<p class="bottom" @click="handleCkeck(11)">
运营类数据分析<a-icon type="swap-right" />
</p>
<p class="bottom">运营类数据分析<a-icon type="swap-right" /></p>
</li>
</ul>
</div>
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/productManage/components/InterfaceManage/alerting.vue
View file @ a9d6544d
......@@ -195,6 +195,9 @@ export default {
</script>
<style lang="less" scoped>
/deep/.ant-spin-container {
display: block;
}
.PoliticsShow-Container {
.header_box {
padding-bottom: 1rem;
......@@ -334,9 +337,6 @@ export default {
margin-left: 1rem !important;
}
}
/deep/.ant-table-pagination {
float: left !important;
}
}
}
</style>
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/productManage/components/InterfaceManage/module.vue
View file @ a9d6544d
......@@ -4,7 +4,7 @@
<a-tabs v-model="tabsActive" @change="tabsChange" :forceRender="false">
<a-tab-pane
:key="item.path"
v-for="(item, index) of tabsList['children']"
v-for="item of tabsList['children']"
:tab="item['meta']['title']"
>
</a-tab-pane>
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/productManage/components/appManage/application.vue
View file @ a9d6544d
......@@ -147,6 +147,9 @@ export default {
</script>
<style lang="less" scoped>
/deep/.ant-spin-container {
display: block;
}
.PoliticsShow-Container {
.header_box {
padding-bottom: 1rem;
......@@ -286,9 +289,6 @@ export default {
margin-left: 1rem !important;
}
}
/deep/.ant-table-pagination {
float: left !important;
}
}
}
</style>
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/productManage/components/docData/fileData.vue
View file @ a9d6544d
......@@ -137,6 +137,9 @@ export default {
</script>
<style lang="less" scoped>
/deep/.ant-spin-container {
display: block;
}
.PoliticsShow-Container {
.header_box {
padding-bottom: 1rem;
......@@ -276,9 +279,6 @@ export default {
margin-left: 1rem !important;
}
}
/deep/.ant-table-pagination {
float: left !important;
}
}
}
</style>
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/productManage/productManage.vue
View file @ a9d6544d
......@@ -14,7 +14,7 @@
新增产品
</a-button>
<ul class="content">
<li class="list" v-for="item of 5">
<li class="list" v-for="item of 5" :key="item">
<a-popover placement="leftBottom">
<template slot="content">
<div class="popoverContent">
......
portal-manager/pom.xml
View file @ a9d6544d
......@@ -116,7 +116,7 @@
<profiles.log.level>INFO</profiles.log.level>
<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<package.environment>yibin</package.environment>
<skipUi>true</skipUi>
<skipUi>false</skipUi>
</properties>
</profile>
......
portal-manager/src/test/java/com/mortals/httpclient/http-client.env.json
View file @ a9d6544d
......@@ -12,6 +12,10 @@
"baseUrl": "http://10.12.185.213:11078/zwfw"
},
"portal-yibin-web": {
"baseUrl": "http://112.19.80.237:11078/zwfw"
},
"portal-yibin-web": {
"baseUrl": "http://112.19.80.237:11078/zwfw"
}
......
portal-manager/src/test/java/com/mortals/httpclient/param/ParamController.http
View file @ a9d6544d
###参数信息业务列表
POST {{baseUrl}}/param/list
Authorization: {{authToken}}
Content-Type: application/json
{
"page":1,
"size":10
"size":1
}
......
smart-gateway/src/main/resources/bootstrap.yml
View file @ a9d6544d
......@@ -85,6 +85,15 @@ spring:
metadata:
response-timeout: 200000
connect-timeout: 200000
# 自助服务
- id: sst-manager
#uri: http://192.168.0.98:17002
uri: lb://sst-manager
predicates:
- Path=/sst/**
metadata:
response-timeout: 200000
connect-timeout: 200000
nacos:
# Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类
discovery:
......
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