From 6e13e0fa577df5511157a7841617106bd2f5c0b2 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期一, 20 三月 2023 16:03:05 +0800
Subject: [PATCH] 1、优化采购批次相关内容2、优化访客停车白名单下发3、新增权限组排序4、优化设备相关5、优化页面相关展示bug
---
service-community/src/main/java/com/java110/community/cmd/visit/SaveVisitSettingCmd.java | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 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 012c538..6a1189f 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
@@ -26,7 +26,6 @@
import com.java110.dto.parking.ParkingAreaDto;
import com.java110.dto.workflow.WorkflowModelDto;
import com.java110.intf.common.IWorkflowInnerServiceSMO;
-import com.java110.intf.community.IParkingAreaAttrInnerServiceSMO;
import com.java110.intf.community.IParkingAreaInnerServiceSMO;
import com.java110.intf.community.IVisitSettingV1InnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
@@ -77,29 +76,25 @@
Assert.hasKeyAndValue(reqJson, "typeName", "璇锋眰鎶ユ枃涓湭鍖呭惈typeName");
Assert.hasKeyAndValue(reqJson, "faceWay", "璇锋眰鎶ユ枃涓湭鍖呭惈faceWay");
Assert.hasKeyAndValue(reqJson, "carNumWay", "璇锋眰鎶ユ枃涓湭鍖呭惈carNumWay");
- Assert.hasKeyAndValue(reqJson, "paId", "璇锋眰鎶ユ枃涓湭鍖呭惈paId");
+// Assert.hasKeyAndValue(reqJson, "paId", "璇锋眰鎶ユ枃涓湭鍖呭惈paId");
Assert.hasKeyAndValue(reqJson, "auditWay", "璇锋眰鎶ユ枃涓湭鍖呭惈auditWay");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
-
}
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
OaWorkflowPo oaWorkflowPo = new OaWorkflowPo();
oaWorkflowPo.setStoreId(storeId);
oaWorkflowPo.setFlowId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_flowId));
- oaWorkflowPo.setFlowName(reqJson.getString("typeName")+"瀹℃壒娴佺▼");
+ oaWorkflowPo.setFlowName(reqJson.getString("typeName") + "瀹℃壒娴佺▼");
oaWorkflowPo.setFlowType(OaWorkflowDto.FLOW_TYPE_VISIT);
-
//鍒涘缓model
WorkflowModelDto workflowModelDto = new WorkflowModelDto();
workflowModelDto.setName(oaWorkflowPo.getFlowName());
workflowModelDto.setKey(oaWorkflowPo.getFlowId());
workflowModelDto = workflowInnerServiceSMOImpl.createModel(workflowModelDto);
-
oaWorkflowPo.setModelId(workflowModelDto.getModelId());
oaWorkflowPo.setFlowKey(workflowModelDto.getKey());
oaWorkflowPo.setState(OaWorkflowDto.STATE_WAIT);
@@ -107,15 +102,14 @@
if (flag < 1) {
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
-
-
-
VisitSettingPo visitSettingPo = BeanConvertUtil.covertBean(reqJson, VisitSettingPo.class);
visitSettingPo.setSettingId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
visitSettingPo.setFlowId(oaWorkflowPo.getFlowId());
visitSettingPo.setFlowName(oaWorkflowPo.getFlowName());
-
- if(!StringUtil.isEmpty(visitSettingPo.getPaId())) {
+ if (StringUtil.isEmpty(reqJson.getString("visitNumber"))) {
+ visitSettingPo.setVisitNumber("0");
+ }
+ if (!StringUtil.isEmpty(visitSettingPo.getPaId())) {
ParkingAreaDto parkingAreaDto = new ParkingAreaDto();
parkingAreaDto.setCommunityId(reqJson.getString("communityId"));
parkingAreaDto.setPaId(reqJson.getString("paId"));
@@ -124,11 +118,9 @@
visitSettingPo.setPaNum(parkingAreaDtos.get(0).getNum());
}
flag = visitSettingV1InnerServiceSMOImpl.saveVisitSetting(visitSettingPo);
-
if (flag < 1) {
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
-
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
}
--
Gitblit v1.8.0