添加根据区域编码查询基础事项

sample-form-manager-ui/admin/src/pages/software/librarymanage/LibraryManage.vue

@@ -14,29 +14,29 @@
           >
         </div>
         <div slot="right" class="flex">
-<!--          <el-select
+          <el-select
             v-model="department"
             size="small"
             class="autoWidth"
             placeholder="选择部门"
           >
             <template slot="prefix">
-              {{ (deptList.find((v) => v.id === department) || {}).name }}
+              {{ (deptList.find((v) => v.deptNumber === department) || {}).name }}
             </template>
             <el-option
               v-for="item in deptList"
-              :key="item.id"
+              :key="item.deptNumber"
               :label="item.name"
-              :value="item.id"
+              :value="item.deptNumber"
             >
             </el-option>
-          </el-select>-->
+          </el-select>
           <el-input
             size="small"
             v-model="searchVal"
             style="width: 200px"
             class="ml10 mr10"
-            placeholder="请输入事项名称搜索"
+            placeholder="请输入材料名称搜索"
           ></el-input>
           <el-button size="small" type="primary" @click="handleSearch"
             >搜索</el-button
@@ -70,9 +70,9 @@
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            label="部门编号"
+            label="部门名称"
             align="center"
-            prop="deptCode"
+            prop="deptName"
             width="160"
           >
           </el-table-column>
@@ -136,6 +136,7 @@
 import TableHeader from "@/components/TableHeader.vue";
 import PreviewMaterals from "./modal/PreviewMaterals.vue";
 import { getPubdatumList,delPubdatum } from "@/api/libray";
