Skip to content

G
government-platform
Commit 5dd836e0 authored by 赵啸非's avatar 赵啸非
Browse files
Options

app-ui

parent c1446d69
Pipeline #2994 failed with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 3198 additions and 5416 deletions
      app-ui/src/assets/icons/index.js
      View file @ 5dd836e0
      import Vue from 'vue'
      import SvgIcon from '@/components/SvgIcon'// svg component
      // register globally
      Vue.component('svg-icon', SvgIcon)
      const req = require.context('./svg', false, /\.svg$/)
      const requireAll = requireContext => requireContext.keys().map(requireContext)
      requireAll(req)
      app-ui/src/assets/utils/globalComponents.js
      View file @ 5dd836e0
      ......@@ -10,7 +10,8 @@ import FormField from '@/components/FormField';
      import Upload from '@/components/Upload';
      import TreeTable from '@/components/TreeTable.vue';
      import TopicInfo from '@/components/TopicInfo.vue';
      import LimitIndex from '@/components/LimitIndex.vue';
      const Prototype = function() {};
      ......@@ -26,8 +27,7 @@ Prototype.install = (Vue, options) => {
      Vue.component('Upload', Upload) // 文件上传
      Vue.component('TreeTable', TreeTable) // 文件上传
      Vue.component('TopicInfo', TopicInfo) // 文件上传
      Vue.component('LimitIndex', LimitIndex) // 文件上传
      }
      export default Prototype;
      app-ui/src/components/LimitEnd.vue
      View file @ 5dd836e0
      ......@@ -16,6 +16,9 @@ export default {
      data() {
      return {}
      },
      created() {
      console.log(33333)
      },
      props: {
      rule: {
      type: Object,
      ......
      app-ui/src/components/LimitIndex.vue
      View file @ 5dd836e0
      <template>
      <el-form inline :form="data" :label-width="'150px'" label-position="right">
      <LimitLevel
      :rule="data"
      :moIndex="mo_index"
      ></LimitLevel>
      </el-form>
      </template>
      <script>
      import LimitLevel from "./LimitLevel";
      export default {
      components: {
      LimitLevel,
      },
      created() {
      //self = this;
      console.log("111")
      this.data=this.rule
      console.log(this.data)
      },
      methods: {
      submitAns(data, label, all_data, index) {
      let ans = null;
      if (data) {
      ans = deepClone(data);
      }
      this.$emit('submitAns', data, label, all_data, this.moIndex);
      }
      },
      data() {
      return {
      mo_index: 0,
      data:[],
      rule: [
      {
      type: "select",
      name: "wr1",
      label: "问题块根-问题1",
      ans: null,
      child: null,
      content: [
      {
      value: "wr11",
      label: "问题块根-问题1-答案1",
      children: [
      {
      type: "select",
      name: "w11",
      label: "问题块1-问题1",
      ans: null,
      child: null,
      content: [
      {
      value: "w11",
      label: "问题块1-问题1-答案1",
      children: [
      {
      type: "end",
      },
      ],
      },
      {
      value: "w11",
      label: "问题块1-问题1-答案2",
      children: [
      {
      type: "select",
      name: "wa1",
      label: "问题块a-问题1",
      ans: null,
      child: null,
      content: [
      {
      value: "wa11",
      label: "问题块a-问题1-答案1",
      children: null,
      },
      {
      value: "wa11",
      label: "问题块a-问题1-答案2",
      children: null,
      },
      ],
      },
      {
      type: "select",
      name: "wa2",
      label: "问题块a-问题2",
      ans: null,
      child: null,
      content: [
      {
      value: "问题块a-问题2-答案1",
      label: "wa21",
      children: null,
      },
      {
      value: "问题块a-问题2-答案1",
      label: "wa22",
      children: null,
      },
      ],
      },
      {
      type: "end",
      },
      ],
      },
      ],
      },
      ],
      },
      {
      value: "wr12",
      label: "问题块根-问题1-答案2",
      children: [
      {
      type: "select",
      name: "wb1",
      label: "问题块b-问题1",
      ans: null,
      child: null,
      content: [
      {
      value: "wb11",
      label: "问题块b-问题1-答案1",
      children: [
      {
      type: "textarea",
      name: "wb111",
      label: "问题块b1-问题1",
      ans: null,
      child: null,
      },
      {
      type: "end",
      },
      ],
      },
      {
      value: "wb12",
      label: "问题块b-问题1-答案2",
      children: [
      {
      type: "daterange",
      label: "问题块b2-问题1",
      name: "wb121",
      ans: null,
      child: null,
      },
      ],
      },
      {
      value: "wb13",
      label: "问题块b-问题1-答案3",
      children: [
      {
      type: "end",
      },
      ],
      },
      ],
      },
      ],
      },
      ],
      },
      ],
      text: "11",
      form: "22",
      table: "",
      };
      },
      };
      </script>
      <style lang="less">
      </style>
      \ No newline at end of file
      app-ui/src/components/LimitLevel.vue
      View file @ 5dd836e0
      // level组件：
      <template>
      {{data}}
      <div v-if="data">
      <template v-for="(item, index) in data">
      // 通过type不同选择不同的代码。。。不全部展示
      <div v-if="item.type == 'end'" :key="item.label">
      <limitEnd :rule="item" @submitAns="submitAns"></limitEnd>
      </div>
      <div v-if="item.type == 'select'" :key="item.label">
      <el-form-item
      :label="item.label ? item.label: ''"
      :rules="[
      { required: true, message: '请选择', trigger: 'change' }
      ]">
      <el-select v-model="item.ans" placeholder="请选择" @change="changeSelect(index)">
      <el-option v-for="(option, option_index) in item.content" :key="option.label" :label="option.label" :value="option_index"></el-option>
      </el-select>
      </el-form-item>
      <template v-if="item.child">
      <limitLevel :rule="item.child" :moIndex="item.index" @submitAns="submitAns"></limitLevel>
      </template>
      </div>
      <div v-if="data">
      <template v-for="(item, index) in data">
      <div v-if="item.type == 'end'" :key="item.label">
      <limitEnd :rule="item" @submitAns="submitAns"></limitEnd>
      </div>
      <div v-if="item.type == 'select'" :key="item.label">
      <el-form-item
      :label="item.label ? item.label : ''"
      :rules="[{ required: true, message: '请选择', trigger: 'change' }]"
      >
      <el-select
      v-model="item.ans"
      placeholder="请选择"
      @change="changeSelect(index)"
      >
      <el-option
      v-for="(option, option_index) in item.content"
      :key="option.label"
      :label="option.label"
      :value="option_index"
      ></el-option>
      </el-select>
      </el-form-item>
      <template v-if="item.child">
      <limitLevel
      :rule="item.child"
      :moIndex="item.index"
      @submitAns="submitAns"
      ></limitLevel>
      </template>
      </div>
      </div>
      </template>
      </div>
      </template>
      <script>
      import limitEnd from './LimitEnd'
      import limitEnd from "./LimitEnd";
      export default {
      name: 'limitLevel',
      components: {
      limitEnd
      name: "LimitLevel",
      components: {
      limitEnd,
      },
      data() {
      return {
      data: null,
      value_index: null,
      value: null,
      child: null,
      };
      },
      props: {
      data: {
      type: Array,
      required: true,
      default: null,
      },
      data() {
      return {
      data: null,
      value_index: null,
      value: null,
      child: null,
      }
      moIndex: {
      type: Number,
      required: true,
      default: null,
      },
      props: {
      rule: {
      type: Array,
      required: true,
      default: null
      },
      moIndex: {
      type: Number,
      required: true,
      default: null
      },
      },
      created() {
      console.log(222)
      this.fileList = this.list;
      },
      watch: {
      $route() {
      console.log(2222)
      }
      },
      methods: {
      changeSelect(index) {
      this.$set(this.data[index], "child", null);
      this.$nextTick(() => {
      let ans = this.data[index].ans;
      let option = this.data[index].content[ans];
      this.$set(this.data[index], "child", option.children);
      this.$set(this.data[index], "index", index);
      });
      },
      created() {
      this.data = deepClone(this.rule);
      judgeAnsIsNull(item, label) {
      if (!item && item != 0) {
      this.$message({
      type: "error",
      message: "请填写" + label,
      });
      return false;
      }
      return true;
      },
      methods: {
      changeSelect(index) {
      this.$set(this.data[index], 'child', null);
      submitAns(data, des, all_data, mo_index) {
      let ans = null;
      let label = "";
      this.$nextTick(() => {
      let ans = this.data[index].ans;
      let option = this.data[index].content[ans];
      this.$set(this.data[index], 'child', option.children);
      this.$set(this.data[index], 'index', index);
      })
      },
      judgeAnsIsNull(item, label) {
      if (!item && item != 0) {
      this.$message({
      type: 'error',
      message: '请填写' + label
      })
      if (mo_index || mo_index == 0) {
      this.$set(this.data[mo_index], "child", all_data);
      }
      return false;
      }
      return true;
      },
      submitAns(data, des, all_data, mo_index) {
      let ans = null;
      let label = '';
      if (mo_index || mo_index == 0) {
      this.$set(this.data[mo_index], 'child', all_data);
      }
      if (data) {
      ans = deepClone(data);
      } else {
      ans = {};
      }
      if (data) {
      ans = deepClone(data);
      } else {
      ans = {};
      }
      for(let i = 0; i < this.data.length; i++) {
      // 没有答案，提醒填写
      if (this.data[i].type == 'end') {
      continue;
      }
      for (let i = 0; i < this.data.length; i++) {
      // 没有答案，提醒填写
      if (this.data[i].type == "end") {
      continue;
      }
      switch(this.data[i].type) {
      case 'end':
      break;
      case 'select':
      this.judgeAnsIsNull(this.data[i].ans, this.data[i].label);
      let index = this.data[i].ans;
      let option = this.data[i].content[index];
      ans[this.data[i].name] = option.value;
      label += ' ' + option.label;
      break;
      default:
      break;
      }
      switch (this.data[i].type) {
      case "end":
      break;
      }
      case "select":
      this.judgeAnsIsNull(this.data[i].ans, this.data[i].label);
      let index = this.data[i].ans;
      let option = this.data[i].content[index];
      ans[this.data[i].name] = option.value;
      label += " " + option.label;
      break;
      this.$emit('submitAns', ans, label + ' ' +des, this.data, this.moIndex);
      default:
      break;
      }
      }
      }
      \ No newline at end of file
      }
      this.$emit("submitAns", ans, label + " " + des, this.data, this.moIndex);
      },
      },
      };
      app-ui/src/router.js
      View file @ 5dd836e0
      ......@@ -12,6 +12,8 @@ const router = new Router({
      builder('/go', 'codeGen/index'),
      builder('/index', 'home/index'),
      builder1('/test', 'components/LimitIndex'),
      builder('/question', 'home/question'),
      ]
      ......@@ -52,6 +54,26 @@ function builder(path, component = path, requiresAuth = false) {
      }
      }
      function builder1(path, component = path, requiresAuth = false) {
      return {
      path: path,
      name: path || 'homepage',
      component: getComponent1(component),
      meta: {
      requiresAuth: requiresAuth
      }
      }
      }
      function getComponent1(fileName) {
      try {
      return require('./' + fileName).default
      } catch (error) {
      return fileNotFound;
      }
      }
      function getComponent(fileName) {
      try {
      return require('./views/' + fileName).default
      ......
      app-ui/src/views/home/index.vue
      View file @ 5dd836e0
      ......@@ -59,10 +59,8 @@
      <script>
      import LimitIndex from "@/components/LimitIndex.vue";
      export default {
      components: {
      LimitIndex,
      },
      created() {
      this.$post("/zwfw/proced/thing/oneTopiclist", {
      ......
      app-ui/src/views/home/question.vue
      View file @ 5dd836e0
      <template>
      <mu-container class="demo-container is-stripe">
      <el-form :label-width="'150px'" label-position="right">
      <template v-for="(item, index) in rule">
      <el-form-item
      :key="index"
      :label="item.label ? item.label : ''"
      style="width: 100%"
      >
      <el-select v-model="item.ans" placeholder="请选择">
      <el-option
      v-for="(option, option_index) in item.content"
      :key="option.label"
      :label="option.label"
      :value="option_index"
      ></el-option>
      </el-select>
      </el-form-item>
      </template>
      <el-form-item>
      <div style="text-align: center; width: 500px">
      <el-button
      size="small"
      type="primary"
      style="margin-right: 50px"
      @click="submitAns"
      >确定</el-button
      >
      <el-button size="small">取消</el-button>
      </div>
      </el-form-item>
      <el-form inline :form="data" :label-width="'150px'" label-position="right">
      <limitLevel
      :rule="data"
      :moIndex="mo_index"
      ></limitLevel>
      </el-form>
      </mu-container>
      </template>
      <script>
      let self = null;
      export default {
      components: {},
      components: {
      limitLevel
      },
      created() {
      console.log(1111);
      self = this;
      this.data=this.rule
      console.log(this.rule)
      },
      methods: {
      submitAns() {
      console.log(this.rule)
      let ans = {};
      for (let i = 0; i < this.rule.length; i++) {
      let item = this.rule[i];
      if ((!item.fa && item.fa != 0) || this.rule[item.fa].ans == item.faV) {
      if (!item.ans && item.ans != 0) {
      this.$message({
      type: "warning",
      message: "请检查您的" + item.label + "是否填写",
      });
      return false;
      }
      ans[item.name] = item.ans;
      submitAns(data, label, all_data, index) {
      let ans = null;
      if (data) {
      ans = deepClone(data);
      }
      console.log(this.rule);
      this.$emit('submitAns', data, label, all_data, this.moIndex);
      }
      }
      console.log(ans);
      },
      },
      data() {
      return {
      mo_index: 0,
      data:[],
      rule: [
      {
      type: "select",
      name: "w1",
      label: "问题1",
      ans: null,
      fa: null,
      content: [
      {
      value: "w11",
      label: "问题1-答案1",
      },
      {
      value: "w12",
      label: "问题1-答案2",
      },
      ],
      },
      {
      type: "select",
      name: "w2",
      label: "问题2",
      name: "wr1",
      label: "问题块根-问题1",
      ans: null,
      fa: 0,
      faV: 0,
      child: null,
      content: [
      {
      value: "w21",
      label: "问题2-答案1",
      value: "wr11",
      label: "问题块根-问题1-答案1",
      children: [
      {
      type: "select",
      name: "w11",
      label: "问题块1-问题1",
      ans: null,
      child: null,
      content: [
      {
      value: "w11",
      label: "问题块1-问题1-答案1",
      children: [
      {
      type: "end",
      },
      ],
      },
      {
      value: "w11",
      label: "问题块1-问题1-答案2",
      children: [
      {
      type: "select",
      name: "wa1",
      label: "问题块a-问题1",
      ans: null,
      child: null,
      content: [
      {
      value: "wa11",
      label: "问题块a-问题1-答案1",
      children: null,
      },
      {
      value: "wa11",
      label: "问题块a-问题1-答案2",
      children: null,
      },
      ],
      },
      {
      type: "select",
      name: "wa2",
      label: "问题块a-问题2",
      ans: null,
      child: null,
      content: [
      {
      value: "问题块a-问题2-答案1",
      label: "wa21",
      children: null,
      },
      {
      value: "问题块a-问题2-答案1",
      label: "wa22",
      children: null,
      },
      ],
      },
      {
      type: "end",
      },
      ],
      },
      ],
      },
      ],
      },
      {
      value: "w22",
      label: "问题2-答案2",
      value: "wr12",
      label: "问题块根-问题1-答案2",
      children: [
      {
      type: "select",
      name: "wb1",
      label: "问题块b-问题1",
      ans: null,
      child: null,
      content: [
      {
      value: "wb11",
      label: "问题块b-问题1-答案1",
      children: [
      {
      type: "textarea",
      name: "wb111",
      label: "问题块b1-问题1",
      ans: null,
      child: null,
      },
      {
      type: "end",
      },
      ],
      },
      {
      value: "wb12",
      label: "问题块b-问题1-答案2",
      children: [
      {
      type: "daterange",
      label: "问题块b2-问题1",
      name: "wb121",
      ans: null,
      child: null,
      },
      ],
      },
      {
      value: "wb13",
      label: "问题块b-问题1-答案3",
      children: [
      {
      type: "end",
      },
      ],
      },
      ],
      },
      ],
      },
      ],
      },
      ......
      app-ui/src/webRouter.ftl deleted 100644 → 0
      View file @ c1446d69
      import Vue from 'vue'
      import Router from 'vue-router'
      import Store from './store'
      import Layout from './views/Layout.vue'
      import fileNotFound from './views/errors/fileNotFound.vue'
      Vue.use(Router);
      const router = new Router({
      routes: [
      builder('/authentication', 'login/authentication'),
      builder('/login', 'login/login'),
      builder('/go', 'codeGen/index'),
      {
      path: '/',
      name: 'layout',
      component: Layout,
      meta: {
      requiresAuth: true
      },
      children: [
      ...restBuilder('oper/log', 'system/log'), // 系统管理-操作日志
      ...restBuilder('validcode', 'system/validcode'), // 接入管理-接入信息
      ...restBuilder('menu', 'system/menu'), // 系统管理--菜单管理
      ...restBuilder('resource', 'system/resource'), // 系统管理--资源管理
      ...restBuilder('role', 'system/role'), // 系统管理--角色管理
      ...restBuilder('user', 'system/user'), // 用户管理 -- 管理用户
      ...restBuilder('param', 'system/param'), // 系统管理--参数管理
      ...restBuilder('task', 'system/task'), // 系统管理--任务管理
      ...restBuilder('area', 'system/area'), // 系统管理-区域管理
      ...restBuilder('device/connhistory', 'device/connhistory'), // 设备管理-连接历史
      ...restBuilder('device', 'device'), // 系统管理-区域管理
      //在此添加业务模块
      //以下为基础路由配置
      builder('', 'Home'),
      builder('index', 'Home'),
      builder('login/updatePwd', 'login/updatePwd'),
      builder('403', 'errors/403'),
      builder('*', 'errors/404'),
      ]
      },
      ]
      })
      /**
      * rest路由生成器
      *
      * @param {string} path 路径
      * @param {string} [component=path] 文件地址
      * @returns {array} [] reset路由数组，包含list/edit/add/view
      */
      function restBuilder(path, component = path) {
      let arr = [];
      arr.push(builder(`${path}/list`, `${component}/list`));
      arr.push(builder(`${path}/edit`, `${component}/show`));
      arr.push(builder(`${path}/add`, `${component}/show`));
      arr.push(builder(`${path}/view`, `${component}/show`));
      return arr;
      }
      /**
      * 路由生成器
      *
      * @param {string} path 路径
      * @param {string} [component=path] 文件地址
      * @param {boolean} [requiresAuth=false] 是否登录后才能访问
      * @returns {any} {} 路由对象
      */
      function builder(path, component = path, requiresAuth = false) {
      return {
      path: path,
      name: path || 'homepage',
      component: getComponent(component),
      meta: {
      requiresAuth: requiresAuth
      }
      }
      }
      function getComponent(fileName) {
      try {
      return require('./views/' + fileName).default
      } catch (error) {
      return fileNotFound;
      }
      }
      //检查是否跳转到sso地址
      function ssoCheck (to, from, next) {
      let redirect = (to.path === '/login/updatePwd') ? '/#/updatePwd' : ''
      redirect = (redirect === '' && to.path === '/login') ? (location.protocol + '//' + location.host + '/#' + from.fullPath) : redirect
      if (redirect != '') {
      next(false)
      window.location.href = '//' + location.host + '/m/login/logout?redirect=' + encodeURIComponent(redirect)
      return true;
      }
      return false;
      }
      router.afterEach(() => {
      document.body.scrollTop = 0
      document.documentElement.scrollTop = 0
      })
      // 路由鉴权
      router.beforeEach((to, from, next) => {
      // if (ssoCheck(to, from, next)) { //sso鉴权检查
      // return
      // }
      if (to.matched.some(record => record.meta.requiresAuth)) {
      if (Store.state.isLogin) {
      next();
      } else {
      next({
      path: '/authentication',
      query: {
      redirect: to.fullPath
      }
      })
      }
      } else {
      next();
      }
      })
      export default router;
      \ No newline at end of file
      common-lib/src/main/java/com/mortals/xhx/feign/rsp/ApiResp.java
      View file @ 5dd836e0
      ......@@ -20,10 +20,4 @@ public class ApiResp<T> {
      */
      private T data;
      // public boolean isSuccess() {
      // if (YesNoEnum.YES.getValue() == code) {
      // return true;
      // }
      // return false;
      // }
      }
      government-manage-ui/admin/src/components/FormField.vue
      View file @ 5dd836e0
      ......@@ -34,7 +34,7 @@
      >{{$label}}</el-checkbox>
      </el-checkbox-group>
      <el-date-picker :disabled='disabled' type="date" value-format="yyyy-MM-dd HH:mm:ss" v-model="field" @change="emit" @input="emit" placeholder="选择日期" v-if='type === "date"'></el-date-picker>
      <el-date-picker :disabled='disabled' type="date" value-format="yyyy-MM-dd" v-model="field" @change="emit" @input="emit" placeholder="选择日期" v-if='type === "date"'></el-date-picker>
      <el-date-picker :disabled='disabled' type="datetime" value-format="yyyy-MM-dd HH:mm:ss" v-model="field" @change="emit" @input="emit" placeholder="选择日期" v-if='type === "datetime"'></el-date-picker>
      </slot>
      ......
      government-manage-ui/admin/src/views/demo/list.vue
      View file @ 5dd836e0
      ......@@ -181,7 +181,7 @@
      {label: "字段3", prop: "fieldThree"},
      {label: "测试详细",
      width: 120,
      prop: "subColumns",
      prop: "demoDetailList",
      formatter: (row) => {
      let widthsize = this.columnSet.reduce((pre, cur) => {
      return pre + Number(cur.width);
      ......
      government-manage-ui/admin/src/views/login/login.vue
      View file @ 5dd836e0
      ......@@ -4,7 +4,7 @@
      <div class="page page-login flex flex-v">
      <div class="form-wrap flex flex-1">
      <el-form @submit.prevent='onSubmit' ref="form" :model="form" label-width="80px" size="small">
      <h1>工作流管理平台</h1>
      <h1>设备管理平台</h1>
      <el-form-item label="用户名">
      <el-input v-model="form.loginName"></el-input>
      </el-form-item>
      ......
      government-manage-ui/admin/src/views/one/classify/list.vue
      View file @ 5dd836e0
      ......@@ -17,6 +17,12 @@
      <el-input v-model="topicform.topicalName"></el-input>
      </el-form-item>
      </el-row>
      <el-row>
      <el-form-item label="描述信息">
      <el-input v-model="topicform.remark"></el-input>
      </el-form-item>
      </el-row>
      </el-form>
      <span slot="footer" class="dialog-footer">
      ......@@ -40,82 +46,41 @@
      :rules="topicPacksRules"
      ref="topicPacksform"
      >
      <el-row>
      <el-col :span="12">
      <el-form-item prop="classifyName" label="主题包名称">
      <el-form-item prop="classifyName" label="主题事项名称">
      <el-input v-model="classifyform.classifyName"></el-input>
      </el-form-item>
      </el-col>
      <el-col :span="12">
      <el-form-item prop="sortRemarks" label="主题包说明">
      <el-form-item prop="sortRemarks" label="主题事项说明">
      <el-input v-model="classifyform.sortRemarks"></el-input>
      </el-form-item>
      </el-col>
      </el-row>
      <!-- <el-row>
      <el-col :span="12">
      <el-form-item prop="mainPicUrl" label="终端主题包图标">
      <el-upload
      class="avatar-uploader"
      action="/m/file/upload"
      :show-file-list="false"
      :on-success="handleSuccess"
      name="uploadFile"
      :data="{ prePath: '/image/plm/materia' }"
      :before-upload="beforeUpload"
      >
      </el-upload>
      </el-form-item>
      </el-col>
      <el-col :span="12">
      <el-form-item prop="mainPicUrl" label="移动主题包图标">
      <el-upload
      class="avatar-uploader"
      action="/m/file/upload"
      :show-file-list="false"
      :on-success="handleSuccess"
      name="uploadFile"
      :data="{ prePath: '/image/plm/materia' }"
      :before-upload="beforeUpload"
      >
      </el-upload>
      </el-form-item>
      </el-col>
      </el-row> -->
      <el-row>
      <el-col :span="12">
      <el-form-item prop="deliveryPeriod" label="承诺办结时限">
      <el-input
      placeholder="请输入内容"
      :disabled="topicPacksform.overWay == '1'"
      v-model="topicPacksform.overTime"
      class="input-with-select"
      >
      <el-select
      v-model="topicPacksform.overWay"
      slot="prepend"
      placeholder="请选择"
      >
      <el-option label="即刻" value="1"></el-option>
      <el-option label="工作日" value="2"></el-option>
      </el-select>
      </el-input>
      </el-form-item>
      </el-col>
      <el-col :span="12">
      <el-form-item prop="deliveryPeriod" label="到现场次数">
      <el-input v-model="topicPacksform.presenceNum"></el-input>
      </el-form-item>
      </el-col>
      </el-row>
      <Field label="办理机构" prop="jointInfoShow" v-model="topicPacksform.jointInfoShow" placeholder="请输入办理机构"/>
      <Field label="法定时限" prop="legalTimeLimitShow" v-model="topicPacksform.legalTimeLimitShow" placeholder="请输入法定时限"/>
      <Field label="承诺时限" prop="promiseTimeLimitShow" v-model="topicPacksform.promiseTimeLimitShow" placeholder="请输入承诺时限"/>
      <Field label="收费标准" prop="isChargesShow" v-model="topicPacksform.isChargesShow" placeholder="请输入收费标准"/>
      <Field label="收费金额" prop="charges" v-model="topicPacksform.charges" placeholder="请输入收费金额"/>
      <Field label="办理时间" prop="handleTimeShow" v-model="topicPacksform.handleTimeShow" placeholder="请输入办理时间"/>
      <Field label="办理地点" prop="handlePlaceShow" v-model="topicPacksform.handlePlaceShow" placeholder="请输入办理地点"/>
      <Field label="咨询方式" prop="cousultingTelephoneShow" v-model="topicPacksform.cousultingTelephoneShow" placeholder="请输入咨询方式"/>
      <Field label="结果信息" prop="resultInfo" v-model="topicPacksform.resultInfo" placeholder="请输入结果信息"/>
      <Field label="投诉电话" prop="supervisoryTelephoneShow" v-model="topicPacksform.supervisoryTelephoneShow" placeholder="请输入投诉电话"/>
      </el-form>
      </el-row>
      <el-divider></el-divider>
      <el-row>
      <!--搜索-->
      <div>
      <el-form :inline="true" size="mini">
      <el-form-item>
      ......@@ -177,7 +142,6 @@
      </el-table-column>
      </el-table>
      <!-- 分页器 -->
      <el-row type="flex" justify="end">
      <el-pagination
      @current-change="handleCurrentChange"
      ......@@ -481,11 +445,14 @@
      <script>
      import Pagination from "@/components/Pagination.vue";
      import table from "@/assets/mixins/table";
      import Form from "../../../components/Form.vue";
      //import Form from "../../../components/Form.vue";
      //import topicClassify from "./topicClassify.vue";
      export default {
      components: {
      Pagination,
      // topicClassify
      },
      name: "topic",
      mixins: [table],
      ......
      government-manage-ui/admin/src/views/one/classify/topicClassify.vue 0 → 100644
      View file @ 5dd836e0
      <template>
      <!-- 新增主题包 -->
      <el-dialog
      :title="topicPacksDialog.title"
      :visible.sync="topicPacksDialog.visible"
      width="95%"
      >
      <el-row>
      <el-row>
      <el-form
      :model="topicPacksform"
      :label-width="formLabelWidth"
      :rules="topicPacksRules"
      ref="topicPacksform"
      >
      <el-row>
      <el-col :span="12">
      <el-form-item prop="classifyName" label="主题事项名称">
      <el-input v-model="classifyform.classifyName"></el-input>
      </el-form-item>
      </el-col>
      <el-col :span="12">
      <el-form-item prop="sortRemarks" label="主题事项说明">
      <el-input v-model="classifyform.sortRemarks"></el-input>
      </el-form-item>
      </el-col>
      </el-row>
      <el-row>
      <el-col :span="12">
      <el-form-item prop="deliveryPeriod" label="承诺办结时限">
      <el-input
      placeholder="请输入内容"
      :disabled="topicPacksform.overWay == '1'"
      v-model="topicPacksform.overTime"
      class="input-with-select"
      >
      <el-select
      v-model="topicPacksform.overWay"
      slot="prepend"
      placeholder="请选择"
      >
      <el-option label="即刻" value="1"></el-option>
      <el-option label="工作日" value="2"></el-option>
      </el-select>
      </el-input>
      </el-form-item>
      </el-col>
      <el-col :span="12">
      <el-form-item prop="deliveryPeriod" label="到现场次数">
      <el-input v-model="topicPacksform.presenceNum"></el-input>
      </el-form-item>
      </el-col>
      </el-row>
      </el-form>
      </el-row>
      <el-divider></el-divider>
      <el-row>
      <!--搜索-->
      <div>
      <el-form :inline="true" size="mini">
      <el-form-item>
      <el-button plain @click="matterBatchAdd">批量添加</el-button>
      </el-form-item>
      <el-form-item style="float: right">
      <el-button plain @click="matterSearchConfirm">查询</el-button>
      </el-form-item>
      <el-form-item label="事项名称" style="float: right">
      <el-input
      v-model="searchform.matterName"
      placeholder="事项名称"
      ></el-input>
      </el-form-item>
      </el-form>
      </div>
      <!--事项列表-->
      <el-table
      size="mini"
      ref="multipleTable"
      :data="matterPageInfoData"
      tooltip-effect="dark"
      border
      v-loading="loading"
      highlight-current-row
      @selection-change="handleSelectionChange"
      >
      <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
      <el-table-column prop="matterName" label="事项名称" :show-overflow-tooltip="true" />
      <el-table-column width="400" prop="datumn" label="关联材料">
      <template slot-scope="scope">
      <el-row
      v-for="(item, index) in scope.row.datumList"
      :key="index"
      >
      <el-tag
      style="
      font-size: 12px;
      white-space: pre-wrap;
      margin-bottom: 5px;
      "
      >
      {{ item.materialName | ellipsis2 }}
      </el-tag>
      </el-row>
      </template>
      </el-table-column>
      <el-table-column width="100" label="操作">
      <template slot-scope="scope">
      <el-button
      size="mini"
      @click="handleAdd(scope.$index, scope.row)"
      >加入</el-button
      >
      </template>
      </el-table-column>
      </el-table>
      <!-- 分页器 -->
      <el-row type="flex" justify="end">
      <el-pagination
      @current-change="handleCurrentChange"
      @size-change="handleSizeChange"
      :current-page="matterPageInfo.currPage"
      :page-size="matterPageInfo.prePageResult"
      :page-sizes="[10, 20, 50, 100, 200]"
      layout="sizes, total, prev, pager, next, jumper"
      :total="matterPageInfo.totalResult"
      >
      </el-pagination>
      </el-row>
      <el-row
      style="margin-bottom: 10px"
      v-for="item in matterTags"
      :key="item.id"
      >
      <el-tag closable @close="handleClose(item.id)">
      {{ item.matterName | ellipsis }}
      </el-tag>
      </el-row>
      <el-row type="flex" justify="end">
      <el-button @click="topicPacksDialog.visible = false"
      >取 消</el-button
      >
      <el-button type="primary" @click="selectMatterConfirm"
      >确 定</el-button
      >
      </el-row>
      </el-row>
      </el-row>
      </el-dialog>
      </template>
      <script>
      export default {
      name: "basicInfoForm",
      props: {
      info: {
      type: Object,
      default: null
      }
      },
      created() {
      },
      data() {
      return {
      };
      }
      };
      </script>
      government-manager/src/main/java/com/mortals/xhx/ManagerApplication.java
      View file @ 5dd836e0
      ......@@ -15,6 +15,9 @@ import org.springframework.context.annotation.ImportResource;
      //@EnableBinding({ProcessTaskSink.class})
      public class ManagerApplication extends BaseWebApplication {
      public static void main(String[] args) {
      SpringApplication.run(ManagerApplication.class, args);
      }
      ......
      government-manager/src/main/java/com/mortals/xhx/base/framework/aspect/RequestLogAspect.java
      View file @ 5dd836e0
      ......@@ -50,7 +50,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
      @Slf4j
      @Aspect
      @Configuration(proxyBeanMethods = false)
      @Profile({"develop1", "test"})
      @Profile({"develop", "test"})
      public class RequestLogAspect {
      private static final ParameterNameDiscoverer PARAMETER_NAME_DISCOVERER = new DefaultParameterNameDiscoverer();
      ......
      government-manager/src/main/java/com/mortals/xhx/base/framework/ws/handler/AuthMessageHandler.java
      View file @ 5dd836e0
      ......@@ -31,6 +31,9 @@ public class AuthMessageHandler implements MessageHandler<AuthRequest> {
      // 判断是否认证成功。这里，假装直接成功
      WebSocketUtil.send(session, AuthResponse.TYPE, new AuthResponse().setCode(0));
      //WebSocketUtil.broadcast();
      // 通知所有人，某个人加入了。这个是可选逻辑，仅仅是为了演示
      // WebSocketUtil.broadcast(UserJoinNoticeRequest.TYPE,
      // new UserJoinNoticeRequest().setNickname(message.getAccessToken())); // 考虑到代码简化，我们先直接使用 accessToken 作为 User
      ......
      government-manager/src/main/java/com/mortals/xhx/base/framework/ws/websocket/WebSocketHandler.java
      View file @ 5dd836e0
      ......@@ -131,6 +131,7 @@ public class WebSocketHandler extends TextWebSocketHandler implements Initializi
      public static void main(String[] args) {
      WebSocketHandler webSocketHandler = new WebSocketHandler();
      }
      }
      government-manager/src/main/java/com/mortals/xhx/base/system/gentable/model/GentableEntity.java
      View file @ 5dd836e0
      package com.mortals.xhx.base.system.gentable.model;
      import java.util.Date;
      import java.util.List;
      import com.mortals.framework.model.BaseEntityLong;
      /**
      *
      * Description:Gentable
      * date: 2021-9-29 9:35:30
      */
      public class GentableEntity extends GentableEntityExt{
      private static final long serialVersionUID = 1632879330094L;
      private static final long serialVersionUID = 1L;
      /**
      * 表名称
      */
      * 表名称
      */
      private String tableName;
      /**
      * 表描述
      */
      * 表描述
      */
      private String tableComment;
      /**
      * 关联子表的表名
      */
      * 关联子表的表名
      */
      private String subTableName;
      /**
      * 子表关联的外键名
      */
      * 子表关联的外键名
      */
      private String subTableFkName;
      /**
      * 实体类名称
      */
      * 实体类名称
      */
      private String className;
      /**
      * 使用的模板（crud单表操作 tree树表操作）
      */
      * 使用的模板（crud单表操作 tree树表操作）
      */
      private String tplCategory;
      /**
      * 生成包路径
      */
      * 生成包路径
      */
      private String packageName;
      /**
      * 生成模块名
      */
      * 生成模块名
      */
      private String moduleName;
      /**
      * 生成业务名
      */
      * 生成业务名
      */
      private String businessName;
      /**
      * 生成功能名
      */
      * 生成功能名
      */
      private String functionName;
      /**
      * 生成功能作者
      */
      * 生成功能作者
      */
      private String functionAuthor;
      /**
      * 缓存服务方式（0,无，1.静态实体缓存，2.动态实体缓存）
      */
      * 缓存服务方式（0,无，1.静态实体缓存，2.动态实体缓存）
      */
      private Integer cacheServiceType;
      /**
      * 生成代码方式（0.zip压缩包 1.自定义路径）
      */
      * 生成代码方式（0.zip压缩包 1.自定义路径）
      */
      private Integer genType;
      /**
      * 分表方式（0.无，1.年，2.月，3.日，4.hash取余）
      */
      * 分表方式（0.无，1.年，2.月，3.日，4.hash取余）
      */
      private Integer dividedTableType;
      /**
      * 是否生成feign结构(0.否，1.是)
      */
      private Integer genFeign;
      /**
      * 生成feign接口，消费应用工程名称如（workflow-platform）
      */
      private String feignAppName;
      /**
      * 是否生成对外api结构（0,否，1.是）
      */
      private Integer genApi;
      /**
      * 生成路径（不填默认项目路径）
      */
      * 是否生成前端导入导出代码（0,否，1.是 默认0）
      */
      private Integer isGenExport;
      /**
      * 是否显示的生成controll mapping(0,否，1.是 默认0)
      */
      private Integer isShowControl;
      /**
      * 生成路径（不填默认项目路径）
      */
      private String genPath;
      /**
      * 其它生成选项
      */
      * 其它生成选项
      */
      private String options;
      /**
      * 备注
      */
      * 备注
      */
      private String remark;
      /**
      * 变更时间
      */
      private Date updateTime;
      /**
      * 变更用户loginName
      */
      private String updateUser;
      public GentableEntity(){}
      /**
      * 创建时间
      */
      private Date createTime;
      /**
      * 创建用户loginName
      */
      private String createUser;
      public GentableEntity(){
      }
      /**
      * 获取 表名称
      * @return tableName
      */
      public String getTableName() {
      return this.tableName;
      * 获取 表名称
      * @return String
      */
      public String getTableName(){
      return tableName;
      }
      /**
      * 设置 表名称
      * @param tableName
      */
      public void setTableName(String tableName) {
      * 设置 表名称
      * @param tableName
      */
      public void setTableName(String tableName){
      this.tableName = tableName;
      }
      /**
      * 获取 表描述
      * @return tableComment
      */
      public String getTableComment() {
      return this.tableComment;
      * 获取 表描述
      * @return String
      */
      public String getTableComment(){
      return tableComment;
      }
      /**
      * 设置 表描述
      * @param tableComment
      */
      public void setTableComment(String tableComment) {
      * 设置 表描述
      * @param tableComment
      */
      public void setTableComment(String tableComment){
      this.tableComment = tableComment;
      }
      /**
      * 获取 关联子表的表名
      * @return subTableName
      */
      public String getSubTableName() {
      return this.subTableName;
      * 获取 关联子表的表名
      * @return String
      */
      public String getSubTableName(){
      return subTableName;
      }
      /**
      * 设置 关联子表的表名
      * @param subTableName
      */
      public void setSubTableName(String subTableName) {
      * 设置 关联子表的表名
      * @param subTableName
      */
      public void setSubTableName(String subTableName){
      this.subTableName = subTableName;
      }
      /**
      * 获取 子表关联的外键名
      * @return subTableFkName
      */
      public String getSubTableFkName() {
      return this.subTableFkName;
      * 获取 子表关联的外键名
      * @return String
      */
      public String getSubTableFkName(){
      return subTableFkName;
      }
      /**
      * 设置 子表关联的外键名
      * @param subTableFkName
      */
      public void setSubTableFkName(String subTableFkName) {
      * 设置 子表关联的外键名
      * @param subTableFkName
      */
      public void setSubTableFkName(String subTableFkName){
      this.subTableFkName = subTableFkName;
      }
      /**
      * 获取 实体类名称
      * @return className
      */
      public String getClassName() {
      return this.className;
      * 获取 实体类名称
      * @return String
      */
      public String getClassName(){
      return className;
      }
      /**
      * 设置 实体类名称
      * @param className
      */
      public void setClassName(String className) {
      * 设置 实体类名称
      * @param className
      */
      public void setClassName(String className){
      this.className = className;
      }
      /**
      * 获取 使用的模板（crud单表操作 tree树表操作）
      * @return tplCategory
      */
      public String getTplCategory() {
      return this.tplCategory;
      * 获取 使用的模板（crud单表操作 tree树表操作）
      * @return String
      */
      public String getTplCategory(){
      return tplCategory;
      }
      /**
      * 设置 使用的模板（crud单表操作 tree树表操作）
      * @param tplCategory
      */
      public void setTplCategory(String tplCategory) {
      * 设置 使用的模板（crud单表操作 tree树表操作）
      * @param tplCategory
      */
      public void setTplCategory(String tplCategory){
      this.tplCategory = tplCategory;
      }
      /**
      * 获取 生成包路径
      * @return packageName
      */
      public String getPackageName() {
      return this.packageName;
      * 获取 生成包路径
      * @return String
      */
      public String getPackageName(){
      return packageName;
      }
      /**
      * 设置 生成包路径
      * @param packageName
      */
      public void setPackageName(String packageName) {
      * 设置 生成包路径
      * @param packageName
      */
      public void setPackageName(String packageName){
      this.packageName = packageName;
      }
      /**
      * 获取 生成模块名
      * @return moduleName
      */
      public String getModuleName() {
      return this.moduleName;
      * 获取 生成模块名
      * @return String
      */
      public String getModuleName(){
      return moduleName;
      }
      /**
      * 设置 生成模块名
      * @param moduleName
      */
      public void setModuleName(String moduleName) {
      * 设置 生成模块名
      * @param moduleName
      */
      public void setModuleName(String moduleName){
      this.moduleName = moduleName;
      }
      /**
      * 获取 生成业务名
      * @return businessName
      */
      public String getBusinessName() {
      return this.businessName;
      * 获取 生成业务名
      * @return String
      */
      public String getBusinessName(){
      return businessName;
      }
      /**
      * 设置 生成业务名
      * @param businessName
      */
      public void setBusinessName(String businessName) {
      * 设置 生成业务名
      * @param businessName
      */
      public void setBusinessName(String businessName){
      this.businessName = businessName;
      }
      /**
      * 获取 生成功能名
      * @return functionName
      */
      public String getFunctionName() {
      return this.functionName;
      * 获取 生成功能名
      * @return String
      */
      public String getFunctionName(){
      return functionName;
      }
      /**
      * 设置 生成功能名
      * @param functionName
      */
      public void setFunctionName(String functionName) {
      * 设置 生成功能名
      * @param functionName
      */
      public void setFunctionName(String functionName){
      this.functionName = functionName;
      }
      /**
      * 获取 生成功能作者
      * @return functionAuthor
      */
      public String getFunctionAuthor() {
      return this.functionAuthor;
      * 获取 生成功能作者
      * @return String
      */
      public String getFunctionAuthor(){
      return functionAuthor;
      }
      /**
      * 设置 生成功能作者
      * @param functionAuthor
      */
      public void setFunctionAuthor(String functionAuthor) {
      * 设置 生成功能作者
      * @param functionAuthor
      */
      public void setFunctionAuthor(String functionAuthor){
      this.functionAuthor = functionAuthor;
      }
      /**
      * 获取 缓存服务方式（0,无，1.静态实体缓存，2.动态实体缓存）
      * @return cacheServiceType
      */
      public Integer getCacheServiceType() {
      return this.cacheServiceType;
      * 获取 缓存服务方式（0,无，1.静态实体缓存，2.动态实体缓存）
      * @return Integer
      */
      public Integer getCacheServiceType(){
      return cacheServiceType;
      }
      /**
      * 设置 缓存服务方式（0,无，1.静态实体缓存，2.动态实体缓存）
      * @param cacheServiceType
      */
      public void setCacheServiceType(Integer cacheServiceType) {
      * 设置 缓存服务方式（0,无，1.静态实体缓存，2.动态实体缓存）
      * @param cacheServiceType
      */
      public void setCacheServiceType(Integer cacheServiceType){
      this.cacheServiceType = cacheServiceType;
      }
      /**
      * 获取 生成代码方式（0.zip压缩包 1.自定义路径）
      * @return genType
      */
      public Integer getGenType() {
      return this.genType;
      * 获取 生成代码方式（0.zip压缩包 1.自定义路径）
      * @return Integer
      */
      public Integer getGenType(){
      return genType;
      }
      /**
      * 设置 生成代码方式（0.zip压缩包 1.自定义路径）
      * @param genType
      */
      public void setGenType(Integer genType) {
      * 设置 生成代码方式（0.zip压缩包 1.自定义路径）
      * @param genType
      */
      public void setGenType(Integer genType){
      this.genType = genType;
      }
      /**
      * 获取 分表方式（0.无，1.年，2.月，3.日，4.hash取余）
      * @return dividedTableType
      */
      public Integer getDividedTableType() {
      return this.dividedTableType;
      * 获取 分表方式（0.无，1.年，2.月，3.日，4.hash取余）
      * @return Integer
      */
      public Integer getDividedTableType(){
      return dividedTableType;
      }
      /**
      * 设置 分表方式（0.无，1.年，2.月，3.日，4.hash取余）
      * @param dividedTableType
      */
      public void setDividedTableType(Integer dividedTableType) {
      * 设置 分表方式（0.无，1.年，2.月，3.日，4.hash取余）
      * @param dividedTableType
      */
      public void setDividedTableType(Integer dividedTableType){
      this.dividedTableType = dividedTableType;
      }
      /**
      * 获取 是否生成feign结构(0.否，1.是)
      * @return genFeign
      * @return Integer
      */
      public Integer getGenFeign() {
      return this.genFeign;
      public Integer getGenFeign(){
      return genFeign;
      }
      /**
      * 设置 是否生成feign结构(0.否，1.是)
      * @param genFeign
      */
      public void setGenFeign(Integer genFeign) {
      public void setGenFeign(Integer genFeign){
      this.genFeign = genFeign;
      }
      /**
      * 获取 生成feign接口，消费应用工程名称如（workflow-platform）
      * @return feignAppName
      * @return String
      */
      public String getFeignAppName() {
      return this.feignAppName;
      public String getFeignAppName(){
      return feignAppName;
      }
      /**
      * 设置 生成feign接口，消费应用工程名称如（workflow-platform）
      * @param feignAppName
      */
      public void setFeignAppName(String feignAppName) {
      public void setFeignAppName(String feignAppName){
      this.feignAppName = feignAppName;
      }
      /**
      * 获取 是否生成对外api结构（0,否，1.是）
      * @return genApi
      * @return Integer
      */
      public Integer getGenApi() {
      return this.genApi;
      public Integer getGenApi(){
      return genApi;
      }
      /**
      * 设置 是否生成对外api结构（0,否，1.是）
      * @param genApi
      */
      public void setGenApi(Integer genApi) {
      public void setGenApi(Integer genApi){
      this.genApi = genApi;
      }
      /**
      * 获取 生成路径（不填默认项目路径）
      * @return genPath
      */
      public String getGenPath() {
      return this.genPath;
      }
      /**
      * 设置 生成路径（不填默认项目路径）
      * @param genPath
      */
      public void setGenPath(String genPath) {
      this.genPath = genPath;
      }
      /**
      * 获取 其它生成选项
      * @return options
      */
      public String getOptions() {
      return this.options;
      }
      /**
      * 设置 其它生成选项
      * @param options
      */
      public void setOptions(String options) {
      this.options = options;
      }
      /**
      * 获取 备注
      * @return remark
      */
      public String getRemark() {
      return this.remark;
      * 获取 是否生成前端导入导出代码（0,否，1.是 默认0）
      * @return Integer
      */
      public Integer getIsGenExport(){
      return isGenExport;
      }
      /**
      * 设置 备注
      * @param remark
      */
      public void setRemark(String remark) {
      this.remark = remark;
      * 设置 是否生成前端导入导出代码（0,否，1.是 默认0）
      * @param isGenExport
      */
      public void setIsGenExport(Integer isGenExport){
      this.isGenExport = isGenExport;
      }
      /**
      * 获取 变更时间
      * @return updateTime
      */
      public Date getUpdateTime() {
      return this.updateTime;
      * 获取 是否显示的生成controll mapping(0,否，1.是 默认0)
      * @return Integer
      */
      public Integer getIsShowControl(){
      return isShowControl;
      }
      /**
      * 设置 变更时间
      * @param updateTime
      */
      public void setUpdateTime(Date updateTime) {
      this.updateTime = updateTime;
      * 设置 是否显示的生成controll mapping(0,否，1.是 默认0)
      * @param isShowControl
      */
      public void setIsShowControl(Integer isShowControl){
      this.isShowControl = isShowControl;
      }
      /**
      * 获取 变更用户loginName
      * @return updateUser
      */
      public String getUpdateUser() {
      return this.updateUser;
      * 获取 生成路径（不填默认项目路径）
      * @return String
      */
      public String getGenPath(){
      return genPath;
      }
      /**
      * 设置 变更用户loginName
      * @param updateUser
      */
      public void setUpdateUser(String updateUser) {
      this.updateUser = updateUser;
      * 设置 生成路径（不填默认项目路径）
      * @param genPath
      */
      public void setGenPath(String genPath){
      this.genPath = genPath;
      }
      /**
      * 获取 创建时间
      * @return createTime
      */
      public Date getCreateTime() {
      return this.createTime;
      * 获取 其它生成选项
      * @return String
      */
      public String getOptions(){
      return options;
      }
      /**
      * 设置 创建时间
      * @param createTime
      */
      public void setCreateTime(Date createTime) {
      this.createTime = createTime;
      * 设置 其它生成选项
      * @param options
      */
      public void setOptions(String options){
      this.options = options;
      }
      /**
      * 获取 创建用户loginName
      * @return createUser
      */
      public String getCreateUser() {
      return this.createUser;
      * 获取 备注
      * @return String
      */
      public String getRemark(){
      return remark;
      }
      /**
      * 设置 创建用户loginName
      * @param createUser
      */
      public void setCreateUser(String createUser) {
      this.createUser = createUser;
      * 设置 备注
      * @param remark
      */
      public void setRemark(String remark){
      this.remark = remark;
      }
      @Override
      public int hashCode() {
      return this.getId().hashCode();
      }
      @Override
      public boolean equals(Object obj) {
      if (obj == null)
      return false;
      if (obj == null) return false;
      if (obj instanceof GentableEntity) {
      GentableEntity tmp = (GentableEntity) obj;
      if (this.getId().longValue() == tmp.getId().longValue()) {
      if (this.getId() == tmp.getId()) {
      return true;
      }
      }
      ......@@ -493,54 +430,53 @@ public class GentableEntity extends GentableEntityExt{
      public String toString(){
      StringBuilder sb = new StringBuilder("");
      sb
      .append(",id:").append(getId())
      .append(",tableName:").append(getTableName())
      .append(",tableComment:").append(getTableComment())
      .append(",subTableName:").append(getSubTableName())
      .append(",subTableFkName:").append(getSubTableFkName())
      .append(",className:").append(getClassName())
      .append(",tplCategory:").append(getTplCategory())
      .append(",packageName:").append(getPackageName())
      .append(",moduleName:").append(getModuleName())
      .append(",businessName:").append(getBusinessName())
      .append(",functionName:").append(getFunctionName())
      .append(",functionAuthor:").append(getFunctionAuthor())
      .append(",cacheServiceType:").append(getCacheServiceType())
      .append(",genType:").append(getGenType())
      .append(",dividedTableType:").append(getDividedTableType())
      .append(",genPath:").append(getGenPath())
      .append(",options:").append(getOptions())
      .append(",remark:").append(getRemark())
      .append(",updateTime:").append(getUpdateTime())
      .append(",updateUser:").append(getUpdateUser())
      .append(",createTime:").append(getCreateTime())
      .append(",createUser:").append(getCreateUser())
      ;
      sb.append(",tableName:").append(getTableName());
      sb.append(",tableComment:").append(getTableComment());
      sb.append(",subTableName:").append(getSubTableName());
      sb.append(",subTableFkName:").append(getSubTableFkName());
      sb.append(",className:").append(getClassName());
      sb.append(",tplCategory:").append(getTplCategory());
      sb.append(",packageName:").append(getPackageName());
      sb.append(",moduleName:").append(getModuleName());
      sb.append(",businessName:").append(getBusinessName());
      sb.append(",functionName:").append(getFunctionName());
      sb.append(",functionAuthor:").append(getFunctionAuthor());
      sb.append(",cacheServiceType:").append(getCacheServiceType());
      sb.append(",genType:").append(getGenType());
      sb.append(",dividedTableType:").append(getDividedTableType());
      sb.append(",genFeign:").append(getGenFeign());
      sb.append(",feignAppName:").append(getFeignAppName());
      sb.append(",genApi:").append(getGenApi());
      sb.append(",isGenExport:").append(getIsGenExport());
      sb.append(",isShowControl:").append(getIsShowControl());
      sb.append(",genPath:").append(getGenPath());
      sb.append(",options:").append(getOptions());
      sb.append(",remark:").append(getRemark());
      return sb.toString();
      }
      public void initAttrValue(){
      this.tableName = null;
      this.tableComment = null;
      this.subTableName = null;
      this.subTableFkName = null;
      this.className = null;
      this.tplCategory = null;
      this.packageName = null;
      this.moduleName = null;
      this.businessName = null;
      this.functionName = null;
      this.functionAuthor = null;
      this.cacheServiceType = null;
      this.genType = null;
      this.dividedTableType = null;
      this.genPath = null;
      this.options = null;
      this.remark = null;
      this.updateTime = null;
      this.updateUser = null;
      this.createTime = null;
      this.createUser = null;
      this.tableName = "";
      this.tableComment = "";
      this.subTableName = null;
      this.subTableFkName = null;
      this.className = "";
      this.tplCategory = "crud";
      this.packageName = null;
      this.moduleName = null;
      this.businessName = null;
      this.functionName = null;
      this.functionAuthor = null;
      this.cacheServiceType = null;
      this.genType = 0;
      this.dividedTableType = 0;
      this.genFeign = 0;
      this.feignAppName = "";
      this.genApi = null;
      this.isGenExport = null;
      this.isShowControl = null;
      this.genPath = "/";
      this.options = null;
      this.remark = null;
      }
      }
      \ No newline at end of file
      government-manager/src/main/java/com/mortals/xhx/base/system/gentable/web/GentableController.java
      View file @ 5dd836e0
      ......@@ -3,6 +3,7 @@ package com.mortals.xhx.base.system.gentable.web;
      import cn.hutool.core.convert.Convert;
      import com.alibaba.fastjson.JSONObject;
      import com.mortals.framework.model.Context;
      import com.mortals.framework.web.BaseCRUDJsonController;
      import com.mortals.framework.web.BaseCRUDJsonMappingController;
      import com.mortals.xhx.base.system.gentable.model.GentableColumnEntity;
      import com.mortals.xhx.base.system.gentable.model.GentableColumnQuery;
      ......@@ -43,7 +44,7 @@ import static com.mortals.framework.ap.SysConstains.MESSAGE_INFO;
      */
      @RestController
      @RequestMapping("gentable")
      public class GentableController extends BaseCRUDJsonMappingController<GentableService, GentableForm, GentableEntity, Long> {
      public class GentableController extends BaseCRUDJsonController<GentableService, GentableForm, GentableEntity, Long> {
      @Autowired
      private GentableColumnService gentableColumnService;
      ......
      government-manager/src/main/java/com/mortals/xhx/base/system/upload/service/impl/UploadServiceImpl.java
      View file @ 5dd836e0
      ......@@ -61,6 +61,10 @@ public class UploadServiceImpl implements UploadService {
      log.error("文件上传大小超过限制，当前文件---" + tempFile.getSize() + "，允许大小----------" + type.getMaxSize());
      throw new AppException("文件上传大小超过限制！");
      }
      if(tempFile.getSize()==0){
      throw new AppException("当前文件为空！");
      }
      if (null != fileName && fileName.length() > 50) {
      throw new AppException("文件名称过长，无法上传！");
      }
      ......
      government-manager/src/main/java/com/mortals/xhx/busiz/WxOneThingApiController.java
      View file @ 5dd836e0
      ......@@ -2,26 +2,39 @@ package com.mortals.xhx.busiz;
      import com.alibaba.fastjson.JSONObject;
      import com.mortals.framework.exception.AppException;
      import com.mortals.framework.model.OrderCol;
      import com.mortals.framework.model.PageInfo;
      import com.mortals.framework.model.Result;
      import com.mortals.framework.util.FileUtil;
      import com.mortals.xhx.base.framework.config.InterceptorConfig;
      import com.mortals.xhx.base.system.param.service.ParamService;
      import com.mortals.xhx.base.system.upload.service.UploadService;
      import com.mortals.xhx.busiz.audit.AuditInfo;
      import com.mortals.xhx.busiz.audit.AuditReq;
      import com.mortals.xhx.busiz.login.DatumDataReq;
      import com.mortals.xhx.busiz.matters.MyMattersReq;
      import com.mortals.xhx.busiz.oneProblemlist.OneProblemInfo;
      import com.mortals.xhx.busiz.oneProblemlist.OneProblemReq;
      import com.mortals.xhx.busiz.onethinglist.OneThineInfo;
      import com.mortals.xhx.busiz.onethinglist.OneThingReq;
      import com.mortals.xhx.busiz.onethinglist.OneThingRsp;
      import com.mortals.xhx.busiz.question.QuestionInfo;
      import com.mortals.xhx.busiz.question.AnswerReq;
      import com.mortals.xhx.busiz.topic.TopicInfo;
      import com.mortals.xhx.busiz.topic.TopicReq;
      import com.mortals.xhx.busiz.topic.TopicRsp;
      import com.mortals.xhx.busiz.uploadfile.DeleteFileReq;
      import com.mortals.xhx.busiz.uploadfile.SubmitDatumReq;
      import com.mortals.xhx.common.code.ApiRespCodeEnum;
      import com.mortals.xhx.common.code.OneThingRespCodeEnum;
      import com.mortals.xhx.common.code.YesNoEnum;
      import com.mortals.xhx.common.pdu.api.Page;
      import com.mortals.xhx.feign.flowable.IApiFlowInstanceFeign;
      import com.mortals.xhx.feign.rsp.ApiResp;
      import com.mortals.xhx.module.member.model.MemberEntity;
      import com.mortals.xhx.module.member.model.MemberQuery;
      import com.mortals.xhx.module.member.service.MemberService;
      import com.mortals.xhx.module.one.model.*;
      import com.mortals.xhx.module.one.service.OneClassifyService;
      import com.mortals.xhx.module.one.service.OneClassifyTopicalService;
      import com.mortals.xhx.module.one.service.OneTopicalService;
      ......@@ -29,17 +42,14 @@ import com.mortals.xhx.module.yth.model.YthOnethingEntity;
      import com.mortals.xhx.module.yth.model.YthOnethingQuery;
      import com.mortals.xhx.module.yth.service.YthOnethingService;
      import lombok.extern.apachecommons.CommonsLog;
      import org.springframework.beans.BeanUtils;
      import org.springframework.beans.factory.annotation.Autowired;
      import org.springframework.util.ObjectUtils;
      import org.springframework.web.bind.annotation.PostMapping;
      import org.springframework.web.bind.annotation.RequestMapping;
      import org.springframework.web.bind.annotation.RequestParam;
      import org.springframework.web.bind.annotation.RestController;
      import org.springframework.web.bind.annotation.*;
      import org.springframework.web.multipart.MultipartFile;
      import java.util.HashMap;
      import java.util.List;
      import java.util.Map;
      import java.util.*;
      import java.util.stream.Collectors;
      /**
      * 一件事微信对外服务接口
      ......@@ -47,6 +57,7 @@ import java.util.Map;
      * @author: zxfei
      * @date: 2021/8/24 20:28
      */
      @CrossOrigin(origins = "*")
      @RestController
      @CommonsLog
      @RequestMapping("/zwfw/proced/")
      ......@@ -55,10 +66,6 @@ public class WxOneThingApiController {
      @Autowired
      private YthOnethingService onethingService;
      @Autowired
      private ParamService paramService;
      @Autowired
      private IApiFlowInstanceFeign apiFlowInstanceFeign;
      @Autowired
      private MemberService memberService;
      @Autowired
      ......@@ -69,11 +76,64 @@ public class WxOneThingApiController {
      private OneTopicalService oneTopicalService;
      @Autowired
      private OneClassifyService oneClassifyService;
      @Autowired
      private OneClassifyTopicalService oneClassifyTopicalService;
      /**
      * 一件事主题包列表
      *
      * @param req
      * @return
      */
      @PostMapping("thing/getTopicList")
      public ApiResp<TopicRsp> getTopicList(TopicReq req) {
      ApiResp<TopicRsp> rsp = new ApiResp<>();
      TopicRsp topicRsp = new TopicRsp();
      rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
      rsp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel());
      try {
      //分页查询
      PageInfo pageInfo = new PageInfo();
      pageInfo.setPrePageResult(req.getLimit());
      pageInfo.setCurrPage(req.getPage());
      OneTopicalQuery query = new OneTopicalQuery();
      if (!ObjectUtils.isEmpty(req.getName())) {
      query.setTopicalName("%" + req.getName() + "%");
      }
      Result<OneTopicalEntity> result = oneTopicalService.find(query.topicalType(req.getType()).deleted(YesNoEnum.NO.getValue()), pageInfo, null);
      List<TopicInfo> collect = result.getList().stream().map(item -> {
      TopicInfo info = new TopicInfo();
      info.setId(item.getId());
      info.setTopicalType(item.getTopicalType());
      info.setTopicalName(item.getTopicalName());
      info.setDescription(item.getRemark());
      //info.setDescription(item.get);
      OneClassifyTopicalEntity oneClassifyTopicalEntity = oneClassifyTopicalService.selectOne(new OneClassifyTopicalQuery().topicalId(item.getId()));
      if (!ObjectUtils.isEmpty(oneClassifyTopicalEntity)) {
      info.setMoveIcon(oneClassifyTopicalEntity.getMoveIcon());
      }
      info.setCreateTime(item.getCreateTime());
      return info;
      }).collect(Collectors.toList());
      Page page = new Page();
      page.setSize(result.getPageInfo().getCurrPage());
      page.setPer(result.getPageInfo().getPrePageResult());
      page.setTotal(result.getPageInfo().getTotalResult());
      topicRsp.setPage(page);
      topicRsp.setList(collect);
      rsp.setData(topicRsp);
      } catch (Exception e) {
      log.error("一件事主题列表失败", e);
      rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
      rsp.setMsg(e.getMessage());
      return rsp;
      }
      log.info("响应【一件事主题包列表】【响应体】--> " + JSONObject.toJSONString(rsp));
      return rsp;
      }
      /**
      * 一件事主题列表(包含主题包)
      ......@@ -100,6 +160,74 @@ public class WxOneThingApiController {
      return rsp;
      }
      /**
      * 一件事列表
      *
      * @param req
      * @return
      */
      @PostMapping("thing/getList")
      public ApiResp<OneThingRsp> getList(OneThingReq req) {
      ApiResp<OneThingRsp> rsp = new ApiResp<>();
      OneThingRsp oneThingRsp = new OneThingRsp();
      rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
      rsp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel());
      try {
      Map<Long, OneTopicalEntity> topicMap = oneTopicalService.find(new OneTopicalQuery().deleted(YesNoEnum.NO.getValue())).stream().collect(Collectors.toMap(x -> x.getId(), y -> y));
      Map<Long, String> classifyMap = oneClassifyService.find(new OneClassifyQuery().deleted(YesNoEnum.NO.getValue()).classifyLevel(1L)).stream().collect(Collectors.toMap(x -> x.getId(), y -> y.getClassifyName()));
      //如果有分类查询，则需要关联查询
      PageInfo pageInfo = new PageInfo();
      pageInfo.setPrePageResult(req.getLimit());
      pageInfo.setCurrPage(req.getPage());
      List<OneThineInfo> collect = new ArrayList<>();
      Page page = new Page();
      //判断是否有分类查询
      if (!ObjectUtils.isEmpty(req.getTopicId())) {
      Result<OneClassifyTopicalEntity> result = oneClassifyTopicalService.find(new OneClassifyTopicalQuery().topicalId(req.getTopicId()).deleted(YesNoEnum.NO.getValue()), pageInfo, null);
      collect = result.getList().stream().map(item -> {
      OneThineInfo info = new OneThineInfo();
      info.setId(item.getClassifyId());
      info.setTopicalName(topicMap.get(item.getTopicalId()) == null ? "" : topicMap.get(item.getTopicalId()).getTopicalName());
      info.setTopicalType(topicMap.get(item.getTopicalId()) == null ? 1 : topicMap.get(item.getTopicalId()).getTopicalType());
      info.setName(classifyMap.get(item.getClassifyId()) == null ? "" : classifyMap.get(item.getClassifyId()));
      info.setCreateTime(item.getCreateTime());
      return info;
      }).collect(Collectors.toList());
      page.setSize(result.getPageInfo().getCurrPage());
      page.setPer(result.getPageInfo().getPrePageResult());
      page.setTotal(result.getPageInfo().getTotalResult());
      } else {
      Result<OneClassifyEntity> result = oneClassifyService.find(new OneClassifyQuery().classifyLevel(1L).classifyName("%" + req.getName() + "%").deleted(YesNoEnum.NO.getValue()), pageInfo, null);
      collect =result.getList().stream().map(item -> {
      OneThineInfo info = new OneThineInfo();
      info.setId(item.getId());
      info.setName(item.getClassifyName());
      info.setCreateTime(item.getCreateTime());
      return info;
      }).collect(Collectors.toList());
      page.setSize(result.getPageInfo().getCurrPage());
      page.setPer(result.getPageInfo().getPrePageResult());
      page.setTotal(result.getPageInfo().getTotalResult());
      }
      oneThingRsp.setPage(page);
      oneThingRsp.setList(collect);
      rsp.setData(oneThingRsp);
      } catch (Exception e) {
      log.error("一件事列表失败", e);
      rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
      rsp.setMsg(e.getMessage());
      return rsp;
      }
      log.info("响应【一件事列表】【响应体】--> " + JSONObject.toJSONString(rsp));
      return rsp;
      }
      /**
      * 问题详细
      *
      ......@@ -152,33 +280,6 @@ public class WxOneThingApiController {
      return rsp;
      }
      // /**
      // * 提交后请求返回数据
      // *
      // * @param req
      // * @return
      // */
      // @PostMapping("thing/datum_data")
      // public ApiResp<QuestionInfo> datumData(DatumDataReq req) {
      // ApiResp<QuestionInfo> rsp = new ApiResp<>();
      // rsp.setMsg(OneThingRespCodeEnum.SUCCESS.getLabel());
      // rsp.setCode(OneThingRespCodeEnum.SUCCESS.getValue());
      // try {
      //
      // //todo 改用户需要的材料
      // // QuestionInfo questionInfo = classifyOptionService.conditionQuestion(req.getOption_id(), req.getKey());
      // //rsp.setData(questionInfo);
      // } catch (Exception e) {
      // log.error("问答基础信息失败", e);
      // rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
      // rsp.setMsg(e.getMessage());
      // return rsp;
      // }
      //
      // log.info("响应【登录后返回数据】【响应体】--> " + JSONObject.toJSONString(rsp));
      // return rsp;
      // }
      /**
      * 上传附件
      *
      ......@@ -220,14 +321,12 @@ public class WxOneThingApiController {
      rsp.setCode(OneThingRespCodeEnum.SUCCESS.getValue());
      try {
      String filePath = uploadService.getFilePath(req.getFilePath());
      String filePath = uploadService.getFilePath(req.getFilePath());
      boolean delete = FileUtil.delete(filePath);
      if (!delete) {
      rsp.setMsg("未找到文件");
      rsp.setCode(OneThingRespCodeEnum.FAILED.getValue());
      }
      } catch (Exception e) {
      log.error("删除文件", e);
      rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
      ......@@ -300,14 +399,24 @@ public class WxOneThingApiController {
      * @return
      */
      @PostMapping("thing/myHandle")
      public ApiResp<List<YthOnethingEntity>> myHandle(MyMattersReq req) {
      ApiResp<List<YthOnethingEntity>> rsp = new ApiResp<>();
      public ApiResp<List<AuditInfo>> myHandle(AuditReq req) {
      ApiResp<List<AuditInfo>> rsp = new ApiResp<>();
      rsp.setMsg(OneThingRespCodeEnum.SUCCESS.getLabel());
      rsp.setCode(OneThingRespCodeEnum.SUCCESS.getValue());
      try {
      //todo 我的办理信息
      List<YthOnethingEntity> list = onethingService.find(new YthOnethingQuery().openId(req.getOpenId()));
      rsp.setData(list);
      List<AuditInfo> collect = list.stream().map(item -> {
      AuditInfo auditInfo = new AuditInfo();
      BeanUtils.copyProperties(item, auditInfo);
      OneClassifyEntity oneClassifyEntity = oneClassifyService.get(item.getClassifyTopicId());
      if(!ObjectUtils.isEmpty(oneClassifyEntity)){
      auditInfo.setClassifyName(oneClassifyEntity.getClassifyName());
      }
      return auditInfo;
      }).collect(Collectors.toList());
      rsp.setData(collect);
      } catch (Exception e) {
      log.error("我的办理失败", e);
      rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
      ......
      government-manager/src/main/java/com/mortals/xhx/busiz/WxOneThingController.http
      View file @ 5dd836e0
      ###一件事查询列表
      POST {{baseUrl}}/m/zwfw/proced/thing/getList
      Content-Type: application/x-www-form-urlencoded
      name=退休&openId=3&limit=10&page=0
      ###一件事查询列表
      POST {{baseUrl}}/m/zwfw/proced/thing/getList
      Content-Type: application/x-www-form-urlencoded
      #topicId=13&name=退休&openId=3&limit=10&page=0
      topicId=13&openId=3
      ###主题包列表
      POST {{baseUrl}}/m/zwfw/proced/thing/getTopicList
      Content-Type: application/x-www-form-urlencoded
      type=1&openId=3
      ###主题包列表
      POST {{baseUrl}}/m/zwfw/proced/thing/oneTopiclist
      Content-Type: application/x-www-form-urlencoded
      ......@@ -12,11 +32,13 @@ Content-Type: application/x-www-form-urlencoded
      id=1
      ###事项详细数据
      POST {{baseUrl}}/m/zwfw/proced/thing/oneBasicsInfo
      ###回答基础数据
      POST {{baseUrl}}/m/zwfw/proced/thing/ansResults
      Content-Type: application/x-www-form-urlencoded
      id=1
      optionIds[0]=17&optionIds[1]=20
      ###根据openid 查询用户
      POST {{baseUrl}}/m/zwfw/proced/thing/searchMember
      ......@@ -24,11 +46,7 @@ Content-Type: application/x-www-form-urlencoded
      openId=abc
      ###问答基础数据
      POST {{baseUrl}}/m/zwfw/proced/thing/ansResults
      Content-Type: application/x-www-form-urlencoded
      optionIds[0]=17&optionIds[1]=20
      ###微信用户校验创建更新
      POST {{baseUrl}}/m/zwfw/wechatinter/base/checkCard
      ......@@ -42,10 +60,10 @@ POST {{baseUrl}}/m/zwfw/proced/thing/uploadFile
      Content-Type: multipart/form-data; boundary=WebAppBoundary
      --WebAppBoundary
      Content-Disposition: form-data; name="file"; filename="test.xlsx"
      Content-Disposition: form-data; name="file"; filename="1.png"
      Content-Type: multipart/form-data
      < ./test.xlsx
      < ./1.png
      --WebAppBoundary--
      ###删除文件
      ......
      government-manager/src/main/java/com/mortals/xhx/busiz/WxWechatApiController.java
      View file @ 5dd836e0
      ......@@ -62,8 +62,6 @@ public class WxWechatApiController {
      }
      memberService.checkMember(req);
      } catch (Exception e) {
      log.error("微信注册认证失败", e);
      rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
      ......
      government-manager/src/main/java/com/mortals/xhx/busiz/oneProblemlist/OneProblemInfo.java
      View file @ 5dd836e0
      ......@@ -15,23 +15,41 @@ import java.util.Map;
      @Data
      public class OneProblemInfo {
      /**
      * 问题与答案id,唯一
      */
      private Long id;
      /**
      * 问题答案名称
      */
      private String name;
      /**
      * 是否为叶子节点（0：否，1：是）
      */
      private Integer isLeaf;
      /**
      * 是问题还是选项答案（0：问题，1：选项答案）
      */
      private Integer isAns;
      /**
      * 父节点id
      */
      private Long parentId;
      /**
      * 事项id “,”号分割
      */
      private String matterIds;
      /**
      * 树的层级
      */
      private Integer level;
      /**
      * 备注信息
      */
      private String remark;
      /**
      * 当前节点的子集
      */
      private List<OneProblemInfo> children;
      }
      government-manager/src/main/java/com/mortals/xhx/busiz/oneProblemlist/mapper/ProblemMapper.java
      View file @ 5dd836e0
      package com.mortals.xhx.busiz.oneProblemlist.mapper;
      import com.mortals.xhx.busiz.oneProblemlist.OneProblemInfo;
      import org.mapstruct.Mapper;
      import org.mapstruct.Mapping;
      import org.mapstruct.factory.Mappers;
      ......@@ -14,25 +15,25 @@ import org.mapstruct.factory.Mappers;
      @Mapper
      public interface ProblemMapper {
      ProblemMapper INSTANCE = Mappers.getMapper( ProblemMapper.class );
      /*
      @Mapping(source = "basicsId", target = "basics_id")
      OneProblemInfo classifyEntity2Info(ClassifyEntity entity);
      @Mapping(source = "classifyId", target = "classify_id")
      @Mapping(source = "classifyNextId", target = "classify_next_id")
      @Mapping(source = "basicsinfoId", target = "basicsinfo_id")
      @Mapping(source = "acceptId", target = "accept_id")
      @Mapping(source = "flowlimitId", target = "flowlimit_id")
      @Mapping(source = "matterId", target = "matter_id")
      @Mapping(source = "datumId", target = "datum_id")
      @Mapping(source = "summaryType", target = "summary_type")
      OptionDetailInfo classifyOptionEntity2DetailInfo(ClassifyOptionEntity entity);
      */
      // ProblemMapper INSTANCE = Mappers.getMapper( ProblemMapper.class );
      //
      //
      //
      // @Mapping(source = "basicsId", target = "basics_id")
      // OneProblemInfo classifyEntity2Info(ClassifyEntity entity);
      //
      //
      // @Mapping(source = "classifyId", target = "classify_id")
      // @Mapping(source = "classifyNextId", target = "classify_next_id")
      // @Mapping(source = "basicsinfoId", target = "basicsinfo_id")
      // @Mapping(source = "acceptId", target = "accept_id")
      // @Mapping(source = "flowlimitId", target = "flowlimit_id")
      // @Mapping(source = "matterId", target = "matter_id")
      // @Mapping(source = "datumId", target = "datum_id")
      // @Mapping(source = "summaryType", target = "summary_type")
      // OptionDetailInfo classifyOptionEntity2DetailInfo(ClassifyOptionEntity entity);
      //
      //
      ......
      government-manager/src/main/java/com/mortals/xhx/busiz/onethinglist/OneThineInfo.java
      View file @ 5dd836e0
      package com.mortals.xhx.busiz.onethinglist;
      import com.fasterxml.jackson.annotation.JsonFormat;
      import io.swagger.annotations.ApiModelProperty;
      import lombok.Data;
      import java.util.Date;
      /**
      * @author: zxfei
      * @date: 2021/9/6 9:32
      ......@@ -18,21 +22,23 @@ public class OneThineInfo {
      /**
      * 名称
      */
      private String tname;
      private String name;
      /**
      * 事项关联id
      * 归属主题类型（1,个人服务，2 企业服务）
      */
      private String matter_ids;
      private Integer topicalType;
      /**
      * 是否删除（ 0正常 1删除）
      * 归属主题名称
      */
      private Integer valid;
      private String topicalName;
      /**
      * 创建时间
      */
      private Long create_time;
      @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
      private Date createTime;
      }
      government-manager/src/main/java/com/mortals/xhx/busiz/onethinglist/OneThingReq.java
      View file @ 5dd836e0
      ......@@ -24,6 +24,12 @@ public class OneThingReq extends BaseReq implements Serializable {
      @ApiModelProperty(value = "主题包类型")
      private int type;
      /**
      * 主题包Id
      */
      @ApiModelProperty(value = "主题包Id")
      private Long topicId;
      /**
      * 当前请求页数
      */
      ......@@ -36,11 +42,12 @@ public class OneThingReq extends BaseReq implements Serializable {
      @ApiModelProperty(value = "每页记录数")
      private int limit;
      /**
      * 搜索关键词
      * 一件事名称
      */
      @ApiModelProperty(value = "搜索关键词")
      private String keywords;
      @ApiModelProperty(value = "搜索")
      private String name;
      }
      government-manager/src/main/java/com/mortals/xhx/busiz/question/AnswerReq.java
      View file @ 5dd836e0
      ......@@ -24,10 +24,8 @@ public class AnswerReq extends BaseReq implements Serializable {
      private List<Long> optionIds;
      /**
      * 问题路线id?
      * 主题事项Id
      */
      @ApiModelProperty(value = "问题路线id")
      private String key;
      private Long classifyId;
      }
      government-manager/src/main/java/com/mortals/xhx/busiz/question/BasicsInfo.java
      View file @ 5dd836e0
      ......@@ -11,74 +11,54 @@ import lombok.Data;
      @Data
      public class BasicsInfo {
      private Long id;
      /**
      * 模板标题
      * 移动主题包图标
      */
      private String title;
      private String moveIcon;
      /**
      * 一件事基础表id
      * 到现场次数
      */
      private Long basics_id;
      private Integer presenceNum;
      /**
      * 办理机构
      */
      private String jointInfoShow;
      /**
      * 法定时限
      */
      private String legalTimeLimitShow;
      /**
      * 承诺时限
      */
      private String promiseTimeLimitShow;
      /**
      * 是否收费,0,否，1是 默认0
      * 收费标准
      */
      private Integer isChargesShow;
      private String isChargesShow;
      /**
      * 收费金额
      */
      private String Charges;
      private String charges;
      /**
      * 办公时间
      * 办理时间
      */
      private String handleTimeShow;
      /**
      * 办公地址
      * 办理地点
      */
      private String handlePlaceShow;
      /**
      * 咨询电话
      * 咨询方式
      */
      private String cousultingTelephoneShow;
      /**
      * 投诉电话
      */
      private String supervisoryTelephoneShow;
      /**
      * 结果信息
      */
      private String resultInfo;
      /**
      * 常见问题
      * 投诉电话
      */
      private String qa;
      private Long create_time;
      private String supervisoryTelephoneShow;
      }
      government-manager/src/main/java/com/mortals/xhx/busiz/question/QuestionInfo.java
      View file @ 5dd836e0
      ......@@ -13,6 +13,11 @@ import java.util.List;
      @Data
      public class QuestionInfo {
      /**
      * 基本信息
      */
      private BasicsInfo basicsInfo;
      /**
      * 事项列表列表
      */
      ......
      government-manager/src/main/java/com/mortals/xhx/busiz/uploadfile/SubmitDatumReq.java
      View file @ 5dd836e0
      ......@@ -18,19 +18,17 @@ import java.util.List;
      @ApiModel(value = "SubmitDatumReq", description = "请求参数")
      public class SubmitDatumReq extends BaseReq implements Serializable {
      /**
      * 申请主题包id
      * 申请主题id
      */
      @ApiModelProperty(value = "申请主题包id")
      @ApiModelProperty(value = "申请主题id")
      private Long classifyTopicId;
      /**
      * 站点ID
      */
      @ApiModelProperty(value = "村数据下的站点id")
      @ApiModelProperty(value = "数据下的站点id")
      private Long siteId;
      ......
      government-manager/src/main/java/com/mortals/xhx/common/code/SiteSatusEnum.java → government-manager/src/main/java/com/mortals/xhx/common/code/SatusEnum.java
      View file @ 5dd836e0
      ......@@ -8,14 +8,14 @@ import java.util.Map;
      * @author
      *
      */
      public enum SiteSatusEnum {
      public enum SatusEnum {
      DISENABLE(0, "禁用"),
      ENABLE(1, "启用");
      private int value;
      private String desc;
      SiteSatusEnum(int value, String desc) {
      SatusEnum(int value, String desc) {
      this.value = value;
      this.desc = desc;
      ......@@ -30,8 +30,8 @@ public enum SiteSatusEnum {
      return desc;
      }
      public static SiteSatusEnum getByValue(int value) {
      for (SiteSatusEnum examStatus : SiteSatusEnum.values()) {
      public static SatusEnum getByValue(int value) {
      for (SatusEnum examStatus : SatusEnum.values()) {
      if (examStatus.getValue() == value) {
      return examStatus;
      }
      ......@@ -46,7 +46,7 @@ public enum SiteSatusEnum {
      public static Map<String,String> getEnumMap(int... eItem) {
      Map<String,String> resultMap= new LinkedHashMap<String,String>();
      for (SiteSatusEnum item : SiteSatusEnum.values()) {
      for (SatusEnum item : SatusEnum.values()) {
      try{
      boolean hasE = false;
      for (int e : eItem){
      ......
      government-manager/src/main/java/com/mortals/xhx/daemon/demo/RequestDispatchController.http
      View file @ 5dd836e0
      ......@@ -97,3 +97,11 @@ POST {{baseUrl}}/m/member/test
      Content-Type: application/json
      {"affairCode":"510184-20200624-000003","name":"11111","systemCode":"dadfasdf"}
      ###测试截取topic
      POST {{baseUrl}}/m/topic/sys/a1GFjLP****/device123/_thing/service/post
      Content-Type: application/json
      {"affairCode":"510184-20200624-000003","name":"11111","systemCode":"dadfasdf"}
      government-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterService.java
      View file @ 5dd836e0
      package com.mortals.xhx.module.matter.service;
      import com.mortals.framework.service.ICRUDCacheService;
      import com.mortals.framework.service.ICRUDService;
      import com.mortals.xhx.module.matter.model.MatterEntity;
      ......
      government-manager/src/main/java/com/mortals/xhx/module/one/model/OneClassifyEntity.java
      View file @ 5dd836e0
      package com.mortals.xhx.module.one.model;
      import java.util.Date;
      import java.util.List;
      import java.util.ArrayList;
      import com.mortals.framework.annotation.Excel;
      import com.mortals.framework.model.BaseEntityLong;
      import com.mortals.xhx.module.one.model.vo.OneClassifyVo;
      /**
      * 分类引导实体对象
      *
      * Description:OneClassify
      * date: 2021-9-22 20:09:50
      * @author zxfei
      * @date 2021-11-16
      */
      public class OneClassifyEntity extends OneClassifyEntityExt{
      private static final long serialVersionUID = 1632312590973L;
      public class OneClassifyEntity extends OneClassifyVo {
      private static final long serialVersionUID = 1L;
      /**
      * 分类名称
      */
      private String classifyName;
      /**
      * 分类引导提问
      */
      private String tName;
      /**
      * 分类级别
      */
      private Integer classifyLevel;
      private Long classifyLevel;
      /**
      * 业务ID
      */
      private String businessId;
      /**
      * 事项ID
      */
      private String matterIds;
      /**
      * 站点ID
      */
      private Long siteId;
      /**
      * 父级ID
      */
      private Long parentId;
      /**
      * 分类备注
      */
      private String sortRemarks;
      /**
      * 是否问题，0问题，1是答案 默认0
      */
      private Integer isAns;
      /**
      * 是否叶子节点，0否，1是 默认0
      */
      private Integer isLeaf;
      /**
      * 是否删除
      */
      private Integer deleted;
      /**
      * 创建人id
      */
      private Long createUserId;
      /**
      * 创建人名称
      */
      private String createUserName;
      /**
      * 创建时间
      */
      private Date createTime;
      /**
      * 修改人
      */
      private Long updateUserId;
      /**
      * 修改人名称
      */
      private String updateUserName;
      /**
      * 更新时间
      */
      private Date updateTime;
      public OneClassifyEntity(){
      }
      public OneClassifyEntity(){}
      /**
      * 获取 分类名称
      * @return classifyName
      * @return String
      */
      public String getClassifyName() {
      return this.classifyName;
      public String getClassifyName(){
      return classifyName;
      }
      /**
      * 设置 分类名称
      * @param classifyName
      */
      public void setClassifyName(String classifyName) {
      public void setClassifyName(String classifyName){
      this.classifyName = classifyName;
      }
      /**
      * 获取 分类引导提问
      * @return tName
      * @return String
      */
      public String getTName() {
      return this.tName;
      public String getTName(){
      return tName;
      }
      /**
      * 设置 分类引导提问
      * @param tName
      */
      public void setTName(String tName) {
      public void setTName(String tName){
      this.tName = tName;
      }
      /**
      * 获取 分类级别
      * @return classifyLevel
      * @return Long
      */
      public Integer getClassifyLevel() {
      return this.classifyLevel;
      public Long getClassifyLevel(){
      return classifyLevel;
      }
      /**
      * 设置 分类级别
      * @param classifyLevel
      */
      public void setClassifyLevel(Integer classifyLevel) {
      public void setClassifyLevel(Long classifyLevel){
      this.classifyLevel = classifyLevel;
      }
      /**
      * 获取 业务ID
      * @return businessId
      * @return String
      */
      public String getBusinessId() {
      return this.businessId;
      public String getBusinessId(){
      return businessId;
      }
      /**
      * 设置 业务ID
      * @param businessId
      */
      public void setBusinessId(String businessId) {
      public void setBusinessId(String businessId){
      this.businessId = businessId;
      }
      /**
      * 获取 事项ID
      * @return matterIds
      * @return String
      */
      public String getMatterIds() {
      return this.matterIds;
      public String getMatterIds(){
      return matterIds;
      }
      /**
      * 设置 事项ID
      * @param matterIds
      */
      public void setMatterIds(String matterIds) {
      public void setMatterIds(String matterIds){
      this.matterIds = matterIds;
      }
      /**
      * 获取 站点ID
      * @return siteId
      */
      public Long getSiteId() {
      return this.siteId;
      }
      /**
      * 设置 站点ID
      * @param siteId
      */
      public void setSiteId(Long siteId) {
      this.siteId = siteId;
      }
      /**
      * 获取 父级ID
      * @return parentId
      * @return Long
      */
      public Long getParentId() {
      return this.parentId;
      public Long getParentId(){
      return parentId;
      }
      /**
      * 设置 父级ID
      * @param parentId
      */
      public void setParentId(Long parentId) {
      public void setParentId(Long parentId){
      this.parentId = parentId;
      }
      /**
      * 获取 分类备注
      * @return sortRemarks
      * @return String
      */
      public String getSortRemarks() {
      return this.sortRemarks;
      public String getSortRemarks(){
      return sortRemarks;
      }
      /**
      * 设置 分类备注
      * @param sortRemarks
      */
      public void setSortRemarks(String sortRemarks) {
      public void setSortRemarks(String sortRemarks){
      this.sortRemarks = sortRemarks;
      }
      /**
      * 获取 是否问题，0问题，1是答案 默认0
      * @return isAns
      * @return Integer
      */
      public Integer getIsAns() {
      return this.isAns;
      public Integer getIsAns(){
      return isAns;
      }
      /**
      * 设置 是否问题，0问题，1是答案 默认0
      * @param isAns
      */
      public void setIsAns(Integer isAns) {
      public void setIsAns(Integer isAns){
      this.isAns = isAns;
      }
      /**
      * 获取 是否叶子节点，0否，1是 默认0
      * @return isLeaf
      * @return Integer
      */
      public Integer getIsLeaf() {
      return this.isLeaf;
      public Integer getIsLeaf(){
      return isLeaf;
      }
      /**
      * 设置 是否叶子节点，0否，1是 默认0
      * @param isLeaf
      */
      public void setIsLeaf(Integer isLeaf) {
      public void setIsLeaf(Integer isLeaf){
      this.isLeaf = isLeaf;
      }
      /**
      * 获取 是否删除
      * @return deleted
      * @return Integer
      */
      public Integer getDeleted() {
      return this.deleted;
      public Integer getDeleted(){
      return deleted;
      }
      /**
      * 设置 是否删除
      * @param deleted
      */
      public void setDeleted(Integer deleted) {
      public void setDeleted(Integer deleted){
      this.deleted = deleted;
      }
      /**
      * 获取 创建人id
      * @return createUserId
      */
      public Long getCreateUserId() {
      return this.createUserId;
      }
      /**
      * 设置 创建人id
      * @param createUserId
      */
      public void setCreateUserId(Long createUserId) {
      this.createUserId = createUserId;
      }
      /**
      * 获取 创建人名称
      * @return createUserName
      * @return String
      */
      public String getCreateUserName() {
      return this.createUserName;
      public String getCreateUserName(){
      return createUserName;
      }
      /**
      * 设置 创建人名称
      * @param createUserName
      */
      public void setCreateUserName(String createUserName) {
      public void setCreateUserName(String createUserName){
      this.createUserName = createUserName;
      }
      /**
      * 获取 创建时间
      * @return createTime
      */
      public Date getCreateTime() {
      return this.createTime;
      }
      /**
      * 设置 创建时间
      * @param createTime
      */
      public void setCreateTime(Date createTime) {
      this.createTime = createTime;
      }
      /**
      * 获取 修改人
      * @return updateUserId
      */
      public Long getUpdateUserId() {
      return this.updateUserId;
      }
      /**
      * 设置 修改人
      * @param updateUserId
      */
      public void setUpdateUserId(Long updateUserId) {
      this.updateUserId = updateUserId;
      }
      /**
      * 获取 修改人名称
      * @return updateUserName
      * @return String
      */
      public String getUpdateUserName() {
      return this.updateUserName;
      public String getUpdateUserName(){
      return updateUserName;
      }
      /**
      * 设置 修改人名称
      * @param updateUserName
      */
      public void setUpdateUserName(String updateUserName) {
      public void setUpdateUserName(String updateUserName){
      this.updateUserName = updateUserName;
      }
      /**
      * 获取 更新时间
      * @return updateTime
      */
      public Date getUpdateTime() {
      return this.updateTime;
      }
      /**
      * 设置 更新时间
      * @param updateTime
      */
      public void setUpdateTime(Date updateTime) {
      this.updateTime = updateTime;
      }
      @Override
      public int hashCode() {
      return this.getId().hashCode();
      return this.getId().hashCode();
      }
      @Override
      public boolean equals(Object obj) {
      if (obj == null)
      return false;
      if (obj == null) return false;
      if (obj instanceof OneClassifyEntity) {
      OneClassifyEntity tmp = (OneClassifyEntity) obj;
      if (this.getId().longValue() == tmp.getId().longValue()) {
      return true;
      if (this.getId() == tmp.getId()) {
      return true;
      }
      }
      return false;
      ......@@ -357,46 +256,33 @@ public class OneClassifyEntity extends OneClassifyEntityExt{
      public String toString(){
      StringBuilder sb = new StringBuilder("");
      sb
      .append(",id:").append(getId())
      .append(",classifyName:").append(getClassifyName())
      .append(",tName:").append(getTName())
      .append(",classifyLevel:").append(getClassifyLevel())
      .append(",businessId:").append(getBusinessId())
      .append(",matterIds:").append(getMatterIds())
      .append(",siteId:").append(getSiteId())
      .append(",parentId:").append(getParentId())
      .append(",sortRemarks:").append(getSortRemarks())
      .append(",isAns:").append(getIsAns())
      .append(",isLeaf:").append(getIsLeaf())
      .append(",deleted:").append(getDeleted())
      .append(",createUserId:").append(getCreateUserId())
      .append(",createUserName:").append(getCreateUserName())
      .append(",createTime:").append(getCreateTime())
      .append(",updateUserId:").append(getUpdateUserId())
      .append(",updateUserName:").append(getUpdateUserName())
      .append(",updateTime:").append(getUpdateTime())
      ;
      sb.append(",classifyName:").append(getClassifyName());
      sb.append(",tName:").append(getTName());
      sb.append(",classifyLevel:").append(getClassifyLevel());
      sb.append(",businessId:").append(getBusinessId());
      sb.append(",matterIds:").append(getMatterIds());
      sb.append(",parentId:").append(getParentId());
      sb.append(",sortRemarks:").append(getSortRemarks());
      sb.append(",isAns:").append(getIsAns());
      sb.append(",isLeaf:").append(getIsLeaf());
      sb.append(",deleted:").append(getDeleted());
      sb.append(",createUserName:").append(getCreateUserName());
      sb.append(",updateUserName:").append(getUpdateUserName());
      return sb.toString();
      }
      public void initAttrValue(){
      this.classifyName = null;
      this.tName = null;
      this.classifyLevel = null;
      this.businessId = null;
      this.matterIds = null;
      this.siteId = null;
      this.parentId = null;
      this.sortRemarks = null;
      this.isAns = null;
      this.isLeaf = null;
      this.deleted = null;
      this.createUserId = null;
      this.createUserName = null;
      this.createTime = null;
      this.updateUserId = null;
      this.updateUserName = null;
      this.updateTime = null;
      this.classifyName = null;
      this.tName = null;
      this.classifyLevel = null;
      this.businessId = null;
      this.matterIds = "";
      this.parentId = null;
      this.sortRemarks = null;
      this.isAns = 0;
      this.isLeaf = 0;
      this.deleted = 0;
      this.createUserName = null;
      this.updateUserName = null;
      }
      }
      \ No newline at end of file
      government-manager/src/main/java/com/mortals/xhx/module/one/model/OneClassifyEntityExt.java deleted 100644 → 0
      View file @ c1446d69
      package com.mortals.xhx.module.one.model;
      import com.mortals.framework.model.BaseEntityLong;
      import lombok.Getter;
      import lombok.Setter;
      import java.util.Date;
      import java.util.List;
      /**
      *
      * Description:OneClassify
      * date: 2021-9-13 16:21:34
      */
      @Setter
      @Getter
      public class OneClassifyEntityExt extends BaseEntityLong{
      private List<OneClassifyEntity> children;
      private boolean hasChildren;
      private String matterNames;
      private List<String> matterNameList;
      }
      \ No newline at end of file
      government-manager/src/main/java/com/mortals/xhx/module/one/model/OneClassifyQuery.java
      View file @ 5dd836e0
      package com.mortals.xhx.module.one.model;
      import java.util.List;
      import java.util.Date;
      import com.mortals.xhx.module.one.model.OneClassifyEntity;
      /**
      * 分类引导查询对象
      *
      * Description:OneClassify
      * date: 2021-9-22 20:09:51
      * @author zxfei
      * @date 2021-11-16
      */
      public class OneClassifyQuery extends OneClassifyEntity{
      private static final long serialVersionUID = 1632312591297L;
      public class OneClassifyQuery extends OneClassifyEntity {
      /** 开始 主键，自增长 */
      private Long idStart;
      ......@@ -19,10 +18,9 @@ public class OneClassifyQuery extends OneClassifyEntity{
      /** 增加 主键，自增长 */
      private Long idIncrement;
      /** 主键，自增长 */
      /** 主键，自增长列表 */
      private List <Long> idList;
      /** 分类名称 */
      private List<String> classifyNameList;
      ......@@ -30,33 +28,22 @@ public class OneClassifyQuery extends OneClassifyEntity{
      private List<String> tNameList;
      /** 开始 分类级别 */
      private Integer classifyLevelStart;
      private Long classifyLevelStart;
      /** 结束 分类级别 */
      private Integer classifyLevelEnd;
      private Long classifyLevelEnd;
      /** 增加 分类级别 */
      private Integer classifyLevelIncrement;
      private Long classifyLevelIncrement;
      /** 分类级别 */
      private List <Integer> classifyLevelList;
      /** 分类级别列表 */
      private List <Long> classifyLevelList;
      /** 业务ID */
      private List<String> businessIdList;
      /** 事项ID */
      private List<String> matterIdsList;
      /** 开始 站点ID */
      private Long siteIdStart;
      /** 结束 站点ID */
      private Long siteIdEnd;
      /** 增加 站点ID */
      private Long siteIdIncrement;
      /** 站点ID */
      private List <Long> siteIdList;
      /** 开始 父级ID */
      private Long parentIdStart;
      ......@@ -67,10 +54,9 @@ public class OneClassifyQuery extends OneClassifyEntity{
      /** 增加 父级ID */
      private Long parentIdIncrement;
      /** 父级ID */
      /** 父级ID列表 */
      private List <Long> parentIdList;
      /** 分类备注 */
      private List<String> sortRemarksList;
      ......@@ -83,7 +69,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      /** 增加 是否问题，0问题，1是答案 默认0 */
      private Integer isAnsIncrement;
      /** 是否问题，0问题，1是答案 默认0 */
      /** 是否问题，0问题，1是答案 默认0列表 */
      private List <Integer> isAnsList;
      /** 开始 是否叶子节点，0否，1是 默认0 */
      ......@@ -95,7 +81,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      /** 增加 是否叶子节点，0否，1是 默认0 */
      private Integer isLeafIncrement;
      /** 是否叶子节点，0否，1是 默认0 */
      /** 是否叶子节点，0否，1是 默认0列表 */
      private List <Integer> isLeafList;
      /** 开始 是否删除 */
      ......@@ -107,8 +93,9 @@ public class OneClassifyQuery extends OneClassifyEntity{
      /** 增加 是否删除 */
      private Integer deletedIncrement;
      /** 是否删除 */
      /** 是否删除列表 */
      private List <Integer> deletedList;
      /** 开始 创建人id */
      private Long createUserIdStart;
      ......@@ -118,17 +105,18 @@ public class OneClassifyQuery extends OneClassifyEntity{
      /** 增加 创建人id */
      private Long createUserIdIncrement;
      /** 创建人id */
      /** 创建人id列表 */
      private List <Long> createUserIdList;
      /** 创建人名称 */
      private List<String> createUserNameList;
      /** 开始 创建时间 */
      private String createTimeStart;
      /** 结束 创建时间 */
      private String createTimeEnd;
      /** 开始 修改人 */
      private Long updateUserIdStart;
      ......@@ -138,12 +126,12 @@ public class OneClassifyQuery extends OneClassifyEntity{
      /** 增加 修改人 */
      private Long updateUserIdIncrement;
      /** 修改人 */
      /** 修改人列表 */
      private List <Long> updateUserIdList;
      /** 修改人名称 */
      private List<String> updateUserNameList;
      /** 开始 更新时间 */
      private String updateTimeStart;
      ......@@ -156,16 +144,14 @@ public class OneClassifyQuery extends OneClassifyEntity{
      /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
      private List<OneClassifyQuery> andConditionList;
      public OneClassifyQuery(){
      }
      public OneClassifyQuery(){}
      /**
      * 获取 开始 主键，自增长
      * @return idStart
      */
      public Long getIdStart(){
      return this.idStart;
      return this.idStart;
      }
      /**
      ......@@ -173,15 +159,15 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @param idStart
      */
      public void setIdStart(Long idStart){
      this.idStart = idStart;
      this.idStart = idStart;
      }
      /**
      * 获取 结束 主键，自增长
      * @return idEnd
      * @return $idEnd
      */
      public Long getIdEnd(){
      return this.idEnd;
      return this.idEnd;
      }
      /**
      ......@@ -189,7 +175,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @param idEnd
      */
      public void setIdEnd(Long idEnd){
      this.idEnd = idEnd;
      this.idEnd = idEnd;
      }
      /**
      ......@@ -197,7 +183,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @return idIncrement
      */
      public Long getIdIncrement(){
      return this.idIncrement;
      return this.idIncrement;
      }
      /**
      ......@@ -205,7 +191,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @param idIncrement
      */
      public void setIdIncrement(Long idIncrement){
      this.idIncrement = idIncrement;
      this.idIncrement = idIncrement;
      }
      /**
      ......@@ -213,7 +199,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @return idList
      */
      public List<Long> getIdList(){
      return this.idList;
      return this.idList;
      }
      /**
      ......@@ -222,7 +208,8 @@ public class OneClassifyQuery extends OneClassifyEntity{
      */
      public void setIdList(List<Long> idList){
      this.idList = idList;
      }
      }
      /**
      * 获取 分类名称
      * @return classifyNameList
      ......@@ -257,7 +244,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * 获取 开始 分类级别
      * @return classifyLevelStart
      */
      public Integer getClassifyLevelStart(){
      public Long getClassifyLevelStart(){
      return this.classifyLevelStart;
      }
      ......@@ -265,15 +252,15 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * 设置 开始 分类级别
      * @param classifyLevelStart
      */
      public void setClassifyLevelStart(Integer classifyLevelStart){
      public void setClassifyLevelStart(Long classifyLevelStart){
      this.classifyLevelStart = classifyLevelStart;
      }
      /**
      * 获取 结束 分类级别
      * @return classifyLevelEnd
      * @return $classifyLevelEnd
      */
      public Integer getClassifyLevelEnd(){
      public Long getClassifyLevelEnd(){
      return this.classifyLevelEnd;
      }
      ......@@ -281,7 +268,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * 设置 结束 分类级别
      * @param classifyLevelEnd
      */
      public void setClassifyLevelEnd(Integer classifyLevelEnd){
      public void setClassifyLevelEnd(Long classifyLevelEnd){
      this.classifyLevelEnd = classifyLevelEnd;
      }
      ......@@ -289,7 +276,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * 获取 增加 分类级别
      * @return classifyLevelIncrement
      */
      public Integer getClassifyLevelIncrement(){
      public Long getClassifyLevelIncrement(){
      return this.classifyLevelIncrement;
      }
      ......@@ -297,7 +284,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * 设置 增加 分类级别
      * @param classifyLevelIncrement
      */
      public void setClassifyLevelIncrement(Integer classifyLevelIncrement){
      public void setClassifyLevelIncrement(Long classifyLevelIncrement){
      this.classifyLevelIncrement = classifyLevelIncrement;
      }
      ......@@ -305,7 +292,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * 获取 分类级别
      * @return classifyLevelList
      */
      public List<Integer> getClassifyLevelList(){
      public List<Long> getClassifyLevelList(){
      return this.classifyLevelList;
      }
      ......@@ -313,9 +300,10 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * 设置 分类级别
      * @param classifyLevelList
      */
      public void setClassifyLevelList(List<Integer> classifyLevelList){
      public void setClassifyLevelList(List<Long> classifyLevelList){
      this.classifyLevelList = classifyLevelList;
      }
      /**
      * 获取 业务ID
      * @return businessIdList
      ......@@ -347,74 +335,11 @@ public class OneClassifyQuery extends OneClassifyEntity{
      this.matterIdsList = matterIdsList;
      }
      /**
      * 获取 开始 站点ID
      * @return siteIdStart
      */
      public Long getSiteIdStart(){
      return this.siteIdStart;
      }
      /**
      * 设置 开始 站点ID
      * @param siteIdStart
      */
      public void setSiteIdStart(Long siteIdStart){
      this.siteIdStart = siteIdStart;
      }
      /**
      * 获取 结束 站点ID
      * @return siteIdEnd
      */
      public Long getSiteIdEnd(){
      return this.siteIdEnd;
      }
      /**
      * 设置 结束 站点ID
      * @param siteIdEnd
      */
      public void setSiteIdEnd(Long siteIdEnd){
      this.siteIdEnd = siteIdEnd;
      }
      /**
      * 获取 增加 站点ID
      * @return siteIdIncrement
      */
      public Long getSiteIdIncrement(){
      return this.siteIdIncrement;
      }
      /**
      * 设置 增加 站点ID
      * @param siteIdIncrement
      */
      public void setSiteIdIncrement(Long siteIdIncrement){
      this.siteIdIncrement = siteIdIncrement;
      }
      /**
      * 获取 站点ID
      * @return siteIdList
      */
      public List<Long> getSiteIdList(){
      return this.siteIdList;
      }
      /**
      * 设置 站点ID
      * @param siteIdList
      */
      public void setSiteIdList(List<Long> siteIdList){
      this.siteIdList = siteIdList;
      }
      /**
      * 获取 开始 父级ID
      * @return parentIdStart
      */
      public Long getParentIdStart(){
      return this.parentIdStart;
      return this.parentIdStart;
      }
      /**
      ......@@ -422,15 +347,15 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @param parentIdStart
      */
      public void setParentIdStart(Long parentIdStart){
      this.parentIdStart = parentIdStart;
      this.parentIdStart = parentIdStart;
      }
      /**
      * 获取 结束 父级ID
      * @return parentIdEnd
      * @return $parentIdEnd
      */
      public Long getParentIdEnd(){
      return this.parentIdEnd;
      return this.parentIdEnd;
      }
      /**
      ......@@ -438,7 +363,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @param parentIdEnd
      */
      public void setParentIdEnd(Long parentIdEnd){
      this.parentIdEnd = parentIdEnd;
      this.parentIdEnd = parentIdEnd;
      }
      /**
      ......@@ -446,7 +371,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @return parentIdIncrement
      */
      public Long getParentIdIncrement(){
      return this.parentIdIncrement;
      return this.parentIdIncrement;
      }
      /**
      ......@@ -454,7 +379,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @param parentIdIncrement
      */
      public void setParentIdIncrement(Long parentIdIncrement){
      this.parentIdIncrement = parentIdIncrement;
      this.parentIdIncrement = parentIdIncrement;
      }
      /**
      ......@@ -462,7 +387,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @return parentIdList
      */
      public List<Long> getParentIdList(){
      return this.parentIdList;
      return this.parentIdList;
      }
      /**
      ......@@ -471,7 +396,8 @@ public class OneClassifyQuery extends OneClassifyEntity{
      */
      public void setParentIdList(List<Long> parentIdList){
      this.parentIdList = parentIdList;
      }
      }
      /**
      * 获取 分类备注
      * @return sortRemarksList
      ......@@ -505,7 +431,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      /**
      * 获取 结束 是否问题，0问题，1是答案 默认0
      * @return isAnsEnd
      * @return $isAnsEnd
      */
      public Integer getIsAnsEnd(){
      return this.isAnsEnd;
      ......@@ -550,6 +476,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      public void setIsAnsList(List<Integer> isAnsList){
      this.isAnsList = isAnsList;
      }
      /**
      * 获取 开始 是否叶子节点，0否，1是 默认0
      * @return isLeafStart
      ......@@ -568,7 +495,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      /**
      * 获取 结束 是否叶子节点，0否，1是 默认0
      * @return isLeafEnd
      * @return $isLeafEnd
      */
      public Integer getIsLeafEnd(){
      return this.isLeafEnd;
      ......@@ -613,6 +540,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      public void setIsLeafList(List<Integer> isLeafList){
      this.isLeafList = isLeafList;
      }
      /**
      * 获取 开始 是否删除
      * @return deletedStart
      ......@@ -631,7 +559,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      /**
      * 获取 结束 是否删除
      * @return deletedEnd
      * @return $deletedEnd
      */
      public Integer getDeletedEnd(){
      return this.deletedEnd;
      ......@@ -676,12 +604,13 @@ public class OneClassifyQuery extends OneClassifyEntity{
      public void setDeletedList(List<Integer> deletedList){
      this.deletedList = deletedList;
      }
      /**
      * 获取 开始 创建人id
      * @return createUserIdStart
      */
      public Long getCreateUserIdStart(){
      return this.createUserIdStart;
      return this.createUserIdStart;
      }
      /**
      ......@@ -689,15 +618,15 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @param createUserIdStart
      */
      public void setCreateUserIdStart(Long createUserIdStart){
      this.createUserIdStart = createUserIdStart;
      this.createUserIdStart = createUserIdStart;
      }
      /**
      * 获取 结束 创建人id
      * @return createUserIdEnd
      * @return $createUserIdEnd
      */
      public Long getCreateUserIdEnd(){
      return this.createUserIdEnd;
      return this.createUserIdEnd;
      }
      /**
      ......@@ -705,7 +634,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @param createUserIdEnd
      */
      public void setCreateUserIdEnd(Long createUserIdEnd){
      this.createUserIdEnd = createUserIdEnd;
      this.createUserIdEnd = createUserIdEnd;
      }
      /**
      ......@@ -713,7 +642,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @return createUserIdIncrement
      */
      public Long getCreateUserIdIncrement(){
      return this.createUserIdIncrement;
      return this.createUserIdIncrement;
      }
      /**
      ......@@ -721,7 +650,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @param createUserIdIncrement
      */
      public void setCreateUserIdIncrement(Long createUserIdIncrement){
      this.createUserIdIncrement = createUserIdIncrement;
      this.createUserIdIncrement = createUserIdIncrement;
      }
      /**
      ......@@ -729,7 +658,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @return createUserIdList
      */
      public List<Long> getCreateUserIdList(){
      return this.createUserIdList;
      return this.createUserIdList;
      }
      /**
      ......@@ -738,7 +667,8 @@ public class OneClassifyQuery extends OneClassifyEntity{
      */
      public void setCreateUserIdList(List<Long> createUserIdList){
      this.createUserIdList = createUserIdList;
      }
      }
      /**
      * 获取 创建人名称
      * @return createUserNameList
      ......@@ -759,7 +689,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @return createTimeStart
      */
      public String getCreateTimeStart(){
      return this.createTimeStart;
      return this.createTimeStart;
      }
      /**
      ......@@ -767,7 +697,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @param createTimeStart
      */
      public void setCreateTimeStart(String createTimeStart){
      this.createTimeStart = createTimeStart;
      this.createTimeStart = createTimeStart;
      }
      /**
      ......@@ -775,7 +705,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @return createTimeEnd
      */
      public String getCreateTimeEnd(){
      return this.createTimeEnd;
      return this.createTimeEnd;
      }
      /**
      ......@@ -783,14 +713,15 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @param createTimeEnd
      */
      public void setCreateTimeEnd(String createTimeEnd){
      this.createTimeEnd = createTimeEnd;
      this.createTimeEnd = createTimeEnd;
      }
      /**
      * 获取 开始 修改人
      * @return updateUserIdStart
      */
      public Long getUpdateUserIdStart(){
      return this.updateUserIdStart;
      return this.updateUserIdStart;
      }
      /**
      ......@@ -798,15 +729,15 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @param updateUserIdStart
      */
      public void setUpdateUserIdStart(Long updateUserIdStart){
      this.updateUserIdStart = updateUserIdStart;
      this.updateUserIdStart = updateUserIdStart;
      }
      /**
      * 获取 结束 修改人
      * @return updateUserIdEnd
      * @return $updateUserIdEnd
      */
      public Long getUpdateUserIdEnd(){
      return this.updateUserIdEnd;
      return this.updateUserIdEnd;
      }
      /**
      ......@@ -814,7 +745,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @param updateUserIdEnd
      */
      public void setUpdateUserIdEnd(Long updateUserIdEnd){
      this.updateUserIdEnd = updateUserIdEnd;
      this.updateUserIdEnd = updateUserIdEnd;
      }
      /**
      ......@@ -822,7 +753,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @return updateUserIdIncrement
      */
      public Long getUpdateUserIdIncrement(){
      return this.updateUserIdIncrement;
      return this.updateUserIdIncrement;
      }
      /**
      ......@@ -830,7 +761,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @param updateUserIdIncrement
      */
      public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
      this.updateUserIdIncrement = updateUserIdIncrement;
      this.updateUserIdIncrement = updateUserIdIncrement;
      }
      /**
      ......@@ -838,7 +769,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @return updateUserIdList
      */
      public List<Long> getUpdateUserIdList(){
      return this.updateUserIdList;
      return this.updateUserIdList;
      }
      /**
      ......@@ -847,7 +778,8 @@ public class OneClassifyQuery extends OneClassifyEntity{
      */
      public void setUpdateUserIdList(List<Long> updateUserIdList){
      this.updateUserIdList = updateUserIdList;
      }
      }
      /**
      * 获取 修改人名称
      * @return updateUserNameList
      ......@@ -868,7 +800,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @return updateTimeStart
      */
      public String getUpdateTimeStart(){
      return this.updateTimeStart;
      return this.updateTimeStart;
      }
      /**
      ......@@ -876,7 +808,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @param updateTimeStart
      */
      public void setUpdateTimeStart(String updateTimeStart){
      this.updateTimeStart = updateTimeStart;
      this.updateTimeStart = updateTimeStart;
      }
      /**
      ......@@ -884,7 +816,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @return updateTimeEnd
      */
      public String getUpdateTimeEnd(){
      return this.updateTimeEnd;
      return this.updateTimeEnd;
      }
      /**
      ......@@ -892,11 +824,10 @@ public class OneClassifyQuery extends OneClassifyEntity{
      * @param updateTimeEnd
      */
      public void setUpdateTimeEnd(String updateTimeEnd){
      this.updateTimeEnd = updateTimeEnd;
      this.updateTimeEnd = updateTimeEnd;
      }
      /**
      /**
      * 设置 主键，自增长
      * @param id
      */
      ......@@ -940,6 +871,8 @@ public class OneClassifyQuery extends OneClassifyEntity{
      this.idList = idList;
      return this;
      }
      /**
      * 设置 分类名称
      * @param classifyName
      ......@@ -949,7 +882,6 @@ public class OneClassifyQuery extends OneClassifyEntity{
      return this;
      }
      /**
      * 设置 分类名称
      * @param classifyNameList
      ......@@ -958,6 +890,8 @@ public class OneClassifyQuery extends OneClassifyEntity{
      this.classifyNameList = classifyNameList;
      return this;
      }
      /**
      * 设置 分类引导提问
      * @param tName
      ......@@ -967,7 +901,6 @@ public class OneClassifyQuery extends OneClassifyEntity{
      return this;
      }
      /**
      * 设置 分类引导提问
      * @param tNameList
      ......@@ -976,54 +909,53 @@ public class OneClassifyQuery extends OneClassifyEntity{
      this.tNameList = tNameList;
      return this;
      }
      /**
      /**
      * 设置 分类级别
      * @param classifyLevel
      */
      public OneClassifyQuery classifyLevel(Integer classifyLevel){
      setClassifyLevel(classifyLevel);
      public OneClassifyQuery classifyLevel(Long classifyLevel){
      setClassifyLevel(classifyLevel);
      return this;
      }
      /**
      /**
      * 设置 开始 分类级别
      * @param classifyLevelStart
      */
      public OneClassifyQuery classifyLevelStart(Integer classifyLevelStart){
      this.classifyLevelStart = classifyLevelStart;
      public OneClassifyQuery classifyLevelStart(Long classifyLevelStart){
      this.classifyLevelStart = classifyLevelStart;
      return this;
      }
      /**
      * 设置 结束 分类级别
      * @param classifyLevelEnd
      */
      public OneClassifyQuery classifyLevelEnd(Integer classifyLevelEnd){
      this.classifyLevelEnd = classifyLevelEnd;
      public OneClassifyQuery classifyLevelEnd(Long classifyLevelEnd){
      this.classifyLevelEnd = classifyLevelEnd;
      return this;
      }
      /**
      * 设置 增加 分类级别
      * @param classifyLevelIncrement
      */
      public OneClassifyQuery classifyLevelIncrement(Integer classifyLevelIncrement){
      this.classifyLevelIncrement = classifyLevelIncrement;
      public OneClassifyQuery classifyLevelIncrement(Long classifyLevelIncrement){
      this.classifyLevelIncrement = classifyLevelIncrement;
      return this;
      }
      /**
      * 设置 分类级别
      * @param classifyLevelList
      */
      public OneClassifyQuery classifyLevelList(List<Integer> classifyLevelList){
      public OneClassifyQuery classifyLevelList(List<Long> classifyLevelList){
      this.classifyLevelList = classifyLevelList;
      return this;
      }
      }
      /**
      * 设置 业务ID
      * @param businessId
      ......@@ -1033,7 +965,6 @@ public class OneClassifyQuery extends OneClassifyEntity{
      return this;
      }
      /**
      * 设置 业务ID
      * @param businessIdList
      ......@@ -1042,6 +973,8 @@ public class OneClassifyQuery extends OneClassifyEntity{
      this.businessIdList = businessIdList;
      return this;
      }
      /**
      * 设置 事项ID
      * @param matterIds
      ......@@ -1051,7 +984,6 @@ public class OneClassifyQuery extends OneClassifyEntity{
      return this;
      }
      /**
      * 设置 事项ID
      * @param matterIdsList
      ......@@ -1061,52 +993,7 @@ public class OneClassifyQuery extends OneClassifyEntity{
      return this;
      }
      /**
      * 设置 站点ID
      * @param siteId
      */
      public OneClassifyQuery siteId(Long siteId){
      setSiteId(siteId);
      return this;
      }
      /**
      * 设置 开始 站点ID
      * @param siteIdStart
      */
      public OneClassifyQuery siteIdStart(Long siteIdStart){
      this.siteIdStart = siteIdStart;
      return this;
      }
      /**
      * 设置 结束 站点ID
      * @param siteIdEnd
      */
      public OneClassifyQuery siteIdEnd(Long siteIdEnd){
      this.siteIdEnd = siteIdEnd;
      return this;
      }
      /**
      * 设置 增加 站点ID
      * @param siteIdIncrement
      */
      public OneClassifyQuery siteIdIncrement(Long siteIdIncrement){
      this.siteIdIncrement = siteIdIncrement;
      return this;
      }
      /**
      * 设置 站点ID
      * @param siteIdList
      */
      public OneClassifyQuery siteIdList(List<Long> siteIdList){
      this.siteIdList = siteIdList;
      return this;
      }
      /**
      * 设置 父级ID
      * @param parentId
      */
      ......@@ -1150,6 +1037,8 @@ public class OneClassifyQuery extends OneClassifyEntity{
      this.parentIdList = parentIdList;
      return this;
      }
      /**
      * 设置 分类备注
      * @param sortRemarks
      ......@@ -1159,7 +1048,6 @@ public class OneClassifyQuery extends OneClassifyEntity{
      return this;
      }
      /**
      * 设置 分类备注
      * @param sortRemarksList
      ......@@ -1168,46 +1056,43 @@ public class OneClassifyQuery extends OneClassifyEntity{
      this.sortRemarksList = sortRemarksList;
      return this;
      }
      /**
      /**
      * 设置 是否问题，0问题，1是答案 默认0
      * @param isAns
      */
      public OneClassifyQuery isAns(Integer isAns){
      setIsAns(isAns);
      setIsAns(isAns);
      return this;
      }
      /**
      /**
      * 设置 开始 是否问题，0问题，1是答案 默认0
      * @param isAnsStart
      */
      public OneClassifyQuery isAnsStart(Integer isAnsStart){
      this.isAnsStart = isAnsStart;
      this.isAnsStart = isAnsStart;
      return this;
      }
      /**
      * 设置 结束 是否问题，0问题，1是答案 默认0
      * @param isAnsEnd
      */
      public OneClassifyQuery isAnsEnd(Integer isAnsEnd){
      this.isAnsEnd = isAnsEnd;
      this.isAnsEnd = isAnsEnd;
      return this;
      }
      /**
      * 设置 增加 是否问题，0问题，1是答案 默认0
      * @param isAnsIncrement
      */
      public OneClassifyQuery isAnsIncrement(Integer isAnsIncrement){
      this.isAnsIncrement = isAnsIncrement;
      this.isAnsIncrement = isAnsIncrement;
      return this;
      }
      /**
      * 设置 是否问题，0问题，1是答案 默认0
      * @param isAnsList
      ......@@ -1215,47 +1100,44 @@ public class OneClassifyQuery extends OneClassifyEntity{
      public OneClassifyQuery isAnsList(List<Integer> isAnsList){
      this.isAnsList = isAnsList;
      return this;
      }
      /**
      }
      /**
      * 设置 是否叶子节点，0否，1是 默认0
      * @param isLeaf
      */
      public OneClassifyQuery isLeaf(Integer isLeaf){
      setIsLeaf(isLeaf);
      setIsLeaf(isLeaf);
      return this;
      }
      /**
      /**
      * 设置 开始 是否叶子节点，0否，1是 默认0
      * @param isLeafStart
      */
      public OneClassifyQuery isLeafStart(Integer isLeafStart){
      this.isLeafStart = isLeafStart;
      this.isLeafStart = isLeafStart;
      return this;
      }
      /**
      * 设置 结束 是否叶子节点，0否，1是 默认0
      * @param isLeafEnd
      */
      public OneClassifyQuery isLeafEnd(Integer isLeafEnd){
      this.isLeafEnd = isLeafEnd;
      this.isLeafEnd = isLeafEnd;
      return this;
      }
      /**
      * 设置 增加 是否叶子节点，0否，1是 默认0
      * @param isLeafIncrement
      */
      public OneClassifyQuery isLeafIncrement(Integer isLeafIncrement){
      this.isLeafIncrement = isLeafIncrement;
      this.isLeafIncrement = isLeafIncrement;
      return this;
      }
      /**
      * 设置 是否叶子节点，0否，1是 默认0
      * @param isLeafList
      ......@@ -1263,47 +1145,44 @@ public class OneClassifyQuery extends OneClassifyEntity{
      public OneClassifyQuery isLeafList(List<Integer> isLeafList){
      this.isLeafList = isLeafList;
      return this;
      }
      /**
      }
      /**
      * 设置 是否删除
      * @param deleted
      */
      public OneClassifyQuery deleted(Integer deleted){
      setDeleted(deleted);
      setDeleted(deleted);
      return this;
      }
      /**
      /**
      * 设置 开始 是否删除
      * @param deletedStart
      */
      public OneClassifyQuery deletedStart(Integer deletedStart){
      this.deletedStart = deletedStart;
      this.deletedStart = deletedStart;
      return this;
      }
      /**
      * 设置 结束 是否删除
      * @param deletedEnd
      */
      public OneClassifyQuery deletedEnd(Integer deletedEnd){
      this.deletedEnd = deletedEnd;
      this.deletedEnd = deletedEnd;
      return this;
      }
      /**
      * 设置 增加 是否删除
      * @param deletedIncrement
      */
      public OneClassifyQuery deletedIncrement(Integer deletedIncrement){
      this.deletedIncrement = deletedIncrement;
      this.deletedIncrement = deletedIncrement;
      return this;
      }
      /**
      * 设置 是否删除
      * @param deletedList
      ......@@ -1311,9 +1190,9 @@ public class OneClassifyQuery extends OneClassifyEntity{
      public OneClassifyQuery deletedList(List<Integer> deletedList){
      this.deletedList = deletedList;
      return this;
      }
      }
      /**
      /**
      * 设置 创建人id
      * @param createUserId
      */
      ......@@ -1357,6 +1236,8 @@ public class OneClassifyQuery extends OneClassifyEntity{
      this.createUserIdList = createUserIdList;
      return this;
      }
      /**
      * 设置 创建人名称
      * @param createUserName
      ......@@ -1366,7 +1247,6 @@ public class OneClassifyQuery extends OneClassifyEntity{
      return this;
      }
      /**
      * 设置 创建人名称
      * @param createUserNameList
      ......@@ -1376,26 +1256,8 @@ public class OneClassifyQuery extends OneClassifyEntity{
      return this;
      }
      /**
      * 设置 开始 创建时间
      * @param createTimeStart
      */
      public OneClassifyQuery createTimeStart(String createTimeStart){
      this.createTimeStart = createTimeStart;
      return this;
      }
      /**
      * 设置 结束 创建时间
      * @param createTimeEnd
      */
      public OneClassifyQuery createTimeEnd(String createTimeEnd){
      this.createTimeEnd = createTimeEnd;
      return this;
      }
      /**
      * 设置 修改人
      * @param updateUserId
      */
      ......@@ -1439,6 +1301,8 @@ public class OneClassifyQuery extends OneClassifyEntity{
      this.updateUserIdList = updateUserIdList;
      return this;
      }
      /**
      * 设置 修改人名称
      * @param updateUserName
      ......@@ -1448,7 +1312,6 @@ public class OneClassifyQuery extends OneClassifyEntity{
      return this;
      }
      /**
      * 设置 修改人名称
      * @param updateUserNameList
      ......@@ -1458,25 +1321,6 @@ public class OneClassifyQuery extends OneClassifyEntity{
      return this;
      }
      /**
      * 设置 开始 更新时间
      * @param updateTimeStart
      */
      public OneClassifyQuery updateTimeStart(String updateTimeStart){
      this.updateTimeStart = updateTimeStart;
      return this;
      }
      /**
      * 设置 结束 更新时间
      * @param updateTimeEnd
      */
      public OneClassifyQuery updateTimeEnd(String updateTimeEnd){
      this.updateTimeEnd = updateTimeEnd;
      return this;
      }
      /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      ......
      government-manager/src/main/java/com/mortals/xhx/module/one/model/OneClassifyTopicalEntity.java
      View file @ 5dd836e0
      package com.mortals.xhx.module.one.model;
      import java.util.Date;
      import java.util.List;
      import java.util.ArrayList;
      import com.mortals.framework.annotation.Excel;
      import com.mortals.framework.model.BaseEntityLong;
      import com.mortals.xhx.module.one.model.vo.OneClassifyTopicalVo;
      /**
      * 分类引导主题中间实体对象
      *
      * Description:OneClassifyTopical
      * date: 2021-9-13 16:21:34
      * @author zxfei
      * @date 2021-11-16
      */
      public class OneClassifyTopicalEntity extends BaseEntityLong{
      private static final long serialVersionUID = 1631521294913L;
      public class OneClassifyTopicalEntity extends OneClassifyTopicalVo {
      private static final long serialVersionUID = 1L;
      /**
      * 主题id
      */
      private Long topicalId;
      /**
      * 分类引导id
      */
      private Long classifyId;
      /**
      * 分类引导排序
      */
      private Integer classifyRank;
      /**
      * 终端主题包图标（建议图标尺寸为290px*180px，格式为png）
      */
      private String terminalIcon;
      /**
      * 移动主题包图标（建议图标尺寸为42px*42px，格式为png）
      */
      private String moveIcon;
      /**
      * 承诺办结方式（1 即办，2 工作日）
      * 事项id(多个事项以逗号隔开)
      */
      private Integer overWay;
      private String matterId;
      /**
      * 承诺办结时限
      * 到现场次数
      */
      private String overTime;
      private Integer presenceNum;
      /**
      * 站点id
      * 办理机构
      */
      private Long siteId;
      private String jointInfoShow;
      /**
      * 事项id(多个事项以逗号隔开)
      * 法定时限
      */
      private String matterId;
      private String legalTimeLimitShow;
      /**
      * 到现场次数
      * 承诺时限
      */
      private Integer presenceNum;
      private String promiseTimeLimitShow;
      /**
      *
      * 收费标准
      */
      private Integer deleted;
      private String isChargesShow;
      /**
      * 创建人id
      * 收费金额
      */
      private Long createUserId;
      private String charges;
      /**
      * 创建人名称
      * 办理时间
      */
      private String createUserName;
      private String handleTimeShow;
      /**
      * 创建时间
      * 办理地点
      */
      private Date createTime;
      private String handlePlaceShow;
      /**
      * 修改人
      * 咨询方式
      */
      private Long updateUserId;
      private String cousultingTelephoneShow;
      /**
      * 结果信息
      */
      private String resultInfo;
      /**
      * 投诉电话
      */
      private String supervisoryTelephoneShow;
      /**
      *
      */
      private Integer deleted;
      /**
      * 创建人名称
      */
      private String createUserName;
      /**
      * 修改人名称
      */
      private String updateUserName;
      /**
      * 更新时间
      */
      private Date updateTime;
      public OneClassifyTopicalEntity(){
      }
      public OneClassifyTopicalEntity(){}
      /**
      * 获取 主题id
      * @return topicalId
      * @return Long
      */
      public Long getTopicalId() {
      return this.topicalId;
      public Long getTopicalId(){
      return topicalId;
      }
      /**
      * 设置 主题id
      * @param topicalId
      */
      public void setTopicalId(Long topicalId) {
      public void setTopicalId(Long topicalId){
      this.topicalId = topicalId;
      }
      /**
      * 获取 分类引导id
      * @return classifyId
      * @return Long
      */
      public Long getClassifyId() {
      return this.classifyId;
      public Long getClassifyId(){
      return classifyId;
      }
      /**
      * 设置 分类引导id
      * @param classifyId
      */
      public void setClassifyId(Long classifyId) {
      public void setClassifyId(Long classifyId){
      this.classifyId = classifyId;
      }
      /**
      * 获取 分类引导排序
      * @return classifyRank
      * @return Integer
      */
      public Integer getClassifyRank() {
      return this.classifyRank;
      public Integer getClassifyRank(){
      return classifyRank;
      }
      /**
      * 设置 分类引导排序
      * @param classifyRank
      */
      public void setClassifyRank(Integer classifyRank) {
      public void setClassifyRank(Integer classifyRank){
      this.classifyRank = classifyRank;
      }
      /**
      * 获取 终端主题包图标（建议图标尺寸为290px*180px，格式为png）
      * @return terminalIcon
      * @return String
      */
      public String getTerminalIcon() {
      return this.terminalIcon;
      public String getTerminalIcon(){
      return terminalIcon;
      }
      /**
      * 设置 终端主题包图标（建议图标尺寸为290px*180px，格式为png）
      * @param terminalIcon
      */
      public void setTerminalIcon(String terminalIcon) {
      public void setTerminalIcon(String terminalIcon){
      this.terminalIcon = terminalIcon;
      }
      /**
      * 获取 移动主题包图标（建议图标尺寸为42px*42px，格式为png）
      * @return moveIcon
      * @return String
      */
      public String getMoveIcon() {
      return this.moveIcon;
      public String getMoveIcon(){
      return moveIcon;
      }
      /**
      * 设置 移动主题包图标（建议图标尺寸为42px*42px，格式为png）
      * @param moveIcon
      */
      public void setMoveIcon(String moveIcon) {
      public void setMoveIcon(String moveIcon){
      this.moveIcon = moveIcon;
      }
      /**
      * 获取 承诺办结方式（1 即办，2 工作日）
      * @return overWay
      * 获取 事项id(多个事项以逗号隔开)
      * @return String
      */
      public Integer getOverWay() {
      return this.overWay;
      public String getMatterId(){
      return matterId;
      }
      /**
      * 设置 承诺办结方式（1 即办，2 工作日）
      * @param overWay
      * 设置 事项id(多个事项以逗号隔开)
      * @param matterId
      */
      public void setOverWay(Integer overWay) {
      this.overWay = overWay;
      public void setMatterId(String matterId){
      this.matterId = matterId;
      }
      /**
      * 获取 承诺办结时限
      * @return overTime
      * 获取 到现场次数
      * @return Integer
      */
      public String getOverTime() {
      return this.overTime;
      public Integer getPresenceNum(){
      return presenceNum;
      }
      /**
      * 设置 承诺办结时限
      * @param overTime
      * 设置 到现场次数
      * @param presenceNum
      */
      public void setOverTime(String overTime) {
      this.overTime = overTime;
      public void setPresenceNum(Integer presenceNum){
      this.presenceNum = presenceNum;
      }
      /**
      * 获取 站点id
      * @return siteId
      * 获取 办理机构
      * @return String
      */
      public Long getSiteId() {
      return this.siteId;
      public String getJointInfoShow(){
      return jointInfoShow;
      }
      /**
      * 设置 站点id
      * @param siteId
      * 设置 办理机构
      * @param jointInfoShow
      */
      public void setSiteId(Long siteId) {
      this.siteId = siteId;
      public void setJointInfoShow(String jointInfoShow){
      this.jointInfoShow = jointInfoShow;
      }
      /**
      * 获取 事项id(多个事项以逗号隔开)
      * @return matterId
      * 获取 法定时限
      * @return String
      */
      public String getMatterId() {
      return this.matterId;
      public String getLegalTimeLimitShow(){
      return legalTimeLimitShow;
      }
      /**
      * 设置 事项id(多个事项以逗号隔开)
      * @param matterId
      * 设置 法定时限
      * @param legalTimeLimitShow
      */
      public void setMatterId(String matterId) {
      this.matterId = matterId;
      public void setLegalTimeLimitShow(String legalTimeLimitShow){
      this.legalTimeLimitShow = legalTimeLimitShow;
      }
      /**
      * 获取 到现场次数
      * @return presenceNum
      * 获取 承诺时限
      * @return String
      */
      public Integer getPresenceNum() {
      return this.presenceNum;
      public String getPromiseTimeLimitShow(){
      return promiseTimeLimitShow;
      }
      /**
      * 设置 到现场次数
      * @param presenceNum
      * 设置 承诺时限
      * @param promiseTimeLimitShow
      */
      public void setPresenceNum(Integer presenceNum) {
      this.presenceNum = presenceNum;
      public void setPromiseTimeLimitShow(String promiseTimeLimitShow){
      this.promiseTimeLimitShow = promiseTimeLimitShow;
      }
      /**
      * 获取
      * @return deleted
      * 获取 收费标准
      * @return String
      */
      public Integer getDeleted() {
      return this.deleted;
      public String getIsChargesShow(){
      return isChargesShow;
      }
      /**
      * 设置
      * @param deleted
      * 设置 收费标准
      * @param isChargesShow
      */
      public void setDeleted(Integer deleted) {
      this.deleted = deleted;
      public void setIsChargesShow(String isChargesShow){
      this.isChargesShow = isChargesShow;
      }
      /**
      * 获取 创建人id
      * @return createUserId
      * 获取 收费金额
      * @return String
      */
      public Long getCreateUserId() {
      return this.createUserId;
      public String getCharges(){
      return charges;
      }
      /**
      * 设置 创建人id
      * @param createUserId
      * 设置 收费金额
      * @param charges
      */
      public void setCreateUserId(Long createUserId) {
      this.createUserId = createUserId;
      public void setCharges(String charges){
      this.charges = charges;
      }
      /**
      * 获取 创建人名称
      * @return createUserName
      * 获取 办理时间
      * @return String
      */
      public String getCreateUserName() {
      return this.createUserName;
      public String getHandleTimeShow(){
      return handleTimeShow;
      }
      /**
      * 设置 创建人名称
      * @param createUserName
      * 设置 办理时间
      * @param handleTimeShow
      */
      public void setCreateUserName(String createUserName) {
      this.createUserName = createUserName;
      public void setHandleTimeShow(String handleTimeShow){
      this.handleTimeShow = handleTimeShow;
      }
      /**
      * 获取 创建时间
      * @return createTime
      * 获取 办理地点
      * @return String
      */
      public Date getCreateTime() {
      return this.createTime;
      public String getHandlePlaceShow(){
      return handlePlaceShow;
      }
      /**
      * 设置 创建时间
      * @param createTime
      * 设置 办理地点
      * @param handlePlaceShow
      */
      public void setCreateTime(Date createTime) {
      this.createTime = createTime;
      public void setHandlePlaceShow(String handlePlaceShow){
      this.handlePlaceShow = handlePlaceShow;
      }
      /**
      * 获取 修改人
      * @return updateUserId
      * 获取 咨询方式
      * @return String
      */
      public Long getUpdateUserId() {
      return this.updateUserId;
      public String getCousultingTelephoneShow(){
      return cousultingTelephoneShow;
      }
      /**
      * 设置 修改人
      * @param updateUserId
      * 设置 咨询方式
      * @param cousultingTelephoneShow
      */
      public void setUpdateUserId(Long updateUserId) {
      this.updateUserId = updateUserId;
      public void setCousultingTelephoneShow(String cousultingTelephoneShow){
      this.cousultingTelephoneShow = cousultingTelephoneShow;
      }
      /**
      * 获取 修改人名称
      * @return updateUserName
      * 获取 结果信息
      * @return String
      */
      public String getUpdateUserName() {
      return this.updateUserName;
      public String getResultInfo(){
      return resultInfo;
      }
      /**
      * 设置 修改人名称
      * @param updateUserName
      * 设置 结果信息
      * @param resultInfo
      */
      public void setUpdateUserName(String updateUserName) {
      this.updateUserName = updateUserName;
      public void setResultInfo(String resultInfo){
      this.resultInfo = resultInfo;
      }
      /**
      * 获取 投诉电话
      * @return String
      */
      public String getSupervisoryTelephoneShow(){
      return supervisoryTelephoneShow;
      }
      /**
      * 设置 投诉电话
      * @param supervisoryTelephoneShow
      */
      public void setSupervisoryTelephoneShow(String supervisoryTelephoneShow){
      this.supervisoryTelephoneShow = supervisoryTelephoneShow;
      }
      /**
      * 获取
      * @return Integer
      */
      public Integer getDeleted(){
      return deleted;
      }
      /**
      * 设置
      * @param deleted
      */
      public void setDeleted(Integer deleted){
      this.deleted = deleted;
      }
      /**
      * 获取 创建人名称
      * @return String
      */
      public String getCreateUserName(){
      return createUserName;
      }
      /**
      * 获取 更新时间
      * @return updateTime
      * 设置 创建人名称
      * @param createUserName
      */
      public Date getUpdateTime() {
      return this.updateTime;
      public void setCreateUserName(String createUserName){
      this.createUserName = createUserName;
      }
      /**
      * 设置 更新时间
      * @param updateTime
      * 获取 修改人名称
      * @return String
      */
      public void setUpdateTime(Date updateTime) {
      this.updateTime = updateTime;
      public String getUpdateUserName(){
      return updateUserName;
      }
      /**
      * 设置 修改人名称
      * @param updateUserName
      */
      public void setUpdateUserName(String updateUserName){
      this.updateUserName = updateUserName;
      }
      @Override
      public int hashCode() {
      return this.getId().hashCode();
      return this.getId().hashCode();
      }
      @Override
      public boolean equals(Object obj) {
      if (obj == null)
      return false;
      if (obj == null) return false;
      if (obj instanceof OneClassifyTopicalEntity) {
      OneClassifyTopicalEntity tmp = (OneClassifyTopicalEntity) obj;
      if (this.getId().longValue() == tmp.getId().longValue()) {
      return true;
      if (this.getId() == tmp.getId()) {
      return true;
      }
      }
      return false;
      ......@@ -357,46 +400,49 @@ public class OneClassifyTopicalEntity extends BaseEntityLong{
      public String toString(){
      StringBuilder sb = new StringBuilder("");
      sb
      .append(",id:").append(getId())
      .append(",topicalId:").append(getTopicalId())
      .append(",classifyId:").append(getClassifyId())
      .append(",classifyRank:").append(getClassifyRank())
      .append(",terminalIcon:").append(getTerminalIcon())
      .append(",moveIcon:").append(getMoveIcon())
      .append(",overWay:").append(getOverWay())
      .append(",overTime:").append(getOverTime())
      .append(",siteId:").append(getSiteId())
      .append(",matterId:").append(getMatterId())
      .append(",presenceNum:").append(getPresenceNum())
      .append(",deleted:").append(getDeleted())
      .append(",createUserId:").append(getCreateUserId())
      .append(",createUserName:").append(getCreateUserName())
      .append(",createTime:").append(getCreateTime())
      .append(",updateUserId:").append(getUpdateUserId())
      .append(",updateUserName:").append(getUpdateUserName())
      .append(",updateTime:").append(getUpdateTime())
      ;
      sb.append(",topicalId:").append(getTopicalId());
      sb.append(",classifyId:").append(getClassifyId());
      sb.append(",classifyRank:").append(getClassifyRank());
      sb.append(",terminalIcon:").append(getTerminalIcon());
      sb.append(",moveIcon:").append(getMoveIcon());
      sb.append(",matterId:").append(getMatterId());
      sb.append(",presenceNum:").append(getPresenceNum());
      sb.append(",jointInfoShow:").append(getJointInfoShow());
      sb.append(",legalTimeLimitShow:").append(getLegalTimeLimitShow());
      sb.append(",promiseTimeLimitShow:").append(getPromiseTimeLimitShow());
      sb.append(",isChargesShow:").append(getIsChargesShow());
      sb.append(",charges:").append(getCharges());
      sb.append(",handleTimeShow:").append(getHandleTimeShow());
      sb.append(",handlePlaceShow:").append(getHandlePlaceShow());
      sb.append(",cousultingTelephoneShow:").append(getCousultingTelephoneShow());
      sb.append(",resultInfo:").append(getResultInfo());
      sb.append(",supervisoryTelephoneShow:").append(getSupervisoryTelephoneShow());
      sb.append(",deleted:").append(getDeleted());
      sb.append(",createUserName:").append(getCreateUserName());
      sb.append(",updateUserName:").append(getUpdateUserName());
      return sb.toString();
      }
      public void initAttrValue(){
      this.topicalId = null;
      this.classifyId = null;
      this.classifyRank = null;
      this.terminalIcon = null;
      this.moveIcon = null;
      this.overWay = null;
      this.overTime = null;
      this.siteId = null;
      this.matterId = null;
      this.presenceNum = null;
      this.deleted = null;
      this.createUserId = null;
      this.createUserName = null;
      this.createTime = null;
      this.updateUserId = null;
      this.updateUserName = null;
      this.updateTime = null;
      this.topicalId = null;
      this.classifyId = null;
      this.classifyRank = null;
      this.terminalIcon = null;
      this.moveIcon = null;
      this.matterId = null;
      this.presenceNum = null;
      this.jointInfoShow = "";
      this.legalTimeLimitShow = "";
      this.promiseTimeLimitShow = "";
      this.isChargesShow = "否";
      this.charges = "";
      this.handleTimeShow = "";
      this.handlePlaceShow = "";
      this.cousultingTelephoneShow = "";
      this.resultInfo = "";
      this.supervisoryTelephoneShow = "";
      this.deleted = 0;
      this.createUserName = null;
      this.updateUserName = null;
      }
      }
      \ No newline at end of file
      government-manager/src/main/java/com/mortals/xhx/module/one/model/OneClassifyTopicalQuery.java
      View file @ 5dd836e0
      package com.mortals.xhx.module.one.model;
      import java.util.List;
      import java.util.Date;
      import com.mortals.xhx.module.one.model.OneClassifyTopicalEntity;
      /**
      * 分类引导主题中间查询对象
      *
      * Description:OneClassifyTopical
      * date: 2021-9-13 16:21:34
      * @author zxfei
      * @date 2021-11-16
      */
      public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      private static final long serialVersionUID = 1631521294915L;
      public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity {
      /** 开始 主键，自增长 */
      private Long idStart;
      ......@@ -19,7 +18,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      /** 增加 主键，自增长 */
      private Long idIncrement;
      /** 主键，自增长 */
      /** 主键，自增长列表 */
      private List <Long> idList;
      /** 开始 主题id */
      ......@@ -31,7 +30,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      /** 增加 主题id */
      private Long topicalIdIncrement;
      /** 主题id */
      /** 主题id列表 */
      private List <Long> topicalIdList;
      /** 开始 分类引导id */
      ......@@ -43,10 +42,9 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      /** 增加 分类引导id */
      private Long classifyIdIncrement;
      /** 分类引导id */
      /** 分类引导id列表 */
      private List <Long> classifyIdList;
      /** 开始 分类引导排序 */
      private Integer classifyRankStart;
      ......@@ -56,7 +54,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      /** 增加 分类引导排序 */
      private Integer classifyRankIncrement;
      /** 分类引导排序 */
      /** 分类引导排序列表 */
      private List <Integer> classifyRankList;
      /** 终端主题包图标（建议图标尺寸为290px*180px，格式为png） */
      ......@@ -65,33 +63,6 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      /** 移动主题包图标（建议图标尺寸为42px*42px，格式为png） */
      private List<String> moveIconList;
      /** 开始 承诺办结方式（1 即办，2 工作日） */
      private Integer overWayStart;
      /** 结束 承诺办结方式（1 即办，2 工作日） */
      private Integer overWayEnd;
      /** 增加 承诺办结方式（1 即办，2 工作日） */
      private Integer overWayIncrement;
      /** 承诺办结方式（1 即办，2 工作日） */
      private List <Integer> overWayList;
      /** 承诺办结时限 */
      private List<String> overTimeList;
      /** 开始 站点id */
      private Long siteIdStart;
      /** 结束 站点id */
      private Long siteIdEnd;
      /** 增加 站点id */
      private Long siteIdIncrement;
      /** 站点id */
      private List <Long> siteIdList;
      /** 事项id(多个事项以逗号隔开) */
      private List<String> matterIdList;
      ......@@ -104,9 +75,39 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      /** 增加 到现场次数 */
      private Integer presenceNumIncrement;
      /** 到现场次数 */
      /** 到现场次数列表 */
      private List <Integer> presenceNumList;
      /** 办理机构 */
      private List<String> jointInfoShowList;
      /** 法定时限 */
      private List<String> legalTimeLimitShowList;
      /** 承诺时限 */
      private List<String> promiseTimeLimitShowList;
      /** 收费标准 */
      private List<String> isChargesShowList;
      /** 收费金额 */
      private List<String> chargesList;
      /** 办理时间 */
      private List<String> handleTimeShowList;
      /** 办理地点 */
      private List<String> handlePlaceShowList;
      /** 咨询方式 */
      private List<String> cousultingTelephoneShowList;
      /** 结果信息 */
      private List<String> resultInfoList;
      /** 投诉电话 */
      private List<String> supervisoryTelephoneShowList;
      /** 开始 */
      private Integer deletedStart;
      ......@@ -116,8 +117,9 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      /** 增加 */
      private Integer deletedIncrement;
      /** */
      /** 列表 */
      private List <Integer> deletedList;
      /** 开始 创建人id */
      private Long createUserIdStart;
      ......@@ -127,17 +129,18 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      /** 增加 创建人id */
      private Long createUserIdIncrement;
      /** 创建人id */
      /** 创建人id列表 */
      private List <Long> createUserIdList;
      /** 创建人名称 */
      private List<String> createUserNameList;
      /** 开始 创建时间 */
      private String createTimeStart;
      /** 结束 创建时间 */
      private String createTimeEnd;
      /** 开始 修改人 */
      private Long updateUserIdStart;
      ......@@ -147,12 +150,12 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      /** 增加 修改人 */
      private Long updateUserIdIncrement;
      /** 修改人 */
      /** 修改人列表 */
      private List <Long> updateUserIdList;
      /** 修改人名称 */
      private List<String> updateUserNameList;
      /** 开始 更新时间 */
      private String updateTimeStart;
      ......@@ -165,16 +168,14 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
      private List<OneClassifyTopicalQuery> andConditionList;
      public OneClassifyTopicalQuery(){
      }
      public OneClassifyTopicalQuery(){}
      /**
      * 获取 开始 主键，自增长
      * @return idStart
      */
      public Long getIdStart(){
      return this.idStart;
      return this.idStart;
      }
      /**
      ......@@ -182,15 +183,15 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @param idStart
      */
      public void setIdStart(Long idStart){
      this.idStart = idStart;
      this.idStart = idStart;
      }
      /**
      * 获取 结束 主键，自增长
      * @return idEnd
      * @return $idEnd
      */
      public Long getIdEnd(){
      return this.idEnd;
      return this.idEnd;
      }
      /**
      ......@@ -198,7 +199,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @param idEnd
      */
      public void setIdEnd(Long idEnd){
      this.idEnd = idEnd;
      this.idEnd = idEnd;
      }
      /**
      ......@@ -206,7 +207,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @return idIncrement
      */
      public Long getIdIncrement(){
      return this.idIncrement;
      return this.idIncrement;
      }
      /**
      ......@@ -214,7 +215,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @param idIncrement
      */
      public void setIdIncrement(Long idIncrement){
      this.idIncrement = idIncrement;
      this.idIncrement = idIncrement;
      }
      /**
      ......@@ -222,7 +223,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @return idList
      */
      public List<Long> getIdList(){
      return this.idList;
      return this.idList;
      }
      /**
      ......@@ -231,13 +232,14 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      */
      public void setIdList(List<Long> idList){
      this.idList = idList;
      }
      }
      /**
      * 获取 开始 主题id
      * @return topicalIdStart
      */
      public Long getTopicalIdStart(){
      return this.topicalIdStart;
      return this.topicalIdStart;
      }
      /**
      ......@@ -245,15 +247,15 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @param topicalIdStart
      */
      public void setTopicalIdStart(Long topicalIdStart){
      this.topicalIdStart = topicalIdStart;
      this.topicalIdStart = topicalIdStart;
      }
      /**
      * 获取 结束 主题id
      * @return topicalIdEnd
      * @return $topicalIdEnd
      */
      public Long getTopicalIdEnd(){
      return this.topicalIdEnd;
      return this.topicalIdEnd;
      }
      /**
      ......@@ -261,7 +263,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @param topicalIdEnd
      */
      public void setTopicalIdEnd(Long topicalIdEnd){
      this.topicalIdEnd = topicalIdEnd;
      this.topicalIdEnd = topicalIdEnd;
      }
      /**
      ......@@ -269,7 +271,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @return topicalIdIncrement
      */
      public Long getTopicalIdIncrement(){
      return this.topicalIdIncrement;
      return this.topicalIdIncrement;
      }
      /**
      ......@@ -277,7 +279,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @param topicalIdIncrement
      */
      public void setTopicalIdIncrement(Long topicalIdIncrement){
      this.topicalIdIncrement = topicalIdIncrement;
      this.topicalIdIncrement = topicalIdIncrement;
      }
      /**
      ......@@ -285,7 +287,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @return topicalIdList
      */
      public List<Long> getTopicalIdList(){
      return this.topicalIdList;
      return this.topicalIdList;
      }
      /**
      ......@@ -294,13 +296,14 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      */
      public void setTopicalIdList(List<Long> topicalIdList){
      this.topicalIdList = topicalIdList;
      }
      }
      /**
      * 获取 开始 分类引导id
      * @return classifyIdStart
      */
      public Long getClassifyIdStart(){
      return this.classifyIdStart;
      return this.classifyIdStart;
      }
      /**
      ......@@ -308,15 +311,15 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @param classifyIdStart
      */
      public void setClassifyIdStart(Long classifyIdStart){
      this.classifyIdStart = classifyIdStart;
      this.classifyIdStart = classifyIdStart;
      }
      /**
      * 获取 结束 分类引导id
      * @return classifyIdEnd
      * @return $classifyIdEnd
      */
      public Long getClassifyIdEnd(){
      return this.classifyIdEnd;
      return this.classifyIdEnd;
      }
      /**
      ......@@ -324,7 +327,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @param classifyIdEnd
      */
      public void setClassifyIdEnd(Long classifyIdEnd){
      this.classifyIdEnd = classifyIdEnd;
      this.classifyIdEnd = classifyIdEnd;
      }
      /**
      ......@@ -332,7 +335,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @return classifyIdIncrement
      */
      public Long getClassifyIdIncrement(){
      return this.classifyIdIncrement;
      return this.classifyIdIncrement;
      }
      /**
      ......@@ -340,7 +343,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @param classifyIdIncrement
      */
      public void setClassifyIdIncrement(Long classifyIdIncrement){
      this.classifyIdIncrement = classifyIdIncrement;
      this.classifyIdIncrement = classifyIdIncrement;
      }
      /**
      ......@@ -348,7 +351,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @return classifyIdList
      */
      public List<Long> getClassifyIdList(){
      return this.classifyIdList;
      return this.classifyIdList;
      }
      /**
      ......@@ -357,7 +360,8 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      */
      public void setClassifyIdList(List<Long> classifyIdList){
      this.classifyIdList = classifyIdList;
      }
      }
      /**
      * 获取 开始 分类引导排序
      * @return classifyRankStart
      ......@@ -376,7 +380,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      /**
      * 获取 结束 分类引导排序
      * @return classifyRankEnd
      * @return $classifyRankEnd
      */
      public Integer getClassifyRankEnd(){
      return this.classifyRankEnd;
      ......@@ -421,6 +425,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      public void setClassifyRankList(List<Integer> classifyRankList){
      this.classifyRankList = classifyRankList;
      }
      /**
      * 获取 终端主题包图标（建议图标尺寸为290px*180px，格式为png）
      * @return terminalIconList
      ......@@ -452,223 +457,233 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      this.moveIconList = moveIconList;
      }
      /**
      * 获取 开始 承诺办结方式（1 即办，2 工作日）
      * @return overWayStart
      * 获取 事项id(多个事项以逗号隔开)
      * @return matterIdList
      */
      public Integer getOverWayStart(){
      return this.overWayStart;
      public List<String> getMatterIdList(){
      return this.matterIdList;
      }
      /**
      * 设置 开始 承诺办结方式（1 即办，2 工作日）
      * @param overWayStart
      * 设置 事项id(多个事项以逗号隔开)
      * @param matterIdList
      */
      public void setOverWayStart(Integer overWayStart){
      this.overWayStart = overWayStart;
      public void setMatterIdList(List<String> matterIdList){
      this.matterIdList = matterIdList;
      }
      /**
      * 获取 结束 承诺办结方式（1 即办，2 工作日）
      * @return overWayEnd
      * 获取 开始 到现场次数
      * @return presenceNumStart
      */
      public Integer getOverWayEnd(){
      return this.overWayEnd;
      public Integer getPresenceNumStart(){
      return this.presenceNumStart;
      }
      /**
      * 设置 结束 承诺办结方式（1 即办，2 工作日）
      * @param overWayEnd
      * 设置 开始 到现场次数
      * @param presenceNumStart
      */
      public void setOverWayEnd(Integer overWayEnd){
      this.overWayEnd = overWayEnd;
      public void setPresenceNumStart(Integer presenceNumStart){
      this.presenceNumStart = presenceNumStart;
      }
      /**
      * 获取 增加 承诺办结方式（1 即办，2 工作日）
      * @return overWayIncrement
      * 获取 结束 到现场次数
      * @return $presenceNumEnd
      */
      public Integer getOverWayIncrement(){
      return this.overWayIncrement;
      public Integer getPresenceNumEnd(){
      return this.presenceNumEnd;
      }
      /**
      * 设置 增加 承诺办结方式（1 即办，2 工作日）
      * @param overWayIncrement
      * 设置 结束 到现场次数
      * @param presenceNumEnd
      */
      public void setOverWayIncrement(Integer overWayIncrement){
      this.overWayIncrement = overWayIncrement;
      public void setPresenceNumEnd(Integer presenceNumEnd){
      this.presenceNumEnd = presenceNumEnd;
      }
      /**
      * 获取 承诺办结方式（1 即办，2 工作日）
      * @return overWayList
      * 获取 增加 到现场次数
      * @return presenceNumIncrement
      */
      public List<Integer> getOverWayList(){
      return this.overWayList;
      public Integer getPresenceNumIncrement(){
      return this.presenceNumIncrement;
      }
      /**
      * 设置 承诺办结方式（1 即办，2 工作日）
      * @param overWayList
      * 设置 增加 到现场次数
      * @param presenceNumIncrement
      */
      public void setOverWayList(List<Integer> overWayList){
      this.overWayList = overWayList;
      public void setPresenceNumIncrement(Integer presenceNumIncrement){
      this.presenceNumIncrement = presenceNumIncrement;
      }
      /**
      * 获取 承诺办结时限
      * @return overTimeList
      * 获取 到现场次数
      * @return presenceNumList
      */
      public List<String> getOverTimeList(){
      return this.overTimeList;
      public List<Integer> getPresenceNumList(){
      return this.presenceNumList;
      }
      /**
      * 设置 承诺办结时限
      * @param overTimeList
      * 设置 到现场次数
      * @param presenceNumList
      */
      public void setOverTimeList(List<String> overTimeList){
      this.overTimeList = overTimeList;
      public void setPresenceNumList(List<Integer> presenceNumList){
      this.presenceNumList = presenceNumList;
      }
      /**
      * 获取 开始 站点id
      * @return siteIdStart
      * 获取 办理机构
      * @return jointInfoShowList
      */
      public Long getSiteIdStart(){
      return this.siteIdStart;
      public List<String> getJointInfoShowList(){
      return this.jointInfoShowList;
      }
      /**
      * 设置 开始 站点id
      * @param siteIdStart
      * 设置 办理机构
      * @param jointInfoShowList
      */
      public void setSiteIdStart(Long siteIdStart){
      this.siteIdStart = siteIdStart;
      public void setJointInfoShowList(List<String> jointInfoShowList){
      this.jointInfoShowList = jointInfoShowList;
      }
      /**
      * 获取 结束 站点id
      * @return siteIdEnd
      * 获取 法定时限
      * @return legalTimeLimitShowList
      */
      public Long getSiteIdEnd(){
      return this.siteIdEnd;
      public List<String> getLegalTimeLimitShowList(){
      return this.legalTimeLimitShowList;
      }
      /**
      * 设置 结束 站点id
      * @param siteIdEnd
      * 设置 法定时限
      * @param legalTimeLimitShowList
      */
      public void setSiteIdEnd(Long siteIdEnd){
      this.siteIdEnd = siteIdEnd;
      public void setLegalTimeLimitShowList(List<String> legalTimeLimitShowList){
      this.legalTimeLimitShowList = legalTimeLimitShowList;
      }
      /**
      * 获取 增加 站点id
      * @return siteIdIncrement
      * 获取 承诺时限
      * @return promiseTimeLimitShowList
      */
      public Long getSiteIdIncrement(){
      return this.siteIdIncrement;
      public List<String> getPromiseTimeLimitShowList(){
      return this.promiseTimeLimitShowList;
      }
      /**
      * 设置 增加 站点id
      * @param siteIdIncrement
      * 设置 承诺时限
      * @param promiseTimeLimitShowList
      */
      public void setSiteIdIncrement(Long siteIdIncrement){
      this.siteIdIncrement = siteIdIncrement;
      public void setPromiseTimeLimitShowList(List<String> promiseTimeLimitShowList){
      this.promiseTimeLimitShowList = promiseTimeLimitShowList;
      }
      /**
      * 获取 站点id
      * @return siteIdList
      * 获取 收费标准
      * @return isChargesShowList
      */
      public List<Long> getSiteIdList(){
      return this.siteIdList;
      public List<String> getIsChargesShowList(){
      return this.isChargesShowList;
      }
      /**
      * 设置 站点id
      * @param siteIdList
      * 设置 收费标准
      * @param isChargesShowList
      */
      public void setSiteIdList(List<Long> siteIdList){
      this.siteIdList = siteIdList;
      }
      public void setIsChargesShowList(List<String> isChargesShowList){
      this.isChargesShowList = isChargesShowList;
      }
      /**
      * 获取 事项id(多个事项以逗号隔开)
      * @return matterIdList
      * 获取 收费金额
      * @return chargesList
      */
      public List<String> getMatterIdList(){
      return this.matterIdList;
      public List<String> getChargesList(){
      return this.chargesList;
      }
      /**
      * 设置 事项id(多个事项以逗号隔开)
      * @param matterIdList
      * 设置 收费金额
      * @param chargesList
      */
      public void setMatterIdList(List<String> matterIdList){
      this.matterIdList = matterIdList;
      public void setChargesList(List<String> chargesList){
      this.chargesList = chargesList;
      }
      /**
      * 获取 开始 到现场次数
      * @return presenceNumStart
      * 获取 办理时间
      * @return handleTimeShowList
      */
      public Integer getPresenceNumStart(){
      return this.presenceNumStart;
      public List<String> getHandleTimeShowList(){
      return this.handleTimeShowList;
      }
      /**
      * 设置 开始 到现场次数
      * @param presenceNumStart
      * 设置 办理时间
      * @param handleTimeShowList
      */
      public void setPresenceNumStart(Integer presenceNumStart){
      this.presenceNumStart = presenceNumStart;
      public void setHandleTimeShowList(List<String> handleTimeShowList){
      this.handleTimeShowList = handleTimeShowList;
      }
      /**
      * 获取 结束 到现场次数
      * @return presenceNumEnd
      * 获取 办理地点
      * @return handlePlaceShowList
      */
      public Integer getPresenceNumEnd(){
      return this.presenceNumEnd;
      public List<String> getHandlePlaceShowList(){
      return this.handlePlaceShowList;
      }
      /**
      * 设置 结束 到现场次数
      * @param presenceNumEnd
      * 设置 办理地点
      * @param handlePlaceShowList
      */
      public void setPresenceNumEnd(Integer presenceNumEnd){
      this.presenceNumEnd = presenceNumEnd;
      public void setHandlePlaceShowList(List<String> handlePlaceShowList){
      this.handlePlaceShowList = handlePlaceShowList;
      }
      /**
      * 获取 增加 到现场次数
      * @return presenceNumIncrement
      * 获取 咨询方式
      * @return cousultingTelephoneShowList
      */
      public Integer getPresenceNumIncrement(){
      return this.presenceNumIncrement;
      public List<String> getCousultingTelephoneShowList(){
      return this.cousultingTelephoneShowList;
      }
      /**
      * 设置 增加 到现场次数
      * @param presenceNumIncrement
      * 设置 咨询方式
      * @param cousultingTelephoneShowList
      */
      public void setPresenceNumIncrement(Integer presenceNumIncrement){
      this.presenceNumIncrement = presenceNumIncrement;
      public void setCousultingTelephoneShowList(List<String> cousultingTelephoneShowList){
      this.cousultingTelephoneShowList = cousultingTelephoneShowList;
      }
      /**
      * 获取 结果信息
      * @return resultInfoList
      */
      public List<String> getResultInfoList(){
      return this.resultInfoList;
      }
      /**
      * 获取 到现场次数
      * @return presenceNumList
      * 设置 结果信息
      * @param resultInfoList
      */
      public List<Integer> getPresenceNumList(){
      return this.presenceNumList;
      public void setResultInfoList(List<String> resultInfoList){
      this.resultInfoList = resultInfoList;
      }
      /**
      * 获取 投诉电话
      * @return supervisoryTelephoneShowList
      */
      public List<String> getSupervisoryTelephoneShowList(){
      return this.supervisoryTelephoneShowList;
      }
      /**
      * 设置 到现场次数
      * @param presenceNumList
      * 设置 投诉电话
      * @param supervisoryTelephoneShowList
      */
      public void setPresenceNumList(List<Integer> presenceNumList){
      this.presenceNumList = presenceNumList;
      public void setSupervisoryTelephoneShowList(List<String> supervisoryTelephoneShowList){
      this.supervisoryTelephoneShowList = supervisoryTelephoneShowList;
      }
      /**
      * 获取 开始
      ......@@ -688,7 +703,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      /**
      * 获取 结束
      * @return deletedEnd
      * @return $deletedEnd
      */
      public Integer getDeletedEnd(){
      return this.deletedEnd;
      ......@@ -733,12 +748,13 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      public void setDeletedList(List<Integer> deletedList){
      this.deletedList = deletedList;
      }
      /**
      * 获取 开始 创建人id
      * @return createUserIdStart
      */
      public Long getCreateUserIdStart(){
      return this.createUserIdStart;
      return this.createUserIdStart;
      }
      /**
      ......@@ -746,15 +762,15 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @param createUserIdStart
      */
      public void setCreateUserIdStart(Long createUserIdStart){
      this.createUserIdStart = createUserIdStart;
      this.createUserIdStart = createUserIdStart;
      }
      /**
      * 获取 结束 创建人id
      * @return createUserIdEnd
      * @return $createUserIdEnd
      */
      public Long getCreateUserIdEnd(){
      return this.createUserIdEnd;
      return this.createUserIdEnd;
      }
      /**
      ......@@ -762,7 +778,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @param createUserIdEnd
      */
      public void setCreateUserIdEnd(Long createUserIdEnd){
      this.createUserIdEnd = createUserIdEnd;
      this.createUserIdEnd = createUserIdEnd;
      }
      /**
      ......@@ -770,7 +786,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @return createUserIdIncrement
      */
      public Long getCreateUserIdIncrement(){
      return this.createUserIdIncrement;
      return this.createUserIdIncrement;
      }
      /**
      ......@@ -778,7 +794,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @param createUserIdIncrement
      */
      public void setCreateUserIdIncrement(Long createUserIdIncrement){
      this.createUserIdIncrement = createUserIdIncrement;
      this.createUserIdIncrement = createUserIdIncrement;
      }
      /**
      ......@@ -786,7 +802,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @return createUserIdList
      */
      public List<Long> getCreateUserIdList(){
      return this.createUserIdList;
      return this.createUserIdList;
      }
      /**
      ......@@ -795,7 +811,8 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      */
      public void setCreateUserIdList(List<Long> createUserIdList){
      this.createUserIdList = createUserIdList;
      }
      }
      /**
      * 获取 创建人名称
      * @return createUserNameList
      ......@@ -816,7 +833,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @return createTimeStart
      */
      public String getCreateTimeStart(){
      return this.createTimeStart;
      return this.createTimeStart;
      }
      /**
      ......@@ -824,7 +841,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @param createTimeStart
      */
      public void setCreateTimeStart(String createTimeStart){
      this.createTimeStart = createTimeStart;
      this.createTimeStart = createTimeStart;
      }
      /**
      ......@@ -832,7 +849,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @return createTimeEnd
      */
      public String getCreateTimeEnd(){
      return this.createTimeEnd;
      return this.createTimeEnd;
      }
      /**
      ......@@ -840,14 +857,15 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @param createTimeEnd
      */
      public void setCreateTimeEnd(String createTimeEnd){
      this.createTimeEnd = createTimeEnd;
      this.createTimeEnd = createTimeEnd;
      }
      /**
      * 获取 开始 修改人
      * @return updateUserIdStart
      */
      public Long getUpdateUserIdStart(){
      return this.updateUserIdStart;
      return this.updateUserIdStart;
      }
      /**
      ......@@ -855,15 +873,15 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @param updateUserIdStart
      */
      public void setUpdateUserIdStart(Long updateUserIdStart){
      this.updateUserIdStart = updateUserIdStart;
      this.updateUserIdStart = updateUserIdStart;
      }
      /**
      * 获取 结束 修改人
      * @return updateUserIdEnd
      * @return $updateUserIdEnd
      */
      public Long getUpdateUserIdEnd(){
      return this.updateUserIdEnd;
      return this.updateUserIdEnd;
      }
      /**
      ......@@ -871,7 +889,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @param updateUserIdEnd
      */
      public void setUpdateUserIdEnd(Long updateUserIdEnd){
      this.updateUserIdEnd = updateUserIdEnd;
      this.updateUserIdEnd = updateUserIdEnd;
      }
      /**
      ......@@ -879,7 +897,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @return updateUserIdIncrement
      */
      public Long getUpdateUserIdIncrement(){
      return this.updateUserIdIncrement;
      return this.updateUserIdIncrement;
      }
      /**
      ......@@ -887,7 +905,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @param updateUserIdIncrement
      */
      public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
      this.updateUserIdIncrement = updateUserIdIncrement;
      this.updateUserIdIncrement = updateUserIdIncrement;
      }
      /**
      ......@@ -895,7 +913,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @return updateUserIdList
      */
      public List<Long> getUpdateUserIdList(){
      return this.updateUserIdList;
      return this.updateUserIdList;
      }
      /**
      ......@@ -904,7 +922,8 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      */
      public void setUpdateUserIdList(List<Long> updateUserIdList){
      this.updateUserIdList = updateUserIdList;
      }
      }
      /**
      * 获取 修改人名称
      * @return updateUserNameList
      ......@@ -925,7 +944,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @return updateTimeStart
      */
      public String getUpdateTimeStart(){
      return this.updateTimeStart;
      return this.updateTimeStart;
      }
      /**
      ......@@ -933,7 +952,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @param updateTimeStart
      */
      public void setUpdateTimeStart(String updateTimeStart){
      this.updateTimeStart = updateTimeStart;
      this.updateTimeStart = updateTimeStart;
      }
      /**
      ......@@ -941,7 +960,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @return updateTimeEnd
      */
      public String getUpdateTimeEnd(){
      return this.updateTimeEnd;
      return this.updateTimeEnd;
      }
      /**
      ......@@ -949,11 +968,10 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      * @param updateTimeEnd
      */
      public void setUpdateTimeEnd(String updateTimeEnd){
      this.updateTimeEnd = updateTimeEnd;
      this.updateTimeEnd = updateTimeEnd;
      }
      /**
      /**
      * 设置 主键，自增长
      * @param id
      */
      ......@@ -998,7 +1016,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      return this;
      }
      /**
      /**
      * 设置 主题id
      * @param topicalId
      */
      ......@@ -1043,7 +1061,7 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      return this;
      }
      /**
      /**
      * 设置 分类引导id
      * @param classifyId
      */
      ......@@ -1087,46 +1105,43 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      this.classifyIdList = classifyIdList;
      return this;
      }
      /**
      /**
      * 设置 分类引导排序
      * @param classifyRank
      */
      public OneClassifyTopicalQuery classifyRank(Integer classifyRank){
      setClassifyRank(classifyRank);
      setClassifyRank(classifyRank);
      return this;
      }
      /**
      /**
      * 设置 开始 分类引导排序
      * @param classifyRankStart
      */
      public OneClassifyTopicalQuery classifyRankStart(Integer classifyRankStart){
      this.classifyRankStart = classifyRankStart;
      this.classifyRankStart = classifyRankStart;
      return this;
      }
      /**
      * 设置 结束 分类引导排序
      * @param classifyRankEnd
      */
      public OneClassifyTopicalQuery classifyRankEnd(Integer classifyRankEnd){
      this.classifyRankEnd = classifyRankEnd;
      this.classifyRankEnd = classifyRankEnd;
      return this;
      }
      /**
      * 设置 增加 分类引导排序
      * @param classifyRankIncrement
      */
      public OneClassifyTopicalQuery classifyRankIncrement(Integer classifyRankIncrement){
      this.classifyRankIncrement = classifyRankIncrement;
      this.classifyRankIncrement = classifyRankIncrement;
      return this;
      }
      /**
      * 设置 分类引导排序
      * @param classifyRankList
      ......@@ -1134,7 +1149,9 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      public OneClassifyTopicalQuery classifyRankList(List<Integer> classifyRankList){
      this.classifyRankList = classifyRankList;
      return this;
      }
      }
      /**
      * 设置 终端主题包图标（建议图标尺寸为290px*180px，格式为png）
      * @param terminalIcon
      ......@@ -1144,7 +1161,6 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      return this;
      }
      /**
      * 设置 终端主题包图标（建议图标尺寸为290px*180px，格式为png）
      * @param terminalIconList
      ......@@ -1153,6 +1169,8 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      this.terminalIconList = terminalIconList;
      return this;
      }
      /**
      * 设置 移动主题包图标（建议图标尺寸为42px*42px，格式为png）
      * @param moveIcon
      ......@@ -1162,7 +1180,6 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      return this;
      }
      /**
      * 设置 移动主题包图标（建议图标尺寸为42px*42px，格式为png）
      * @param moveIconList
      ......@@ -1171,223 +1188,297 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      this.moveIconList = moveIconList;
      return this;
      }
      /**
      * 设置 承诺办结方式（1 即办，2 工作日）
      * @param overWay
      * 设置 事项id(多个事项以逗号隔开)
      * @param matterId
      */
      public OneClassifyTopicalQuery overWay(Integer overWay){
      setOverWay(overWay);
      public OneClassifyTopicalQuery matterId(String matterId){
      setMatterId(matterId);
      return this;
      }
      /**
      * 设置 开始 承诺办结方式（1 即办，2 工作日）
      * @param overWayStart
      * 设置 事项id(多个事项以逗号隔开)
      * @param matterIdList
      */
      public OneClassifyTopicalQuery overWayStart(Integer overWayStart){
      this.overWayStart = overWayStart;
      public OneClassifyTopicalQuery matterIdList(List<String> matterIdList){
      this.matterIdList = matterIdList;
      return this;
      }
      /**
      * 设置 结束 承诺办结方式（1 即办，2 工作日）
      * @param overWayEnd
      * 设置 到现场次数
      * @param presenceNum
      */
      public OneClassifyTopicalQuery presenceNum(Integer presenceNum){
      setPresenceNum(presenceNum);
      return this;
      }
      /**
      * 设置 开始 到现场次数
      * @param presenceNumStart
      */
      public OneClassifyTopicalQuery overWayEnd(Integer overWayEnd){
      this.overWayEnd = overWayEnd;
      public OneClassifyTopicalQuery presenceNumStart(Integer presenceNumStart){
      this.presenceNumStart = presenceNumStart;
      return this;
      }
      /**
      * 设置 结束 到现场次数
      * @param presenceNumEnd
      */
      public OneClassifyTopicalQuery presenceNumEnd(Integer presenceNumEnd){
      this.presenceNumEnd = presenceNumEnd;
      return this;
      }
      /**
      * 设置 增加 承诺办结方式（1 即办，2 工作日）
      * @param overWayIncrement
      * 设置 增加 到现场次数
      * @param presenceNumIncrement
      */
      public OneClassifyTopicalQuery overWayIncrement(Integer overWayIncrement){
      this.overWayIncrement = overWayIncrement;
      public OneClassifyTopicalQuery presenceNumIncrement(Integer presenceNumIncrement){
      this.presenceNumIncrement = presenceNumIncrement;
      return this;
      }
      /**
      * 设置 到现场次数
      * @param presenceNumList
      */
      public OneClassifyTopicalQuery presenceNumList(List<Integer> presenceNumList){
      this.presenceNumList = presenceNumList;
      return this;
      }
      /**
      * 设置 办理机构
      * @param jointInfoShow
      */
      public OneClassifyTopicalQuery jointInfoShow(String jointInfoShow){
      setJointInfoShow(jointInfoShow);
      return this;
      }
      /**
      * 设置 承诺办结方式（1 即办，2 工作日）
      * @param overWayList
      * 设置 办理机构
      * @param jointInfoShowList
      */
      public OneClassifyTopicalQuery overWayList(List<Integer> overWayList){
      this.overWayList = overWayList;
      public OneClassifyTopicalQuery jointInfoShowList(List<String> jointInfoShowList){
      this.jointInfoShowList = jointInfoShowList;
      return this;
      }
      /**
      * 设置 承诺办结时限
      * @param overTime
      * 设置 法定时限
      * @param legalTimeLimitShow
      */
      public OneClassifyTopicalQuery overTime(String overTime){
      setOverTime(overTime);
      public OneClassifyTopicalQuery legalTimeLimitShow(String legalTimeLimitShow){
      setLegalTimeLimitShow(legalTimeLimitShow);
      return this;
      }
      /**
      * 设置 承诺办结时限
      * @param overTimeList
      * 设置 法定时限
      * @param legalTimeLimitShowList
      */
      public OneClassifyTopicalQuery overTimeList(List<String> overTimeList){
      this.overTimeList = overTimeList;
      public OneClassifyTopicalQuery legalTimeLimitShowList(List<String> legalTimeLimitShowList){
      this.legalTimeLimitShowList = legalTimeLimitShowList;
      return this;
      }
      /**
      * 设置 站点id
      * @param siteId
      * 设置 承诺时限
      * @param promiseTimeLimitShow
      */
      public OneClassifyTopicalQuery siteId(Long siteId){
      setSiteId(siteId);
      public OneClassifyTopicalQuery promiseTimeLimitShow(String promiseTimeLimitShow){
      setPromiseTimeLimitShow(promiseTimeLimitShow);
      return this;
      }
      /**
      * 设置 开始 站点id
      * @param siteIdStart
      /**
      * 设置 承诺时限
      * @param promiseTimeLimitShowList
      */
      public OneClassifyTopicalQuery siteIdStart(Long siteIdStart){
      this.siteIdStart = siteIdStart;
      public OneClassifyTopicalQuery promiseTimeLimitShowList(List<String> promiseTimeLimitShowList){
      this.promiseTimeLimitShowList = promiseTimeLimitShowList;
      return this;
      }
      /**
      * 设置 结束 站点id
      * @param siteIdEnd
      /**
      * 设置 收费标准
      * @param isChargesShow
      */
      public OneClassifyTopicalQuery siteIdEnd(Long siteIdEnd){
      this.siteIdEnd = siteIdEnd;
      public OneClassifyTopicalQuery isChargesShow(String isChargesShow){
      setIsChargesShow(isChargesShow);
      return this;
      }
      /**
      * 设置 增加 站点id
      * @param siteIdIncrement
      * 设置 收费标准
      * @param isChargesShowList
      */
      public OneClassifyTopicalQuery isChargesShowList(List<String> isChargesShowList){
      this.isChargesShowList = isChargesShowList;
      return this;
      }
      /**
      * 设置 收费金额
      * @param charges
      */
      public OneClassifyTopicalQuery siteIdIncrement(Long siteIdIncrement){
      this.siteIdIncrement = siteIdIncrement;
      public OneClassifyTopicalQuery charges(String charges){
      setCharges(charges);
      return this;
      }
      /**
      * 设置 站点id
      * @param siteIdList
      * 设置 收费金额
      * @param chargesList
      */
      public OneClassifyTopicalQuery siteIdList(List<Long> siteIdList){
      this.siteIdList = siteIdList;
      public OneClassifyTopicalQuery chargesList(List<String> chargesList){
      this.chargesList = chargesList;
      return this;
      }
      }
      /**
      * 设置 事项id(多个事项以逗号隔开)
      * @param matterId
      * 设置 办理时间
      * @param handleTimeShow
      */
      public OneClassifyTopicalQuery matterId(String matterId){
      setMatterId(matterId);
      public OneClassifyTopicalQuery handleTimeShow(String handleTimeShow){
      setHandleTimeShow(handleTimeShow);
      return this;
      }
      /**
      * 设置 事项id(多个事项以逗号隔开)
      * @param matterIdList
      * 设置 办理时间
      * @param handleTimeShowList
      */
      public OneClassifyTopicalQuery matterIdList(List<String> matterIdList){
      this.matterIdList = matterIdList;
      public OneClassifyTopicalQuery handleTimeShowList(List<String> handleTimeShowList){
      this.handleTimeShowList = handleTimeShowList;
      return this;
      }
      /**
      * 设置 到现场次数
      * @param presenceNum
      * 设置 办理地点
      * @param handlePlaceShow
      */
      public OneClassifyTopicalQuery presenceNum(Integer presenceNum){
      setPresenceNum(presenceNum);
      public OneClassifyTopicalQuery handlePlaceShow(String handlePlaceShow){
      setHandlePlaceShow(handlePlaceShow);
      return this;
      }
      /**
      * 设置 开始 到现场次数
      * @param presenceNumStart
      * 设置 办理地点
      * @param handlePlaceShowList
      */
      public OneClassifyTopicalQuery presenceNumStart(Integer presenceNumStart){
      this.presenceNumStart = presenceNumStart;
      public OneClassifyTopicalQuery handlePlaceShowList(List<String> handlePlaceShowList){
      this.handlePlaceShowList = handlePlaceShowList;
      return this;
      }
      /**
      * 设置 咨询方式
      * @param cousultingTelephoneShow
      */
      public OneClassifyTopicalQuery cousultingTelephoneShow(String cousultingTelephoneShow){
      setCousultingTelephoneShow(cousultingTelephoneShow);
      return this;
      }
      /**
      * 设置 结束 到现场次数
      * @param presenceNumEnd
      * 设置 咨询方式
      * @param cousultingTelephoneShowList
      */
      public OneClassifyTopicalQuery presenceNumEnd(Integer presenceNumEnd){
      this.presenceNumEnd = presenceNumEnd;
      public OneClassifyTopicalQuery cousultingTelephoneShowList(List<String> cousultingTelephoneShowList){
      this.cousultingTelephoneShowList = cousultingTelephoneShowList;
      return this;
      }
      /**
      * 设置 结果信息
      * @param resultInfo
      */
      public OneClassifyTopicalQuery resultInfo(String resultInfo){
      setResultInfo(resultInfo);
      return this;
      }
      /**
      * 设置 增加 到现场次数
      * @param presenceNumIncrement
      * 设置 结果信息
      * @param resultInfoList
      */
      public OneClassifyTopicalQuery presenceNumIncrement(Integer presenceNumIncrement){
      this.presenceNumIncrement = presenceNumIncrement;
      public OneClassifyTopicalQuery resultInfoList(List<String> resultInfoList){
      this.resultInfoList = resultInfoList;
      return this;
      }
      /**
      * 设置 投诉电话
      * @param supervisoryTelephoneShow
      */
      public OneClassifyTopicalQuery supervisoryTelephoneShow(String supervisoryTelephoneShow){
      setSupervisoryTelephoneShow(supervisoryTelephoneShow);
      return this;
      }
      /**
      * 设置 到现场次数
      * @param presenceNumList
      * 设置 投诉电话
      * @param supervisoryTelephoneShowList
      */
      public OneClassifyTopicalQuery presenceNumList(List<Integer> presenceNumList){
      this.presenceNumList = presenceNumList;
      public OneClassifyTopicalQuery supervisoryTelephoneShowList(List<String> supervisoryTelephoneShowList){
      this.supervisoryTelephoneShowList = supervisoryTelephoneShowList;
      return this;
      }
      /**
      /**
      * 设置
      * @param deleted
      */
      public OneClassifyTopicalQuery deleted(Integer deleted){
      setDeleted(deleted);
      setDeleted(deleted);
      return this;
      }
      /**
      /**
      * 设置 开始
      * @param deletedStart
      */
      public OneClassifyTopicalQuery deletedStart(Integer deletedStart){
      this.deletedStart = deletedStart;
      this.deletedStart = deletedStart;
      return this;
      }
      /**
      * 设置 结束
      * @param deletedEnd
      */
      public OneClassifyTopicalQuery deletedEnd(Integer deletedEnd){
      this.deletedEnd = deletedEnd;
      this.deletedEnd = deletedEnd;
      return this;
      }
      /**
      * 设置 增加
      * @param deletedIncrement
      */
      public OneClassifyTopicalQuery deletedIncrement(Integer deletedIncrement){
      this.deletedIncrement = deletedIncrement;
      this.deletedIncrement = deletedIncrement;
      return this;
      }
      /**
      * 设置
      * @param deletedList
      ......@@ -1395,9 +1486,9 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      public OneClassifyTopicalQuery deletedList(List<Integer> deletedList){
      this.deletedList = deletedList;
      return this;
      }
      }
      /**
      /**
      * 设置 创建人id
      * @param createUserId
      */
      ......@@ -1441,6 +1532,8 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      this.createUserIdList = createUserIdList;
      return this;
      }
      /**
      * 设置 创建人名称
      * @param createUserName
      ......@@ -1450,7 +1543,6 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      return this;
      }
      /**
      * 设置 创建人名称
      * @param createUserNameList
      ......@@ -1460,26 +1552,8 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      return this;
      }
      /**
      * 设置 开始 创建时间
      * @param createTimeStart
      */
      public OneClassifyTopicalQuery createTimeStart(String createTimeStart){
      this.createTimeStart = createTimeStart;
      return this;
      }
      /**
      * 设置 结束 创建时间
      * @param createTimeEnd
      */
      public OneClassifyTopicalQuery createTimeEnd(String createTimeEnd){
      this.createTimeEnd = createTimeEnd;
      return this;
      }
      /**
      * 设置 修改人
      * @param updateUserId
      */
      ......@@ -1523,6 +1597,8 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      this.updateUserIdList = updateUserIdList;
      return this;
      }
      /**
      * 设置 修改人名称
      * @param updateUserName
      ......@@ -1532,7 +1608,6 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      return this;
      }
      /**
      * 设置 修改人名称
      * @param updateUserNameList
      ......@@ -1542,25 +1617,6 @@ public class OneClassifyTopicalQuery extends OneClassifyTopicalEntity{
      return this;
      }
      /**
      * 设置 开始 更新时间
      * @param updateTimeStart
      */
      public OneClassifyTopicalQuery updateTimeStart(String updateTimeStart){
      this.updateTimeStart = updateTimeStart;
      return this;
      }
      /**
      * 设置 结束 更新时间
      * @param updateTimeEnd
      */
      public OneClassifyTopicalQuery updateTimeEnd(String updateTimeEnd){
      this.updateTimeEnd = updateTimeEnd;
      return this;
      }
      /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      ......
      government-manager/src/main/java/com/mortals/xhx/module/one/model/OneTopicalEntity.java
      View file @ 5dd836e0
      package com.mortals.xhx.module.one.model;
      import java.util.Date;
      import java.util.List;
      import java.util.ArrayList;
      import com.mortals.framework.annotation.Excel;
      import com.mortals.framework.model.BaseEntityLong;
      import com.mortals.xhx.module.one.model.vo.OneTopicalVo;
      /**
      * 主题实体对象
      *
      * Description:OneTopical
      * date: 2021-9-13 16:21:34
      * @author zxfei
      * @date 2021-11-16
      */
      public class OneTopicalEntity extends BaseEntityLong{
      private static final long serialVersionUID = 1631521294937L;
      public class OneTopicalEntity extends OneTopicalVo {
      private static final long serialVersionUID = 1L;
      /**
      * 主题名称
      */
      private String topicalName;
      /**
      * 主题排序
      */
      private Integer topicalRank;
      /**
      * 站点id
      */
      private Long siteId;
      /**
      * 主题类型（1 个人服务，2 企业服务）
      */
      private Integer topicalType;
      /**
      *
      * 描述信息
      */
      private Integer deleted;
      private String remark;
      /**
      * 创建人id
      *
      */
      private Long createUserId;
      private Integer deleted;
      /**
      * 创建人名称
      */
      private String createUserName;
      /**
      * 创建时间
      */
      private Date createTime;
      /**
      * 修改人
      */
      private Long updateUserId;
      /**
      * 修改人名称
      */
      private String updateUserName;
      /**
      * 更新时间
      */
      private Date updateTime;
      public OneTopicalEntity(){
      }
      public OneTopicalEntity(){}
      /**
      * 获取 主题名称
      * @return topicalName
      * @return String
      */
      public String getTopicalName() {
      return this.topicalName;
      public String getTopicalName(){
      return topicalName;
      }
      /**
      * 设置 主题名称
      * @param topicalName
      */
      public void setTopicalName(String topicalName) {
      public void setTopicalName(String topicalName){
      this.topicalName = topicalName;
      }
      /**
      * 获取 主题排序
      * @return topicalRank
      * @return Integer
      */
      public Integer getTopicalRank() {
      return this.topicalRank;
      public Integer getTopicalRank(){
      return topicalRank;
      }
      /**
      * 设置 主题排序
      * @param topicalRank
      */
      public void setTopicalRank(Integer topicalRank) {
      public void setTopicalRank(Integer topicalRank){
      this.topicalRank = topicalRank;
      }
      /**
      * 获取 站点id
      * @return siteId
      * @return Long
      */
      public Long getSiteId() {
      return this.siteId;
      public Long getSiteId(){
      return siteId;
      }
      /**
      * 设置 站点id
      * @param siteId
      */
      public void setSiteId(Long siteId) {
      public void setSiteId(Long siteId){
      this.siteId = siteId;
      }
      /**
      * 获取 主题类型（1 个人服务，2 企业服务）
      * @return topicalType
      * @return Integer
      */
      public Integer getTopicalType() {
      return this.topicalType;
      public Integer getTopicalType(){
      return topicalType;
      }
      /**
      * 设置 主题类型（1 个人服务，2 企业服务）
      * @param topicalType
      */
      public void setTopicalType(Integer topicalType) {
      public void setTopicalType(Integer topicalType){
      this.topicalType = topicalType;
      }
      /**
      * 获取
      * @return deleted
      * 获取 描述信息
      * @return String
      */
      public Integer getDeleted() {
      return this.deleted;
      public String getRemark(){
      return remark;
      }
      /**
      * 设置
      * @param deleted
      * 设置 描述信息
      * @param remark
      */
      public void setDeleted(Integer deleted) {
      this.deleted = deleted;
      public void setRemark(String remark){
      this.remark = remark;
      }
      /**
      * 获取 创建人id
      * @return createUserId
      * 获取
      * @return Integer
      */
      public Long getCreateUserId() {
      return this.createUserId;
      public Integer getDeleted(){
      return deleted;
      }
      /**
      * 设置 创建人id
      * @param createUserId
      * 设置
      * @param deleted
      */
      public void setCreateUserId(Long createUserId) {
      this.createUserId = createUserId;
      public void setDeleted(Integer deleted){
      this.deleted = deleted;
      }
      /**
      * 获取 创建人名称
      * @return createUserName
      * @return String
      */
      public String getCreateUserName() {
      return this.createUserName;
      public String getCreateUserName(){
      return createUserName;
      }
      /**
      * 设置 创建人名称
      * @param createUserName
      */
      public void setCreateUserName(String createUserName) {
      public void setCreateUserName(String createUserName){
      this.createUserName = createUserName;
      }
      /**
      * 获取 创建时间
      * @return createTime
      */
      public Date getCreateTime() {
      return this.createTime;
      }
      /**
      * 设置 创建时间
      * @param createTime
      */
      public void setCreateTime(Date createTime) {
      this.createTime = createTime;
      }
      /**
      * 获取 修改人
      * @return updateUserId
      */
      public Long getUpdateUserId() {
      return this.updateUserId;
      }
      /**
      * 设置 修改人
      * @param updateUserId
      */
      public void setUpdateUserId(Long updateUserId) {
      this.updateUserId = updateUserId;
      }
      /**
      * 获取 修改人名称
      * @return updateUserName
      * @return String
      */
      public String getUpdateUserName() {
      return this.updateUserName;
      public String getUpdateUserName(){
      return updateUserName;
      }
      /**
      * 设置 修改人名称
      * @param updateUserName
      */
      public void setUpdateUserName(String updateUserName) {
      public void setUpdateUserName(String updateUserName){
      this.updateUserName = updateUserName;
      }
      /**
      * 获取 更新时间
      * @return updateTime
      */
      public Date getUpdateTime() {
      return this.updateTime;
      }
      /**
      * 设置 更新时间
      * @param updateTime
      */
      public void setUpdateTime(Date updateTime) {
      this.updateTime = updateTime;
      }
      @Override
      public int hashCode() {
      return this.getId().hashCode();
      return this.getId().hashCode();
      }
      @Override
      public boolean equals(Object obj) {
      if (obj == null)
      return false;
      if (obj == null) return false;
      if (obj instanceof OneTopicalEntity) {
      OneTopicalEntity tmp = (OneTopicalEntity) obj;
      if (this.getId().longValue() == tmp.getId().longValue()) {
      return true;
      if (this.getId() == tmp.getId()) {
      return true;
      }
      }
      return false;
      ......@@ -243,34 +184,25 @@ public class OneTopicalEntity extends BaseEntityLong{
      public String toString(){
      StringBuilder sb = new StringBuilder("");
      sb
      .append(",id:").append(getId())
      .append(",topicalName:").append(getTopicalName())
      .append(",topicalRank:").append(getTopicalRank())
      .append(",siteId:").append(getSiteId())
      .append(",topicalType:").append(getTopicalType())
      .append(",deleted:").append(getDeleted())
      .append(",createUserId:").append(getCreateUserId())
      .append(",createUserName:").append(getCreateUserName())
      .append(",createTime:").append(getCreateTime())
      .append(",updateUserId:").append(getUpdateUserId())
      .append(",updateUserName:").append(getUpdateUserName())
      .append(",updateTime:").append(getUpdateTime())
      ;
      sb.append(",topicalName:").append(getTopicalName());
      sb.append(",topicalRank:").append(getTopicalRank());
      sb.append(",siteId:").append(getSiteId());
      sb.append(",topicalType:").append(getTopicalType());
      sb.append(",remark:").append(getRemark());
      sb.append(",deleted:").append(getDeleted());
      sb.append(",createUserName:").append(getCreateUserName());
      sb.append(",updateUserName:").append(getUpdateUserName());
      return sb.toString();
      }
      public void initAttrValue(){
      this.topicalName = null;
      this.topicalRank = null;
      this.siteId = null;
      this.topicalType = null;
      this.deleted = null;
      this.createUserId = null;
      this.createUserName = null;
      this.createTime = null;
      this.updateUserId = null;
      this.updateUserName = null;
      this.updateTime = null;
      this.topicalName = null;
      this.topicalRank = null;
      this.siteId = null;
      this.topicalType = null;
      this.remark = null;
      this.deleted = 0;
      this.createUserName = null;
      this.updateUserName = null;
      }
      }
      \ No newline at end of file
      government-manager/src/main/java/com/mortals/xhx/module/one/model/OneTopicalQuery.java
      View file @ 5dd836e0
      package com.mortals.xhx.module.one.model;
      import java.util.List;
      import java.util.Date;
      import com.mortals.xhx.module.one.model.OneTopicalEntity;
      /**
      * 主题查询对象
      *
      * Description:OneTopical
      * date: 2021-9-13 16:21:34
      * @author zxfei
      * @date 2021-11-16
      */
      public class OneTopicalQuery extends OneTopicalEntity{
      private static final long serialVersionUID = 1631521294938L;
      public class OneTopicalQuery extends OneTopicalEntity {
      /** 开始 主键，自增长 */
      private Long idStart;
      ......@@ -19,10 +18,9 @@ public class OneTopicalQuery extends OneTopicalEntity{
      /** 增加 主键，自增长 */
      private Long idIncrement;
      /** 主键，自增长 */
      /** 主键，自增长列表 */
      private List <Long> idList;
      /** 主题名称 */
      private List<String> topicalNameList;
      ......@@ -35,8 +33,9 @@ public class OneTopicalQuery extends OneTopicalEntity{
      /** 增加 主题排序 */
      private Integer topicalRankIncrement;
      /** 主题排序 */
      /** 主题排序列表 */
      private List <Integer> topicalRankList;
      /** 开始 站点id */
      private Long siteIdStart;
      ......@@ -46,10 +45,9 @@ public class OneTopicalQuery extends OneTopicalEntity{
      /** 增加 站点id */
      private Long siteIdIncrement;
      /** 站点id */
      /** 站点id列表 */
      private List <Long> siteIdList;
      /** 开始 主题类型（1 个人服务，2 企业服务） */
      private Integer topicalTypeStart;
      ......@@ -59,9 +57,12 @@ public class OneTopicalQuery extends OneTopicalEntity{
      /** 增加 主题类型（1 个人服务，2 企业服务） */
      private Integer topicalTypeIncrement;
      /** 主题类型（1 个人服务，2 企业服务） */
      /** 主题类型（1 个人服务，2 企业服务）列表 */
      private List <Integer> topicalTypeList;
      /** 描述信息 */
      private List<String> remarkList;
      /** 开始 */
      private Integer deletedStart;
      ......@@ -71,8 +72,9 @@ public class OneTopicalQuery extends OneTopicalEntity{
      /** 增加 */
      private Integer deletedIncrement;
      /** */
      /** 列表 */
      private List <Integer> deletedList;
      /** 开始 创建人id */
      private Long createUserIdStart;
      ......@@ -82,17 +84,18 @@ public class OneTopicalQuery extends OneTopicalEntity{
      /** 增加 创建人id */
      private Long createUserIdIncrement;
      /** 创建人id */
      /** 创建人id列表 */
      private List <Long> createUserIdList;
      /** 创建人名称 */
      private List<String> createUserNameList;
      /** 开始 创建时间 */
      private String createTimeStart;
      /** 结束 创建时间 */
      private String createTimeEnd;
      /** 开始 修改人 */
      private Long updateUserIdStart;
      ......@@ -102,12 +105,12 @@ public class OneTopicalQuery extends OneTopicalEntity{
      /** 增加 修改人 */
      private Long updateUserIdIncrement;
      /** 修改人 */
      /** 修改人列表 */
      private List <Long> updateUserIdList;
      /** 修改人名称 */
      private List<String> updateUserNameList;
      /** 开始 更新时间 */
      private String updateTimeStart;
      ......@@ -120,16 +123,14 @@ public class OneTopicalQuery extends OneTopicalEntity{
      /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
      private List<OneTopicalQuery> andConditionList;
      public OneTopicalQuery(){
      }
      public OneTopicalQuery(){}
      /**
      * 获取 开始 主键，自增长
      * @return idStart
      */
      public Long getIdStart(){
      return this.idStart;
      return this.idStart;
      }
      /**
      ......@@ -137,15 +138,15 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @param idStart
      */
      public void setIdStart(Long idStart){
      this.idStart = idStart;
      this.idStart = idStart;
      }
      /**
      * 获取 结束 主键，自增长
      * @return idEnd
      * @return $idEnd
      */
      public Long getIdEnd(){
      return this.idEnd;
      return this.idEnd;
      }
      /**
      ......@@ -153,7 +154,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @param idEnd
      */
      public void setIdEnd(Long idEnd){
      this.idEnd = idEnd;
      this.idEnd = idEnd;
      }
      /**
      ......@@ -161,7 +162,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @return idIncrement
      */
      public Long getIdIncrement(){
      return this.idIncrement;
      return this.idIncrement;
      }
      /**
      ......@@ -169,7 +170,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @param idIncrement
      */
      public void setIdIncrement(Long idIncrement){
      this.idIncrement = idIncrement;
      this.idIncrement = idIncrement;
      }
      /**
      ......@@ -177,7 +178,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @return idList
      */
      public List<Long> getIdList(){
      return this.idList;
      return this.idList;
      }
      /**
      ......@@ -186,7 +187,8 @@ public class OneTopicalQuery extends OneTopicalEntity{
      */
      public void setIdList(List<Long> idList){
      this.idList = idList;
      }
      }
      /**
      * 获取 主题名称
      * @return topicalNameList
      ......@@ -220,7 +222,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      /**
      * 获取 结束 主题排序
      * @return topicalRankEnd
      * @return $topicalRankEnd
      */
      public Integer getTopicalRankEnd(){
      return this.topicalRankEnd;
      ......@@ -265,12 +267,13 @@ public class OneTopicalQuery extends OneTopicalEntity{
      public void setTopicalRankList(List<Integer> topicalRankList){
      this.topicalRankList = topicalRankList;
      }
      /**
      * 获取 开始 站点id
      * @return siteIdStart
      */
      public Long getSiteIdStart(){
      return this.siteIdStart;
      return this.siteIdStart;
      }
      /**
      ......@@ -278,15 +281,15 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @param siteIdStart
      */
      public void setSiteIdStart(Long siteIdStart){
      this.siteIdStart = siteIdStart;
      this.siteIdStart = siteIdStart;
      }
      /**
      * 获取 结束 站点id
      * @return siteIdEnd
      * @return $siteIdEnd
      */
      public Long getSiteIdEnd(){
      return this.siteIdEnd;
      return this.siteIdEnd;
      }
      /**
      ......@@ -294,7 +297,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @param siteIdEnd
      */
      public void setSiteIdEnd(Long siteIdEnd){
      this.siteIdEnd = siteIdEnd;
      this.siteIdEnd = siteIdEnd;
      }
      /**
      ......@@ -302,7 +305,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @return siteIdIncrement
      */
      public Long getSiteIdIncrement(){
      return this.siteIdIncrement;
      return this.siteIdIncrement;
      }
      /**
      ......@@ -310,7 +313,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @param siteIdIncrement
      */
      public void setSiteIdIncrement(Long siteIdIncrement){
      this.siteIdIncrement = siteIdIncrement;
      this.siteIdIncrement = siteIdIncrement;
      }
      /**
      ......@@ -318,7 +321,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @return siteIdList
      */
      public List<Long> getSiteIdList(){
      return this.siteIdList;
      return this.siteIdList;
      }
      /**
      ......@@ -327,7 +330,8 @@ public class OneTopicalQuery extends OneTopicalEntity{
      */
      public void setSiteIdList(List<Long> siteIdList){
      this.siteIdList = siteIdList;
      }
      }
      /**
      * 获取 开始 主题类型（1 个人服务，2 企业服务）
      * @return topicalTypeStart
      ......@@ -346,7 +350,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      /**
      * 获取 结束 主题类型（1 个人服务，2 企业服务）
      * @return topicalTypeEnd
      * @return $topicalTypeEnd
      */
      public Integer getTopicalTypeEnd(){
      return this.topicalTypeEnd;
      ......@@ -391,6 +395,22 @@ public class OneTopicalQuery extends OneTopicalEntity{
      public void setTopicalTypeList(List<Integer> topicalTypeList){
      this.topicalTypeList = topicalTypeList;
      }
      /**
      * 获取 描述信息
      * @return remarkList
      */
      public List<String> getRemarkList(){
      return this.remarkList;
      }
      /**
      * 设置 描述信息
      * @param remarkList
      */
      public void setRemarkList(List<String> remarkList){
      this.remarkList = remarkList;
      }
      /**
      * 获取 开始
      * @return deletedStart
      ......@@ -409,7 +429,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      /**
      * 获取 结束
      * @return deletedEnd
      * @return $deletedEnd
      */
      public Integer getDeletedEnd(){
      return this.deletedEnd;
      ......@@ -454,12 +474,13 @@ public class OneTopicalQuery extends OneTopicalEntity{
      public void setDeletedList(List<Integer> deletedList){
      this.deletedList = deletedList;
      }
      /**
      * 获取 开始 创建人id
      * @return createUserIdStart
      */
      public Long getCreateUserIdStart(){
      return this.createUserIdStart;
      return this.createUserIdStart;
      }
      /**
      ......@@ -467,15 +488,15 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @param createUserIdStart
      */
      public void setCreateUserIdStart(Long createUserIdStart){
      this.createUserIdStart = createUserIdStart;
      this.createUserIdStart = createUserIdStart;
      }
      /**
      * 获取 结束 创建人id
      * @return createUserIdEnd
      * @return $createUserIdEnd
      */
      public Long getCreateUserIdEnd(){
      return this.createUserIdEnd;
      return this.createUserIdEnd;
      }
      /**
      ......@@ -483,7 +504,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @param createUserIdEnd
      */
      public void setCreateUserIdEnd(Long createUserIdEnd){
      this.createUserIdEnd = createUserIdEnd;
      this.createUserIdEnd = createUserIdEnd;
      }
      /**
      ......@@ -491,7 +512,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @return createUserIdIncrement
      */
      public Long getCreateUserIdIncrement(){
      return this.createUserIdIncrement;
      return this.createUserIdIncrement;
      }
      /**
      ......@@ -499,7 +520,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @param createUserIdIncrement
      */
      public void setCreateUserIdIncrement(Long createUserIdIncrement){
      this.createUserIdIncrement = createUserIdIncrement;
      this.createUserIdIncrement = createUserIdIncrement;
      }
      /**
      ......@@ -507,7 +528,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @return createUserIdList
      */
      public List<Long> getCreateUserIdList(){
      return this.createUserIdList;
      return this.createUserIdList;
      }
      /**
      ......@@ -516,7 +537,8 @@ public class OneTopicalQuery extends OneTopicalEntity{
      */
      public void setCreateUserIdList(List<Long> createUserIdList){
      this.createUserIdList = createUserIdList;
      }
      }
      /**
      * 获取 创建人名称
      * @return createUserNameList
      ......@@ -537,7 +559,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @return createTimeStart
      */
      public String getCreateTimeStart(){
      return this.createTimeStart;
      return this.createTimeStart;
      }
      /**
      ......@@ -545,7 +567,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @param createTimeStart
      */
      public void setCreateTimeStart(String createTimeStart){
      this.createTimeStart = createTimeStart;
      this.createTimeStart = createTimeStart;
      }
      /**
      ......@@ -553,7 +575,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @return createTimeEnd
      */
      public String getCreateTimeEnd(){
      return this.createTimeEnd;
      return this.createTimeEnd;
      }
      /**
      ......@@ -561,14 +583,15 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @param createTimeEnd
      */
      public void setCreateTimeEnd(String createTimeEnd){
      this.createTimeEnd = createTimeEnd;
      this.createTimeEnd = createTimeEnd;
      }
      /**
      * 获取 开始 修改人
      * @return updateUserIdStart
      */
      public Long getUpdateUserIdStart(){
      return this.updateUserIdStart;
      return this.updateUserIdStart;
      }
      /**
      ......@@ -576,15 +599,15 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @param updateUserIdStart
      */
      public void setUpdateUserIdStart(Long updateUserIdStart){
      this.updateUserIdStart = updateUserIdStart;
      this.updateUserIdStart = updateUserIdStart;
      }
      /**
      * 获取 结束 修改人
      * @return updateUserIdEnd
      * @return $updateUserIdEnd
      */
      public Long getUpdateUserIdEnd(){
      return this.updateUserIdEnd;
      return this.updateUserIdEnd;
      }
      /**
      ......@@ -592,7 +615,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @param updateUserIdEnd
      */
      public void setUpdateUserIdEnd(Long updateUserIdEnd){
      this.updateUserIdEnd = updateUserIdEnd;
      this.updateUserIdEnd = updateUserIdEnd;
      }
      /**
      ......@@ -600,7 +623,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @return updateUserIdIncrement
      */
      public Long getUpdateUserIdIncrement(){
      return this.updateUserIdIncrement;
      return this.updateUserIdIncrement;
      }
      /**
      ......@@ -608,7 +631,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @param updateUserIdIncrement
      */
      public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
      this.updateUserIdIncrement = updateUserIdIncrement;
      this.updateUserIdIncrement = updateUserIdIncrement;
      }
      /**
      ......@@ -616,7 +639,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @return updateUserIdList
      */
      public List<Long> getUpdateUserIdList(){
      return this.updateUserIdList;
      return this.updateUserIdList;
      }
      /**
      ......@@ -625,7 +648,8 @@ public class OneTopicalQuery extends OneTopicalEntity{
      */
      public void setUpdateUserIdList(List<Long> updateUserIdList){
      this.updateUserIdList = updateUserIdList;
      }
      }
      /**
      * 获取 修改人名称
      * @return updateUserNameList
      ......@@ -646,7 +670,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @return updateTimeStart
      */
      public String getUpdateTimeStart(){
      return this.updateTimeStart;
      return this.updateTimeStart;
      }
      /**
      ......@@ -654,7 +678,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @param updateTimeStart
      */
      public void setUpdateTimeStart(String updateTimeStart){
      this.updateTimeStart = updateTimeStart;
      this.updateTimeStart = updateTimeStart;
      }
      /**
      ......@@ -662,7 +686,7 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @return updateTimeEnd
      */
      public String getUpdateTimeEnd(){
      return this.updateTimeEnd;
      return this.updateTimeEnd;
      }
      /**
      ......@@ -670,11 +694,10 @@ public class OneTopicalQuery extends OneTopicalEntity{
      * @param updateTimeEnd
      */
      public void setUpdateTimeEnd(String updateTimeEnd){
      this.updateTimeEnd = updateTimeEnd;
      this.updateTimeEnd = updateTimeEnd;
      }
      /**
      /**
      * 设置 主键，自增长
      * @param id
      */
      ......@@ -718,6 +741,8 @@ public class OneTopicalQuery extends OneTopicalEntity{
      this.idList = idList;
      return this;
      }
      /**
      * 设置 主题名称
      * @param topicalName
      ......@@ -727,7 +752,6 @@ public class OneTopicalQuery extends OneTopicalEntity{
      return this;
      }
      /**
      * 设置 主题名称
      * @param topicalNameList
      ......@@ -736,46 +760,43 @@ public class OneTopicalQuery extends OneTopicalEntity{
      this.topicalNameList = topicalNameList;
      return this;
      }
      /**
      /**
      * 设置 主题排序
      * @param topicalRank
      */
      public OneTopicalQuery topicalRank(Integer topicalRank){
      setTopicalRank(topicalRank);
      setTopicalRank(topicalRank);
      return this;
      }
      /**
      /**
      * 设置 开始 主题排序
      * @param topicalRankStart
      */
      public OneTopicalQuery topicalRankStart(Integer topicalRankStart){
      this.topicalRankStart = topicalRankStart;
      this.topicalRankStart = topicalRankStart;
      return this;
      }
      /**
      * 设置 结束 主题排序
      * @param topicalRankEnd
      */
      public OneTopicalQuery topicalRankEnd(Integer topicalRankEnd){
      this.topicalRankEnd = topicalRankEnd;
      this.topicalRankEnd = topicalRankEnd;
      return this;
      }
      /**
      * 设置 增加 主题排序
      * @param topicalRankIncrement
      */
      public OneTopicalQuery topicalRankIncrement(Integer topicalRankIncrement){
      this.topicalRankIncrement = topicalRankIncrement;
      this.topicalRankIncrement = topicalRankIncrement;
      return this;
      }
      /**
      * 设置 主题排序
      * @param topicalRankList
      ......@@ -783,9 +804,9 @@ public class OneTopicalQuery extends OneTopicalEntity{
      public OneTopicalQuery topicalRankList(List<Integer> topicalRankList){
      this.topicalRankList = topicalRankList;
      return this;
      }
      }
      /**
      /**
      * 设置 站点id
      * @param siteId
      */
      ......@@ -829,46 +850,43 @@ public class OneTopicalQuery extends OneTopicalEntity{
      this.siteIdList = siteIdList;
      return this;
      }
      /**
      /**
      * 设置 主题类型（1 个人服务，2 企业服务）
      * @param topicalType
      */
      public OneTopicalQuery topicalType(Integer topicalType){
      setTopicalType(topicalType);
      setTopicalType(topicalType);
      return this;
      }
      /**
      /**
      * 设置 开始 主题类型（1 个人服务，2 企业服务）
      * @param topicalTypeStart
      */
      public OneTopicalQuery topicalTypeStart(Integer topicalTypeStart){
      this.topicalTypeStart = topicalTypeStart;
      this.topicalTypeStart = topicalTypeStart;
      return this;
      }
      /**
      * 设置 结束 主题类型（1 个人服务，2 企业服务）
      * @param topicalTypeEnd
      */
      public OneTopicalQuery topicalTypeEnd(Integer topicalTypeEnd){
      this.topicalTypeEnd = topicalTypeEnd;
      this.topicalTypeEnd = topicalTypeEnd;
      return this;
      }
      /**
      * 设置 增加 主题类型（1 个人服务，2 企业服务）
      * @param topicalTypeIncrement
      */
      public OneTopicalQuery topicalTypeIncrement(Integer topicalTypeIncrement){
      this.topicalTypeIncrement = topicalTypeIncrement;
      this.topicalTypeIncrement = topicalTypeIncrement;
      return this;
      }
      /**
      * 设置 主题类型（1 个人服务，2 企业服务）
      * @param topicalTypeList
      ......@@ -876,47 +894,63 @@ public class OneTopicalQuery extends OneTopicalEntity{
      public OneTopicalQuery topicalTypeList(List<Integer> topicalTypeList){
      this.topicalTypeList = topicalTypeList;
      return this;
      }
      }
      /**
      * 设置 描述信息
      * @param remark
      */
      public OneTopicalQuery remark(String remark){
      setRemark(remark);
      return this;
      }
      /**
      * 设置 描述信息
      * @param remarkList
      */
      public OneTopicalQuery remarkList(List<String> remarkList){
      this.remarkList = remarkList;
      return this;
      }
      /**
      * 设置
      * @param deleted
      */
      public OneTopicalQuery deleted(Integer deleted){
      setDeleted(deleted);
      setDeleted(deleted);
      return this;
      }
      /**
      /**
      * 设置 开始
      * @param deletedStart
      */
      public OneTopicalQuery deletedStart(Integer deletedStart){
      this.deletedStart = deletedStart;
      this.deletedStart = deletedStart;
      return this;
      }
      /**
      * 设置 结束
      * @param deletedEnd
      */
      public OneTopicalQuery deletedEnd(Integer deletedEnd){
      this.deletedEnd = deletedEnd;
      this.deletedEnd = deletedEnd;
      return this;
      }
      /**
      * 设置 增加
      * @param deletedIncrement
      */
      public OneTopicalQuery deletedIncrement(Integer deletedIncrement){
      this.deletedIncrement = deletedIncrement;
      this.deletedIncrement = deletedIncrement;
      return this;
      }
      /**
      * 设置
      * @param deletedList
      ......@@ -924,9 +958,9 @@ public class OneTopicalQuery extends OneTopicalEntity{
      public OneTopicalQuery deletedList(List<Integer> deletedList){
      this.deletedList = deletedList;
      return this;
      }
      }
      /**
      /**
      * 设置 创建人id
      * @param createUserId
      */
      ......@@ -970,6 +1004,8 @@ public class OneTopicalQuery extends OneTopicalEntity{
      this.createUserIdList = createUserIdList;
      return this;
      }
      /**
      * 设置 创建人名称
      * @param createUserName
      ......@@ -979,7 +1015,6 @@ public class OneTopicalQuery extends OneTopicalEntity{
      return this;
      }
      /**
      * 设置 创建人名称
      * @param createUserNameList
      ......@@ -989,26 +1024,8 @@ public class OneTopicalQuery extends OneTopicalEntity{
      return this;
      }
      /**
      * 设置 开始 创建时间
      * @param createTimeStart
      */
      public OneTopicalQuery createTimeStart(String createTimeStart){
      this.createTimeStart = createTimeStart;
      return this;
      }
      /**
      * 设置 结束 创建时间
      * @param createTimeEnd
      */
      public OneTopicalQuery createTimeEnd(String createTimeEnd){
      this.createTimeEnd = createTimeEnd;
      return this;
      }
      /**
      * 设置 修改人
      * @param updateUserId
      */
      ......@@ -1052,6 +1069,8 @@ public class OneTopicalQuery extends OneTopicalEntity{
      this.updateUserIdList = updateUserIdList;
      return this;
      }
      /**
      * 设置 修改人名称
      * @param updateUserName
      ......@@ -1061,7 +1080,6 @@ public class OneTopicalQuery extends OneTopicalEntity{
      return this;
      }
      /**
      * 设置 修改人名称
      * @param updateUserNameList
      ......@@ -1071,25 +1089,6 @@ public class OneTopicalQuery extends OneTopicalEntity{
      return this;
      }
      /**
      * 设置 开始 更新时间
      * @param updateTimeStart
      */
      public OneTopicalQuery updateTimeStart(String updateTimeStart){
      this.updateTimeStart = updateTimeStart;
      return this;
      }
      /**
      * 设置 结束 更新时间
      * @param updateTimeEnd
      */
      public OneTopicalQuery updateTimeEnd(String updateTimeEnd){
      this.updateTimeEnd = updateTimeEnd;
      return this;
      }
      /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      ......
      government-manager/src/main/java/com/mortals/xhx/module/one/service/OneTopicalService.java
      View file @ 5dd836e0
      package com.mortals.xhx.module.one.service;
      import com.mortals.framework.model.Result;
      import com.mortals.framework.service.ICRUDService;
      import com.mortals.xhx.busiz.onethinglist.OneThingReq;
      import com.mortals.xhx.module.one.model.OneClassifyEntity;
      import com.mortals.xhx.module.one.model.OneTopicalEntity;
      import java.util.List;
      ......@@ -19,5 +22,8 @@ public interface OneTopicalService extends ICRUDService<OneTopicalEntity, Long>
      List<Map<String, Object>> getTreeList(Integer type);
      Result<OneClassifyEntity> getList(OneThingReq req);
      void upOrDownTopicList(Long id, Integer type);
      }
      \ No newline at end of file
      government-manager/src/main/java/com/mortals/xhx/module/one/service/impl/OneClassifyServiceImpl.java
      View file @ 5dd836e0
      ......@@ -53,12 +53,16 @@ public class OneClassifyServiceImpl extends AbstractCRUDCacheServiceImpl<OneClas
      if(oneClassifyEntity.getClassifyLevel()>1){
      if(oneClassifyEntity.getIsAns()==YesNoEnum.NO.getValue()){
      entity.setIsAns(YesNoEnum.YES.getValue());
      }else if(oneClassifyEntity.getIsAns()==YesNoEnum.YES.getValue()){
      //判断当前节点是否是问题 且父节点是否已经存在问题
      List<OneClassifyEntity> list = this.find(new OneClassifyQuery().parentId(entity.getParentId()).deleted(YesNoEnum.NO.getValue()));
      if(list.size()>0){
      throw new AppException("当前选项已经存在关联问题！");
      }
      }
      }
      }
      super.saveBefore(entity, context);
      }
      ......@@ -80,7 +84,6 @@ public class OneClassifyServiceImpl extends AbstractCRUDCacheServiceImpl<OneClas
      @Override
      protected void updateAfter(OneClassifyEntity entity, Context context) throws AppException {
      //更新事项数据
      List<Long> matterIds = Arrays.asList(entity.getMatterIds().split(",")).stream().filter(e->!ObjectUtils.isEmpty(e)).map(Long::valueOf).collect(Collectors.toList());
      if(!ObjectUtils.isEmpty(matterIds)){
      ......
      government-manager/src/main/java/com/mortals/xhx/module/one/service/impl/OneClassifyTopicalServiceImpl.java
      View file @ 5dd836e0
      ......@@ -39,6 +39,8 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl
      @Autowired
      private OneClassifyService oneClassifyService;
      @Autowired
      private OneClassifyTopicalService oneClassifyTopicalService;
      @Autowired
      private MatterService matterService;
      @Autowired
      private MatterDatumService matterDatumService;
      ......@@ -117,15 +119,13 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl
      @Override
      public OneProblemInfo findAllQuestion(Long id) {
      //获取根节点，递归获取所有树节点
      OneProblemInfo info = new OneProblemInfo();
      OneClassifyEntity rootClassify = oneClassifyService.get(id);
      if (!ObjectUtils.isEmpty(rootClassify)) {
      info.setId(rootClassify.getId());
      info.setIsLeaf(rootClassify.getIsLeaf());
      info.setLevel(rootClassify.getClassifyLevel());
      info.setLevel(rootClassify.getClassifyLevel().intValue());
      info.setMatterIds(rootClassify.getMatterIds());
      info.setName(rootClassify.getClassifyName());
      info.setParentId(rootClassify.getParentId());
      ......@@ -146,7 +146,7 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl
      OneProblemInfo info = new OneProblemInfo();
      info.setId(item.getId());
      info.setIsLeaf(item.getIsLeaf());
      info.setLevel(item.getClassifyLevel());
      info.setLevel(item.getClassifyLevel().intValue());
      info.setMatterIds(item.getMatterIds());
      info.setName(item.getClassifyName());
      info.setParentId(item.getParentId());
      ......@@ -178,9 +178,18 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl
      Map<String, String> isMustMap = paramService.getParamByFirstOrganize(Constant.Param_isMust);
      //基本信息
      OneClassifyTopicalEntity classifyTopicalEntity = oneClassifyTopicalService.selectOne(new OneClassifyTopicalQuery().classifyId(req.getClassifyId()));
      if(!ObjectUtils.isEmpty(classifyTopicalEntity)){
      BasicsInfo basicsInfo = new BasicsInfo();
      BeanUtils.copyProperties(classifyTopicalEntity,basicsInfo);
      questionInfo.setBasicsInfo(basicsInfo);
      }
      //获取关联的所有事项
      List<Long> matterIdsList = oneClassifyService.find(new OneClassifyQuery().idList(req.getOptionIds()))
      .stream().flatMap(item ->
      .stream().filter(f->!"".equals(f.getMatterIds())).flatMap(item ->
      Arrays.asList(item.getMatterIds().split(",")).stream()
      ).map(Long::valueOf).distinct().collect(Collectors.toList());
      //根据事项获取所有材料
      ......@@ -252,6 +261,10 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl
      }).collect(Collectors.toList());
      questionInfo.setQAndAInfoList(qAndAInfoList);
      return questionInfo;
      }
      }
      \ No newline at end of file
      government-manager/src/main/java/com/mortals/xhx/module/one/service/impl/OneTopicalServiceImpl.java
      View file @ 5dd836e0
      ......@@ -3,6 +3,9 @@ package com.mortals.xhx.module.one.service.impl;
      import com.mortals.framework.exception.AppException;
      import com.mortals.framework.model.Context;
      import com.mortals.framework.model.OrderCol;
      import com.mortals.framework.model.PageInfo;
      import com.mortals.framework.model.Result;
      import com.mortals.xhx.busiz.onethinglist.OneThingReq;
      import com.mortals.xhx.common.code.TreeTypeEnum;
      import com.mortals.xhx.common.code.YesNoEnum;
      import com.mortals.xhx.module.one.model.*;
      ......@@ -38,12 +41,12 @@ public class OneTopicalServiceImpl extends AbstractCRUDServiceImpl<OneTopicalDao
      OneClassifyTopicalQuery oneClassifyTopicalQuery = new OneClassifyTopicalQuery().deleted(YesNoEnum.NO.getValue());
      oneClassifyTopicalQuery.setOrderColList(Arrays.asList(new OrderCol("classify_rank", OrderCol.ASCENDING)));
      oneClassifyTopicalQuery.setOrderColList(Arrays.asList(new OrderCol("classifyRank", OrderCol.ASCENDING)));
      List<OneClassifyTopicalEntity> classifyTopicalEntityList = oneClassifyTopicalService.find(oneClassifyTopicalQuery);
      OneTopicalQuery oneTopicalQuery = new OneTopicalQuery().deleted(YesNoEnum.NO.getValue()).topicalType(type);
      oneTopicalQuery.setOrderColList(Arrays.asList(new OrderCol("topical_rank", OrderCol.ASCENDING)));
      oneTopicalQuery.setOrderColList(Arrays.asList(new OrderCol("topicalRank", OrderCol.ASCENDING)));
      List<Map<String, Object>> collect = this.find(oneTopicalQuery).stream().map(item -> {
      Map<String, Object> data = new HashMap<>();
      ......@@ -55,7 +58,7 @@ public class OneTopicalServiceImpl extends AbstractCRUDServiceImpl<OneTopicalDao
      data.put("isLeaf", true);
      List<Map<String, Object>> children = classifyTopicalEntityList
      .stream().filter(f->f.getTopicalId()==item.getId()).map(classifyTopic -> {
      .stream().filter(f -> f.getTopicalId() == item.getId()).map(classifyTopic -> {
      OneClassifyEntity oneClassifyEntity = oneClassifyService.getCache(classifyTopic.getClassifyId().toString());
      Map<String, Object> map = new HashMap<>();
      map.put("id", classifyTopic.getId());
      ......@@ -78,6 +81,17 @@ public class OneTopicalServiceImpl extends AbstractCRUDServiceImpl<OneTopicalDao
      return collect;
      }
      @Override
      public Result<OneClassifyEntity> getList(OneThingReq req) {
      //分页查询
      PageInfo pageInfo = new PageInfo();
      pageInfo.setPrePageResult(req.getLimit());
      pageInfo.setCurrPage(req.getPage());
      return oneClassifyService.find(new OneClassifyQuery().classifyLevel(1L).classifyName("%"+req.getName()+"%").deleted(YesNoEnum.NO.getValue()), pageInfo, null);
      }
      @Override
      public void upOrDownTopicList(Long id, Integer type) {
      OneTopicalQuery query = new OneTopicalQuery().deleted(YesNoEnum.NO.getValue());
      ......
      government-manager/src/main/java/com/mortals/xhx/module/site/dao/SiteDao.java
      View file @ 5dd836e0
      ......@@ -3,6 +3,9 @@ package com.mortals.xhx.module.site.dao;
      import com.mortals.framework.dao.ICRUDDao;
      import com.mortals.xhx.module.site.model.SiteEntity;
      import java.util.List;
      import java.util.Map;
      /**
      * <p>Title: 站点信息表</p>
      * <p>Description: SiteDao DAO接口 </p>
      ......@@ -12,4 +15,12 @@ import com.mortals.xhx.module.site.model.SiteEntity;
      public interface SiteDao extends ICRUDDao<SiteEntity,Long>{
      /**
      * 查询子站点
      *
      * @param
      * @return
      */
      List<SiteEntity> selectChildrenSiteById(String siteId);
      }
      government-manager/src/main/java/com/mortals/xhx/module/site/dao/ibatis/SiteDaoImpl.java
      View file @ 5dd836e0
      package com.mortals.xhx.module.site.dao.ibatis;
      import org.springframework.stereotype.Repository;
      import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
      import com.mortals.xhx.module.site.dao.SiteDao;
      import com.mortals.xhx.module.site.model.SiteEntity;
      import org.springframework.stereotype.Repository;
      import java.util.List;
      /**
      * <p>Title: 站点信息表</p>
      ......@@ -14,4 +16,8 @@ import com.mortals.xhx.module.site.model.SiteEntity;
      @Repository("siteDao")
      public class SiteDaoImpl extends BaseCRUDDaoMybatis<SiteEntity,Long> implements SiteDao {
      @Override
      public List<SiteEntity> selectChildrenSiteById(String siteId) {
      return getSqlSession().selectList(getSqlId("selectChildrenSiteById"), siteId);
      }
      }
      government-manager/src/main/java/com/mortals/xhx/module/site/model/TreeSelect.java
      View file @ 5dd836e0
      package com.mortals.xhx.module.site.model;
      import com.fasterxml.jackson.annotation.JsonInclude;
      import lombok.Data;
      import java.io.Serializable;
      import java.util.List;
      ......@@ -12,6 +13,7 @@ import java.util.stream.Collectors;
      * @author: zxfei
      * @date: 2021/10/13 21:08
      */
      @Data
      public class TreeSelect implements Serializable {
      private static final long serialVersionUID = 1L;
      ......@@ -31,38 +33,10 @@ public class TreeSelect implements Serializable {
      @JsonInclude(JsonInclude.Include.NON_EMPTY)
      private List<TreeSelect> children;
      public TreeSelect() {
      }
      public TreeSelect(SiteEntity site) {
      this.id = site.getId();
      this.label = site.getSiteName();
      this.children = site.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
      }
      public Long getId() {
      return id;
      }
      public void setId(Long id) {
      this.id = id;
      }
      public String getLabel() {
      return label;
      }
      public void setLabel(String label) {
      this.label = label;
      }
      public List<TreeSelect> getChildren() {
      return children;
      }
      public void setChildren(List<TreeSelect> children) {
      this.children = children;
      }
      }
      government-manager/src/main/java/com/mortals/xhx/module/site/service/SiteService.java
      View file @ 5dd836e0
      ......@@ -49,5 +49,5 @@ public interface SiteService extends ICRUDService<SiteEntity, Long> {
      * @param sites 站点列表
      * @return 下拉树结构列表
      */
      public List<TreeSelect> buildSiteTreeSelect(List<SiteEntity> sites);
      List<TreeSelect> buildSiteTreeSelect(List<SiteEntity> sites);
      }
      \ No newline at end of file
      government-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
      View file @ 5dd836e0
      ......@@ -2,21 +2,19 @@ package com.mortals.xhx.module.site.service.impl;
      import com.mortals.framework.exception.AppException;
      import com.mortals.framework.model.Context;
      import com.mortals.framework.util.StringUtils;
      import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
      import com.mortals.xhx.base.system.user.model.UserEntity;
      import com.mortals.xhx.base.system.user.model.UserQuery;
      import com.mortals.xhx.base.system.user.service.UserService;
      import com.mortals.xhx.common.code.SiteSatusEnum;
      import com.mortals.xhx.common.code.UserStatus;
      import com.mortals.xhx.common.code.SatusEnum;
      import com.mortals.xhx.module.site.dao.ISiteCustomDao;
      import com.mortals.xhx.module.site.dao.SiteDao;
      import com.mortals.xhx.module.site.model.SiteEntity;
      import com.mortals.xhx.module.site.model.SiteQuery;
      import com.mortals.xhx.module.site.model.TreeSelect;
      import com.mortals.xhx.module.site.service.SiteService;
      import org.springframework.beans.factory.annotation.Autowired;
      import org.springframework.stereotype.Service;
      import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
      import com.mortals.xhx.module.site.dao.SiteDao;
      import com.mortals.xhx.module.site.model.SiteEntity;
      import com.mortals.xhx.module.site.service.SiteService;
      import org.springframework.util.ObjectUtils;
      import java.util.*;
      ......@@ -43,16 +41,15 @@ public class SiteServiceImpl extends AbstractCRUDServiceImpl<SiteDao, SiteEntity
      protected void validData(SiteEntity entity, Context context) throws AppException {
      //校验站点名称是否存在 todo
      super.validData(entity, context);
      }
      @Override
      protected void saveBefore(SiteEntity entity, Context context) throws AppException {
      SiteEntity parentSiteEntity = this.get(entity.getParentId());
      // 如果父节点不为正常状态,则不允许新增子节点
      if (!ObjectUtils.isEmpty(parentSiteEntity) && SiteSatusEnum.DISENABLE.getValue() == parentSiteEntity.getStatus()) {
      if (!ObjectUtils.isEmpty(parentSiteEntity) && SatusEnum.DISENABLE.getValue() == parentSiteEntity.getStatus()) {
      throw new AppException("站点停用，不允许新增");
      }
      ......@@ -85,7 +82,7 @@ public class SiteServiceImpl extends AbstractCRUDServiceImpl<SiteDao, SiteEntity
      protected void updateAfter(SiteEntity entity, Context context) throws AppException {
      super.updateAfter(entity, context);
      if (SiteSatusEnum.ENABLE.getValue() == entity.getStatus()) {
      if (SatusEnum.ENABLE.getValue() == entity.getStatus()) {
      // 如果该部门是启用状态，则启用该部门的所有上级部门
      updateParentDeptStatus(entity, context);
      }
      ......@@ -99,7 +96,7 @@ public class SiteServiceImpl extends AbstractCRUDServiceImpl<SiteDao, SiteEntity
      private void updateParentDeptStatus(SiteEntity dept, Context context) {
      SiteEntity siteEntity = this.get(dept.getParentId());
      siteEntity.setStatus(SiteSatusEnum.ENABLE.getValue());
      siteEntity.setStatus(SatusEnum.ENABLE.getValue());
      siteEntity.setUpdateTime(new Date());
      siteEntity.setUpdateUser(context.getUser().getLoginName());
      SiteEntity condition = new SiteEntity();
      ......@@ -128,6 +125,8 @@ public class SiteServiceImpl extends AbstractCRUDServiceImpl<SiteDao, SiteEntity
      this.updateAfter(children, context);
      // deptMapper.updateDeptChildren(children);
      }
      }
      ......@@ -164,16 +163,14 @@ public class SiteServiceImpl extends AbstractCRUDServiceImpl<SiteDao, SiteEntity
      @Override
      public List<TreeSelect> buildSiteTreeSelect(List<SiteEntity> sites) {
      List<SiteEntity> returnList = new ArrayList<>();
      List<Long> tempList = new ArrayList<>();
      for (SiteEntity dept : sites) {
      tempList.add(dept.getId());
      }
      List<Long> tempList = sites.stream().map(SiteEntity::getId).collect(Collectors.toList());
      for (Iterator<SiteEntity> iterator = sites.iterator(); iterator.hasNext(); ) {
      SiteEntity dept = iterator.next();
      SiteEntity siteEntity = iterator.next();
      // 如果是顶级节点, 遍历该父节点的所有子节点
      if (!tempList.contains(dept.getParentId())) {
      recursionFn(sites, dept);
      returnList.add(dept);
      if (!tempList.contains(siteEntity.getParentId())) {
      recursionFn(sites, siteEntity);
      returnList.add(siteEntity);
      }
      }
      if (returnList.isEmpty()) {
      ......@@ -198,25 +195,22 @@ public class SiteServiceImpl extends AbstractCRUDServiceImpl<SiteDao, SiteEntity
      }
      /**
      * 得到子节点列表
      * 判断是否有子节点
      */
      private List<SiteEntity> getChildList(List<SiteEntity> list, SiteEntity t) {
      List<SiteEntity> tlist = new ArrayList<>();
      Iterator<SiteEntity> it = list.iterator();
      while (it.hasNext()) {
      SiteEntity n = it.next();
      if (!ObjectUtils.isEmpty(n.getParentId()) && n.getParentId() == t.getId()) {
      tlist.add(n);
      }
      }
      return tlist;
      private boolean hasChild(List<SiteEntity> list, SiteEntity t) {
      return getChildList(list, t).size() > 0 ? true : false;
      }
      /**
      * 判断是否有子节点
      * 得到子节点列表
      */
      private boolean hasChild(List<SiteEntity> list, SiteEntity t) {
      return getChildList(list, t).size() > 0 ? true : false;
      private List<SiteEntity> getChildList(List<SiteEntity> list, SiteEntity t) {
      return list.stream().map(item->{
      if (!ObjectUtils.isEmpty(item.getParentId()) && item.getParentId() == t.getId()) {
      return item;
      }
      return null;
      }).filter(f->f!=null).collect(Collectors.toList());
      }
      }
      \ No newline at end of file
      government-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
      View file @ 5dd836e0
      ......@@ -2,7 +2,7 @@ package com.mortals.xhx.module.site.web;
      import com.alibaba.fastjson.JSONObject;
      import com.mortals.framework.model.Context;
      import com.mortals.xhx.common.code.SiteSatusEnum;
      import com.mortals.xhx.common.code.SatusEnum;
      import com.mortals.xhx.module.site.model.SiteQuery;
      import com.mortals.xhx.module.site.model.TreeSelect;
      import org.apache.commons.lang.StringUtils;
      ......@@ -42,7 +42,7 @@ public class SiteController extends BaseCRUDJsonMappingController<SiteService, S
      @Override
      protected void init(HttpServletRequest request, HttpServletResponse response, SiteForm form, Map<String, Object> model, Context context) {
      this.addDict(model, "status", SiteSatusEnum.getEnumMap());
      this.addDict(model, "status", SatusEnum.getEnumMap());
      super.init(request, response, form, model, context);
      }
      ......
      government-manager/src/main/java/com/mortals/xhx/module/yth/service/impl/YthOnethingServiceImpl.java
      View file @ 5dd836e0
      ......@@ -114,8 +114,6 @@ public class YthOnethingServiceImpl extends AbstractCRUDServiceImpl<YthOnethingD
      ).collect(Collectors.toList());
      ythOnethingDetailService.save(detailList);
      //获取流程定义key 发起流程 当前通过param参数固定获取
      String oneThingKey = paramService.getValueByKey(BusizParams.SYS_PARAM_FLOW_KEY);
      //通过流程key获取基础提交参数
      ......
      government-manager/src/main/resources/bootstrap.yml
      View file @ 5dd836e0
      ......@@ -34,8 +34,8 @@ mybatis:
      application:
      auth:
      unloginUrl: /refresh,/error,/login/login,/login/index,/login/logout,/securitycode/createCode,/file/common/*,,/test*,/api/asset/*,/api/*,/zwfw/*,/ws/*,/swagger-ui*
      uncheckUrl: /refresh,/error,/login/login,/login/index,/login/logout,/securitycode/createCode,/file/common/*,,/test*,/api/asset/*,/api/*,/zwfw/*,/ws/*,/swagger-ui*
      unloginUrl: /refresh,/error,/login/login,/login/index,/login/logout,/securitycode/createCode,/file/common/*,/test*,/api/asset/*,/api/*,/zwfw/*,/ws/*,/swagger-ui*,/topic/*,/uploads/*
      uncheckUrl: /refresh,/error,/login/login,/login/index,/login/logout,/securitycode/createCode,/file/common/*,/test*,/api/asset/*,/api/*,/zwfw/*,/ws/*,/swagger-ui*,/topic/*,/uploads/*
      workflow:
      tenantId: ${spring.application.name}
      token:
      ......
      government-manager/src/main/resources/sqlmap/base/system/gentable.xml
      View file @ 5dd836e0
      <?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.base.system.gentable.dao.ibatis.GentableDaoImpl">
      <!-- 字段和属性映射 -->
      <resultMap type="GentableEntity" id="GentableEntity-Map">
      <result property="id" column="id" />
      <id property="id" column="id" />
      <result property="tableName" column="tableName" />
      <result property="tableComment" column="tableComment" />
      <result property="subTableName" column="subTableName" />
      ......@@ -23,6 +23,8 @@
      <result property="genFeign" column="genFeign" />
      <result property="feignAppName" column="feignAppName" />
      <result property="genApi" column="genApi" />
      <result property="isGenExport" column="isGenExport" />
      <result property="isShowControl" column="isShowControl" />
      <result property="genPath" column="genPath" />
      <result property="options" column="options" />
      <result property="remark" column="remark" />
      ......@@ -30,36 +32,10 @@
      <result property="updateUser" column="updateUser" />
      <result property="createTime" column="createTime" />
      <result property="createUser" column="createUser" />
      <collection property="columns" javaType="java.util.List" resultMap="GentableColumnEntity-Map" />
      </resultMap>
      <resultMap type="GentableColumnEntity" id="GentableColumnEntity-Map">
      <result property="id" column="id" />
      <result property="tableId" column="tableId" />
      <result property="columnName" column="columnName" />
      <result property="columnComment" column="columnComment" />
      <result property="columnType" column="columnType" />
      <result property="javaType" column="javaType" />
      <result property="javaField" column="javaField" />
      <result property="isPrimaryKey" column="isPrimaryKey" />
      <result property="isIncrement" column="isIncrement" />
      <result property="isRequired" column="isRequired" />
      <result property="isInsert" column="isInsert" />
      <result property="isEdit" column="isEdit" />
      <result property="isList" column="isList" />
      <result property="isQuery" column="isQuery" />
      <result property="isExport" column="isExport" />
      <result property="isSerialize" column="isSerialize" />
      <result property="htmlType" column="htmlType" />
      <result property="queryType" column="queryType" />
      <result property="defaultValue" column="defaultValue" />
      <result property="sort" column="sort" />
      <result property="updateTime" column="updateTime" />
      <result property="updateUser" column="updateUser" />
      <result property="createTime" column="createTime" />
      <result property="createUser" column="createUser" />
      </resultMap>
      <!-- 表所有列 -->
      <sql id="_columns">
      <trim suffixOverrides="," suffix="">
      ......@@ -117,6 +93,12 @@
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('genApi') or colPickMode == 1 and data.containsKey('genApi')))">
      a.genApi as genApi,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isGenExport') or colPickMode == 1 and data.containsKey('isGenExport')))">
      a.isGenExport as isGenExport,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isShowControl') or colPickMode == 1 and data.containsKey('isShowControl')))">
      a.isShowControl as isShowControl,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('genPath') or colPickMode == 1 and data.containsKey('genPath')))">
      a.genPath as genPath,
      </if>
      ......@@ -140,23 +122,25 @@
      </if>
      </trim>
      </sql>
      <!-- 新增 -->
      <insert id="insert" parameterType="GentableEntity" useGeneratedKeys="true" keyProperty="id">
      <!-- 新增 区分主键自增加还是业务插入 -->
      <insert id="insert" parameterType="GentableEntity" useGeneratedKeys="true" keyProperty="id">
      insert into mortals_xhx_gentable
      (tableName,tableComment,subTableName,subTableFkName,className,tplCategory,packageName,moduleName,businessName,functionName,functionAuthor,cacheServiceType,genType,dividedTableType,genFeign,feignAppName,genApi,genPath,options,remark,updateTime,updateUser,createTime,createUser)
      (tableName,tableComment,subTableName,subTableFkName,className,tplCategory,packageName,moduleName,businessName,functionName,functionAuthor,cacheServiceType,genType,dividedTableType,genFeign,feignAppName,genApi,isGenExport,isShowControl,genPath,options,remark,updateTime,updateUser,createTime,createUser)
      VALUES
      (#{tableName},#{tableComment},#{subTableName},#{subTableFkName},#{className},#{tplCategory},#{packageName},#{moduleName},#{businessName},#{functionName},#{functionAuthor},#{cacheServiceType},#{genType},#{dividedTableType},#{genFeign},#{feignAppName},#{genApi},#{genPath},#{options},#{remark},#{updateTime},#{updateUser},#{createTime},#{createUser})
      (#{tableName},#{tableComment},#{subTableName},#{subTableFkName},#{className},#{tplCategory},#{packageName},#{moduleName},#{businessName},#{functionName},#{functionAuthor},#{cacheServiceType},#{genType},#{dividedTableType},#{genFeign},#{feignAppName},#{genApi},#{isGenExport},#{isShowControl},#{genPath},#{options},#{remark},#{updateTime},#{updateUser},#{createTime},#{createUser})
      </insert>
      <!-- 批量新增 -->
      <insert id="insertBatch" parameterType="paramDto">
      insert into mortals_xhx_gentable
      (tableName,tableComment,subTableName,subTableFkName,className,tplCategory,packageName,moduleName,businessName,functionName,functionAuthor,cacheServiceType,genType,dividedTableType,genFeign,feignAppName,genApi,genPath,options,remark,updateTime,updateUser,createTime,createUser)
      (tableName,tableComment,subTableName,subTableFkName,className,tplCategory,packageName,moduleName,businessName,functionName,functionAuthor,cacheServiceType,genType,dividedTableType,genFeign,feignAppName,genApi,isGenExport,isShowControl,genPath,options,remark,updateTime,updateUser,createTime,createUser)
      VALUES
      <foreach collection="data.dataList" item="item" index="index" separator="," >
      (#{item.tableName},#{item.tableComment},#{item.subTableName},#{item.subTableFkName},#{item.className},#{item.tplCategory},#{item.packageName},#{item.moduleName},#{item.businessName},#{item.functionName},#{item.functionAuthor},#{item.cacheServiceType},#{item.genType},#{item.dividedTableType},#{item.genFeign},#{item.feignAppName},#{item.genApi},#{item.genPath},#{item.options},#{item.remark},#{item.updateTime},#{item.updateUser},#{item.createTime},#{item.createUser})
      (#{item.tableName},#{item.tableComment},#{item.subTableName},#{item.subTableFkName},#{item.className},#{item.tplCategory},#{item.packageName},#{item.moduleName},#{item.businessName},#{item.functionName},#{item.functionAuthor},#{item.cacheServiceType},#{item.genType},#{item.dividedTableType},#{item.genFeign},#{item.feignAppName},#{item.genApi},#{item.isGenExport},#{item.isShowControl},#{item.genPath},#{item.options},#{item.remark},#{item.updateTime},#{item.updateUser},#{item.createTime},#{item.createUser})
      </foreach>
      </insert>
      <!-- 根据ParamDto更新 -->
      <update id="update" parameterType="paramDto">
      update mortals_xhx_gentable as a
      ......@@ -228,6 +212,18 @@
      <if test="(colPickMode==0 and data.containsKey('genApiIncrement')) or (colPickMode==1 and !data.containsKey('genApiIncrement'))">
      a.genApi=ifnull(a.genApi,0) + #{data.genApiIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('isGenExport')) or (colPickMode==1 and !data.containsKey('isGenExport'))">
      a.isGenExport=#{data.isGenExport},
      </if>
      <if test="(colPickMode==0 and data.containsKey('isGenExportIncrement')) or (colPickMode==1 and !data.containsKey('isGenExportIncrement'))">
      a.isGenExport=ifnull(a.isGenExport,0) + #{data.isGenExportIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('isShowControl')) or (colPickMode==1 and !data.containsKey('isShowControl'))">
      a.isShowControl=#{data.isShowControl},
      </if>
      <if test="(colPickMode==0 and data.containsKey('isShowControlIncrement')) or (colPickMode==1 and !data.containsKey('isShowControlIncrement'))">
      a.isShowControl=ifnull(a.isShowControl,0) + #{data.isShowControlIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('genPath')) or (colPickMode==1 and !data.containsKey('genPath'))">
      a.genPath=#{data.genPath},
      </if>
      ......@@ -261,8 +257,6 @@
      <update id="updateBatch" parameterType="paramDto">
      update mortals_xhx_gentable as a
      <trim prefix="set" suffixOverrides=",">
      <trim prefix="tableName=(case" suffix="ELSE tableName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('tableName')) or (colPickMode==1 and !item.containsKey('tableName'))">
      ......@@ -270,7 +264,6 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="tableComment=(case" suffix="ELSE tableComment end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('tableComment')) or (colPickMode==1 and !item.containsKey('tableComment'))">
      ......@@ -278,7 +271,6 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="subTableName=(case" suffix="ELSE subTableName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('subTableName')) or (colPickMode==1 and !item.containsKey('subTableName'))">
      ......@@ -286,7 +278,6 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="subTableFkName=(case" suffix="ELSE subTableFkName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('subTableFkName')) or (colPickMode==1 and !item.containsKey('subTableFkName'))">
      ......@@ -294,7 +285,6 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="className=(case" suffix="ELSE className end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('className')) or (colPickMode==1 and !item.containsKey('className'))">
      ......@@ -302,7 +292,6 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="tplCategory=(case" suffix="ELSE tplCategory end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('tplCategory')) or (colPickMode==1 and !item.containsKey('tplCategory'))">
      ......@@ -310,7 +299,6 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="packageName=(case" suffix="ELSE packageName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('packageName')) or (colPickMode==1 and !item.containsKey('packageName'))">
      ......@@ -318,7 +306,6 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="moduleName=(case" suffix="ELSE moduleName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('moduleName')) or (colPickMode==1 and !item.containsKey('moduleName'))">
      ......@@ -326,7 +313,6 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="businessName=(case" suffix="ELSE businessName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('businessName')) or (colPickMode==1 and !item.containsKey('businessName'))">
      ......@@ -334,7 +320,6 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="functionName=(case" suffix="ELSE functionName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('functionName')) or (colPickMode==1 and !item.containsKey('functionName'))">
      ......@@ -342,7 +327,6 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="functionAuthor=(case" suffix="ELSE functionAuthor end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('functionAuthor')) or (colPickMode==1 and !item.containsKey('functionAuthor'))">
      ......@@ -350,7 +334,6 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="cacheServiceType=(case" suffix="ELSE cacheServiceType end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      ......@@ -363,7 +346,6 @@
      </choose>
      </foreach>
      </trim>
      <trim prefix="genType=(case" suffix="ELSE genType end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      ......@@ -376,7 +358,6 @@
      </choose>
      </foreach>
      </trim>
      <trim prefix="dividedTableType=(case" suffix="ELSE dividedTableType end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      ......@@ -389,7 +370,6 @@
      </choose>
      </foreach>
      </trim>
      <trim prefix="genFeign=(case" suffix="ELSE genFeign end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      ......@@ -402,7 +382,6 @@
      </choose>
      </foreach>
      </trim>
      <trim prefix="feignAppName=(case" suffix="ELSE feignAppName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('feignAppName')) or (colPickMode==1 and !item.containsKey('feignAppName'))">
      ......@@ -410,7 +389,6 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="genApi=(case" suffix="ELSE genApi end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      ......@@ -423,7 +401,30 @@
      </choose>
      </foreach>
      </trim>
      <trim prefix="isGenExport=(case" suffix="ELSE isGenExport end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('isGenExport')) or (colPickMode==1 and !item.containsKey('isGenExport'))">
      when a.id=#{item.id} then #{item.isGenExport}
      </when>
      <when test="(colPickMode==0 and item.containsKey('isGenExportIncrement')) or (colPickMode==1 and !item.containsKey('isGenExportIncrement'))">
      when a.id=#{item.id} then ifnull(a.isGenExport,0) + #{item.isGenExportIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="isShowControl=(case" suffix="ELSE isShowControl end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('isShowControl')) or (colPickMode==1 and !item.containsKey('isShowControl'))">
      when a.id=#{item.id} then #{item.isShowControl}
      </when>
      <when test="(colPickMode==0 and item.containsKey('isShowControlIncrement')) or (colPickMode==1 and !item.containsKey('isShowControlIncrement'))">
      when a.id=#{item.id} then ifnull(a.isShowControl,0) + #{item.isShowControlIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="genPath=(case" suffix="ELSE genPath end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('genPath')) or (colPickMode==1 and !item.containsKey('genPath'))">
      ......@@ -431,7 +432,6 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="options=(case" suffix="ELSE options end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('options')) or (colPickMode==1 and !item.containsKey('options'))">
      ......@@ -439,7 +439,6 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="remark=(case" suffix="ELSE remark end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
      ......@@ -447,7 +446,6 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
      ......@@ -455,7 +453,6 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="updateUser=(case" suffix="ELSE updateUser end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('updateUser')) or (colPickMode==1 and !item.containsKey('updateUser'))">
      ......@@ -463,7 +460,6 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="createTime=(case" suffix="ELSE createTime end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
      ......@@ -471,7 +467,6 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="createUser=(case" suffix="ELSE createUser end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('createUser')) or (colPickMode==1 and !item.containsKey('createUser'))">
      ......@@ -524,6 +519,7 @@
      </trim>
      <include refid="_orderCols_"/>
      </select>
      <!-- 获取 -->
      <select id="getListCount" parameterType="paramDto" resultType="int">
      select count(1)
      ......@@ -572,7 +568,6 @@
      <!-- 条件映射-代参数 -->
      <sql id="_condition_param_">
      <bind name="conditionParamRef" value="${_conditionParam_}"/>
      <if test="conditionParamRef.containsKey('id')">
      <if test="conditionParamRef.id != null">
      ${_conditionType_} a.id=#{${_conditionParam_}.id}
      ......@@ -884,6 +879,48 @@
      ${_conditionType_} a.genApi <![CDATA[ <= ]]> #{${_conditionParam_}.genApiEnd}
      </if>
      <if test="conditionParamRef.containsKey('isGenExport')">
      <if test="conditionParamRef.isGenExport != null ">
      ${_conditionType_} a.isGenExport = #{${_conditionParam_}.isGenExport}
      </if>
      <if test="conditionParamRef.isGenExport == null">
      ${_conditionType_} a.isGenExport is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('isGenExportList')">
      ${_conditionType_} a.isGenExport in
      <foreach collection="conditionParamRef.isGenExportList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('isGenExportStart') and conditionParamRef.isGenExportStart != null">
      ${_conditionType_} a.isGenExport <![CDATA[ >= ]]> #{${_conditionParam_}.isGenExportStart}
      </if>
      <if test="conditionParamRef.containsKey('isGenExportEnd') and conditionParamRef.isGenExportEnd != null">
      ${_conditionType_} a.isGenExport <![CDATA[ <= ]]> #{${_conditionParam_}.isGenExportEnd}
      </if>
      <if test="conditionParamRef.containsKey('isShowControl')">
      <if test="conditionParamRef.isShowControl != null ">
      ${_conditionType_} a.isShowControl = #{${_conditionParam_}.isShowControl}
      </if>
      <if test="conditionParamRef.isShowControl == null">
      ${_conditionType_} a.isShowControl is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('isShowControlList')">
      ${_conditionType_} a.isShowControl in
      <foreach collection="conditionParamRef.isShowControlList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('isShowControlStart') and conditionParamRef.isShowControlStart != null">
      ${_conditionType_} a.isShowControl <![CDATA[ >= ]]> #{${_conditionParam_}.isShowControlStart}
      </if>
      <if test="conditionParamRef.containsKey('isShowControlEnd') and conditionParamRef.isShowControlEnd != null">
      ${_conditionType_} a.isShowControl <![CDATA[ <= ]]> #{${_conditionParam_}.isShowControlEnd}
      </if>
      <if test="conditionParamRef.containsKey('genPath')">
      <if test="conditionParamRef.genPath != null and conditionParamRef.genPath != ''">
      ......@@ -1092,6 +1129,16 @@
      <if test='orderCol.genApi != null and "DESC".equalsIgnoreCase(orderCol.genApi)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('isGenExport')">
      a.isGenExport
      <if test='orderCol.isGenExport != null and "DESC".equalsIgnoreCase(orderCol.isGenExport)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('isShowControl')">
      a.isShowControl
      <if test='orderCol.isShowControl != null and "DESC".equalsIgnoreCase(orderCol.isShowControl)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('genPath')">
      a.genPath
      <if test='orderCol.genPath != null and "DESC".equalsIgnoreCase(orderCol.genPath)'>DESC</if>
      ......
      government-manager/src/main/resources/sqlmap/module/demo/DemoMapper.xml
      View file @ 5dd836e0
      ......@@ -14,8 +14,8 @@
      <result property="updateUser" column="updateUser" />
      <result property="createTime" column="createTime" />
      <result property="createUser" column="createUser" />
      <association property="demoDetailEntity" column="id" select="getDemoDetailByDemoId"></association>
      </resultMap>
      <collection property="demoDetailList" column="id" ofType="DemoDetailEntity" javaType="ArrayList" select="getDemoDetailByDemoId"></collection>
      </resultMap>
      <resultMap type="DemoDetailEntity" id="DemoDetailEntity-Map">
      <result property="id" column="id" />
      <result property="demoId" column="demoId" />
      ......
      government-manager/src/main/resources/sqlmap/module/matters/matters.xml
      View file @ 5dd836e0
      ......@@ -127,8 +127,6 @@
      <update id="updateBatch" parameterType="paramDto">
      update mortals_iot_matters as a
      <trim prefix="set" suffixOverrides=",">
      <trim prefix="areaCode=(case" suffix="ELSE areaCode end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('areaCode')) or (colPickMode==1 and !item.containsKey('areaCode'))">
      ......
      government-manager/src/main/resources/sqlmap/module/one/oneClassify.xml deleted 100644 → 0
      View file @ c1446d69
      <?xml version="1.0" encoding="UTF-8"?>
      <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
      "mybatis-3-mapper.dtd">
      <mapper namespace="com.mortals.xhx.module.one.dao.ibatis.OneClassifyDaoImpl">
      <!-- 字段和属性映射 -->
      <resultMap type="OneClassifyEntity" id="OneClassifyEntity-Map">
      <result property="id" column="id" />
      <result property="classifyName" column="classify_name" />
      <result property="tName" column="t_name" />
      <result property="classifyLevel" column="classify_level" />
      <result property="businessId" column="business_id" />
      <result property="matterIds" column="matter_ids" />
      <result property="siteId" column="site_id" />
      <result property="parentId" column="parent_id" />
      <result property="sortRemarks" column="sort_remarks" />
      <result property="isAns" column="isAns" />
      <result property="isLeaf" column="isLeaf" />
      <result property="deleted" column="deleted" />
      <result property="createUserId" column="createUserId" />
      <result property="createUserName" column="createUserName" />
      <result property="createTime" column="createTime" />
      <result property="updateUserId" column="updateUserId" />
      <result property="updateUserName" column="updateUserName" />
      <result property="updateTime" column="updateTime" />
      </resultMap>
      <!-- 表所有列 -->
      <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,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('classifyName') or colPickMode == 1 and data.containsKey('classifyName')))">
      a.classify_name as classify_name,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('tName') or colPickMode == 1 and data.containsKey('tName')))">
      a.t_name as t_name,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('classifyLevel') or colPickMode == 1 and data.containsKey('classifyLevel')))">
      a.classify_level as classify_level,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('businessId') or colPickMode == 1 and data.containsKey('businessId')))">
      a.business_id as business_id,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterIds') or colPickMode == 1 and data.containsKey('matterIds')))">
      a.matter_ids as matter_ids,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
      a.site_id as site_id,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('parentId') or colPickMode == 1 and data.containsKey('parentId')))">
      a.parent_id as parent_id,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sortRemarks') or colPickMode == 1 and data.containsKey('sortRemarks')))">
      a.sort_remarks as sort_remarks,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isAns') or colPickMode == 1 and data.containsKey('isAns')))">
      a.isAns as isAns,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isLeaf') or colPickMode == 1 and data.containsKey('isLeaf')))">
      a.isLeaf as isLeaf,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deleted') or colPickMode == 1 and data.containsKey('deleted')))">
      a.deleted as deleted,
      </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,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserName') or colPickMode == 1 and data.containsKey('createUserName')))">
      a.createUserName as createUserName,
      </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,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
      a.updateUserId as updateUserId,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserName') or colPickMode == 1 and data.containsKey('updateUserName')))">
      a.updateUserName as updateUserName,
      </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,
      </if>
      </trim>
      </sql>
      <!-- 新增 -->
      <insert id="insert" parameterType="OneClassifyEntity" useGeneratedKeys="true" keyProperty="id">
      insert into mortals_xhx_one_classify
      (classify_name,t_name,classify_level,business_id,matter_ids,site_id,parent_id,sort_remarks,isAns,isLeaf,deleted,createUserId,createUserName,createTime,updateUserId,updateUserName,updateTime)
      VALUES
      (#{classifyName},#{tName},#{classifyLevel},#{businessId},#{matterIds},#{siteId},#{parentId},#{sortRemarks},#{isAns},#{isLeaf},#{deleted},#{createUserId},#{createUserName},#{createTime},#{updateUserId},#{updateUserName},#{updateTime})
      </insert>
      <!-- 批量新增 -->
      <insert id="insertBatch" parameterType="paramDto">
      insert into mortals_xhx_one_classify
      (classify_name,t_name,classify_level,business_id,matter_ids,site_id,parent_id,sort_remarks,isAns,isLeaf,deleted,createUserId,createUserName,createTime,updateUserId,updateUserName,updateTime)
      VALUES
      <foreach collection="data.dataList" item="item" index="index" separator="," >
      (#{item.classifyName},#{item.tName},#{item.classifyLevel},#{item.businessId},#{item.matterIds},#{item.siteId},#{item.parentId},#{item.sortRemarks},#{item.isAns},#{item.isLeaf},#{item.deleted},#{item.createUserId},#{item.createUserName},#{item.createTime},#{item.updateUserId},#{item.updateUserName},#{item.updateTime})
      </foreach>
      </insert>
      <!-- 根据ParamDto更新 -->
      <update id="update" parameterType="paramDto">
      update mortals_xhx_one_classify as a
      set
      <trim suffixOverrides="," suffix="">
      <if test="(colPickMode==0 and data.containsKey('classifyName')) or (colPickMode==1 and !data.containsKey('classifyName'))">
      a.classify_name=#{data.classifyName},
      </if>
      <if test="(colPickMode==0 and data.containsKey('tName')) or (colPickMode==1 and !data.containsKey('tName'))">
      a.t_name=#{data.tName},
      </if>
      <if test="(colPickMode==0 and data.containsKey('classifyLevel')) or (colPickMode==1 and !data.containsKey('classifyLevel'))">
      a.classify_level=#{data.classifyLevel},
      </if>
      <if test="(colPickMode==0 and data.containsKey('classifyLevelIncrement')) or (colPickMode==1 and !data.containsKey('classifyLevelIncrement'))">
      a.classify_level=ifnull(a.classify_level,0) + #{data.classifyLevelIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('businessId')) or (colPickMode==1 and !data.containsKey('businessId'))">
      a.business_id=#{data.businessId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('matterIds')) or (colPickMode==1 and !data.containsKey('matterIds'))">
      a.matter_ids=#{data.matterIds},
      </if>
      <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
      a.site_id=#{data.siteId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
      a.site_id=ifnull(a.site_id,0) + #{data.siteIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('parentId')) or (colPickMode==1 and !data.containsKey('parentId'))">
      a.parent_id=#{data.parentId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('parentIdIncrement')) or (colPickMode==1 and !data.containsKey('parentIdIncrement'))">
      a.parent_id=ifnull(a.parent_id,0) + #{data.parentIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('sortRemarks')) or (colPickMode==1 and !data.containsKey('sortRemarks'))">
      a.sort_remarks=#{data.sortRemarks},
      </if>
      <if test="(colPickMode==0 and data.containsKey('isAns')) or (colPickMode==1 and !data.containsKey('isAns'))">
      a.isAns=#{data.isAns},
      </if>
      <if test="(colPickMode==0 and data.containsKey('isAnsIncrement')) or (colPickMode==1 and !data.containsKey('isAnsIncrement'))">
      a.isAns=ifnull(a.isAns,0) + #{data.isAnsIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('isLeaf')) or (colPickMode==1 and !data.containsKey('isLeaf'))">
      a.isLeaf=#{data.isLeaf},
      </if>
      <if test="(colPickMode==0 and data.containsKey('isLeafIncrement')) or (colPickMode==1 and !data.containsKey('isLeafIncrement'))">
      a.isLeaf=ifnull(a.isLeaf,0) + #{data.isLeafIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('deleted')) or (colPickMode==1 and !data.containsKey('deleted'))">
      a.deleted=#{data.deleted},
      </if>
      <if test="(colPickMode==0 and data.containsKey('deletedIncrement')) or (colPickMode==1 and !data.containsKey('deletedIncrement'))">
      a.deleted=ifnull(a.deleted,0) + #{data.deletedIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
      a.createUserId=#{data.createUserId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
      a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('createUserName')) or (colPickMode==1 and !data.containsKey('createUserName'))">
      a.createUserName=#{data.createUserName},
      </if>
      <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
      a.createTime=#{data.createTime},
      </if>
      <if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
      a.updateUserId=#{data.updateUserId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
      a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('updateUserName')) or (colPickMode==1 and !data.containsKey('updateUserName'))">
      a.updateUserName=#{data.updateUserName},
      </if>
      <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
      a.updateTime=#{data.updateTime},
      </if>
      </trim>
      <trim suffixOverrides="where" suffix="">
      where
      <trim prefixOverrides="and" prefix="">
      <include refid="_condition_"/>
      </trim>
      </trim>
      </update>
      <!-- 批量更新 -->
      <update id="updateBatch" parameterType="paramDto">
      update mortals_xhx_one_classify as a
      <trim prefix="set" suffixOverrides=",">
      <trim prefix="classify_name=(case" suffix="ELSE classify_name end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('classifyName')) or (colPickMode==1 and !item.containsKey('classifyName'))">
      when a.id=#{item.id} then #{item.classifyName}
      </if>
      </foreach>
      </trim>
      <trim prefix="t_name=(case" suffix="ELSE t_name end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('tName')) or (colPickMode==1 and !item.containsKey('tName'))">
      when a.id=#{item.id} then #{item.tName}
      </if>
      </foreach>
      </trim>
      <trim prefix="classify_level=(case" suffix="ELSE classify_level end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('classifyLevel')) or (colPickMode==1 and !item.containsKey('classifyLevel'))">
      when a.id=#{item.id} then #{item.classifyLevel}
      </when>
      <when test="(colPickMode==0 and item.containsKey('classifyLevelIncrement')) or (colPickMode==1 and !item.containsKey('classifyLevelIncrement'))">
      when a.id=#{item.id} then ifnull(a.classify_level,0) + #{item.classifyLevelIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="business_id=(case" suffix="ELSE business_id end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('businessId')) or (colPickMode==1 and !item.containsKey('businessId'))">
      when a.id=#{item.id} then #{item.businessId}
      </if>
      </foreach>
      </trim>
      <trim prefix="matter_ids=(case" suffix="ELSE matter_ids end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('matterIds')) or (colPickMode==1 and !item.containsKey('matterIds'))">
      when a.id=#{item.id} then #{item.matterIds}
      </if>
      </foreach>
      </trim>
      <trim prefix="site_id=(case" suffix="ELSE site_id end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
      when a.id=#{item.id} then #{item.siteId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.site_id,0) + #{item.siteIdIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="parent_id=(case" suffix="ELSE parent_id end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('parentId')) or (colPickMode==1 and !item.containsKey('parentId'))">
      when a.id=#{item.id} then #{item.parentId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('parentIdIncrement')) or (colPickMode==1 and !item.containsKey('parentIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.parent_id,0) + #{item.parentIdIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="sort_remarks=(case" suffix="ELSE sort_remarks end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('sortRemarks')) or (colPickMode==1 and !item.containsKey('sortRemarks'))">
      when a.id=#{item.id} then #{item.sortRemarks}
      </if>
      </foreach>
      </trim>
      <trim prefix="isAns=(case" suffix="ELSE isAns end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('isAns')) or (colPickMode==1 and !item.containsKey('isAns'))">
      when a.id=#{item.id} then #{item.isAns}
      </when>
      <when test="(colPickMode==0 and item.containsKey('isAnsIncrement')) or (colPickMode==1 and !item.containsKey('isAnsIncrement'))">
      when a.id=#{item.id} then ifnull(a.isAns,0) + #{item.isAnsIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="isLeaf=(case" suffix="ELSE isLeaf end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('isLeaf')) or (colPickMode==1 and !item.containsKey('isLeaf'))">
      when a.id=#{item.id} then #{item.isLeaf}
      </when>
      <when test="(colPickMode==0 and item.containsKey('isLeafIncrement')) or (colPickMode==1 and !item.containsKey('isLeafIncrement'))">
      when a.id=#{item.id} then ifnull(a.isLeaf,0) + #{item.isLeafIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="deleted=(case" suffix="ELSE deleted end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('deleted')) or (colPickMode==1 and !item.containsKey('deleted'))">
      when a.id=#{item.id} then #{item.deleted}
      </when>
      <when test="(colPickMode==0 and item.containsKey('deletedIncrement')) or (colPickMode==1 and !item.containsKey('deletedIncrement'))">
      when a.id=#{item.id} then ifnull(a.deleted,0) + #{item.deletedIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
      when a.id=#{item.id} then #{item.createUserId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="createUserName=(case" suffix="ELSE createUserName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('createUserName')) or (colPickMode==1 and !item.containsKey('createUserName'))">
      when a.id=#{item.id} then #{item.createUserName}
      </if>
      </foreach>
      </trim>
      <trim prefix="createTime=(case" suffix="ELSE createTime end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
      when a.id=#{item.id} then #{item.createTime}
      </if>
      </foreach>
      </trim>
      <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
      when a.id=#{item.id} then #{item.updateUserId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="updateUserName=(case" suffix="ELSE updateUserName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('updateUserName')) or (colPickMode==1 and !item.containsKey('updateUserName'))">
      when a.id=#{item.id} then #{item.updateUserName}
      </if>
      </foreach>
      </trim>
      <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
      when a.id=#{item.id} then #{item.updateTime}
      </if>
      </foreach>
      </trim>
      </trim>
      where id in
      <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
      #{item.id}
      </foreach>
      </update>
      <!-- 根据主健查询 -->
      <select id="getByKey" parameterType="paramDto" resultMap="OneClassifyEntity-Map">
      select <include refid="_columns"/>
      from mortals_xhx_one_classify as a
      where a.id=#{condition.id}
      </select>
      <!-- 根据主健删除 -->
      <delete id="deleteByKey" parameterType="paramDto">
      delete a.* from mortals_xhx_one_classify as a where a.id=#{condition.id}
      </delete>
      <!-- 根据主健删除一批，针对单一主健有效 -->
      <delete id="deleteByKeys">
      delete from mortals_xhx_one_classify where id in
      <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
      #{item}
      </foreach>
      </delete>
      <!-- 根据paramDto删除一批 -->
      <delete id="deleteByMap" parameterType="paramDto">
      delete a.* from mortals_xhx_one_classify as a
      <trim suffixOverrides="where" suffix="">
      where
      <trim prefixOverrides="and" prefix="">
      <include refid="_condition_"/>
      </trim>
      </trim>
      </delete>
      <!-- 获取列表 -->
      <select id="getList" parameterType="paramDto" resultMap="OneClassifyEntity-Map">
      select <include refid="_columns"/>
      from mortals_xhx_one_classify as a
      <trim suffixOverrides="where" suffix="">
      where
      <trim prefixOverrides="and" prefix="">
      <include refid="_condition_"/>
      </trim>
      </trim>
      <include refid="_orderCols_"/>
      </select>
      <!-- 获取 -->
      <select id="getListCount" parameterType="paramDto" resultType="int">
      select count(1)
      from mortals_xhx_one_classify as a
      <trim suffixOverrides="where" suffix="">
      where
      <trim prefixOverrides="and" prefix="">
      <include refid="_condition_"/>
      </trim>
      </trim>
      </select>
      <!-- 条件映射 -->
      <sql id="_condition_">
      <if test="condition != null and !condition.isEmpty()">
      <!-- 条件映射-普通条件 -->
      <include refid="_condition_param_">
      <property name="_conditionParam_" value="condition"/>
      <property name="_conditionType_" value="and"/>
      </include>
      <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
      <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
      and
      <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
      <trim prefixOverrides="or" prefix="(" suffix=")">
      <include refid="_condition_param_">
      <property name="_conditionParam_" value="andCondition"/>
      <property name="_conditionType_" value="or"/>
      </include>
      </trim>
      </foreach>
      </if>
      <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
      <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
      and
      <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
      <trim prefixOverrides="and" prefix="(" suffix=")">
      <include refid="_condition_param_">
      <property name="_conditionParam_" value="orCondition"/>
      <property name="_conditionType_" value="and"/>
      </include>
      </trim>
      </foreach>
      </if>
      </if>
      </sql>
      <!-- 条件映射-代参数 -->
      <sql id="_condition_param_">
      <bind name="conditionParamRef" value="${_conditionParam_}"/>
      <if test="conditionParamRef.containsKey('id')">
      <if test="conditionParamRef.id != null">
      ${_conditionType_} a.id=#{${_conditionParam_}.id}
      </if>
      </if>
      <if test="conditionParamRef.containsKey('id')">
      <if test="conditionParamRef.id != null ">
      ${_conditionType_} a.id = #{${_conditionParam_}.id}
      </if>
      <if test="conditionParamRef.id == null">
      ${_conditionType_} a.id is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('idList')">
      ${_conditionType_} a.id in
      <foreach collection="conditionParamRef.idList" 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>
      <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
      ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
      </if>
      <if test="conditionParamRef.containsKey('classifyName')">
      <if test="conditionParamRef.classifyName != null and conditionParamRef.classifyName != ''">
      ${_conditionType_} a.classify_name like #{${_conditionParam_}.classifyName}
      </if>
      <if test="conditionParamRef.classifyName == null">
      ${_conditionType_} a.classify_name is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('classifyNameList')">
      ${_conditionType_} a.classify_name in
      <foreach collection="conditionParamRef.classifyNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('tName')">
      <if test="conditionParamRef.tName != null and conditionParamRef.tName != ''">
      ${_conditionType_} a.t_name like #{${_conditionParam_}.tName}
      </if>
      <if test="conditionParamRef.tName == null">
      ${_conditionType_} a.t_name is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('tNameList')">
      ${_conditionType_} a.t_name in
      <foreach collection="conditionParamRef.tNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('classifyLevel')">
      <if test="conditionParamRef.classifyLevel != null ">
      ${_conditionType_} a.classify_level = #{${_conditionParam_}.classifyLevel}
      </if>
      <if test="conditionParamRef.classifyLevel == null">
      ${_conditionType_} a.classify_level is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('classifyLevelList')">
      ${_conditionType_} a.classify_level in
      <foreach collection="conditionParamRef.classifyLevelList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('classifyLevelStart') and conditionParamRef.classifyLevelStart != null">
      ${_conditionType_} a.classify_level <![CDATA[ >= ]]> #{${_conditionParam_}.classifyLevelStart}
      </if>
      <if test="conditionParamRef.containsKey('classifyLevelEnd') and conditionParamRef.classifyLevelEnd != null">
      ${_conditionType_} a.classify_level <![CDATA[ <= ]]> #{${_conditionParam_}.classifyLevelEnd}
      </if>
      <if test="conditionParamRef.containsKey('businessId')">
      <if test="conditionParamRef.businessId != null and conditionParamRef.businessId != ''">
      ${_conditionType_} a.business_id like #{${_conditionParam_}.businessId}
      </if>
      <if test="conditionParamRef.businessId == null">
      ${_conditionType_} a.business_id is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('businessIdList')">
      ${_conditionType_} a.business_id in
      <foreach collection="conditionParamRef.businessIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterIds')">
      <if test="conditionParamRef.matterIds != null and conditionParamRef.matterIds != ''">
      ${_conditionType_} a.matter_ids like #{${_conditionParam_}.matterIds}
      </if>
      <if test="conditionParamRef.matterIds == null">
      ${_conditionType_} a.matter_ids is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('matterIdsList')">
      ${_conditionType_} a.matter_ids in
      <foreach collection="conditionParamRef.matterIdsList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('siteId')">
      <if test="conditionParamRef.siteId != null ">
      ${_conditionType_} a.site_id = #{${_conditionParam_}.siteId}
      </if>
      <if test="conditionParamRef.siteId == null">
      ${_conditionType_} a.site_id is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('siteIdList')">
      ${_conditionType_} a.site_id in
      <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
      ${_conditionType_} a.site_id <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
      </if>
      <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
      ${_conditionType_} a.site_id <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('parentId')">
      <if test="conditionParamRef.parentId != null ">
      ${_conditionType_} a.parent_id = #{${_conditionParam_}.parentId}
      </if>
      <if test="conditionParamRef.parentId == null">
      ${_conditionType_} a.parent_id is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('parentIdList')">
      ${_conditionType_} a.parent_id in
      <foreach collection="conditionParamRef.parentIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('parentIdStart') and conditionParamRef.parentIdStart != null">
      ${_conditionType_} a.parent_id <![CDATA[ >= ]]> #{${_conditionParam_}.parentIdStart}
      </if>
      <if test="conditionParamRef.containsKey('parentIdEnd') and conditionParamRef.parentIdEnd != null">
      ${_conditionType_} a.parent_id <![CDATA[ <= ]]> #{${_conditionParam_}.parentIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('sortRemarks')">
      <if test="conditionParamRef.sortRemarks != null and conditionParamRef.sortRemarks != ''">
      ${_conditionType_} a.sort_remarks like #{${_conditionParam_}.sortRemarks}
      </if>
      <if test="conditionParamRef.sortRemarks == null">
      ${_conditionType_} a.sort_remarks is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('sortRemarksList')">
      ${_conditionType_} a.sort_remarks in
      <foreach collection="conditionParamRef.sortRemarksList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('isAns')">
      <if test="conditionParamRef.isAns != null ">
      ${_conditionType_} a.isAns = #{${_conditionParam_}.isAns}
      </if>
      <if test="conditionParamRef.isAns == null">
      ${_conditionType_} a.isAns is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('isAnsList')">
      ${_conditionType_} a.isAns in
      <foreach collection="conditionParamRef.isAnsList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('isAnsStart') and conditionParamRef.isAnsStart != null">
      ${_conditionType_} a.isAns <![CDATA[ >= ]]> #{${_conditionParam_}.isAnsStart}
      </if>
      <if test="conditionParamRef.containsKey('isAnsEnd') and conditionParamRef.isAnsEnd != null">
      ${_conditionType_} a.isAns <![CDATA[ <= ]]> #{${_conditionParam_}.isAnsEnd}
      </if>
      <if test="conditionParamRef.containsKey('isLeaf')">
      <if test="conditionParamRef.isLeaf != null ">
      ${_conditionType_} a.isLeaf = #{${_conditionParam_}.isLeaf}
      </if>
      <if test="conditionParamRef.isLeaf == null">
      ${_conditionType_} a.isLeaf is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('isLeafList')">
      ${_conditionType_} a.isLeaf in
      <foreach collection="conditionParamRef.isLeafList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('isLeafStart') and conditionParamRef.isLeafStart != null">
      ${_conditionType_} a.isLeaf <![CDATA[ >= ]]> #{${_conditionParam_}.isLeafStart}
      </if>
      <if test="conditionParamRef.containsKey('isLeafEnd') and conditionParamRef.isLeafEnd != null">
      ${_conditionType_} a.isLeaf <![CDATA[ <= ]]> #{${_conditionParam_}.isLeafEnd}
      </if>
      <if test="conditionParamRef.containsKey('deleted')">
      <if test="conditionParamRef.deleted != null ">
      ${_conditionType_} a.deleted = #{${_conditionParam_}.deleted}
      </if>
      <if test="conditionParamRef.deleted == null">
      ${_conditionType_} a.deleted is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('deletedList')">
      ${_conditionType_} a.deleted in
      <foreach collection="conditionParamRef.deletedList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deletedStart') and conditionParamRef.deletedStart != null">
      ${_conditionType_} a.deleted <![CDATA[ >= ]]> #{${_conditionParam_}.deletedStart}
      </if>
      <if test="conditionParamRef.containsKey('deletedEnd') and conditionParamRef.deletedEnd != null">
      ${_conditionType_} a.deleted <![CDATA[ <= ]]> #{${_conditionParam_}.deletedEnd}
      </if>
      <if test="conditionParamRef.containsKey('createUserId')">
      <if test="conditionParamRef.createUserId != null ">
      ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
      </if>
      <if test="conditionParamRef.createUserId == null">
      ${_conditionType_} a.createUserId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('createUserIdList')">
      ${_conditionType_} a.createUserId in
      <foreach collection="conditionParamRef.createUserIdList" 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>
      <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
      ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('createUserName')">
      <if test="conditionParamRef.createUserName != null and conditionParamRef.createUserName != ''">
      ${_conditionType_} a.createUserName like #{${_conditionParam_}.createUserName}
      </if>
      <if test="conditionParamRef.createUserName == null">
      ${_conditionType_} a.createUserName is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('createUserNameList')">
      ${_conditionType_} a.createUserName in
      <foreach collection="conditionParamRef.createUserNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('createTime')">
      <if test="conditionParamRef.createTime != null ">
      ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
      </if>
      <if test="conditionParamRef.createTime == null">
      ${_conditionType_} a.createTime is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
      ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
      ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('updateUserId')">
      <if test="conditionParamRef.updateUserId != null ">
      ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
      </if>
      <if test="conditionParamRef.updateUserId == null">
      ${_conditionType_} a.updateUserId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('updateUserIdList')">
      ${_conditionType_} a.updateUserId in
      <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
      ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
      </if>
      <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
      ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('updateUserName')">
      <if test="conditionParamRef.updateUserName != null and conditionParamRef.updateUserName != ''">
      ${_conditionType_} a.updateUserName like #{${_conditionParam_}.updateUserName}
      </if>
      <if test="conditionParamRef.updateUserName == null">
      ${_conditionType_} a.updateUserName is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('updateUserNameList')">
      ${_conditionType_} a.updateUserName in
      <foreach collection="conditionParamRef.updateUserNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('updateTime')">
      <if test="conditionParamRef.updateTime != null ">
      ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
      </if>
      <if test="conditionParamRef.updateTime == null">
      ${_conditionType_} a.updateTime is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
      ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
      ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      </sql>
      <sql id="_orderCols_">
      <if test="orderColList != null and !orderColList.isEmpty()">
      order by
      <trim suffixOverrides="," suffix="">
      <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
      ${item.colName} ${item.sortKind}
      </foreach>
      </trim>
      </if>
      <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
      order by
      <trim suffixOverrides="," suffix="">
      <if test="orderCol.containsKey('id')">
      a.id
      <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('classifyName')">
      a.classify_name
      <if test='orderCol.classifyName != null and "DESC".equalsIgnoreCase(orderCol.classifyName)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('tName')">
      a.t_name
      <if test='orderCol.tName != null and "DESC".equalsIgnoreCase(orderCol.tName)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('classifyLevel')">
      a.classify_level
      <if test='orderCol.classifyLevel != null and "DESC".equalsIgnoreCase(orderCol.classifyLevel)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('businessId')">
      a.business_id
      <if test='orderCol.businessId != null and "DESC".equalsIgnoreCase(orderCol.businessId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('matterIds')">
      a.matter_ids
      <if test='orderCol.matterIds != null and "DESC".equalsIgnoreCase(orderCol.matterIds)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('siteId')">
      a.site_id
      <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('parentId')">
      a.parent_id
      <if test='orderCol.parentId != null and "DESC".equalsIgnoreCase(orderCol.parentId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('sortRemarks')">
      a.sort_remarks
      <if test='orderCol.sortRemarks != null and "DESC".equalsIgnoreCase(orderCol.sortRemarks)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('isAns')">
      a.isAns
      <if test='orderCol.isAns != null and "DESC".equalsIgnoreCase(orderCol.isAns)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('isLeaf')">
      a.isLeaf
      <if test='orderCol.isLeaf != null and "DESC".equalsIgnoreCase(orderCol.isLeaf)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('deleted')">
      a.deleted
      <if test='orderCol.deleted != null and "DESC".equalsIgnoreCase(orderCol.deleted)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('createUserId')">
      a.createUserId
      <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('createUserName')">
      a.createUserName
      <if test='orderCol.createUserName != null and "DESC".equalsIgnoreCase(orderCol.createUserName)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('createTime')">
      a.createTime
      <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('updateUserId')">
      a.updateUserId
      <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('updateUserName')">
      a.updateUserName
      <if test='orderCol.updateUserName != null and "DESC".equalsIgnoreCase(orderCol.updateUserName)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('updateTime')">
      a.updateTime
      <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
      ,
      </if>
      </trim>
      </if>
      </sql>
      <sql id="_group_by_">
      <if test="groupList != null and !groupList.isEmpty()">
      GROUP BY
      <trim suffixOverrides="," suffix="">
      <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
      ${item}
      </foreach>
      </trim>
      </if>
      </sql>
      </mapper>
      \ No newline at end of file
      government-manager/src/main/resources/sqlmap/module/one/oneClassifyTopical.xml deleted 100644 → 0
      View file @ c1446d69
      <?xml version="1.0" encoding="UTF-8"?>
      <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
      "mybatis-3-mapper.dtd">
      <mapper namespace="com.mortals.xhx.module.one.dao.ibatis.OneClassifyTopicalDaoImpl">
      <!-- 字段和属性映射 -->
      <resultMap type="OneClassifyTopicalEntity" id="OneClassifyTopicalEntity-Map">
      <result property="id" column="id" />
      <result property="topicalId" column="topical_id" />
      <result property="classifyId" column="classify_id" />
      <result property="classifyRank" column="classify_rank" />
      <result property="terminalIcon" column="terminal_icon" />
      <result property="moveIcon" column="move_icon" />
      <result property="overWay" column="over_way" />
      <result property="overTime" column="over_time" />
      <result property="siteId" column="site_id" />
      <result property="matterId" column="matter_id" />
      <result property="presenceNum" column="presence_num" />
      <result property="deleted" column="deleted" />
      <result property="createUserId" column="createUserId" />
      <result property="createUserName" column="createUserName" />
      <result property="createTime" column="createTime" />
      <result property="updateUserId" column="updateUserId" />
      <result property="updateUserName" column="updateUserName" />
      <result property="updateTime" column="updateTime" />
      </resultMap>
      <!-- 表所有列 -->
      <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,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('topicalId') or colPickMode == 1 and data.containsKey('topicalId')))">
      a.topical_id as topical_id,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('classifyId') or colPickMode == 1 and data.containsKey('classifyId')))">
      a.classify_id as classify_id,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('classifyRank') or colPickMode == 1 and data.containsKey('classifyRank')))">
      a.classify_rank as classify_rank,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('terminalIcon') or colPickMode == 1 and data.containsKey('terminalIcon')))">
      a.terminal_icon as terminal_icon,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('moveIcon') or colPickMode == 1 and data.containsKey('moveIcon')))">
      a.move_icon as move_icon,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('overWay') or colPickMode == 1 and data.containsKey('overWay')))">
      a.over_way as over_way,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('overTime') or colPickMode == 1 and data.containsKey('overTime')))">
      a.over_time as over_time,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
      a.site_id as site_id,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterId') or colPickMode == 1 and data.containsKey('matterId')))">
      a.matter_id as matter_id,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('presenceNum') or colPickMode == 1 and data.containsKey('presenceNum')))">
      a.presence_num as presence_num,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deleted') or colPickMode == 1 and data.containsKey('deleted')))">
      a.deleted as deleted,
      </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,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserName') or colPickMode == 1 and data.containsKey('createUserName')))">
      a.createUserName as createUserName,
      </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,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
      a.updateUserId as updateUserId,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserName') or colPickMode == 1 and data.containsKey('updateUserName')))">
      a.updateUserName as updateUserName,
      </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,
      </if>
      </trim>
      </sql>
      <!-- 新增 -->
      <insert id="insert" parameterType="OneClassifyTopicalEntity" useGeneratedKeys="true" keyProperty="id">
      insert into mortals_xhx_one_classify_topical
      (topical_id,classify_id,classify_rank,terminal_icon,move_icon,over_way,over_time,site_id,matter_id,presence_num,deleted,createUserId,createUserName,createTime,updateUserId,updateUserName,updateTime)
      VALUES
      (#{topicalId},#{classifyId},#{classifyRank},#{terminalIcon},#{moveIcon},#{overWay},#{overTime},#{siteId},#{matterId},#{presenceNum},#{deleted},#{createUserId},#{createUserName},#{createTime},#{updateUserId},#{updateUserName},#{updateTime})
      </insert>
      <!-- 批量新增 -->
      <insert id="insertBatch" parameterType="paramDto">
      insert into mortals_xhx_one_classify_topical
      (topical_id,classify_id,classify_rank,terminal_icon,move_icon,over_way,over_time,site_id,matter_id,presence_num,deleted,createUserId,createUserName,createTime,updateUserId,updateUserName,updateTime)
      VALUES
      <foreach collection="data.dataList" item="item" index="index" separator="," >
      (#{item.topicalId},#{item.classifyId},#{item.classifyRank},#{item.terminalIcon},#{item.moveIcon},#{item.overWay},#{item.overTime},#{item.siteId},#{item.matterId},#{item.presenceNum},#{item.deleted},#{item.createUserId},#{item.createUserName},#{item.createTime},#{item.updateUserId},#{item.updateUserName},#{item.updateTime})
      </foreach>
      </insert>
      <!-- 根据ParamDto更新 -->
      <update id="update" parameterType="paramDto">
      update mortals_xhx_one_classify_topical as a
      set
      <trim suffixOverrides="," suffix="">
      <if test="(colPickMode==0 and data.containsKey('topicalId')) or (colPickMode==1 and !data.containsKey('topicalId'))">
      a.topical_id=#{data.topicalId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('topicalIdIncrement')) or (colPickMode==1 and !data.containsKey('topicalIdIncrement'))">
      a.topical_id=ifnull(a.topical_id,0) + #{data.topicalIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('classifyId')) or (colPickMode==1 and !data.containsKey('classifyId'))">
      a.classify_id=#{data.classifyId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('classifyIdIncrement')) or (colPickMode==1 and !data.containsKey('classifyIdIncrement'))">
      a.classify_id=ifnull(a.classify_id,0) + #{data.classifyIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('classifyRank')) or (colPickMode==1 and !data.containsKey('classifyRank'))">
      a.classify_rank=#{data.classifyRank},
      </if>
      <if test="(colPickMode==0 and data.containsKey('classifyRankIncrement')) or (colPickMode==1 and !data.containsKey('classifyRankIncrement'))">
      a.classify_rank=ifnull(a.classify_rank,0) + #{data.classifyRankIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('terminalIcon')) or (colPickMode==1 and !data.containsKey('terminalIcon'))">
      a.terminal_icon=#{data.terminalIcon},
      </if>
      <if test="(colPickMode==0 and data.containsKey('moveIcon')) or (colPickMode==1 and !data.containsKey('moveIcon'))">
      a.move_icon=#{data.moveIcon},
      </if>
      <if test="(colPickMode==0 and data.containsKey('overWay')) or (colPickMode==1 and !data.containsKey('overWay'))">
      a.over_way=#{data.overWay},
      </if>
      <if test="(colPickMode==0 and data.containsKey('overWayIncrement')) or (colPickMode==1 and !data.containsKey('overWayIncrement'))">
      a.over_way=ifnull(a.over_way,0) + #{data.overWayIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('overTime')) or (colPickMode==1 and !data.containsKey('overTime'))">
      a.over_time=#{data.overTime},
      </if>
      <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
      a.site_id=#{data.siteId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
      a.site_id=ifnull(a.site_id,0) + #{data.siteIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('matterId')) or (colPickMode==1 and !data.containsKey('matterId'))">
      a.matter_id=#{data.matterId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('presenceNum')) or (colPickMode==1 and !data.containsKey('presenceNum'))">
      a.presence_num=#{data.presenceNum},
      </if>
      <if test="(colPickMode==0 and data.containsKey('presenceNumIncrement')) or (colPickMode==1 and !data.containsKey('presenceNumIncrement'))">
      a.presence_num=ifnull(a.presence_num,0) + #{data.presenceNumIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('deleted')) or (colPickMode==1 and !data.containsKey('deleted'))">
      a.deleted=#{data.deleted},
      </if>
      <if test="(colPickMode==0 and data.containsKey('deletedIncrement')) or (colPickMode==1 and !data.containsKey('deletedIncrement'))">
      a.deleted=ifnull(a.deleted,0) + #{data.deletedIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
      a.createUserId=#{data.createUserId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
      a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('createUserName')) or (colPickMode==1 and !data.containsKey('createUserName'))">
      a.createUserName=#{data.createUserName},
      </if>
      <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
      a.createTime=#{data.createTime},
      </if>
      <if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
      a.updateUserId=#{data.updateUserId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
      a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('updateUserName')) or (colPickMode==1 and !data.containsKey('updateUserName'))">
      a.updateUserName=#{data.updateUserName},
      </if>
      <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
      a.updateTime=#{data.updateTime},
      </if>
      </trim>
      <trim suffixOverrides="where" suffix="">
      where
      <trim prefixOverrides="and" prefix="">
      <include refid="_condition_"/>
      </trim>
      </trim>
      </update>
      <!-- 批量更新 -->
      <update id="updateBatch" parameterType="paramDto">
      update mortals_xhx_one_classify_topical as a
      <trim prefix="set" suffixOverrides=",">
      <trim prefix="topical_id=(case" suffix="ELSE topical_id end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('topicalId')) or (colPickMode==1 and !item.containsKey('topicalId'))">
      when a.id=#{item.id} then #{item.topicalId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('topicalIdIncrement')) or (colPickMode==1 and !item.containsKey('topicalIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.topical_id,0) + #{item.topicalIdIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="classify_id=(case" suffix="ELSE classify_id end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('classifyId')) or (colPickMode==1 and !item.containsKey('classifyId'))">
      when a.id=#{item.id} then #{item.classifyId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('classifyIdIncrement')) or (colPickMode==1 and !item.containsKey('classifyIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.classify_id,0) + #{item.classifyIdIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="classify_rank=(case" suffix="ELSE classify_rank end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('classifyRank')) or (colPickMode==1 and !item.containsKey('classifyRank'))">
      when a.id=#{item.id} then #{item.classifyRank}
      </when>
      <when test="(colPickMode==0 and item.containsKey('classifyRankIncrement')) or (colPickMode==1 and !item.containsKey('classifyRankIncrement'))">
      when a.id=#{item.id} then ifnull(a.classify_rank,0) + #{item.classifyRankIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="terminal_icon=(case" suffix="ELSE terminal_icon end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('terminalIcon')) or (colPickMode==1 and !item.containsKey('terminalIcon'))">
      when a.id=#{item.id} then #{item.terminalIcon}
      </if>
      </foreach>
      </trim>
      <trim prefix="move_icon=(case" suffix="ELSE move_icon end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('moveIcon')) or (colPickMode==1 and !item.containsKey('moveIcon'))">
      when a.id=#{item.id} then #{item.moveIcon}
      </if>
      </foreach>
      </trim>
      <trim prefix="over_way=(case" suffix="ELSE over_way end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('overWay')) or (colPickMode==1 and !item.containsKey('overWay'))">
      when a.id=#{item.id} then #{item.overWay}
      </when>
      <when test="(colPickMode==0 and item.containsKey('overWayIncrement')) or (colPickMode==1 and !item.containsKey('overWayIncrement'))">
      when a.id=#{item.id} then ifnull(a.over_way,0) + #{item.overWayIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="over_time=(case" suffix="ELSE over_time end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('overTime')) or (colPickMode==1 and !item.containsKey('overTime'))">
      when a.id=#{item.id} then #{item.overTime}
      </if>
      </foreach>
      </trim>
      <trim prefix="site_id=(case" suffix="ELSE site_id end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
      when a.id=#{item.id} then #{item.siteId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.site_id,0) + #{item.siteIdIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="matter_id=(case" suffix="ELSE matter_id end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('matterId')) or (colPickMode==1 and !item.containsKey('matterId'))">
      when a.id=#{item.id} then #{item.matterId}
      </if>
      </foreach>
      </trim>
      <trim prefix="presence_num=(case" suffix="ELSE presence_num end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('presenceNum')) or (colPickMode==1 and !item.containsKey('presenceNum'))">
      when a.id=#{item.id} then #{item.presenceNum}
      </when>
      <when test="(colPickMode==0 and item.containsKey('presenceNumIncrement')) or (colPickMode==1 and !item.containsKey('presenceNumIncrement'))">
      when a.id=#{item.id} then ifnull(a.presence_num,0) + #{item.presenceNumIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="deleted=(case" suffix="ELSE deleted end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('deleted')) or (colPickMode==1 and !item.containsKey('deleted'))">
      when a.id=#{item.id} then #{item.deleted}
      </when>
      <when test="(colPickMode==0 and item.containsKey('deletedIncrement')) or (colPickMode==1 and !item.containsKey('deletedIncrement'))">
      when a.id=#{item.id} then ifnull(a.deleted,0) + #{item.deletedIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
      when a.id=#{item.id} then #{item.createUserId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="createUserName=(case" suffix="ELSE createUserName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('createUserName')) or (colPickMode==1 and !item.containsKey('createUserName'))">
      when a.id=#{item.id} then #{item.createUserName}
      </if>
      </foreach>
      </trim>
      <trim prefix="createTime=(case" suffix="ELSE createTime end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
      when a.id=#{item.id} then #{item.createTime}
      </if>
      </foreach>
      </trim>
      <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
      when a.id=#{item.id} then #{item.updateUserId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="updateUserName=(case" suffix="ELSE updateUserName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('updateUserName')) or (colPickMode==1 and !item.containsKey('updateUserName'))">
      when a.id=#{item.id} then #{item.updateUserName}
      </if>
      </foreach>
      </trim>
      <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
      when a.id=#{item.id} then #{item.updateTime}
      </if>
      </foreach>
      </trim>
      </trim>
      where id in
      <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
      #{item.id}
      </foreach>
      </update>
      <!-- 根据主健查询 -->
      <select id="getByKey" parameterType="paramDto" resultMap="OneClassifyTopicalEntity-Map">
      select <include refid="_columns"/>
      from mortals_xhx_one_classify_topical as a
      where a.id=#{condition.id}
      </select>
      <!-- 根据主健删除 -->
      <delete id="deleteByKey" parameterType="paramDto">
      delete a.* from mortals_xhx_one_classify_topical as a where a.id=#{condition.id}
      </delete>
      <!-- 根据主健删除一批，针对单一主健有效 -->
      <delete id="deleteByKeys">
      delete from mortals_xhx_one_classify_topical where id in
      <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
      #{item}
      </foreach>
      </delete>
      <!-- 根据paramDto删除一批 -->
      <delete id="deleteByMap" parameterType="paramDto">
      delete a.* from mortals_xhx_one_classify_topical as a
      <trim suffixOverrides="where" suffix="">
      where
      <trim prefixOverrides="and" prefix="">
      <include refid="_condition_"/>
      </trim>
      </trim>
      </delete>
      <!-- 获取列表 -->
      <select id="getList" parameterType="paramDto" resultMap="OneClassifyTopicalEntity-Map">
      select <include refid="_columns"/>
      from mortals_xhx_one_classify_topical as a
      <trim suffixOverrides="where" suffix="">
      where
      <trim prefixOverrides="and" prefix="">
      <include refid="_condition_"/>
      </trim>
      </trim>
      <include refid="_orderCols_"/>
      </select>
      <!-- 获取 -->
      <select id="getListCount" parameterType="paramDto" resultType="int">
      select count(1)
      from mortals_xhx_one_classify_topical as a
      <trim suffixOverrides="where" suffix="">
      where
      <trim prefixOverrides="and" prefix="">
      <include refid="_condition_"/>
      </trim>
      </trim>
      </select>
      <!-- 条件映射 -->
      <sql id="_condition_">
      <if test="condition != null and !condition.isEmpty()">
      <!-- 条件映射-普通条件 -->
      <include refid="_condition_param_">
      <property name="_conditionParam_" value="condition"/>
      <property name="_conditionType_" value="and"/>
      </include>
      <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
      <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
      and
      <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
      <trim prefixOverrides="or" prefix="(" suffix=")">
      <include refid="_condition_param_">
      <property name="_conditionParam_" value="andCondition"/>
      <property name="_conditionType_" value="or"/>
      </include>
      </trim>
      </foreach>
      </if>
      <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
      <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
      and
      <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
      <trim prefixOverrides="and" prefix="(" suffix=")">
      <include refid="_condition_param_">
      <property name="_conditionParam_" value="orCondition"/>
      <property name="_conditionType_" value="and"/>
      </include>
      </trim>
      </foreach>
      </if>
      </if>
      </sql>
      <!-- 条件映射-代参数 -->
      <sql id="_condition_param_">
      <bind name="conditionParamRef" value="${_conditionParam_}"/>
      <if test="conditionParamRef.containsKey('id')">
      <if test="conditionParamRef.id != null">
      ${_conditionType_} a.id=#{${_conditionParam_}.id}
      </if>
      </if>
      <if test="conditionParamRef.containsKey('id')">
      <if test="conditionParamRef.id != null ">
      ${_conditionType_} a.id = #{${_conditionParam_}.id}
      </if>
      <if test="conditionParamRef.id == null">
      ${_conditionType_} a.id is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('idList')">
      ${_conditionType_} a.id in
      <foreach collection="conditionParamRef.idList" 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>
      <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
      ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
      </if>
      <if test="conditionParamRef.containsKey('topicalId')">
      <if test="conditionParamRef.topicalId != null ">
      ${_conditionType_} a.topical_id = #{${_conditionParam_}.topicalId}
      </if>
      <if test="conditionParamRef.topicalId == null">
      ${_conditionType_} a.topical_id is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('topicalIdList')">
      ${_conditionType_} a.topical_id in
      <foreach collection="conditionParamRef.topicalIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('topicalIdStart') and conditionParamRef.topicalIdStart != null">
      ${_conditionType_} a.topical_id <![CDATA[ >= ]]> #{${_conditionParam_}.topicalIdStart}
      </if>
      <if test="conditionParamRef.containsKey('topicalIdEnd') and conditionParamRef.topicalIdEnd != null">
      ${_conditionType_} a.topical_id <![CDATA[ <= ]]> #{${_conditionParam_}.topicalIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('classifyId')">
      <if test="conditionParamRef.classifyId != null ">
      ${_conditionType_} a.classify_id = #{${_conditionParam_}.classifyId}
      </if>
      <if test="conditionParamRef.classifyId == null">
      ${_conditionType_} a.classify_id is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('classifyIdList')">
      ${_conditionType_} a.classify_id in
      <foreach collection="conditionParamRef.classifyIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('classifyIdStart') and conditionParamRef.classifyIdStart != null">
      ${_conditionType_} a.classify_id <![CDATA[ >= ]]> #{${_conditionParam_}.classifyIdStart}
      </if>
      <if test="conditionParamRef.containsKey('classifyIdEnd') and conditionParamRef.classifyIdEnd != null">
      ${_conditionType_} a.classify_id <![CDATA[ <= ]]> #{${_conditionParam_}.classifyIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('classifyRank')">
      <if test="conditionParamRef.classifyRank != null ">
      ${_conditionType_} a.classify_rank = #{${_conditionParam_}.classifyRank}
      </if>
      <if test="conditionParamRef.classifyRank == null">
      ${_conditionType_} a.classify_rank is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('classifyRankList')">
      ${_conditionType_} a.classify_rank in
      <foreach collection="conditionParamRef.classifyRankList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('classifyRankStart') and conditionParamRef.classifyRankStart != null">
      ${_conditionType_} a.classify_rank <![CDATA[ >= ]]> #{${_conditionParam_}.classifyRankStart}
      </if>
      <if test="conditionParamRef.containsKey('classifyRankEnd') and conditionParamRef.classifyRankEnd != null">
      ${_conditionType_} a.classify_rank <![CDATA[ <= ]]> #{${_conditionParam_}.classifyRankEnd}
      </if>
      <if test="conditionParamRef.containsKey('terminalIcon')">
      <if test="conditionParamRef.terminalIcon != null and conditionParamRef.terminalIcon != ''">
      ${_conditionType_} a.terminal_icon like #{${_conditionParam_}.terminalIcon}
      </if>
      <if test="conditionParamRef.terminalIcon == null">
      ${_conditionType_} a.terminal_icon is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('terminalIconList')">
      ${_conditionType_} a.terminal_icon in
      <foreach collection="conditionParamRef.terminalIconList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('moveIcon')">
      <if test="conditionParamRef.moveIcon != null and conditionParamRef.moveIcon != ''">
      ${_conditionType_} a.move_icon like #{${_conditionParam_}.moveIcon}
      </if>
      <if test="conditionParamRef.moveIcon == null">
      ${_conditionType_} a.move_icon is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('moveIconList')">
      ${_conditionType_} a.move_icon in
      <foreach collection="conditionParamRef.moveIconList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('overWay')">
      <if test="conditionParamRef.overWay != null ">
      ${_conditionType_} a.over_way = #{${_conditionParam_}.overWay}
      </if>
      <if test="conditionParamRef.overWay == null">
      ${_conditionType_} a.over_way is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('overWayList')">
      ${_conditionType_} a.over_way in
      <foreach collection="conditionParamRef.overWayList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('overWayStart') and conditionParamRef.overWayStart != null">
      ${_conditionType_} a.over_way <![CDATA[ >= ]]> #{${_conditionParam_}.overWayStart}
      </if>
      <if test="conditionParamRef.containsKey('overWayEnd') and conditionParamRef.overWayEnd != null">
      ${_conditionType_} a.over_way <![CDATA[ <= ]]> #{${_conditionParam_}.overWayEnd}
      </if>
      <if test="conditionParamRef.containsKey('overTime')">
      <if test="conditionParamRef.overTime != null and conditionParamRef.overTime != ''">
      ${_conditionType_} a.over_time like #{${_conditionParam_}.overTime}
      </if>
      <if test="conditionParamRef.overTime == null">
      ${_conditionType_} a.over_time is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('overTimeList')">
      ${_conditionType_} a.over_time in
      <foreach collection="conditionParamRef.overTimeList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('siteId')">
      <if test="conditionParamRef.siteId != null ">
      ${_conditionType_} a.site_id = #{${_conditionParam_}.siteId}
      </if>
      <if test="conditionParamRef.siteId == null">
      ${_conditionType_} a.site_id is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('siteIdList')">
      ${_conditionType_} a.site_id in
      <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
      ${_conditionType_} a.site_id <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
      </if>
      <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
      ${_conditionType_} a.site_id <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('matterId')">
      <if test="conditionParamRef.matterId != null and conditionParamRef.matterId != ''">
      ${_conditionType_} a.matter_id like #{${_conditionParam_}.matterId}
      </if>
      <if test="conditionParamRef.matterId == null">
      ${_conditionType_} a.matter_id is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('matterIdList')">
      ${_conditionType_} a.matter_id in
      <foreach collection="conditionParamRef.matterIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('presenceNum')">
      <if test="conditionParamRef.presenceNum != null ">
      ${_conditionType_} a.presence_num = #{${_conditionParam_}.presenceNum}
      </if>
      <if test="conditionParamRef.presenceNum == null">
      ${_conditionType_} a.presence_num is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('presenceNumList')">
      ${_conditionType_} a.presence_num in
      <foreach collection="conditionParamRef.presenceNumList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('presenceNumStart') and conditionParamRef.presenceNumStart != null">
      ${_conditionType_} a.presence_num <![CDATA[ >= ]]> #{${_conditionParam_}.presenceNumStart}
      </if>
      <if test="conditionParamRef.containsKey('presenceNumEnd') and conditionParamRef.presenceNumEnd != null">
      ${_conditionType_} a.presence_num <![CDATA[ <= ]]> #{${_conditionParam_}.presenceNumEnd}
      </if>
      <if test="conditionParamRef.containsKey('deleted')">
      <if test="conditionParamRef.deleted != null ">
      ${_conditionType_} a.deleted = #{${_conditionParam_}.deleted}
      </if>
      <if test="conditionParamRef.deleted == null">
      ${_conditionType_} a.deleted is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('deletedList')">
      ${_conditionType_} a.deleted in
      <foreach collection="conditionParamRef.deletedList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deletedStart') and conditionParamRef.deletedStart != null">
      ${_conditionType_} a.deleted <![CDATA[ >= ]]> #{${_conditionParam_}.deletedStart}
      </if>
      <if test="conditionParamRef.containsKey('deletedEnd') and conditionParamRef.deletedEnd != null">
      ${_conditionType_} a.deleted <![CDATA[ <= ]]> #{${_conditionParam_}.deletedEnd}
      </if>
      <if test="conditionParamRef.containsKey('createUserId')">
      <if test="conditionParamRef.createUserId != null ">
      ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
      </if>
      <if test="conditionParamRef.createUserId == null">
      ${_conditionType_} a.createUserId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('createUserIdList')">
      ${_conditionType_} a.createUserId in
      <foreach collection="conditionParamRef.createUserIdList" 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>
      <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
      ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('createUserName')">
      <if test="conditionParamRef.createUserName != null and conditionParamRef.createUserName != ''">
      ${_conditionType_} a.createUserName like #{${_conditionParam_}.createUserName}
      </if>
      <if test="conditionParamRef.createUserName == null">
      ${_conditionType_} a.createUserName is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('createUserNameList')">
      ${_conditionType_} a.createUserName in
      <foreach collection="conditionParamRef.createUserNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('createTime')">
      <if test="conditionParamRef.createTime != null ">
      ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
      </if>
      <if test="conditionParamRef.createTime == null">
      ${_conditionType_} a.createTime is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
      ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
      ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('updateUserId')">
      <if test="conditionParamRef.updateUserId != null ">
      ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
      </if>
      <if test="conditionParamRef.updateUserId == null">
      ${_conditionType_} a.updateUserId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('updateUserIdList')">
      ${_conditionType_} a.updateUserId in
      <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
      ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
      </if>
      <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
      ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('updateUserName')">
      <if test="conditionParamRef.updateUserName != null and conditionParamRef.updateUserName != ''">
      ${_conditionType_} a.updateUserName like #{${_conditionParam_}.updateUserName}
      </if>
      <if test="conditionParamRef.updateUserName == null">
      ${_conditionType_} a.updateUserName is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('updateUserNameList')">
      ${_conditionType_} a.updateUserName in
      <foreach collection="conditionParamRef.updateUserNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('updateTime')">
      <if test="conditionParamRef.updateTime != null ">
      ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
      </if>
      <if test="conditionParamRef.updateTime == null">
      ${_conditionType_} a.updateTime is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
      ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
      ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      </sql>
      <sql id="_orderCols_">
      <if test="orderColList != null and !orderColList.isEmpty()">
      order by
      <trim suffixOverrides="," suffix="">
      <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
      ${item.colName} ${item.sortKind}
      </foreach>
      </trim>
      </if>
      <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
      order by
      <trim suffixOverrides="," suffix="">
      <if test="orderCol.containsKey('id')">
      a.id
      <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('topicalId')">
      a.topical_id
      <if test='orderCol.topicalId != null and "DESC".equalsIgnoreCase(orderCol.topicalId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('classifyId')">
      a.classify_id
      <if test='orderCol.classifyId != null and "DESC".equalsIgnoreCase(orderCol.classifyId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('classifyRank')">
      a.classify_rank
      <if test='orderCol.classifyRank != null and "DESC".equalsIgnoreCase(orderCol.classifyRank)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('terminalIcon')">
      a.terminal_icon
      <if test='orderCol.terminalIcon != null and "DESC".equalsIgnoreCase(orderCol.terminalIcon)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('moveIcon')">
      a.move_icon
      <if test='orderCol.moveIcon != null and "DESC".equalsIgnoreCase(orderCol.moveIcon)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('overWay')">
      a.over_way
      <if test='orderCol.overWay != null and "DESC".equalsIgnoreCase(orderCol.overWay)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('overTime')">
      a.over_time
      <if test='orderCol.overTime != null and "DESC".equalsIgnoreCase(orderCol.overTime)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('siteId')">
      a.site_id
      <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('matterId')">
      a.matter_id
      <if test='orderCol.matterId != null and "DESC".equalsIgnoreCase(orderCol.matterId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('presenceNum')">
      a.presence_num
      <if test='orderCol.presenceNum != null and "DESC".equalsIgnoreCase(orderCol.presenceNum)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('deleted')">
      a.deleted
      <if test='orderCol.deleted != null and "DESC".equalsIgnoreCase(orderCol.deleted)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('createUserId')">
      a.createUserId
      <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('createUserName')">
      a.createUserName
      <if test='orderCol.createUserName != null and "DESC".equalsIgnoreCase(orderCol.createUserName)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('createTime')">
      a.createTime
      <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('updateUserId')">
      a.updateUserId
      <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('updateUserName')">
      a.updateUserName
      <if test='orderCol.updateUserName != null and "DESC".equalsIgnoreCase(orderCol.updateUserName)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('updateTime')">
      a.updateTime
      <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
      ,
      </if>
      </trim>
      </if>
      </sql>
      <sql id="_group_by_">
      <if test="groupList != null and !groupList.isEmpty()">
      GROUP BY
      <trim suffixOverrides="," suffix="">
      <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
      ${item}
      </foreach>
      </trim>
      </if>
      </sql>
      </mapper>
      \ No newline at end of file
      government-manager/src/main/resources/sqlmap/module/one/oneTopical.xml deleted 100644 → 0
      View file @ c1446d69
      <?xml version="1.0" encoding="UTF-8"?>
      <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
      "mybatis-3-mapper.dtd">
      <mapper namespace="com.mortals.xhx.module.one.dao.ibatis.OneTopicalDaoImpl">
      <!-- 字段和属性映射 -->
      <resultMap type="OneTopicalEntity" id="OneTopicalEntity-Map">
      <result property="id" column="id" />
      <result property="topicalName" column="topical_name" />
      <result property="topicalRank" column="topical_rank" />
      <result property="siteId" column="site_id" />
      <result property="topicalType" column="topical_type" />
      <result property="deleted" column="deleted" />
      <result property="createUserId" column="createUserId" />
      <result property="createUserName" column="createUserName" />
      <result property="createTime" column="createTime" />
      <result property="updateUserId" column="updateUserId" />
      <result property="updateUserName" column="updateUserName" />
      <result property="updateTime" column="updateTime" />
      </resultMap>
      <!-- 表所有列 -->
      <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,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('topicalName') or colPickMode == 1 and data.containsKey('topicalName')))">
      a.topical_name as topical_name,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('topicalRank') or colPickMode == 1 and data.containsKey('topicalRank')))">
      a.topical_rank as topical_rank,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
      a.site_id as site_id,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('topicalType') or colPickMode == 1 and data.containsKey('topicalType')))">
      a.topical_type as topical_type,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deleted') or colPickMode == 1 and data.containsKey('deleted')))">
      a.deleted as deleted,
      </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,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserName') or colPickMode == 1 and data.containsKey('createUserName')))">
      a.createUserName as createUserName,
      </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,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
      a.updateUserId as updateUserId,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserName') or colPickMode == 1 and data.containsKey('updateUserName')))">
      a.updateUserName as updateUserName,
      </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,
      </if>
      </trim>
      </sql>
      <!-- 新增 -->
      <insert id="insert" parameterType="OneTopicalEntity" useGeneratedKeys="true" keyProperty="id">
      insert into mortals_xhx_one_topical
      (topical_name,topical_rank,site_id,topical_type,deleted,createUserId,createUserName,createTime,updateUserId,updateUserName,updateTime)
      VALUES
      (#{topicalName},#{topicalRank},#{siteId},#{topicalType},#{deleted},#{createUserId},#{createUserName},#{createTime},#{updateUserId},#{updateUserName},#{updateTime})
      </insert>
      <!-- 批量新增 -->
      <insert id="insertBatch" parameterType="paramDto">
      insert into mortals_xhx_one_topical
      (topical_name,topical_rank,site_id,topical_type,deleted,createUserId,createUserName,createTime,updateUserId,updateUserName,updateTime)
      VALUES
      <foreach collection="data.dataList" item="item" index="index" separator="," >
      (#{item.topicalName},#{item.topicalRank},#{item.siteId},#{item.topicalType},#{item.deleted},#{item.createUserId},#{item.createUserName},#{item.createTime},#{item.updateUserId},#{item.updateUserName},#{item.updateTime})
      </foreach>
      </insert>
      <!-- 根据ParamDto更新 -->
      <update id="update" parameterType="paramDto">
      update mortals_xhx_one_topical as a
      set
      <trim suffixOverrides="," suffix="">
      <if test="(colPickMode==0 and data.containsKey('topicalName')) or (colPickMode==1 and !data.containsKey('topicalName'))">
      a.topical_name=#{data.topicalName},
      </if>
      <if test="(colPickMode==0 and data.containsKey('topicalRank')) or (colPickMode==1 and !data.containsKey('topicalRank'))">
      a.topical_rank=#{data.topicalRank},
      </if>
      <if test="(colPickMode==0 and data.containsKey('topicalRankIncrement')) or (colPickMode==1 and !data.containsKey('topicalRankIncrement'))">
      a.topical_rank=ifnull(a.topical_rank,0) + #{data.topicalRankIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
      a.site_id=#{data.siteId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
      a.site_id=ifnull(a.site_id,0) + #{data.siteIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('topicalType')) or (colPickMode==1 and !data.containsKey('topicalType'))">
      a.topical_type=#{data.topicalType},
      </if>
      <if test="(colPickMode==0 and data.containsKey('topicalTypeIncrement')) or (colPickMode==1 and !data.containsKey('topicalTypeIncrement'))">
      a.topical_type=ifnull(a.topical_type,0) + #{data.topicalTypeIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('deleted')) or (colPickMode==1 and !data.containsKey('deleted'))">
      a.deleted=#{data.deleted},
      </if>
      <if test="(colPickMode==0 and data.containsKey('deletedIncrement')) or (colPickMode==1 and !data.containsKey('deletedIncrement'))">
      a.deleted=ifnull(a.deleted,0) + #{data.deletedIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
      a.createUserId=#{data.createUserId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
      a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('createUserName')) or (colPickMode==1 and !data.containsKey('createUserName'))">
      a.createUserName=#{data.createUserName},
      </if>
      <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
      a.createTime=#{data.createTime},
      </if>
      <if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
      a.updateUserId=#{data.updateUserId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
      a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('updateUserName')) or (colPickMode==1 and !data.containsKey('updateUserName'))">
      a.updateUserName=#{data.updateUserName},
      </if>
      <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
      a.updateTime=#{data.updateTime},
      </if>
      </trim>
      <trim suffixOverrides="where" suffix="">
      where
      <trim prefixOverrides="and" prefix="">
      <include refid="_condition_"/>
      </trim>
      </trim>
      </update>
      <!-- 批量更新 -->
      <update id="updateBatch" parameterType="paramDto">
      update mortals_xhx_one_topical as a
      <trim prefix="set" suffixOverrides=",">
      <trim prefix="topical_name=(case" suffix="ELSE topical_name end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('topicalName')) or (colPickMode==1 and !item.containsKey('topicalName'))">
      when a.id=#{item.id} then #{item.topicalName}
      </if>
      </foreach>
      </trim>
      <trim prefix="topical_rank=(case" suffix="ELSE topical_rank end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('topicalRank')) or (colPickMode==1 and !item.containsKey('topicalRank'))">
      when a.id=#{item.id} then #{item.topicalRank}
      </when>
      <when test="(colPickMode==0 and item.containsKey('topicalRankIncrement')) or (colPickMode==1 and !item.containsKey('topicalRankIncrement'))">
      when a.id=#{item.id} then ifnull(a.topical_rank,0) + #{item.topicalRankIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="site_id=(case" suffix="ELSE site_id end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
      when a.id=#{item.id} then #{item.siteId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.site_id,0) + #{item.siteIdIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="topical_type=(case" suffix="ELSE topical_type end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('topicalType')) or (colPickMode==1 and !item.containsKey('topicalType'))">
      when a.id=#{item.id} then #{item.topicalType}
      </when>
      <when test="(colPickMode==0 and item.containsKey('topicalTypeIncrement')) or (colPickMode==1 and !item.containsKey('topicalTypeIncrement'))">
      when a.id=#{item.id} then ifnull(a.topical_type,0) + #{item.topicalTypeIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="deleted=(case" suffix="ELSE deleted end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('deleted')) or (colPickMode==1 and !item.containsKey('deleted'))">
      when a.id=#{item.id} then #{item.deleted}
      </when>
      <when test="(colPickMode==0 and item.containsKey('deletedIncrement')) or (colPickMode==1 and !item.containsKey('deletedIncrement'))">
      when a.id=#{item.id} then ifnull(a.deleted,0) + #{item.deletedIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
      when a.id=#{item.id} then #{item.createUserId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="createUserName=(case" suffix="ELSE createUserName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('createUserName')) or (colPickMode==1 and !item.containsKey('createUserName'))">
      when a.id=#{item.id} then #{item.createUserName}
      </if>
      </foreach>
      </trim>
      <trim prefix="createTime=(case" suffix="ELSE createTime end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
      when a.id=#{item.id} then #{item.createTime}
      </if>
      </foreach>
      </trim>
      <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
      when a.id=#{item.id} then #{item.updateUserId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="updateUserName=(case" suffix="ELSE updateUserName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('updateUserName')) or (colPickMode==1 and !item.containsKey('updateUserName'))">
      when a.id=#{item.id} then #{item.updateUserName}
      </if>
      </foreach>
      </trim>
      <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
      when a.id=#{item.id} then #{item.updateTime}
      </if>
      </foreach>
      </trim>
      </trim>
      where id in
      <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
      #{item.id}
      </foreach>
      </update>
      <!-- 根据主健查询 -->
      <select id="getByKey" parameterType="paramDto" resultMap="OneTopicalEntity-Map">
      select <include refid="_columns"/>
      from mortals_xhx_one_topical as a
      where a.id=#{condition.id}
      </select>
      <!-- 根据主健删除 -->
      <delete id="deleteByKey" parameterType="paramDto">
      delete a.* from mortals_xhx_one_topical as a where a.id=#{condition.id}
      </delete>
      <!-- 根据主健删除一批，针对单一主健有效 -->
      <delete id="deleteByKeys">
      delete from mortals_xhx_one_topical where id in
      <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
      #{item}
      </foreach>
      </delete>
      <!-- 根据paramDto删除一批 -->
      <delete id="deleteByMap" parameterType="paramDto">
      delete a.* from mortals_xhx_one_topical as a
      <trim suffixOverrides="where" suffix="">
      where
      <trim prefixOverrides="and" prefix="">
      <include refid="_condition_"/>
      </trim>
      </trim>
      </delete>
      <!-- 获取列表 -->
      <select id="getList" parameterType="paramDto" resultMap="OneTopicalEntity-Map">
      select <include refid="_columns"/>
      from mortals_xhx_one_topical as a
      <trim suffixOverrides="where" suffix="">
      where
      <trim prefixOverrides="and" prefix="">
      <include refid="_condition_"/>
      </trim>
      </trim>
      <include refid="_orderCols_"/>
      </select>
      <!-- 获取 -->
      <select id="getListCount" parameterType="paramDto" resultType="int">
      select count(1)
      from mortals_xhx_one_topical as a
      <trim suffixOverrides="where" suffix="">
      where
      <trim prefixOverrides="and" prefix="">
      <include refid="_condition_"/>
      </trim>
      </trim>
      </select>
      <!-- 条件映射 -->
      <sql id="_condition_">
      <if test="condition != null and !condition.isEmpty()">
      <!-- 条件映射-普通条件 -->
      <include refid="_condition_param_">
      <property name="_conditionParam_" value="condition"/>
      <property name="_conditionType_" value="and"/>
      </include>
      <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
      <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
      and
      <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
      <trim prefixOverrides="or" prefix="(" suffix=")">
      <include refid="_condition_param_">
      <property name="_conditionParam_" value="andCondition"/>
      <property name="_conditionType_" value="or"/>
      </include>
      </trim>
      </foreach>
      </if>
      <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
      <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
      and
      <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
      <trim prefixOverrides="and" prefix="(" suffix=")">
      <include refid="_condition_param_">
      <property name="_conditionParam_" value="orCondition"/>
      <property name="_conditionType_" value="and"/>
      </include>
      </trim>
      </foreach>
      </if>
      </if>
      </sql>
      <!-- 条件映射-代参数 -->
      <sql id="_condition_param_">
      <bind name="conditionParamRef" value="${_conditionParam_}"/>
      <if test="conditionParamRef.containsKey('id')">
      <if test="conditionParamRef.id != null">
      ${_conditionType_} a.id=#{${_conditionParam_}.id}
      </if>
      </if>
      <if test="conditionParamRef.containsKey('id')">
      <if test="conditionParamRef.id != null ">
      ${_conditionType_} a.id = #{${_conditionParam_}.id}
      </if>
      <if test="conditionParamRef.id == null">
      ${_conditionType_} a.id is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('idList')">
      ${_conditionType_} a.id in
      <foreach collection="conditionParamRef.idList" 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>
      <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
      ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
      </if>
      <if test="conditionParamRef.containsKey('topicalName')">
      <if test="conditionParamRef.topicalName != null and conditionParamRef.topicalName != ''">
      ${_conditionType_} a.topical_name like #{${_conditionParam_}.topicalName}
      </if>
      <if test="conditionParamRef.topicalName == null">
      ${_conditionType_} a.topical_name is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('topicalNameList')">
      ${_conditionType_} a.topical_name in
      <foreach collection="conditionParamRef.topicalNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('topicalRank')">
      <if test="conditionParamRef.topicalRank != null ">
      ${_conditionType_} a.topical_rank = #{${_conditionParam_}.topicalRank}
      </if>
      <if test="conditionParamRef.topicalRank == null">
      ${_conditionType_} a.topical_rank is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('topicalRankList')">
      ${_conditionType_} a.topical_rank in
      <foreach collection="conditionParamRef.topicalRankList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('topicalRankStart') and conditionParamRef.topicalRankStart != null">
      ${_conditionType_} a.topical_rank <![CDATA[ >= ]]> #{${_conditionParam_}.topicalRankStart}
      </if>
      <if test="conditionParamRef.containsKey('topicalRankEnd') and conditionParamRef.topicalRankEnd != null">
      ${_conditionType_} a.topical_rank <![CDATA[ <= ]]> #{${_conditionParam_}.topicalRankEnd}
      </if>
      <if test="conditionParamRef.containsKey('siteId')">
      <if test="conditionParamRef.siteId != null ">
      ${_conditionType_} a.site_id = #{${_conditionParam_}.siteId}
      </if>
      <if test="conditionParamRef.siteId == null">
      ${_conditionType_} a.site_id is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('siteIdList')">
      ${_conditionType_} a.site_id in
      <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
      ${_conditionType_} a.site_id <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
      </if>
      <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
      ${_conditionType_} a.site_id <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('topicalType')">
      <if test="conditionParamRef.topicalType != null ">
      ${_conditionType_} a.topical_type = #{${_conditionParam_}.topicalType}
      </if>
      <if test="conditionParamRef.topicalType == null">
      ${_conditionType_} a.topical_type is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('topicalTypeList')">
      ${_conditionType_} a.topical_type in
      <foreach collection="conditionParamRef.topicalTypeList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('topicalTypeStart') and conditionParamRef.topicalTypeStart != null">
      ${_conditionType_} a.topical_type <![CDATA[ >= ]]> #{${_conditionParam_}.topicalTypeStart}
      </if>
      <if test="conditionParamRef.containsKey('topicalTypeEnd') and conditionParamRef.topicalTypeEnd != null">
      ${_conditionType_} a.topical_type <![CDATA[ <= ]]> #{${_conditionParam_}.topicalTypeEnd}
      </if>
      <if test="conditionParamRef.containsKey('deleted')">
      <if test="conditionParamRef.deleted != null ">
      ${_conditionType_} a.deleted = #{${_conditionParam_}.deleted}
      </if>
      <if test="conditionParamRef.deleted == null">
      ${_conditionType_} a.deleted is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('deletedList')">
      ${_conditionType_} a.deleted in
      <foreach collection="conditionParamRef.deletedList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deletedStart') and conditionParamRef.deletedStart != null">
      ${_conditionType_} a.deleted <![CDATA[ >= ]]> #{${_conditionParam_}.deletedStart}
      </if>
      <if test="conditionParamRef.containsKey('deletedEnd') and conditionParamRef.deletedEnd != null">
      ${_conditionType_} a.deleted <![CDATA[ <= ]]> #{${_conditionParam_}.deletedEnd}
      </if>
      <if test="conditionParamRef.containsKey('createUserId')">
      <if test="conditionParamRef.createUserId != null ">
      ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
      </if>
      <if test="conditionParamRef.createUserId == null">
      ${_conditionType_} a.createUserId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('createUserIdList')">
      ${_conditionType_} a.createUserId in
      <foreach collection="conditionParamRef.createUserIdList" 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>
      <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
      ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('createUserName')">
      <if test="conditionParamRef.createUserName != null and conditionParamRef.createUserName != ''">
      ${_conditionType_} a.createUserName like #{${_conditionParam_}.createUserName}
      </if>
      <if test="conditionParamRef.createUserName == null">
      ${_conditionType_} a.createUserName is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('createUserNameList')">
      ${_conditionType_} a.createUserName in
      <foreach collection="conditionParamRef.createUserNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('createTime')">
      <if test="conditionParamRef.createTime != null ">
      ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
      </if>
      <if test="conditionParamRef.createTime == null">
      ${_conditionType_} a.createTime is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
      ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
      ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('updateUserId')">
      <if test="conditionParamRef.updateUserId != null ">
      ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
      </if>
      <if test="conditionParamRef.updateUserId == null">
      ${_conditionType_} a.updateUserId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('updateUserIdList')">
      ${_conditionType_} a.updateUserId in
      <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
      ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
      </if>
      <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
      ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('updateUserName')">
      <if test="conditionParamRef.updateUserName != null and conditionParamRef.updateUserName != ''">
      ${_conditionType_} a.updateUserName like #{${_conditionParam_}.updateUserName}
      </if>
      <if test="conditionParamRef.updateUserName == null">
      ${_conditionType_} a.updateUserName is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('updateUserNameList')">
      ${_conditionType_} a.updateUserName in
      <foreach collection="conditionParamRef.updateUserNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('updateTime')">
      <if test="conditionParamRef.updateTime != null ">
      ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
      </if>
      <if test="conditionParamRef.updateTime == null">
      ${_conditionType_} a.updateTime is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
      ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
      ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      </sql>
      <sql id="_orderCols_">
      <if test="orderColList != null and !orderColList.isEmpty()">
      order by
      <trim suffixOverrides="," suffix="">
      <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
      ${item.colName} ${item.sortKind}
      </foreach>
      </trim>
      </if>
      <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
      order by
      <trim suffixOverrides="," suffix="">
      <if test="orderCol.containsKey('id')">
      a.id
      <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('topicalName')">
      a.topical_name
      <if test='orderCol.topicalName != null and "DESC".equalsIgnoreCase(orderCol.topicalName)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('topicalRank')">
      a.topical_rank
      <if test='orderCol.topicalRank != null and "DESC".equalsIgnoreCase(orderCol.topicalRank)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('siteId')">
      a.site_id
      <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('topicalType')">
      a.topical_type
      <if test='orderCol.topicalType != null and "DESC".equalsIgnoreCase(orderCol.topicalType)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('deleted')">
      a.deleted
      <if test='orderCol.deleted != null and "DESC".equalsIgnoreCase(orderCol.deleted)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('createUserId')">
      a.createUserId
      <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('createUserName')">
      a.createUserName
      <if test='orderCol.createUserName != null and "DESC".equalsIgnoreCase(orderCol.createUserName)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('createTime')">
      a.createTime
      <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('updateUserId')">
      a.updateUserId
      <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('updateUserName')">
      a.updateUserName
      <if test='orderCol.updateUserName != null and "DESC".equalsIgnoreCase(orderCol.updateUserName)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('updateTime')">
      a.updateTime
      <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
      ,
      </if>
      </trim>
      </if>
      </sql>
      <sql id="_group_by_">
      <if test="groupList != null and !groupList.isEmpty()">
      GROUP BY
      <trim suffixOverrides="," suffix="">
      <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
      ${item}
      </foreach>
      </trim>
      </if>
      </sql>
      </mapper>
      \ No newline at end of file
      government-manager/src/main/resources/static/doc/AllInOne.md.md
      View file @ 5dd836e0
      Version | Update Time | Status | Author | Description
      ---|---|---|---|---
      v2021-10-14 14:08:21|2021-10-14 14:08:21|auto|@finegirl|Created by smart-doc
      v2021-11-16 12:00:32|2021-11-16 12:00:32|auto|@finegirl|Created by smart-doc
      ## 一件事微信对外服务接口
      ### 一件事主题包列表
      **URL:** http://192.168.0.217:17011/m/zwfw/proced/thing/getTopicList
      **Type:** POST
      **Content-Type:** application/x-www-form-urlencoded;charset=utf-8
      **Description:** 一件事主题包列表
      **Query-parameters:**
      Parameter | Type|Description|Required|Since
      ---|---|---|---|---
      openId|string|微信开放id|false|-
      type|int32|主题包类型（1：个人服务，2：企业服务）|false|-
      page|int32|当前请求页数|false|-
      limit|int32|每页记录数|false|-
      name|string|搜索主题包名称|false|-
      **Request-example:**
      ```
      curl -X POST -i http://192.168.0.217:17011/m/zwfw/proced/thing/getTopicList --data 'page=1&name=明轩.李&type=19&limit=10&openId=67'
      ```
      **Response-fields:**
      Field | Type|Description|Since
      ---|---|---|---
      code|int32|No comments found.|-
      msg|string|No comments found.|-
      data|object|No comments found.|-
      └─page|object|No comments found.|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─per|int32|No comments found.|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─size|int32|No comments found.|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─total|int32|No comments found.|-
      └─list|array|No comments found.|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─id|int64|id|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─topicalName|string|主题名称|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─description|string|主题描述信息|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─topicalType|int32|主题类型（1 个人服务，2 企业服务）|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─moveIcon|string|主题包图标|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─createTime|string|创建时间|-
      **Response-example:**
      ```
      {
      "code": 774,
      "msg": "8w37rf",
      "data": {
      "page": {
      "per": 699,
      "size": 10,
      "total": 67
      },
      "list": [
      {
      "id": 998,
      "topicalName": "明轩.李",
      "description": "ztx6rg",
      "topicalType": 278,
      "moveIcon": "5elg2h",
      "createTime": "2021-11-16 12:00:44"
      }
      ]
      }
      }
      ```
      ### 一件事主题列表(包含主题包)
      **URL:** http://localhost:28080/zwfw/proced/thing/oneTopiclist
      **URL:** http://192.168.0.217:17011/m/zwfw/proced/thing/oneTopiclist
      **Type:** POST
      ......@@ -21,13 +89,14 @@ Parameter | Type|Description|Required|Since
      ---|---|---|---|---
      openId|string|微信开放id|false|-
      type|int32|主题包类型（1：个人服务，2：企业服务）|false|-
      topicId|int64|主题包Id|false|-
      page|int32|当前请求页数|false|-
      limit|int32|每页记录数|false|-
      keywords|string|搜索关键词|false|-
      name|string|一件事名称|false|-
      **Request-example:**
      ```
      curl -X POST -i http://localhost:28080/zwfw/proced/thing/oneTopiclist --data 'limit=10&page=1&keywords=kuirrl&openId=8&type=595'
      curl -X POST -i http://192.168.0.217:17011/m/zwfw/proced/thing/oneTopiclist --data 'limit=10&topicId=610&page=1&type=75&openId=67&name=明轩.李'
      ```
      **Response-fields:**
      ......@@ -41,8 +110,8 @@ data|array|No comments found.|-
      **Response-example:**
      ```
      {
      "code": 54,
      "msg": "gdo76h",
      "code": 776,
      "msg": "phapqu",
      "data": [
      {
      "mapKey": {
      ......@@ -53,27 +122,30 @@ data|array|No comments found.|-
      }
      ```
      ### 问答答案提交后返回的详细结果
      **URL:** http://localhost:28080/zwfw/proced/thing/ansResults
      ### 一件事列表
      **URL:** http://192.168.0.217:17011/m/zwfw/proced/thing/getList
      **Type:** POST
      **Content-Type:** application/x-www-form-urlencoded;charset=utf-8
      **Description:** 问答答案提交后返回的详细结果
      **Description:** 一件事列表
      **Query-parameters:**
      Parameter | Type|Description|Required|Since
      ---|---|---|---|---
      openId|string|微信开放id|false|-
      optionIds|array|问答最后答案选项ID（多问题线）|false|-
      key|string|问题路线id?|false|-
      type|int32|主题包类型（1：个人服务，2：企业服务）|false|-
      topicId|int64|主题包Id|false|-
      page|int32|当前请求页数|false|-
      limit|int32|每页记录数|false|-
      name|string|一件事名称|false|-
      **Request-example:**
      ```
      curl -X POST -i http://localhost:28080/zwfw/proced/thing/ansResults --data 'openId=8&key=0gtgo6'
      curl -X POST -i http://192.168.0.217:17011/m/zwfw/proced/thing/getList --data 'limit=10&topicId=686&openId=67&page=1&name=明轩.李&type=798'
      ```
      **Response-fields:**
      ......@@ -82,141 +154,123 @@ Field | Type|Description|Since
      code|int32|No comments found.|-
      msg|string|No comments found.|-
      data|object|No comments found.|-
      └─matterInfoList|array|事项列表列表|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─id|int64|事项id|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─matterName|string|事项名称|-
      └─acceptInfoList|array|受理条件列表|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─matterId|int64|事项id|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─title|string|受理条件|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─content|string|受理条件|-
      └─flowLimitInfoList|array|办理流程列表|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─matterId|int64|事项matter id|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─flowName|string|办理流程|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─flowTime|string|办理时长|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─flowTurnOut|string|转外时限|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─flowDesc|string|办理流程说明|-
      └─datumInfoList|array|事项材料列表|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─id|int64|材料id|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialName|string|材料名|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─matterId|int64|事项Id|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialProperty|string|材料形式|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─isMust|string|是否必交，0 否 1 是 默认0|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialType|string|材料类型|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─electronicgs|string|电子材料格式|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialSource|string|材料来源渠道|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─paperNum|int32|纸质材料份数|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─paperGg|string|纸质材料规格|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─jianmMs|string|减免模式|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─sealWay|string|盖章方式|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─isjianm|string|是否减免|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─isLack|string|材料是否容缺|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialSourceSm|string|来源渠道说明|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─remarkSub|string|填报须知|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─remark|string|受理标准|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─clauseContent|string|要求提供材料的依据|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─summary|string|备注|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─createTime|string|材料创建时间|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─attachList|array|No comments found.|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─datumid|int64|材料id|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─fileName|string|附件名称|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─fileUrl|string|附件下载地址|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─filetype|int32|附件类型 1 示例样表 2空白表格 默认1|-
      └─qAndAInfoList|array|常见问题列表|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─matterId|int64|事项id|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─question|string|问题|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─answer|string|回答|-
      └─page|object|No comments found.|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─per|int32|No comments found.|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─size|int32|No comments found.|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─total|int32|No comments found.|-
      └─list|array|No comments found.|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─id|int64|id|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─name|string|名称|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─topicalType|int32|归属主题类型（1,个人服务，2 企业服务）|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─topicalName|string|归属主题名称|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─createTime|string|创建时间|-
      **Response-example:**
      ```
      {
      "code": 836,
      "msg": "9jrd2o",
      "code": 660,
      "msg": "8hymnp",
      "data": {
      "matterInfoList": [
      {
      "id": 76,
      "matterName": "涛.贾"
      }
      ],
      "acceptInfoList": [
      "page": {
      "per": 158,
      "size": 10,
      "total": 917
      },
      "list": [
      {
      "matterId": 403,
      "title": "6w89gy",
      "content": "ar2kxe"
      "id": 157,
      "name": "明轩.李",
      "topicalType": 119,
      "topicalName": "明轩.李",
      "createTime": "2021-11-16 12:00:44"
      }
      ],
      "flowLimitInfoList": [
      {
      "matterId": 697,
      "flowName": "涛.贾",
      "flowTime": "2021-10-14 14:08:25",
      "flowTurnOut": "426gjx",
      "flowDesc": "moxvgk"
      }
      ],
      "datumInfoList": [
      {
      "id": 232,
      "materialName": "涛.贾",
      "matterId": 687,
      "materialProperty": "fe7nei",
      "isMust": "gbpiqu",
      "materialType": "abylra",
      "electronicgs": "iufy0b",
      "materialSource": "i9tfhx",
      "paperNum": 669,
      "paperGg": "sbsosn",
      "jianmMs": "73cvoh",
      "sealWay": "we0k4a",
      "isjianm": "8fhxlb",
      "isLack": "gznmwt",
      "materialSourceSm": "n0gowu",
      "remarkSub": "an0r7r",
      "remark": "8ls3ps",
      "clauseContent": "ytz04h",
      "summary": "co9z60",
      "createTime": "2021-10-14 14:08:29",
      "attachList": [
      {
      "datumid": 895,
      "fileName": "涛.贾",
      "fileUrl": "www.xn---xn--zqq-dl3p256h.co",
      "filetype": 253
      }
      ]
      }
      ],
      "qAndAInfoList": [
      ]
      }
      }
      ```
      ### 问题详细
      **URL:** http://192.168.0.217:17011/m/zwfw/proced/thing/oneProblem
      **Type:** POST
      **Content-Type:** application/x-www-form-urlencoded;charset=utf-8
      **Description:** 问题详细
      **Query-parameters:**
      Parameter | Type|Description|Required|Since
      ---|---|---|---|---
      openId|string|微信开放id|false|-
      id|int64|选中一件事ID|false|-
      **Request-example:**
      ```
      curl -X POST -i http://192.168.0.217:17011/m/zwfw/proced/thing/oneProblem --data 'id=714&openId=67'
      ```
      **Response-fields:**
      Field | Type|Description|Since
      ---|---|---|---
      code|int32|No comments found.|-
      msg|string|No comments found.|-
      data|object|No comments found.|-
      └─id|int64|问题与答案id,唯一|-
      └─name|string|问题答案名称|-
      └─isLeaf|int32|是否为叶子节点（0：否，1：是）|-
      └─isAns|int32|是问题还是选项答案（0：问题，1：选项答案）|-
      └─parentId|int64|父节点id|-
      └─matterIds|string|事项id “,”号分割|-
      └─level|int32|树的层级|-
      └─remark|string|备注信息|-
      └─children|array|当前节点的子集|-
      **Response-example:**
      ```
      {
      "code": 395,
      "msg": "blquoj",
      "data": {
      "id": 471,
      "name": "明轩.李",
      "isLeaf": 886,
      "isAns": 988,
      "parentId": 161,
      "matterIds": "zn9hne",
      "level": 763,
      "remark": "js0m5r",
      "children": [
      {
      "matterId": 601,
      "question": "n8de6u",
      "answer": "fyq3hb"
      "$ref": ".."
      }
      ]
      }
      }
      ```
      ### 提交后请求返回数据
      **URL:** http://localhost:28080/zwfw/proced/thing/datum_data
      ### 问答答案提交后返回的详细结果
      **URL:** http://192.168.0.217:17011/m/zwfw/proced/thing/ansResults
      **Type:** POST
      **Content-Type:** application/x-www-form-urlencoded;charset=utf-8
      **Description:** 提交后请求返回数据
      **Description:** 问答答案提交后返回的详细结果
      **Query-parameters:**
      Parameter | Type|Description|Required|Since
      ---|---|---|---|---
      key|string|No comments found.|false|-
      open_id|string|No comments found.|false|-
      openId|string|微信开放id|false|-
      optionIds|array|问答最后答案选项ID（多问题线）|false|-
      classifyId|int64|主题事项Id|false|-
      **Request-example:**
      ```
      curl -X POST -i http://localhost:28080/zwfw/proced/thing/datum_data --data 'open_id=8&key=02smut'
      curl -X POST -i http://192.168.0.217:17011/m/zwfw/proced/thing/ansResults --data 'openId=67&classifyId=677'
      ```
      **Response-fields:**
      ......@@ -225,6 +279,19 @@ Field | Type|Description|Since
      code|int32|No comments found.|-
      msg|string|No comments found.|-
      data|object|No comments found.|-
      └─basicsInfo|object|基本信息|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─moveIcon|string|移动主题包图标|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─presenceNum|int32|到现场次数|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─jointInfoShow|string|办理机构|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─legalTimeLimitShow|string|法定时限|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─promiseTimeLimitShow|string|承诺时限|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─isChargesShow|string|收费标准|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─charges|string|收费金额|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─handleTimeShow|string|办理时间|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─handlePlaceShow|string|办理地点|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─cousultingTelephoneShow|string|咨询方式|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─resultInfo|string|结果信息|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─supervisoryTelephoneShow|string|投诉电话|-
      └─matterInfoList|array|事项列表列表|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─id|int64|事项id|-
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─matterName|string|事项名称|-
      ......@@ -272,68 +339,82 @@ data|object|No comments found.|-
      **Response-example:**
      ```
      {
      "code": 305,
      "msg": "25jh8h",
      "code": 307,
      "msg": "ehxcdn",
      "data": {
      "basicsInfo": {
      "moveIcon": "fkq3vp",
      "presenceNum": 632,
      "jointInfoShow": "6htkhu",
      "legalTimeLimitShow": "n390ur",
      "promiseTimeLimitShow": "qkxwoa",
      "isChargesShow": "ln58d5",
      "charges": "p6ijj6",
      "handleTimeShow": "d0x4a3",
      "handlePlaceShow": "bjaxt7",
      "cousultingTelephoneShow": "sb3ull",
      "resultInfo": "nlv1jc",
      "supervisoryTelephoneShow": "0rsi5v"
      },
      "matterInfoList": [
      {
      "id": 998,
      "matterName": "涛.贾"
      "id": 260,
      "matterName": "明轩.李"
      }
      ],
      "acceptInfoList": [
      {
      "matterId": 90,
      "title": "mo24in",
      "content": "abt6qv"
      "matterId": 934,
      "title": "y961nq",
      "content": "avu70d"
      }
      ],
      "flowLimitInfoList": [
      {
      "matterId": 25,
      "flowName": "涛.贾",
      "flowTime": "2021-10-14 14:08:25",
      "flowTurnOut": "yilqls",
      "flowDesc": "x4axxc"
      "matterId": 637,
      "flowName": "明轩.李",
      "flowTime": "2021-11-16 12:00:39",
      "flowTurnOut": "7zgtb7",
      "flowDesc": "9o1ctw"
      }
      ],
      "datumInfoList": [
      {
      "id": 166,
      "materialName": "涛.贾",
      "matterId": 708,
      "materialProperty": "8lm8ps",
      "isMust": "ejp9fv",
      "materialType": "a4o11p",
      "electronicgs": "2e6ohm",
      "materialSource": "71s6zt",
      "paperNum": 549,
      "paperGg": "3qyrnr",
      "jianmMs": "8pnl8n",
      "sealWay": "8frspv",
      "isjianm": "on9aw8",
      "isLack": "cuvjso",
      "materialSourceSm": "c1m9d9",
      "remarkSub": "c6lwuo",
      "remark": "byxeve",
      "clauseContent": "opt058",
      "summary": "mdgyvv",
      "createTime": "2021-10-14 14:08:29",
      "id": 25,
      "materialName": "明轩.李",
      "matterId": 847,
      "materialProperty": "8mx27d",
      "isMust": "1pddk2",
      "materialType": "6k6f75",
      "electronicgs": "comx6u",
      "materialSource": "p43beu",
      "paperNum": 799,
      "paperGg": "7ucem1",
      "jianmMs": "zwuz0y",
      "sealWay": "jz1oeo",
      "isjianm": "bqnwl2",
      "isLack": "z6uyis",
      "materialSourceSm": "4c6v1p",
      "remarkSub": "q0jimr",
      "remark": "7w4zmy",
      "clauseContent": "ngoco1",
      "summary": "ajvazr",
      "createTime": "2021-11-16 12:00:45",
      "attachList": [
      {
      "datumid": 317,
      "fileName": "涛.贾",
      "fileUrl": "www.xn---xn--zqq-dl3p256h.co",
      "filetype": 96
      "datumid": 438,
      "fileName": "明轩.李",
      "fileUrl": "www.xn---xn--7mz-s41mk45h.biz",
      "filetype": 269
      }
      ]
      }
      ],
      "qAndAInfoList": [
      {
      "matterId": 712,
      "question": "oevcic",
      "answer": "hhdrvt"
      "matterId": 698,
      "question": "ij8e7x",
      "answer": "t5rd5f"
      }
      ]
      }
      ......@@ -341,7 +422,7 @@ data|object|No comments found.|-
      ```
      ### 上传附件
      **URL:** http://localhost:28080/zwfw/proced/thing/uploadFile
      **URL:** http://192.168.0.217:17011/m/zwfw/proced/thing/uploadFile
      **Type:** POST
      ......@@ -358,7 +439,7 @@ file|file|No comments found.|true|-
      **Request-example:**
      ```
      curl -X POST -H 'Content-Type: multipart/form-data' -i http://localhost:28080/zwfw/proced/thing/uploadFile
      curl -X POST -H 'Content-Type: multipart/form-data' -i http://192.168.0.217:17011/m/zwfw/proced/thing/uploadFile
      ```
      **Response-fields:**
      ......@@ -371,17 +452,17 @@ data|object|No comments found.|-
      **Response-example:**
      ```
      {
      "code": 91,
      "msg": "jug6rf",
      "code": 299,
      "msg": "i1tt17",
      "data": {
      "mapKey1": "rs1ub2",
      "mapKey2": "11sug1"
      "mapKey1": "yz83ox",
      "mapKey2": "54bvgb"
      }
      }
      ```
      ### 删除附件
      **URL:** http://localhost:28080/zwfw/proced/thing/delFile
      **URL:** http://192.168.0.217:17011/m/zwfw/proced/thing/delFile
      **Type:** POST
      ......@@ -399,7 +480,7 @@ filePath|string|文件路径|false|-
      **Request-example:**
      ```
      curl -X POST -i http://localhost:28080/zwfw/proced/thing/delFile --data 'filePath=4gn7hw&openId=8'
      curl -X POST -i http://192.168.0.217:17011/m/zwfw/proced/thing/delFile --data 'openId=67&filePath=uj6n1p'
      ```
      **Response-fields:**
      ......@@ -412,14 +493,14 @@ data|object|No comments found.|-
      **Response-example:**
      ```
      {
      "code": 415,
      "msg": "qb62od",
      "data": "everzo"
      "code": 159,
      "msg": "4qzy9r",
      "data": "dy4hp0"
      }
      ```
      ### 查询用户信息
      **URL:** http://localhost:28080/zwfw/proced/thing/searchMember
      **URL:** http://192.168.0.217:17011/m/zwfw/proced/thing/searchMember
      **Type:** POST
      ......@@ -436,7 +517,7 @@ openId|string|微信开放id|false|-
      **Request-example:**
      ```
      curl -X POST -i http://localhost:28080/zwfw/proced/thing/searchMember --data 'openId=8'
      curl -X POST -i http://192.168.0.217:17011/m/zwfw/proced/thing/searchMember --data 'openId=67'
      ```
      **Response-fields:**
      ......@@ -488,54 +569,54 @@ data|object|No comments found.|-
      **Response-example:**
      ```
      {
      "code": 241,
      "msg": "7rce3x",
      "code": 163,
      "msg": "bs5132",
      "data": {
      "id": "edvk4n",
      "createTime": "2021-10-14 14:08:29",
      "createUser": "nv67z5",
      "createUserId": 860,
      "deleted": 660,
      "createUserName": "涛.贾",
      "createUserDeptId": 465,
      "createUserDeptName": "涛.贾",
      "updateTime": "2021-10-14 14:08:29",
      "updateUser": "kamlwd",
      "updateUserId": 469,
      "updateUserName": "涛.贾",
      "updateUserDeptId": 198,
      "updateUserDeptName": "涛.贾",
      "idcardName": "涛.贾",
      "idcardSex": "7pc1i2",
      "idcardNation": "3tinpl",
      "idcardBorn": "yxgl6k",
      "idcardAddress": "段侬14号， 泸州， 吉 709471",
      "idcardIDCardNo": "ndtymz",
      "idcardGrantDept": "7po359",
      "idcardUserLifeBegin": "m5bzpb",
      "idcardUserLifeEnd": "853rpp",
      "idcardDataPhotoFileName": "涛.贾",
      "phone": "17002625379",
      "unionid": "8",
      "openId": "8",
      "picImage": "i8cymq",
      "nickname": "wallace.wolf",
      "realName": "涛.贾",
      "gender": "vym1a6",
      "icon": "bluwtw",
      "zImg": "9fnhva",
      "bImg": "uepmxz",
      "siteid": 331,
      "username": "涛.贾",
      "lasttime": "2021-10-14 14:08:29",
      "remark": "iwwih4",
      "status": 18
      "id": "pcjnii",
      "createTime": "2021-11-16 12:00:45",
      "createUser": "k80sqf",
      "createUserId": 330,
      "deleted": 317,
      "createUserName": "明轩.李",
      "createUserDeptId": 543,
      "createUserDeptName": "明轩.李",
      "updateTime": "2021-11-16 12:00:45",
      "updateUser": "jdolki",
      "updateUserId": 302,
      "updateUserName": "明轩.李",
      "updateUserDeptId": 315,
      "updateUserDeptName": "明轩.李",
      "idcardName": "明轩.李",
      "idcardSex": "c3qids",
      "idcardNation": "onosna",
      "idcardBorn": "msojne",
      "idcardAddress": "Suite 139 段中心4610号， 济宁， 赣 424588",
      "idcardIDCardNo": "ft1hql",
      "idcardGrantDept": "77vj77",
      "idcardUserLifeBegin": "7s6uh3",
      "idcardUserLifeEnd": "64fg2b",
      "idcardDataPhotoFileName": "明轩.李",
      "phone": "17144806078",
      "unionid": "67",
      "openId": "67",
      "picImage": "viebp9",
      "nickname": "tuyet.koss",
      "realName": "明轩.李",
      "gender": "eftny5",
      "icon": "ldghea",
      "zImg": "6y815t",
      "bImg": "nwog4j",
      "siteid": 4,
      "username": "明轩.李",
      "lasttime": "2021-11-16 12:00:45",
      "remark": "0xcwsq",
      "status": 603
      }
      }
      ```
      ### 一件事办理资料提交
      **URL:** http://localhost:28080/zwfw/proced/thing/submitDatum
      **URL:** http://192.168.0.217:17011/m/zwfw/proced/thing/submitDatum
      **Type:** POST
      ......@@ -549,7 +630,7 @@ data|object|No comments found.|-
      Parameter | Type|Description|Required|Since
      ---|---|---|---|---
      openId|string|微信开放id|false|-
      classifyTopicId|int64|申请主题包id|false|-
      classifyTopicId|int64|申请主题id|false|-
      siteId|int64|站点ID|false|-
      name|string|申请人姓名|false|-
      phone|string|电话|false|-
      ......@@ -565,7 +646,7 @@ matterReqList|array|申请事项列表|false|-
      **Request-example:**
      ```
      curl -X POST -i http://localhost:28080/zwfw/proced/thing/submitDatum --data 'isAgent=899&phone=17002625379&manner=944&classifyTopicId=830&matterReqList[0].attachmentList[0].datumId=797&siteId=440&matterReqList[0].attachmentList[0].filepath=dcbehl&matterReqList[0].attachmentList[0].fileName=涛.贾&name=涛.贾&matterReqList[0].matterid=491&idcard=371208198101227551&openId=8'
      curl -X POST -i http://192.168.0.217:17011/m/zwfw/proced/thing/submitDatum --data 'matterReqList[0].attachmentList[0].fileName=明轩.李&phone=17144806078&classifyTopicId=304&name=明轩.李&matterReqList[0].attachmentList[0].filepath=pzudy0&siteId=272&matterReqList[0].matterid=675&idcard=511704199003249407&isAgent=799&openId=67&manner=354&matterReqList[0].attachmentList[0].datumId=805'
      ```
      **Response-fields:**
      ......@@ -578,14 +659,14 @@ data|object|No comments found.|-
      **Response-example:**
      ```
      {
      "code": 726,
      "msg": "kzgz7a",
      "data": "gp2b3u"
      "code": 37,
      "msg": "1k6hxi",
      "data": "hr3yf5"
      }
      ```
      ### 我的办理
      **URL:** http://localhost:28080/zwfw/proced/thing/myHandle
      **URL:** http://192.168.0.217:17011/m/zwfw/proced/thing/myHandle
      **Type:** POST
      ......@@ -602,7 +683,7 @@ openId|string|微信开放id|false|-
      **Request-example:**
      ```
      curl -X POST -i http://localhost:28080/zwfw/proced/thing/myHandle --data 'openId=8'
      curl -X POST -i http://192.168.0.217:17011/m/zwfw/proced/thing/myHandle --data 'openId=67'
      ```
      **Response-fields:**
      ......@@ -611,25 +692,10 @@ Field | Type|Description|Since
      code|int32|No comments found.|-
      msg|string|No comments found.|-
      data|array|No comments found.|-
      └─id|object|No comments found.|-
      └─createTime|string|创建时间|-
      └─createUser|string|创建用户loginName|-
      └─createUserId|int64|No comments found.|-
      └─deleted|int32|No comments found.|-
      └─createUserName|string|No comments found.|-
      └─createUserDeptId|int64|No comments found.|-
      └─createUserDeptName|string|No comments found.|-
      └─updateTime|string|变更时间|-
      └─updateUser|string|变更用户loginName|-
      └─updateUserId|int64|No comments found.|-
      └─updateUserName|string|No comments found.|-
      └─updateUserDeptId|int64|No comments found.|-
      └─updateUserDeptName|string|No comments found.|-
      └─taskId|string|流程任务id|-
      └─processInstanceId|string|流程实例id|-
      └─processInstanceId|string|审核流程id|-
      └─memberId|int64|微信用户ID|-
      └─openId|string|微信OPENID|-
      └─classifyTopicId|int64|申请主题包id|-
      └─classifyName|string|申请主题名称|-
      └─address|string|邮寄地址|-
      └─linkman|string|联系人|-
      └─phone|int32|联系电话|-
      ......@@ -637,51 +703,84 @@ data|array|No comments found.|-
      └─getnum|string|取件码|-
      └─number|string|快递单号|-
      └─isAgent|int32|是否代办 0是本人办理 1他人代办|-
      └─isRevoke|int32|0是否撤销 1撤销|-
      └─isRevoke|int32|是否撤销,0否， 1是|-
      └─siteid|int32|站点ID|-
      └─status|int32|审批状态 0未审核 1 审核中 2 审核成功|-
      └─createTime|string|创建时间|-
      **Response-example:**
      ```
      {
      "code": 508,
      "msg": "pp5m23",
      "code": 835,
      "msg": "fyv0bq",
      "data": [
      {
      "id": "8wsue6",
      "createTime": "2021-10-14 14:08:29",
      "createUser": "jxns4n",
      "createUserId": 751,
      "deleted": 588,
      "createUserName": "涛.贾",
      "createUserDeptId": 272,
      "createUserDeptName": "涛.贾",
      "updateTime": "2021-10-14 14:08:29",
      "updateUser": "osyzur",
      "updateUserId": 737,
      "updateUserName": "涛.贾",
      "updateUserDeptId": 9,
      "updateUserDeptName": "涛.贾",
      "taskId": "8",
      "processInstanceId": "8",
      "memberId": 718,
      "openId": "8",
      "classifyTopicId": 866,
      "address": "段侬14号， 泸州， 吉 709471",
      "linkman": "lgkzbq",
      "phone": 458,
      "manner": 185,
      "getnum": "zkceq5",
      "number": "671cq1",
      "isAgent": 738,
      "isRevoke": 727,
      "siteid": 759,
      "status": 92
      "processInstanceId": "67",
      "memberId": 184,
      "openId": "67",
      "classifyName": "明轩.李",
      "address": "Suite 139 段中心4610号， 济宁， 赣 424588",
      "linkman": "waqhiq",
      "phone": 108,
      "manner": 702,
      "getnum": "e8tp5a",
      "number": "hdcuaq",
      "isAgent": 531,
      "isRevoke": 568,
      "siteid": 941,
      "status": 492,
      "createTime": "2021-11-16 12:00:45"
      }
      ]
      }
      ```
      ## 微信认证
      ### 微信注册认证
      **URL:** http://192.168.0.217:17011/m/zwfw/wechatinter/base/checkCard
      **Type:** POST
      **Content-Type:** application/x-www-form-urlencoded;charset=utf-8
      **Description:** 微信注册认证
      **Query-parameters:**
      Parameter | Type|Description|Required|Since
      ---|---|---|---|---
      sitenum|string|站点编号|false|-
      openid|string|微信openid|false|-
      idcard|string|身份证|false|-
      tel|string|电话|false|-
      name|string|姓名|false|-
      file|string|人脸照片地址|false|-
      z_img|string|身份证正面照片地址|false|-
      b_img|string|身份证反面照片地址|false|-
      siteid|int64|站点id (对站点进行绑定)|false|-
      **Request-example:**
      ```
      curl -X POST -i http://192.168.0.217:17011/m/zwfw/wechatinter/base/checkCard --data 'z_img=5ium8n&openid=67&siteid=826&sitenum=7uwh0v&name=明轩.李&idcard=511704199003249407&file=e7y2vh&tel=x4ml2a&b_img=0mjo90'
      ```
      **Response-fields:**
      Field | Type|Description|Since
      ---|---|---|---
      code|int32|No comments found.|-
      msg|string|No comments found.|-
      data|object|No comments found.|-
      **Response-example:**
      ```
      {
      "code": 772,
      "msg": "mqtos9",
      "data": "0tgx2j"
      }
      ```
      ## 错误码列表
      Error code |Description
      ---|---
      ......
      government-manager/src/main/resources/static/doc/index.html
      View file @ 5dd836e0
      This source diff could not be displayed because it is too large. You can view the blob instead.
      government-manager/src/main/resources/static/doc/search.js
      View file @ 5dd836e0
      ......@@ -8,46 +8,65 @@ api.push({
      })
      api[0].list.push({
      order: '1',
      desc: '一件事主题列表(包含主题包)',
      desc: '一件事主题包列表',
      });
      api[0].list.push({
      order: '2',
      desc: '问答答案提交后返回的详细结果',
      desc: '一件事主题列表(包含主题包)',
      });
      api[0].list.push({
      order: '3',
      desc: '提交后请求返回数据',
      desc: '一件事列表',
      });
      api[0].list.push({
      order: '4',
      desc: '上传附件',
      desc: '问题详细',
      });
      api[0].list.push({
      order: '5',
      desc: '删除附件',
      desc: '问答答案提交后返回的详细结果',
      });
      api[0].list.push({
      order: '6',
      desc: '查询用户信息',
      desc: '上传附件',
      });
      api[0].list.push({
      order: '7',
      desc: '一件事办理资料提交',
      desc: '删除附件',
      });
      api[0].list.push({
      order: '8',
      desc: '查询用户信息',
      });
      api[0].list.push({
      order: '9',
      desc: '一件事办理资料提交',
      });
      api[0].list.push({
      order: '10',
      desc: '我的办理',
      });
      api.push({
      alias: 'error',
      alias: 'WxWechatApiController',
      order: '2',
      link: '微信认证',
      desc: '微信认证',
      list: []
      })
      api[1].list.push({
      order: '1',
      desc: '微信注册认证',
      });
      api.push({
      alias: 'error',
      order: '3',
      link: 'error_code_list',
      desc: '错误码列表',
      list: []
      })
      api.push({
      alias: 'dict',
      order: '3',
      order: '4',
      link: 'dict_list',
      desc: '数据字典',
      list: []
      ......
      government-manager/src/test/java/com/mortals/TestDoc.java
      View file @ 5dd836e0
      ......@@ -26,11 +26,11 @@ public class TestDoc {
      @Test
      public void testBuilderControllersApi() {
      ApiConfig config = new ApiConfig();
      config.setServerUrl("http://localhost:28080");
      config.setServerUrl("http://192.168.0.217:17011/m");
      config.setAllInOne(true);
      config.setOutPath(DocGlobalConstants.HTML_DOC_OUT_PATH);
      //com/mortals/xhx/daemon/demo/RequestDispatchController.java
      config.setPackageFilters("com.mortals.xhx.busiz.WxOneThingApiController");
      config.setPackageFilters("com.mortals.xhx.busiz.WxOneThingApiController,com.mortals.xhx.busiz.WxWechatApiController");
      //config.setPackageFilters("com.mortals.xhx.daemon.demo.RequestDispatchController");
      ......
      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