Merge remote-tracking branch 'origin/master'

db/add.sql

 -- ----------------------------
-2023-9-11
+-- 2023-9-11
 -- ----------------------------
 ALTER TABLE mortals_xhx_user ADD COLUMN  `staffId` varchar(64)      COMMENT '员工Id，关联用户员工表';
 ALTER TABLE mortals_xhx_user ADD COLUMN  `openId` varchar(64)      COMMENT '微信openId';
@@ -108,3 +108,10 @@ CREATE TABLE mortals_xhx_news_up(
 PRIMARY KEY  (`id`)
 ,KEY `upName` (`upName`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='新闻点赞记录信息';
+
+
+-- ----------------------------
+-- 2024-12-5
+-- ----------------------------
+ALTER TABLE mortals_xhx_company ADD COLUMN   `background` varchar(256)   default ''  COMMENT '背景图片';
+

enterprise-manager-ui/admin/.env.development

+#开发环境
+NODE_ENV = "development"
+VUE_APP_API_BASE_URL= http://192.168.0.98:11086

enterprise-manager-ui/admin/src/assets/less/new.css

@@ -2,6 +2,7 @@
   height: 100% !important;
 }
 .layout-menu-wrapper {
+  padding: 0 24px;
   height: 64px !important;
   line-height: 64px !important;
   background: linear-gradient(90deg, #1845c6, #2999ff) !important;
@@ -9,6 +10,13 @@
 .layout-menu-wrapper .layout-logo {
   font-size: 20px;
   font-weight: bold;
+  width: 200px;
+}
+.layout-menu-wrapper .menu-list {
+  margin-left: 50px;
+}
+.layout-menu-wrapper .menu-list li {
+  padding: 0 20px;
 }
 .layout-menu-wrapper .menu-list li a {
   display: block;

enterprise-manager-ui/admin/src/assets/less/new.less

 #app {
-    height: 100% !important;
+  height: 100% !important;
 }
 
 .layout-menu-wrapper {
-    height: 64px !important;
-    line-height: 64px !important;
-    background: linear-gradient(90deg, #1845c6, #2999ff) !important;
+  padding: 0 24px;
+  height: 64px !important;
+  line-height: 64px !important;
+  background: linear-gradient(90deg, #1845c6, #2999ff) !important;
 
-    .layout-logo {
-        font-size: 20px;
-        font-weight: bold;
-    }
-
-    .menu-list {
-        li {
-            a {
-                display: block;
-                padding: 0 12px;
-                height: 100%;
-                font-size: 14px !important;
-                color: rgba(254, 254, 254, .65) !important;
-                text-align: center !important;
-
-                i {
-                    font-size: 14px !important;
-                    margin-right: 10px !important;
-                }
+  .layout-logo {
+    font-size: 20px;
+    font-weight: bold;
+    width: 200px;
+  }
 
-                i:first-child {
-                    margin-right: 0px !important;
-                }
+  .menu-list {
+    margin-left: 50px;
+    li {
+      padding: 0 20px;
+      a {
+        display: block;
+        padding: 0 12px;
+        height: 100%;
+        font-size: 14px !important;
+        color: rgba(254, 254, 254, 0.65) !important;
+        text-align: center !important;
 
-                &:hover {
-                    color: #fff !important;
+        i {
+          font-size: 14px !important;
+          margin-right: 10px !important;
+        }
 
-                }
+        i:first-child {
+          margin-right: 0px !important;
+        }
 
-                &.router-link-active,
-                &[active] {
-                    //background: #1890ff;
-                    color: #fff !important;
-                    list-style-type: none;
-                    border-bottom: none !important;
-                    padding-bottom: 2px;
-                    background-color: #1890ff !important;
-                }
-            }
+        &:hover {
+          color: #fff !important;
         }
 
+        &.router-link-active,
+        &[active] {
+          //background: #1890ff;
+          color: #fff !important;
+          list-style-type: none;
+          border-bottom: none !important;
+          padding-bottom: 2px;
+          background-color: #1890ff !important;
+        }
+      }
     }
-
-
+  }
 }
 
 .layout-header .layout-submenu-wrapper {
-    width: 95% !important;
-    margin: 0 auto !important;
-    margin-top: 20px !important;
-    border-top-left-radius: 8px;
-    border-top-right-radius: 8px;
+  width: 95% !important;
+  margin: 0 auto !important;
+  margin-top: 20px !important;
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
 }
 
 .page.active {
-    width: 95% !important;
-    margin: 0 auto !important;
-    padding: 20px !important;
-    padding-top: 0 !important;
+  width: 95% !important;
+  margin: 0 auto !important;
+  padding: 20px !important;
+  padding-top: 0 !important;
 }
 
 .page {
-    height: 82% !important;
-    min-height: 82% !important;
-    border-bottom-left-radius: 8px;
-    border-bottom-right-radius: 8px;
-}
\ No newline at end of file
+  height: 82% !important;
+  min-height: 82% !important;
+  border-bottom-left-radius: 8px;
+  border-bottom-right-radius: 8px;
+}

enterprise-manager-ui/admin/src/assets/utils/dateFormat.js

+export const timestampToTime = (timestamp, transLength) => {
+  // 时间戳为10位需*1000，时间戳为13位不需乘1000
+  let date = null;
+  if (timestamp) {
+    if (timestamp.length < 13) {
+      date = new Date(timestamp * 1000);
+    } else {
+      date = new Date(timestamp);
+    }
+    let Y = date.getFullYear() + "-";
+    let M =
+      date.getMonth() + 1 < 10
+        ? "0" + (date.getMonth() + 1)
+        : date.getMonth() + 1;
+    let D =
+      date.getDate() < 10 ? "-" + "0" + date.getDate() : "-" + date.getDate();
+    let h =
+      " " +
+      (date.getHours() < 10 ? "0" + date.getHours() : date.getHours()) +
+      ":";
+    let m =
+      (date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes()) +
+      ":";
+    let s =
+      date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
+    switch (transLength) {
+      case 2:
+        return Y + M;
+      case 3:
+        return Y + M + D;
+      case 6:
+        return Y + M + D + h + m + s;
+    }
+  } else {
+    return "";
+  }
+};
+// 小时：分钟 ==》 转分钟
+
+export const transFormMinut = (String) => {
+  if (typeof String === "number") {
+    return;
+  }
+  if (!String) {
+    return 0;
+  }
+  let arr = String.split(":");
+  let hour =
+    arr[0].indexOf("0") === 0 ? arr[0].substring(1, arr[0].length) : arr[0];
+  let minu =
+    arr[1].indexOf("0") === 0 ? arr[1].substring(1, arr[1].length) : arr[1];
+  return hour * 60 + minu * 1;
+  // return JSON.stringify(hour * 60 + minu * 1);
+};
+// // 分钟 ==》 小时
+export const transFormTime = (num) => {
+  if (typeof num != "string" && num !== 0) {
+    return Math.floor(num / 60).toString() + ":" + (num % 60).toString();
+  } else {
+    return "0:00";
+  }
+};
+
+//当前月第一天
+export const getFirstDay = () => {
+  let y = new Date().getFullYear(); //获取年份
+  let m = new Date().getMonth() + 1; //获取月份
+  let d = "01";
+  m = m < 10 ? "0" + m : m; //月份补 0
+
+  return [y, m, d].join("-");
+};
+
+//当前月最后一天
+export const getLastDay = () => {
+  let y = new Date().getFullYear(); //获取年份
+  let m = new Date().getMonth() + 1; //获取月份
+  let d = new Date(y, m, 0).getDate(); //获取当月最后一日
+  m = m < 10 ? "0" + m : m; //月份补 0
+  d = d < 10 ? "0" + d : d; //日数补 0
+
+  return [y, m, d].join("-");
+};
+
+//获取两日期之间日期列表函数
+export const getdiffdate = (stime, etime) => {
+  //初始化日期列表，数组
+  let diffdate = new Array();
+  let i = 0;
+  //开始日期小于等于结束日期,并循环
+  while (stime <= etime) {
+    diffdate[i] = stime;
+    //获取开始日期时间戳
+    let stime_ts = new Date(stime).getTime();
+
+    //增加一天时间戳后的日期
+    let next_date = stime_ts + 24 * 60 * 60 * 1000;
+
+    //拼接年月日，这里的月份会返回（0-11），所以要+1
+    let next_dates_y = new Date(next_date).getFullYear() + "-";
+    let next_dates_m =
+      new Date(next_date).getMonth() + 1 < 10
+        ? "0" + (new Date(next_date).getMonth() + 1) + "-"
+        : new Date(next_date).getMonth() + 1 + "-";
+    let next_dates_d =
+      new Date(next_date).getDate() < 10
+        ? "0" + new Date(next_date).getDate()
+        : new Date(next_date).getDate();
+
+    stime = next_dates_y + next_dates_m + next_dates_d;
+
+    //增加数组key
+    i++;
+  }
+  return diffdate;
+};
+// 获取某个日期是周几
+export const getMyDay = (date) => {
+  let week;
+  if (date.getDay() == 0) week = "周日";
+  if (date.getDay() == 1) week = "周一";
+  if (date.getDay() == 2) week = "周二";
+  if (date.getDay() == 3) week = "周三";
+  if (date.getDay() == 4) week = "周四";
+  if (date.getDay() == 5) week = "周五";
+  if (date.getDay() == 6) week = "周六";
+  return week;
+};
+// 求两个日期的 分钟差
+export const getMinu = (s1, s2) => {
+  var reDate = /\d{4}-\d{1,2}-\d{1,2} /;
+  s1 = new Date((reDate.test(s1) ? s1 : "2023-01-01 " + s1).replace(/-/g, "/"));
+  s2 = new Date((reDate.test(s2) ? s2 : "2023-01-01 " + s2).replace(/-/g, "/"));
+  var ms = s2.getTime() - s1.getTime();
+  if (ms < 0) return 0;
+  return Math.floor(ms / 1000 / 60); //分钟
+};
+// 求两个日期的 秒差
+export const getSec = (s1, s2) => {
+  var reDate = /\d{4}-\d{1,2}-\d{1,2} /;
+  s1 = new Date((reDate.test(s1) ? s1 : "2023-01-01 " + s1).replace(/-/g, "/"));
+  s2 = new Date((reDate.test(s2) ? s2 : "2023-01-01 " + s2).replace(/-/g, "/"));
+  var ms = s2.getTime() - s1.getTime();
+  if (ms < 0) return 0;
+  return Math.floor(ms / 1000); //秒
+};

enterprise-manager-ui/admin/src/components/FormField.vue

 // 表单节点封装，支持 input textarea select radio checkbox 及slot方式
 <template>
-  <el-col :span='span'>
-
-    <el-form-item :label="label" :prop="prop" class='my-form-field'>
+  <el-col :span="span">
+    <el-form-item :label="label" :prop="prop" class="my-form-field">
       <slot>
-        <el-input :disabled='disabled' :placeholder='placeholder' v-model="field" @change="emit" @input="emit" v-if='type === "text"' :class="inputClass" :clearable='clearable'></el-input>
-        <el-input :disabled='disabled' :placeholder='placeholder' v-model="field" @change="emit" @input="emit" type='password' v-if='type === "password"'></el-input>
-
-        <el-input-number  :disabled='disabled'  v-model="field" size="small" :placeholder='placeholder' @change="emit" @input="emit"  v-if='type === "num"'></el-input-number>
+        <el-input
+          :disabled="disabled"
+          :placeholder="placeholder"
+          v-model="field"
+          @change="emit"
+          @input="emit"
+          v-if="type === 'text'"
+          :class="inputClass"
+          :clearable="clearable"
+        ></el-input>
+        <el-input
+          :disabled="disabled"
+          :placeholder="placeholder"
+          v-model="field"
+          @change="emit"
+          @input="emit"
+          type="password"
+          v-if="type === 'password'"
+        ></el-input>
 
+        <el-input-number
+          :disabled="disabled"
+          v-model="field"
+          size="small"
+          :placeholder="placeholder"
+          @change="emit"
+          @input="emit"
+          v-if="type === 'num'"
+        ></el-input-number>
 
-        <el-input :disabled='disabled' :placeholder='placeholder' v-model="field" @change="emit" :rows='rows' @input="emit" v-if='type === "textarea"' type='textarea' :autosize="textareaSize" :class="inputClass"></el-input>
+        <el-input
+          :disabled="disabled"
+          :placeholder="placeholder"
+          v-model="field"
+          @change="emit"
+          :rows="rows"
+          @input="emit"
+          v-if="type === 'textarea'"
+          type="textarea"
+          :autosize="textareaSize"
+          :class="inputClass"
+        ></el-input>
 
-        <el-select :disabled='disabled' v-model="field" @change="emit" :multiple='multiple' :filterable='filterable' :clearable='clearable' v-if='type === "select"'>
+        <el-select
+          :disabled="disabled"
+          v-model="field"
+          @change="emit"
+          :multiple="multiple"
+          :filterable="filterable"
+          :clearable="clearable"
+          v-if="type === 'select'"
+        >
           <el-option
             v-for="($label, $value) in enumData"
             :key="$value"
@@ -21,25 +63,54 @@
           ></el-option>
         </el-select>
 
-        <el-radio-group :disabled='disabled' v-model="field" @change="emit" v-if='type === "radio"'>
+        <el-radio-group
+          :disabled="disabled"
+          v-model="field"
+          @change="emit"
+          v-if="type === 'radio'"
+        >
           <el-radio
-            v-for='($label, $value) in enumData'
-            :key='$value'
+            v-for="($label, $value) in enumData"
+            :key="$value"
             :label="$value"
-          >{{$label}}</el-radio>
+            >{{ $label }}</el-radio
+          >
         </el-radio-group>
 
-        <el-checkbox-group :disabled='disabled' v-model="field" @change="emit" v-if='type === "checkbox"'>
+        <el-checkbox-group
+          :disabled="disabled"
+          v-model="field"
+          @change="emit"
+          v-if="type === 'checkbox'"
+        >
           <el-checkbox
-            v-for='($label, $value) in enumData'
-            :key='$value'
+            v-for="($label, $value) in enumData"
+            :key="$value"
             :label="$value"
-          >{{$label}}</el-checkbox>
+            >{{ $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="datetime" value-format="yyyy-MM-dd HH:mm:ss" v-model="field" @change="emit" @input="emit" placeholder="选择日期" v-if='type === "datetime"'></el-date-picker>
-
+        <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="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>
     </el-form-item>
   </el-col>
@@ -48,29 +119,29 @@
 <script>
 export default {
   props: {
-     // 字段值
+    // 字段值
     value: {
       type: [String, Number, Array],
     },
     // 组件的el-col span宽度 1-24,默认12
-    span: {                         
+    span: {
       type: Number,
       default: 12,
     },
     // 字段类型: text,password,textarea,select,radio,checkbox,date,datetime
-    type: {                          
+    type: {
       type: String,
-      default: 'text',
+      default: "text",
     },
     // 字段name
     prop: {
       type: String,
-      default: '',
+      default: "",
     },
     // 字段中文标题
     label: {
       type: String,
-      default: '',
+      default: "",
     },
     // 是否禁用
     disabled: {
@@ -80,18 +151,18 @@ export default {
     // 是否提示
     placeholder: {
       type: String,
-      default: '',
+      default: "",
     },
 
     // 字段所需的枚举类型
     enumData: {
       type: Object,
-      default: ()=>{},
+      default: () => {},
     },
     // textarea专用-自适应内容高度
     textareaSize: {
       type: Object,
-      default: ()=>{},
+      default: () => {},
     },
     // select专用-是否可搜索
     filterable: {
@@ -111,38 +182,39 @@ export default {
     // 字段所需的枚举类型
     options: {
       type: Array,
-      default: ()=>[],
+      default: () => [],
     },
     children: {
       type: Array,
-      default: ()=>[],
+      default: () => [],
     },
     inputClass: {
       type: String,
-      default: '',
-    }
+      default: "",
+    },
   },
   methods: {
     emit() {
-      this.$emit('input', this.newVal)
-      this.$emit('change', this.newVal)
-    }
+      this.$emit("input", this.newVal);
+      this.$emit("change", this.newVal);
+      console.log(this.newVal);
+    },
   },
   computed: {
     field: {
       get() {
-        return this.value
+        return this.value;
       },
       set(val) {
         this.newVal = val;
-      }
-    }
+      },
+    },
   },
   data() {
     return {
       newVal: this.value,
-    }
-  }
-}
+    };
+  },
+};
 </script>
 

enterprise-manager-ui/admin/src/components/Header.vue

@@ -11,11 +11,11 @@
           <router-link to="/">
             <img
               :src="sysLogo ? sysLogo : require('../assets/images/logo.png')"
-              style="margin-bottom:5px"
+              style="margin-bottom: 5px"
               height="40"
               alt=""
             />
-            <b style="color:white;font-size:18px;"
+            <b style="color: white; font-size: 18px"
               >&nbsp;&nbsp;&nbsp;
               {{ sysName ? sysName : "企业服务平台" }}
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b
@@ -43,7 +43,7 @@
           </span> -->
 
         <el-dropdown @command="handleCommand">
-          <span class="el-dropdown-link" style="color:white">
+          <span class="el-dropdown-link" style="color: white">
             {{ userData.currUserName }}
             <i class="el-icon-arrow-down el-icon--right"></i>
           </span>
@@ -249,9 +249,7 @@ export default {
         }
       }
     }
-    .layout-profile {
-      padding-right: 30px;
-    }
+   
   }
 
   .layout-submenu-wrapper {

enterprise-manager-ui/admin/src/components/ImageUpload.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="component-upload-image">
     <el-upload
-      :action="uploadImgUrl+'?prePath=' +prePath"
+      :action="uploadImgUrl + '?prePath=' + prePath"
       list-type="picture-card"
       :on-success="handleUploadSuccess"
       :before-upload="handleBeforeUpload"
@@ -11,14 +11,22 @@
       :show-file-list="false"
       :headers="headers"
       style="display: inline-block; vertical-align: top"
+      v-if="!isList"
     >
-      <el-image v-if="!value" :src="value">
+      <el-image
+        v-if="!value"
+        :src="value.indexOf('http') == -1 ? baseUrl + value : value"
+      >
         <div slot="error" class="image-slot">
           <i class="el-icon-plus" />
         </div>
       </el-image>
       <div v-else class="image">
-        <el-image :src="value" :style="`width:150px;height:150px;`" fit="fill"/>
+        <el-image
+          :src="value.indexOf('http') == -1 ? baseUrl + value : value"
+          :style="`width:150px;height:150px;`"
+          fit="fill"
+        />
         <div class="mask">
           <div class="actions">
             <span title="预览" @click.stop="dialogVisible = true">
@@ -31,8 +39,36 @@
         </div>
       </div>
     </el-upload>
-    <el-dialog :visible.sync="dialogVisible" title="预览" width="800" append-to-body>
-      <img :src="value" style="display: block; max-width: 100%; margin: 0 auto;">
+    <el-upload
+      :action="uploadImgUrl + '?prePath=' + prePath"
+      list-type="picture-card"
+      :on-remove="handleRemove"
+      :on-success="handleUploadSuccess"
+      :before-upload="handleBeforeUpload"
+      :on-preview="handlePictureCardPreview"
+      :file-list="imgList"
+      accept=".jpeg,.png,.jpg,.bmp,.gif"
+      :headers="headers"
+      v-else
+    >
+      <i class="el-icon-plus"></i>
+    </el-upload>
+    <el-dialog
+      :visible.sync="dialogVisible"
+      title="预览"
+      width="800"
+      append-to-body
+    >
+      <img
+        :src="dialogImageUrl"
+        style="display: block; max-width: 100%; margin: 0 auto"
+        v-if="isList"
+      />
+      <img
+        :src="value"
+        style="display: block; max-width: 100%; margin: 0 auto"
+        v-else
+      />
     </el-dialog>
   </div>
 </template>
@@ -41,8 +77,11 @@
 export default {
   data() {
     return {
+      baseUrl: process.env.VUE_APP_API_BASE_URL + "/",
       dialogVisible: false,
-      uploadImgUrl:  "/enterprise/file/commonupload", // 上传的图片服务器地址
+      uploadImgUrl: "/enterprise/file/commonupload", // 上传的图片服务器地址
+      imgList: [],
+      dialogImageUrl: "",
     };
   },
   props: {
@@ -53,16 +92,52 @@ export default {
     //保存服务器路径前缀地址
     prePath: {
       type: String,
-      default: '',
+      default: "",
+    },
+    isList: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  mounted() {
+    // 判断是否为多图上传
+    if (this.isList) {
+      if (this.value && this.value != "") {
+        this.imgList = [];
+        let arr = [];
+        arr = this.value?.split(",");
+        arr.forEach((v) => {
+          let obj = {};
+          obj.name = "轮播图";
+          obj.uid = parseInt(Math.random(0, 100));
+          v.indexOf("http") == -1
+            ? (obj.url = this.baseUrl + v)
+            : (obj.url = v);
+          this.imgList.push(obj);
+        });
+      }
     }
   },
   methods: {
+    handleRemove(file, fileList) {
+      console.log(fileList);
+      this.imgList = fileList;
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
     removeImage() {
       this.$emit("input", "");
     },
-    handleUploadSuccess(res) {
-      this.$emit("input", res.url);
-      this.loading.close();
+    handleUploadSuccess(res, file, fileList) {
+      if (this.isList) {
+        this.loading.close();
+        this.imgList = fileList;
+      } else {
+        this.$emit("input", res.url);
+        this.loading.close();
+      }
     },
     handleBeforeUpload() {
       this.loading = this.$loading({

enterprise-manager-ui/admin/src/views/company/drawershow.vue

@@ -7,33 +7,62 @@
     :destroy-on-close="true"
     size="80%"
   >
-    <el-form ref="form" :model="form" :rules="rules" label-width="140px" style="padding:0 40px;">
+    <el-form
+      ref="form"
+      :model="form"
+      :rules="rules"
+      label-width="140px"
+      style="padding: 0 40px"
+    >
       <el-row>
-        <Field label="企业名称" prop="companyName" v-model="form.companyName" placeholder="请输入企业名称" />
-        <Field label="联系电话" prop="contactPhone" v-model="form.contactPhone" placeholder="请输入联系电话" />
-        <!-- <Field label="公司编码" prop="companyCode" v-model="form.companyCode" placeholder="请输入公司编码"/>
+        <Field
+          label="企业名称"
+          prop="companyName"
+          v-model="form.companyName"
+          placeholder="请输入企业名称"
+        />
+      </el-row>
+      <el-row>
+        <Field
+          label="联系电话"
+          prop="contactPhone"
+          v-model="form.contactPhone"
+          placeholder="请输入联系电话"
+        />
+      </el-row>
+      <!-- <Field label="公司编码" prop="companyCode" v-model="form.companyCode" placeholder="请输入公司编码"/>
                             <Field label="注册号" prop="registrationNumber" v-model="form.registrationNumber" placeholder="请输入注册号"/>
                             <Field label="法定代表人" prop="legalRepresentative" v-model="form.legalRepresentative" placeholder="请输入法定代表人"/>
                             <Field label="注册资本" prop="registeredCapital" v-model="form.registeredCapital" placeholder="请输入注册资本"/>
                             <Field label="公司类型" prop="companyType" v-model="form.companyType" placeholder="请输入公司类型"/>
         <Field :span="24" label="经营范围" prop="businessScope" v-model="form.businessScope" placeholder="请输入经营范围"/>-->
-        <!-- <Field :span="24" label="经营地址" prop="businessAdress" v-model="form.businessAdress" placeholder="请输入经营地址">
+      <!-- <Field :span="24" label="经营地址" prop="businessAdress" v-model="form.businessAdress" placeholder="请输入经营地址">
                               <p>当前选中的行政区划编码为： {{regionCodeList}}</p>
                               <el-cascader  v-model="regionCodeList" :props="areaprops"></el-cascader>
         </Field>-->
-
+      <el-row>
         <Field
           :span="24"
           label="经营地址"
           prop="businessAdress"
           placeholder="请输入经营地址"
         >
-          <area-select ref="areaselect" v-model="form.areaCode" @addressSelect="addressSelect"></area-select>
+          <area-select
+            ref="areaselect"
+            v-model="form.areaCode"
+            @addressSelect="addressSelect"
+          ></area-select>
         </Field>
-
+      </el-row>
+      <el-row>
         <!-- <Field label="所在地" prop="location" v-model="form.location" placeholder="请输入所在地"/> -->
-        <Field prop="location" v-model="form.location" placeholder="请输入详细地址" />
-        <!-- <Field label="电子邮件地址" prop="email" v-model="form.email" placeholder="请输入电子邮件地址"/>
+        <Field
+          prop="location"
+          v-model="form.location"
+          placeholder="请输入详细地址"
+        />
+      </el-row>
+      <!-- <Field label="电子邮件地址" prop="email" v-model="form.email" placeholder="请输入电子邮件地址"/>
                             <Field label="公司网站" prop="website" v-model="form.website" placeholder="请输入公司网站"/>
                             <Field label="税务登记号" prop="taxRegistrationNumber" v-model="form.taxRegistrationNumber" placeholder="请输入税务登记号"/>
                             <Field label="社会信用代码" prop="socialCreditCode" v-model="form.socialCreditCode" placeholder="请输入社会信用代码"/>
@@ -45,13 +74,30 @@
                             <Field label="历史发展" prop="hisDevelop" v-model="form.hisDevelop" type="textarea" placeholder="请输入历史发展"/>
                             <Field label="经度" prop="lon" v-model="form.lon" placeholder="请输入经度"/>
         <Field label="纬度" prop="lati" v-model="form.lati" placeholder="请输入纬度"/>-->
-        <!-- <Field label="公司文化" prop="companyCulture" v-model="form.companyCulture" type="textarea" placeholder="请输入公司文化"/>
+      <!-- <Field label="公司文化" prop="companyCulture" v-model="form.companyCulture" type="textarea" placeholder="请输入公司文化"/>
                             <Field label="排序" prop="sort" v-model="form.sort" type="num" placeholder="请输入排序"/>
         <Field label="成立日期" prop="establishDate" v-model="form.establishDate" type="date" />-->
-
+      <el-row>
         <Field :span="24" label="企业logo">
           <imageUpload v-model="form.logoPath" prePath="/file/preview" />
         </Field>
+      </el-row>
+      <el-row>
+        <Field :span="24" label="企业背景图">
+          <imageUpload v-model="form.background" prePath="/file/preview" />
+        </Field>
+      </el-row>
+      <el-row>
+        <!-- <Field
+          :span="24"
+          label="企业标签"
+          prop="companyLabelsList"
+          type="select"
+          :multiple="true"
+          :enumData="dict.labels"
+          v-model="form.companyLabelsList"
+          placeholder="请选择产品分类"
+        /> -->
         <Field :span="24" label="企业标签">
           <el-select
             v-model="companyLabelsList"
@@ -67,13 +113,36 @@
             ></el-option>
           </el-select>
         </Field>
-        <Field
+      </el-row>
+      <el-row>
+        <Field label="轮播图">
+          <imageUpload
+            v-model="form.companyPicPath"
+            prePath="/file/preview"
+            :isList="true"
+            ref="imgList"
+          />
+        </Field>
+      </el-row>
+      <el-row>
+        <Field label="短视频"
+          ><fileUpload
+            v-model="form.companyVideoPath"
+            :fileType="['mp4', 'avi']"
+            prePath="/file/fileupload"
+        /></Field>
+      </el-row>
+      <el-row>
+        <Field label="公司介绍">
+          <editor v-model="form.companyIntroduction" :min-height="150" />
+        </Field>
+        <!-- <Field
           label="公司介绍"
           prop="companyIntroduction"
           v-model="form.companyIntroduction"
           type="textarea"
           placeholder="请输入公司介绍"
-        />
+        /> -->
         <!-- <Field :span="24" label="企业视频"><fileUpload v-model="form.companyVideoPath" :fileType="[ 'mp4', 'avi']"  prePath="/file/fileupload"/></Field>
               <Field :span="24" label="企业宣传图片"><fileUpload v-model="form.companyPicPath" :fileType="['png', 'jpg', 'jpeg']" prePath="/file/preview"/></Field>
 
@@ -88,10 +157,22 @@
           ref="companyPatents"
         >
           <!-- <el-table-column type="selection" width="50" align="center" /> -->
-          <el-table-column label="序号" align="center" prop="index" width="50" />
-          <el-table-column label="知识产权类型" align="center" prop="intellectPropertyType">
+          <el-table-column
+            label="序号"
+            align="center"
+            prop="index"
+            width="50"
+          />
+          <el-table-column
+            label="知识产权类型"
+            align="center"
+            prop="intellectPropertyType"
+          >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.intellectPropertyType" placeholder="请输入知识产权类型" />
+              <el-input
+                v-model="scope.row.intellectPropertyType"
+                placeholder="请输入知识产权类型"
+              />
             </template>
           </el-table-column>
 
@@ -107,25 +188,40 @@
 
           <el-table-column label="操作" width="240">
             <template slot-scope="scope">
-              <Confirm @confirm="handleDeleteCompanyPatents(scope.row)" message="确定要删除该条知识产权吗？">
+              <Confirm
+                @confirm="handleDeleteCompanyPatents(scope.row)"
+                message="确定要删除该条知识产权吗？"
+              >
                 <div class="del">删除</div>
               </Confirm>
             </template>
           </el-table-column>
         </el-table>
         <el-row
-          style="margin:10px 0;display: flex;justify-content: center;"
+          style="margin: 10px 0; display: flex; justify-content: center"
           :gutter="10"
           class="mb8"
         >
           <el-col :span="1.5">
-            <el-button type="primary" icon="el-icon-plus" @click="handleAddCompanyPatents">新增知识产权</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              @click="handleAddCompanyPatents"
+              >新增知识产权</el-button
+            >
           </el-col>
         </el-row>
 
-        <el-form-item v-if="pageInfo.type!='view'" class="formbtns">
-          <el-button type="primary" @click="hanndleSubmit" icon="el-icon-circle-check-outline">保存</el-button>
-          <el-button @click="open=false" icon="el-icon-circle-close-outline">取消</el-button>
+        <el-form-item v-if="pageInfo.type != 'view'" class="formbtns">
+          <el-button
+            type="primary"
+            @click="hanndleSubmit"
+            icon="el-icon-circle-check-outline"
+            >保存</el-button
+          >
+          <el-button @click="open = false" icon="el-icon-circle-close-outline"
+            >取消</el-button
+          >
         </el-form-item>
       </Field>
     </el-form>
@@ -139,25 +235,25 @@ export default {
   name: "CompanyDetail",
   mixins: [form],
   components: {
-    Confirm
+    Confirm,
   },
   created() {
     this.changePath("company");
   },
   data() {
     let that = this;
-    var checkPhone = (rule,value,callback) =>{
-      let phoneReg = /^(((\d{3,4}-)?[0-9]{7,8})|(1(3|4|5|6|7|8|9)\d{9}))$/
-      if(!value){
-        callback()
-      }else{
-        if(phoneReg.test(value)){
-          callback()
-        }else{
-          callback(new Error("请输入正确的联系电话"))
+    var checkPhone = (rule, value, callback) => {
+      let phoneReg = /^(((\d{3,4}-)?[0-9]{7,8})|(1(3|4|5|6|7|8|9)\d{9}))$/;
+      if (!value) {
+        callback();
+      } else {
+        if (phoneReg.test(value)) {
+          callback();
+        } else {
+          callback(new Error("请输入正确的联系电话"));
         }
       }
-    }
+    };
     return {
       regionCodeList: [],
       areaprops: {
@@ -168,22 +264,22 @@ export default {
         lazyLoad(node, resolve) {
           var param = {
             pid: node.level === 0 ? 0 : node.data.id,
-            size: -1
+            size: -1,
           };
 
-          that.$post("/base/area/list", param).then(res => {
+          that.$post("/base/area/list", param).then((res) => {
             console.log(res);
-            let nodes = res.data.data.map(item => {
+            let nodes = res.data.data.map((item) => {
               return {
                 value: item.areaCode,
                 label: item.name,
                 id: item.iid,
-                leaf: item.haveSonArea === "False"
+                leaf: item.haveSonArea === "False",
               };
             });
             resolve(nodes);
           });
-        }
+        },
       },
       // 子表选中数据
       checkedCompanyLabels: [],
@@ -206,61 +302,66 @@ export default {
       rules: {
         companyName: [
           { required: true, message: "请输入公司名称", trigger: "blur" },
-          { max: 128, message: "最多只能录入128个字符", trigger: "blur" }
+          { max: 128, message: "最多只能录入128个字符", trigger: "blur" },
         ],
         areaCode: [
           { required: true, message: "请输入所属区域编码", trigger: "blur" },
-          { max: 128, message: "最多只能录入128个字符", trigger: "blur" }
+          { max: 128, message: "最多只能录入128个字符", trigger: "blur" },
         ],
         areaName: [
           { required: true, message: "请输入所属区域名称", trigger: "blur" },
-          { max: 128, message: "最多只能录入128个字符", trigger: "blur" }
+          { max: 128, message: "最多只能录入128个字符", trigger: "blur" },
         ],
         contactPhone: [
           { required: true, message: "请输入联系电话", trigger: "blur" },
-          { validator: checkPhone,trigger: "blur" },
-          { max: 32, message: "最多只能录入32个字符", trigger: "blur" }
+          { validator: checkPhone, trigger: "blur" },
+          { max: 32, message: "最多只能录入32个字符", trigger: "blur" },
         ],
         lon: [
           { required: true, message: "请输入经度", trigger: "blur" },
-          { max: 32, message: "最多只能录入32个字符", trigger: "blur" }
+          { max: 32, message: "最多只能录入32个字符", trigger: "blur" },
         ],
         lati: [
           { required: true, message: "请输入纬度", trigger: "blur" },
-          { max: 32, message: "最多只能录入32个字符", trigger: "blur" }
+          { max: 32, message: "最多只能录入32个字符", trigger: "blur" },
         ],
         logoPath: [
           { required: true, message: "请输入企业logo", trigger: "blur" },
-          { max: 128, message: "最多只能录入128个字符", trigger: "blur" }
         ],
         establishDate: [{ required: true, message: "请选择成立日期" }],
-        createTime: [{ required: true, message: "请选择创建时间" }]
-      }
+        createTime: [{ required: true, message: "请选择创建时间" }],
+      },
     };
   },
 
   methods: {
-    hanndleSubmit(){
-      this.form.businessAdress = this.$refs.areaselect.provinceName+this.$refs.areaselect.cityName+this.$refs.areaselect.areaName+this.$refs.areaselect.streetName+this.$refs.areaselect.communityName+this.form.location
+    hanndleSubmit() {
+      this.form.businessAdress =
+        this.$refs.areaselect.provinceName +
+        this.$refs.areaselect.cityName +
+        this.$refs.areaselect.areaName +
+        this.$refs.areaselect.streetName +
+        this.$refs.areaselect.communityName +
+        this.form.location;
       // 检查知识产权list中类型不能为空
-      if(this.companyPatentsList && this.companyPatentsList.length>0){
-        let isNull = false
-        this.companyPatentsList.forEach((item)=>{
+      if (this.companyPatentsList && this.companyPatentsList.length > 0) {
+        let isNull = false;
+        this.companyPatentsList.forEach((item) => {
           if (!item.intellectPropertyType) {
-            isNull = true
+            isNull = true;
           }
-        })
-        if(isNull){
-          this.$confirm('知识产权类型不能为空', '提示', {
-              confirmButtonText: '确定',
-              type: 'warning',
-              showCancelButton: false, //是否显示取消按钮
-              showClose: false, //是否显示关闭按钮
-          })
+        });
+        if (isNull) {
+          this.$confirm("知识产权类型不能为空", "提示", {
+            confirmButtonText: "确定",
+            type: "warning",
+            showCancelButton: false, //是否显示取消按钮
+            showClose: false, //是否显示关闭按钮
+          });
           return;
         }
       }
-      this.submitForm()
+      this.submitForm();
     },
     addressSelect(val) {
       console.log("addressSelect", val);
@@ -293,7 +394,7 @@ export default {
     handleDeleteCompanyPatents(row) {
       // 由于有一些知识产权还没有id，所以这里删除选用的是字段中带的index
       this.companyPatentsList = this.companyPatentsList.filter(
-        item => item.index !== row.index
+        (item) => item.index !== row.index
       );
       this.form.companyPatentsList = this.companyPatentsList;
     },
@@ -311,7 +412,7 @@ export default {
     beforeRender(data) {
       if (data.entity.companyLabelsList) {
         let arr = [];
-        data.entity.companyLabelsList.forEach(item => {
+        data.entity.companyLabelsList.forEach((item) => {
           //如果相等做操作
           item["labelId"] = item["labelId"] + "";
           arr.push(item.labelId);
@@ -354,6 +455,15 @@ export default {
     cancel() {
       this.open = false;
     },
+    beforeSubmit(data) {
+      // data.companyLabelsList = data.companyLabelsList.join(",");
+      let arr = [];
+      arr = this.$refs.imgList.imgList.map((v) => {
+        return v.response ? v.response.url : v.url.substr(v.url.indexOf("f"));
+      });
+      data.companyPicPath = arr.join(",");
+      return data;
+    },
     /**获取数据后弹框 */
     afterRender(data) {
       this.open = true;
@@ -392,6 +502,7 @@ export default {
         lon: "",
         lati: "",
         logoPath: "",
+        background: "",
         companyVideoPath: "",
         companyPicPath: "",
         companyIntroduction: "",
@@ -400,7 +511,7 @@ export default {
         establishDate: null,
         remark: "",
         companyLabelsList: [],
-        companyPatentsList: []
+        companyPatentsList: [],
       };
       this.resetForm("form");
     },
@@ -408,19 +519,19 @@ export default {
       if (this.$refs[refName]) {
         this.$refs[refName].resetFields();
       }
-    }
+    },
   },
   watch: {
     companyLabelsList(newval) {
       let arr = [];
-      newval.forEach(item => {
+      newval.forEach((item) => {
         arr.push({
-          labelId: item
+          labelId: item,
         });
       });
       this.form.companyLabelsList = arr;
-    }
-  }
+    },
+  },
 };
 </script>
 

enterprise-manager-ui/admin/src/views/news/drawershow.vue

 <template>
-    <!-- 弹出框表单 -->
-    <el-drawer
-            :title="title"
-            :visible.sync="open"
-            :direction="direction"
-            :destroy-on-close="true"
-            size="100%">
-        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-            <div class="form">
-                <div class="formleft">
-                    <Field label="标题" :span="24" prop="title" v-model="form.title"  placeholder="请输入标题"/>
-                    <Field :span="24" label="内容"><editor v-model="form.content" :min-height="256"/></Field>
-                </div>
-                <div class="formright">
-                    <el-row>
-                    <Field label="类型" :span="20" prop="categoryId" v-model="form.categoryId" type="radio" :enum-data="dict.categoryId" placeholder="请输入分类id"/>
-                    <Field :span="20" label="封面"><imageUpload v-model="form.titleLogoPath" prePath="/file/preview"/></Field>
+  <!-- 弹出框表单 -->
+  <el-drawer
+    :title="title"
+    :visible.sync="open"
+    :direction="direction"
+    :destroy-on-close="true"
+    size="100%"
+  >
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <div class="form">
+        <div class="formleft">
+          <Field
+            label="标题"
+            :span="24"
+            prop="title"
+            v-model="form.title"
+            placeholder="请输入标题"
+          />
+          <Field :span="24" label="内容"
+            ><editor v-model="form.content" :min-height="256"
+          /></Field>
+        </div>
+        <div class="formright">
+          <el-row>
+            <Field
+              label="类型"
+              :span="20"
+              prop="categoryId"
+              v-model="form.categoryId"
+              type="radio"
+              :enum-data="dict.categoryId"
+              placeholder="请输入分类id"
+            />
+            <Field :span="20" label="封面">
+              <imageUpload
+                v-model="form.titleLogoPath"
+                prePath="/file/preview"
+                :isList="true"
+                ref="imgList"
+              />
+            </Field>
 
-                    <Field :span="20" label="责任编辑" prop="editor" v-model="form.editor" placeholder="请输入责任编辑"/>
+            <Field
+              :span="20"
+              label="责任编辑"
+              prop="editor"
+              v-model="form.editor"
+              placeholder="请输入责任编辑"
+            />
 
-                    <Field :span="20" label="发布部门" prop="deptId" v-model="form.deptId" type="select" :enum-data="dict.deptId" placeholder="请输入发布部门"/>
+            <Field
+              :span="20"
+              label="发布部门"
+              prop="deptId"
+              v-model="form.deptId"
+              type="select"
+              :enum-data="dict.deptId"
+              placeholder="请输入发布部门"
+            />
 
-                    <Field :span="20" label="文章来源" prop="source" v-model="form.source" placeholder="请输入文章来源"/>
+            <Field
+              :span="20"
+              label="文章来源"
+              prop="source"
+              v-model="form.source"
+              placeholder="请输入文章来源"
+            />
 
-                    <Field label="发布时间" prop="publishTime" v-model="form.publishTime" type="date" />
+            <Field
+              label="发布时间"
+              prop="publishTime"
+              v-model="form.publishTime"
+              type="date"
+            />
 
-                    <Field :span="20" label="声明" prop="statement" v-model="form.statement" type="textarea" placeholder="请输入声明"/>
-
-                    </el-row>
-                </div>
-            </div>
-            <el-form-item class="footerbtns">
-                <el-button type="primary" @click='submitForm' icon='el-icon-circle-check-outline'>发布</el-button>
-                <el-button @click='()=>{open = false}' icon='el-icon-circle-close-outline'>取消</el-button>
-            </el-form-item>
-        </el-form>
-
-    </el-drawer>
+            <Field
+              :span="20"
+              label="声明"
+              prop="statement"
+              v-model="form.statement"
+              type="textarea"
+              placeholder="请输入声明"
+            />
+          </el-row>
+        </div>
+      </div>
+      <el-form-item class="footerbtns">
+        <el-button
+          type="primary"
+          @click="submitForm"
+          icon="el-icon-circle-check-outline"
+          >发布</el-button
+        >
+        <el-button
+          @click="
+            () => {
+              open = false;
+            }
+          "
+          icon="el-icon-circle-close-outline"
+          >取消</el-button
+        >
+      </el-form-item>
+    </el-form>
+  </el-drawer>
 </template>
 
 <script>
-    import form from "@/assets/mixins/formdialog";
-    export default {
-        name: "NewsDetail",
-        mixins: [form],
-        components: {
-
-        },
-        created() {
-            this.changePath("news")
-        },
-        data() {
-            return {
-                // 遮罩层
-                loading: true,
-                // 弹出层标题
-                title: "新闻",
-                // 是否显示弹出层
-                open: false,
-                direction:"rtl",
-                toString:[
-                    "top",
-                    "viewNums",
-                    "categoryId"
-                ],
-                toDate:[
-                    "publishTime",
-                ],
-                // 表单校验
-                rules: {
-                  categoryId: [
-                    {required: true,message: "请选择频道类型", trigger: "blur" },
-                  ],
-                    title: [
-                        {required: true,message: "请输入标题", trigger: "blur" },
-                        {max: 512,message: "最多只能录入512个字符",trigger: "blur",},
-                    ],
-                    titleLogoPath: [
-                        {required: true,message: "请输入标题logo", trigger: "blur" },
-                    ],
-                    publishTime: [
-                        {required: true,message: "请选择发布时间" },
-                    ]
-                }
-            };
-        },
-
-        methods: {
-            /** 编辑 */
-            edit(row) {
-                this.reset()
-                this.query = { id: row.id };
-                this.urls.currUrl ="news/edit";
-                this.getData();
-                this.pageInfo.type="edit"
-                this.title = "修改新闻";
-            },
-            /** 新增 */
-            add(row) {
-                this.reset()
-                this.urls.currUrl = "news/add";
-                this.getData();
-                this.pageInfo.type="add"
-                this.title = "新增新闻";
-            },
-            /** 查看*/
-            view(row) {
-                this.reset()
-                this.query = { id: row.id };
-                this.urls.currUrl ="news/view";
-                this.getData();
-                this.pageInfo.type="view"
-                this.title = "新闻详细";
-            },
-            /**取消按钮 */
-            cancel() {
-                this.open = false;
-            },
-            /**获取数据后弹框 */
-            afterRender(data) {
-                this.open = true;
-            },
+import form from "@/assets/mixins/formdialog";
+export default {
+  name: "NewsDetail",
+  mixins: [form],
+  components: {},
+  created() {
+    this.changePath("news");
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 弹出层标题
+      title: "新闻",
+      // 是否显示弹出层
+      open: false,
+      direction: "rtl",
+      toString: ["top", "viewNums", "categoryId"],
+      toDate: ["publishTime"],
+      // 表单校验
+      rules: {
+        categoryId: [
+          { required: true, message: "请选择频道类型", trigger: "blur" },
+        ],
+        title: [
+          { required: true, message: "请输入标题", trigger: "blur" },
+          { max: 512, message: "最多只能录入512个字符", trigger: "blur" },
+        ],
+        titleLogoPath: [
+          { required: true, message: "请输入标题logo", trigger: "blur" },
+        ],
+        publishTime: [{ required: true, message: "请选择发布时间" }],
+      },
+    };
+  },
 
-            afterSubmit(data) {
-                this.open = false;
-                this.$emit("ok");
-            },
+  methods: {
+    /** 编辑 */
+    edit(row) {
+      this.reset();
+      this.query = { id: row.id };
+      this.urls.currUrl = "news/edit";
+      this.getData();
+      this.pageInfo.type = "edit";
+      this.title = "修改新闻";
+    },
+    /** 新增 */
+    add(row) {
+      this.reset();
+      this.urls.currUrl = "news/add";
+      this.getData();
+      this.pageInfo.type = "add";
+      this.title = "新增新闻";
+    },
+    /** 查看*/
+    view(row) {
+      this.reset();
+      this.query = { id: row.id };
+      this.urls.currUrl = "news/view";
+      this.getData();
+      this.pageInfo.type = "view";
+      this.title = "新闻详细";
+    },
+    /**取消按钮 */
+    cancel() {
+      this.open = false;
+    },
+    /**获取数据后弹框 */
+    afterRender(data) {
+      this.open = true;
+    },
+    // 提交前数据处理
+    beforeSubmit(data) {
+      console.log(data, "123");
+      let arr = [];
+      arr = this.$refs.imgList.imgList.map((v) => {
+        return v.response ? v.response.url : v.url.substr(v.url.indexOf("f"));
+      });
+      data.titleLogoPath = arr.join(",");
+      return data;
+    },
+    afterSubmit(data) {
+      this.open = false;
+      this.$emit("ok");
+    },
 
-            // 表单重置
-            reset() {
-                this.form = {
-                    categoryId : null,
-                    categoryName : "",
-                    title : "",
-                    titleLogoPath : "",
-                    content : "",
-                    top : 0,
-                    viewNums : 0,
-                    publishTime : null,
-                };
-                this.resetForm("form");
-            },
-            resetForm(refName) {
-                if (this.$refs[refName]) {
-                    this.$refs[refName].resetFields();
-                }
-            },
-        },
-    };
+    // 表单重置
+    reset() {
+      this.form = {
+        categoryId: null,
+        categoryName: "",
+        title: "",
+        titleLogoPath: "",
+        content: "",
+        top: 0,
+        viewNums: 0,
+        publishTime: null,
+      };
+      this.resetForm("form");
+    },
+    resetForm(refName) {
+      if (this.$refs[refName]) {
+        this.$refs[refName].resetFields();
+      }
+    },
+  },
+};
 </script>
 <style lang="less" scoped>
-.footerbtns{
-    margin-top: 20px;
-    padding-top: 20px;
-    border-top: 1px solid gainsboro;
-    display: flex;
-    justify-content: center;
-    align-content: center;
+.footerbtns {
+  margin-top: 20px;
+  padding-top: 20px;
+  border-top: 1px solid gainsboro;
+  display: flex;
+  justify-content: center;
+  align-content: center;
 }
-.form{
-    display: flex;
-    width: 100%;
-    .formleft{
-        flex:1;
-        width: 60%;
-        height: calc(100vh - 200px);
-        overflow: auto;
-    }
-    .formright{
-        width: 40%;
-        flex-shrink: 0;
-        flex-grow: 0;
-    }
+.form {
+  display: flex;
+  width: 100%;
+  .formleft {
+    flex: 1;
+    width: 60%;
+    height: calc(100vh - 200px);
+    overflow: auto;
+  }
+  .formright {
+    width: 40%;
+    flex-shrink: 0;
+    flex-grow: 0;
+  }
 }
 </style>
\ No newline at end of file

enterprise-manager-ui/admin/src/views/news/list.vue

 <template>
-    <div class="page">
-        <LayoutTable :data="tableData" :config="tableConfig" notDel>
-                    </LayoutTable>
-
-
-        <drawer-show ref="drawerform" @ok="getData" />
-        <drawer-view ref="drawerview" @handletop="handleTop" @del="toDel"/>
-    </div>
+  <div class="page">
+    <LayoutTable :data="tableData" :config="tableConfig" notDel> </LayoutTable>
+
+    <drawer-show ref="drawerform" @ok="getData" />
+    <share-drawershow
+      ref="shareDrawershow"
+      :drawerTableData="drawerTableData"
+    />
+    <drawer-view ref="drawerview" @handletop="handleTop" @del="toDel" />
+  </div>
 </template>
 
 <script>
-    /** 表单弹出框模式需引入 */
-    import drawerShow from "./drawershow";
-    import drawerView from "./drawerview";
-    import table from "@/assets/mixins/table";
-    export default {
-        name: "NewsList",
-        components: {
-            drawerShow,
-            drawerView
-},
-        mixins: [table],
-        created() {
-        },
-        methods: {
-            /** 重写新增方法 */
-            toAdd(row) {
-                this.$refs.drawerform.add(row);
-            },
-            /** 重写编辑方法 */
-            toEdit(row) {
-                this.$refs.drawerform.edit(row);
-            },
-            /** 重写查看方法 */
-            toView(row,isopen) {
-                // this.$refs.drawerform.view(row);
-                // 这里查看不再和编辑共用界面，多写一个抽屉，但调用view方法接口
-                // this.$refs.drawerform.reset()
-                this.$refs.drawerform.query = { id: row.id };
-                this.$refs.drawerform.urls.currUrl ="news/view";
-
-                this.$refs.drawerform.$get('news/view', this.$refs.drawerform.query)
-                .then(({ data }) => {
-                  if(!isopen){
-                    this.$refs.drawerview.open = true
-                  }
-                  this.$refs.drawerview.form = data.entity
-                })
-                .catch(error => {
-                  this.$refs.drawerview.form = {}
-                  this.$message.error(error.message)
-                  throw error
-                })
-
-            },
+/** 表单弹出框模式需引入 */
+import drawerShow from "./drawershow";
+import drawerView from "./drawerview";
+import table from "@/assets/mixins/table";
+import ShareDrawershow from "./shareDrawershow.vue";
+export default {
+  name: "NewsList",
+  components: {
+    drawerShow,
+    drawerView,
+    ShareDrawershow,
+  },
+  mixins: [table],
+  created() {},
+  methods: {
+    /** 重写新增方法 */
+    toAdd(row) {
+      this.$refs.drawerform.add(row);
+    },
+    /** 重写编辑方法 */
+    toEdit(row) {
+      this.$refs.drawerform.edit(row);
+    },
+    /** 重写查看方法 */
+    toView(row, isopen) {
+      // this.$refs.drawerform.view(row);
+      // 这里查看不再和编辑共用界面，多写一个抽屉，但调用view方法接口
+      // this.$refs.drawerform.reset()
+      this.$refs.drawerform.query = { id: row.id };
+      this.$refs.drawerform.urls.currUrl = "news/view";
+
+      this.$refs.drawerform
+        .$get("news/view", this.$refs.drawerform.query)
+        .then(({ data }) => {
+          if (!isopen) {
+            this.$refs.drawerview.open = true;
+          }
+          this.$refs.drawerview.form = data.entity;
+        })
+        .catch((error) => {
+          this.$refs.drawerview.form = {};
+          this.$message.error(error.message);
+          throw error;
+        });
+    },
+
+    handleTop(row, top) {
+      this.$post("/news/save", { id: row.id, top: top })
+        .then((res) => {
+          if (res.code == 1) {
+            if (top == 0) {
+              this.$message.success("取消置顶成功！");
+            } else {
+              this.$message.success("置顶成功！");
+            }
+            this.toView({ id: row.id }, true);
+            this.getData();
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
+        });
+    },
+
+    handleViews(row) {
+      //查询详细
+      this.$post("/news/record/list", { newsId: row.id })
+        .then((res) => {
+          if (res.code == 1) {
+            console.log("views-data", res);
+            // this.getData();
+            this.drawerTableData = res.data;
+            this.drawerTableData.row = row;
+            this.drawerTableData.title = "浏览";
+            this.$refs.shareDrawershow.open = true;
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
+        });
+    },
+
+    handleShares(row) {
+      //分享详细
+      this.$post("/news/share/list", { newsId: row.id })
+        .then((res) => {
+          if (res.code == 1) {
+            this.drawerTableData = res.data;
+            this.drawerTableData.row = row;
+            this.drawerTableData.title = "分享";
+            this.$refs.shareDrawershow.open = true;
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
+        });
+    },
+  },
+  data() {
+    return {
+      drawerTableData: [],
+      config: {
+        search: [
+          {
+            name: "categoryId",
+            type: "select",
+            placeholder: "请选择新闻类型",
+            label: "新闻类型",
+          },
+          {
+            name: "title",
+            type: "text",
+            label: "新闻标题",
+            fuzzy: true,
+          },
+        ],
+        columns: [
+          // {type: "selection", width: 60},
+          { type: "index", label: "序号", width: 50 },
 
-          handleTop(row,top) {
+          { label: "新闻标题", prop: "title" },
 
-              this.$post("/news/save",{id:row.id,top:top}).then((res) => {
-                if (res.code == 1) {
-                  if(top==0){
-                    this.$message.success("取消置顶成功！");
-                  }else{
-                    this.$message.success("置顶成功！");
-                  }
-                  this.toView({id:row.id},true)
-                  this.getData();
-                }
-              })
-                  .catch((error) => {
-                    this.$message.error(error.message);
-                  });
+          { label: "新闻类型", prop: "categoryId", formatter: this.formatter },
 
+          {
+            label: "创建时间",
+            prop: "createDateTime",
+            formatter: this.formatterDate,
           },
 
-          handleViews(row) {
-            //查询详细
-            this.$post("/news/record/list",{newsId:row.id}).then((res) => {
-              if (res.code == 1) {
-                console.log("views-data",res)
-                this.getData();
-              }
-            }).catch((error) => {
-                  this.$message.error(error.message);
-                });
-
+          {
+            label: "数据",
+            formatter: (row) => {
+              let bool = false;
+              return (
+                <div>
+                  <el-link
+                    underline={bool}
+                    onClick={() => {
+                      this.handleViews(row);
+                    }}
+                    type="primary"
+                  >
+                    浏览({row.viewNums})
+                  </el-link>
+                  <br />
+
+                  <el-link
+                    underline={bool}
+                    onClick={() => {
+                      this.handleShares(row);
+                    }}
+                    type="primary"
+                  >
+                    分享({row.shareNums})
+                  </el-link>
+                </div>
+              );
+            },
           },
 
-
-          handleShares(row) {
-            //分享详细
-            this.$post("/news/share/list",{newsId:row.id}).then((res) => {
-              if (res.code == 1) {
-                console.log("shares-data",res)
-                this.getData();
-              }
-            }).catch((error) => {
-                  this.$message.error(error.message);
-                });
+          {
+            label: "创建用户",
+            prop: "createUserId",
+            formatter: this.formatter,
           },
-        },
-        data() {
-            return {
-                config: {
-                    search: [
-                        {
-                            name: "categoryId",
-                            type: "select",
-                            placeholder:"请选择新闻类型",
-                            label: "新闻类型"
-                        },
-                        {
-                            name: "title",
-                            type: "text",
-                            label: "新闻标题",
-                            fuzzy: true,
-                        },
-                    ],
-                    columns: [
-                        // {type: "selection", width: 60},
-                        {type: "index",label: "序号",width: 50},
-
-                      {label: "新闻标题", prop: "title"},
-
-                        {label: "新闻类型", prop: "categoryId",formatter: this.formatter},
-
-                      {label: "创建时间", prop: "createDateTime", formatter: this.formatterDate},
-
-                        {label: "数据",formatter:  row => {
-                          let bool=false;
-                            return (
-                                <div>
-                                  <el-link underline={bool} onClick={() => {
-                                    this.handleViews(row);
-                                  }}  type="primary">浏览({row.viewNums})</el-link><br/>
-
-                                  <el-link underline={bool} onClick={() => {
-                                    this.handleShares(row);
-                                  }}  type="primary">分享({row.shareNums})</el-link>
-                                </div>
-                            );}},
-
-
-                        {label: "创建用户", prop: "createUserId", formatter: this.formatter},
-                        {
-                            label: "操作",
-                            width: 240,
-                            formatter: row => {
-                                return (
-                                    <div>
-
-                                      {row.top === 0 ? (
-                                          <el-button
-                                              size="mini"
-                                              type="text"
-                                              icon="el-icon-open"
-                                              onClick={() => {
-                                                this.handleTop(row,1);
-                                              }}
-                                          >
-                                            置顶
-                                          </el-button>
-                                      ) : (
-                                          <el-button
-                                              size="mini"
-                                              type="text"
-                                              icon="el-icon-open"
-                                              onClick={() => {
-                                                this.handleTop(row,0);
-                                              }}
-                                          >
-                                            取消置顶
-                                          </el-button>
-                                      )}
-                                      <span> </span>
-                                      <table-buttons
-                                          noAdd
-                                          row={row}
-                                          onEdit={this.toEdit}
-                                          onView={this.toView}
-                                          onDel={this.toDel}
-                                      />
-
-                                    </div>
-                            );
-                            }
-                        }
-                    ]
-                }
-            };
-        }
+          {
+            label: "操作",
+            width: 240,
+            formatter: (row) => {
+              return (
+                <div>
+                  {row.top === 0 ? (
+                    <el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-open"
+                      onClick={() => {
+                        this.handleTop(row, 1);
+                      }}
+                    >
+                      置顶
+                    </el-button>
+                  ) : (
+                    <el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-open"
+                      onClick={() => {
+                        this.handleTop(row, 0);
+                      }}
+                    >
+                      取消置顶
+                    </el-button>
+                  )}
+                  <span> </span>
+                  <table-buttons
+                    noAdd
+                    row={row}
+                    onEdit={this.toEdit}
+                    onView={this.toView}
+                    onDel={this.toDel}
+                  />
+                </div>
+              );
+            },
+          },
+        ],
+      },
     };
+  },
+};
 </script>

enterprise-manager-ui/admin/src/views/news/shareDrawershow.vue

+<template>
+  <!-- 弹出框表单 -->
+  <el-drawer
+    :visible.sync="open"
+    :direction="direction"
+    :destroy-on-close="true"
+    size="40%"
+  >
+    <div slot="title" class="title">
+      <h4
+        :class="activeTitle == 0 ? 'title_text active' : 'title_text'"
+        @click="handleTitle(0)"
+      >
+        浏览（{{ drawerTableData.row ? drawerTableData.row.viewNums : 0 }}）
+      </h4>
+      <h4
+        :class="activeTitle == 1 ? 'title_text active' : 'title_text'"
+        @click="handleTitle(1)"
+      >
+        分享（{{ drawerTableData.row ? drawerTableData.row.shareNums : 0 }}）
+      </h4>
+    </div>
+    <div class="form">
+      <el-table :data="tableData.data" border style="width: 100%">
+        <el-table-column type="index" width="50" label="序号">
+        </el-table-column>
+        <el-table-column prop="viewName" label="浏览人员"> </el-table-column>
+        <el-table-column prop="sumViews" label="浏览次数"> </el-table-column>
+        <el-table-column prop="viewTime" label="最近浏览时间">
+          <template slot-scope="scope">
+            <span>{{ timeFix(scope.row.viewTime) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          @current-change="handleCurrentChange"
+          :current-page.sync="tableData.current_page"
+          :page-size="10"
+          layout="total, prev, pager, next"
+          :total="tableData.total"
+        >
+        </el-pagination>
+      </div>
+    </div>
+  </el-drawer>
+</template>
+
+<script>
+import form from "@/assets/mixins/formdialog";
+import { timestampToTime } from "@/assets/utils/dateFormat.js";
+export default {
+  name: "NewsDetail",
+  props: {
+    drawerTableData: {
+      type: Object,
+      default: {},
+    },
+  },
+  mixins: [form],
+  components: {},
+  computed: {
+    timeFix(val) {
+      console.log(val);
+      return (val) => {
+        let time = timestampToTime(val, 6);
+        return time;
+      };
+    },
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: false,
+      // 弹出层标题
+      title: "新闻",
+      // 是否显示弹出层
+      open: false,
+      tableData: [],
+      activeTitle: 0,
+    };
+  },
+
+  methods: {
+    // 标题切换操作
+    handleTitle(i) {
+      this.activeTitle = i;
+      this.activeTitle == 0 ? this.handleView() : this.handleShare();
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.activeTitle == 0 ? this.handleView(val) : this.handleShare(val);
+    },
+    //查询详细
+    handleView(val = 1) {
+      this.$post("/news/record/list", {
+        newsId: this.drawerTableData.row.id,
+        page: val,
+      })
+        .then((res) => {
+          if (res.code == 1) {
+            this.tableData = res.data;
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
+        });
+    },
+    //分享详细
+    handleShare(val = 1) {
+      this.$post("/news/share/list", {
+        newsId: this.drawerTableData.row.id,
+        page: val,
+      })
+        .then((res) => {
+          if (res.code == 1) {
+            console.log("shares-data", res);
+            this.tableData = res.data;
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
+        });
+    },
+    /** 编辑 */
+    edit(row) {
+      this.reset();
+      this.query = { id: row.id };
+      this.urls.currUrl = "news/edit";
+      this.getData();
+      this.pageInfo.type = "edit";
+      this.title = "修改新闻";
+    },
+    /** 新增 */
+    add(row) {
+      this.reset();
+      this.urls.currUrl = "news/add";
+      this.getData();
+      this.pageInfo.type = "add";
+      this.title = "新增新闻";
+    },
+    /** 查看*/
+    view(row) {
+      this.reset();
+      this.query = { id: row.id };
+      this.urls.currUrl = "news/view";
+      this.getData();
+      this.pageInfo.type = "view";
+      this.title = "新闻详细";
+    },
+    /**取消按钮 */
+    cancel() {
+      this.open = false;
+    },
+    /**获取数据后弹框 */
+    afterRender(data) {
+      this.open = true;
+    },
+  },
+  watch: {
+    open: {
+      handler(val) {
+        if (val) {
+          this.tableData = this.drawerTableData;
+          console.log(this.drawerTableData);
+          this.drawerTableData.title == "浏览"
+            ? (this.activeTitle = 0)
+            : (this.activeTitle = 1);
+        }
+      },
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.footerbtns {
+  margin-top: 20px;
+  padding-top: 20px;
+  border-top: 1px solid gainsboro;
+  display: flex;
+  justify-content: center;
+  align-content: center;
+}
+.form {
+  width: 100%;
+  padding: 20px;
+}
+.title {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  .title_text {
+    width: 20%;
+    color: #333;
+    opacity: 0.5;
+    cursor: pointer;
+  }
+  .active {
+    opacity: 1;
+    color: #333;
+  }
+}
+.block {
+  width: 100%;
+  text-align: end;
+}
+</style>
\ No newline at end of file

enterprise-manager-ui/admin/src/views/product/drawershow.vue

 <template>
-    <!-- 弹出框表单 -->
-    <el-drawer
-            :title="title"
-            :visible.sync="open"
-            :direction="direction"
-            :destroy-on-close="true"
-            size="90%">
-        <el-form ref="form" :model="form" :rules="rules" label-width="120px" >
-            <div class="form">
-                <div class="formleft">
-                    <el-row>
-                    <Field label="产品名称" prop="productName" v-model="form.productName" placeholder="请输入产品名称，名称唯一"/>
-                    </el-row>
-                    <el-row>
-                    <Field label="产品slogan" prop="productSlogan" v-model="form.productSlogan" placeholder="请输入产品slogan"/>
-                    </el-row>
-                    <el-row>
-                    <Field label="产品分类" prop="categoryId" v-model="form.categoryId" :multiple="true" type="select" :enumData="dict.categoryId" placeholder="请选择产品分类"/>
-                    <Field label="所属企业" prop="companyId" v-model="form.companyId" :multiple="true" type="select" :enumData="dict.companyId" placeholder="请选择所属企业"/>
+  <!-- 弹出框表单 -->
+  <el-drawer
+    :title="title"
+    :visible.sync="open"
+    :direction="direction"
+    :destroy-on-close="true"
+    size="90%"
+  >
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <div class="form">
+        <div class="formleft">
+          <el-row>
+            <Field
+              label="产品名称"
+              prop="productName"
+              v-model="form.productName"
+              placeholder="请输入产品名称，名称唯一"
+            />
+          </el-row>
+          <el-row>
+            <Field label="产品slogan">
+              <el-tag
+                :key="tag"
+                v-for="tag in dynamicTags"
+                closable
+                :disable-transitions="false"
+                @close="handleClose(tag)"
+              >
+                {{ tag }}
+              </el-tag>
+              <el-input
+                class="input-new-tag"
+                v-if="inputVisible"
+                v-model="inputValue"
+                ref="saveTagInput"
+                size="small"
+                @keyup.enter.native="handleInputConfirm"
+                @blur="handleInputConfirm"
+              >
+              </el-input>
+              <el-button
+                v-else
+                class="button-new-tag"
+                size="small"
+                @click="showInput"
+                >+ 新增 slogan</el-button
+              >
+            </Field>
+            <!-- <Field
+              label="产品slogan"
+              prop="productSlogan"
+              v-model="form.productSlogan"
+              placeholder="请输入产品slogan"
+            /> -->
+          </el-row>
+          <el-row>
+            <Field
+              label="产品分类"
+              prop="categoryId"
+              v-model="form.categoryId"
+              :multiple="false"
+              type="select"
+              :enumData="dict.categoryId"
+              placeholder="请选择产品分类"
+            />
+            <Field
+              label="所属企业"
+              prop="companyId"
+              v-model="form.companyId"
+              :multiple="true"
+              type="select"
+              :enumData="dict.companyId"
+              placeholder="请选择所属企业"
+            />
 
+            <!-- <Field label="产品图标"><imageUpload v-model="form.productLogoPath" prePath="/file/preview"/></Field> -->
+          </el-row>
+          <el-row>
+            <Field label="产品封面图片" prop="productFacePath"
+              ><imageUpload
+                v-model="form.productFacePath"
+                prePath="/file/preview"
+              />
+            </Field>
+          </el-row>
+          <!-- <el-row>
+            <Field
+              label="宣传形式"
+              type="checkbox"
+              :enumData="dict.propagandaList"
+              v-model="form.nowPropaganda"
+              @change="changeNowprop"
+            ></Field>
+          </el-row> -->
+          <el-row>
+            <Field label="轮播图">
+              <imageUpload
+                v-model="form.productPicPath"
+                prePath="/file/preview"
+                :isList="true"
+                ref="imgList"
+              />
+            </Field>
+          </el-row>
+          <el-row>
+            <Field label="短视频"
+              ><fileUpload
+                v-model="form.productVideoPath"
+                :fileType="['mp4', 'avi']"
+                prePath="/file/fileupload"
+            /></Field>
+          </el-row>
+          <el-row>
+            <Field
+              label="产品简介"
+              prop="productIntroduction"
+              v-model="form.productIntroduction"
+              type="textarea"
+              placeholder="请输入产品简介"
+            />
+            <!-- <Field label="发布时间" prop="publishTime" v-model="form.publishTime" type="date" /> -->
+          </el-row>
+          <el-row>
+            <Field
+              label="是否热门"
+              prop="hot"
+              v-model="form.hot"
+              type="radio"
+              :enumData="dict.hot"
+              placeholder="请选择是否热门"
+            />
+            <!-- <Field label="备注" prop="productRemark" v-model="form.productRemark" type="textarea" placeholder="请输入备注"/> -->
+          </el-row>
+        </div>
 
-                    <!-- <Field label="产品图标"><imageUpload v-model="form.productLogoPath" prePath="/file/preview"/></Field> -->
-                    </el-row>
-                    <el-row>
-                    <Field label="产品封面图片" prop="productFacePath" ><imageUpload v-model="form.productFacePath" prePath="/file/preview"/> </Field>
-                    </el-row>
-                    <el-row>
-                    <Field label="宣传形式" type="radio" :enumData="propagandaList" v-model="nowPropaganda" :field="nowPropaganda" @emit="changeNowprop"></Field>
-                    </el-row>
-                    <el-row>
-                    <Field label="轮播图" v-if="nowPropaganda==0"><imageUpload v-model="form.productPicPath" prePath="/file/preview"/></Field>
-                    </el-row>
-                    <el-row>
-                    <Field label="短视频" v-if="nowPropaganda==1"><fileUpload v-model="form.productVideoPath" :fileType="[ 'mp4', 'avi']" prePath="/file/fileupload"/></Field>
-                    </el-row>
-                    <el-row>
-                    <Field label="产品简介" prop="productIntroduction" v-model="form.productIntroduction" type="textarea" placeholder="请输入产品简介"/>
-                    <!-- <Field label="发布时间" prop="publishTime" v-model="form.publishTime" type="date" /> -->
-                    </el-row>
-                    <el-row>
-                    <Field label="是否热门" prop="hot" v-model="form.hot" type="radio" :enumData="dict.hot" placeholder="请选择是否热门"/>
-                    <!-- <Field label="备注" prop="productRemark" v-model="form.productRemark" type="textarea" placeholder="请输入备注"/> -->
-                    </el-row>
-                </div>
-                
-                <div class="formright">
-                    <div class="tabs">
-                        <div class="tab" :class="nowtab==1?'activetab':''" @click="changeTab(1)">产品详情</div>
-                        <div class="tab" :class="nowtab==2?'activetab':''" @click="changeTab(2)">常见问题</div>
-                    </div>
-                    <div class="content" v-show="nowtab==1">
-                        <editor v-model="form.productDetail" :min-height="100"/>
-                    </div>
-                    <div class="content" v-show="nowtab==2">
-                        <el-table :data="productQuestionList" :row-class-name="rowProductQuestionIndex" @selection-change="handleProductQuestionSelectionChange" ref="productQuestion">
-                            <el-table-column label="序号" align="center" prop="index" width="50"/>
-                            <el-table-column label="问题" prop="question">
-                                <template slot-scope="scope">
-                                    <el-input v-model="scope.row.question" placeholder="请输入问题" />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="常见问题回答" prop="answer">
-                                <template slot-scope="scope">
-                                    <el-input v-model="scope.row.answer" placeholder="请输入常见问题回答" />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="操作" width="240" align="center">
-                                <template slot-scope="scope">
-                                <Confirm @confirm="handleDeleteCompanyPatents(scope.row)" message="确定要删除该条知识产权吗？">
-                                    <div class="del">删除</div>
-                                </Confirm>
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                        
-                        <el-row style="margin:10px 0;display: flex;justify-content: center;" :gutter="10" class="mb8">
-                            <el-col :span="1.5">
-                                <el-button type="primary" icon="el-icon-plus" @click="handleAddProductQuestion">新增常见问题</el-button>
-                            </el-col>
-                        </el-row>
-
-                    </div>
-                </div>
+        <div class="formright">
+          <div class="tabs">
+            <div
+              class="tab"
+              :class="nowtab == 1 ? 'activetab' : ''"
+              @click="changeTab(1)"
+            >
+              产品详情
+            </div>
+            <div
+              class="tab"
+              :class="nowtab == 2 ? 'activetab' : ''"
+              @click="changeTab(2)"
+            >
+              常见问题
             </div>
-            
-            
-                <!-- 保存按钮 -->
-            <form-buttons @submit='onSubmitForm' @cancel='cancelForm' v-if="pageInfo.type!='view'" class="formbtns" />
-        </el-form>
+          </div>
+          <div class="content" v-show="nowtab == 1">
+            <editor v-model="form.productDetail" :min-height="100" />
+          </div>
+          <div class="content" v-show="nowtab == 2">
+            <el-table
+              :data="productQuestionList"
+              :row-class-name="rowProductQuestionIndex"
+              @selection-change="handleProductQuestionSelectionChange"
+              ref="productQuestion"
+            >
+              <el-table-column
+                label="序号"
+                align="center"
+                prop="index"
+                width="50"
+              />
+              <el-table-column label="问题" prop="question">
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="scope.row.question"
+                    placeholder="请输入问题"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column label="常见问题回答" prop="answer">
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="scope.row.answer"
+                    placeholder="请输入常见问题回答"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" width="240" align="center">
+                <template slot-scope="scope">
+                  <Confirm
+                    @confirm="handleDeleteCompanyPatents(scope.row)"
+                    message="确定要删除该条知识产权吗？"
+                  >
+                    <div class="del">删除</div>
+                  </Confirm>
+                </template>
+              </el-table-column>
+            </el-table>
+
+            <el-row
+              style="margin: 10px 0; display: flex; justify-content: center"
+              :gutter="10"
+              class="mb8"
+            >
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-plus"
+                  @click="handleAddProductQuestion"
+                  >新增常见问题</el-button
+                >
+              </el-col>
+            </el-row>
+          </div>
+        </div>
+      </div>
 
-    </el-drawer>
+      <!-- 保存按钮 -->
+      <form-buttons
+        @submit="onSubmitForm"
+        @cancel="cancelForm"
+        v-if="pageInfo.type != 'view'"
+        class="formbtns"
+      />
+    </el-form>
+  </el-drawer>
 </template>
 
 <script>
-    import form from "@/assets/mixins/formdialog";
-    export default {
-        name: "ProductDetail",
-        mixins: [form],
-        components: {
-
-        },
-        created() {
-            this.changePath("product")
-        },
-        data() {
-            return {
-                propagandaList:['轮播图','短视频'],
-                // 当前宣传形式
-                nowPropaganda:0,
-                nowtab:1,
-                // 子表选中数据
-                checkedProductQuestion: [],
-                // 产品常见问题表格数据
-                productQuestionList: [],
-                // 遮罩层
-                loading: true,
-                // 弹出层标题
-                title: "产品",
-                // 是否显示弹出层
-                open: false,
-                direction:"rtl",
-                toString:[
-                    "hot",
-                ],
-              toArrays:[
-                "companyId",
-                "categoryId"
-              ],
-                toDate:[
-                    "publishTime",
-                ],
-                // 表单校验
-                rules: {
-                    productName: [
-                        {required: true,message: "请输入产品名称，名称唯一", trigger: "blur" },
-                        {max: 20,message: "最多只能录入20个字符",trigger: "blur",},
-                    ],
-                    productSlogan: [
-                        {required: true,message: "请输入产品slogan", trigger: "blur" },
-                        {max: 64,message: "最多只能录入64个字符",trigger: "blur",},
-                    ],
-                    productLogoPath: [
-                        {required: true,message: "请输入产品图标", trigger: "blur" },
-                        {max: 64,message: "最多只能录入64个字符",trigger: "blur",},
-                    ],
-                    productFacePath: [
-                        {required: true,message: "请输入产品封面图片", trigger: "blur" },
-                        {max: 64,message: "最多只能录入64个字符",trigger: "blur",},
-                    ],
-                    publishTime: [
-                        {required: true,message: "请选择发布时间" },
-                    ],
-                    createTime: [
-                        {required: true,message: "请选择创建时间" },
-                    ],
-                }
-            };
-        },
-
-        methods: {
-            // 重写提交表单
-            onSubmitForm(){
-                // 由于宣传形式修改，只能存在一种，所以当选中一种时另外一种清空
-                
-                if(this.nowPropaganda===0){
-                    // 选中轮播图
-                    this.form.productVideoPath = ''
-                }else{
-                    // 选中短视频
-                    this.form.productPicPath = ''
-                }
-                // 检查常见问题list中问题不能为空
-                if(this.productQuestionList && this.productQuestionList.length>0){
-                    let isNull = false
-                    this.productQuestionList.forEach((item)=>{
-                    if (!item.question) {
-                        isNull = true
-                    }
-                    })
-                    if(isNull){
-                    this.$confirm('常见问题项的问题标题不能为空', '提示', {
-                        confirmButtonText: '确定',
-                        type: 'warning',
-                        showCancelButton: false, //是否显示取消按钮
-                        showClose: false, //是否显示关闭按钮
-                    })
-                    return;
-                    }
-                }
-                this.submitForm()
-            },
-            // 修改宣传形式
-            changeNowprop(val){
-                this.nowPropaganda = val
-            },
-            // 问题删除
-            handleDeleteCompanyPatents(row) {
-                console.log(row);
-                // 由于有一些知识产权还没有id，所以这里删除选用的是字段中带的index
-                this.productQuestionList = this.productQuestionList.filter(
-                    item => item.index !== row.index
-                );
-                this.form.productQuestionList = this.productQuestionList;
-            },
-            cancelForm(){
-                this.open = false
-            },
-            changeTab(nowtab){
-                this.nowtab = nowtab
-                this.$forceUpdate()
-            },
-            /** 产品常见问题序号 */
-            rowProductQuestionIndex({ row, rowIndex }) {
-                row.index = rowIndex + 1;
-            },
-            /** 产品常见问题添加按钮操作 */
-            handleAddProductQuestion() {
-                let obj = {};
-                obj.productName = "";
-                obj.question = "";
-                obj.answer = "";
-                obj.createTime = "";
-                obj.createUserId = "";
-                obj.updateTime = "";
-                this.productQuestionList.push(obj);
-            },
-            /** 产品常见问题删除按钮操作 */
-            handleDeleteProductQuestion() {
-                if (this.checkedProductQuestion.length == 0) {
-                    this.$alert("请先选择要删除的产品常见问题数据", "提示", { confirmButtonText: "确定", });
-                } else {
-                    this.productQuestionList.splice(this.checkedProductQuestion[0].index - 1, 1);
-                }
-            },
-            /** 单选框选中数据 */
-            handleProductQuestionSelectionChange(selection) {
-                if (selection.length > 1) {
-                    this.$refs.productQuestion.clearSelection();
-                    this.$refs.productQuestion.toggleRowSelection(selection.pop());
-                } else {
-                    this.checkedProductQuestion = selection;
-                }
-            },
-            // 渲染前置处理
-            beforeRender(data) {
-                if(data.entity.productQuestionList) {
-                    this.productQuestionList = data.entity.productQuestionList;
-                }
-                // 判断有无短视频，如果有短视频那么更改为短视频选项
-                if(data.entity.productVideoPath){
-                    this.nowPropaganda = 1
-                }else{
-                    this.nowPropaganda = 0
-                }
-                return data
-            },
-            /** 编辑 */
-            edit(row) {
-                this.reset()
-                this.query = { id: row.id };
-                this.urls.currUrl ="product/edit";
-                this.getData();
-                this.pageInfo.type="edit"
-                this.title = "修改产品";
-            },
-            /** 新增 */
-            add(row) {
-                this.reset()
-                this.urls.currUrl = "product/add";
-                this.getData();
-                this.pageInfo.type="add"
-                this.title = "新增产品";
-            },
-            /** 查看*/
-            view(row) {
-                this.reset()
-                this.query = { id: row.id };
-                this.urls.currUrl ="product/view";
-                this.getData();
-                this.pageInfo.type="view"
-                this.title = "产品详细";
-            },
-            /**取消按钮 */
-            cancel() {
-                this.open = false;
-            },
-            /**获取数据后弹框 */
-            afterRender(data) {
-                this.open = true;
-            },
-
-          beforeSubmit(data) {
-
-              data.categoryId=data.categoryId.join(",")
-              data.companyId=data.companyId.join(",")
-
-            return data
+import form from "@/assets/mixins/formdialog";
+export default {
+  name: "ProductDetail",
+  mixins: [form],
+  components: {},
+  created() {
+    this.changePath("product");
+  },
+  data() {
+    return {
+      dynamicTags: [],
+      inputVisible: false,
+      inputValue: "",
+      propagandaList: { 1: "轮播图", 2: "短视频" },
+      // 当前宣传形式
+      nowPropaganda: [],
+      nowtab: 1,
+      // 子表选中数据
+      checkedProductQuestion: [],
+      // 产品常见问题表格数据
+      productQuestionList: [],
+      // 遮罩层
+      loading: true,
+      // 弹出层标题
+      title: "产品",
+      // 是否显示弹出层
+      open: false,
+      direction: "rtl",
+      toString: ["hot"],
+      toArrays: ["companyId"],
+      toDate: ["publishTime"],
+      // 表单校验
+      rules: {
+        productName: [
+          {
+            required: true,
+            message: "请输入产品名称，名称唯一",
+            trigger: "blur",
           },
+          { max: 20, message: "最多只能录入20个字符", trigger: "blur" },
+        ],
+        productSlogan: [
+          { required: true, message: "请输入产品slogan", trigger: "blur" },
+          { max: 64, message: "最多只能录入64个字符", trigger: "blur" },
+        ],
+        productLogoPath: [
+          { required: true, message: "请输入产品图标", trigger: "blur" },
+          { max: 64, message: "最多只能录入64个字符", trigger: "blur" },
+        ],
+        productFacePath: [
+          { required: true, message: "请输入产品封面图片", trigger: "blur" },
+          { max: 64, message: "最多只能录入64个字符", trigger: "blur" },
+        ],
+        publishTime: [{ required: true, message: "请选择发布时间" }],
+        createTime: [{ required: true, message: "请选择创建时间" }],
+      },
+    };
+  },
 
+  methods: {
+    // 删除slogan标签
+    handleClose(tag) {
+      this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
+    },
+    // 展示标签输入框
+    showInput() {
+      this.inputVisible = true;
+      this.$nextTick((_) => {
+        this.$refs.saveTagInput.$refs.input.focus();
+      });
+    },
+    // 确认标签输入框内容
+    handleInputConfirm() {
+      let inputValue = this.inputValue;
+      if (inputValue) {
+        this.dynamicTags.push(inputValue);
+      }
+      this.inputVisible = false;
+      this.inputValue = "";
+    },
+    // 重写提交表单
+    onSubmitForm() {
+      console.log(this.form);
+      console.log(this.$refs.imgList.imgList);
+      let arr = [];
+      arr = this.$refs.imgList.imgList.map((v) => {
+        return v.response ? v.response.url : v.url.substr(v.url.indexOf("f"));
+      });
+      this.form.productPicPath = arr.join(",");
+      // // 由于宣传形式修改，只能存在一种，所以当选中一种时另外一种清空
+      // if (this.nowPropaganda === 0) {
+      //   // 选中轮播图
+      //   this.form.productVideoPath = "";
+      // } else {
+      //   // 选中短视频
+      //   this.form.productPicPath = "";
+      // }
+      // 检查常见问题list中问题不能为空
+      if (this.productQuestionList && this.productQuestionList.length > 0) {
+        let isNull = false;
+        this.productQuestionList.forEach((item) => {
+          if (!item.question) {
+            isNull = true;
+          }
+        });
+        if (isNull) {
+          this.$confirm("常见问题项的问题标题不能为空", "提示", {
+            confirmButtonText: "确定",
+            type: "warning",
+            showCancelButton: false, //是否显示取消按钮
+            showClose: false, //是否显示关闭按钮
+          });
+          return;
+        }
+      }
+      this.submitForm();
+    },
+    // 修改宣传形式
+    changeNowprop(val) {
+      this.form.nowPropaganda = val;
+      this.$forceUpdate(this.form);
+    },
+    // 问题删除
+    handleDeleteCompanyPatents(row) {
+      console.log(row);
+      // 由于有一些知识产权还没有id，所以这里删除选用的是字段中带的index
+      this.productQuestionList = this.productQuestionList.filter(
+        (item) => item.index !== row.index
+      );
+      this.form.productQuestionList = this.productQuestionList;
+    },
+    cancelForm() {
+      this.open = false;
+    },
+    changeTab(nowtab) {
+      this.nowtab = nowtab;
+      this.$forceUpdate();
+    },
+    /** 产品常见问题序号 */
+    rowProductQuestionIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    /** 产品常见问题添加按钮操作 */
+    handleAddProductQuestion() {
+      let obj = {};
+      obj.productName = "";
+      obj.question = "";
+      obj.answer = "";
+      obj.createTime = "";
+      obj.createUserId = "";
+      obj.updateTime = "";
+      this.productQuestionList.push(obj);
+    },
+    /** 产品常见问题删除按钮操作 */
+    handleDeleteProductQuestion() {
+      if (this.checkedProductQuestion.length == 0) {
+        this.$alert("请先选择要删除的产品常见问题数据", "提示", {
+          confirmButtonText: "确定",
+        });
+      } else {
+        this.productQuestionList.splice(
+          this.checkedProductQuestion[0].index - 1,
+          1
+        );
+      }
+    },
+    /** 单选框选中数据 */
+    handleProductQuestionSelectionChange(selection) {
+      if (selection.length > 1) {
+        this.$refs.productQuestion.clearSelection();
+        this.$refs.productQuestion.toggleRowSelection(selection.pop());
+      } else {
+        this.checkedProductQuestion = selection;
+      }
+    },
+    // 渲染前置处理
+    beforeRender(data) {
+      if (data.entity.productQuestionList) {
+        this.productQuestionList = data.entity.productQuestionList;
+      }
+      // 判断有无短视频，如果有短视频那么更改为短视频选项
+      // if (data.entity.productVideoPath) {
+      //   this.nowPropaganda = 1;
+      // } else {
+      //   this.nowPropaganda = 0;
+      // }
+      data.entity.categoryId
+        ? (data.entity.categoryId = String(data.entity.categoryId))
+        : "";
+      data.entity.productSlogan && data.entity.productSlogan != ""
+        ? (this.dynamicTags = data.entity.productSlogan.split(","))
+        : "";
+      return data;
+    },
+    /** 编辑 */
+    edit(row) {
+      this.reset();
+      this.query = { id: row.id };
+      this.urls.currUrl = "product/edit";
+      this.getData();
+      this.pageInfo.type = "edit";
+      this.title = "修改产品";
+    },
+    /** 新增 */
+    add(row) {
+      this.reset();
+      this.urls.currUrl = "product/add";
+      this.getData();
+      this.pageInfo.type = "add";
+      this.title = "新增产品";
+    },
+    /** 查看*/
+    view(row) {
+      this.reset();
+      this.query = { id: row.id };
+      this.urls.currUrl = "product/view";
+      this.getData();
+      this.pageInfo.type = "view";
+      this.title = "产品详细";
+    },
+    /**取消按钮 */
+    cancel() {
+      this.open = false;
+    },
+    /**获取数据后弹框 */
+    afterRender(data) {
+      this.open = true;
+      this.dict.propagandaList = { 1: "轮播图", 2: "短视频" };
+      this.form.nowPropaganda = [];
+      this.$forceUpdate(this.dict);
+      this.$forceUpdate(this.form);
+    },
 
-            afterSubmit(data) {
-                this.open = false;
-                this.$emit("ok");
-            },
+    beforeSubmit(data) {
+      // data.categoryId = data.categoryId.join(",");
+      data.companyId = data.companyId.join(",");
+      this.dynamicTags && this.dynamicTags.length > 0
+        ? (data.productSlogan = this.dynamicTags.join(","))
+        : (data.productSlogan = "");
+      return data;
+    },
 
-            // 表单重置
-            reset() {
-                this.form = {
-                    productName : "",
-                    productCode : "",
-                    productSlogan : "",
-                    productLogoPath : "",
-                    productFacePath : "",
-                    productVideoPath : "",
-                    productPicPath : "",
-                    productIntroduction : "",
-                    productDetail : "",
-                    publishTime : null,
-                    hot : 0,
-                    productRemark : "",
-                };
-                this.resetForm("form");
-            },
-            resetForm(refName) {
-                if (this.$refs[refName]) {
-                    this.$refs[refName].resetFields();
-                }
-            },
-        },
-    };
+    afterSubmit(data) {
+      this.open = false;
+      this.$emit("ok");
+    },
+
+    // 表单重置
+    reset() {
+      this.form = {
+        productName: "",
+        productCode: "",
+        productSlogan: "",
+        productLogoPath: "",
+        productFacePath: "",
+        productVideoPath: "",
+        productPicPath: "",
+        productIntroduction: "",
+        productDetail: "",
+        publishTime: null,
+        hot: 0,
+        productRemark: "",
+      };
+      this.resetForm("form");
+    },
+    resetForm(refName) {
+      if (this.$refs[refName]) {
+        this.$refs[refName].resetFields();
+      }
+    },
+  },
+};
 </script>
 <style lang="less" scoped>
+/deep/.el-tag + .el-tag {
+  margin-left: 10px;
+}
+/deep/.button-new-tag {
+  margin-left: 10px;
+  height: 32px;
+  line-height: 30px;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+.input-new-tag {
+  width: 90px;
+  margin-left: 10px;
+  vertical-align: bottom;
+}
 .del {
   color: red;
 }
@@ -343,43 +526,43 @@
   padding-right: 30px;
   border-top: 1px solid #dcdcdc;
 }
-.tabs{
-    background: #dcdcdc59;
-    height: 50px;
-    display: flex;
-    padding-left: 10px;
-    .tab{
-        height: 100%;
-        line-height: 50px;
-        padding: 0 20px;
-        width: 120px;
-        align-items: center;
-        // display: flex;
-        // justify-content: center;
-        // align-content: center;
-    }
-    .activetab{
-        background: white;
-    }
+.tabs {
+  background: #dcdcdc59;
+  height: 50px;
+  display: flex;
+  padding-left: 10px;
+  .tab {
+    height: 100%;
+    line-height: 50px;
+    padding: 0 20px;
+    width: 120px;
+    align-items: center;
+    // display: flex;
+    // justify-content: center;
+    // align-content: center;
+  }
+  .activetab {
+    background: white;
+  }
 }
-.form{
-    display: flex;
-    .formleft{
-        width: 600px;
-        border-right: 1px solid gainsboro;
-        flex-shrink: 0;
-        flex-grow: 0;
-    }
-    .el-col-12{
-      width: 96% !important;
-    }
-    .formright{
-        margin-left: 10px;
-        width: 100%;
-        .content{
-            margin-top: 10px;
-            width: 100%;
-        }
+.form {
+  display: flex;
+  .formleft {
+    width: 600px;
+    border-right: 1px solid gainsboro;
+    flex-shrink: 0;
+    flex-grow: 0;
+  }
+  .el-col-12 {
+    width: 96% !important;
+  }
+  .formright {
+    margin-left: 10px;
+    width: 100%;
+    .content {
+      margin-top: 10px;
+      width: 100%;
     }
+  }
 }
 </style>
\ No newline at end of file

enterprise-manager-ui/admin/src/views/product/list.vue

 <template>
-    <div class="page">
-        <LayoutTable ref="layouttable" :data="tableData" :config="tableConfig" notDel >
-            <!-- 热门0为非热门1为热门 -->
-            <div slot="table-search-left" class="onlyhot">
-                <el-checkbox
-                :key="0"
-                v-model="ishot"
-                :checked="ishot"
-                @change="changeIshot"
-                >
-                   
-                </el-checkbox> 
-                只看热门
-            </div>
-            
-        </LayoutTable>
+  <div class="page">
+    <LayoutTable
+      ref="layouttable"
+      :data="tableData"
+      :config="tableConfig"
+      notDel
+    >
+      <!-- 热门0为非热门1为热门 -->
+      <div slot="table-search-left" class="onlyhot">
+        <el-checkbox
+          :key="0"
+          v-model="ishot"
+          :checked="ishot"
+          @change="changeIshot"
+        >
+        </el-checkbox>
+        只看热门
+      </div>
+    </LayoutTable>
 
-
-        <drawer-show ref="drawerform" @ok="getData" />
-    </div>
+    <drawer-show ref="drawerform" @ok="getData" />
+  </div>
 </template>
 
 <script>
-    /** 表单弹出框模式需引入 */
-    import drawerShow from "./drawershow";
-    import table from "@/assets/mixins/table";
-    export default {
-        name: "ProductList",
-        components: {
-            drawerShow
-        },
-        mixins: [table],
-        mounted() {
-            // 重写查询
-            this.$refs.layouttable.$refs.searchform.onSubmit = this.onSearch
-            // 重写搜索清除
-            this.$refs.layouttable.$refs.searchform.cleanForm = this.cleanForm
-        },
-        methods: {
-            renderTable(tableData) {
-                return (
-                    <el-table stripe data={tableData} class="total-table">
-                    {this.columnSet.map((item) => this.renderTableColumn(item))}
-                    </el-table>
-                );
-            },
-            renderTableColumn(options) {
-                return (
-                    <el-table-column
-                        prop={options.prop}
-                        label={options.label}
-                        width={options.width}
-                        formatter={options.formatter}
-                    >
-                    </el-table-column>
-                 );
-            },
-            /** 重写新增方法 */
-            toAdd(row) {
-                this.$refs.drawerform.add(row);
-            },
-            /** 重写编辑方法 */
-            toEdit(row) {
-                this.$refs.drawerform.edit(row);
-            },
-            /** 重写查看方法 */
-            toView(row) {
-                this.$refs.drawerform.view(row);
-            },
-            // 重写查询
-            onSearch(){
-                if(this.ishot){
-                    this.$refs.layouttable.$refs.searchform.form = Object.assign({}, this.$refs.layouttable.$refs.searchform.form, {hot:1})
-                }
-                let { path, query } = this.$refs.layouttable.$refs.searchform.$route;
-                let data = this.$refs.layouttable.$refs.searchform.decode(this.$refs.layouttable.$refs.searchform.form);
-                this.$refs.layouttable.$refs.searchform.$router.push({
-                    path: path,
-                    query: Object.assign({}, query, data),
-                });
-            },
-            // 重写搜索清除
-            cleanForm(){
-                this.ishot = false
-                this.$refs.layouttable.$refs.searchform.form.hot = undefined
-                this.$forceUpdate()
-                this.$refs.layouttable.$refs.searchform.clean();
-                this.$refs.layouttable.$refs.searchform.onSubmit();
-            },
-            changeIshot(val){
-                this.ishot = val
-            }
-            
-        },
-        data() {
-            return {
-                ishot:false,
-                config: {
-                    search: [
-                        {
-                            name: "categoryId",
-                            type: "select",
-                            placeholder:"请选择产品分类",
-                            label: "产品分类"
-                        },
-                        {
-                            name: "companyId",
-                            type: "select",
-                            placeholder:"请选择所属企业",
-                            label: "所属企业"
-                        },
-                        {
-                            name: "productName",
-                            type: "text",
-                            label: "产品名称",
-                            fuzzy: true,
-                        },
-                    ],
-                    columns: [
-                        {type: "index",label: "序号",width: 50},
+/** 表单弹出框模式需引入 */
+import drawerShow from "./drawershow";
+import table from "@/assets/mixins/table";
+export default {
+  name: "ProductList",
+  components: {
+    drawerShow,
+  },
+  mixins: [table],
+  mounted() {
+    // 重写查询
+    this.$refs.layouttable.$refs.searchform.onSubmit = this.onSearch;
+    // 重写搜索清除
+    this.$refs.layouttable.$refs.searchform.cleanForm = this.cleanForm;
+  },
+  methods: {
+    renderTable(tableData) {
+      return (
+        <el-table stripe data={tableData} class="total-table">
+          {this.columnSet.map((item) => this.renderTableColumn(item))}
+        </el-table>
+      );
+    },
+    renderTableColumn(options) {
+      return (
+        <el-table-column
+          prop={options.prop}
+          label={options.label}
+          width={options.width}
+          formatter={options.formatter}
+        ></el-table-column>
+      );
+    },
+    /** 重写新增方法 */
+    toAdd(row) {
+      this.$refs.drawerform.add(row);
+    },
+    /** 重写编辑方法 */
+    toEdit(row) {
+      this.$refs.drawerform.edit(row);
+    },
+    /** 重写查看方法 */
+    toView(row) {
+      this.$refs.drawerform.view(row);
+    },
+    // 重写查询
+    onSearch() {
+      if (this.ishot) {
+        this.$refs.layouttable.$refs.searchform.form = Object.assign(
+          {},
+          this.$refs.layouttable.$refs.searchform.form,
+          { hot: 1 }
+        );
+      }
+      let { path, query } = this.$refs.layouttable.$refs.searchform.$route;
+      let data = this.$refs.layouttable.$refs.searchform.decode(
+        this.$refs.layouttable.$refs.searchform.form
+      );
+      this.$refs.layouttable.$refs.searchform.$router.push({
+        path: path,
+        query: Object.assign({}, query, data),
+      });
+    },
+    // 重写搜索清除
+    cleanForm() {
+      this.ishot = false;
+      this.$refs.layouttable.$refs.searchform.form.hot = undefined;
+      this.$forceUpdate();
+      this.$refs.layouttable.$refs.searchform.clean();
+      this.$refs.layouttable.$refs.searchform.onSubmit();
+    },
+    changeIshot(val) {
+      this.ishot = val;
+    },
+  },
+  data() {
+    return {
+      ishot: false,
+      config: {
+        search: [
+          {
+            name: "categoryId",
+            type: "select",
+            placeholder: "请选择产品分类",
+            label: "产品分类",
+          },
+          {
+            name: "companyId",
+            type: "select",
+            placeholder: "请选择所属企业",
+            label: "所属企业",
+          },
+          {
+            name: "productName",
+            type: "text",
+            label: "产品名称",
+            fuzzy: true,
+          },
+        ],
+        columns: [
+          { type: "index", label: "序号", width: 50 },
 
-                        {label: "产品名称", prop: "productName"},
+          { label: "产品名称", prop: "productName" },
 
-                        {label: "产品分类", prop: "categoryId",formatter: this.formatters},
+          { label: "产品分类", prop: "categoryId", formatter: this.formatters },
 
-                        {label: "所属企业", prop: "companyId",formatter: this.formatters},
+          { label: "所属企业", prop: "companyId", formatter: this.formatters },
 
-                        {label: "产品介绍", prop: "productIntroduction" , width: 500,formatter: this.formatters},
+          {
+            label: "产品介绍",
+            prop: "productIntroduction",
+            width: 500,
+            formatter: this.formatters,
+          },
 
-                        {label: "发布时间", prop: "publishTime", formatter: this.formatterDate},
+          {
+            label: "发布时间",
+            prop: "publishTime",
+            formatter: this.formatterDate,
+          },
 
-                        {label: "热门", prop: "hot",formatter: this.formatterYES, width: 50},
+          {
+            label: "热门",
+            prop: "hot",
+            formatter: this.formatterYES,
+            width: 50,
+          },
 
-                        {label: "最近更新时间", prop: "updateTime", formatter: this.formatterDate},
+          {
+            label: "最近更新时间",
+            prop: "updateTime",
+            formatter: this.formatterDate,
+          },
 
-                        {
-                            label: "操作",
-                            width: 240,
-                            formatter: row => {
-                                return (
-                                    <table-buttons noAdd noView row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
-                            );
-                            }
-                        }
-                    ]
-                }
-            };
-        }
+          {
+            label: "操作",
+            width: 240,
+            formatter: (row) => {
+              return (
+                <table-buttons
+                  noAdd
+                  noView
+                  row={row}
+                  onEdit={this.toEdit}
+                  onView={this.toView}
+                  onDel={this.toDel}
+                />
+              );
+            },
+          },
+        ],
+      },
     };
+  },
+};
 </script>
 <style lang="less" >
-.table-form{
-    display: flex ;
+.table-form {
+  display: flex;
 }
-.onlyhot{
-    margin-right: 20px;
-    line-height: 30px;
-    font-size: 14px;
-    color: #333333;
+.onlyhot {
+  margin-right: 20px;
+  line-height: 30px;
+  font-size: 14px;
+  color: #333333;
 }
 </style>
\ No newline at end of file

enterprise-manager/pom.xml

@@ -14,6 +14,22 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <!-- 默认值 -->
+        <profiles.server.debug></profiles.server.debug>
+        <profiles.server.path>/enterprise</profiles.server.path>
+        <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
+        <profiles.log.level>info</profiles.log.level>
+        <profiles.publish.path>/home/publish</profiles.publish.path>
+        <profiles.filepath>/mortals/app/data</profiles.filepath>
+        <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
+        <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
+        <profiles.req.json.check>false</profiles.req.json.check>
+        <profiles.trustedReferer></profiles.trustedReferer>
+        <package.environment>build</package.environment>
+        <skipUi>true</skipUi>
+    </properties>
+
     <profiles>
         <profile>
             <id>develop</id>
@@ -42,6 +58,7 @@
                 <profiles.active>test</profiles.active>
                 <profiles.platform.type>standalone</profiles.platform.type>
                 <profiles.server.port>21086</profiles.server.port>
+                <profiles.server.debug>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=6519</profiles.server.debug>
                 <profiles.server.path>/enterprise</profiles.server.path>
                 <profiles.publish.path>/home/publish</profiles.publish.path>
                 <profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
@@ -55,36 +72,25 @@
                 <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <profiles.log.level>INFO</profiles.log.level>
                 <package.environment>test</package.environment>
-                <skipUi>false</skipUi>
+                <skipUi>true</skipUi>
             </properties>
         </profile>
         <profile>
             <id>product</id>
             <properties>
                 <profiles.active>product</profiles.active>
-                <profiles.platform.type>cloud</profiles.platform.type>
-                <profiles.server.port>11086</profiles.server.port>
-                <profiles.server.path>/office</profiles.server.path>
-                <profiles.nacos.server-addr>172.15.28.120:8848</profiles.nacos.server-addr>
+                <profiles.platform.type>standalone</profiles.platform.type>
+                <profiles.server.port>21086</profiles.server.port>
+                <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
                 <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
                 <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
-                <profiles.rabbitmq.host>172.15.28.115</profiles.rabbitmq.host>
-                <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-                <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
-                <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
-                <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
-                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
-                <profiles.log.level>info</profiles.log.level>
-                <profiles.publish.path>/home/publish</profiles.publish.path>
-                <package.environment>build</package.environment>
-                <skipUi>false</skipUi>
+                <package.environment>build:prod</package.environment>
+                <skipDeploy>true</skipDeploy>
             </properties>
         </profile>
 
     </profiles>
 
-    <properties>
-    </properties>
 
     <dependencies>
 

enterprise-manager/src/main/bin/deploy.sh

@@ -14,7 +14,7 @@ SHELL_LOG="${BASEDIR}/${SHELL_NAME}.log"
 
 JAVA_HOME="/usr/local/java/jdk1.8"
 SERVICE_PATH="/usr/lib/systemd/system"
-PUBLISH_PATH="@profiles.publish.path@"
+PUBLISH_PATH="/home/publish"
 PROJECT_NAME="@project.artifactId@"
 
 PROJECT_EXECPATH="${PUBLISH_PATH}/${PROJECT_NAME}"
@@ -35,7 +35,7 @@ clear_deploy() {
   SERVICE=$1
   EXECPATH=$2
   #清理后台自启服务
-  rm -rf ${SERVICE}
+  rm -f ${SERVICE}
   #清理执行文件目录
   rm -rf ${EXECPATH}
 }
@@ -58,6 +58,7 @@ build_service() {
   echo "[Service]" >>${SERVICE}
   echo "Environment=\"JAVA_HOME=$JAVA_HOME\"" >>${SERVICE}
   echo "Type=forking" >>${SERVICE}
+  echo "ExecStartPre=-/bin/sleep 5s" >>${SERVICE}
   echo "ExecStart=${EXECPATH}/bin/start.sh" >>${SERVICE}
   echo "ExecStop=${EXECPATH}/bin/shutdown.sh" >>${SERVICE}
   echo "PrivateTmp=true" >>${SERVICE}
@@ -103,8 +104,11 @@ project_ui_deploy() {
 main() {
   echo "后台服务部署"
   project_deploy
-  echo "前端服务部署"
-  project_ui_deploy
+  #判断是否需要部署ui
+  if [ "@skipUi@" == "false" ];then
+    echo "前端服务部署"
+    project_ui_deploy
+  fi;
   exit ${RETVAL}
 }
 

enterprise-manager/src/main/bin/shutdown.sh

-#! /bin/sh
+#!/bin/sh
 PORT="@profiles.server.port@"
-BASEDIR=$(dirname $0)
-BASEDIR=$( (
-  cd "$BASEDIR"
-  pwd
-))
+BASEDIR=`dirname $0`
+BASEDIR=`(cd "$BASEDIR"; pwd)`
 PROJECT_NAME="@project.artifactId@"
-MAIN_CLASS="$PROJECT_NAME"
-
-if [ ! -n "$PORT" ]; then
-  echo $"Usage: $0 {port}"
-  exit $FAIL
+MAIN_CLASS="$PROJECT_NAME";
+SUCCESS=0
+FAIL=9
+if [ ! -n "$PORT" ]; then  
+	echo $"Usage: $0 {port}"
+	exit $FAIL
 fi
 
-pid=$(ps ax | grep -i "$MAIN_CLASS" | grep java | grep -v grep | awk '{print $1}')
-if [ -z "$pid" ]; then
-  echo "No Server running."
-  exit 1
+
+pid=`ps ax | grep -i "$MAIN_CLASS"  | grep java | grep -v grep | awk '{print $1}'`
+if [ -z "$pid" ] ; then
+        echo "No Server running."
+        exit $FAIL;
 fi
 
 echo "stoping application $PROJECT_NAME......"
@@ -24,3 +23,5 @@ echo "stoping application $PROJECT_NAME......"
 kill -15 ${pid}
 
 echo "Send shutdown request to Server $PROJECT_NAME OK"
+
+

enterprise-manager/src/main/bin/start.sh

 #!/bin/sh
 PORT="@profiles.server.port@"
+DEBUG=@profiles.server.debug@
 BASEDIR=`dirname $0`/..
 BASEDIR=`(cd "$BASEDIR"; pwd)`
 PROJECT_NAME="@project.artifactId@";
 MAIN_CLASS="$PROJECT_NAME-@project.version@.jar";
 LOG_PATH="@profiles.log.path@/$PROJECT_NAME"
-GC_PATH=$LOG_PATH/PROJECT_NAME"-gc.log"
-HS_ERR_PATH=$LOG_PATH/PROJECT_NAME"-hs_err.log"
-HEAP_DUMP_PATH=$LOG_PATH/PROJECT_NAME"-heap_dump.hprof"
+GC_PATH=$LOG_PATH/$PROJECT_NAME"-gc.log"
+HS_ERR_PATH=$LOG_PATH/$PROJECT_NAME"-hs_err.log"
+HEAP_DUMP_PATH=$LOG_PATH/$PROJECT_NAME"-heap_dump.hprof"
 TEMP_PATH=$LOG_PATH/temp/
 SUCCESS=0
 FAIL=9
@@ -32,8 +33,9 @@ if [ -z "$JAVACMD" ] ; then
       JAVACMD="$JAVA_HOME/bin/java"
     fi
   else
-    JAVACMD=`which java`
-	echo  "Error: JAVA_HOME is $JAVACMD"
+    JAVACMD=`which java > /dev/null 2>&1`
+	echo  "Error: JAVA_HOME is not defined correctly."
+    exit $ERR_NO_JAVA
   fi
 fi
 
@@ -44,7 +46,7 @@ fi
 
 if [ -e "$BASEDIR" ]
 then
-  JAVA_OPTS="-Xms512M -Xmx1024M -Xss256K -XX:+UseAdaptiveSizePolicy -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:GCTimeRatio=39 -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$GC_PATH -XX:+HeapDumpOnOutOfMemoryError -XX:ErrorFile=$HS_ERR_PATH -XX:HeapDumpPath=$HEAP_DUMP_PATH"
+  JAVA_OPTS="-Xms128M -Xmx512M -Xss256K -XX:+UseAdaptiveSizePolicy -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:GCTimeRatio=39 -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$GC_PATH -XX:+HeapDumpOnOutOfMemoryError -XX:ErrorFile=$HS_ERR_PATH -XX:HeapDumpPath=$HEAP_DUMP_PATH"
 fi
 
 CLASSPATH=$CLASSPATH_PREFIX:
@@ -55,12 +57,12 @@ cd "$BASEDIR/boot";
 echo "starting application $PROJECT_NAME......"
 exec "$JAVACMD" $JAVA_OPTS \
 				$EXTRA_JVM_ARGUMENTS \
+				$DEBUG \
 				-Dapp.name="$PROJECT_NAME" \
 				-Dapp.port="$PORT" \
 				-Dbasedir="$BASEDIR" \
+				-Dfile.encoding=utf-8 \
 				-Djava.io.tmpdir=$TEMP_PATH \
-				-Dloader.path="file://$BASEDIR/conf,file://$BASEDIR/lib" \
-				-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=41086 \
 				-jar $MAIN_CLASS \
 				> /dev/null &
 				

enterprise-manager/src/main/java/com/mortals/xhx/busiz/controller/TestIdempotentController.java

 package com.mortals.xhx.busiz.controller;
 
+import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.idempotent.helper.IdempotentHelper;
 import com.mortals.xhx.busiz.service.TestIdempotentService;
 import lombok.extern.slf4j.Slf4j;
@@ -28,6 +29,7 @@ public class TestIdempotentController {
      * url: localhost:12345/v1/idempotent/test-with-result?source=taobao&operationType=publish_product&businessKey=pd_20230105007&name=lisi
      */
     @GetMapping("/test-with-result")
+    @UnAuth
     public String testWithResult(String source,
                                  String operationType,
                                  String businessKey,
@@ -44,6 +46,7 @@ public class TestIdempotentController {
      * url : localhost:12345/v1/idempotent/test-with-no-result?source=taobao&operationType=publish_product&businessKey=pd_20230105008&name=zhangsan
      */
     @GetMapping("/test-with-no-result")
+    @UnAuth
     public String testWithNoResult(String source,
                                    String operationType,
                                    String businessKey,

enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyEntity.java

@@ -13,150 +13,154 @@ import com.mortals.xhx.module.company.model.vo.CompanyVo;
 import com.mortals.xhx.module.company.model.CompanyLabelsEntity;
 import lombok.Data;
 /**
-* 公司实体对象
-*
-* @author zxfei
-* @date 2023-09-18
-*/
+ * 公司实体对象
+ *
+ * @author zxfei
+ * @date 2024-12-05
+ */
 @Data
 public class CompanyEntity extends CompanyVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 公司名称
-    */
+     * 公司名称
+     */
     @Excel(name = "公司名称")
     private String companyName;
     /**
-    * 公司编码
-    */
+     * 公司编码
+     */
     private String companyCode;
     /**
-    * 注册号
-    */
+     * 注册号
+     */
     private String registrationNumber;
     /**
-    * 法定代表人
-    */
+     * 法定代表人
+     */
     private String legalRepresentative;
     /**
-    * 注册资本
-    */
+     * 注册资本
+     */
     private String registeredCapital;
     /**
-    * 公司类型
-    */
+     * 公司类型
+     */
     private String companyType;
     /**
-    * 经营范围
-    */
+     * 经营范围
+     */
     private String businessScope;
     /**
-    * 经营地址
-    */
+     * 经营地址
+     */
     private String businessAdress;
     /**
-    * 所在地
-    */
+     * 所在地
+     */
     private String location;
     /**
-    * 所属区域编码
-    */
+     * 所属区域编码
+     */
     private String areaCode;
     /**
-    * 所属区域名称
-    */
+     * 所属区域名称
+     */
     private String areaName;
     /**
-    * 联系电话
-    */
+     * 联系电话
+     */
     private String contactPhone;
     /**
-    * 电子邮件地址
-    */
+     * 电子邮件地址
+     */
     private String email;
     /**
-    * 公司网站
-    */
+     * 公司网站
+     */
     private String website;
     /**
-    * 税务登记号
-    */
+     * 税务登记号
+     */
     private String taxRegistrationNumber;
     /**
-    * 社会信用代码
-    */
+     * 社会信用代码
+     */
     private String socialCreditCode;
     /**
-    * 商标信息
-    */
+     * 商标信息
+     */
     private String trademarkInfo;
     /**
-    * 网站历史备案信息
-    */
+     * 网站历史备案信息
+     */
     private String websiteRegistrationInfo;
     /**
-    * 员工总数
-    */
+     * 员工总数
+     */
     private Integer totalEmployees;
     /**
-    * 软件著作权数量
-    */
+     * 软件著作权数量
+     */
     private Integer softNum;
     /**
-    * 专利数量
-    */
+     * 专利数量
+     */
     private Integer patentNum;
     /**
-    * 历史发展
-    */
+     * 历史发展
+     */
     private String hisDevelop;
     /**
-    * 经度
-    */
+     * 经度
+     */
     private String lon;
     /**
-    * 纬度
-    */
+     * 纬度
+     */
     private String lati;
     /**
-    * 企业logo
-    */
+     * 企业logo
+     */
     private String logoPath;
     /**
-    * 企业视频
-    */
+     * 企业视频
+     */
     private String companyVideoPath;
     /**
-    * 企业宣传图片
-    */
+     * 企业宣传图片
+     */
     private String companyPicPath;
     /**
-    * 公司介绍
-    */
+     * 公司介绍
+     */
     private String companyIntroduction;
     /**
-    * 公司文化
-    */
+     * 公司文化
+     */
     private String companyCulture;
     /**
-    * 排序
-    */
+     * 排序
+     */
     private Integer sort;
     /**
-    * 成立日期
-    */
+     * 成立日期
+     */
     private Date establishDate;
     /**
-    * 备注
-    */
+     * 备注
+     */
     private String remark;
     /**
-    * 公司标注信息
-    */
+     * 背景图片
+     */
+    private String background;
+    /**
+     * 公司标注信息
+     */
     private List<CompanyLabelsEntity> companyLabelsList=new ArrayList<>();;
     public List<CompanyLabelsEntity> getCompanyLabelsList(){
-      return companyLabelsList;
+        return companyLabelsList;
     }
 
     public void setCompanyLabelsList(List<CompanyLabelsEntity> companyLabelsList){
@@ -164,7 +168,7 @@ public class CompanyEntity extends CompanyVo {
     }
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -172,44 +176,45 @@ public class CompanyEntity extends CompanyVo {
         if (obj instanceof CompanyEntity) {
             CompanyEntity tmp = (CompanyEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
     }
 
     public void initAttrValue(){
-            this.companyName = "";
-            this.companyCode = "";
-            this.registrationNumber = "";
-            this.legalRepresentative = "";
-            this.registeredCapital = "";
-            this.companyType = "";
-            this.businessScope = "";
-            this.businessAdress = "";
-            this.location = "";
-            this.areaCode = "";
-            this.areaName = "";
-            this.contactPhone = "";
-            this.email = "";
-            this.website = "";
-            this.taxRegistrationNumber = "";
-            this.socialCreditCode = "";
-            this.trademarkInfo = "";
-            this.websiteRegistrationInfo = "";
-            this.totalEmployees = 0;
-            this.softNum = 0;
-            this.patentNum = 0;
-            this.hisDevelop = "";
-            this.lon = "";
-            this.lati = "";
-            this.logoPath = "";
-            this.companyVideoPath = "";
-            this.companyPicPath = "";
-            this.companyIntroduction = "";
-            this.companyCulture = "";
-            this.sort = 0;
-            this.establishDate = new Date();
-            this.remark = "";
+        this.companyName = "";
+        this.companyCode = "";
+        this.registrationNumber = "";
+        this.legalRepresentative = "";
+        this.registeredCapital = "";
+        this.companyType = "";
+        this.businessScope = "";
+        this.businessAdress = "";
+        this.location = "";
+        this.areaCode = "";
+        this.areaName = "";
+        this.contactPhone = "";
+        this.email = "";
+        this.website = "";
+        this.taxRegistrationNumber = "";
+        this.socialCreditCode = "";
+        this.trademarkInfo = "";
+        this.websiteRegistrationInfo = "";
+        this.totalEmployees = 0;
+        this.softNum = 0;
+        this.patentNum = 0;
+        this.hisDevelop = "";
+        this.lon = "";
+        this.lati = "";
+        this.logoPath = "";
+        this.companyVideoPath = "";
+        this.companyPicPath = "";
+        this.companyIntroduction = "";
+        this.companyCulture = "";
+        this.sort = 0;
+        this.establishDate = null;
+        this.remark = "";
+        this.background = "";
     }
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyQuery.java

@@ -5,11 +5,11 @@ import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.company.model.CompanyEntity;
 /**
-* 公司查询对象
-*
-* @author zxfei
-* @date 2023-09-18
-*/
+ * 公司查询对象
+ *
+ * @author zxfei
+ * @date 2024-12-05
+ */
 public class CompanyQuery extends CompanyEntity {
     /** 开始 主键ID，主键，自增长 */
     private Long idStart;
@@ -269,6 +269,11 @@ public class CompanyQuery extends CompanyEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 背景图片 */
+    private List<String> backgroundList;
+
+    /** 背景图片排除列表 */
+    private List <String> backgroundNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CompanyQuery> orConditionList;
 
@@ -278,2454 +283,2505 @@ public class CompanyQuery extends CompanyEntity {
     public CompanyQuery(){}
 
     /**
-    * 获取 开始 主键ID，主键，自增长
-    * @return idStart
-    */
+     * 获取 开始 主键ID，主键，自增长
+     * @return idStart
+     */
     public Long getIdStart(){
         return this.idStart;
     }
 
     /**
-    * 设置 开始 主键ID，主键，自增长
-    * @param idStart
-    */
+     * 设置 开始 主键ID，主键，自增长
+     * @param idStart
+     */
     public void setIdStart(Long idStart){
         this.idStart = idStart;
     }
 
     /**
-    * 获取 结束 主键ID，主键，自增长
-    * @return $idEnd
-    */
+     * 获取 结束 主键ID，主键，自增长
+     * @return $idEnd
+     */
     public Long getIdEnd(){
         return this.idEnd;
     }
 
     /**
-    * 设置 结束 主键ID，主键，自增长
-    * @param idEnd
-    */
+     * 设置 结束 主键ID，主键，自增长
+     * @param idEnd
+     */
     public void setIdEnd(Long idEnd){
         this.idEnd = idEnd;
     }
 
     /**
-    * 获取 增加 主键ID，主键，自增长
-    * @return idIncrement
-    */
+     * 获取 增加 主键ID，主键，自增长
+     * @return idIncrement
+     */
     public Long getIdIncrement(){
         return this.idIncrement;
     }
 
     /**
-    * 设置 增加 主键ID，主键，自增长
-    * @param idIncrement
-    */
+     * 设置 增加 主键ID，主键，自增长
+     * @param idIncrement
+     */
     public void setIdIncrement(Long idIncrement){
         this.idIncrement = idIncrement;
     }
 
     /**
-    * 获取 主键ID，主键，自增长
-    * @return idList
-    */
+     * 获取 主键ID，主键，自增长
+     * @return idList
+     */
     public List<Long> getIdList(){
         return this.idList;
     }
 
     /**
-    * 设置 主键ID，主键，自增长
-    * @param idList
-    */
+     * 设置 主键ID，主键，自增长
+     * @param idList
+     */
     public void setIdList(List<Long> idList){
         this.idList = idList;
     }
 
     /**
-    * 获取 主键ID，主键，自增长
-    * @return idNotList
-    */
+     * 获取 主键ID，主键，自增长
+     * @return idNotList
+     */
     public List<Long> getIdNotList(){
         return this.idNotList;
     }
 
     /**
-    * 设置 主键ID，主键，自增长
-    * @param idNotList
-    */
+     * 设置 主键ID，主键，自增长
+     * @param idNotList
+     */
     public void setIdNotList(List<Long> idNotList){
         this.idNotList = idNotList;
     }
 
 
     /**
-    * 获取 公司名称
-    * @return companyNameList
-    */
+     * 获取 公司名称
+     * @return companyNameList
+     */
     public List<String> getCompanyNameList(){
         return this.companyNameList;
     }
 
     /**
-    * 设置 公司名称
-    * @param companyNameList
-    */
+     * 设置 公司名称
+     * @param companyNameList
+     */
     public void setCompanyNameList(List<String> companyNameList){
         this.companyNameList = companyNameList;
     }
 
     /**
-    * 获取 公司名称
-    * @return companyNameNotList
-    */
+     * 获取 公司名称
+     * @return companyNameNotList
+     */
     public List<String> getCompanyNameNotList(){
         return this.companyNameNotList;
     }
 
     /**
-    * 设置 公司名称
-    * @param companyNameNotList
-    */
+     * 设置 公司名称
+     * @param companyNameNotList
+     */
     public void setCompanyNameNotList(List<String> companyNameNotList){
         this.companyNameNotList = companyNameNotList;
     }
 
     /**
-    * 获取 公司编码
-    * @return companyCodeList
-    */
+     * 获取 公司编码
+     * @return companyCodeList
+     */
     public List<String> getCompanyCodeList(){
         return this.companyCodeList;
     }
 
     /**
-    * 设置 公司编码
-    * @param companyCodeList
-    */
+     * 设置 公司编码
+     * @param companyCodeList
+     */
     public void setCompanyCodeList(List<String> companyCodeList){
         this.companyCodeList = companyCodeList;
     }
 
     /**
-    * 获取 公司编码
-    * @return companyCodeNotList
-    */
+     * 获取 公司编码
+     * @return companyCodeNotList
+     */
     public List<String> getCompanyCodeNotList(){
         return this.companyCodeNotList;
     }
 
     /**
-    * 设置 公司编码
-    * @param companyCodeNotList
-    */
+     * 设置 公司编码
+     * @param companyCodeNotList
+     */
     public void setCompanyCodeNotList(List<String> companyCodeNotList){
         this.companyCodeNotList = companyCodeNotList;
     }
 
     /**
-    * 获取 注册号
-    * @return registrationNumberList
-    */
+     * 获取 注册号
+     * @return registrationNumberList
+     */
     public List<String> getRegistrationNumberList(){
         return this.registrationNumberList;
     }
 
     /**
-    * 设置 注册号
-    * @param registrationNumberList
-    */
+     * 设置 注册号
+     * @param registrationNumberList
+     */
     public void setRegistrationNumberList(List<String> registrationNumberList){
         this.registrationNumberList = registrationNumberList;
     }
 
     /**
-    * 获取 注册号
-    * @return registrationNumberNotList
-    */
+     * 获取 注册号
+     * @return registrationNumberNotList
+     */
     public List<String> getRegistrationNumberNotList(){
         return this.registrationNumberNotList;
     }
 
     /**
-    * 设置 注册号
-    * @param registrationNumberNotList
-    */
+     * 设置 注册号
+     * @param registrationNumberNotList
+     */
     public void setRegistrationNumberNotList(List<String> registrationNumberNotList){
         this.registrationNumberNotList = registrationNumberNotList;
     }
 
     /**
-    * 获取 法定代表人
-    * @return legalRepresentativeList
-    */
+     * 获取 法定代表人
+     * @return legalRepresentativeList
+     */
     public List<String> getLegalRepresentativeList(){
         return this.legalRepresentativeList;
     }
 
     /**
-    * 设置 法定代表人
-    * @param legalRepresentativeList
-    */
+     * 设置 法定代表人
+     * @param legalRepresentativeList
+     */
     public void setLegalRepresentativeList(List<String> legalRepresentativeList){
         this.legalRepresentativeList = legalRepresentativeList;
     }
 
     /**
-    * 获取 法定代表人
-    * @return legalRepresentativeNotList
-    */
+     * 获取 法定代表人
+     * @return legalRepresentativeNotList
+     */
     public List<String> getLegalRepresentativeNotList(){
         return this.legalRepresentativeNotList;
     }
 
     /**
-    * 设置 法定代表人
-    * @param legalRepresentativeNotList
-    */
+     * 设置 法定代表人
+     * @param legalRepresentativeNotList
+     */
     public void setLegalRepresentativeNotList(List<String> legalRepresentativeNotList){
         this.legalRepresentativeNotList = legalRepresentativeNotList;
     }
 
     /**
-    * 获取 注册资本
-    * @return registeredCapitalList
-    */
+     * 获取 注册资本
+     * @return registeredCapitalList
+     */
     public List<String> getRegisteredCapitalList(){
         return this.registeredCapitalList;
     }
 
     /**
-    * 设置 注册资本
-    * @param registeredCapitalList
-    */
+     * 设置 注册资本
+     * @param registeredCapitalList
+     */
     public void setRegisteredCapitalList(List<String> registeredCapitalList){
         this.registeredCapitalList = registeredCapitalList;
     }
 
     /**
-    * 获取 注册资本
-    * @return registeredCapitalNotList
-    */
+     * 获取 注册资本
+     * @return registeredCapitalNotList
+     */
     public List<String> getRegisteredCapitalNotList(){
         return this.registeredCapitalNotList;
     }
 
     /**
-    * 设置 注册资本
-    * @param registeredCapitalNotList
-    */
+     * 设置 注册资本
+     * @param registeredCapitalNotList
+     */
     public void setRegisteredCapitalNotList(List<String> registeredCapitalNotList){
         this.registeredCapitalNotList = registeredCapitalNotList;
     }
 
     /**
-    * 获取 公司类型
-    * @return companyTypeList
-    */
+     * 获取 公司类型
+     * @return companyTypeList
+     */
     public List<String> getCompanyTypeList(){
         return this.companyTypeList;
     }
 
     /**
-    * 设置 公司类型
-    * @param companyTypeList
-    */
+     * 设置 公司类型
+     * @param companyTypeList
+     */
     public void setCompanyTypeList(List<String> companyTypeList){
         this.companyTypeList = companyTypeList;
     }
 
     /**
-    * 获取 公司类型
-    * @return companyTypeNotList
-    */
+     * 获取 公司类型
+     * @return companyTypeNotList
+     */
     public List<String> getCompanyTypeNotList(){
         return this.companyTypeNotList;
     }
 
     /**
-    * 设置 公司类型
-    * @param companyTypeNotList
-    */
+     * 设置 公司类型
+     * @param companyTypeNotList
+     */
     public void setCompanyTypeNotList(List<String> companyTypeNotList){
         this.companyTypeNotList = companyTypeNotList;
     }
 
     /**
-    * 获取 经营范围
-    * @return businessScopeList
-    */
+     * 获取 经营范围
+     * @return businessScopeList
+     */
     public List<String> getBusinessScopeList(){
         return this.businessScopeList;
     }
 
     /**
-    * 设置 经营范围
-    * @param businessScopeList
-    */
+     * 设置 经营范围
+     * @param businessScopeList
+     */
     public void setBusinessScopeList(List<String> businessScopeList){
         this.businessScopeList = businessScopeList;
     }
 
     /**
-    * 获取 经营范围
-    * @return businessScopeNotList
-    */
+     * 获取 经营范围
+     * @return businessScopeNotList
+     */
     public List<String> getBusinessScopeNotList(){
         return this.businessScopeNotList;
     }
 
     /**
-    * 设置 经营范围
-    * @param businessScopeNotList
-    */
+     * 设置 经营范围
+     * @param businessScopeNotList
+     */
     public void setBusinessScopeNotList(List<String> businessScopeNotList){
         this.businessScopeNotList = businessScopeNotList;
     }
 
     /**
-    * 获取 经营地址
-    * @return businessAdressList
-    */
+     * 获取 经营地址
+     * @return businessAdressList
+     */
     public List<String> getBusinessAdressList(){
         return this.businessAdressList;
     }
 
     /**
-    * 设置 经营地址
-    * @param businessAdressList
-    */
+     * 设置 经营地址
+     * @param businessAdressList
+     */
     public void setBusinessAdressList(List<String> businessAdressList){
         this.businessAdressList = businessAdressList;
     }
 
     /**
-    * 获取 经营地址
-    * @return businessAdressNotList
-    */
+     * 获取 经营地址
+     * @return businessAdressNotList
+     */
     public List<String> getBusinessAdressNotList(){
         return this.businessAdressNotList;
     }
 
     /**
-    * 设置 经营地址
-    * @param businessAdressNotList
-    */
+     * 设置 经营地址
+     * @param businessAdressNotList
+     */
     public void setBusinessAdressNotList(List<String> businessAdressNotList){
         this.businessAdressNotList = businessAdressNotList;
     }
 
     /**
-    * 获取 所在地
-    * @return locationList
-    */
+     * 获取 所在地
+     * @return locationList
+     */
     public List<String> getLocationList(){
         return this.locationList;
     }
 
     /**
-    * 设置 所在地
-    * @param locationList
-    */
+     * 设置 所在地
+     * @param locationList
+     */
     public void setLocationList(List<String> locationList){
         this.locationList = locationList;
     }
 
     /**
-    * 获取 所在地
-    * @return locationNotList
-    */
+     * 获取 所在地
+     * @return locationNotList
+     */
     public List<String> getLocationNotList(){
         return this.locationNotList;
     }
 
     /**
-    * 设置 所在地
-    * @param locationNotList
-    */
+     * 设置 所在地
+     * @param locationNotList
+     */
     public void setLocationNotList(List<String> locationNotList){
         this.locationNotList = locationNotList;
     }
 
     /**
-    * 获取 所属区域编码
-    * @return areaCodeList
-    */
+     * 获取 所属区域编码
+     * @return areaCodeList
+     */
     public List<String> getAreaCodeList(){
         return this.areaCodeList;
     }
 
     /**
-    * 设置 所属区域编码
-    * @param areaCodeList
-    */
+     * 设置 所属区域编码
+     * @param areaCodeList
+     */
     public void setAreaCodeList(List<String> areaCodeList){
         this.areaCodeList = areaCodeList;
     }
 
     /**
-    * 获取 所属区域编码
-    * @return areaCodeNotList
-    */
+     * 获取 所属区域编码
+     * @return areaCodeNotList
+     */
     public List<String> getAreaCodeNotList(){
         return this.areaCodeNotList;
     }
 
     /**
-    * 设置 所属区域编码
-    * @param areaCodeNotList
-    */
+     * 设置 所属区域编码
+     * @param areaCodeNotList
+     */
     public void setAreaCodeNotList(List<String> areaCodeNotList){
         this.areaCodeNotList = areaCodeNotList;
     }
 
     /**
-    * 获取 所属区域名称
-    * @return areaNameList
-    */
+     * 获取 所属区域名称
+     * @return areaNameList
+     */
     public List<String> getAreaNameList(){
         return this.areaNameList;
     }
 
     /**
-    * 设置 所属区域名称
-    * @param areaNameList
-    */
+     * 设置 所属区域名称
+     * @param areaNameList
+     */
     public void setAreaNameList(List<String> areaNameList){
         this.areaNameList = areaNameList;
     }
 
     /**
-    * 获取 所属区域名称
-    * @return areaNameNotList
-    */
+     * 获取 所属区域名称
+     * @return areaNameNotList
+     */
     public List<String> getAreaNameNotList(){
         return this.areaNameNotList;
     }
 
     /**
-    * 设置 所属区域名称
-    * @param areaNameNotList
-    */
+     * 设置 所属区域名称
+     * @param areaNameNotList
+     */
     public void setAreaNameNotList(List<String> areaNameNotList){
         this.areaNameNotList = areaNameNotList;
     }
 
     /**
-    * 获取 联系电话
-    * @return contactPhoneList
-    */
+     * 获取 联系电话
+     * @return contactPhoneList
+     */
     public List<String> getContactPhoneList(){
         return this.contactPhoneList;
     }
 
     /**
-    * 设置 联系电话
-    * @param contactPhoneList
-    */
+     * 设置 联系电话
+     * @param contactPhoneList
+     */
     public void setContactPhoneList(List<String> contactPhoneList){
         this.contactPhoneList = contactPhoneList;
     }
 
     /**
-    * 获取 联系电话
-    * @return contactPhoneNotList
-    */
+     * 获取 联系电话
+     * @return contactPhoneNotList
+     */
     public List<String> getContactPhoneNotList(){
         return this.contactPhoneNotList;
     }
 
     /**
-    * 设置 联系电话
-    * @param contactPhoneNotList
-    */
+     * 设置 联系电话
+     * @param contactPhoneNotList
+     */
     public void setContactPhoneNotList(List<String> contactPhoneNotList){
         this.contactPhoneNotList = contactPhoneNotList;
     }
 
     /**
-    * 获取 电子邮件地址
-    * @return emailList
-    */
+     * 获取 电子邮件地址
+     * @return emailList
+     */
     public List<String> getEmailList(){
         return this.emailList;
     }
 
     /**
-    * 设置 电子邮件地址
-    * @param emailList
-    */
+     * 设置 电子邮件地址
+     * @param emailList
+     */
     public void setEmailList(List<String> emailList){
         this.emailList = emailList;
     }
 
     /**
-    * 获取 电子邮件地址
-    * @return emailNotList
-    */
+     * 获取 电子邮件地址
+     * @return emailNotList
+     */
     public List<String> getEmailNotList(){
         return this.emailNotList;
     }
 
     /**
-    * 设置 电子邮件地址
-    * @param emailNotList
-    */
+     * 设置 电子邮件地址
+     * @param emailNotList
+     */
     public void setEmailNotList(List<String> emailNotList){
         this.emailNotList = emailNotList;
     }
 
     /**
-    * 获取 公司网站
-    * @return websiteList
-    */
+     * 获取 公司网站
+     * @return websiteList
+     */
     public List<String> getWebsiteList(){
         return this.websiteList;
     }
 
     /**
-    * 设置 公司网站
-    * @param websiteList
-    */
+     * 设置 公司网站
+     * @param websiteList
+     */
     public void setWebsiteList(List<String> websiteList){
         this.websiteList = websiteList;
     }
 
     /**
-    * 获取 公司网站
-    * @return websiteNotList
-    */
+     * 获取 公司网站
+     * @return websiteNotList
+     */
     public List<String> getWebsiteNotList(){
         return this.websiteNotList;
     }
 
     /**
-    * 设置 公司网站
-    * @param websiteNotList
-    */
+     * 设置 公司网站
+     * @param websiteNotList
+     */
     public void setWebsiteNotList(List<String> websiteNotList){
         this.websiteNotList = websiteNotList;
     }
 
     /**
-    * 获取 税务登记号
-    * @return taxRegistrationNumberList
-    */
+     * 获取 税务登记号
+     * @return taxRegistrationNumberList
+     */
     public List<String> getTaxRegistrationNumberList(){
         return this.taxRegistrationNumberList;
     }
 
     /**
-    * 设置 税务登记号
-    * @param taxRegistrationNumberList
-    */
+     * 设置 税务登记号
+     * @param taxRegistrationNumberList
+     */
     public void setTaxRegistrationNumberList(List<String> taxRegistrationNumberList){
         this.taxRegistrationNumberList = taxRegistrationNumberList;
     }
 
     /**
-    * 获取 税务登记号
-    * @return taxRegistrationNumberNotList
-    */
+     * 获取 税务登记号
+     * @return taxRegistrationNumberNotList
+     */
     public List<String> getTaxRegistrationNumberNotList(){
         return this.taxRegistrationNumberNotList;
     }
 
     /**
-    * 设置 税务登记号
-    * @param taxRegistrationNumberNotList
-    */
+     * 设置 税务登记号
+     * @param taxRegistrationNumberNotList
+     */
     public void setTaxRegistrationNumberNotList(List<String> taxRegistrationNumberNotList){
         this.taxRegistrationNumberNotList = taxRegistrationNumberNotList;
     }
 
     /**
-    * 获取 社会信用代码
-    * @return socialCreditCodeList
-    */
+     * 获取 社会信用代码
+     * @return socialCreditCodeList
+     */
     public List<String> getSocialCreditCodeList(){
         return this.socialCreditCodeList;
     }
 
     /**
-    * 设置 社会信用代码
-    * @param socialCreditCodeList
-    */
+     * 设置 社会信用代码
+     * @param socialCreditCodeList
+     */
     public void setSocialCreditCodeList(List<String> socialCreditCodeList){
         this.socialCreditCodeList = socialCreditCodeList;
     }
 
     /**
-    * 获取 社会信用代码
-    * @return socialCreditCodeNotList
-    */
+     * 获取 社会信用代码
+     * @return socialCreditCodeNotList
+     */
     public List<String> getSocialCreditCodeNotList(){
         return this.socialCreditCodeNotList;
     }
 
     /**
-    * 设置 社会信用代码
-    * @param socialCreditCodeNotList
-    */
+     * 设置 社会信用代码
+     * @param socialCreditCodeNotList
+     */
     public void setSocialCreditCodeNotList(List<String> socialCreditCodeNotList){
         this.socialCreditCodeNotList = socialCreditCodeNotList;
     }
 
     /**
-    * 获取 商标信息
-    * @return trademarkInfoList
-    */
+     * 获取 商标信息
+     * @return trademarkInfoList
+     */
     public List<String> getTrademarkInfoList(){
         return this.trademarkInfoList;
     }
 
     /**
-    * 设置 商标信息
-    * @param trademarkInfoList
-    */
+     * 设置 商标信息
+     * @param trademarkInfoList
+     */
     public void setTrademarkInfoList(List<String> trademarkInfoList){
         this.trademarkInfoList = trademarkInfoList;
     }
 
     /**
-    * 获取 商标信息
-    * @return trademarkInfoNotList
-    */
+     * 获取 商标信息
+     * @return trademarkInfoNotList
+     */
     public List<String> getTrademarkInfoNotList(){
         return this.trademarkInfoNotList;
     }
 
     /**
-    * 设置 商标信息
-    * @param trademarkInfoNotList
-    */
+     * 设置 商标信息
+     * @param trademarkInfoNotList
+     */
     public void setTrademarkInfoNotList(List<String> trademarkInfoNotList){
         this.trademarkInfoNotList = trademarkInfoNotList;
     }
 
     /**
-    * 获取 网站历史备案信息
-    * @return websiteRegistrationInfoList
-    */
+     * 获取 网站历史备案信息
+     * @return websiteRegistrationInfoList
+     */
     public List<String> getWebsiteRegistrationInfoList(){
         return this.websiteRegistrationInfoList;
     }
 
     /**
-    * 设置 网站历史备案信息
-    * @param websiteRegistrationInfoList
-    */
+     * 设置 网站历史备案信息
+     * @param websiteRegistrationInfoList
+     */
     public void setWebsiteRegistrationInfoList(List<String> websiteRegistrationInfoList){
         this.websiteRegistrationInfoList = websiteRegistrationInfoList;
     }
 
     /**
-    * 获取 网站历史备案信息
-    * @return websiteRegistrationInfoNotList
-    */
+     * 获取 网站历史备案信息
+     * @return websiteRegistrationInfoNotList
+     */
     public List<String> getWebsiteRegistrationInfoNotList(){
         return this.websiteRegistrationInfoNotList;
     }
 
     /**
-    * 设置 网站历史备案信息
-    * @param websiteRegistrationInfoNotList
-    */
+     * 设置 网站历史备案信息
+     * @param websiteRegistrationInfoNotList
+     */
     public void setWebsiteRegistrationInfoNotList(List<String> websiteRegistrationInfoNotList){
         this.websiteRegistrationInfoNotList = websiteRegistrationInfoNotList;
     }
 
     /**
-    * 获取 开始 员工总数
-    * @return totalEmployeesStart
-    */
+     * 获取 开始 员工总数
+     * @return totalEmployeesStart
+     */
     public Integer getTotalEmployeesStart(){
         return this.totalEmployeesStart;
     }
 
     /**
-    * 设置 开始 员工总数
-    * @param totalEmployeesStart
-    */
+     * 设置 开始 员工总数
+     * @param totalEmployeesStart
+     */
     public void setTotalEmployeesStart(Integer totalEmployeesStart){
         this.totalEmployeesStart = totalEmployeesStart;
     }
 
     /**
-    * 获取 结束 员工总数
-    * @return $totalEmployeesEnd
-    */
+     * 获取 结束 员工总数
+     * @return $totalEmployeesEnd
+     */
     public Integer getTotalEmployeesEnd(){
         return this.totalEmployeesEnd;
     }
 
     /**
-    * 设置 结束 员工总数
-    * @param totalEmployeesEnd
-    */
+     * 设置 结束 员工总数
+     * @param totalEmployeesEnd
+     */
     public void setTotalEmployeesEnd(Integer totalEmployeesEnd){
         this.totalEmployeesEnd = totalEmployeesEnd;
     }
 
     /**
-    * 获取 增加 员工总数
-    * @return totalEmployeesIncrement
-    */
+     * 获取 增加 员工总数
+     * @return totalEmployeesIncrement
+     */
     public Integer getTotalEmployeesIncrement(){
         return this.totalEmployeesIncrement;
     }
 
     /**
-    * 设置 增加 员工总数
-    * @param totalEmployeesIncrement
-    */
+     * 设置 增加 员工总数
+     * @param totalEmployeesIncrement
+     */
     public void setTotalEmployeesIncrement(Integer totalEmployeesIncrement){
         this.totalEmployeesIncrement = totalEmployeesIncrement;
     }
 
     /**
-    * 获取 员工总数
-    * @return totalEmployeesList
-    */
+     * 获取 员工总数
+     * @return totalEmployeesList
+     */
     public List<Integer> getTotalEmployeesList(){
         return this.totalEmployeesList;
     }
 
     /**
-    * 设置 员工总数
-    * @param totalEmployeesList
-    */
+     * 设置 员工总数
+     * @param totalEmployeesList
+     */
     public void setTotalEmployeesList(List<Integer> totalEmployeesList){
         this.totalEmployeesList = totalEmployeesList;
     }
 
     /**
-    * 获取 员工总数
-    * @return totalEmployeesNotList
-    */
+     * 获取 员工总数
+     * @return totalEmployeesNotList
+     */
     public List<Integer> getTotalEmployeesNotList(){
         return this.totalEmployeesNotList;
     }
 
     /**
-    * 设置 员工总数
-    * @param totalEmployeesNotList
-    */
+     * 设置 员工总数
+     * @param totalEmployeesNotList
+     */
     public void setTotalEmployeesNotList(List<Integer> totalEmployeesNotList){
         this.totalEmployeesNotList = totalEmployeesNotList;
     }
 
 
     /**
-    * 获取 开始 软件著作权数量
-    * @return softNumStart
-    */
+     * 获取 开始 软件著作权数量
+     * @return softNumStart
+     */
     public Integer getSoftNumStart(){
         return this.softNumStart;
     }
 
     /**
-    * 设置 开始 软件著作权数量
-    * @param softNumStart
-    */
+     * 设置 开始 软件著作权数量
+     * @param softNumStart
+     */
     public void setSoftNumStart(Integer softNumStart){
         this.softNumStart = softNumStart;
     }
 
     /**
-    * 获取 结束 软件著作权数量
-    * @return $softNumEnd
-    */
+     * 获取 结束 软件著作权数量
+     * @return $softNumEnd
+     */
     public Integer getSoftNumEnd(){
         return this.softNumEnd;
     }
 
     /**
-    * 设置 结束 软件著作权数量
-    * @param softNumEnd
-    */
+     * 设置 结束 软件著作权数量
+     * @param softNumEnd
+     */
     public void setSoftNumEnd(Integer softNumEnd){
         this.softNumEnd = softNumEnd;
     }
 
     /**
-    * 获取 增加 软件著作权数量
-    * @return softNumIncrement
-    */
+     * 获取 增加 软件著作权数量
+     * @return softNumIncrement
+     */
     public Integer getSoftNumIncrement(){
         return this.softNumIncrement;
     }
 
     /**
-    * 设置 增加 软件著作权数量
-    * @param softNumIncrement
-    */
+     * 设置 增加 软件著作权数量
+     * @param softNumIncrement
+     */
     public void setSoftNumIncrement(Integer softNumIncrement){
         this.softNumIncrement = softNumIncrement;
     }
 
     /**
-    * 获取 软件著作权数量
-    * @return softNumList
-    */
+     * 获取 软件著作权数量
+     * @return softNumList
+     */
     public List<Integer> getSoftNumList(){
         return this.softNumList;
     }
 
     /**
-    * 设置 软件著作权数量
-    * @param softNumList
-    */
+     * 设置 软件著作权数量
+     * @param softNumList
+     */
     public void setSoftNumList(List<Integer> softNumList){
         this.softNumList = softNumList;
     }
 
     /**
-    * 获取 软件著作权数量
-    * @return softNumNotList
-    */
+     * 获取 软件著作权数量
+     * @return softNumNotList
+     */
     public List<Integer> getSoftNumNotList(){
         return this.softNumNotList;
     }
 
     /**
-    * 设置 软件著作权数量
-    * @param softNumNotList
-    */
+     * 设置 软件著作权数量
+     * @param softNumNotList
+     */
     public void setSoftNumNotList(List<Integer> softNumNotList){
         this.softNumNotList = softNumNotList;
     }
 
 
     /**
-    * 获取 开始 专利数量
-    * @return patentNumStart
-    */
+     * 获取 开始 专利数量
+     * @return patentNumStart
+     */
     public Integer getPatentNumStart(){
         return this.patentNumStart;
     }
 
     /**
-    * 设置 开始 专利数量
-    * @param patentNumStart
-    */
+     * 设置 开始 专利数量
+     * @param patentNumStart
+     */
     public void setPatentNumStart(Integer patentNumStart){
         this.patentNumStart = patentNumStart;
     }
 
     /**
-    * 获取 结束 专利数量
-    * @return $patentNumEnd
-    */
+     * 获取 结束 专利数量
+     * @return $patentNumEnd
+     */
     public Integer getPatentNumEnd(){
         return this.patentNumEnd;
     }
 
     /**
-    * 设置 结束 专利数量
-    * @param patentNumEnd
-    */
+     * 设置 结束 专利数量
+     * @param patentNumEnd
+     */
     public void setPatentNumEnd(Integer patentNumEnd){
         this.patentNumEnd = patentNumEnd;
     }
 
     /**
-    * 获取 增加 专利数量
-    * @return patentNumIncrement
-    */
+     * 获取 增加 专利数量
+     * @return patentNumIncrement
+     */
     public Integer getPatentNumIncrement(){
         return this.patentNumIncrement;
     }
 
     /**
-    * 设置 增加 专利数量
-    * @param patentNumIncrement
-    */
+     * 设置 增加 专利数量
+     * @param patentNumIncrement
+     */
     public void setPatentNumIncrement(Integer patentNumIncrement){
         this.patentNumIncrement = patentNumIncrement;
     }
 
     /**
-    * 获取 专利数量
-    * @return patentNumList
-    */
+     * 获取 专利数量
+     * @return patentNumList
+     */
     public List<Integer> getPatentNumList(){
         return this.patentNumList;
     }
 
     /**
-    * 设置 专利数量
-    * @param patentNumList
-    */
+     * 设置 专利数量
+     * @param patentNumList
+     */
     public void setPatentNumList(List<Integer> patentNumList){
         this.patentNumList = patentNumList;
     }
 
     /**
-    * 获取 专利数量
-    * @return patentNumNotList
-    */
+     * 获取 专利数量
+     * @return patentNumNotList
+     */
     public List<Integer> getPatentNumNotList(){
         return this.patentNumNotList;
     }
 
     /**
-    * 设置 专利数量
-    * @param patentNumNotList
-    */
+     * 设置 专利数量
+     * @param patentNumNotList
+     */
     public void setPatentNumNotList(List<Integer> patentNumNotList){
         this.patentNumNotList = patentNumNotList;
     }
 
 
     /**
-    * 获取 历史发展
-    * @return hisDevelopList
-    */
+     * 获取 历史发展
+     * @return hisDevelopList
+     */
     public List<String> getHisDevelopList(){
         return this.hisDevelopList;
     }
 
     /**
-    * 设置 历史发展
-    * @param hisDevelopList
-    */
+     * 设置 历史发展
+     * @param hisDevelopList
+     */
     public void setHisDevelopList(List<String> hisDevelopList){
         this.hisDevelopList = hisDevelopList;
     }
 
     /**
-    * 获取 历史发展
-    * @return hisDevelopNotList
-    */
+     * 获取 历史发展
+     * @return hisDevelopNotList
+     */
     public List<String> getHisDevelopNotList(){
         return this.hisDevelopNotList;
     }
 
     /**
-    * 设置 历史发展
-    * @param hisDevelopNotList
-    */
+     * 设置 历史发展
+     * @param hisDevelopNotList
+     */
     public void setHisDevelopNotList(List<String> hisDevelopNotList){
         this.hisDevelopNotList = hisDevelopNotList;
     }
 
     /**
-    * 获取 经度
-    * @return lonList
-    */
+     * 获取 经度
+     * @return lonList
+     */
     public List<String> getLonList(){
         return this.lonList;
     }
 
     /**
-    * 设置 经度
-    * @param lonList
-    */
+     * 设置 经度
+     * @param lonList
+     */
     public void setLonList(List<String> lonList){
         this.lonList = lonList;
     }
 
     /**
-    * 获取 经度
-    * @return lonNotList
-    */
+     * 获取 经度
+     * @return lonNotList
+     */
     public List<String> getLonNotList(){
         return this.lonNotList;
     }
 
     /**
-    * 设置 经度
-    * @param lonNotList
-    */
+     * 设置 经度
+     * @param lonNotList
+     */
     public void setLonNotList(List<String> lonNotList){
         this.lonNotList = lonNotList;
     }
 
     /**
-    * 获取 纬度
-    * @return latiList
-    */
+     * 获取 纬度
+     * @return latiList
+     */
     public List<String> getLatiList(){
         return this.latiList;
     }
 
     /**
-    * 设置 纬度
-    * @param latiList
-    */
+     * 设置 纬度
+     * @param latiList
+     */
     public void setLatiList(List<String> latiList){
         this.latiList = latiList;
     }
 
     /**
-    * 获取 纬度
-    * @return latiNotList
-    */
+     * 获取 纬度
+     * @return latiNotList
+     */
     public List<String> getLatiNotList(){
         return this.latiNotList;
     }
 
     /**
-    * 设置 纬度
-    * @param latiNotList
-    */
+     * 设置 纬度
+     * @param latiNotList
+     */
     public void setLatiNotList(List<String> latiNotList){
         this.latiNotList = latiNotList;
     }
 
     /**
-    * 获取 企业logo
-    * @return logoPathList
-    */
+     * 获取 企业logo
+     * @return logoPathList
+     */
     public List<String> getLogoPathList(){
         return this.logoPathList;
     }
 
     /**
-    * 设置 企业logo
-    * @param logoPathList
-    */
+     * 设置 企业logo
+     * @param logoPathList
+     */
     public void setLogoPathList(List<String> logoPathList){
         this.logoPathList = logoPathList;
     }
 
     /**
-    * 获取 企业logo
-    * @return logoPathNotList
-    */
+     * 获取 企业logo
+     * @return logoPathNotList
+     */
     public List<String> getLogoPathNotList(){
         return this.logoPathNotList;
     }
 
     /**
-    * 设置 企业logo
-    * @param logoPathNotList
-    */
+     * 设置 企业logo
+     * @param logoPathNotList
+     */
     public void setLogoPathNotList(List<String> logoPathNotList){
         this.logoPathNotList = logoPathNotList;
     }
 
     /**
-    * 获取 企业视频
-    * @return companyVideoPathList
-    */
+     * 获取 企业视频
+     * @return companyVideoPathList
+     */
     public List<String> getCompanyVideoPathList(){
         return this.companyVideoPathList;
     }
 
     /**
-    * 设置 企业视频
-    * @param companyVideoPathList
-    */
+     * 设置 企业视频
+     * @param companyVideoPathList
+     */
     public void setCompanyVideoPathList(List<String> companyVideoPathList){
         this.companyVideoPathList = companyVideoPathList;
     }
 
     /**
-    * 获取 企业视频
-    * @return companyVideoPathNotList
-    */
+     * 获取 企业视频
+     * @return companyVideoPathNotList
+     */
     public List<String> getCompanyVideoPathNotList(){
         return this.companyVideoPathNotList;
     }
 
     /**
-    * 设置 企业视频
-    * @param companyVideoPathNotList
-    */
+     * 设置 企业视频
+     * @param companyVideoPathNotList
+     */
     public void setCompanyVideoPathNotList(List<String> companyVideoPathNotList){
         this.companyVideoPathNotList = companyVideoPathNotList;
     }
 
     /**
-    * 获取 企业宣传图片
-    * @return companyPicPathList
-    */
+     * 获取 企业宣传图片
+     * @return companyPicPathList
+     */
     public List<String> getCompanyPicPathList(){
         return this.companyPicPathList;
     }
 
     /**
-    * 设置 企业宣传图片
-    * @param companyPicPathList
-    */
+     * 设置 企业宣传图片
+     * @param companyPicPathList
+     */
     public void setCompanyPicPathList(List<String> companyPicPathList){
         this.companyPicPathList = companyPicPathList;
     }
 
     /**
-    * 获取 企业宣传图片
-    * @return companyPicPathNotList
-    */
+     * 获取 企业宣传图片
+     * @return companyPicPathNotList
+     */
     public List<String> getCompanyPicPathNotList(){
         return this.companyPicPathNotList;
     }
 
     /**
-    * 设置 企业宣传图片
-    * @param companyPicPathNotList
-    */
+     * 设置 企业宣传图片
+     * @param companyPicPathNotList
+     */
     public void setCompanyPicPathNotList(List<String> companyPicPathNotList){
         this.companyPicPathNotList = companyPicPathNotList;
     }
 
     /**
-    * 获取 公司介绍
-    * @return companyIntroductionList
-    */
+     * 获取 公司介绍
+     * @return companyIntroductionList
+     */
     public List<String> getCompanyIntroductionList(){
         return this.companyIntroductionList;
     }
 
     /**
-    * 设置 公司介绍
-    * @param companyIntroductionList
-    */
+     * 设置 公司介绍
+     * @param companyIntroductionList
+     */
     public void setCompanyIntroductionList(List<String> companyIntroductionList){
         this.companyIntroductionList = companyIntroductionList;
     }
 
     /**
-    * 获取 公司介绍
-    * @return companyIntroductionNotList
-    */
+     * 获取 公司介绍
+     * @return companyIntroductionNotList
+     */
     public List<String> getCompanyIntroductionNotList(){
         return this.companyIntroductionNotList;
     }
 
     /**
-    * 设置 公司介绍
-    * @param companyIntroductionNotList
-    */
+     * 设置 公司介绍
+     * @param companyIntroductionNotList
+     */
     public void setCompanyIntroductionNotList(List<String> companyIntroductionNotList){
         this.companyIntroductionNotList = companyIntroductionNotList;
     }
 
     /**
-    * 获取 公司文化
-    * @return companyCultureList
-    */
+     * 获取 公司文化
+     * @return companyCultureList
+     */
     public List<String> getCompanyCultureList(){
         return this.companyCultureList;
     }
 
     /**
-    * 设置 公司文化
-    * @param companyCultureList
-    */
+     * 设置 公司文化
+     * @param companyCultureList
+     */
     public void setCompanyCultureList(List<String> companyCultureList){
         this.companyCultureList = companyCultureList;
     }
 
     /**
-    * 获取 公司文化
-    * @return companyCultureNotList
-    */
+     * 获取 公司文化
+     * @return companyCultureNotList
+     */
     public List<String> getCompanyCultureNotList(){
         return this.companyCultureNotList;
     }
 
     /**
-    * 设置 公司文化
-    * @param companyCultureNotList
-    */
+     * 设置 公司文化
+     * @param companyCultureNotList
+     */
     public void setCompanyCultureNotList(List<String> companyCultureNotList){
         this.companyCultureNotList = companyCultureNotList;
     }
 
     /**
-    * 获取 开始 排序
-    * @return sortStart
-    */
+     * 获取 开始 排序
+     * @return sortStart
+     */
     public Integer getSortStart(){
         return this.sortStart;
     }
 
     /**
-    * 设置 开始 排序
-    * @param sortStart
-    */
+     * 设置 开始 排序
+     * @param sortStart
+     */
     public void setSortStart(Integer sortStart){
         this.sortStart = sortStart;
     }
 
     /**
-    * 获取 结束 排序
-    * @return $sortEnd
-    */
+     * 获取 结束 排序
+     * @return $sortEnd
+     */
     public Integer getSortEnd(){
         return this.sortEnd;
     }
 
     /**
-    * 设置 结束 排序
-    * @param sortEnd
-    */
+     * 设置 结束 排序
+     * @param sortEnd
+     */
     public void setSortEnd(Integer sortEnd){
         this.sortEnd = sortEnd;
     }
 
     /**
-    * 获取 增加 排序
-    * @return sortIncrement
-    */
+     * 获取 增加 排序
+     * @return sortIncrement
+     */
     public Integer getSortIncrement(){
         return this.sortIncrement;
     }
 
     /**
-    * 设置 增加 排序
-    * @param sortIncrement
-    */
+     * 设置 增加 排序
+     * @param sortIncrement
+     */
     public void setSortIncrement(Integer sortIncrement){
         this.sortIncrement = sortIncrement;
     }
 
     /**
-    * 获取 排序
-    * @return sortList
-    */
+     * 获取 排序
+     * @return sortList
+     */
     public List<Integer> getSortList(){
         return this.sortList;
     }
 
     /**
-    * 设置 排序
-    * @param sortList
-    */
+     * 设置 排序
+     * @param sortList
+     */
     public void setSortList(List<Integer> sortList){
         this.sortList = sortList;
     }
 
     /**
-    * 获取 排序
-    * @return sortNotList
-    */
+     * 获取 排序
+     * @return sortNotList
+     */
     public List<Integer> getSortNotList(){
         return this.sortNotList;
     }
 
     /**
-    * 设置 排序
-    * @param sortNotList
-    */
+     * 设置 排序
+     * @param sortNotList
+     */
     public void setSortNotList(List<Integer> sortNotList){
         this.sortNotList = sortNotList;
     }
 
 
     /**
-    * 获取 开始 成立日期
-    * @return establishDateStart
-    */
+     * 获取 开始 成立日期
+     * @return establishDateStart
+     */
     public String getEstablishDateStart(){
         return this.establishDateStart;
     }
 
     /**
-    * 设置 开始 成立日期
-    * @param establishDateStart
-    */
+     * 设置 开始 成立日期
+     * @param establishDateStart
+     */
     public void setEstablishDateStart(String establishDateStart){
         this.establishDateStart = establishDateStart;
     }
 
     /**
-    * 获取 结束 成立日期
-    * @return establishDateEnd
-    */
+     * 获取 结束 成立日期
+     * @return establishDateEnd
+     */
     public String getEstablishDateEnd(){
         return this.establishDateEnd;
     }
 
     /**
-    * 设置 结束 成立日期
-    * @param establishDateEnd
-    */
+     * 设置 结束 成立日期
+     * @param establishDateEnd
+     */
     public void setEstablishDateEnd(String establishDateEnd){
         this.establishDateEnd = establishDateEnd;
     }
 
     /**
-    * 获取 备注
-    * @return remarkList
-    */
+     * 获取 备注
+     * @return remarkList
+     */
     public List<String> getRemarkList(){
         return this.remarkList;
     }
 
     /**
-    * 设置 备注
-    * @param remarkList
-    */
+     * 设置 备注
+     * @param remarkList
+     */
     public void setRemarkList(List<String> remarkList){
         this.remarkList = remarkList;
     }
 
     /**
-    * 获取 备注
-    * @return remarkNotList
-    */
+     * 获取 备注
+     * @return remarkNotList
+     */
     public List<String> getRemarkNotList(){
         return this.remarkNotList;
     }
 
     /**
-    * 设置 备注
-    * @param remarkNotList
-    */
+     * 设置 备注
+     * @param remarkNotList
+     */
     public void setRemarkNotList(List<String> remarkNotList){
         this.remarkNotList = remarkNotList;
     }
 
     /**
-    * 获取 开始 创建用户
-    * @return createUserIdStart
-    */
+     * 获取 开始 创建用户
+     * @return createUserIdStart
+     */
     public Long getCreateUserIdStart(){
         return this.createUserIdStart;
     }
 
     /**
-    * 设置 开始 创建用户
-    * @param createUserIdStart
-    */
+     * 设置 开始 创建用户
+     * @param createUserIdStart
+     */
     public void setCreateUserIdStart(Long createUserIdStart){
         this.createUserIdStart = createUserIdStart;
     }
 
     /**
-    * 获取 结束 创建用户
-    * @return $createUserIdEnd
-    */
+     * 获取 结束 创建用户
+     * @return $createUserIdEnd
+     */
     public Long getCreateUserIdEnd(){
         return this.createUserIdEnd;
     }
 
     /**
-    * 设置 结束 创建用户
-    * @param createUserIdEnd
-    */
+     * 设置 结束 创建用户
+     * @param createUserIdEnd
+     */
     public void setCreateUserIdEnd(Long createUserIdEnd){
         this.createUserIdEnd = createUserIdEnd;
     }
 
     /**
-    * 获取 增加 创建用户
-    * @return createUserIdIncrement
-    */
+     * 获取 增加 创建用户
+     * @return createUserIdIncrement
+     */
     public Long getCreateUserIdIncrement(){
         return this.createUserIdIncrement;
     }
 
     /**
-    * 设置 增加 创建用户
-    * @param createUserIdIncrement
-    */
+     * 设置 增加 创建用户
+     * @param createUserIdIncrement
+     */
     public void setCreateUserIdIncrement(Long createUserIdIncrement){
         this.createUserIdIncrement = createUserIdIncrement;
     }
 
     /**
-    * 获取 创建用户
-    * @return createUserIdList
-    */
+     * 获取 创建用户
+     * @return createUserIdList
+     */
     public List<Long> getCreateUserIdList(){
         return this.createUserIdList;
     }
 
     /**
-    * 设置 创建用户
-    * @param createUserIdList
-    */
+     * 设置 创建用户
+     * @param createUserIdList
+     */
     public void setCreateUserIdList(List<Long> createUserIdList){
         this.createUserIdList = createUserIdList;
     }
 
     /**
-    * 获取 创建用户
-    * @return createUserIdNotList
-    */
+     * 获取 创建用户
+     * @return createUserIdNotList
+     */
     public List<Long> getCreateUserIdNotList(){
         return this.createUserIdNotList;
     }
 
     /**
-    * 设置 创建用户
-    * @param createUserIdNotList
-    */
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
     public void setCreateUserIdNotList(List<Long> createUserIdNotList){
         this.createUserIdNotList = createUserIdNotList;
     }
 
 
     /**
-    * 获取 开始 创建时间
-    * @return createTimeStart
-    */
+     * 获取 开始 创建时间
+     * @return createTimeStart
+     */
     public String getCreateTimeStart(){
         return this.createTimeStart;
     }
 
     /**
-    * 设置 开始 创建时间
-    * @param createTimeStart
-    */
+     * 设置 开始 创建时间
+     * @param createTimeStart
+     */
     public void setCreateTimeStart(String createTimeStart){
         this.createTimeStart = createTimeStart;
     }
 
     /**
-    * 获取 结束 创建时间
-    * @return createTimeEnd
-    */
+     * 获取 结束 创建时间
+     * @return createTimeEnd
+     */
     public String getCreateTimeEnd(){
         return this.createTimeEnd;
     }
 
     /**
-    * 设置 结束 创建时间
-    * @param createTimeEnd
-    */
+     * 设置 结束 创建时间
+     * @param createTimeEnd
+     */
     public void setCreateTimeEnd(String createTimeEnd){
         this.createTimeEnd = createTimeEnd;
     }
 
     /**
-    * 获取 开始 更新用户
-    * @return updateUserIdStart
-    */
+     * 获取 开始 更新用户
+     * @return updateUserIdStart
+     */
     public Long getUpdateUserIdStart(){
         return this.updateUserIdStart;
     }
 
     /**
-    * 设置 开始 更新用户
-    * @param updateUserIdStart
-    */
+     * 设置 开始 更新用户
+     * @param updateUserIdStart
+     */
     public void setUpdateUserIdStart(Long updateUserIdStart){
         this.updateUserIdStart = updateUserIdStart;
     }
 
     /**
-    * 获取 结束 更新用户
-    * @return $updateUserIdEnd
-    */
+     * 获取 结束 更新用户
+     * @return $updateUserIdEnd
+     */
     public Long getUpdateUserIdEnd(){
         return this.updateUserIdEnd;
     }
 
     /**
-    * 设置 结束 更新用户
-    * @param updateUserIdEnd
-    */
+     * 设置 结束 更新用户
+     * @param updateUserIdEnd
+     */
     public void setUpdateUserIdEnd(Long updateUserIdEnd){
         this.updateUserIdEnd = updateUserIdEnd;
     }
 
     /**
-    * 获取 增加 更新用户
-    * @return updateUserIdIncrement
-    */
+     * 获取 增加 更新用户
+     * @return updateUserIdIncrement
+     */
     public Long getUpdateUserIdIncrement(){
         return this.updateUserIdIncrement;
     }
 
     /**
-    * 设置 增加 更新用户
-    * @param updateUserIdIncrement
-    */
+     * 设置 增加 更新用户
+     * @param updateUserIdIncrement
+     */
     public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
         this.updateUserIdIncrement = updateUserIdIncrement;
     }
 
     /**
-    * 获取 更新用户
-    * @return updateUserIdList
-    */
+     * 获取 更新用户
+     * @return updateUserIdList
+     */
     public List<Long> getUpdateUserIdList(){
         return this.updateUserIdList;
     }
 
     /**
-    * 设置 更新用户
-    * @param updateUserIdList
-    */
+     * 设置 更新用户
+     * @param updateUserIdList
+     */
     public void setUpdateUserIdList(List<Long> updateUserIdList){
         this.updateUserIdList = updateUserIdList;
     }
 
     /**
-    * 获取 更新用户
-    * @return updateUserIdNotList
-    */
+     * 获取 更新用户
+     * @return updateUserIdNotList
+     */
     public List<Long> getUpdateUserIdNotList(){
         return this.updateUserIdNotList;
     }
 
     /**
-    * 设置 更新用户
-    * @param updateUserIdNotList
-    */
+     * 设置 更新用户
+     * @param updateUserIdNotList
+     */
     public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
         this.updateUserIdNotList = updateUserIdNotList;
     }
 
 
     /**
-    * 获取 开始 更新时间
-    * @return updateTimeStart
-    */
+     * 获取 开始 更新时间
+     * @return updateTimeStart
+     */
     public String getUpdateTimeStart(){
         return this.updateTimeStart;
     }
 
     /**
-    * 设置 开始 更新时间
-    * @param updateTimeStart
-    */
+     * 设置 开始 更新时间
+     * @param updateTimeStart
+     */
     public void setUpdateTimeStart(String updateTimeStart){
         this.updateTimeStart = updateTimeStart;
     }
 
     /**
-    * 获取 结束 更新时间
-    * @return updateTimeEnd
-    */
+     * 获取 结束 更新时间
+     * @return updateTimeEnd
+     */
     public String getUpdateTimeEnd(){
         return this.updateTimeEnd;
     }
 
     /**
-    * 设置 结束 更新时间
-    * @param updateTimeEnd
-    */
+     * 设置 结束 更新时间
+     * @param updateTimeEnd
+     */
     public void setUpdateTimeEnd(String updateTimeEnd){
         this.updateTimeEnd = updateTimeEnd;
     }
 
     /**
-    * 设置  主键ID，主键，自增长
-    * @param id
-    */
+     * 获取 背景图片
+     * @return backgroundList
+     */
+    public List<String> getBackgroundList(){
+        return this.backgroundList;
+    }
+
+    /**
+     * 设置 背景图片
+     * @param backgroundList
+     */
+    public void setBackgroundList(List<String> backgroundList){
+        this.backgroundList = backgroundList;
+    }
+
+    /**
+     * 获取 背景图片
+     * @return backgroundNotList
+     */
+    public List<String> getBackgroundNotList(){
+        return this.backgroundNotList;
+    }
+
+    /**
+     * 设置 背景图片
+     * @param backgroundNotList
+     */
+    public void setBackgroundNotList(List<String> backgroundNotList){
+        this.backgroundNotList = backgroundNotList;
+    }
+
+    /**
+     * 设置  主键ID，主键，自增长
+     * @param id
+     */
     public CompanyQuery id(Long id){
-	    setId(id);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 主键ID，主键，自增长
-    * @param idStart
-    */
+        setId(id);
+        return this;
+    }
+
+    /**
+     * 设置 开始 主键ID，主键，自增长
+     * @param idStart
+     */
     public CompanyQuery idStart(Long idStart){
-		this.idStart = idStart;
-		return this;
+        this.idStart = idStart;
+        return this;
     }
 
     /**
-    * 设置 结束 主键ID，主键，自增长
-    * @param idEnd
-    */
+     * 设置 结束 主键ID，主键，自增长
+     * @param idEnd
+     */
     public CompanyQuery idEnd(Long idEnd){
-		this.idEnd = idEnd;
-		return this;
+        this.idEnd = idEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 主键ID，主键，自增长
-    * @param idIncrement
-    */
+     * 设置 增加 主键ID，主键，自增长
+     * @param idIncrement
+     */
     public CompanyQuery idIncrement(Long idIncrement){
-		this.idIncrement = idIncrement;
-		return this;
+        this.idIncrement = idIncrement;
+        return this;
     }
 
     /**
-    * 设置 主键ID，主键，自增长
-    * @param idList
-    */
+     * 设置 主键ID，主键，自增长
+     * @param idList
+     */
     public CompanyQuery idList(List<Long> idList){
         this.idList = idList;
-		return this;
-        }
-
-        /**
-        * 设置 主键ID，主键，自增长
-        * @param idNotList
-        */
-        public CompanyQuery idNotList(List<Long> idNotList){
+        return this;
+    }
+
+    /**
+     * 设置 主键ID，主键，自增长
+     * @param idNotList
+     */
+    public CompanyQuery idNotList(List<Long> idNotList){
         this.idNotList = idNotList;
         return this;
-        }
+    }
 
 
-	/**
-    * 设置 公司名称
-    * @param companyName
-    */
+    /**
+     * 设置 公司名称
+     * @param companyName
+     */
     public CompanyQuery companyName(String companyName){
         setCompanyName(companyName);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 公司名称
-    * @param companyNameList
-    */
+     * 设置 公司名称
+     * @param companyNameList
+     */
     public CompanyQuery companyNameList(List<String> companyNameList){
         this.companyNameList = companyNameList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 公司编码
-    * @param companyCode
-    */
+    /**
+     * 设置 公司编码
+     * @param companyCode
+     */
     public CompanyQuery companyCode(String companyCode){
         setCompanyCode(companyCode);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 公司编码
-    * @param companyCodeList
-    */
+     * 设置 公司编码
+     * @param companyCodeList
+     */
     public CompanyQuery companyCodeList(List<String> companyCodeList){
         this.companyCodeList = companyCodeList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 注册号
-    * @param registrationNumber
-    */
+    /**
+     * 设置 注册号
+     * @param registrationNumber
+     */
     public CompanyQuery registrationNumber(String registrationNumber){
         setRegistrationNumber(registrationNumber);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 注册号
-    * @param registrationNumberList
-    */
+     * 设置 注册号
+     * @param registrationNumberList
+     */
     public CompanyQuery registrationNumberList(List<String> registrationNumberList){
         this.registrationNumberList = registrationNumberList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 法定代表人
-    * @param legalRepresentative
-    */
+    /**
+     * 设置 法定代表人
+     * @param legalRepresentative
+     */
     public CompanyQuery legalRepresentative(String legalRepresentative){
         setLegalRepresentative(legalRepresentative);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 法定代表人
-    * @param legalRepresentativeList
-    */
+     * 设置 法定代表人
+     * @param legalRepresentativeList
+     */
     public CompanyQuery legalRepresentativeList(List<String> legalRepresentativeList){
         this.legalRepresentativeList = legalRepresentativeList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 注册资本
-    * @param registeredCapital
-    */
+    /**
+     * 设置 注册资本
+     * @param registeredCapital
+     */
     public CompanyQuery registeredCapital(String registeredCapital){
         setRegisteredCapital(registeredCapital);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 注册资本
-    * @param registeredCapitalList
-    */
+     * 设置 注册资本
+     * @param registeredCapitalList
+     */
     public CompanyQuery registeredCapitalList(List<String> registeredCapitalList){
         this.registeredCapitalList = registeredCapitalList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 公司类型
-    * @param companyType
-    */
+    /**
+     * 设置 公司类型
+     * @param companyType
+     */
     public CompanyQuery companyType(String companyType){
         setCompanyType(companyType);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 公司类型
-    * @param companyTypeList
-    */
+     * 设置 公司类型
+     * @param companyTypeList
+     */
     public CompanyQuery companyTypeList(List<String> companyTypeList){
         this.companyTypeList = companyTypeList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 经营范围
-    * @param businessScope
-    */
+    /**
+     * 设置 经营范围
+     * @param businessScope
+     */
     public CompanyQuery businessScope(String businessScope){
         setBusinessScope(businessScope);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 经营范围
-    * @param businessScopeList
-    */
+     * 设置 经营范围
+     * @param businessScopeList
+     */
     public CompanyQuery businessScopeList(List<String> businessScopeList){
         this.businessScopeList = businessScopeList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 经营地址
-    * @param businessAdress
-    */
+    /**
+     * 设置 经营地址
+     * @param businessAdress
+     */
     public CompanyQuery businessAdress(String businessAdress){
         setBusinessAdress(businessAdress);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 经营地址
-    * @param businessAdressList
-    */
+     * 设置 经营地址
+     * @param businessAdressList
+     */
     public CompanyQuery businessAdressList(List<String> businessAdressList){
         this.businessAdressList = businessAdressList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 所在地
-    * @param location
-    */
+    /**
+     * 设置 所在地
+     * @param location
+     */
     public CompanyQuery location(String location){
         setLocation(location);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 所在地
-    * @param locationList
-    */
+     * 设置 所在地
+     * @param locationList
+     */
     public CompanyQuery locationList(List<String> locationList){
         this.locationList = locationList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 所属区域编码
-    * @param areaCode
-    */
+    /**
+     * 设置 所属区域编码
+     * @param areaCode
+     */
     public CompanyQuery areaCode(String areaCode){
         setAreaCode(areaCode);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 所属区域编码
-    * @param areaCodeList
-    */
+     * 设置 所属区域编码
+     * @param areaCodeList
+     */
     public CompanyQuery areaCodeList(List<String> areaCodeList){
         this.areaCodeList = areaCodeList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 所属区域名称
-    * @param areaName
-    */
+    /**
+     * 设置 所属区域名称
+     * @param areaName
+     */
     public CompanyQuery areaName(String areaName){
         setAreaName(areaName);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 所属区域名称
-    * @param areaNameList
-    */
+     * 设置 所属区域名称
+     * @param areaNameList
+     */
     public CompanyQuery areaNameList(List<String> areaNameList){
         this.areaNameList = areaNameList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 联系电话
-    * @param contactPhone
-    */
+    /**
+     * 设置 联系电话
+     * @param contactPhone
+     */
     public CompanyQuery contactPhone(String contactPhone){
         setContactPhone(contactPhone);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 联系电话
-    * @param contactPhoneList
-    */
+     * 设置 联系电话
+     * @param contactPhoneList
+     */
     public CompanyQuery contactPhoneList(List<String> contactPhoneList){
         this.contactPhoneList = contactPhoneList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 电子邮件地址
-    * @param email
-    */
+    /**
+     * 设置 电子邮件地址
+     * @param email
+     */
     public CompanyQuery email(String email){
         setEmail(email);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 电子邮件地址
-    * @param emailList
-    */
+     * 设置 电子邮件地址
+     * @param emailList
+     */
     public CompanyQuery emailList(List<String> emailList){
         this.emailList = emailList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 公司网站
-    * @param website
-    */
+    /**
+     * 设置 公司网站
+     * @param website
+     */
     public CompanyQuery website(String website){
         setWebsite(website);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 公司网站
-    * @param websiteList
-    */
+     * 设置 公司网站
+     * @param websiteList
+     */
     public CompanyQuery websiteList(List<String> websiteList){
         this.websiteList = websiteList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 税务登记号
-    * @param taxRegistrationNumber
-    */
+    /**
+     * 设置 税务登记号
+     * @param taxRegistrationNumber
+     */
     public CompanyQuery taxRegistrationNumber(String taxRegistrationNumber){
         setTaxRegistrationNumber(taxRegistrationNumber);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 税务登记号
-    * @param taxRegistrationNumberList
-    */
+     * 设置 税务登记号
+     * @param taxRegistrationNumberList
+     */
     public CompanyQuery taxRegistrationNumberList(List<String> taxRegistrationNumberList){
         this.taxRegistrationNumberList = taxRegistrationNumberList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 社会信用代码
-    * @param socialCreditCode
-    */
+    /**
+     * 设置 社会信用代码
+     * @param socialCreditCode
+     */
     public CompanyQuery socialCreditCode(String socialCreditCode){
         setSocialCreditCode(socialCreditCode);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 社会信用代码
-    * @param socialCreditCodeList
-    */
+     * 设置 社会信用代码
+     * @param socialCreditCodeList
+     */
     public CompanyQuery socialCreditCodeList(List<String> socialCreditCodeList){
         this.socialCreditCodeList = socialCreditCodeList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 商标信息
-    * @param trademarkInfo
-    */
+    /**
+     * 设置 商标信息
+     * @param trademarkInfo
+     */
     public CompanyQuery trademarkInfo(String trademarkInfo){
         setTrademarkInfo(trademarkInfo);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 商标信息
-    * @param trademarkInfoList
-    */
+     * 设置 商标信息
+     * @param trademarkInfoList
+     */
     public CompanyQuery trademarkInfoList(List<String> trademarkInfoList){
         this.trademarkInfoList = trademarkInfoList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 网站历史备案信息
-    * @param websiteRegistrationInfo
-    */
+    /**
+     * 设置 网站历史备案信息
+     * @param websiteRegistrationInfo
+     */
     public CompanyQuery websiteRegistrationInfo(String websiteRegistrationInfo){
         setWebsiteRegistrationInfo(websiteRegistrationInfo);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 网站历史备案信息
-    * @param websiteRegistrationInfoList
-    */
+     * 设置 网站历史备案信息
+     * @param websiteRegistrationInfoList
+     */
     public CompanyQuery websiteRegistrationInfoList(List<String> websiteRegistrationInfoList){
         this.websiteRegistrationInfoList = websiteRegistrationInfoList;
-		return this;
+        return this;
     }
 
     /**
-    * 设置  员工总数
-    * @param totalEmployees
-    */
+     * 设置  员工总数
+     * @param totalEmployees
+     */
     public CompanyQuery totalEmployees(Integer totalEmployees){
-	    setTotalEmployees(totalEmployees);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 员工总数
-    * @param totalEmployeesStart
-    */
+        setTotalEmployees(totalEmployees);
+        return this;
+    }
+
+    /**
+     * 设置 开始 员工总数
+     * @param totalEmployeesStart
+     */
     public CompanyQuery totalEmployeesStart(Integer totalEmployeesStart){
-		this.totalEmployeesStart = totalEmployeesStart;
-		return this;
+        this.totalEmployeesStart = totalEmployeesStart;
+        return this;
     }
 
     /**
-    * 设置 结束 员工总数
-    * @param totalEmployeesEnd
-    */
+     * 设置 结束 员工总数
+     * @param totalEmployeesEnd
+     */
     public CompanyQuery totalEmployeesEnd(Integer totalEmployeesEnd){
-		this.totalEmployeesEnd = totalEmployeesEnd;
-		return this;
+        this.totalEmployeesEnd = totalEmployeesEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 员工总数
-    * @param totalEmployeesIncrement
-    */
+     * 设置 增加 员工总数
+     * @param totalEmployeesIncrement
+     */
     public CompanyQuery totalEmployeesIncrement(Integer totalEmployeesIncrement){
-		this.totalEmployeesIncrement = totalEmployeesIncrement;
-		return this;
+        this.totalEmployeesIncrement = totalEmployeesIncrement;
+        return this;
     }
 
     /**
-    * 设置 员工总数
-    * @param totalEmployeesList
-    */
+     * 设置 员工总数
+     * @param totalEmployeesList
+     */
     public CompanyQuery totalEmployeesList(List<Integer> totalEmployeesList){
         this.totalEmployeesList = totalEmployeesList;
-		return this;
-        }
-
-        /**
-        * 设置 员工总数
-        * @param totalEmployeesNotList
-        */
-        public CompanyQuery totalEmployeesNotList(List<Integer> totalEmployeesNotList){
+        return this;
+    }
+
+    /**
+     * 设置 员工总数
+     * @param totalEmployeesNotList
+     */
+    public CompanyQuery totalEmployeesNotList(List<Integer> totalEmployeesNotList){
         this.totalEmployeesNotList = totalEmployeesNotList;
         return this;
-        }
+    }
 
     /**
-    * 设置  软件著作权数量
-    * @param softNum
-    */
+     * 设置  软件著作权数量
+     * @param softNum
+     */
     public CompanyQuery softNum(Integer softNum){
-	    setSoftNum(softNum);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 软件著作权数量
-    * @param softNumStart
-    */
+        setSoftNum(softNum);
+        return this;
+    }
+
+    /**
+     * 设置 开始 软件著作权数量
+     * @param softNumStart
+     */
     public CompanyQuery softNumStart(Integer softNumStart){
-		this.softNumStart = softNumStart;
-		return this;
+        this.softNumStart = softNumStart;
+        return this;
     }
 
     /**
-    * 设置 结束 软件著作权数量
-    * @param softNumEnd
-    */
+     * 设置 结束 软件著作权数量
+     * @param softNumEnd
+     */
     public CompanyQuery softNumEnd(Integer softNumEnd){
-		this.softNumEnd = softNumEnd;
-		return this;
+        this.softNumEnd = softNumEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 软件著作权数量
-    * @param softNumIncrement
-    */
+     * 设置 增加 软件著作权数量
+     * @param softNumIncrement
+     */
     public CompanyQuery softNumIncrement(Integer softNumIncrement){
-		this.softNumIncrement = softNumIncrement;
-		return this;
+        this.softNumIncrement = softNumIncrement;
+        return this;
     }
 
     /**
-    * 设置 软件著作权数量
-    * @param softNumList
-    */
+     * 设置 软件著作权数量
+     * @param softNumList
+     */
     public CompanyQuery softNumList(List<Integer> softNumList){
         this.softNumList = softNumList;
-		return this;
-        }
-
-        /**
-        * 设置 软件著作权数量
-        * @param softNumNotList
-        */
-        public CompanyQuery softNumNotList(List<Integer> softNumNotList){
+        return this;
+    }
+
+    /**
+     * 设置 软件著作权数量
+     * @param softNumNotList
+     */
+    public CompanyQuery softNumNotList(List<Integer> softNumNotList){
         this.softNumNotList = softNumNotList;
         return this;
-        }
+    }
 
     /**
-    * 设置  专利数量
-    * @param patentNum
-    */
+     * 设置  专利数量
+     * @param patentNum
+     */
     public CompanyQuery patentNum(Integer patentNum){
-	    setPatentNum(patentNum);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 专利数量
-    * @param patentNumStart
-    */
+        setPatentNum(patentNum);
+        return this;
+    }
+
+    /**
+     * 设置 开始 专利数量
+     * @param patentNumStart
+     */
     public CompanyQuery patentNumStart(Integer patentNumStart){
-		this.patentNumStart = patentNumStart;
-		return this;
+        this.patentNumStart = patentNumStart;
+        return this;
     }
 
     /**
-    * 设置 结束 专利数量
-    * @param patentNumEnd
-    */
+     * 设置 结束 专利数量
+     * @param patentNumEnd
+     */
     public CompanyQuery patentNumEnd(Integer patentNumEnd){
-		this.patentNumEnd = patentNumEnd;
-		return this;
+        this.patentNumEnd = patentNumEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 专利数量
-    * @param patentNumIncrement
-    */
+     * 设置 增加 专利数量
+     * @param patentNumIncrement
+     */
     public CompanyQuery patentNumIncrement(Integer patentNumIncrement){
-		this.patentNumIncrement = patentNumIncrement;
-		return this;
+        this.patentNumIncrement = patentNumIncrement;
+        return this;
     }
 
     /**
-    * 设置 专利数量
-    * @param patentNumList
-    */
+     * 设置 专利数量
+     * @param patentNumList
+     */
     public CompanyQuery patentNumList(List<Integer> patentNumList){
         this.patentNumList = patentNumList;
-		return this;
-        }
-
-        /**
-        * 设置 专利数量
-        * @param patentNumNotList
-        */
-        public CompanyQuery patentNumNotList(List<Integer> patentNumNotList){
+        return this;
+    }
+
+    /**
+     * 设置 专利数量
+     * @param patentNumNotList
+     */
+    public CompanyQuery patentNumNotList(List<Integer> patentNumNotList){
         this.patentNumNotList = patentNumNotList;
         return this;
-        }
+    }
 
 
-	/**
-    * 设置 历史发展
-    * @param hisDevelop
-    */
+    /**
+     * 设置 历史发展
+     * @param hisDevelop
+     */
     public CompanyQuery hisDevelop(String hisDevelop){
         setHisDevelop(hisDevelop);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 历史发展
-    * @param hisDevelopList
-    */
+     * 设置 历史发展
+     * @param hisDevelopList
+     */
     public CompanyQuery hisDevelopList(List<String> hisDevelopList){
         this.hisDevelopList = hisDevelopList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 经度
-    * @param lon
-    */
+    /**
+     * 设置 经度
+     * @param lon
+     */
     public CompanyQuery lon(String lon){
         setLon(lon);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 经度
-    * @param lonList
-    */
+     * 设置 经度
+     * @param lonList
+     */
     public CompanyQuery lonList(List<String> lonList){
         this.lonList = lonList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 纬度
-    * @param lati
-    */
+    /**
+     * 设置 纬度
+     * @param lati
+     */
     public CompanyQuery lati(String lati){
         setLati(lati);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 纬度
-    * @param latiList
-    */
+     * 设置 纬度
+     * @param latiList
+     */
     public CompanyQuery latiList(List<String> latiList){
         this.latiList = latiList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 企业logo
-    * @param logoPath
-    */
+    /**
+     * 设置 企业logo
+     * @param logoPath
+     */
     public CompanyQuery logoPath(String logoPath){
         setLogoPath(logoPath);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 企业logo
-    * @param logoPathList
-    */
+     * 设置 企业logo
+     * @param logoPathList
+     */
     public CompanyQuery logoPathList(List<String> logoPathList){
         this.logoPathList = logoPathList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 企业视频
-    * @param companyVideoPath
-    */
+    /**
+     * 设置 企业视频
+     * @param companyVideoPath
+     */
     public CompanyQuery companyVideoPath(String companyVideoPath){
         setCompanyVideoPath(companyVideoPath);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 企业视频
-    * @param companyVideoPathList
-    */
+     * 设置 企业视频
+     * @param companyVideoPathList
+     */
     public CompanyQuery companyVideoPathList(List<String> companyVideoPathList){
         this.companyVideoPathList = companyVideoPathList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 企业宣传图片
-    * @param companyPicPath
-    */
+    /**
+     * 设置 企业宣传图片
+     * @param companyPicPath
+     */
     public CompanyQuery companyPicPath(String companyPicPath){
         setCompanyPicPath(companyPicPath);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 企业宣传图片
-    * @param companyPicPathList
-    */
+     * 设置 企业宣传图片
+     * @param companyPicPathList
+     */
     public CompanyQuery companyPicPathList(List<String> companyPicPathList){
         this.companyPicPathList = companyPicPathList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 公司介绍
-    * @param companyIntroduction
-    */
+    /**
+     * 设置 公司介绍
+     * @param companyIntroduction
+     */
     public CompanyQuery companyIntroduction(String companyIntroduction){
         setCompanyIntroduction(companyIntroduction);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 公司介绍
-    * @param companyIntroductionList
-    */
+     * 设置 公司介绍
+     * @param companyIntroductionList
+     */
     public CompanyQuery companyIntroductionList(List<String> companyIntroductionList){
         this.companyIntroductionList = companyIntroductionList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 公司文化
-    * @param companyCulture
-    */
+    /**
+     * 设置 公司文化
+     * @param companyCulture
+     */
     public CompanyQuery companyCulture(String companyCulture){
         setCompanyCulture(companyCulture);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 公司文化
-    * @param companyCultureList
-    */
+     * 设置 公司文化
+     * @param companyCultureList
+     */
     public CompanyQuery companyCultureList(List<String> companyCultureList){
         this.companyCultureList = companyCultureList;
-		return this;
+        return this;
     }
 
     /**
-    * 设置  排序
-    * @param sort
-    */
+     * 设置  排序
+     * @param sort
+     */
     public CompanyQuery sort(Integer sort){
-	    setSort(sort);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 排序
-    * @param sortStart
-    */
+        setSort(sort);
+        return this;
+    }
+
+    /**
+     * 设置 开始 排序
+     * @param sortStart
+     */
     public CompanyQuery sortStart(Integer sortStart){
-		this.sortStart = sortStart;
-		return this;
+        this.sortStart = sortStart;
+        return this;
     }
 
     /**
-    * 设置 结束 排序
-    * @param sortEnd
-    */
+     * 设置 结束 排序
+     * @param sortEnd
+     */
     public CompanyQuery sortEnd(Integer sortEnd){
-		this.sortEnd = sortEnd;
-		return this;
+        this.sortEnd = sortEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 排序
-    * @param sortIncrement
-    */
+     * 设置 增加 排序
+     * @param sortIncrement
+     */
     public CompanyQuery sortIncrement(Integer sortIncrement){
-		this.sortIncrement = sortIncrement;
-		return this;
+        this.sortIncrement = sortIncrement;
+        return this;
     }
 
     /**
-    * 设置 排序
-    * @param sortList
-    */
+     * 设置 排序
+     * @param sortList
+     */
     public CompanyQuery sortList(List<Integer> sortList){
         this.sortList = sortList;
-		return this;
-        }
-
-        /**
-        * 设置 排序
-        * @param sortNotList
-        */
-        public CompanyQuery sortNotList(List<Integer> sortNotList){
+        return this;
+    }
+
+    /**
+     * 设置 排序
+     * @param sortNotList
+     */
+    public CompanyQuery sortNotList(List<Integer> sortNotList){
         this.sortNotList = sortNotList;
         return this;
-        }
+    }
 
 
 
-	/**
-    * 设置 备注
-    * @param remark
-    */
+    /**
+     * 设置 备注
+     * @param remark
+     */
     public CompanyQuery remark(String remark){
         setRemark(remark);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 备注
-    * @param remarkList
-    */
+     * 设置 备注
+     * @param remarkList
+     */
     public CompanyQuery remarkList(List<String> remarkList){
         this.remarkList = remarkList;
-		return this;
+        return this;
     }
 
     /**
-    * 设置  创建用户
-    * @param createUserId
-    */
+     * 设置  创建用户
+     * @param createUserId
+     */
     public CompanyQuery createUserId(Long createUserId){
-	    setCreateUserId(createUserId);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 创建用户
-    * @param createUserIdStart
-    */
+        setCreateUserId(createUserId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 创建用户
+     * @param createUserIdStart
+     */
     public CompanyQuery createUserIdStart(Long createUserIdStart){
-		this.createUserIdStart = createUserIdStart;
-		return this;
+        this.createUserIdStart = createUserIdStart;
+        return this;
     }
 
     /**
-    * 设置 结束 创建用户
-    * @param createUserIdEnd
-    */
+     * 设置 结束 创建用户
+     * @param createUserIdEnd
+     */
     public CompanyQuery createUserIdEnd(Long createUserIdEnd){
-		this.createUserIdEnd = createUserIdEnd;
-		return this;
+        this.createUserIdEnd = createUserIdEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 创建用户
-    * @param createUserIdIncrement
-    */
+     * 设置 增加 创建用户
+     * @param createUserIdIncrement
+     */
     public CompanyQuery createUserIdIncrement(Long createUserIdIncrement){
-		this.createUserIdIncrement = createUserIdIncrement;
-		return this;
+        this.createUserIdIncrement = createUserIdIncrement;
+        return this;
     }
 
     /**
-    * 设置 创建用户
-    * @param createUserIdList
-    */
+     * 设置 创建用户
+     * @param createUserIdList
+     */
     public CompanyQuery createUserIdList(List<Long> createUserIdList){
         this.createUserIdList = createUserIdList;
-		return this;
-        }
-
-        /**
-        * 设置 创建用户
-        * @param createUserIdNotList
-        */
-        public CompanyQuery createUserIdNotList(List<Long> createUserIdNotList){
+        return this;
+    }
+
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public CompanyQuery createUserIdNotList(List<Long> createUserIdNotList){
         this.createUserIdNotList = createUserIdNotList;
         return this;
-        }
+    }
 
 
     /**
-    * 设置  更新用户
-    * @param updateUserId
-    */
+     * 设置  更新用户
+     * @param updateUserId
+     */
     public CompanyQuery updateUserId(Long updateUserId){
-	    setUpdateUserId(updateUserId);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 更新用户
-    * @param updateUserIdStart
-    */
+        setUpdateUserId(updateUserId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 更新用户
+     * @param updateUserIdStart
+     */
     public CompanyQuery updateUserIdStart(Long updateUserIdStart){
-		this.updateUserIdStart = updateUserIdStart;
-		return this;
+        this.updateUserIdStart = updateUserIdStart;
+        return this;
     }
 
     /**
-    * 设置 结束 更新用户
-    * @param updateUserIdEnd
-    */
+     * 设置 结束 更新用户
+     * @param updateUserIdEnd
+     */
     public CompanyQuery updateUserIdEnd(Long updateUserIdEnd){
-		this.updateUserIdEnd = updateUserIdEnd;
-		return this;
+        this.updateUserIdEnd = updateUserIdEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 更新用户
-    * @param updateUserIdIncrement
-    */
+     * 设置 增加 更新用户
+     * @param updateUserIdIncrement
+     */
     public CompanyQuery updateUserIdIncrement(Long updateUserIdIncrement){
-		this.updateUserIdIncrement = updateUserIdIncrement;
-		return this;
+        this.updateUserIdIncrement = updateUserIdIncrement;
+        return this;
     }
 
     /**
-    * 设置 更新用户
-    * @param updateUserIdList
-    */
+     * 设置 更新用户
+     * @param updateUserIdList
+     */
     public CompanyQuery updateUserIdList(List<Long> updateUserIdList){
         this.updateUserIdList = updateUserIdList;
-		return this;
-        }
-
-        /**
-        * 设置 更新用户
-        * @param updateUserIdNotList
-        */
-        public CompanyQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+        return this;
+    }
+
+    /**
+     * 设置 更新用户
+     * @param updateUserIdNotList
+     */
+    public CompanyQuery updateUserIdNotList(List<Long> updateUserIdNotList){
         this.updateUserIdNotList = updateUserIdNotList;
         return this;
-        }
+    }
 
 
+
+    /**
+     * 设置 背景图片
+     * @param background
+     */
+    public CompanyQuery background(String background){
+        setBackground(background);
+        return this;
+    }
+
+    /**
+     * 设置 背景图片
+     * @param backgroundList
+     */
+    public CompanyQuery backgroundList(List<String> backgroundList){
+        this.backgroundList = backgroundList;
+        return this;
+    }
+
     /**
-    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @return orConditionList
-    */
+     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @return orConditionList
+     */
     public List<CompanyQuery> getOrConditionList(){
-    return this.orConditionList;
+        return this.orConditionList;
     }
 
     /**
-    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @param orConditionList
-    */
+     * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @param orConditionList
+     */
     public void setOrConditionList(List<CompanyQuery> orConditionList){
         this.orConditionList = orConditionList;
     }
 
     /**
-    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @return andConditionList
-    */
+     * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @return andConditionList
+     */
     public List<CompanyQuery> getAndConditionList(){
         return this.andConditionList;
     }
 
     /**
-    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @param andConditionList
-    */
+     * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @param andConditionList
+     */
     public void setAndConditionList(List<CompanyQuery> andConditionList){
         this.andConditionList = andConditionList;
     }

enterprise-manager/src/main/java/com/mortals/xhx/module/company/service/impl/CompanyServiceImpl.java

@@ -86,7 +86,34 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
     @Autowired
     private LabelsService labelsService;
 
+    @Override
+    protected void findAfter(CompanyEntity params,PageInfo pageInfo, Context context, List<CompanyEntity> list) throws AppException {
+        fillSubData(list);
+        super.findAfter(params,pageInfo, context, list);
+    }
+    @Override
+    protected void findAfter(CompanyEntity params, Context context, List<CompanyEntity> list) throws AppException {
+        fillSubData(list);
+        super.findAfter(params, context, list);
+    }
+
+    private void fillSubData(List<CompanyEntity> list) {
+        List<Long> idList = list.stream().map(i -> i.getId()).collect(Collectors.toList());
+        if(ObjectUtils.isEmpty(idList))return;
+        Map<Long, List<CompanyLabelsEntity>> companyLabelsListMap = companyLabelsService
+                .find(new CompanyLabelsQuery().companyIdList(idList)).parallelStream()
+                .collect(Collectors.groupingBy(CompanyLabelsEntity::getCompanyId));
+
+        List<CompanyPatentEntity> companyPatentEntities = companyPatentService.find(new CompanyPatentQuery().companyIdList(idList));
+        Map<Long, List<CompanyPatentEntity>> companyPatentListMap = companyPatentEntities.parallelStream().collect((Collectors.groupingBy(CompanyPatentEntity::getCompanyId)));
+
+        list.forEach(item -> {
+            item.setCompanyLabelsList(companyLabelsListMap.get(item.getId()));
+            item.setCompanyPatentsList(companyPatentListMap.get(item.getId()));
+        });
+    }
 
+/*
     @Override
     protected void findAfter(CompanyEntity params, PageInfo pageInfo, Context context, List<CompanyEntity> list) throws AppException {
 
@@ -95,6 +122,7 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
             item.setCompanyPatentsList(companyPatentEntities);
         }).count();
     }
+*/
 
     @Override
     protected void saveAfter(CompanyEntity entity, Context context) throws AppException {

enterprise-manager/src/main/java/com/mortals/xhx/module/company/web/CompanyController.java

@@ -7,8 +7,7 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.YesNoEnum;
-import com.mortals.xhx.module.company.model.CompanyPatentEntity;
-import com.mortals.xhx.module.company.model.CompanyPatentQuery;
+import com.mortals.xhx.module.company.model.*;
 import com.mortals.xhx.module.company.model.vo.HomeStatInfo;
 import com.mortals.xhx.module.company.service.CompanyLabelsService;
 import com.mortals.xhx.module.company.service.CompanyPatentService;
@@ -26,7 +25,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.company.model.CompanyEntity;
 import com.mortals.xhx.module.company.service.CompanyService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
@@ -62,6 +60,9 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company
     private LabelsService labelsService;
     @Autowired
     private CompanyPatentService companyPatentService;
+    @Autowired
+    private CompanyLabelsService companyLabelsService;
+
 
 
     public CompanyController() {
@@ -84,6 +85,10 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company
     protected int editAfter(Long id, Map<String, Object> model, CompanyEntity entity, Context context) throws AppException {
 
         List<CompanyPatentEntity> companyPatentEntities = companyPatentService.find(new CompanyPatentQuery().companyId(entity.getId()));
+
+        List<CompanyLabelsEntity> companyLabelsEntities = companyLabelsService.find(new CompanyLabelsQuery().companyId(entity.getId()));
+
+        entity.setCompanyLabelsList(companyLabelsEntities);
         entity.setCompanyPatentsList(companyPatentEntities);
 
 
@@ -95,6 +100,8 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company
     protected int viewAfter(Long id, Map<String, Object> model, CompanyEntity entity, Context context) throws AppException {
 
         List<CompanyPatentEntity> companyPatentEntities = companyPatentService.find(new CompanyPatentQuery().companyId(entity.getId()));
+        List<CompanyLabelsEntity> companyLabelsEntities = companyLabelsService.find(new CompanyLabelsQuery().companyId(entity.getId()));
+        entity.setCompanyLabelsList(companyLabelsEntities);
         entity.setCompanyPatentsList(companyPatentEntities);
 
         return super.viewAfter(id, model, entity, context);

enterprise-manager/src/main/java/com/mortals/xhx/module/news/service/impl/NewsServiceImpl.java

@@ -58,7 +58,7 @@ public class NewsServiceImpl extends AbstractCRUDServiceImpl<NewsDao, NewsEntity
                 List<NewsUpEntity> upList = newsUpService.find(new NewsUpQuery().newsIdList(newsIdList).upId(context.getUser().getId()));
                 Map<Long,NewsUpEntity> upMap = new HashMap<>();
                 if(CollectionUtils.isNotEmpty(upList)){
-                    upMap = upList.parallelStream().collect(Collectors.toMap(x -> x.getId(), z -> z, (o, n) -> n));
+                    upMap = upList.parallelStream().collect(Collectors.toMap(x -> x.getNewsId(), z -> z, (o, n) -> n));
                 }
                 List<NewsShareEntity> shareList = newsShareService.find(new NewsShareQuery().newsIdList(newsIdList).createUserId(context.getUser().getId()));
                 Map<Long,NewsShareEntity> shareMap = new HashMap<>();

enterprise-manager/src/test/java/com/mortals/httpclient/company/CompanyController.http

@@ -14,10 +14,11 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 %}
 
 ###公司列表
-POST {{baseUrl}}/company/list
+POST {{baseUrl}}/company/interlist
 Content-Type: application/json
 
 {
+  "id": 5,
     "page":1,
     "size":10
 }