diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/RespData.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/RespData.java
index 3509efeb17b170bbc6c8137f6738f5ff2676ed05..d2230ed79a7ce1756c348d9dba240b45396a7381 100644
--- a/common-lib/src/main/java/com/mortals/xhx/common/pdu/RespData.java
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/RespData.java
@@ -14,13 +14,5 @@ public class RespData<T> {
private T data;
private T entity;
private PageInfo pageInfo;
-
-
- public static void main(String[] args) {
-
- String resp="";
-
- //JSON.parseObject()
-
- }
+ private Object dict;
}
diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/dept/DeptPdu.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/dept/DeptPdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..e60e408f50bad88b6fb86ba8d7eb75f2c7a1416f
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/dept/DeptPdu.java
@@ -0,0 +1,2207 @@
+package com.mortals.xhx.common.pdu.dept;
+
+import com.mortals.framework.model.BaseEntityLong;
+
+import java.util.List;
+
+/**
+* 閮ㄩ棬Pdu瀵硅薄
+*
+* @author zxfei
+* @date 2022-12-09
+*/
+
+public class DeptPdu extends BaseEntityLong {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 浠庢斂鍔＄郴缁熸潵鐨勯儴闂╥d
+ */
+ private String tid;
+ /**
+ * 浠庢斂鍔＄郴缁熸潵鐨勯儴闂╪ame
+ */
+ 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;
+
+ /** 浠庢斂鍔＄郴缁熸潵鐨勯儴闂╥d */
+ private List<String> tidList;
+
+ /** 浠庢斂鍔＄郴缁熸潵鐨勯儴闂╪ame */
+ 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鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+ private List<DeptPdu> orConditionList;
+
+ /** AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+ private List<DeptPdu> andConditionList;
+
+ public DeptPdu(){}
+ /**
+ * 鑾峰彇 浠庢斂鍔＄郴缁熸潵鐨勯儴闂╥d
+ * @return String
+ */
+ public String getTid(){
+ return tid;
+ }
+ /**
+ * 璁剧疆 浠庢斂鍔＄郴缁熸潵鐨勯儴闂╥d
+ * @param tid
+ */
+ public void setTid(String tid){
+ this.tid = tid;
+ }
+ /**
+ * 鑾峰彇 浠庢斂鍔＄郴缁熸潵鐨勯儴闂╪ame
+ * @return String
+ */
+ public String getTname(){
+ return tname;
+ }
+ /**
+ * 璁剧疆 浠庢斂鍔＄郴缁熸潵鐨勯儴闂╪ame
+ * @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;
+ }
+
+ /**
+ * 鑾峰彇 浠庢斂鍔＄郴缁熸潵鐨勯儴闂╥d
+ * @return tidList
+ */
+ public List<String> getTidList(){
+ return this.tidList;
+ }
+
+ /**
+ * 璁剧疆 浠庢斂鍔＄郴缁熸潵鐨勯儴闂╥d
+ * @param tidList
+ */
+ public void setTidList(List<String> tidList){
+ this.tidList = tidList;
+ }
+ /**
+ * 鑾峰彇 浠庢斂鍔＄郴缁熸潵鐨勯儴闂╪ame
+ * @return tnameList
+ */
+ public List<String> getTnameList(){
+ return this.tnameList;
+ }
+
+ /**
+ * 璁剧疆 浠庢斂鍔＄郴缁熸潵鐨勯儴闂╪ame
+ * @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;
+ }
+
+
+ /**
+ * 璁剧疆 浠庢斂鍔＄郴缁熸潵鐨勯儴闂╥d
+ * @param tid
+ */
+ public DeptPdu tid(String tid){
+ setTid(tid);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 浠庢斂鍔＄郴缁熸潵鐨勯儴闂╥d
+ * @param tidList
+ */
+ public DeptPdu tidList(List<String> tidList){
+ this.tidList = tidList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 浠庢斂鍔＄郴缁熸潵鐨勯儴闂╪ame
+ * @param tname
+ */
+ public DeptPdu tname(String tname){
+ setTname(tname);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 浠庢斂鍔＄郴缁熸潵鐨勯儴闂╪ame
+ * @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鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(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鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(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鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(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鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(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
diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterAcceptPdu.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterAcceptPdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..5ec24726293929a4ab2d95d537ef0404f3eebe55
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterAcceptPdu.java
@@ -0,0 +1,118 @@
+package com.mortals.xhx.common.pdu.matter;
+
+import com.mortals.framework.model.BaseEntityLong;
+
+import java.util.List;
+
+public class MatterAcceptPdu extends BaseEntityLong {
+ /**
+ * 鍩虹浜嬮」琛╥d
+ */
+ private Long matterId;
+ /**
+ * 浜嬮」缂栫爜
+ */
+ private String matterCode;
+ /**
+ * 浜嬮」鍚嶇О
+ */
+ private String matterName;
+ /**
+ * 鍙楃悊鏉′欢
+ */
+ private String content;
+ /**
+ * 浜嬮」鏉ユ簮 (0.鏀垮姟缃戯紝1.鑷畾涔�)
+ */
+ private Integer source;
+
+ /** 涓婚敭锛岃嚜澧為暱鍒楄〃 */
+ private List<Long> idList;
+
+ public Long getMatterId() {
+ return matterId;
+ }
+
+ public void setMatterId(Long matterId) {
+ this.matterId = matterId;
+ }
+
+ public String getMatterCode() {
+ return matterCode;
+ }
+
+ public void setMatterCode(String matterCode) {
+ this.matterCode = matterCode;
+ }
+
+ public String getMatterName() {
+ return matterName;
+ }
+
+ public void setMatterName(String matterName) {
+ this.matterName = matterName;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public Integer getSource() {
+ return source;
+ }
+
+ public void setSource(Integer source) {
+ this.source = source;
+ }
+
+ public List<Long> getIdList() {
+ return idList;
+ }
+
+ public void setIdList(List<Long> idList) {
+ this.idList = idList;
+ }
+
+ @Override
+ public int hashCode() {
+ return this.getId().hashCode();
+ }
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null) return false;
+ if (obj instanceof MatterAcceptPdu) {
+ MatterAcceptPdu tmp = (MatterAcceptPdu) obj;
+ if (this.getId() == tmp.getId()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public String toString(){
+ StringBuilder sb = new StringBuilder("");
+ sb.append(",matterId:").append(getMatterId());
+ sb.append(",matterCode:").append(getMatterCode());
+ sb.append(",matterName:").append(getMatterName());
+ sb.append(",content:").append(getContent());
+ sb.append(",source:").append(getSource());
+ return sb.toString();
+ }
+
+ public void initAttrValue(){
+
+ this.matterId = 0L;
+
+ this.matterCode = "";
+
+ this.matterName = "";
+
+ this.content = "";
+
+ this.source = 0;
+ }
+}
diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterChargesPdu.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterChargesPdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..2eab3fee3d0761ac0f25d6ac2db6e78594dfd1ec
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterChargesPdu.java
@@ -0,0 +1,122 @@
+package com.mortals.xhx.common.pdu.matter;
+
+import com.mortals.framework.model.BaseEntityLong;
+
+import java.util.List;
+
+public class MatterChargesPdu extends BaseEntityLong {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 浜嬮」鍩虹琛╩atter id
+ */
+ private Long matterId;
+ /**
+ * 浜嬮」缂栫爜
+ */
+ private String matterCode;
+ /**
+ * 浜嬮」鍚嶇О
+ */
+ private String matterName;
+ /**
+ * 鏀惰垂鏍囧噯
+ */
+ private String content;
+ /**
+ * 浜嬮」鏉ユ簮锛�(0.鏀垮姟缃戯紝1.鑷畾涔�)
+ */
+ private Integer source;
+
+ /** 涓婚敭锛岃嚜澧為暱鍒楄〃 */
+ private List<Long> idList;
+
+
+ public Long getMatterId() {
+ return matterId;
+ }
+
+ public void setMatterId(Long matterId) {
+ this.matterId = matterId;
+ }
+
+ public String getMatterCode() {
+ return matterCode;
+ }
+
+ public void setMatterCode(String matterCode) {
+ this.matterCode = matterCode;
+ }
+
+ public String getMatterName() {
+ return matterName;
+ }
+
+ public void setMatterName(String matterName) {
+ this.matterName = matterName;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public Integer getSource() {
+ return source;
+ }
+
+ public void setSource(Integer source) {
+ this.source = source;
+ }
+
+ public List<Long> getIdList() {
+ return idList;
+ }
+
+ public void setIdList(List<Long> idList) {
+ this.idList = idList;
+ }
+
+ @Override
+ public int hashCode() {
+ return this.getId().hashCode();
+ }
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null) return false;
+ if (obj instanceof MatterChargesPdu) {
+ MatterChargesPdu tmp = (MatterChargesPdu) obj;
+ if (this.getId() == tmp.getId()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public String toString(){
+ StringBuilder sb = new StringBuilder("");
+ sb.append(",matterId:").append(getMatterId());
+ sb.append(",matterCode:").append(getMatterCode());
+ sb.append(",matterName:").append(getMatterName());
+ sb.append(",content:").append(getContent());
+ sb.append(",source:").append(getSource());
+ return sb.toString();
+ }
+
+ public void initAttrValue(){
+
+ this.matterId = 0L;
+
+ this.matterCode = "";
+
+ this.matterName = "";
+
+ this.content = "";
+
+ this.source = 0;
+ }
+}
diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterDatumFilePdu.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterDatumFilePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..def5cbdcbcb897c489e0fa561f3bcb50f6a07e8a
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterDatumFilePdu.java
@@ -0,0 +1,153 @@
+package com.mortals.xhx.common.pdu.matter;
+
+import com.mortals.framework.model.BaseEntityLong;
+
+public class MatterDatumFilePdu extends BaseEntityLong {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鏉愭枡id
+ */
+ private Long datumId;
+ /**
+ * 浜嬮」缂栫爜
+ */
+ private String matterCode;
+ /**
+ * 鏉愭枡鍚�
+ */
+ private String materialName;
+ /**
+ * 闄勪欢鍚嶇О
+ */
+ private String fileName;
+ /**
+ * 闄勪欢涓嬭浇鍦板潃
+ */
+ private String fileUrl;
+ /**
+ * 闄勪欢鏈湴涓嬭浇鍦板潃
+ */
+ private String localFileUrl;
+ /**
+ * 闄勪欢绫诲瀷 (绀轰緥鏍疯〃.绀轰緥鏍疯〃锛岀┖鐧借〃鏍�.绌虹櫧琛ㄦ牸)
+ */
+ private String filetype;
+ /**
+ * 闄勪欢鏉ユ簮 (0.鏀垮姟缃戯紝1.鑷畾涔�)
+ */
+ private Integer source;
+
+ public Long getDatumId() {
+ return datumId;
+ }
+
+ public void setDatumId(Long datumId) {
+ this.datumId = datumId;
+ }
+
+ public String getMatterCode() {
+ return matterCode;
+ }
+
+ public void setMatterCode(String matterCode) {
+ this.matterCode = matterCode;
+ }
+
+ public String getMaterialName() {
+ return materialName;
+ }
+
+ public void setMaterialName(String materialName) {
+ this.materialName = materialName;
+ }
+
+ public String getFileName() {
+ return fileName;
+ }
+
+ public void setFileName(String fileName) {
+ this.fileName = fileName;
+ }
+
+ public String getFileUrl() {
+ return fileUrl;
+ }
+
+ public void setFileUrl(String fileUrl) {
+ this.fileUrl = fileUrl;
+ }
+
+ public String getLocalFileUrl() {
+ return localFileUrl;
+ }
+
+ public void setLocalFileUrl(String localFileUrl) {
+ this.localFileUrl = localFileUrl;
+ }
+
+ public String getFiletype() {
+ return filetype;
+ }
+
+ public void setFiletype(String filetype) {
+ this.filetype = filetype;
+ }
+
+ public Integer getSource() {
+ return source;
+ }
+
+ public void setSource(Integer source) {
+ this.source = source;
+ }
+
+ @Override
+ public int hashCode() {
+ return this.getId().hashCode();
+ }
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null) return false;
+ if (obj instanceof MatterDatumFilePdu) {
+ MatterDatumFilePdu tmp = (MatterDatumFilePdu) obj;
+ if (this.getId() == tmp.getId()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public String toString(){
+ StringBuilder sb = new StringBuilder("");
+ sb.append(",datumId:").append(getDatumId());
+ sb.append(",matterCode:").append(getMatterCode());
+ sb.append(",materialName:").append(getMaterialName());
+ sb.append(",fileName:").append(getFileName());
+ sb.append(",fileUrl:").append(getFileUrl());
+ sb.append(",localFileUrl:").append(getLocalFileUrl());
+ sb.append(",filetype:").append(getFiletype());
+ sb.append(",source:").append(getSource());
+ return sb.toString();
+ }
+
+ public void initAttrValue(){
+
+ this.datumId = null;
+
+ this.matterCode = "";
+
+ this.materialName = "";
+
+ this.fileName = "";
+
+ this.fileUrl = "";
+
+ this.localFileUrl = "";
+
+ this.filetype = "绀轰緥鏍疯〃";
+
+ this.source = 1;
+ }
+}
diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterDatumPdu.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterDatumPdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..f89fd926db001c1a9e71f257d2ae0551aaea169f
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterDatumPdu.java
@@ -0,0 +1,524 @@
+package com.mortals.xhx.common.pdu.matter;
+
+import com.mortals.framework.model.BaseEntityLong;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MatterDatumPdu extends BaseEntityLong {
+ private static final long serialVersionUID = 1L;
+ /**
+ * 浜嬮」id
+ */
+ private Long matterId;
+ /**
+ * 浜嬮」缂栫爜
+ */
+ private String matterCode;
+ /**
+ * 浜嬮」鍚嶇О
+ */
+ private String matterName;
+ /**
+ * 鏉愭枡鍚�
+ */
+ private String materialName;
+ /**
+ * 蹇呬氦鎬э紙闈炲繀瑕�.闈炲繀瑕侊紝蹇呰.蹇呰锛屽繀瑕亅瀹圭己鍚庤ˉ.蹇呰|瀹圭己鍚庤ˉ锛岄潪蹇呰|瀹圭己鍚庤ˉ.闈炲繀瑕亅瀹圭己鍚庤ˉ锛�
+ */
+ private String isMust;
+ /**
+ * 鏉愭枡绫诲瀷锛堟棤.鏃狅紝鍘熶欢.鍘熶欢锛屽鍗颁欢.澶嶅嵃浠讹紝鍘熶欢鍜屽鍗颁欢.鍘熶欢鍜屽鍗颁欢)
+ */
+ private String materialType;
+ /**
+ * 鏉愭枡褰㈠紡锛堢焊璐�.绾歌川锛岀數瀛�.鐢靛瓙锛岀焊璐▅鐢靛瓙.绾歌川|鐢靛瓙锛�
+ */
+ private String materialProperty;
+ /**
+ * 鐢靛瓙鏉愭枡鏍煎紡锛堟棤.鏃狅紝涓嶉檺.涓嶉檺锛宩pg.jpg锛宩peg.jpeg锛宲df.pdf锛寃ord.word锛宲df|jpg|jpeg.pdf|jpg|jpeg锛宲df|jpg.pdf|jpg锛�
+ */
+ private String electronicgs;
+ /**
+ * 鏉愭枡鏉ユ簮娓犻亾锛堟棤.鏃狅紝鐢宠浜鸿嚜澶�.鐢宠浜鸿嚜澶囷紝鏀垮簻閮ㄩ棬鏍稿彂.鏀垮簻閮ㄩ棬鏍稿彂锛屽叾浠�.鍏朵粬锛�
+ */
+ private String materialSource;
+ /**
+ * 绾歌川鏉愭枡浠芥暟
+ */
+ private Integer paperNum;
+ /**
+ * 绾歌川鏉愭枡瑙勬牸
+ */
+ private String paperGg;
+ /**
+ * 鍑忓厤妯″紡锛堟棤.鏃狅紝鍑�.鍑忥紝鍏�.鍏嶏級
+ */
+ private String jianmMs;
+ /**
+ * 鐩栫珷鏂瑰紡
+ */
+ private String sealWay;
+ /**
+ * 鏄惁鍑忓厤锛堝惁.鍚︼紝鏄�.鏄級
+ */
+ private String isjianm;
+ /**
+ * 鏉愭枡鏄惁瀹圭己锛堝繀瑕�.蹇呰锛岄潪蹇呰.闈炲繀瑕侊級
+ */
+ private String isLack;
+ /**
+ * 鏉愭枡鍦板潃
+ */
+ private String ybUrl;
+ /**
+ * 鏉ユ簮娓犻亾璇存槑
+ */
+ private String materialSourceSm;
+ /**
+ * 濉姤椤荤煡
+ */
+ private String remarkSub;
+ /**
+ * 瑕佹眰鎻愪緵鏉愭枡鐨勪緷鎹�
+ */
+ private String clauseContent;
+ /**
+ * 鍙楃悊鏍囧噯
+ */
+ private String summary;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+ /**
+ * 浜嬮」鏉ユ簮(0.鏀垮姟缃戯紝1.鑷畾涔�)
+ */
+ private Integer source;
+
+ /** 浜嬮」id鍒楄〃 */
+ private List <Long> matterIdList;
+
+ /**
+ * 鏉愭枡闄勪欢淇℃伅
+ */
+ private List<MatterDatumFilePdu> matterDatumFileList=new ArrayList<>();;
+
+
+ public MatterDatumPdu(){}
+ /**
+ * 鑾峰彇 浜嬮」id
+ * @return Long
+ */
+ public Long getMatterId(){
+ return matterId;
+ }
+ /**
+ * 璁剧疆 浜嬮」id
+ * @param matterId
+ */
+ public void setMatterId(Long matterId){
+ this.matterId = matterId;
+ }
+ /**
+ * 鑾峰彇 浜嬮」缂栫爜
+ * @return String
+ */
+ public String getMatterCode(){
+ return matterCode;
+ }
+ /**
+ * 璁剧疆 浜嬮」缂栫爜
+ * @param matterCode
+ */
+ public void setMatterCode(String matterCode){
+ this.matterCode = matterCode;
+ }
+ /**
+ * 鑾峰彇 浜嬮」鍚嶇О
+ * @return String
+ */
+ public String getMatterName(){
+ return matterName;
+ }
+ /**
+ * 璁剧疆 浜嬮」鍚嶇О
+ * @param matterName
+ */
+ public void setMatterName(String matterName){
+ this.matterName = matterName;
+ }
+ /**
+ * 鑾峰彇 鏉愭枡鍚�
+ * @return String
+ */
+ public String getMaterialName(){
+ return materialName;
+ }
+ /**
+ * 璁剧疆 鏉愭枡鍚�
+ * @param materialName
+ */
+ public void setMaterialName(String materialName){
+ this.materialName = materialName;
+ }
+ /**
+ * 鑾峰彇 蹇呬氦鎬э紙闈炲繀瑕�.闈炲繀瑕侊紝蹇呰.蹇呰锛屽繀瑕亅瀹圭己鍚庤ˉ.蹇呰|瀹圭己鍚庤ˉ锛岄潪蹇呰|瀹圭己鍚庤ˉ.闈炲繀瑕亅瀹圭己鍚庤ˉ锛�
+ * @return String
+ */
+ public String getIsMust(){
+ return isMust;
+ }
+ /**
+ * 璁剧疆 蹇呬氦鎬э紙闈炲繀瑕�.闈炲繀瑕侊紝蹇呰.蹇呰锛屽繀瑕亅瀹圭己鍚庤ˉ.蹇呰|瀹圭己鍚庤ˉ锛岄潪蹇呰|瀹圭己鍚庤ˉ.闈炲繀瑕亅瀹圭己鍚庤ˉ锛�
+ * @param isMust
+ */
+ public void setIsMust(String isMust){
+ this.isMust = isMust;
+ }
+ /**
+ * 鑾峰彇 鏉愭枡绫诲瀷锛堟棤.鏃狅紝鍘熶欢.鍘熶欢锛屽鍗颁欢.澶嶅嵃浠讹紝鍘熶欢鍜屽鍗颁欢.鍘熶欢鍜屽鍗颁欢)
+ * @return String
+ */
+ public String getMaterialType(){
+ return materialType;
+ }
+ /**
+ * 璁剧疆 鏉愭枡绫诲瀷锛堟棤.鏃狅紝鍘熶欢.鍘熶欢锛屽鍗颁欢.澶嶅嵃浠讹紝鍘熶欢鍜屽鍗颁欢.鍘熶欢鍜屽鍗颁欢)
+ * @param materialType
+ */
+ public void setMaterialType(String materialType){
+ this.materialType = materialType;
+ }
+ /**
+ * 鑾峰彇 鏉愭枡褰㈠紡锛堢焊璐�.绾歌川锛岀數瀛�.鐢靛瓙锛岀焊璐▅鐢靛瓙.绾歌川|鐢靛瓙锛�
+ * @return String
+ */
+ public String getMaterialProperty(){
+ return materialProperty;
+ }
+ /**
+ * 璁剧疆 鏉愭枡褰㈠紡锛堢焊璐�.绾歌川锛岀數瀛�.鐢靛瓙锛岀焊璐▅鐢靛瓙.绾歌川|鐢靛瓙锛�
+ * @param materialProperty
+ */
+ public void setMaterialProperty(String materialProperty){
+ this.materialProperty = materialProperty;
+ }
+ /**
+ * 鑾峰彇 鐢靛瓙鏉愭枡鏍煎紡锛堟棤.鏃狅紝涓嶉檺.涓嶉檺锛宩pg.jpg锛宩peg.jpeg锛宲df.pdf锛寃ord.word锛宲df|jpg|jpeg.pdf|jpg|jpeg锛宲df|jpg.pdf|jpg锛�
+ * @return String
+ */
+ public String getElectronicgs(){
+ return electronicgs;
+ }
+ /**
+ * 璁剧疆 鐢靛瓙鏉愭枡鏍煎紡锛堟棤.鏃狅紝涓嶉檺.涓嶉檺锛宩pg.jpg锛宩peg.jpeg锛宲df.pdf锛寃ord.word锛宲df|jpg|jpeg.pdf|jpg|jpeg锛宲df|jpg.pdf|jpg锛�
+ * @param electronicgs
+ */
+ public void setElectronicgs(String electronicgs){
+ this.electronicgs = electronicgs;
+ }
+ /**
+ * 鑾峰彇 鏉愭枡鏉ユ簮娓犻亾锛堟棤.鏃狅紝鐢宠浜鸿嚜澶�.鐢宠浜鸿嚜澶囷紝鏀垮簻閮ㄩ棬鏍稿彂.鏀垮簻閮ㄩ棬鏍稿彂锛屽叾浠�.鍏朵粬锛�
+ * @return String
+ */
+ public String getMaterialSource(){
+ return materialSource;
+ }
+ /**
+ * 璁剧疆 鏉愭枡鏉ユ簮娓犻亾锛堟棤.鏃狅紝鐢宠浜鸿嚜澶�.鐢宠浜鸿嚜澶囷紝鏀垮簻閮ㄩ棬鏍稿彂.鏀垮簻閮ㄩ棬鏍稿彂锛屽叾浠�.鍏朵粬锛�
+ * @param materialSource
+ */
+ public void setMaterialSource(String materialSource){
+ this.materialSource = materialSource;
+ }
+ /**
+ * 鑾峰彇 绾歌川鏉愭枡浠芥暟
+ * @return Integer
+ */
+ public Integer getPaperNum(){
+ return paperNum;
+ }
+ /**
+ * 璁剧疆 绾歌川鏉愭枡浠芥暟
+ * @param paperNum
+ */
+ public void setPaperNum(Integer paperNum){
+ this.paperNum = paperNum;
+ }
+ /**
+ * 鑾峰彇 绾歌川鏉愭枡瑙勬牸
+ * @return String
+ */
+ public String getPaperGg(){
+ return paperGg;
+ }
+ /**
+ * 璁剧疆 绾歌川鏉愭枡瑙勬牸
+ * @param paperGg
+ */
+ public void setPaperGg(String paperGg){
+ this.paperGg = paperGg;
+ }
+ /**
+ * 鑾峰彇 鍑忓厤妯″紡锛堟棤.鏃狅紝鍑�.鍑忥紝鍏�.鍏嶏級
+ * @return String
+ */
+ public String getJianmMs(){
+ return jianmMs;
+ }
+ /**
+ * 璁剧疆 鍑忓厤妯″紡锛堟棤.鏃狅紝鍑�.鍑忥紝鍏�.鍏嶏級
+ * @param jianmMs
+ */
+ public void setJianmMs(String jianmMs){
+ this.jianmMs = jianmMs;
+ }
+ /**
+ * 鑾峰彇 鐩栫珷鏂瑰紡
+ * @return String
+ */
+ public String getSealWay(){
+ return sealWay;
+ }
+ /**
+ * 璁剧疆 鐩栫珷鏂瑰紡
+ * @param sealWay
+ */
+ public void setSealWay(String sealWay){
+ this.sealWay = sealWay;
+ }
+ /**
+ * 鑾峰彇 鏄惁鍑忓厤锛堝惁.鍚︼紝鏄�.鏄級
+ * @return String
+ */
+ public String getIsjianm(){
+ return isjianm;
+ }
+ /**
+ * 璁剧疆 鏄惁鍑忓厤锛堝惁.鍚︼紝鏄�.鏄級
+ * @param isjianm
+ */
+ public void setIsjianm(String isjianm){
+ this.isjianm = isjianm;
+ }
+ /**
+ * 鑾峰彇 鏉愭枡鏄惁瀹圭己锛堝繀瑕�.蹇呰锛岄潪蹇呰.闈炲繀瑕侊級
+ * @return String
+ */
+ public String getIsLack(){
+ return isLack;
+ }
+ /**
+ * 璁剧疆 鏉愭枡鏄惁瀹圭己锛堝繀瑕�.蹇呰锛岄潪蹇呰.闈炲繀瑕侊級
+ * @param isLack
+ */
+ public void setIsLack(String isLack){
+ this.isLack = isLack;
+ }
+ /**
+ * 鑾峰彇 鏉愭枡鍦板潃
+ * @return String
+ */
+ public String getYbUrl(){
+ return ybUrl;
+ }
+ /**
+ * 璁剧疆 鏉愭枡鍦板潃
+ * @param ybUrl
+ */
+ public void setYbUrl(String ybUrl){
+ this.ybUrl = ybUrl;
+ }
+ /**
+ * 鑾峰彇 鏉ユ簮娓犻亾璇存槑
+ * @return String
+ */
+ public String getMaterialSourceSm(){
+ return materialSourceSm;
+ }
+ /**
+ * 璁剧疆 鏉ユ簮娓犻亾璇存槑
+ * @param materialSourceSm
+ */
+ public void setMaterialSourceSm(String materialSourceSm){
+ this.materialSourceSm = materialSourceSm;
+ }
+ /**
+ * 鑾峰彇 濉姤椤荤煡
+ * @return String
+ */
+ public String getRemarkSub(){
+ return remarkSub;
+ }
+ /**
+ * 璁剧疆 濉姤椤荤煡
+ * @param remarkSub
+ */
+ public void setRemarkSub(String remarkSub){
+ this.remarkSub = remarkSub;
+ }
+ /**
+ * 鑾峰彇 瑕佹眰鎻愪緵鏉愭枡鐨勪緷鎹�
+ * @return String
+ */
+ public String getClauseContent(){
+ return clauseContent;
+ }
+ /**
+ * 璁剧疆 瑕佹眰鎻愪緵鏉愭枡鐨勪緷鎹�
+ * @param clauseContent
+ */
+ public void setClauseContent(String clauseContent){
+ this.clauseContent = clauseContent;
+ }
+ /**
+ * 鑾峰彇 鍙楃悊鏍囧噯
+ * @return String
+ */
+ public String getSummary(){
+ return summary;
+ }
+ /**
+ * 璁剧疆 鍙楃悊鏍囧噯
+ * @param summary
+ */
+ public void setSummary(String summary){
+ this.summary = summary;
+ }
+ /**
+ * 鑾峰彇 澶囨敞
+ * @return String
+ */
+ public String getRemark(){
+ return remark;
+ }
+ /**
+ * 璁剧疆 澶囨敞
+ * @param remark
+ */
+ public void setRemark(String remark){
+ this.remark = remark;
+ }
+ /**
+ * 鑾峰彇 浜嬮」鏉ユ簮(0.鏀垮姟缃戯紝1.鑷畾涔�)
+ * @return Integer
+ */
+ public Integer getSource(){
+ return source;
+ }
+ /**
+ * 璁剧疆 浜嬮」鏉ユ簮(0.鏀垮姟缃戯紝1.鑷畾涔�)
+ * @param source
+ */
+ public void setSource(Integer source){
+ this.source = source;
+ }
+
+ public List<Long> getMatterIdList() {
+ return matterIdList;
+ }
+
+ public void setMatterIdList(List<Long> matterIdList) {
+ this.matterIdList = matterIdList;
+ }
+
+ public List<MatterDatumFilePdu> getMatterDatumFileList(){
+ return matterDatumFileList;
+ }
+
+ public void setMatterDatumFileList(List<MatterDatumFilePdu> matterDatumFileList){
+ this.matterDatumFileList = matterDatumFileList;
+ }
+
+
+ @Override
+ public int hashCode() {
+ return this.getId().hashCode();
+ }
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null) return false;
+ if (obj instanceof MatterDatumPdu) {
+ MatterDatumPdu tmp = (MatterDatumPdu) obj;
+ if (this.getId() == tmp.getId()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public String toString(){
+ StringBuilder sb = new StringBuilder("");
+ sb.append(",matterId:").append(getMatterId());
+ sb.append(",matterCode:").append(getMatterCode());
+ sb.append(",matterName:").append(getMatterName());
+ sb.append(",materialName:").append(getMaterialName());
+ sb.append(",isMust:").append(getIsMust());
+ sb.append(",materialType:").append(getMaterialType());
+ sb.append(",materialProperty:").append(getMaterialProperty());
+ sb.append(",electronicgs:").append(getElectronicgs());
+ sb.append(",materialSource:").append(getMaterialSource());
+ sb.append(",paperNum:").append(getPaperNum());
+ sb.append(",paperGg:").append(getPaperGg());
+ sb.append(",jianmMs:").append(getJianmMs());
+ sb.append(",sealWay:").append(getSealWay());
+ sb.append(",isjianm:").append(getIsjianm());
+ sb.append(",isLack:").append(getIsLack());
+ sb.append(",ybUrl:").append(getYbUrl());
+ sb.append(",materialSourceSm:").append(getMaterialSourceSm());
+ sb.append(",remarkSub:").append(getRemarkSub());
+ sb.append(",clauseContent:").append(getClauseContent());
+ sb.append(",summary:").append(getSummary());
+ sb.append(",remark:").append(getRemark());
+ sb.append(",source:").append(getSource());
+ return sb.toString();
+ }
+
+ public void initAttrValue(){
+
+ this.matterId = null;
+
+ this.matterCode = "";
+
+ this.matterName = "";
+
+ this.materialName = "";
+
+ this.isMust = "闈炲繀瑕�";
+
+ this.materialType = "鏃�";
+
+ this.materialProperty = "绾歌川";
+
+ this.electronicgs = "鏃�";
+
+ this.materialSource = "鏃�";
+
+ this.paperNum = 1;
+
+ this.paperGg = "";
+
+ this.jianmMs = "鏃�";
+
+ this.sealWay = "";
+
+ this.isjianm = "鏄�";
+
+ this.isLack = "蹇呰";
+
+ this.ybUrl = "";
+
+ this.materialSourceSm = "";
+
+ this.remarkSub = "";
+
+ this.clauseContent = "";
+
+ this.summary = "";
+
+ this.remark = "";
+
+ this.source = 1;
+ }
+}
diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterFlowlimitPdu.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterFlowlimitPdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..30b144c1873e737368015b29920ec8a060c8fb4c
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterFlowlimitPdu.java
@@ -0,0 +1,207 @@
+package com.mortals.xhx.common.pdu.matter;
+
+import com.mortals.framework.model.BaseEntityLong;
+
+public class MatterFlowlimitPdu extends BaseEntityLong {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 浜嬮」鍩虹琛╥d
+ */
+ private Long matterId;
+ /**
+ * 浜嬮」缂栫爜
+ */
+ private String matterCode;
+ /**
+ * 浜嬮」鍚嶇О
+ */
+ private String matterName;
+ /**
+ * 鍔炵悊娴佺▼
+ */
+ private String flowName;
+ /**
+ * 鍔炵悊鏃堕暱
+ */
+ private String flowTime;
+ /**
+ * 杞鏃堕檺
+ */
+ private String flowLimit;
+ /**
+ * 鍔炵悊娴佺▼璇存槑
+ */
+ private String flowDesc;
+ /**
+ * 浜嬮」鏉ユ簮(0.鏀垮姟缃戯紝1.鑷畾涔�)
+ */
+ private Integer source;
+
+
+
+ public MatterFlowlimitPdu(){}
+ /**
+ * 鑾峰彇 浜嬮」鍩虹琛╥d
+ * @return Long
+ */
+ public Long getMatterId(){
+ return matterId;
+ }
+ /**
+ * 璁剧疆 浜嬮」鍩虹琛╥d
+ * @param matterId
+ */
+ public void setMatterId(Long matterId){
+ this.matterId = matterId;
+ }
+ /**
+ * 鑾峰彇 浜嬮」缂栫爜
+ * @return String
+ */
+ public String getMatterCode(){
+ return matterCode;
+ }
+ /**
+ * 璁剧疆 浜嬮」缂栫爜
+ * @param matterCode
+ */
+ public void setMatterCode(String matterCode){
+ this.matterCode = matterCode;
+ }
+ /**
+ * 鑾峰彇 浜嬮」鍚嶇О
+ * @return String
+ */
+ public String getMatterName(){
+ return matterName;
+ }
+ /**
+ * 璁剧疆 浜嬮」鍚嶇О
+ * @param matterName
+ */
+ public void setMatterName(String matterName){
+ this.matterName = matterName;
+ }
+ /**
+ * 鑾峰彇 鍔炵悊娴佺▼
+ * @return String
+ */
+ public String getFlowName(){
+ return flowName;
+ }
+ /**
+ * 璁剧疆 鍔炵悊娴佺▼
+ * @param flowName
+ */
+ public void setFlowName(String flowName){
+ this.flowName = flowName;
+ }
+ /**
+ * 鑾峰彇 鍔炵悊鏃堕暱
+ * @return String
+ */
+ public String getFlowTime(){
+ return flowTime;
+ }
+ /**
+ * 璁剧疆 鍔炵悊鏃堕暱
+ * @param flowTime
+ */
+ public void setFlowTime(String flowTime){
+ this.flowTime = flowTime;
+ }
+ /**
+ * 鑾峰彇 杞鏃堕檺
+ * @return String
+ */
+ public String getFlowLimit(){
+ return flowLimit;
+ }
+ /**
+ * 璁剧疆 杞鏃堕檺
+ * @param flowLimit
+ */
+ public void setFlowLimit(String flowLimit){
+ this.flowLimit = flowLimit;
+ }
+ /**
+ * 鑾峰彇 鍔炵悊娴佺▼璇存槑
+ * @return String
+ */
+ public String getFlowDesc(){
+ return flowDesc;
+ }
+ /**
+ * 璁剧疆 鍔炵悊娴佺▼璇存槑
+ * @param flowDesc
+ */
+ public void setFlowDesc(String flowDesc){
+ this.flowDesc = flowDesc;
+ }
+ /**
+ * 鑾峰彇 浜嬮」鏉ユ簮(0.鏀垮姟缃戯紝1.鑷畾涔�)
+ * @return Integer
+ */
+ public Integer getSource(){
+ return source;
+ }
+ /**
+ * 璁剧疆 浜嬮」鏉ユ簮(0.鏀垮姟缃戯紝1.鑷畾涔�)
+ * @param source
+ */
+ public void setSource(Integer source){
+ this.source = source;
+ }
+
+
+
+
+ @Override
+ public int hashCode() {
+ return this.getId().hashCode();
+ }
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null) return false;
+ if (obj instanceof MatterFlowlimitPdu) {
+ MatterFlowlimitPdu tmp = (MatterFlowlimitPdu) obj;
+ if (this.getId() == tmp.getId()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public String toString(){
+ StringBuilder sb = new StringBuilder("");
+ sb.append(",matterId:").append(getMatterId());
+ sb.append(",matterCode:").append(getMatterCode());
+ sb.append(",matterName:").append(getMatterName());
+ sb.append(",flowName:").append(getFlowName());
+ sb.append(",flowTime:").append(getFlowTime());
+ sb.append(",flowLimit:").append(getFlowLimit());
+ sb.append(",flowDesc:").append(getFlowDesc());
+ sb.append(",source:").append(getSource());
+ return sb.toString();
+ }
+
+ public void initAttrValue(){
+
+ this.matterId = 0L;
+
+ this.matterCode = "";
+
+ this.matterName = "";
+
+ this.flowName = "";
+
+ this.flowTime = "";
+
+ this.flowLimit = "";
+
+ this.flowDesc = "";
+
+ this.source = 0;
+ }
+}
diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterIntermediaryPdu.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterIntermediaryPdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..2c094dafcfbddb084d5f930d0ab442a4b109230d
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterIntermediaryPdu.java
@@ -0,0 +1,207 @@
+package com.mortals.xhx.common.pdu.matter;
+
+import com.mortals.framework.model.BaseEntityLong;
+
+public class MatterIntermediaryPdu extends BaseEntityLong {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 浜嬮」matter id
+ */
+ private Long matterId;
+ /**
+ * 浜嬮」缂栫爜
+ */
+ private String matterCode;
+ /**
+ * 浜嬮」鍚嶇О
+ */
+ private String matterName;
+ /**
+ * 涓粙鏈嶅姟浜嬮」鍚嶇О
+ */
+ private String title;
+ /**
+ * 涓粙鏈嶅姟瀹炴柦鏈烘瀯鍙婅祫璐ㄨ祫鏍艰姹�
+ */
+ private String intermediaryRequest;
+ /**
+ * 鏈嶅姟鏃堕檺
+ */
+ private String intermediaryRequestTime;
+ /**
+ * 鍐呭
+ */
+ private String remark;
+ /**
+ * 浜嬮」鏉ユ簮锛�(0.鏀垮姟缃戯紝1.鑷畾涔�)
+ */
+ private Integer source;
+
+
+
+ public MatterIntermediaryPdu(){}
+ /**
+ * 鑾峰彇 浜嬮」matter id
+ * @return Long
+ */
+ public Long getMatterId(){
+ return matterId;
+ }
+ /**
+ * 璁剧疆 浜嬮」matter id
+ * @param matterId
+ */
+ public void setMatterId(Long matterId){
+ this.matterId = matterId;
+ }
+ /**
+ * 鑾峰彇 浜嬮」缂栫爜
+ * @return String
+ */
+ public String getMatterCode(){
+ return matterCode;
+ }
+ /**
+ * 璁剧疆 浜嬮」缂栫爜
+ * @param matterCode
+ */
+ public void setMatterCode(String matterCode){
+ this.matterCode = matterCode;
+ }
+ /**
+ * 鑾峰彇 浜嬮」鍚嶇О
+ * @return String
+ */
+ public String getMatterName(){
+ return matterName;
+ }
+ /**
+ * 璁剧疆 浜嬮」鍚嶇О
+ * @param matterName
+ */
+ public void setMatterName(String matterName){
+ this.matterName = matterName;
+ }
+ /**
+ * 鑾峰彇 涓粙鏈嶅姟浜嬮」鍚嶇О
+ * @return String
+ */
+ public String getTitle(){
+ return title;
+ }
+ /**
+ * 璁剧疆 涓粙鏈嶅姟浜嬮」鍚嶇О
+ * @param title
+ */
+ public void setTitle(String title){
+ this.title = title;
+ }
+ /**
+ * 鑾峰彇 涓粙鏈嶅姟瀹炴柦鏈烘瀯鍙婅祫璐ㄨ祫鏍艰姹�
+ * @return String
+ */
+ public String getIntermediaryRequest(){
+ return intermediaryRequest;
+ }
+ /**
+ * 璁剧疆 涓粙鏈嶅姟瀹炴柦鏈烘瀯鍙婅祫璐ㄨ祫鏍艰姹�
+ * @param intermediaryRequest
+ */
+ public void setIntermediaryRequest(String intermediaryRequest){
+ this.intermediaryRequest = intermediaryRequest;
+ }
+ /**
+ * 鑾峰彇 鏈嶅姟鏃堕檺
+ * @return String
+ */
+ public String getIntermediaryRequestTime(){
+ return intermediaryRequestTime;
+ }
+ /**
+ * 璁剧疆 鏈嶅姟鏃堕檺
+ * @param intermediaryRequestTime
+ */
+ public void setIntermediaryRequestTime(String intermediaryRequestTime){
+ this.intermediaryRequestTime = intermediaryRequestTime;
+ }
+ /**
+ * 鑾峰彇 鍐呭
+ * @return String
+ */
+ public String getRemark(){
+ return remark;
+ }
+ /**
+ * 璁剧疆 鍐呭
+ * @param remark
+ */
+ public void setRemark(String remark){
+ this.remark = remark;
+ }
+ /**
+ * 鑾峰彇 浜嬮」鏉ユ簮锛�(0.鏀垮姟缃戯紝1.鑷畾涔�)
+ * @return Integer
+ */
+ public Integer getSource(){
+ return source;
+ }
+ /**
+ * 璁剧疆 浜嬮」鏉ユ簮锛�(0.鏀垮姟缃戯紝1.鑷畾涔�)
+ * @param source
+ */
+ public void setSource(Integer source){
+ this.source = source;
+ }
+
+
+
+
+ @Override
+ public int hashCode() {
+ return this.getId().hashCode();
+ }
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null) return false;
+ if (obj instanceof MatterIntermediaryPdu) {
+ MatterIntermediaryPdu tmp = (MatterIntermediaryPdu) obj;
+ if (this.getId() == tmp.getId()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public String toString(){
+ StringBuilder sb = new StringBuilder("");
+ sb.append(",matterId:").append(getMatterId());
+ sb.append(",matterCode:").append(getMatterCode());
+ sb.append(",matterName:").append(getMatterName());
+ sb.append(",title:").append(getTitle());
+ sb.append(",intermediaryRequest:").append(getIntermediaryRequest());
+ sb.append(",intermediaryRequestTime:").append(getIntermediaryRequestTime());
+ sb.append(",remark:").append(getRemark());
+ sb.append(",source:").append(getSource());
+ return sb.toString();
+ }
+
+ public void initAttrValue(){
+
+ this.matterId = 0L;
+
+ this.matterCode = "";
+
+ this.matterName = "";
+
+ this.title = "";
+
+ this.intermediaryRequest = "";
+
+ this.intermediaryRequestTime = "";
+
+ this.remark = "";
+
+ this.source = 0;
+ }
+}
diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterPdu.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterPdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..2bce3442d95ed9644d978e37fe3882b506f552e7
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterPdu.java
@@ -0,0 +1,1918 @@
+package com.mortals.xhx.common.pdu.matter;
+
+import com.mortals.framework.model.BaseEntityLong;
+
+import java.util.Date;
+import java.util.Objects;
+
+public class MatterPdu extends BaseEntityLong {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 绔欑偣ID
+ */
+ private Long siteId;
+ /**
+ * 浠庢斂鍔＄郴缁熸潵鐨勪簨椤筰d
+ */
+ private String tid;
+ /**
+ * 浠庢斂鍔＄郴缁熸潵鐨勪簨椤筩ode
+ */
+ private String tcode;
+ /**
+ * 浠庢斂鍔＄郴缁熸潵鐨勪簨椤筺ame
+ */
+ private String tname;
+ /**
+ * 浜嬮」鍚嶇О
+ */
+ private String matterName;
+ /**
+ * 鑻辫浜嬮」鍚�
+ */
+ private String englishName;
+ /**
+ * 浜嬮」缂栧彿
+ */
+ private String matterNo;
+ /**
+ * 鍖哄煙缂栫爜
+ */
+ private String areaCode;
+ /**
+ * 閮ㄩ棬缂栧彿
+ */
+ private String deptCode;
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ private String deptName;
+ /**
+ * 琛屾斂鏉冨姏缂栧彿
+ */
+ private String powerCode;
+ /**
+ * 涓婚缂栧彿
+ */
+ private String themeCode;
+ /**
+ * 鏈嶅姟绫诲瀷缂栧彿
+ */
+ private String usertypeCode;
+ /**
+ * 浜嬮」缁勫悕
+ */
+ private String groupName;
+ /**
+ * 浜嬮」璇︽儏閾炬帴
+ */
+ private String url;
+ /**
+ * 鏄惁鑾峰彇浜嬮」璇︽儏
+ */
+ private String haveGetMatterInfo;
+ /**
+ * 鎵€灞為儴闂�
+ */
+ private String belongDept;
+ /**
+ * 鏈嶅姟瀵硅薄 锛堜簨涓氭硶浜�.浜嬩笟娉曚汉锛岀ぞ浼氱粍缁囨硶浜�.绀句細缁勭粐娉曚汉锛岄潪娉曚汉浼佷笟.闈炴硶浜轰紒涓氾紝浼佷笟娉曚汉.浼佷笟娉曚汉锛岃嚜鐒朵汉.鑷劧浜猴紝鍏朵粬缁勭粐.鍏朵粬缁勭粐锛�
+ */
+ private String appoveObjectShow;
+ /**
+ * 閫氬姙鑼冨洿 锛堟棤.鏃狅紝鍏ㄥ浗.鍏ㄥ浗锛屽叏甯�.鍏ㄥ競锛屽叏鍘�.鍏ㄥ幙锛屽叏闀嘯涔� 琛楅亾].鍏ㄩ晣[涔� 琛楅亾]锛岃法鏉慬绀惧尯].璺ㄦ潙[绀惧尯]锛�
+ */
+ private String operatScopeShow;
+ /**
+ * 鍔炰欢绫诲瀷锛堢綉缁滃姙浠�.缃戠粶鍔炰欢锛岃鏀垮鎵逛竴鑸欢.琛屾斂瀹℃壒涓€鑸欢锛岀患鍚堢獥鍙ｄ欢.缁煎悎绐楀彛浠讹級
+ */
+ private String appoveTimeLimitShow;
+ /**
+ * 鍔炵悊褰㈠紡锛堢獥鍙ｅ姙鐞�.绐楀彛鍔炵悊锛岀綉涓婂姙鐞�.缃戜笂鍔炵悊锛�
+ */
+ private String handleType;
+ /**
+ * 娉曞畾鍔炵粨鏃堕檺
+ */
+ private String legalTimeLimitShow;
+ /**
+ * 娉曞畾鏃堕檺鍔炵粨璇存槑
+ */
+ private String legalEndExplain;
+ /**
+ * 鎵胯鍔炵粨鏃堕檺
+ */
+ private String promiseTimeLimitShow;
+ /**
+ * 鎵胯鏃堕檺鍔炵粨璇存槑
+ */
+ private String promiseEndExplain;
+ /**
+ * 鏄惁鏀惰垂锛堝惁.鍚︼紝鏄�.鏄級
+ */
+ private String isChargesShow;
+ /**
+ * 璁よ瘉绛夌骇闇€姹傦紙瀹炲悕璁よ瘉.瀹炲悕璁よ瘉锛屽崟娆￠潰绛�.鍗曟闈㈢锛屾瘡娆￠潰绛�.姣忔闈㈢锛�
+ */
+ private String certificationLevelsShow;
+ /**
+ * 璁″垝鐢熸晥鏃ユ湡
+ */
+ private Date planTakeTime;
+ /**
+ * 鎵胯鐢熸晥鏃ユ湡
+ */
+ private Date promiseTakeTime;
+ /**
+ * 鐗瑰埆绋嬪簭
+ */
+ private String specialProcedure;
+ /**
+ * 绐楀彛鍒扮幇鍦烘鏁�
+ */
+ private Integer windowToTheSceneNum;
+ /**
+ * 鏄惁缃戜笂棰勭害,绐楀彛鍔炵悊閫夛紙鍚�.鍚︼紝鏄�.鏄級
+ */
+ private String isOnlineSubscribeShow;
+ /**
+ * 鐗╂祦蹇€�,绐楀彛鍔炵悊閫夛紙鍚�.鍚︼紝鏄�.鏄級
+ */
+ private String isExpressTakeShow;
+ /**
+ * 鏄惁鏀寔鍏ㄧ渷鑼冨洿灏辫繎鍙栦欢锛堝惁.鍚︼紝鏄�.鏄級
+ */
+ private String isProvinceAcquisitionShow;
+ /**
+ * 鏄惁鏀寔鍏ㄧ渷鑼冨洿灏辫繎鍔炵悊锛堝惁.鍚︼紝鏄�.鏄級
+ */
+ private String isApplyProvinceShow;
+ /**
+ * 蹇呴』鍒扮幇鍦哄師鍥�
+ */
+ private String mustSceneExplain;
+ /**
+ * 缃戝姙绫诲瀷锛堝師浠堕瀹�.鍘熶欢棰勫锛屽師浠舵牳楠�.鍘熶欢鏍搁獙锛屽叏绋嬬綉鍔�.鍏ㄧ▼缃戝姙锛�
+ */
+ private String onlineType;
+ /**
+ * 缃戝姙鍒扮幇鍦烘鏁�
+ */
+ private Integer onlineToTheSceneNum;
+ /**
+ * 缃戠粶鍔炵悊娣卞害锛堜簰鑱旂綉鍜ㄨ.浜掕仈缃戝挩璇紝浜掕仈缃戞敹浠�.浜掕仈缃戞敹浠讹紝浜掕仈缃戦瀹�.浜掕仈缃戦瀹★紝浜掕仈缃戝彈鐞�.浜掕仈缃戝彈鐞嗭紝浜掕仈缃戝姙鐞�.浜掕仈缃戝姙鐞嗭紝浜掕仈缃戝姙鐞嗙粨鏋滀俊鎭弽棣�.浜掕仈缃戝姙鐞嗙粨鏋滀俊鎭弽棣堬紝鍏朵粬.鍏朵粬锛�
+ */
+ private String onlineOperatDeep;
+ /**
+ * 鐗╂祦蹇€掞紝缃戜笂鍔炵悊閫夛紙鍚�.鍚︼紝鏄�.鏄級
+ */
+ private String isExpressTakeOnlineShow;
+ /**
+ * 鏄惁鏀寔涓婇棬鏀跺彇鐢宠锛堝惁.鍚︼紝鏄�.鏄級
+ */
+ private String isDoorTakeShow;
+ /**
+ * 缃戜笂蹇呴』鍒扮幇鍦哄師鍥�
+ */
+ private String onlineMustSceneExplain;
+ /**
+ * 瀹炴柦涓讳綋
+ */
+ private String performDeptType;
+ /**
+ * 浜嬮」鐗堟湰
+ */
+ private String matterEdition;
+ /**
+ * 浜嬮」绫诲瀷鍚嶇О锛堣鏀胯鍙�.琛屾斂璁稿彲锛岃鏀垮缃�.琛屾斂澶勭綒锛岃鏀垮己鍒�.琛屾斂寮哄埗锛岃鏀垮緛鏀�.琛屾斂寰佹敹锛岃鏀跨粰浠�.琛屾斂缁欎粯锛岃鏀挎鏌�.琛屾斂妫€鏌ワ紝琛屾斂纭.琛屾斂纭锛岃鏀垮鍔�.琛屾斂濂栧姳锛岃鏀胯鍐�.琛屾斂瑁佸喅锛屽叾浠栬鏀挎潈鍔�.鍏朵粬琛屾斂鏉冨姏锛屼富鍔ㄦ湇鍔�.涓诲姩鏈嶅姟锛屼緷鐢宠鏈嶅姟.渚濈敵璇锋湇鍔★紝鍜ㄨ鏌ヨ.鍜ㄨ鏌ヨ锛屾湭褰掔被浜嬮」.鏈綊绫讳簨椤癸級
+ */
+ private String eventTypeShow;
+ /**
+ * 琛屼娇灞傜骇鍚嶇О锛堢渷绾�.鐪佺骇锛屽競绾�.甯傜骇锛屽幙绾�.鍘跨骇锛岄晣[涔� 琛楅亾].闀嘯涔� 琛楅亾]锛屾潙[绀惧尯]绾�.鏉慬绀惧尯]绾э級
+ */
+ private String performHierarchyShow;
+ /**
+ * 鏉冨姏鏉ユ簮锛堟硶瀹氭湰绾ц浣�.娉曞畾鏈骇琛屼娇锛屼笂绾т笅鏀�.涓婄骇涓嬫斁锛屼笂绾ф巿鏉�.涓婄骇鎺堟潈锛屽悓绾ф巿鏉�.鍚岀骇鎺堟潈锛屼笂绾у鎵�.涓婄骇濮旀墭锛屽悓绾у鎵�.鍚岀骇濮旀墭锛�
+ */
+ private String powerSourceShow;
+ /**
+ * 瀹炴柦涓讳綋鎬ц川锛堟硶瀹氭満鍏�.娉曞畾鏈哄叧锛屾巿鏉冪粍缁�.鎺堟潈缁勭粐锛屽彈濮旀墭缁勭粐.鍙楀鎵樼粍缁囷級
+ */
+ private String performDeptTypeShow;
+ /**
+ * 鏄惁杩涢┗涓績锛堝惁.鍚︼紝鏄�.鏄級
+ */
+ private String goveServiceCenterShow;
+ /**
+ * 鏄惁绾冲叆渚挎皯鏈嶅姟涓績锛堝惁.鍚︼紝鏄�.鏄級
+ */
+ private String isConvenientCenterShow;
+ /**
+ * 鑷姪缁堢鍔炵悊 锛堝惁.鍚︼紝鏄�.鏄級
+ */
+ private String terminalHandle;
+ /**
+ * 鏄惁缃戝姙 锛堝惁.鍚︼紝鏄�.鏄級
+ */
+ private String isOnline;
+ /**
+ * 鏀寔缃戜笂鏀粯锛堝惁.鍚︼紝鏄�.鏄級
+ */
+ private String isOnlinePayShow;
+ /**
+ * 濮旀墭閮ㄩ棬锛堝惁.鍚︼紝鏄�.鏄級
+ */
+ private String entrustmentDepartmen;
+ /**
+ * 鑱斿姙鏈烘瀯
+ */
+ private String jointInfoShow;
+ /**
+ * 浜嬮」鐘舵€侊紙鍋滅敤.鍋滅敤锛屽湪鐢�.鍦ㄧ敤锛�
+ */
+ private String matterStatus;
+ /**
+ * 鏁伴噺闄愬埗
+ */
+ private Long numberLimit;
+ /**
+ * 涓婚绫诲瀷
+ */
+ private String type;
+ /**
+ * 鍩烘湰缂栫爜
+ */
+ private String baseCode;
+ /**
+ * 瀹炴柦缂栫爜
+ */
+ private String implementCode;
+ /**
+ * 瀹炴柦涓讳綋缂栫爜
+ */
+ private String implementBodyCode;
+ /**
+ * 鍔炵悊椤圭紪鐮�
+ */
+ private String operateItemCode;
+ /**
+ * 涔￠晣琛楅亾鍚嶇О
+ */
+ private String townshipName;
+ /**
+ * 涔￠晣琛楅亾浠ｇ爜
+ */
+ private String townshipCode;
+ /**
+ * 鏉戝眳绀惧尯鍚嶇О
+ */
+ private String villageName;
+ /**
+ * 鏉戝眳绀惧尯浠ｇ爜
+ */
+ private String villageCode;
+ /**
+ * 鍔炵悊鏃堕棿
+ */
+ private String operateTime;
+ /**
+ * 鍔炵悊鍦扮偣
+ */
+ private String operateSite;
+ /**
+ * 鍜ㄨ鏂瑰紡
+ */
+ private String cousultingShow;
+ /**
+ * 鍜ㄨ鐢佃瘽
+ */
+ private String cousultingTelephoneShow;
+ /**
+ * 鐩戠潱鎶曡瘔鏂瑰紡
+ */
+ private String superviseShow;
+ /**
+ * 鎺掑簭
+ */
+ private Integer sort;
+ /**
+ * 浜嬮」鏉ユ簮(0.鏀垮姟缃戯紝1.鑷畾涔�)
+ */
+ private Integer source;
+ /**
+ * 璇勪环鍦板潃
+ */
+ private String evaluationUrl;
+ /**
+ * 鐢宠鍦板潃
+ */
+ private String netApplyUrl;
+
+
+
+
+ public MatterPdu() {
+ }
+
+ /**
+ * 鑾峰彇 绔欑偣ID
+ *
+ * @return Long
+ */
+ public Long getSiteId() {
+ return siteId;
+ }
+
+ /**
+ * 璁剧疆 绔欑偣ID
+ *
+ * @param siteId
+ */
+ public void setSiteId(Long siteId) {
+ this.siteId = siteId;
+ }
+
+ /**
+ * 鑾峰彇 浠庢斂鍔＄郴缁熸潵鐨勪簨椤筰d
+ *
+ * @return String
+ */
+ public String getTid() {
+ return tid;
+ }
+
+ /**
+ * 璁剧疆 浠庢斂鍔＄郴缁熸潵鐨勪簨椤筰d
+ *
+ * @param tid
+ */
+ public void setTid(String tid) {
+ this.tid = tid;
+ }
+
+ /**
+ * 鑾峰彇 浠庢斂鍔＄郴缁熸潵鐨勪簨椤筩ode
+ *
+ * @return String
+ */
+ public String getTcode() {
+ return tcode;
+ }
+
+ /**
+ * 璁剧疆 浠庢斂鍔＄郴缁熸潵鐨勪簨椤筩ode
+ *
+ * @param tcode
+ */
+ public void setTcode(String tcode) {
+ this.tcode = tcode;
+ }
+
+ /**
+ * 鑾峰彇 浠庢斂鍔＄郴缁熸潵鐨勪簨椤筺ame
+ *
+ * @return String
+ */
+ public String getTname() {
+ return tname;
+ }
+
+ /**
+ * 璁剧疆 浠庢斂鍔＄郴缁熸潵鐨勪簨椤筺ame
+ *
+ * @param tname
+ */
+ public void setTname(String tname) {
+ this.tname = tname;
+ }
+
+ /**
+ * 鑾峰彇 浜嬮」鍚嶇О
+ *
+ * @return String
+ */
+ public String getMatterName() {
+ return matterName;
+ }
+
+ /**
+ * 璁剧疆 浜嬮」鍚嶇О
+ *
+ * @param matterName
+ */
+ public void setMatterName(String matterName) {
+ this.matterName = matterName;
+ }
+
+ /**
+ * 鑾峰彇 鑻辫浜嬮」鍚�
+ *
+ * @return String
+ */
+ public String getEnglishName() {
+ return englishName;
+ }
+
+ /**
+ * 璁剧疆 鑻辫浜嬮」鍚�
+ *
+ * @param englishName
+ */
+ public void setEnglishName(String englishName) {
+ this.englishName = englishName;
+ }
+
+ /**
+ * 鑾峰彇 浜嬮」缂栧彿
+ *
+ * @return String
+ */
+ public String getMatterNo() {
+ return matterNo;
+ }
+
+ /**
+ * 璁剧疆 浜嬮」缂栧彿
+ *
+ * @param matterNo
+ */
+ public void setMatterNo(String matterNo) {
+ this.matterNo = matterNo;
+ }
+
+ /**
+ * 鑾峰彇 鍖哄煙缂栫爜
+ *
+ * @return String
+ */
+ public String getAreaCode() {
+ return areaCode;
+ }
+
+ /**
+ * 璁剧疆 鍖哄煙缂栫爜
+ *
+ * @param areaCode
+ */
+ public void setAreaCode(String areaCode) {
+ this.areaCode = areaCode;
+ }
+
+ /**
+ * 鑾峰彇 閮ㄩ棬缂栧彿
+ *
+ * @return String
+ */
+ public String getDeptCode() {
+ return deptCode;
+ }
+
+ /**
+ * 璁剧疆 閮ㄩ棬缂栧彿
+ *
+ * @param deptCode
+ */
+ public void setDeptCode(String deptCode) {
+ this.deptCode = deptCode;
+ }
+
+ /**
+ * 鑾峰彇 閮ㄩ棬鍚嶇О
+ *
+ * @return String
+ */
+ public String getDeptName() {
+ return deptName;
+ }
+
+ /**
+ * 璁剧疆 閮ㄩ棬鍚嶇О
+ *
+ * @param deptName
+ */
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
+
+ /**
+ * 鑾峰彇 琛屾斂鏉冨姏缂栧彿
+ *
+ * @return String
+ */
+ public String getPowerCode() {
+ return powerCode;
+ }
+
+ /**
+ * 璁剧疆 琛屾斂鏉冨姏缂栧彿
+ *
+ * @param powerCode
+ */
+ public void setPowerCode(String powerCode) {
+ this.powerCode = powerCode;
+ }
+
+ /**
+ * 鑾峰彇 涓婚缂栧彿
+ *
+ * @return String
+ */
+ public String getThemeCode() {
+ return themeCode;
+ }
+
+ /**
+ * 璁剧疆 涓婚缂栧彿
+ *
+ * @param themeCode
+ */
+ public void setThemeCode(String themeCode) {
+ this.themeCode = themeCode;
+ }
+
+ /**
+ * 鑾峰彇 鏈嶅姟绫诲瀷缂栧彿
+ *
+ * @return String
+ */
+ public String getUsertypeCode() {
+ return usertypeCode;
+ }
+
+ /**
+ * 璁剧疆 鏈嶅姟绫诲瀷缂栧彿
+ *
+ * @param usertypeCode
+ */
+ public void setUsertypeCode(String usertypeCode) {
+ this.usertypeCode = usertypeCode;
+ }
+
+ /**
+ * 鑾峰彇 浜嬮」缁勫悕
+ *
+ * @return String
+ */
+ public String getGroupName() {
+ return groupName;
+ }
+
+ /**
+ * 璁剧疆 浜嬮」缁勫悕
+ *
+ * @param groupName
+ */
+ public void setGroupName(String groupName) {
+ this.groupName = groupName;
+ }
+
+ /**
+ * 鑾峰彇 浜嬮」璇︽儏閾炬帴
+ *
+ * @return String
+ */
+ public String getUrl() {
+ return url;
+ }
+
+ /**
+ * 璁剧疆 浜嬮」璇︽儏閾炬帴
+ *
+ * @param url
+ */
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ /**
+ * 鑾峰彇 鏄惁鑾峰彇浜嬮」璇︽儏
+ *
+ * @return String
+ */
+ public String getHaveGetMatterInfo() {
+ return haveGetMatterInfo;
+ }
+
+ /**
+ * 璁剧疆 鏄惁鑾峰彇浜嬮」璇︽儏
+ *
+ * @param haveGetMatterInfo
+ */
+ public void setHaveGetMatterInfo(String haveGetMatterInfo) {
+ this.haveGetMatterInfo = haveGetMatterInfo;
+ }
+
+ /**
+ * 鑾峰彇 鎵€灞為儴闂�
+ *
+ * @return String
+ */
+ public String getBelongDept() {
+ return belongDept;
+ }
+
+ /**
+ * 璁剧疆 鎵€灞為儴闂�
+ *
+ * @param belongDept
+ */
+ public void setBelongDept(String belongDept) {
+ this.belongDept = belongDept;
+ }
+
+ /**
+ * 鑾峰彇 鏈嶅姟瀵硅薄 锛堜簨涓氭硶浜�.浜嬩笟娉曚汉锛岀ぞ浼氱粍缁囨硶浜�.绀句細缁勭粐娉曚汉锛岄潪娉曚汉浼佷笟.闈炴硶浜轰紒涓氾紝浼佷笟娉曚汉.浼佷笟娉曚汉锛岃嚜鐒朵汉.鑷劧浜猴紝鍏朵粬缁勭粐.鍏朵粬缁勭粐锛�
+ *
+ * @return String
+ */
+ public String getAppoveObjectShow() {
+ return appoveObjectShow;
+ }
+
+ /**
+ * 璁剧疆 鏈嶅姟瀵硅薄 锛堜簨涓氭硶浜�.浜嬩笟娉曚汉锛岀ぞ浼氱粍缁囨硶浜�.绀句細缁勭粐娉曚汉锛岄潪娉曚汉浼佷笟.闈炴硶浜轰紒涓氾紝浼佷笟娉曚汉.浼佷笟娉曚汉锛岃嚜鐒朵汉.鑷劧浜猴紝鍏朵粬缁勭粐.鍏朵粬缁勭粐锛�
+ *
+ * @param appoveObjectShow
+ */
+ public void setAppoveObjectShow(String appoveObjectShow) {
+ this.appoveObjectShow = appoveObjectShow;
+ }
+
+ /**
+ * 鑾峰彇 閫氬姙鑼冨洿 锛堟棤.鏃狅紝鍏ㄥ浗.鍏ㄥ浗锛屽叏甯�.鍏ㄥ競锛屽叏鍘�.鍏ㄥ幙锛屽叏闀嘯涔� 琛楅亾].鍏ㄩ晣[涔� 琛楅亾]锛岃法鏉慬绀惧尯].璺ㄦ潙[绀惧尯]锛�
+ *
+ * @return String
+ */
+ public String getOperatScopeShow() {
+ return operatScopeShow;
+ }
+
+ /**
+ * 璁剧疆 閫氬姙鑼冨洿 锛堟棤.鏃狅紝鍏ㄥ浗.鍏ㄥ浗锛屽叏甯�.鍏ㄥ競锛屽叏鍘�.鍏ㄥ幙锛屽叏闀嘯涔� 琛楅亾].鍏ㄩ晣[涔� 琛楅亾]锛岃法鏉慬绀惧尯].璺ㄦ潙[绀惧尯]锛�
+ *
+ * @param operatScopeShow
+ */
+ public void setOperatScopeShow(String operatScopeShow) {
+ this.operatScopeShow = operatScopeShow;
+ }
+
+ /**
+ * 鑾峰彇 鍔炰欢绫诲瀷锛堢綉缁滃姙浠�.缃戠粶鍔炰欢锛岃鏀垮鎵逛竴鑸欢.琛屾斂瀹℃壒涓€鑸欢锛岀患鍚堢獥鍙ｄ欢.缁煎悎绐楀彛浠讹級
+ *
+ * @return String
+ */
+ public String getAppoveTimeLimitShow() {
+ return appoveTimeLimitShow;
+ }
+
+ /**
+ * 璁剧疆 鍔炰欢绫诲瀷锛堢綉缁滃姙浠�.缃戠粶鍔炰欢锛岃鏀垮鎵逛竴鑸欢.琛屾斂瀹℃壒涓€鑸欢锛岀患鍚堢獥鍙ｄ欢.缁煎悎绐楀彛浠讹級
+ *
+ * @param appoveTimeLimitShow
+ */
+ public void setAppoveTimeLimitShow(String appoveTimeLimitShow) {
+ this.appoveTimeLimitShow = appoveTimeLimitShow;
+ }
+
+ /**
+ * 鑾峰彇 鍔炵悊褰㈠紡锛堢獥鍙ｅ姙鐞�.绐楀彛鍔炵悊锛岀綉涓婂姙鐞�.缃戜笂鍔炵悊锛�
+ *
+ * @return String
+ */
+ public String getHandleType() {
+ return handleType;
+ }
+
+ /**
+ * 璁剧疆 鍔炵悊褰㈠紡锛堢獥鍙ｅ姙鐞�.绐楀彛鍔炵悊锛岀綉涓婂姙鐞�.缃戜笂鍔炵悊锛�
+ *
+ * @param handleType
+ */
+ public void setHandleType(String handleType) {
+ this.handleType = handleType;
+ }
+
+ /**
+ * 鑾峰彇 娉曞畾鍔炵粨鏃堕檺
+ *
+ * @return String
+ */
+ public String getLegalTimeLimitShow() {
+ return legalTimeLimitShow;
+ }
+
+ /**
+ * 璁剧疆 娉曞畾鍔炵粨鏃堕檺
+ *
+ * @param legalTimeLimitShow
+ */
+ public void setLegalTimeLimitShow(String legalTimeLimitShow) {
+ this.legalTimeLimitShow = legalTimeLimitShow;
+ }
+
+ /**
+ * 鑾峰彇 娉曞畾鏃堕檺鍔炵粨璇存槑
+ *
+ * @return String
+ */
+ public String getLegalEndExplain() {
+ return legalEndExplain;
+ }
+
+ /**
+ * 璁剧疆 娉曞畾鏃堕檺鍔炵粨璇存槑
+ *
+ * @param legalEndExplain
+ */
+ public void setLegalEndExplain(String legalEndExplain) {
+ this.legalEndExplain = legalEndExplain;
+ }
+
+ /**
+ * 鑾峰彇 鎵胯鍔炵粨鏃堕檺
+ *
+ * @return String
+ */
+ public String getPromiseTimeLimitShow() {
+ return promiseTimeLimitShow;
+ }
+
+ /**
+ * 璁剧疆 鎵胯鍔炵粨鏃堕檺
+ *
+ * @param promiseTimeLimitShow
+ */
+ public void setPromiseTimeLimitShow(String promiseTimeLimitShow) {
+ this.promiseTimeLimitShow = promiseTimeLimitShow;
+ }
+
+ /**
+ * 鑾峰彇 鎵胯鏃堕檺鍔炵粨璇存槑
+ *
+ * @return String
+ */
+ public String getPromiseEndExplain() {
+ return promiseEndExplain;
+ }
+
+ /**
+ * 璁剧疆 鎵胯鏃堕檺鍔炵粨璇存槑
+ *
+ * @param promiseEndExplain
+ */
+ public void setPromiseEndExplain(String promiseEndExplain) {
+ this.promiseEndExplain = promiseEndExplain;
+ }
+
+ /**
+ * 鑾峰彇 鏄惁鏀惰垂锛堝惁.鍚︼紝鏄�.鏄級
+ *
+ * @return String
+ */
+ public String getIsChargesShow() {
+ return isChargesShow;
+ }
+
+ /**
+ * 璁剧疆 鏄惁鏀惰垂锛堝惁.鍚︼紝鏄�.鏄級
+ *
+ * @param isChargesShow
+ */
+ public void setIsChargesShow(String isChargesShow) {
+ this.isChargesShow = isChargesShow;
+ }
+
+ /**
+ * 鑾峰彇 璁よ瘉绛夌骇闇€姹傦紙瀹炲悕璁よ瘉.瀹炲悕璁よ瘉锛屽崟娆￠潰绛�.鍗曟闈㈢锛屾瘡娆￠潰绛�.姣忔闈㈢锛�
+ *
+ * @return String
+ */
+ public String getCertificationLevelsShow() {
+ return certificationLevelsShow;
+ }
+
+ /**
+ * 璁剧疆 璁よ瘉绛夌骇闇€姹傦紙瀹炲悕璁よ瘉.瀹炲悕璁よ瘉锛屽崟娆￠潰绛�.鍗曟闈㈢锛屾瘡娆￠潰绛�.姣忔闈㈢锛�
+ *
+ * @param certificationLevelsShow
+ */
+ public void setCertificationLevelsShow(String certificationLevelsShow) {
+ this.certificationLevelsShow = certificationLevelsShow;
+ }
+
+ /**
+ * 鑾峰彇 璁″垝鐢熸晥鏃ユ湡
+ *
+ * @return Date
+ */
+ public Date getPlanTakeTime() {
+ return planTakeTime;
+ }
+
+ /**
+ * 璁剧疆 璁″垝鐢熸晥鏃ユ湡
+ *
+ * @param planTakeTime
+ */
+ public void setPlanTakeTime(Date planTakeTime) {
+ this.planTakeTime = planTakeTime;
+ }
+
+ /**
+ * 鑾峰彇 鎵胯鐢熸晥鏃ユ湡
+ *
+ * @return Date
+ */
+ public Date getPromiseTakeTime() {
+ return promiseTakeTime;
+ }
+
+ /**
+ * 璁剧疆 鎵胯鐢熸晥鏃ユ湡
+ *
+ * @param promiseTakeTime
+ */
+ public void setPromiseTakeTime(Date promiseTakeTime) {
+ this.promiseTakeTime = promiseTakeTime;
+ }
+
+ /**
+ * 鑾峰彇 鐗瑰埆绋嬪簭
+ *
+ * @return String
+ */
+ public String getSpecialProcedure() {
+ return specialProcedure;
+ }
+
+ /**
+ * 璁剧疆 鐗瑰埆绋嬪簭
+ *
+ * @param specialProcedure
+ */
+ public void setSpecialProcedure(String specialProcedure) {
+ this.specialProcedure = specialProcedure;
+ }
+
+ /**
+ * 鑾峰彇 绐楀彛鍒扮幇鍦烘鏁�
+ *
+ * @return Integer
+ */
+ public Integer getWindowToTheSceneNum() {
+ return windowToTheSceneNum;
+ }
+
+ /**
+ * 璁剧疆 绐楀彛鍒扮幇鍦烘鏁�
+ *
+ * @param windowToTheSceneNum
+ */
+ public void setWindowToTheSceneNum(Integer windowToTheSceneNum) {
+ this.windowToTheSceneNum = windowToTheSceneNum;
+ }
+
+ /**
+ * 鑾峰彇 鏄惁缃戜笂棰勭害,绐楀彛鍔炵悊閫夛紙鍚�.鍚︼紝鏄�.鏄級
+ *
+ * @return String
+ */
+ public String getIsOnlineSubscribeShow() {
+ return isOnlineSubscribeShow;
+ }
+
+ /**
+ * 璁剧疆 鏄惁缃戜笂棰勭害,绐楀彛鍔炵悊閫夛紙鍚�.鍚︼紝鏄�.鏄級
+ *
+ * @param isOnlineSubscribeShow
+ */
+ public void setIsOnlineSubscribeShow(String isOnlineSubscribeShow) {
+ this.isOnlineSubscribeShow = isOnlineSubscribeShow;
+ }
+
+ /**
+ * 鑾峰彇 鐗╂祦蹇€�,绐楀彛鍔炵悊閫夛紙鍚�.鍚︼紝鏄�.鏄級
+ *
+ * @return String
+ */
+ public String getIsExpressTakeShow() {
+ return isExpressTakeShow;
+ }
+
+ /**
+ * 璁剧疆 鐗╂祦蹇€�,绐楀彛鍔炵悊閫夛紙鍚�.鍚︼紝鏄�.鏄級
+ *
+ * @param isExpressTakeShow
+ */
+ public void setIsExpressTakeShow(String isExpressTakeShow) {
+ this.isExpressTakeShow = isExpressTakeShow;
+ }
+
+ /**
+ * 鑾峰彇 鏄惁鏀寔鍏ㄧ渷鑼冨洿灏辫繎鍙栦欢锛堝惁.鍚︼紝鏄�.鏄級
+ *
+ * @return String
+ */
+ public String getIsProvinceAcquisitionShow() {
+ return isProvinceAcquisitionShow;
+ }
+
+ /**
+ * 璁剧疆 鏄惁鏀寔鍏ㄧ渷鑼冨洿灏辫繎鍙栦欢锛堝惁.鍚︼紝鏄�.鏄級
+ *
+ * @param isProvinceAcquisitionShow
+ */
+ public void setIsProvinceAcquisitionShow(String isProvinceAcquisitionShow) {
+ this.isProvinceAcquisitionShow = isProvinceAcquisitionShow;
+ }
+
+ /**
+ * 鑾峰彇 鏄惁鏀寔鍏ㄧ渷鑼冨洿灏辫繎鍔炵悊锛堝惁.鍚︼紝鏄�.鏄級
+ *
+ * @return String
+ */
+ public String getIsApplyProvinceShow() {
+ return isApplyProvinceShow;
+ }
+
+ /**
+ * 璁剧疆 鏄惁鏀寔鍏ㄧ渷鑼冨洿灏辫繎鍔炵悊锛堝惁.鍚︼紝鏄�.鏄級
+ *
+ * @param isApplyProvinceShow
+ */
+ public void setIsApplyProvinceShow(String isApplyProvinceShow) {
+ this.isApplyProvinceShow = isApplyProvinceShow;
+ }
+
+ /**
+ * 鑾峰彇 蹇呴』鍒扮幇鍦哄師鍥�
+ *
+ * @return String
+ */
+ public String getMustSceneExplain() {
+ return mustSceneExplain;
+ }
+
+ /**
+ * 璁剧疆 蹇呴』鍒扮幇鍦哄師鍥�
+ *
+ * @param mustSceneExplain
+ */
+ public void setMustSceneExplain(String mustSceneExplain) {
+ this.mustSceneExplain = mustSceneExplain;
+ }
+
+ /**
+ * 鑾峰彇 缃戝姙绫诲瀷锛堝師浠堕瀹�.鍘熶欢棰勫锛屽師浠舵牳楠�.鍘熶欢鏍搁獙锛屽叏绋嬬綉鍔�.鍏ㄧ▼缃戝姙锛�
+ *
+ * @return String
+ */
+ public String getOnlineType() {
+ return onlineType;
+ }
+
+ /**
+ * 璁剧疆 缃戝姙绫诲瀷锛堝師浠堕瀹�.鍘熶欢棰勫锛屽師浠舵牳楠�.鍘熶欢鏍搁獙锛屽叏绋嬬綉鍔�.鍏ㄧ▼缃戝姙锛�
+ *
+ * @param onlineType
+ */
+ public void setOnlineType(String onlineType) {
+ this.onlineType = onlineType;
+ }
+
+ /**
+ * 鑾峰彇 缃戝姙鍒扮幇鍦烘鏁�
+ *
+ * @return Integer
+ */
+ public Integer getOnlineToTheSceneNum() {
+ return onlineToTheSceneNum;
+ }
+
+ /**
+ * 璁剧疆 缃戝姙鍒扮幇鍦烘鏁�
+ *
+ * @param onlineToTheSceneNum
+ */
+ public void setOnlineToTheSceneNum(Integer onlineToTheSceneNum) {
+ this.onlineToTheSceneNum = onlineToTheSceneNum;
+ }
+
+ /**
+ * 鑾峰彇 缃戠粶鍔炵悊娣卞害锛堜簰鑱旂綉鍜ㄨ.浜掕仈缃戝挩璇紝浜掕仈缃戞敹浠�.浜掕仈缃戞敹浠讹紝浜掕仈缃戦瀹�.浜掕仈缃戦瀹★紝浜掕仈缃戝彈鐞�.浜掕仈缃戝彈鐞嗭紝浜掕仈缃戝姙鐞�.浜掕仈缃戝姙鐞嗭紝浜掕仈缃戝姙鐞嗙粨鏋滀俊鎭弽棣�.浜掕仈缃戝姙鐞嗙粨鏋滀俊鎭弽棣堬紝鍏朵粬.鍏朵粬锛�
+ *
+ * @return String
+ */
+ public String getOnlineOperatDeep() {
+ return onlineOperatDeep;
+ }
+
+ /**
+ * 璁剧疆 缃戠粶鍔炵悊娣卞害锛堜簰鑱旂綉鍜ㄨ.浜掕仈缃戝挩璇紝浜掕仈缃戞敹浠�.浜掕仈缃戞敹浠讹紝浜掕仈缃戦瀹�.浜掕仈缃戦瀹★紝浜掕仈缃戝彈鐞�.浜掕仈缃戝彈鐞嗭紝浜掕仈缃戝姙鐞�.浜掕仈缃戝姙鐞嗭紝浜掕仈缃戝姙鐞嗙粨鏋滀俊鎭弽棣�.浜掕仈缃戝姙鐞嗙粨鏋滀俊鎭弽棣堬紝鍏朵粬.鍏朵粬锛�
+ *
+ * @param onlineOperatDeep
+ */
+ public void setOnlineOperatDeep(String onlineOperatDeep) {
+ this.onlineOperatDeep = onlineOperatDeep;
+ }
+
+ /**
+ * 鑾峰彇 鐗╂祦蹇€掞紝缃戜笂鍔炵悊閫夛紙鍚�.鍚︼紝鏄�.鏄級
+ *
+ * @return String
+ */
+ public String getIsExpressTakeOnlineShow() {
+ return isExpressTakeOnlineShow;
+ }
+
+ /**
+ * 璁剧疆 鐗╂祦蹇€掞紝缃戜笂鍔炵悊閫夛紙鍚�.鍚︼紝鏄�.鏄級
+ *
+ * @param isExpressTakeOnlineShow
+ */
+ public void setIsExpressTakeOnlineShow(String isExpressTakeOnlineShow) {
+ this.isExpressTakeOnlineShow = isExpressTakeOnlineShow;
+ }
+
+ /**
+ * 鑾峰彇 鏄惁鏀寔涓婇棬鏀跺彇鐢宠锛堝惁.鍚︼紝鏄�.鏄級
+ *
+ * @return String
+ */
+ public String getIsDoorTakeShow() {
+ return isDoorTakeShow;
+ }
+
+ /**
+ * 璁剧疆 鏄惁鏀寔涓婇棬鏀跺彇鐢宠锛堝惁.鍚︼紝鏄�.鏄級
+ *
+ * @param isDoorTakeShow
+ */
+ public void setIsDoorTakeShow(String isDoorTakeShow) {
+ this.isDoorTakeShow = isDoorTakeShow;
+ }
+
+ /**
+ * 鑾峰彇 缃戜笂蹇呴』鍒扮幇鍦哄師鍥�
+ *
+ * @return String
+ */
+ public String getOnlineMustSceneExplain() {
+ return onlineMustSceneExplain;
+ }
+
+ /**
+ * 璁剧疆 缃戜笂蹇呴』鍒扮幇鍦哄師鍥�
+ *
+ * @param onlineMustSceneExplain
+ */
+ public void setOnlineMustSceneExplain(String onlineMustSceneExplain) {
+ this.onlineMustSceneExplain = onlineMustSceneExplain;
+ }
+
+ /**
+ * 鑾峰彇 瀹炴柦涓讳綋
+ *
+ * @return String
+ */
+ public String getPerformDeptType() {
+ return performDeptType;
+ }
+
+ /**
+ * 璁剧疆 瀹炴柦涓讳綋
+ *
+ * @param performDeptType
+ */
+ public void setPerformDeptType(String performDeptType) {
+ this.performDeptType = performDeptType;
+ }
+
+ /**
+ * 鑾峰彇 浜嬮」鐗堟湰
+ *
+ * @return String
+ */
+ public String getMatterEdition() {
+ return matterEdition;
+ }
+
+ /**
+ * 璁剧疆 浜嬮」鐗堟湰
+ *
+ * @param matterEdition
+ */
+ public void setMatterEdition(String matterEdition) {
+ this.matterEdition = matterEdition;
+ }
+
+ /**
+ * 鑾峰彇 浜嬮」绫诲瀷鍚嶇О锛堣鏀胯鍙�.琛屾斂璁稿彲锛岃鏀垮缃�.琛屾斂澶勭綒锛岃鏀垮己鍒�.琛屾斂寮哄埗锛岃鏀垮緛鏀�.琛屾斂寰佹敹锛岃鏀跨粰浠�.琛屾斂缁欎粯锛岃鏀挎鏌�.琛屾斂妫€鏌ワ紝琛屾斂纭.琛屾斂纭锛岃鏀垮鍔�.琛屾斂濂栧姳锛岃鏀胯鍐�.琛屾斂瑁佸喅锛屽叾浠栬鏀挎潈鍔�.鍏朵粬琛屾斂鏉冨姏锛屼富鍔ㄦ湇鍔�.涓诲姩鏈嶅姟锛屼緷鐢宠鏈嶅姟.渚濈敵璇锋湇鍔★紝鍜ㄨ鏌ヨ.鍜ㄨ鏌ヨ锛屾湭褰掔被浜嬮」.鏈綊绫讳簨椤癸級
+ *
+ * @return String
+ */
+ public String getEventTypeShow() {
+ return eventTypeShow;
+ }
+
+ /**
+ * 璁剧疆 浜嬮」绫诲瀷鍚嶇О锛堣鏀胯鍙�.琛屾斂璁稿彲锛岃鏀垮缃�.琛屾斂澶勭綒锛岃鏀垮己鍒�.琛屾斂寮哄埗锛岃鏀垮緛鏀�.琛屾斂寰佹敹锛岃鏀跨粰浠�.琛屾斂缁欎粯锛岃鏀挎鏌�.琛屾斂妫€鏌ワ紝琛屾斂纭.琛屾斂纭锛岃鏀垮鍔�.琛屾斂濂栧姳锛岃鏀胯鍐�.琛屾斂瑁佸喅锛屽叾浠栬鏀挎潈鍔�.鍏朵粬琛屾斂鏉冨姏锛屼富鍔ㄦ湇鍔�.涓诲姩鏈嶅姟锛屼緷鐢宠鏈嶅姟.渚濈敵璇锋湇鍔★紝鍜ㄨ鏌ヨ.鍜ㄨ鏌ヨ锛屾湭褰掔被浜嬮」.鏈綊绫讳簨椤癸級
+ *
+ * @param eventTypeShow
+ */
+ public void setEventTypeShow(String eventTypeShow) {
+ this.eventTypeShow = eventTypeShow;
+ }
+
+ /**
+ * 鑾峰彇 琛屼娇灞傜骇鍚嶇О锛堢渷绾�.鐪佺骇锛屽競绾�.甯傜骇锛屽幙绾�.鍘跨骇锛岄晣[涔� 琛楅亾].闀嘯涔� 琛楅亾]锛屾潙[绀惧尯]绾�.鏉慬绀惧尯]绾э級
+ *
+ * @return String
+ */
+ public String getPerformHierarchyShow() {
+ return performHierarchyShow;
+ }
+
+ /**
+ * 璁剧疆 琛屼娇灞傜骇鍚嶇О锛堢渷绾�.鐪佺骇锛屽競绾�.甯傜骇锛屽幙绾�.鍘跨骇锛岄晣[涔� 琛楅亾].闀嘯涔� 琛楅亾]锛屾潙[绀惧尯]绾�.鏉慬绀惧尯]绾э級
+ *
+ * @param performHierarchyShow
+ */
+ public void setPerformHierarchyShow(String performHierarchyShow) {
+ this.performHierarchyShow = performHierarchyShow;
+ }
+
+ /**
+ * 鑾峰彇 鏉冨姏鏉ユ簮锛堟硶瀹氭湰绾ц浣�.娉曞畾鏈骇琛屼娇锛屼笂绾т笅鏀�.涓婄骇涓嬫斁锛屼笂绾ф巿鏉�.涓婄骇鎺堟潈锛屽悓绾ф巿鏉�.鍚岀骇鎺堟潈锛屼笂绾у鎵�.涓婄骇濮旀墭锛屽悓绾у鎵�.鍚岀骇濮旀墭锛�
+ *
+ * @return String
+ */
+ public String getPowerSourceShow() {
+ return powerSourceShow;
+ }
+
+ /**
+ * 璁剧疆 鏉冨姏鏉ユ簮锛堟硶瀹氭湰绾ц浣�.娉曞畾鏈骇琛屼娇锛屼笂绾т笅鏀�.涓婄骇涓嬫斁锛屼笂绾ф巿鏉�.涓婄骇鎺堟潈锛屽悓绾ф巿鏉�.鍚岀骇鎺堟潈锛屼笂绾у鎵�.涓婄骇濮旀墭锛屽悓绾у鎵�.鍚岀骇濮旀墭锛�
+ *
+ * @param powerSourceShow
+ */
+ public void setPowerSourceShow(String powerSourceShow) {
+ this.powerSourceShow = powerSourceShow;
+ }
+
+ /**
+ * 鑾峰彇 瀹炴柦涓讳綋鎬ц川锛堟硶瀹氭満鍏�.娉曞畾鏈哄叧锛屾巿鏉冪粍缁�.鎺堟潈缁勭粐锛屽彈濮旀墭缁勭粐.鍙楀鎵樼粍缁囷級
+ *
+ * @return String
+ */
+ public String getPerformDeptTypeShow() {
+ return performDeptTypeShow;
+ }
+
+ /**
+ * 璁剧疆 瀹炴柦涓讳綋鎬ц川锛堟硶瀹氭満鍏�.娉曞畾鏈哄叧锛屾巿鏉冪粍缁�.鎺堟潈缁勭粐锛屽彈濮旀墭缁勭粐.鍙楀鎵樼粍缁囷級
+ *
+ * @param performDeptTypeShow
+ */
+ public void setPerformDeptTypeShow(String performDeptTypeShow) {
+ this.performDeptTypeShow = performDeptTypeShow;
+ }
+
+ /**
+ * 鑾峰彇 鏄惁杩涢┗涓績锛堝惁.鍚︼紝鏄�.鏄級
+ *
+ * @return String
+ */
+ public String getGoveServiceCenterShow() {
+ return goveServiceCenterShow;
+ }
+
+ /**
+ * 璁剧疆 鏄惁杩涢┗涓績锛堝惁.鍚︼紝鏄�.鏄級
+ *
+ * @param goveServiceCenterShow
+ */
+ public void setGoveServiceCenterShow(String goveServiceCenterShow) {
+ this.goveServiceCenterShow = goveServiceCenterShow;
+ }
+
+ /**
+ * 鑾峰彇 鏄惁绾冲叆渚挎皯鏈嶅姟涓績锛堝惁.鍚︼紝鏄�.鏄級
+ *
+ * @return String
+ */
+ public String getIsConvenientCenterShow() {
+ return isConvenientCenterShow;
+ }
+
+ /**
+ * 璁剧疆 鏄惁绾冲叆渚挎皯鏈嶅姟涓績锛堝惁.鍚︼紝鏄�.鏄級
+ *
+ * @param isConvenientCenterShow
+ */
+ public void setIsConvenientCenterShow(String isConvenientCenterShow) {
+ this.isConvenientCenterShow = isConvenientCenterShow;
+ }
+
+ /**
+ * 鑾峰彇 鑷姪缁堢鍔炵悊 锛堝惁.鍚︼紝鏄�.鏄級
+ *
+ * @return String
+ */
+ public String getTerminalHandle() {
+ return terminalHandle;
+ }
+
+ /**
+ * 璁剧疆 鑷姪缁堢鍔炵悊 锛堝惁.鍚︼紝鏄�.鏄級
+ *
+ * @param terminalHandle
+ */
+ public void setTerminalHandle(String terminalHandle) {
+ this.terminalHandle = terminalHandle;
+ }
+
+ /**
+ * 鑾峰彇 鏄惁缃戝姙 锛堝惁.鍚︼紝鏄�.鏄級
+ *
+ * @return String
+ */
+ public String getIsOnline() {
+ return isOnline;
+ }
+
+ /**
+ * 璁剧疆 鏄惁缃戝姙 锛堝惁.鍚︼紝鏄�.鏄級
+ *
+ * @param isOnline
+ */
+ public void setIsOnline(String isOnline) {
+ this.isOnline = isOnline;
+ }
+
+ /**
+ * 鑾峰彇 鏀寔缃戜笂鏀粯锛堝惁.鍚︼紝鏄�.鏄級
+ *
+ * @return String
+ */
+ public String getIsOnlinePayShow() {
+ return isOnlinePayShow;
+ }
+
+ /**
+ * 璁剧疆 鏀寔缃戜笂鏀粯锛堝惁.鍚︼紝鏄�.鏄級
+ *
+ * @param isOnlinePayShow
+ */
+ public void setIsOnlinePayShow(String isOnlinePayShow) {
+ this.isOnlinePayShow = isOnlinePayShow;
+ }
+
+ /**
+ * 鑾峰彇 濮旀墭閮ㄩ棬锛堝惁.鍚︼紝鏄�.鏄級
+ *
+ * @return String
+ */
+ public String getEntrustmentDepartmen() {
+ return entrustmentDepartmen;
+ }
+
+ /**
+ * 璁剧疆 濮旀墭閮ㄩ棬锛堝惁.鍚︼紝鏄�.鏄級
+ *
+ * @param entrustmentDepartmen
+ */
+ public void setEntrustmentDepartmen(String entrustmentDepartmen) {
+ this.entrustmentDepartmen = entrustmentDepartmen;
+ }
+
+ /**
+ * 鑾峰彇 鑱斿姙鏈烘瀯
+ *
+ * @return String
+ */
+ public String getJointInfoShow() {
+ return jointInfoShow;
+ }
+
+ /**
+ * 璁剧疆 鑱斿姙鏈烘瀯
+ *
+ * @param jointInfoShow
+ */
+ public void setJointInfoShow(String jointInfoShow) {
+ this.jointInfoShow = jointInfoShow;
+ }
+
+ /**
+ * 鑾峰彇 浜嬮」鐘舵€侊紙鍋滅敤.鍋滅敤锛屽湪鐢�.鍦ㄧ敤锛�
+ *
+ * @return String
+ */
+ public String getMatterStatus() {
+ return matterStatus;
+ }
+
+ /**
+ * 璁剧疆 浜嬮」鐘舵€侊紙鍋滅敤.鍋滅敤锛屽湪鐢�.鍦ㄧ敤锛�
+ *
+ * @param matterStatus
+ */
+ public void setMatterStatus(String matterStatus) {
+ this.matterStatus = matterStatus;
+ }
+
+ /**
+ * 鑾峰彇 鏁伴噺闄愬埗
+ *
+ * @return Long
+ */
+ public Long getNumberLimit() {
+ return numberLimit;
+ }
+
+ /**
+ * 璁剧疆 鏁伴噺闄愬埗
+ *
+ * @param numberLimit
+ */
+ public void setNumberLimit(Long numberLimit) {
+ this.numberLimit = numberLimit;
+ }
+
+ /**
+ * 鑾峰彇 涓婚绫诲瀷
+ *
+ * @return String
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * 璁剧疆 涓婚绫诲瀷
+ *
+ * @param type
+ */
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ /**
+ * 鑾峰彇 鍩烘湰缂栫爜
+ *
+ * @return String
+ */
+ public String getBaseCode() {
+ return baseCode;
+ }
+
+ /**
+ * 璁剧疆 鍩烘湰缂栫爜
+ *
+ * @param baseCode
+ */
+ public void setBaseCode(String baseCode) {
+ this.baseCode = baseCode;
+ }
+
+ /**
+ * 鑾峰彇 瀹炴柦缂栫爜
+ *
+ * @return String
+ */
+ public String getImplementCode() {
+ return implementCode;
+ }
+
+ /**
+ * 璁剧疆 瀹炴柦缂栫爜
+ *
+ * @param implementCode
+ */
+ public void setImplementCode(String implementCode) {
+ this.implementCode = implementCode;
+ }
+
+ /**
+ * 鑾峰彇 瀹炴柦涓讳綋缂栫爜
+ *
+ * @return String
+ */
+ public String getImplementBodyCode() {
+ return implementBodyCode;
+ }
+
+ /**
+ * 璁剧疆 瀹炴柦涓讳綋缂栫爜
+ *
+ * @param implementBodyCode
+ */
+ public void setImplementBodyCode(String implementBodyCode) {
+ this.implementBodyCode = implementBodyCode;
+ }
+
+ /**
+ * 鑾峰彇 鍔炵悊椤圭紪鐮�
+ *
+ * @return String
+ */
+ public String getOperateItemCode() {
+ return operateItemCode;
+ }
+
+ /**
+ * 璁剧疆 鍔炵悊椤圭紪鐮�
+ *
+ * @param operateItemCode
+ */
+ public void setOperateItemCode(String operateItemCode) {
+ this.operateItemCode = operateItemCode;
+ }
+
+ /**
+ * 鑾峰彇 涔￠晣琛楅亾鍚嶇О
+ *
+ * @return String
+ */
+ public String getTownshipName() {
+ return townshipName;
+ }
+
+ /**
+ * 璁剧疆 涔￠晣琛楅亾鍚嶇О
+ *
+ * @param townshipName
+ */
+ public void setTownshipName(String townshipName) {
+ this.townshipName = townshipName;
+ }
+
+ /**
+ * 鑾峰彇 涔￠晣琛楅亾浠ｇ爜
+ *
+ * @return String
+ */
+ public String getTownshipCode() {
+ return townshipCode;
+ }
+
+ /**
+ * 璁剧疆 涔￠晣琛楅亾浠ｇ爜
+ *
+ * @param townshipCode
+ */
+ public void setTownshipCode(String townshipCode) {
+ this.townshipCode = townshipCode;
+ }
+
+ /**
+ * 鑾峰彇 鏉戝眳绀惧尯鍚嶇О
+ *
+ * @return String
+ */
+ public String getVillageName() {
+ return villageName;
+ }
+
+ /**
+ * 璁剧疆 鏉戝眳绀惧尯鍚嶇О
+ *
+ * @param villageName
+ */
+ public void setVillageName(String villageName) {
+ this.villageName = villageName;
+ }
+
+ /**
+ * 鑾峰彇 鏉戝眳绀惧尯浠ｇ爜
+ *
+ * @return String
+ */
+ public String getVillageCode() {
+ return villageCode;
+ }
+
+ /**
+ * 璁剧疆 鏉戝眳绀惧尯浠ｇ爜
+ *
+ * @param villageCode
+ */
+ public void setVillageCode(String villageCode) {
+ this.villageCode = villageCode;
+ }
+
+ /**
+ * 鑾峰彇 鍔炵悊鏃堕棿
+ *
+ * @return String
+ */
+ public String getOperateTime() {
+ return operateTime;
+ }
+
+ /**
+ * 璁剧疆 鍔炵悊鏃堕棿
+ *
+ * @param operateTime
+ */
+ public void setOperateTime(String operateTime) {
+ this.operateTime = operateTime;
+ }
+
+ /**
+ * 鑾峰彇 鍔炵悊鍦扮偣
+ *
+ * @return String
+ */
+ public String getOperateSite() {
+ return operateSite;
+ }
+
+ /**
+ * 璁剧疆 鍔炵悊鍦扮偣
+ *
+ * @param operateSite
+ */
+ public void setOperateSite(String operateSite) {
+ this.operateSite = operateSite;
+ }
+
+ /**
+ * 鑾峰彇 鍜ㄨ鏂瑰紡
+ *
+ * @return String
+ */
+ public String getCousultingShow() {
+ return cousultingShow;
+ }
+
+ /**
+ * 璁剧疆 鍜ㄨ鏂瑰紡
+ *
+ * @param cousultingShow
+ */
+ public void setCousultingShow(String cousultingShow) {
+ this.cousultingShow = cousultingShow;
+ }
+
+ /**
+ * 鑾峰彇 鍜ㄨ鐢佃瘽
+ *
+ * @return String
+ */
+ public String getCousultingTelephoneShow() {
+ return cousultingTelephoneShow;
+ }
+
+ /**
+ * 璁剧疆 鍜ㄨ鐢佃瘽
+ *
+ * @param cousultingTelephoneShow
+ */
+ public void setCousultingTelephoneShow(String cousultingTelephoneShow) {
+ this.cousultingTelephoneShow = cousultingTelephoneShow;
+ }
+
+ /**
+ * 鑾峰彇 鐩戠潱鎶曡瘔鏂瑰紡
+ *
+ * @return String
+ */
+ public String getSuperviseShow() {
+ return superviseShow;
+ }
+
+ /**
+ * 璁剧疆 鐩戠潱鎶曡瘔鏂瑰紡
+ *
+ * @param superviseShow
+ */
+ public void setSuperviseShow(String superviseShow) {
+ this.superviseShow = superviseShow;
+ }
+
+ /**
+ * 鑾峰彇 鎺掑簭
+ *
+ * @return Integer
+ */
+ public Integer getSort() {
+ return sort;
+ }
+
+ /**
+ * 璁剧疆 鎺掑簭
+ *
+ * @param sort
+ */
+ public void setSort(Integer sort) {
+ this.sort = sort;
+ }
+
+ /**
+ * 鑾峰彇 浜嬮」鏉ユ簮(0.鏀垮姟缃戯紝1.鑷畾涔�)
+ *
+ * @return Integer
+ */
+ public Integer getSource() {
+ return source;
+ }
+
+ /**
+ * 璁剧疆 浜嬮」鏉ユ簮(0.鏀垮姟缃戯紝1.鑷畾涔�)
+ *
+ * @param source
+ */
+ public void setSource(Integer source) {
+ this.source = source;
+ }
+
+ /**
+ * 鑾峰彇 璇勪环鍦板潃
+ *
+ * @return String
+ */
+ public String getEvaluationUrl() {
+ return evaluationUrl;
+ }
+
+ /**
+ * 璁剧疆 璇勪环鍦板潃
+ *
+ * @param evaluationUrl
+ */
+ public void setEvaluationUrl(String evaluationUrl) {
+ this.evaluationUrl = evaluationUrl;
+ }
+
+ /**
+ * 鑾峰彇 鐢宠鍦板潃
+ *
+ * @return String
+ */
+ public String getNetApplyUrl() {
+ return netApplyUrl;
+ }
+
+ /**
+ * 璁剧疆 鐢宠鍦板潃
+ *
+ * @param netApplyUrl
+ */
+ public void setNetApplyUrl(String netApplyUrl) {
+ this.netApplyUrl = netApplyUrl;
+ }
+
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(this.areaCode, this.matterNo);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null) return false;
+ if (obj instanceof MatterPdu) {
+ MatterPdu tmp = (MatterPdu) obj;
+ if ((this.getAreaCode()+this.matterNo).equals(tmp.getAreaCode()+tmp.matterNo)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public String toString() {
+ StringBuilder sb = new StringBuilder("");
+ sb.append(",siteId:").append(getSiteId());
+ sb.append(",tid:").append(getTid());
+ sb.append(",tcode:").append(getTcode());
+ sb.append(",tname:").append(getTname());
+ sb.append(",matterName:").append(getMatterName());
+ sb.append(",englishName:").append(getEnglishName());
+ sb.append(",matterNo:").append(getMatterNo());
+ sb.append(",areaCode:").append(getAreaCode());
+ sb.append(",deptCode:").append(getDeptCode());
+ sb.append(",deptName:").append(getDeptName());
+ sb.append(",powerCode:").append(getPowerCode());
+ sb.append(",themeCode:").append(getThemeCode());
+ sb.append(",usertypeCode:").append(getUsertypeCode());
+ sb.append(",groupName:").append(getGroupName());
+ sb.append(",url:").append(getUrl());
+ sb.append(",haveGetMatterInfo:").append(getHaveGetMatterInfo());
+ sb.append(",belongDept:").append(getBelongDept());
+ sb.append(",appoveObjectShow:").append(getAppoveObjectShow());
+ sb.append(",operatScopeShow:").append(getOperatScopeShow());
+ sb.append(",appoveTimeLimitShow:").append(getAppoveTimeLimitShow());
+ sb.append(",handleType:").append(getHandleType());
+ sb.append(",legalTimeLimitShow:").append(getLegalTimeLimitShow());
+ sb.append(",legalEndExplain:").append(getLegalEndExplain());
+ sb.append(",promiseTimeLimitShow:").append(getPromiseTimeLimitShow());
+ sb.append(",promiseEndExplain:").append(getPromiseEndExplain());
+ sb.append(",isChargesShow:").append(getIsChargesShow());
+ sb.append(",certificationLevelsShow:").append(getCertificationLevelsShow());
+ sb.append(",planTakeTime:").append(getPlanTakeTime());
+ sb.append(",promiseTakeTime:").append(getPromiseTakeTime());
+ sb.append(",specialProcedure:").append(getSpecialProcedure());
+ sb.append(",windowToTheSceneNum:").append(getWindowToTheSceneNum());
+ sb.append(",isOnlineSubscribeShow:").append(getIsOnlineSubscribeShow());
+ sb.append(",isExpressTakeShow:").append(getIsExpressTakeShow());
+ sb.append(",isProvinceAcquisitionShow:").append(getIsProvinceAcquisitionShow());
+ sb.append(",isApplyProvinceShow:").append(getIsApplyProvinceShow());
+ sb.append(",mustSceneExplain:").append(getMustSceneExplain());
+ sb.append(",onlineType:").append(getOnlineType());
+ sb.append(",onlineToTheSceneNum:").append(getOnlineToTheSceneNum());
+ sb.append(",onlineOperatDeep:").append(getOnlineOperatDeep());
+ sb.append(",isExpressTakeOnlineShow:").append(getIsExpressTakeOnlineShow());
+ sb.append(",isDoorTakeShow:").append(getIsDoorTakeShow());
+ sb.append(",onlineMustSceneExplain:").append(getOnlineMustSceneExplain());
+ sb.append(",performDeptType:").append(getPerformDeptType());
+ sb.append(",matterEdition:").append(getMatterEdition());
+ sb.append(",eventTypeShow:").append(getEventTypeShow());
+ sb.append(",performHierarchyShow:").append(getPerformHierarchyShow());
+ sb.append(",powerSourceShow:").append(getPowerSourceShow());
+ sb.append(",performDeptTypeShow:").append(getPerformDeptTypeShow());
+ sb.append(",goveServiceCenterShow:").append(getGoveServiceCenterShow());
+ sb.append(",isConvenientCenterShow:").append(getIsConvenientCenterShow());
+ sb.append(",terminalHandle:").append(getTerminalHandle());
+ sb.append(",isOnline:").append(getIsOnline());
+ sb.append(",isOnlinePayShow:").append(getIsOnlinePayShow());
+ sb.append(",entrustmentDepartmen:").append(getEntrustmentDepartmen());
+ sb.append(",jointInfoShow:").append(getJointInfoShow());
+ sb.append(",matterStatus:").append(getMatterStatus());
+ sb.append(",numberLimit:").append(getNumberLimit());
+ sb.append(",type:").append(getType());
+ sb.append(",baseCode:").append(getBaseCode());
+ sb.append(",implementCode:").append(getImplementCode());
+ sb.append(",implementBodyCode:").append(getImplementBodyCode());
+ sb.append(",operateItemCode:").append(getOperateItemCode());
+ sb.append(",townshipName:").append(getTownshipName());
+ sb.append(",townshipCode:").append(getTownshipCode());
+ sb.append(",villageName:").append(getVillageName());
+ sb.append(",villageCode:").append(getVillageCode());
+ sb.append(",operateTime:").append(getOperateTime());
+ sb.append(",operateSite:").append(getOperateSite());
+ sb.append(",cousultingShow:").append(getCousultingShow());
+ sb.append(",cousultingTelephoneShow:").append(getCousultingTelephoneShow());
+ sb.append(",superviseShow:").append(getSuperviseShow());
+ sb.append(",sort:").append(getSort());
+ sb.append(",source:").append(getSource());
+ sb.append(",evaluationUrl:").append(getEvaluationUrl());
+ sb.append(",netApplyUrl:").append(getNetApplyUrl());
+ return sb.toString();
+ }
+
+ public void initAttrValue() {
+
+ this.siteId = -1L;
+
+ this.tid = "";
+
+ this.tcode = "";
+
+ this.tname = "";
+
+ this.matterName = "";
+
+ this.englishName = "";
+
+ this.matterNo = "";
+
+ this.areaCode = "";
+
+ this.deptCode = "";
+
+ this.deptName = "";
+
+ this.powerCode = "";
+
+ this.themeCode = "";
+
+ this.usertypeCode = "";
+
+ this.groupName = "";
+
+ this.url = "";
+
+ this.haveGetMatterInfo = "false";
+
+ this.belongDept = "";
+
+ this.appoveObjectShow = "浜嬩笟娉曚汉";
+
+ this.operatScopeShow = "鏃�";
+
+ this.appoveTimeLimitShow = "缃戠粶鍔炰欢";
+
+ this.handleType = "绐楀彛鍔炵悊";
+
+ this.legalTimeLimitShow = "";
+
+ this.legalEndExplain = "";
+
+ this.promiseTimeLimitShow = "";
+
+ this.promiseEndExplain = "";
+
+ this.isChargesShow = "鍚�";
+
+ this.certificationLevelsShow = "瀹炲悕璁よ瘉";
+
+ this.planTakeTime = null;
+
+ this.promiseTakeTime = null;
+
+ this.specialProcedure = "";
+
+ this.windowToTheSceneNum = null;
+
+ this.isOnlineSubscribeShow = "鍚�";
+
+ this.isExpressTakeShow = "鍚�";
+
+ this.isProvinceAcquisitionShow = "鍚�";
+
+ this.isApplyProvinceShow = "鍚�";
+
+ this.mustSceneExplain = "";
+
+ this.onlineType = "鍘熶欢棰勫";
+
+ this.onlineToTheSceneNum = 0;
+
+ this.onlineOperatDeep = "浜掕仈缃戝挩璇�";
+
+ this.isExpressTakeOnlineShow = "";
+
+ this.isDoorTakeShow = "鍚�";
+
+ this.onlineMustSceneExplain = "";
+
+ this.performDeptType = "";
+
+ this.matterEdition = "";
+
+ this.eventTypeShow = "琛屾斂璁稿彲";
+
+ this.performHierarchyShow = "";
+
+ this.powerSourceShow = "";
+
+ this.performDeptTypeShow = "";
+
+ this.goveServiceCenterShow = "鍚�";
+
+ this.isConvenientCenterShow = "鍚�";
+
+ this.terminalHandle = "鏄�";
+
+ this.isOnline = "鏄�";
+
+ this.isOnlinePayShow = "鏄�";
+
+ this.entrustmentDepartmen = "鏄�";
+
+ this.jointInfoShow = "";
+
+ this.matterStatus = "鍦ㄧ敤";
+
+ this.numberLimit = null;
+
+ this.type = "";
+
+ this.baseCode = "";
+
+ this.implementCode = "";
+
+ this.implementBodyCode = "";
+
+ this.operateItemCode = "";
+
+ this.townshipName = "";
+
+ this.townshipCode = "";
+
+ this.villageName = "";
+
+ this.villageCode = "";
+
+ this.operateTime = "";
+
+ this.operateSite = "";
+
+ this.cousultingShow = "";
+
+ this.cousultingTelephoneShow = "";
+
+ this.superviseShow = "";
+
+ this.sort = 0;
+
+ this.source = 1;
+
+ this.evaluationUrl = "";
+
+ this.netApplyUrl = "";
+ }
+}
diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterQuestionPdu.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterQuestionPdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..6c81516c15cd4927a080b822264400786f0f3fdd
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterQuestionPdu.java
@@ -0,0 +1,165 @@
+package com.mortals.xhx.common.pdu.matter;
+
+import com.mortals.framework.model.BaseEntityLong;
+
+public class MatterQuestionPdu extends BaseEntityLong {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 浜嬮」鍩虹琛╩atter id
+ */
+ private Long matterId;
+ /**
+ * 浜嬮」缂栫爜
+ */
+ private String matterCode;
+ /**
+ * 浜嬮」鍚嶇О
+ */
+ private String matterName;
+ /**
+ * 闂
+ */
+ private String question;
+ /**
+ * 甯歌闂
+ */
+ private String answer;
+ /**
+ * 浜嬮」鏉ユ簮锛�(0.鏀垮姟缃戯紝1.鑷畾涔�)
+ */
+ private Integer source;
+
+
+
+ public MatterQuestionPdu(){}
+ /**
+ * 鑾峰彇 浜嬮」鍩虹琛╩atter id
+ * @return Long
+ */
+ public Long getMatterId(){
+ return matterId;
+ }
+ /**
+ * 璁剧疆 浜嬮」鍩虹琛╩atter id
+ * @param matterId
+ */
+ public void setMatterId(Long matterId){
+ this.matterId = matterId;
+ }
+ /**
+ * 鑾峰彇 浜嬮」缂栫爜
+ * @return String
+ */
+ public String getMatterCode(){
+ return matterCode;
+ }
+ /**
+ * 璁剧疆 浜嬮」缂栫爜
+ * @param matterCode
+ */
+ public void setMatterCode(String matterCode){
+ this.matterCode = matterCode;
+ }
+ /**
+ * 鑾峰彇 浜嬮」鍚嶇О
+ * @return String
+ */
+ public String getMatterName(){
+ return matterName;
+ }
+ /**
+ * 璁剧疆 浜嬮」鍚嶇О
+ * @param matterName
+ */
+ public void setMatterName(String matterName){
+ this.matterName = matterName;
+ }
+ /**
+ * 鑾峰彇 闂
+ * @return String
+ */
+ public String getQuestion(){
+ return question;
+ }
+ /**
+ * 璁剧疆 闂
+ * @param question
+ */
+ public void setQuestion(String question){
+ this.question = question;
+ }
+ /**
+ * 鑾峰彇 甯歌闂
+ * @return String
+ */
+ public String getAnswer(){
+ return answer;
+ }
+ /**
+ * 璁剧疆 甯歌闂
+ * @param answer
+ */
+ public void setAnswer(String answer){
+ this.answer = answer;
+ }
+ /**
+ * 鑾峰彇 浜嬮」鏉ユ簮锛�(0.鏀垮姟缃戯紝1.鑷畾涔�)
+ * @return Integer
+ */
+ public Integer getSource(){
+ return source;
+ }
+ /**
+ * 璁剧疆 浜嬮」鏉ユ簮锛�(0.鏀垮姟缃戯紝1.鑷畾涔�)
+ * @param source
+ */
+ public void setSource(Integer source){
+ this.source = source;
+ }
+
+
+
+
+ @Override
+ public int hashCode() {
+ return this.getId().hashCode();
+ }
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null) return false;
+ if (obj instanceof MatterQuestionPdu) {
+ MatterQuestionPdu tmp = (MatterQuestionPdu) obj;
+ if (this.getId() == tmp.getId()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public String toString(){
+ StringBuilder sb = new StringBuilder("");
+ sb.append(",matterId:").append(getMatterId());
+ sb.append(",matterCode:").append(getMatterCode());
+ sb.append(",matterName:").append(getMatterName());
+ sb.append(",question:").append(getQuestion());
+ sb.append(",answer:").append(getAnswer());
+ sb.append(",source:").append(getSource());
+ return sb.toString();
+ }
+
+ public void initAttrValue(){
+
+ this.matterId = 0L;
+
+ this.matterCode = "";
+
+ this.matterName = "";
+
+ this.question = "";
+
+ this.answer = "";
+
+ this.source = 0;
+ }
+}
diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterSetbasePdu.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterSetbasePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..79b91c2c3945e08b3030c3066e4bf14fba5087bd
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterSetbasePdu.java
@@ -0,0 +1,207 @@
+package com.mortals.xhx.common.pdu.matter;
+
+import com.mortals.framework.model.BaseEntityLong;
+
+public class MatterSetbasePdu extends BaseEntityLong {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 浜嬮」matter id
+ */
+ private Long matterId;
+ /**
+ * 浜嬮」缂栫爜
+ */
+ private String matterCode;
+ /**
+ * 浜嬮」鍚嶇О
+ */
+ private String matterName;
+ /**
+ * 娉曡鏍囬
+ */
+ private String policyName;
+ /**
+ * 娉曡绫诲瀷锛�(娉曞緥.娉曞緥锛岃鏀挎硶瑙�.琛屾斂娉曡锛屽湴鏂规硶瑙�.鍦版柟娉曡锛岄儴闂ㄨ绔�.閮ㄩ棬瑙勭珷锛屽叾浠�.鍏朵粬锛屾斂搴滆绔�.鏀垮簻瑙勭珷锛岃鑼冩€ф枃浠�.瑙勮寖鎬ф枃浠�)
+ */
+ private String policyType;
+ /**
+ * 鏉′緥
+ */
+ private String policyitem;
+ /**
+ * 鏉℃鍐呭
+ */
+ private String content;
+ /**
+ * 浜嬮」鏉ユ簮锛�(0.鏀垮姟缃戯紝1.鑷畾涔�)
+ */
+ private Integer source;
+
+
+
+ public MatterSetbasePdu(){}
+ /**
+ * 鑾峰彇 浜嬮」matter id
+ * @return Long
+ */
+ public Long getMatterId(){
+ return matterId;
+ }
+ /**
+ * 璁剧疆 浜嬮」matter id
+ * @param matterId
+ */
+ public void setMatterId(Long matterId){
+ this.matterId = matterId;
+ }
+ /**
+ * 鑾峰彇 浜嬮」缂栫爜
+ * @return String
+ */
+ public String getMatterCode(){
+ return matterCode;
+ }
+ /**
+ * 璁剧疆 浜嬮」缂栫爜
+ * @param matterCode
+ */
+ public void setMatterCode(String matterCode){
+ this.matterCode = matterCode;
+ }
+ /**
+ * 鑾峰彇 浜嬮」鍚嶇О
+ * @return String
+ */
+ public String getMatterName(){
+ return matterName;
+ }
+ /**
+ * 璁剧疆 浜嬮」鍚嶇О
+ * @param matterName
+ */
+ public void setMatterName(String matterName){
+ this.matterName = matterName;
+ }
+ /**
+ * 鑾峰彇 娉曡鏍囬
+ * @return String
+ */
+ public String getPolicyName(){
+ return policyName;
+ }
+ /**
+ * 璁剧疆 娉曡鏍囬
+ * @param policyName
+ */
+ public void setPolicyName(String policyName){
+ this.policyName = policyName;
+ }
+ /**
+ * 鑾峰彇 娉曡绫诲瀷锛�(娉曞緥.娉曞緥锛岃鏀挎硶瑙�.琛屾斂娉曡锛屽湴鏂规硶瑙�.鍦版柟娉曡锛岄儴闂ㄨ绔�.閮ㄩ棬瑙勭珷锛屽叾浠�.鍏朵粬锛屾斂搴滆绔�.鏀垮簻瑙勭珷锛岃鑼冩€ф枃浠�.瑙勮寖鎬ф枃浠�)
+ * @return String
+ */
+ public String getPolicyType(){
+ return policyType;
+ }
+ /**
+ * 璁剧疆 娉曡绫诲瀷锛�(娉曞緥.娉曞緥锛岃鏀挎硶瑙�.琛屾斂娉曡锛屽湴鏂规硶瑙�.鍦版柟娉曡锛岄儴闂ㄨ绔�.閮ㄩ棬瑙勭珷锛屽叾浠�.鍏朵粬锛屾斂搴滆绔�.鏀垮簻瑙勭珷锛岃鑼冩€ф枃浠�.瑙勮寖鎬ф枃浠�)
+ * @param policyType
+ */
+ public void setPolicyType(String policyType){
+ this.policyType = policyType;
+ }
+ /**
+ * 鑾峰彇 鏉′緥
+ * @return String
+ */
+ public String getPolicyitem(){
+ return policyitem;
+ }
+ /**
+ * 璁剧疆 鏉′緥
+ * @param policyitem
+ */
+ public void setPolicyitem(String policyitem){
+ this.policyitem = policyitem;
+ }
+ /**
+ * 鑾峰彇 鏉℃鍐呭
+ * @return String
+ */
+ public String getContent(){
+ return content;
+ }
+ /**
+ * 璁剧疆 鏉℃鍐呭
+ * @param content
+ */
+ public void setContent(String content){
+ this.content = content;
+ }
+ /**
+ * 鑾峰彇 浜嬮」鏉ユ簮锛�(0.鏀垮姟缃戯紝1.鑷畾涔�)
+ * @return Integer
+ */
+ public Integer getSource(){
+ return source;
+ }
+ /**
+ * 璁剧疆 浜嬮」鏉ユ簮锛�(0.鏀垮姟缃戯紝1.鑷畾涔�)
+ * @param source
+ */
+ public void setSource(Integer source){
+ this.source = source;
+ }
+
+
+
+
+ @Override
+ public int hashCode() {
+ return this.getId().hashCode();
+ }
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null) return false;
+ if (obj instanceof MatterSetbasePdu) {
+ MatterSetbasePdu tmp = (MatterSetbasePdu) obj;
+ if (this.getId() == tmp.getId()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public String toString(){
+ StringBuilder sb = new StringBuilder("");
+ sb.append(",matterId:").append(getMatterId());
+ sb.append(",matterCode:").append(getMatterCode());
+ sb.append(",matterName:").append(getMatterName());
+ sb.append(",policyName:").append(getPolicyName());
+ sb.append(",policyType:").append(getPolicyType());
+ sb.append(",policyitem:").append(getPolicyitem());
+ sb.append(",content:").append(getContent());
+ sb.append(",source:").append(getSource());
+ return sb.toString();
+ }
+
+ public void initAttrValue(){
+
+ this.matterId = 0L;
+
+ this.matterCode = "";
+
+ this.matterName = "";
+
+ this.policyName = "";
+
+ this.policyType = "娉曞緥";
+
+ this.policyitem = "";
+
+ this.content = "";
+
+ this.source = 0;
+ }
+}
diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/site/SiteMatterPdu.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/site/SiteMatterPdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..989c0161692cb59e35c7e435e9ca0aa55a99c596
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/site/SiteMatterPdu.java
@@ -0,0 +1,1315 @@
+package com.mortals.xhx.common.pdu.site;
+
+import com.mortals.framework.model.BaseEntityLong;
+
+import java.util.List;
+
+/**
+* 绔欑偣浜嬮」Pdu瀵硅薄
+*
+* @author zxfei
+* @date 2023-02-17
+*/
+
+public class SiteMatterPdu extends BaseEntityLong {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 绔欑偣ID
+ */
+ private Long siteId;
+ /**
+ * 绔欑偣鍚嶇О
+ */
+ private String siteName;
+ /**
+ * 浜嬮」ID
+ */
+ private Long matterId;
+ /**
+ * 浜嬮」鍚嶇О
+ */
+ private String matterName;
+ /**
+ * 浜嬮」缂栫爜
+ */
+ private String matterCode;
+ /**
+ * 閮ㄩ棬ID
+ */
+ private Long deptId;
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ private String deptName;
+
+ private String areaCode;
+ /**
+ * 浜嬮」绫诲瀷
+ */
+ private String eventTypeShow;
+ /**
+ * 浜嬮」鏉ユ簮
+ */
+ private Integer source;
+ /**
+ * 閮ㄩ棬缂栧彿
+ */
+ private String deptCode;
+
+ /** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
+ private Long idStart;
+
+ /** 缁撴潫 搴忓彿锛屼富閿紝鑷闀� */
+ private Long idEnd;
+
+ /** 澧炲姞 搴忓彿锛屼富閿紝鑷闀� */
+ private Long idIncrement;
+
+ /** 搴忓彿锛屼富閿紝鑷闀垮垪琛� */
+ private List <Long> idList;
+
+ /** 寮€濮� 绔欑偣ID */
+ private Long siteIdStart;
+
+ /** 缁撴潫 绔欑偣ID */
+ private Long siteIdEnd;
+
+ /** 澧炲姞 绔欑偣ID */
+ private Long siteIdIncrement;
+
+ /** 绔欑偣ID鍒楄〃 */
+ private List <Long> siteIdList;
+
+ /** 绔欑偣鍚嶇О */
+ private List<String> siteNameList;
+
+ /** 寮€濮� 浜嬮」ID */
+ private Long matterIdStart;
+
+ /** 缁撴潫 浜嬮」ID */
+ private Long matterIdEnd;
+
+ /** 澧炲姞 浜嬮」ID */
+ private Long matterIdIncrement;
+
+ /** 浜嬮」ID鍒楄〃 */
+ private List <Long> matterIdList;
+
+ /** 浜嬮」鍚嶇О */
+ private List<String> matterNameList;
+
+ /** 浜嬮」缂栫爜 */
+ private List<String> matterCodeList;
+
+ /** 寮€濮� 閮ㄩ棬ID */
+ private Long deptIdStart;
+
+ /** 缁撴潫 閮ㄩ棬ID */
+ private Long deptIdEnd;
+
+ /** 澧炲姞 閮ㄩ棬ID */
+ private Long deptIdIncrement;
+
+ /** 閮ㄩ棬ID鍒楄〃 */
+ private List <Long> deptIdList;
+
+ /** 閮ㄩ棬鍚嶇О */
+ private List<String> deptNameList;
+
+ /** 浜嬮」绫诲瀷 */
+ private List<String> eventTypeShowList;
+
+ /** 寮€濮� 浜嬮」鏉ユ簮 */
+ private Integer sourceStart;
+
+ /** 缁撴潫 浜嬮」鏉ユ簮 */
+ private Integer sourceEnd;
+
+ /** 澧炲姞 浜嬮」鏉ユ簮 */
+ private Integer sourceIncrement;
+
+ /** 浜嬮」鏉ユ簮鍒楄〃 */
+ private List <Integer> sourceList;
+
+ /** 閮ㄩ棬缂栧彿 */
+ private List<String> deptCodeList;
+
+ /** 寮€濮� 鍒涘缓鏃堕棿 */
+ 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鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+ private List<SiteMatterPdu> orConditionList;
+
+ /** AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+ private List<SiteMatterPdu> andConditionList;
+
+
+ public String getAreaCode() {
+ return areaCode;
+ }
+
+ public void setAreaCode(String areaCode) {
+ this.areaCode = areaCode;
+ }
+
+ public SiteMatterPdu(){}
+ /**
+ * 鑾峰彇 绔欑偣ID
+ * @return Long
+ */
+ public Long getSiteId(){
+ return siteId;
+ }
+ /**
+ * 璁剧疆 绔欑偣ID
+ * @param siteId
+ */
+ public void setSiteId(Long siteId){
+ this.siteId = siteId;
+ }
+ /**
+ * 鑾峰彇 绔欑偣鍚嶇О
+ * @return String
+ */
+ public String getSiteName(){
+ return siteName;
+ }
+ /**
+ * 璁剧疆 绔欑偣鍚嶇О
+ * @param siteName
+ */
+ public void setSiteName(String siteName){
+ this.siteName = siteName;
+ }
+ /**
+ * 鑾峰彇 浜嬮」ID
+ * @return Long
+ */
+ public Long getMatterId(){
+ return matterId;
+ }
+ /**
+ * 璁剧疆 浜嬮」ID
+ * @param matterId
+ */
+ public void setMatterId(Long matterId){
+ this.matterId = matterId;
+ }
+ /**
+ * 鑾峰彇 浜嬮」鍚嶇О
+ * @return String
+ */
+ public String getMatterName(){
+ return matterName;
+ }
+ /**
+ * 璁剧疆 浜嬮」鍚嶇О
+ * @param matterName
+ */
+ public void setMatterName(String matterName){
+ this.matterName = matterName;
+ }
+ /**
+ * 鑾峰彇 浜嬮」缂栫爜
+ * @return String
+ */
+ public String getMatterCode(){
+ return matterCode;
+ }
+ /**
+ * 璁剧疆 浜嬮」缂栫爜
+ * @param matterCode
+ */
+ public void setMatterCode(String matterCode){
+ this.matterCode = matterCode;
+ }
+ /**
+ * 鑾峰彇 閮ㄩ棬ID
+ * @return Long
+ */
+ public Long getDeptId(){
+ return deptId;
+ }
+ /**
+ * 璁剧疆 閮ㄩ棬ID
+ * @param deptId
+ */
+ public void setDeptId(Long deptId){
+ this.deptId = deptId;
+ }
+ /**
+ * 鑾峰彇 閮ㄩ棬鍚嶇О
+ * @return String
+ */
+ public String getDeptName(){
+ return deptName;
+ }
+ /**
+ * 璁剧疆 閮ㄩ棬鍚嶇О
+ * @param deptName
+ */
+ public void setDeptName(String deptName){
+ this.deptName = deptName;
+ }
+ /**
+ * 鑾峰彇 浜嬮」绫诲瀷
+ * @return String
+ */
+ public String getEventTypeShow(){
+ return eventTypeShow;
+ }
+ /**
+ * 璁剧疆 浜嬮」绫诲瀷
+ * @param eventTypeShow
+ */
+ public void setEventTypeShow(String eventTypeShow){
+ this.eventTypeShow = eventTypeShow;
+ }
+ /**
+ * 鑾峰彇 浜嬮」鏉ユ簮
+ * @return Integer
+ */
+ public Integer getSource(){
+ return source;
+ }
+ /**
+ * 璁剧疆 浜嬮」鏉ユ簮
+ * @param source
+ */
+ public void setSource(Integer source){
+ this.source = source;
+ }
+ /**
+ * 鑾峰彇 閮ㄩ棬缂栧彿
+ * @return String
+ */
+ public String getDeptCode(){
+ return deptCode;
+ }
+ /**
+ * 璁剧疆 閮ㄩ棬缂栧彿
+ * @param deptCode
+ */
+ public void setDeptCode(String deptCode){
+ this.deptCode = deptCode;
+ }
+
+ /**
+ * 鑾峰彇 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
+ * @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 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 siteNameList
+ */
+ public List<String> getSiteNameList(){
+ return this.siteNameList;
+ }
+
+ /**
+ * 璁剧疆 绔欑偣鍚嶇О
+ * @param siteNameList
+ */
+ public void setSiteNameList(List<String> siteNameList){
+ this.siteNameList = siteNameList;
+ }
+ /**
+ * 鑾峰彇 寮€濮� 浜嬮」ID
+ * @return matterIdStart
+ */
+ public Long getMatterIdStart(){
+ return this.matterIdStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 浜嬮」ID
+ * @param matterIdStart
+ */
+ public void setMatterIdStart(Long matterIdStart){
+ this.matterIdStart = matterIdStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 浜嬮」ID
+ * @return $matterIdEnd
+ */
+ public Long getMatterIdEnd(){
+ return this.matterIdEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 浜嬮」ID
+ * @param matterIdEnd
+ */
+ public void setMatterIdEnd(Long matterIdEnd){
+ this.matterIdEnd = matterIdEnd;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 浜嬮」ID
+ * @return matterIdIncrement
+ */
+ public Long getMatterIdIncrement(){
+ return this.matterIdIncrement;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 浜嬮」ID
+ * @param matterIdIncrement
+ */
+ public void setMatterIdIncrement(Long matterIdIncrement){
+ this.matterIdIncrement = matterIdIncrement;
+ }
+
+ /**
+ * 鑾峰彇 浜嬮」ID
+ * @return matterIdList
+ */
+ public List<Long> getMatterIdList(){
+ return this.matterIdList;
+ }
+
+ /**
+ * 璁剧疆 浜嬮」ID
+ * @param matterIdList
+ */
+ public void setMatterIdList(List<Long> matterIdList){
+ this.matterIdList = matterIdList;
+ }
+
+ /**
+ * 鑾峰彇 浜嬮」鍚嶇О
+ * @return matterNameList
+ */
+ public List<String> getMatterNameList(){
+ return this.matterNameList;
+ }
+
+ /**
+ * 璁剧疆 浜嬮」鍚嶇О
+ * @param matterNameList
+ */
+ public void setMatterNameList(List<String> matterNameList){
+ this.matterNameList = matterNameList;
+ }
+ /**
+ * 鑾峰彇 浜嬮」缂栫爜
+ * @return matterCodeList
+ */
+ public List<String> getMatterCodeList(){
+ return this.matterCodeList;
+ }
+
+ /**
+ * 璁剧疆 浜嬮」缂栫爜
+ * @param matterCodeList
+ */
+ public void setMatterCodeList(List<String> matterCodeList){
+ this.matterCodeList = matterCodeList;
+ }
+ /**
+ * 鑾峰彇 寮€濮� 閮ㄩ棬ID
+ * @return deptIdStart
+ */
+ public Long getDeptIdStart(){
+ return this.deptIdStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 閮ㄩ棬ID
+ * @param deptIdStart
+ */
+ public void setDeptIdStart(Long deptIdStart){
+ this.deptIdStart = deptIdStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 閮ㄩ棬ID
+ * @return $deptIdEnd
+ */
+ public Long getDeptIdEnd(){
+ return this.deptIdEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 閮ㄩ棬ID
+ * @param deptIdEnd
+ */
+ public void setDeptIdEnd(Long deptIdEnd){
+ this.deptIdEnd = deptIdEnd;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 閮ㄩ棬ID
+ * @return deptIdIncrement
+ */
+ public Long getDeptIdIncrement(){
+ return this.deptIdIncrement;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 閮ㄩ棬ID
+ * @param deptIdIncrement
+ */
+ public void setDeptIdIncrement(Long deptIdIncrement){
+ this.deptIdIncrement = deptIdIncrement;
+ }
+
+ /**
+ * 鑾峰彇 閮ㄩ棬ID
+ * @return deptIdList
+ */
+ public List<Long> getDeptIdList(){
+ return this.deptIdList;
+ }
+
+ /**
+ * 璁剧疆 閮ㄩ棬ID
+ * @param deptIdList
+ */
+ public void setDeptIdList(List<Long> deptIdList){
+ this.deptIdList = deptIdList;
+ }
+
+ /**
+ * 鑾峰彇 閮ㄩ棬鍚嶇О
+ * @return deptNameList
+ */
+ public List<String> getDeptNameList(){
+ return this.deptNameList;
+ }
+
+ /**
+ * 璁剧疆 閮ㄩ棬鍚嶇О
+ * @param deptNameList
+ */
+ public void setDeptNameList(List<String> deptNameList){
+ this.deptNameList = deptNameList;
+ }
+ /**
+ * 鑾峰彇 浜嬮」绫诲瀷
+ * @return eventTypeShowList
+ */
+ public List<String> getEventTypeShowList(){
+ return this.eventTypeShowList;
+ }
+
+ /**
+ * 璁剧疆 浜嬮」绫诲瀷
+ * @param eventTypeShowList
+ */
+ public void setEventTypeShowList(List<String> eventTypeShowList){
+ this.eventTypeShowList = eventTypeShowList;
+ }
+ /**
+ * 鑾峰彇 寮€濮� 浜嬮」鏉ユ簮
+ * @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 deptCodeList
+ */
+ public List<String> getDeptCodeList(){
+ return this.deptCodeList;
+ }
+
+ /**
+ * 璁剧疆 閮ㄩ棬缂栧彿
+ * @param deptCodeList
+ */
+ public void setDeptCodeList(List<String> deptCodeList){
+ this.deptCodeList = deptCodeList;
+ }
+ /**
+ * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
+ * @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 SiteMatterPdu id(Long id){
+ setId(id);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
+ * @param idStart
+ */
+ public SiteMatterPdu idStart(Long idStart){
+ this.idStart = idStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
+ * @param idEnd
+ */
+ public SiteMatterPdu idEnd(Long idEnd){
+ this.idEnd = idEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
+ * @param idIncrement
+ */
+ public SiteMatterPdu idIncrement(Long idIncrement){
+ this.idIncrement = idIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+ * @param idList
+ */
+ public SiteMatterPdu idList(List<Long> idList){
+ this.idList = idList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 绔欑偣ID
+ * @param siteId
+ */
+ public SiteMatterPdu siteId(Long siteId){
+ setSiteId(siteId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 绔欑偣ID
+ * @param siteIdStart
+ */
+ public SiteMatterPdu siteIdStart(Long siteIdStart){
+ this.siteIdStart = siteIdStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 绔欑偣ID
+ * @param siteIdEnd
+ */
+ public SiteMatterPdu siteIdEnd(Long siteIdEnd){
+ this.siteIdEnd = siteIdEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 绔欑偣ID
+ * @param siteIdIncrement
+ */
+ public SiteMatterPdu siteIdIncrement(Long siteIdIncrement){
+ this.siteIdIncrement = siteIdIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 绔欑偣ID
+ * @param siteIdList
+ */
+ public SiteMatterPdu siteIdList(List<Long> siteIdList){
+ this.siteIdList = siteIdList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 绔欑偣鍚嶇О
+ * @param siteName
+ */
+ public SiteMatterPdu siteName(String siteName){
+ setSiteName(siteName);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 绔欑偣鍚嶇О
+ * @param siteNameList
+ */
+ public SiteMatterPdu siteNameList(List<String> siteNameList){
+ this.siteNameList = siteNameList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 浜嬮」ID
+ * @param matterId
+ */
+ public SiteMatterPdu matterId(Long matterId){
+ setMatterId(matterId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 浜嬮」ID
+ * @param matterIdStart
+ */
+ public SiteMatterPdu matterIdStart(Long matterIdStart){
+ this.matterIdStart = matterIdStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 浜嬮」ID
+ * @param matterIdEnd
+ */
+ public SiteMatterPdu matterIdEnd(Long matterIdEnd){
+ this.matterIdEnd = matterIdEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 浜嬮」ID
+ * @param matterIdIncrement
+ */
+ public SiteMatterPdu matterIdIncrement(Long matterIdIncrement){
+ this.matterIdIncrement = matterIdIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 浜嬮」ID
+ * @param matterIdList
+ */
+ public SiteMatterPdu matterIdList(List<Long> matterIdList){
+ this.matterIdList = matterIdList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 浜嬮」鍚嶇О
+ * @param matterName
+ */
+ public SiteMatterPdu matterName(String matterName){
+ setMatterName(matterName);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 浜嬮」鍚嶇О
+ * @param matterNameList
+ */
+ public SiteMatterPdu matterNameList(List<String> matterNameList){
+ this.matterNameList = matterNameList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 浜嬮」缂栫爜
+ * @param matterCode
+ */
+ public SiteMatterPdu matterCode(String matterCode){
+ setMatterCode(matterCode);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 浜嬮」缂栫爜
+ * @param matterCodeList
+ */
+ public SiteMatterPdu matterCodeList(List<String> matterCodeList){
+ this.matterCodeList = matterCodeList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 閮ㄩ棬ID
+ * @param deptId
+ */
+ public SiteMatterPdu deptId(Long deptId){
+ setDeptId(deptId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 閮ㄩ棬ID
+ * @param deptIdStart
+ */
+ public SiteMatterPdu deptIdStart(Long deptIdStart){
+ this.deptIdStart = deptIdStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 閮ㄩ棬ID
+ * @param deptIdEnd
+ */
+ public SiteMatterPdu deptIdEnd(Long deptIdEnd){
+ this.deptIdEnd = deptIdEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 閮ㄩ棬ID
+ * @param deptIdIncrement
+ */
+ public SiteMatterPdu deptIdIncrement(Long deptIdIncrement){
+ this.deptIdIncrement = deptIdIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 閮ㄩ棬ID
+ * @param deptIdList
+ */
+ public SiteMatterPdu deptIdList(List<Long> deptIdList){
+ this.deptIdList = deptIdList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 閮ㄩ棬鍚嶇О
+ * @param deptName
+ */
+ public SiteMatterPdu deptName(String deptName){
+ setDeptName(deptName);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 閮ㄩ棬鍚嶇О
+ * @param deptNameList
+ */
+ public SiteMatterPdu deptNameList(List<String> deptNameList){
+ this.deptNameList = deptNameList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 浜嬮」绫诲瀷
+ * @param eventTypeShow
+ */
+ public SiteMatterPdu eventTypeShow(String eventTypeShow){
+ setEventTypeShow(eventTypeShow);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 浜嬮」绫诲瀷
+ * @param eventTypeShowList
+ */
+ public SiteMatterPdu eventTypeShowList(List<String> eventTypeShowList){
+ this.eventTypeShowList = eventTypeShowList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 浜嬮」鏉ユ簮
+ * @param source
+ */
+ public SiteMatterPdu source(Integer source){
+ setSource(source);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 浜嬮」鏉ユ簮
+ * @param sourceStart
+ */
+ public SiteMatterPdu sourceStart(Integer sourceStart){
+ this.sourceStart = sourceStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 浜嬮」鏉ユ簮
+ * @param sourceEnd
+ */
+ public SiteMatterPdu sourceEnd(Integer sourceEnd){
+ this.sourceEnd = sourceEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 浜嬮」鏉ユ簮
+ * @param sourceIncrement
+ */
+ public SiteMatterPdu sourceIncrement(Integer sourceIncrement){
+ this.sourceIncrement = sourceIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 浜嬮」鏉ユ簮
+ * @param sourceList
+ */
+ public SiteMatterPdu sourceList(List<Integer> sourceList){
+ this.sourceList = sourceList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 閮ㄩ棬缂栧彿
+ * @param deptCode
+ */
+ public SiteMatterPdu deptCode(String deptCode){
+ setDeptCode(deptCode);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 閮ㄩ棬缂栧彿
+ * @param deptCodeList
+ */
+ public SiteMatterPdu deptCodeList(List<String> deptCodeList){
+ this.deptCodeList = deptCodeList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鍒涘缓鐢ㄦ埛
+ * @param createUserId
+ */
+ public SiteMatterPdu createUserId(Long createUserId){
+ setCreateUserId(createUserId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
+ * @param createUserIdStart
+ */
+ public SiteMatterPdu createUserIdStart(Long createUserIdStart){
+ this.createUserIdStart = createUserIdStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
+ * @param createUserIdEnd
+ */
+ public SiteMatterPdu createUserIdEnd(Long createUserIdEnd){
+ this.createUserIdEnd = createUserIdEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
+ * @param createUserIdIncrement
+ */
+ public SiteMatterPdu createUserIdIncrement(Long createUserIdIncrement){
+ this.createUserIdIncrement = createUserIdIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍒涘缓鐢ㄦ埛
+ * @param createUserIdList
+ */
+ public SiteMatterPdu createUserIdList(List<Long> createUserIdList){
+ this.createUserIdList = createUserIdList;
+ return this;
+ }
+
+
+
+/**
+ * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+ * @return orConditionList
+ */
+ public List<SiteMatterPdu> getOrConditionList(){
+ return this.orConditionList;
+ }
+
+ /**
+ * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+ * @param orConditionList
+ */
+ public void setOrConditionList(List<SiteMatterPdu> orConditionList){
+ this.orConditionList = orConditionList;
+ }
+
+ /**
+ * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+ * @return andConditionList
+ */
+ public List<SiteMatterPdu> getAndConditionList(){
+ return this.andConditionList;
+ }
+
+ /**
+ * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+ * @param andConditionList
+ */
+ public void setAndConditionList(List<SiteMatterPdu> 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 SiteMatterPdu) {
+ SiteMatterPdu tmp = (SiteMatterPdu) obj;
+ if (this.getId() == tmp.getId()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public void initAttrValue(){
+
+ this.siteId = null;
+
+ this.siteName = null;
+
+ this.matterId = null;
+
+ this.matterName = null;
+
+ this.matterCode = null;
+
+ this.deptId = null;
+
+ this.deptName = null;
+
+ this.eventTypeShow = null;
+
+ this.source = null;
+
+ this.deptCode = null;
+ }
+}
\ No newline at end of file
diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/site/SitePdu.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/site/SitePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..33f7743b6d02a425a424796cac826a15002216b5
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/site/SitePdu.java
@@ -0,0 +1,3910 @@
+package com.mortals.xhx.common.pdu.site;
+
+import com.mortals.framework.model.BaseEntityLong;
+
+import java.util.List;
+
+/**
+ * 绔欑偣Pdu瀵硅薄
+ *
+ * @author zxfei
+ * @date 2022-07-14
+ */
+
+public class SitePdu extends BaseEntityLong {
+ private static final long serialVersionUID = 1L;
+ /**
+ * 绔欑偣鍚嶇О
+ */
+ private String siteName;
+ /**
+ * 鐖剁骇id,榛樿0
+ */
+ private Long parentId;
+ /**
+ * 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
+ */
+ private String ancestors;
+ /**
+ * 鍖哄煙缂栧彿
+ */
+ private String regionCode;
+ /**
+ * 鏍囪瘑ID
+ */
+ private String iid;
+ /**
+ * 绔欑偣缂栧彿
+ */
+ private String siteCode;
+ /**
+ * 鐪佺紪鐮�
+ */
+ private String proCode;
+ /**
+ * 鍖哄煙ID
+ */
+ private String areaID;
+ /**
+ * 鍖哄煙缂栫爜
+ */
+ private String areaCode;
+ /**
+ * 甯傜紪鐮�
+ */
+ private String cityCode;
+ /**
+ * 鍖虹紪鐮�
+ */
+ private String districtCode;
+ /**
+ * 绔欑偣鏈嶅姟鍣╥p
+ */
+ private String siteIp;
+ /**
+ * 绔欑偣鏈嶅姟鍣ㄧ鍙�
+ */
+ private String sitePort;
+ /**
+ * 缁忓害
+ */
+ private String longitude;
+ /**
+ * 绾害
+ */
+ private String latitude;
+ /**
+ * 鏄惁鏈変笅绾�(0.鍚︼紝1.鏄�)
+ */
+ private String haveSonArea;
+ /**
+ * 涓績鑱旂郴鐢佃瘽
+ */
+ private String siteTel;
+ /**
+ * 涓績璇︾粏鍦板潃
+ */
+ private String detailAddress;
+ /**
+ * 涓績浠嬬粛
+ */
+ private String siteRemark;
+ /**
+ * 涓婂崍涓婄彮寮€濮嬫椂闂�
+ */
+ private String amWorkStartTime;
+ /**
+ * 涓婂崍涓婄彮缁撴潫鏃堕棿
+ */
+ private String amWorkEndTime;
+ /**
+ * 涓嬪崍涓婄彮寮€濮嬫椂闂�
+ */
+ private String pmWorkStartTime;
+ /**
+ * 涓嬪崍涓婄彮缁撴潫鏃堕棿
+ */
+ private String pmWorkEndTime;
+ /**
+ * 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
+ */
+ private Integer averageTime;
+ /**
+ * 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
+ */
+ private Integer waitingNumber;
+ /**
+ * 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
+ */
+ private Integer workday1;
+ /**
+ * 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
+ */
+ private Integer workday2;
+ /**
+ * 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
+ */
+ private Integer workday3;
+ /**
+ * 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
+ */
+ private Integer workday4;
+ /**
+ * 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
+ */
+ private Integer workday5;
+ /**
+ * 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
+ */
+ private Integer workday6;
+ /**
+ * 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
+ */
+ private Integer workday7;
+ /**
+ * 妤煎眰
+ */
+ private Integer level;
+ /**
+ * 妤兼爧
+ */
+ private Integer building;
+ /**
+ * 鏄惁鏄珯鐐� (1.鏄�,0.鍚�)
+ */
+ private Integer isSite;
+ /**
+ * 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+ */
+ private Integer status;
+ /**
+ * 璁惧logo鍦板潃
+ */
+ private String logoPath;
+ /**
+ * 绔欑偣鑻辨枃鍚嶇О
+ */
+ private String englishName;
+ /**
+ * 璐熻矗浜�
+ */
+ private String leadingOfficial;
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
+ private String leadingOfficialTelephone;
+ /**
+ * 閮ㄧ讲妯″潡锛岄€楀彿鍒嗛殧
+ */
+ private String modelIds;
+
+ /** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
+ private Long idStart;
+
+ /** 缁撴潫 搴忓彿锛屼富閿紝鑷闀� */
+ private Long idEnd;
+
+ /** 澧炲姞 搴忓彿锛屼富閿紝鑷闀� */
+ private Long idIncrement;
+
+ /** 搴忓彿锛屼富閿紝鑷闀垮垪琛� */
+ private List <Long> idList;
+
+ /** 绔欑偣鍚嶇О */
+ private List<String> siteNameList;
+
+ /** 寮€濮� 鐖剁骇id,榛樿0 */
+ private Long parentIdStart;
+
+ /** 缁撴潫 鐖剁骇id,榛樿0 */
+ private Long parentIdEnd;
+
+ /** 澧炲姞 鐖剁骇id,榛樿0 */
+ private Long parentIdIncrement;
+
+ /** 鐖剁骇id,榛樿0鍒楄〃 */
+ private List <Long> parentIdList;
+
+ /** 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧 */
+ private List<String> ancestorsList;
+
+ /** 鍖哄煙缂栧彿 */
+ private List<String> regionCodeList;
+
+ /** 鏍囪瘑ID */
+ private List<String> iidList;
+
+ /** 绔欑偣缂栧彿 */
+ private List<String> siteCodeList;
+
+ /** 鐪佺紪鐮� */
+ private List<String> proCodeList;
+
+ /** 鍖哄煙ID */
+ private List<String> areaIDList;
+
+ /** 鍖哄煙缂栫爜 */
+ private List<String> areaCodeList;
+
+ /** 甯傜紪鐮� */
+ private List<String> cityCodeList;
+
+ /** 鍖虹紪鐮� */
+ private List<String> districtCodeList;
+
+ /** 绔欑偣鏈嶅姟鍣╥p */
+ private List<String> siteIpList;
+
+ /** 绔欑偣鏈嶅姟鍣ㄧ鍙� */
+ private List<String> sitePortList;
+
+ /** 缁忓害 */
+ private List<String> longitudeList;
+
+ /** 绾害 */
+ private List<String> latitudeList;
+
+ /** 鏄惁鏈変笅绾�(0.鍚︼紝1.鏄�) */
+ private List<String> haveSonAreaList;
+
+ /** 涓績鑱旂郴鐢佃瘽 */
+ private List<String> siteTelList;
+
+ /** 涓績璇︾粏鍦板潃 */
+ private List<String> detailAddressList;
+
+ /** 涓績浠嬬粛 */
+ private List<String> siteRemarkList;
+
+ /** 涓婂崍涓婄彮寮€濮嬫椂闂� */
+ private List<String> amWorkStartTimeList;
+
+ /** 涓婂崍涓婄彮缁撴潫鏃堕棿 */
+ private List<String> amWorkEndTimeList;
+
+ /** 涓嬪崍涓婄彮寮€濮嬫椂闂� */
+ private List<String> pmWorkStartTimeList;
+
+ /** 涓嬪崍涓婄彮缁撴潫鏃堕棿 */
+ private List<String> pmWorkEndTimeList;
+
+ /** 寮€濮� 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎 */
+ private Integer averageTimeStart;
+
+ /** 缁撴潫 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎 */
+ private Integer averageTimeEnd;
+
+ /** 澧炲姞 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎 */
+ private Integer averageTimeIncrement;
+
+ /** 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎鍒楄〃 */
+ private List <Integer> averageTimeList;
+
+ /** 寮€濮� 绛夊緟浜烘暟,鍚庢湡鍒犻櫎 */
+ private Integer waitingNumberStart;
+
+ /** 缁撴潫 绛夊緟浜烘暟,鍚庢湡鍒犻櫎 */
+ private Integer waitingNumberEnd;
+
+ /** 澧炲姞 绛夊緟浜烘暟,鍚庢湡鍒犻櫎 */
+ private Integer waitingNumberIncrement;
+
+ /** 绛夊緟浜烘暟,鍚庢湡鍒犻櫎鍒楄〃 */
+ private List <Integer> waitingNumberList;
+
+ /** 寮€濮� 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday1Start;
+
+ /** 缁撴潫 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday1End;
+
+ /** 澧炲姞 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday1Increment;
+
+ /** 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)鍒楄〃 */
+ private List <Integer> workday1List;
+
+ /** 寮€濮� 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday2Start;
+
+ /** 缁撴潫 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday2End;
+
+ /** 澧炲姞 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday2Increment;
+
+ /** 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)鍒楄〃 */
+ private List <Integer> workday2List;
+
+ /** 寮€濮� 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday3Start;
+
+ /** 缁撴潫 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday3End;
+
+ /** 澧炲姞 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday3Increment;
+
+ /** 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)鍒楄〃 */
+ private List <Integer> workday3List;
+
+ /** 寮€濮� 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday4Start;
+
+ /** 缁撴潫 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday4End;
+
+ /** 澧炲姞 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday4Increment;
+
+ /** 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)鍒楄〃 */
+ private List <Integer> workday4List;
+
+ /** 寮€濮� 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday5Start;
+
+ /** 缁撴潫 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday5End;
+
+ /** 澧炲姞 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday5Increment;
+
+ /** 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)鍒楄〃 */
+ private List <Integer> workday5List;
+
+ /** 寮€濮� 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday6Start;
+
+ /** 缁撴潫 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday6End;
+
+ /** 澧炲姞 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday6Increment;
+
+ /** 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)鍒楄〃 */
+ private List <Integer> workday6List;
+
+ /** 寮€濮� 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday7Start;
+
+ /** 缁撴潫 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday7End;
+
+ /** 澧炲姞 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂) */
+ private Integer workday7Increment;
+
+ /** 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)鍒楄〃 */
+ private List <Integer> workday7List;
+
+ /** 寮€濮� 妤煎眰 */
+ private Integer levelStart;
+
+ /** 缁撴潫 妤煎眰 */
+ private Integer levelEnd;
+
+ /** 澧炲姞 妤煎眰 */
+ private Integer levelIncrement;
+
+ /** 妤煎眰鍒楄〃 */
+ private List <Integer> levelList;
+
+ /** 寮€濮� 妤兼爧 */
+ private Integer buildingStart;
+
+ /** 缁撴潫 妤兼爧 */
+ private Integer buildingEnd;
+
+ /** 澧炲姞 妤兼爧 */
+ private Integer buildingIncrement;
+
+ /** 妤兼爧鍒楄〃 */
+ private List <Integer> buildingList;
+
+ /** 寮€濮� 鏄惁鏄珯鐐� (1.鏄�,0.鍚�) */
+ private Integer isSiteStart;
+
+ /** 缁撴潫 鏄惁鏄珯鐐� (1.鏄�,0.鍚�) */
+ private Integer isSiteEnd;
+
+ /** 澧炲姞 鏄惁鏄珯鐐� (1.鏄�,0.鍚�) */
+ private Integer isSiteIncrement;
+
+ /** 鏄惁鏄珯鐐� (1.鏄�,0.鍚�)鍒楄〃 */
+ private List <Integer> isSiteList;
+
+ /** 寮€濮� 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝ｅ父) */
+ private Integer statusStart;
+
+ /** 缁撴潫 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝ｅ父) */
+ private Integer statusEnd;
+
+ /** 澧炲姞 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝ｅ父) */
+ private Integer statusIncrement;
+
+ /** 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)鍒楄〃 */
+ private List <Integer> statusList;
+
+ /** 璁惧logo鍦板潃 */
+ private List<String> logoPathList;
+
+ /** 绔欑偣鑻辨枃鍚嶇О */
+ private List<String> englishNameList;
+
+ /** 璐熻矗浜� */
+ private List<String> leadingOfficialList;
+
+ /** 鑱旂郴鐢佃瘽 */
+ private List<String> leadingOfficialTelephoneList;
+
+ /** 寮€濮� 鍒涘缓鏃堕棿 */
+ 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;
+
+ /** 閮ㄧ讲妯″潡锛岄€楀彿鍒嗛殧 */
+ private List<String> modelIdsList;
+
+
+ /** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+ private List<SitePdu> orConditionList;
+
+ /** AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+ private List<SitePdu> andConditionList;
+
+ public SitePdu(){}
+ /**
+ * 鑾峰彇 绔欑偣鍚嶇О
+ * @return String
+ */
+ public String getSiteName(){
+ return siteName;
+ }
+ /**
+ * 璁剧疆 绔欑偣鍚嶇О
+ * @param siteName
+ */
+ public void setSiteName(String siteName){
+ this.siteName = siteName;
+ }
+ /**
+ * 鑾峰彇 鐖剁骇id,榛樿0
+ * @return Long
+ */
+ public Long getParentId(){
+ return parentId;
+ }
+ /**
+ * 璁剧疆 鐖剁骇id,榛樿0
+ * @param parentId
+ */
+ public void setParentId(Long parentId){
+ this.parentId = parentId;
+ }
+ /**
+ * 鑾峰彇 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
+ * @return String
+ */
+ public String getAncestors(){
+ return ancestors;
+ }
+ /**
+ * 璁剧疆 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
+ * @param ancestors
+ */
+ public void setAncestors(String ancestors){
+ this.ancestors = ancestors;
+ }
+ /**
+ * 鑾峰彇 鍖哄煙缂栧彿
+ * @return String
+ */
+ public String getRegionCode(){
+ return regionCode;
+ }
+ /**
+ * 璁剧疆 鍖哄煙缂栧彿
+ * @param regionCode
+ */
+ public void setRegionCode(String regionCode){
+ this.regionCode = regionCode;
+ }
+ /**
+ * 鑾峰彇 鏍囪瘑ID
+ * @return String
+ */
+ public String getIid(){
+ return iid;
+ }
+ /**
+ * 璁剧疆 鏍囪瘑ID
+ * @param iid
+ */
+ public void setIid(String iid){
+ this.iid = iid;
+ }
+ /**
+ * 鑾峰彇 绔欑偣缂栧彿
+ * @return String
+ */
+ public String getSiteCode(){
+ return siteCode;
+ }
+ /**
+ * 璁剧疆 绔欑偣缂栧彿
+ * @param siteCode
+ */
+ public void setSiteCode(String siteCode){
+ this.siteCode = siteCode;
+ }
+ /**
+ * 鑾峰彇 鐪佺紪鐮�
+ * @return String
+ */
+ public String getProCode(){
+ return proCode;
+ }
+ /**
+ * 璁剧疆 鐪佺紪鐮�
+ * @param proCode
+ */
+ public void setProCode(String proCode){
+ this.proCode = proCode;
+ }
+ /**
+ * 鑾峰彇 鍖哄煙ID
+ * @return String
+ */
+ public String getAreaID(){
+ return areaID;
+ }
+ /**
+ * 璁剧疆 鍖哄煙ID
+ * @param areaID
+ */
+ public void setAreaID(String areaID){
+ this.areaID = areaID;
+ }
+ /**
+ * 鑾峰彇 鍖哄煙缂栫爜
+ * @return String
+ */
+ public String getAreaCode(){
+ return areaCode;
+ }
+ /**
+ * 璁剧疆 鍖哄煙缂栫爜
+ * @param areaCode
+ */
+ public void setAreaCode(String areaCode){
+ this.areaCode = areaCode;
+ }
+ /**
+ * 鑾峰彇 甯傜紪鐮�
+ * @return String
+ */
+ public String getCityCode(){
+ return cityCode;
+ }
+ /**
+ * 璁剧疆 甯傜紪鐮�
+ * @param cityCode
+ */
+ public void setCityCode(String cityCode){
+ this.cityCode = cityCode;
+ }
+ /**
+ * 鑾峰彇 鍖虹紪鐮�
+ * @return String
+ */
+ public String getDistrictCode(){
+ return districtCode;
+ }
+ /**
+ * 璁剧疆 鍖虹紪鐮�
+ * @param districtCode
+ */
+ public void setDistrictCode(String districtCode){
+ this.districtCode = districtCode;
+ }
+ /**
+ * 鑾峰彇 绔欑偣鏈嶅姟鍣╥p
+ * @return String
+ */
+ public String getSiteIp(){
+ return siteIp;
+ }
+ /**
+ * 璁剧疆 绔欑偣鏈嶅姟鍣╥p
+ * @param siteIp
+ */
+ public void setSiteIp(String siteIp){
+ this.siteIp = siteIp;
+ }
+ /**
+ * 鑾峰彇 绔欑偣鏈嶅姟鍣ㄧ鍙�
+ * @return String
+ */
+ public String getSitePort(){
+ return sitePort;
+ }
+ /**
+ * 璁剧疆 绔欑偣鏈嶅姟鍣ㄧ鍙�
+ * @param sitePort
+ */
+ public void setSitePort(String sitePort){
+ this.sitePort = sitePort;
+ }
+ /**
+ * 鑾峰彇 缁忓害
+ * @return String
+ */
+ public String getLongitude(){
+ return longitude;
+ }
+ /**
+ * 璁剧疆 缁忓害
+ * @param longitude
+ */
+ public void setLongitude(String longitude){
+ this.longitude = longitude;
+ }
+ /**
+ * 鑾峰彇 绾害
+ * @return String
+ */
+ public String getLatitude(){
+ return latitude;
+ }
+ /**
+ * 璁剧疆 绾害
+ * @param latitude
+ */
+ public void setLatitude(String latitude){
+ this.latitude = latitude;
+ }
+ /**
+ * 鑾峰彇 鏄惁鏈変笅绾�(0.鍚︼紝1.鏄�)
+ * @return String
+ */
+ public String getHaveSonArea(){
+ return haveSonArea;
+ }
+ /**
+ * 璁剧疆 鏄惁鏈変笅绾�(0.鍚︼紝1.鏄�)
+ * @param haveSonArea
+ */
+ public void setHaveSonArea(String haveSonArea){
+ this.haveSonArea = haveSonArea;
+ }
+ /**
+ * 鑾峰彇 涓績鑱旂郴鐢佃瘽
+ * @return String
+ */
+ public String getSiteTel(){
+ return siteTel;
+ }
+ /**
+ * 璁剧疆 涓績鑱旂郴鐢佃瘽
+ * @param siteTel
+ */
+ public void setSiteTel(String siteTel){
+ this.siteTel = siteTel;
+ }
+ /**
+ * 鑾峰彇 涓績璇︾粏鍦板潃
+ * @return String
+ */
+ public String getDetailAddress(){
+ return detailAddress;
+ }
+ /**
+ * 璁剧疆 涓績璇︾粏鍦板潃
+ * @param detailAddress
+ */
+ public void setDetailAddress(String detailAddress){
+ this.detailAddress = detailAddress;
+ }
+ /**
+ * 鑾峰彇 涓績浠嬬粛
+ * @return String
+ */
+ public String getSiteRemark(){
+ return siteRemark;
+ }
+ /**
+ * 璁剧疆 涓績浠嬬粛
+ * @param siteRemark
+ */
+ public void setSiteRemark(String siteRemark){
+ this.siteRemark = siteRemark;
+ }
+ /**
+ * 鑾峰彇 涓婂崍涓婄彮寮€濮嬫椂闂�
+ * @return String
+ */
+ public String getAmWorkStartTime(){
+ return amWorkStartTime;
+ }
+ /**
+ * 璁剧疆 涓婂崍涓婄彮寮€濮嬫椂闂�
+ * @param amWorkStartTime
+ */
+ public void setAmWorkStartTime(String amWorkStartTime){
+ this.amWorkStartTime = amWorkStartTime;
+ }
+ /**
+ * 鑾峰彇 涓婂崍涓婄彮缁撴潫鏃堕棿
+ * @return String
+ */
+ public String getAmWorkEndTime(){
+ return amWorkEndTime;
+ }
+ /**
+ * 璁剧疆 涓婂崍涓婄彮缁撴潫鏃堕棿
+ * @param amWorkEndTime
+ */
+ public void setAmWorkEndTime(String amWorkEndTime){
+ this.amWorkEndTime = amWorkEndTime;
+ }
+ /**
+ * 鑾峰彇 涓嬪崍涓婄彮寮€濮嬫椂闂�
+ * @return String
+ */
+ public String getPmWorkStartTime(){
+ return pmWorkStartTime;
+ }
+ /**
+ * 璁剧疆 涓嬪崍涓婄彮寮€濮嬫椂闂�
+ * @param pmWorkStartTime
+ */
+ public void setPmWorkStartTime(String pmWorkStartTime){
+ this.pmWorkStartTime = pmWorkStartTime;
+ }
+ /**
+ * 鑾峰彇 涓嬪崍涓婄彮缁撴潫鏃堕棿
+ * @return String
+ */
+ public String getPmWorkEndTime(){
+ return pmWorkEndTime;
+ }
+ /**
+ * 璁剧疆 涓嬪崍涓婄彮缁撴潫鏃堕棿
+ * @param pmWorkEndTime
+ */
+ public void setPmWorkEndTime(String pmWorkEndTime){
+ this.pmWorkEndTime = pmWorkEndTime;
+ }
+ /**
+ * 鑾峰彇 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
+ * @return Integer
+ */
+ public Integer getAverageTime(){
+ return averageTime;
+ }
+ /**
+ * 璁剧疆 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
+ * @param averageTime
+ */
+ public void setAverageTime(Integer averageTime){
+ this.averageTime = averageTime;
+ }
+ /**
+ * 鑾峰彇 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
+ * @return Integer
+ */
+ public Integer getWaitingNumber(){
+ return waitingNumber;
+ }
+ /**
+ * 璁剧疆 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
+ * @param waitingNumber
+ */
+ public void setWaitingNumber(Integer waitingNumber){
+ this.waitingNumber = waitingNumber;
+ }
+ /**
+ * 鑾峰彇 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
+ * @return Integer
+ */
+ public Integer getWorkday1(){
+ return workday1;
+ }
+ /**
+ * 璁剧疆 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday1
+ */
+ public void setWorkday1(Integer workday1){
+ this.workday1 = workday1;
+ }
+ /**
+ * 鑾峰彇 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
+ * @return Integer
+ */
+ public Integer getWorkday2(){
+ return workday2;
+ }
+ /**
+ * 璁剧疆 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday2
+ */
+ public void setWorkday2(Integer workday2){
+ this.workday2 = workday2;
+ }
+ /**
+ * 鑾峰彇 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
+ * @return Integer
+ */
+ public Integer getWorkday3(){
+ return workday3;
+ }
+ /**
+ * 璁剧疆 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday3
+ */
+ public void setWorkday3(Integer workday3){
+ this.workday3 = workday3;
+ }
+ /**
+ * 鑾峰彇 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
+ * @return Integer
+ */
+ public Integer getWorkday4(){
+ return workday4;
+ }
+ /**
+ * 璁剧疆 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday4
+ */
+ public void setWorkday4(Integer workday4){
+ this.workday4 = workday4;
+ }
+ /**
+ * 鑾峰彇 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
+ * @return Integer
+ */
+ public Integer getWorkday5(){
+ return workday5;
+ }
+ /**
+ * 璁剧疆 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday5
+ */
+ public void setWorkday5(Integer workday5){
+ this.workday5 = workday5;
+ }
+ /**
+ * 鑾峰彇 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
+ * @return Integer
+ */
+ public Integer getWorkday6(){
+ return workday6;
+ }
+ /**
+ * 璁剧疆 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday6
+ */
+ public void setWorkday6(Integer workday6){
+ this.workday6 = workday6;
+ }
+ /**
+ * 鑾峰彇 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
+ * @return Integer
+ */
+ public Integer getWorkday7(){
+ return workday7;
+ }
+ /**
+ * 璁剧疆 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday7
+ */
+ public void setWorkday7(Integer workday7){
+ this.workday7 = workday7;
+ }
+ /**
+ * 鑾峰彇 妤煎眰
+ * @return Integer
+ */
+ public Integer getLevel(){
+ return level;
+ }
+ /**
+ * 璁剧疆 妤煎眰
+ * @param level
+ */
+ public void setLevel(Integer level){
+ this.level = level;
+ }
+ /**
+ * 鑾峰彇 妤兼爧
+ * @return Integer
+ */
+ public Integer getBuilding(){
+ return building;
+ }
+ /**
+ * 璁剧疆 妤兼爧
+ * @param building
+ */
+ public void setBuilding(Integer building){
+ this.building = building;
+ }
+ /**
+ * 鑾峰彇 鏄惁鏄珯鐐� (1.鏄�,0.鍚�)
+ * @return Integer
+ */
+ public Integer getIsSite(){
+ return isSite;
+ }
+ /**
+ * 璁剧疆 鏄惁鏄珯鐐� (1.鏄�,0.鍚�)
+ * @param isSite
+ */
+ public void setIsSite(Integer isSite){
+ this.isSite = isSite;
+ }
+ /**
+ * 鑾峰彇 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+ * @return Integer
+ */
+ public Integer getStatus(){
+ return status;
+ }
+ /**
+ * 璁剧疆 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+ * @param status
+ */
+ public void setStatus(Integer status){
+ this.status = status;
+ }
+ /**
+ * 鑾峰彇 璁惧logo鍦板潃
+ * @return String
+ */
+ public String getLogoPath(){
+ return logoPath;
+ }
+ /**
+ * 璁剧疆 璁惧logo鍦板潃
+ * @param logoPath
+ */
+ public void setLogoPath(String logoPath){
+ this.logoPath = logoPath;
+ }
+ /**
+ * 鑾峰彇 绔欑偣鑻辨枃鍚嶇О
+ * @return String
+ */
+ public String getEnglishName(){
+ return englishName;
+ }
+ /**
+ * 璁剧疆 绔欑偣鑻辨枃鍚嶇О
+ * @param englishName
+ */
+ public void setEnglishName(String englishName){
+ this.englishName = englishName;
+ }
+ /**
+ * 鑾峰彇 璐熻矗浜�
+ * @return String
+ */
+ public String getLeadingOfficial(){
+ return leadingOfficial;
+ }
+ /**
+ * 璁剧疆 璐熻矗浜�
+ * @param leadingOfficial
+ */
+ public void setLeadingOfficial(String leadingOfficial){
+ this.leadingOfficial = leadingOfficial;
+ }
+ /**
+ * 鑾峰彇 鑱旂郴鐢佃瘽
+ * @return String
+ */
+ public String getLeadingOfficialTelephone(){
+ return leadingOfficialTelephone;
+ }
+ /**
+ * 璁剧疆 鑱旂郴鐢佃瘽
+ * @param leadingOfficialTelephone
+ */
+ public void setLeadingOfficialTelephone(String leadingOfficialTelephone){
+ this.leadingOfficialTelephone = leadingOfficialTelephone;
+ }
+ /**
+ * 鑾峰彇 閮ㄧ讲妯″潡锛岄€楀彿鍒嗛殧
+ * @return String
+ */
+ public String getModelIds(){
+ return modelIds;
+ }
+ /**
+ * 璁剧疆 閮ㄧ讲妯″潡锛岄€楀彿鍒嗛殧
+ * @param modelIds
+ */
+ public void setModelIds(String modelIds){
+ this.modelIds = modelIds;
+ }
+
+ /**
+ * 鑾峰彇 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
+ * @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;
+ }
+
+ /**
+ * 鑾峰彇 绔欑偣鍚嶇О
+ * @return siteNameList
+ */
+ public List<String> getSiteNameList(){
+ return this.siteNameList;
+ }
+
+ /**
+ * 璁剧疆 绔欑偣鍚嶇О
+ * @param siteNameList
+ */
+ public void setSiteNameList(List<String> siteNameList){
+ this.siteNameList = siteNameList;
+ }
+ /**
+ * 鑾峰彇 寮€濮� 鐖剁骇id,榛樿0
+ * @return parentIdStart
+ */
+ public Long getParentIdStart(){
+ return this.parentIdStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鐖剁骇id,榛樿0
+ * @param parentIdStart
+ */
+ public void setParentIdStart(Long parentIdStart){
+ this.parentIdStart = parentIdStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 鐖剁骇id,榛樿0
+ * @return $parentIdEnd
+ */
+ public Long getParentIdEnd(){
+ return this.parentIdEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鐖剁骇id,榛樿0
+ * @param parentIdEnd
+ */
+ public void setParentIdEnd(Long parentIdEnd){
+ this.parentIdEnd = parentIdEnd;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 鐖剁骇id,榛樿0
+ * @return parentIdIncrement
+ */
+ public Long getParentIdIncrement(){
+ return this.parentIdIncrement;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鐖剁骇id,榛樿0
+ * @param parentIdIncrement
+ */
+ public void setParentIdIncrement(Long parentIdIncrement){
+ this.parentIdIncrement = parentIdIncrement;
+ }
+
+ /**
+ * 鑾峰彇 鐖剁骇id,榛樿0
+ * @return parentIdList
+ */
+ public List<Long> getParentIdList(){
+ return this.parentIdList;
+ }
+
+ /**
+ * 璁剧疆 鐖剁骇id,榛樿0
+ * @param parentIdList
+ */
+ public void setParentIdList(List<Long> parentIdList){
+ this.parentIdList = parentIdList;
+ }
+
+ /**
+ * 鑾峰彇 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
+ * @return ancestorsList
+ */
+ public List<String> getAncestorsList(){
+ return this.ancestorsList;
+ }
+
+ /**
+ * 璁剧疆 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
+ * @param ancestorsList
+ */
+ public void setAncestorsList(List<String> ancestorsList){
+ this.ancestorsList = ancestorsList;
+ }
+ /**
+ * 鑾峰彇 鍖哄煙缂栧彿
+ * @return regionCodeList
+ */
+ public List<String> getRegionCodeList(){
+ return this.regionCodeList;
+ }
+
+ /**
+ * 璁剧疆 鍖哄煙缂栧彿
+ * @param regionCodeList
+ */
+ public void setRegionCodeList(List<String> regionCodeList){
+ this.regionCodeList = regionCodeList;
+ }
+ /**
+ * 鑾峰彇 鏍囪瘑ID
+ * @return iidList
+ */
+ public List<String> getIidList(){
+ return this.iidList;
+ }
+
+ /**
+ * 璁剧疆 鏍囪瘑ID
+ * @param iidList
+ */
+ public void setIidList(List<String> iidList){
+ this.iidList = iidList;
+ }
+ /**
+ * 鑾峰彇 绔欑偣缂栧彿
+ * @return siteCodeList
+ */
+ public List<String> getSiteCodeList(){
+ return this.siteCodeList;
+ }
+
+ /**
+ * 璁剧疆 绔欑偣缂栧彿
+ * @param siteCodeList
+ */
+ public void setSiteCodeList(List<String> siteCodeList){
+ this.siteCodeList = siteCodeList;
+ }
+ /**
+ * 鑾峰彇 鐪佺紪鐮�
+ * @return proCodeList
+ */
+ public List<String> getProCodeList(){
+ return this.proCodeList;
+ }
+
+ /**
+ * 璁剧疆 鐪佺紪鐮�
+ * @param proCodeList
+ */
+ public void setProCodeList(List<String> proCodeList){
+ this.proCodeList = proCodeList;
+ }
+ /**
+ * 鑾峰彇 鍖哄煙ID
+ * @return areaIDList
+ */
+ public List<String> getAreaIDList(){
+ return this.areaIDList;
+ }
+
+ /**
+ * 璁剧疆 鍖哄煙ID
+ * @param areaIDList
+ */
+ public void setAreaIDList(List<String> areaIDList){
+ this.areaIDList = areaIDList;
+ }
+ /**
+ * 鑾峰彇 鍖哄煙缂栫爜
+ * @return areaCodeList
+ */
+ public List<String> getAreaCodeList(){
+ return this.areaCodeList;
+ }
+
+ /**
+ * 璁剧疆 鍖哄煙缂栫爜
+ * @param areaCodeList
+ */
+ public void setAreaCodeList(List<String> areaCodeList){
+ this.areaCodeList = areaCodeList;
+ }
+ /**
+ * 鑾峰彇 甯傜紪鐮�
+ * @return cityCodeList
+ */
+ public List<String> getCityCodeList(){
+ return this.cityCodeList;
+ }
+
+ /**
+ * 璁剧疆 甯傜紪鐮�
+ * @param cityCodeList
+ */
+ public void setCityCodeList(List<String> cityCodeList){
+ this.cityCodeList = cityCodeList;
+ }
+ /**
+ * 鑾峰彇 鍖虹紪鐮�
+ * @return districtCodeList
+ */
+ public List<String> getDistrictCodeList(){
+ return this.districtCodeList;
+ }
+
+ /**
+ * 璁剧疆 鍖虹紪鐮�
+ * @param districtCodeList
+ */
+ public void setDistrictCodeList(List<String> districtCodeList){
+ this.districtCodeList = districtCodeList;
+ }
+ /**
+ * 鑾峰彇 绔欑偣鏈嶅姟鍣╥p
+ * @return siteIpList
+ */
+ public List<String> getSiteIpList(){
+ return this.siteIpList;
+ }
+
+ /**
+ * 璁剧疆 绔欑偣鏈嶅姟鍣╥p
+ * @param siteIpList
+ */
+ public void setSiteIpList(List<String> siteIpList){
+ this.siteIpList = siteIpList;
+ }
+ /**
+ * 鑾峰彇 绔欑偣鏈嶅姟鍣ㄧ鍙�
+ * @return sitePortList
+ */
+ public List<String> getSitePortList(){
+ return this.sitePortList;
+ }
+
+ /**
+ * 璁剧疆 绔欑偣鏈嶅姟鍣ㄧ鍙�
+ * @param sitePortList
+ */
+ public void setSitePortList(List<String> sitePortList){
+ this.sitePortList = sitePortList;
+ }
+ /**
+ * 鑾峰彇 缁忓害
+ * @return longitudeList
+ */
+ public List<String> getLongitudeList(){
+ return this.longitudeList;
+ }
+
+ /**
+ * 璁剧疆 缁忓害
+ * @param longitudeList
+ */
+ public void setLongitudeList(List<String> longitudeList){
+ this.longitudeList = longitudeList;
+ }
+ /**
+ * 鑾峰彇 绾害
+ * @return latitudeList
+ */
+ public List<String> getLatitudeList(){
+ return this.latitudeList;
+ }
+
+ /**
+ * 璁剧疆 绾害
+ * @param latitudeList
+ */
+ public void setLatitudeList(List<String> latitudeList){
+ this.latitudeList = latitudeList;
+ }
+ /**
+ * 鑾峰彇 鏄惁鏈変笅绾�(0.鍚︼紝1.鏄�)
+ * @return haveSonAreaList
+ */
+ public List<String> getHaveSonAreaList(){
+ return this.haveSonAreaList;
+ }
+
+ /**
+ * 璁剧疆 鏄惁鏈変笅绾�(0.鍚︼紝1.鏄�)
+ * @param haveSonAreaList
+ */
+ public void setHaveSonAreaList(List<String> haveSonAreaList){
+ this.haveSonAreaList = haveSonAreaList;
+ }
+ /**
+ * 鑾峰彇 涓績鑱旂郴鐢佃瘽
+ * @return siteTelList
+ */
+ public List<String> getSiteTelList(){
+ return this.siteTelList;
+ }
+
+ /**
+ * 璁剧疆 涓績鑱旂郴鐢佃瘽
+ * @param siteTelList
+ */
+ public void setSiteTelList(List<String> siteTelList){
+ this.siteTelList = siteTelList;
+ }
+ /**
+ * 鑾峰彇 涓績璇︾粏鍦板潃
+ * @return detailAddressList
+ */
+ public List<String> getDetailAddressList(){
+ return this.detailAddressList;
+ }
+
+ /**
+ * 璁剧疆 涓績璇︾粏鍦板潃
+ * @param detailAddressList
+ */
+ public void setDetailAddressList(List<String> detailAddressList){
+ this.detailAddressList = detailAddressList;
+ }
+ /**
+ * 鑾峰彇 涓績浠嬬粛
+ * @return siteRemarkList
+ */
+ public List<String> getSiteRemarkList(){
+ return this.siteRemarkList;
+ }
+
+ /**
+ * 璁剧疆 涓績浠嬬粛
+ * @param siteRemarkList
+ */
+ public void setSiteRemarkList(List<String> siteRemarkList){
+ this.siteRemarkList = siteRemarkList;
+ }
+ /**
+ * 鑾峰彇 涓婂崍涓婄彮寮€濮嬫椂闂�
+ * @return amWorkStartTimeList
+ */
+ public List<String> getAmWorkStartTimeList(){
+ return this.amWorkStartTimeList;
+ }
+
+ /**
+ * 璁剧疆 涓婂崍涓婄彮寮€濮嬫椂闂�
+ * @param amWorkStartTimeList
+ */
+ public void setAmWorkStartTimeList(List<String> amWorkStartTimeList){
+ this.amWorkStartTimeList = amWorkStartTimeList;
+ }
+ /**
+ * 鑾峰彇 涓婂崍涓婄彮缁撴潫鏃堕棿
+ * @return amWorkEndTimeList
+ */
+ public List<String> getAmWorkEndTimeList(){
+ return this.amWorkEndTimeList;
+ }
+
+ /**
+ * 璁剧疆 涓婂崍涓婄彮缁撴潫鏃堕棿
+ * @param amWorkEndTimeList
+ */
+ public void setAmWorkEndTimeList(List<String> amWorkEndTimeList){
+ this.amWorkEndTimeList = amWorkEndTimeList;
+ }
+ /**
+ * 鑾峰彇 涓嬪崍涓婄彮寮€濮嬫椂闂�
+ * @return pmWorkStartTimeList
+ */
+ public List<String> getPmWorkStartTimeList(){
+ return this.pmWorkStartTimeList;
+ }
+
+ /**
+ * 璁剧疆 涓嬪崍涓婄彮寮€濮嬫椂闂�
+ * @param pmWorkStartTimeList
+ */
+ public void setPmWorkStartTimeList(List<String> pmWorkStartTimeList){
+ this.pmWorkStartTimeList = pmWorkStartTimeList;
+ }
+ /**
+ * 鑾峰彇 涓嬪崍涓婄彮缁撴潫鏃堕棿
+ * @return pmWorkEndTimeList
+ */
+ public List<String> getPmWorkEndTimeList(){
+ return this.pmWorkEndTimeList;
+ }
+
+ /**
+ * 璁剧疆 涓嬪崍涓婄彮缁撴潫鏃堕棿
+ * @param pmWorkEndTimeList
+ */
+ public void setPmWorkEndTimeList(List<String> pmWorkEndTimeList){
+ this.pmWorkEndTimeList = pmWorkEndTimeList;
+ }
+ /**
+ * 鑾峰彇 寮€濮� 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
+ * @return averageTimeStart
+ */
+ public Integer getAverageTimeStart(){
+ return this.averageTimeStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
+ * @param averageTimeStart
+ */
+ public void setAverageTimeStart(Integer averageTimeStart){
+ this.averageTimeStart = averageTimeStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
+ * @return $averageTimeEnd
+ */
+ public Integer getAverageTimeEnd(){
+ return this.averageTimeEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
+ * @param averageTimeEnd
+ */
+ public void setAverageTimeEnd(Integer averageTimeEnd){
+ this.averageTimeEnd = averageTimeEnd;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
+ * @return averageTimeIncrement
+ */
+ public Integer getAverageTimeIncrement(){
+ return this.averageTimeIncrement;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
+ * @param averageTimeIncrement
+ */
+ public void setAverageTimeIncrement(Integer averageTimeIncrement){
+ this.averageTimeIncrement = averageTimeIncrement;
+ }
+
+ /**
+ * 鑾峰彇 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
+ * @return averageTimeList
+ */
+ public List<Integer> getAverageTimeList(){
+ return this.averageTimeList;
+ }
+
+ /**
+ * 璁剧疆 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
+ * @param averageTimeList
+ */
+ public void setAverageTimeList(List<Integer> averageTimeList){
+ this.averageTimeList = averageTimeList;
+ }
+
+ /**
+ * 鑾峰彇 寮€濮� 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
+ * @return waitingNumberStart
+ */
+ public Integer getWaitingNumberStart(){
+ return this.waitingNumberStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
+ * @param waitingNumberStart
+ */
+ public void setWaitingNumberStart(Integer waitingNumberStart){
+ this.waitingNumberStart = waitingNumberStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
+ * @return $waitingNumberEnd
+ */
+ public Integer getWaitingNumberEnd(){
+ return this.waitingNumberEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
+ * @param waitingNumberEnd
+ */
+ public void setWaitingNumberEnd(Integer waitingNumberEnd){
+ this.waitingNumberEnd = waitingNumberEnd;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
+ * @return waitingNumberIncrement
+ */
+ public Integer getWaitingNumberIncrement(){
+ return this.waitingNumberIncrement;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
+ * @param waitingNumberIncrement
+ */
+ public void setWaitingNumberIncrement(Integer waitingNumberIncrement){
+ this.waitingNumberIncrement = waitingNumberIncrement;
+ }
+
+ /**
+ * 鑾峰彇 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
+ * @return waitingNumberList
+ */
+ public List<Integer> getWaitingNumberList(){
+ return this.waitingNumberList;
+ }
+
+ /**
+ * 璁剧疆 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
+ * @param waitingNumberList
+ */
+ public void setWaitingNumberList(List<Integer> waitingNumberList){
+ this.waitingNumberList = waitingNumberList;
+ }
+
+ /**
+ * 鑾峰彇 寮€濮� 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday1Start
+ */
+ public Integer getWorkday1Start(){
+ return this.workday1Start;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday1Start
+ */
+ public void setWorkday1Start(Integer workday1Start){
+ this.workday1Start = workday1Start;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
+ * @return $workday1End
+ */
+ public Integer getWorkday1End(){
+ return this.workday1End;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday1End
+ */
+ public void setWorkday1End(Integer workday1End){
+ this.workday1End = workday1End;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday1Increment
+ */
+ public Integer getWorkday1Increment(){
+ return this.workday1Increment;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday1Increment
+ */
+ public void setWorkday1Increment(Integer workday1Increment){
+ this.workday1Increment = workday1Increment;
+ }
+
+ /**
+ * 鑾峰彇 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday1List
+ */
+ public List<Integer> getWorkday1List(){
+ return this.workday1List;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday1List
+ */
+ public void setWorkday1List(List<Integer> workday1List){
+ this.workday1List = workday1List;
+ }
+
+ /**
+ * 鑾峰彇 寮€濮� 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday2Start
+ */
+ public Integer getWorkday2Start(){
+ return this.workday2Start;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday2Start
+ */
+ public void setWorkday2Start(Integer workday2Start){
+ this.workday2Start = workday2Start;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
+ * @return $workday2End
+ */
+ public Integer getWorkday2End(){
+ return this.workday2End;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday2End
+ */
+ public void setWorkday2End(Integer workday2End){
+ this.workday2End = workday2End;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday2Increment
+ */
+ public Integer getWorkday2Increment(){
+ return this.workday2Increment;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday2Increment
+ */
+ public void setWorkday2Increment(Integer workday2Increment){
+ this.workday2Increment = workday2Increment;
+ }
+
+ /**
+ * 鑾峰彇 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday2List
+ */
+ public List<Integer> getWorkday2List(){
+ return this.workday2List;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday2List
+ */
+ public void setWorkday2List(List<Integer> workday2List){
+ this.workday2List = workday2List;
+ }
+
+ /**
+ * 鑾峰彇 寮€濮� 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday3Start
+ */
+ public Integer getWorkday3Start(){
+ return this.workday3Start;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday3Start
+ */
+ public void setWorkday3Start(Integer workday3Start){
+ this.workday3Start = workday3Start;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
+ * @return $workday3End
+ */
+ public Integer getWorkday3End(){
+ return this.workday3End;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday3End
+ */
+ public void setWorkday3End(Integer workday3End){
+ this.workday3End = workday3End;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday3Increment
+ */
+ public Integer getWorkday3Increment(){
+ return this.workday3Increment;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday3Increment
+ */
+ public void setWorkday3Increment(Integer workday3Increment){
+ this.workday3Increment = workday3Increment;
+ }
+
+ /**
+ * 鑾峰彇 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday3List
+ */
+ public List<Integer> getWorkday3List(){
+ return this.workday3List;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday3List
+ */
+ public void setWorkday3List(List<Integer> workday3List){
+ this.workday3List = workday3List;
+ }
+
+ /**
+ * 鑾峰彇 寮€濮� 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday4Start
+ */
+ public Integer getWorkday4Start(){
+ return this.workday4Start;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday4Start
+ */
+ public void setWorkday4Start(Integer workday4Start){
+ this.workday4Start = workday4Start;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
+ * @return $workday4End
+ */
+ public Integer getWorkday4End(){
+ return this.workday4End;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday4End
+ */
+ public void setWorkday4End(Integer workday4End){
+ this.workday4End = workday4End;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday4Increment
+ */
+ public Integer getWorkday4Increment(){
+ return this.workday4Increment;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday4Increment
+ */
+ public void setWorkday4Increment(Integer workday4Increment){
+ this.workday4Increment = workday4Increment;
+ }
+
+ /**
+ * 鑾峰彇 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday4List
+ */
+ public List<Integer> getWorkday4List(){
+ return this.workday4List;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday4List
+ */
+ public void setWorkday4List(List<Integer> workday4List){
+ this.workday4List = workday4List;
+ }
+
+ /**
+ * 鑾峰彇 寮€濮� 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday5Start
+ */
+ public Integer getWorkday5Start(){
+ return this.workday5Start;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday5Start
+ */
+ public void setWorkday5Start(Integer workday5Start){
+ this.workday5Start = workday5Start;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
+ * @return $workday5End
+ */
+ public Integer getWorkday5End(){
+ return this.workday5End;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday5End
+ */
+ public void setWorkday5End(Integer workday5End){
+ this.workday5End = workday5End;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday5Increment
+ */
+ public Integer getWorkday5Increment(){
+ return this.workday5Increment;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday5Increment
+ */
+ public void setWorkday5Increment(Integer workday5Increment){
+ this.workday5Increment = workday5Increment;
+ }
+
+ /**
+ * 鑾峰彇 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday5List
+ */
+ public List<Integer> getWorkday5List(){
+ return this.workday5List;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday5List
+ */
+ public void setWorkday5List(List<Integer> workday5List){
+ this.workday5List = workday5List;
+ }
+
+ /**
+ * 鑾峰彇 寮€濮� 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday6Start
+ */
+ public Integer getWorkday6Start(){
+ return this.workday6Start;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday6Start
+ */
+ public void setWorkday6Start(Integer workday6Start){
+ this.workday6Start = workday6Start;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
+ * @return $workday6End
+ */
+ public Integer getWorkday6End(){
+ return this.workday6End;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday6End
+ */
+ public void setWorkday6End(Integer workday6End){
+ this.workday6End = workday6End;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday6Increment
+ */
+ public Integer getWorkday6Increment(){
+ return this.workday6Increment;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday6Increment
+ */
+ public void setWorkday6Increment(Integer workday6Increment){
+ this.workday6Increment = workday6Increment;
+ }
+
+ /**
+ * 鑾峰彇 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday6List
+ */
+ public List<Integer> getWorkday6List(){
+ return this.workday6List;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday6List
+ */
+ public void setWorkday6List(List<Integer> workday6List){
+ this.workday6List = workday6List;
+ }
+
+ /**
+ * 鑾峰彇 寮€濮� 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday7Start
+ */
+ public Integer getWorkday7Start(){
+ return this.workday7Start;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday7Start
+ */
+ public void setWorkday7Start(Integer workday7Start){
+ this.workday7Start = workday7Start;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
+ * @return $workday7End
+ */
+ public Integer getWorkday7End(){
+ return this.workday7End;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday7End
+ */
+ public void setWorkday7End(Integer workday7End){
+ this.workday7End = workday7End;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday7Increment
+ */
+ public Integer getWorkday7Increment(){
+ return this.workday7Increment;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday7Increment
+ */
+ public void setWorkday7Increment(Integer workday7Increment){
+ this.workday7Increment = workday7Increment;
+ }
+
+ /**
+ * 鑾峰彇 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
+ * @return workday7List
+ */
+ public List<Integer> getWorkday7List(){
+ return this.workday7List;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday7List
+ */
+ public void setWorkday7List(List<Integer> workday7List){
+ this.workday7List = workday7List;
+ }
+
+ /**
+ * 鑾峰彇 寮€濮� 妤煎眰
+ * @return levelStart
+ */
+ public Integer getLevelStart(){
+ return this.levelStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 妤煎眰
+ * @param levelStart
+ */
+ public void setLevelStart(Integer levelStart){
+ this.levelStart = levelStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 妤煎眰
+ * @return $levelEnd
+ */
+ public Integer getLevelEnd(){
+ return this.levelEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 妤煎眰
+ * @param levelEnd
+ */
+ public void setLevelEnd(Integer levelEnd){
+ this.levelEnd = levelEnd;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 妤煎眰
+ * @return levelIncrement
+ */
+ public Integer getLevelIncrement(){
+ return this.levelIncrement;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 妤煎眰
+ * @param levelIncrement
+ */
+ public void setLevelIncrement(Integer levelIncrement){
+ this.levelIncrement = levelIncrement;
+ }
+
+ /**
+ * 鑾峰彇 妤煎眰
+ * @return levelList
+ */
+ public List<Integer> getLevelList(){
+ return this.levelList;
+ }
+
+ /**
+ * 璁剧疆 妤煎眰
+ * @param levelList
+ */
+ public void setLevelList(List<Integer> levelList){
+ this.levelList = levelList;
+ }
+
+ /**
+ * 鑾峰彇 寮€濮� 妤兼爧
+ * @return buildingStart
+ */
+ public Integer getBuildingStart(){
+ return this.buildingStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 妤兼爧
+ * @param buildingStart
+ */
+ public void setBuildingStart(Integer buildingStart){
+ this.buildingStart = buildingStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 妤兼爧
+ * @return $buildingEnd
+ */
+ public Integer getBuildingEnd(){
+ return this.buildingEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 妤兼爧
+ * @param buildingEnd
+ */
+ public void setBuildingEnd(Integer buildingEnd){
+ this.buildingEnd = buildingEnd;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 妤兼爧
+ * @return buildingIncrement
+ */
+ public Integer getBuildingIncrement(){
+ return this.buildingIncrement;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 妤兼爧
+ * @param buildingIncrement
+ */
+ public void setBuildingIncrement(Integer buildingIncrement){
+ this.buildingIncrement = buildingIncrement;
+ }
+
+ /**
+ * 鑾峰彇 妤兼爧
+ * @return buildingList
+ */
+ public List<Integer> getBuildingList(){
+ return this.buildingList;
+ }
+
+ /**
+ * 璁剧疆 妤兼爧
+ * @param buildingList
+ */
+ public void setBuildingList(List<Integer> buildingList){
+ this.buildingList = buildingList;
+ }
+
+ /**
+ * 鑾峰彇 寮€濮� 鏄惁鏄珯鐐� (1.鏄�,0.鍚�)
+ * @return isSiteStart
+ */
+ public Integer getIsSiteStart(){
+ return this.isSiteStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鏄惁鏄珯鐐� (1.鏄�,0.鍚�)
+ * @param isSiteStart
+ */
+ public void setIsSiteStart(Integer isSiteStart){
+ this.isSiteStart = isSiteStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 鏄惁鏄珯鐐� (1.鏄�,0.鍚�)
+ * @return $isSiteEnd
+ */
+ public Integer getIsSiteEnd(){
+ return this.isSiteEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鏄惁鏄珯鐐� (1.鏄�,0.鍚�)
+ * @param isSiteEnd
+ */
+ public void setIsSiteEnd(Integer isSiteEnd){
+ this.isSiteEnd = isSiteEnd;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 鏄惁鏄珯鐐� (1.鏄�,0.鍚�)
+ * @return isSiteIncrement
+ */
+ public Integer getIsSiteIncrement(){
+ return this.isSiteIncrement;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鏄惁鏄珯鐐� (1.鏄�,0.鍚�)
+ * @param isSiteIncrement
+ */
+ public void setIsSiteIncrement(Integer isSiteIncrement){
+ this.isSiteIncrement = isSiteIncrement;
+ }
+
+ /**
+ * 鑾峰彇 鏄惁鏄珯鐐� (1.鏄�,0.鍚�)
+ * @return isSiteList
+ */
+ public List<Integer> getIsSiteList(){
+ return this.isSiteList;
+ }
+
+ /**
+ * 璁剧疆 鏄惁鏄珯鐐� (1.鏄�,0.鍚�)
+ * @param isSiteList
+ */
+ public void setIsSiteList(List<Integer> isSiteList){
+ this.isSiteList = isSiteList;
+ }
+
+ /**
+ * 鑾峰彇 寮€濮� 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+ * @return statusStart
+ */
+ public Integer getStatusStart(){
+ return this.statusStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+ * @param statusStart
+ */
+ public void setStatusStart(Integer statusStart){
+ this.statusStart = statusStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+ * @return $statusEnd
+ */
+ public Integer getStatusEnd(){
+ return this.statusEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+ * @param statusEnd
+ */
+ public void setStatusEnd(Integer statusEnd){
+ this.statusEnd = statusEnd;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+ * @return statusIncrement
+ */
+ public Integer getStatusIncrement(){
+ return this.statusIncrement;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+ * @param statusIncrement
+ */
+ public void setStatusIncrement(Integer statusIncrement){
+ this.statusIncrement = statusIncrement;
+ }
+
+ /**
+ * 鑾峰彇 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+ * @return statusList
+ */
+ public List<Integer> getStatusList(){
+ return this.statusList;
+ }
+
+ /**
+ * 璁剧疆 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+ * @param statusList
+ */
+ public void setStatusList(List<Integer> statusList){
+ this.statusList = statusList;
+ }
+
+ /**
+ * 鑾峰彇 璁惧logo鍦板潃
+ * @return logoPathList
+ */
+ public List<String> getLogoPathList(){
+ return this.logoPathList;
+ }
+
+ /**
+ * 璁剧疆 璁惧logo鍦板潃
+ * @param logoPathList
+ */
+ public void setLogoPathList(List<String> logoPathList){
+ this.logoPathList = logoPathList;
+ }
+ /**
+ * 鑾峰彇 绔欑偣鑻辨枃鍚嶇О
+ * @return englishNameList
+ */
+ public List<String> getEnglishNameList(){
+ return this.englishNameList;
+ }
+
+ /**
+ * 璁剧疆 绔欑偣鑻辨枃鍚嶇О
+ * @param englishNameList
+ */
+ public void setEnglishNameList(List<String> englishNameList){
+ this.englishNameList = englishNameList;
+ }
+ /**
+ * 鑾峰彇 璐熻矗浜�
+ * @return leadingOfficialList
+ */
+ public List<String> getLeadingOfficialList(){
+ return this.leadingOfficialList;
+ }
+
+ /**
+ * 璁剧疆 璐熻矗浜�
+ * @param leadingOfficialList
+ */
+ public void setLeadingOfficialList(List<String> leadingOfficialList){
+ this.leadingOfficialList = leadingOfficialList;
+ }
+ /**
+ * 鑾峰彇 鑱旂郴鐢佃瘽
+ * @return leadingOfficialTelephoneList
+ */
+ public List<String> getLeadingOfficialTelephoneList(){
+ return this.leadingOfficialTelephoneList;
+ }
+
+ /**
+ * 璁剧疆 鑱旂郴鐢佃瘽
+ * @param leadingOfficialTelephoneList
+ */
+ public void setLeadingOfficialTelephoneList(List<String> leadingOfficialTelephoneList){
+ this.leadingOfficialTelephoneList = leadingOfficialTelephoneList;
+ }
+ /**
+ * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
+ * @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;
+ }
+
+ /**
+ * 鑾峰彇 閮ㄧ讲妯″潡锛岄€楀彿鍒嗛殧
+ * @return modelIdsList
+ */
+ public List<String> getModelIdsList(){
+ return this.modelIdsList;
+ }
+
+ /**
+ * 璁剧疆 閮ㄧ讲妯″潡锛岄€楀彿鍒嗛殧
+ * @param modelIdsList
+ */
+ public void setModelIdsList(List<String> modelIdsList){
+ this.modelIdsList = modelIdsList;
+ }
+ /**
+ * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+ * @param id
+ */
+ public SitePdu id(Long id){
+ setId(id);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
+ * @param idStart
+ */
+ public SitePdu idStart(Long idStart){
+ this.idStart = idStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
+ * @param idEnd
+ */
+ public SitePdu idEnd(Long idEnd){
+ this.idEnd = idEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
+ * @param idIncrement
+ */
+ public SitePdu idIncrement(Long idIncrement){
+ this.idIncrement = idIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+ * @param idList
+ */
+ public SitePdu idList(List<Long> idList){
+ this.idList = idList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 绔欑偣鍚嶇О
+ * @param siteName
+ */
+ public SitePdu siteName(String siteName){
+ setSiteName(siteName);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 绔欑偣鍚嶇О
+ * @param siteNameList
+ */
+ public SitePdu siteNameList(List<String> siteNameList){
+ this.siteNameList = siteNameList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鐖剁骇id,榛樿0
+ * @param parentId
+ */
+ public SitePdu parentId(Long parentId){
+ setParentId(parentId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鐖剁骇id,榛樿0
+ * @param parentIdStart
+ */
+ public SitePdu parentIdStart(Long parentIdStart){
+ this.parentIdStart = parentIdStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鐖剁骇id,榛樿0
+ * @param parentIdEnd
+ */
+ public SitePdu parentIdEnd(Long parentIdEnd){
+ this.parentIdEnd = parentIdEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鐖剁骇id,榛樿0
+ * @param parentIdIncrement
+ */
+ public SitePdu parentIdIncrement(Long parentIdIncrement){
+ this.parentIdIncrement = parentIdIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鐖剁骇id,榛樿0
+ * @param parentIdList
+ */
+ public SitePdu parentIdList(List<Long> parentIdList){
+ this.parentIdList = parentIdList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
+ * @param ancestors
+ */
+ public SitePdu ancestors(String ancestors){
+ setAncestors(ancestors);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
+ * @param ancestorsList
+ */
+ public SitePdu ancestorsList(List<String> ancestorsList){
+ this.ancestorsList = ancestorsList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鍖哄煙缂栧彿
+ * @param regionCode
+ */
+ public SitePdu regionCode(String regionCode){
+ setRegionCode(regionCode);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍖哄煙缂栧彿
+ * @param regionCodeList
+ */
+ public SitePdu regionCodeList(List<String> regionCodeList){
+ this.regionCodeList = regionCodeList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鏍囪瘑ID
+ * @param iid
+ */
+ public SitePdu iid(String iid){
+ setIid(iid);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鏍囪瘑ID
+ * @param iidList
+ */
+ public SitePdu iidList(List<String> iidList){
+ this.iidList = iidList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 绔欑偣缂栧彿
+ * @param siteCode
+ */
+ public SitePdu siteCode(String siteCode){
+ setSiteCode(siteCode);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 绔欑偣缂栧彿
+ * @param siteCodeList
+ */
+ public SitePdu siteCodeList(List<String> siteCodeList){
+ this.siteCodeList = siteCodeList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鐪佺紪鐮�
+ * @param proCode
+ */
+ public SitePdu proCode(String proCode){
+ setProCode(proCode);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鐪佺紪鐮�
+ * @param proCodeList
+ */
+ public SitePdu proCodeList(List<String> proCodeList){
+ this.proCodeList = proCodeList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鍖哄煙ID
+ * @param areaID
+ */
+ public SitePdu areaID(String areaID){
+ setAreaID(areaID);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍖哄煙ID
+ * @param areaIDList
+ */
+ public SitePdu areaIDList(List<String> areaIDList){
+ this.areaIDList = areaIDList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鍖哄煙缂栫爜
+ * @param areaCode
+ */
+ public SitePdu areaCode(String areaCode){
+ setAreaCode(areaCode);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍖哄煙缂栫爜
+ * @param areaCodeList
+ */
+ public SitePdu areaCodeList(List<String> areaCodeList){
+ this.areaCodeList = areaCodeList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 甯傜紪鐮�
+ * @param cityCode
+ */
+ public SitePdu cityCode(String cityCode){
+ setCityCode(cityCode);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 甯傜紪鐮�
+ * @param cityCodeList
+ */
+ public SitePdu cityCodeList(List<String> cityCodeList){
+ this.cityCodeList = cityCodeList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鍖虹紪鐮�
+ * @param districtCode
+ */
+ public SitePdu districtCode(String districtCode){
+ setDistrictCode(districtCode);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍖虹紪鐮�
+ * @param districtCodeList
+ */
+ public SitePdu districtCodeList(List<String> districtCodeList){
+ this.districtCodeList = districtCodeList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 绔欑偣鏈嶅姟鍣╥p
+ * @param siteIp
+ */
+ public SitePdu siteIp(String siteIp){
+ setSiteIp(siteIp);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 绔欑偣鏈嶅姟鍣╥p
+ * @param siteIpList
+ */
+ public SitePdu siteIpList(List<String> siteIpList){
+ this.siteIpList = siteIpList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 绔欑偣鏈嶅姟鍣ㄧ鍙�
+ * @param sitePort
+ */
+ public SitePdu sitePort(String sitePort){
+ setSitePort(sitePort);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 绔欑偣鏈嶅姟鍣ㄧ鍙�
+ * @param sitePortList
+ */
+ public SitePdu sitePortList(List<String> sitePortList){
+ this.sitePortList = sitePortList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 缁忓害
+ * @param longitude
+ */
+ public SitePdu longitude(String longitude){
+ setLongitude(longitude);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁忓害
+ * @param longitudeList
+ */
+ public SitePdu longitudeList(List<String> longitudeList){
+ this.longitudeList = longitudeList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 绾害
+ * @param latitude
+ */
+ public SitePdu latitude(String latitude){
+ setLatitude(latitude);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 绾害
+ * @param latitudeList
+ */
+ public SitePdu latitudeList(List<String> latitudeList){
+ this.latitudeList = latitudeList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鏄惁鏈変笅绾�(0.鍚︼紝1.鏄�)
+ * @param haveSonArea
+ */
+ public SitePdu haveSonArea(String haveSonArea){
+ setHaveSonArea(haveSonArea);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鏄惁鏈変笅绾�(0.鍚︼紝1.鏄�)
+ * @param haveSonAreaList
+ */
+ public SitePdu haveSonAreaList(List<String> haveSonAreaList){
+ this.haveSonAreaList = haveSonAreaList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 涓績鑱旂郴鐢佃瘽
+ * @param siteTel
+ */
+ public SitePdu siteTel(String siteTel){
+ setSiteTel(siteTel);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 涓績鑱旂郴鐢佃瘽
+ * @param siteTelList
+ */
+ public SitePdu siteTelList(List<String> siteTelList){
+ this.siteTelList = siteTelList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 涓績璇︾粏鍦板潃
+ * @param detailAddress
+ */
+ public SitePdu detailAddress(String detailAddress){
+ setDetailAddress(detailAddress);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 涓績璇︾粏鍦板潃
+ * @param detailAddressList
+ */
+ public SitePdu detailAddressList(List<String> detailAddressList){
+ this.detailAddressList = detailAddressList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 涓績浠嬬粛
+ * @param siteRemark
+ */
+ public SitePdu siteRemark(String siteRemark){
+ setSiteRemark(siteRemark);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 涓績浠嬬粛
+ * @param siteRemarkList
+ */
+ public SitePdu siteRemarkList(List<String> siteRemarkList){
+ this.siteRemarkList = siteRemarkList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 涓婂崍涓婄彮寮€濮嬫椂闂�
+ * @param amWorkStartTime
+ */
+ public SitePdu amWorkStartTime(String amWorkStartTime){
+ setAmWorkStartTime(amWorkStartTime);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 涓婂崍涓婄彮寮€濮嬫椂闂�
+ * @param amWorkStartTimeList
+ */
+ public SitePdu amWorkStartTimeList(List<String> amWorkStartTimeList){
+ this.amWorkStartTimeList = amWorkStartTimeList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 涓婂崍涓婄彮缁撴潫鏃堕棿
+ * @param amWorkEndTime
+ */
+ public SitePdu amWorkEndTime(String amWorkEndTime){
+ setAmWorkEndTime(amWorkEndTime);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 涓婂崍涓婄彮缁撴潫鏃堕棿
+ * @param amWorkEndTimeList
+ */
+ public SitePdu amWorkEndTimeList(List<String> amWorkEndTimeList){
+ this.amWorkEndTimeList = amWorkEndTimeList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 涓嬪崍涓婄彮寮€濮嬫椂闂�
+ * @param pmWorkStartTime
+ */
+ public SitePdu pmWorkStartTime(String pmWorkStartTime){
+ setPmWorkStartTime(pmWorkStartTime);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 涓嬪崍涓婄彮寮€濮嬫椂闂�
+ * @param pmWorkStartTimeList
+ */
+ public SitePdu pmWorkStartTimeList(List<String> pmWorkStartTimeList){
+ this.pmWorkStartTimeList = pmWorkStartTimeList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 涓嬪崍涓婄彮缁撴潫鏃堕棿
+ * @param pmWorkEndTime
+ */
+ public SitePdu pmWorkEndTime(String pmWorkEndTime){
+ setPmWorkEndTime(pmWorkEndTime);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 涓嬪崍涓婄彮缁撴潫鏃堕棿
+ * @param pmWorkEndTimeList
+ */
+ public SitePdu pmWorkEndTimeList(List<String> pmWorkEndTimeList){
+ this.pmWorkEndTimeList = pmWorkEndTimeList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
+ * @param averageTime
+ */
+ public SitePdu averageTime(Integer averageTime){
+ setAverageTime(averageTime);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
+ * @param averageTimeStart
+ */
+ public SitePdu averageTimeStart(Integer averageTimeStart){
+ this.averageTimeStart = averageTimeStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
+ * @param averageTimeEnd
+ */
+ public SitePdu averageTimeEnd(Integer averageTimeEnd){
+ this.averageTimeEnd = averageTimeEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
+ * @param averageTimeIncrement
+ */
+ public SitePdu averageTimeIncrement(Integer averageTimeIncrement){
+ this.averageTimeIncrement = averageTimeIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
+ * @param averageTimeList
+ */
+ public SitePdu averageTimeList(List<Integer> averageTimeList){
+ this.averageTimeList = averageTimeList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
+ * @param waitingNumber
+ */
+ public SitePdu waitingNumber(Integer waitingNumber){
+ setWaitingNumber(waitingNumber);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
+ * @param waitingNumberStart
+ */
+ public SitePdu waitingNumberStart(Integer waitingNumberStart){
+ this.waitingNumberStart = waitingNumberStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
+ * @param waitingNumberEnd
+ */
+ public SitePdu waitingNumberEnd(Integer waitingNumberEnd){
+ this.waitingNumberEnd = waitingNumberEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
+ * @param waitingNumberIncrement
+ */
+ public SitePdu waitingNumberIncrement(Integer waitingNumberIncrement){
+ this.waitingNumberIncrement = waitingNumberIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
+ * @param waitingNumberList
+ */
+ public SitePdu waitingNumberList(List<Integer> waitingNumberList){
+ this.waitingNumberList = waitingNumberList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday1
+ */
+ public SitePdu workday1(Integer workday1){
+ setWorkday1(workday1);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday1Start
+ */
+ public SitePdu workday1Start(Integer workday1Start){
+ this.workday1Start = workday1Start;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday1End
+ */
+ public SitePdu workday1End(Integer workday1End){
+ this.workday1End = workday1End;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday1Increment
+ */
+ public SitePdu workday1Increment(Integer workday1Increment){
+ this.workday1Increment = workday1Increment;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday1List
+ */
+ public SitePdu workday1List(List<Integer> workday1List){
+ this.workday1List = workday1List;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday2
+ */
+ public SitePdu workday2(Integer workday2){
+ setWorkday2(workday2);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday2Start
+ */
+ public SitePdu workday2Start(Integer workday2Start){
+ this.workday2Start = workday2Start;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday2End
+ */
+ public SitePdu workday2End(Integer workday2End){
+ this.workday2End = workday2End;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday2Increment
+ */
+ public SitePdu workday2Increment(Integer workday2Increment){
+ this.workday2Increment = workday2Increment;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday2List
+ */
+ public SitePdu workday2List(List<Integer> workday2List){
+ this.workday2List = workday2List;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday3
+ */
+ public SitePdu workday3(Integer workday3){
+ setWorkday3(workday3);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday3Start
+ */
+ public SitePdu workday3Start(Integer workday3Start){
+ this.workday3Start = workday3Start;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday3End
+ */
+ public SitePdu workday3End(Integer workday3End){
+ this.workday3End = workday3End;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday3Increment
+ */
+ public SitePdu workday3Increment(Integer workday3Increment){
+ this.workday3Increment = workday3Increment;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday3List
+ */
+ public SitePdu workday3List(List<Integer> workday3List){
+ this.workday3List = workday3List;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday4
+ */
+ public SitePdu workday4(Integer workday4){
+ setWorkday4(workday4);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday4Start
+ */
+ public SitePdu workday4Start(Integer workday4Start){
+ this.workday4Start = workday4Start;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday4End
+ */
+ public SitePdu workday4End(Integer workday4End){
+ this.workday4End = workday4End;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday4Increment
+ */
+ public SitePdu workday4Increment(Integer workday4Increment){
+ this.workday4Increment = workday4Increment;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday4List
+ */
+ public SitePdu workday4List(List<Integer> workday4List){
+ this.workday4List = workday4List;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday5
+ */
+ public SitePdu workday5(Integer workday5){
+ setWorkday5(workday5);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday5Start
+ */
+ public SitePdu workday5Start(Integer workday5Start){
+ this.workday5Start = workday5Start;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday5End
+ */
+ public SitePdu workday5End(Integer workday5End){
+ this.workday5End = workday5End;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday5Increment
+ */
+ public SitePdu workday5Increment(Integer workday5Increment){
+ this.workday5Increment = workday5Increment;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday5List
+ */
+ public SitePdu workday5List(List<Integer> workday5List){
+ this.workday5List = workday5List;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday6
+ */
+ public SitePdu workday6(Integer workday6){
+ setWorkday6(workday6);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday6Start
+ */
+ public SitePdu workday6Start(Integer workday6Start){
+ this.workday6Start = workday6Start;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday6End
+ */
+ public SitePdu workday6End(Integer workday6End){
+ this.workday6End = workday6End;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday6Increment
+ */
+ public SitePdu workday6Increment(Integer workday6Increment){
+ this.workday6Increment = workday6Increment;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday6List
+ */
+ public SitePdu workday6List(List<Integer> workday6List){
+ this.workday6List = workday6List;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday7
+ */
+ public SitePdu workday7(Integer workday7){
+ setWorkday7(workday7);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday7Start
+ */
+ public SitePdu workday7Start(Integer workday7Start){
+ this.workday7Start = workday7Start;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday7End
+ */
+ public SitePdu workday7End(Integer workday7End){
+ this.workday7End = workday7End;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday7Increment
+ */
+ public SitePdu workday7Increment(Integer workday7Increment){
+ this.workday7Increment = workday7Increment;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
+ * @param workday7List
+ */
+ public SitePdu workday7List(List<Integer> workday7List){
+ this.workday7List = workday7List;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 妤煎眰
+ * @param level
+ */
+ public SitePdu level(Integer level){
+ setLevel(level);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 妤煎眰
+ * @param levelStart
+ */
+ public SitePdu levelStart(Integer levelStart){
+ this.levelStart = levelStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 妤煎眰
+ * @param levelEnd
+ */
+ public SitePdu levelEnd(Integer levelEnd){
+ this.levelEnd = levelEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 妤煎眰
+ * @param levelIncrement
+ */
+ public SitePdu levelIncrement(Integer levelIncrement){
+ this.levelIncrement = levelIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 妤煎眰
+ * @param levelList
+ */
+ public SitePdu levelList(List<Integer> levelList){
+ this.levelList = levelList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 妤兼爧
+ * @param building
+ */
+ public SitePdu building(Integer building){
+ setBuilding(building);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 妤兼爧
+ * @param buildingStart
+ */
+ public SitePdu buildingStart(Integer buildingStart){
+ this.buildingStart = buildingStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 妤兼爧
+ * @param buildingEnd
+ */
+ public SitePdu buildingEnd(Integer buildingEnd){
+ this.buildingEnd = buildingEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 妤兼爧
+ * @param buildingIncrement
+ */
+ public SitePdu buildingIncrement(Integer buildingIncrement){
+ this.buildingIncrement = buildingIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 妤兼爧
+ * @param buildingList
+ */
+ public SitePdu buildingList(List<Integer> buildingList){
+ this.buildingList = buildingList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鏄惁鏄珯鐐� (1.鏄�,0.鍚�)
+ * @param isSite
+ */
+ public SitePdu isSite(Integer isSite){
+ setIsSite(isSite);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鏄惁鏄珯鐐� (1.鏄�,0.鍚�)
+ * @param isSiteStart
+ */
+ public SitePdu isSiteStart(Integer isSiteStart){
+ this.isSiteStart = isSiteStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鏄惁鏄珯鐐� (1.鏄�,0.鍚�)
+ * @param isSiteEnd
+ */
+ public SitePdu isSiteEnd(Integer isSiteEnd){
+ this.isSiteEnd = isSiteEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鏄惁鏄珯鐐� (1.鏄�,0.鍚�)
+ * @param isSiteIncrement
+ */
+ public SitePdu isSiteIncrement(Integer isSiteIncrement){
+ this.isSiteIncrement = isSiteIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鏄惁鏄珯鐐� (1.鏄�,0.鍚�)
+ * @param isSiteList
+ */
+ public SitePdu isSiteList(List<Integer> isSiteList){
+ this.isSiteList = isSiteList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+ * @param status
+ */
+ public SitePdu status(Integer status){
+ setStatus(status);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+ * @param statusStart
+ */
+ public SitePdu statusStart(Integer statusStart){
+ this.statusStart = statusStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+ * @param statusEnd
+ */
+ public SitePdu statusEnd(Integer statusEnd){
+ this.statusEnd = statusEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+ * @param statusIncrement
+ */
+ public SitePdu statusIncrement(Integer statusIncrement){
+ this.statusIncrement = statusIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+ * @param statusList
+ */
+ public SitePdu statusList(List<Integer> statusList){
+ this.statusList = statusList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 璁惧logo鍦板潃
+ * @param logoPath
+ */
+ public SitePdu logoPath(String logoPath){
+ setLogoPath(logoPath);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 璁惧logo鍦板潃
+ * @param logoPathList
+ */
+ public SitePdu logoPathList(List<String> logoPathList){
+ this.logoPathList = logoPathList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 绔欑偣鑻辨枃鍚嶇О
+ * @param englishName
+ */
+ public SitePdu englishName(String englishName){
+ setEnglishName(englishName);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 绔欑偣鑻辨枃鍚嶇О
+ * @param englishNameList
+ */
+ public SitePdu englishNameList(List<String> englishNameList){
+ this.englishNameList = englishNameList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 璐熻矗浜�
+ * @param leadingOfficial
+ */
+ public SitePdu leadingOfficial(String leadingOfficial){
+ setLeadingOfficial(leadingOfficial);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 璐熻矗浜�
+ * @param leadingOfficialList
+ */
+ public SitePdu leadingOfficialList(List<String> leadingOfficialList){
+ this.leadingOfficialList = leadingOfficialList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鑱旂郴鐢佃瘽
+ * @param leadingOfficialTelephone
+ */
+ public SitePdu leadingOfficialTelephone(String leadingOfficialTelephone){
+ setLeadingOfficialTelephone(leadingOfficialTelephone);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鑱旂郴鐢佃瘽
+ * @param leadingOfficialTelephoneList
+ */
+ public SitePdu leadingOfficialTelephoneList(List<String> leadingOfficialTelephoneList){
+ this.leadingOfficialTelephoneList = leadingOfficialTelephoneList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鍒涘缓鐢ㄦ埛
+ * @param createUserId
+ */
+ public SitePdu createUserId(Long createUserId){
+ setCreateUserId(createUserId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
+ * @param createUserIdStart
+ */
+ public SitePdu createUserIdStart(Long createUserIdStart){
+ this.createUserIdStart = createUserIdStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
+ * @param createUserIdEnd
+ */
+ public SitePdu createUserIdEnd(Long createUserIdEnd){
+ this.createUserIdEnd = createUserIdEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
+ * @param createUserIdIncrement
+ */
+ public SitePdu createUserIdIncrement(Long createUserIdIncrement){
+ this.createUserIdIncrement = createUserIdIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍒涘缓鐢ㄦ埛
+ * @param createUserIdList
+ */
+ public SitePdu createUserIdList(List<Long> createUserIdList){
+ this.createUserIdList = createUserIdList;
+ return this;
+ }
+
+
+
+ /**
+ * 璁剧疆 閮ㄧ讲妯″潡锛岄€楀彿鍒嗛殧
+ * @param modelIds
+ */
+ public SitePdu modelIds(String modelIds){
+ setModelIds(modelIds);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 閮ㄧ讲妯″潡锛岄€楀彿鍒嗛殧
+ * @param modelIdsList
+ */
+ public SitePdu modelIdsList(List<String> modelIdsList){
+ this.modelIdsList = modelIdsList;
+ return this;
+ }
+
+
+ /**
+ * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+ * @return orConditionList
+ */
+ public List<SitePdu> getOrConditionList(){
+ return this.orConditionList;
+ }
+
+ /**
+ * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+ * @param orConditionList
+ */
+ public void setOrConditionList(List<SitePdu> orConditionList){
+ this.orConditionList = orConditionList;
+ }
+
+ /**
+ * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+ * @return andConditionList
+ */
+ public List<SitePdu> getAndConditionList(){
+ return this.andConditionList;
+ }
+
+ /**
+ * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+ * @param andConditionList
+ */
+ public void setAndConditionList(List<SitePdu> 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 SitePdu) {
+ SitePdu tmp = (SitePdu) obj;
+ if (this.getId() == tmp.getId()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public void initAttrValue(){
+
+ this.siteName = "";
+
+ this.parentId = null;
+
+ this.ancestors = "";
+
+ this.regionCode = "";
+
+ this.iid = "";
+
+ this.siteCode = "";
+
+ this.proCode = "";
+
+ this.areaID = "";
+
+ this.areaCode = "";
+
+ this.cityCode = "";
+
+ this.districtCode = "";
+
+ this.siteIp = "";
+
+ this.sitePort = "";
+
+ this.longitude = "";
+
+ this.latitude = "";
+
+ this.haveSonArea = "0";
+
+ this.siteTel = "";
+
+ this.detailAddress = "";
+
+ this.siteRemark = "";
+
+ this.amWorkStartTime = "";
+
+ this.amWorkEndTime = "";
+
+ this.pmWorkStartTime = "";
+
+ this.pmWorkEndTime = "";
+
+ this.averageTime = null;
+
+ this.waitingNumber = null;
+
+ this.workday1 = 1;
+
+ this.workday2 = 1;
+
+ this.workday3 = 1;
+
+ this.workday4 = 1;
+
+ this.workday5 = 1;
+
+ this.workday6 = 0;
+
+ this.workday7 = 0;
+
+ this.level = null;
+
+ this.building = null;
+
+ this.isSite = 0;
+
+ this.status = 1;
+
+ this.logoPath = "";
+
+ this.englishName = "";
+
+ this.leadingOfficial = "";
+
+ this.leadingOfficialTelephone = "";
+
+ this.modelIds = "";
+ }
+}
\ No newline at end of file
diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/dept/IDeptFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/dept/IDeptFeign.java
new file mode 100644
index 0000000000000000000000000000000000000000..8289fa3cfa325baed0867fa352940213d9b9f408
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/feign/dept/IDeptFeign.java
@@ -0,0 +1,101 @@
+package com.mortals.xhx.feign.dept;
+
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.dept.DeptPdu;
+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/interlist")
+ 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("鏆傛椂鏃犳硶淇濆瓨閮ㄩ棬锛岃绋嶅悗鍐嶈瘯!");
+ }
+ };
+ }
+}
+
+
+
+
+
+
+
+
diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterAcceptFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterAcceptFeign.java
new file mode 100644
index 0000000000000000000000000000000000000000..18d1f9cdf1d4d3865845b5bf947d25c1786a27a0
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterAcceptFeign.java
@@ -0,0 +1,59 @@
+package com.mortals.xhx.feign.matter;
+
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.matter.MatterAcceptPdu;
+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.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = "base-manager", path = "/base", fallbackFactory = MatterAcceptFallbackFactory.class)
+public interface IMatterAcceptFeign extends IFeign {
+ /**
+ * 鏌ョ湅浜嬮」鍙楃悊鏉′欢鍒楄〃
+ *
+ * @param matterAcceptPdu
+ * @return
+ */
+ @PostMapping(value = "/matter/accept/interlist")
+ Rest<RespData<List<MatterAcceptPdu>>> list(@RequestBody MatterAcceptPdu matterAcceptPdu);
+
+
+ /**
+ * 鏌ョ湅浜嬮」鍙楃悊鏉′欢
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping(value = "/matter/accept/interinfo")
+ Rest<MatterAcceptPdu> info(@RequestParam(value = "id") Long id);
+}
+
+@Slf4j
+@Component
+class MatterAcceptFallbackFactory implements FallbackFactory<IMatterAcceptFeign> {
+
+ @Override
+ public IMatterAcceptFeign create(Throwable throwable) {
+ return new IMatterAcceptFeign(){
+
+ @Override
+ public Rest<RespData<List<MatterAcceptPdu>>> list(MatterAcceptPdu matterAcceptPdu) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇浜嬮」鍙楃悊鏉′欢鍒楄〃锛岃绋嶅悗鍐嶈瘯!");
+ }
+
+ @Override
+ public Rest<MatterAcceptPdu> info(Long id) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇浜嬮」鍙楃悊鏉′欢锛岃绋嶅悗鍐嶈瘯!");
+ }
+ };
+ }
+}
\ No newline at end of file
diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterChargesFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterChargesFeign.java
new file mode 100644
index 0000000000000000000000000000000000000000..bcbf604a4813f6c722c1ad33509b9d909cff1083
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterChargesFeign.java
@@ -0,0 +1,59 @@
+package com.mortals.xhx.feign.matter;
+
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.matter.MatterChargesPdu;
+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.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = "base-manager", path = "/base", fallbackFactory = MatterChargesFallbackFactory.class)
+public interface IMatterChargesFeign extends IFeign {
+ /**
+ * 鏌ョ湅浜嬮」鏀惰垂鏍囧噯鍒楄〃
+ *
+ * @param matterChargesPdu
+ * @return
+ */
+ @PostMapping(value = "/matter/charges/interlist")
+ Rest<RespData<List<MatterChargesPdu>>> list(@RequestBody MatterChargesPdu matterChargesPdu);
+
+
+ /**
+ * 鏌ョ湅浜嬮」鏀惰垂鏍囧噯
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping(value = "/matter/charges/interinfo")
+ Rest<MatterChargesPdu> info(@RequestParam(value = "id") Long id);
+}
+
+@Slf4j
+@Component
+class MatterChargesFallbackFactory implements FallbackFactory<IMatterChargesFeign> {
+
+ @Override
+ public IMatterChargesFeign create(Throwable throwable) {
+ return new IMatterChargesFeign(){
+
+ @Override
+ public Rest<RespData<List<MatterChargesPdu>>> list(MatterChargesPdu matterChargesPdu) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇浜嬮」鏀惰垂鏍囧噯鍒楄〃锛岃绋嶅悗鍐嶈瘯!");
+ }
+
+ @Override
+ public Rest<MatterChargesPdu> info(Long id) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇浜嬮」鏀惰垂鏍囧噯鍒楄〃锛岃绋嶅悗鍐嶈瘯!");
+ }
+ };
+ }
+}
\ No newline at end of file
diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterDatumFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterDatumFeign.java
new file mode 100644
index 0000000000000000000000000000000000000000..a9d54f39b9fbc961e1d840fc1e130a8eb7e732e0
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterDatumFeign.java
@@ -0,0 +1,60 @@
+package com.mortals.xhx.feign.matter;
+
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.matter.MatterDatumPdu;
+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.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = "base-manager", path = "/base", fallbackFactory = MatterDatumFallbackFactory.class)
+public interface IMatterDatumFeign extends IFeign {
+ /**
+ * 鏌ョ湅浜嬮」鐢宠鏉愭枡涓氬姟鍒楄〃
+ *
+ * @param matterDatumPdu
+ * @return
+ */
+ @PostMapping(value = "/matter/datum/interlist")
+ Rest<RespData<List<MatterDatumPdu>>> list(@RequestBody MatterDatumPdu matterDatumPdu);
+
+
+ /**
+ * 鏌ョ湅浜嬮」鐢宠鏉愭枡涓氬姟
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping(value = "/matter/datum/interinfo")
+ Rest<MatterDatumPdu> info(@RequestParam(value = "id") Long id);
+}
+
+@Slf4j
+@Component
+class MatterDatumFallbackFactory implements FallbackFactory<IMatterDatumFeign> {
+
+ @Override
+ public IMatterDatumFeign create(Throwable throwable) {
+ return new IMatterDatumFeign(){
+
+ @Override
+ public Rest<RespData<List<MatterDatumPdu>>> list(MatterDatumPdu matterDatumPdu) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇浜嬮」鐢宠鏉愭枡涓氬姟鍒楄〃锛岃绋嶅悗鍐嶈瘯!");
+ }
+
+ @Override
+ public Rest<MatterDatumPdu> info(Long id) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇浜嬮」鐢宠鏉愭枡涓氬姟璇︾粏锛岃绋嶅悗鍐嶈瘯!");
+ }
+
+ };
+ }
+}
\ No newline at end of file
diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterDatumFileFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterDatumFileFeign.java
new file mode 100644
index 0000000000000000000000000000000000000000..f25fea564b31c96c36c452fc82e953d6dfbefa11
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterDatumFileFeign.java
@@ -0,0 +1,58 @@
+package com.mortals.xhx.feign.matter;
+
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.matter.MatterDatumFilePdu;
+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.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = "base-manager", path = "/base", fallbackFactory = MatterDatumFileFallbackFactory.class)
+public interface IMatterDatumFileFeign extends IFeign {
+ /**
+ * 鏌ョ湅鏉愭枡闄勪欢涓氬姟鍒楄〃
+ *
+ * @param matterDatumFilePdu
+ * @return
+ */
+ @PostMapping(value = "/matter/datum/file/interlist")
+ Rest<RespData<List<MatterDatumFilePdu>>> list(@RequestBody MatterDatumFilePdu matterDatumFilePdu);
+
+
+ /**
+ * 鏌ョ湅鏉愭枡闄勪欢涓氬姟
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping(value = "/matter/datum/file/interinfo")
+ Rest<MatterDatumFilePdu> info(@RequestParam(value = "id") Long id);
+}
+
+@Slf4j
+@Component
+class MatterDatumFileFallbackFactory implements FallbackFactory<IMatterDatumFileFeign> {
+
+ @Override
+ public IMatterDatumFileFeign create(Throwable throwable) {
+ return new IMatterDatumFileFeign(){
+ @Override
+ public Rest<RespData<List<MatterDatumFilePdu>>> list(MatterDatumFilePdu matterDatumFilePdu) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇鏉愭枡闄勪欢涓氬姟鍒楄〃锛岃绋嶅悗鍐嶈瘯!");
+ }
+
+ @Override
+ public Rest<MatterDatumFilePdu> info(Long id) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇鏉愭枡闄勪欢涓氬姟璇︾粏锛岃绋嶅悗鍐嶈瘯!");
+ }
+ };
+ }
+}
diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterFeign.java
new file mode 100644
index 0000000000000000000000000000000000000000..553f02c6604e03b79f46583441cfecb364610d63
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterFeign.java
@@ -0,0 +1,57 @@
+package com.mortals.xhx.feign.matter;
+
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.matter.MatterPdu;
+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;
+
+@FeignClient(name = "base-manager", path = "/base", fallbackFactory = MatterFallbackFactory.class)
+public interface IMatterFeign extends IFeign {
+ /**
+ * 鏌ョ湅鍩虹浜嬮」鍒楄〃
+ *
+ * @param matterPdu
+ * @return
+ */
+ @PostMapping(value = "/matter/interlist")
+ Rest<RespData<List<MatterPdu>>> list(@RequestBody MatterPdu matterPdu);
+
+
+ /**
+ * 鏌ョ湅鍩虹浜嬮」
+ *
+ * @param id
+ * @return
+ */
+ @PostMapping(value = "/matter/interinfo")
+ String info(@RequestParam(value = "id") Long id);
+}
+
+@Slf4j
+@Component
+class MatterFallbackFactory implements FallbackFactory<IMatterFeign> {
+
+ @Override
+ public IMatterFeign create(Throwable throwable) {
+ return new IMatterFeign(){
+
+ @Override
+ public Rest<RespData<List<MatterPdu>>> list(MatterPdu matterPdu) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇鍩虹浜嬮」鍒楄〃锛岃绋嶅悗鍐嶈瘯!");
+ }
+
+ @Override
+ public String info(Long id) {
+ return JSONObject.toJSONString(Rest.fail("鏆傛椂鏃犳硶鑾峰彇鍩虹浜嬮」锛岃绋嶅悗鍐嶈瘯!"));
+ }
+ };
+ }
+}
\ No newline at end of file
diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterFlowlimitFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterFlowlimitFeign.java
new file mode 100644
index 0000000000000000000000000000000000000000..9eb15834e57c350e680ada2a18cd980dce628b03
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterFlowlimitFeign.java
@@ -0,0 +1,59 @@
+package com.mortals.xhx.feign.matter;
+
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.matter.MatterFlowlimitPdu;
+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.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = "base-manager", path = "/base", fallbackFactory = MatterFlowlimitFallbackFactory.class)
+public interface IMatterFlowlimitFeign extends IFeign {
+ /**
+ * 鏌ョ湅浜嬮」鍔炵悊娴佺▼鍒楄〃
+ *
+ * @param matterFlowlimitPdu
+ * @return
+ */
+ @PostMapping(value = "/matter/flowlimit/interlist")
+ Rest<RespData<List<MatterFlowlimitPdu>>> list(@RequestBody MatterFlowlimitPdu matterFlowlimitPdu);
+
+
+ /**
+ * 鏌ョ湅浜嬮」鍔炵悊娴佺▼
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping(value = "/matter/flowlimit/interinfo")
+ Rest<MatterFlowlimitPdu> info(@RequestParam(value = "id") Long id);
+}
+
+@Slf4j
+@Component
+class MatterFlowlimitFallbackFactory implements FallbackFactory<IMatterFlowlimitFeign> {
+
+ @Override
+ public IMatterFlowlimitFeign create(Throwable throwable) {
+ return new IMatterFlowlimitFeign(){
+
+ @Override
+ public Rest<RespData<List<MatterFlowlimitPdu>>> list(MatterFlowlimitPdu matterFlowlimitPdu) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇浜嬮」鍔炵悊娴佺▼鍒楄〃锛岃绋嶅悗鍐嶈瘯!");
+ }
+
+ @Override
+ public Rest<MatterFlowlimitPdu> info(Long id) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇浜嬮」鍔炵悊娴佺▼锛岃绋嶅悗鍐嶈瘯!");
+ }
+ };
+ }
+}
diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterIntermediaryFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterIntermediaryFeign.java
new file mode 100644
index 0000000000000000000000000000000000000000..63bc11f7db26aeb18ce7d11f119ba8b27d43bb17
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterIntermediaryFeign.java
@@ -0,0 +1,59 @@
+package com.mortals.xhx.feign.matter;
+
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.matter.MatterIntermediaryPdu;
+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.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = "base-manager", path = "/base", fallbackFactory = MatterIntermediaryFallbackFactory.class)
+public interface IMatterIntermediaryFeign extends IFeign {
+ /**
+ * 鏌ョ湅浜嬮」涓粙鏈嶅姟鍒楄〃
+ *
+ * @param matterIntermediaryPdu
+ * @return
+ */
+ @PostMapping(value = "/matter/intermediary/interlist")
+ Rest<RespData<List<MatterIntermediaryPdu>>> list(@RequestBody MatterIntermediaryPdu matterIntermediaryPdu);
+
+
+ /**
+ * 鏌ョ湅浜嬮」涓粙鏈嶅姟
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping(value = "/matter/intermediary/interinfo")
+ Rest<MatterIntermediaryPdu> info(@RequestParam(value = "id") Long id);
+}
+
+@Slf4j
+@Component
+class MatterIntermediaryFallbackFactory implements FallbackFactory<IMatterIntermediaryFeign> {
+
+ @Override
+ public IMatterIntermediaryFeign create(Throwable throwable) {
+ return new IMatterIntermediaryFeign(){
+
+ @Override
+ public Rest<RespData<List<MatterIntermediaryPdu>>> list(MatterIntermediaryPdu matterIntermediaryPdu) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇浜嬮」涓粙鏈嶅姟鍒楄〃锛岃绋嶅悗鍐嶈瘯!");
+ }
+
+ @Override
+ public Rest<MatterIntermediaryPdu> info(Long id) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇浜嬮」涓粙鏈嶅姟锛岃绋嶅悗鍐嶈瘯!");
+ }
+ };
+ }
+}
diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterQuestionFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterQuestionFeign.java
new file mode 100644
index 0000000000000000000000000000000000000000..05accb98847de8d70394ac806aa7f132901065ea
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterQuestionFeign.java
@@ -0,0 +1,59 @@
+package com.mortals.xhx.feign.matter;
+
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.matter.MatterQuestionPdu;
+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.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = "base-manager", path = "/base", fallbackFactory = MatterQuestionFallbackFactory.class)
+public interface IMatterQuestionFeign extends IFeign {
+ /**
+ * 鏌ョ湅浜嬮」甯歌闂鍒楄〃
+ *
+ * @param matterQuestionPdu
+ * @return
+ */
+ @PostMapping(value = "/matter/question/interlist")
+ Rest<RespData<List<MatterQuestionPdu>>> list(@RequestBody MatterQuestionPdu matterQuestionPdu);
+
+
+ /**
+ * 鏌ョ湅浜嬮」甯歌闂
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping(value = "/matter/question/interinfo")
+ Rest<MatterQuestionPdu> info(@RequestParam(value = "id") Long id);
+}
+
+@Slf4j
+@Component
+class MatterQuestionFallbackFactory implements FallbackFactory<IMatterQuestionFeign> {
+
+ @Override
+ public IMatterQuestionFeign create(Throwable throwable) {
+ return new IMatterQuestionFeign(){
+
+ @Override
+ public Rest<RespData<List<MatterQuestionPdu>>> list(MatterQuestionPdu matterQuestionPdu) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇浜嬮」甯歌闂鍒楄〃锛岃绋嶅悗鍐嶈瘯!");
+ }
+
+ @Override
+ public Rest<MatterQuestionPdu> info(Long id) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇浜嬮」甯歌闂锛岃绋嶅悗鍐嶈瘯!");
+ }
+ };
+ }
+}
diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterSetbaseFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterSetbaseFeign.java
new file mode 100644
index 0000000000000000000000000000000000000000..ad4f1d1319eab2e8d2ca03d456a75d54ee4346e1
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/feign/matter/IMatterSetbaseFeign.java
@@ -0,0 +1,59 @@
+package com.mortals.xhx.feign.matter;
+
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.matter.MatterSetbasePdu;
+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.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = "base-manager", path = "/base", fallbackFactory = MatterSetbaseFallbackFactory.class)
+public interface IMatterSetbaseFeign extends IFeign {
+ /**
+ * 鏌ョ湅浜嬮」璁惧畾渚濇嵁鍒楄〃
+ *
+ * @param matterSetbasePdu
+ * @return
+ */
+ @PostMapping(value = "/matter/setbase/interlist")
+ Rest<RespData<List<MatterSetbasePdu>>> list(@RequestBody MatterSetbasePdu matterSetbasePdu);
+
+
+ /**
+ * 鏌ョ湅浜嬮」璁惧畾渚濇嵁
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping(value = "/matter/setbase/interinfo")
+ Rest<MatterSetbasePdu> info(@RequestParam(value = "id") Long id);
+}
+
+@Slf4j
+@Component
+class MatterSetbaseFallbackFactory implements FallbackFactory<IMatterSetbaseFeign> {
+
+ @Override
+ public IMatterSetbaseFeign create(Throwable throwable) {
+ return new IMatterSetbaseFeign(){
+
+ @Override
+ public Rest<RespData<List<MatterSetbasePdu>>> list(MatterSetbasePdu matterSetbasePdu) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇浜嬮」璁惧畾渚濇嵁鍒楄〃锛岃绋嶅悗鍐嶈瘯!");
+ }
+
+ @Override
+ public Rest<MatterSetbasePdu> info(Long id) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇浜嬮」璁惧畾渚濇嵁锛岃绋嶅悗鍐嶈瘯!");
+ }
+ };
+ }
+}
\ No newline at end of file
diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/site/ISiteFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/site/ISiteFeign.java
new file mode 100644
index 0000000000000000000000000000000000000000..d5980e2db3ba538d96a731ff522789b62262472a
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/feign/site/ISiteFeign.java
@@ -0,0 +1,148 @@
+package com.mortals.xhx.feign.site;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.site.SitePdu;
+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-06-28
+ */
+@FeignClient(name = "base-manager", path = "/base", fallbackFactory = SiteFeignFallbackFactory.class)
+public interface ISiteFeign extends IFeign {
+
+
+ /**
+ * 鏌ョ湅绔欑偣鍒楄〃
+ *
+ * @param sitePdu
+ * @return
+ */
+ @PostMapping(value = "/site/interlist")
+ Rest<RespData<List<SitePdu>>> list(@RequestBody SitePdu sitePdu);
+
+
+ /**
+ * 鏌ョ湅绔欑偣
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping(value = "/site/interinfo")
+ Rest<SitePdu> info(@RequestParam(value = "id") Long id);
+
+ /**
+ * 鍒犻櫎绔欑偣
+ *
+ * @param ids
+ * @return
+ */
+ @GetMapping(value = "/site/delete")
+ Rest<Void> delete(Long[] ids, @RequestHeader("Authorization") String authorization);
+
+
+ /**
+ * 绔欑偣淇濆瓨鏇存柊
+ *
+ * @param sitePdu
+ * @return
+ */
+ @PostMapping(value = "/site/save")
+ Rest<RespData<SitePdu>> save(@RequestBody SitePdu sitePdu, @RequestHeader("Authorization") String authorization);
+
+ /**
+ * 鑾峰彇绔欑偣鏍�
+ *
+ * @return
+ */
+ @GetMapping(value = "/site/siteTree")
+ String siteTree(@RequestHeader("Authorization") String authorization);
+
+ /**
+ * 鏌ヨ绔欑偣鍙婂瓙绔欑偣
+ *
+ * @param sitePdu
+ * @return
+ */
+ @PostMapping(value = "/site/getFlatSitesBySiteId")
+ String getFlatSitesBySiteId(@RequestBody SitePdu sitePdu);
+
+
+ /**
+ * 鏌ヨ绔欑偣鍙婂瓙绔欑偣
+ *
+ * @param sitePdu
+ * @return
+ */
+ @PostMapping(value = "/site/getFlatSitesByAreaCode")
+ Rest<List<SitePdu>> getFlatSitesByAreaCode(@RequestBody SitePdu sitePdu);
+
+
+
+}
+
+
+@Slf4j
+@Component
+class SiteFeignFallbackFactory implements FallbackFactory<ISiteFeign> {
+ @Override
+ public ISiteFeign create(Throwable t) {
+ log.error("寮傚父锛�", t);
+ return new ISiteFeign() {
+ @Override
+ public Rest<RespData<List<SitePdu>>> list(SitePdu sitePdu) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇绔欑偣鍒楄〃锛岃绋嶅悗鍐嶈瘯!");
+ }
+
+ @Override
+ public Rest<SitePdu> info(Long id) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇绔欑偣璇︾粏锛岃绋嶅悗鍐嶈瘯!");
+ }
+
+ @Override
+ public Rest<Void> delete(Long[] ids, String authorization) {
+ return Rest.fail("鏆傛椂鏃犳硶鍒犻櫎绔欑偣锛岃绋嶅悗鍐嶈瘯!");
+ }
+
+ @Override
+ public Rest<RespData<SitePdu>> save(SitePdu sitePdu, String authorization) {
+ return Rest.fail("鏆傛椂鏃犳硶淇濆瓨绔欑偣锛岃绋嶅悗鍐嶈瘯!");
+ }
+
+ @Override
+ public String siteTree(String authorization) {
+ return JSON.toJSONString(Rest.fail("鏆傛椂鏃犳硶鑾峰彇绔欑偣鏍戯紝璇风◢鍚庡啀璇�!"));
+ }
+
+ @Override
+ public String getFlatSitesBySiteId(SitePdu sitePdu) {
+ return JSONObject.toJSONString(Rest.fail("鏆傛椂鏃犳硶鑾峰彇绔欑偣瀛愮珯鐐癸紝璇风◢鍚庡啀璇�!"));
+ }
+
+ @Override
+ public Rest<List<SitePdu>> getFlatSitesByAreaCode(SitePdu sitePdu) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇绔欑偣瀛愮珯鐐癸紝璇风◢鍚庡啀璇�!");
+ }
+ };
+ }
+}
+
+
+
+
+
+
+
+
diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/site/ISiteMatterFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/site/ISiteMatterFeign.java
new file mode 100644
index 0000000000000000000000000000000000000000..c448931dfa7213456943da1919618784358fd04c
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/feign/site/ISiteMatterFeign.java
@@ -0,0 +1,101 @@
+package com.mortals.xhx.feign.site;
+
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.site.SiteMatterPdu;
+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 2023-02-17
+ */
+@FeignClient(name = "base-manager", path = "/base", fallbackFactory = SiteMatterFeignFallbackFactory.class)
+public interface ISiteMatterFeign extends IFeign {
+
+
+ /**
+ * 鏌ョ湅绔欑偣浜嬮」鍒楄〃
+ *
+ * @param siteMatterPdu
+ * @return
+ */
+ @PostMapping(value = "/site/matter/interlist")
+ Rest<RespData<List<SiteMatterPdu>>> list(@RequestBody SiteMatterPdu siteMatterPdu);
+
+
+ /**
+ * 鏌ョ湅绔欑偣浜嬮」
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping(value = "/site/matter/interinfo")
+ Rest<SiteMatterPdu> info(@RequestParam(value = "id") Long id);
+
+ /**
+ * 鍒犻櫎绔欑偣浜嬮」
+ *
+ * @param ids
+ * @return
+ */
+ @GetMapping(value = "/site/matter/delete")
+ Rest<Void> delete(Long[] ids,@RequestHeader("Authorization") String authorization);
+
+
+ /**
+ * 绔欑偣浜嬮」淇濆瓨鏇存柊
+ *
+ * @param siteMatterPdu
+ * @return
+ */
+ @PostMapping(value = "/site/matter/save")
+ Rest<RespData<SiteMatterPdu>> save(@RequestBody SiteMatterPdu siteMatterPdu, @RequestHeader("Authorization") String authorization);
+
+
+}
+
+
+@Slf4j
+@Component
+class SiteMatterFeignFallbackFactory implements FallbackFactory<ISiteMatterFeign> {
+ @Override
+ public ISiteMatterFeign create(Throwable t) {
+ return new ISiteMatterFeign() {
+ @Override
+ public Rest<RespData<List<SiteMatterPdu>>> list(SiteMatterPdu siteMatterPdu) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇绔欑偣浜嬮」鍒楄〃锛岃绋嶅悗鍐嶈瘯!");
+ }
+
+ @Override
+ public Rest<SiteMatterPdu> info(Long id) {
+ return Rest.fail("鏆傛椂鏃犳硶鑾峰彇绔欑偣浜嬮」璇︾粏锛岃绋嶅悗鍐嶈瘯!");
+ }
+
+ @Override
+ public Rest<Void> delete(Long[] ids, String authorization) {
+ return Rest.fail("鏆傛椂鏃犳硶鍒犻櫎绔欑偣浜嬮」锛岃绋嶅悗鍐嶈瘯!");
+ }
+
+ @Override
+ public Rest<RespData<SiteMatterPdu>> save(SiteMatterPdu siteMatterPdu, String authorization) {
+ return Rest.fail("鏆傛椂鏃犳硶淇濆瓨绔欑偣浜嬮」锛岃绋嶅悗鍐嶈瘯!");
+ }
+ };
+ }
+}
+
+
+
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index fa52135317a78e6a2e78d471f689aa5d85df446b..5862d3e92ec2513376231ee19fd925a4709caf6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
<modules>
<module>common-lib</module>
<module>single-matter</module>
- <module>knowledge-base</module>
+<!-- <module>knowledge-base</module>-->
</modules>
<properties>
diff --git a/single-matter/src/main/java/com/mortals/xhx/base/login/web/LoginController.java b/single-matter/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
index 747460994c9d0749a487f1e4120176b9c1c17299..1ba0181d50e52a177f2f3a45edcad12a3095af2d 100644
--- a/single-matter/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
+++ b/single-matter/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
@@ -19,6 +19,8 @@ import com.mortals.xhx.base.system.user.model.UserEntity;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.base.system.valid.service.ValidCodeService;
import com.mortals.xhx.common.key.RedisKey;
+import com.mortals.xhx.common.pdu.user.UserPdu;
+import com.mortals.xhx.feign.user.IUserFeign;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,8 +50,8 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
@Autowired
private ICacheService cacheService;
-// @Autowired
-// private IUserFeign userFeign;
+ @Autowired
+ private IUserFeign userFeign;
private static Log logger = LogFactory.getLog(LoginController.class);
@@ -57,76 +59,81 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
public String login( @RequestBody LoginForm loginForm) throws Exception {
+ String loginName = loginForm.getLoginName();
+ String password = loginForm.getPassword();
+
+ UserPdu userPdu = new UserPdu();
+ userPdu.setLoginName(loginName);
+ userPdu.setPassword(password);
+ userPdu.setSecurityCode("admin");
+ String resp = userFeign.portalLogin(userPdu);
+
+ return resp;
+
+
+// JSONObject ret = new JSONObject();
// String loginName = loginForm.getLoginName();
// String password = loginForm.getPassword();
+// //String securityCode = loginForm.getSecurityCode();
+// String ip = super.getRequestIP(request);
+// if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password)) {
+// ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+// ret.put(KEY_RESULT_MSG, "鏈幏鍙栧埌鐢ㄦ埛淇℃伅锛岃閲嶆柊鐧诲綍");
+// return ret.toJSONString();
+// }
+// UserEntity userEntity = null;
+// try {
+// loginForm.validate();
//
-// UserPdu userPdu = new UserPdu();
-// userPdu.setLoginName(loginName);
-// userPdu.setPassword(password);
-// String resp = userFeign.portalLogin(userPdu);
+// userEntity = userService.doLogin(loginName, password, ip);
+// userEntity.setLastLoginAddress(ip);
+// //saveCurrUser(request, response, userEntity);
+// recordSysLog(request, userEntity, "鐢ㄦ埛鐧诲綍绯荤粺鎴愬姛!");
+// // 杩斿洖鎷ユ湁鐨勮彍鍗曟暟鎹�
+// Set<String> urls = resourceService.findUrlSetByUserId(userEntity.getId());
+// List<MenuEntity> outlookBarList = menuService.findTreeMenu(userEntity, urls);
+// String currUserName = userEntity.getRealName();
+// if (currUserName == null || currUserName.trim().length() == 0) {
+// currUserName = "绠＄悊鍛�";
+// }
+// userEntity.setLoginTime(System.currentTimeMillis());
+// userEntity.setToken(IdUtil.fastSimpleUUID());
+// userEntity.setExpireTime(DateUtils.addCurrDate(7).getTime());
+// String token = authTokenService.createToken(userEntity);
+// JSONObject data = new JSONObject();
+// data.put("token", token);
+// data.put("currUserName", currUserName);
+// data.put("barList", outlookBarList);
+// data.put("id", userEntity.getId());
+// data.put("userType", userEntity.getUserType());
//
-// return resp;
-
-
- JSONObject ret = new JSONObject();
- String loginName = loginForm.getLoginName();
- String password = loginForm.getPassword();
- //String securityCode = loginForm.getSecurityCode();
- String ip = super.getRequestIP(request);
- if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password)) {
- ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
- ret.put(KEY_RESULT_MSG, "鏈幏鍙栧埌鐢ㄦ埛淇℃伅锛岃閲嶆柊鐧诲綍");
- return ret.toJSONString();
- }
- UserEntity userEntity = null;
- try {
- loginForm.validate();
-
- userEntity = userService.doLogin(loginName, password, ip);
- userEntity.setLastLoginAddress(ip);
- //saveCurrUser(request, response, userEntity);
- recordSysLog(request, userEntity, "鐢ㄦ埛鐧诲綍绯荤粺鎴愬姛!");
- // 杩斿洖鎷ユ湁鐨勮彍鍗曟暟鎹�
- Set<String> urls = resourceService.findUrlSetByUserId(userEntity.getId());
- List<MenuEntity> outlookBarList = menuService.findTreeMenu(userEntity, urls);
- String currUserName = userEntity.getRealName();
- if (currUserName == null || currUserName.trim().length() == 0) {
- currUserName = "绠＄悊鍛�";
- }
- userEntity.setLoginTime(System.currentTimeMillis());
- userEntity.setToken(IdUtil.fastSimpleUUID());
- userEntity.setExpireTime(DateUtils.addCurrDate(7).getTime());
- String token = authTokenService.createToken(userEntity);
- JSONObject data = new JSONObject();
- data.put("token", token);
- data.put("currUserName", currUserName);
- data.put("barList", outlookBarList);
- data.put("id", userEntity.getId());
- data.put("userType", userEntity.getUserType());
-
- //this.generateBlackCookie(request, response, loginName, urls);
- ret.put(KEY_RESULT_DATA, data);
- ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
- ret.put(KEY_RESULT_MSG, "鐢ㄦ埛鐧诲綍绯荤粺鎴愬姛!");
- ret.put("resources", urls);
-
- return ret.toJSONString();
- } catch (Exception e) {
- log.error("login error ", e);
- if (userEntity == null) {
- userEntity = new UserEntity();
- userEntity.setLoginName(loginName);
- }
- ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
- ret.put(KEY_RESULT_MSG, super.convertException(e));
- return ret.toJSONString();
- }
+// //this.generateBlackCookie(request, response, loginName, urls);
+// ret.put(KEY_RESULT_DATA, data);
+// ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+// ret.put(KEY_RESULT_MSG, "鐢ㄦ埛鐧诲綍绯荤粺鎴愬姛!");
+// ret.put("resources", urls);
+//
+// return ret.toJSONString();
+// } catch (Exception e) {
+// log.error("login error ", e);
+// if (userEntity == null) {
+// userEntity = new UserEntity();
+// userEntity.setLoginName(loginName);
+// }
+// ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+// ret.put(KEY_RESULT_MSG, super.convertException(e));
+// return ret.toJSONString();
+// }
}
@RequestMapping("logout")
- public void logout() throws Exception {
+ public String logout() throws Exception {
recordSysLog(request, "閫€鍑虹櫥褰�");
super.removeCurrUser(request);
+ JSONObject ret = new JSONObject();
+ ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+ ret.put(KEY_RESULT_MSG, "鐢ㄦ埛閫€鍑虹郴缁熸垚鍔�!");
+ return ret.toJSONString();
}
@RequestMapping("index")
diff --git a/single-matter/src/main/java/com/mortals/xhx/base/system/param/service/ParamService.java b/single-matter/src/main/java/com/mortals/xhx/base/system/param/service/ParamService.java
index f606913b9d3eda2fb2259289eb28e45959dd1773..dd0153ab2ab1c4efd637fb0c169513863e7c7efc 100644
--- a/single-matter/src/main/java/com/mortals/xhx/base/system/param/service/ParamService.java
+++ b/single-matter/src/main/java/com/mortals/xhx/base/system/param/service/ParamService.java
@@ -44,4 +44,5 @@ public interface ParamService extends ICRUDCacheService<ParamEntity, Long>, IPar
*/
Map<String, String> getParamBySecondOrganize(String firstOrganize,String secondOrganize, String... excludeParamKeys);
+ Long getIdByKey(String key);
}
\ No newline at end of file
diff --git a/single-matter/src/main/java/com/mortals/xhx/base/system/param/service/impl/ParamServiceImpl.java b/single-matter/src/main/java/com/mortals/xhx/base/system/param/service/impl/ParamServiceImpl.java
index 9f0c82dd47085ca14816326b313d34b07ebec24d..ee69e2ab7b5f00c54258ac1b23e3f85af5727494 100644
--- a/single-matter/src/main/java/com/mortals/xhx/base/system/param/service/impl/ParamServiceImpl.java
+++ b/single-matter/src/main/java/com/mortals/xhx/base/system/param/service/impl/ParamServiceImpl.java
@@ -194,4 +194,11 @@ public class ParamServiceImpl extends AbstractCRUDCacheServiceImpl<ParamDao, Par
}
}
+
+ @Override
+ public Long getIdByKey(String key) {
+ List<ParamEntity> list = this.getCacheList();
+ Map<String, Long> keyValueMap = list.parallelStream().collect(Collectors.toMap(x -> x.getParamKey(), y -> y.getId(), (o, n) -> n));
+ return keyValueMap.get(key);
+ }
}
\ No newline at end of file
diff --git a/single-matter/src/main/java/com/mortals/xhx/base/system/param/web/ParamController.java b/single-matter/src/main/java/com/mortals/xhx/base/system/param/web/ParamController.java
index 297005f3ed2f786735b128289c6586a5d7fb9187..270c46a56a1a1d2bfb30cd9e0d31abc93ab877f0 100644
--- a/single-matter/src/main/java/com/mortals/xhx/base/system/param/web/ParamController.java
+++ b/single-matter/src/main/java/com/mortals/xhx/base/system/param/web/ParamController.java
@@ -3,15 +3,16 @@ package com.mortals.xhx.base.system.param.web;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.RepeatSubmit;
+import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.code.PageDisplayType;
import com.mortals.framework.model.Context;
import com.mortals.framework.util.FileUtil;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.common.pdu.BannerPdu;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
import com.mortals.framework.web.BaseCRUDJsonMappingController;
import com.mortals.xhx.base.system.param.model.ParamEntity;
@@ -21,8 +22,9 @@ import com.mortals.xhx.common.code.ModStatusEnum;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
+
+import static com.mortals.xhx.common.key.ParamKey.SYS_PARAM_BANNER;
/**
* 鍙傛暟淇℃伅
@@ -49,7 +51,6 @@ public class ParamController extends BaseCRUDJsonBodyMappingController<ParamServ
model.put(KEY_RESULT_DICT, status);
}
-
private Map<String, Object> getPageDisplayType() {
PageDisplayType[] pageDisplayTypes = PageDisplayType.values();
Map<String, Object> result = new HashMap<>(pageDisplayTypes.length);
@@ -59,6 +60,60 @@ public class ParamController extends BaseCRUDJsonBodyMappingController<ParamServ
return result;
}
+ @GetMapping("banner/info")
+ @UnAuth
+ public String getBannerInfo() {
+ JSONObject jsonObject = new JSONObject();
+ String busiDesc = "鑾峰彇banner閰嶇疆";
+ try {
+ String value = this.service.getValueByKey(SYS_PARAM_BANNER);
+ if (ObjectUtils.isEmpty(value)) {
+ BannerPdu pdu = new BannerPdu();
+ jsonObject.put(KEY_RESULT_DATA, pdu);
+ }else {
+ BannerPdu pdu = JSONObject.parseObject(value,BannerPdu.class);
+ jsonObject.put(KEY_RESULT_DATA, pdu);
+ }
+ recordSysLog(request, busiDesc + " 銆愭垚鍔熴€�");
+ jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+ jsonObject.put(KEY_RESULT_MSG, busiDesc + "鎴愬姛锛�");
+ } catch (Exception e) {
+ log.error("鑾峰彇寮傚父", e);
+ jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+ jsonObject.put(KEY_RESULT_MSG, super.convertException(e));
+ }
+ return jsonObject.toJSONString();
+ }
+
+ @PostMapping("banner/save")
+ @UnAuth
+ public String saveBannerInfo(@RequestBody BannerPdu pdu) {
+ JSONObject jsonObject = new JSONObject();
+ String busiDesc = "淇敼banner閰嶇疆";
+ try {
+ ParamEntity entity = new ParamEntity();
+ entity.setParamKey(SYS_PARAM_BANNER);
+ entity.setParamValue(JSONObject.toJSONString(pdu));
+ Long id = this.service.getIdByKey(SYS_PARAM_BANNER);
+ if(id==null){
+ entity.setCreateTime(new Date());
+ this.service.save(entity);
+ }else {
+ entity.setId(id);
+ entity.setUpdateTime(new Date());
+ this.service.update(entity);
+ }
+ recordSysLog(request, busiDesc + " 銆愭垚鍔熴€�");
+ jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+ jsonObject.put(KEY_RESULT_MSG, busiDesc + "鎴愬姛锛�");
+ } catch (Exception e) {
+ log.error("鑾峰彇寮傚父", e);
+ jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+ jsonObject.put(KEY_RESULT_MSG, super.convertException(e));
+ }
+ return jsonObject.toJSONString();
+ }
+
public static void main(String[] args) {
FileUtil.delete("E:\\pic\\1.png");
}
diff --git a/single-matter/src/main/java/com/mortals/xhx/base/system/upload/service/impl/UploadServiceImpl.java b/single-matter/src/main/java/com/mortals/xhx/base/system/upload/service/impl/UploadServiceImpl.java
index ce3814d848580ee48abcdb8104ffacef52b48153..821f416eccf751b4d38d90d71cbac268a8aae65d 100644
--- a/single-matter/src/main/java/com/mortals/xhx/base/system/upload/service/impl/UploadServiceImpl.java
+++ b/single-matter/src/main/java/com/mortals/xhx/base/system/upload/service/impl/UploadServiceImpl.java
@@ -57,7 +57,7 @@ public class UploadServiceImpl implements UploadService {
log.error("鏂囦欢涓婁紶澶у皬瓒呰繃闄愬埗锛屽綋鍓嶆枃浠�---" + tempFile.getSize() + "锛屽厑璁稿ぇ灏�----------" + type.getMaxSize());
throw new AppException("鏂囦欢涓婁紶澶у皬瓒呰繃闄愬埗锛�");
}
- if (null != fileName && fileName.length() > 50) {
+ if (null != fileName && fileName.length() > 128) {
throw new AppException("鏂囦欢鍚嶇О杩囬暱锛屾棤娉曚笂浼狅紒");
}
diff --git a/single-matter/src/main/java/com/mortals/xhx/common/key/ParamKey.java b/single-matter/src/main/java/com/mortals/xhx/common/key/ParamKey.java
index 47c5199eba6ad1cd3ef70df37bef5af66cddb0d6..76228eb7ecaebe3508c839839eddca6e03e60eeb 100644
--- a/single-matter/src/main/java/com/mortals/xhx/common/key/ParamKey.java
+++ b/single-matter/src/main/java/com/mortals/xhx/common/key/ParamKey.java
@@ -12,4 +12,7 @@ public class ParamKey {
/** 鐗╂枡缂栫爜闀垮害锛岄粯璁�6 */
public static final String MATERIA_CODE_LENGTH = "iot:base:param:materia:length";
+ /** banner鍥鹃厤缃� */
+ public static String SYS_PARAM_BANNER = "banner";
+
}
diff --git a/single-matter/src/main/java/com/mortals/xhx/common/pdu/BannerPdu.java b/single-matter/src/main/java/com/mortals/xhx/common/pdu/BannerPdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..fc1e62f1d91742145a5c22f3de031e36974591c0
--- /dev/null
+++ b/single-matter/src/main/java/com/mortals/xhx/common/pdu/BannerPdu.java
@@ -0,0 +1,38 @@
+package com.mortals.xhx.common.pdu;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class BannerPdu {
+ private List<BannerInfo> bannerInfo;
+
+ public BannerPdu() {
+ bannerInfo = new ArrayList<>();
+ BannerInfo info = new BannerInfo();
+ bannerInfo.add(info);
+ }
+}
+
+class BannerInfo{
+ private String fileName = "bannerName";
+ private String filePath = "bannerUrl";
+
+ public String getFileName() {
+ return fileName;
+ }
+
+ public void setFileName(String fileName) {
+ this.fileName = fileName;
+ }
+
+ public String getFilePath() {
+ return filePath;
+ }
+
+ public void setFilePath(String filePath) {
+ this.filePath = filePath;
+ }
+}
diff --git a/single-matter/src/main/java/com/mortals/xhx/common/utils/AESUtil.java b/single-matter/src/main/java/com/mortals/xhx/common/utils/AESUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..27b87cc00ca8508ed3d2262994ea54aac06f2015
--- /dev/null
+++ b/single-matter/src/main/java/com/mortals/xhx/common/utils/AESUtil.java
@@ -0,0 +1,241 @@
+package com.mortals.xhx.common.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.Base64Utils;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+/**
+ * AES鍔犲瘑宸ュ叿绫�
+ *
+ */
+public class AESUtil {
+ /**
+ * 鏃ュ織鐩稿叧
+ */
+ private static final Logger LOGGER = LoggerFactory.getLogger(AESUtil.class);
+ /**
+ * 缂栫爜
+ */
+ private static final String ENCODING = "UTF-8";
+ /**
+ * 绠楁硶瀹氫箟
+ */
+ private static final String AES_ALGORITHM = "AES";
+ /**
+ * 鎸囧畾濉厖鏂瑰紡
+ */
+ private static final String CIPHER_PADDING = "AES/ECB/PKCS5Padding";
+ private static final String CIPHER_CBC_PADDING = "AES/CBC/PKCS5Padding";
+ /**
+ * 鍋忕Щ閲�(CBC涓娇鐢紝澧炲己鍔犲瘑绠楁硶寮哄害)
+ */
+ private static final String IV_SEED = "tdrdadq59tbss5n7";
+
+ /**
+ * AES鍔犲瘑
+ * @param content 寰呭姞瀵嗗唴瀹�
+ * @param aesKey 瀵嗙爜
+ * @return
+ */
+ public static String encrypt(String content, String aesKey){
+ if(StringUtils.isBlank(content)){
+ LOGGER.info("AES encrypt: the content is null!");
+ return null;
+ }
+ //鍒ゆ柇绉橀挜鏄惁涓�16浣�
+ if(StringUtils.isNotBlank(aesKey) && aesKey.length() == 16){
+ try {
+ //瀵瑰瘑鐮佽繘琛岀紪鐮�
+ byte[] bytes = aesKey.getBytes(ENCODING);
+ //璁剧疆鍔犲瘑绠楁硶锛岀敓鎴愮閽�
+ SecretKeySpec skeySpec = new SecretKeySpec(bytes, AES_ALGORITHM);
+ // "绠楁硶/妯″紡/琛ョ爜鏂瑰紡"
+ Cipher cipher = Cipher.getInstance(CIPHER_PADDING);
+ //閫夋嫨鍔犲瘑
+ cipher.init(Cipher.ENCRYPT_MODE, skeySpec);
+ //鏍规嵁寰呭姞瀵嗗唴瀹圭敓鎴愬瓧鑺傛暟缁�
+ byte[] encrypted = cipher.doFinal(content.getBytes(ENCODING));
+ //杩斿洖base64瀛楃涓�
+ return Base64Utils.encodeToString(encrypted);
+ } catch (Exception e) {
+ LOGGER.info("AES encrypt exception:" + e.getMessage());
+ throw new RuntimeException(e);
+ }
+
+ }else {
+ LOGGER.info("AES encrypt: the aesKey is null or error!");
+ return null;
+ }
+ }
+
+ /**
+ * 瑙ｅ瘑
+ *
+ * @param content 寰呰В瀵嗗唴瀹�
+ * @param aesKey 瀵嗙爜
+ * @return
+ */
+ public static String decrypt(String content, String aesKey){
+ if(StringUtils.isBlank(content)){
+ LOGGER.info("AES decrypt: the content is null!");
+ return null;
+ }
+ //鍒ゆ柇绉橀挜鏄惁涓�16浣�
+ if(StringUtils.isNotBlank(aesKey) && aesKey.length() == 16){
+ try {
+ //瀵瑰瘑鐮佽繘琛岀紪鐮�
+ byte[] bytes = aesKey.getBytes(ENCODING);
+ //璁剧疆瑙ｅ瘑绠楁硶锛岀敓鎴愮閽�
+ SecretKeySpec skeySpec = new SecretKeySpec(bytes, AES_ALGORITHM);
+ // "绠楁硶/妯″紡/琛ョ爜鏂瑰紡"
+ Cipher cipher = Cipher.getInstance(CIPHER_PADDING);
+ //閫夋嫨瑙ｅ瘑
+ cipher.init(Cipher.DECRYPT_MODE, skeySpec);
+
+ //鍏堣繘琛孊ase64瑙ｇ爜
+ byte[] decodeBase64 = Base64Utils.decodeFromString(content);
+
+ //鏍规嵁寰呰В瀵嗗唴瀹硅繘琛岃В瀵�
+ byte[] decrypted = cipher.doFinal(decodeBase64);
+ //灏嗗瓧鑺傛暟缁勮浆鎴愬瓧绗︿覆
+ return new String(decrypted, ENCODING);
+ } catch (Exception e) {
+ LOGGER.info("AES decrypt exception:" + e.getMessage());
+ throw new RuntimeException(e);
+ }
+
+ }else {
+ LOGGER.info("AES decrypt: the aesKey is null or error!");
+ return null;
+ }
+ }
+
+ /**
+ * AES_CBC鍔犲瘑
+ *
+ * @param content 寰呭姞瀵嗗唴瀹�
+ * @param aesKey 瀵嗙爜
+ * @return
+ */
+ public static String encryptCBC(String content, String aesKey){
+ if(StringUtils.isBlank(content)){
+ LOGGER.info("AES_CBC encrypt: the content is null!");
+ return null;
+ }
+ //鍒ゆ柇绉橀挜鏄惁涓�16浣�
+ if(StringUtils.isNotBlank(aesKey) && aesKey.length() == 16){
+ try {
+ //瀵瑰瘑鐮佽繘琛岀紪鐮�
+ byte[] bytes = aesKey.getBytes(ENCODING);
+ //璁剧疆鍔犲瘑绠楁硶锛岀敓鎴愮閽�
+ SecretKeySpec skeySpec = new SecretKeySpec(bytes, AES_ALGORITHM);
+ // "绠楁硶/妯″紡/琛ョ爜鏂瑰紡"
+ Cipher cipher = Cipher.getInstance(CIPHER_CBC_PADDING);
+ //鍋忕Щ
+ IvParameterSpec iv = new IvParameterSpec(IV_SEED.getBytes(ENCODING));
+ //閫夋嫨鍔犲瘑
+ cipher.init(Cipher.ENCRYPT_MODE, skeySpec, iv);
+ //鏍规嵁寰呭姞瀵嗗唴瀹圭敓鎴愬瓧鑺傛暟缁�
+ byte[] encrypted = cipher.doFinal(content.getBytes(ENCODING));
+ //杩斿洖base64瀛楃涓�
+ return Base64Utils.encodeToString(encrypted);
+ } catch (Exception e) {
+ LOGGER.info("AES_CBC encrypt exception:" + e.getMessage());
+ throw new RuntimeException(e);
+ }
+
+ }else {
+ LOGGER.info("AES_CBC encrypt: the aesKey is null or error!");
+ return null;
+ }
+ }
+
+ /**
+ * AES_CBC瑙ｅ瘑
+ *
+ * @param content 寰呰В瀵嗗唴瀹�
+ * @param aesKey 瀵嗙爜
+ * @return
+ */
+ public static String decryptCBC(String content, String aesKey){
+ if(StringUtils.isBlank(content)){
+ LOGGER.info("AES_CBC decrypt: the content is null!");
+ return null;
+ }
+ //鍒ゆ柇绉橀挜鏄惁涓�16浣�
+ if(StringUtils.isNotBlank(aesKey) && aesKey.length() == 16){
+ try {
+ //瀵瑰瘑鐮佽繘琛岀紪鐮�
+ byte[] bytes = aesKey.getBytes(ENCODING);
+ //璁剧疆瑙ｅ瘑绠楁硶锛岀敓鎴愮閽�
+ SecretKeySpec skeySpec = new SecretKeySpec(bytes, AES_ALGORITHM);
+ //鍋忕Щ
+ IvParameterSpec iv = new IvParameterSpec(IV_SEED.getBytes(ENCODING));
+ // "绠楁硶/妯″紡/琛ョ爜鏂瑰紡"
+ Cipher cipher = Cipher.getInstance(CIPHER_CBC_PADDING);
+ //閫夋嫨瑙ｅ瘑
+ cipher.init(Cipher.DECRYPT_MODE, skeySpec, iv);
+
+ //鍏堣繘琛孊ase64瑙ｇ爜
+ byte[] decodeBase64 = Base64Utils.decodeFromString(content);
+
+ //鏍规嵁寰呰В瀵嗗唴瀹硅繘琛岃В瀵�
+ byte[] decrypted = cipher.doFinal(decodeBase64);
+ //灏嗗瓧鑺傛暟缁勮浆鎴愬瓧绗︿覆
+ return new String(decrypted, ENCODING);
+ } catch (Exception e) {
+ LOGGER.info("AES_CBC decrypt exception:" + e.getMessage());
+ throw new RuntimeException(e);
+ }
+
+ }else {
+ LOGGER.info("AES_CBC decrypt: the aesKey is null or error!");
+ return null;
+ }
+ }
+
+ public static void main(String[] args) {
+ // AES鏀寔涓夌闀垮害鐨勫瘑閽ワ細128浣嶃€�192浣嶃€�256浣嶃€�
+ // 浠ｇ爜涓繖绉嶅氨鏄�128浣嶇殑鍔犲瘑瀵嗛挜锛�16瀛楄妭 * 8浣�/瀛楄妭 = 128浣嶃€�
+ String random = "0000000671595991";
+// System.out.println("闅忔満key:" + random);
+// System.out.println();
+//
+// System.out.println("---------鍔犲瘑---------");
+// String aesResult = encrypt("511181198903042414", random);
+// System.out.println("aes鍔犲瘑缁撴灉:" + aesResult);
+// System.out.println();
+//
+// System.out.println("---------瑙ｅ瘑---------");
+// String decrypt = decrypt(aesResult, random);
+// System.out.println("aes瑙ｅ瘑缁撴灉:" + decrypt);
+// System.out.println();
+//
+//
+// System.out.println("--------AES_CBC鍔犲瘑瑙ｅ瘑---------");
+// String cbcResult = encryptCBC("511181198903042414", random);
+// System.out.println("aes_cbc鍔犲瘑缁撴灉:" + cbcResult);
+// System.out.println();
+
+ System.out.println("---------瑙ｅ瘑CBC---------");
+ String cbcDecrypt = decryptCBC("SWYgzz2KjYx+6TopctMpJQ==", random);
+ System.out.println("aes瑙ｅ瘑缁撴灉:" + cbcDecrypt);
+ System.out.println();
+
+ System.out.println("---------瑙ｅ瘑CBC---------");
+ String cbcDecrypt1 = decryptCBC("DXgGKRNryrPM/eeUQiN4wlfpYNUZ0XIwumXNHRFQGZM=", random);
+ System.out.println("aes瑙ｅ瘑缁撴灉:" + cbcDecrypt1);
+ System.out.println();
+
+ System.out.println("---------瑙ｅ瘑CBC---------");
+ String cbcDecrypt2 = decryptCBC("6yPbSSjvMeFuJ2ONqNmSyA==", random);
+ System.out.println("aes瑙ｅ瘑缁撴灉:" + cbcDecrypt2);
+ System.out.println();
+ }
+}
+
diff --git a/single-matter/src/main/java/com/mortals/xhx/daemon/task/SyncPortalUserTaskImpl.java b/single-matter/src/main/java/com/mortals/xhx/daemon/task/SyncPortalUserTaskImpl.java
index b3df8e9ae62cf64c78199add106bf3b5ca37e053..fb864d6d40f822c71c0fd4a60e5fdde2eb79e6db 100644
--- a/single-matter/src/main/java/com/mortals/xhx/daemon/task/SyncPortalUserTaskImpl.java
+++ b/single-matter/src/main/java/com/mortals/xhx/daemon/task/SyncPortalUserTaskImpl.java
@@ -4,6 +4,7 @@ import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.service.ITask;
import com.mortals.framework.service.ITaskExcuteService;
+import com.mortals.framework.util.StringUtils;
import com.mortals.xhx.base.system.user.model.UserEntity;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
@@ -11,6 +12,9 @@ import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.pdu.RespData;
import com.mortals.xhx.common.pdu.user.UserPdu;
import com.mortals.xhx.feign.user.IUserFeign;
+import com.mortals.xhx.module.apply.model.ApproverEntity;
+import com.mortals.xhx.module.apply.model.ApproverQuery;
+import com.mortals.xhx.module.apply.service.ApproverService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +38,8 @@ public class SyncPortalUserTaskImpl implements ITaskExcuteService {
@Autowired
private UserService userService;
+ @Autowired
+ private ApproverService approverService;
@Override
@@ -70,7 +76,6 @@ public class SyncPortalUserTaskImpl implements ITaskExcuteService {
//闂ㄦ埛鐢ㄦ埛map
// Map<String, UserEntity> newUserMap = newUserList.stream().collect(Collectors.toMap(x -> x.getLoginName(), y -> y, (o, n) -> n));
-
List<UserEntity> saveUserList = newUserList.stream().map(item -> {
if (!oldUserMap.containsKey(item.getLoginName())) {
item.setCreateUserId(1L);
@@ -89,6 +94,42 @@ public class SyncPortalUserTaskImpl implements ITaskExcuteService {
});
}
+ List<ApproverEntity> newApproverList = userPduList.stream().map(newUser -> {
+ ApproverEntity approverEntity = new ApproverEntity();
+ approverEntity.initAttrValue();
+ approverEntity.setFullName(newUser.getRealName());
+ if(StringUtils.isNotEmpty(newUser.getPhone())) {
+ approverEntity.setPhoneNumber(newUser.getMobile());
+ }else {
+ approverEntity.setPhoneNumber("13888888888");
+ }
+ approverEntity.setLoginName(newUser.getLoginName());
+ approverEntity.setLoginPwd(newUser.getLoginPwd());
+ return approverEntity;
+ }).collect(Collectors.toList());
+ List<ApproverEntity> oldApproverList = approverService.find(new ApproverQuery());
+ log.info(" oldApproverList size锛歿}", oldApproverList.size());
+ //褰撳墠鍗曚簨椤瑰鎵逛汉鍛�
+ Map<String, ApproverEntity> oldApproverMap = oldApproverList.parallelStream().collect(Collectors.toMap(x -> x.getLoginName(), y -> y, (o, n) -> n));
+ List<ApproverEntity> saveApproverList = newApproverList.stream().map(item -> {
+ if (!oldApproverMap.containsKey(item.getLoginName())) {
+ item.setCreateUserId(1L);
+ item.setCreateUserName("绯荤粺绠＄悊鍛�");
+ item.setCreateTime(new Date());
+ return item;
+ }
+ return null;
+ }).filter(f -> f != null).collect(Collectors.toList());
+
+
+ if (!ObjectUtils.isEmpty(saveApproverList)) {
+ log.info("鍗曚簨椤瑰鎵逛汉鍛樻柊澧烇紝size:{}", saveApproverList.size());
+ saveApproverList.stream().forEach(item -> {
+ approverService.getDao().insert(item);
+ });
+ }
+
+
}
//鏌ユ壘鏂板 涓庢洿鏂�
diff --git a/single-matter/src/main/java/com/mortals/xhx/daemon/task/SyncSiteMatterTaskImpl.java b/single-matter/src/main/java/com/mortals/xhx/daemon/task/SyncSiteMatterTaskImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..d6f1d6e6998037c4124d824988dd5b93153f7cf8
--- /dev/null
+++ b/single-matter/src/main/java/com/mortals/xhx/daemon/task/SyncSiteMatterTaskImpl.java
@@ -0,0 +1,106 @@
+package com.mortals.xhx.daemon.task;
+
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.service.ITask;
+import com.mortals.framework.service.ITaskExcuteService;
+import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.site.SiteMatterPdu;
+import com.mortals.xhx.common.pdu.site.SitePdu;
+import com.mortals.xhx.common.utils.BeanUtil;
+import com.mortals.xhx.feign.site.ISiteFeign;
+import com.mortals.xhx.feign.site.ISiteMatterFeign;
+import com.mortals.xhx.module.site.model.SiteMatterEntity;
+import com.mortals.xhx.module.site.model.SiteMatterQuery;
+import com.mortals.xhx.module.site.service.SiteMatterService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 鍚屾浜嬮」鍒楄〃
+ */
+@Slf4j
+@Service("SyncSiteMatterTask")
+public class SyncSiteMatterTaskImpl implements ITaskExcuteService {
+
+ @Autowired
+ private ISiteFeign siteFeign;
+ @Autowired
+ private ISiteMatterFeign siteMatterFeign;
+ @Autowired
+ private SiteMatterService siteMatterService;
+
+ @Override
+ public void excuteTask(ITask task) throws AppException {
+ log.info("寮€濮嬪悓姝ヤ簨椤瑰垪琛紒");
+ SitePdu sitePdu = new SitePdu();
+ sitePdu.setId(1L);
+ String resp = siteFeign.getFlatSitesBySiteId(sitePdu);
+ JSONObject jsonObject = JSONObject.parseObject(resp);
+ if (jsonObject.getInteger("code") == YesNoEnum.YES.getValue()) {
+ List<SitePdu> siteList = JSONObject.parseArray(jsonObject.getString("data"),SitePdu.class);
+ log.info("鎬绘暟閲忥細{}",siteList.size());
+ siteList.forEach(site -> {
+ //siteMatterService.getDao().delete(new SiteMatterQuery().siteId(site.getId()));
+ int page=100;
+ int pageNum=100;
+ for(int i=1;i<=page;i++){
+ SiteMatterPdu siteMatterPdu = new SiteMatterPdu();
+ siteMatterPdu.setPage(i);
+ siteMatterPdu.setSize(pageNum);
+ siteMatterPdu.setSiteId(site.getId());
+ log.info("璇锋眰鍒楄〃:"+i);
+ Rest<RespData<List<SiteMatterPdu>>> siteMatterRest = siteMatterFeign.list(siteMatterPdu);
+ if (siteMatterRest.getCode() == YesNoEnum.YES.getValue()) {
+ if(siteMatterRest.getData().getData().size()==0){
+ log.info("鏁版嵁娌℃湁锛佽烦鍑哄惊鐜�");
+ break;
+ }
+ //鍒犻櫎鍚庢柊澧�
+ log.info("浜嬮」鎬绘暟閲忥細{}",siteMatterRest.getData().getData().size());
+ List<SiteMatterEntity> siteMatterEntities = new ArrayList<>();
+ siteMatterRest.getData().getData().forEach(siteMatter ->{
+ SiteMatterEntity temp = siteMatterService.selectOne(new SiteMatterQuery().matterId(siteMatter.getMatterId()));
+ if(temp==null) {
+ SiteMatterEntity target = new SiteMatterEntity();
+ target.initAttrValue();
+ BeanUtils.copyProperties(siteMatter, target, BeanUtil.getNullPropertyNames(siteMatter));
+ target.setCreateTime(new Date());
+ target.setViewsCount(0l);
+ target.setIsConvert(0);
+ siteMatterEntities.add(target);
+ }
+ });
+
+ if (!ObjectUtils.isEmpty(siteMatterEntities)) {
+ // sheetMatterService.getDao().delete(new SheetMatterQuery().siteId(site.getId()));
+ log.info("鏂板鏁伴噺锛歿}",siteMatterEntities.size());
+ siteMatterService.save(siteMatterEntities);
+ /* List<List<SheetMatterEntity>> partition = ListUtil.partition(sheetMatterEntities, 500);
+ for (List<SheetMatterEntity> matterEntities : partition) {
+ }*/
+
+ }
+ }else{
+ log.info("璇锋眰閿欒锛宑ode:{}",siteMatterRest.getCode());
+ }
+ }
+
+ });
+ }
+ }
+ @Override
+ public void stopTask(ITask task) throws AppException {
+
+ }
+}
diff --git a/single-matter/src/main/java/com/mortals/xhx/module/apply/model/vo/MatterApplyDatumGroupVO.java b/single-matter/src/main/java/com/mortals/xhx/module/apply/model/vo/MatterApplyDatumGroupVO.java
index 69e3c12bc9351ba81908552a3bfdf06076391fb0..ea801acd97ede673171a13214aabe9224d4f8fa9 100644
--- a/single-matter/src/main/java/com/mortals/xhx/module/apply/model/vo/MatterApplyDatumGroupVO.java
+++ b/single-matter/src/main/java/com/mortals/xhx/module/apply/model/vo/MatterApplyDatumGroupVO.java
@@ -1,5 +1,6 @@
package com.mortals.xhx.module.apply.model.vo;
+import com.mortals.xhx.common.pdu.matter.MatterDatumFilePdu;
import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
import lombok.Data;
@@ -31,5 +32,5 @@ public class MatterApplyDatumGroupVO {
private List<DatumFileVO> datumFileList;
/** 绀轰緥鏍疯〃 */
- private List<MatterDatumFileEntity> exampleFileList;
+ private List<MatterDatumFilePdu> exampleFileList;
}
diff --git a/single-matter/src/main/java/com/mortals/xhx/module/apply/model/vo/MatterApplyVo.java b/single-matter/src/main/java/com/mortals/xhx/module/apply/model/vo/MatterApplyVo.java
index 1e11dc6152f9610e846f45178004772ce2d7843b..28b29fa835f5ff03a3284fa6d3a6eb3d8d81cefe 100644
--- a/single-matter/src/main/java/com/mortals/xhx/module/apply/model/vo/MatterApplyVo.java
+++ b/single-matter/src/main/java/com/mortals/xhx/module/apply/model/vo/MatterApplyVo.java
@@ -31,4 +31,6 @@ public class MatterApplyVo extends BaseEntityLong {
private String applyTypeName;
private List<MatterApplyDatumGroupVO> datumGroupList;
+ /** 鏁版嵁鏉ユ簮 1锛氬皬绋嬪簭锛�0鍏朵粬*/
+ private Integer source;
}
\ No newline at end of file
diff --git a/single-matter/src/main/java/com/mortals/xhx/module/apply/service/impl/ApproverServiceImpl.java b/single-matter/src/main/java/com/mortals/xhx/module/apply/service/impl/ApproverServiceImpl.java
index 970d787ebdc3421e6a38dfd22a92c93961b8162c..adad6fa497f46b138dc59a4f4e725960555fd43c 100644
--- a/single-matter/src/main/java/com/mortals/xhx/module/apply/service/impl/ApproverServiceImpl.java
+++ b/single-matter/src/main/java/com/mortals/xhx/module/apply/service/impl/ApproverServiceImpl.java
@@ -86,17 +86,18 @@ public class ApproverServiceImpl extends AbstractCRUDServiceImpl<ApproverDao, Ap
@Override
public String getDeptCodeByUser(Long userId) throws AppException {
- UserEntity userEntity = userService.get(userId);
- if(userEntity==null){
- throw new AppException("鐢ㄦ埛id涓嶆纭�,鎵句笉鍒板搴旂殑鐢ㄦ埛淇℃伅");
- }
- ApproverEntity approverEntity = this.selectOne(new ApproverQuery().loginName(userEntity.getLoginName()));
- if(approverEntity==null){
- throw new AppException("璇ョ敤鎴蜂笉鏄瀹″伐浣滀汉鍛�");
- }
- if(StringUtils.isEmpty(approverEntity.getDeptCode())){
- throw new AppException("璇ュ伐浣滀汉鍛樻病鏈夐厤缃杈栭儴闂�");
- }
- return approverEntity.getDeptCode();
+// UserEntity userEntity = userService.get(userId);
+// if(userEntity==null){
+// throw new AppException("鐢ㄦ埛id涓嶆纭�,鎵句笉鍒板搴旂殑鐢ㄦ埛淇℃伅");
+// }
+// ApproverEntity approverEntity = this.selectOne(new ApproverQuery().loginName(userEntity.getLoginName()));
+// if(approverEntity==null){
+// throw new AppException("璇ョ敤鎴蜂笉鏄瀹″伐浣滀汉鍛�");
+// }
+// if(StringUtils.isEmpty(approverEntity.getDeptCode())){
+// throw new AppException("璇ュ伐浣滀汉鍛樻病鏈夐厤缃杈栭儴闂�");
+// }
+// return approverEntity.getDeptCode();
+ return null;
}
}
\ No newline at end of file
diff --git a/single-matter/src/main/java/com/mortals/xhx/module/apply/service/impl/MatterApplyServiceImpl.java b/single-matter/src/main/java/com/mortals/xhx/module/apply/service/impl/MatterApplyServiceImpl.java
index 78cc46c5aa4f21810405f278a8842e407172d8c4..893c5aca34e421b2f4aeec793a51dd6c254c58cf 100644
--- a/single-matter/src/main/java/com/mortals/xhx/module/apply/service/impl/MatterApplyServiceImpl.java
+++ b/single-matter/src/main/java/com/mortals/xhx/module/apply/service/impl/MatterApplyServiceImpl.java
@@ -1,5 +1,6 @@
package com.mortals.xhx.module.apply.service.impl;
+import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
@@ -7,6 +8,10 @@ import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.util.StringUtils;
import com.mortals.xhx.base.system.user.model.UserEntity;
import com.mortals.xhx.base.system.user.service.UserService;
+import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.matter.MatterDatumFilePdu;
+import com.mortals.xhx.feign.matter.IMatterDatumFileFeign;
import com.mortals.xhx.module.apply.dao.MatterApplyDao;
import com.mortals.xhx.module.apply.model.MatterApplyDatumEntity;
import com.mortals.xhx.module.apply.model.MatterApplyDatumQuery;
@@ -56,7 +61,7 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
@Autowired
private SingleMatterService singleMatterService;
@Autowired
- private MatterDatumFileService matterDatumFileService;
+ private IMatterDatumFileFeign iMatterDatumFileFeign;
@Override
protected void saveBefore(MatterApplyEntity entity, Context context) throws AppException {
@@ -163,7 +168,16 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
@Override
protected void updateAfter(MatterApplyEntity entity, Context context) throws AppException {
if(CollectionUtils.isNotEmpty(entity.getApplyDatumList())){
- matterApplyDatumService.update(entity.getApplyDatumList());
+ matterApplyDatumService.getDao().delete(new MatterApplyDatumQuery().applyId(entity.getId()));
+ for (MatterApplyDatumEntity item:entity.getApplyDatumList()){
+ item.setSiteId(entity.getSiteId());
+ item.setSingleMatterId(entity.getSingleMatterId());
+ item.setMatterId(entity.getMatterId());
+ item.setApplyId(entity.getId());
+ item.setCreateTime(new Date());
+ item.setCreateUserId(entity.getCreateUserId());
+ }
+ matterApplyDatumService.save(entity.getApplyDatumList());
}
}
@@ -233,8 +247,13 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
datumFileList.add(fileVO);
}
groupVO.setDatumFileList(datumFileList);
- List<MatterDatumFileEntity> datumFileEntities = matterDatumFileService.find(new MatterDatumFileQuery().datumId(groupVO.getDatumId()).filetype("绀轰緥鏍疯〃"));
- groupVO.setExampleFileList(datumFileEntities);
+ MatterDatumFilePdu matterDatumFilePdu = new MatterDatumFilePdu();
+ matterDatumFilePdu.setDatumId(groupVO.getDatumId());
+ matterDatumFilePdu.setFiletype("绀轰緥鏍疯〃");
+ Rest<RespData<List<MatterDatumFilePdu>>> datumFileEntities = iMatterDatumFileFeign.list(matterDatumFilePdu);
+ if(datumFileEntities.getCode()== YesNoEnum.YES.getValue()){
+ groupVO.setExampleFileList(datumFileEntities.getData().getData());
+ }
groupVOList.add(groupVO);
}
}
diff --git a/single-matter/src/main/java/com/mortals/xhx/module/apply/web/MatterApplyController.java b/single-matter/src/main/java/com/mortals/xhx/module/apply/web/MatterApplyController.java
index 9e0d45c8c6be3e519c568c0a4ded1115343b736e..ce30417d93d7fcb25d78816a1ce6c6dc04100e48 100644
--- a/single-matter/src/main/java/com/mortals/xhx/module/apply/web/MatterApplyController.java
+++ b/single-matter/src/main/java/com/mortals/xhx/module/apply/web/MatterApplyController.java
@@ -11,6 +11,7 @@ import com.mortals.framework.utils.BeanUtil;
import com.mortals.framework.utils.ReflectUtils;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.utils.AESUtil;
import com.mortals.xhx.module.apply.model.MatterApplyDatumEntity;
import com.mortals.xhx.module.apply.model.MatterApplyDatumQuery;
import com.mortals.xhx.module.apply.service.MatterApplyDatumService;
@@ -85,6 +86,12 @@ public class MatterApplyController extends BaseCRUDJsonBodyMappingController<Mat
int code;
try {
this.saveBefore(entity, model, context);
+ if(entity.getSource()!=null && entity.getSource()==1) {
+ String random = "0000000671595991";
+ entity.setApplyPerson(AESUtil.decryptCBC(entity.getApplyPerson(), random));
+ entity.setIdCard(AESUtil.decryptCBC(entity.getIdCard(), random));
+ entity.setPhoneNum(AESUtil.decryptCBC(entity.getPhoneNum(), random));
+ }
if (entity.newEntity()) {
Class<MatterApplyEntity> tClass = ReflectUtils.getClassGenricType(this.getClass(), 1);
MatterApplyEntity initEntity = (MatterApplyEntity)tClass.newInstance();
@@ -193,6 +200,12 @@ public class MatterApplyController extends BaseCRUDJsonBodyMappingController<Mat
int code;
try {
+ if(entity.getSource()!=null && entity.getSource()==1) {
+ String random = "0000000671595991";
+ entity.setApplyPerson(AESUtil.decryptCBC(entity.getApplyPerson(), random));
+ entity.setIdCard(AESUtil.decryptCBC(entity.getIdCard(), random));
+ entity.setPhoneNum(AESUtil.decryptCBC(entity.getPhoneNum(), random));
+ }
this.service.reApply(entity,context);
model.put("id", entity.getId());
code = this.saveAfter(entity, model, context);
@@ -257,6 +270,18 @@ public class MatterApplyController extends BaseCRUDJsonBodyMappingController<Mat
int code;
try {
this.doListBefore(query, model, context);
+ if(query.getSource()!=null && query.getSource()==1) {
+ String random = "0000000671595991";
+ if(StringUtils.isNotEmpty(query.getApplyPerson())) {
+ query.setApplyPerson(AESUtil.decryptCBC(query.getApplyPerson(), random));
+ }
+ if(StringUtils.isNotEmpty(query.getIdCard())) {
+ query.setIdCard(AESUtil.decryptCBC(query.getIdCard(), random));
+ }
+ if(StringUtils.isNotEmpty(query.getPhoneNum())) {
+ query.setPhoneNum(AESUtil.decryptCBC(query.getPhoneNum(), random));
+ }
+ }
PageInfo pageInfo = this.buildPageInfo(query);
Result<MatterApplyEntity> result = this.getService().find(query, pageInfo, context);
this.doListAfter(query, result.getList(), context);
diff --git a/single-matter/src/main/java/com/mortals/xhx/module/base/web/BaseMatterController.java b/single-matter/src/main/java/com/mortals/xhx/module/base/web/BaseMatterController.java
new file mode 100644
index 0000000000000000000000000000000000000000..50baaf9c88ffcc9706a9e49d2b5e1f48a1582834
--- /dev/null
+++ b/single-matter/src/main/java/com/mortals/xhx/module/base/web/BaseMatterController.java
@@ -0,0 +1,342 @@
+package com.mortals.xhx.module.base.web;
+
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseJsonBodyController;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.matter.*;
+import com.mortals.xhx.feign.matter.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("base/matter")
+public class BaseMatterController extends BaseJsonBodyController {
+ @Autowired
+ private IMatterFeign iMatterFeign;
+ @Autowired
+ private IMatterDatumFeign iMatterDatumFeign;
+ @Autowired
+ private IMatterAcceptFeign iMatterAcceptFeign;
+ @Autowired
+ private IMatterChargesFeign iMatterChargesFeign;
+ @Autowired
+ private IMatterFlowlimitFeign iMatterFlowlimitFeign;
+ @Autowired
+ private IMatterIntermediaryFeign iMatterIntermediaryFeign;
+ @Autowired
+ private IMatterQuestionFeign iMatterQuestionFeign;
+ @Autowired
+ private IMatterSetbaseFeign iMatterSetbaseFeign;
+
+ /**
+ * 浜嬮」鍩烘湰淇℃伅
+ * @param id
+ * @return
+ */
+ @GetMapping({"info"})
+ @UnAuth
+ public Rest<Object> info(@RequestParam(value = "id") Long id) {
+ Rest<Object> ret = new Rest();
+ Map<String, Object> model = new HashMap();
+ Context context = this.getContext();
+ String busiDesc = "鏌ョ湅浜嬮」鍩烘湰淇℃伅";
+
+ int code;
+ try {
+ String result = iMatterFeign.info(id);
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ MatterPdu pdu = JSONObject.parseObject(jsonObject.getString("data"),MatterPdu.class);
+ code = jsonObject.getInteger("code");
+ if(code > 0) {
+ model.put("data", pdu);
+ model.put("dict", jsonObject.get("dict"));
+ model.put("message_info", busiDesc + "鎴愬姛");
+ }else {
+ model.put("message_info", jsonObject.getString("msg"));
+ }
+ this.recordSysLog(this.request, busiDesc + " 銆愭垚鍔熴€�");
+ } catch (Exception var9) {
+ code = -1;
+ this.doException(this.request, busiDesc, model, var9);
+ }
+
+ ret.setCode(code);
+ ret.setData(model);
+ ret.setDict(model.get("dict"));
+ ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+ return ret;
+ }
+
+ /**
+ * 鏌ョ湅浜嬮」鐢宠鏉愭枡涓氬姟鍒楄〃
+ * @param query
+ * @return
+ */
+ @PostMapping({"datum/list"})
+ @UnAuth
+ public Rest<Object> datumList(@RequestBody MatterDatumPdu query) {
+ Rest<Object> ret = new Rest();
+ Map<String, Object> model = new HashMap();
+ Context context = this.getContext();
+ String busiDesc = "鏌ョ湅浜嬮」鐢宠鏉愭枡涓氬姟鍒楄〃";
+
+ int code;
+ try {
+ Rest<RespData<List<MatterDatumPdu>>> result = iMatterDatumFeign.list(query);
+ code = result.getCode();
+ if(code > 0) {
+ model.put("data", result.getData().getData());
+ model.put("pageInfo", result.getData().getPageInfo());
+ model.put("dict", result.getData().getDict());
+ model.put("message_info", busiDesc + "鎴愬姛");
+ }else {
+ model.put("message_info", result.getMsg());
+ }
+ this.recordSysLog(this.request, busiDesc + " 銆愭垚鍔熴€�");
+ } catch (Exception var9) {
+ code = -1;
+ this.doException(this.request, busiDesc, model, var9);
+ }
+
+ ret.setCode(code);
+ ret.setData(model);
+ ret.setDict(model.get("dict"));
+ ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+ return ret;
+ }
+
+ /**
+ * 浜嬮」鍙楃悊鏉′欢
+ * @param query
+ * @return
+ */
+ @PostMapping({"accept/list"})
+ @UnAuth
+ public Rest<Object> acceptList(@RequestBody MatterAcceptPdu query) {
+ Rest<Object> ret = new Rest();
+ Map<String, Object> model = new HashMap();
+ Context context = this.getContext();
+ String busiDesc = "鏌ヨ浜嬮」鍙楃悊鏉′欢";
+
+ int code;
+ try {
+ Rest<RespData<List<MatterAcceptPdu>>> result = iMatterAcceptFeign.list(query);
+ code = result.getCode();
+ if(code > 0) {
+ model.put("data", result.getData().getData());
+ model.put("pageInfo", result.getData().getPageInfo());
+ model.put("dict", result.getData().getDict());
+ model.put("message_info", busiDesc + "鎴愬姛");
+ }else {
+ model.put("message_info", result.getMsg());
+ }
+ this.recordSysLog(this.request, busiDesc + " 銆愭垚鍔熴€�");
+ } catch (Exception var9) {
+ code = -1;
+ this.doException(this.request, busiDesc, model, var9);
+ }
+
+ ret.setCode(code);
+ ret.setData(model);
+ ret.setDict(model.get("dict"));
+ ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+ return ret;
+ }
+
+ /**
+ * 鏌ョ湅浜嬮」鍔炵悊娴佺▼鍒楄〃
+ * @param query
+ * @return
+ */
+ @PostMapping({"flowlimit/list"})
+ @UnAuth
+ public Rest<Object> flowlimitList(@RequestBody MatterFlowlimitPdu query) {
+ Rest<Object> ret = new Rest();
+ Map<String, Object> model = new HashMap();
+ Context context = this.getContext();
+ String busiDesc = "鏌ョ湅浜嬮」鍔炵悊娴佺▼鍒楄〃";
+
+ int code;
+ try {
+ Rest<RespData<List<MatterFlowlimitPdu>>> result = iMatterFlowlimitFeign.list(query);
+ code = result.getCode();
+ if(code > 0) {
+ model.put("data", result.getData().getData());
+ model.put("pageInfo", result.getData().getPageInfo());
+ model.put("dict", result.getData().getDict());
+ model.put("message_info", busiDesc + "鎴愬姛");
+ }else {
+ model.put("message_info", result.getMsg());
+ }
+ this.recordSysLog(this.request, busiDesc + " 銆愭垚鍔熴€�");
+ } catch (Exception var9) {
+ code = -1;
+ this.doException(this.request, busiDesc, model, var9);
+ }
+
+ ret.setCode(code);
+ ret.setData(model);
+ ret.setDict(model.get("dict"));
+ ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+ return ret;
+ }
+
+ /**
+ * 鏌ョ湅浜嬮」鏀惰垂鏍囧噯鍒楄〃
+ * @param query
+ * @return
+ */
+ @PostMapping({"charges/list"})
+ @UnAuth
+ public Rest<Object> chargesList(@RequestBody MatterChargesPdu query) {
+ Rest<Object> ret = new Rest();
+ Map<String, Object> model = new HashMap();
+ Context context = this.getContext();
+ String busiDesc = "鏌ョ湅浜嬮」鏀惰垂鏍囧噯鍒楄〃";
+
+ int code;
+ try {
+ Rest<RespData<List<MatterChargesPdu>>> result = iMatterChargesFeign.list(query);
+ code = result.getCode();
+ if(code > 0) {
+ model.put("data", result.getData().getData());
+ model.put("pageInfo", result.getData().getPageInfo());
+ model.put("dict", result.getData().getDict());
+ model.put("message_info", busiDesc + "鎴愬姛");
+ }else {
+ model.put("message_info", result.getMsg());
+ }
+ this.recordSysLog(this.request, busiDesc + " 銆愭垚鍔熴€�");
+ } catch (Exception var9) {
+ code = -1;
+ this.doException(this.request, busiDesc, model, var9);
+ }
+
+ ret.setCode(code);
+ ret.setData(model);
+ ret.setDict(model.get("dict"));
+ ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+ return ret;
+ }
+
+ /**
+ * 鏌ョ湅浜嬮」璁惧畾渚濇嵁鍒楄〃
+ * @param query
+ * @return
+ */
+ @PostMapping({"setbase/list"})
+ @UnAuth
+ public Rest<Object> setbaseList(@RequestBody MatterSetbasePdu query) {
+ Rest<Object> ret = new Rest();
+ Map<String, Object> model = new HashMap();
+ Context context = this.getContext();
+ String busiDesc = "鏌ョ湅浜嬮」璁惧畾渚濇嵁鍒楄〃";
+
+ int code;
+ try {
+ Rest<RespData<List<MatterSetbasePdu>>> result = iMatterSetbaseFeign.list(query);
+ code = result.getCode();
+ if(code > 0) {
+ model.put("data", result.getData().getData());
+ model.put("pageInfo", result.getData().getPageInfo());
+ model.put("dict", result.getData().getDict());
+ model.put("message_info", busiDesc + "鎴愬姛");
+ }else {
+ model.put("message_info", result.getMsg());
+ }
+ this.recordSysLog(this.request, busiDesc + " 銆愭垚鍔熴€�");
+ } catch (Exception var9) {
+ code = -1;
+ this.doException(this.request, busiDesc, model, var9);
+ }
+
+ ret.setCode(code);
+ ret.setData(model);
+ ret.setDict(model.get("dict"));
+ ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+ return ret;
+ }
+
+ /**
+ * 鏌ョ湅浜嬮」涓粙鏈嶅姟鍒楄〃
+ * @param query
+ * @return
+ */
+ @PostMapping({"intermediary/list"})
+ @UnAuth
+ public Rest<Object> intermediaryList(@RequestBody MatterIntermediaryPdu query) {
+ Rest<Object> ret = new Rest();
+ Map<String, Object> model = new HashMap();
+ Context context = this.getContext();
+ String busiDesc = "鏌ョ湅浜嬮」涓粙鏈嶅姟鍒楄〃";
+
+ int code;
+ try {
+ Rest<RespData<List<MatterIntermediaryPdu>>> result = iMatterIntermediaryFeign.list(query);
+ code = result.getCode();
+ if(code > 0) {
+ model.put("data", result.getData().getData());
+ model.put("pageInfo", result.getData().getPageInfo());
+ model.put("dict", result.getData().getDict());
+ model.put("message_info", busiDesc + "鎴愬姛");
+ }else {
+ model.put("message_info", result.getMsg());
+ }
+ this.recordSysLog(this.request, busiDesc + " 銆愭垚鍔熴€�");
+ } catch (Exception var9) {
+ code = -1;
+ this.doException(this.request, busiDesc, model, var9);
+ }
+
+ ret.setCode(code);
+ ret.setData(model);
+ ret.setDict(model.get("dict"));
+ ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+ return ret;
+ }
+
+ /**
+ * 鏌ョ湅浜嬮」甯歌闂鍒楄〃
+ * @param query
+ * @return
+ */
+ @PostMapping({"question/list"})
+ @UnAuth
+ public Rest<Object> questionList(@RequestBody MatterQuestionPdu query) {
+ Rest<Object> ret = new Rest();
+ Map<String, Object> model = new HashMap();
+ Context context = this.getContext();
+ String busiDesc = "鏌ョ湅浜嬮」甯歌闂鍒楄〃";
+
+ int code;
+ try {
+ Rest<RespData<List<MatterQuestionPdu>>> result = iMatterQuestionFeign.list(query);
+ code = result.getCode();
+ if(code > 0) {
+ model.put("data", result.getData().getData());
+ model.put("pageInfo", result.getData().getPageInfo());
+ model.put("dict", result.getData().getDict());
+ model.put("message_info", busiDesc + "鎴愬姛");
+ }else {
+ model.put("message_info", result.getMsg());
+ }
+ this.recordSysLog(this.request, busiDesc + " 銆愭垚鍔熴€�");
+ } catch (Exception var9) {
+ code = -1;
+ this.doException(this.request, busiDesc, model, var9);
+ }
+
+ ret.setCode(code);
+ ret.setData(model);
+ ret.setDict(model.get("dict"));
+ ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+ return ret;
+ }
+}
diff --git a/single-matter/src/main/java/com/mortals/xhx/module/dept/web/DeptController.java b/single-matter/src/main/java/com/mortals/xhx/module/dept/web/DeptController.java
index a05c123eb01bcb3c502c603b9baae4147a840fa9..ee94b3a3fe2812b448e5a5d54943dd09ea3c9b5f 100644
--- a/single-matter/src/main/java/com/mortals/xhx/module/dept/web/DeptController.java
+++ b/single-matter/src/main/java/com/mortals/xhx/module/dept/web/DeptController.java
@@ -1,33 +1,16 @@
package com.mortals.xhx.module.dept.web;
-import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest;
-import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
-import com.mortals.framework.model.OrderCol;
-import com.mortals.framework.util.DataUtil;
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.base.system.param.service.ParamService;
-import com.mortals.xhx.common.code.YesNoEnum;
-import com.mortals.xhx.module.business.model.BusinessEntity;
-import com.mortals.xhx.module.dept.model.DeptEntity;
-import com.mortals.xhx.module.dept.model.DeptQuery;
-import com.mortals.xhx.module.dept.model.vo.DeptVo;
-import com.mortals.xhx.module.dept.service.DeptService;
-import com.mortals.xhx.module.site.model.SiteEntity;
-import com.mortals.xhx.module.site.model.SiteQuery;
-import com.mortals.xhx.module.site.model.vo.SiteAreaVo;
-import com.mortals.xhx.module.site.service.SiteService;
-import org.checkerframework.checker.units.qual.A;
+import com.mortals.framework.web.BaseJsonBodyController;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.dept.DeptPdu;
+import com.mortals.xhx.common.pdu.matter.MatterPdu;
+import com.mortals.xhx.feign.dept.IDeptFeign;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -40,135 +23,78 @@ import java.util.Map;
*/
@RestController
@RequestMapping("dept")
-public class DeptController extends BaseCRUDJsonBodyMappingController<DeptService, DeptEntity, Long> {
+public class DeptController extends BaseJsonBodyController {
@Autowired
- private ParamService paramService;
- @Autowired
- private SiteService siteService;
+ private IDeptFeign deptFeign;
- public DeptController() {
- super.setFormClass(DeptForm.class);
- super.setModuleDesc("閮ㄩ棬");
- }
+ @PostMapping({"list"})
+ @UnAuth
+ public Rest<Object> list(@RequestBody DeptPdu query) {
+ Rest<Object> ret = new Rest();
+ Map<String, Object> model = new HashMap();
+ Context context = this.getContext();
+ String busiDesc = "鏌ヨ閮ㄩ棬鍒楄〃";
- @Override
- protected void doListBefore(DeptEntity query, Map<String, Object> model, Context context) throws AppException {
- query.setOrderColList(new ArrayList<OrderCol>() {
- {
- add(new OrderCol("a.sort", OrderCol.ASCENDING));
- add(new OrderCol("a.createTime", OrderCol.ASCENDING));
+ int code;
+ try {
+ Rest<RespData<List<DeptPdu>>> result = deptFeign.list(query);
+ code = result.getCode();
+ if(code > 0) {
+ model.put("data", result.getData().getData());
+ model.put("pageInfo", result.getData().getPageInfo());
+ model.put("dict", result.getData().getDict());
+ model.put("message_info", busiDesc + "鎴愬姛");
+ }else {
+ model.put("message_info", result.getMsg());
}
- });
-
- if(!ObjectUtils.isEmpty(query.getFilter())&& YesNoEnum.YES.getValue()==query.getFilter()){
- //杩囨护閮ㄩ棬浜嬮」鏁版嵁涓�0鐨勯儴闂�
- query.setTotalStart(0);
+ this.recordSysLog(this.request, busiDesc + " 銆愭垚鍔熴€�");
+ } catch (Exception var9) {
+ code = -1;
+ this.doException(this.request, busiDesc, model, var9);
}
- super.doListBefore(query, model, context);
- }
-
- @Override
- protected void init(Map<String, Object> model, Context context) {
- this.addDict(model, "isAutotable", paramService.getParamBySecondOrganize("Dept", "isAutotable"));
- this.addDict(model, "isOrder", paramService.getParamBySecondOrganize("Dept", "isOrder"));
- this.addDict(model, "isBkb", paramService.getParamBySecondOrganize("Dept", "isBkb"));
- this.addDict(model, "isWorkGuide", paramService.getParamBySecondOrganize("Dept", "isWorkGuide"));
- this.addDict(model, "usValid", paramService.getParamBySecondOrganize("Dept", "usValid"));
- this.addDict(model, "isSecphone", paramService.getParamBySecondOrganize("Dept", "isSecphone"));
- this.addDict(model, "isEnglish", paramService.getParamBySecondOrganize("Dept", "isEnglish"));
- super.init(model, context);
- }
-
- /**
- * 鏍规嵁绔欑偣鍚屾閮ㄩ棬
- */
- @PostMapping(value = "syncDeptBySiteId")
- public String syncDeptBySiteId(Long siteId) {
- JSONObject jsonObject = new JSONObject();
- Map<String, Object> model = new HashMap<>();
- SiteEntity siteEntity = siteService.get(siteId, getContext());
- try {
- Rest<String> rest = this.service.syncDeptBySiteId(siteEntity, getContext());
- jsonObject.put(KEY_RESULT_MSG, rest.getMsg());
- jsonObject.put(KEY_RESULT_DATA, model);
- jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
- this.recordSysLog(this.request, rest.getMsg());
- } catch (Exception e) {
- log.error("鑾峰彇寮傚父", e);
- jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
- jsonObject.put(KEY_RESULT_MSG, super.convertException(e));
- }
- return jsonObject.toJSONString();
+ ret.setCode(code);
+ ret.setData(model);
+ ret.setDict(model.get("dict"));
+ ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+ return ret;
}
-
/**
- * 鏍规嵁閮ㄩ棬鏌ヨ涓氬姟
+ * 浜嬮」鍩烘湰淇℃伅
+ * @param id
+ * @return
*/
- @PostMapping(value = "getBusinessByDept")
+ @GetMapping({"info"})
@UnAuth
- public String getBusinessByDept(@RequestBody DeptQuery deptQuery) {
- JSONObject jsonObject = new JSONObject();
- String busiDesc = "鏍规嵁閮ㄩ棬鏌ヨ涓氬姟" + this.getModuleDesc();
- try {
- if (ObjectUtils.isEmpty(deptQuery.getIdList())) {
- throw new AppException("鍙傛暟閮ㄩ棬ids涓嶈兘涓虹┖锛�");
- }
- Rest<Map<String, List<DeptVo>>> rest = this.service.getBusinessByDept(deptQuery, getContext());
- recordSysLog(request, busiDesc + " 銆愭垚鍔熴€�");
- jsonObject.put(KEY_RESULT_DATA, rest.getData());
- jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
- jsonObject.put(KEY_RESULT_MSG, busiDesc + "鎴愬姛锛�");
- } catch (Exception e) {
- log.error("鑾峰彇寮傚父", e);
- jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
- jsonObject.put(KEY_RESULT_MSG, super.convertException(e));
- }
- return jsonObject.toJSONString();
- }
+ public Rest<Object> info(@RequestParam(value = "id") Long id) {
+ Rest<Object> ret = new Rest();
+ Map<String, Object> model = new HashMap();
+ Context context = this.getContext();
+ String busiDesc = "鏌ョ湅浜嬮」鍩烘湰淇℃伅";
-
- /**
- * 鏍规嵁閮ㄩ棬鏌ヨ涓氬姟
- */
- @PostMapping(value = "getDeptListByBusiness")
- @UnAuth
- public String getDeptListByBusiness(@RequestBody DeptQuery deptQuery) {
- JSONObject jsonObject = new JSONObject();
- String busiDesc = "鏍规嵁涓氬姟鏌ヨ閮ㄩ棬鍒楄〃" + this.getModuleDesc();
+ int code;
try {
- if (ObjectUtils.isEmpty(deptQuery.getSiteBusinessIdList())) {
- throw new AppException("涓氬姟id涓嶈兘涓虹┖锛�");
+ Rest<DeptPdu> result = deptFeign.info(id);
+ code = result.getCode();
+ if(code > 0) {
+ model.put("data", result.getData());
+ model.put("dict", result.getDict());
+ model.put("message_info", busiDesc + "鎴愬姛");
+ }else {
+ model.put("message_info", result.getMsg());
}
- Rest<Map<String, List<DeptVo>>> rest = this.service.getDeptListByBusiness(deptQuery, getContext());
- recordSysLog(request, busiDesc + " 銆愭垚鍔熴€�");
- jsonObject.put(KEY_RESULT_DATA, rest.getData());
- jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
- jsonObject.put(KEY_RESULT_MSG, busiDesc + "鎴愬姛锛�");
- } catch (Exception e) {
- log.error("鑾峰彇寮傚父", e);
- jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
- jsonObject.put(KEY_RESULT_MSG, super.convertException(e));
+ this.recordSysLog(this.request, busiDesc + " 銆愭垚鍔熴€�");
+ } catch (Exception var9) {
+ code = -1;
+ this.doException(this.request, busiDesc, model, var9);
}
- return jsonObject.toJSONString();
- }
-
- /**
- * @param entity
- * @param model
- * @param context
- * @throws AppException
- */
- @Override
- protected void saveBefore(DeptEntity entity, Map<String, Object> model, Context context) throws AppException {
- DeptEntity deptEntity = this.service.selectOne(new DeptQuery().deptNumber(entity.getDeptNumber()));
- if(!ObjectUtils.isEmpty(deptEntity)){
- throw new AppException("閮ㄩ棬缂栫爜宸插瓨鍦紒");
- }
- entity.setSource(1);
- super.saveBefore(entity, model, context);
+ ret.setCode(code);
+ ret.setData(model);
+ ret.setDict(model.get("dict"));
+ ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+ return ret;
}
}
\ No newline at end of file
diff --git a/single-matter/src/main/java/com/mortals/xhx/module/single/service/impl/SingleMatterFileServiceImpl.java b/single-matter/src/main/java/com/mortals/xhx/module/single/service/impl/SingleMatterFileServiceImpl.java
index 141a075a09670e5414923cefb219e897bba96ea5..7d8596c19636e49ff0fac4b21e69f3feb3335c59 100644
--- a/single-matter/src/main/java/com/mortals/xhx/module/single/service/impl/SingleMatterFileServiceImpl.java
+++ b/single-matter/src/main/java/com/mortals/xhx/module/single/service/impl/SingleMatterFileServiceImpl.java
@@ -1,9 +1,12 @@
package com.mortals.xhx.module.single.service.impl;
+import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.util.StringUtils;
+import com.mortals.xhx.common.pdu.matter.MatterPdu;
+import com.mortals.xhx.feign.matter.IMatterFeign;
import com.mortals.xhx.module.matter.model.MatterEntity;
import com.mortals.xhx.module.matter.service.MatterService;
import com.mortals.xhx.module.single.dao.SingleMatterFileDao;
@@ -28,7 +31,7 @@ import java.util.Date;
public class SingleMatterFileServiceImpl extends AbstractCRUDServiceImpl<SingleMatterFileDao, SingleMatterFileEntity, Long> implements SingleMatterFileService {
@Autowired
- private MatterService matterService;
+ private IMatterFeign matterService;
@Override
protected void validData(SingleMatterFileEntity entity, Context context) throws AppException {
@@ -60,15 +63,17 @@ public class SingleMatterFileServiceImpl extends AbstractCRUDServiceImpl<SingleM
dao.update(update);
}
}else {
- MatterEntity matterEntity = matterService.get(entity.getMatterId());
- if(matterEntity==null){
+ String resp = matterService.info(entity.getMatterId());
+ JSONObject jsonObject = JSONObject.parseObject(resp);
+ MatterPdu pdu = JSONObject.parseObject(jsonObject.getString("data"),MatterPdu.class);
+ if(pdu==null){
throw new AppException("鍩虹浜嬮」id涓嶆纭�,鏌ヤ笉鍒板搴旂殑浜嬮」");
}
- entity.setMatterCode(matterEntity.getMatterNo());
- entity.setMatterName(matterEntity.getMatterName());
- if(entity.getSiteId()==null) {
- entity.setSiteId(matterEntity.getSiteId());
- }
+ entity.setMatterCode(pdu.getMatterNo());
+ entity.setMatterName(pdu.getMatterName());
+// if(entity.getSiteId()==null) {
+// entity.setSiteId(pdu.getSiteId());
+// }
if(context!=null && context.getUser()!=null){
entity.setCreateUserId(context.getUser().getId());
}
diff --git a/single-matter/src/main/java/com/mortals/xhx/module/single/service/impl/SingleMatterServiceImpl.java b/single-matter/src/main/java/com/mortals/xhx/module/single/service/impl/SingleMatterServiceImpl.java
index fe14b30bd076e57a921a1c39bdb08bf5db4282d1..1d3295a66bfd5725cebd093a9e6629d9aa7b748a 100644
--- a/single-matter/src/main/java/com/mortals/xhx/module/single/service/impl/SingleMatterServiceImpl.java
+++ b/single-matter/src/main/java/com/mortals/xhx/module/single/service/impl/SingleMatterServiceImpl.java
@@ -39,11 +39,11 @@ public class SingleMatterServiceImpl extends AbstractCRUDServiceImpl<SingleMatte
@Override
protected void findAfter(SingleMatterEntity params, PageInfo pageInfo, Context context, List<SingleMatterEntity> list) throws AppException {
- List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.getMatterDatumCount();
- Map<Long,Integer> datumCountMap = new HashMap<>();
- for (MatterDatumEntity item:matterDatumFileEntities){
- datumCountMap.put(item.getMatterId(),item.getCount());
- }
+// List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.getMatterDatumCount();
+// Map<Long,Integer> datumCountMap = new HashMap<>();
+// for (MatterDatumEntity item:matterDatumFileEntities){
+// datumCountMap.put(item.getMatterId(),item.getCount());
+// }
list.stream().peek(item->{
// List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
// if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
@@ -51,11 +51,11 @@ public class SingleMatterServiceImpl extends AbstractCRUDServiceImpl<SingleMatte
// }else {
// item.setDatumCount(0);
// }
- if(datumCountMap.containsKey(item.getMatterId())){
- item.setDatumCount(datumCountMap.get(item.getMatterId()));
- }else {
- item.setDatumCount(0);
- }
+// if(datumCountMap.containsKey(item.getMatterId())){
+// item.setDatumCount(datumCountMap.get(item.getMatterId()));
+// }else {
+// item.setDatumCount(0);
+// }
SingleMatterFileEntity singleMatterFileEntity = singleMatterFileService.selectOne(new SingleMatterFileQuery().matterId(item.getMatterId()));
if(singleMatterFileEntity!=null){
item.setHasApplyForm(1);
@@ -68,11 +68,11 @@ public class SingleMatterServiceImpl extends AbstractCRUDServiceImpl<SingleMatte
@Override
protected void findAfter(SingleMatterEntity params, Context context, List<SingleMatterEntity> list) throws AppException {
- List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.getMatterDatumCount();
- Map<Long,Integer> datumCountMap = new HashMap<>();
- for (MatterDatumEntity item:matterDatumFileEntities){
- datumCountMap.put(item.getMatterId(),item.getCount());
- }
+// List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.getMatterDatumCount();
+// Map<Long,Integer> datumCountMap = new HashMap<>();
+// for (MatterDatumEntity item:matterDatumFileEntities){
+// datumCountMap.put(item.getMatterId(),item.getCount());
+// }
list.stream().peek(item->{
// List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
// if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
@@ -80,11 +80,11 @@ public class SingleMatterServiceImpl extends AbstractCRUDServiceImpl<SingleMatte
// }else {
// item.setDatumCount(0);
// }
- if(datumCountMap.containsKey(item.getMatterId())){
- item.setDatumCount(datumCountMap.get(item.getMatterId()));
- }else {
- item.setDatumCount(0);
- }
+// if(datumCountMap.containsKey(item.getMatterId())){
+// item.setDatumCount(datumCountMap.get(item.getMatterId()));
+// }else {
+// item.setDatumCount(0);
+// }
SingleMatterFileEntity singleMatterFileEntity = singleMatterFileService.selectOne(new SingleMatterFileQuery().matterId(item.getMatterId()));
if(singleMatterFileEntity!=null){
item.setHasApplyForm(1);
@@ -103,4 +103,18 @@ public class SingleMatterServiceImpl extends AbstractCRUDServiceImpl<SingleMatte
condition.put("id",id);
dao.update(data,condition);
}
+
+ @Override
+ public SingleMatterEntity get(Long key, Context context) throws AppException {
+ SingleMatterEntity entity = this.dao.get(key);
+ if(entity!=null) {
+ SingleMatterFileEntity singleMatterFileEntity = singleMatterFileService.selectOne(new SingleMatterFileQuery().matterId(entity.getMatterId()));
+ if (singleMatterFileEntity != null) {
+ entity.setHasApplyForm(1);
+ entity.setApplyFormUrl(singleMatterFileEntity.getFileUrl());
+ entity.setApplyFormFileName(singleMatterFileEntity.getFilename());
+ }
+ }
+ return entity;
+ }
}
\ No newline at end of file
diff --git a/single-matter/src/main/java/com/mortals/xhx/module/site/service/impl/SiteMatterServiceImpl.java b/single-matter/src/main/java/com/mortals/xhx/module/site/service/impl/SiteMatterServiceImpl.java
index f7879a822e13860548b6b98f21c2c8b4363b7870..e0bf8c0687efe532620d09e5be54585fc885d3dd 100644
--- a/single-matter/src/main/java/com/mortals/xhx/module/site/service/impl/SiteMatterServiceImpl.java
+++ b/single-matter/src/main/java/com/mortals/xhx/module/site/service/impl/SiteMatterServiceImpl.java
@@ -40,31 +40,31 @@ public class SiteMatterServiceImpl extends AbstractCRUDServiceImpl<SiteMatterDao
@Autowired
private SingleMatterService singleMatterService;
- @Override
- protected void findAfter(SiteMatterEntity params, PageInfo pageInfo, Context context, List<SiteMatterEntity> list) throws AppException {
- list.stream().peek(item->{
- List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
- if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
- item.setDatumCount(matterDatumFileEntities.size());
- }else {
- item.setDatumCount(0);
- }
- }).count();
- super.findAfter(params, context, list);
- }
-
- @Override
- protected void findAfter(SiteMatterEntity params, Context context, List<SiteMatterEntity> list) throws AppException {
- list.stream().peek(item->{
- List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
- if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
- item.setDatumCount(matterDatumFileEntities.size());
- }else {
- item.setDatumCount(0);
- }
- }).count();
- super.findAfter(params, context, list);
- }
+// @Override
+// protected void findAfter(SiteMatterEntity params, PageInfo pageInfo, Context context, List<SiteMatterEntity> list) throws AppException {
+// list.stream().peek(item->{
+// List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
+// if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
+// item.setDatumCount(matterDatumFileEntities.size());
+// }else {
+// item.setDatumCount(0);
+// }
+// }).count();
+// super.findAfter(params, context, list);
+// }
+//
+// @Override
+// protected void findAfter(SiteMatterEntity params, Context context, List<SiteMatterEntity> list) throws AppException {
+// list.stream().peek(item->{
+// List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
+// if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
+// item.setDatumCount(matterDatumFileEntities.size());
+// }else {
+// item.setDatumCount(0);
+// }
+// }).count();
+// super.findAfter(params, context, list);
+// }
@Override
public void addViewsCount(Long id) {
diff --git a/single-matter/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java b/single-matter/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
index 0072f9e727d7e459e3d3fe164127ca872970a24b..6b1d500693988988b97f8283b8a4111064a4354c 100644
--- a/single-matter/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
+++ b/single-matter/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
@@ -629,6 +629,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
for (MatterEntity matterEntity : subList) {
DeptEntity deptCache = deptService.getExtCache(matterEntity.getDeptCode());
matterEntity.setDeptName(deptCache == null ? "" : deptCache.getName());
+ matterEntity.setCreateTime(new Date());
matterService.save(matterEntity, context);
}