From 77946261ec663aa1fe7f6f97e550532ed879f982 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 13:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java | 418 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 343 insertions(+), 75 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 922de6e..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,6 +26,7 @@
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;
@@ -75,8 +77,6 @@
@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());
@@ -84,15 +84,14 @@
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()){
+ }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.setStatus(Constants.ZERO);//寰呮墽琛�
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("鍚堝悓鎽樿锛�","")+"銆�");//璁板綍鏂板缓鏃ュ織
@@ -113,6 +112,12 @@
t.setEditor(model.getCreator());
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);
}
@@ -163,7 +168,7 @@
isParamValidForBill(model);
model.setCreateDate(new Date());
model.setEditDate(model.getCreateDate());
- dealDetailListBiz(model);//澶勭悊鏉℃淇℃伅
+ dealDetailListBiz(model,true);//澶勭悊鏉℃淇℃伅
return model.getBillList();
}
@@ -178,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(),"瀵逛笉璧凤紝鍚堝悓鏈夋晥鏈熺粨鏉熸椂闂翠笉寰楁棭浜庡紑濮嬫椂闂达紒");
}
@@ -212,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(),"瀵逛笉璧凤紝绉熻祦鏉℃鏈夋晥鏈熺粨鏉熸椂闂翠笉寰楁棭浜庡紑濮嬫椂闂达紒");
}
@@ -343,6 +347,13 @@
@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());
//澶勭悊
@@ -366,30 +377,47 @@
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(){
- //瀹氭椂澶勭悊鍚堝悓鎵ц涓�
- ywContractMapper.update(new UpdateWrapper<YwContract>()
- .lambda()
- .set(YwContract::getStatus,Constants.ONE)
- .set(YwContract::getEditDate,DateUtil.getCurrDateTime())
+
+ 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() ")
);
- //瀹氭椂澶勭悊鍚堝悓宸茶繃鏈�
- 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() ")
- );
+ 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()))
+ );
+ }
+ }
}
@@ -400,6 +428,7 @@
List<YwContractBill> noBills = new ArrayList<>();//涓嶉渶瑕佺粨绠楃殑璐﹀崟
List<YwContractBill> yjBills = new ArrayList<>();//鎶奸噾璐﹀崟
List<YwContractBill> canBills = new ArrayList<>();//鍙��绉熶慨鏀规暟鎹�
+ Integer canBillCount = Constants.ZERO;
List<YwContractBill> allBills = ywContractBillMapper.selectList(new QueryWrapper<YwContractBill>().
select("*," +
"( select ifnull(sum(case when yw.REVENUE_TYPE = 0 then yw.ACT_RECEIVABLE_FEE else -yw.ACT_RECEIVABLE_FEE end),0) from yw_contract_revenue yw where yw.bill_id = yw_contract_bill.id and yw.status = 0 and yw.isdeleted = 0 ) as actReceivableFee " )
@@ -421,6 +450,7 @@
||Constants.equalsInteger(bill.getPayStatus(),Constants.THREE)){
if(bill.getStartDate().getTime()<=param.getBtDate().getTime()){
canBills.add(bill);
+ canBillCount = canBillCount + 1 ;
}else{
//濡傛灉杩樻病寮�濮嬶紝璐﹀崟鐩存帴鍏抽棴
closeBills.add(bill);
@@ -432,9 +462,11 @@
noBills.add(bill);
}else{
canBills.add(bill);
+ canBillCount = canBillCount + 1 ;
}
}else if(Constants.equalsInteger(bill.getPayStatus(),Constants.TWO) ){
canBills.add(bill);
+ canBillCount = canBillCount + 1 ;
}
}
}
@@ -462,14 +494,20 @@
if(fee.compareTo(new BigDecimal(0))== 0){
//濡傛灉璐圭敤姝ｅソ锛屽垯淇敼璐﹀崟淇℃伅涓哄凡缁撴竻
b.setPayStatus(Constants.ONE);
- }else if(fee.compareTo(new BigDecimal(0))> 0){
+ canBillCount = canBillCount - 1 ;
+ }else if(fee.compareTo(new BigDecimal(0))< 0){
//濡傛灉闇�瑕佽繘琛岄��娆撅紝鏇存柊璐﹀崟淇℃伅涓哄緟閫�娆�
b.setPayStatus(Constants.FOUR);
- }else if(fee.compareTo(new BigDecimal(0)) < 0){
- //濡傛灉璐﹀崟杩樻湁娆惧緟鏀讹紝鍒欎繚鎸佺姸鎬佷笉鍙�
+ }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.setReceivableFee(editBill.getReceivableFee());
b.setEditDate(param.getEditDate());
b.setEditor(param.getEditor());
b.setBtActDate(param.getBtActDate());
@@ -488,9 +526,12 @@
for(YwContractBill addBill : param.getAddBillList()){
addBill.setIsdeleted(Constants.ZERO);
addBill.setContractId(param.getId());
+ addBill.setCreateDate(new Date());
+ addBill.setCreator(param.getEditor());
addBill.setType(Constants.TWO);
addBill.setStatus(Constants.ZERO);
addBill.setTotleFee(addBill.getReceivableFee());
+ addBill.setCompanyId(param.getCompanyId());
if(Constants.equalsInteger(addBill.getFeeType(),Constants.ONE)){
addBill.setStartDate(addBill.getPlanPayDate());
addBill.setEndDate(addBill.getPlanPayDate());
@@ -548,7 +589,7 @@
}
}
}
- param.setBtWaitBill(canBills.size() + newBills.size()+yjNoBills);//鏈竻绠楃殑璐﹀崟鏁伴噺
+ param.setBtWaitBill(canBillCount + newBills.size()+yjNoBills);//鏈竻绠楃殑璐﹀崟鏁伴噺
param.setBtCLoseBill(closeBills.size());
param.setBtFee(totalBackFee);
}
@@ -598,7 +639,11 @@
}
}
- private void dealDetailListBiz(YwContract model) {
+ /**
+ * @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;
@@ -638,7 +683,90 @@
}
}
//澶勭悊璐﹀崟淇℃伅
- dealBillListBiz(model,details1,details2);
+ 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);
+ }
+ }
+
}
/**
@@ -700,13 +828,19 @@
}
int num =1;
for(int i=0;i<billList1.size();i++){
+ if(Constants.formatBigdecimal(billList1.get(i).getReceivableFee()).compareTo(new BigDecimal(0)) == 0){
+ billList1.get(i).setPayStatus(Constants.ONE);
+ }
if(Constants.equalsInteger(billList1.get(i).getCostType(),Constants.ZERO)){
billList1.get(i).setSortnum(num);
num++;
}
}
for(int i=0;i<billList2.size();i++){
- if(Constants.equalsInteger(billList1.get(i).getCostType(),Constants.ONE)) {
+ if(Constants.formatBigdecimal(billList2.get(i).getReceivableFee()).compareTo(new BigDecimal(0)) == 0){
+ billList2.get(i).setPayStatus(Constants.ONE);
+ }
+ if(Constants.equalsInteger(billList2.get(i).getCostType(),Constants.ONE)) {
billList2.get(i).setSortnum(num);
num++;
}
@@ -1030,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 )
@@ -1067,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()){
@@ -1175,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
@@ -1252,7 +1431,7 @@
.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)
+ .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)
@@ -1263,38 +1442,38 @@
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));
+ //鍚堝悓闄勪欢
+ 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));
return model;
}
@@ -1313,14 +1492,12 @@
//鏌ヨ璐﹀崟闆嗗悎
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();
@@ -1328,9 +1505,13 @@
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){
+ if(bill.getStartDate().getTime()>nowEnd ){
//濡傛灉杩樻病寮�濮嬶紝璐﹀崟鐩存帴鍏抽棴
continue;
}
@@ -1412,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());
@@ -1425,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());
@@ -1508,10 +1693,6 @@
queryWrapper.le(YwContract::getWyFreeEndDate, Utils.Date.getEnd(pageWrap.getModel().getWyFreeEndDate()));
}
-
-
-
-
if (pageWrap.getModel().getZlTotalFee() != null) {
queryWrapper.eq(YwContract::getZlTotalFee, pageWrap.getModel().getZlTotalFee());
}
@@ -1521,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 );
@@ -1529,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;
@@ -1539,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