更新

src/main/resources/report.sql

@@ -16,7 +16,7 @@ left outer join t_department on t_user.defaultdepartment=t_department.ID
 where  t_department.ID in (select  ID from t_department start with ID=#para(ID) connect by prior ID=superior)
 and e.created between to_date(#para(begin),'yyyy-mm-dd hh24:mi:ss') and to_date(#para(end),'yyyy-mm-dd hh24:mi:ss')
 
-#if(name)
+#if(name&&name=='结束')
 and e.STATELABEL = '结束'
 #else
 and e.STATELABEL != '结束'
@@ -47,7 +47,7 @@ and e.STATELABEL != '结束'
 
 ###试验类型统计
 #sql("type")
- select  #para(DOMAINID) AS DOMAINID,nvl(item_experiment_type,'空')as item_experiment_type,count(*) as item_invalue from tlk_entrustment
+ select  #para(DOMAINID) AS DOMAINID,nvl(item_experiment_type,'其他')as item_experiment_type,count(*) as item_invalue from tlk_entrustment
  left outer join t_user on t_user.ID=author
  left outer join t_department on t_user.defaultdepartment=t_department.ID
  where  t_department.ID in (select  ID from t_department start with ID=#para(ID) connect by prior ID=superior)
@@ -57,12 +57,17 @@ and e.STATELABEL != '结束'
 
 ###试验类型统计列表
 #sql("type_list")
- select  t_user.name,t.ID,t.ITEM_WT_NUM,t.ITEM_TITLE,t.item_experiment_type from tlk_entrustment t
+ select  t_user.name,t.ID,t.ITEM_WT_NUM,t.ITEM_TITLE,nvl(t.item_experiment_type,'其他')as item_experiment_type from tlk_entrustment t
  left outer join t_user on t_user.ID=author
  left outer join t_department on t_user.defaultdepartment=t_department.ID
  where  t_department.ID in (select  ID from t_department start with ID=#para(ID) connect by prior ID=superior)
  and created between to_date(#para(begin),'yyyy-mm-dd hh24:mi:ss') and to_date(#para(end),'yyyy-mm-dd hh24:mi:ss')
+ #if(name&&name!='其他')
  and item_experiment_type=#para(name)
+ #else
+ and item_experiment_type IS NULL
+ #end
+
 #end
 
 ###样机试验统计
@@ -90,7 +95,7 @@ WHERE
 ###产品线统计
 #sql("product")
 SELECT
-	nvl(y.item_product,'空')as item_product,
+	nvl(y.item_product,'其他')as item_product,
 	count( * ) AS item_invalue
 FROM
 	TLK_EXAMINE y
@@ -114,7 +119,13 @@ WHERE
 	1 = 1
 	AND y.created BETWEEN to_date(#para(begin), 'yyyy-mm-dd hh24:mi:ss' )
 	AND to_date(#para(end), 'yyyy-mm-dd hh24:mi:ss' )
-	AND y.item_product =#para(name)
+
+	 #if(name&&name!='其他')
+      AND y.item_product =#para(name)
+     #else
+      AND y.item_product IS NULL OR y.item_product =#para(name)
+     #end
+
 #end
 
 ###数据查询与统计

src/main/webapp/WEB-INF/view/report/product.html

@@ -108,10 +108,17 @@
             initEcharts(data) {
                 let legend = [];
                 let series = [];
+                let other=0;
                 data.forEach(item => {
-                    legend.push(item.ITEM_PRODUCT);
-                    series.push(item.ITEM_INVALUE);
+                    if(item.ITEM_PRODUCT!='其他'){
+                        legend.push(item.ITEM_PRODUCT);
+                        series.push(item.ITEM_INVALUE);
+                    }else{
+                        other=other+item.ITEM_INVALUE;
+                    }
                 });
+                legend.push("其他");
+                series.push(other);
                 let option = {
                     title: {
                         text: '产品线统计',