+import { mapGetters } from "vuex";
 export default {
   components: {
     TableHeader,
@@ -161,9 +162,9 @@ export default {
   created() {
     this.getPbuList();
   },
-  // computed: {
-  //   ...mapGetters(["deptList"]),
-  // },
+  computed: {
+    ...mapGetters(["deptList"]),
+  },
   methods: {
     // 系统事项列表
     async getPbuList() {

sample-form-manager-ui/admin/src/pages/software/materials/MaterialsManage.vue

@@ -19,13 +19,13 @@
               class="autoWidth"
             >
               <template slot="prefix">
-                {{ (deptList.find((v) => v.id === departmentLeft) || {}).name }}
+                {{ (deptList.find((v) => v.deptNumber === departmentLeft) || {}).name }}
               </template>
               <el-option
                 v-for="item in deptList"
-                :key="item.id"
+                :key="item.deptNumber"
                 :label="item.name"
-                :value="item.id"
+                :value="item.deptNumber"
               >
               </el-option>
             </el-select>
@@ -68,9 +68,9 @@
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
-                label="部门编号"
+                label="部门名称"
                 align="center"
-                prop="deptCode"
+                prop="deptName"
               >
               </el-table-column>
               <el-table-column
@@ -189,9 +189,9 @@
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
-              label="部门编码"
+              label="部门名称"
               align="center"
-              prop="deptCode"
+              prop="deptName"
             >
             </el-table-column>
             <el-table-column prop="name" show-overflow-tooltip label="材料名称">

sample-form-manager-ui/admin/src/pages/software/matter/MatterManage.vue

@@ -23,7 +23,7 @@
               class="autoWidth"
             >
               <template slot="prefix">
-                {{ (deptList.find((v) => v.deptCode === departmentLeft) || {}).name }}
+                {{ (deptList.find((v) => v.deptNumber === departmentLeft) || {}).name }}
               </template>
               <el-option
                 v-for="item in deptList"
@@ -72,9 +72,9 @@
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
-              label="部门编号"
+              label="部门名称"
               align="center"
-              prop="deptCode"
+              prop="deptName"
             >
             </el-table-column>
             <el-table-column prop="matterName" show-overflow-tooltip label="事项名称">
@@ -169,7 +169,7 @@
             >
               <template slot="prefix">
                 {{
-                  (deptList.find((v) => v.deptCode === departmentRight) || {}).name
+                  (deptList.find((v) => v.deptNumber === departmentRight) || {}).name
                 }}
               </template>
               <el-option
@@ -223,9 +223,9 @@
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
-              label="部门编号"
+              label="部门名称"
               align="center"
-              prop="deptCode"
+              prop="deptName"
             >
             </el-table-column>
             <el-table-column

sample-form-manager/db/module.sql

@@ -120,49 +120,52 @@ CREATE TABLE mortals_xhx_matter
 -- ----------------------------
 DROP TABLE IF EXISTS `mortals_xhx_matter_datum`;
 CREATE TABLE mortals_xhx_matter_datum(
-     `id` bigint(20)   AUTO_INCREMENT  COMMENT '主键，自增长',
-     `matterId` bigint(20)     COMMENT '事项matter id',
-     `siteId` bigint(20)     COMMENT '站点ID',
-     `deptId` bigint(20)     COMMENT '部门ID',
-     `deptCode` varchar(64)     COMMENT '部门编号',
-     `materialName` varchar(1024) NOT NULL    COMMENT '材料名',
-     `materiaFullName` varchar(1024) NOT NULL    COMMENT '材料全名',
-     `source` tinyint(2)     COMMENT '事项来源(0.政务网，1.自定义)',
-     `isRecommend` tinyint(2)     COMMENT '是否推荐(0.未推荐，1.推荐)',
-     `total` int(8)     COMMENT '填单次数',
-     `sort` int(4)     COMMENT '排序',
-     `sampleName` varchar(255)     COMMENT '样表名称',
-     `samplePath` varchar(255)     COMMENT '样表地址',
-     `preViewPath` varchar(255)     COMMENT '样表预览地址',
-     `createTime` datetime     COMMENT '创建时间',
-     `createUserId` bigint(20)     COMMENT '创建用户',
-     `updateTime` datetime     COMMENT '修改时间',
-     PRIMARY KEY  (`id`)
+                                         `id` bigint(20)   AUTO_INCREMENT  COMMENT '主键，自增长',
+                                         `matterId` bigint(20)     COMMENT '事项matter id',
+                                         `siteId` bigint(20)     COMMENT '站点ID',
+                                         `deptId` bigint(20)     COMMENT '部门ID',
+                                         `deptCode` varchar(256)     COMMENT '部门编号',
+                                         `deptName` varchar(256)     COMMENT '部门名称',
+                                         `materialName` varchar(1024) NOT NULL    COMMENT '材料名',
+                                         `materiaFullName` varchar(1024) NOT NULL    COMMENT '材料全名',
+                                         `source` tinyint(2)     COMMENT '事项来源(0.政务网，1.自定义)',
+                                         `isRecommend` tinyint(2)     COMMENT '是否推荐(0.未推荐，1.推荐)',
+                                         `total` int(8)     COMMENT '填单次数',
+                                         `sort` int(4)     COMMENT '排序',
+                                         `sampleName` varchar(255)     COMMENT '样表名称',
+                                         `samplePath` varchar(255)     COMMENT '样表地址',
+                                         `preViewPath` varchar(255)     COMMENT '样表预览地址',
+                                         `createTime` datetime     COMMENT '创建时间',
+                                         `createUserId` bigint(20)     COMMENT '创建用户',
+                                         `updateTime` datetime     COMMENT '修改时间',
+                                         PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项申请材料业务';
 
 
 
+
+
 -- ----------------------------
 -- 事项材料公共库表
 -- ----------------------------
 DROP TABLE IF EXISTS `mortals_xhx_pubdatum`;
-CREATE TABLE mortals_xhx_pubdatum
-(
-    `id`              bigint(20) AUTO_INCREMENT COMMENT '主键，自增长',
-    `matterId`        bigint(20) COMMENT '事项matter id',
-    `deptId`          bigint(20) COMMENT '部门ID',
-    `deptCode`        varchar(64) COMMENT '部门编号',
-    `materialName`    varchar(1024) NOT NULL COMMENT '材料名',
-    `materiaFullName` varchar(1024) NOT NULL COMMENT '材料全名',
-    `total`           int(8) COMMENT '填单次数',
-    `sort`            int(4) COMMENT '排序',
-    `sampleName`      varchar(255) COMMENT '样表名称',
-    `samplePath`      varchar(255) COMMENT '样表地址',
-    `preViewPath`     varchar(255) COMMENT '样表预览地址',
-    `createTime`      datetime COMMENT '创建时间',
-    `createUserId`    bigint(20) COMMENT '创建用户',
-    `updateTime`      datetime COMMENT '修改时间',
-    PRIMARY KEY (`id`)
+CREATE TABLE mortals_xhx_pubdatum(
+                                     `id` bigint(20)   AUTO_INCREMENT  COMMENT '主键，自增长',
+                                     `matterId` bigint(20)     COMMENT '事项matter id',
+                                     `deptId` bigint(20)     COMMENT '部门ID',
+                                     `deptCode` varchar(256)     COMMENT '部门编号',
+                                     `deptName` varchar(256)     COMMENT '部门名称',
+                                     `materialName` varchar(1024) NOT NULL    COMMENT '材料名',
+                                     `materiaFullName` varchar(1024) NOT NULL    COMMENT '材料全名',
+                                     `total` int(8)     COMMENT '填单次数',
+                                     `sort` int(4)     COMMENT '排序',
+                                     `sampleName` varchar(255)     COMMENT '样表名称',
+                                     `samplePath` varchar(255)     COMMENT '样表地址',
+                                     `preViewPath` varchar(255)     COMMENT '样表预览地址',
+                                     `createTime` datetime     COMMENT '创建时间',
+                                     `createUserId` bigint(20)     COMMENT '创建用户',
+                                     `updateTime` datetime     COMMENT '修改时间',
+                                     PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项材料公共库';
 
 
@@ -171,3 +174,5 @@ CREATE TABLE mortals_xhx_pubdatum
 
 
 
+
+

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumEntity.java

@@ -10,7 +10,7 @@ import com.mortals.xhx.module.matter.model.vo.MatterDatumVo;
  * 事项申请材料业务实体对象
  *
  * @author zxfei
- * @date 2022-11-11
+ * @date 2022-11-17
  */
 
 public class MatterDatumEntity extends MatterDatumVo {
@@ -32,6 +32,10 @@ public class MatterDatumEntity extends MatterDatumVo {
      * 部门编号
      */
     private String deptCode;
+    /**
+     * 部门名称
+     */
+    private String deptName;
     /**
      * 材料名
      */
@@ -128,6 +132,20 @@ public class MatterDatumEntity extends MatterDatumVo {
     public void setDeptCode(String deptCode){
         this.deptCode = deptCode;
     }
+    /**
+     * 获取 部门名称
+     * @return String
+     */
+    public String getDeptName(){
+        return deptName;
+    }
+    /**
+     * 设置 部门名称
+     * @param deptName
+     */
+    public void setDeptName(String deptName){
+        this.deptName = deptName;
+    }
     /**
      * 获取 材料名
      * @return String
@@ -280,6 +298,7 @@ public class MatterDatumEntity extends MatterDatumVo {
         sb.append(",siteId:").append(getSiteId());
         sb.append(",deptId:").append(getDeptId());
         sb.append(",deptCode:").append(getDeptCode());
+        sb.append(",deptName:").append(getDeptName());
         sb.append(",materialName:").append(getMaterialName());
         sb.append(",materiaFullName:").append(getMateriaFullName());
         sb.append(",source:").append(getSource());
@@ -302,6 +321,8 @@ public class MatterDatumEntity extends MatterDatumVo {
 
         this.deptCode = "";
 
+        this.deptName = "";
+
         this.materialName = "";
 
         this.materiaFullName = "";

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.matter.model.MatterDatumEntity;
  * 事项申请材料业务查询对象
  *
  * @author zxfei
- * @date 2022-11-11
+ * @date 2022-11-17
  */
 public class MatterDatumQuery extends MatterDatumEntity {
     /** 开始 主键，自增长 */
@@ -60,6 +60,9 @@ public class MatterDatumQuery extends MatterDatumEntity {
     /** 部门编号 */
     private List<String> deptCodeList;
 
+    /** 部门名称 */
+    private List<String> deptNameList;
+
     /** 材料名 */
     private List<String> materialNameList;
 
@@ -426,6 +429,21 @@ public class MatterDatumQuery extends MatterDatumEntity {
     public void setDeptCodeList(List<String> deptCodeList){
         this.deptCodeList = deptCodeList;
     }
+    /**
+     * 获取 部门名称
+     * @return deptNameList
+     */
+    public List<String> getDeptNameList(){
+        return this.deptNameList;
+    }
+
+    /**
+     * 设置 部门名称
+     * @param deptNameList
+     */
+    public void setDeptNameList(List<String> deptNameList){
+        this.deptNameList = deptNameList;
+    }
     /**
      * 获取 材料名
      * @return materialNameList
@@ -1085,6 +1103,25 @@ public class MatterDatumQuery extends MatterDatumEntity {
     }
 
 
+    /**
+     * 设置 部门名称
+     * @param deptName
+     */
+    public MatterDatumQuery deptName(String deptName){
+        setDeptName(deptName);
+        return this;
+    }
+
+    /**
+     * 设置 部门名称
+     * @param deptNameList
+     */
+    public MatterDatumQuery deptNameList(List<String> deptNameList){
+        this.deptNameList = deptNameList;
+        return this;
+    }
+
+
     /**
      * 设置 材料名
      * @param materialName

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -96,6 +96,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
             matterEntity.initAttrValue();
             matterEntity.setSiteId(siteId);
             matterEntity.setDeptCode(sheetMatterEntity.getDeptCode());
+            matterEntity.setDeptName(sheetMatterEntity.getDeptName());
             matterEntity.setTid(sheetMatterEntity.getTid());
             matterEntity.setTcode(sheetMatterEntity.getTcode());
             matterEntity.setTname(sheetMatterEntity.getTname());

sample-form-manager/src/main/java/com/mortals/xhx/module/pubdatum/model/PubdatumEntity.java

@@ -7,196 +7,214 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.pubdatum.model.vo.PubdatumVo;
 /**
-* 事项材料公共库实体对象
-*
-* @author zxfei
-* @date 2022-11-10
-*/
+ * 事项材料公共库实体对象
+ *
+ * @author zxfei
+ * @date 2022-11-17
+ */
 
 public class PubdatumEntity extends PubdatumVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 事项matter id
-    */
+     * 事项matter id
+     */
     private Long matterId;
     /**
-    * 部门ID
-    */
+     * 部门ID
+     */
     private Long deptId;
     /**
-    * 部门编号
-    */
+     * 部门编号
+     */
     private String deptCode;
     /**
-    * 材料名
-    */
+     * 部门名称
+     */
+    private String deptName;
+    /**
+     * 材料名
+     */
     private String materialName;
     /**
-    * 材料全名
-    */
+     * 材料全名
+     */
     private String materiaFullName;
     /**
-    * 填单次数
-    */
+     * 填单次数
+     */
     private Integer total;
     /**
-    * 排序
-    */
+     * 排序
+     */
     private Integer sort;
     /**
-    * 样表名称
-    */
+     * 样表名称
+     */
     private String sampleName;
     /**
-    * 样表地址
-    */
+     * 样表地址
+     */
     private String samplePath;
     /**
-    * 样表预览地址
-    */
+     * 样表预览地址
+     */
     private String preViewPath;
 
 
 
     public PubdatumEntity(){}
     /**
-    * 获取 事项matter id
-    * @return Long
-    */
+     * 获取 事项matter id
+     * @return Long
+     */
     public Long getMatterId(){
         return matterId;
     }
     /**
-    * 设置 事项matter id
-    * @param matterId
-    */
+     * 设置 事项matter id
+     * @param matterId
+     */
     public void setMatterId(Long matterId){
         this.matterId = matterId;
     }
     /**
-    * 获取 部门ID
-    * @return Long
-    */
+     * 获取 部门ID
+     * @return Long
+     */
     public Long getDeptId(){
         return deptId;
     }
     /**
-    * 设置 部门ID
-    * @param deptId
-    */
+     * 设置 部门ID
+     * @param deptId
+     */
     public void setDeptId(Long deptId){
         this.deptId = deptId;
     }
     /**
-    * 获取 部门编号
-    * @return String
-    */
+     * 获取 部门编号
+     * @return String
+     */
     public String getDeptCode(){
         return deptCode;
     }
     /**
-    * 设置 部门编号
-    * @param deptCode
-    */
+     * 设置 部门编号
+     * @param deptCode
+     */
     public void setDeptCode(String deptCode){
         this.deptCode = deptCode;
     }
     /**
-    * 获取 材料名
-    * @return String
-    */
+     * 获取 部门名称
+     * @return String
+     */
+    public String getDeptName(){
+        return deptName;
+    }
+    /**
+     * 设置 部门名称
+     * @param deptName
+     */
+    public void setDeptName(String deptName){
+        this.deptName = deptName;
+    }
+    /**
+     * 获取 材料名
+     * @return String
+     */
     public String getMaterialName(){
         return materialName;
     }
     /**
-    * 设置 材料名
-    * @param materialName
-    */
+     * 设置 材料名
+     * @param materialName
+     */
     public void setMaterialName(String materialName){
         this.materialName = materialName;
     }
     /**
-    * 获取 材料全名
-    * @return String
-    */
+     * 获取 材料全名
+     * @return String
+     */
     public String getMateriaFullName(){
         return materiaFullName;
     }
     /**
-    * 设置 材料全名
-    * @param materiaFullName
-    */
+     * 设置 材料全名
+     * @param materiaFullName
+     */
     public void setMateriaFullName(String materiaFullName){
         this.materiaFullName = materiaFullName;
     }
     /**
-    * 获取 填单次数
-    * @return Integer
-    */
+     * 获取 填单次数
+     * @return Integer
+     */
     public Integer getTotal(){
         return total;
     }
     /**
-    * 设置 填单次数
-    * @param total
-    */
+     * 设置 填单次数
+     * @param total
+     */
     public void setTotal(Integer total){
         this.total = total;
     }
     /**
-    * 获取 排序
-    * @return Integer
-    */
+     * 获取 排序
+     * @return Integer
+     */
     public Integer getSort(){
         return sort;
     }
     /**
-    * 设置 排序
-    * @param sort
-    */
+     * 设置 排序
+     * @param sort
+     */
     public void setSort(Integer sort){
         this.sort = sort;
     }
     /**
-    * 获取 样表名称
-    * @return String
-    */
+     * 获取 样表名称
+     * @return String
+     */
     public String getSampleName(){
         return sampleName;
     }
     /**
-    * 设置 样表名称
-    * @param sampleName
-    */
+     * 设置 样表名称
+     * @param sampleName
+     */
     public void setSampleName(String sampleName){
         this.sampleName = sampleName;
     }
     /**
-    * 获取 样表地址
-    * @return String
-    */
+     * 获取 样表地址
+     * @return String
+     */
     public String getSamplePath(){
         return samplePath;
     }
     /**
-    * 设置 样表地址
-    * @param samplePath
-    */
+     * 设置 样表地址
+     * @param samplePath
+     */
     public void setSamplePath(String samplePath){
         this.samplePath = samplePath;
     }
     /**
-    * 获取 样表预览地址
-    * @return String
-    */
+     * 获取 样表预览地址
+     * @return String
+     */
     public String getPreViewPath(){
         return preViewPath;
     }
     /**
-    * 设置 样表预览地址
-    * @param preViewPath
-    */
+     * 设置 样表预览地址
+     * @param preViewPath
+     */
     public void setPreViewPath(String preViewPath){
         this.preViewPath = preViewPath;
     }
@@ -206,7 +224,7 @@ public class PubdatumEntity extends PubdatumVo {
 
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -214,7 +232,7 @@ public class PubdatumEntity extends PubdatumVo {
         if (obj instanceof PubdatumEntity) {
             PubdatumEntity tmp = (PubdatumEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
@@ -225,6 +243,7 @@ public class PubdatumEntity extends PubdatumVo {
         sb.append(",matterId:").append(getMatterId());
         sb.append(",deptId:").append(getDeptId());
         sb.append(",deptCode:").append(getDeptCode());
+        sb.append(",deptName:").append(getDeptName());
         sb.append(",materialName:").append(getMaterialName());
         sb.append(",materiaFullName:").append(getMateriaFullName());
         sb.append(",total:").append(getTotal());
@@ -237,24 +256,26 @@ public class PubdatumEntity extends PubdatumVo {
 
     public void initAttrValue(){
 
-            this.matterId = null;
+        this.matterId = null;
+
+        this.deptId = null;
 
-            this.deptId = null;
+        this.deptCode = "";
 
-            this.deptCode = "";
+        this.deptName = "";
 
-            this.materialName = "";
+        this.materialName = "";
 
-            this.materiaFullName = "";
+        this.materiaFullName = "";
 
-            this.total = null;
+        this.total = null;
 
-            this.sort = null;
+        this.sort = null;
 
-            this.sampleName = "";
+        this.sampleName = "";
 
-            this.samplePath = "";
+        this.samplePath = "";
 
-            this.preViewPath = "";
+        this.preViewPath = "";
     }
 }
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/pubdatum/model/PubdatumQuery.java

@@ -3,11 +3,11 @@ package com.mortals.xhx.module.pubdatum.model;
 import java.util.List;
 import com.mortals.xhx.module.pubdatum.model.PubdatumEntity;
 /**
-* 事项材料公共库查询对象
-*
-* @author zxfei
-* @date 2022-11-10
-*/
+ * 事项材料公共库查询对象
+ *
+ * @author zxfei
+ * @date 2022-11-17
+ */
 public class PubdatumQuery extends PubdatumEntity {
     /** 开始 主键，自增长 */
     private Long idStart;
@@ -48,6 +48,9 @@ public class PubdatumQuery extends PubdatumEntity {
     /** 部门编号 */
     private List<String> deptCodeList;
 
+    /** 部门名称 */
+    private List<String> deptNameList;
+
     /** 材料名 */
     private List<String> materialNameList;
 
@@ -120,957 +123,991 @@ public class PubdatumQuery extends PubdatumEntity {
     public PubdatumQuery(){}
 
     /**
-    * 获取 开始 主键，自增长
-    * @return idStart
-    */
+     * 获取 开始 主键，自增长
+     * @return idStart
+     */
     public Long getIdStart(){
         return this.idStart;
     }
 
     /**
-    * 设置 开始 主键，自增长
-    * @param idStart
-    */
+     * 设置 开始 主键，自增长
+     * @param idStart
+     */
     public void setIdStart(Long idStart){
         this.idStart = idStart;
     }
 
     /**
-    * 获取 结束 主键，自增长
-    * @return $idEnd
-    */
+     * 获取 结束 主键，自增长
+     * @return $idEnd
+     */
     public Long getIdEnd(){
         return this.idEnd;
     }
 
     /**
-    * 设置 结束 主键，自增长
-    * @param idEnd
-    */
+     * 设置 结束 主键，自增长
+     * @param idEnd
+     */
     public void setIdEnd(Long idEnd){
         this.idEnd = idEnd;
     }
 
     /**
-    * 获取 增加 主键，自增长
-    * @return idIncrement
-    */
+     * 获取 增加 主键，自增长
+     * @return idIncrement
+     */
     public Long getIdIncrement(){
         return this.idIncrement;
     }
 
     /**
-    * 设置 增加 主键，自增长
-    * @param idIncrement
-    */
+     * 设置 增加 主键，自增长
+     * @param idIncrement
+     */
     public void setIdIncrement(Long idIncrement){
         this.idIncrement = idIncrement;
     }
 
     /**
-    * 获取 主键，自增长
-    * @return idList
-    */
+     * 获取 主键，自增长
+     * @return idList
+     */
     public List<Long> getIdList(){
         return this.idList;
     }
 
     /**
-    * 设置 主键，自增长
-    * @param idList
-    */
+     * 设置 主键，自增长
+     * @param idList
+     */
     public void setIdList(List<Long> idList){
         this.idList = idList;
     }
 
     /**
-    * 获取 开始 事项matter id
-    * @return matterIdStart
-    */
+     * 获取 开始 事项matter id
+     * @return matterIdStart
+     */
     public Long getMatterIdStart(){
         return this.matterIdStart;
     }
 
     /**
-    * 设置 开始 事项matter id
-    * @param matterIdStart
-    */
+     * 设置 开始 事项matter id
+     * @param matterIdStart
+     */
     public void setMatterIdStart(Long matterIdStart){
         this.matterIdStart = matterIdStart;
     }
 
     /**
-    * 获取 结束 事项matter id
-    * @return $matterIdEnd
-    */
+     * 获取 结束 事项matter id
+     * @return $matterIdEnd
+     */
     public Long getMatterIdEnd(){
         return this.matterIdEnd;
     }
 
     /**
-    * 设置 结束 事项matter id
-    * @param matterIdEnd
-    */
+     * 设置 结束 事项matter id
+     * @param matterIdEnd
+     */
     public void setMatterIdEnd(Long matterIdEnd){
         this.matterIdEnd = matterIdEnd;
     }
 
     /**
-    * 获取 增加 事项matter id
-    * @return matterIdIncrement
-    */
+     * 获取 增加 事项matter id
+     * @return matterIdIncrement
+     */
     public Long getMatterIdIncrement(){
         return this.matterIdIncrement;
     }
 
     /**
-    * 设置 增加 事项matter id
-    * @param matterIdIncrement
-    */
+     * 设置 增加 事项matter id
+     * @param matterIdIncrement
+     */
     public void setMatterIdIncrement(Long matterIdIncrement){
         this.matterIdIncrement = matterIdIncrement;
     }
 
     /**
-    * 获取 事项matter id
-    * @return matterIdList
-    */
+     * 获取 事项matter id
+     * @return matterIdList
+     */
     public List<Long> getMatterIdList(){
         return this.matterIdList;
     }
 
     /**
-    * 设置 事项matter id
-    * @param matterIdList
-    */
+     * 设置 事项matter id
+     * @param matterIdList
+     */
     public void setMatterIdList(List<Long> matterIdList){
         this.matterIdList = matterIdList;
     }
 
     /**
-    * 获取 开始 部门ID
-    * @return deptIdStart
-    */
+     * 获取 开始 部门ID
+     * @return deptIdStart
+     */
     public Long getDeptIdStart(){
         return this.deptIdStart;
     }
 
     /**
-    * 设置 开始 部门ID
-    * @param deptIdStart
-    */
+     * 设置 开始 部门ID
+     * @param deptIdStart
+     */
     public void setDeptIdStart(Long deptIdStart){
         this.deptIdStart = deptIdStart;
     }
 
     /**
-    * 获取 结束 部门ID
-    * @return $deptIdEnd
-    */
+     * 获取 结束 部门ID
+     * @return $deptIdEnd
+     */
     public Long getDeptIdEnd(){
         return this.deptIdEnd;
     }
 
     /**
-    * 设置 结束 部门ID
-    * @param deptIdEnd
-    */
+     * 设置 结束 部门ID
+     * @param deptIdEnd
+     */
     public void setDeptIdEnd(Long deptIdEnd){
         this.deptIdEnd = deptIdEnd;
     }
 
     /**
-    * 获取 增加 部门ID
-    * @return deptIdIncrement
-    */
+     * 获取 增加 部门ID
+     * @return deptIdIncrement
+     */
     public Long getDeptIdIncrement(){
         return this.deptIdIncrement;
     }
 
     /**
-    * 设置 增加 部门ID
-    * @param deptIdIncrement
-    */
+     * 设置 增加 部门ID
+     * @param deptIdIncrement
+     */
     public void setDeptIdIncrement(Long deptIdIncrement){
         this.deptIdIncrement = deptIdIncrement;
     }
 
     /**
-    * 获取 部门ID
-    * @return deptIdList
-    */
+     * 获取 部门ID
+     * @return deptIdList
+     */
     public List<Long> getDeptIdList(){
         return this.deptIdList;
     }
 
     /**
-    * 设置 部门ID
-    * @param deptIdList
-    */
+     * 设置 部门ID
+     * @param deptIdList
+     */
     public void setDeptIdList(List<Long> deptIdList){
         this.deptIdList = deptIdList;
     }
 
     /**
-    * 获取 部门编号
-    * @return deptCodeList
-    */
+     * 获取 部门编号
+     * @return deptCodeList
+     */
     public List<String> getDeptCodeList(){
         return this.deptCodeList;
     }
 
     /**
-    * 设置 部门编号
-    * @param deptCodeList
-    */
+     * 设置 部门编号
+     * @param deptCodeList
+     */
     public void setDeptCodeList(List<String> deptCodeList){
         this.deptCodeList = deptCodeList;
     }
     /**
-    * 获取 材料名
-    * @return materialNameList
-    */
+     * 获取 部门名称
+     * @return deptNameList
+     */
+    public List<String> getDeptNameList(){
+        return this.deptNameList;
+    }
+
+    /**
+     * 设置 部门名称
+     * @param deptNameList
+     */
+    public void setDeptNameList(List<String> deptNameList){
+        this.deptNameList = deptNameList;
+    }
+    /**
+     * 获取 材料名
+     * @return materialNameList
+     */
     public List<String> getMaterialNameList(){
         return this.materialNameList;
     }
 
     /**
-    * 设置 材料名
-    * @param materialNameList
-    */
+     * 设置 材料名
+     * @param materialNameList
+     */
     public void setMaterialNameList(List<String> materialNameList){
         this.materialNameList = materialNameList;
     }
     /**
-    * 获取 材料全名
-    * @return materiaFullNameList
-    */
+     * 获取 材料全名
+     * @return materiaFullNameList
+     */
     public List<String> getMateriaFullNameList(){
         return this.materiaFullNameList;
     }
 
     /**
-    * 设置 材料全名
-    * @param materiaFullNameList
-    */
+     * 设置 材料全名
+     * @param materiaFullNameList
+     */
     public void setMateriaFullNameList(List<String> materiaFullNameList){
         this.materiaFullNameList = materiaFullNameList;
     }
     /**
-    * 获取 开始 填单次数
-    * @return totalStart
-    */
+     * 获取 开始 填单次数
+     * @return totalStart
+     */
     public Integer getTotalStart(){
         return this.totalStart;
     }
 
     /**
-    * 设置 开始 填单次数
-    * @param totalStart
-    */
+     * 设置 开始 填单次数
+     * @param totalStart
+     */
     public void setTotalStart(Integer totalStart){
         this.totalStart = totalStart;
     }
 
     /**
-    * 获取 结束 填单次数
-    * @return $totalEnd
-    */
+     * 获取 结束 填单次数
+     * @return $totalEnd
+     */
     public Integer getTotalEnd(){
         return this.totalEnd;
     }
 
     /**
-    * 设置 结束 填单次数
-    * @param totalEnd
-    */
+     * 设置 结束 填单次数
+     * @param totalEnd
+     */
     public void setTotalEnd(Integer totalEnd){
         this.totalEnd = totalEnd;
     }
 
     /**
-    * 获取 增加 填单次数
-    * @return totalIncrement
-    */
+     * 获取 增加 填单次数
+     * @return totalIncrement
+     */
     public Integer getTotalIncrement(){
         return this.totalIncrement;
     }
 
     /**
-    * 设置 增加 填单次数
-    * @param totalIncrement
-    */
+     * 设置 增加 填单次数
+     * @param totalIncrement
+     */
     public void setTotalIncrement(Integer totalIncrement){
         this.totalIncrement = totalIncrement;
     }
 
     /**
-    * 获取 填单次数
-    * @return totalList
-    */
+     * 获取 填单次数
+     * @return totalList
+     */
     public List<Integer> getTotalList(){
         return this.totalList;
     }
 
     /**
-    * 设置 填单次数
-    * @param totalList
-    */
+     * 设置 填单次数
+     * @param totalList
+     */
     public void setTotalList(List<Integer> totalList){
         this.totalList = totalList;
     }
 
     /**
-    * 获取 开始 排序
-    * @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 sampleNameList
-    */
+     * 获取 样表名称
+     * @return sampleNameList
+     */
     public List<String> getSampleNameList(){
         return this.sampleNameList;
     }
 
     /**
-    * 设置 样表名称
-    * @param sampleNameList
-    */
+     * 设置 样表名称
+     * @param sampleNameList
+     */
     public void setSampleNameList(List<String> sampleNameList){
         this.sampleNameList = sampleNameList;
     }
     /**
-    * 获取 样表地址
-    * @return samplePathList
-    */
+     * 获取 样表地址
+     * @return samplePathList
+     */
     public List<String> getSamplePathList(){
         return this.samplePathList;
     }
 
     /**
-    * 设置 样表地址
-    * @param samplePathList
-    */
+     * 设置 样表地址
+     * @param samplePathList
+     */
     public void setSamplePathList(List<String> samplePathList){
         this.samplePathList = samplePathList;
     }
     /**
-    * 获取 样表预览地址
-    * @return preViewPathList
-    */
+     * 获取 样表预览地址
+     * @return preViewPathList
+     */
     public List<String> getPreViewPathList(){
         return this.preViewPathList;
     }
 
     /**
-    * 设置 样表预览地址
-    * @param preViewPathList
-    */
+     * 设置 样表预览地址
+     * @param preViewPathList
+     */
     public void setPreViewPathList(List<String> preViewPathList){
         this.preViewPathList = preViewPathList;
     }
     /**
-    * 获取 开始 创建时间
-    * @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 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 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;
     }
 
     /**
-    * 设置  主键，自增长
-    * @param id
-    */
+     * 设置  主键，自增长
+     * @param id
+     */
     public PubdatumQuery id(Long id){
-	    setId(id);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 主键，自增长
-    * @param idStart
-    */
+        setId(id);
+        return this;
+    }
+
+    /**
+     * 设置 开始 主键，自增长
+     * @param idStart
+     */
     public PubdatumQuery idStart(Long idStart){
-		this.idStart = idStart;
-		return this;
+        this.idStart = idStart;
+        return this;
     }
 
     /**
-    * 设置 结束 主键，自增长
-    * @param idEnd
-    */
+     * 设置 结束 主键，自增长
+     * @param idEnd
+     */
     public PubdatumQuery idEnd(Long idEnd){
-		this.idEnd = idEnd;
-		return this;
+        this.idEnd = idEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 主键，自增长
-    * @param idIncrement
-    */
+     * 设置 增加 主键，自增长
+     * @param idIncrement
+     */
     public PubdatumQuery idIncrement(Long idIncrement){
-		this.idIncrement = idIncrement;
-		return this;
+        this.idIncrement = idIncrement;
+        return this;
     }
 
     /**
-    * 设置 主键，自增长
-    * @param idList
-    */
+     * 设置 主键，自增长
+     * @param idList
+     */
     public PubdatumQuery idList(List<Long> idList){
         this.idList = idList;
-		return this;
-        }
+        return this;
+    }
 
     /**
-    * 设置  事项matter id
-    * @param matterId
-    */
+     * 设置  事项matter id
+     * @param matterId
+     */
     public PubdatumQuery matterId(Long matterId){
-	    setMatterId(matterId);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 事项matter id
-    * @param matterIdStart
-    */
+        setMatterId(matterId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 事项matter id
+     * @param matterIdStart
+     */
     public PubdatumQuery matterIdStart(Long matterIdStart){
-		this.matterIdStart = matterIdStart;
-		return this;
+        this.matterIdStart = matterIdStart;
+        return this;
     }
 
     /**
-    * 设置 结束 事项matter id
-    * @param matterIdEnd
-    */
+     * 设置 结束 事项matter id
+     * @param matterIdEnd
+     */
     public PubdatumQuery matterIdEnd(Long matterIdEnd){
-		this.matterIdEnd = matterIdEnd;
-		return this;
+        this.matterIdEnd = matterIdEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 事项matter id
-    * @param matterIdIncrement
-    */
+     * 设置 增加 事项matter id
+     * @param matterIdIncrement
+     */
     public PubdatumQuery matterIdIncrement(Long matterIdIncrement){
-		this.matterIdIncrement = matterIdIncrement;
-		return this;
+        this.matterIdIncrement = matterIdIncrement;
+        return this;
     }
 
     /**
-    * 设置 事项matter id
-    * @param matterIdList
-    */
+     * 设置 事项matter id
+     * @param matterIdList
+     */
     public PubdatumQuery matterIdList(List<Long> matterIdList){
         this.matterIdList = matterIdList;
-		return this;
-        }
+        return this;
+    }
 
     /**
-    * 设置  部门ID
-    * @param deptId
-    */
+     * 设置  部门ID
+     * @param deptId
+     */
     public PubdatumQuery deptId(Long deptId){
-	    setDeptId(deptId);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 部门ID
-    * @param deptIdStart
-    */
+        setDeptId(deptId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 部门ID
+     * @param deptIdStart
+     */
     public PubdatumQuery deptIdStart(Long deptIdStart){
-		this.deptIdStart = deptIdStart;
-		return this;
+        this.deptIdStart = deptIdStart;
+        return this;
     }
 
     /**
-    * 设置 结束 部门ID
-    * @param deptIdEnd
-    */
+     * 设置 结束 部门ID
+     * @param deptIdEnd
+     */
     public PubdatumQuery deptIdEnd(Long deptIdEnd){
-		this.deptIdEnd = deptIdEnd;
-		return this;
+        this.deptIdEnd = deptIdEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 部门ID
-    * @param deptIdIncrement
-    */
+     * 设置 增加 部门ID
+     * @param deptIdIncrement
+     */
     public PubdatumQuery deptIdIncrement(Long deptIdIncrement){
-		this.deptIdIncrement = deptIdIncrement;
-		return this;
+        this.deptIdIncrement = deptIdIncrement;
+        return this;
     }
 
     /**
-    * 设置 部门ID
-    * @param deptIdList
-    */
+     * 设置 部门ID
+     * @param deptIdList
+     */
     public PubdatumQuery deptIdList(List<Long> deptIdList){
         this.deptIdList = deptIdList;
-		return this;
-        }
+        return this;
+    }
 
 
-	/**
-    * 设置 部门编号
-    * @param deptCode
-    */
+    /**
+     * 设置 部门编号
+     * @param deptCode
+     */
     public PubdatumQuery deptCode(String deptCode){
         setDeptCode(deptCode);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 部门编号
-    * @param deptCodeList
-    */
+     * 设置 部门编号
+     * @param deptCodeList
+     */
     public PubdatumQuery deptCodeList(List<String> deptCodeList){
         this.deptCodeList = deptCodeList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 材料名
-    * @param materialName
-    */
+    /**
+     * 设置 部门名称
+     * @param deptName
+     */
+    public PubdatumQuery deptName(String deptName){
+        setDeptName(deptName);
+        return this;
+    }
+
+    /**
+     * 设置 部门名称
+     * @param deptNameList
+     */
+    public PubdatumQuery deptNameList(List<String> deptNameList){
+        this.deptNameList = deptNameList;
+        return this;
+    }
+
+
+    /**
+     * 设置 材料名
+     * @param materialName
+     */
     public PubdatumQuery materialName(String materialName){
         setMaterialName(materialName);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 材料名
-    * @param materialNameList
-    */
+     * 设置 材料名
+     * @param materialNameList
+     */
     public PubdatumQuery materialNameList(List<String> materialNameList){
         this.materialNameList = materialNameList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 材料全名
-    * @param materiaFullName
-    */
+    /**
+     * 设置 材料全名
+     * @param materiaFullName
+     */
     public PubdatumQuery materiaFullName(String materiaFullName){
         setMateriaFullName(materiaFullName);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 材料全名
-    * @param materiaFullNameList
-    */
+     * 设置 材料全名
+     * @param materiaFullNameList
+     */
     public PubdatumQuery materiaFullNameList(List<String> materiaFullNameList){
         this.materiaFullNameList = materiaFullNameList;
-		return this;
+        return this;
     }
 
     /**
-    * 设置  填单次数
-    * @param total
-    */
+     * 设置  填单次数
+     * @param total
+     */
     public PubdatumQuery total(Integer total){
-	    setTotal(total);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 填单次数
-    * @param totalStart
-    */
+        setTotal(total);
+        return this;
+    }
+
+    /**
+     * 设置 开始 填单次数
+     * @param totalStart
+     */
     public PubdatumQuery totalStart(Integer totalStart){
-		this.totalStart = totalStart;
-		return this;
+        this.totalStart = totalStart;
+        return this;
     }
 
     /**
-    * 设置 结束 填单次数
-    * @param totalEnd
-    */
+     * 设置 结束 填单次数
+     * @param totalEnd
+     */
     public PubdatumQuery totalEnd(Integer totalEnd){
-		this.totalEnd = totalEnd;
-		return this;
+        this.totalEnd = totalEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 填单次数
-    * @param totalIncrement
-    */
+     * 设置 增加 填单次数
+     * @param totalIncrement
+     */
     public PubdatumQuery totalIncrement(Integer totalIncrement){
-		this.totalIncrement = totalIncrement;
-		return this;
+        this.totalIncrement = totalIncrement;
+        return this;
     }
 
     /**
-    * 设置 填单次数
-    * @param totalList
-    */
+     * 设置 填单次数
+     * @param totalList
+     */
     public PubdatumQuery totalList(List<Integer> totalList){
         this.totalList = totalList;
-		return this;
-        }
+        return this;
+    }
 
     /**
-    * 设置  排序
-    * @param sort
-    */
+     * 设置  排序
+     * @param sort
+     */
     public PubdatumQuery sort(Integer sort){
-	    setSort(sort);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 排序
-    * @param sortStart
-    */
+        setSort(sort);
+        return this;
+    }
+
+    /**
+     * 设置 开始 排序
+     * @param sortStart
+     */
     public PubdatumQuery sortStart(Integer sortStart){
-		this.sortStart = sortStart;
-		return this;
+        this.sortStart = sortStart;
+        return this;
     }
 
     /**
-    * 设置 结束 排序
-    * @param sortEnd
-    */
+     * 设置 结束 排序
+     * @param sortEnd
+     */
     public PubdatumQuery sortEnd(Integer sortEnd){
-		this.sortEnd = sortEnd;
-		return this;
+        this.sortEnd = sortEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 排序
-    * @param sortIncrement
-    */
+     * 设置 增加 排序
+     * @param sortIncrement
+     */
     public PubdatumQuery sortIncrement(Integer sortIncrement){
-		this.sortIncrement = sortIncrement;
-		return this;
+        this.sortIncrement = sortIncrement;
+        return this;
     }
 
     /**
-    * 设置 排序
-    * @param sortList
-    */
+     * 设置 排序
+     * @param sortList
+     */
     public PubdatumQuery sortList(List<Integer> sortList){
         this.sortList = sortList;
-		return this;
-        }
+        return this;
+    }
 
 
-	/**
-    * 设置 样表名称
-    * @param sampleName
-    */
+    /**
+     * 设置 样表名称
+     * @param sampleName
+     */
     public PubdatumQuery sampleName(String sampleName){
         setSampleName(sampleName);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 样表名称
-    * @param sampleNameList
-    */
+     * 设置 样表名称
+     * @param sampleNameList
+     */
     public PubdatumQuery sampleNameList(List<String> sampleNameList){
         this.sampleNameList = sampleNameList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 样表地址
-    * @param samplePath
-    */
+    /**
+     * 设置 样表地址
+     * @param samplePath
+     */
     public PubdatumQuery samplePath(String samplePath){
         setSamplePath(samplePath);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 样表地址
-    * @param samplePathList
-    */
+     * 设置 样表地址
+     * @param samplePathList
+     */
     public PubdatumQuery samplePathList(List<String> samplePathList){
         this.samplePathList = samplePathList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 样表预览地址
-    * @param preViewPath
-    */
+    /**
+     * 设置 样表预览地址
+     * @param preViewPath
+     */
     public PubdatumQuery preViewPath(String preViewPath){
         setPreViewPath(preViewPath);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 样表预览地址
-    * @param preViewPathList
-    */
+     * 设置 样表预览地址
+     * @param preViewPathList
+     */
     public PubdatumQuery preViewPathList(List<String> preViewPathList){
         this.preViewPathList = preViewPathList;
-		return this;
+        return this;
     }
 
 
     /**
-    * 设置  创建用户
-    * @param createUserId
-    */
+     * 设置  创建用户
+     * @param createUserId
+     */
     public PubdatumQuery createUserId(Long createUserId){
-	    setCreateUserId(createUserId);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 创建用户
-    * @param createUserIdStart
-    */
+        setCreateUserId(createUserId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 创建用户
+     * @param createUserIdStart
+     */
     public PubdatumQuery createUserIdStart(Long createUserIdStart){
-		this.createUserIdStart = createUserIdStart;
-		return this;
+        this.createUserIdStart = createUserIdStart;
+        return this;
     }
 
     /**
-    * 设置 结束 创建用户
-    * @param createUserIdEnd
-    */
+     * 设置 结束 创建用户
+     * @param createUserIdEnd
+     */
     public PubdatumQuery createUserIdEnd(Long createUserIdEnd){
-		this.createUserIdEnd = createUserIdEnd;
-		return this;
+        this.createUserIdEnd = createUserIdEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 创建用户
-    * @param createUserIdIncrement
-    */
+     * 设置 增加 创建用户
+     * @param createUserIdIncrement
+     */
     public PubdatumQuery createUserIdIncrement(Long createUserIdIncrement){
-		this.createUserIdIncrement = createUserIdIncrement;
-		return this;
+        this.createUserIdIncrement = createUserIdIncrement;
+        return this;
     }
 
     /**
-    * 设置 创建用户
-    * @param createUserIdList
-    */
+     * 设置 创建用户
+     * @param createUserIdList
+     */
     public PubdatumQuery createUserIdList(List<Long> createUserIdList){
         this.createUserIdList = createUserIdList;
-		return this;
-        }
+        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<PubdatumQuery> 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<PubdatumQuery> 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<PubdatumQuery> 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<PubdatumQuery> andConditionList){
         this.andConditionList = andConditionList;
     }

sample-form-manager/src/main/resources/sqlmap/module/matter/MatterDatumMapper.xml

@@ -10,6 +10,7 @@
         <result property="siteId" column="siteId" />
         <result property="deptId" column="deptId" />
         <result property="deptCode" column="deptCode" />
+        <result property="deptName" column="deptName" />
         <result property="materialName" column="materialName" />
         <result property="materiaFullName" column="materiaFullName" />
         <result property="source" column="source" />
@@ -44,6 +45,9 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptCode') or colPickMode == 1 and data.containsKey('deptCode')))">
                 a.deptCode,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
+                a.deptName,
+            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('materialName') or colPickMode == 1 and data.containsKey('materialName')))">
                 a.materialName,
             </if>
@@ -85,18 +89,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="MatterDatumEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_matter_datum
-        (matterId,siteId,deptId,deptCode,materialName,materiaFullName,source,isRecommend,total,sort,sampleName,samplePath,preViewPath,createTime,createUserId,updateTime)
+        (matterId,siteId,deptId,deptCode,deptName,materialName,materiaFullName,source,isRecommend,total,sort,sampleName,samplePath,preViewPath,createTime,createUserId,updateTime)
         VALUES
-        (#{matterId},#{siteId},#{deptId},#{deptCode},#{materialName},#{materiaFullName},#{source},#{isRecommend},#{total},#{sort},#{sampleName},#{samplePath},#{preViewPath},#{createTime},#{createUserId},#{updateTime})
+        (#{matterId},#{siteId},#{deptId},#{deptCode},#{deptName},#{materialName},#{materiaFullName},#{source},#{isRecommend},#{total},#{sort},#{sampleName},#{samplePath},#{preViewPath},#{createTime},#{createUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_matter_datum
-        (matterId,siteId,deptId,deptCode,materialName,materiaFullName,source,isRecommend,total,sort,sampleName,samplePath,preViewPath,createTime,createUserId,updateTime)
+        (matterId,siteId,deptId,deptCode,deptName,materialName,materiaFullName,source,isRecommend,total,sort,sampleName,samplePath,preViewPath,createTime,createUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.matterId},#{item.siteId},#{item.deptId},#{item.deptCode},#{item.materialName},#{item.materiaFullName},#{item.source},#{item.isRecommend},#{item.total},#{item.sort},#{item.sampleName},#{item.samplePath},#{item.preViewPath},#{item.createTime},#{item.createUserId},#{item.updateTime})
+            (#{item.matterId},#{item.siteId},#{item.deptId},#{item.deptCode},#{item.deptName},#{item.materialName},#{item.materiaFullName},#{item.source},#{item.isRecommend},#{item.total},#{item.sort},#{item.sampleName},#{item.samplePath},#{item.preViewPath},#{item.createTime},#{item.createUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -127,6 +131,9 @@
             <if test="(colPickMode==0 and data.containsKey('deptCode')) or (colPickMode==1 and !data.containsKey('deptCode'))">
                 a.deptCode=#{data.deptCode},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('deptName')) or (colPickMode==1 and !data.containsKey('deptName'))">
+                a.deptName=#{data.deptName},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('materialName')) or (colPickMode==1 and !data.containsKey('materialName'))">
                 a.materialName=#{data.materialName},
             </if>
@@ -233,6 +240,13 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="deptName=(case" suffix="ELSE deptName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('deptName')) or (colPickMode==1 and !item.containsKey('deptName'))">
+                        when a.id=#{item.id} then #{item.deptName}
+                    </if>
+                </foreach>
+            </trim>
             <trim prefix="materialName=(case" suffix="ELSE materialName end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <if test="(colPickMode==0 and item.containsKey('materialName')) or (colPickMode==1 and !item.containsKey('materialName'))">
@@ -543,6 +557,21 @@
             </foreach>
         </if>
 
+        <if test="conditionParamRef.containsKey('deptName')">
+            <if test="conditionParamRef.deptName != null and conditionParamRef.deptName != ''">
+                ${_conditionType_} a.deptName like #{${_conditionParam_}.deptName}
+            </if>
+            <if test="conditionParamRef.deptName == null">
+                ${_conditionType_} a.deptName is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('deptNameList')">
+            ${_conditionType_} a.deptName in
+            <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
         <if test="conditionParamRef.containsKey('materialName')">
             <if test="conditionParamRef.materialName != null and conditionParamRef.materialName != ''">
                 ${_conditionType_} a.materialName like #{${_conditionParam_}.materialName}
@@ -790,6 +819,11 @@
                     <if test='orderCol.deptCode != null and "DESC".equalsIgnoreCase(orderCol.deptCode)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('deptName')">
+                    a.deptName
+                    <if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
+                    ,
+                </if>
                 <if test="orderCol.containsKey('materialName')">
                     a.materialName
                     <if test='orderCol.materialName != null and "DESC".equalsIgnoreCase(orderCol.materialName)'>DESC</if>

sample-form-manager/src/main/resources/sqlmap/module/pubdatum/PubdatumMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.pubdatum.dao.ibatis.PubdatumDaoImpl">
 
     <!-- 字段和属性映射 -->
     <resultMap type="PubdatumEntity" id="PubdatumEntity-Map">
-            <id  property="id" column="id" />
-            <result property="matterId" column="matterId" />
-            <result property="deptId" column="deptId" />
-            <result property="deptCode" column="deptCode" />
-            <result property="materialName" column="materialName" />
-            <result property="materiaFullName" column="materiaFullName" />
-            <result property="total" column="total" />
-            <result property="sort" column="sort" />
-            <result property="sampleName" column="sampleName" />
-            <result property="samplePath" column="samplePath" />
-            <result property="preViewPath" column="preViewPath" />
-            <result property="createTime" column="createTime" />
-            <result property="createUserId" column="createUserId" />
-            <result property="updateTime" column="updateTime" />
-            
+        <id  property="id" column="id" />
+        <result property="matterId" column="matterId" />
+        <result property="deptId" column="deptId" />
+        <result property="deptCode" column="deptCode" />
+        <result property="deptName" column="deptName" />
+        <result property="materialName" column="materialName" />
+        <result property="materiaFullName" column="materiaFullName" />
+        <result property="total" column="total" />
+        <result property="sort" column="sort" />
+        <result property="sampleName" column="sampleName" />
+        <result property="samplePath" column="samplePath" />
+        <result property="preViewPath" column="preViewPath" />
+        <result property="createTime" column="createTime" />
+        <result property="createUserId" column="createUserId" />
+        <result property="updateTime" column="updateTime" />
+
     </resultMap>
 
 
     <!-- 表所有列 -->
     <sql id="_columns">
         <trim suffixOverrides="," suffix="">
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
-                    a.id,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterId') or colPickMode == 1 and data.containsKey('matterId')))">
-                    a.matterId,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))">
-                    a.deptId,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptCode') or colPickMode == 1 and data.containsKey('deptCode')))">
-                    a.deptCode,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('materialName') or colPickMode == 1 and data.containsKey('materialName')))">
-                    a.materialName,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('materiaFullName') or colPickMode == 1 and data.containsKey('materiaFullName')))">
-                    a.materiaFullName,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('total') or colPickMode == 1 and data.containsKey('total')))">
-                    a.total,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sort') or colPickMode == 1 and data.containsKey('sort')))">
-                    a.sort,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sampleName') or colPickMode == 1 and data.containsKey('sampleName')))">
-                    a.sampleName,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('samplePath') or colPickMode == 1 and data.containsKey('samplePath')))">
-                    a.samplePath,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('preViewPath') or colPickMode == 1 and data.containsKey('preViewPath')))">
-                    a.preViewPath,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
-                    a.createTime,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
-                    a.createUserId,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
-                    a.updateTime,
-                </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                a.id,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterId') or colPickMode == 1 and data.containsKey('matterId')))">
+                a.matterId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))">
+                a.deptId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptCode') or colPickMode == 1 and data.containsKey('deptCode')))">
+                a.deptCode,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
+                a.deptName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('materialName') or colPickMode == 1 and data.containsKey('materialName')))">
+                a.materialName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('materiaFullName') or colPickMode == 1 and data.containsKey('materiaFullName')))">
+                a.materiaFullName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('total') or colPickMode == 1 and data.containsKey('total')))">
+                a.total,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sort') or colPickMode == 1 and data.containsKey('sort')))">
+                a.sort,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sampleName') or colPickMode == 1 and data.containsKey('sampleName')))">
+                a.sampleName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('samplePath') or colPickMode == 1 and data.containsKey('samplePath')))">
+                a.samplePath,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('preViewPath') or colPickMode == 1 and data.containsKey('preViewPath')))">
+                a.preViewPath,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                a.createTime,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                a.createUserId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                a.updateTime,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="PubdatumEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_pubdatum
-        (matterId,deptId,deptCode,materialName,materiaFullName,total,sort,sampleName,samplePath,preViewPath,createTime,createUserId,updateTime)
+        (matterId,deptId,deptCode,deptName,materialName,materiaFullName,total,sort,sampleName,samplePath,preViewPath,createTime,createUserId,updateTime)
         VALUES
-        (#{matterId},#{deptId},#{deptCode},#{materialName},#{materiaFullName},#{total},#{sort},#{sampleName},#{samplePath},#{preViewPath},#{createTime},#{createUserId},#{updateTime})
+        (#{matterId},#{deptId},#{deptCode},#{deptName},#{materialName},#{materiaFullName},#{total},#{sort},#{sampleName},#{samplePath},#{preViewPath},#{createTime},#{createUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_pubdatum
-        (matterId,deptId,deptCode,materialName,materiaFullName,total,sort,sampleName,samplePath,preViewPath,createTime,createUserId,updateTime)
+        (matterId,deptId,deptCode,deptName,materialName,materiaFullName,total,sort,sampleName,samplePath,preViewPath,createTime,createUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.matterId},#{item.deptId},#{item.deptCode},#{item.materialName},#{item.materiaFullName},#{item.total},#{item.sort},#{item.sampleName},#{item.samplePath},#{item.preViewPath},#{item.createTime},#{item.createUserId},#{item.updateTime})
+            (#{item.matterId},#{item.deptId},#{item.deptCode},#{item.deptName},#{item.materialName},#{item.materiaFullName},#{item.total},#{item.sort},#{item.sampleName},#{item.samplePath},#{item.preViewPath},#{item.createTime},#{item.createUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -109,6 +113,9 @@
             <if test="(colPickMode==0 and data.containsKey('deptCode')) or (colPickMode==1 and !data.containsKey('deptCode'))">
                 a.deptCode=#{data.deptCode},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('deptName')) or (colPickMode==1 and !data.containsKey('deptName'))">
+                a.deptName=#{data.deptName},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('materialName')) or (colPickMode==1 and !data.containsKey('materialName'))">
                 a.materialName=#{data.materialName},
             </if>
@@ -160,122 +167,129 @@
     <update id="updateBatch" parameterType="paramDto">
         update mortals_xhx_pubdatum as a
         <trim prefix="set" suffixOverrides=",">
-                        <trim prefix="matterId=(case" suffix="ELSE matterId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('matterId')) or (colPickMode==1 and !item.containsKey('matterId'))">
-                                        when a.id=#{item.id} then #{item.matterId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('matterIdIncrement')) or (colPickMode==1 and !item.containsKey('matterIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.matterId,0) + #{item.matterIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                        <trim prefix="deptId=(case" suffix="ELSE deptId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('deptId')) or (colPickMode==1 and !item.containsKey('deptId'))">
-                                        when a.id=#{item.id} then #{item.deptId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('deptIdIncrement')) or (colPickMode==1 and !item.containsKey('deptIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.deptId,0) + #{item.deptIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="deptCode=(case" suffix="ELSE deptCode end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('deptCode')) or (colPickMode==1 and !item.containsKey('deptCode'))">
-                            when a.id=#{item.id} then #{item.deptCode}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="materialName=(case" suffix="ELSE materialName end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('materialName')) or (colPickMode==1 and !item.containsKey('materialName'))">
-                            when a.id=#{item.id} then #{item.materialName}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="materiaFullName=(case" suffix="ELSE materiaFullName end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('materiaFullName')) or (colPickMode==1 and !item.containsKey('materiaFullName'))">
-                            when a.id=#{item.id} then #{item.materiaFullName}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="total=(case" suffix="ELSE total end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('total')) or (colPickMode==1 and !item.containsKey('total'))">
-                                        when a.id=#{item.id} then #{item.total}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('totalIncrement')) or (colPickMode==1 and !item.containsKey('totalIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.total,0) + #{item.totalIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                        <trim prefix="sort=(case" suffix="ELSE sort end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('sort')) or (colPickMode==1 and !item.containsKey('sort'))">
-                                        when a.id=#{item.id} then #{item.sort}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('sortIncrement')) or (colPickMode==1 and !item.containsKey('sortIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.sort,0) + #{item.sortIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="sampleName=(case" suffix="ELSE sampleName end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('sampleName')) or (colPickMode==1 and !item.containsKey('sampleName'))">
-                            when a.id=#{item.id} then #{item.sampleName}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="samplePath=(case" suffix="ELSE samplePath end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('samplePath')) or (colPickMode==1 and !item.containsKey('samplePath'))">
-                            when a.id=#{item.id} then #{item.samplePath}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="preViewPath=(case" suffix="ELSE preViewPath end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('preViewPath')) or (colPickMode==1 and !item.containsKey('preViewPath'))">
-                            when a.id=#{item.id} then #{item.preViewPath}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
-                            when a.id=#{item.id} then #{item.createTime}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
-                                        when a.id=#{item.id} then #{item.createUserId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
-                            when a.id=#{item.id} then #{item.updateTime}
-                        </if>
-                    </foreach>
-                </trim>
+            <trim prefix="matterId=(case" suffix="ELSE matterId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('matterId')) or (colPickMode==1 and !item.containsKey('matterId'))">
+                            when a.id=#{item.id} then #{item.matterId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('matterIdIncrement')) or (colPickMode==1 and !item.containsKey('matterIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.matterId,0) + #{item.matterIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="deptId=(case" suffix="ELSE deptId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('deptId')) or (colPickMode==1 and !item.containsKey('deptId'))">
+                            when a.id=#{item.id} then #{item.deptId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('deptIdIncrement')) or (colPickMode==1 and !item.containsKey('deptIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.deptId,0) + #{item.deptIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="deptCode=(case" suffix="ELSE deptCode end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('deptCode')) or (colPickMode==1 and !item.containsKey('deptCode'))">
+                        when a.id=#{item.id} then #{item.deptCode}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="deptName=(case" suffix="ELSE deptName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('deptName')) or (colPickMode==1 and !item.containsKey('deptName'))">
+                        when a.id=#{item.id} then #{item.deptName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="materialName=(case" suffix="ELSE materialName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('materialName')) or (colPickMode==1 and !item.containsKey('materialName'))">
+                        when a.id=#{item.id} then #{item.materialName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="materiaFullName=(case" suffix="ELSE materiaFullName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('materiaFullName')) or (colPickMode==1 and !item.containsKey('materiaFullName'))">
+                        when a.id=#{item.id} then #{item.materiaFullName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="total=(case" suffix="ELSE total end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('total')) or (colPickMode==1 and !item.containsKey('total'))">
+                            when a.id=#{item.id} then #{item.total}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('totalIncrement')) or (colPickMode==1 and !item.containsKey('totalIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.total,0) + #{item.totalIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="sort=(case" suffix="ELSE sort end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('sort')) or (colPickMode==1 and !item.containsKey('sort'))">
+                            when a.id=#{item.id} then #{item.sort}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('sortIncrement')) or (colPickMode==1 and !item.containsKey('sortIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.sort,0) + #{item.sortIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="sampleName=(case" suffix="ELSE sampleName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('sampleName')) or (colPickMode==1 and !item.containsKey('sampleName'))">
+                        when a.id=#{item.id} then #{item.sampleName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="samplePath=(case" suffix="ELSE samplePath end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('samplePath')) or (colPickMode==1 and !item.containsKey('samplePath'))">
+                        when a.id=#{item.id} then #{item.samplePath}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="preViewPath=(case" suffix="ELSE preViewPath end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('preViewPath')) or (colPickMode==1 and !item.containsKey('preViewPath'))">
+                        when a.id=#{item.id} then #{item.preViewPath}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                        when a.id=#{item.id} then #{item.createTime}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                            when a.id=#{item.id} then #{item.createUserId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                        when a.id=#{item.id} then #{item.updateTime}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -377,335 +391,355 @@
                 ${_conditionType_} a.id=#{${_conditionParam_}.id}
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('id')">
-                <if test="conditionParamRef.id != null ">
-                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
-                </if>
-                <if test="conditionParamRef.id == null">
-                    ${_conditionType_} a.id is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('idList')">
-                ${_conditionType_} a.id in
-                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
-                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null ">
+                ${_conditionType_} a.id = #{${_conditionParam_}.id}
             </if>
-            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
-                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            <if test="conditionParamRef.id == null">
+                ${_conditionType_} a.id is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('idList')">
+            ${_conditionType_} a.id in
+            <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+            ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+        </if>
+        <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+            ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('matterId')">
-                <if test="conditionParamRef.matterId != null ">
-                    ${_conditionType_} a.matterId = #{${_conditionParam_}.matterId}
-                </if>
-                <if test="conditionParamRef.matterId == null">
-                    ${_conditionType_} a.matterId is null
-                </if>
+        <if test="conditionParamRef.containsKey('matterId')">
+            <if test="conditionParamRef.matterId != null ">
+                ${_conditionType_} a.matterId = #{${_conditionParam_}.matterId}
             </if>
-            <if test="conditionParamRef.containsKey('matterIdList')">
-                ${_conditionType_} a.matterId in
-                <foreach collection="conditionParamRef.matterIdList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('matterIdStart') and conditionParamRef.matterIdStart != null">
-                ${_conditionType_} a.matterId <![CDATA[ >= ]]> #{${_conditionParam_}.matterIdStart}
-            </if>
-            <if test="conditionParamRef.containsKey('matterIdEnd') and conditionParamRef.matterIdEnd != null">
-                ${_conditionType_} a.matterId <![CDATA[ <= ]]> #{${_conditionParam_}.matterIdEnd}
+            <if test="conditionParamRef.matterId == null">
+                ${_conditionType_} a.matterId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('matterIdList')">
+            ${_conditionType_} a.matterId in
+            <foreach collection="conditionParamRef.matterIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('matterIdStart') and conditionParamRef.matterIdStart != null">
+            ${_conditionType_} a.matterId <![CDATA[ >= ]]> #{${_conditionParam_}.matterIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('matterIdEnd') and conditionParamRef.matterIdEnd != null">
+            ${_conditionType_} a.matterId <![CDATA[ <= ]]> #{${_conditionParam_}.matterIdEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('deptId')">
-                <if test="conditionParamRef.deptId != null ">
-                    ${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
-                </if>
-                <if test="conditionParamRef.deptId == null">
-                    ${_conditionType_} a.deptId is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('deptIdList')">
-                ${_conditionType_} a.deptId in
-                <foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('deptId')">
+            <if test="conditionParamRef.deptId != null ">
+                ${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
             </if>
-            <if test="conditionParamRef.containsKey('deptIdStart') and conditionParamRef.deptIdStart != null">
-                ${_conditionType_} a.deptId <![CDATA[ >= ]]> #{${_conditionParam_}.deptIdStart}
-            </if>
-            <if test="conditionParamRef.containsKey('deptIdEnd') and conditionParamRef.deptIdEnd != null">
-                ${_conditionType_} a.deptId <![CDATA[ <= ]]> #{${_conditionParam_}.deptIdEnd}
+            <if test="conditionParamRef.deptId == null">
+                ${_conditionType_} a.deptId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('deptIdList')">
+            ${_conditionType_} a.deptId in
+            <foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('deptIdStart') and conditionParamRef.deptIdStart != null">
+            ${_conditionType_} a.deptId <![CDATA[ >= ]]> #{${_conditionParam_}.deptIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('deptIdEnd') and conditionParamRef.deptIdEnd != null">
+            ${_conditionType_} a.deptId <![CDATA[ <= ]]> #{${_conditionParam_}.deptIdEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('deptCode')">
-                <if test="conditionParamRef.deptCode != null and conditionParamRef.deptCode != ''">
-                    ${_conditionType_} a.deptCode like #{${_conditionParam_}.deptCode}
-                </if>
-                <if test="conditionParamRef.deptCode == null">
-                    ${_conditionType_} a.deptCode is null
-                </if>
+        <if test="conditionParamRef.containsKey('deptCode')">
+            <if test="conditionParamRef.deptCode != null and conditionParamRef.deptCode != ''">
+                ${_conditionType_} a.deptCode like #{${_conditionParam_}.deptCode}
             </if>
-            <if test="conditionParamRef.containsKey('deptCodeList')">
-                ${_conditionType_} a.deptCode in
-                <foreach collection="conditionParamRef.deptCodeList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.deptCode == null">
+                ${_conditionType_} a.deptCode is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('deptCodeList')">
+            ${_conditionType_} a.deptCode in
+            <foreach collection="conditionParamRef.deptCodeList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('materialName')">
-                <if test="conditionParamRef.materialName != null and conditionParamRef.materialName != ''">
-                    ${_conditionType_} a.materialName like #{${_conditionParam_}.materialName}
-                </if>
-                <if test="conditionParamRef.materialName == null">
-                    ${_conditionType_} a.materialName is null
-                </if>
+        <if test="conditionParamRef.containsKey('deptName')">
+            <if test="conditionParamRef.deptName != null and conditionParamRef.deptName != ''">
+                ${_conditionType_} a.deptName like #{${_conditionParam_}.deptName}
             </if>
-            <if test="conditionParamRef.containsKey('materialNameList')">
-                ${_conditionType_} a.materialName in
-                <foreach collection="conditionParamRef.materialNameList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.deptName == null">
+                ${_conditionType_} a.deptName is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('deptNameList')">
+            ${_conditionType_} a.deptName in
+            <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('materiaFullName')">
-                <if test="conditionParamRef.materiaFullName != null and conditionParamRef.materiaFullName != ''">
-                    ${_conditionType_} a.materiaFullName like #{${_conditionParam_}.materiaFullName}
-                </if>
-                <if test="conditionParamRef.materiaFullName == null">
-                    ${_conditionType_} a.materiaFullName is null
-                </if>
+        <if test="conditionParamRef.containsKey('materialName')">
+            <if test="conditionParamRef.materialName != null and conditionParamRef.materialName != ''">
+                ${_conditionType_} a.materialName like #{${_conditionParam_}.materialName}
             </if>
-            <if test="conditionParamRef.containsKey('materiaFullNameList')">
-                ${_conditionType_} a.materiaFullName in
-                <foreach collection="conditionParamRef.materiaFullNameList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.materialName == null">
+                ${_conditionType_} a.materialName is null
             </if>
-            <if test="conditionParamRef.containsKey('total')">
-                <if test="conditionParamRef.total != null ">
-                    ${_conditionType_} a.total = #{${_conditionParam_}.total}
-                </if>
-                <if test="conditionParamRef.total == null">
-                    ${_conditionType_} a.total is null
-                </if>
+        </if>
+        <if test="conditionParamRef.containsKey('materialNameList')">
+            ${_conditionType_} a.materialName in
+            <foreach collection="conditionParamRef.materialNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('materiaFullName')">
+            <if test="conditionParamRef.materiaFullName != null and conditionParamRef.materiaFullName != ''">
+                ${_conditionType_} a.materiaFullName like #{${_conditionParam_}.materiaFullName}
             </if>
-            <if test="conditionParamRef.containsKey('totalList')">
-                ${_conditionType_} a.total in
-                <foreach collection="conditionParamRef.totalList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.materiaFullName == null">
+                ${_conditionType_} a.materiaFullName is null
             </if>
-            <if test="conditionParamRef.containsKey('totalStart') and conditionParamRef.totalStart != null">
-                ${_conditionType_} a.total <![CDATA[ >= ]]> #{${_conditionParam_}.totalStart}
+        </if>
+        <if test="conditionParamRef.containsKey('materiaFullNameList')">
+            ${_conditionType_} a.materiaFullName in
+            <foreach collection="conditionParamRef.materiaFullNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('total')">
+            <if test="conditionParamRef.total != null ">
+                ${_conditionType_} a.total = #{${_conditionParam_}.total}
             </if>
-            <if test="conditionParamRef.containsKey('totalEnd') and conditionParamRef.totalEnd != null">
-                ${_conditionType_} a.total <![CDATA[ <= ]]> #{${_conditionParam_}.totalEnd}
+            <if test="conditionParamRef.total == null">
+                ${_conditionType_} a.total is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('totalList')">
+            ${_conditionType_} a.total in
+            <foreach collection="conditionParamRef.totalList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('totalStart') and conditionParamRef.totalStart != null">
+            ${_conditionType_} a.total <![CDATA[ >= ]]> #{${_conditionParam_}.totalStart}
+        </if>
+        <if test="conditionParamRef.containsKey('totalEnd') and conditionParamRef.totalEnd != null">
+            ${_conditionType_} a.total <![CDATA[ <= ]]> #{${_conditionParam_}.totalEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('sort')">
-                <if test="conditionParamRef.sort != null ">
-                    ${_conditionType_} a.sort = #{${_conditionParam_}.sort}
-                </if>
-                <if test="conditionParamRef.sort == null">
-                    ${_conditionType_} a.sort is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('sortList')">
-                ${_conditionType_} a.sort in
-                <foreach collection="conditionParamRef.sortList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('sort')">
+            <if test="conditionParamRef.sort != null ">
+                ${_conditionType_} a.sort = #{${_conditionParam_}.sort}
             </if>
-            <if test="conditionParamRef.containsKey('sortStart') and conditionParamRef.sortStart != null">
-                ${_conditionType_} a.sort <![CDATA[ >= ]]> #{${_conditionParam_}.sortStart}
-            </if>
-            <if test="conditionParamRef.containsKey('sortEnd') and conditionParamRef.sortEnd != null">
-                ${_conditionType_} a.sort <![CDATA[ <= ]]> #{${_conditionParam_}.sortEnd}
+            <if test="conditionParamRef.sort == null">
+                ${_conditionType_} a.sort is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('sortList')">
+            ${_conditionType_} a.sort in
+            <foreach collection="conditionParamRef.sortList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('sortStart') and conditionParamRef.sortStart != null">
+            ${_conditionType_} a.sort <![CDATA[ >= ]]> #{${_conditionParam_}.sortStart}
+        </if>
+        <if test="conditionParamRef.containsKey('sortEnd') and conditionParamRef.sortEnd != null">
+            ${_conditionType_} a.sort <![CDATA[ <= ]]> #{${_conditionParam_}.sortEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('sampleName')">
-                <if test="conditionParamRef.sampleName != null and conditionParamRef.sampleName != ''">
-                    ${_conditionType_} a.sampleName like #{${_conditionParam_}.sampleName}
-                </if>
-                <if test="conditionParamRef.sampleName == null">
-                    ${_conditionType_} a.sampleName is null
-                </if>
+        <if test="conditionParamRef.containsKey('sampleName')">
+            <if test="conditionParamRef.sampleName != null and conditionParamRef.sampleName != ''">
+                ${_conditionType_} a.sampleName like #{${_conditionParam_}.sampleName}
             </if>
-            <if test="conditionParamRef.containsKey('sampleNameList')">
-                ${_conditionType_} a.sampleName in
-                <foreach collection="conditionParamRef.sampleNameList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.sampleName == null">
+                ${_conditionType_} a.sampleName is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('sampleNameList')">
+            ${_conditionType_} a.sampleName in
+            <foreach collection="conditionParamRef.sampleNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('samplePath')">
-                <if test="conditionParamRef.samplePath != null and conditionParamRef.samplePath != ''">
-                    ${_conditionType_} a.samplePath like #{${_conditionParam_}.samplePath}
-                </if>
-                <if test="conditionParamRef.samplePath == null">
-                    ${_conditionType_} a.samplePath is null
-                </if>
+        <if test="conditionParamRef.containsKey('samplePath')">
+            <if test="conditionParamRef.samplePath != null and conditionParamRef.samplePath != ''">
+                ${_conditionType_} a.samplePath like #{${_conditionParam_}.samplePath}
             </if>
-            <if test="conditionParamRef.containsKey('samplePathList')">
-                ${_conditionType_} a.samplePath in
-                <foreach collection="conditionParamRef.samplePathList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.samplePath == null">
+                ${_conditionType_} a.samplePath is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('samplePathList')">
+            ${_conditionType_} a.samplePath in
+            <foreach collection="conditionParamRef.samplePathList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('preViewPath')">
-                <if test="conditionParamRef.preViewPath != null and conditionParamRef.preViewPath != ''">
-                    ${_conditionType_} a.preViewPath like #{${_conditionParam_}.preViewPath}
-                </if>
-                <if test="conditionParamRef.preViewPath == null">
-                    ${_conditionType_} a.preViewPath is null
-                </if>
+        <if test="conditionParamRef.containsKey('preViewPath')">
+            <if test="conditionParamRef.preViewPath != null and conditionParamRef.preViewPath != ''">
+                ${_conditionType_} a.preViewPath like #{${_conditionParam_}.preViewPath}
             </if>
-            <if test="conditionParamRef.containsKey('preViewPathList')">
-                ${_conditionType_} a.preViewPath in
-                <foreach collection="conditionParamRef.preViewPathList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.preViewPath == null">
+                ${_conditionType_} a.preViewPath is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('preViewPathList')">
+            ${_conditionType_} a.preViewPath in
+            <foreach collection="conditionParamRef.preViewPathList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('createTime')">
-                <if test="conditionParamRef.createTime != null ">
-                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
-                </if>
-                <if test="conditionParamRef.createTime == null">
-                    ${_conditionType_} a.createTime is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
-                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        <if test="conditionParamRef.containsKey('createTime')">
+            <if test="conditionParamRef.createTime != null ">
+                ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
             </if>
-            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
-                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            <if test="conditionParamRef.createTime == null">
+                ${_conditionType_} a.createTime is null
             </if>
-            <if test="conditionParamRef.containsKey('createUserId')">
-                <if test="conditionParamRef.createUserId != null ">
-                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
-                </if>
-                <if test="conditionParamRef.createUserId == null">
-                    ${_conditionType_} a.createUserId is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('createUserIdList')">
-                ${_conditionType_} a.createUserId in
-                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
-                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+            ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+            ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('createUserId')">
+            <if test="conditionParamRef.createUserId != null ">
+                ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
-                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            <if test="conditionParamRef.createUserId == null">
+                ${_conditionType_} a.createUserId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('createUserIdList')">
+            ${_conditionType_} a.createUserId in
+            <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+            ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+            ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('updateTime')">
-                <if test="conditionParamRef.updateTime != null ">
-                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
-                </if>
-                <if test="conditionParamRef.updateTime == null">
-                    ${_conditionType_} a.updateTime is null
-                </if>
+        <if test="conditionParamRef.containsKey('updateTime')">
+            <if test="conditionParamRef.updateTime != null ">
+                ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
             </if>
-            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
-                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-            </if>
-            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
-                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            <if test="conditionParamRef.updateTime == null">
+                ${_conditionType_} a.updateTime is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+            ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+            ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
             order by
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                     ${item.colName} ${item.sortKind}
+                    ${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
             <trim suffixOverrides=","  suffix="">
-                    <if test="orderCol.containsKey('id')">
-                        a.id
-                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('matterId')">
-                        a.matterId
-                        <if test='orderCol.matterId != null and "DESC".equalsIgnoreCase(orderCol.matterId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('deptId')">
-                        a.deptId
-                        <if test='orderCol.deptId != null and "DESC".equalsIgnoreCase(orderCol.deptId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('deptCode')">
-                        a.deptCode
-                        <if test='orderCol.deptCode != null and "DESC".equalsIgnoreCase(orderCol.deptCode)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('materialName')">
-                        a.materialName
-                        <if test='orderCol.materialName != null and "DESC".equalsIgnoreCase(orderCol.materialName)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('materiaFullName')">
-                        a.materiaFullName
-                        <if test='orderCol.materiaFullName != null and "DESC".equalsIgnoreCase(orderCol.materiaFullName)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('total')">
-                        a.total
-                        <if test='orderCol.total != null and "DESC".equalsIgnoreCase(orderCol.total)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('sort')">
-                        a.sort
-                        <if test='orderCol.sort != null and "DESC".equalsIgnoreCase(orderCol.sort)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('sampleName')">
-                        a.sampleName
-                        <if test='orderCol.sampleName != null and "DESC".equalsIgnoreCase(orderCol.sampleName)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('samplePath')">
-                        a.samplePath
-                        <if test='orderCol.samplePath != null and "DESC".equalsIgnoreCase(orderCol.samplePath)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('preViewPath')">
-                        a.preViewPath
-                        <if test='orderCol.preViewPath != null and "DESC".equalsIgnoreCase(orderCol.preViewPath)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('createTime')">
-                        a.createTime
-                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('createUserId')">
-                        a.createUserId
-                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('updateTime')">
-                        a.updateTime
-                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
-                        ,
-                    </if>
+                <if test="orderCol.containsKey('id')">
+                    a.id
+                    <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('matterId')">
+                    a.matterId
+                    <if test='orderCol.matterId != null and "DESC".equalsIgnoreCase(orderCol.matterId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('deptId')">
+                    a.deptId
+                    <if test='orderCol.deptId != null and "DESC".equalsIgnoreCase(orderCol.deptId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('deptCode')">
+                    a.deptCode
+                    <if test='orderCol.deptCode != null and "DESC".equalsIgnoreCase(orderCol.deptCode)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('deptName')">
+                    a.deptName
+                    <if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('materialName')">
+                    a.materialName
+                    <if test='orderCol.materialName != null and "DESC".equalsIgnoreCase(orderCol.materialName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('materiaFullName')">
+                    a.materiaFullName
+                    <if test='orderCol.materiaFullName != null and "DESC".equalsIgnoreCase(orderCol.materiaFullName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('total')">
+                    a.total
+                    <if test='orderCol.total != null and "DESC".equalsIgnoreCase(orderCol.total)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('sort')">
+                    a.sort
+                    <if test='orderCol.sort != null and "DESC".equalsIgnoreCase(orderCol.sort)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('sampleName')">
+                    a.sampleName
+                    <if test='orderCol.sampleName != null and "DESC".equalsIgnoreCase(orderCol.sampleName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('samplePath')">
+                    a.samplePath
+                    <if test='orderCol.samplePath != null and "DESC".equalsIgnoreCase(orderCol.samplePath)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('preViewPath')">
+                    a.preViewPath
+                    <if test='orderCol.preViewPath != null and "DESC".equalsIgnoreCase(orderCol.preViewPath)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('createTime')">
+                    a.createTime
+                    <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('createUserId')">
+                    a.createUserId
+                    <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('updateTime')">
+                    a.updateTime
+                    <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>