From e23023b93f34286f5a807b0b85e9a0619a297ed7 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 21 二月 2023 23:25:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/cmd/visit/SaveVisitSettingCmd.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/visit/SaveVisitSettingCmd.java b/service-community/src/main/java/com/java110/community/cmd/visit/SaveVisitSettingCmd.java
index b052247..6c0af2f 100644
--- a/service-community/src/main/java/com/java110/community/cmd/visit/SaveVisitSettingCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/visit/SaveVisitSettingCmd.java
@@ -35,6 +35,7 @@
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
@@ -76,7 +77,7 @@
Assert.hasKeyAndValue(reqJson, "typeName", "璇锋眰鎶ユ枃涓湭鍖呭惈typeName");
Assert.hasKeyAndValue(reqJson, "faceWay", "璇锋眰鎶ユ枃涓湭鍖呭惈faceWay");
Assert.hasKeyAndValue(reqJson, "carNumWay", "璇锋眰鎶ユ枃涓湭鍖呭惈carNumWay");
- Assert.hasKeyAndValue(reqJson, "paId", "璇锋眰鎶ユ枃涓湭鍖呭惈paId");
+
Assert.hasKeyAndValue(reqJson, "auditWay", "璇锋眰鎶ユ枃涓湭鍖呭惈auditWay");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
@@ -107,17 +108,21 @@
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
- ParkingAreaDto parkingAreaDto = new ParkingAreaDto();
- parkingAreaDto.setCommunityId(reqJson.getString("communityId"));
- parkingAreaDto.setPaId(reqJson.getString("paId"));
- List<ParkingAreaDto> parkingAreaDtos = parkingAreaInnerServiceSMOImpl.queryParkingAreas(parkingAreaDto);
- Assert.listOnlyOne(parkingAreaDtos,"鍋滆溅鍦轰笉瀛樺湪");
+
VisitSettingPo visitSettingPo = BeanConvertUtil.covertBean(reqJson, VisitSettingPo.class);
visitSettingPo.setSettingId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
visitSettingPo.setFlowId(oaWorkflowPo.getFlowId());
visitSettingPo.setFlowName(oaWorkflowPo.getFlowName());
- visitSettingPo.setPaNum(parkingAreaDtos.get(0).getNum());
+
+ if(!StringUtil.isEmpty(visitSettingPo.getPaId())) {
+ ParkingAreaDto parkingAreaDto = new ParkingAreaDto();
+ parkingAreaDto.setCommunityId(reqJson.getString("communityId"));
+ parkingAreaDto.setPaId(reqJson.getString("paId"));
+ List<ParkingAreaDto> parkingAreaDtos = parkingAreaInnerServiceSMOImpl.queryParkingAreas(parkingAreaDto);
+ Assert.listOnlyOne(parkingAreaDtos, "鍋滆溅鍦轰笉瀛樺湪");
+ visitSettingPo.setPaNum(parkingAreaDtos.get(0).getNum());
+ }
flag = visitSettingV1InnerServiceSMOImpl.saveVisitSetting(visitSettingPo);
if (flag < 1) {
--
Gitblit v1.8.0