From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突
---
service-api/src/main/java/com/java110/api/bmo/store/impl/StoreBMOImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 56 insertions(+), 1 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/store/impl/StoreBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/store/impl/StoreBMOImpl.java
index f0ccd52..8213f62 100644
--- a/service-api/src/main/java/com/java110/api/bmo/store/impl/StoreBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/store/impl/StoreBMOImpl.java
@@ -10,7 +10,11 @@
import com.java110.intf.store.IStoreInnerServiceSMO;
import com.java110.po.org.OrgPo;
import com.java110.po.org.OrgStaffRelPo;
-import com.java110.po.store.*;
+import com.java110.po.store.StoreAttrPo;
+import com.java110.po.store.StoreCerdentialPo;
+import com.java110.po.store.StorePhotoPo;
+import com.java110.po.store.StorePo;
+import com.java110.po.store.StoreUserPo;
import com.java110.po.workflow.WorkflowPo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.BusinessTypeConstant;
@@ -298,5 +302,56 @@
return business;
}
+ /**
+ * 鍚堝悓鐢宠缁
+ *
+ * @param paramInJson
+ * @return
+ */
+ public JSONObject contractApply(JSONObject paramInJson) {
+
+ JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
+ business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_WORKFLOW);
+ business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 9);
+ business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+ JSONArray businessOrgStaffRels = new JSONArray();
+ WorkflowPo workflowPo = new WorkflowPo();
+ workflowPo.setCommunityId("9999"); //鎵�鏈夊皬鍖�
+ workflowPo.setFlowId("-3");
+ workflowPo.setFlowName("鍚堝悓鐢宠缁");
+ workflowPo.setFlowType(WorkflowDto.FLOW_TYPE_CONTRACT_APPLY);
+ workflowPo.setSkipLevel(WorkflowDto.DEFAULT_SKIP_LEVEL);
+ workflowPo.setStoreId(paramInJson.getString("storeId"));
+ businessOrgStaffRels.add(JSONObject.parseObject(JSONObject.toJSONString(workflowPo)));
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(WorkflowPo.class.getSimpleName(), businessOrgStaffRels);
+ return business;
+ }
+
+
+ /**
+ * 鍚堝悓鍙樻洿
+ *
+ * @param paramInJson
+ * @return
+ */
+ public JSONObject contractChange(JSONObject paramInJson) {
+
+ JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
+ business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_WORKFLOW);
+ business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 10);
+ business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+ JSONArray businessOrgStaffRels = new JSONArray();
+ WorkflowPo workflowPo = new WorkflowPo();
+ workflowPo.setCommunityId("9999"); //鎵�鏈夊皬鍖�
+ workflowPo.setFlowId("-4");
+ workflowPo.setFlowName("鍚堝悓鍙樻洿");
+ workflowPo.setFlowType(WorkflowDto.FLOW_TYPE_CONTRACT_CHANGE);
+ workflowPo.setSkipLevel(WorkflowDto.DEFAULT_SKIP_LEVEL);
+ workflowPo.setStoreId(paramInJson.getString("storeId"));
+ businessOrgStaffRels.add(JSONObject.parseObject(JSONObject.toJSONString(workflowPo)));
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(WorkflowPo.class.getSimpleName(), businessOrgStaffRels);
+ return business;
+ }
+
}
--
Gitblit v1.8.0