From d526cf637048d71f046667f26e76436e9d489861 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期日, 23 四月 2023 22:45:11 +0800
Subject: [PATCH] 优化代码
---
service-report/src/main/java/com/java110/report/bmo/customReport/InspectionData.java | 48 +++++++++++++++++++++++-------------------------
1 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/bmo/customReport/InspectionData.java b/service-report/src/main/java/com/java110/report/bmo/customReport/InspectionData.java
index ad8da92..fb2d118 100644
--- a/service-report/src/main/java/com/java110/report/bmo/customReport/InspectionData.java
+++ b/service-report/src/main/java/com/java110/report/bmo/customReport/InspectionData.java
@@ -72,39 +72,37 @@
JSONObject paramOut = new JSONObject();
List sqlParams = new ArrayList();
- String sql = "select t.inspection_name '宸℃鐐�',t.point_obj_name '浣嶇疆',ips.staff_name '鍛樺伐',\n" +
- "(select count(1) from inspection_task it \n" +
+ String sql = "select t.inspection_name '宸℃鐐�',\n" +
+ "t.point_obj_name '浣嶇疆',\n" +
+ "ips.staff_name '鍛樺伐',\n" +
+ "(select count(1) from inspection_task it\n" +
"INNER JOIN inspection_task_detail itd on it.task_id = itd.task_id and itd.status_cd = '0'\n" +
- "where it.inspection_plan_id = ip.inspection_plan_id\n" +
- "and itd.inspection_id = t.inspection_id and it.plan_user_id = ips.staff_id\n" +
+ "where itd.inspection_id = t.inspection_id and it.plan_user_id = ips.staff_id\n" +
"and itd.act_user_id is not null\n" +
"and it.create_time > ?\n" +
"and it.create_time < ?\n" +
") '宸插贰妫�',\n" +
- "(select count(1) from inspection_task it \n" +
+ "(select count(1) from inspection_task it\n" +
"INNER JOIN inspection_task_detail itd on it.task_id = itd.task_id and itd.status_cd = '0'\n" +
- "where it.inspection_plan_id = ip.inspection_plan_id\n" +
- "and itd.inspection_id = t.inspection_id and it.plan_user_id = ips.staff_id\n" +
+ "where itd.inspection_id = t.inspection_id and it.plan_user_id = ips.staff_id\n" +
"and itd.act_user_id is null\n" +
"and it.create_time > ?\n" +
"and it.create_time < ?\n" +
") '鏈贰妫�',\n" +
- "(select itd.description from inspection_task it \n" +
+ "(select itd.description from inspection_task it\n" +
"INNER JOIN inspection_task_detail itd on it.task_id = itd.task_id and itd.status_cd = '0'\n" +
- "where it.inspection_plan_id = ip.inspection_plan_id\n" +
- "and itd.inspection_id = t.inspection_id and it.plan_user_id = ips.staff_id\n" +
- "and itd.act_user_id is not null\n" +
- "and it.create_time > ?\n" +
- "and it.create_time < ?\n" +
- "limit 1\n" +
- ") '鐘舵��'\n" +
- " from inspection_point t \n" +
- "left join inspection_route_point_rel irpr on t.inspection_id = irpr.inspection_id and irpr.status_cd = '0'\n" +
- "left join inspection_plan ip on ip.inspection_route_id = irpr.inspection_route_id and ip.status_cd = '0'\n" +
- "left join inspection_plan_staff ips on ip.inspection_plan_id = ips.inspection_plan_id and ips.status_cd = '0'\n" +
- "\n" +
- "where ips.staff_name is not null\n" +
- "and t.status_cd = '0'\n";
+ "where itd.inspection_id = t.inspection_id and it.plan_user_id = ips.staff_id\n" +
+ " and itd.act_user_id is not null\n" +
+ " and it.create_time > ?\n" +
+ " and it.create_time < ?\n" +
+ " limit 1\n" +
+ " ) '鐘舵��'\n" +
+ " from inspection_point t\n" +
+ " left join inspection_route_point_rel irpr on t.inspection_id = irpr.inspection_id and irpr.status_cd = '0'\n" +
+ " left join inspection_plan ip on ip.inspection_route_id = irpr.inspection_route_id and ip.status_cd = '0'\n" +
+ " left join inspection_plan_staff ips on ip.inspection_plan_id = ips.inspection_plan_id and ips.status_cd = '0'\n" +
+ " where ips.staff_name is not null\n" +
+ " and t.status_cd = '0'\n" ;
if (params.containsKey("startTime") && !StringUtils.isEmpty(params.getString("startTime"))) {
sqlParams.add(params.get("startTime"));
sqlParams.add(params.get("endTime"));
@@ -128,7 +126,7 @@
sqlParams.add(params.get("communityId"));
}
- sql += "group by t.inspection_name,t.point_obj_name,ips.staff_name\n" +
+ sql += "group by t.inspection_name,t.point_obj_name,ips.staff_name,t.inspection_id,ips.staff_id\n" +
"order by t.inspection_name";
@@ -137,8 +135,8 @@
System.out.println("datas=" + datas);
if (datas == null || datas.size() < 1) {
- paramOut.put("toatl", 1);
- paramOut.put("data", new JSONArray());
+ paramOut.put("total",1);
+ paramOut.put("data",new JSONArray());
return paramOut.toJSONString();
}
--
Gitblit v1.8.0