From 4db93360932dcee2efddae48152a4ba1f9d7f28b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 19 一月 2021 12:02:20 +0800
Subject: [PATCH] 优化业主查询报错问题
---
service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 106 insertions(+), 6 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java
index 6868d7d..2e04433 100644
--- a/service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java
@@ -6,12 +6,16 @@
import com.java110.api.bmo.community.ICommunityBMO;
import com.java110.core.context.DataFlowContext;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.core.smo.community.ICommunityInnerServiceSMO;
import com.java110.dto.CommunityMemberDto;
import com.java110.dto.community.CommunityDto;
+import com.java110.dto.workflow.WorkflowDto;
+import com.java110.intf.common.IWorkflowInnerServiceSMO;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.po.community.CommunityAttrPo;
import com.java110.po.community.CommunityMemberPo;
import com.java110.po.community.CommunityPo;
import com.java110.po.fee.PayFeeConfigPo;
+import com.java110.po.workflow.WorkflowPo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.*;
import com.java110.utils.exception.ListenerExecuteException;
@@ -39,6 +43,10 @@
@Autowired
private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
+
+
+ @Autowired
+ private IWorkflowInnerServiceSMO workflowInnerServiceSMOImpl;
/**
* 娣诲姞灏忓尯淇℃伅
@@ -108,6 +116,35 @@
businessCommunityMember.put("auditStatusCd", auditStatusCd);
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(CommunityMemberPo.class.getSimpleName(), businessCommunityMember);
+ return business;
+ }
+
+ /**
+ * 娣诲姞灏忓尯鎴愬憳
+ *
+ * @param paramInJson 鎺ュ彛璇锋眰鏁版嵁灏佽
+ * @return 灏佽濂界殑 data鏁版嵁
+ */
+ public JSONObject updateComplaint(JSONObject paramInJson) {
+ WorkflowDto workflowDto = new WorkflowDto();
+ workflowDto.setCommunityId(paramInJson.getString("communityId"));
+ workflowDto.setFlowType(WorkflowDto.FLOW_TYPE_COMPLAINT);
+ List<WorkflowDto> workflowDtos = workflowInnerServiceSMOImpl.queryWorkflows(workflowDto);
+
+ if (workflowDtos == null || workflowDtos.size() < 1) {
+ return null;
+ }
+ JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
+ business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_WORKFLOW);
+ business.put(CommonConstant.HTTP_SEQ, 2);
+ business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+ JSONObject businessCommunityMember = new JSONObject();
+ businessCommunityMember.put("flowId", workflowDtos.get(0).getFlowId());
+ businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
+ businessCommunityMember.put("storeId", paramInJson.getString("memberId"));
+ JSONArray data = new JSONArray();
+ data.add(businessCommunityMember);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(WorkflowPo.class.getSimpleName(), data);
return business;
}
@@ -246,8 +283,39 @@
businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
businessFeeConfig.put("configId", paramInJson.getString("configId"));
businessFeeConfig.put("billType", "002");//鎸夋湀鍑鸿处
+ businessFeeConfig.put("paymentCycle", "1");//鎸夋湀鍑鸿处
businessFeeConfig.put("isDefault", "T");
PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
+ super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
+ }
+
+ /**
+ * 娣诲姞灏忓尯淇℃伅
+ *
+ * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
+ * @param dataFlowContext 鏁版嵁涓婁笅鏂�
+ * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
+ */
+ public void addFeeConfigRepair(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
+ JSONObject businessFeeConfig = new JSONObject();
+ businessFeeConfig.putAll(paramInJson);
+ businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_REPAIR);
+ businessFeeConfig.put("feeName", "鎶ヤ慨璐筟绯荤粺榛樿]");
+ businessFeeConfig.put("feeFlag", "2006012"); //涓�娆℃�ц垂鐢�
+ businessFeeConfig.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ businessFeeConfig.put("endTime", DateUtil.LAST_TIME);
+ businessFeeConfig.put("computingFormula", "4004");
+ businessFeeConfig.put("squarePrice", "0.00");
+ businessFeeConfig.put("additionalAmount", "0.00");
+ businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
+ businessFeeConfig.put("configId", paramInJson.getString("configId"));
+ businessFeeConfig.put("billType", "003");//鎸夊ぉ鍑鸿处
+ businessFeeConfig.put("paymentCd", "2100");
+ businessFeeConfig.put("paymentCycle", "1");//鎸夋湀鍑鸿处
+ businessFeeConfig.put("isDefault", "T");
+ PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
+
super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
}
@@ -262,7 +330,7 @@
paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
JSONObject businessFeeConfig = new JSONObject();
businessFeeConfig.putAll(paramInJson);
- businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_SELL_UP_PARKING_SPACE);
+ businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_CAR);
businessFeeConfig.put("feeName", "鍦颁笂鍑哄敭杞︿綅璐筟绯荤粺榛樿]");
businessFeeConfig.put("feeFlag", "2006012");
businessFeeConfig.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -274,6 +342,7 @@
businessFeeConfig.put("configId", paramInJson.getString("configId"));
businessFeeConfig.put("billType", "003");//鎸夊ぉ鍑鸿处
businessFeeConfig.put("paymentCd", "1200");
+ businessFeeConfig.put("paymentCycle", "1");//鎸夋湀鍑鸿处
businessFeeConfig.put("isDefault", "T");
PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
@@ -291,7 +360,7 @@
paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
JSONObject businessFeeConfig = new JSONObject();
businessFeeConfig.putAll(paramInJson);
- businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_SELL_DOWN_PARKING_SPACE);
+ businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_CAR);
businessFeeConfig.put("feeName", "鍦颁笅鍑哄敭杞︿綅璐筟绯荤粺榛樿]");
businessFeeConfig.put("feeFlag", "2006012");
businessFeeConfig.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -303,6 +372,7 @@
businessFeeConfig.put("configId", paramInJson.getString("configId"));
businessFeeConfig.put("billType", "003");//鎸夊ぉ鍑鸿处
businessFeeConfig.put("paymentCd", "1200");
+ businessFeeConfig.put("paymentCycle", "1");//鎸夋湀鍑鸿处
businessFeeConfig.put("isDefault", "T");
PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
@@ -320,7 +390,7 @@
paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
JSONObject businessFeeConfig = new JSONObject();
businessFeeConfig.putAll(paramInJson);
- businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_HIRE_UP_PARKING_SPACE);
+ businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_CAR);
businessFeeConfig.put("feeName", "鍦颁笂鍑虹杞︿綅璐筟绯荤粺榛樿]");
businessFeeConfig.put("feeFlag", "1003006");
businessFeeConfig.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -332,6 +402,7 @@
businessFeeConfig.put("configId", paramInJson.getString("configId"));
businessFeeConfig.put("billType", "003");//鎸夊ぉ鍑鸿处
businessFeeConfig.put("paymentCd", "1200");
+ businessFeeConfig.put("paymentCycle", "1");//鎸夋湀鍑鸿处
businessFeeConfig.put("isDefault", "T");
PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
@@ -349,7 +420,7 @@
paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
JSONObject businessFeeConfig = new JSONObject();
businessFeeConfig.putAll(paramInJson);
- businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_HIRE_DOWN_PARKING_SPACE);
+ businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_CAR);
businessFeeConfig.put("feeName", "鍦颁笅鍑虹杞︿綅璐筟绯荤粺榛樿]");
businessFeeConfig.put("feeFlag", "1003006");
businessFeeConfig.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -362,6 +433,7 @@
businessFeeConfig.put("billType", "003");//鎸夊ぉ鍑鸿处
businessFeeConfig.put("paymentCd", "1200");
+ businessFeeConfig.put("paymentCycle", "1");//鎸夋湀鍑鸿处
businessFeeConfig.put("isDefault", "T");
PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
@@ -391,6 +463,7 @@
businessFeeConfig.put("configId", paramInJson.getString("configId"));
businessFeeConfig.put("billType", "004");//鎸夊ぉ鍑鸿处
businessFeeConfig.put("paymentCd", "1200");
+ businessFeeConfig.put("paymentCycle", "1");//鎸夋湀鍑鸿处
businessFeeConfig.put("isDefault", "T");
PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
@@ -447,8 +520,36 @@
paramInJson.put("communityId", GenerateCodeFactory.getCommunityId());
paramInJson.put("state", "1000");
+ paramInJson.put("communityArea", "0");
CommunityPo communityPo = BeanConvertUtil.covertBean(paramInJson, CommunityPo.class);
super.insert(dataFlowContext, communityPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_COMMUNITY_INFO);
+
+ }
+ /**
+ * 娣诲姞灏忓尯淇℃伅
+ *
+ * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
+ * @param dataFlowContext 鏁版嵁涓婁笅鏂�
+ * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
+ */
+ public void addAttr(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+
+ paramInJson.put("attrId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ CommunityAttrPo communityAttrPo = BeanConvertUtil.covertBean(paramInJson, CommunityAttrPo.class);
+ super.insert(dataFlowContext, communityAttrPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_COMMUNITY_INFO);
+
+ }
+ /**
+ * 娣诲姞灏忓尯淇℃伅
+ *
+ * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
+ * @param dataFlowContext 鏁版嵁涓婁笅鏂�
+ * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
+ */
+ public void updateAttr(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+
+ CommunityAttrPo communityAttrPo = BeanConvertUtil.covertBean(paramInJson, CommunityAttrPo.class);
+ super.insert(dataFlowContext, communityAttrPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_COMMUNITY_INFO);
}
@@ -460,7 +561,6 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public void updateCommunityOne(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
CommunityPo communityPo = BeanConvertUtil.covertBean(paramInJson, CommunityPo.class);
--
Gitblit v1.8.0