|
|
|
@@ -1031,8 +1031,6 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
//WxContractCustomers ccq = new WxContractCustomers(); |
|
|
|
|
|
|
|
WxRentContractAgileDeposit cadq = new WxRentContractAgileDeposit(); |
|
|
|
cadq.updateTenantInfo(rentContract); |
|
|
|
cadq.setRentContractId(rentContract.getId()); |
|
|
|
@@ -1092,9 +1090,50 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// WxRentContractRevenue |
|
|
|
// WxRentContractRevenueItem |
|
|
|
// WxRentContractRevenueFees |
|
|
|
WxRentContractAgileRenevue rq = new WxRentContractAgileRenevue(); |
|
|
|
rq.updateTenantInfo(rentContract); |
|
|
|
rq.setRentContractId(rentContract.getId()); |
|
|
|
List<WxRentContractAgileRenevue> renevueList = wxRentContractAgileRenevueMapper.findList(rq); |
|
|
|
Long renevueId = null; |
|
|
|
if (null != renevueList && renevueList.size() > 0 ) { |
|
|
|
for (int i = 0 ; i < renevueList.size() ; i++) { |
|
|
|
WxRentContractAgileRenevue ar = renevueList.get(i); |
|
|
|
ar.setRentContractId(newContractId); |
|
|
|
ar.setId(idWorker.nextId()); |
|
|
|
ar.setCreatetime(new Date()); |
|
|
|
ar.setUpdatetime(new Date()); |
|
|
|
wxRentContractAgileRenevueMapper.insert(ar); |
|
|
|
renevueId = ar.getId(); |
|
|
|
} |
|
|
|
} |
|
|
|
if (null != renevueId) { |
|
|
|
WxRentContractAgileRenevueItem ari = new WxRentContractAgileRenevueItem(); |
|
|
|
ari.setRentContractId(newContractId); |
|
|
|
ari.setRenevueId(renevueId); |
|
|
|
ari.setBeginTime(rentContract.getRentalStartDate()); |
|
|
|
ari.setBeginTime(rentContract.getRentalEndDate()); |
|
|
|
ari.setRate("0"); |
|
|
|
ari.setIsFree(EnumYesOrNo.NO.getCode()); |
|
|
|
ari.setId(idWorker.nextId()); |
|
|
|
ari.setCreatetime(new Date()); |
|
|
|
ari.setUpdatetime(new Date()); |
|
|
|
wxRentContractAgileRenevueItemMapper.insert(ari); |
|
|
|
} |
|
|
|
WxRentContractAgileRenevueFees fq = new WxRentContractAgileRenevueFees(); |
|
|
|
fq.updateTenantInfo(rentContract); |
|
|
|
fq.setRentContractId(rentContract.getId()); |
|
|
|
List<WxRentContractAgileRenevueFees> renevueFeesList = wxRentContractAgileRenevueFeesMapper.findList(fq); |
|
|
|
if (null != renevueFeesList && renevueFeesList.size() > 0 && null != renevueId ) { |
|
|
|
for (int i = 0 ; i < renevueFeesList.size() ; i++) { |
|
|
|
WxRentContractAgileRenevueFees arf = renevueFeesList.get(i); |
|
|
|
arf.setRentContractId(newContractId); |
|
|
|
arf.setAgileRenevueId(renevueId); |
|
|
|
arf.setId(idWorker.nextId()); |
|
|
|
arf.setCreatetime(new Date()); |
|
|
|
arf.setUpdatetime(new Date()); |
|
|
|
wxRentContractAgileRenevueFeesMapper.insert(arf); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
WxRentContractRevenueJump crjq = new WxRentContractRevenueJump(); |
|
|
|
crjq.updateTenantInfo(rentContract); |
|
|
|
@@ -1118,17 +1157,11 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { |
|
|
|
rentContract.setUpdatetime(new Date()); |
|
|
|
rentContract.setUpdateBy(user.getId()); |
|
|
|
rentContract.setUpdateByName(user.getName()); |
|
|
|
rentContract.setStatus(EnumRentContractStatus.DRAFT.getCode()); |
|
|
|
rentContract.setStatus(EnumRentContractStatus.UNWRITE.getCode()); |
|
|
|
rentContract.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); |
|
|
|
rentContract.setEndContractTime(null); |
|
|
|
//rentContract.setFirstBillDateStart(null); |
|
|
|
//rentContract.setFirstBillDateEnd(null); |
|
|
|
//rentContract.setFirstBillReceiveDate(null); |
|
|
|
int[] array = DateUtils.getDiff(rentContract.getRentalStartDate(),rentContract.getRentalEndDate()); |
|
|
|
rentContract.setLease(array[0]); |
|
|
|
//rentContract.setAdjustRatio(); |
|
|
|
//rentContract.setRevenueRatioSet(); |
|
|
|
//rentContract.set |
|
|
|
wxRentContractMapper.insert(rentContract); |
|
|
|
} |
|
|
|
|
|
|
|
|