监控运营/协查单管理/协查单明细

src/main/java/com/hp/cmsz/repository/BusinessDao.java

@@ -83,6 +83,10 @@ public interface BusinessDao extends JpaSpecificationExecutor<Business>,
     @Query("select business from Business business where business.isActive = :isActived and business.channelDataSourceMapId in (:channelDataSourceMapIdList)")
     public List<Business> findBusinessListBychannelDataSourceMapIdListAndIsActived(@Param(value = "channelDataSourceMapIdList") List<Long>channelDataSourceMapIdList,@Param(value = "isActived") String isActived);
 
+    @Query(value = "select business_id,business_name from dim_business_info_t where business_id in( select distinct business_id from etl.run_task_t a ) and IS_ACTIVE= :isActived and CHANNEL_DATA_SOURCE_MAP_ID in (:channelDataSourceMapIdList)" ,nativeQuery =true )
+    public List<Object[]> findBusinessListBychannelDataSourceMapIdListAndIsActived2(
+            @Param(value = "channelDataSourceMapIdList") List<Long>channelDataSourceMapIdList,
+            @Param(value = "isActived") String isActived);
 
 }
 

src/main/java/com/hp/cmsz/repository/DimKpiDao.java

@@ -33,6 +33,11 @@ public interface DimKpiDao extends JpaSpecificationExecutor<DimKpi>,
 	public List<DimKpi> findDimKpiListBybusnameIdList(@Param(value = "busnameIdList") List<Long>busnameIdList);
 
 
+	//本语句 所对应的表非 本实体类对应的表 [临时加]
+	@Query(value = "select kpi_name,kpi_id from dim_kpi_info_t where business_id in (:busnameIdList) and IS_ACTIVE= :isActive ",nativeQuery = true)
+	public List<Object[]> findDimKpiListBybusnameIdList2(@Param(value = "busnameIdList") List<Long>busnameIdList,
+													   @Param(value = "isActive")String isActive);
+
 	@Query("select dimKpi from DimKpi dimKpi where dimKpi.kpiId in (:kpiIdList)")
 	public List<DimKpi> findDimKpiListBykpiIdList(@Param(value = "kpiIdList") List<Long>kpiIdList);
 

src/main/java/com/hp/cmsz/web/PageURLController.java

@@ -58,7 +58,8 @@ public class PageURLController {
 	//监控运营下的协查单分析
 	//WarnAnalysis映射到WEB-INF/views下的MonitorOperation/WorkingOrderAnalysis.jsp页面
 	public static String WorkingOrderAnalysis="MonitorOperation/WorkingOrderAnalysis";
-	
+	public static String CustomAnalysis="MonitorOperation/CustomAnalysis";
+
 	//监控运营下的故障页面 | author:August
 	//监控运营下的故障分析
 	//WarnAnalysis映射到WEB-INF/views下的MonitorOperation/WarnAnalysis.jsp页面

src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderAnalysis.jsp

@@ -31,6 +31,7 @@
 				<ul class="nav nav-tabs">
 					<li class="active"><a id="a_home" href="#home" data-toggle="tab">协查单统计</a> </li>
 					<li><a id="a_profile" href="${ctx}/MonitorOperation/WorkingOrderReasult">协查单明细</a></li>
+					<li><a id="b_home" href="${ctx}/MonitorOperation/CustomAnalysis">定制分析</a></li>>
 	<%-- 				<li><a id="a_profile" href="${ctx}/MonitorOperation/WorkingOrderAnalysisDetail">协查单明细展示</a> </li>  --%>
 				</ul>
 			</div>

src/main/webapp/static/js/xcdResultTable.js

@@ -130,23 +130,24 @@ function xcdFindTable(){
 		    	  header[0] = ["","<input type='radio' name='update'id='update' onclick='javascript:radioChoose(this);'/>","1%",""];
 		    	  header[1] = ["编号","workingOrderCode","4%",""];
 		    	  header[2] = ["协查单标题","workingOrderTitle","8%","15"];
-		    	  header[3] = ["协查单描述","workingOrderDescription","10%","18"];
+		    	  header[3] = ["协查单描述","workingOrderDescription","9%","18"];
 		    	  header[4] = ["省份","provinceName","4%",""];
 //		    	  header[5] = ["渠道","channelName","4%",""];
 //		    	  header[6] = ["重要级别","importanceLevelName","5%",""];
 //		    	  header[7] = ["告警来源","warningSourceName","5%",""];
-		    	  header[5] = ["事件发生时间","eventHappenTime","7%",""];
-		    	  header[6] = ["业务恢复时间","businessRecoveryTime","7%",""];
+		    	  header[5] = ["事件发生时间","eventHappenTime","8%",""];
+		    	  header[6] = ["业务恢复时间","businessRecoveryTime","8%",""];
 //		    	  header[10] = ["事件完成时间","eventCompletionTimeline","10%",""];
 //		    	  header[11] = ["实际完成时间","actualCompletionTime","10%",""];
 //		    	  header[12] = ["是否关闭","closed","5%",""];
 //		    	  header[13] = ["发生原因","occurReason","10%",""];
 //		    	  header[14] = ["解决状态","resolvingStatus","10%",""];
-		    	  header[7]=["事件子来源","suborigin","6%",""];
-		    	  header[8]=["原因类别","woReasonType","5%",""];
-		    	  header[9]=["原因子类一","woReasonSubTypeOne","6%",""];
-		    	  header[10]=["原因子类二","woReasonSubTypeTwo","6%",""];
-		    	  header[11]=["解决方案","proposedResolution","10%","20"];
+		    	  header[7]=["事件子来源","suborigin","7%",""];
+		    	  header[8]=["原因类别","woReasonType","6%",""];
+		    	  header[9]=["原因子类一","woReasonSubTypeOne","7%",""];
+		    	  header[10]=["原因子类二","woReasonSubTypeTwo","7%",""];
+		    	  header[11]=["解决方案","proposedResolution","9%","20"];
+		    	  header[12]=["分析报告","proposedResolution","9%","20"];
 //		    	  header[12]=["详细","","4%",""];
 		    	  
 		    		window.pagging = new table_pagging({limit:12,tableId:'xcdResultTable',header:header});