From b311c0d7aad6f77659e39fb4f7900d1f0ef9de93 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 19 七月 2022 08:49:33 +0800
Subject: [PATCH] 巡检计划调整为cmd模式
---
service-api/src/main/java/com/java110/api/bmo/machineTranslate/impl/MachineTranslateBMOImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/machineTranslate/impl/MachineTranslateBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/machineTranslate/impl/MachineTranslateBMOImpl.java
old mode 100644
new mode 100755
index e86c9aa..39b3304
--- a/service-api/src/main/java/com/java110/api/bmo/machineTranslate/impl/MachineTranslateBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/machineTranslate/impl/MachineTranslateBMOImpl.java
@@ -5,11 +5,6 @@
import com.java110.api.bmo.machineTranslate.IMachineTranslateBMO;
import com.java110.core.context.DataFlowContext;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.core.smo.community.ICommunityInnerServiceSMO;
-import com.java110.core.smo.fee.IFeeConfigInnerServiceSMO;
-import com.java110.core.smo.file.IFileInnerServiceSMO;
-import com.java110.core.smo.hardwareAdapation.IApplicationKeyInnerServiceSMO;
-import com.java110.core.smo.owner.IOwnerInnerServiceSMO;
import com.java110.dto.CommunityMemberDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.file.FileDto;
@@ -17,6 +12,11 @@
import com.java110.dto.machine.CarInoutDto;
import com.java110.dto.machine.MachineDto;
import com.java110.dto.owner.OwnerDto;
+import com.java110.intf.common.IApplicationKeyInnerServiceSMO;
+import com.java110.intf.common.IFileInnerServiceSMO;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
+import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.po.car.CarInoutDetailPo;
import com.java110.po.car.CarInoutPo;
import com.java110.po.fee.PayFeePo;
@@ -91,7 +91,8 @@
businessCarInoutDetail.put("machineId", machineDto.getMachineId());
businessCarInoutDetail.put("machineCode", machineDto.getMachineCode());
businessCarInoutDetail.put("carInout", machineDto.getDirection());
- businessCarInoutDetail.put("detailId", "-1");
+ businessCarInoutDetail.put("detailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
+ paramInJson.put("detailId",businessCarInoutDetail.getString("detailId"));
CarInoutDetailPo carInoutDetailPo = BeanConvertUtil.covertBean(businessCarInoutDetail, CarInoutDetailPo.class);
super.insert(dataFlowContext, carInoutDetailPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_CAR_INOUT);
@@ -107,7 +108,9 @@
*/
public void addCarInout(JSONObject paramInJson, DataFlowContext dataFlowContext, String communityId) {
- paramInJson.put("inoutId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_inoutId));
+ if (!paramInJson.containsKey("inoutId") || "-1".equals(paramInJson.getString("inoutId"))) {
+ paramInJson.put("inoutId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_inoutId));
+ }
JSONObject businessCarInout = new JSONObject();
businessCarInout.put("carNum", paramInJson.getString("carNum"));
businessCarInout.put("inoutId", paramInJson.getString("inoutId"));
--
Gitblit v1.8.0