From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 19:19:34 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java | 839 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 650 insertions(+), 189 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 51efed1..383ca4c 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
@@ -12,6 +12,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dto.YwContractBillDTO;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.MultifileMapper;
import com.doumee.dao.system.SystemUserMapper;
@@ -25,14 +26,17 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.C;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
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;
/**
* 杩愮淮鍚堝悓淇℃伅琛⊿ervice瀹炵幇
@@ -76,21 +80,26 @@
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() && Utils.Date.getEnd(model.getEndDate()).getTime() > System.currentTimeMillis()){
+ model.setStatus(Constants.ONE);
+ }else{
+ model.setStatus(Constants.TWO);
+ }
model.setRemark(getRemarlByParam(model));
ywContractMapper.insert(model);
- dealDetailListBiz(model);//澶勭悊鏉℃淇℃伅
+ dealDetailListBiz(model,false);//澶勭悊鏉℃淇℃伅
dealMultifileBiz(model);//澶勭悊闄勪欢淇℃伅
dealRoomsForContract(model);//澶勭悊鎴挎簮鍏宠仈琛�
dealLogBiz(model,Constants.YwLogType.CONTRACT_CREATE,model.getLoginUserInfo().getRealname(),"銆�"+model.getRemark().replace("鍚堝悓鎽樿锛�","")+"銆�");//璁板綍鏂板缓鏃ュ織
-
return model.getId();
}
private void dealRoomsForContract(YwContract model) {
+ this.dealRoomsValid(model);
List<YwContractRoom> list = new ArrayList<>();
for(YwRoom room :model.getRoomList()){
YwContractRoom t = new YwContractRoom();
@@ -104,8 +113,54 @@
t.setType(Constants.ZERO);
list.add(t);
}
+ if(Constants.equalsInteger(model.getStatus(),Constants.ONE)){
+ //鏇存柊鎴挎簮鏁版嵁涓虹璧佷腑
+ roomMapper.update(new UpdateWrapper<YwRoom>().lambda().set(YwRoom::getLeaseNowStatus,Constants.ONE)
+ .in(YwRoom::getId,model.getRoomList().stream().map(i->i.getId()).collect(Collectors.toList()))
+ );
+ }
ywContractRoomMapper.insert(list);
}
+
+ private void dealRoomsValid(YwContract model){
+ List<Integer> roomIds = model.getRoomList().stream().map(i->i.getId()).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(roomIds)){
+ if(ywContractMapper.selectJoinCount(new MPJLambdaWrapper<YwContract>()
+ .leftJoin(YwContractRoom.class,YwContractRoom::getContractId,YwContract::getId)
+ .eq(YwContractRoom::getType,Constants.ZERO)
+ .in(YwContractRoom::getRoomId,roomIds)
+ .in(YwContract::getStatus,Constants.ZERO,Constants.ONE,Constants.TWO)
+ .apply(" (" +
+ " ( t.START_DATE < '"+DateUtil.getFomartDate(model.getEndDate(),"yyyy-MM-dd HH:mm:ss")+"' and t.END_DATE > '"+DateUtil.getFomartDate(model.getStartDate(),"yyyy-MM-dd HH:mm:ss")+"' ) " +
+ "or " +
+ " ( t.START_DATE < '"+DateUtil.getFomartDate(model.getEndDate(),"yyyy-MM-dd HH:mm:ss")+"' and t.END_DATE > '"+DateUtil.getFomartDate(model.getStartDate(),"yyyy-MM-dd HH:mm:ss")+"' ) " +
+ " ) ")
+
+ )>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎴挎簮宸茶鍗犵敤璇峰埛鏂伴噸璇�");
+ };
+
+ if(ywContractMapper.selectJoinCount(new MPJLambdaWrapper<YwContract>()
+ .leftJoin(YwContractRoom.class,YwContractRoom::getContractId,YwContract::getId)
+ .eq(YwContractRoom::getType,Constants.ZERO)
+ .in(YwContractRoom::getRoomId,roomIds)
+ .in(YwContract::getStatus,Constants.THREE)
+ .apply(" ( t.START_DATE < '"+DateUtil.getFomartDate(model.getEndDate(),"yyyy-MM-dd HH:mm:ss")+"' " +
+ " and t.BT_DATE > '"+DateUtil.getFomartDate(model.getStartDate(),"yyyy-MM-dd HH:mm:ss")+"' ) " )
+ )>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎴挎簮宸茶鍗犵敤璇峰埛鏂伴噸璇�");
+ };
+
+
+
+ }
+
+
+
+
+
+ }
+
@Override
public List<YwContractBill> getBillList(YwContract model){
@@ -113,7 +168,7 @@
isParamValidForBill(model);
model.setCreateDate(new Date());
model.setEditDate(model.getCreateDate());
- dealDetailListBiz(model);//澶勭悊鏉℃淇℃伅
+ dealDetailListBiz(model,true);//澶勭悊鏉℃淇℃伅
return model.getBillList();
}
@@ -128,8 +183,7 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜椤甸潰瑕佹眰濉啓鍚堝悓淇℃伅");
}
- if(model.getEndDate().getTime()<= model.getStartDate().getTime()){
-
+ if(model.getEndDate().getTime()< model.getStartDate().getTime()){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鍚堝悓鏈夋晥鏈熺粨鏉熸椂闂翠笉寰楁棭浜庡紑濮嬫椂闂达紒");
}
@@ -162,7 +216,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(),"瀵逛笉璧凤紝绉熻祦鏉℃鏈夋晥鏈熺粨鏉熸椂闂翠笉寰楁棭浜庡紑濮嬫椂闂达紒");
}
@@ -193,7 +247,7 @@
}
for(YwContractDetail d :model.getWyDetailList()){
if( d.getStartDate() == null
- ||d.getEditDate() == null
+ ||d.getEndDate() == null
||d.getPrice() == null
||d.getCircleType() == null
|| d.getCircleType()>6
@@ -227,7 +281,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);
}
@@ -236,9 +290,9 @@
String str = "";
//璧风鏃�2024/06/01锛岀璧佹暟涓�500銕°�傞鏈熺璧佷笁鏈堜竴浠橈紝绉熼噾鍗曚环35鍏�/銕÷锋湀銆傞鏈熺墿涓氫笁鏈堜竴浠橈紝鐗╀笟鍗曚环4.3鍏�/銕÷锋湀
- String str0 = "鍚堝悓鎽樿锛氳捣绉熸棩{param1}锛岀璧佹暟涓簕param2}銕°�傞鏈熺璧亄param3}锛岀閲戝崟浠穥param4}鍏儃param5}銆傞鏈熺墿涓歿param6}锛岀墿涓氬崟浠穥param7}{param8}";
- String str1 = "鍚堝悓鎽樿锛氳捣绉熸棩{param1}锛岀璧佹暟涓簕param2}銕°�傞鏈熺璧亄param3}锛岀閲戝崟浠穥param4}鍏儃param5}銆�";
- String str2 = "鍚堝悓鎽樿锛氳捣绉熸棩{param1}锛岄鏈熺墿涓歿param6}锛岀墿涓氬崟浠穥param7}鍏儃param8}";
+ String str0 = "鍚堝悓鎽樿锛氳捣绉熸棩{param1}锛岀璧佹暟涓簕param2}銕°�傞鏈熺璧亄param3}锛岀閲戝崟浠穥param4}{param5}銆傞鏈熺墿涓歿param6}锛岀墿涓氬崟浠穥param7}{param8}";
+ String str1 = "鍚堝悓鎽樿锛氳捣绉熸棩{param1}锛岀璧佹暟涓簕param2}銕°�傞鏈熺璧亄param3}锛岀閲戝崟浠穥param4}{param5}銆�";
+ String str2 = "鍚堝悓鎽樿锛氳捣绉熸棩{param1}锛岄鏈熺墿涓歿param6}锛岀墿涓氬崟浠穥param7}{param8}";
if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
str= str0;
}
@@ -252,29 +306,33 @@
.replace("{param2}",model.getTotalArea().intValue()+"")
.replace("{param3}",Constants.getPayTypeByNum(model.getZlPayType()))
.replace("{param4}",Constants.formatBigdecimal(model.getZlFirstPrice()).intValue()+"")
- .replace("{param5}",Constants.getUnitTypeByNum(model.getZlFirstCircle())
+ .replace("{param5}",Constants.getUnitTypeByNum(model.getZlFirstCircle()))
.replace("{param6}",Constants.getPayTypeByNum(model.getWyPayType()))
.replace("{param7}",Constants.formatBigdecimal(model.getWyFirstPrice()).intValue()+"")
- .replace("{param8}",Constants.getUnitTypeByNum(model.getWyFirstCircle())));
+ .replace("{param8}",Constants.getUnitTypeByNum(model.getWyFirstCircle()));
return str;
}
private String getbackRentRemarkByParam(YwContract model) {
BigDecimal fee = Constants.formatBigdecimal(model.getBtFee());
String str = "閫�绉熸憳瑕侊細鍓╀綑鏈粨娓呰处鍗晎param1}浠斤紝鍏抽棴璐﹀崟{param2}浠姐�愰��绉熸棩{param3}锛岄��绉熻垂鐢ㄥ悎璁￠渶{param4}{param5}鍏冦�傘��";
str = str.replace("{param1}",model.getBtWaitBill()+"")
- .replace("{param2}",DateUtil.getDateLongSlash(model.getBtDate()))
- .replace("{param3}",fee.compareTo(new BigDecimal(0)) >=0?"鏀�":"浠�")
- .replace("{param4}",(fee.compareTo(new BigDecimal(0)) >=0?
- Constants.formatBigdecimal(model.getBtFee()).intValue()
- :(Constants.formatBigdecimal(model.getBtFee()).intValue() * -1))+"" );
+ .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.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;
}
@@ -289,16 +347,28 @@
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer backRent(YwContract param){
isParamValidBackRent(param);
+ YwContract model = ywContractMapper.selectById(param.getId());
+ if(Objects.isNull(model)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!(model.getStartDate().getTime()<=param.getBtDate().getTime()&&model.getEndDate().getTime()>=param.getBtDate().getTime())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"閫�绉熸棩鏈熼敊璇紝璇锋鏌ラ��绉熸棩鏈熼渶鍦ㄥ悎鍚屾棩鏈熷唴锛�");
+ }
param.setEditDate(new Date());
param.setEditor(param.getLoginUserInfo().getId());
//澶勭悊
dealBackRentBillBiz(param);
YwContract update = new YwContract();
+ update.setId(param.getId());
update.setEditDate(new Date());
update.setEditor(param.getLoginUserInfo().getId());
update.setBtActDate(update.getEditDate());
update.setBtActUserId(update.getEditor());
- update.setStatus(Constants.THREE);
+ if(Objects.nonNull(param.getBtWaitBill()) && param.getBtWaitBill() > Constants.ZERO){
+ update.setStatus(Constants.THREE);
+ }else{
+ update.setStatus(Constants.FOUR);
+ }
update.setBtInfo(param.getBtInfo());
update.setBtDate(param.getBtDate());
update.setBtType(param.getBtType());
@@ -307,7 +377,48 @@
update.setBtRemark(getbackRentRemarkByParam(param));
ywContractMapper.updateById(update);
dealLogBiz(param,Constants.YwLogType.CONTRACT_BACK, param.getLoginUserInfo().getRealname(),getbackRentLogByParam(param));
+ //濡傛灉閫�绉熸棩鏈熷皬浜庡綋鍓嶆棩鏈� 鍒欑洿鎺ラ噴鏀炬埧婧愪俊鎭� 鏈璧�
+ if(Utils.Date.getEnd(param.getBtDate()).getTime()<System.currentTimeMillis()){
+ List<YwContractRoom> contractRoomList = ywContractRoomMapper.selectList(new QueryWrapper<YwContractRoom>().lambda()
+ .eq(YwContractRoom::getContractId, param.getId()));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(contractRoomList)){
+ //鏇存柊鎴挎簮鏁版嵁涓烘湭绉熻祦
+ roomMapper.update(new UpdateWrapper<YwRoom>().lambda().set(YwRoom::getLeaseNowStatus,Constants.ZERO)
+ .in(YwRoom::getId,contractRoomList.stream().map(i->i.getRoomId()).collect(Collectors.toList()))
+ );
+ }
+ }
return param.getId();
+ }
+
+
+ @Override
+ public void dealTimeOut(){
+
+ List<YwContract> listA = ywContractMapper.selectList(new QueryWrapper<YwContract>().lambda()
+ .eq(YwContract::getIsdeleted,Constants.ZERO)
+ .in(YwContract::getStatus,Constants.ZERO)
+ .apply(" START_DATE < NOW() AND END_DATE > NOW() ")
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(listA)){
+ //瀹氭椂澶勭悊鍚堝悓鎵ц涓�
+ ywContractMapper.update(new UpdateWrapper<YwContract>()
+ .lambda()
+ .set(YwContract::getStatus,Constants.ONE)
+ .set(YwContract::getEditDate,DateUtil.getCurrDateTime())
+ .in(YwContract::getId,listA.stream().map(i->i.getId()).collect(Collectors.toList()))
+ );
+
+ List<YwContractRoom> contractRoomList = ywContractRoomMapper.selectList(new QueryWrapper<YwContractRoom>().lambda().in(YwContractRoom::getContractId,
+ listA.stream().map(i->i.getId()).collect(Collectors.toList())));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(contractRoomList)){
+ //鏇存柊鎴挎簮鏁版嵁涓虹璧佷腑
+ roomMapper.update(new UpdateWrapper<YwRoom>().lambda().set(YwRoom::getLeaseNowStatus,Constants.ONE)
+ .in(YwRoom::getId,contractRoomList.stream().map(i->i.getRoomId()).collect(Collectors.toList()))
+ );
+ }
+ }
+
}
private void dealBackRentBillBiz(YwContract param) {
@@ -317,9 +428,10 @@
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(yw.ACT_RECEIVABLE_FEE),0) from yw_contract_revenue yw where yw.bill_id = yw_contract_bill.id and yw.status = 0 and yw.isdeleted = 0 ) as actReceivableFee " )
+ "( 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 " )
.lambda().
eq(YwContractBill::getIsdeleted,Constants.ZERO)
.eq(YwContractBill::getContractId,param.getId()));
@@ -328,7 +440,7 @@
//浠樻鐘舵�侊細0=寰呮敹娆撅紱1=宸茬粨娓咃紱2=閮ㄥ垎缁撴竻锛�3=寰呬粯娆撅紱4=寰呴��娆撅紱5=宸插叧闂�
// 濡傛灉鏄娂閲戞垨鑰呬繚璇侀噾锛屼笉鏀寔閫�娆撅紝淇濇寔鍘熸潵鐨勭姸鎬侊紝 0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬;7=淇濊瘉閲�
if(Constants.equalsInteger(Constants.THREE,bill.getCostType())
- || Constants.equalsInteger(Constants.FOUR,bill.getCostType())
+ || Constants.equalsInteger(Constants.TWO,bill.getCostType())
||Constants.equalsInteger(Constants.SEVEN,bill.getCostType())){
//鎶奸噾鍜屼繚璇侀噾
yjBills.add(bill);
@@ -336,22 +448,25 @@
}
if(Constants.equalsInteger(bill.getPayStatus(),Constants.ZERO)
||Constants.equalsInteger(bill.getPayStatus(),Constants.THREE)){
- if(bill.getStartDate().getTime()>param.getEditDate().getTime()){
+ if(bill.getStartDate().getTime()<=param.getBtDate().getTime()){
+ canBills.add(bill);
+ canBillCount = canBillCount + 1 ;
+ }else{
//濡傛灉杩樻病寮�濮嬶紝璐﹀崟鐩存帴鍏抽棴
closeBills.add(bill);
noBills.add(bill);
- }else{
- canBills.add(bill);
}
}else if(Constants.equalsInteger(bill.getPayStatus(),Constants.ONE) ){
- if(bill.getEndDate().getTime()<param.getEditDate().getTime()){
+ if(bill.getStartDate().getTime()>param.getBtDate().getTime()){
//濡傛灉宸茬粨娓咃紝璐﹀崟鐩存帴鍏抽棴
noBills.add(bill);
}else{
canBills.add(bill);
+ canBillCount = canBillCount + 1 ;
}
}else if(Constants.equalsInteger(bill.getPayStatus(),Constants.TWO) ){
canBills.add(bill);
+ canBillCount = canBillCount + 1 ;
}
}
}
@@ -365,35 +480,33 @@
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){
- //鐩存帴鍏抽棴鍏抽棴璐﹀崟
+ //
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.setStatus(Constants.ONE);
- }else if(fee.compareTo(new BigDecimal(0))> 0){
+ b.setPayStatus(Constants.ONE);
+ canBillCount = canBillCount - 1 ;
+ }else if(fee.compareTo(new BigDecimal(0))< 0){
//濡傛灉闇�瑕佽繘琛岄��娆撅紝鏇存柊璐﹀崟淇℃伅涓哄緟閫�娆�
- b.setStatus(Constants.FOUR);
- }else if(fee.compareTo(new BigDecimal(0)) < 0){
- //濡傛灉璐﹀崟杩樻湁娆惧緟鏀讹紝鍒欎繚鎸佺姸鎬佷笉鍙�
+ b.setPayStatus(Constants.FOUR);
+ }else if(fee.compareTo(new BigDecimal(0)) > 0){
+ //濡傛灉璐﹀崟杩樻湁娆惧緟鏀讹紝鍒欐洿鏂拌处鍗曚负寰呮敹娆�
+ if(b.getPayStatus()==Constants.ZERO){
+ b.setPayStatus(Constants.ZERO);
+ }else if(b.getPayStatus()!=Constants.TWO){
+ b.setPayStatus(Constants.TWO);
+ }
}
+ b.setReceivableFee(editBill.getReceivableFee());
}
b.setEditDate(param.getEditDate());
b.setEditor(param.getEditor());
@@ -413,17 +526,25 @@
for(YwContractBill addBill : param.getAddBillList()){
addBill.setIsdeleted(Constants.ZERO);
addBill.setContractId(param.getId());
- addBill.setType(Constants.ONE);
+ addBill.setCreateDate(new Date());
+ addBill.setCreator(param.getEditor());
+ 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.setEditDate(param.getEditDate());
@@ -438,7 +559,37 @@
}
ywContractBillMapper.insert(param.getAddBillList());//鎵归噺鎻掑叆鏁版嵁
}
- param.setBtWaitBill(canBills.size() + newBills.size()+yjNoBills);//鏈竻绠楃殑璐﹀崟鏁伴噺
+
+ int yjNoBills =0;
+ if(yjBills.size()>0){
+ // 濡傛灉鏄娂閲戞垨鑰呬繚璇侀噾锛屼笉鏀寔閫�娆撅紝淇濇寔鍘熸潵鐨勭姸鎬侊紝 0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬;7=淇濊瘉閲�
+ for(YwContractBill bill : yjBills){
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(param.getCanBackRentBills())){
+ List<YwContractBill> optional = param.getCanBackRentBills().stream().filter(i->Constants.equalsInteger(bill.getId(),i.getId())).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(optional)){
+ YwContractBill canBill = optional.get(Constants.ZERO);
+ YwContractBill yjBill = new YwContractBill();
+ yjBill.setId(bill.getId());
+ yjBill.setEditDate(param.getEditDate());
+ yjBill.setEditor(param.getEditor());
+ yjBill.setReceivableFee(BigDecimal.ZERO);
+ 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 ++;
+ }
+ ywContractBillMapper.updateById(yjBill);
+ }
+ }
+ }
+ }
+ param.setBtWaitBill(canBillCount + newBills.size()+yjNoBills);//鏈竻绠楃殑璐﹀崟鏁伴噺
param.setBtCLoseBill(closeBills.size());
param.setBtFee(totalBackFee);
}
@@ -466,7 +617,7 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鍚堝悓淇℃伅涓嶅瓨鍦紝璇疯繑鍥炲垪琛ㄥ埛鏂伴噸璇曪紒");
}
- SystemUser user = systemUserMapper.selectById(param.getUserId());
+ SystemUser user = systemUserMapper.selectById(param.getBtUserId());
if(user ==null || (user.getDeleted()!=null&& user.getDeleted() )){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝缁忓姙浜轰俊鎭笉瀛樺湪锛�");
}
@@ -488,8 +639,13 @@
}
}
- private void dealDetailListBiz(YwContract model) {
- List<YwContractDetail> details = new ArrayList<>();
+ /**
+ * @param model
+ * @param createBill 鏍规嵁鏉℃鐢熸垚璐﹀崟 false 鍒欐牴鎹墠绔紪杈戝悗鐨勬暟鎹敓鎴�
+ */
+ private void dealDetailListBiz(YwContract model,boolean createBill) {
+ List<YwContractDetail> details1 = new ArrayList<>();
+ List<YwContractDetail> details2 = new ArrayList<>();
int num = 0;
if(Constants.equalsInteger(model.getType(),Constants.ZERO )
|| Constants.equalsInteger(model.getType(),Constants.TWO)){
@@ -501,7 +657,7 @@
d.setType(Constants.ZERO);
d.setSortnum(num++);
d.setStatus(Constants.ZERO);
- details.add(d);
+ details1.add(d);
}
}
num = 0;
@@ -515,22 +671,111 @@
d.setContractId(model.getId());
d.setSortnum(num++);
d.setStatus(Constants.ZERO);
- details.add(d);
+ details2.add(d);
}
}
if(model.getId()!=null){
- ywContractDetailMapper.insert(details);//鎵归噺鎻掑叆鏉℃淇℃伅淇℃伅
+ if(details1.size()>0){
+ ywContractDetailMapper.insert(details1);//鎵归噺鎻掑叆鏉℃淇℃伅淇℃伅
+ }
+ if(details2.size()>0){
+ ywContractDetailMapper.insert(details2);//鎵归噺鎻掑叆鏉℃淇℃伅淇℃伅
+ }
}
//澶勭悊璐﹀崟淇℃伅
- dealBillListBiz(model,details);
+ if(createBill){
+ dealBillListBiz(model,details1,details2);
+ }else{
+ //2025-1-23 13:56:53 鍔犲叆 鍓嶇鍏ュ弬璋冩暣鍚庣殑璐﹀崟淇℃伅
+ List<YwContractBill> ywContractBillList = new ArrayList<>();
+ //鏌ヨ绉熻祦鏉℃
+ if((Constants.equalsInteger(model.getType(),Constants.ZERO )
+ || Constants.equalsInteger(model.getType(),Constants.TWO))&& com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(details1)){
+ YwContractDetail ywContractDetail = details1.get(Constants.ZERO);
+ YwContractBill zlBill = new YwContractBill();
+ BeanUtils.copyProperties(model.getZlBillDTO(),zlBill);
+ zlBill.setCreator(model.getCreator());
+ zlBill.setCreateDate(model.getCreateDate());
+ zlBill.setIsdeleted(Constants.ZERO);
+ zlBill.setStatus(Constants.ZERO);
+ zlBill.setReceivableFee(zlBill.getTotleFee());
+ zlBill.setType(Constants.ZERO);
+ zlBill.setCompanyId(model.getCompanyId());
+ zlBill.setContractId(model.getId());
+ zlBill.setBillType(Constants.ZERO);
+ zlBill.setPayStatus(Constants.ZERO);
+ ywContractBillList.add(zlBill);
+ Integer sortnum = Constants.ONE;
+ for (YwContractBillDTO zlBillDTO:model.getZlBillDTOList()) {
+ YwContractBill zl = new YwContractBill();
+ BeanUtils.copyProperties(zlBillDTO,zl);
+ zl.setCreator(model.getCreator());
+ zl.setCreateDate(model.getCreateDate());
+ zl.setIsdeleted(Constants.ZERO);
+ zl.setStatus(Constants.ZERO);
+ zl.setReceivableFee(zl.getTotleFee());
+ zl.setType(Constants.ZERO);
+ zl.setCompanyId(model.getCompanyId());
+ zl.setContractId(model.getId());
+ zl.setBillType(Constants.ZERO);
+ zl.setPayStatus(Constants.ZERO);
+ zl.setSortnum(sortnum);
+ zl.setDetailId(ywContractDetail.getId());
+ ywContractBillList.add(zl);
+ sortnum++;
+ }
+ }
+ //鏌ヨ鐗╀笟璐﹀崟
+ if((Constants.equalsInteger(model.getType(),Constants.ZERO )
+ || Constants.equalsInteger(model.getType(),Constants.ONE))&& com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(details2)){
+ YwContractDetail ywContractDetail = details2.get(Constants.ZERO);
+ YwContractBill wyBill = new YwContractBill();
+ BeanUtils.copyProperties(model.getWyBillDTO(),wyBill);
+ wyBill.setCreator(model.getCreator());
+ wyBill.setCreateDate(model.getCreateDate());
+ wyBill.setIsdeleted(Constants.ZERO);
+ wyBill.setStatus(Constants.ZERO);
+ wyBill.setReceivableFee(wyBill.getTotleFee());
+ wyBill.setType(Constants.ZERO);
+ wyBill.setCompanyId(model.getCompanyId());
+ wyBill.setContractId(model.getId());
+ wyBill.setBillType(Constants.ZERO);
+ wyBill.setPayStatus(Constants.ZERO);
+ ywContractBillList.add(wyBill);
+ Integer sortnum = Constants.ONE;
+ for (YwContractBillDTO wyBillDTO:model.getWyBillDTOList()) {
+ YwContractBill wy = new YwContractBill();
+ BeanUtils.copyProperties(wyBillDTO,wy);
+ wy.setCreator(model.getCreator());
+ wy.setCreateDate(model.getCreateDate());
+ wy.setIsdeleted(Constants.ZERO);
+ wy.setStatus(Constants.ZERO);
+ wy.setReceivableFee(wy.getTotleFee());
+ wy.setType(Constants.ZERO);
+ wy.setCompanyId(model.getCompanyId());
+ wy.setContractId(model.getId());
+ wy.setBillType(Constants.ZERO);
+ wy.setPayStatus(Constants.ZERO);
+ wy.setSortnum(sortnum);
+ wy.setDetailId(ywContractDetail.getId());
+ ywContractBillList.add(wy);
+ sortnum++;
+ }
+ }
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractBillList)){
+ ywContractBillMapper.insert(ywContractBillList);
+ }
+ }
+
}
/**
* 鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�
* @param model
- * @param details
+ * @param details1 绉熻祦鏉℃
+ * @param details2 鐗╀笟鏉℃
*/
- private void dealBillListBiz(YwContract model, List<YwContractDetail> details) {
+ private void dealBillListBiz(YwContract model, List<YwContractDetail> details1, List<YwContractDetail> details2) {
List<YwContractBill> billList1 = new ArrayList<>();
List<YwContractBill> billList2 = new ArrayList<>();
if(Constants.equalsInteger(model.getType(),Constants.ZERO )
@@ -538,20 +783,20 @@
//濡傛灉鏈夌璧佹潯娆�
if(Constants.formatBigdecimal(model.getZlDeposit()).compareTo(new BigDecimal(0))>0){
//濡傛灉鏈夌璧佹娂閲�
- billList1.add(initDepoistBill(Constants.THREE,model,details));
+ billList1.add(initDepoistBill(Constants.TWO,model));
}
if(Constants.equalsInteger(model.getZlPayType(), Constants.ZERO)){
//濡傛灉鏄竴娆℃�т粯娓�
- billList1.addAll(getBillsByParamOnce(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
+ billList1.addAll(getBillsByParamOnce(model,details1,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
}else if(Constants.equalsInteger(model.getZlPayType(), Constants.ONE)){
//濡傛灉姣忎笁涓湀涓�浠�
- billList1.addAll(getBillsByParam3Months(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
+ billList1.addAll(getBillsByParam3Months(model,details1,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
}else if(Constants.equalsInteger(model.getZlPayType(), Constants.TWO)){
//濡傛灉鍏釜鏈堜竴浠�
- billList1.addAll(getBillsByParam6Months(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
+ billList1.addAll(getBillsByParam6Months(model,details1,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
}else if(Constants.equalsInteger(model.getZlPayType(), Constants.THREE)){
//濡傛灉涓�骞翠竴浠�
- billList1.addAll(getBillsByParam1Year(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
+ billList1.addAll(getBillsByParam1Year(model,details1,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
}
}
if(Constants.equalsInteger(model.getType(),Constants.ZERO )
@@ -559,38 +804,45 @@
//濡傛灉鐗╀笟鏉℃
if(Constants.formatBigdecimal(model.getWyDeposit()).compareTo(new BigDecimal(0))>0){
//濡傛灉鏈夌璧佹娂閲�
- billList2.add(initDepoistBill(Constants.FOUR,model,details));
+ billList2.add(initDepoistBill(Constants.THREE,model));
}
if(Constants.equalsInteger(model.getWyPayType(), Constants.ZERO)){
//濡傛灉鏄竴娆℃�т粯娓�
- billList2.addAll(getBillsByParamOnce(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
+ billList2.addAll(getBillsByParamOnce(model,details2,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
}else if(Constants.equalsInteger(model.getWyPayType(), Constants.ONE)){
//濡傛灉姣忎笁涓湀涓�浠�
- billList2.addAll(getBillsByParam3Months(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
+ billList2.addAll(getBillsByParam3Months(model,details2,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
}else if(Constants.equalsInteger(model.getWyPayType(), Constants.TWO)){
//濡傛灉鍏釜鏈堜竴浠�
- billList2.addAll(getBillsByParam6Months(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
+ billList2.addAll(getBillsByParam6Months(model,details2,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
}else if(Constants.equalsInteger(model.getWyPayType(), Constants.THREE)){
//濡傛灉涓�骞翠竴浠�
- billList2.addAll(getBillsByParam1Year(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
+ billList2.addAll(getBillsByParam1Year(model,details2,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
}
}
if(model.getBillType() == 0){
model.setBillList(billList1);
- }else if(model.getBillType() == 0){
+ }else if(model.getBillType() == 1){
model.setBillList(billList2);
}
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){
@@ -599,7 +851,7 @@
}
}
- private YwContractBill initDepoistBill(int type, YwContract model, List<YwContractDetail> details) {
+ private YwContractBill initDepoistBill(int type, YwContract model ) {
YwContractBill bill = new YwContractBill();
bill.setCreateDate(model.getEditDate());
bill.setCreator(model.getEditor());
@@ -613,7 +865,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);
@@ -726,46 +981,45 @@
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));
+ 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)){
@@ -836,7 +1090,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()));
}
}
@@ -910,8 +1164,7 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜椤甸潰瑕佹眰濉啓鍚堝悓淇℃伅");
}
- if(model.getEndDate().getTime()<= model.getStartDate().getTime()){
-
+ if(model.getEndDate().getTime()< model.getStartDate().getTime()){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鍚堝悓鏈夋晥鏈熺粨鏉熸椂闂翠笉寰楁棭浜庡紑濮嬫椂闂达紒");
}
if(Constants.equalsInteger(model.getType(),Constants.ZERO )
@@ -947,7 +1200,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(d.getEndDate().getTime()>model.getEndDate().getTime() ||d.getStartDate().getTime()<model.getStartDate().getTime()){
@@ -1030,7 +1283,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());
@@ -1055,7 +1308,53 @@
if(user ==null || (user.getDeleted()!=null && user.getDeleted()) ){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝缁忓姙浜轰俊鎭笉瀛樺湪锛岃灏濊瘯鍒锋柊椤甸潰閲嶈瘯锛�");
}
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(model.getYwContractBillDTOList())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏃犺处鍗曚俊鎭紝璇峰埛鏂伴噸璇�");
+ }
+ for (YwContractBillDTO billDTO:model.getYwContractBillDTOList()) {
+ if(
+ Objects.isNull(billDTO.getStartDate())
+ ||Objects.isNull(billDTO.getEndDate())
+ ||Objects.isNull(billDTO.getPlanPayDate())
+ ||Objects.isNull(billDTO.getTotleFee())
+ ||Objects.isNull(billDTO.getCostType())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璐﹀崟鏄庣粏鍙傛暟閿欒");
+ }
+ }
+ List<YwContractBillDTO> ywContractBillDTOList = model.getYwContractBillDTOList();
+ //鏌ヨ绉熻祦鏉℃
+ if(Constants.equalsInteger(model.getType(),Constants.ZERO )
+ || Constants.equalsInteger(model.getType(),Constants.TWO)){
+ List<YwContractBillDTO> leaseBillDTOList = ywContractBillDTOList.stream()
+ .filter(i->Constants.equalsInteger(i.getCostType(),Constants.ZERO)).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(leaseBillDTOList)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犵璧佽垂璐﹀崟锛�");
+ }
+ model.setZlBillDTOList(leaseBillDTOList);
+ Optional<YwContractBillDTO> leaseBillOptional = ywContractBillDTOList.stream()
+ .filter(i->Constants.equalsInteger(i.getCostType(),Constants.TWO)).findAny();
+ if(!leaseBillOptional.isPresent()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犵璧佹娂閲戣处鍗曪紒");
+ }
+ model.setZlBillDTO(leaseBillOptional.get());
+ }
+ if(Constants.equalsInteger(model.getType(),Constants.ZERO )
+ || Constants.equalsInteger(model.getType(),Constants.ONE)){
+ List<YwContractBillDTO> wyBillDTOList = ywContractBillDTOList.stream()
+ .filter(i->Constants.equalsInteger(i.getCostType(),Constants.ONE)).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(wyBillDTOList)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犵墿涓氳垂璐﹀崟锛�");
+ }
+ model.setWyBillDTOList(wyBillDTOList);
+ Optional<YwContractBillDTO> wyBillOptional = ywContractBillDTOList.stream()
+ .filter(i->Constants.equalsInteger(i.getCostType(),Constants.THREE)).findAny();
+ if(!wyBillOptional.isPresent()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犵墿涓氭娂閲戣处鍗曪紒");
+ }
+ model.setWyBillDTO(wyBillOptional.get());
+ }
}
@Override
@@ -1107,100 +1406,162 @@
}
@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 )
- .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){
- //鍚堝悓闄勪欢
- 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));
- 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)
- .orderByAsc(YwContractDetail::getSortnum);
- 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)
- .orderByAsc(YwContractDetail::getSortnum);
- model.setWyDetailList(ywContractDetailMapper.selectJoinList(YwContractDetail.class,dw));
+ 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.RENT_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));
+ 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)
+ .orderByAsc(YwContractDetail::getSortnum);
+ 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)
+ .orderByAsc(YwContractDetail::getSortnum);
+ 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 )
- .eq( YwContractBill::getContractId,model.getId())
- .eq(YwContractBill::getIsdeleted,Constants.ZERO)
- .orderByAsc(YwContractBill::getSortnum,YwContractBill::getCreateDate)));
- 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);
+ @Override
+ public YwContract findForBills(YwContract param) {
+ YwContract model = queryDetailInfoById(param.getId());
+ queryBillListByModel(model,param.getBtDate());
+ return model;
- }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);
+ }
+ 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 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());
+ }
+ 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);
+ }
+ }
+ 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
@@ -1211,10 +1572,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
@@ -1224,7 +1593,8 @@
queryWrapper.selectAll(YwContract.class )
.selectAs(Company::getName,YwContract::getCompanyName )
.selectAs(YwCustomer::getName,YwContract::getRenterName )
- .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 )
+ .select("(select sum(r.RENT_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 )
+ .select(" ( select ifnull(sum(y.TOTLE_FEE),0) from yw_contract_bill y where y.CONTRACT_ID = t.id and y.type = 0 and y.COST_TYPE=0 and y.BILL_TYPE = 0 ) " , YwContract::getTotalFee)
.leftJoin(Company.class,Company::getId,YwContract::getCompanyId)
.leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId);
Utils.MP.blankToNull(pageWrap.getModel());
@@ -1237,6 +1607,9 @@
if (pageWrap.getModel().getCreateDate() != null) {
queryWrapper.ge(YwContract::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
queryWrapper.le(YwContract::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ }
+ if (pageWrap.getModel().getStatusList() != null) {
+ queryWrapper.in(YwContract::getStatus, pageWrap.getModel().getStatusList());
}
if (pageWrap.getModel().getEditor() != null) {
queryWrapper.eq(YwContract::getEditor, pageWrap.getModel().getEditor());
@@ -1319,6 +1692,7 @@
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());
}
@@ -1328,6 +1702,12 @@
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()+" ) ");
+ }
+ if (pageWrap.getModel().getBuildingId() != null) {
+ queryWrapper.apply(" t.id in ( select ycr.CONTRACT_ID from yw_contract_room ycr left join yw_room yr on ycr.ROOM_ID = yr.id where ycr.type = 0 and yr.BUILDING_ID = "+pageWrap.getModel().getBuildingId()+" ) ");
+ }
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 );
@@ -1336,6 +1716,28 @@
for(YwContract model : data.getRecords()){
model.setWyFirstCircleStr(Constants.getUnitTypeByNum(model.getWyFirstCircle()));
model.setZlFirstCircleStr(Constants.getUnitTypeByNum(model.getZlFirstCircle()));
+ //鏌ヨ鎴挎簮淇℃伅鏁版嵁
+ 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));
+ model.setLeaseDays(
+ DateUtil.daysBetweenDates(model.getEndDate(),model.getStartDate()) + 1
+ );
+ if(Objects.nonNull(model.getLeaseDays())&&Objects.nonNull(model.getTotalArea())&&Objects.nonNull(model.getTotalFee())){
+ model.setLeasePrice(model.getTotalFee().divide((model.getTotalArea().multiply(new BigDecimal(model.getLeaseDays()))),2,BigDecimal.ROUND_HALF_UP));
+ }else{
+ model.setLeasePrice(BigDecimal.ZERO);
+ }
+
+
}
}
return data;
@@ -1346,4 +1748,63 @@
QueryWrapper<YwContract> wrapper = new QueryWrapper<>(ywContract);
return ywContractMapper.selectCount(wrapper);
}
+
+
+ /**
+ * 鍒版湡鍚堝悓 鏈彂璧烽��绉熺殑杩涜鏁版嵁璋冩暣 鎶婂悎鍚屼笅鐨勬埧婧愰噴鏀� 瀹氭椂鏃堕棿闇�瑕佸湪姣忓ぉ鏅氫笂12鐐瑰墠
+ */
+ @Override
+ public void updRoomLeaseNowStatus(){
+
+ //瀹氭椂澶勭悊鍚堝悓宸茶繃鏈�
+ List<YwContract> ywContractList = ywContractMapper.selectList(new QueryWrapper<YwContract>().lambda()
+ .eq(YwContract::getIsdeleted,Constants.ZERO)
+ .in(YwContract::getStatus,Constants.ONE,Constants.ZERO)
+ .apply(" DATE(END_DATE) = CURRENT_DATE ")
+ );
+
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractList)){
+ ywContractMapper.update(new UpdateWrapper<YwContract>()
+ .lambda()
+ .set(YwContract::getStatus,Constants.TWO)
+ .set(YwContract::getEditDate,DateUtil.getCurrDateTime())
+ .in(YwContract::getId,ywContractList.stream().map(i->i.getId()).collect(Collectors.toList()))
+ );
+
+
+ List<YwContractRoom> contractRoomList = ywContractRoomMapper.selectList(new QueryWrapper<YwContractRoom>().lambda().in(YwContractRoom::getContractId,
+ ywContractList.stream().map(i->i.getId()).collect(Collectors.toList())));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(contractRoomList)){
+ //鏇存柊鎴挎簮鏁版嵁涓虹璧佷腑
+ roomMapper.update(new UpdateWrapper<YwRoom>().lambda().set(YwRoom::getLeaseNowStatus,Constants.ZERO)
+ .in(YwRoom::getId,contractRoomList.stream().map(i->i.getRoomId()).collect(Collectors.toList()))
+ );
+ }
+ }
+ }
+
+
+ /**
+ * 閫�绉熶腑/宸查��绉熷悎鍚� 鎶婂埌浜嗛��绉熸棩鏈熸椂闂寸殑鏁版嵁 杩涜鎴挎簮閲婃斁 瀹氭椂鏃堕棿闇�瑕佸湪姣忓ぉ鏅氫笂12鐐瑰墠
+ */
+ @Override
+ public void updRentContractStatus(){
+ List<YwContract> ywContractList = ywContractMapper.selectList(new QueryWrapper<YwContract>().lambda()
+ .eq(YwContract::getIsdeleted,Constants.ZERO)
+ .in(YwContract::getStatus,Constants.THREE,Constants.FOUR)
+ .eq(YwContract::getBtDate,DateUtil.getCurrDate())
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractList)){
+ List<YwContractRoom> contractRoomList = ywContractRoomMapper.selectList(new QueryWrapper<YwContractRoom>().lambda().in(YwContractRoom::getContractId,
+ ywContractList.stream().map(i->i.getId()).collect(Collectors.toList())));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(contractRoomList)){
+ //鏇存柊鎴挎簮鏁版嵁涓哄緟绉熻祦
+ roomMapper.update(new UpdateWrapper<YwRoom>().lambda().set(YwRoom::getLeaseNowStatus,Constants.ZERO)
+ .in(YwRoom::getId,contractRoomList.stream().map(i->i.getRoomId()).collect(Collectors.toList()))
+ );
+ }
+ }
+ }
+
+
}
--
Gitblit v1.9.3