From a20310f135ebf1c8ccff2b619f3eff3d704436a0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 08 十二月 2022 13:12:03 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-report/src/main/java/com/java110/report/bmo/customReport/InspectionData.java |   80 ++++++++++++++++++++--------------------
 1 files changed, 40 insertions(+), 40 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 d789a5b..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
@@ -11,42 +11,42 @@
 
 /**
  * select t.inspection_name '宸℃鐐�',t.point_obj_name '浣嶇疆',ips.staff_name '鍛樺伐',
- (select count(1) from inspection_task it
- INNER JOIN inspection_task_detail itd on it.task_id = itd.task_id and itd.status_cd = '0'
- where it.inspection_plan_id = ip.inspection_plan_id
- and itd.inspection_id = t.inspection_id and it.plan_user_id = ips.staff_id
- and itd.act_user_id is not null
- ) '宸插贰妫�',
- (select count(1) from inspection_task it
- INNER JOIN inspection_task_detail itd on it.task_id = itd.task_id and itd.status_cd = '0'
- where it.inspection_plan_id = ip.inspection_plan_id
- and itd.inspection_id = t.inspection_id and it.plan_user_id = ips.staff_id
- and itd.act_user_id is null
- ) '鏈贰妫�',
- (select itd.description from inspection_task it
- INNER JOIN inspection_task_detail itd on it.task_id = itd.task_id and itd.status_cd = '0'
- where it.inspection_plan_id = ip.inspection_plan_id
- and itd.inspection_id = t.inspection_id and it.plan_user_id = ips.staff_id
- and itd.act_user_id is not null
- limit 1
- ) '鐘舵��'
- from inspection_point t
- left join inspection_route_point_rel irpr on t.inspection_id = irpr.inspection_id and irpr.status_cd = '0'
- left join inspection_plan ip on ip.inspection_route_id = irpr.inspection_route_id and ip.status_cd = '0'
- left join inspection_plan_staff ips on ip.inspection_plan_id = ips.inspection_plan_id and ips.status_cd = '0'
-
- where ips.staff_name is not null
- and t.community_id = #communityId#
- and t.status_cd = '0'
- <if test="startTime != null and startTime != ''">
- and ip.create_time &gt; #startTime#
- </if>
- <if test="endTime != null and endTime != ''">
- and ip.create_time &lt; #endTime#
- </if>
-
- group by t.inspection_name,t.point_obj_name,ips.staff_name
- order by t.inspection_name
+ * (select count(1) from inspection_task it
+ * INNER JOIN inspection_task_detail itd on it.task_id = itd.task_id and itd.status_cd = '0'
+ * where it.inspection_plan_id = ip.inspection_plan_id
+ * and itd.inspection_id = t.inspection_id and it.plan_user_id = ips.staff_id
+ * and itd.act_user_id is not null
+ * ) '宸插贰妫�',
+ * (select count(1) from inspection_task it
+ * INNER JOIN inspection_task_detail itd on it.task_id = itd.task_id and itd.status_cd = '0'
+ * where it.inspection_plan_id = ip.inspection_plan_id
+ * and itd.inspection_id = t.inspection_id and it.plan_user_id = ips.staff_id
+ * and itd.act_user_id is null
+ * ) '鏈贰妫�',
+ * (select itd.description from inspection_task it
+ * INNER JOIN inspection_task_detail itd on it.task_id = itd.task_id and itd.status_cd = '0'
+ * where it.inspection_plan_id = ip.inspection_plan_id
+ * and itd.inspection_id = t.inspection_id and it.plan_user_id = ips.staff_id
+ * and itd.act_user_id is not null
+ * limit 1
+ * ) '鐘舵��'
+ * from inspection_point t
+ * left join inspection_route_point_rel irpr on t.inspection_id = irpr.inspection_id and irpr.status_cd = '0'
+ * left join inspection_plan ip on ip.inspection_route_id = irpr.inspection_route_id and ip.status_cd = '0'
+ * left join inspection_plan_staff ips on ip.inspection_plan_id = ips.inspection_plan_id and ips.status_cd = '0'
+ * <p>
+ * where ips.staff_name is not null
+ * and t.community_id = #communityId#
+ * and t.status_cd = '0'
+ * <if test="startTime != null and startTime != ''">
+ * and ip.create_time &gt; #startTime#
+ * </if>
+ * <if test="endTime != null and endTime != ''">
+ * and ip.create_time &lt; #endTime#
+ * </if>
+ * <p>
+ * group by t.inspection_name,t.point_obj_name,ips.staff_name
+ * order by t.inspection_name
  */
 
 public class InspectionData implements ReportExecute {
@@ -132,7 +132,7 @@
 
         List datas = queryServiceDAOImpl.executeSql(sql, sqlParams.toArray());
 
-        System.out.println("datas="+datas);
+        System.out.println("datas=" + datas);
 
         if (datas == null || datas.size() < 1) {
             paramOut.put("total",1);
@@ -153,11 +153,11 @@
             }
 
             td.put(dataObj.get("鍛樺伐").toString(), dataObj.get("宸插贰妫�") + "/" + dataObj.get("鏈贰妫�"));
-            td.put(dataObj.get("鍛樺伐").toString()+"宸℃鐘舵��", dataObj.get("鐘舵��"));
+            td.put(dataObj.get("鍛樺伐").toString() + "宸℃鐘舵��", dataObj.get("鐘舵��"));
         }
 
-        paramOut.put("total",params.get("row"));
-        paramOut.put("data",tds);
+        paramOut.put("total", params.get("row"));
+        paramOut.put("data", tds);
 
         return paramOut.toJSONString();
     }

--
Gitblit v1.8.0