Skip to content

F
fill-system
Commit cbce0ba1 authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加事项接口

parent 798d0c72
Pipeline #2811 failed with stages
      Show whitespace changes
      Inline Side-by-side
      Showing with 677 additions and 46 deletions
      fill-manager/pom.xml
      View file @ cbce0ba1
      ......@@ -56,6 +56,15 @@
      <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
      </properties>
      </profile>
      <profile>
      <id>regtest</id>
      <properties>
      <profiles.active>regtest</profiles.active>
      <profiles.nacos.server-addr>192.168.0.250:8848</profiles.nacos.server-addr>
      <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
      <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
      </properties>
      </profile>
      <profile>
      <id>reg</id>
      <properties>
      ......
      fill-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterQuery.java
      View file @ cbce0ba1
      ......@@ -7,7 +7,7 @@ import com.mortals.xhx.module.matter.model.MatterEntity;
      * 事项申请材料业务查询对象
      *
      * @author zxfei
      * @date 2022-11-18
      * @date 2024-07-16
      */
      public class MatterQuery extends MatterEntity {
      /** 开始 主键，自增长 */
      ......@@ -22,6 +22,9 @@ public class MatterQuery extends MatterEntity {
      /** 主键，自增长列表 */
      private List <Long> idList;
      /** 主键，自增长排除列表 */
      private List <Long> idNotList;
      /** 开始 站点ID */
      private Long siteIdStart;
      ......@@ -34,27 +37,44 @@ public class MatterQuery extends MatterEntity {
      /** 站点ID列表 */
      private List <Long> siteIdList;
      /** 站点ID排除列表 */
      private List <Long> siteIdNotList;
      /** 从政务系统来的事项id */
      private List<String> tidList;
      /** 从政务系统来的事项id排除列表 */
      private List <String> tidNotList;
      /** 从政务系统来的事项code */
      private List<String> tcodeList;
      /** 从政务系统来的事项code排除列表 */
      private List <String> tcodeNotList;
      /** 从政务系统来的事项name */
      private List<String> tnameList;
      /** 从政务系统来的事项name排除列表 */
      private List <String> tnameNotList;
      /** 事项名称 */
      private List<String> matterNameList;
      /** 事项名称排除列表 */
      private List <String> matterNameNotList;
      /** 英语事项名 */
      private List<String> englishNameList;
      /** 英语事项名排除列表 */
      private List <String> englishNameNotList;
      /** 事项编号 */
      private List<String> matterNoList;
      /** 事项编号排除列表 */
      private List <String> matterNoNotList;
      /** 事项全称 */
      private List<String> matterFullNameList;
      /** 事项全称排除列表 */
      private List <String> matterFullNameNotList;
      /** 开始 部门ID */
      private Long deptIdStart;
      ......@@ -67,12 +87,19 @@ public class MatterQuery extends MatterEntity {
      /** 部门ID列表 */
      private List <Long> deptIdList;
      /** 部门ID排除列表 */
      private List <Long> deptIdNotList;
      /** 部门编号 */
      private List<String> deptCodeList;
      /** 部门编号排除列表 */
      private List <String> deptCodeNotList;
      /** 部门名称 */
      private List<String> deptNameList;
      /** 部门名称排除列表 */
      private List <String> deptNameNotList;
      /** 开始 填单次数 */
      private Integer totalStart;
      ......@@ -85,6 +112,9 @@ public class MatterQuery extends MatterEntity {
      /** 填单次数列表 */
      private List <Integer> totalList;
      /** 填单次数排除列表 */
      private List <Integer> totalNotList;
      /** 开始 排序 */
      private Integer sortStart;
      ......@@ -97,6 +127,9 @@ public class MatterQuery extends MatterEntity {
      /** 排序列表 */
      private List <Integer> sortList;
      /** 排序排除列表 */
      private List <Integer> sortNotList;
      /** 开始 是否推荐(0.未推荐，1.推荐) */
      private Integer isRecommendStart;
      ......@@ -109,18 +142,24 @@ public class MatterQuery extends MatterEntity {
      /** 是否推荐(0.未推荐，1.推荐)列表 */
      private List <Integer> isRecommendList;
      /** 开始 事项来源(0.手动添加，1.站点事项) */
      /** 是否推荐(0.未推荐，1.推荐)排除列表 */
      private List <Integer> isRecommendNotList;
      /** 开始 是否推荐(0.手动添加，1.站点事项) */
      private Integer sourceStart;
      /** 结束 事项来源(0.手动添加，1.站点事项) */
      /** 结束 是否推荐(0.手动添加，1.站点事项) */
      private Integer sourceEnd;
      /** 增加 事项来源(0.手动添加，1.站点事项) */
      /** 增加 是否推荐(0.手动添加，1.站点事项) */
      private Integer sourceIncrement;
      /** 事项来源(0.手动添加，1.站点事项)列表 */
      /** 是否推荐(0.手动添加，1.站点事项)列表 */
      private List <Integer> sourceList;
      /** 是否推荐(0.手动添加，1.站点事项)排除列表 */
      private List <Integer> sourceNotList;
      /** 开始 创建时间 */
      private String createTimeStart;
      ......@@ -139,6 +178,9 @@ public class MatterQuery extends MatterEntity {
      /** 创建用户列表 */
      private List <Long> createUserIdList;
      /** 创建用户排除列表 */
      private List <Long> createUserIdNotList;
      /** 开始 修改时间 */
      private String updateTimeStart;
      ......@@ -217,6 +259,23 @@ public class MatterQuery extends MatterEntity {
      this.idList = idList;
      }
      /**
      * 获取 主键，自增长
      * @return idNotList
      */
      public List<Long> getIdNotList(){
      return this.idNotList;
      }
      /**
      * 设置 主键，自增长
      * @param idNotList
      */
      public void setIdNotList(List<Long> idNotList){
      this.idNotList = idNotList;
      }
      /**
      * 获取 开始 站点ID
      * @return siteIdStart
      ......@@ -281,6 +340,23 @@ public class MatterQuery extends MatterEntity {
      this.siteIdList = siteIdList;
      }
      /**
      * 获取 站点ID
      * @return siteIdNotList
      */
      public List<Long> getSiteIdNotList(){
      return this.siteIdNotList;
      }
      /**
      * 设置 站点ID
      * @param siteIdNotList
      */
      public void setSiteIdNotList(List<Long> siteIdNotList){
      this.siteIdNotList = siteIdNotList;
      }
      /**
      * 获取 从政务系统来的事项id
      * @return tidList
      ......@@ -296,6 +372,23 @@ public class MatterQuery extends MatterEntity {
      public void setTidList(List<String> tidList){
      this.tidList = tidList;
      }
      /**
      * 获取 从政务系统来的事项id
      * @return tidNotList
      */
      public List<String> getTidNotList(){
      return this.tidNotList;
      }
      /**
      * 设置 从政务系统来的事项id
      * @param tidNotList
      */
      public void setTidNotList(List<String> tidNotList){
      this.tidNotList = tidNotList;
      }
      /**
      * 获取 从政务系统来的事项code
      * @return tcodeList
      ......@@ -311,6 +404,23 @@ public class MatterQuery extends MatterEntity {
      public void setTcodeList(List<String> tcodeList){
      this.tcodeList = tcodeList;
      }
      /**
      * 获取 从政务系统来的事项code
      * @return tcodeNotList
      */
      public List<String> getTcodeNotList(){
      return this.tcodeNotList;
      }
      /**
      * 设置 从政务系统来的事项code
      * @param tcodeNotList
      */
      public void setTcodeNotList(List<String> tcodeNotList){
      this.tcodeNotList = tcodeNotList;
      }
      /**
      * 获取 从政务系统来的事项name
      * @return tnameList
      ......@@ -326,6 +436,23 @@ public class MatterQuery extends MatterEntity {
      public void setTnameList(List<String> tnameList){
      this.tnameList = tnameList;
      }
      /**
      * 获取 从政务系统来的事项name
      * @return tnameNotList
      */
      public List<String> getTnameNotList(){
      return this.tnameNotList;
      }
      /**
      * 设置 从政务系统来的事项name
      * @param tnameNotList
      */
      public void setTnameNotList(List<String> tnameNotList){
      this.tnameNotList = tnameNotList;
      }
      /**
      * 获取 事项名称
      * @return matterNameList
      ......@@ -341,6 +468,23 @@ public class MatterQuery extends MatterEntity {
      public void setMatterNameList(List<String> matterNameList){
      this.matterNameList = matterNameList;
      }
      /**
      * 获取 事项名称
      * @return matterNameNotList
      */
      public List<String> getMatterNameNotList(){
      return this.matterNameNotList;
      }
      /**
      * 设置 事项名称
      * @param matterNameNotList
      */
      public void setMatterNameNotList(List<String> matterNameNotList){
      this.matterNameNotList = matterNameNotList;
      }
      /**
      * 获取 英语事项名
      * @return englishNameList
      ......@@ -356,6 +500,23 @@ public class MatterQuery extends MatterEntity {
      public void setEnglishNameList(List<String> englishNameList){
      this.englishNameList = englishNameList;
      }
      /**
      * 获取 英语事项名
      * @return englishNameNotList
      */
      public List<String> getEnglishNameNotList(){
      return this.englishNameNotList;
      }
      /**
      * 设置 英语事项名
      * @param englishNameNotList
      */
      public void setEnglishNameNotList(List<String> englishNameNotList){
      this.englishNameNotList = englishNameNotList;
      }
      /**
      * 获取 事项编号
      * @return matterNoList
      ......@@ -371,6 +532,23 @@ public class MatterQuery extends MatterEntity {
      public void setMatterNoList(List<String> matterNoList){
      this.matterNoList = matterNoList;
      }
      /**
      * 获取 事项编号
      * @return matterNoNotList
      */
      public List<String> getMatterNoNotList(){
      return this.matterNoNotList;
      }
      /**
      * 设置 事项编号
      * @param matterNoNotList
      */
      public void setMatterNoNotList(List<String> matterNoNotList){
      this.matterNoNotList = matterNoNotList;
      }
      /**
      * 获取 事项全称
      * @return matterFullNameList
      ......@@ -386,6 +564,23 @@ public class MatterQuery extends MatterEntity {
      public void setMatterFullNameList(List<String> matterFullNameList){
      this.matterFullNameList = matterFullNameList;
      }
      /**
      * 获取 事项全称
      * @return matterFullNameNotList
      */
      public List<String> getMatterFullNameNotList(){
      return this.matterFullNameNotList;
      }
      /**
      * 设置 事项全称
      * @param matterFullNameNotList
      */
      public void setMatterFullNameNotList(List<String> matterFullNameNotList){
      this.matterFullNameNotList = matterFullNameNotList;
      }
      /**
      * 获取 开始 部门ID
      * @return deptIdStart
      ......@@ -450,6 +645,23 @@ public class MatterQuery extends MatterEntity {
      this.deptIdList = deptIdList;
      }
      /**
      * 获取 部门ID
      * @return deptIdNotList
      */
      public List<Long> getDeptIdNotList(){
      return this.deptIdNotList;
      }
      /**
      * 设置 部门ID
      * @param deptIdNotList
      */
      public void setDeptIdNotList(List<Long> deptIdNotList){
      this.deptIdNotList = deptIdNotList;
      }
      /**
      * 获取 部门编号
      * @return deptCodeList
      ......@@ -465,6 +677,23 @@ public class MatterQuery extends MatterEntity {
      public void setDeptCodeList(List<String> deptCodeList){
      this.deptCodeList = deptCodeList;
      }
      /**
      * 获取 部门编号
      * @return deptCodeNotList
      */
      public List<String> getDeptCodeNotList(){
      return this.deptCodeNotList;
      }
      /**
      * 设置 部门编号
      * @param deptCodeNotList
      */
      public void setDeptCodeNotList(List<String> deptCodeNotList){
      this.deptCodeNotList = deptCodeNotList;
      }
      /**
      * 获取 部门名称
      * @return deptNameList
      ......@@ -480,6 +709,23 @@ public class MatterQuery extends MatterEntity {
      public void setDeptNameList(List<String> deptNameList){
      this.deptNameList = deptNameList;
      }
      /**
      * 获取 部门名称
      * @return deptNameNotList
      */
      public List<String> getDeptNameNotList(){
      return this.deptNameNotList;
      }
      /**
      * 设置 部门名称
      * @param deptNameNotList
      */
      public void setDeptNameNotList(List<String> deptNameNotList){
      this.deptNameNotList = deptNameNotList;
      }
      /**
      * 获取 开始 填单次数
      * @return totalStart
      ......@@ -544,6 +790,23 @@ public class MatterQuery extends MatterEntity {
      this.totalList = totalList;
      }
      /**
      * 获取 填单次数
      * @return totalNotList
      */
      public List<Integer> getTotalNotList(){
      return this.totalNotList;
      }
      /**
      * 设置 填单次数
      * @param totalNotList
      */
      public void setTotalNotList(List<Integer> totalNotList){
      this.totalNotList = totalNotList;
      }
      /**
      * 获取 开始 排序
      * @return sortStart
      ......@@ -608,6 +871,23 @@ public class MatterQuery extends MatterEntity {
      this.sortList = sortList;
      }
      /**
      * 获取 排序
      * @return sortNotList
      */
      public List<Integer> getSortNotList(){
      return this.sortNotList;
      }
      /**
      * 设置 排序
      * @param sortNotList
      */
      public void setSortNotList(List<Integer> sortNotList){
      this.sortNotList = sortNotList;
      }
      /**
      * 获取 开始 是否推荐(0.未推荐，1.推荐)
      * @return isRecommendStart
      ......@@ -673,7 +953,24 @@ public class MatterQuery extends MatterEntity {
      }
      /**
      * 获取 开始 事项来源(0.手动添加，1.站点事项)
      * 获取 是否推荐(0.未推荐，1.推荐)
      * @return isRecommendNotList
      */
      public List<Integer> getIsRecommendNotList(){
      return this.isRecommendNotList;
      }
      /**
      * 设置 是否推荐(0.未推荐，1.推荐)
      * @param isRecommendNotList
      */
      public void setIsRecommendNotList(List<Integer> isRecommendNotList){
      this.isRecommendNotList = isRecommendNotList;
      }
      /**
      * 获取 开始 是否推荐(0.手动添加，1.站点事项)
      * @return sourceStart
      */
      public Integer getSourceStart(){
      ......@@ -681,7 +978,7 @@ public class MatterQuery extends MatterEntity {
      }
      /**
      * 设置 开始 事项来源(0.手动添加，1.站点事项)
      * 设置 开始 是否推荐(0.手动添加，1.站点事项)
      * @param sourceStart
      */
      public void setSourceStart(Integer sourceStart){
      ......@@ -689,7 +986,7 @@ public class MatterQuery extends MatterEntity {
      }
      /**
      * 获取 结束 事项来源(0.手动添加，1.站点事项)
      * 获取 结束 是否推荐(0.手动添加，1.站点事项)
      * @return $sourceEnd
      */
      public Integer getSourceEnd(){
      ......@@ -697,7 +994,7 @@ public class MatterQuery extends MatterEntity {
      }
      /**
      * 设置 结束 事项来源(0.手动添加，1.站点事项)
      * 设置 结束 是否推荐(0.手动添加，1.站点事项)
      * @param sourceEnd
      */
      public void setSourceEnd(Integer sourceEnd){
      ......@@ -705,7 +1002,7 @@ public class MatterQuery extends MatterEntity {
      }
      /**
      * 获取 增加 事项来源(0.手动添加，1.站点事项)
      * 获取 增加 是否推荐(0.手动添加，1.站点事项)
      * @return sourceIncrement
      */
      public Integer getSourceIncrement(){
      ......@@ -713,7 +1010,7 @@ public class MatterQuery extends MatterEntity {
      }
      /**
      * 设置 增加 事项来源(0.手动添加，1.站点事项)
      * 设置 增加 是否推荐(0.手动添加，1.站点事项)
      * @param sourceIncrement
      */
      public void setSourceIncrement(Integer sourceIncrement){
      ......@@ -721,7 +1018,7 @@ public class MatterQuery extends MatterEntity {
      }
      /**
      * 获取 事项来源(0.手动添加，1.站点事项)
      * 获取 是否推荐(0.手动添加，1.站点事项)
      * @return sourceList
      */
      public List<Integer> getSourceList(){
      ......@@ -729,13 +1026,30 @@ public class MatterQuery extends MatterEntity {
      }
      /**
      * 设置 事项来源(0.手动添加，1.站点事项)
      * 设置 是否推荐(0.手动添加，1.站点事项)
      * @param sourceList
      */
      public void setSourceList(List<Integer> sourceList){
      this.sourceList = sourceList;
      }
      /**
      * 获取 是否推荐(0.手动添加，1.站点事项)
      * @return sourceNotList
      */
      public List<Integer> getSourceNotList(){
      return this.sourceNotList;
      }
      /**
      * 设置 是否推荐(0.手动添加，1.站点事项)
      * @param sourceNotList
      */
      public void setSourceNotList(List<Integer> sourceNotList){
      this.sourceNotList = sourceNotList;
      }
      /**
      * 获取 开始 创建时间
      * @return createTimeStart
      ......@@ -832,6 +1146,23 @@ public class MatterQuery extends MatterEntity {
      this.createUserIdList = createUserIdList;
      }
      /**
      * 获取 创建用户
      * @return createUserIdNotList
      */
      public List<Long> getCreateUserIdNotList(){
      return this.createUserIdNotList;
      }
      /**
      * 设置 创建用户
      * @param createUserIdNotList
      */
      public void setCreateUserIdNotList(List<Long> createUserIdNotList){
      this.createUserIdNotList = createUserIdNotList;
      }
      /**
      * 获取 开始 修改时间
      * @return updateTimeStart
      ......@@ -909,6 +1240,15 @@ public class MatterQuery extends MatterEntity {
      return this;
      }
      /**
      * 设置 主键，自增长
      * @param idNotList
      */
      public MatterQuery idNotList(List<Long> idNotList){
      this.idNotList = idNotList;
      return this;
      }
      /**
      * 设置 站点ID
      * @param siteId
      ......@@ -954,6 +1294,15 @@ public class MatterQuery extends MatterEntity {
      return this;
      }
      /**
      * 设置 站点ID
      * @param siteIdNotList
      */
      public MatterQuery siteIdNotList(List<Long> siteIdNotList){
      this.siteIdNotList = siteIdNotList;
      return this;
      }
      /**
      * 设置 从政务系统来的事项id
      ......@@ -1132,6 +1481,15 @@ public class MatterQuery extends MatterEntity {
      return this;
      }
      /**
      * 设置 部门ID
      * @param deptIdNotList
      */
      public MatterQuery deptIdNotList(List<Long> deptIdNotList){
      this.deptIdNotList = deptIdNotList;
      return this;
      }
      /**
      * 设置 部门编号
      ......@@ -1215,6 +1573,15 @@ public class MatterQuery extends MatterEntity {
      return this;
      }
      /**
      * 设置 填单次数
      * @param totalNotList
      */
      public MatterQuery totalNotList(List<Integer> totalNotList){
      this.totalNotList = totalNotList;
      return this;
      }
      /**
      * 设置 排序
      * @param sort
      ......@@ -1260,6 +1627,15 @@ public class MatterQuery extends MatterEntity {
      return this;
      }
      /**
      * 设置 排序
      * @param sortNotList
      */
      public MatterQuery sortNotList(List<Integer> sortNotList){
      this.sortNotList = sortNotList;
      return this;
      }
      /**
      * 设置 是否推荐(0.未推荐，1.推荐)
      * @param isRecommend
      ......@@ -1306,7 +1682,16 @@ public class MatterQuery extends MatterEntity {
      }
      /**
      * 设置 事项来源(0.手动添加，1.站点事项)
      * 设置 是否推荐(0.未推荐，1.推荐)
      * @param isRecommendNotList
      */
      public MatterQuery isRecommendNotList(List<Integer> isRecommendNotList){
      this.isRecommendNotList = isRecommendNotList;
      return this;
      }
      /**
      * 设置 是否推荐(0.手动添加，1.站点事项)
      * @param source
      */
      public MatterQuery source(Integer source){
      ......@@ -1315,7 +1700,7 @@ public class MatterQuery extends MatterEntity {
      }
      /**
      * 设置 开始 事项来源(0.手动添加，1.站点事项)
      * 设置 开始 是否推荐(0.手动添加，1.站点事项)
      * @param sourceStart
      */
      public MatterQuery sourceStart(Integer sourceStart){
      ......@@ -1324,7 +1709,7 @@ public class MatterQuery extends MatterEntity {
      }
      /**
      * 设置 结束 事项来源(0.手动添加，1.站点事项)
      * 设置 结束 是否推荐(0.手动添加，1.站点事项)
      * @param sourceEnd
      */
      public MatterQuery sourceEnd(Integer sourceEnd){
      ......@@ -1333,7 +1718,7 @@ public class MatterQuery extends MatterEntity {
      }
      /**
      * 设置 增加 事项来源(0.手动添加，1.站点事项)
      * 设置 增加 是否推荐(0.手动添加，1.站点事项)
      * @param sourceIncrement
      */
      public MatterQuery sourceIncrement(Integer sourceIncrement){
      ......@@ -1342,7 +1727,7 @@ public class MatterQuery extends MatterEntity {
      }
      /**
      * 设置 事项来源(0.手动添加，1.站点事项)
      * 设置 是否推荐(0.手动添加，1.站点事项)
      * @param sourceList
      */
      public MatterQuery sourceList(List<Integer> sourceList){
      ......@@ -1350,6 +1735,15 @@ public class MatterQuery extends MatterEntity {
      return this;
      }
      /**
      * 设置 是否推荐(0.手动添加，1.站点事项)
      * @param sourceNotList
      */
      public MatterQuery sourceNotList(List<Integer> sourceNotList){
      this.sourceNotList = sourceNotList;
      return this;
      }
      /**
      * 设置 创建用户
      ......@@ -1396,6 +1790,15 @@ public class MatterQuery extends MatterEntity {
      return this;
      }
      /**
      * 设置 创建用户
      * @param createUserIdNotList
      */
      public MatterQuery createUserIdNotList(List<Long> createUserIdNotList){
      this.createUserIdNotList = createUserIdNotList;
      return this;
      }
      /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      ......
      fill-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterVo.java
      View file @ cbce0ba1
      ......@@ -22,4 +22,10 @@ public class MatterVo extends BaseEntityLong {
      */
      private Integer isTerminal = 0;
      /** 主键，自增长列表 */
      private List <Long> idList;
      /** 主键，自增长排除列表 */
      private List <Long> idNotList;
      }
      \ No newline at end of file
      fill-manager/src/main/resources/sqlmap/module/matter/MatterMapper.xml
      View file @ cbce0ba1
      ......@@ -27,9 +27,9 @@
      <collection property="matterDatumList" column="id" ofType="MatterDatumEntity" javaType="ArrayList" select="getMatterDatumByMatterId"></collection>
      </resultMap>
      <resultMap type="MatterDatumEntity" id="MatterDatumEntity-Map">
      <id property="id" column="id" />
      <result property="siteId" column="siteId" />
      <result property="id" column="id" />
      <result property="matterId" column="matterId" />
      <result property="siteId" column="siteId" />
      <result property="deptId" column="deptId" />
      <result property="deptCode" column="deptCode" />
      <result property="deptName" column="deptName" />
      ......@@ -39,16 +39,9 @@
      <result property="isRecommend" column="isRecommend" />
      <result property="total" column="total" />
      <result property="sort" column="sort" />
      <result property="samplePrint" column="samplePrint" />
      <result property="fileName" column="fileName" />
      <result property="fileUrl" column="fileUrl" />
      <result property="filePreViewUrl" column="filePreViewUrl" />
      <result property="sampleName" column="sampleName" />
      <result property="samplePath" column="samplePath" />
      <result property="templateName" column="templateName" />
      <result property="templatePath" column="templatePath" />
      <result property="preViewPath" column="preViewPath" />
      <result property="formContent" column="formContent" />
      <result property="createTime" column="createTime" />
      <result property="createUserId" column="createUserId" />
      <result property="updateTime" column="updateTime" />
      ......@@ -120,7 +113,7 @@
      <!-- 子表所有列 -->
      <sql id="_columns_sub">
      <trim suffixOverrides="," suffix="">
      b.id,b.matterId,b.siteId,b.deptId,b.deptCode,b.deptName,b.materialName,b.materiaFullName,b.source,b.isRecommend,b.total,b.sort,b.samplePrint,b.fileName, b.fileUrl,b.filePreViewUrl,b.sampleName,b.samplePath,b.preViewPath,b.createTime,b.createUserId,b.updateTime,
      b.id,b.matterId,b.siteId,b.deptId,b.deptCode,b.deptName,b.materialName,b.materiaFullName,b.source,b.isRecommend,b.total,b.sort,b.sampleName,b.samplePath,b.preViewPath,b.createTime,b.createUserId,b.updateTime,
      </trim>
      </sql>
      <!-- 新增 区分主键自增加还是业务插入 -->
      ......@@ -514,6 +507,10 @@
      <!-- 条件映射-代参数 -->
      <sql id="_condition_param_">
      <bind name="conditionParamRef" value="${_conditionParam_}"/>
      <if test="permissionSql != null and permissionSql != ''">
      ${permissionSql}
      </if>
      <if test="conditionParamRef.containsKey('id')">
      <if test="conditionParamRef.id != null">
      ${_conditionType_} a.id=#{${_conditionParam_}.id}
      ......@@ -527,12 +524,18 @@
      ${_conditionType_} a.id is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('idList')">
      <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
      ${_conditionType_} a.id in
      <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
      ${_conditionType_} a.id not in
      <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
      ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
      </if>
      ......@@ -548,12 +551,18 @@
      ${_conditionType_} a.siteId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('siteIdList')">
      <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
      ${_conditionType_} a.siteId in
      <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
      ${_conditionType_} a.siteId not in
      <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
      ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
      </if>
      ......@@ -570,12 +579,18 @@
      ${_conditionType_} a.tid is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('tidList')">
      <if test="conditionParamRef.containsKey('tidList') and conditionParamRef.tidList.size() > 0">
      ${_conditionType_} a.tid in
      <foreach collection="conditionParamRef.tidList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('tidNotList') and conditionParamRef.tidNotList.size() > 0">
      ${_conditionType_} a.tid not in
      <foreach collection="conditionParamRef.tidNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('tcode')">
      <if test="conditionParamRef.tcode != null and conditionParamRef.tcode != ''">
      ......@@ -585,12 +600,18 @@
      ${_conditionType_} a.tcode is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('tcodeList')">
      <if test="conditionParamRef.containsKey('tcodeList') and conditionParamRef.tcodeList.size() > 0">
      ${_conditionType_} a.tcode in
      <foreach collection="conditionParamRef.tcodeList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('tcodeNotList') and conditionParamRef.tcodeNotList.size() > 0">
      ${_conditionType_} a.tcode not in
      <foreach collection="conditionParamRef.tcodeNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('tname')">
      <if test="conditionParamRef.tname != null and conditionParamRef.tname != ''">
      ......@@ -600,12 +621,18 @@
      ${_conditionType_} a.tname is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('tnameList')">
      <if test="conditionParamRef.containsKey('tnameList') and conditionParamRef.tnameList.size() > 0">
      ${_conditionType_} a.tname in
      <foreach collection="conditionParamRef.tnameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('tnameNotList') and conditionParamRef.tnameNotList.size() > 0">
      ${_conditionType_} a.tname not in
      <foreach collection="conditionParamRef.tnameNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterName')">
      <if test="conditionParamRef.matterName != null and conditionParamRef.matterName != ''">
      ......@@ -615,12 +642,18 @@
      ${_conditionType_} a.matterName is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('matterNameList')">
      <if test="conditionParamRef.containsKey('matterNameList') and conditionParamRef.matterNameList.size() > 0">
      ${_conditionType_} a.matterName in
      <foreach collection="conditionParamRef.matterNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterNameNotList') and conditionParamRef.matterNameNotList.size() > 0">
      ${_conditionType_} a.matterName not in
      <foreach collection="conditionParamRef.matterNameNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('englishName')">
      <if test="conditionParamRef.englishName != null and conditionParamRef.englishName != ''">
      ......@@ -630,12 +663,18 @@
      ${_conditionType_} a.englishName is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('englishNameList')">
      <if test="conditionParamRef.containsKey('englishNameList') and conditionParamRef.englishNameList.size() > 0">
      ${_conditionType_} a.englishName in
      <foreach collection="conditionParamRef.englishNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('englishNameNotList') and conditionParamRef.englishNameNotList.size() > 0">
      ${_conditionType_} a.englishName not in
      <foreach collection="conditionParamRef.englishNameNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterNo')">
      <if test="conditionParamRef.matterNo != null and conditionParamRef.matterNo != ''">
      ......@@ -645,12 +684,18 @@
      ${_conditionType_} a.matterNo is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('matterNoList')">
      <if test="conditionParamRef.containsKey('matterNoList') and conditionParamRef.matterNoList.size() > 0">
      ${_conditionType_} a.matterNo in
      <foreach collection="conditionParamRef.matterNoList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterNoNotList') and conditionParamRef.matterNoNotList.size() > 0">
      ${_conditionType_} a.matterNo not in
      <foreach collection="conditionParamRef.matterNoNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterFullName')">
      <if test="conditionParamRef.matterFullName != null and conditionParamRef.matterFullName != ''">
      ......@@ -660,12 +705,18 @@
      ${_conditionType_} a.matterFullName is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('matterFullNameList')">
      <if test="conditionParamRef.containsKey('matterFullNameList') and conditionParamRef.matterFullNameList.size() > 0">
      ${_conditionType_} a.matterFullName in
      <foreach collection="conditionParamRef.matterFullNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterFullNameNotList') and conditionParamRef.matterFullNameNotList.size() > 0">
      ${_conditionType_} a.matterFullName not in
      <foreach collection="conditionParamRef.matterFullNameNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deptId')">
      <if test="conditionParamRef.deptId != null ">
      ${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
      ......@@ -674,12 +725,18 @@
      ${_conditionType_} a.deptId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('deptIdList')">
      <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
      ${_conditionType_} a.deptId in
      <foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deptIdNotList') and conditionParamRef.deptIdNotList.size() > 0">
      ${_conditionType_} a.deptId not in
      <foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deptIdStart') and conditionParamRef.deptIdStart != null">
      ${_conditionType_} a.deptId <![CDATA[ >= ]]> #{${_conditionParam_}.deptIdStart}
      </if>
      ......@@ -696,12 +753,18 @@
      ${_conditionType_} a.deptCode is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('deptCodeList')">
      <if test="conditionParamRef.containsKey('deptCodeList') and conditionParamRef.deptCodeList.size() > 0">
      ${_conditionType_} a.deptCode in
      <foreach collection="conditionParamRef.deptCodeList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deptCodeNotList') and conditionParamRef.deptCodeNotList.size() > 0">
      ${_conditionType_} a.deptCode not in
      <foreach collection="conditionParamRef.deptCodeNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deptName')">
      <if test="conditionParamRef.deptName != null and conditionParamRef.deptName != ''">
      ......@@ -711,12 +774,18 @@
      ${_conditionType_} a.deptName is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('deptNameList')">
      <if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0">
      ${_conditionType_} a.deptName in
      <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
      ${_conditionType_} a.deptName not in
      <foreach collection="conditionParamRef.deptNameNotList" 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}
      ......@@ -725,12 +794,18 @@
      ${_conditionType_} a.total is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('totalList')">
      <if test="conditionParamRef.containsKey('totalList') and conditionParamRef.totalList.size() > 0">
      ${_conditionType_} a.total in
      <foreach collection="conditionParamRef.totalList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('totalNotList') and conditionParamRef.totalNotList.size() > 0">
      ${_conditionType_} a.total not in
      <foreach collection="conditionParamRef.totalNotList" 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>
      ......@@ -746,12 +821,18 @@
      ${_conditionType_} a.sort is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('sortList')">
      <if test="conditionParamRef.containsKey('sortList') and conditionParamRef.sortList.size() > 0">
      ${_conditionType_} a.sort in
      <foreach collection="conditionParamRef.sortList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('sortNotList') and conditionParamRef.sortNotList.size() > 0">
      ${_conditionType_} a.sort not in
      <foreach collection="conditionParamRef.sortNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('sortStart') and conditionParamRef.sortStart != null">
      ${_conditionType_} a.sort <![CDATA[ >= ]]> #{${_conditionParam_}.sortStart}
      </if>
      ......@@ -767,12 +848,18 @@
      ${_conditionType_} a.isRecommend is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('isRecommendList')">
      <if test="conditionParamRef.containsKey('isRecommendList') and conditionParamRef.isRecommendList.size() > 0">
      ${_conditionType_} a.isRecommend in
      <foreach collection="conditionParamRef.isRecommendList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('isRecommendNotList') and conditionParamRef.isRecommendNotList.size() > 0">
      ${_conditionType_} a.isRecommend not in
      <foreach collection="conditionParamRef.isRecommendNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('isRecommendStart') and conditionParamRef.isRecommendStart != null">
      ${_conditionType_} a.isRecommend <![CDATA[ >= ]]> #{${_conditionParam_}.isRecommendStart}
      </if>
      ......@@ -788,12 +875,18 @@
      ${_conditionType_} a.source is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('sourceList')">
      <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
      ${_conditionType_} a.source in
      <foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('sourceNotList') and conditionParamRef.sourceNotList.size() > 0">
      ${_conditionType_} a.source not in
      <foreach collection="conditionParamRef.sourceNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
      ${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
      </if>
      ......@@ -824,12 +917,18 @@
      ${_conditionType_} a.createUserId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('createUserIdList')">
      <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
      ${_conditionType_} a.createUserId in
      <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
      ${_conditionType_} a.createUserId not in
      <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
      ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
      </if>
      ......@@ -856,14 +955,126 @@
      <sql id="_orderCols_">
      <if test="orderColList != null and !orderColList.isEmpty()">
      order by
      <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
      field(a.id,
      <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
      field(a.siteId,
      <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
      field(a.deptId,
      <foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('totalList') and conditionParamRef.totalList.size() > 0">
      field(a.total,
      <foreach collection="conditionParamRef.totalList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('sortList') and conditionParamRef.sortList.size() > 0">
      field(a.sort,
      <foreach collection="conditionParamRef.sortList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('isRecommendList') and conditionParamRef.isRecommendList.size() > 0">
      field(a.isRecommend,
      <foreach collection="conditionParamRef.isRecommendList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
      field(a.source,
      <foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
      field(a.createUserId,
      <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <trim suffixOverrides="," suffix="">
      <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
      ${item.colName} ${item.sortKind}
      a.${item.colName} ${item.sortKind}
      </foreach>
      </trim>
      </if>
      <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
      order by
      <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
      field(a.id,
      <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
      field(a.siteId,
      <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
      field(a.deptId,
      <foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('totalList') and conditionParamRef.totalList.size() > 0">
      field(a.total,
      <foreach collection="conditionParamRef.totalList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('sortList') and conditionParamRef.sortList.size() > 0">
      field(a.sort,
      <foreach collection="conditionParamRef.sortList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('isRecommendList') and conditionParamRef.isRecommendList.size() > 0">
      field(a.isRecommend,
      <foreach collection="conditionParamRef.isRecommendList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
      field(a.source,
      <foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
      field(a.createUserId,
      <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <trim suffixOverrides="," suffix="">
      <if test="orderCol.containsKey('id')">
      a.id
      ......@@ -962,6 +1173,8 @@
      </if>
      </trim>
      </if>
      </sql>
      <sql id="_group_by_">
      <if test="groupList != null and !groupList.isEmpty()">
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment