From 440f3671c552a58d9a911dbe184b583e3d17be16 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 30 十一月 2024 16:13:48 +0800
Subject: [PATCH] 客户资料 巡检任务业务
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRevenueServiceImpl.java | 82 ++++++++++++++++++++++++++++------------
1 files changed, 57 insertions(+), 25 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRevenueServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRevenueServiceImpl.java
index b6b00ca..8843a63 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRevenueServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRevenueServiceImpl.java
@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -67,6 +68,10 @@
@Autowired
private SystemUserMapper systemUserMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
+
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@@ -112,8 +117,10 @@
ywContractRevenue.setContractId(ywContractBill.getContractId());
//鏍规嵁鏀舵敮鎯呭喌 鏇存柊璐﹀崟鏁版嵁
//鏌ヨ褰撳墠璐﹀崟涓� 宸叉敮浠樼殑璐圭敤
- List<YwContractRevenue> ywContractRevenueList = ywContractRevenueMapper.selectList(new QueryWrapper<YwContractRevenue>().lambda().eq(YwContractRevenue::getIsdeleted,Constants.ZERO)
+ List<YwContractRevenue> ywContractRevenueList = ywContractRevenueMapper.selectList(new QueryWrapper<YwContractRevenue>()
+ .lambda().eq(YwContractRevenue::getIsdeleted,Constants.ZERO)
.eq(YwContractRevenue::getStatus,Constants.ZERO)
+ .eq(YwContractRevenue::getBillId,ywContractRevenue.getBillId())
);
//宸叉敮浠橀噾棰�
BigDecimal payTotal = BigDecimal.ZERO;
@@ -147,14 +154,14 @@
//寰呮敮浠樼殑娴佹按 濡傛灉涓烘敹鍏� 鍒欐瘮瀵� 閲戦鍊� 濡傛灉鏄敮鍑� 鍒欒幏鍙栫粷瀵瑰�� 杩涜瀵规瘮
if(Constants.equalsInteger(ywContractRevenue.getRevenueType(),Constants.ZERO)){
//濡傛灉鏀粯閲戦 澶т簬 寰呮敮浠橀噾棰� 鍒欐彁绀哄紓甯� 濡傛灉鏀粯閲戦灏忎簬 寰呮敮浠橀噾棰� 鍒欑姸鎬佷笉鍙樺寲 鍏朵粬鐘舵�� 寮傚父
- if(waitPayTotal.compareTo(ywContractRevenue.getActReceivableFee())>Constants.ZERO){
+ if(waitPayTotal.compareTo(ywContractRevenue.getActReceivableFee())<Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇疯緭鍏ユ纭殑閲戦锛�");
}else if(waitPayTotal.compareTo(ywContractRevenue.getActReceivableFee())==Constants.ZERO){
ywContractBill.setPayStatus(Constants.ONE);
}
}else{
waitPayTotal = waitPayTotal.abs();
- if(waitPayTotal.compareTo(ywContractRevenue.getActReceivableFee())>Constants.ZERO){
+ if(waitPayTotal.compareTo(ywContractRevenue.getActReceivableFee())<Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇疯緭鍏ユ纭殑閲戦锛�");
}else if(waitPayTotal.compareTo(ywContractRevenue.getActReceivableFee())==Constants.ZERO){
ywContractBill.setPayStatus(Constants.ONE);
@@ -230,14 +237,36 @@
.selectAs(YwContract::getCode,YwContractRevenue::getContractCode)
.selectAs(YwCustomer::getName,YwContractRevenue::getCustomerName)
.selectAs(SystemUser::getRealname,YwContractRevenue::getRealname)
+ .selectAs(YwAccount::getTitle,YwContractRevenue::getAccountTitle)
.leftJoin(YwContractBill.class,YwContractBill::getId,YwContractRevenue::getBillId)
.leftJoin(YwContract.class,YwContract::getId,YwContractBill::getContractId)
.leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
.leftJoin(SystemUser.class,SystemUser::getId,YwContractRevenue::getCreator)
+ .leftJoin(YwAccount.class,YwAccount::getId,YwContractRevenue::getAccountId)
.eq(YwContractRevenue::getId,id)
);
this.getRecordData(ywContractRevenue);
+
+ //闄勪欢鏁版嵁
+ List<Multifile> multifileList = multifileMapper.selectJoinList(Multifile.class,new MPJLambdaWrapper<Multifile>()
+ .selectAll(Multifile.class)
+ .selectAs(SystemUser::getRealname,Multifile::getUserName)
+ .leftJoin(SystemUser.class,SystemUser::getId,Multifile::getCreator)
+ .eq(Multifile::getObjId,id)
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .eq(Multifile::getObjType,Constants.MultiFile.FN_CONTRACT_REVENUE_FILE.getKey()));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_CONTRACT_BILL).getCode();
+ for (Multifile multifile:multifileList) {
+ if(StringUtils.isNotBlank(multifile.getFileurl())){
+ multifile.setFileurlFull(path + multifile.getFileurl());
+ }
+ }
+ ywContractRevenue.setMultifileList(multifileList);
+ }
+
return ywContractRevenue;
}
@@ -289,11 +318,11 @@
if(Objects.isNull(ywContract)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(Constants.equalsInteger(ywContract.getStatus(),Constants.THREE)){
+ if(Constants.equalsInteger(ywContract.getStatus(),Constants.FOUR)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝悓鐘舵�佸凡娴佽浆,鏃犳硶鎿嶄綔");
}
if(Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.ONE)
- || Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.TWO)){
+ || Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.FIVE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璐﹀崟鐘舵�佸凡娴佽浆,鏃犳硶鎿嶄綔");
}
//鏌ヨ璐﹀崟涓� 鎵�鏈夌殑璐﹀崟
@@ -345,7 +374,7 @@
public List<YwContractRevenue> findList(YwContractRevenue ywContractRevenue) {
List<YwContractRevenue> ywContractRevenueList = ywContractRevenueMapper.selectJoinList(YwContractRevenue.class,new MPJLambdaWrapper<YwContractRevenue>()
.selectAll(YwContractRevenue.class)
- .selectAs(YwCustomer::getName,YwContractRevenue::getCustomerNme)
+ .selectAs(YwCustomer::getName,YwContractRevenue::getCustomerName)
.leftJoin(YwContract.class,YwContract::getId,YwContractRevenue::getContractId)
.leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
.eq(YwContractRevenue::getStatus,Constants.ZERO)
@@ -371,8 +400,8 @@
.leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
.leftJoin(SystemUser.class,SystemUser::getId,YwContractRevenue::getCreator)
.eq(YwContractRevenue::getIsdeleted,Constants.ZERO)
- .like(Objects.nonNull(model)&&StringUtils.isNotBlank(model.getCustomerNme()),
- YwCustomer::getName,model.getCustomerNme())
+ .like(Objects.nonNull(model)&&StringUtils.isNotBlank(model.getCustomerName()),
+ YwCustomer::getName,model.getCustomerName())
.eq(Objects.nonNull(model)&&Objects.nonNull(model.getPayType()),
YwContractRevenue::getPayType,model.getPayType())
.eq(Objects.nonNull(model)&&Objects.nonNull(model.getRevenueType()),
@@ -386,25 +415,28 @@
for (YwContractRevenue ywContractRevenue:iPage.getRecords()) {
//妤煎畤鍚嶇О
List<YwContractRoom> ywContractRoomList = ywContractRevenue.getYwContractRoomList();
- StringBuilder roomPathName = new StringBuilder();
- for (YwContractRoom ywContractRoom:ywContractRoomList) {
- if(StringUtils.isNotBlank(ywContractRoom.getProjectName())){
- roomPathName.append(ywContractRoom.getProjectName()+"/");
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractRoomList)){
+ StringBuilder roomPathName = new StringBuilder();
+ for (YwContractRoom ywContractRoom:ywContractRoomList) {
+ if(StringUtils.isNotBlank(ywContractRoom.getProjectName())){
+ roomPathName.append(ywContractRoom.getProjectName()+"/");
+ }
+ if(StringUtils.isNotBlank(ywContractRoom.getBuildingName())){
+ roomPathName.append(ywContractRoom.getBuildingName()+"/");
+ }
+ if(StringUtils.isNotBlank(ywContractRoom.getFloorName())){
+ roomPathName.append(ywContractRoom.getFloorName()+"/");
+ }
+ if(StringUtils.isNotBlank(ywContractRoom.getRoomName())){
+ roomPathName.append(ywContractRoom.getRoomName());
+ }
+ if(StringUtils.isNotBlank(roomPathName)){
+ roomPathName.append(";");
+ }
}
- if(StringUtils.isNotBlank(ywContractRoom.getBuildingName())){
- roomPathName.append(ywContractRoom.getBuildingName()+"/");
- }
- if(StringUtils.isNotBlank(ywContractRoom.getFloorName())){
- roomPathName.append(ywContractRoom.getFloorName()+"/");
- }
- if(StringUtils.isNotBlank(ywContractRoom.getRoomName())){
- roomPathName.append(ywContractRoom.getRoomName());
- }
- if(StringUtils.isNotBlank(roomPathName)){
- roomPathName.append(";");
- }
+ ywContractRevenue.setRoomPathName(roomPathName.toString());
}
- ywContractRevenue.setRoomPathName(roomPathName.toString());
+
}
return PageData.from(iPage);
}
--
Gitblit v1.9.3