From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebService/src/main/java/com/java110/web/components/machineRecord/MachineRecordManageComponent.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/components/machineRecord/MachineRecordManageComponent.java b/WebService/src/main/java/com/java110/web/components/machineRecord/MachineRecordManageComponent.java
index 20960f9..ff5bddf 100644
--- a/WebService/src/main/java/com/java110/web/components/machineRecord/MachineRecordManageComponent.java
+++ b/WebService/src/main/java/com/java110/web/components/machineRecord/MachineRecordManageComponent.java
@@ -1,7 +1,10 @@
package com.java110.web.components.machineRecord;
+import com.alibaba.fastjson.JSONObject;
import com.java110.core.context.IPageData;
+import com.java110.core.context.PageData;
+import com.java110.utils.constant.StateConstant;
import com.java110.web.smo.machineRecord.IListMachineRecordsSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -27,7 +30,13 @@
* @return 杩斿洖 ResponseEntity 瀵硅薄
*/
public ResponseEntity<String> list(IPageData pd){
- return listMachineRecordsSMOImpl.listMachineRecords(pd);
+ JSONObject reqParam = JSONObject.parseObject(pd.getReqData());
+ reqParam.put("recordTypeCd", "8888");
+
+ IPageData newPd = PageData.newInstance().builder(pd.getUserId(),pd.getUserName(), pd.getToken(),
+ reqParam.toJSONString(), pd.getComponentCode(), pd.getComponentMethod(), "", pd.getSessionId());
+
+ return listMachineRecordsSMOImpl.listMachineRecords(newPd);
}
public IListMachineRecordsSMO getListMachineRecordsSMOImpl() {
--
Gitblit v1.8.0