From 3f629504991dff37c7b9678cfd6435b4e378ebba Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 31 五月 2020 19:52:22 +0800
Subject: [PATCH] 优化添加员工 报错entity

---
 Api/src/main/java/com/java110/api/bmo/inspectionTask/impl/InspectionTaskBMOImpl.java |   59 +++++++++++++++++++----------------------------------------
 1 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/Api/src/main/java/com/java110/api/bmo/inspectionTask/impl/InspectionTaskBMOImpl.java b/Api/src/main/java/com/java110/api/bmo/inspectionTask/impl/InspectionTaskBMOImpl.java
index 42be43c..7049657 100644
--- a/Api/src/main/java/com/java110/api/bmo/inspectionTask/impl/InspectionTaskBMOImpl.java
+++ b/Api/src/main/java/com/java110/api/bmo/inspectionTask/impl/InspectionTaskBMOImpl.java
@@ -6,6 +6,8 @@
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.smo.inspectionTask.IInspectionTaskInnerServiceSMO;
 import com.java110.dto.inspectionTask.InspectionTaskDto;
+import com.java110.po.file.FileRelPo;
+import com.java110.po.inspection.InspectionTaskPo;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.util.Assert;
@@ -13,6 +15,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
 import java.util.List;
 
 @Service("inspectionTaskBMOImpl")
@@ -28,19 +31,12 @@
      * @param dataFlowContext 鏁版嵁涓婁笅鏂�
      * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
      */
-    public JSONObject addInspectionTask(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+    public void addInspectionTask(JSONObject paramInJson, DataFlowContext dataFlowContext) {
 
+        paramInJson.put("taskId", "-1");
+        InspectionTaskPo inspectionTaskPo = BeanConvertUtil.covertBean(paramInJson, InspectionTaskPo.class);
 
-        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
-        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_INSPECTION_TASK);
-        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
-        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
-        JSONObject businessInspectionTask = new JSONObject();
-        businessInspectionTask.putAll(paramInJson);
-        businessInspectionTask.put("taskId", "-1");
-        //璁$畻 搴旀敹閲戦
-        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessInspectionTask", businessInspectionTask);
-        return business;
+        super.insert(dataFlowContext, inspectionTaskPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_INSPECTION_TASK);
     }
 
 
@@ -51,7 +47,7 @@
      * @param dataFlowContext 鏁版嵁涓婁笅鏂�
      * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
      */
-    public JSONObject updateInspectionTask(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+    public void updateInspectionTask(JSONObject paramInJson, DataFlowContext dataFlowContext) {
 
         InspectionTaskDto inspectionTaskDto = new InspectionTaskDto();
         inspectionTaskDto.setTaskId(paramInJson.getString("taskId"));
@@ -60,17 +56,12 @@
 
         Assert.listOnlyOne(inspectionTaskDtos, "鏈壘鍒伴渶瑕佷慨鏀圭殑宸℃浠诲姟 鎴栧鏉℃暟鎹�");
 
-
-        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
-        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_INSPECTION_TASK);
-        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
-        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
         JSONObject businessInspectionTask = new JSONObject();
         businessInspectionTask.putAll(BeanConvertUtil.beanCovertMap(inspectionTaskDtos.get(0)));
-        businessInspectionTask.putAll(paramInJson);
-        //璁$畻 搴旀敹閲戦
-        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessInspectionTask", businessInspectionTask);
-        return business;
+
+        InspectionTaskPo inspectionTaskPo = BeanConvertUtil.covertBean(businessInspectionTask, InspectionTaskPo.class);
+
+        super.update(dataFlowContext, inspectionTaskPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_INSPECTION_TASK);
     }
 
 
@@ -81,18 +72,12 @@
      * @param dataFlowContext 鏁版嵁涓婁笅鏂�
      * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
      */
-    public JSONObject deleteInspectionTask(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+    public void deleteInspectionTask(JSONObject paramInJson, DataFlowContext dataFlowContext) {
 
 
-        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
-        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_INSPECTION_TASK);
-        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
-        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
-        JSONObject businessInspectionTask = new JSONObject();
-        businessInspectionTask.putAll(paramInJson);
-        //璁$畻 搴旀敹閲戦
-        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessInspectionTask", businessInspectionTask);
-        return business;
+        InspectionTaskPo inspectionTaskPo = BeanConvertUtil.covertBean(paramInJson, InspectionTaskPo.class);
+
+        super.update(dataFlowContext, inspectionTaskPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_INSPECTION_TASK);
     }
 
     /**
@@ -102,13 +87,8 @@
      * @param dataFlowContext 鏁版嵁涓婁笅鏂�
      * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
      */
-    public JSONObject addPhoto(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+    public void addPhoto(JSONObject paramInJson, DataFlowContext dataFlowContext) {
 
-
-        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
-        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FILE_REL);
-        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 2);
-        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
         JSONObject businessUnit = new JSONObject();
         businessUnit.put("fileRelId", "-1");
         businessUnit.put("relTypeCd", "90000");
@@ -116,8 +96,7 @@
         businessUnit.put("objId", paramInJson.getString("taskDetailId"));
         businessUnit.put("fileRealName", paramInJson.getString("photoId"));
         businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
-        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFileRel", businessUnit);
-
-        return business;
+        FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
+        super.insert(dataFlowContext,fileRelPo,BusinessTypeConstant.BUSINESS_TYPE_SAVE_FILE_REL);
     }
 }

--
Gitblit v1.8.0