From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebService/src/main/java/com/java110/web/components/org/AddOrgComponent.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/components/org/AddOrgComponent.java b/WebService/src/main/java/com/java110/web/components/org/AddOrgComponent.java
index 4b5332f..a1e1119 100644
--- a/WebService/src/main/java/com/java110/web/components/org/AddOrgComponent.java
+++ b/WebService/src/main/java/com/java110/web/components/org/AddOrgComponent.java
@@ -1,7 +1,12 @@
package com.java110.web.components.org;
+import com.alibaba.fastjson.JSONObject;
import com.java110.core.context.IPageData;
+import com.java110.core.context.PageData;
+import com.java110.utils.constant.StateConstant;
+import com.java110.web.smo.ICommunityServiceSMO;
import com.java110.web.smo.org.IAddOrgSMO;
+import com.java110.web.smo.org.IListOrgsSMO;
import com.java110.web.smo.org.IListParentOrgsSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -17,19 +22,50 @@
private IAddOrgSMO addOrgSMOImpl;
@Autowired
+ private IListOrgsSMO listOrgsSMOImpl;
+
+ @Autowired
private IListParentOrgsSMO listParentOrgsSMOImpl;
+ @Autowired
+ private ICommunityServiceSMO communityServiceSMOImpl;
/**
* 娣诲姞缁勭粐绠＄悊鏁版嵁
+ *
* @param pd 椤甸潰鏁版嵁灏佽
* @return ResponseEntity 瀵硅薄
*/
- public ResponseEntity<String> save(IPageData pd){
+ public ResponseEntity<String> save(IPageData pd) {
return addOrgSMOImpl.saveOrg(pd);
}
+ public ResponseEntity<String> listEnterCommunitys(IPageData pd) {
- public ResponseEntity<String> getParentOrg(IPageData pd){
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ paramIn.put("auditStatusCd", StateConstant.AGREE_AUDIT);
+
+ IPageData newPd = PageData.newInstance().builder(pd.getUserId(),
+ pd.getUserName(), pd.getToken(),
+ paramIn.toJSONString(), pd.getComponentCode(),
+ pd.getComponentMethod(), "",
+ pd.getAppId());
+
+ return communityServiceSMOImpl.listMyCommunity(newPd);
+
+ }
+
+ /**
+ * 鏌ヨ缁勭粐绠＄悊鍒楄〃
+ *
+ * @param pd 椤甸潰鏁版嵁灏佽
+ * @return 杩斿洖 ResponseEntity 瀵硅薄
+ */
+ public ResponseEntity<String> list(IPageData pd) {
+ return listOrgsSMOImpl.listOrgs(pd);
+ }
+
+
+ public ResponseEntity<String> getParentOrg(IPageData pd) {
return listParentOrgsSMOImpl.listParentOrgs(pd);
}
@@ -48,4 +84,20 @@
public void setListParentOrgsSMOImpl(IListParentOrgsSMO listParentOrgsSMOImpl) {
this.listParentOrgsSMOImpl = listParentOrgsSMOImpl;
}
+
+ public IListOrgsSMO getListOrgsSMOImpl() {
+ return listOrgsSMOImpl;
+ }
+
+ public void setListOrgsSMOImpl(IListOrgsSMO listOrgsSMOImpl) {
+ this.listOrgsSMOImpl = listOrgsSMOImpl;
+ }
+
+ public ICommunityServiceSMO getCommunityServiceSMOImpl() {
+ return communityServiceSMOImpl;
+ }
+
+ public void setCommunityServiceSMOImpl(ICommunityServiceSMO communityServiceSMOImpl) {
+ this.communityServiceSMOImpl = communityServiceSMOImpl;
+ }
}
--
Gitblit v1.8.0