From 9ce28811e94fa042adb7cabe6581b0393c6d576d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 09 十二月 2024 18:17:11 +0800
Subject: [PATCH] ll
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java | 535 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 365 insertions(+), 170 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 c2b91d8..729156a 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,8 +31,10 @@
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瀹炵幇
@@ -73,12 +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());
+ 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.setStatus(Constants.ZERO);//寰呮墽琛�
model.setRemark(getRemarlByParam(model));
ywContractMapper.insert(model);
@@ -86,11 +96,11 @@
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();
@@ -106,6 +116,46 @@
}
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){
@@ -193,7 +243,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 +277,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 +286,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 +302,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;
}
@@ -294,11 +348,16 @@
//澶勭悊
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());
@@ -310,6 +369,30 @@
return param.getId();
}
+
+ @Override
+ public void dealTimeOut(){
+ //瀹氭椂澶勭悊鍚堝悓鎵ц涓�
+ ywContractMapper.update(new UpdateWrapper<YwContract>()
+ .lambda()
+ .set(YwContract::getStatus,Constants.ONE)
+ .set(YwContract::getEditDate,DateUtil.getCurrDateTime())
+ .eq(YwContract::getIsdeleted,Constants.ZERO)
+ .in(YwContract::getStatus,Constants.ZERO)
+ .apply(" START_DATE < NOW() AND END_DATE > NOW() ")
+ );
+ //瀹氭椂澶勭悊鍚堝悓宸茶繃鏈�
+ ywContractMapper.update(new UpdateWrapper<YwContract>()
+ .lambda()
+ .set(YwContract::getStatus,Constants.TWO)
+ .set(YwContract::getEditDate,DateUtil.getCurrDateTime())
+ .eq(YwContract::getIsdeleted,Constants.ZERO)
+ .in(YwContract::getStatus,Constants.ONE,Constants.ZERO)
+ .apply(" END_DATE < NOW() ")
+ );
+
+ }
+
private void dealBackRentBillBiz(YwContract param) {
//鏌ヨ鍚堝悓鍏ㄩ儴璐﹀崟淇℃伅
List<YwContractBill> closeBills = new ArrayList<>();//甯﹀叧闂�
@@ -319,7 +402,7 @@
List<YwContractBill> canBills = new ArrayList<>();//鍙��绉熶慨鏀规暟鎹�
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 +411,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,15 +419,15 @@
}
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);
+ }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{
@@ -365,36 +448,28 @@
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);
+ 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){
//濡傛灉璐﹀崟杩樻湁娆惧緟鏀讹紝鍒欎繚鎸佺姸鎬佷笉鍙�
}
}
+ b.setReceivableFee(editBill.getReceivableFee());
b.setEditDate(param.getEditDate());
b.setEditor(param.getEditor());
b.setBtActDate(param.getBtActDate());
@@ -413,17 +488,23 @@
for(YwContractBill addBill : param.getAddBillList()){
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.setEditDate(param.getEditDate());
@@ -437,6 +518,36 @@
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(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(canBills.size() + newBills.size()+yjNoBills);//鏈竻绠楃殑璐﹀崟鏁伴噺
param.setBtCLoseBill(closeBills.size());
@@ -466,7 +577,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(),"瀵逛笉璧凤紝缁忓姙浜轰俊鎭笉瀛樺湪锛�");
}
@@ -489,7 +600,8 @@
}
private void dealDetailListBiz(YwContract model) {
- List<YwContractDetail> details = new ArrayList<>();
+ 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 +613,7 @@
d.setType(Constants.ZERO);
d.setSortnum(num++);
d.setStatus(Constants.ZERO);
- details.add(d);
+ details1.add(d);
}
}
num = 0;
@@ -515,22 +627,28 @@
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);
+ dealBillListBiz(model,details1,details2);
}
/**
* 鏀粯鏂瑰紡 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 +656,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 +677,39 @@
//濡傛灉鐗╀笟鏉℃
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.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.equalsInteger(billList1.get(i).getCostType(),Constants.ONE)) {
+ billList2.get(i).setSortnum(num);
+ num++;
}
}
if(model.getId()!=null){
@@ -599,7 +718,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 +732,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);
@@ -670,7 +792,7 @@
list.add(DateUtil.addMonthToDate(startDate,i*6));
}
if(restMonth>0 || monthDays>0){
- list.add(DateUtil.addMonthToDate(startDate,monthSix));
+ list.add(DateUtil.addMonthToDate(startDate,monthSix*6));
}
return list;
}
@@ -685,7 +807,7 @@
list.add(DateUtil.addMonthToDate(startDate,i*3));
}
if(restMonth>0 || monthDays>0){
- list.add(DateUtil.addMonthToDate(startDate,monthThree));
+ list.add(DateUtil.addMonthToDate(startDate,monthThree*3));
}
return list;
}
@@ -712,59 +834,59 @@
private void dealCircleDateBillBiz( List<Date> dateList ,YwContract model, YwContractDetail d, Date freeStart, Date freeEnd, List<YwContractBill> list ) {
int temp = 0;
for(Date start : dateList){
- Date end = model.getEndDate();
+ Date end = d.getEndDate();
if(temp+1 < dateList.size()){
end =DateUtil.addDaysToDate(dateList.get(temp+1),-1);
}
+ temp++;
YwContractBill bill = initCreateBillModel(model,d );
bill.setStartDate(start);//璐﹀崟寮�濮�
bill.setEndDate(end);//璐﹀崟缁撴潫
Date planPayDate = DateUtil.addDaysToDate(bill.getStartDate(),Constants.formatIntegerNum(d.getAdvanceDays()) * -1);
bill.setPlanPayDate(planPayDate.getTime()>System.currentTimeMillis()?planPayDate:new Date());
- BigDecimal totalFee =getTotalFeeByStartEnd(model,d,freeStart,freeEnd);
+ BigDecimal totalFee =getTotalFeeByStartEnd(model,d,bill,freeStart,freeEnd);
bill.setTotleFee(totalFee);
bill.setReceivableFee(totalFee);
bill.setBillType(Constants.ZERO);
-
- temp++;
bill.setCompanyId(model.getCompanyId());
list.add(bill);
}
}
-
-
- private BigDecimal getTotalFeeByStartEnd(YwContract model, YwContractDetail d,Date freeStart,Date freeEnd) {
+ private BigDecimal getTotalFeeByStartEnd(YwContract model, YwContractDetail d, YwContractBill bill,Date freeStart,Date freeEnd) {
BigDecimal totalFee = new BigDecimal(0);
- DateCompare dateCompare = DateCompare.dayCompare(d.getStartDate(),d.getEndDate(),freeStart,freeEnd);
+ DateCompare dateCompare = DateCompare.dayCompare(bill.getStartDate(),bill.getEndDate(),freeStart, freeEnd);
if(Constants.equalsInteger(d.getCircleType(),Constants.ZERO)){
- //0=鍏冩瘡骞崇背澶�
- int days = dateCompare.getDay();
+ //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=鍏冩瘡澶�
- int days = dateCompare.getDay();
+ //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)){
@@ -805,7 +927,7 @@
bill.setStartDate(d.getStartDate());//璐﹀崟寮�濮�
bill.setEndDate(d.getEndDate());//璐﹀崟缁撴潫
bill.setPlanPayDate(DateUtil.addDaysToDate(bill.getStartDate(),Constants.formatIntegerNum(d.getAdvanceDays()) * -1));
- bill.setTotleFee(getTotalFeeByStartEnd(model,d,freeStart,freeEnd));
+ bill.setTotleFee(getTotalFeeByStartEnd(model,d,bill,freeStart,freeEnd));
bill.setReceivableFee(bill.getTotleFee());
bill.setBillType(Constants.ZERO);
list.add(bill);
@@ -835,7 +957,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()));
}
}
@@ -1029,7 +1151,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());
@@ -1106,100 +1228,160 @@
}
@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){
+ 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 )
- .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 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.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
@@ -1210,10 +1392,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
@@ -1318,6 +1508,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