From b5cf636e0ab19cbfea6c72d36f5629eb10bf2bda Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 10 一月 2025 14:09:32 +0800
Subject: [PATCH] 客户资料 巡检任务业务
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 25b1402..ad8f044 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
@@ -89,7 +89,6 @@
}else{
model.setStatus(Constants.TWO);
}
- model.setStatus(Constants.ZERO);//寰呮墽琛�
model.setRemark(getRemarlByParam(model));
ywContractMapper.insert(model);
dealDetailListBiz(model);//澶勭悊鏉℃淇℃伅
@@ -400,6 +399,7 @@
List<YwContractBill> noBills = new ArrayList<>();//涓嶉渶瑕佺粨绠楃殑璐﹀崟
List<YwContractBill> yjBills = new ArrayList<>();//鎶奸噾璐﹀崟
List<YwContractBill> canBills = new ArrayList<>();//鍙��绉熶慨鏀规暟鎹�
+ Integer canBillCount = Constants.ZERO;
List<YwContractBill> allBills = ywContractBillMapper.selectList(new QueryWrapper<YwContractBill>().
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 = yw_contract_bill.id and yw.status = 0 and yw.isdeleted = 0 ) as actReceivableFee " )
@@ -421,6 +421,7 @@
||Constants.equalsInteger(bill.getPayStatus(),Constants.THREE)){
if(bill.getStartDate().getTime()<=param.getBtDate().getTime()){
canBills.add(bill);
+ canBillCount = canBillCount ++;
}else{
//濡傛灉杩樻病寮�濮嬶紝璐﹀崟鐩存帴鍏抽棴
closeBills.add(bill);
@@ -432,9 +433,11 @@
noBills.add(bill);
}else{
canBills.add(bill);
+ canBillCount = canBillCount ++;
}
}else if(Constants.equalsInteger(bill.getPayStatus(),Constants.TWO) ){
canBills.add(bill);
+ canBillCount = canBillCount ++;
}
}
}
@@ -462,14 +465,15 @@
if(fee.compareTo(new BigDecimal(0))== 0){
//濡傛灉璐圭敤姝ｅソ锛屽垯淇敼璐﹀崟淇℃伅涓哄凡缁撴竻
b.setPayStatus(Constants.ONE);
+ canBillCount = canBillCount --;
}else if(fee.compareTo(new BigDecimal(0))> 0){
//濡傛灉闇�瑕佽繘琛岄��娆撅紝鏇存柊璐﹀崟淇℃伅涓哄緟閫�娆�
b.setPayStatus(Constants.FOUR);
}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());
@@ -488,6 +492,8 @@
for(YwContractBill addBill : param.getAddBillList()){
addBill.setIsdeleted(Constants.ZERO);
addBill.setContractId(param.getId());
+ addBill.setCreateDate(new Date());
+ addBill.setCreator(param.getEditor());
addBill.setType(Constants.TWO);
addBill.setStatus(Constants.ZERO);
addBill.setTotleFee(addBill.getReceivableFee());
@@ -549,7 +555,7 @@
}
}
}
- param.setBtWaitBill(canBills.size() + newBills.size()+yjNoBills);//鏈竻绠楃殑璐﹀崟鏁伴噺
+ param.setBtWaitBill(canBillCount + newBills.size()+yjNoBills);//鏈竻绠楃殑璐﹀崟鏁伴噺
param.setBtCLoseBill(closeBills.size());
param.setBtFee(totalBackFee);
}
@@ -701,13 +707,19 @@
}
int num =1;
for(int i=0;i<billList1.size();i++){
+ 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++;
}
}
for(int i=0;i<billList2.size();i++){
- if(Constants.equalsInteger(billList1.get(i).getCostType(),Constants.ONE)) {
+ 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++;
}
@@ -1513,10 +1525,6 @@
queryWrapper.le(YwContract::getWyFreeEndDate, Utils.Date.getEnd(pageWrap.getModel().getWyFreeEndDate()));
}
-
-
-
-
if (pageWrap.getModel().getZlTotalFee() != null) {
queryWrapper.eq(YwContract::getZlTotalFee, pageWrap.getModel().getZlTotalFee());
}
@@ -1526,6 +1534,9 @@
if (pageWrap.getModel().getCompanyName() != null) {
queryWrapper.like(Company::getName, pageWrap.getModel().getCompanyName());
}
+ if (pageWrap.getModel().getRoomId() != null) {
+ queryWrapper.apply(" t.id in ( select ycr.CONTRACT_ID from yw_contract_room ycr where ycr.type = 0 and ycr.ROOM_ID = "+pageWrap.getModel().getRoomId()+" ) ");
+ }
queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), YwContract::getStartDate, pageWrap.getModel().getQueryStartTime())
.le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()), YwContract::getEndDate, pageWrap.getModel().getQueryEndTime());
queryWrapper.orderByDesc(YwContract::getCreateDate );
--
Gitblit v1.9.3