From 4db2530d1bd178289b4f017967432caefb9435e6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 18 四月 2024 14:46:44 +0800
Subject: [PATCH] 首页的日历任务+我的日程,资质明细
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 85b7357..08ed607 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -479,14 +479,15 @@
JSONObject sheet = JSON.parseObject(JSON.toJSONString(JSON.parseArray(JSON.toJSONString(JSON.parseObject(thing).get("data"))).get(0)));
JSONObject config = JSON.parseObject(JSON.toJSONString(sheet.get("config")));
List<JSONObject> cellData = JSON.parseArray(JSON.toJSONString(sheet.get("celldata")), JSONObject.class);
- List<JSONObject> tableData = new ArrayList<>();
+// List<JSONObject> tableData = new ArrayList<>();
Map<String, Object> style = new HashMap<>();
style.put("rowlen", config.get("rowlen"));
style.put("columnlen", config.get("columnlen"));
int r = -1;
- if (BeanUtil.isNotEmpty(cellData)) {
+ /*if (BeanUtil.isNotEmpty(cellData)) {
for (JSONObject o : cellData) {
JSONObject v = JSON.parseObject(JSON.toJSONString(o.get("v")));
+ tableData.add(o);
if (BeanUtil.isNotEmpty(v.get("ps"))) {
JSONObject ps = JSON.parseObject(JSON.toJSONString(v.get("ps")));
if (ps.get("value").equals("妫�楠岄」") && v.get("v").equals(product.getInspectionItem())) {
@@ -504,8 +505,8 @@
}
}
}
- }
- product.setTemplate(tableData);
+ }*/
+ product.setTemplate(cellData);
product.setStyle(style);
}
}
--
Gitblit v1.9.3