|
|
|
@@ -2068,9 +2068,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
if(StringUtils.isNotBlank(wxRentContract.getBusinessHours())){ |
|
|
|
//{"beginEnd": "00", "finishEnd": "00", "beginStart": "00", "finishStart": "18"} |
|
|
|
JSONObject jsonObject = JSONObject.parseObject(wxRentContract.getBusinessHours()); |
|
|
|
if(!("-1").equals(jsonObject.getString("beginStarts")) && !("-1").equals(jsonObject.getString("beginEnd")) |
|
|
|
if(!("-1").equals(jsonObject.getString("beginStart")) && !("-1").equals(jsonObject.getString("beginEnd")) |
|
|
|
&& !("-1").equals(jsonObject.getString("finishStart")) && !("-1").equals(jsonObject.getString("finishEnd"))){ |
|
|
|
result.put("businessStart",jsonObject.getString("beginStarts")+":"+jsonObject.getString("beginEnd")); |
|
|
|
result.put("businessStart",jsonObject.getString("beginStart")+":"+jsonObject.getString("beginEnd")); |
|
|
|
result.put("businessEnd",jsonObject.getString("finishStart")+":"+jsonObject.getString("finishEnd")); |
|
|
|
} |
|
|
|
} |
|
|
|
@@ -2207,7 +2207,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
result.put("reductionStartDateYear", reductionStartDate.substring(0, 4)); |
|
|
|
result.put("reductionStartDateMonth", reductionStartDate.substring(5, 7)); |
|
|
|
result.put("reductionStartDateDay", reductionStartDate.substring(8)); |
|
|
|
String reductionEndDate = DateUtils.date2String(wxRentContract.getRentalStartDate(), "yyyy-MM-dd"); |
|
|
|
// String reductionEndDate = DateUtils.date2String(wxRentContract.getRentalStartDate(), "yyyy-MM-dd"); |
|
|
|
String reductionEndDate = DateUtils.getTimeBefore(1,wxRentContract.getRentalStartDate()); |
|
|
|
result.put("reductionEndDateYear", reductionEndDate.substring(0, 4)); |
|
|
|
result.put("reductionEndDateMonth", reductionEndDate.substring(5, 7)); |
|
|
|
result.put("reductionEndDateDay", reductionEndDate.substring(8)); |
|
|
|
|