From f7b32b8f0143ea03f81ff5a54a5fd1fd208b921b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 28 五月 2020 15:33:50 +0800
Subject: [PATCH] 优化完成巡检计划
---
FeeService/src/main/java/com/java110/fee/listener/fee/UpdateFeeInfoListener.java | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/FeeService/src/main/java/com/java110/fee/listener/fee/UpdateFeeInfoListener.java b/FeeService/src/main/java/com/java110/fee/listener/fee/UpdateFeeInfoListener.java
index 87084c1..a52ed8e 100644
--- a/FeeService/src/main/java/com/java110/fee/listener/fee/UpdateFeeInfoListener.java
+++ b/FeeService/src/main/java/com/java110/fee/listener/fee/UpdateFeeInfoListener.java
@@ -72,27 +72,26 @@
Assert.notEmpty(data, "娌℃湁datas 鑺傜偣锛屾垨娌℃湁瀛愯妭鐐归渶瑕佸鐞�");
+
//澶勭悊 businessFee 鑺傜偣
- if (data.containsKey("businessFee")) {
- //澶勭悊 businessFee 鑺傜偣
- if (data.containsKey("businessFee")) {
- Object _obj = data.get("businessFee");
- JSONArray businessFees = null;
+ if (data.containsKey(BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_INFO)) {
+ Object _obj = data.get(BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_INFO);
+ JSONArray businessFees = null;
+ if (_obj instanceof JSONObject) {
+ businessFees = new JSONArray();
+ businessFees.add(_obj);
+ } else {
+ businessFees = (JSONArray) _obj;
+ }
+ //JSONObject businessFee = data.getJSONObject("businessFee");
+ for (int _feeIndex = 0; _feeIndex < businessFees.size(); _feeIndex++) {
+ JSONObject businessFee = businessFees.getJSONObject(_feeIndex);
+ doBusinessFee(business, businessFee);
if (_obj instanceof JSONObject) {
- businessFees = new JSONArray();
- businessFees.add(_obj);
- } else {
- businessFees = (JSONArray) _obj;
- }
- //JSONObject businessFee = data.getJSONObject("businessFee");
- for (int _feeIndex = 0; _feeIndex < businessFees.size(); _feeIndex++) {
- JSONObject businessFee = businessFees.getJSONObject(_feeIndex);
- doBusinessFee(business, businessFee);
- if (_obj instanceof JSONObject) {
- dataFlowContext.addParamOut("feeId", businessFee.getString("feeId"));
- }
+ dataFlowContext.addParamOut("feeId", businessFee.getString("feeId"));
}
}
+
}
}
@@ -148,12 +147,12 @@
Assert.listOnlyOne(feeInfo, "鏌ヨ鍒板鏉℃暟鎹垨鏈煡璇㈠埌鏁版嵁" + feeMap);
//鏍规嵁褰撳墠鐨勭粨鏉熸椂闂� 淇敼
Date endTime = (Date) feeInfo.get(0).get("end_time");
- if(cycles > 0) {
+ if (cycles > 0) {
Calendar endCalender = Calendar.getInstance();
endCalender.setTime(endTime);
- if(StringUtil.isNumber(cyclesStr)) {
+ if (StringUtil.isNumber(cyclesStr)) {
endCalender.add(Calendar.MONTH, new Double(cycles).intValue());
- }else{
+ } else {
int hours = new Double(cycles * DateUtil.getCurrentMonthDay() * 24).intValue();
endCalender.add(Calendar.HOUR, hours);
}
@@ -161,14 +160,14 @@
}
// 涓�娆℃�ф敹璐圭被鍨嬶紝缂磋垂鍚庯紝鍒欒缃垂鐢ㄧ姸鎬佷负鏀惰垂缁撴潫銆佽缃粨鏉熸棩鏈熶负璐圭敤椤圭粓姝㈡棩鏈�
- if(FeeFlagTypeConstant.ONETIME.equals(feeInfo.get(0).get("feeFlag"))){
+ if (FeeFlagTypeConstant.ONETIME.equals(feeInfo.get(0).get("feeFlag"))) {
businessFeeInfo.put("state", FeeStateConstant.END);
businessFeeInfo.put("end_time", feeInfo.get(0).get("configEndTime"));
}
// 鍛ㄦ湡鎬ф敹璐广�佺即璐瑰悗锛屽埌鏈熸棩鏈熷湪璐圭敤椤圭粓姝㈡棩鏈熷悗锛屽垯璁剧疆缂磋垂鐘舵�佺粨鏉燂紝璁剧疆缁撴潫鏃ユ湡涓鸿垂鐢ㄩ」缁堟鏃ユ湡
- if(FeeFlagTypeConstant.CYCLE.equals(feeInfo.get(0).get("feeFlag"))){
- if(((Date)businessFeeInfo.get("endTime")).after((Date)feeInfo.get(0).get("configEndTime"))) {
+ if (FeeFlagTypeConstant.CYCLE.equals(feeInfo.get(0).get("feeFlag"))) {
+ if (((Date) businessFeeInfo.get("endTime")).after((Date) feeInfo.get(0).get("configEndTime"))) {
businessFeeInfo.put("state", FeeStateConstant.END);
businessFeeInfo.put("end_time", feeInfo.get(0).get("configEndTime"));
}
--
Gitblit v1.8.0