|
|
@@ -1,5 +1,6 @@
|
|
|
package com.uas.service.Impl;
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.landray.kmss.seg.hetong.webservice.AttachmentForm;
|
|
|
@@ -207,29 +208,38 @@ public class ISegHetongServiceImpl implements ISegHetongService {
|
|
|
String varchar5005 = rs.getString("ct_varchar500_5");
|
|
|
SqlRowList rowList = baseDao.queryForRowSet("select ig_item1,ig_item2,ig_item3,ig_item4 from itemgrid" +
|
|
|
" where nvl(ig_item1,' ')<>' ' and ig_mainid=" + varchar5005);
|
|
|
- JSONArray jsonArray = new JSONArray();
|
|
|
+ List<String> item1s = new ArrayList<>();
|
|
|
+ List<String> item2s = new ArrayList<>();
|
|
|
+ List<String> item3s = new ArrayList<>();
|
|
|
+ List<String> item4s = new ArrayList<>();
|
|
|
+
|
|
|
while (rowList.next()){
|
|
|
- JSONObject jsonObject = new JSONObject();
|
|
|
- jsonObject.put("fd_36e4452e5e67f2",rowList.getString("ig_item1"));
|
|
|
- jsonObject.put("fd_35ed1cbb52a108",rowList.getString("ig_item2"));
|
|
|
- jsonObject.put("fd_35ed13a94684a8",rowList.getString("ig_item3"));
|
|
|
- jsonObject.put("fd_35ed133ea9aa74",rowList.getString("ig_item4"));
|
|
|
- jsonArray.add(jsonObject);
|
|
|
+ item1s.add(rowList.getString("ig_item1"));
|
|
|
+ item2s.add(rowList.getString("ig_item2"));
|
|
|
+ item3s.add(rowList.getString("ig_item3"));
|
|
|
+ item4s.add(rowList.getString("ig_item4"));
|
|
|
}
|
|
|
- json.put("fd_35ed12c9fca3ca",jsonArray);
|
|
|
+ json.put("fd_35ed12c9fca3ca.fd_36e4452e5e67f2", JSONArray.parseArray(JSON.toJSONString(item1s)));
|
|
|
+ json.put("fd_35ed12c9fca3ca.fd_35ed1cbb52a108",JSONArray.parseArray(JSON.toJSONString(item2s)));
|
|
|
+ json.put("fd_35ed12c9fca3ca.fd_35ed13a94684a8",JSONArray.parseArray(JSON.toJSONString(item3s)));
|
|
|
+ json.put("fd_35ed12c9fca3ca.fd_35ed133ea9aa74",JSONArray.parseArray(JSON.toJSONString(item4s)));
|
|
|
int ct_id = rs.getInt("ct_id");
|
|
|
SqlRowList sqlRowList = baseDao.queryForRowSet("select to_char(cd_date_1,'yyyy-MM-dd HH24:mi:ss') " +
|
|
|
"cd_date_1,cd_varchar50_1,cd_varchar50_2,cd_varchar50_3 from customtabledetail where cd_ctid=" + ct_id);
|
|
|
- JSONArray jsonArr = new JSONArray();
|
|
|
+ List<String> dates = new ArrayList<String>();
|
|
|
+ List<Double> varchar501s = new ArrayList<>();
|
|
|
+ List<Double> varchar502s = new ArrayList<>();
|
|
|
+ List<String> varchar503s = new ArrayList<>();
|
|
|
while (sqlRowList.next()){
|
|
|
- JSONObject jsonObject = new JSONObject();
|
|
|
- jsonObject.put("fd_3759c2d18852a0",sqlRowList.getString("cd_date_1"));
|
|
|
- jsonObject.put("fd_3759c2d33f14d0",sqlRowList.getGeneralDouble("cd_varchar50_1"));
|
|
|
- jsonObject.put("fd_3759c2e9805608",sqlRowList.getGeneralDouble("cd_varchar50_2"));
|
|
|
- jsonObject.put("fd_3759c3010a51ea",sqlRowList.getString("cd_varchar50_3"));
|
|
|
- jsonArr.add(jsonObject);
|
|
|
+ dates.add(sqlRowList.getString("cd_date_1"));
|
|
|
+ varchar501s.add(sqlRowList.getGeneralDouble("cd_varchar50_1"));
|
|
|
+ varchar502s.add(sqlRowList.getGeneralDouble("cd_varchar50_2"));
|
|
|
+ varchar503s.add(sqlRowList.getString("cd_varchar50_3"));
|
|
|
}
|
|
|
- json.put("fd_3759c29b9e5210",jsonArr);
|
|
|
+ json.put("fd_3759c29b9e5210.fd_3759c2d18852a0",JSONArray.parseArray(JSON.toJSONString(dates)));
|
|
|
+ json.put("fd_3759c29b9e5210.fd_3759c2d33f14d0",JSONArray.parseArray(JSON.toJSONString(varchar501s)));
|
|
|
+ json.put("fd_3759c29b9e5210.fd_3759c2e9805608",JSONArray.parseArray(JSON.toJSONString(varchar502s)));
|
|
|
+ json.put("fd_3759c29b9e5210.fd_3759c3010a51ea",JSONArray.parseArray(JSON.toJSONString(varchar503s)));
|
|
|
form.setFormValues(json.toString());
|
|
|
/*List<AttachmentForm> attForms = createAllAtts();*/
|
|
|
/* form.getAttachmentForms().add();*/
|
