suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改设计阶段接口

Browse Source
This commit is contained in:
shuo.wang
2024-04-30 18:58:58 +08:00
parent 3951445ab3
commit f36888915c
1 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java
View File

@@ -8,6 +8,8 @@ import com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO;
import com.cool.store.entity.AcceptanceInfoDO; import com.cool.store.entity.AcceptanceInfoDO;
import com.cool.store.entity.ShopInfoDO; import com.cool.store.entity.ShopInfoDO;
import com.cool.store.entity.ShopStageInfoDO; import com.cool.store.entity.ShopStageInfoDO;
import com.cool.store.enums.ConstructionPhaseEnum;
import com.cool.store.enums.DesignPhaseEnum;
import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.WorkflowSubStageStatusEnum; import com.cool.store.enums.WorkflowSubStageStatusEnum;
import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageEnum;
@@ -34,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.*; import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -75,15 +78,28 @@ public class DecorationServiceImpl implements DecorationService {
log.error("DecorationModel storeNum is null"); log.error("DecorationModel storeNum is null");
return null; return null;
} }
AtomicInteger flag = new AtomicInteger(0);
DesignInfoVo designInfoVo = new DesignInfoVo(); DesignInfoVo designInfoVo = new DesignInfoVo();
List<DesignSchemeDTO> designScheme = decoration.getDesignScheme(); List<DesignSchemeDTO> designScheme = decoration.getDesignScheme();
if (designScheme != null && designScheme.size() > CommonConstants.ZERO) { if (designScheme != null && designScheme.size() > CommonConstants.ZERO) {
Map<String, DesignSchemeDTO> designSchemeMap = designScheme.stream().collect(Collectors.toMap(DesignSchemeDTO::getId, dto -> dto)); Map<String, DesignSchemeDTO> designSchemeMap = designScheme.stream().collect(Collectors.toMap(DesignSchemeDTO::getId, dto -> dto));
List<DesignSchemeDTO> designSchemeDTOS = new ArrayList<>(); List<DesignSchemeDTO> designSchemeDTOS = new ArrayList<>();
//平面图 //平面图
designSchemeDTOS.add(designSchemeMap.get(CommonConstants.FLOOR_PLAN)); DesignSchemeDTO planeGraph = designSchemeMap.get(CommonConstants.FLOOR_PLAN);
if (Objects.nonNull(planeGraph)) {
designSchemeDTOS.add(planeGraph);
if (DesignPhaseEnum.DESIGN_PHASE_ACCEPTANCE_PASS.getCode().equals(planeGraph.getStatus()) ){
flag.incrementAndGet();
}
}
//施工图 //施工图
designSchemeDTOS.add(designSchemeMap.get(CommonConstants.CONSTRUCTION_DRAWING)); DesignSchemeDTO constructionDrawing = designSchemeMap.get(CommonConstants.CONSTRUCTION_DRAWING);
if (Objects.nonNull(constructionDrawing)) {
designSchemeDTOS.add(designSchemeMap.get(CommonConstants.CONSTRUCTION_DRAWING));
if (DesignPhaseEnum.DESIGN_PHASE_ACCEPTANCE_PASS.getCode().equals(constructionDrawing.getStatus())){
flag.incrementAndGet();
}
}
designInfoVo.setDesignScheme(designSchemeDTOS); designInfoVo.setDesignScheme(designSchemeDTOS);
} }
@@ -93,16 +109,26 @@ public class DecorationServiceImpl implements DecorationService {
dto -> dto)); dto -> dto));
if (constructionScheduleMap != null && constructionScheduleMap.size() > 0) { if (constructionScheduleMap != null && constructionScheduleMap.size() > 0) {
//量房 //量房
designInfoVo.setMeasuringRoom(constructionScheduleMap.get(CommonConstants.MEASURING_THE_ROOM)); ConstructionScheduleDTO measuringRoom = constructionScheduleMap.get(CommonConstants.MEASURING_THE_ROOM);
if (Objects.nonNull(measuringRoom)) {
designInfoVo.setMeasuringRoom(measuringRoom);
if (ConstructionPhaseEnum.construction_FINSH.getCode().equals(measuringRoom.getState())){
flag.incrementAndGet();
}
}
} }
} }
//预算 //预算
List<BudgetDTO> proposedBookBudget = decoration.getProposedBookBudget(); List<BudgetDTO> proposedBookBudget = decoration.getProposedBookBudget();
Collections.sort(decoration.getProposedBookBudget(), (x1, x2) -> x2.getId().compareTo(x1.getId())); Collections.sort(decoration.getProposedBookBudget(), (x1, x2) -> x2.getId().compareTo(x1.getId()));
designInfoVo.setProposedBookBudget(proposedBookBudget.get(CommonConstants.ZERO)); if (!proposedBookBudget.isEmpty()){
if (Objects.nonNull(designInfoVo.getMeasuringRoom()) && Objects.nonNull(designInfoVo.getProposedBookBudget()) BudgetDTO budgetDTO = proposedBookBudget.get(CommonConstants.ZERO);
&& designInfoVo.getDesignScheme().size() == CommonConstants.TWO) { designInfoVo.setProposedBookBudget(budgetDTO);
flag.incrementAndGet();
}
if (flag.get() == CommonConstants.FOUR) {
//如果设计阶段未完成 //如果设计阶段未完成
if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_91.getShopSubStageStatus(). if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_91.getShopSubStageStatus().
equals(shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_9).getShopSubStageStatus()) ) equals(shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_9).getShopSubStageStatus()) )