From ef7f644b88bb63395f511ec74a01e0c3c3e52320 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 30 十一月 2024 10:34:51 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java | 73 +++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 22 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 d2da52a..6b26da4 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
@@ -394,16 +394,7 @@
ywContractBillMapper.updateById(b);
}
}
- int yjNoBills =0;
- if(yjBills.size()>0){
- // 濡傛灉鏄娂閲戞垨鑰呬繚璇侀噾锛屼笉鏀寔閫�娆撅紝淇濇寔鍘熸潵鐨勭姸鎬侊紝 0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬;7=淇濊瘉閲�
- for(YwContractBill bill : yjBills){
- if(!Constants.equalsInteger(bill.getPayStatus(),Constants.ONE) ){
- //濡傛灉鏄湭缁撴竻鎶奸噾
- yjNoBills ++;
- }
- }
- }
+
BigDecimal totalBackFee = new BigDecimal(0);
if(canBills.size()>0){
//鐩存帴鍏抽棴鍏抽棴璐﹀崟
@@ -416,10 +407,10 @@
fee = Constants.formatBigdecimal(b.getActReceivableFee()).subtract(editBill.getReceivableFee());
if(fee.compareTo(new BigDecimal(0))== 0){
//濡傛灉璐圭敤姝ｅソ锛屽垯淇敼璐﹀崟淇℃伅涓哄凡缁撴竻
- b.setStatus(Constants.ONE);
+ b.setPayStatus(Constants.ONE);
}else if(fee.compareTo(new BigDecimal(0))> 0){
//濡傛灉闇�瑕佽繘琛岄��娆撅紝鏇存柊璐﹀崟淇℃伅涓哄緟閫�娆�
- b.setStatus(Constants.FOUR);
+ b.setPayStatus(Constants.FOUR);
}else if(fee.compareTo(new BigDecimal(0)) < 0){
//濡傛灉璐﹀崟杩樻湁娆惧緟鏀讹紝鍒欎繚鎸佺姸鎬佷笉鍙�
}
@@ -444,6 +435,10 @@
addBill.setContractId(param.getId());
addBill.setType(Constants.ONE);
addBill.setStatus(Constants.ZERO);
+ 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()));
@@ -466,6 +461,33 @@
newBills.add(addBill);
}
ywContractBillMapper.insert(param.getAddBillList());//鎵归噺鎻掑叆鏁版嵁
+ }
+
+ int yjNoBills =0;
+ if(yjBills.size()>0){
+ // 濡傛灉鏄娂閲戞垨鑰呬繚璇侀噾锛屼笉鏀寔閫�娆撅紝淇濇寔鍘熸潵鐨勭姸鎬侊紝 0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬;7=淇濊瘉閲�
+ for(YwContractBill bill : yjBills){
+ if(!Constants.equalsInteger(bill.getPayStatus(),Constants.ONE) ){
+// YwContractBill b = new YwContractBill();
+// //浠樻鐘舵�侊細0=寰呮敹娆撅紱1=宸茬粨娓咃紱2=閮ㄥ垎缁撴竻锛�3=寰呬粯娆撅紱4=寰呴��娆撅紱5=宸插叧闂�
+// //濡傛灉璐﹀崟淇℃伅鍋氫簡缂栬緫锛岄噾棰濊绠� 瀹炴敹閲戦 鍜� 淇敼鍚庡簲鏀堕噾棰濅綔瀵规瘮锛屽垽鏂槸鍚﹀簲璇ラ��娆�
+// BigDecimal fee = Constants.formatBigdecimal(bill.getActReceivableFee()).subtract(bill.getReceivableFee());
+// if(fee.compareTo(new BigDecimal(0))== 0){
+// //濡傛灉璐圭敤姝ｅソ锛屽垯淇敼璐﹀崟淇℃伅涓哄凡缁撴竻
+// b.setPayStatus(Constants.ONE);
+// }else if(fee.compareTo(new BigDecimal(0))> 0){
+// //濡傛灉闇�瑕佽繘琛岄��娆撅紝鏇存柊璐﹀崟淇℃伅涓哄緟閫�娆�
+// b.setPayStatus(Constants.FOUR);
+// }
+// b.setId(bill.getId());
+// b.setEditDate(param.getEditDate());
+// b.setEditor(param.getEditor());
+// b.setReceivableFee(BigDecimal.ZERO);
+// ywContractBillMapper.updateById(b);
+ //濡傛灉鏄湭缁撴竻鎶奸噾
+ yjNoBills ++;
+ }
+ }
}
param.setBtWaitBill(canBills.size() + newBills.size()+yjNoBills);//鏈竻绠楃殑璐﹀崟鏁伴噺
param.setBtCLoseBill(closeBills.size());
@@ -649,7 +671,10 @@
bill.setType(Constants.ZERO);
bill.setCostType(type);
bill.setPlanPayDate(bill.getStartDate());
- bill.setTotleFee(type==Constants.THREE?model.getZlDeposit():model.getWyDeposit());//鎶奸噾璐圭敤
+ bill.setTotleFee(type==Constants.TWO?
+ Objects.isNull(model.getZlDeposit())?BigDecimal.ZERO:model.getZlDeposit()
+ :
+ Objects.isNull(model.getWyDeposit())?BigDecimal.ZERO:model.getWyDeposit());//鎶奸噾璐圭敤
bill.setReceivableFee(bill.getTotleFee());
bill.setBillType(Constants.ZERO);
bill.setPayStatus(Constants.ZERO);
@@ -762,14 +787,10 @@
bill.setTotleFee(totalFee);
bill.setReceivableFee(totalFee);
bill.setBillType(Constants.ZERO);
-
-
bill.setCompanyId(model.getCompanyId());
list.add(bill);
}
}
-
-
private BigDecimal getTotalFeeByStartEnd(YwContract model, YwContractDetail d, YwContractBill bill,Date freeStart,Date freeEnd) {
BigDecimal totalFee = new BigDecimal(0);
DateCompare dateCompare = DateCompare.dayCompare(bill.getStartDate(),DateUtil.addDaysToDate(bill.getEndDate(),1),freeStart,DateUtil.addDaysToDate(freeEnd,1));
@@ -1226,7 +1247,7 @@
}else if(Constants.equalsInteger(bill.getPayStatus(),Constants.ONE) ){
if(bill.getEndDate().getTime()<nowStart){
//濡傛灉宸茬粨娓咃紝璐﹀崟鐩存帴鍏抽棴
- continue;
+ continue;
}
model.getCanBackRentBills().add(bill);
}else if(Constants.equalsInteger(bill.getPayStatus(),Constants.TWO) ){
@@ -1248,10 +1269,18 @@
@Override
public List<YwContract> findList(YwContract ywContract) {
- QueryWrapper<YwContract> wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(YwContract::getIsdeleted,Constants.ZERO);
- wrapper.lambda().in(YwContract::getStatus,Constants.ZERO,Constants.ONE,Constants.TWO);
- return ywContractMapper.selectList(wrapper);
+ return ywContractMapper.selectJoinList(YwContract.class,new MPJLambdaWrapper<YwContract>().selectAll(YwContract.class )
+ .selectAs(Company::getName,YwContract::getCompanyName )
+ .selectAs(SystemUser::getRealname,YwContract::getUserName )
+ .selectAs(YwCustomer::getName,YwContract::getRenterName )
+ .selectAs(YwProject::getName,YwContract::getProjectName )
+ .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::getIsdeleted,Constants.ZERO)
+ .in(YwContract::getStatus,Constants.ZERO,Constants.ONE,Constants.TWO));
}
@Override
--
Gitblit v1.9.3