Browse Source

合同

release_toaliyun_real
xhxu 4 years ago
parent
commit
cc4e9a3f8d
2 changed files with 4 additions and 3 deletions
  1. +4
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  2. BIN
      mallinkService/src/main/resources/contract-word-template/jinmao_contract_rent_property.docx

+ 4
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -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));


BIN
mallinkService/src/main/resources/contract-word-template/jinmao_contract_rent_property.docx View File


Loading…
Cancel
Save