From 5758497544f1add3ac89fbf6b4dc7ae31fb1adee Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十二月 2024 13:57:48 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java | 347 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 208 insertions(+), 139 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
index 94da9a9..4b51994 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
@@ -31,6 +31,7 @@
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.stream.Collectors;
@@ -74,13 +75,20 @@
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer create(YwContract model) {
isParamValidCreated(model);
+
+
model.setCreator(model.getLoginUserInfo().getId());
model.setIsdeleted(Constants.ZERO);
model.setCreateDate(new Date());
- model.setStatus(Constants.ZERO);
model.setEditDate(model.getCreateDate());
model.setEditor(model.getCreator());
- model.setStatus(Constants.ZERO);//寰呮墽琛�
+ if(model.getStartDate().getTime() > System.currentTimeMillis()){
+ model.setStatus(Constants.ZERO);
+ }else if(model.getStartDate().getTime() <= System.currentTimeMillis() && model.getEndDate().getTime() > System.currentTimeMillis()){
+ model.setStatus(Constants.ONE);
+ }else{
+ model.setStatus(Constants.TWO);
+ }
model.setRemark(getRemarlByParam(model));
ywContractMapper.insert(model);
dealDetailListBiz(model);//澶勭悊鏉℃淇℃伅
@@ -189,7 +197,7 @@
if(!(model.getZlFreeEndDate()==null && model.getZlFreeStartDate()==null) && (
(model.getZlFreeEndDate()!=null && model.getZlFreeStartDate()==null)
||(model.getZlFreeEndDate()==null && model.getZlFreeStartDate()!=null)
- ||model.getZlFreeEndDate().getTime()< model.getZlFreeStartDate().getTime())
+ ||model.getZlFreeEndDate().getTime()<= model.getZlFreeStartDate().getTime())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勭璧佹潯娆惧厤绉熸湡淇℃伅锛�");
}
@@ -242,7 +250,7 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜椤甸潰瑕佹眰濉啓鐗╀笟鏉℃淇℃伅!");
}
- if(d.getEndDate().getTime()< d.getStartDate().getTime()){
+ if(d.getEndDate().getTime()<= d.getStartDate().getTime()){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鐗╀笟鏉℃鏈夋晥鏈熺粨鏉熸椂闂翠笉寰楁棭浜庡紑濮嬫椂闂达紒");
}
if(!Constants.equalsInteger(model.getWyPayType(),Constants.ZERO) &&
@@ -268,7 +276,7 @@
}
model.setTotalArea(new BigDecimal(0));
for(YwRoom r : rooms){
- model.setTotalArea(model.getTotalArea().add(Constants.formatBigdecimal(r.getArea())));
+ model.setTotalArea(model.getTotalArea().add(Constants.formatBigdecimal(r.getRentArea())));
}
model.setRoomList(rooms);
}
@@ -303,20 +311,23 @@
BigDecimal fee = Constants.formatBigdecimal(model.getBtFee());
String str = "閫�绉熸憳瑕侊細鍓╀綑鏈粨娓呰处鍗晎param1}浠斤紝鍏抽棴璐﹀崟{param2}浠姐�愰��绉熸棩{param3}锛岄��绉熻垂鐢ㄥ悎璁￠渶{param4}{param5}鍏冦�傘��";
str = str.replace("{param1}",model.getBtWaitBill()+"")
- .replace("{param2}",Integer.toString(model.getBtCLoseBill()))
+ .replace("{param2}",model.getBtCLoseBill()+"")
.replace("{param3}",DateUtil.getDateLongSlash(model.getBtDate()))
.replace("{param4}",fee.compareTo(new BigDecimal(0)) >=0?"鏀�":"浠�")
.replace("{param5}",(fee.compareTo(new BigDecimal(0)) >=0?
- Constants.formatBigdecimal(model.getBtFee()).intValue()
- :(Constants.formatBigdecimal(model.getBtFee()).intValue() * -1))+"" );
+ Constants.formatBigdecimal2Float(model.getBtFee())
+ :(Constants.formatBigdecimal2Float(model.getBtFee()).multiply(new BigDecimal(-1)))).toString());
return str;
}
private String getbackRentLogByParam(YwContract model) {
BigDecimal fee = Constants.formatBigdecimal(model.getBtFee());
- String str = "銆愰��绉熸棩{param1}锛岄��绉熷師鍥狅細{param2},閫�绉熷崗璁腑缁熻鐨勮垂鐢ㄦ�昏{param3}鍏冦�傘��";
+ String str = "銆愰��绉熸棩{param1}锛岄��绉熷師鍥狅細{param2},閫�绉熷崗璁腑缁熻鐨勮垂鐢ㄦ�昏闇�{param4}{param5}鍏冦�傘��";
str = str.replace("{param1}",DateUtil.getDateLongSlash(model.getBtDate()))
.replace("{param2}",StringUtils.defaultString(model.getBtInfo(),""))
- .replace("{param3}",Constants.formatBigdecimal2Float(model.getBtFee()).doubleValue()+"");
+ .replace("{param4}",fee.compareTo(new BigDecimal(0)) >=0?"鏀�":"浠�")
+ .replace("{param5}",(fee.compareTo(new BigDecimal(0)) >=0?
+ Constants.formatBigdecimal2Float(model.getBtFee())
+ :(Constants.formatBigdecimal2Float(model.getBtFee()).multiply(new BigDecimal(-1)))).toString());
return str;
}
@@ -407,23 +418,15 @@
}
if(Constants.equalsInteger(bill.getPayStatus(),Constants.ZERO)
||Constants.equalsInteger(bill.getPayStatus(),Constants.THREE)){
- if(bill.getStartDate().getTime()<param.getBtDate().getTime()){
+ if(bill.getStartDate().getTime()<=param.getBtDate().getTime()){
canBills.add(bill);
}else{
//濡傛灉杩樻病寮�濮嬶紝璐﹀崟鐩存帴鍏抽棴
closeBills.add(bill);
noBills.add(bill);
}
-// if(bill.getStartDate().getTime()>param.getEditDate().getTime()){
-// //濡傛灉杩樻病寮�濮嬶紝璐﹀崟鐩存帴鍏抽棴
-// closeBills.add(bill);
-// noBills.add(bill);
-// }else{
-// canBills.add(bill);
-// }
}else if(Constants.equalsInteger(bill.getPayStatus(),Constants.ONE) ){
if(bill.getStartDate().getTime()>param.getBtDate().getTime()){
-// if(bill.getEndDate().getTime()<param.getEditDate().getTime()){
//濡傛灉宸茬粨娓咃紝璐﹀崟鐩存帴鍏抽棴
noBills.add(bill);
}else{
@@ -447,14 +450,14 @@
BigDecimal totalBackFee = new BigDecimal(0);
if(canBills.size()>0){
- //鐩存帴鍏抽棴鍏抽棴璐﹀崟
+ //
for(YwContractBill b : canBills){
BigDecimal fee = new BigDecimal(0);
YwContractBill editBill = getEditBillFromListByParam(b,param.getCanBackRentBills());
if(editBill != null){
//浠樻鐘舵�侊細0=寰呮敹娆撅紱1=宸茬粨娓咃紱2=閮ㄥ垎缁撴竻锛�3=寰呬粯娆撅紱4=寰呴��娆撅紱5=宸插叧闂�
//濡傛灉璐﹀崟淇℃伅鍋氫簡缂栬緫锛岄噾棰濊绠� 瀹炴敹閲戦 鍜� 淇敼鍚庡簲鏀堕噾棰濅綔瀵规瘮锛屽垽鏂槸鍚﹀簲璇ラ��娆�
- fee = Constants.formatBigdecimal(b.getActReceivableFee()).subtract(editBill.getReceivableFee());
+ fee = editBill.getReceivableFee().subtract(Constants.formatBigdecimal(b.getActReceivableFee()));
if(fee.compareTo(new BigDecimal(0))== 0){
//濡傛灉璐圭敤姝ｅソ锛屽垯淇敼璐﹀崟淇℃伅涓哄凡缁撴竻
b.setPayStatus(Constants.ONE);
@@ -464,8 +467,8 @@
}else if(fee.compareTo(new BigDecimal(0)) < 0){
//濡傛灉璐﹀崟杩樻湁娆惧緟鏀讹紝鍒欎繚鎸佺姸鎬佷笉鍙�
}
+ b.setReceivableFee(editBill.getReceivableFee());
}
- b.setReceivableFee(editBill.getReceivableFee());
b.setEditDate(param.getEditDate());
b.setEditor(param.getEditor());
b.setBtActDate(param.getBtActDate());
@@ -480,34 +483,29 @@
totalBackFee = totalBackFee.add(fee);//绱閫�娆鹃噾棰�
}
}
- List<YwContractBill> ywContractBillList = ywContractBillMapper.selectList(new QueryWrapper<YwContractBill>()
- .lambda().eq(YwContractBill::getContractId,param.getId()).orderByDesc(YwContractBill::getId));
- Integer sortNum = ywContractBillList.size();
if(param.getAddBillList()!=null && param.getAddBillList().size()>0){
for(YwContractBill addBill : param.getAddBillList()){
- sortNum = sortNum + 1 ;
addBill.setIsdeleted(Constants.ZERO);
addBill.setContractId(param.getId());
- addBill.setType(Constants.ONE);
+ addBill.setType(Constants.TWO);
addBill.setStatus(Constants.ZERO);
addBill.setTotleFee(addBill.getReceivableFee());
+ addBill.setCompanyId(param.getCompanyId());
if(Constants.equalsInteger(addBill.getFeeType(),Constants.ONE)){
addBill.setStartDate(addBill.getPlanPayDate());
addBill.setEndDate(addBill.getPlanPayDate());
}
if(Constants.equalsInteger(addBill.getBillType(),Constants.ZERO)){
//濡傛灉鏄敹娆�
- totalBackFee = totalBackFee.add(Constants.formatBigdecimal(addBill.getActReceivableFee()));
+// totalBackFee = totalBackFee.add(Constants.formatBigdecimal(addBill.getActReceivableFee()));
addBill.setPayStatus(Constants.ZERO);
- addBill.setBtFee(Constants.formatBigdecimal(addBill.getActReceivableFee()));
+ addBill.setBtFee(Constants.formatBigdecimal(addBill.getReceivableFee()));
}else{
//濡傛灉鏄粯娆�
addBill.setPayStatus(Constants.THREE);
- addBill.setBtFee(Constants.formatBigdecimal(addBill.getActReceivableFee()).multiply(new BigDecimal(-1)));
+ addBill.setBtFee(Constants.formatBigdecimal(addBill.getReceivableFee()).multiply(new BigDecimal(-1)));
}
totalBackFee = totalBackFee.add(Constants.formatBigdecimal(addBill.getBtFee()));
- addBill.setCreator(param.getEditor());
- addBill.setCreateDate(param.getEditDate());
addBill.setEditDate(param.getEditDate());
addBill.setEditor(param.getEditor());
addBill.setBtActDate(param.getBtActDate());
@@ -516,7 +514,6 @@
addBill.setBtUserId(param.getBtUserId());
addBill.setBtSignDate(param.getBtSignDate());
addBill.setBtType(param.getBtType());
- addBill.setSortnum(sortNum );
newBills.add(addBill);
}
ywContractBillMapper.insert(param.getAddBillList());//鎵归噺鎻掑叆鏁版嵁
@@ -535,18 +532,20 @@
yjBill.setEditDate(param.getEditDate());
yjBill.setEditor(param.getEditor());
yjBill.setReceivableFee(BigDecimal.ZERO);
- if(bill.getActReceivableFee().compareTo(BigDecimal.ZERO)==Constants.ZERO){
- yjBill.setPayStatus(Constants.FIVE);
+ if(Constants.formatBigdecimal(canBill.getActReceivableFee()).compareTo(new BigDecimal(0)) == 0){
+ //鏈敮浠樼殑鎶奸噾锛岀洿鎺ュ叧闂�
yjBill.setStatus(Constants.ONE);
+ closeBills.add(yjBill);
}else{
+ yjBill.setBtFee(Constants.formatBigdecimal(canBill.getActReceivableFee()).multiply(new BigDecimal(-1)));
yjBill.setPayStatus(Constants.FOUR);
+ yjBill.setPlanPayDate(canBill.getPlanPayDate());
+ totalBackFee = totalBackFee.add(Constants.formatBigdecimal(yjBill.getBtFee()));
yjNoBills ++;
}
- yjBill.setPlanPayDate(canBill.getPlanPayDate());
ywContractBillMapper.updateById(yjBill);
}
}
-
}
}
param.setBtWaitBill(canBills.size() + newBills.size()+yjNoBills);//鏈竻绠楃殑璐﹀崟鏁伴噺
@@ -701,14 +700,21 @@
}
int num =1;
for(int i=0;i<billList1.size();i++){
- if(Constants.equalsInteger( billList1.get(i).getCostType(),Constants.ZERO)){
- billList1.get(i).setSortnum(num++);
+ if(Constants.formatBigdecimal(billList1.get(i).getReceivableFee()).compareTo(new BigDecimal(0)) == 0){
+ billList1.get(i).setPayStatus(Constants.ONE);
+ }
+ if(Constants.equalsInteger(billList1.get(i).getCostType(),Constants.ZERO)){
+ billList1.get(i).setSortnum(num);
+ num++;
}
}
- num =1;
for(int i=0;i<billList2.size();i++){
- if(Constants.equalsInteger( billList2.get(i).getCostType(),Constants.ONE)){
- billList2.get(i).setSortnum(num++);
+ if(Constants.formatBigdecimal(billList2.get(i).getReceivableFee()).compareTo(new BigDecimal(0)) == 0){
+ billList2.get(i).setPayStatus(Constants.ONE);
+ }
+ if(Constants.equalsInteger(billList2.get(i).getCostType(),Constants.ONE)) {
+ billList2.get(i).setSortnum(num);
+ num++;
}
}
if(model.getId()!=null){
@@ -855,34 +861,37 @@
BigDecimal totalFee = new BigDecimal(0);
DateCompare dateCompare = DateCompare.dayCompare(bill.getStartDate(),bill.getEndDate(),freeStart, freeEnd);
if(Constants.equalsInteger(d.getCircleType(),Constants.ZERO)){
- //0=鍏冩瘡骞崇背澶�
+ //0=鍏冩瘡骞崇背澶� 璐﹀崟閲戦=璐﹀崟鍛ㄦ湡鐨勫ぉ鏁�*绉熻祦闈㈢Н*鍗曚环锛�
int days = dateCompare.getDay() ;
BigDecimal areas = getAreasNumBYRooms(model.getRoomList());
totalFee = new BigDecimal(days).multiply(areas).multiply(Constants.formatBigdecimal(d.getPrice()));//鎬讳环鏍�
}else if(Constants.equalsInteger(d.getCircleType(),Constants.ONE)){
- //1=鍏冩瘡骞崇背鏈�
+ //1=鍏冩瘡骞崇背鏈� 璐﹀崟閲戦=璐﹀崟鍛ㄦ湡鐨勬湀鏁帮紙寮�濮嬫棩鏈熻绠楄嚜鐒舵湀锛�*绉熻祦闈㈢Н*鍗曚环+涓嶆弧涓�涓湀鐨勫ぉ鏁�*绉熻祦闈㈢Н*鍗曚环*12/365锛�
BigDecimal areas = getAreasNumBYRooms(model.getRoomList());
BigDecimal month =dateCompare.getMonthFloat();
totalFee = month.multiply(areas).multiply(Constants.formatBigdecimal(d.getPrice()));//鎬讳环鏍�
}else if(Constants.equalsInteger(d.getCircleType(),Constants.TWO)){
- //2=鍏冩瘡骞崇背骞�
+ //2=鍏冩瘡骞崇背骞� 璐﹀崟閲戦=璐﹀崟鍛ㄦ湡鐨勬湀鏁帮紙寮�濮嬫棩鏈熻绠楄嚜鐒舵湀锛�*鍗曚环*闈㈢Н/12+涓嶆弧涓�涓湀鐨勫ぉ鏁�*绉熻祦闈㈢Н*鍗曚环/365锛�
BigDecimal areas = getAreasNumBYRooms(model.getRoomList());
- BigDecimal year = dateCompare.getYearFloat();
- totalFee = year.multiply(areas).multiply(Constants.formatBigdecimal(d.getPrice()));//鎬讳环鏍�
+ BigDecimal month = new BigDecimal(dateCompare.getMonth());
+ totalFee = ((month.multiply(Constants.formatBigdecimal(d.getPrice())).divide(new BigDecimal(12),2, RoundingMode.HALF_UP))
+ .add(new BigDecimal(dateCompare.getMonthDays()).multiply(Constants.formatBigdecimal(d.getPrice())).divide(new BigDecimal(365),2, RoundingMode.HALF_UP)))
+ .multiply(areas);//鎬讳环鏍�
}else if(Constants.equalsInteger(d.getCircleType(),Constants.THREE)){
- //3=鍏冩瘡澶�
+ //3=鍏冩瘡澶� 璐﹀崟閲戦=璐﹀崟鍛ㄦ湡鐨勫ぉ鏁�*鍗曚环锛�
int days = dateCompare.getDay() ;
totalFee = new BigDecimal(days).multiply(Constants.formatBigdecimal(d.getPrice()));//鎬讳环鏍�
}else if(Constants.equalsInteger(d.getCircleType(),Constants.FOUR)){
- //4=鍏冩瘡鏈�
+ //4=鍏冩瘡鏈� 璐﹀崟閲戦=璐﹀崟鍛ㄦ湡鐨勬湀鏁帮紙寮�濮嬫棩鏈熻绠楄嚜鐒舵湀锛�*鍗曚环+涓嶆弧涓�涓湀鐨勫ぉ鏁�*鍗曚环*12/365
BigDecimal month = dateCompare.getMonthFloat();
totalFee = month.multiply(Constants.formatBigdecimal(d.getPrice()));//鎬讳环鏍�
}else if(Constants.equalsInteger(d.getCircleType(),Constants.FIVE)){
- //5=鍏冩瘡骞�
- BigDecimal year = dateCompare.getYearFloat();
- totalFee = year.multiply(Constants.formatBigdecimal(d.getPrice()));//鎬讳环鏍�
+ //5=鍏冩瘡骞� 璐﹀崟閲戦=璐﹀崟鍛ㄦ湡鐨勬湀鏁帮紙寮�濮嬫棩鏈熻绠楄嚜鐒舵湀锛�*鍗曚环*闈㈢Н/12+涓嶆弧涓�涓湀鐨勫ぉ鏁�*绉熻祦闈㈢Н*鍗曚环/365锛�
+ BigDecimal month = new BigDecimal(dateCompare.getMonth());
+ totalFee =( month.multiply(Constants.formatBigdecimal(d.getPrice())).divide(new BigDecimal(12),2, RoundingMode.HALF_UP))
+ .add(new BigDecimal(dateCompare.getMonthDays()).multiply(Constants.formatBigdecimal(d.getPrice())).divide(new BigDecimal(365),2, RoundingMode.HALF_UP));//鎬讳环鏍�
}else if(Constants.equalsInteger(d.getCircleType(),Constants.SIX)){
- //6=鍏冩瘡鍦�
+ //6=鍏冩瘡鍦� 璐﹀崟閲戦=鍗曚环锛涘彧鏈夐�夋嫨涓�娆℃�т粯娆炬椂锛屾墠鑳介�夋嫨璇ュ崟浠风淮搴︼紱
totalFee =Constants.formatBigdecimal(d.getPrice());
}
if(Constants.equalsInteger(model.getRoundedUp(),Constants.ONE)){
@@ -926,7 +935,6 @@
bill.setTotleFee(getTotalFeeByStartEnd(model,d,bill,freeStart,freeEnd));
bill.setReceivableFee(bill.getTotleFee());
bill.setBillType(Constants.ZERO);
- bill.setCompanyId(model.getCompanyId());
list.add(bill);
}
return list;
@@ -954,7 +962,7 @@
BigDecimal data= new BigDecimal(0);
if(roomList!=null){
for(YwRoom r :roomList){
- data = data.add(Constants.formatBigdecimal(r.getArea()));
+ data = data.add(Constants.formatBigdecimal(r.getRentArea()));
}
}
@@ -1046,7 +1054,7 @@
if(!(model.getZlFreeEndDate()==null && model.getZlFreeStartDate()==null) && (
(model.getZlFreeEndDate()!=null && model.getZlFreeStartDate()==null)
||(model.getZlFreeEndDate()==null && model.getZlFreeStartDate()!=null)
- ||model.getZlFreeEndDate().getTime()< model.getZlFreeStartDate().getTime())
+ ||model.getZlFreeEndDate().getTime()<= model.getZlFreeStartDate().getTime())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勭璧佹潯娆惧厤绉熸湡淇℃伅锛�");
}
@@ -1075,7 +1083,7 @@
Constants.equalsInteger(d.getCircleType(),Constants.SIX)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绉熻祦鏉℃鍙湁閫夋嫨涓�娆℃�т粯娆炬椂锛屾墠鑳介�夋嫨璇ユ寜姣忓満鏀惰垂锛�");
}
- if(model.getZlFirstPrice() == null){//棣栨湡淇℃伅
+ if(model.getZlFirstCircle() == null){//棣栨湡淇℃伅
model.setZlFirstPrice(d.getPrice());
model.setZlFirstCircle(d.getCircleType());
}
@@ -1124,7 +1132,7 @@
Constants.equalsInteger(d.getCircleType(),Constants.SIX)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鐗╀笟鏉℃鍙湁閫夋嫨涓�娆℃�т粯娆炬椂锛屾墠鑳介�夋嫨璇ユ寜姣忓満鏀惰垂锛�");
}
- if(model.getWyFirstPrice() == null){
+ if(model.getWyFirstCircle() == null){
//棣栨湡淇℃伅
model.setWyFirstPrice(d.getPrice());
model.setWyFirstCircle(d.getCircleType());
@@ -1148,7 +1156,7 @@
}
model.setTotalArea(new BigDecimal(0));
for(YwRoom r : rooms){
- model.setTotalArea(model.getTotalArea().add(Constants.formatBigdecimal(r.getArea())));
+ model.setTotalArea(model.getTotalArea().add(Constants.formatBigdecimal(r.getRentArea())));
}
model.setRoomList(rooms);
YwCustomer customer = customerMapper.selectById(model.getRenterId());
@@ -1225,108 +1233,164 @@
}
@Override
public YwContract findById(Integer id) {
+
+ YwContract model =queryDetailInfoById(id);
+ //鏌ヨ鎿嶄綔鏃ュ織璁板綍
+ YwWorkorderLog log = new YwWorkorderLog();
+ log.setJobId(model.getId());
+ log.setIsdeleted(Constants.ZERO);
+ model.setLogList(ywWorkorderLogMapper.selectList(new QueryWrapper<YwWorkorderLog>(log)
+ .lambda()
+ .in(YwWorkorderLog::getObjType,Constants.YwLogType.CONTRACT_BACK.getKey()
+ ,Constants.YwLogType.CONTRACT_CREATE.getKey()
+ ,Constants.YwLogType.CONTRACT_UPDATE.getKey())
+ .orderByAsc(YwWorkorderLog::getCreateDate)));
+
+ //鏌ヨ璐﹀崟闆嗗悎
+ queryBillListByModel(model,new Date());
+ return model;
+ }
+ private YwContract queryDetailInfoById(Integer id) {
MPJLambdaWrapper<YwContract> queryWrapper = new MPJLambdaWrapper<>();
- queryWrapper.selectAll(YwContract.class )
- .selectAs(Company::getName,YwContract::getCompanyName )
- .selectAs(SystemUser::getRealname,YwContract::getUserName )
- .selectAs(YwCustomer::getName,YwContract::getRenterName )
- .selectAs(YwProject::getName,YwContract::getProjectName )
- .select("t3.realname",YwContract::getCreatorName )
- .select("(select sum(r.area) from yw_contract_room cr left join yw_room r on r.id = cr.room_id where r.isdeleted=0 and cr.contract_id =t.id)",YwContract::getTotalArea )
- .leftJoin(Company.class,Company::getId,YwContract::getCompanyId)
- .leftJoin(SystemUser.class,SystemUser::getId,YwContract::getUserId)
- .leftJoin(SystemUser.class,SystemUser::getId,YwContract::getCreator)
- .leftJoin(YwProject.class,YwProject::getId,YwContract::getProjectId)
- .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
- .eq( YwContract::getId,id);
- YwContract model = ywContractMapper.selectJoinOne(YwContract.class,queryWrapper);
- if(model != null){
+ queryWrapper.selectAll(YwContract.class)
+ .selectAs(Company::getName, YwContract::getCompanyName)
+ .selectAs(SystemUser::getRealname, YwContract::getUserName)
+ .selectAs(YwCustomer::getName, YwContract::getRenterName)
+ .selectAs(YwProject::getName, YwContract::getProjectName)
+ .select("t3.realname", YwContract::getCreatorName)
+ .select("(select sum(r.area) from yw_contract_room cr left join yw_room r on r.id = cr.room_id where r.isdeleted=0 and cr.contract_id =t.id)", YwContract::getTotalArea)
+ .leftJoin(Company.class, Company::getId, YwContract::getCompanyId)
+ .leftJoin(SystemUser.class, SystemUser::getId, YwContract::getUserId)
+ .leftJoin(SystemUser.class, SystemUser::getId, YwContract::getCreator)
+ .leftJoin(YwProject.class, YwProject::getId, YwContract::getProjectId)
+ .leftJoin(YwCustomer.class, YwCustomer::getId, YwContract::getRenterId)
+ .eq(YwContract::getId, id);
+ YwContract model = ywContractMapper.selectJoinOne(YwContract.class, queryWrapper);
+ if (model == null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
//鍚堝悓闄勪欢
initFiles(model);
//鏌ヨ鎴挎簮淇℃伅鏁版嵁
MPJLambdaWrapper<YwRoom> rw = new MPJLambdaWrapper<>();
- rw.selectAll(YwRoom.class )
- .selectAs(YwProject::getName,YwRoom::getProjectName)
- .selectAs(YwFloor::getName,YwRoom::getFloorName)
- .selectAs(YwBuilding::getName,YwRoom::getBuildingName)
- .leftJoin(YwProject.class,YwProject::getId,YwRoom::getProjectId)
- .leftJoin(YwBuilding.class,YwBuilding::getId,YwRoom::getBuildingId)
- .leftJoin(YwFloor.class,YwFloor::getId,YwRoom::getFloor)
- .eq(YwRoom::getIsdeleted,Constants.ZERO)
- .exists("(select a.id from yw_contract_room a where a.isdeleted=0 and a.type=0 and a.room_id=t.id and a.contract_id="+model.getId()+")");
- model.setRoomList(roomMapper.selectJoinList(YwRoom.class,rw));
+ rw.selectAll(YwRoom.class)
+ .selectAs(YwProject::getName, YwRoom::getProjectName)
+ .selectAs(YwFloor::getName, YwRoom::getFloorName)
+ .selectAs(YwBuilding::getName, YwRoom::getBuildingName)
+ .leftJoin(YwProject.class, YwProject::getId, YwRoom::getProjectId)
+ .leftJoin(YwBuilding.class, YwBuilding::getId, YwRoom::getBuildingId)
+ .leftJoin(YwFloor.class, YwFloor::getId, YwRoom::getFloor)
+ .eq(YwRoom::getIsdeleted, Constants.ZERO)
+ .exists("(select a.id from yw_contract_room a where a.isdeleted=0 and a.type=0 and a.room_id=t.id and a.contract_id=" + model.getId() + ")");
+ model.setRoomList(roomMapper.selectJoinList(YwRoom.class, rw));
model.setWyFirstCircleStr(Constants.getUnitTypeByNum(model.getWyFirstCircle()));
model.setZlFirstCircleStr(Constants.getUnitTypeByNum(model.getZlFirstCircle()));
//鏌ヨ绉熻硟鏉℃淇℃伅
MPJLambdaWrapper<YwContractDetail> dw = new MPJLambdaWrapper<>();
- dw.selectAll(YwContractDetail.class )
- .eq(YwContractDetail::getIsdeleted,Constants.ZERO)
- .eq(YwContractDetail::getContractId,model.getId())
- .in(YwContractDetail::getType,Constants.ZERO,Constants.TWO)
+ dw.selectAll(YwContractDetail.class)
+ .eq(YwContractDetail::getIsdeleted, Constants.ZERO)
+ .eq(YwContractDetail::getContractId, model.getId())
+ .in(YwContractDetail::getType, Constants.ZERO, Constants.TWO)
.orderByAsc(YwContractDetail::getSortnum);
- model.setZlDetailList(ywContractDetailMapper.selectJoinList(YwContractDetail.class,dw));
+ model.setZlDetailList(ywContractDetailMapper.selectJoinList(YwContractDetail.class, dw));
//鏌ヨ鐗╂キ鏉℃淇℃伅
dw = new MPJLambdaWrapper<>();
- dw.selectAll(YwContractDetail.class )
- .eq(YwContractDetail::getIsdeleted,Constants.ZERO)
- .eq(YwContractDetail::getContractId,model.getId())
- .in(YwContractDetail::getType,Constants.ONE,Constants.THREE)
+ dw.selectAll(YwContractDetail.class)
+ .eq(YwContractDetail::getIsdeleted, Constants.ZERO)
+ .eq(YwContractDetail::getContractId, model.getId())
+ .in(YwContractDetail::getType, Constants.ONE, Constants.THREE)
.orderByAsc(YwContractDetail::getSortnum);
- model.setWyDetailList(ywContractDetailMapper.selectJoinList(YwContractDetail.class,dw));
+ model.setWyDetailList(ywContractDetailMapper.selectJoinList(YwContractDetail.class, dw));
- //鏌ヨ鎿嶄綔鏃ュ織璁板綍
- YwWorkorderLog log = new YwWorkorderLog();
- log.setJobId(model.getId());
- log.setIsdeleted(Constants.ZERO);
- model.setLogList(ywWorkorderLogMapper.selectList(new QueryWrapper<YwWorkorderLog>(log)
- .lambda()
- .in(YwWorkorderLog::getObjType,Constants.YwLogType.CONTRACT_BACK.getKey()
- ,Constants.YwLogType.CONTRACT_CREATE.getKey()
- ,Constants.YwLogType.CONTRACT_UPDATE.getKey())
- .orderByAsc(YwWorkorderLog::getCreateDate)));
+ return model;
+ }
- //鏌ヨ璐﹀崟闆嗗悎
- model.setBillList(ywContractBillMapper.selectJoinList(YwContractBill.class,new MPJLambdaWrapper<YwContractBill>()
- .selectAll(YwContractBill.class )
- //.select(" ( select ifnull(sum(case when yw.REVENUE_TYPE = 0 then yw.ACT_RECEIVABLE_FEE else -yw.ACT_RECEIVABLE_FEE end),0) from yw_contract_revenue yw where yw.bill_id = t.id and yw.status = 0 and yw.isdeleted = 0 ) as actReceivableFee ")
- .select(" ( select ifnull( sum( CASE WHEN t.bill_type = 0 and yw.REVENUE_TYPE = 0 THEN yw.ACT_RECEIVABLE_FEE when t.bill_type = 0 and yw.REVENUE_TYPE = 1 then -yw.ACT_RECEIVABLE_FEE when t.bill_type = 1 and yw.REVENUE_TYPE = 0 then -yw.ACT_RECEIVABLE_FEE else yw.ACT_RECEIVABLE_FEE END),0) from yw_contract_revenue yw where yw.bill_id = t.id and yw.status = 0 and yw.isdeleted = 0 ) as actReceivableFee ")
- .eq( YwContractBill::getContractId,model.getId())
- .eq(YwContractBill::getIsdeleted,Constants.ZERO)
- .orderByAsc(YwContractBill::getSortnum,YwContractBill::getCreateDate)));
+ @Override
+ public YwContract findForBills(YwContract param) {
+ YwContract model = queryDetailInfoById(param.getId());
+ queryBillListByModel(model,param.getBtDate());
+ return model;
- for (YwContractBill ywContractBill:model.getBillList()) {
- ywContractBill.setNeedReceivableFee(ywContractBill.getReceivableFee().subtract(ywContractBill.getActReceivableFee()));
+ }
+ private void queryBillListByModel(YwContract model,Date date) {
+ if(date ==null){
+ date = new Date();
+ }
+ //鏌ヨ璐﹀崟闆嗗悎
+ model.setBillList(ywContractBillMapper.selectJoinList(YwContractBill.class,new MPJLambdaWrapper<YwContractBill>()
+ .selectAll(YwContractBill.class )
+ //.select(" ( select ifnull(sum(case when yw.REVENUE_TYPE = 0 then yw.ACT_RECEIVABLE_FEE else -yw.ACT_RECEIVABLE_FEE end),0) from yw_contract_revenue yw where yw.bill_id = t.id and yw.status = 0 and yw.isdeleted = 0 ) as actReceivableFee ")
+ .select(" ( select ifnull( sum( CASE WHEN t.bill_type = 0 and yw.REVENUE_TYPE = 0 THEN yw.ACT_RECEIVABLE_FEE when t.bill_type = 0 and yw.REVENUE_TYPE = 1 then -yw.ACT_RECEIVABLE_FEE when t.bill_type = 1 and yw.REVENUE_TYPE = 0 then -yw.ACT_RECEIVABLE_FEE else yw.ACT_RECEIVABLE_FEE END),0) from yw_contract_revenue yw where yw.bill_id = t.id and yw.status = 0 and yw.isdeleted = 0 ) as actReceivableFee ")
+ .eq( YwContractBill::getContractId,model.getId())
+ .eq(YwContractBill::getIsdeleted,Constants.ZERO)
+ .orderByAsc(YwContractBill::getSortnum,YwContractBill::getCreateDate)));
+ for (YwContractBill ywContractBill:model.getBillList()) {
+ ywContractBill.setNeedReceivableFee(ywContractBill.getReceivableFee());
+// ywContractBill.setNeedReceivableFee(ywContractBill.getReceivableFee().subtract(ywContractBill.getActReceivableFee()));
+ }
+ model.setCanBackRentBills(new ArrayList<>());
+ long nowStart = Utils.Date.getStart(date).getTime();
+ long nowEnd = Utils.Date.getDayEnd(date).getTime();
+ if(model.getBillList()!=null && model.getBillList().size()>0){
+ for(YwContractBill bill: model.getBillList()){
+ //浠樻鐘舵�侊細0=寰呮敹娆撅紱1=宸茬粨娓咃紱2=閮ㄥ垎缁撴竻锛�3=寰呬粯娆撅紱4=寰呴��娆撅紱5=宸插叧闂�
+ if( Constants.formatBigdecimal(bill.getReceivableFee()).compareTo(new BigDecimal(0)) ==0){
+ //濡傛灉杩樻病寮�濮嬶紝璐﹀崟鐩存帴鍏抽棴
+ continue;
+ }
+ if(Constants.equalsInteger(bill.getPayStatus(),Constants.ZERO)
+ ||Constants.equalsInteger(bill.getPayStatus(),Constants.THREE)){
+ if(bill.getStartDate().getTime()>nowEnd ){
+ //濡傛灉杩樻病寮�濮嬶紝璐﹀崟鐩存帴鍏抽棴
+ continue;
+ }
+ model.getCanBackRentBills().add(bill);
+ }else if(Constants.equalsInteger(bill.getPayStatus(),Constants.ONE) ){
+ if(bill.getEndDate().getTime()<nowStart){
+ //濡傛灉宸茬粨娓咃紝璐﹀崟鐩存帴鍏抽棴
+ continue;
+ }
+ model.getCanBackRentBills().add(bill);
+ }else if(Constants.equalsInteger(bill.getPayStatus(),Constants.TWO) ){
+ model.getCanBackRentBills().add(bill);
+ }
}
-
- model.setCanBackRentBills(new ArrayList<>());
- long nowStart = Utils.Date.getStart(new Date()).getTime();
- long nowEnd = Utils.Date.getEnd(new Date()).getTime();
- if(model.getBillList()!=null && model.getBillList().size()>0){
- for(YwContractBill bill: model.getBillList()){
- //浠樻鐘舵�侊細0=寰呮敹娆撅紱1=宸茬粨娓咃紱2=閮ㄥ垎缁撴竻锛�3=寰呬粯娆撅紱4=寰呴��娆撅紱5=宸插叧闂�
- if(Constants.equalsInteger(bill.getPayStatus(),Constants.ZERO)
- ||Constants.equalsInteger(bill.getPayStatus(),Constants.THREE)){
- if(bill.getStartDate().getTime()>nowEnd){
- //濡傛灉杩樻病寮�濮嬶紝璐﹀崟鐩存帴鍏抽棴
- continue;
- }
- model.getCanBackRentBills().add(bill);
-
- }else if(Constants.equalsInteger(bill.getPayStatus(),Constants.ONE) ){
- if(bill.getEndDate().getTime()<nowStart){
- //濡傛灉宸茬粨娓咃紝璐﹀崟鐩存帴鍏抽棴
- continue;
- }
- model.getCanBackRentBills().add(bill);
- }else if(Constants.equalsInteger(bill.getPayStatus(),Constants.TWO) ){
- model.getCanBackRentBills().add(bill);
+ for(YwContractBill bill : model.getCanBackRentBills()){
+ YwContractDetail detail = null;
+ if(Constants.equalsInteger(bill.getCostType(),Constants.ZERO)){
+ detail = getDetailByIdFromList(bill.getDetailId(),model.getZlDetailList());
+ if(detail!=null&& bill.getStartDate()!=null && bill.getEndDate()!=null
+ &&(date.getTime() <= bill.getStartDate().getTime() || (date.getTime() >= bill.getStartDate().getTime() && date.getTime()<= bill.getEndDate().getTime()))){
+ Date odate = bill.getEndDate();
+ bill.setEndDate(date);
+ BigDecimal actFee = getTotalFeeByStartEnd(model,detail,bill,model.getZlFreeStartDate(),model.getZlFreeEndDate());
+ bill.setEndDate(odate);
+ bill.setNeedReceivableFee(actFee);
+ }
+ }else if(Constants.equalsInteger(bill.getCostType(),Constants.ONE)){
+ detail = getDetailByIdFromList(bill.getDetailId(),model.getWyDetailList());
+ if(detail!=null&& bill.getStartDate()!=null && bill.getEndDate()!=null
+ &&(date.getTime() <= bill.getStartDate().getTime() || (date.getTime() >= bill.getStartDate().getTime() && date.getTime()<= bill.getEndDate().getTime()))){
+ Date odate = bill.getEndDate();
+ bill.setEndDate(date);
+ BigDecimal actFee = getTotalFeeByStartEnd(model,detail,bill,model.getWyFreeStartDate(),model.getWyFreeEndDate());
+ bill.setEndDate(odate);
+ bill.setNeedReceivableFee(actFee);
}
}
}
-
}
+ }
- return model;
+ private YwContractDetail getDetailByIdFromList(Integer detailId, List<YwContractDetail> list) {
+ if(list!=null){
+ for(YwContractDetail d : list){
+ if(Constants.equalsInteger(detailId,d.getId())){
+ return d;
+ }
+ }
+ }
+ return null;
}
@Override
@@ -1453,6 +1517,11 @@
queryWrapper.ge(YwContract::getWyFreeEndDate, Utils.Date.getStart(pageWrap.getModel().getWyFreeEndDate()));
queryWrapper.le(YwContract::getWyFreeEndDate, Utils.Date.getEnd(pageWrap.getModel().getWyFreeEndDate()));
}
+
+
+
+
+
if (pageWrap.getModel().getZlTotalFee() != null) {
queryWrapper.eq(YwContract::getZlTotalFee, pageWrap.getModel().getZlTotalFee());
}
--
Gitblit v1.9.3