From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java | 210 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 192 insertions(+), 18 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java b/service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java
index f298093..149a5e9 100755
--- a/service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java
+++ b/service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.RoomDto;
import com.java110.dto.contract.ContractDto;
import com.java110.dto.contractAttr.ContractAttrDto;
import com.java110.dto.contractChangePlan.ContractChangePlanDto;
@@ -11,19 +12,29 @@
import com.java110.dto.contractChangePlanRoom.ContractChangePlanRoomDto;
import com.java110.dto.contractRoom.ContractRoomDto;
import com.java110.dto.fee.FeeDto;
+import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.dto.rentingPool.RentingPoolDto;
import com.java110.dto.store.StoreDto;
import com.java110.intf.common.IContractApplyUserInnerServiceSMO;
import com.java110.intf.common.IContractChangeUserInnerServiceSMO;
-import com.java110.intf.store.*;
+import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.store.IContractAttrInnerServiceSMO;
+import com.java110.intf.store.IContractChangePlanDetailInnerServiceSMO;
+import com.java110.intf.store.IContractChangePlanInnerServiceSMO;
+import com.java110.intf.store.IContractChangePlanRoomInnerServiceSMO;
+import com.java110.intf.store.IContractFileInnerServiceSMO;
+import com.java110.intf.store.IContractInnerServiceSMO;
+import com.java110.intf.store.IContractRoomInnerServiceSMO;
+import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.intf.user.IRentingPoolInnerServiceSMO;
import com.java110.po.contract.ContractPo;
import com.java110.po.contractAttr.ContractAttrPo;
import com.java110.po.contractChangePlan.ContractChangePlanPo;
-import com.java110.po.contractChangePlanRoom.ContractChangePlanRoomPo;
import com.java110.po.contractFile.ContractFilePo;
import com.java110.po.contractRoom.ContractRoomPo;
+import com.java110.po.owner.OwnerRoomRelPo;
import com.java110.po.rentingPool.RentingPoolPo;
+import com.java110.po.room.RoomPo;
import com.java110.store.bmo.contract.IUpdateContractBMO;
import com.java110.store.bmo.contractFile.IDeleteContractFileBMO;
import com.java110.utils.constant.StatusConstant;
@@ -31,7 +42,6 @@
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
-import org.apache.http.annotation.Contract;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
@@ -75,6 +85,13 @@
@Autowired
private IDeleteContractFileBMO deleteContractFileBMOImpl;
+
+ @Autowired
+ private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
+
+ @Autowired
+ private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
+
/**
* @param contractPo
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
@@ -95,10 +112,12 @@
deleteContractFileBMOImpl.delete(contractFilePo);
List<ContractFilePo> filePos = contractPo.getContractFilePo();
- for (ContractFilePo file: filePos) {
- if (file.getFileRealName().length() > 0 && file.getFileSaveName().length() > 0){
- file.setContractId(contractPo.getContractId());
- contractFileInnerServiceSMOImpl.saveContractFile(file);
+ if (filePos != null) {
+ for (ContractFilePo file : filePos) {
+ if (file.getFileRealName().length() > 0 && file.getFileSaveName().length() > 0) {
+ file.setContractId(contractPo.getContractId());
+ contractFileInnerServiceSMOImpl.saveContractFile(file);
+ }
}
}
@@ -133,6 +152,7 @@
List<ContractDto> contractDtos = contractInnerServiceSMOImpl.queryContracts(tmpContractDto);
Assert.listOnlyOne(contractDtos, "鍚堝悓涓嶅瓨鍦�");
contractDto.setStartUserId(contractDtos.get(0).getStartUserId());
+ contractDto.setNextUserId(reqJson.getString("nextUserId"));
boolean isLastTask = contractApplyUserInnerServiceSMOImpl.completeTask(contractDto);
if (isLastTask) {
@@ -145,6 +165,9 @@
ContractPo contractPo = new ContractPo();
contractPo.setContractId(contractDto.getContractId());
contractPo.setState(ContractDto.STATE_AUDIT_DOING);
+ if ("1200".equals(reqJson.getString("state"))) {
+ contractPo.setState(ContractDto.STATE_FAIL);
+ }
contractPo.setStatusCd(StatusConstant.STATUS_CD_VALID);
contractInnerServiceSMOImpl.updateContract(contractPo);
}
@@ -153,12 +176,22 @@
@Override
public ResponseEntity<String> needAuditContractPlan(ContractChangePlanDto contractChangePlanDto, JSONObject reqJson) {
+
+ //鏌ヨ鑰佺殑鍚堝悓淇℃伅
+ ContractDto contractDto = new ContractDto();
+ contractDto.setContractId(contractChangePlanDto.getContractId());
+ contractDto.setStoreId(contractChangePlanDto.getStoreId());
+ List<ContractDto> contractDtos = contractInnerServiceSMOImpl.queryContracts(contractDto);
+
+ Assert.listOnlyOne(contractDtos, "鍚堝悓涓嶅瓨鍦�");
+
ContractChangePlanDto tmpContractChangePlanDto = new ContractChangePlanDto();
tmpContractChangePlanDto.setPlanId(contractChangePlanDto.getPlanId());
tmpContractChangePlanDto.setStoreId(contractChangePlanDto.getStoreId());
List<ContractChangePlanDto> contractChangePlanDtos = contractChangePlanInnerServiceSMOImpl.queryContractChangePlans(tmpContractChangePlanDto);
Assert.listOnlyOne(contractChangePlanDtos, "鍚堝悓璁″垝涓嶅瓨鍦�");
contractChangePlanDto.setStartUserId(contractChangePlanDtos.get(0).getChangePerson());
+ contractChangePlanDto.setNextUserId(reqJson.getString("nextUserId"));
boolean isLastTask = contractChangeUserInnerServiceSMOImpl.completeTask(contractChangePlanDto);
if (isLastTask) {
@@ -179,7 +212,10 @@
ContractPo contractPo = BeanConvertUtil.covertBean(contractChangePlanDetailDtos.get(0), ContractPo.class);
contractInnerServiceSMOImpl.updateContract(contractPo);
- dealContractChangePlanRoom(contractChangePlanDto);
+ //瑙ｅ喅鍚堝悓bug 鍙湁 璧勪骇鍙樻洿鏃� 鎿嶄綔 鍚堝悓鎴垮眿
+ if (ContractChangePlanDto.PLAN_TYPE_CHANGE_ROOM.equals(contractChangePlanDtos.get(0).getPlanType())) {
+ dealContractChangePlanRoom(contractChangePlanDto, contractDtos.get(0));
+ }
} else { //淇敼涓哄鏍镐腑
ContractChangePlanPo contractChangePlanPo = new ContractChangePlanPo();
@@ -191,7 +227,13 @@
return ResultVo.success();
}
- private void dealContractChangePlanRoom(ContractChangePlanDto contractChangePlanDto) {
+ private void dealContractChangePlanRoom(ContractChangePlanDto contractChangePlanDto, ContractDto contractDto) {
+
+ //鏌ヨ鍚堝悓鎴垮眿
+ ContractRoomDto contractRoomDto = new ContractRoomDto();
+ contractRoomDto.setStoreId(contractChangePlanDto.getStoreId());
+ contractRoomDto.setContractId(contractDto.getContractId());
+ List<ContractRoomDto> oldContractRoomDtos = contractRoomInnerServiceSMOImpl.queryContractRooms(contractRoomDto);
// 鏌ヨ 鏄惁鏈夎祫浜у彉鏇�
ContractChangePlanRoomDto contractChangePlanRoomDto = new ContractChangePlanRoomDto();
@@ -202,19 +244,29 @@
List<ContractChangePlanRoomDto> contractChangePlanRoomDtos
= contractChangePlanRoomInnerServiceSMOImpl.queryContractChangePlanRooms(contractChangePlanRoomDto);
- if(contractChangePlanRoomDtos == null || contractChangePlanRoomDtos.size() < 1){
- return ;
+ if (contractChangePlanRoomDtos == null || contractChangePlanRoomDtos.size() < 1) {
+ //鍒犻櫎鑰佺殑鍏崇郴鍊�
+ doDelOldRoomRel(contractChangePlanRoomDtos, oldContractRoomDtos);
+ return;
}
+ //鍒犻櫎鑰佺殑鍏崇郴鍊�
+ doDelOldRoomRel(contractChangePlanRoomDtos, oldContractRoomDtos);
+ //澧炲姞
+ doAddRoomRel(contractDto, oldContractRoomDtos, contractChangePlanRoomDtos);
+
+
+
+ }
+
+ private void doAddRoomRel(ContractDto contractDto, List<ContractRoomDto> oldContractRoomDtos, List<ContractChangePlanRoomDto> contractChangePlanRoomDtos) {
//鍒犻櫎涔嬪墠鏁版嵁 鎻掑叆鏂版暟鎹�
- ContractRoomPo contractRoomPo = new ContractRoomPo();
- contractRoomPo.setContractId(contractChangePlanRoomDtos.get(0).getContractId());
- contractRoomPo.setStoreId(contractChangePlanRoomDtos.get(0).getStoreId());
- contractRoomInnerServiceSMOImpl.deleteContractRoom(contractRoomPo);
-
+ ContractRoomPo contractRoomPo = null;
//鎻掑叆鏂扮殑鍏崇郴鍊�
-
- for(ContractChangePlanRoomDto tmpContractChangePlanRoomDto : contractChangePlanRoomDtos){
+ for (ContractChangePlanRoomDto tmpContractChangePlanRoomDto : contractChangePlanRoomDtos) {
+ if (isOldRoom(tmpContractChangePlanRoomDto, oldContractRoomDtos)) {
+ continue;
+ }
contractRoomPo = new ContractRoomPo();
contractRoomPo.setContractId(contractChangePlanRoomDtos.get(0).getContractId());
contractRoomPo.setStoreId(contractChangePlanRoomDtos.get(0).getStoreId());
@@ -224,10 +276,132 @@
contractRoomPo.setRoomId(tmpContractChangePlanRoomDto.getRoomId());
contractRoomPo.setRoomName(tmpContractChangePlanRoomDto.getRoomName());
contractRoomInnerServiceSMOImpl.saveContractRoom(contractRoomPo);
+
+ //鍒蜂笟涓�
+ OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+ ownerRoomRelDto.setRoomId(contractRoomPo.getRoomId());
+ List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+
+ if (ownerRoomRelDtos != null && ownerRoomRelDtos.size() > 0) { // 璇存槑涓氫富娌℃湁鍙戠敓鍙樺寲锛屽悗缁伐浣滀笉鍋氬鐞�
+ if (contractDto.getObjId().equals(ownerRoomRelDtos.get(0).getOwnerId())) {
+ continue;
+ }
+ }
+
+ //缁戝畾鍏崇郴
+ String relId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId);
+ OwnerRoomRelPo ownerRoomRelPo = new OwnerRoomRelPo();
+ ownerRoomRelPo.setEndTime(contractDto.getEndTime());
+ ownerRoomRelPo.setStartTime(contractDto.getStartTime());
+ ownerRoomRelPo.setOwnerId(contractDto.getObjId());
+ ownerRoomRelPo.setRelId(relId);
+ ownerRoomRelPo.setRemark("绛捐鍚堝悓鑷姩缁戝畾");
+ ownerRoomRelPo.setRoomId(contractRoomPo.getRoomId());
+ ownerRoomRelPo.setState("2001");
+ ownerRoomRelPo.setUserId("-1");
+ ownerRoomRelPo.setOperate("ADD");
+ ownerRoomRelPo.setbId("-1");
+ ownerRoomRelInnerServiceSMOImpl.saveBusinessOwnerRoomRels(ownerRoomRelPo);
+
+ ownerRoomRelPo = new OwnerRoomRelPo();
+ ownerRoomRelPo.setEndTime(contractDto.getEndTime());
+ ownerRoomRelPo.setStartTime(contractDto.getStartTime());
+ ownerRoomRelPo.setOwnerId(contractDto.getObjId());
+ ownerRoomRelPo.setRelId(relId);
+ ownerRoomRelPo.setRemark("绛捐鍚堝悓鑷姩缁戝畾");
+ ownerRoomRelPo.setRoomId(contractRoomPo.getRoomId());
+ ownerRoomRelPo.setState("2001");
+ ownerRoomRelPo.setUserId("-1");
+ ownerRoomRelInnerServiceSMOImpl.saveOwnerRoomRels(ownerRoomRelPo);
+
+ //淇敼鎴垮眿鐘舵��
+ RoomPo roomPo = new RoomPo();
+ roomPo.setRoomId(contractRoomPo.getRoomId());
+ roomPo.setState(RoomDto.STATE_SELL);
+ roomPo.setStatusCd(StatusConstant.STATUS_CD_VALID);
+ roomInnerServiceSMOImpl.updateRooms(roomPo);
+ //鍒犻櫎鑰佺殑
+ if (ownerRoomRelDtos != null && ownerRoomRelDtos.size() > 0) {
+ ownerRoomRelPo = new OwnerRoomRelPo();
+ ownerRoomRelPo.setStatusCd(StatusConstant.STATUS_CD_INVALID);
+ ownerRoomRelPo.setRelId(ownerRoomRelDtos.get(0).getRelId());
+ ownerRoomRelInnerServiceSMOImpl.updateOwnerRoomRels(ownerRoomRelPo);
+ ownerRoomRelPo = BeanConvertUtil.covertBean(ownerRoomRelDtos.get(0), OwnerRoomRelPo.class);
+ ownerRoomRelPo.setbId("-1");
+ ownerRoomRelPo.setOperate("DEL");
+ ownerRoomRelInnerServiceSMOImpl.saveBusinessOwnerRoomRels(ownerRoomRelPo);
+ }
+ }
+ }
+
+ private void doDelOldRoomRel(List<ContractChangePlanRoomDto> contractChangePlanRoomDtos, List<ContractRoomDto> oldContractRoomDtos) {
+ ContractRoomPo contractRoomPo;
+ OwnerRoomRelPo ownerRoomRelPo = null;
+ for (ContractRoomDto oldContractRoomDto : oldContractRoomDtos) {
+ if (isDelOldRoom(oldContractRoomDto, contractChangePlanRoomDtos)) {
+ continue;
+ }
+ contractRoomPo = new ContractRoomPo();
+ contractRoomPo.setContractId(oldContractRoomDtos.get(0).getContractId());
+ contractRoomPo.setStoreId(oldContractRoomDtos.get(0).getStoreId());
+ contractRoomPo.setCrId(oldContractRoomDto.getCrId());
+ contractRoomInnerServiceSMOImpl.deleteContractRoom(contractRoomPo);
+
+ //鍒蜂笟涓�
+ OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+ ownerRoomRelDto.setRoomId(oldContractRoomDto.getRoomId());
+ List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+
+ if (ownerRoomRelDtos == null || ownerRoomRelDtos.size() < 1) { // 璇存槑鎴垮眿娌℃湁涓氫富
+ continue;
+ }
+ //鍒犻櫎鍏崇郴
+ ownerRoomRelPo = new OwnerRoomRelPo();
+ ownerRoomRelPo.setStatusCd(StatusConstant.STATUS_CD_INVALID);
+ ownerRoomRelPo.setRelId(ownerRoomRelDtos.get(0).getRelId());
+ ownerRoomRelInnerServiceSMOImpl.updateOwnerRoomRels(ownerRoomRelPo);
+
+ //鎻掑叆鍒犻櫎鍏崇郴
+ ownerRoomRelPo = BeanConvertUtil.covertBean(ownerRoomRelDtos.get(0), OwnerRoomRelPo.class);
+ ownerRoomRelPo.setbId("-1");
+ ownerRoomRelPo.setOperate("DEL");
+ ownerRoomRelInnerServiceSMOImpl.saveBusinessOwnerRoomRels(ownerRoomRelPo);
+
+ //淇敼鎴垮眿鐘舵��
+ RoomPo roomPo = new RoomPo();
+ roomPo.setRoomId(oldContractRoomDto.getRoomId());
+ roomPo.setState(RoomDto.STATE_FREE);
+ roomPo.setStatusCd(StatusConstant.STATUS_CD_VALID);
+ roomInnerServiceSMOImpl.updateRooms(roomPo);
+ }
+ }
+
+ private boolean isDelOldRoom(ContractRoomDto oldContractRoomDto, List<ContractChangePlanRoomDto> contractChangePlanRoomDtos) {
+ if (contractChangePlanRoomDtos == null || contractChangePlanRoomDtos.size() < 1) {
+ return false;
}
+ for (ContractChangePlanRoomDto contractChangePlanRoomDto : contractChangePlanRoomDtos) {
+ if (contractChangePlanRoomDto.getRoomId().equals(oldContractRoomDto.getRoomId())) {
+ return true;
+ }
+ }
+ return false;
+ }
+ private boolean isOldRoom(ContractChangePlanRoomDto tmpContractChangePlanRoomDto, List<ContractRoomDto> oldContractRoomDtos) {
+ if (oldContractRoomDtos == null || oldContractRoomDtos.size() < 1) {
+ return false;
+ }
+
+ for (ContractRoomDto contractRoomDto : oldContractRoomDtos) {
+ if (tmpContractChangePlanRoomDto.getRoomId().equals(contractRoomDto.getRoomId())) {
+ return true;
+ }
+ }
+
+ return false;
}
private void updateContractAttr(JSONObject jsonObject, ContractPo contractPo) {
--
Gitblit v1.8.0