Skip to content

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

修改热门词汇

parent 2bcf9922
Pipeline #2417 canceled with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 4459 additions and 327 deletions
      common-lib/src/main/java/com/mortals/xhx/common/pdu/dept/DeptPdu.java 0 → 100644
      View file @ 00396d9f
      package com.mortals.xhx.common.pdu.dept;
      import java.util.Date;
      import java.util.List;
      import com.mortals.framework.model.BaseEntityLong;
      /**
      * 部门Pdu对象
      *
      * @author zxfei
      * @date 2022-12-09
      */
      public class DeptPdu extends BaseEntityLong {
      private static final long serialVersionUID = 1L;
      /**
      * 从政务系统来的部门id
      */
      private String tid;
      /**
      * 从政务系统来的部门name
      */
      private String tname;
      /**
      * 部门名称
      */
      private String name;
      /**
      * 从政务系统来的别名
      */
      private String simpleName;
      /**
      * 站点ID
      */
      private Long siteId;
      /**
      * 部门简称
      */
      private String deptAbb;
      /**
      * 部门电话
      */
      private String deptTelphone;
      /**
      * 部门编号
      */
      private String deptNumber;
      /**
      * 填单机展示 (0.否，1.是)
      */
      private Integer isAutotable;
      /**
      * 预约展示 (0.否，1.是)
      */
      private Integer isOrder;
      /**
      * 背靠背展示 (0.否，1.是)
      */
      private Integer isBkb;
      /**
      * 办事指南展示 (0.否，1.是)
      */
      private Integer isWorkGuide;
      /**
      * 是否使用 (0.否，1.是)
      */
      private Integer usValid;
      /**
      * 部门电话是否展示 (0.否，1.是)
      */
      private Integer isSecphone;
      /**
      * 是否展示英文 (0.否，1.是)
      */
      private Integer isEnglish;
      /**
      * 排序
      */
      private Integer sort;
      /**
      * 部门来源
      */
      private Integer source;
      /** 开始 序号，主键，自增长 */
      private Long idStart;
      /** 结束 序号，主键，自增长 */
      private Long idEnd;
      /** 增加 序号，主键，自增长 */
      private Long idIncrement;
      /** 序号，主键，自增长列表 */
      private List <Long> idList;
      /** 从政务系统来的部门id */
      private List<String> tidList;
      /** 从政务系统来的部门name */
      private List<String> tnameList;
      /** 部门名称 */
      private List<String> nameList;
      /** 从政务系统来的别名 */
      private List<String> simpleNameList;
      /** 开始 站点ID */
      private Long siteIdStart;
      /** 结束 站点ID */
      private Long siteIdEnd;
      /** 增加 站点ID */
      private Long siteIdIncrement;
      /** 站点ID列表 */
      private List <Long> siteIdList;
      /** 部门简称 */
      private List<String> deptAbbList;
      /** 部门电话 */
      private List<String> deptTelphoneList;
      /** 部门编号 */
      private List<String> deptNumberList;
      /** 开始 填单机展示 (0.否，1.是) */
      private Integer isAutotableStart;
      /** 结束 填单机展示 (0.否，1.是) */
      private Integer isAutotableEnd;
      /** 增加 填单机展示 (0.否，1.是) */
      private Integer isAutotableIncrement;
      /** 填单机展示 (0.否，1.是) 列表 */
      private List <Integer> isAutotableList;
      /** 开始 预约展示 (0.否，1.是) */
      private Integer isOrderStart;
      /** 结束 预约展示 (0.否，1.是) */
      private Integer isOrderEnd;
      /** 增加 预约展示 (0.否，1.是) */
      private Integer isOrderIncrement;
      /** 预约展示 (0.否，1.是) 列表 */
      private List <Integer> isOrderList;
      /** 开始 背靠背展示 (0.否，1.是) */
      private Integer isBkbStart;
      /** 结束 背靠背展示 (0.否，1.是) */
      private Integer isBkbEnd;
      /** 增加 背靠背展示 (0.否，1.是) */
      private Integer isBkbIncrement;
      /** 背靠背展示 (0.否，1.是) 列表 */
      private List <Integer> isBkbList;
      /** 开始 办事指南展示 (0.否，1.是) */
      private Integer isWorkGuideStart;
      /** 结束 办事指南展示 (0.否，1.是) */
      private Integer isWorkGuideEnd;
      /** 增加 办事指南展示 (0.否，1.是) */
      private Integer isWorkGuideIncrement;
      /** 办事指南展示 (0.否，1.是) 列表 */
      private List <Integer> isWorkGuideList;
      /** 开始 是否使用 (0.否，1.是) */
      private Integer usValidStart;
      /** 结束 是否使用 (0.否，1.是) */
      private Integer usValidEnd;
      /** 增加 是否使用 (0.否，1.是) */
      private Integer usValidIncrement;
      /** 是否使用 (0.否，1.是) 列表 */
      private List <Integer> usValidList;
      /** 开始 部门电话是否展示 (0.否，1.是) */
      private Integer isSecphoneStart;
      /** 结束 部门电话是否展示 (0.否，1.是) */
      private Integer isSecphoneEnd;
      /** 增加 部门电话是否展示 (0.否，1.是) */
      private Integer isSecphoneIncrement;
      /** 部门电话是否展示 (0.否，1.是) 列表 */
      private List <Integer> isSecphoneList;
      /** 开始 是否展示英文 (0.否，1.是) */
      private Integer isEnglishStart;
      /** 结束 是否展示英文 (0.否，1.是) */
      private Integer isEnglishEnd;
      /** 增加 是否展示英文 (0.否，1.是) */
      private Integer isEnglishIncrement;
      /** 是否展示英文 (0.否，1.是) 列表 */
      private List <Integer> isEnglishList;
      /** 开始 排序 */
      private Integer sortStart;
      /** 结束 排序 */
      private Integer sortEnd;
      /** 增加 排序 */
      private Integer sortIncrement;
      /** 排序列表 */
      private List <Integer> sortList;
      /** 开始 部门来源 */
      private Integer sourceStart;
      /** 结束 部门来源 */
      private Integer sourceEnd;
      /** 增加 部门来源 */
      private Integer sourceIncrement;
      /** 部门来源列表 */
      private List <Integer> sourceList;
      /** 开始 创建时间 */
      private String createTimeStart;
      /** 结束 创建时间 */
      private String createTimeEnd;
      /** 开始 创建用户 */
      private Long createUserIdStart;
      /** 结束 创建用户 */
      private Long createUserIdEnd;
      /** 增加 创建用户 */
      private Long createUserIdIncrement;
      /** 创建用户列表 */
      private List <Long> createUserIdList;
      /** 开始 修改时间 */
      private String updateTimeStart;
      /** 结束 修改时间 */
      private String updateTimeEnd;
      /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
      private List<DeptPdu> orConditionList;
      /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
      private List<DeptPdu> andConditionList;
      public DeptPdu(){}
      /**
      * 获取 从政务系统来的部门id
      * @return String
      */
      public String getTid(){
      return tid;
      }
      /**
      * 设置 从政务系统来的部门id
      * @param tid
      */
      public void setTid(String tid){
      this.tid = tid;
      }
      /**
      * 获取 从政务系统来的部门name
      * @return String
      */
      public String getTname(){
      return tname;
      }
      /**
      * 设置 从政务系统来的部门name
      * @param tname
      */
      public void setTname(String tname){
      this.tname = tname;
      }
      /**
      * 获取 部门名称
      * @return String
      */
      public String getName(){
      return name;
      }
      /**
      * 设置 部门名称
      * @param name
      */
      public void setName(String name){
      this.name = name;
      }
      /**
      * 获取 从政务系统来的别名
      * @return String
      */
      public String getSimpleName(){
      return simpleName;
      }
      /**
      * 设置 从政务系统来的别名
      * @param simpleName
      */
      public void setSimpleName(String simpleName){
      this.simpleName = simpleName;
      }
      /**
      * 获取 站点ID
      * @return Long
      */
      public Long getSiteId(){
      return siteId;
      }
      /**
      * 设置 站点ID
      * @param siteId
      */
      public void setSiteId(Long siteId){
      this.siteId = siteId;
      }
      /**
      * 获取 部门简称
      * @return String
      */
      public String getDeptAbb(){
      return deptAbb;
      }
      /**
      * 设置 部门简称
      * @param deptAbb
      */
      public void setDeptAbb(String deptAbb){
      this.deptAbb = deptAbb;
      }
      /**
      * 获取 部门电话
      * @return String
      */
      public String getDeptTelphone(){
      return deptTelphone;
      }
      /**
      * 设置 部门电话
      * @param deptTelphone
      */
      public void setDeptTelphone(String deptTelphone){
      this.deptTelphone = deptTelphone;
      }
      /**
      * 获取 部门编号
      * @return String
      */
      public String getDeptNumber(){
      return deptNumber;
      }
      /**
      * 设置 部门编号
      * @param deptNumber
      */
      public void setDeptNumber(String deptNumber){
      this.deptNumber = deptNumber;
      }
      /**
      * 获取 填单机展示 (0.否，1.是)
      * @return Integer
      */
      public Integer getIsAutotable(){
      return isAutotable;
      }
      /**
      * 设置 填单机展示 (0.否，1.是)
      * @param isAutotable
      */
      public void setIsAutotable(Integer isAutotable){
      this.isAutotable = isAutotable;
      }
      /**
      * 获取 预约展示 (0.否，1.是)
      * @return Integer
      */
      public Integer getIsOrder(){
      return isOrder;
      }
      /**
      * 设置 预约展示 (0.否，1.是)
      * @param isOrder
      */
      public void setIsOrder(Integer isOrder){
      this.isOrder = isOrder;
      }
      /**
      * 获取 背靠背展示 (0.否，1.是)
      * @return Integer
      */
      public Integer getIsBkb(){
      return isBkb;
      }
      /**
      * 设置 背靠背展示 (0.否，1.是)
      * @param isBkb
      */
      public void setIsBkb(Integer isBkb){
      this.isBkb = isBkb;
      }
      /**
      * 获取 办事指南展示 (0.否，1.是)
      * @return Integer
      */
      public Integer getIsWorkGuide(){
      return isWorkGuide;
      }
      /**
      * 设置 办事指南展示 (0.否，1.是)
      * @param isWorkGuide
      */
      public void setIsWorkGuide(Integer isWorkGuide){
      this.isWorkGuide = isWorkGuide;
      }
      /**
      * 获取 是否使用 (0.否，1.是)
      * @return Integer
      */
      public Integer getUsValid(){
      return usValid;
      }
      /**
      * 设置 是否使用 (0.否，1.是)
      * @param usValid
      */
      public void setUsValid(Integer usValid){
      this.usValid = usValid;
      }
      /**
      * 获取 部门电话是否展示 (0.否，1.是)
      * @return Integer
      */
      public Integer getIsSecphone(){
      return isSecphone;
      }
      /**
      * 设置 部门电话是否展示 (0.否，1.是)
      * @param isSecphone
      */
      public void setIsSecphone(Integer isSecphone){
      this.isSecphone = isSecphone;
      }
      /**
      * 获取 是否展示英文 (0.否，1.是)
      * @return Integer
      */
      public Integer getIsEnglish(){
      return isEnglish;
      }
      /**
      * 设置 是否展示英文 (0.否，1.是)
      * @param isEnglish
      */
      public void setIsEnglish(Integer isEnglish){
      this.isEnglish = isEnglish;
      }
      /**
      * 获取 排序
      * @return Integer
      */
      public Integer getSort(){
      return sort;
      }
      /**
      * 设置 排序
      * @param sort
      */
      public void setSort(Integer sort){
      this.sort = sort;
      }
      /**
      * 获取 部门来源
      * @return Integer
      */
      public Integer getSource(){
      return source;
      }
      /**
      * 设置 部门来源
      * @param source
      */
      public void setSource(Integer source){
      this.source = source;
      }
      /**
      * 获取 开始 序号，主键，自增长
      * @return idStart
      */
      public Long getIdStart(){
      return this.idStart;
      }
      /**
      * 设置 开始 序号，主键，自增长
      * @param idStart
      */
      public void setIdStart(Long idStart){
      this.idStart = idStart;
      }
      /**
      * 获取 结束 序号，主键，自增长
      * @return $idEnd
      */
      public Long getIdEnd(){
      return this.idEnd;
      }
      /**
      * 设置 结束 序号，主键，自增长
      * @param idEnd
      */
      public void setIdEnd(Long idEnd){
      this.idEnd = idEnd;
      }
      /**
      * 获取 增加 序号，主键，自增长
      * @return idIncrement
      */
      public Long getIdIncrement(){
      return this.idIncrement;
      }
      /**
      * 设置 增加 序号，主键，自增长
      * @param idIncrement
      */
      public void setIdIncrement(Long idIncrement){
      this.idIncrement = idIncrement;
      }
      /**
      * 获取 序号，主键，自增长
      * @return idList
      */
      public List<Long> getIdList(){
      return this.idList;
      }
      /**
      * 设置 序号，主键，自增长
      * @param idList
      */
      public void setIdList(List<Long> idList){
      this.idList = idList;
      }
      /**
      * 获取 从政务系统来的部门id
      * @return tidList
      */
      public List<String> getTidList(){
      return this.tidList;
      }
      /**
      * 设置 从政务系统来的部门id
      * @param tidList
      */
      public void setTidList(List<String> tidList){
      this.tidList = tidList;
      }
      /**
      * 获取 从政务系统来的部门name
      * @return tnameList
      */
      public List<String> getTnameList(){
      return this.tnameList;
      }
      /**
      * 设置 从政务系统来的部门name
      * @param tnameList
      */
      public void setTnameList(List<String> tnameList){
      this.tnameList = tnameList;
      }
      /**
      * 获取 部门名称
      * @return nameList
      */
      public List<String> getNameList(){
      return this.nameList;
      }
      /**
      * 设置 部门名称
      * @param nameList
      */
      public void setNameList(List<String> nameList){
      this.nameList = nameList;
      }
      /**
      * 获取 从政务系统来的别名
      * @return simpleNameList
      */
      public List<String> getSimpleNameList(){
      return this.simpleNameList;
      }
      /**
      * 设置 从政务系统来的别名
      * @param simpleNameList
      */
      public void setSimpleNameList(List<String> simpleNameList){
      this.simpleNameList = simpleNameList;
      }
      /**
      * 获取 开始 站点ID
      * @return siteIdStart
      */
      public Long getSiteIdStart(){
      return this.siteIdStart;
      }
      /**
      * 设置 开始 站点ID
      * @param siteIdStart
      */
      public void setSiteIdStart(Long siteIdStart){
      this.siteIdStart = siteIdStart;
      }
      /**
      * 获取 结束 站点ID
      * @return $siteIdEnd
      */
      public Long getSiteIdEnd(){
      return this.siteIdEnd;
      }
      /**
      * 设置 结束 站点ID
      * @param siteIdEnd
      */
      public void setSiteIdEnd(Long siteIdEnd){
      this.siteIdEnd = siteIdEnd;
      }
      /**
      * 获取 增加 站点ID
      * @return siteIdIncrement
      */
      public Long getSiteIdIncrement(){
      return this.siteIdIncrement;
      }
      /**
      * 设置 增加 站点ID
      * @param siteIdIncrement
      */
      public void setSiteIdIncrement(Long siteIdIncrement){
      this.siteIdIncrement = siteIdIncrement;
      }
      /**
      * 获取 站点ID
      * @return siteIdList
      */
      public List<Long> getSiteIdList(){
      return this.siteIdList;
      }
      /**
      * 设置 站点ID
      * @param siteIdList
      */
      public void setSiteIdList(List<Long> siteIdList){
      this.siteIdList = siteIdList;
      }
      /**
      * 获取 部门简称
      * @return deptAbbList
      */
      public List<String> getDeptAbbList(){
      return this.deptAbbList;
      }
      /**
      * 设置 部门简称
      * @param deptAbbList
      */
      public void setDeptAbbList(List<String> deptAbbList){
      this.deptAbbList = deptAbbList;
      }
      /**
      * 获取 部门电话
      * @return deptTelphoneList
      */
      public List<String> getDeptTelphoneList(){
      return this.deptTelphoneList;
      }
      /**
      * 设置 部门电话
      * @param deptTelphoneList
      */
      public void setDeptTelphoneList(List<String> deptTelphoneList){
      this.deptTelphoneList = deptTelphoneList;
      }
      /**
      * 获取 部门编号
      * @return deptNumberList
      */
      public List<String> getDeptNumberList(){
      return this.deptNumberList;
      }
      /**
      * 设置 部门编号
      * @param deptNumberList
      */
      public void setDeptNumberList(List<String> deptNumberList){
      this.deptNumberList = deptNumberList;
      }
      /**
      * 获取 开始 填单机展示 (0.否，1.是)
      * @return isAutotableStart
      */
      public Integer getIsAutotableStart(){
      return this.isAutotableStart;
      }
      /**
      * 设置 开始 填单机展示 (0.否，1.是)
      * @param isAutotableStart
      */
      public void setIsAutotableStart(Integer isAutotableStart){
      this.isAutotableStart = isAutotableStart;
      }
      /**
      * 获取 结束 填单机展示 (0.否，1.是)
      * @return $isAutotableEnd
      */
      public Integer getIsAutotableEnd(){
      return this.isAutotableEnd;
      }
      /**
      * 设置 结束 填单机展示 (0.否，1.是)
      * @param isAutotableEnd
      */
      public void setIsAutotableEnd(Integer isAutotableEnd){
      this.isAutotableEnd = isAutotableEnd;
      }
      /**
      * 获取 增加 填单机展示 (0.否，1.是)
      * @return isAutotableIncrement
      */
      public Integer getIsAutotableIncrement(){
      return this.isAutotableIncrement;
      }
      /**
      * 设置 增加 填单机展示 (0.否，1.是)
      * @param isAutotableIncrement
      */
      public void setIsAutotableIncrement(Integer isAutotableIncrement){
      this.isAutotableIncrement = isAutotableIncrement;
      }
      /**
      * 获取 填单机展示 (0.否，1.是)
      * @return isAutotableList
      */
      public List<Integer> getIsAutotableList(){
      return this.isAutotableList;
      }
      /**
      * 设置 填单机展示 (0.否，1.是)
      * @param isAutotableList
      */
      public void setIsAutotableList(List<Integer> isAutotableList){
      this.isAutotableList = isAutotableList;
      }
      /**
      * 获取 开始 预约展示 (0.否，1.是)
      * @return isOrderStart
      */
      public Integer getIsOrderStart(){
      return this.isOrderStart;
      }
      /**
      * 设置 开始 预约展示 (0.否，1.是)
      * @param isOrderStart
      */
      public void setIsOrderStart(Integer isOrderStart){
      this.isOrderStart = isOrderStart;
      }
      /**
      * 获取 结束 预约展示 (0.否，1.是)
      * @return $isOrderEnd
      */
      public Integer getIsOrderEnd(){
      return this.isOrderEnd;
      }
      /**
      * 设置 结束 预约展示 (0.否，1.是)
      * @param isOrderEnd
      */
      public void setIsOrderEnd(Integer isOrderEnd){
      this.isOrderEnd = isOrderEnd;
      }
      /**
      * 获取 增加 预约展示 (0.否，1.是)
      * @return isOrderIncrement
      */
      public Integer getIsOrderIncrement(){
      return this.isOrderIncrement;
      }
      /**
      * 设置 增加 预约展示 (0.否，1.是)
      * @param isOrderIncrement
      */
      public void setIsOrderIncrement(Integer isOrderIncrement){
      this.isOrderIncrement = isOrderIncrement;
      }
      /**
      * 获取 预约展示 (0.否，1.是)
      * @return isOrderList
      */
      public List<Integer> getIsOrderList(){
      return this.isOrderList;
      }
      /**
      * 设置 预约展示 (0.否，1.是)
      * @param isOrderList
      */
      public void setIsOrderList(List<Integer> isOrderList){
      this.isOrderList = isOrderList;
      }
      /**
      * 获取 开始 背靠背展示 (0.否，1.是)
      * @return isBkbStart
      */
      public Integer getIsBkbStart(){
      return this.isBkbStart;
      }
      /**
      * 设置 开始 背靠背展示 (0.否，1.是)
      * @param isBkbStart
      */
      public void setIsBkbStart(Integer isBkbStart){
      this.isBkbStart = isBkbStart;
      }
      /**
      * 获取 结束 背靠背展示 (0.否，1.是)
      * @return $isBkbEnd
      */
      public Integer getIsBkbEnd(){
      return this.isBkbEnd;
      }
      /**
      * 设置 结束 背靠背展示 (0.否，1.是)
      * @param isBkbEnd
      */
      public void setIsBkbEnd(Integer isBkbEnd){
      this.isBkbEnd = isBkbEnd;
      }
      /**
      * 获取 增加 背靠背展示 (0.否，1.是)
      * @return isBkbIncrement
      */
      public Integer getIsBkbIncrement(){
      return this.isBkbIncrement;
      }
      /**
      * 设置 增加 背靠背展示 (0.否，1.是)
      * @param isBkbIncrement
      */
      public void setIsBkbIncrement(Integer isBkbIncrement){
      this.isBkbIncrement = isBkbIncrement;
      }
      /**
      * 获取 背靠背展示 (0.否，1.是)
      * @return isBkbList
      */
      public List<Integer> getIsBkbList(){
      return this.isBkbList;
      }
      /**
      * 设置 背靠背展示 (0.否，1.是)
      * @param isBkbList
      */
      public void setIsBkbList(List<Integer> isBkbList){
      this.isBkbList = isBkbList;
      }
      /**
      * 获取 开始 办事指南展示 (0.否，1.是)
      * @return isWorkGuideStart
      */
      public Integer getIsWorkGuideStart(){
      return this.isWorkGuideStart;
      }
      /**
      * 设置 开始 办事指南展示 (0.否，1.是)
      * @param isWorkGuideStart
      */
      public void setIsWorkGuideStart(Integer isWorkGuideStart){
      this.isWorkGuideStart = isWorkGuideStart;
      }
      /**
      * 获取 结束 办事指南展示 (0.否，1.是)
      * @return $isWorkGuideEnd
      */
      public Integer getIsWorkGuideEnd(){
      return this.isWorkGuideEnd;
      }
      /**
      * 设置 结束 办事指南展示 (0.否，1.是)
      * @param isWorkGuideEnd
      */
      public void setIsWorkGuideEnd(Integer isWorkGuideEnd){
      this.isWorkGuideEnd = isWorkGuideEnd;
      }
      /**
      * 获取 增加 办事指南展示 (0.否，1.是)
      * @return isWorkGuideIncrement
      */
      public Integer getIsWorkGuideIncrement(){
      return this.isWorkGuideIncrement;
      }
      /**
      * 设置 增加 办事指南展示 (0.否，1.是)
      * @param isWorkGuideIncrement
      */
      public void setIsWorkGuideIncrement(Integer isWorkGuideIncrement){
      this.isWorkGuideIncrement = isWorkGuideIncrement;
      }
      /**
      * 获取 办事指南展示 (0.否，1.是)
      * @return isWorkGuideList
      */
      public List<Integer> getIsWorkGuideList(){
      return this.isWorkGuideList;
      }
      /**
      * 设置 办事指南展示 (0.否，1.是)
      * @param isWorkGuideList
      */
      public void setIsWorkGuideList(List<Integer> isWorkGuideList){
      this.isWorkGuideList = isWorkGuideList;
      }
      /**
      * 获取 开始 是否使用 (0.否，1.是)
      * @return usValidStart
      */
      public Integer getUsValidStart(){
      return this.usValidStart;
      }
      /**
      * 设置 开始 是否使用 (0.否，1.是)
      * @param usValidStart
      */
      public void setUsValidStart(Integer usValidStart){
      this.usValidStart = usValidStart;
      }
      /**
      * 获取 结束 是否使用 (0.否，1.是)
      * @return $usValidEnd
      */
      public Integer getUsValidEnd(){
      return this.usValidEnd;
      }
      /**
      * 设置 结束 是否使用 (0.否，1.是)
      * @param usValidEnd
      */
      public void setUsValidEnd(Integer usValidEnd){
      this.usValidEnd = usValidEnd;
      }
      /**
      * 获取 增加 是否使用 (0.否，1.是)
      * @return usValidIncrement
      */
      public Integer getUsValidIncrement(){
      return this.usValidIncrement;
      }
      /**
      * 设置 增加 是否使用 (0.否，1.是)
      * @param usValidIncrement
      */
      public void setUsValidIncrement(Integer usValidIncrement){
      this.usValidIncrement = usValidIncrement;
      }
      /**
      * 获取 是否使用 (0.否，1.是)
      * @return usValidList
      */
      public List<Integer> getUsValidList(){
      return this.usValidList;
      }
      /**
      * 设置 是否使用 (0.否，1.是)
      * @param usValidList
      */
      public void setUsValidList(List<Integer> usValidList){
      this.usValidList = usValidList;
      }
      /**
      * 获取 开始 部门电话是否展示 (0.否，1.是)
      * @return isSecphoneStart
      */
      public Integer getIsSecphoneStart(){
      return this.isSecphoneStart;
      }
      /**
      * 设置 开始 部门电话是否展示 (0.否，1.是)
      * @param isSecphoneStart
      */
      public void setIsSecphoneStart(Integer isSecphoneStart){
      this.isSecphoneStart = isSecphoneStart;
      }
      /**
      * 获取 结束 部门电话是否展示 (0.否，1.是)
      * @return $isSecphoneEnd
      */
      public Integer getIsSecphoneEnd(){
      return this.isSecphoneEnd;
      }
      /**
      * 设置 结束 部门电话是否展示 (0.否，1.是)
      * @param isSecphoneEnd
      */
      public void setIsSecphoneEnd(Integer isSecphoneEnd){
      this.isSecphoneEnd = isSecphoneEnd;
      }
      /**
      * 获取 增加 部门电话是否展示 (0.否，1.是)
      * @return isSecphoneIncrement
      */
      public Integer getIsSecphoneIncrement(){
      return this.isSecphoneIncrement;
      }
      /**
      * 设置 增加 部门电话是否展示 (0.否，1.是)
      * @param isSecphoneIncrement
      */
      public void setIsSecphoneIncrement(Integer isSecphoneIncrement){
      this.isSecphoneIncrement = isSecphoneIncrement;
      }
      /**
      * 获取 部门电话是否展示 (0.否，1.是)
      * @return isSecphoneList
      */
      public List<Integer> getIsSecphoneList(){
      return this.isSecphoneList;
      }
      /**
      * 设置 部门电话是否展示 (0.否，1.是)
      * @param isSecphoneList
      */
      public void setIsSecphoneList(List<Integer> isSecphoneList){
      this.isSecphoneList = isSecphoneList;
      }
      /**
      * 获取 开始 是否展示英文 (0.否，1.是)
      * @return isEnglishStart
      */
      public Integer getIsEnglishStart(){
      return this.isEnglishStart;
      }
      /**
      * 设置 开始 是否展示英文 (0.否，1.是)
      * @param isEnglishStart
      */
      public void setIsEnglishStart(Integer isEnglishStart){
      this.isEnglishStart = isEnglishStart;
      }
      /**
      * 获取 结束 是否展示英文 (0.否，1.是)
      * @return $isEnglishEnd
      */
      public Integer getIsEnglishEnd(){
      return this.isEnglishEnd;
      }
      /**
      * 设置 结束 是否展示英文 (0.否，1.是)
      * @param isEnglishEnd
      */
      public void setIsEnglishEnd(Integer isEnglishEnd){
      this.isEnglishEnd = isEnglishEnd;
      }
      /**
      * 获取 增加 是否展示英文 (0.否，1.是)
      * @return isEnglishIncrement
      */
      public Integer getIsEnglishIncrement(){
      return this.isEnglishIncrement;
      }
      /**
      * 设置 增加 是否展示英文 (0.否，1.是)
      * @param isEnglishIncrement
      */
      public void setIsEnglishIncrement(Integer isEnglishIncrement){
      this.isEnglishIncrement = isEnglishIncrement;
      }
      /**
      * 获取 是否展示英文 (0.否，1.是)
      * @return isEnglishList
      */
      public List<Integer> getIsEnglishList(){
      return this.isEnglishList;
      }
      /**
      * 设置 是否展示英文 (0.否，1.是)
      * @param isEnglishList
      */
      public void setIsEnglishList(List<Integer> isEnglishList){
      this.isEnglishList = isEnglishList;
      }
      /**
      * 获取 开始 排序
      * @return sortStart
      */
      public Integer getSortStart(){
      return this.sortStart;
      }
      /**
      * 设置 开始 排序
      * @param sortStart
      */
      public void setSortStart(Integer sortStart){
      this.sortStart = sortStart;
      }
      /**
      * 获取 结束 排序
      * @return $sortEnd
      */
      public Integer getSortEnd(){
      return this.sortEnd;
      }
      /**
      * 设置 结束 排序
      * @param sortEnd
      */
      public void setSortEnd(Integer sortEnd){
      this.sortEnd = sortEnd;
      }
      /**
      * 获取 增加 排序
      * @return sortIncrement
      */
      public Integer getSortIncrement(){
      return this.sortIncrement;
      }
      /**
      * 设置 增加 排序
      * @param sortIncrement
      */
      public void setSortIncrement(Integer sortIncrement){
      this.sortIncrement = sortIncrement;
      }
      /**
      * 获取 排序
      * @return sortList
      */
      public List<Integer> getSortList(){
      return this.sortList;
      }
      /**
      * 设置 排序
      * @param sortList
      */
      public void setSortList(List<Integer> sortList){
      this.sortList = sortList;
      }
      /**
      * 获取 开始 部门来源
      * @return sourceStart
      */
      public Integer getSourceStart(){
      return this.sourceStart;
      }
      /**
      * 设置 开始 部门来源
      * @param sourceStart
      */
      public void setSourceStart(Integer sourceStart){
      this.sourceStart = sourceStart;
      }
      /**
      * 获取 结束 部门来源
      * @return $sourceEnd
      */
      public Integer getSourceEnd(){
      return this.sourceEnd;
      }
      /**
      * 设置 结束 部门来源
      * @param sourceEnd
      */
      public void setSourceEnd(Integer sourceEnd){
      this.sourceEnd = sourceEnd;
      }
      /**
      * 获取 增加 部门来源
      * @return sourceIncrement
      */
      public Integer getSourceIncrement(){
      return this.sourceIncrement;
      }
      /**
      * 设置 增加 部门来源
      * @param sourceIncrement
      */
      public void setSourceIncrement(Integer sourceIncrement){
      this.sourceIncrement = sourceIncrement;
      }
      /**
      * 获取 部门来源
      * @return sourceList
      */
      public List<Integer> getSourceList(){
      return this.sourceList;
      }
      /**
      * 设置 部门来源
      * @param sourceList
      */
      public void setSourceList(List<Integer> sourceList){
      this.sourceList = sourceList;
      }
      /**
      * 获取 开始 创建时间
      * @return createTimeStart
      */
      public String getCreateTimeStart(){
      return this.createTimeStart;
      }
      /**
      * 设置 开始 创建时间
      * @param createTimeStart
      */
      public void setCreateTimeStart(String createTimeStart){
      this.createTimeStart = createTimeStart;
      }
      /**
      * 获取 结束 创建时间
      * @return createTimeEnd
      */
      public String getCreateTimeEnd(){
      return this.createTimeEnd;
      }
      /**
      * 设置 结束 创建时间
      * @param createTimeEnd
      */
      public void setCreateTimeEnd(String createTimeEnd){
      this.createTimeEnd = createTimeEnd;
      }
      /**
      * 获取 开始 创建用户
      * @return createUserIdStart
      */
      public Long getCreateUserIdStart(){
      return this.createUserIdStart;
      }
      /**
      * 设置 开始 创建用户
      * @param createUserIdStart
      */
      public void setCreateUserIdStart(Long createUserIdStart){
      this.createUserIdStart = createUserIdStart;
      }
      /**
      * 获取 结束 创建用户
      * @return $createUserIdEnd
      */
      public Long getCreateUserIdEnd(){
      return this.createUserIdEnd;
      }
      /**
      * 设置 结束 创建用户
      * @param createUserIdEnd
      */
      public void setCreateUserIdEnd(Long createUserIdEnd){
      this.createUserIdEnd = createUserIdEnd;
      }
      /**
      * 获取 增加 创建用户
      * @return createUserIdIncrement
      */
      public Long getCreateUserIdIncrement(){
      return this.createUserIdIncrement;
      }
      /**
      * 设置 增加 创建用户
      * @param createUserIdIncrement
      */
      public void setCreateUserIdIncrement(Long createUserIdIncrement){
      this.createUserIdIncrement = createUserIdIncrement;
      }
      /**
      * 获取 创建用户
      * @return createUserIdList
      */
      public List<Long> getCreateUserIdList(){
      return this.createUserIdList;
      }
      /**
      * 设置 创建用户
      * @param createUserIdList
      */
      public void setCreateUserIdList(List<Long> createUserIdList){
      this.createUserIdList = createUserIdList;
      }
      /**
      * 获取 开始 修改时间
      * @return updateTimeStart
      */
      public String getUpdateTimeStart(){
      return this.updateTimeStart;
      }
      /**
      * 设置 开始 修改时间
      * @param updateTimeStart
      */
      public void setUpdateTimeStart(String updateTimeStart){
      this.updateTimeStart = updateTimeStart;
      }
      /**
      * 获取 结束 修改时间
      * @return updateTimeEnd
      */
      public String getUpdateTimeEnd(){
      return this.updateTimeEnd;
      }
      /**
      * 设置 结束 修改时间
      * @param updateTimeEnd
      */
      public void setUpdateTimeEnd(String updateTimeEnd){
      this.updateTimeEnd = updateTimeEnd;
      }
      /**
      * 设置 序号，主键，自增长
      * @param id
      */
      public DeptPdu id(Long id){
      setId(id);
      return this;
      }
      /**
      * 设置 开始 序号，主键，自增长
      * @param idStart
      */
      public DeptPdu idStart(Long idStart){
      this.idStart = idStart;
      return this;
      }
      /**
      * 设置 结束 序号，主键，自增长
      * @param idEnd
      */
      public DeptPdu idEnd(Long idEnd){
      this.idEnd = idEnd;
      return this;
      }
      /**
      * 设置 增加 序号，主键，自增长
      * @param idIncrement
      */
      public DeptPdu idIncrement(Long idIncrement){
      this.idIncrement = idIncrement;
      return this;
      }
      /**
      * 设置 序号，主键，自增长
      * @param idList
      */
      public DeptPdu idList(List<Long> idList){
      this.idList = idList;
      return this;
      }
      /**
      * 设置 从政务系统来的部门id
      * @param tid
      */
      public DeptPdu tid(String tid){
      setTid(tid);
      return this;
      }
      /**
      * 设置 从政务系统来的部门id
      * @param tidList
      */
      public DeptPdu tidList(List<String> tidList){
      this.tidList = tidList;
      return this;
      }
      /**
      * 设置 从政务系统来的部门name
      * @param tname
      */
      public DeptPdu tname(String tname){
      setTname(tname);
      return this;
      }
      /**
      * 设置 从政务系统来的部门name
      * @param tnameList
      */
      public DeptPdu tnameList(List<String> tnameList){
      this.tnameList = tnameList;
      return this;
      }
      /**
      * 设置 部门名称
      * @param name
      */
      public DeptPdu name(String name){
      setName(name);
      return this;
      }
      /**
      * 设置 部门名称
      * @param nameList
      */
      public DeptPdu nameList(List<String> nameList){
      this.nameList = nameList;
      return this;
      }
      /**
      * 设置 从政务系统来的别名
      * @param simpleName
      */
      public DeptPdu simpleName(String simpleName){
      setSimpleName(simpleName);
      return this;
      }
      /**
      * 设置 从政务系统来的别名
      * @param simpleNameList
      */
      public DeptPdu simpleNameList(List<String> simpleNameList){
      this.simpleNameList = simpleNameList;
      return this;
      }
      /**
      * 设置 站点ID
      * @param siteId
      */
      public DeptPdu siteId(Long siteId){
      setSiteId(siteId);
      return this;
      }
      /**
      * 设置 开始 站点ID
      * @param siteIdStart
      */
      public DeptPdu siteIdStart(Long siteIdStart){
      this.siteIdStart = siteIdStart;
      return this;
      }
      /**
      * 设置 结束 站点ID
      * @param siteIdEnd
      */
      public DeptPdu siteIdEnd(Long siteIdEnd){
      this.siteIdEnd = siteIdEnd;
      return this;
      }
      /**
      * 设置 增加 站点ID
      * @param siteIdIncrement
      */
      public DeptPdu siteIdIncrement(Long siteIdIncrement){
      this.siteIdIncrement = siteIdIncrement;
      return this;
      }
      /**
      * 设置 站点ID
      * @param siteIdList
      */
      public DeptPdu siteIdList(List<Long> siteIdList){
      this.siteIdList = siteIdList;
      return this;
      }
      /**
      * 设置 部门简称
      * @param deptAbb
      */
      public DeptPdu deptAbb(String deptAbb){
      setDeptAbb(deptAbb);
      return this;
      }
      /**
      * 设置 部门简称
      * @param deptAbbList
      */
      public DeptPdu deptAbbList(List<String> deptAbbList){
      this.deptAbbList = deptAbbList;
      return this;
      }
      /**
      * 设置 部门电话
      * @param deptTelphone
      */
      public DeptPdu deptTelphone(String deptTelphone){
      setDeptTelphone(deptTelphone);
      return this;
      }
      /**
      * 设置 部门电话
      * @param deptTelphoneList
      */
      public DeptPdu deptTelphoneList(List<String> deptTelphoneList){
      this.deptTelphoneList = deptTelphoneList;
      return this;
      }
      /**
      * 设置 部门编号
      * @param deptNumber
      */
      public DeptPdu deptNumber(String deptNumber){
      setDeptNumber(deptNumber);
      return this;
      }
      /**
      * 设置 部门编号
      * @param deptNumberList
      */
      public DeptPdu deptNumberList(List<String> deptNumberList){
      this.deptNumberList = deptNumberList;
      return this;
      }
      /**
      * 设置 填单机展示 (0.否，1.是)
      * @param isAutotable
      */
      public DeptPdu isAutotable(Integer isAutotable){
      setIsAutotable(isAutotable);
      return this;
      }
      /**
      * 设置 开始 填单机展示 (0.否，1.是)
      * @param isAutotableStart
      */
      public DeptPdu isAutotableStart(Integer isAutotableStart){
      this.isAutotableStart = isAutotableStart;
      return this;
      }
      /**
      * 设置 结束 填单机展示 (0.否，1.是)
      * @param isAutotableEnd
      */
      public DeptPdu isAutotableEnd(Integer isAutotableEnd){
      this.isAutotableEnd = isAutotableEnd;
      return this;
      }
      /**
      * 设置 增加 填单机展示 (0.否，1.是)
      * @param isAutotableIncrement
      */
      public DeptPdu isAutotableIncrement(Integer isAutotableIncrement){
      this.isAutotableIncrement = isAutotableIncrement;
      return this;
      }
      /**
      * 设置 填单机展示 (0.否，1.是)
      * @param isAutotableList
      */
      public DeptPdu isAutotableList(List<Integer> isAutotableList){
      this.isAutotableList = isAutotableList;
      return this;
      }
      /**
      * 设置 预约展示 (0.否，1.是)
      * @param isOrder
      */
      public DeptPdu isOrder(Integer isOrder){
      setIsOrder(isOrder);
      return this;
      }
      /**
      * 设置 开始 预约展示 (0.否，1.是)
      * @param isOrderStart
      */
      public DeptPdu isOrderStart(Integer isOrderStart){
      this.isOrderStart = isOrderStart;
      return this;
      }
      /**
      * 设置 结束 预约展示 (0.否，1.是)
      * @param isOrderEnd
      */
      public DeptPdu isOrderEnd(Integer isOrderEnd){
      this.isOrderEnd = isOrderEnd;
      return this;
      }
      /**
      * 设置 增加 预约展示 (0.否，1.是)
      * @param isOrderIncrement
      */
      public DeptPdu isOrderIncrement(Integer isOrderIncrement){
      this.isOrderIncrement = isOrderIncrement;
      return this;
      }
      /**
      * 设置 预约展示 (0.否，1.是)
      * @param isOrderList
      */
      public DeptPdu isOrderList(List<Integer> isOrderList){
      this.isOrderList = isOrderList;
      return this;
      }
      /**
      * 设置 背靠背展示 (0.否，1.是)
      * @param isBkb
      */
      public DeptPdu isBkb(Integer isBkb){
      setIsBkb(isBkb);
      return this;
      }
      /**
      * 设置 开始 背靠背展示 (0.否，1.是)
      * @param isBkbStart
      */
      public DeptPdu isBkbStart(Integer isBkbStart){
      this.isBkbStart = isBkbStart;
      return this;
      }
      /**
      * 设置 结束 背靠背展示 (0.否，1.是)
      * @param isBkbEnd
      */
      public DeptPdu isBkbEnd(Integer isBkbEnd){
      this.isBkbEnd = isBkbEnd;
      return this;
      }
      /**
      * 设置 增加 背靠背展示 (0.否，1.是)
      * @param isBkbIncrement
      */
      public DeptPdu isBkbIncrement(Integer isBkbIncrement){
      this.isBkbIncrement = isBkbIncrement;
      return this;
      }
      /**
      * 设置 背靠背展示 (0.否，1.是)
      * @param isBkbList
      */
      public DeptPdu isBkbList(List<Integer> isBkbList){
      this.isBkbList = isBkbList;
      return this;
      }
      /**
      * 设置 办事指南展示 (0.否，1.是)
      * @param isWorkGuide
      */
      public DeptPdu isWorkGuide(Integer isWorkGuide){
      setIsWorkGuide(isWorkGuide);
      return this;
      }
      /**
      * 设置 开始 办事指南展示 (0.否，1.是)
      * @param isWorkGuideStart
      */
      public DeptPdu isWorkGuideStart(Integer isWorkGuideStart){
      this.isWorkGuideStart = isWorkGuideStart;
      return this;
      }
      /**
      * 设置 结束 办事指南展示 (0.否，1.是)
      * @param isWorkGuideEnd
      */
      public DeptPdu isWorkGuideEnd(Integer isWorkGuideEnd){
      this.isWorkGuideEnd = isWorkGuideEnd;
      return this;
      }
      /**
      * 设置 增加 办事指南展示 (0.否，1.是)
      * @param isWorkGuideIncrement
      */
      public DeptPdu isWorkGuideIncrement(Integer isWorkGuideIncrement){
      this.isWorkGuideIncrement = isWorkGuideIncrement;
      return this;
      }
      /**
      * 设置 办事指南展示 (0.否，1.是)
      * @param isWorkGuideList
      */
      public DeptPdu isWorkGuideList(List<Integer> isWorkGuideList){
      this.isWorkGuideList = isWorkGuideList;
      return this;
      }
      /**
      * 设置 是否使用 (0.否，1.是)
      * @param usValid
      */
      public DeptPdu usValid(Integer usValid){
      setUsValid(usValid);
      return this;
      }
      /**
      * 设置 开始 是否使用 (0.否，1.是)
      * @param usValidStart
      */
      public DeptPdu usValidStart(Integer usValidStart){
      this.usValidStart = usValidStart;
      return this;
      }
      /**
      * 设置 结束 是否使用 (0.否，1.是)
      * @param usValidEnd
      */
      public DeptPdu usValidEnd(Integer usValidEnd){
      this.usValidEnd = usValidEnd;
      return this;
      }
      /**
      * 设置 增加 是否使用 (0.否，1.是)
      * @param usValidIncrement
      */
      public DeptPdu usValidIncrement(Integer usValidIncrement){
      this.usValidIncrement = usValidIncrement;
      return this;
      }
      /**
      * 设置 是否使用 (0.否，1.是)
      * @param usValidList
      */
      public DeptPdu usValidList(List<Integer> usValidList){
      this.usValidList = usValidList;
      return this;
      }
      /**
      * 设置 部门电话是否展示 (0.否，1.是)
      * @param isSecphone
      */
      public DeptPdu isSecphone(Integer isSecphone){
      setIsSecphone(isSecphone);
      return this;
      }
      /**
      * 设置 开始 部门电话是否展示 (0.否，1.是)
      * @param isSecphoneStart
      */
      public DeptPdu isSecphoneStart(Integer isSecphoneStart){
      this.isSecphoneStart = isSecphoneStart;
      return this;
      }
      /**
      * 设置 结束 部门电话是否展示 (0.否，1.是)
      * @param isSecphoneEnd
      */
      public DeptPdu isSecphoneEnd(Integer isSecphoneEnd){
      this.isSecphoneEnd = isSecphoneEnd;
      return this;
      }
      /**
      * 设置 增加 部门电话是否展示 (0.否，1.是)
      * @param isSecphoneIncrement
      */
      public DeptPdu isSecphoneIncrement(Integer isSecphoneIncrement){
      this.isSecphoneIncrement = isSecphoneIncrement;
      return this;
      }
      /**
      * 设置 部门电话是否展示 (0.否，1.是)
      * @param isSecphoneList
      */
      public DeptPdu isSecphoneList(List<Integer> isSecphoneList){
      this.isSecphoneList = isSecphoneList;
      return this;
      }
      /**
      * 设置 是否展示英文 (0.否，1.是)
      * @param isEnglish
      */
      public DeptPdu isEnglish(Integer isEnglish){
      setIsEnglish(isEnglish);
      return this;
      }
      /**
      * 设置 开始 是否展示英文 (0.否，1.是)
      * @param isEnglishStart
      */
      public DeptPdu isEnglishStart(Integer isEnglishStart){
      this.isEnglishStart = isEnglishStart;
      return this;
      }
      /**
      * 设置 结束 是否展示英文 (0.否，1.是)
      * @param isEnglishEnd
      */
      public DeptPdu isEnglishEnd(Integer isEnglishEnd){
      this.isEnglishEnd = isEnglishEnd;
      return this;
      }
      /**
      * 设置 增加 是否展示英文 (0.否，1.是)
      * @param isEnglishIncrement
      */
      public DeptPdu isEnglishIncrement(Integer isEnglishIncrement){
      this.isEnglishIncrement = isEnglishIncrement;
      return this;
      }
      /**
      * 设置 是否展示英文 (0.否，1.是)
      * @param isEnglishList
      */
      public DeptPdu isEnglishList(List<Integer> isEnglishList){
      this.isEnglishList = isEnglishList;
      return this;
      }
      /**
      * 设置 排序
      * @param sort
      */
      public DeptPdu sort(Integer sort){
      setSort(sort);
      return this;
      }
      /**
      * 设置 开始 排序
      * @param sortStart
      */
      public DeptPdu sortStart(Integer sortStart){
      this.sortStart = sortStart;
      return this;
      }
      /**
      * 设置 结束 排序
      * @param sortEnd
      */
      public DeptPdu sortEnd(Integer sortEnd){
      this.sortEnd = sortEnd;
      return this;
      }
      /**
      * 设置 增加 排序
      * @param sortIncrement
      */
      public DeptPdu sortIncrement(Integer sortIncrement){
      this.sortIncrement = sortIncrement;
      return this;
      }
      /**
      * 设置 排序
      * @param sortList
      */
      public DeptPdu sortList(List<Integer> sortList){
      this.sortList = sortList;
      return this;
      }
      /**
      * 设置 部门来源
      * @param source
      */
      public DeptPdu source(Integer source){
      setSource(source);
      return this;
      }
      /**
      * 设置 开始 部门来源
      * @param sourceStart
      */
      public DeptPdu sourceStart(Integer sourceStart){
      this.sourceStart = sourceStart;
      return this;
      }
      /**
      * 设置 结束 部门来源
      * @param sourceEnd
      */
      public DeptPdu sourceEnd(Integer sourceEnd){
      this.sourceEnd = sourceEnd;
      return this;
      }
      /**
      * 设置 增加 部门来源
      * @param sourceIncrement
      */
      public DeptPdu sourceIncrement(Integer sourceIncrement){
      this.sourceIncrement = sourceIncrement;
      return this;
      }
      /**
      * 设置 部门来源
      * @param sourceList
      */
      public DeptPdu sourceList(List<Integer> sourceList){
      this.sourceList = sourceList;
      return this;
      }
      /**
      * 设置 创建用户
      * @param createUserId
      */
      public DeptPdu createUserId(Long createUserId){
      setCreateUserId(createUserId);
      return this;
      }
      /**
      * 设置 开始 创建用户
      * @param createUserIdStart
      */
      public DeptPdu createUserIdStart(Long createUserIdStart){
      this.createUserIdStart = createUserIdStart;
      return this;
      }
      /**
      * 设置 结束 创建用户
      * @param createUserIdEnd
      */
      public DeptPdu createUserIdEnd(Long createUserIdEnd){
      this.createUserIdEnd = createUserIdEnd;
      return this;
      }
      /**
      * 设置 增加 创建用户
      * @param createUserIdIncrement
      */
      public DeptPdu createUserIdIncrement(Long createUserIdIncrement){
      this.createUserIdIncrement = createUserIdIncrement;
      return this;
      }
      /**
      * 设置 创建用户
      * @param createUserIdList
      */
      public DeptPdu createUserIdList(List<Long> createUserIdList){
      this.createUserIdList = createUserIdList;
      return this;
      }
      /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList
      */
      public List<DeptPdu> getOrConditionList(){
      return this.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<DeptPdu> orConditionList){
      this.orConditionList = orConditionList;
      }
      /**
      * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
      * @return andConditionList
      */
      public List<DeptPdu> getAndConditionList(){
      return this.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<DeptPdu> andConditionList){
      this.andConditionList = andConditionList;
      }
      @Override
      public int hashCode() {
      return this.getId().hashCode();
      }
      @Override
      public boolean equals(Object obj) {
      if (obj == null) return false;
      if (obj instanceof DeptPdu) {
      DeptPdu tmp = (DeptPdu) obj;
      if (this.getId() == tmp.getId()) {
      return true;
      }
      }
      return false;
      }
      public void initAttrValue(){
      this.tid = null;
      this.tname = null;
      this.name = null;
      this.simpleName = null;
      this.siteId = null;
      this.deptAbb = null;
      this.deptTelphone = null;
      this.deptNumber = null;
      this.isAutotable = 1;
      this.isOrder = 1;
      this.isBkb = 1;
      this.isWorkGuide = 1;
      this.usValid = 1;
      this.isSecphone = 1;
      this.isEnglish = 1;
      this.sort = 0;
      this.source = 0;
      }
      }
      \ No newline at end of file
      common-lib/src/main/java/com/mortals/xhx/feign/dept/IDeptFeign.java 0 → 100644
      View file @ 00396d9f
      package com.mortals.xhx.feign.dept;
      import com.mortals.xhx.common.pdu.RespData;
      import com.mortals.xhx.common.pdu.dept.DeptPdu;
      import com.alibaba.fastjson.JSON;
      import com.mortals.framework.common.Rest;
      import com.mortals.xhx.feign.IFeign;
      import feign.hystrix.FallbackFactory;
      import lombok.extern.slf4j.Slf4j;
      import org.springframework.cloud.openfeign.FeignClient;
      import org.springframework.stereotype.Component;
      import org.springframework.web.bind.annotation.*;
      import java.util.List;
      /**
      * 部门 Feign接口
      * @author zxfei
      * @date 2022-12-09
      */
      @FeignClient(name = "base-manager", path = "/base", fallbackFactory = DeptFeignFallbackFactory.class)
      public interface IDeptFeign extends IFeign {
      /**
      * 查看部门列表
      *
      * @param deptPdu
      * @return
      */
      @PostMapping(value = "/dept/list")
      Rest<RespData<List<DeptPdu>>> list(@RequestBody DeptPdu deptPdu);
      /**
      * 查看部门
      *
      * @param id
      * @return
      */
      @GetMapping(value = "/dept/info")
      Rest<DeptPdu> info(@RequestParam(value = "id") Long id);
      /**
      * 删除部门
      *
      * @param ids
      * @return
      */
      @GetMapping(value = "/dept/delete")
      Rest<Void> delete(Long[] ids,@RequestHeader("Authorization") String authorization);
      /**
      * 部门保存更新
      *
      * @param deptPdu
      * @return
      */
      @PostMapping(value = "/dept/save")
      Rest<RespData<DeptPdu>> save(@RequestBody DeptPdu deptPdu,@RequestHeader("Authorization") String authorization);
      }
      @Slf4j
      @Component
      class DeptFeignFallbackFactory implements FallbackFactory<IDeptFeign> {
      @Override
      public IDeptFeign create(Throwable t) {
      return new IDeptFeign() {
      @Override
      public Rest<RespData<List<DeptPdu>>> list(DeptPdu deptPdu) {
      return Rest.fail("暂时无法获取部门列表，请稍后再试!");
      }
      @Override
      public Rest<DeptPdu> info(Long id) {
      return Rest.fail("暂时无法获取部门详细，请稍后再试!");
      }
      @Override
      public Rest<Void> delete(Long[] ids, String authorization) {
      return Rest.fail("暂时无法删除部门，请稍后再试!");
      }
      @Override
      public Rest<RespData<DeptPdu>> save(DeptPdu deptPdu, String authorization) {
      return Rest.fail("暂时无法保存部门，请稍后再试!");
      }
      };
      }
      }
      fill-manager/db/module.sql
      View file @ 00396d9f
      ...@@ -3,117 +3,119 @@ use `fill-platform`; ...@@ -3,117 +3,119 @@ use `fill-platform`;
      -- 基础事项业务表 -- 基础事项业务表
      -- ---------------------------- -- ----------------------------
      DROP TABLE IF EXISTS `mortals_xhx_sheet_matter`; DROP TABLE IF EXISTS `mortals_xhx_sheet_matter`;
      CREATE TABLE mortals_xhx_sheet_matter( CREATE TABLE mortals_xhx_sheet_matter
      `id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长', (
      `siteId` bigint(20) COMMENT '站点ID', `id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
      `tid` varchar(256) COMMENT '从政务系统来的事项id', `siteId` bigint(20) COMMENT '站点ID',
      `tcode` varchar(256) COMMENT '从政务系统来的事项code', `tid` varchar(256) COMMENT '从政务系统来的事项id',
      `tname` varchar(2048) COMMENT '从政务系统来的事项name', `tcode` varchar(256) COMMENT '从政务系统来的事项code',
      `matterName` varchar(2048) COMMENT '事项名称', `tname` varchar(2048) COMMENT '从政务系统来的事项name',
      `englishName` varchar(256) COMMENT '英语事项名', `matterName` varchar(2048) COMMENT '事项名称',
      `matterNo` varchar(512) COMMENT '事项编号', `englishName` varchar(256) COMMENT '英语事项名',
      `areaCode` varchar(255) COMMENT '区域编码', `matterNo` varchar(512) COMMENT '事项编号',
      `deptCode` varchar(255) COMMENT '部门编号', `areaCode` varchar(255) COMMENT '区域编码',
      `deptName` varchar(255) COMMENT '部门名称', `deptCode` varchar(255) COMMENT '部门编号',
      `powerCode` varchar(255) COMMENT '行政权力编号', `deptName` varchar(255) COMMENT '部门名称',
      `themeCode` varchar(255) COMMENT '主题编号', `powerCode` varchar(255) COMMENT '行政权力编号',
      `usertypeCode` varchar(255) COMMENT '服务类型编号', `themeCode` varchar(255) COMMENT '主题编号',
      `groupName` varchar(255) COMMENT '事项组名', `usertypeCode` varchar(255) COMMENT '服务类型编号',
      `url` varchar(1024) COMMENT '事项详情链接', `groupName` varchar(255) COMMENT '事项组名',
      `haveGetMatterInfo` varchar(20) COMMENT '是否获取事项详情', `url` varchar(1024) COMMENT '事项详情链接',
      `belongDept` varchar(64) COMMENT '所属部门', `haveGetMatterInfo` varchar(20) COMMENT '是否获取事项详情',
      `appoveObjectShow` varchar(16) COMMENT '服务对象 （事业法人.事业法人，社会组织法人.社会组织法人，非法人企业.非法人企业，企业法人.企业法人，自然人.自然人，其他组织.其他组织）', `belongDept` varchar(64) COMMENT '所属部门',
      `operatScopeShow` varchar(64) COMMENT '通办范围 （无.无，全国.全国，全市.全市，全县.全县，全镇[乡 街道].全镇[乡 街道]，跨村[社区].跨村[社区]）', `appoveObjectShow` varchar(16) COMMENT '服务对象 （事业法人.事业法人，社会组织法人.社会组织法人，非法人企业.非法人企业，企业法人.企业法人，自然人.自然人，其他组织.其他组织）',
      `appoveTimeLimitShow` varchar(16) COMMENT '办件类型（网络办件.网络办件，行政审批一般件.行政审批一般件，综合窗口件.综合窗口件）', `operatScopeShow` varchar(64) COMMENT '通办范围 （无.无，全国.全国，全市.全市，全县.全县，全镇[乡 街道].全镇[乡 街道]，跨村[社区].跨村[社区]）',
      `handleType` varchar(12) COMMENT '办理形式（窗口办理.窗口办理，网上办理.网上办理）', `appoveTimeLimitShow` varchar(16) COMMENT '办件类型（网络办件.网络办件，行政审批一般件.行政审批一般件，综合窗口件.综合窗口件）',
      `legalTimeLimitShow` varchar(32) COMMENT '法定办结时限', `handleType` varchar(12) COMMENT '办理形式（窗口办理.窗口办理，网上办理.网上办理）',
      `legalEndExplain` varchar(255) COMMENT '法定时限办结说明', `legalTimeLimitShow` varchar(32) COMMENT '法定办结时限',
      `promiseTimeLimitShow` varchar(32) COMMENT '承诺办结时限', `legalEndExplain` varchar(255) COMMENT '法定时限办结说明',
      `promiseEndExplain` varchar(255) COMMENT '承诺时限办结说明', `promiseTimeLimitShow` varchar(32) COMMENT '承诺办结时限',
      `isChargesShow` varchar(16) COMMENT '是否收费（否.否，是.是）', `promiseEndExplain` varchar(255) COMMENT '承诺时限办结说明',
      `certificationLevelsShow` varchar(64) COMMENT '认证等级需求（实名认证.实名认证，单次面签.单次面签，每次面签.每次面签）', `isChargesShow` varchar(16) COMMENT '是否收费（否.否，是.是）',
      `planTakeTime` datetime COMMENT '计划生效日期', `certificationLevelsShow` varchar(64) COMMENT '认证等级需求（实名认证.实名认证，单次面签.单次面签，每次面签.每次面签）',
      `promiseTakeTime` datetime COMMENT '承诺生效日期', `planTakeTime` datetime COMMENT '计划生效日期',
      `specialProcedure` varchar(64) COMMENT '特别程序', `promiseTakeTime` datetime COMMENT '承诺生效日期',
      `windowToTheSceneNum` tinyint(2) COMMENT '窗口到现场次数', `specialProcedure` varchar(64) COMMENT '特别程序',
      `isOnlineSubscribeShow` varchar(64) COMMENT '是否网上预约,窗口办理选（否.否，是.是）', `windowToTheSceneNum` tinyint(2) COMMENT '窗口到现场次数',
      `isExpressTakeShow` varchar(16) COMMENT '物流快递,窗口办理选（否.否，是.是）', `isOnlineSubscribeShow` varchar(64) COMMENT '是否网上预约,窗口办理选（否.否，是.是）',
      `isProvinceAcquisitionShow` varchar(16) COMMENT '是否支持全省范围就近取件（否.否，是.是）', `isExpressTakeShow` varchar(16) COMMENT '物流快递,窗口办理选（否.否，是.是）',
      `isApplyProvinceShow` varchar(16) COMMENT '是否支持全省范围就近办理（否.否，是.是）', `isProvinceAcquisitionShow` varchar(16) COMMENT '是否支持全省范围就近取件（否.否，是.是）',
      `mustSceneExplain` varchar(512) COMMENT '必须到现场原因', `isApplyProvinceShow` varchar(16) COMMENT '是否支持全省范围就近办理（否.否，是.是）',
      `onlineType` varchar(32) COMMENT '网办类型（原件预审.原件预审，原件核验.原件核验，全程网办.全程网办）', `mustSceneExplain` varchar(512) COMMENT '必须到现场原因',
      `onlineToTheSceneNum` tinyint(2) COMMENT '网办到现场次数', `onlineType` varchar(32) COMMENT '网办类型（原件预审.原件预审，原件核验.原件核验，全程网办.全程网办）',
      `onlineOperatDeep` varchar(16) COMMENT '网络办理深度（互联网咨询.互联网咨询，互联网收件.互联网收件，互联网预审.互联网预审，互联网受理.互联网受理，互联网办理.互联网办理，互联网办理结果信息反馈.互联网办理结果信息反馈，其他.其他）', `onlineToTheSceneNum` tinyint(2) COMMENT '网办到现场次数',
      `isExpressTakeOnlineShow` varchar(16) COMMENT '物流快递，网上办理选（否.否，是.是）', `onlineOperatDeep` varchar(16) COMMENT '网络办理深度（互联网咨询.互联网咨询，互联网收件.互联网收件，互联网预审.互联网预审，互联网受理.互联网受理，互联网办理.互联网办理，互联网办理结果信息反馈.互联网办理结果信息反馈，其他.其他）',
      `isDoorTakeShow` varchar(16) COMMENT '是否支持上门收取申请（否.否，是.是）', `isExpressTakeOnlineShow` varchar(16) COMMENT '物流快递，网上办理选（否.否，是.是）',
      `onlineMustSceneExplain` varchar(512) COMMENT '网上必须到现场原因', `isDoorTakeShow` varchar(16) COMMENT '是否支持上门收取申请（否.否，是.是）',
      `performDeptType` varchar(64) COMMENT '实施主体', `onlineMustSceneExplain` varchar(512) COMMENT '网上必须到现场原因',
      `matterEdition` varchar(32) COMMENT '事项版本', `performDeptType` varchar(64) COMMENT '实施主体',
      `eventTypeShow` varchar(128) COMMENT '事项类型名称（行政许可.行政许可，行政处罚.行政处罚，行政强制.行政强制，行政征收.行政征收，行政给付.行政给付，行政检查.行政检查，行政确认.行政确认，行政奖励.行政奖励，行政裁决.行政裁决，其他行政权力.其他行政权力，主动服务.主动服务，依申请服务.依申请服务，咨询查询.咨询查询，未归类事项.未归类事项）', `matterEdition` varchar(32) COMMENT '事项版本',
      `performHierarchyShow` varchar(128) COMMENT '行使层级名称（省级.省级，市级.市级，县级.县级，镇[乡 街道].镇[乡 街道]，村[社区]级.村[社区]级）', `eventTypeShow` varchar(128) COMMENT '事项类型名称（行政许可.行政许可，行政处罚.行政处罚，行政强制.行政强制，行政征收.行政征收，行政给付.行政给付，行政检查.行政检查，行政确认.行政确认，行政奖励.行政奖励，行政裁决.行政裁决，其他行政权力.其他行政权力，主动服务.主动服务，依申请服务.依申请服务，咨询查询.咨询查询，未归类事项.未归类事项）',
      `powerSourceShow` varchar(64) COMMENT '权力来源（法定本级行使.法定本级行使，上级下放.上级下放，上级授权.上级授权，同级授权.同级授权，上级委托.上级委托，同级委托.同级委托）', `performHierarchyShow` varchar(128) COMMENT '行使层级名称（省级.省级，市级.市级，县级.县级，镇[乡 街道].镇[乡 街道]，村[社区]级.村[社区]级）',
      `performDeptTypeShow` varchar(64) COMMENT '实施主体性质（法定机关.法定机关，授权组织.授权组织，受委托组织.受委托组织）', `powerSourceShow` varchar(64) COMMENT '权力来源（法定本级行使.法定本级行使，上级下放.上级下放，上级授权.上级授权，同级授权.同级授权，上级委托.上级委托，同级委托.同级委托）',
      `goveServiceCenterShow` varchar(16) COMMENT '是否进驻中心（否.否，是.是）', `performDeptTypeShow` varchar(64) COMMENT '实施主体性质（法定机关.法定机关，授权组织.授权组织，受委托组织.受委托组织）',
      `isConvenientCenterShow` varchar(16) COMMENT '是否纳入便民服务中心（否.否，是.是）', `goveServiceCenterShow` varchar(16) COMMENT '是否进驻中心（否.否，是.是）',
      `terminalHandle` varchar(20) COMMENT '自助终端办理 （否.否，是.是）', `isConvenientCenterShow` varchar(16) COMMENT '是否纳入便民服务中心（否.否，是.是）',
      `isOnline` varchar(20) COMMENT '是否网办 （否.否，是.是）', `terminalHandle` varchar(20) COMMENT '自助终端办理 （否.否，是.是）',
      `isOnlinePayShow` varchar(16) COMMENT '支持网上支付（否.否，是.是）', `isOnline` varchar(20) COMMENT '是否网办 （否.否，是.是）',
      `entrustmentDepartmen` varchar(64) COMMENT '委托部门（否.否，是.是）', `isOnlinePayShow` varchar(16) COMMENT '支持网上支付（否.否，是.是）',
      `jointInfoShow` varchar(128) COMMENT '联办机构', `entrustmentDepartmen` varchar(64) COMMENT '委托部门（否.否，是.是）',
      `matterStatus` varchar(32) COMMENT '事项状态（停用.停用，在用.在用）', `jointInfoShow` varchar(128) COMMENT '联办机构',
      `numberLimit` int(11) COMMENT '数量限制', `matterStatus` varchar(32) COMMENT '事项状态（停用.停用，在用.在用）',
      `type` varchar(32) COMMENT '主题类型', `numberLimit` int(11) COMMENT '数量限制',
      `baseCode` varchar(128) COMMENT '基本编码', `type` varchar(32) COMMENT '主题类型',
      `implementCode` varchar(128) COMMENT '实施编码', `baseCode` varchar(128) COMMENT '基本编码',
      `implementBodyCode` varchar(128) COMMENT '实施主体编码', `implementCode` varchar(128) COMMENT '实施编码',
      `operateItemCode` varchar(128) COMMENT '办理项编码', `implementBodyCode` varchar(128) COMMENT '实施主体编码',
      `townshipName` varchar(128) COMMENT '乡镇街道名称', `operateItemCode` varchar(128) COMMENT '办理项编码',
      `townshipCode` varchar(128) COMMENT '乡镇街道代码', `townshipName` varchar(128) COMMENT '乡镇街道名称',
      `villageName` varchar(128) COMMENT '村居社区名称', `townshipCode` varchar(128) COMMENT '乡镇街道代码',
      `villageCode` varchar(128) COMMENT '村居社区代码', `villageName` varchar(128) COMMENT '村居社区名称',
      `operateTime` varchar(128) COMMENT '办理时间', `villageCode` varchar(128) COMMENT '村居社区代码',
      `operateSite` varchar(1024) COMMENT '办理地点', `operateTime` varchar(128) COMMENT '办理时间',
      `cousultingShow` varchar(1024) COMMENT '咨询方式', `operateSite` varchar(1024) COMMENT '办理地点',
      `cousultingTelephoneShow` varchar(64) COMMENT '咨询电话', `cousultingShow` varchar(1024) COMMENT '咨询方式',
      `superviseShow` varchar(1024) COMMENT '监督投诉方式', `cousultingTelephoneShow` varchar(64) COMMENT '咨询电话',
      `sort` int(4) COMMENT '排序', `superviseShow` varchar(1024) COMMENT '监督投诉方式',
      `source` tinyint(2) COMMENT '事项来源(0.政务网，1.自定义)', `sort` int(4) COMMENT '排序',
      `createTime` datetime COMMENT '创建时间', `source` tinyint(2) COMMENT '事项来源(0.政务网，1.自定义)',
      `createUserId` bigint(20) COMMENT '创建用户', `createTime` datetime COMMENT '创建时间',
      `updateTime` datetime COMMENT '修改时间', `createUserId` bigint(20) COMMENT '创建用户',
      PRIMARY KEY (`id`) `updateTime` datetime COMMENT '修改时间',
      PRIMARY KEY (`id`)
      ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='基础事项业务'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='基础事项业务';
      -- ---------------------------- -- ----------------------------
      -- 事项申请材料表 -- 事项申请材料表
      -- ---------------------------- -- ----------------------------
      DROP TABLE IF EXISTS `mortals_xhx_matter_datum`; DROP TABLE IF EXISTS `mortals_xhx_matter_datum`;
      CREATE TABLE mortals_xhx_matter_datum( CREATE TABLE mortals_xhx_matter_datum
      `id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长', (
      `siteId` bigint(20) COMMENT '站点id', `id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长',
      `matterId` bigint(20) COMMENT '事项matter id', `siteId` bigint(20) COMMENT '站点id',
      `deptId` bigint(20) COMMENT '部门ID', `matterId` bigint(20) COMMENT '事项matter id',
      `deptCode` varchar(255) COMMENT '部门编码', `deptId` bigint(20) COMMENT '部门ID',
      `deptName` varchar(255) COMMENT '部门名称', `deptCode` varchar(255) COMMENT '部门编码',
      `materialName` varchar(1024) NOT NULL COMMENT '材料名', `deptName` varchar(255) COMMENT '部门名称',
      `materiaFullName` varchar(1024) NOT NULL COMMENT '材料全名', `materialName` varchar(1024) NOT NULL COMMENT '材料名',
      `source` tinyint(2) COMMENT '事项来源(0.政务网，1.自定义)', `materiaFullName` varchar(1024) NOT NULL COMMENT '材料全名',
      `isRecommend` tinyint(2) COMMENT '是否推荐(0.未推荐，1.推荐)', `source` tinyint(2) COMMENT '事项来源(0.政务网，1.自定义)',
      `total` int(8) COMMENT '填单次数', `isRecommend` tinyint(2) COMMENT '是否推荐(0.未推荐，1.推荐)',
      `sort` int(4) COMMENT '排序', `total` int(8) COMMENT '填单次数',
      `samplePrint` int(9) COMMENT '样表打印次数', `sort` int(4) COMMENT '排序',
      `fileName` varchar(255) COMMENT '填单的附件名称', `samplePrint` int(9) COMMENT '样表打印次数',
      `fileUrl` varchar(255) COMMENT '填单的附件下载地址', `fileName` varchar(255) COMMENT '填单的附件名称',
      `sampleName` varchar(255) COMMENT '样表名称', `fileUrl` varchar(255) COMMENT '填单的附件下载地址',
      `samplePath` varchar(255) COMMENT '样表地址', `sampleName` varchar(255) COMMENT '样表名称',
      `templateName` varchar(255) COMMENT '模板名称', `samplePath` varchar(255) COMMENT '样表地址',
      `templatePath` varchar(255) COMMENT '模板地址', `templateName` varchar(255) COMMENT '模板名称',
      `preViewPath` varchar(255) COMMENT '样表预览地址', `templatePath` varchar(255) COMMENT '模板地址',
      `formContent` mediumtext COMMENT '表单内容', `preViewPath` varchar(255) COMMENT '样表预览地址',
      `createTime` datetime COMMENT '创建时间', `formContent` mediumtext COMMENT '表单内容',
      `createUserId` bigint(20) COMMENT '创建用户', `createTime` datetime COMMENT '创建时间',
      `updateTime` datetime COMMENT '修改时间', `createUserId` bigint(20) COMMENT '创建用户',
      PRIMARY KEY (`id`) `updateTime` datetime COMMENT '修改时间',
      PRIMARY KEY (`id`)
      ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项申请材料'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项申请材料';
      ...@@ -121,28 +123,29 @@ CREATE TABLE mortals_xhx_matter_datum( ...@@ -121,28 +123,29 @@ CREATE TABLE mortals_xhx_matter_datum(
      -- 事项材料公共库表 -- 事项材料公共库表
      -- ---------------------------- -- ----------------------------
      DROP TABLE IF EXISTS `mortals_xhx_pubdatum`; DROP TABLE IF EXISTS `mortals_xhx_pubdatum`;
      CREATE TABLE mortals_xhx_pubdatum( CREATE TABLE mortals_xhx_pubdatum
      `id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长', (
      `matterId` bigint(20) COMMENT '事项matter id', `id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长',
      `deptId` bigint(20) COMMENT '部门ID', `matterId` bigint(20) COMMENT '事项matter id',
      `deptCode` varchar(256) COMMENT '部门编号', `deptId` bigint(20) COMMENT '部门ID',
      `deptName` varchar(256) COMMENT '部门名称', `deptCode` varchar(256) COMMENT '部门编号',
      `materialName` varchar(1024) NOT NULL COMMENT '材料名', `deptName` varchar(256) COMMENT '部门名称',
      `materiaFullName` varchar(1024) NOT NULL COMMENT '材料全名', `materialName` varchar(1024) NOT NULL COMMENT '材料名',
      `total` int(8) COMMENT '填单次数', `materiaFullName` varchar(1024) NOT NULL COMMENT '材料全名',
      `sort` int(4) COMMENT '排序', `total` int(8) COMMENT '填单次数',
      `fileName` varchar(255) COMMENT '填单的附件名称', `sort` int(4) COMMENT '排序',
      `fileUrl` varchar(255) COMMENT '填单的附件下载地址', `fileName` varchar(255) COMMENT '填单的附件名称',
      `sampleName` varchar(255) COMMENT '样表名称', `fileUrl` varchar(255) COMMENT '填单的附件下载地址',
      `samplePath` varchar(255) COMMENT '样表地址', `sampleName` varchar(255) COMMENT '样表名称',
      `templateName` varchar(255) COMMENT '模板名称', `samplePath` varchar(255) COMMENT '样表地址',
      `templatePath` varchar(255) COMMENT '模板地址', `templateName` varchar(255) COMMENT '模板名称',
      `preViewPath` varchar(255) COMMENT '样表预览地址', `templatePath` varchar(255) COMMENT '模板地址',
      `formContent` mediumtext COMMENT '表单内容', `preViewPath` varchar(255) COMMENT '样表预览地址',
      `createTime` datetime COMMENT '创建时间', `formContent` mediumtext COMMENT '表单内容',
      `createUserId` bigint(20) COMMENT '创建用户', `createTime` datetime COMMENT '创建时间',
      `updateTime` datetime COMMENT '修改时间', `createUserId` bigint(20) COMMENT '创建用户',
      PRIMARY KEY (`id`) `updateTime` datetime COMMENT '修改时间',
      PRIMARY KEY (`id`)
      ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项材料公共库'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项材料公共库';
      ...@@ -151,31 +154,33 @@ CREATE TABLE mortals_xhx_pubdatum( ...@@ -151,31 +154,33 @@ CREATE TABLE mortals_xhx_pubdatum(
      -- 填单服务基础设置表 -- 填单服务基础设置表
      -- ---------------------------- -- ----------------------------
      DROP TABLE IF EXISTS `mortals_xhx_baseset`; DROP TABLE IF EXISTS `mortals_xhx_baseset`;
      CREATE TABLE mortals_xhx_baseset( CREATE TABLE mortals_xhx_baseset
      `id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长', (
      `siteId` bigint(20) COMMENT '站点ID', `id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长',
      `printDisplay` int(4) COMMENT '空白打印材料展示数量', `siteId` bigint(20) COMMENT '站点ID',
      `newsSource` tinyint(4) COMMENT '新闻来源(1.热点新闻,2.本地要闻,3.政策发布,4.通知公告)', `printDisplay` int(4) COMMENT '空白打印材料展示数量',
      `createTime` datetime COMMENT '创建时间', `newsSource` tinyint(4) COMMENT '新闻来源(1.热点新闻,2.本地要闻,3.政策发布,4.通知公告)',
      `createUserId` bigint(20) COMMENT '创建用户', `createTime` datetime COMMENT '创建时间',
      `updateTime` datetime COMMENT '修改时间', `createUserId` bigint(20) COMMENT '创建用户',
      PRIMARY KEY (`id`) `updateTime` datetime COMMENT '修改时间',
      PRIMARY KEY (`id`)
      ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='填单服务基础设置'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='填单服务基础设置';
      -- ---------------------------- -- ----------------------------
      -- 热门词汇业务表 -- 热门词汇业务表
      -- ---------------------------- -- ----------------------------
      DROP TABLE IF EXISTS `mortals_xhx_hotword`; DROP TABLE IF EXISTS `mortals_xhx_hotword`;
      CREATE TABLE mortals_xhx_hotword( CREATE TABLE mortals_xhx_hotword
      `id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长', (
      `siteId` bigint(20) COMMENT '站点ID', `id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长',
      `hotwords` varchar(512) COMMENT '热门词汇', `siteId` bigint(20) COMMENT '站点ID',
      `searchCount` int(9) COMMENT '查询次数', `hotwords` varchar(512) COMMENT '热门词汇',
      `wordsSource` tinyint(4) COMMENT '热门词汇来源（1.手动添加,2.查询添加）', `searchCount` int(9) COMMENT '查询次数',
      `createTime` datetime COMMENT '创建时间', `wordsSource` tinyint(4) COMMENT '热门词汇来源（1.手动添加,2.查询添加）',
      `createUserId` bigint(20) COMMENT '创建用户', `createTime` datetime COMMENT '创建时间',
      `updateTime` datetime COMMENT '修改时间', `createUserId` bigint(20) COMMENT '创建用户',
      PRIMARY KEY (`id`) `updateTime` datetime COMMENT '修改时间',
      PRIMARY KEY (`id`)
      ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='热门词汇业务'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='热门词汇业务';
      ...@@ -184,51 +189,54 @@ CREATE TABLE mortals_xhx_hotword( ...@@ -184,51 +189,54 @@ CREATE TABLE mortals_xhx_hotword(
      -- 事项申请材料业务表 -- 事项申请材料业务表
      -- ---------------------------- -- ----------------------------
      DROP TABLE IF EXISTS `mortals_xhx_matter_datum`; DROP TABLE IF EXISTS `mortals_xhx_matter_datum`;
      CREATE TABLE mortals_xhx_matter_datum( CREATE TABLE mortals_xhx_matter_datum
      `id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长', (
      `matterId` bigint(20) COMMENT '事项matter id', `id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长',
      `siteId` bigint(20) COMMENT '站点ID', `matterId` bigint(20) COMMENT '事项matter id',
      `deptId` bigint(20) COMMENT '部门ID', `siteId` bigint(20) COMMENT '站点ID',
      `deptCode` varchar(256) COMMENT '部门编号', `deptId` bigint(20) COMMENT '部门ID',
      `deptName` varchar(256) COMMENT '部门名称', `deptCode` varchar(256) COMMENT '部门编号',
      `materialName` varchar(1024) NOT NULL COMMENT '材料名', `deptName` varchar(256) COMMENT '部门名称',
      `materiaFullName` varchar(1024) NOT NULL COMMENT '材料全名', `materialName` varchar(1024) NOT NULL COMMENT '材料名',
      `source` tinyint(2) COMMENT '事项来源(0.政务网，1.自定义)', `materiaFullName` varchar(1024) NOT NULL COMMENT '材料全名',
      `isRecommend` tinyint(2) COMMENT '是否推荐(0.未推荐，1.推荐)', `source` tinyint(2) COMMENT '事项来源(0.政务网，1.自定义)',
      `total` int(8) COMMENT '填单次数', `isRecommend` tinyint(2) COMMENT '是否推荐(0.未推荐，1.推荐)',
      `sort` int(4) COMMENT '排序', `total` int(8) COMMENT '填单次数',
      `samplePrint` int(4) COMMENT '样表打印次数', `sort` int(4) COMMENT '排序',
      `fileName` varchar(255) COMMENT '填单的附件名称', `samplePrint` int(4) COMMENT '样表打印次数',
      `fileUrl` varchar(255) COMMENT '填单的附件下载地址', `fileName` varchar(255) COMMENT '填单的附件名称',
      `sampleName` varchar(255) COMMENT '样表名称', `fileUrl` varchar(255) COMMENT '填单的附件下载地址',
      `samplePath` varchar(255) COMMENT '样表地址', `sampleName` varchar(255) COMMENT '样表名称',
      `templateName` varchar(255) COMMENT '模板名称', `samplePath` varchar(255) COMMENT '样表地址',
      `templatePath` varchar(255) COMMENT '模板地址', `templateName` varchar(255) COMMENT '模板名称',
      `preViewPath` varchar(255) COMMENT '样表预览地址', `templatePath` varchar(255) COMMENT '模板地址',
      `formContent` mediumtext COMMENT '表单内容', `preViewPath` varchar(255) COMMENT '样表预览地址',
      `createTime` datetime COMMENT '创建时间', `formContent` mediumtext COMMENT '表单内容',
      `createUserId` bigint(20) COMMENT '创建用户', `createTime` datetime COMMENT '创建时间',
      `updateTime` datetime COMMENT '修改时间', `createUserId` bigint(20) COMMENT '创建用户',
      PRIMARY KEY (`id`) `updateTime` datetime COMMENT '修改时间',
      PRIMARY KEY (`id`)
      ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项申请材料业务'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项申请材料业务';
      -- ---------------------------- -- ----------------------------
      -- 打印提交表 -- 打印提交表
      -- ---------------------------- -- ----------------------------
      DROP TABLE IF EXISTS `mortals_fill_matter_datum_print`; DROP TABLE IF EXISTS `mortals_xhx_matter_datum_print`;
      CREATE TABLE mortals_fill_matter_datum_print( CREATE TABLE mortals_xhx_matter_datum_print
      `id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长', (
      `orderId` varchar(64) COMMENT '打印订单', `id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长',
      `materialId` bigint(20) COMMENT '材料Id', `siteId` bigint(20) COMMENT '站点id',
      `materialName` varchar(1024) NOT NULL COMMENT '材料名', `orderId` varchar(64) COMMENT '打印订单',
      `page` int(8) COMMENT '材料页数', `materialId` bigint(20) COMMENT '材料Id',
      `type` tinyint(2) COMMENT '打印类型(1.本地打印,2.在线打印)', `materialName` varchar(1024) NOT NULL COMMENT '材料名',
      `docPath` varchar(255) COMMENT '合成doc后地址', `page` int(8) COMMENT '材料页数',
      `formContent` mediumtext COMMENT '提交的表单', `type` tinyint(2) COMMENT '打印类型(1.本地打印,2.在线打印)',
      `createTime` datetime COMMENT '创建时间', `docPath` varchar(255) COMMENT '合成doc后地址',
      `createUserId` bigint(20) COMMENT '创建用户', `formContent` mediumtext COMMENT '提交的表单',
      `updateTime` datetime COMMENT '修改时间', `createTime` datetime COMMENT '创建时间',
      PRIMARY KEY (`id`) `createUserId` bigint(20) COMMENT '创建用户',
      `updateTime` datetime COMMENT '修改时间',
      PRIMARY KEY (`id`)
      ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='打印提交'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='打印提交';
      ...@@ -241,3 +249,5 @@ CREATE TABLE mortals_fill_matter_datum_print( ...@@ -241,3 +249,5 @@ CREATE TABLE mortals_fill_matter_datum_print(
      fill-manager/src/main/java/com/mortals/xhx/common/utils/WordUtil.java
      View file @ 00396d9f
      ...@@ -134,11 +134,22 @@ public class WordUtil { ...@@ -134,11 +134,22 @@ public class WordUtil {
      log.info("文件转换结束,共耗时：" + ((now - old) / 1000.0) + "秒"); log.info("文件转换结束,共耗时：" + ((now - old) / 1000.0) + "秒");
      return jpegPath; return jpegPath;
      } catch (Exception e) { } catch (Exception e) {
      log.error("文件转换异常!",e); log.error("文件转换异常!", e);
      throw new AppException(String.format("文件转换异常! %s", e.getMessage())); throw new AppException(String.format("文件转换异常! %s", e.getMessage()));
      } }
      } }
      public static Integer getPageByDoc(String inputFile) {
      try {
      //FileOutputStream os = new FileOutputStream(file);
      // 要转换的word文档的路径
      Document doc = new Document(inputFile);
      return doc.getPageCount();
      } catch (Exception e) {
      log.error("获取doc异常!", e);
      return 0;
      }
      }
      /** /**
      * 合并任数量的图片成一张图片 * 合并任数量的图片成一张图片
      ......
      fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java
      View file @ 00396d9f
      ...@@ -14,6 +14,7 @@ import com.mortals.framework.model.PageInfo; ...@@ -14,6 +14,7 @@ import com.mortals.framework.model.PageInfo;
      import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
      import com.mortals.framework.service.IUser; import com.mortals.framework.service.IUser;
      import com.mortals.framework.util.DataUtil; import com.mortals.framework.util.DataUtil;
      import com.mortals.framework.util.DateUtils;
      import com.mortals.framework.util.HttpUtil; import com.mortals.framework.util.HttpUtil;
      import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
      import com.mortals.framework.web.BaseJsonBodyController; import com.mortals.framework.web.BaseJsonBodyController;
      ...@@ -35,10 +36,8 @@ import com.mortals.xhx.module.home.pdu.NoticeQueryPdu; ...@@ -35,10 +36,8 @@ import com.mortals.xhx.module.home.pdu.NoticeQueryPdu;
      import com.mortals.xhx.module.hotword.model.HotwordEntity; import com.mortals.xhx.module.hotword.model.HotwordEntity;
      import com.mortals.xhx.module.hotword.model.HotwordQuery; import com.mortals.xhx.module.hotword.model.HotwordQuery;
      import com.mortals.xhx.module.hotword.service.HotwordService; import com.mortals.xhx.module.hotword.service.HotwordService;
      import com.mortals.xhx.module.matter.model.MatterDatumEntity; import com.mortals.xhx.module.matter.model.*;
      import com.mortals.xhx.module.matter.model.MatterDatumQuery; import com.mortals.xhx.module.matter.service.MatterDatumPrintService;
      import com.mortals.xhx.module.matter.model.MatterEntity;
      import com.mortals.xhx.module.matter.model.MatterQuery;
      import com.mortals.xhx.module.matter.service.MatterDatumService; import com.mortals.xhx.module.matter.service.MatterDatumService;
      import com.mortals.xhx.module.matter.service.MatterService; import com.mortals.xhx.module.matter.service.MatterService;
      import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.formula.functions.T;
      ...@@ -69,6 +68,9 @@ public class HomeController extends BaseJsonBodyController { ...@@ -69,6 +68,9 @@ public class HomeController extends BaseJsonBodyController {
      private ISiteFeign siteFeign; private ISiteFeign siteFeign;
      @Autowired @Autowired
      private BasesetService basesetService; private BasesetService basesetService;
      @Autowired
      private MatterDatumPrintService matterDatumPrintService;
      @PostMapping({"site/list"}) @PostMapping({"site/list"})
      public Rest<Object> list() { public Rest<Object> list() {
      ...@@ -118,6 +120,32 @@ public class HomeController extends BaseJsonBodyController { ...@@ -118,6 +120,32 @@ public class HomeController extends BaseJsonBodyController {
      return ret; return ret;
      } }
      @PostMapping({"depts"})
      @UnAuth
      public Rest<Object> depts(@RequestBody HomeQueryPdu queryPdu) {
      Rest<Object> ret = new Rest();
      Map<String, Object> model = new HashMap();
      String busiDesc = "查询站点部门";
      int code = VALUE_RESULT_SUCCESS;
      try {
      if (queryPdu.getSiteId() != null) {
      Map<String, String> deptMap = matterService.find(new MatterQuery().siteId(queryPdu.getSiteId())).stream().collect(Collectors.toMap(x -> x.getDeptCode(), y -> y.getDeptName(), (o, n) -> n));
      model.put("deptMap", deptMap);
      }
      model.put("deptMap", new HashMap<>());
      model.put("message_info", busiDesc + "成功");
      this.recordSysLog(this.request, busiDesc + " 【成功】");
      } catch (Exception var9) {
      code = VALUE_RESULT_FAILURE;
      this.doException(this.request, busiDesc, model, var9);
      }
      ret.setCode(code);
      ret.setData(model);
      ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
      return ret;
      }
      @PostMapping({"dept/list"}) @PostMapping({"dept/list"})
      @UnAuth @UnAuth
      public Rest<Object> deptList(@RequestBody HomeQueryPdu queryPdu) { public Rest<Object> deptList(@RequestBody HomeQueryPdu queryPdu) {
      ...@@ -265,14 +293,7 @@ public class HomeController extends BaseJsonBodyController { ...@@ -265,14 +293,7 @@ public class HomeController extends BaseJsonBodyController {
      pageInfo.setPrePageResult(nums); pageInfo.setPrePageResult(nums);
      List<HotwordEntity> hotwordEntities = hotwordService.find(hotwordQuery, pageInfo, null).getList(); List<HotwordEntity> hotwordEntities = hotwordService.find(hotwordQuery, pageInfo, null).getList();
      /* List<String> hotwordEntities = hotwordService.find(hotwordQuery, new PageInfo(), null).getList().stream()
      .map(HotwordEntity::getHotwords)
      .flatMap(item -> StrUtil.split(item, ",".charAt(0)).stream())
      .collect(Collectors.toList());*/
      model.put("hotWords", hotwordEntities); model.put("hotWords", hotwordEntities);
      MatterQuery matterQuery = new MatterQuery(); MatterQuery matterQuery = new MatterQuery();
      matterQuery.setSiteId(homeQueryPdu.getSiteId()); matterQuery.setSiteId(homeQueryPdu.getSiteId());
      int matterCont = matterService.count(matterQuery, this.getContext()); int matterCont = matterService.count(matterQuery, this.getContext());
      ...@@ -288,15 +309,26 @@ public class HomeController extends BaseJsonBodyController { ...@@ -288,15 +309,26 @@ public class HomeController extends BaseJsonBodyController {
      model.put("datumList", datumList); //热门表单 model.put("datumList", datumList); //热门表单
      model.put("datumCont", datumCont); //入驻表单数量 model.put("datumCont", datumCont); //入驻表单数量
      model.put("localPrint", 20); //本地打印数量
      model.put("onlineSubmit", 0); //在线提交数量 Map<Boolean, List<MatterDatumPrintEntity>> collect = matterDatumPrintService.find(new MatterDatumPrintQuery().siteId(homeQueryPdu.getSiteId())).stream().collect(Collectors.partitioningBy(x -> x.getType().equals(1)));
      model.put("dayThrift", 66); //今日节约 List<MatterDatumPrintEntity> matterDatumPrintLocalEntities = collect.get(true);
      model.put("totalThrift", 996); //累计节约 List<MatterDatumPrintEntity> matterDatumPrintOnlineEntities = collect.get(false);
      model.put("localPrint", matterDatumPrintLocalEntities.size()); //本地打印数量
      model.put("onlineSubmit", matterDatumPrintOnlineEntities.size()); //在线提交数量
      MatterDatumPrintQuery matterDatumPrintQuery = new MatterDatumPrintQuery();
      matterDatumPrintQuery.setSiteId(homeQueryPdu.getSiteId());
      matterDatumPrintQuery.setCreateTimeStart(DateUtils.getStrDate(new Date()));
      matterDatumPrintQuery.setCreateTimeEnd(DateUtils.getStrDate(new Date()));
      long todaySum = matterDatumPrintService.find(matterDatumPrintQuery).stream().collect(Collectors.summarizingInt(x -> x.getPage())).getSum();
      model.put("dayThrift", todaySum); //今日节约
      long sum = matterDatumPrintOnlineEntities.stream().collect(Collectors.summarizingInt(x -> x.getPage())).getSum();
      model.put("totalThrift", sum*2); //累计节约
      Rest<com.mortals.xhx.common.pdu.site.SitePdu> info = siteFeign.info(homeQueryPdu.getSiteId()); Rest<com.mortals.xhx.common.pdu.site.SitePdu> info = siteFeign.info(homeQueryPdu.getSiteId());
      model.put("title", info == null ? "" : info.getData().getSiteName()); //标题 model.put("title", info == null ? "" : info.getData().getSiteName()); //标题
      //HotwordEntity hotwordEntity = hotwordService.selectOne(hotwordQuery.siteId(homeQueryPdu.getSiteId()));
      BasesetEntity basesetEntity = basesetService.selectOne(new BasesetQuery().siteId(homeQueryPdu.getSiteId())); BasesetEntity basesetEntity = basesetService.selectOne(new BasesetQuery().siteId(homeQueryPdu.getSiteId()));
      model.put("blankCount", basesetEntity == null ? 20 : basesetEntity.getPrintDisplay()); //空白样表数量 model.put("blankCount", basesetEntity == null ? 20 : basesetEntity.getPrintDisplay()); //空白样表数量
      ......
      fill-manager/src/main/java/com/mortals/xhx/module/hotword/model/HotwordEntity.java
      View file @ 00396d9f
      package com.mortals.xhx.module.hotword.model; package com.mortals.xhx.module.hotword.model;
      import java.util.List;
      import java.util.ArrayList;
      import com.fasterxml.jackson.annotation.JsonFormat;
      import com.mortals.framework.annotation.Excel;
      import com.mortals.framework.model.BaseEntityLong;
      import com.mortals.xhx.module.hotword.model.vo.HotwordVo; import com.mortals.xhx.module.hotword.model.vo.HotwordVo;
      /** /**
      * 热门词汇业务实体对象 * 热门词汇业务实体对象
      ......
      fill-manager/src/main/java/com/mortals/xhx/module/mortals/dao/MortalsFillMatterDatumPrintDao.java → fill-manager/src/main/java/com/mortals/xhx/module/matter/dao/MatterDatumPrintDao.java
      View file @ 00396d9f
      package com.mortals.xhx.module.mortals.dao; package com.mortals.xhx.module.matter.dao;
      import com.mortals.framework.dao.ICRUDDao; import com.mortals.framework.dao.ICRUDDao;
      import com.mortals.xhx.module.mortals.model.MortalsFillMatterDatumPrintEntity; import com.mortals.xhx.module.matter.model.MatterDatumPrintEntity;
      import java.util.List; import java.util.List;
      /** /**
      * 打印提交Dao * 打印提交Dao
      * 打印提交 DAO接口 * 打印提交 DAO接口
      * *
      * @author zxfei * @author zxfei
      * @date 2022-12-07 * @date 2022-12-09
      */ */
      public interface MortalsFillMatterDatumPrintDao extends ICRUDDao<MortalsFillMatterDatumPrintEntity,Long>{ public interface MatterDatumPrintDao extends ICRUDDao<MatterDatumPrintEntity,Long>{
      } }
      fill-manager/src/main/java/com/mortals/xhx/module/mortals/dao/ibatis/MortalsFillMatterDatumPrintDaoImpl.java → fill-manager/src/main/java/com/mortals/xhx/module/matter/dao/ibatis/MatterDatumPrintDaoImpl.java
      View file @ 00396d9f
      package com.mortals.xhx.module.mortals.dao.ibatis; package com.mortals.xhx.module.matter.dao.ibatis;
      import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
      import com.mortals.xhx.module.mortals.dao.MortalsFillMatterDatumPrintDao; import com.mortals.xhx.module.matter.dao.MatterDatumPrintDao;
      import com.mortals.xhx.module.mortals.model.MortalsFillMatterDatumPrintEntity; import com.mortals.xhx.module.matter.model.MatterDatumPrintEntity;
      import java.util.Date; import java.util.Date;
      import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis; import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
      import java.util.List; import java.util.List;
      ...@@ -11,10 +11,10 @@ import java.util.List; ...@@ -11,10 +11,10 @@ import java.util.List;
      * 打印提交DaoImpl DAO接口 * 打印提交DaoImpl DAO接口
      * *
      * @author zxfei * @author zxfei
      * @date 2022-12-07 * @date 2022-12-09
      */ */
      @Repository("mortalsFillMatterDatumPrintDao") @Repository("matterDatumPrintDao")
      public class MortalsFillMatterDatumPrintDaoImpl extends BaseCRUDDaoMybatis<MortalsFillMatterDatumPrintEntity,Long> implements MortalsFillMatterDatumPrintDao { public class MatterDatumPrintDaoImpl extends BaseCRUDDaoMybatis<MatterDatumPrintEntity,Long> implements MatterDatumPrintDao {
      ......
      fill-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumInfo.java
      View file @ 00396d9f
      ...@@ -54,6 +54,15 @@ public class MatterDatumInfo { ...@@ -54,6 +54,15 @@ public class MatterDatumInfo {
      */ */
      private Integer samplePrint; private Integer samplePrint;
      /**
      * 填单的附件名称
      */
      private String fileName;
      /**
      * 填单的附件下载地址
      */
      private String fileUrl;
      /** /**
      * 样表名称 * 样表名称
      */ */
      ...@@ -62,6 +71,15 @@ public class MatterDatumInfo { ...@@ -62,6 +71,15 @@ public class MatterDatumInfo {
      * 样表地址 * 样表地址
      */ */
      private String samplePath; private String samplePath;
      /**
      * 模板名称
      */
      private String templateName;
      /**
      * 模板地址
      */
      private String templatePath;
      /** /**
      * 样表预览地址 * 样表预览地址
      */ */
      ......
      fill-manager/src/main/java/com/mortals/xhx/module/mortals/model/MortalsFillMatterDatumPrintEntity.java → fill-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumPrintEntity.java
      View file @ 00396d9f
      package com.mortals.xhx.module.mortals.model; package com.mortals.xhx.module.matter.model;
      import java.util.List; import java.util.List;
      import java.util.ArrayList; import java.util.ArrayList;
      import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
      import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
      import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
      import com.mortals.xhx.module.mortals.model.vo.MortalsFillMatterDatumPrintVo; import com.mortals.xhx.module.matter.model.vo.MatterDatumPrintVo;
      /** /**
      * 打印提交实体对象 * 打印提交实体对象
      * *
      * @author zxfei * @author zxfei
      * @date 2022-12-07 * @date 2022-12-09
      */ */
      public class MortalsFillMatterDatumPrintEntity extends MortalsFillMatterDatumPrintVo { public class MatterDatumPrintEntity extends MatterDatumPrintVo {
      private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
      /** /**
      * 打印订单 * 站点id
      */ */
      private Long siteId;
      /**
      * 打印订单
      */
      private String orderId; private String orderId;
      /** /**
      * 材料Id * 材料Id
      */ */
      private Long materialId; private Long materialId;
      /** /**
      * 材料名 * 材料名
      */ */
      private String materialName; private String materialName;
      /** /**
      * 材料页数 * 材料页数
      */ */
      private Integer page; private Integer page;
      /** /**
      * 打印类型(1.本地打印,2.在线打印) * 打印类型(1.本地打印,2.在线打印)
      */ */
      private Integer type; private Integer type;
      /** /**
      * 合成doc后地址 * 合成doc后地址
      */ */
      private String docPath; private String docPath;
      /** /**
      * 提交的表单 * 提交的表单
      */ */
      private String formContent; private String formContent;
      public MortalsFillMatterDatumPrintEntity(){} public MatterDatumPrintEntity(){}
      /**
      * 获取 站点id
      * @return Long
      */
      public Long getSiteId(){
      return siteId;
      }
      /** /**
      * 获取 打印订单 * 设置 站点id
      * @return String * @param siteId
      */ */
      public void setSiteId(Long siteId){
      this.siteId = siteId;
      }
      /**
      * 获取 打印订单
      * @return String
      */
      public String getOrderId(){ public String getOrderId(){
      return orderId; return orderId;
      } }
      /** /**
      * 设置 打印订单 * 设置 打印订单
      * @param orderId * @param orderId
      */ */
      public void setOrderId(String orderId){ public void setOrderId(String orderId){
      this.orderId = orderId; this.orderId = orderId;
      } }
      /** /**
      * 获取 材料Id * 获取 材料Id
      * @return Long * @return Long
      */ */
      public Long getMaterialId(){ public Long getMaterialId(){
      return materialId; return materialId;
      } }
      /** /**
      * 设置 材料Id * 设置 材料Id
      * @param materialId * @param materialId
      */ */
      public void setMaterialId(Long materialId){ public void setMaterialId(Long materialId){
      this.materialId = materialId; this.materialId = materialId;
      } }
      /** /**
      * 获取 材料名 * 获取 材料名
      * @return String * @return String
      */ */
      public String getMaterialName(){ public String getMaterialName(){
      return materialName; return materialName;
      } }
      /** /**
      * 设置 材料名 * 设置 材料名
      * @param materialName * @param materialName
      */ */
      public void setMaterialName(String materialName){ public void setMaterialName(String materialName){
      this.materialName = materialName; this.materialName = materialName;
      } }
      /** /**
      * 获取 材料页数 * 获取 材料页数
      * @return Integer * @return Integer
      */ */
      public Integer getPage(){ public Integer getPage(){
      return page; return page;
      } }
      /** /**
      * 设置 材料页数 * 设置 材料页数
      * @param page * @param page
      */ */
      public void setPage(Integer page){ public void setPage(Integer page){
      this.page = page; this.page = page;
      } }
      /** /**
      * 获取 打印类型(1.本地打印,2.在线打印) * 获取 打印类型(1.本地打印,2.在线打印)
      * @return Integer * @return Integer
      */ */
      public Integer getType(){ public Integer getType(){
      return type; return type;
      } }
      /** /**
      * 设置 打印类型(1.本地打印,2.在线打印) * 设置 打印类型(1.本地打印,2.在线打印)
      * @param type * @param type
      */ */
      public void setType(Integer type){ public void setType(Integer type){
      this.type = type; this.type = type;
      } }
      /** /**
      * 获取 合成doc后地址 * 获取 合成doc后地址
      * @return String * @return String
      */ */
      public String getDocPath(){ public String getDocPath(){
      return docPath; return docPath;
      } }
      /** /**
      * 设置 合成doc后地址 * 设置 合成doc后地址
      * @param docPath * @param docPath
      */ */
      public void setDocPath(String docPath){ public void setDocPath(String docPath){
      this.docPath = docPath; this.docPath = docPath;
      } }
      /** /**
      * 获取 提交的表单 * 获取 提交的表单
      * @return String * @return String
      */ */
      public String getFormContent(){ public String getFormContent(){
      return formContent; return formContent;
      } }
      /** /**
      * 设置 提交的表单 * 设置 提交的表单
      * @param formContent * @param formContent
      */ */
      public void setFormContent(String formContent){ public void setFormContent(String formContent){
      this.formContent = formContent; this.formContent = formContent;
      } }
      ...@@ -152,15 +170,15 @@ public class MortalsFillMatterDatumPrintEntity extends MortalsFillMatterDatumPri ...@@ -152,15 +170,15 @@ public class MortalsFillMatterDatumPrintEntity extends MortalsFillMatterDatumPri
      @Override @Override
      public int hashCode() { public int hashCode() {
      return this.getId().hashCode(); return this.getId().hashCode();
      } }
      @Override @Override
      public boolean equals(Object obj) { public boolean equals(Object obj) {
      if (obj == null) return false; if (obj == null) return false;
      if (obj instanceof MortalsFillMatterDatumPrintEntity) { if (obj instanceof MatterDatumPrintEntity) {
      MortalsFillMatterDatumPrintEntity tmp = (MortalsFillMatterDatumPrintEntity) obj; MatterDatumPrintEntity tmp = (MatterDatumPrintEntity) obj;
      if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
      return true; return true;
      } }
      } }
      return false; return false;
      ...@@ -168,6 +186,7 @@ public class MortalsFillMatterDatumPrintEntity extends MortalsFillMatterDatumPri ...@@ -168,6 +186,7 @@ public class MortalsFillMatterDatumPrintEntity extends MortalsFillMatterDatumPri
      public String toString(){ public String toString(){
      StringBuilder sb = new StringBuilder(""); StringBuilder sb = new StringBuilder("");
      sb.append(",siteId:").append(getSiteId());
      sb.append(",orderId:").append(getOrderId()); sb.append(",orderId:").append(getOrderId());
      sb.append(",materialId:").append(getMaterialId()); sb.append(",materialId:").append(getMaterialId());
      sb.append(",materialName:").append(getMaterialName()); sb.append(",materialName:").append(getMaterialName());
      ...@@ -180,18 +199,20 @@ public class MortalsFillMatterDatumPrintEntity extends MortalsFillMatterDatumPri ...@@ -180,18 +199,20 @@ public class MortalsFillMatterDatumPrintEntity extends MortalsFillMatterDatumPri
      public void initAttrValue(){ public void initAttrValue(){
      this.orderId = null; this.siteId = null;
      this.orderId = null;
      this.materialId = null; this.materialId = null;
      this.materialName = null; this.materialName = null;
      this.page = null; this.page = 0;
      this.type = 1; this.type = 1;
      this.docPath = null; this.docPath = "";
      this.formContent = null; this.formContent = "";
      } }
      } }
      \ No newline at end of file
      fill-manager/src/main/java/com/mortals/xhx/module/mortals/model/MortalsFillMatterDatumPrintQuery.java → fill-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumPrintQuery.java
      View file @ 00396d9f
      package com.mortals.xhx.module.mortals.model; package com.mortals.xhx.module.matter.model;
      import java.util.List; import java.util.List;
      import com.mortals.xhx.module.mortals.model.MortalsFillMatterDatumPrintEntity; import com.mortals.xhx.module.matter.model.MatterDatumPrintEntity;
      /** /**
      * 打印提交查询对象 * 打印提交查询对象
      * *
      * @author zxfei * @author zxfei
      * @date 2022-12-07 * @date 2022-12-09
      */ */
      public class MortalsFillMatterDatumPrintQuery extends MortalsFillMatterDatumPrintEntity { public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
      /** 开始 主键，自增长 */ /** 开始 主键，自增长 */
      private Long idStart; private Long idStart;
      ...@@ -21,6 +21,18 @@ public class MortalsFillMatterDatumPrintQuery extends MortalsFillMatterDatumPrin ...@@ -21,6 +21,18 @@ public class MortalsFillMatterDatumPrintQuery extends MortalsFillMatterDatumPrin
      /** 主键，自增长列表 */ /** 主键，自增长列表 */
      private List <Long> idList; private List <Long> idList;
      /** 开始 站点id */
      private Long siteIdStart;
      /** 结束 站点id */
      private Long siteIdEnd;
      /** 增加 站点id */
      private Long siteIdIncrement;
      /** 站点id列表 */
      private List <Long> siteIdList;
      /** 打印订单 */ /** 打印订单 */
      private List<String> orderIdList; private List<String> orderIdList;
      ...@@ -94,789 +106,898 @@ public class MortalsFillMatterDatumPrintQuery extends MortalsFillMatterDatumPrin ...@@ -94,789 +106,898 @@ public class MortalsFillMatterDatumPrintQuery extends MortalsFillMatterDatumPrin
      private String updateTimeEnd; private String updateTimeEnd;
      /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
      private List<MortalsFillMatterDatumPrintQuery> orConditionList; private List<MatterDatumPrintQuery> orConditionList;
      /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */ /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
      private List<MortalsFillMatterDatumPrintQuery> andConditionList; private List<MatterDatumPrintQuery> andConditionList;
      public MortalsFillMatterDatumPrintQuery(){} public MatterDatumPrintQuery(){}
      /** /**
      * 获取 开始 主键，自增长 * 获取 开始 主键，自增长
      * @return idStart * @return idStart
      */ */
      public Long getIdStart(){ public Long getIdStart(){
      return this.idStart; return this.idStart;
      } }
      /** /**
      * 设置 开始 主键，自增长 * 设置 开始 主键，自增长
      * @param idStart * @param idStart
      */ */
      public void setIdStart(Long idStart){ public void setIdStart(Long idStart){
      this.idStart = idStart; this.idStart = idStart;
      } }
      /** /**
      * 获取 结束 主键，自增长 * 获取 结束 主键，自增长
      * @return $idEnd * @return $idEnd
      */ */
      public Long getIdEnd(){ public Long getIdEnd(){
      return this.idEnd; return this.idEnd;
      } }
      /** /**
      * 设置 结束 主键，自增长 * 设置 结束 主键，自增长
      * @param idEnd * @param idEnd
      */ */
      public void setIdEnd(Long idEnd){ public void setIdEnd(Long idEnd){
      this.idEnd = idEnd; this.idEnd = idEnd;
      } }
      /** /**
      * 获取 增加 主键，自增长 * 获取 增加 主键，自增长
      * @return idIncrement * @return idIncrement
      */ */
      public Long getIdIncrement(){ public Long getIdIncrement(){
      return this.idIncrement; return this.idIncrement;
      } }
      /** /**
      * 设置 增加 主键，自增长 * 设置 增加 主键，自增长
      * @param idIncrement * @param idIncrement
      */ */
      public void setIdIncrement(Long idIncrement){ public void setIdIncrement(Long idIncrement){
      this.idIncrement = idIncrement; this.idIncrement = idIncrement;
      } }
      /** /**
      * 获取 主键，自增长 * 获取 主键，自增长
      * @return idList * @return idList
      */ */
      public List<Long> getIdList(){ public List<Long> getIdList(){
      return this.idList; return this.idList;
      } }
      /** /**
      * 设置 主键，自增长 * 设置 主键，自增长
      * @param idList * @param idList
      */ */
      public void setIdList(List<Long> idList){ public void setIdList(List<Long> idList){
      this.idList = idList; this.idList = idList;
      } }
      /** /**
      * 获取 打印订单 * 获取 开始 站点id
      * @return orderIdList * @return siteIdStart
      */ */
      public Long getSiteIdStart(){
      return this.siteIdStart;
      }
      /**
      * 设置 开始 站点id
      * @param siteIdStart
      */
      public void setSiteIdStart(Long siteIdStart){
      this.siteIdStart = siteIdStart;
      }
      /**
      * 获取 结束 站点id
      * @return $siteIdEnd
      */
      public Long getSiteIdEnd(){
      return this.siteIdEnd;
      }
      /**
      * 设置 结束 站点id
      * @param siteIdEnd
      */
      public void setSiteIdEnd(Long siteIdEnd){
      this.siteIdEnd = siteIdEnd;
      }
      /**
      * 获取 增加 站点id
      * @return siteIdIncrement
      */
      public Long getSiteIdIncrement(){
      return this.siteIdIncrement;
      }
      /**
      * 设置 增加 站点id
      * @param siteIdIncrement
      */
      public void setSiteIdIncrement(Long siteIdIncrement){
      this.siteIdIncrement = siteIdIncrement;
      }
      /**
      * 获取 站点id
      * @return siteIdList
      */
      public List<Long> getSiteIdList(){
      return this.siteIdList;
      }
      /**
      * 设置 站点id
      * @param siteIdList
      */
      public void setSiteIdList(List<Long> siteIdList){
      this.siteIdList = siteIdList;
      }
      /**
      * 获取 打印订单
      * @return orderIdList
      */
      public List<String> getOrderIdList(){ public List<String> getOrderIdList(){
      return this.orderIdList; return this.orderIdList;
      } }
      /** /**
      * 设置 打印订单 * 设置 打印订单
      * @param orderIdList * @param orderIdList
      */ */
      public void setOrderIdList(List<String> orderIdList){ public void setOrderIdList(List<String> orderIdList){
      this.orderIdList = orderIdList; this.orderIdList = orderIdList;
      } }
      /** /**
      * 获取 开始 材料Id * 获取 开始 材料Id
      * @return materialIdStart * @return materialIdStart
      */ */
      public Long getMaterialIdStart(){ public Long getMaterialIdStart(){
      return this.materialIdStart; return this.materialIdStart;
      } }
      /** /**
      * 设置 开始 材料Id * 设置 开始 材料Id
      * @param materialIdStart * @param materialIdStart
      */ */
      public void setMaterialIdStart(Long materialIdStart){ public void setMaterialIdStart(Long materialIdStart){
      this.materialIdStart = materialIdStart; this.materialIdStart = materialIdStart;
      } }
      /** /**
      * 获取 结束 材料Id * 获取 结束 材料Id
      * @return $materialIdEnd * @return $materialIdEnd
      */ */
      public Long getMaterialIdEnd(){ public Long getMaterialIdEnd(){
      return this.materialIdEnd; return this.materialIdEnd;
      } }
      /** /**
      * 设置 结束 材料Id * 设置 结束 材料Id
      * @param materialIdEnd * @param materialIdEnd
      */ */
      public void setMaterialIdEnd(Long materialIdEnd){ public void setMaterialIdEnd(Long materialIdEnd){
      this.materialIdEnd = materialIdEnd; this.materialIdEnd = materialIdEnd;
      } }
      /** /**
      * 获取 增加 材料Id * 获取 增加 材料Id
      * @return materialIdIncrement * @return materialIdIncrement
      */ */
      public Long getMaterialIdIncrement(){ public Long getMaterialIdIncrement(){
      return this.materialIdIncrement; return this.materialIdIncrement;
      } }
      /** /**
      * 设置 增加 材料Id * 设置 增加 材料Id
      * @param materialIdIncrement * @param materialIdIncrement
      */ */
      public void setMaterialIdIncrement(Long materialIdIncrement){ public void setMaterialIdIncrement(Long materialIdIncrement){
      this.materialIdIncrement = materialIdIncrement; this.materialIdIncrement = materialIdIncrement;
      } }
      /** /**
      * 获取 材料Id * 获取 材料Id
      * @return materialIdList * @return materialIdList
      */ */
      public List<Long> getMaterialIdList(){ public List<Long> getMaterialIdList(){
      return this.materialIdList; return this.materialIdList;
      } }
      /** /**
      * 设置 材料Id * 设置 材料Id
      * @param materialIdList * @param materialIdList
      */ */
      public void setMaterialIdList(List<Long> materialIdList){ public void setMaterialIdList(List<Long> materialIdList){
      this.materialIdList = materialIdList; this.materialIdList = materialIdList;
      } }
      /** /**
      * 获取 材料名 * 获取 材料名
      * @return materialNameList * @return materialNameList
      */ */
      public List<String> getMaterialNameList(){ public List<String> getMaterialNameList(){
      return this.materialNameList; return this.materialNameList;
      } }
      /** /**
      * 设置 材料名 * 设置 材料名
      * @param materialNameList * @param materialNameList
      */ */
      public void setMaterialNameList(List<String> materialNameList){ public void setMaterialNameList(List<String> materialNameList){
      this.materialNameList = materialNameList; this.materialNameList = materialNameList;
      } }
      /** /**
      * 获取 开始 材料页数 * 获取 开始 材料页数
      * @return pageStart * @return pageStart
      */ */
      public Integer getPageStart(){ public Integer getPageStart(){
      return this.pageStart; return this.pageStart;
      } }
      /** /**
      * 设置 开始 材料页数 * 设置 开始 材料页数
      * @param pageStart * @param pageStart
      */ */
      public void setPageStart(Integer pageStart){ public void setPageStart(Integer pageStart){
      this.pageStart = pageStart; this.pageStart = pageStart;
      } }
      /** /**
      * 获取 结束 材料页数 * 获取 结束 材料页数
      * @return $pageEnd * @return $pageEnd
      */ */
      public Integer getPageEnd(){ public Integer getPageEnd(){
      return this.pageEnd; return this.pageEnd;
      } }
      /** /**
      * 设置 结束 材料页数 * 设置 结束 材料页数
      * @param pageEnd * @param pageEnd
      */ */
      public void setPageEnd(Integer pageEnd){ public void setPageEnd(Integer pageEnd){
      this.pageEnd = pageEnd; this.pageEnd = pageEnd;
      } }
      /** /**
      * 获取 增加 材料页数 * 获取 增加 材料页数
      * @return pageIncrement * @return pageIncrement
      */ */
      public Integer getPageIncrement(){ public Integer getPageIncrement(){
      return this.pageIncrement; return this.pageIncrement;
      } }
      /** /**
      * 设置 增加 材料页数 * 设置 增加 材料页数
      * @param pageIncrement * @param pageIncrement
      */ */
      public void setPageIncrement(Integer pageIncrement){ public void setPageIncrement(Integer pageIncrement){
      this.pageIncrement = pageIncrement; this.pageIncrement = pageIncrement;
      } }
      /** /**
      * 获取 材料页数 * 获取 材料页数
      * @return pageList * @return pageList
      */ */
      public List<Integer> getPageList(){ public List<Integer> getPageList(){
      return this.pageList; return this.pageList;
      } }
      /** /**
      * 设置 材料页数 * 设置 材料页数
      * @param pageList * @param pageList
      */ */
      public void setPageList(List<Integer> pageList){ public void setPageList(List<Integer> pageList){
      this.pageList = pageList; this.pageList = pageList;
      } }
      /** /**
      * 获取 开始 打印类型(1.本地打印,2.在线打印) * 获取 开始 打印类型(1.本地打印,2.在线打印)
      * @return typeStart * @return typeStart
      */ */
      public Integer getTypeStart(){ public Integer getTypeStart(){
      return this.typeStart; return this.typeStart;
      } }
      /** /**
      * 设置 开始 打印类型(1.本地打印,2.在线打印) * 设置 开始 打印类型(1.本地打印,2.在线打印)
      * @param typeStart * @param typeStart
      */ */
      public void setTypeStart(Integer typeStart){ public void setTypeStart(Integer typeStart){
      this.typeStart = typeStart; this.typeStart = typeStart;
      } }
      /** /**
      * 获取 结束 打印类型(1.本地打印,2.在线打印) * 获取 结束 打印类型(1.本地打印,2.在线打印)
      * @return $typeEnd * @return $typeEnd
      */ */
      public Integer getTypeEnd(){ public Integer getTypeEnd(){
      return this.typeEnd; return this.typeEnd;
      } }
      /** /**
      * 设置 结束 打印类型(1.本地打印,2.在线打印) * 设置 结束 打印类型(1.本地打印,2.在线打印)
      * @param typeEnd * @param typeEnd
      */ */
      public void setTypeEnd(Integer typeEnd){ public void setTypeEnd(Integer typeEnd){
      this.typeEnd = typeEnd; this.typeEnd = typeEnd;
      } }
      /** /**
      * 获取 增加 打印类型(1.本地打印,2.在线打印) * 获取 增加 打印类型(1.本地打印,2.在线打印)
      * @return typeIncrement * @return typeIncrement
      */ */
      public Integer getTypeIncrement(){ public Integer getTypeIncrement(){
      return this.typeIncrement; return this.typeIncrement;
      } }
      /** /**
      * 设置 增加 打印类型(1.本地打印,2.在线打印) * 设置 增加 打印类型(1.本地打印,2.在线打印)
      * @param typeIncrement * @param typeIncrement
      */ */
      public void setTypeIncrement(Integer typeIncrement){ public void setTypeIncrement(Integer typeIncrement){
      this.typeIncrement = typeIncrement; this.typeIncrement = typeIncrement;
      } }
      /** /**
      * 获取 打印类型(1.本地打印,2.在线打印) * 获取 打印类型(1.本地打印,2.在线打印)
      * @return typeList * @return typeList
      */ */
      public List<Integer> getTypeList(){ public List<Integer> getTypeList(){
      return this.typeList; return this.typeList;
      } }
      /** /**
      * 设置 打印类型(1.本地打印,2.在线打印) * 设置 打印类型(1.本地打印,2.在线打印)
      * @param typeList * @param typeList
      */ */
      public void setTypeList(List<Integer> typeList){ public void setTypeList(List<Integer> typeList){
      this.typeList = typeList; this.typeList = typeList;
      } }
      /** /**
      * 获取 合成doc后地址 * 获取 合成doc后地址
      * @return docPathList * @return docPathList
      */ */
      public List<String> getDocPathList(){ public List<String> getDocPathList(){
      return this.docPathList; return this.docPathList;
      } }
      /** /**
      * 设置 合成doc后地址 * 设置 合成doc后地址
      * @param docPathList * @param docPathList
      */ */
      public void setDocPathList(List<String> docPathList){ public void setDocPathList(List<String> docPathList){
      this.docPathList = docPathList; this.docPathList = docPathList;
      } }
      /** /**
      * 获取 提交的表单 * 获取 提交的表单
      * @return formContentList * @return formContentList
      */ */
      public List<String> getFormContentList(){ public List<String> getFormContentList(){
      return this.formContentList; return this.formContentList;
      } }
      /** /**
      * 设置 提交的表单 * 设置 提交的表单
      * @param formContentList * @param formContentList
      */ */
      public void setFormContentList(List<String> formContentList){ public void setFormContentList(List<String> formContentList){
      this.formContentList = formContentList; this.formContentList = formContentList;
      } }
      /** /**
      * 获取 开始 创建时间 * 获取 开始 创建时间
      * @return createTimeStart * @return createTimeStart
      */ */
      public String getCreateTimeStart(){ public String getCreateTimeStart(){
      return this.createTimeStart; return this.createTimeStart;
      } }
      /** /**
      * 设置 开始 创建时间 * 设置 开始 创建时间
      * @param createTimeStart * @param createTimeStart
      */ */
      public void setCreateTimeStart(String createTimeStart){ public void setCreateTimeStart(String createTimeStart){
      this.createTimeStart = createTimeStart; this.createTimeStart = createTimeStart;
      } }
      /** /**
      * 获取 结束 创建时间 * 获取 结束 创建时间
      * @return createTimeEnd * @return createTimeEnd
      */ */
      public String getCreateTimeEnd(){ public String getCreateTimeEnd(){
      return this.createTimeEnd; return this.createTimeEnd;
      } }
      /** /**
      * 设置 结束 创建时间 * 设置 结束 创建时间
      * @param createTimeEnd * @param createTimeEnd
      */ */
      public void setCreateTimeEnd(String createTimeEnd){ public void setCreateTimeEnd(String createTimeEnd){
      this.createTimeEnd = createTimeEnd; this.createTimeEnd = createTimeEnd;
      } }
      /** /**
      * 获取 开始 创建用户 * 获取 开始 创建用户
      * @return createUserIdStart * @return createUserIdStart
      */ */
      public Long getCreateUserIdStart(){ public Long getCreateUserIdStart(){
      return this.createUserIdStart; return this.createUserIdStart;
      } }
      /** /**
      * 设置 开始 创建用户 * 设置 开始 创建用户
      * @param createUserIdStart * @param createUserIdStart
      */ */
      public void setCreateUserIdStart(Long createUserIdStart){ public void setCreateUserIdStart(Long createUserIdStart){
      this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
      } }
      /** /**
      * 获取 结束 创建用户 * 获取 结束 创建用户
      * @return $createUserIdEnd * @return $createUserIdEnd
      */ */
      public Long getCreateUserIdEnd(){ public Long getCreateUserIdEnd(){
      return this.createUserIdEnd; return this.createUserIdEnd;
      } }
      /** /**
      * 设置 结束 创建用户 * 设置 结束 创建用户
      * @param createUserIdEnd * @param createUserIdEnd
      */ */
      public void setCreateUserIdEnd(Long createUserIdEnd){ public void setCreateUserIdEnd(Long createUserIdEnd){
      this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
      } }
      /** /**
      * 获取 增加 创建用户 * 获取 增加 创建用户
      * @return createUserIdIncrement * @return createUserIdIncrement
      */ */
      public Long getCreateUserIdIncrement(){ public Long getCreateUserIdIncrement(){
      return this.createUserIdIncrement; return this.createUserIdIncrement;
      } }
      /** /**
      * 设置 增加 创建用户 * 设置 增加 创建用户
      * @param createUserIdIncrement * @param createUserIdIncrement
      */ */
      public void setCreateUserIdIncrement(Long createUserIdIncrement){ public void setCreateUserIdIncrement(Long createUserIdIncrement){
      this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
      } }
      /** /**
      * 获取 创建用户 * 获取 创建用户
      * @return createUserIdList * @return createUserIdList
      */ */
      public List<Long> getCreateUserIdList(){ public List<Long> getCreateUserIdList(){
      return this.createUserIdList; return this.createUserIdList;
      } }
      /** /**
      * 设置 创建用户 * 设置 创建用户
      * @param createUserIdList * @param createUserIdList
      */ */
      public void setCreateUserIdList(List<Long> createUserIdList){ public void setCreateUserIdList(List<Long> createUserIdList){
      this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
      } }
      /** /**
      * 获取 开始 修改时间 * 获取 开始 修改时间
      * @return updateTimeStart * @return updateTimeStart
      */ */
      public String getUpdateTimeStart(){ public String getUpdateTimeStart(){
      return this.updateTimeStart; return this.updateTimeStart;
      } }
      /** /**
      * 设置 开始 修改时间 * 设置 开始 修改时间
      * @param updateTimeStart * @param updateTimeStart
      */ */
      public void setUpdateTimeStart(String updateTimeStart){ public void setUpdateTimeStart(String updateTimeStart){
      this.updateTimeStart = updateTimeStart; this.updateTimeStart = updateTimeStart;
      } }
      /** /**
      * 获取 结束 修改时间 * 获取 结束 修改时间
      * @return updateTimeEnd * @return updateTimeEnd
      */ */
      public String getUpdateTimeEnd(){ public String getUpdateTimeEnd(){
      return this.updateTimeEnd; return this.updateTimeEnd;
      } }
      /** /**
      * 设置 结束 修改时间 * 设置 结束 修改时间
      * @param updateTimeEnd * @param updateTimeEnd
      */ */
      public void setUpdateTimeEnd(String updateTimeEnd){ public void setUpdateTimeEnd(String updateTimeEnd){
      this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
      } }
      /** /**
      * 设置 主键，自增长 * 设置 主键，自增长
      * @param id * @param id
      */ */
      public MortalsFillMatterDatumPrintQuery id(Long id){ public MatterDatumPrintQuery id(Long id){
      setId(id); setId(id);
      return this; return this;
      } }
      /** /**
      * 设置 开始 主键，自增长 * 设置 开始 主键，自增长
      * @param idStart * @param idStart
      */ */
      public MortalsFillMatterDatumPrintQuery idStart(Long idStart){ public MatterDatumPrintQuery idStart(Long idStart){
      this.idStart = idStart; this.idStart = idStart;
      return this; return this;
      } }
      /** /**
      * 设置 结束 主键，自增长 * 设置 结束 主键，自增长
      * @param idEnd * @param idEnd
      */ */
      public MortalsFillMatterDatumPrintQuery idEnd(Long idEnd){ public MatterDatumPrintQuery idEnd(Long idEnd){
      this.idEnd = idEnd; this.idEnd = idEnd;
      return this; return this;
      } }
      /** /**
      * 设置 增加 主键，自增长 * 设置 增加 主键，自增长
      * @param idIncrement * @param idIncrement
      */ */
      public MortalsFillMatterDatumPrintQuery idIncrement(Long idIncrement){ public MatterDatumPrintQuery idIncrement(Long idIncrement){
      this.idIncrement = idIncrement; this.idIncrement = idIncrement;
      return this; return this;
      } }
      /** /**
      * 设置 主键，自增长 * 设置 主键，自增长
      * @param idList * @param idList
      */ */
      public MortalsFillMatterDatumPrintQuery idList(List<Long> idList){ public MatterDatumPrintQuery idList(List<Long> idList){
      this.idList = idList; this.idList = idList;
      return this; return this;
      } }
      /**
      * 设置 站点id
      * @param siteId
      */
      public MatterDatumPrintQuery siteId(Long siteId){
      setSiteId(siteId);
      return this;
      }
      /**
      * 设置 开始 站点id
      * @param siteIdStart
      */
      public MatterDatumPrintQuery siteIdStart(Long siteIdStart){
      this.siteIdStart = siteIdStart;
      return this;
      }
      /** /**
      * 设置 打印订单 * 设置 结束 站点id
      * @param orderId * @param siteIdEnd
      */ */
      public MortalsFillMatterDatumPrintQuery orderId(String orderId){ public MatterDatumPrintQuery siteIdEnd(Long siteIdEnd){
      this.siteIdEnd = siteIdEnd;
      return this;
      }
      /**
      * 设置 增加 站点id
      * @param siteIdIncrement
      */
      public MatterDatumPrintQuery siteIdIncrement(Long siteIdIncrement){
      this.siteIdIncrement = siteIdIncrement;
      return this;
      }
      /**
      * 设置 站点id
      * @param siteIdList
      */
      public MatterDatumPrintQuery siteIdList(List<Long> siteIdList){
      this.siteIdList = siteIdList;
      return this;
      }
      /**
      * 设置 打印订单
      * @param orderId
      */
      public MatterDatumPrintQuery orderId(String orderId){
      setOrderId(orderId); setOrderId(orderId);
      return this; return this;
      } }
      /** /**
      * 设置 打印订单 * 设置 打印订单
      * @param orderIdList * @param orderIdList
      */ */
      public MortalsFillMatterDatumPrintQuery orderIdList(List<String> orderIdList){ public MatterDatumPrintQuery orderIdList(List<String> orderIdList){
      this.orderIdList = orderIdList; this.orderIdList = orderIdList;
      return this; return this;
      } }
      /** /**
      * 设置 材料Id * 设置 材料Id
      * @param materialId * @param materialId
      */ */
      public MortalsFillMatterDatumPrintQuery materialId(Long materialId){ public MatterDatumPrintQuery materialId(Long materialId){
      setMaterialId(materialId); setMaterialId(materialId);
      return this; return this;
      } }
      /** /**
      * 设置 开始 材料Id * 设置 开始 材料Id
      * @param materialIdStart * @param materialIdStart
      */ */
      public MortalsFillMatterDatumPrintQuery materialIdStart(Long materialIdStart){ public MatterDatumPrintQuery materialIdStart(Long materialIdStart){
      this.materialIdStart = materialIdStart; this.materialIdStart = materialIdStart;
      return this; return this;
      } }
      /** /**
      * 设置 结束 材料Id * 设置 结束 材料Id
      * @param materialIdEnd * @param materialIdEnd
      */ */
      public MortalsFillMatterDatumPrintQuery materialIdEnd(Long materialIdEnd){ public MatterDatumPrintQuery materialIdEnd(Long materialIdEnd){
      this.materialIdEnd = materialIdEnd; this.materialIdEnd = materialIdEnd;
      return this; return this;
      } }
      /** /**
      * 设置 增加 材料Id * 设置 增加 材料Id
      * @param materialIdIncrement * @param materialIdIncrement
      */ */
      public MortalsFillMatterDatumPrintQuery materialIdIncrement(Long materialIdIncrement){ public MatterDatumPrintQuery materialIdIncrement(Long materialIdIncrement){
      this.materialIdIncrement = materialIdIncrement; this.materialIdIncrement = materialIdIncrement;
      return this; return this;
      } }
      /** /**
      * 设置 材料Id * 设置 材料Id
      * @param materialIdList * @param materialIdList
      */ */
      public MortalsFillMatterDatumPrintQuery materialIdList(List<Long> materialIdList){ public MatterDatumPrintQuery materialIdList(List<Long> materialIdList){
      this.materialIdList = materialIdList; this.materialIdList = materialIdList;
      return this; return this;
      } }
      /** /**
      * 设置 材料名 * 设置 材料名
      * @param materialName * @param materialName
      */ */
      public MortalsFillMatterDatumPrintQuery materialName(String materialName){ public MatterDatumPrintQuery materialName(String materialName){
      setMaterialName(materialName); setMaterialName(materialName);
      return this; return this;
      } }
      /** /**
      * 设置 材料名 * 设置 材料名
      * @param materialNameList * @param materialNameList
      */ */
      public MortalsFillMatterDatumPrintQuery materialNameList(List<String> materialNameList){ public MatterDatumPrintQuery materialNameList(List<String> materialNameList){
      this.materialNameList = materialNameList; this.materialNameList = materialNameList;
      return this; return this;
      } }
      /** /**
      * 设置 材料页数 * 设置 材料页数
      * @param page * @param page
      */ */
      public MortalsFillMatterDatumPrintQuery page(Integer page){ public MatterDatumPrintQuery page(Integer page){
      setPage(page); setPage(page);
      return this; return this;
      } }
      /** /**
      * 设置 开始 材料页数 * 设置 开始 材料页数
      * @param pageStart * @param pageStart
      */ */
      public MortalsFillMatterDatumPrintQuery pageStart(Integer pageStart){ public MatterDatumPrintQuery pageStart(Integer pageStart){
      this.pageStart = pageStart; this.pageStart = pageStart;
      return this; return this;
      } }
      /** /**
      * 设置 结束 材料页数 * 设置 结束 材料页数
      * @param pageEnd * @param pageEnd
      */ */
      public MortalsFillMatterDatumPrintQuery pageEnd(Integer pageEnd){ public MatterDatumPrintQuery pageEnd(Integer pageEnd){
      this.pageEnd = pageEnd; this.pageEnd = pageEnd;
      return this; return this;
      } }
      /** /**
      * 设置 增加 材料页数 * 设置 增加 材料页数
      * @param pageIncrement * @param pageIncrement
      */ */
      public MortalsFillMatterDatumPrintQuery pageIncrement(Integer pageIncrement){ public MatterDatumPrintQuery pageIncrement(Integer pageIncrement){
      this.pageIncrement = pageIncrement; this.pageIncrement = pageIncrement;
      return this; return this;
      } }
      /** /**
      * 设置 材料页数 * 设置 材料页数
      * @param pageList * @param pageList
      */ */
      public MortalsFillMatterDatumPrintQuery pageList(List<Integer> pageList){ public MatterDatumPrintQuery pageList(List<Integer> pageList){
      this.pageList = pageList; this.pageList = pageList;
      return this; return this;
      } }
      /** /**
      * 设置 打印类型(1.本地打印,2.在线打印) * 设置 打印类型(1.本地打印,2.在线打印)
      * @param type * @param type
      */ */
      public MortalsFillMatterDatumPrintQuery type(Integer type){ public MatterDatumPrintQuery type(Integer type){
      setType(type); setType(type);
      return this; return this;
      } }
      /** /**
      * 设置 开始 打印类型(1.本地打印,2.在线打印) * 设置 开始 打印类型(1.本地打印,2.在线打印)
      * @param typeStart * @param typeStart
      */ */
      public MortalsFillMatterDatumPrintQuery typeStart(Integer typeStart){ public MatterDatumPrintQuery typeStart(Integer typeStart){
      this.typeStart = typeStart; this.typeStart = typeStart;
      return this; return this;
      } }
      /** /**
      * 设置 结束 打印类型(1.本地打印,2.在线打印) * 设置 结束 打印类型(1.本地打印,2.在线打印)
      * @param typeEnd * @param typeEnd
      */ */
      public MortalsFillMatterDatumPrintQuery typeEnd(Integer typeEnd){ public MatterDatumPrintQuery typeEnd(Integer typeEnd){
      this.typeEnd = typeEnd; this.typeEnd = typeEnd;
      return this; return this;
      } }
      /** /**
      * 设置 增加 打印类型(1.本地打印,2.在线打印) * 设置 增加 打印类型(1.本地打印,2.在线打印)
      * @param typeIncrement * @param typeIncrement
      */ */
      public MortalsFillMatterDatumPrintQuery typeIncrement(Integer typeIncrement){ public MatterDatumPrintQuery typeIncrement(Integer typeIncrement){
      this.typeIncrement = typeIncrement; this.typeIncrement = typeIncrement;
      return this; return this;
      } }
      /** /**
      * 设置 打印类型(1.本地打印,2.在线打印) * 设置 打印类型(1.本地打印,2.在线打印)
      * @param typeList * @param typeList
      */ */
      public MortalsFillMatterDatumPrintQuery typeList(List<Integer> typeList){ public MatterDatumPrintQuery typeList(List<Integer> typeList){
      this.typeList = typeList; this.typeList = typeList;
      return this; return this;
      } }
      /** /**
      * 设置 合成doc后地址 * 设置 合成doc后地址
      * @param docPath * @param docPath
      */ */
      public MortalsFillMatterDatumPrintQuery docPath(String docPath){ public MatterDatumPrintQuery docPath(String docPath){
      setDocPath(docPath); setDocPath(docPath);
      return this; return this;
      } }
      /** /**
      * 设置 合成doc后地址 * 设置 合成doc后地址
      * @param docPathList * @param docPathList
      */ */
      public MortalsFillMatterDatumPrintQuery docPathList(List<String> docPathList){ public MatterDatumPrintQuery docPathList(List<String> docPathList){
      this.docPathList = docPathList; this.docPathList = docPathList;
      return this; return this;
      } }
      /** /**
      * 设置 提交的表单 * 设置 提交的表单
      * @param formContent * @param formContent
      */ */
      public MortalsFillMatterDatumPrintQuery formContent(String formContent){ public MatterDatumPrintQuery formContent(String formContent){
      setFormContent(formContent); setFormContent(formContent);
      return this; return this;
      } }
      /** /**
      * 设置 提交的表单 * 设置 提交的表单
      * @param formContentList * @param formContentList
      */ */
      public MortalsFillMatterDatumPrintQuery formContentList(List<String> formContentList){ public MatterDatumPrintQuery formContentList(List<String> formContentList){
      this.formContentList = formContentList; this.formContentList = formContentList;
      return this; return this;
      } }
      /** /**
      * 设置 创建用户 * 设置 创建用户
      * @param createUserId * @param createUserId
      */ */
      public MortalsFillMatterDatumPrintQuery createUserId(Long createUserId){ public MatterDatumPrintQuery createUserId(Long createUserId){
      setCreateUserId(createUserId); setCreateUserId(createUserId);
      return this; return this;
      } }
      /** /**
      * 设置 开始 创建用户 * 设置 开始 创建用户
      * @param createUserIdStart * @param createUserIdStart
      */ */
      public MortalsFillMatterDatumPrintQuery createUserIdStart(Long createUserIdStart){ public MatterDatumPrintQuery createUserIdStart(Long createUserIdStart){
      this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
      return this; return this;
      } }
      /** /**
      * 设置 结束 创建用户 * 设置 结束 创建用户
      * @param createUserIdEnd * @param createUserIdEnd
      */ */
      public MortalsFillMatterDatumPrintQuery createUserIdEnd(Long createUserIdEnd){ public MatterDatumPrintQuery createUserIdEnd(Long createUserIdEnd){
      this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
      return this; return this;
      } }
      /** /**
      * 设置 增加 创建用户 * 设置 增加 创建用户
      * @param createUserIdIncrement * @param createUserIdIncrement
      */ */
      public MortalsFillMatterDatumPrintQuery createUserIdIncrement(Long createUserIdIncrement){ public MatterDatumPrintQuery createUserIdIncrement(Long createUserIdIncrement){
      this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
      return this; return this;
      } }
      /** /**
      * 设置 创建用户 * 设置 创建用户
      * @param createUserIdList * @param createUserIdList
      */ */
      public MortalsFillMatterDatumPrintQuery createUserIdList(List<Long> createUserIdList){ public MatterDatumPrintQuery createUserIdList(List<Long> createUserIdList){
      this.createUserIdList = 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) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList * @return orConditionList
      */ */
      public List<MortalsFillMatterDatumPrintQuery> getOrConditionList(){ public List<MatterDatumPrintQuery> 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) * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @param orConditionList * @param orConditionList
      */ */
      public void setOrConditionList(List<MortalsFillMatterDatumPrintQuery> orConditionList){ public void setOrConditionList(List<MatterDatumPrintQuery> orConditionList){
      this.orConditionList = orConditionList; this.orConditionList = orConditionList;
      } }
      /** /**
      * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
      * @return andConditionList * @return andConditionList
      */ */
      public List<MortalsFillMatterDatumPrintQuery> getAndConditionList(){ public List<MatterDatumPrintQuery> getAndConditionList(){
      return this.andConditionList; return this.andConditionList;
      } }
      /** /**
      * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
      * @param andConditionList * @param andConditionList
      */ */
      public void setAndConditionList(List<MortalsFillMatterDatumPrintQuery> andConditionList){ public void setAndConditionList(List<MatterDatumPrintQuery> andConditionList){
      this.andConditionList = andConditionList; this.andConditionList = andConditionList;
      } }
      ......
      fill-manager/src/main/java/com/mortals/xhx/module/mortals/model/vo/MortalsFillMatterDatumPrintVo.java → fill-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterDatumPrintVo.java
      View file @ 00396d9f
      package com.mortals.xhx.module.mortals.model.vo; package com.mortals.xhx.module.matter.model.vo;
      import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
      import com.mortals.xhx.module.mortals.model.MortalsFillMatterDatumPrintEntity; import com.mortals.xhx.module.matter.model.MatterDatumPrintEntity;
      import java.util.ArrayList; import java.util.ArrayList;
      import java.util.List; import java.util.List;
      /** /**
      * 打印提交视图对象 * 打印提交视图对象
      * *
      * @author zxfei * @author zxfei
      * @date 2022-12-07 * @date 2022-12-09
      */ */
      public class MortalsFillMatterDatumPrintVo extends BaseEntityLong { public class MatterDatumPrintVo extends BaseEntityLong {
      } }
      \ No newline at end of file
      fill-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterDatumPrintService.java 0 → 100644
      View file @ 00396d9f
      package com.mortals.xhx.module.matter.service;
      import com.mortals.framework.service.ICRUDService;
      import com.mortals.xhx.module.matter.model.MatterDatumPrintEntity;
      /**
      * MatterDatumPrintService
      *
      * 打印提交 service接口
      *
      * @author zxfei
      * @date 2022-12-09
      */
      public interface MatterDatumPrintService extends ICRUDService<MatterDatumPrintEntity,Long>{
      }
      \ No newline at end of file
      fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumPrintServiceImpl.java 0 → 100644
      View file @ 00396d9f
      package com.mortals.xhx.module.matter.service.impl;
      import com.mortals.xhx.common.utils.WordUtil;
      import com.mortals.xhx.module.matter.model.MatterDatumEntity;
      import com.mortals.xhx.module.matter.service.MatterDatumService;
      import org.springframework.beans.factory.annotation.Autowired;
      import org.springframework.stereotype.Service;
      import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
      import com.mortals.framework.exception.AppException;
      import com.mortals.framework.model.Context;
      import com.mortals.xhx.module.matter.dao.MatterDatumPrintDao;
      import com.mortals.xhx.module.matter.model.MatterDatumPrintEntity;
      import com.mortals.xhx.module.matter.service.MatterDatumPrintService;
      /**
      * MatterDatumPrintService
      * 打印提交 service实现
      *
      * @author zxfei
      * @date 2022-12-09
      */
      @Service("matterDatumPrintService")
      public class MatterDatumPrintServiceImpl extends AbstractCRUDServiceImpl<MatterDatumPrintDao, MatterDatumPrintEntity, Long> implements MatterDatumPrintService {
      @Override
      protected void saveBefore(MatterDatumPrintEntity entity, Context context) throws AppException {
      // MatterDatumEntity matterDatumEntity = matterDatumService.get(entity.getMaterialId());
      Integer pageByDoc = WordUtil.getPageByDoc(entity.getDocPath());
      entity.setPage(pageByDoc);
      super.saveBefore(entity, context);
      }
      }
      \ No newline at end of file
      fill-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java
      View file @ 00396d9f
      ...@@ -99,8 +99,8 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat ...@@ -99,8 +99,8 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
      } }
      List<OrderCol> orderColList = new ArrayList<>(); List<OrderCol> orderColList = new ArrayList<>();
      orderColList.add(new OrderCol("createTime", OrderCol.DESCENDING));
      orderColList.add(new OrderCol("isRecommend", OrderCol.DESCENDING)); orderColList.add(new OrderCol("isRecommend", OrderCol.DESCENDING));
      orderColList.add(new OrderCol("createTime", OrderCol.DESCENDING));
      query.setOrderColList(orderColList); query.setOrderColList(orderColList);
      super.doListBefore(query, model, context); super.doListBefore(query, model, context);
      } }
      ...@@ -192,4 +192,8 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat ...@@ -192,4 +192,8 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
      ret.setMsg(model.get(MESSAGE_INFO) == null ? "" : model.remove(MESSAGE_INFO).toString()); ret.setMsg(model.get(MESSAGE_INFO) == null ? "" : model.remove(MESSAGE_INFO).toString());
      return ret; return ret;
      } }
      } }
      \ No newline at end of file
      fill-manager/src/main/java/com/mortals/xhx/module/mortals/web/MortalsFillMatterDatumPrintController.java → fill-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumPrintController.java
      View file @ 00396d9f
      package com.mortals.xhx.module.mortals.web; package com.mortals.xhx.module.matter.web;
      import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
      import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
      import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
      ...@@ -9,8 +9,8 @@ import com.mortals.framework.model.Context; ...@@ -9,8 +9,8 @@ import com.mortals.framework.model.Context;
      import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
      import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
      import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
      import com.mortals.xhx.module.mortals.model.MortalsFillMatterDatumPrintEntity; import com.mortals.xhx.module.matter.model.MatterDatumPrintEntity;
      import com.mortals.xhx.module.mortals.service.MortalsFillMatterDatumPrintService; import com.mortals.xhx.module.matter.service.MatterDatumPrintService;
      import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
      import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
      import java.util.HashMap; import java.util.HashMap;
      ...@@ -27,22 +27,22 @@ import static com.mortals.framework.ap.SysConstains.*; ...@@ -27,22 +27,22 @@ import static com.mortals.framework.ap.SysConstains.*;
      * 打印提交 * 打印提交
      * *
      * @author zxfei * @author zxfei
      * @date 2022-12-07 * @date 2022-12-09
      */ */
      @RestController @RestController
      @RequestMapping("mortals/fill/matter/datum/print") @RequestMapping("matter/datum/print")
      public class MortalsFillMatterDatumPrintController extends BaseCRUDJsonBodyMappingController<MortalsFillMatterDatumPrintService,MortalsFillMatterDatumPrintEntity,Long> { public class MatterDatumPrintController extends BaseCRUDJsonBodyMappingController<MatterDatumPrintService,MatterDatumPrintEntity,Long> {
      @Autowired @Autowired
      private ParamService paramService; private ParamService paramService;
      public MortalsFillMatterDatumPrintController(){ public MatterDatumPrintController(){
      super.setModuleDesc( "打印提交"); super.setModuleDesc( "打印提交");
      } }
      @Override @Override
      protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
      this.addDict(model, "type", paramService.getParamBySecondOrganize("MortalsFillMatterDatumPrint","type")); this.addDict(model, "type", paramService.getParamBySecondOrganize("MatterDatumPrint","type"));
      super.init(model, context); super.init(model, context);
      } }
      ......
      fill-manager/src/main/java/com/mortals/xhx/module/mortals/service/MortalsFillMatterDatumPrintService.java deleted 100644 → 0
      View file @ 2bcf9922
      package com.mortals.xhx.module.mortals.service;
      import com.mortals.framework.service.ICRUDService;
      import com.mortals.xhx.module.mortals.model.MortalsFillMatterDatumPrintEntity;
      /**
      * MortalsFillMatterDatumPrintService
      *
      * 打印提交 service接口
      *
      * @author zxfei
      * @date 2022-12-07
      */
      public interface MortalsFillMatterDatumPrintService extends ICRUDService<MortalsFillMatterDatumPrintEntity,Long>{
      }
      \ No newline at end of file
      fill-manager/src/main/java/com/mortals/xhx/module/mortals/service/impl/MortalsFillMatterDatumPrintServiceImpl.java deleted 100644 → 0
      View file @ 2bcf9922
      package com.mortals.xhx.module.mortals.service.impl;
      import org.springframework.stereotype.Service;
      import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
      import com.mortals.framework.exception.AppException;
      import com.mortals.framework.model.Context;
      import com.mortals.xhx.module.mortals.dao.MortalsFillMatterDatumPrintDao;
      import com.mortals.xhx.module.mortals.model.MortalsFillMatterDatumPrintEntity;
      import com.mortals.xhx.module.mortals.service.MortalsFillMatterDatumPrintService;
      /**
      * MortalsFillMatterDatumPrintService
      * 打印提交 service实现
      *
      * @author zxfei
      * @date 2022-12-07
      */
      @Service("mortalsFillMatterDatumPrintService")
      public class MortalsFillMatterDatumPrintServiceImpl extends AbstractCRUDServiceImpl<MortalsFillMatterDatumPrintDao, MortalsFillMatterDatumPrintEntity, Long> implements MortalsFillMatterDatumPrintService {
      }
      \ No newline at end of file
      fill-manager/src/main/resources/sqlmap/module/matter/MatterDatumPrintMapper.xml 0 → 100644
      View file @ 00396d9f
      <?xml version="1.0" encoding="UTF-8"?>
      <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
      "mybatis-3-mapper.dtd">
      <mapper namespace="com.mortals.xhx.module.matter.dao.ibatis.MatterDatumPrintDaoImpl">
      <!-- 字段和属性映射 -->
      <resultMap type="MatterDatumPrintEntity" id="MatterDatumPrintEntity-Map">
      <id property="id" column="id" />
      <result property="siteId" column="siteId" />
      <result property="orderId" column="orderId" />
      <result property="materialId" column="materialId" />
      <result property="materialName" column="materialName" />
      <result property="page" column="page" />
      <result property="type" column="type" />
      <result property="docPath" column="docPath" />
      <result property="formContent" column="formContent" />
      <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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
      a.siteId,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('orderId') or colPickMode == 1 and data.containsKey('orderId')))">
      a.orderId,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('materialId') or colPickMode == 1 and data.containsKey('materialId')))">
      a.materialId,
      </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('page') or colPickMode == 1 and data.containsKey('page')))">
      a.page,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('type') or colPickMode == 1 and data.containsKey('type')))">
      a.type,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('docPath') or colPickMode == 1 and data.containsKey('docPath')))">
      a.docPath,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('formContent') or colPickMode == 1 and data.containsKey('formContent')))">
      a.formContent,
      </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="MatterDatumPrintEntity" useGeneratedKeys="true" keyProperty="id">
      insert into mortals_xhx_matter_datum_print
      (siteId,orderId,materialId,materialName,page,type,docPath,formContent,createTime,createUserId,updateTime)
      VALUES
      (#{siteId},#{orderId},#{materialId},#{materialName},#{page},#{type},#{docPath},#{formContent},#{createTime},#{createUserId},#{updateTime})
      </insert>
      <!-- 批量新增 -->
      <insert id="insertBatch" parameterType="paramDto">
      insert into mortals_xhx_matter_datum_print
      (siteId,orderId,materialId,materialName,page,type,docPath,formContent,createTime,createUserId,updateTime)
      VALUES
      <foreach collection="data.dataList" item="item" index="index" separator="," >
      (#{item.siteId},#{item.orderId},#{item.materialId},#{item.materialName},#{item.page},#{item.type},#{item.docPath},#{item.formContent},#{item.createTime},#{item.createUserId},#{item.updateTime})
      </foreach>
      </insert>
      <!-- 根据ParamDto更新 -->
      <update id="update" parameterType="paramDto">
      update mortals_xhx_matter_datum_print as a
      set
      <trim suffixOverrides="," suffix="">
      <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
      a.siteId=#{data.siteId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
      a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('orderId')) or (colPickMode==1 and !data.containsKey('orderId'))">
      a.orderId=#{data.orderId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('materialId')) or (colPickMode==1 and !data.containsKey('materialId'))">
      a.materialId=#{data.materialId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('materialIdIncrement')) or (colPickMode==1 and !data.containsKey('materialIdIncrement'))">
      a.materialId=ifnull(a.materialId,0) + #{data.materialIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('materialName')) or (colPickMode==1 and !data.containsKey('materialName'))">
      a.materialName=#{data.materialName},
      </if>
      <if test="(colPickMode==0 and data.containsKey('page')) or (colPickMode==1 and !data.containsKey('page'))">
      a.page=#{data.page},
      </if>
      <if test="(colPickMode==0 and data.containsKey('pageIncrement')) or (colPickMode==1 and !data.containsKey('pageIncrement'))">
      a.page=ifnull(a.page,0) + #{data.pageIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('type')) or (colPickMode==1 and !data.containsKey('type'))">
      a.type=#{data.type},
      </if>
      <if test="(colPickMode==0 and data.containsKey('typeIncrement')) or (colPickMode==1 and !data.containsKey('typeIncrement'))">
      a.type=ifnull(a.type,0) + #{data.typeIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('docPath')) or (colPickMode==1 and !data.containsKey('docPath'))">
      a.docPath=#{data.docPath},
      </if>
      <if test="(colPickMode==0 and data.containsKey('formContent')) or (colPickMode==1 and !data.containsKey('formContent'))">
      a.formContent=#{data.formContent},
      </if>
      <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
      a.createTime=#{data.createTime},
      </if>
      <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
      a.createUserId=#{data.createUserId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
      a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
      a.updateTime=#{data.updateTime},
      </if>
      </trim>
      <trim suffixOverrides="where" suffix="">
      where
      <trim prefixOverrides="and" prefix="">
      <include refid="_condition_"/>
      </trim>
      </trim>
      </update>
      <!-- 批量更新 -->
      <update id="updateBatch" parameterType="paramDto">
      update mortals_xhx_matter_datum_print as a
      <trim prefix="set" suffixOverrides=",">
      <trim prefix="siteId=(case" suffix="ELSE siteId end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
      when a.id=#{item.id} then #{item.siteId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="orderId=(case" suffix="ELSE orderId end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('orderId')) or (colPickMode==1 and !item.containsKey('orderId'))">
      when a.id=#{item.id} then #{item.orderId}
      </if>
      </foreach>
      </trim>
      <trim prefix="materialId=(case" suffix="ELSE materialId end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('materialId')) or (colPickMode==1 and !item.containsKey('materialId'))">
      when a.id=#{item.id} then #{item.materialId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('materialIdIncrement')) or (colPickMode==1 and !item.containsKey('materialIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.materialId,0) + #{item.materialIdIncrement}
      </when>
      </choose>
      </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="page=(case" suffix="ELSE page end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('page')) or (colPickMode==1 and !item.containsKey('page'))">
      when a.id=#{item.id} then #{item.page}
      </when>
      <when test="(colPickMode==0 and item.containsKey('pageIncrement')) or (colPickMode==1 and !item.containsKey('pageIncrement'))">
      when a.id=#{item.id} then ifnull(a.page,0) + #{item.pageIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="type=(case" suffix="ELSE type end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('type')) or (colPickMode==1 and !item.containsKey('type'))">
      when a.id=#{item.id} then #{item.type}
      </when>
      <when test="(colPickMode==0 and item.containsKey('typeIncrement')) or (colPickMode==1 and !item.containsKey('typeIncrement'))">
      when a.id=#{item.id} then ifnull(a.type,0) + #{item.typeIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="docPath=(case" suffix="ELSE docPath end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('docPath')) or (colPickMode==1 and !item.containsKey('docPath'))">
      when a.id=#{item.id} then #{item.docPath}
      </if>
      </foreach>
      </trim>
      <trim prefix="formContent=(case" suffix="ELSE formContent end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('formContent')) or (colPickMode==1 and !item.containsKey('formContent'))">
      when a.id=#{item.id} then #{item.formContent}
      </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=")">
      #{item.id}
      </foreach>
      </update>
      <!-- 根据主健查询 -->
      <select id="getByKey" parameterType="paramDto" resultMap="MatterDatumPrintEntity-Map">
      select <include refid="_columns"/>
      from mortals_xhx_matter_datum_print as a
      where a.id=#{condition.id}
      </select>
      <!-- 根据主健删除 -->
      <delete id="deleteByKey" parameterType="paramDto">
      delete a.* from mortals_xhx_matter_datum_print as a where a.id=#{condition.id}
      </delete>
      <!-- 根据主健删除一批，针对单一主健有效 -->
      <delete id="deleteByKeys">
      delete from mortals_xhx_matter_datum_print where id in
      <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
      #{item}
      </foreach>
      </delete>
      <!-- 根据主健列表删除一批，针对单一主健有效 -->
      <delete id="deleteByKeyList">
      delete from mortals_xhx_matter_datum_print where id in
      <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
      #{item}
      </foreach>
      </delete>
      <!-- 根据对象列表删除一批，针对单一主健有效 -->
      <delete id="deleteByEntityList">
      delete from mortals_xhx_matter_datum_print where id in
      <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
      #{item.id}
      </foreach>
      </delete>
      <!-- 根据paramDto删除一批 -->
      <delete id="deleteByMap" parameterType="paramDto">
      delete a.* from mortals_xhx_matter_datum_print as a
      <trim suffixOverrides="where" suffix="">
      where
      <trim prefixOverrides="and" prefix="">
      <include refid="_condition_"/>
      </trim>
      </trim>
      </delete>
      <!-- 获取列表 -->
      <select id="getList" parameterType="paramDto" resultMap="MatterDatumPrintEntity-Map">
      select <include refid="_columns"/>
      from mortals_xhx_matter_datum_print as a
      <trim suffixOverrides="where" suffix="">
      where
      <trim prefixOverrides="and" prefix="">
      <include refid="_condition_"/>
      </trim>
      </trim>
      <include refid="_orderCols_"/>
      </select>
      <!-- 获取 -->
      <select id="getListCount" parameterType="paramDto" resultType="int">
      select count(1)
      from mortals_xhx_matter_datum_print as a
      <trim suffixOverrides="where" suffix="">
      where
      <trim prefixOverrides="and" prefix="">
      <include refid="_condition_"/>
      </trim>
      </trim>
      </select>
      <!-- 条件映射 -->
      <sql id="_condition_">
      <if test="condition != null and !condition.isEmpty()">
      <!-- 条件映射-普通条件 -->
      <include refid="_condition_param_">
      <property name="_conditionParam_" value="condition"/>
      <property name="_conditionType_" value="and"/>
      </include>
      <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
      <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
      and
      <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
      <trim prefixOverrides="or" prefix="(" suffix=")">
      <include refid="_condition_param_">
      <property name="_conditionParam_" value="andCondition"/>
      <property name="_conditionType_" value="or"/>
      </include>
      </trim>
      </foreach>
      </if>
      <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
      <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
      and
      <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
      <trim prefixOverrides="and" prefix="(" suffix=")">
      <include refid="_condition_param_">
      <property name="_conditionParam_" value="orCondition"/>
      <property name="_conditionType_" value="and"/>
      </include>
      </trim>
      </foreach>
      </if>
      </if>
      </sql>
      <!-- 条件映射-代参数 -->
      <sql id="_condition_param_">
      <bind name="conditionParamRef" value="${_conditionParam_}"/>
      <if test="conditionParamRef.containsKey('id')">
      <if test="conditionParamRef.id != null">
      ${_conditionType_} a.id=#{${_conditionParam_}.id}
      </if>
      </if>
      <if test="conditionParamRef.containsKey('id')">
      <if test="conditionParamRef.id != null ">
      ${_conditionType_} a.id = #{${_conditionParam_}.id}
      </if>
      <if test="conditionParamRef.id == null">
      ${_conditionType_} a.id is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('idList')">
      ${_conditionType_} a.id in
      <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
      ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
      </if>
      <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
      ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
      </if>
      <if test="conditionParamRef.containsKey('siteId')">
      <if test="conditionParamRef.siteId != null ">
      ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
      </if>
      <if test="conditionParamRef.siteId == null">
      ${_conditionType_} a.siteId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('siteIdList')">
      ${_conditionType_} a.siteId in
      <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
      ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
      </if>
      <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
      ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('orderId')">
      <if test="conditionParamRef.orderId != null and conditionParamRef.orderId != ''">
      ${_conditionType_} a.orderId like #{${_conditionParam_}.orderId}
      </if>
      <if test="conditionParamRef.orderId == null">
      ${_conditionType_} a.orderId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('orderIdList')">
      ${_conditionType_} a.orderId in
      <foreach collection="conditionParamRef.orderIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('materialId')">
      <if test="conditionParamRef.materialId != null ">
      ${_conditionType_} a.materialId = #{${_conditionParam_}.materialId}
      </if>
      <if test="conditionParamRef.materialId == null">
      ${_conditionType_} a.materialId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('materialIdList')">
      ${_conditionType_} a.materialId in
      <foreach collection="conditionParamRef.materialIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('materialIdStart') and conditionParamRef.materialIdStart != null">
      ${_conditionType_} a.materialId <![CDATA[ >= ]]> #{${_conditionParam_}.materialIdStart}
      </if>
      <if test="conditionParamRef.containsKey('materialIdEnd') and conditionParamRef.materialIdEnd != null">
      ${_conditionType_} a.materialId <![CDATA[ <= ]]> #{${_conditionParam_}.materialIdEnd}
      </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>
      <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('page')">
      <if test="conditionParamRef.page != null ">
      ${_conditionType_} a.page = #{${_conditionParam_}.page}
      </if>
      <if test="conditionParamRef.page == null">
      ${_conditionType_} a.page is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('pageList')">
      ${_conditionType_} a.page in
      <foreach collection="conditionParamRef.pageList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('pageStart') and conditionParamRef.pageStart != null">
      ${_conditionType_} a.page <![CDATA[ >= ]]> #{${_conditionParam_}.pageStart}
      </if>
      <if test="conditionParamRef.containsKey('pageEnd') and conditionParamRef.pageEnd != null">
      ${_conditionType_} a.page <![CDATA[ <= ]]> #{${_conditionParam_}.pageEnd}
      </if>
      <if test="conditionParamRef.containsKey('type')">
      <if test="conditionParamRef.type != null ">
      ${_conditionType_} a.type = #{${_conditionParam_}.type}
      </if>
      <if test="conditionParamRef.type == null">
      ${_conditionType_} a.type is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('typeList')">
      ${_conditionType_} a.type in
      <foreach collection="conditionParamRef.typeList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('typeStart') and conditionParamRef.typeStart != null">
      ${_conditionType_} a.type <![CDATA[ >= ]]> #{${_conditionParam_}.typeStart}
      </if>
      <if test="conditionParamRef.containsKey('typeEnd') and conditionParamRef.typeEnd != null">
      ${_conditionType_} a.type <![CDATA[ <= ]]> #{${_conditionParam_}.typeEnd}
      </if>
      <if test="conditionParamRef.containsKey('docPath')">
      <if test="conditionParamRef.docPath != null and conditionParamRef.docPath != ''">
      ${_conditionType_} a.docPath like #{${_conditionParam_}.docPath}
      </if>
      <if test="conditionParamRef.docPath == null">
      ${_conditionType_} a.docPath is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('docPathList')">
      ${_conditionType_} a.docPath in
      <foreach collection="conditionParamRef.docPathList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('formContent')">
      <if test="conditionParamRef.formContent != null and conditionParamRef.formContent != ''">
      ${_conditionType_} a.formContent like #{${_conditionParam_}.formContent}
      </if>
      <if test="conditionParamRef.formContent == null">
      ${_conditionType_} a.formContent is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('formContentList')">
      ${_conditionType_} a.formContent in
      <foreach collection="conditionParamRef.formContentList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('createTime')">
      <if test="conditionParamRef.createTime != null ">
      ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
      </if>
      <if test="conditionParamRef.createTime == null">
      ${_conditionType_} a.createTime is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
      ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
      ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('createUserId')">
      <if test="conditionParamRef.createUserId != null ">
      ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
      </if>
      <if test="conditionParamRef.createUserId == null">
      ${_conditionType_} a.createUserId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('createUserIdList')">
      ${_conditionType_} a.createUserId in
      <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
      ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
      </if>
      <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
      ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('updateTime')">
      <if test="conditionParamRef.updateTime != null ">
      ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
      </if>
      <if test="conditionParamRef.updateTime == null">
      ${_conditionType_} a.updateTime is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
      ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
      ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      </sql>
      <sql id="_orderCols_">
      <if test="orderColList != null and !orderColList.isEmpty()">
      order by
      <trim suffixOverrides="," suffix="">
      <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
      ${item.colName} ${item.sortKind}
      </foreach>
      </trim>
      </if>
      <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
      order by
      <trim suffixOverrides="," suffix="">
      <if test="orderCol.containsKey('id')">
      a.id
      <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('siteId')">
      a.siteId
      <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('orderId')">
      a.orderId
      <if test='orderCol.orderId != null and "DESC".equalsIgnoreCase(orderCol.orderId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('materialId')">
      a.materialId
      <if test='orderCol.materialId != null and "DESC".equalsIgnoreCase(orderCol.materialId)'>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('page')">
      a.page
      <if test='orderCol.page != null and "DESC".equalsIgnoreCase(orderCol.page)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('type')">
      a.type
      <if test='orderCol.type != null and "DESC".equalsIgnoreCase(orderCol.type)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('docPath')">
      a.docPath
      <if test='orderCol.docPath != null and "DESC".equalsIgnoreCase(orderCol.docPath)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('formContent')">
      a.formContent
      <if test='orderCol.formContent != null and "DESC".equalsIgnoreCase(orderCol.formContent)'>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>
      <sql id="_group_by_">
      <if test="groupList != null and !groupList.isEmpty()">
      GROUP BY
      <trim suffixOverrides="," suffix="">
      <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
      ${item}
      </foreach>
      </trim>
      </if>
      </sql>
      </mapper>
      \ No newline at end of file
      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