Merge remote-tracking branch 'origin/liuna'

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

@@ -18,4 +18,7 @@ public interface QualityRuleViewDao extends JpaSpecificationExecutor<QualityRule
 
     //筛选项加指标编码
     List<QualityRuleView> findByDataSourceIdInAndChannelIdInAndBusinessIdInAndKpiCodeOrderByQualityRuleIdAscBusinessTimeDesc(List<Long> dataSource,List<Long> chnnal,List<Long> busines,String kpiCode);
+
+    //筛选项指标编码
+    List<QualityRuleView> findByKpiCode(String kpiCode);
 }

src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleViewService.java

@@ -25,4 +25,9 @@ public class QualityRuleViewService {
         return qualityRuleViewDao.findByDataSourceIdInAndChannelIdInAndBusinessIdInAndKpiCodeOrderByQualityRuleIdAscBusinessTimeDesc(dataSource,chnnal,busines,kpiCode);
     }
 
+    //按指标编码查
+    public List<QualityRuleView> getQualityRuleByKpiCode(String kpiCode){
+        return qualityRuleViewDao.findByKpiCode(kpiCode);
+    }
+
 }

src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java

@@ -123,14 +123,22 @@ public class QualityRuleResultController {
 			String[] dataSourceS=dataSource.split(",");
 			String[] chnnalS=chnnal.split(",");
 			String[] bussinesS =bussines.split(",");
-			List<Long> dataSourceList=changeStrToList(dataSourceS);
-			List<Long> chnnalList=changeStrToList(chnnalS);
-			List<Long> bussinesList=changeStrToList(bussinesS);
 			if(code.equals("")){
+				List<Long> dataSourceList = changeStrToList(dataSourceS);
+				List<Long> chnnalList = changeStrToList(chnnalS);
+				List<Long> bussinesList = changeStrToList(bussinesS);
 				qualityRuleViewList = qualityRuleViewService.getQualityRuleViewBy(dataSourceList,chnnalList,bussinesList);
-			}else{
-				qualityRuleViewList = qualityRuleViewService.getBy(dataSourceList,chnnalList,bussinesList,code);
+			}else {
+				if(!dataSource.equals("") && !chnnal.equals("") && !bussinesS.equals("")){
+					List<Long> dataSourceList = changeStrToList(dataSourceS);
+					List<Long> chnnalList = changeStrToList(chnnalS);
+					List<Long> bussinesList = changeStrToList(bussinesS);
+					qualityRuleViewList = qualityRuleViewService.getBy(dataSourceList,chnnalList,bussinesList,code);
+				} else{
+					qualityRuleViewList = qualityRuleViewService.getQualityRuleByKpiCode(code);
+				}
 			}
+
 			Gson gson = new Gson();
 			response.setContentType("text/Xml;charset=gbk");
 			PrintWriter out = null;
@@ -141,7 +149,6 @@ public class QualityRuleResultController {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
-
 		}
 
 		//将string数据类型转换成List<Long>类型
@@ -150,7 +157,6 @@ public class QualityRuleResultController {
 			for(int i=0;i<str.length;i++){
 				list.add(Long.parseLong(str[i]));
 			}
-
 			return list;
 		}
 		

src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp

@@ -173,14 +173,6 @@ $("#createRule").click(function(){
                 });
             }
         }else if(code!==""){
-            if(dataSource==""){
-                $.alert("数据来源的选择不能为空");
-            }else if(chnnal===""){
-                $.alert("渠道的选择不能为空");
-            }else if(bussines===""){
-                $.alert("业务的选择不能为空");
-            }else{
-                toggleMenu('slidePushMenus');//隐藏筛选项
                 //数据来源标签
                 $('#DataSourceTag').text("数据来源").append($("<span class='badge'></span>").text(getStatsDataSourceCheckedValues().length)).attr('data-original-title',getStatsDataSourceCheckedTitles()).tooltip();
 
@@ -210,15 +202,13 @@ $("#createRule").click(function(){
                     }
                 });
             }
-        }
-
-
     }
 
 	function ruleResultReset(){
         $("#kpiCodeID").attr("value",'');
 		statsDataSourceReset();//三级联动重置
 	}
+
 $("#updateRule").click(function(){
     var qualityRuleId = $("input[name='checkbox']:checked").val();
     location.href="${ctx}/AnalysisSupport/QualityRuleConfiguration?qualityRuleId="+qualityRuleId;

src/main/webapp/static/js/ruleReportDetailTable.js

@@ -589,6 +589,7 @@ function selectOperation(qualityVerificationReportId) {
             } else {
                 data.accuracyPro = (data.accuracyPro * 100).toFixed(0) + "%";
             }
+
             $.dialog({
                 title: "数据质量运营明细",
                 content: "<div class='dialog-p' style='max-height: 560px; overflow-y: scroll; overflow-x: auto;'>" +
@@ -616,6 +617,12 @@ function selectOperation(qualityVerificationReportId) {
                 "        <td>" + data.kpiCode + "</td>" +
                 "    </tr>" +
                 "    <tr>" +
+                "        <td>开始时间</td>" +
+                "        <td>" + df.format(new Date(data.reportSumStartTime)) + "</td>" +
+                "        <td>结束时间</td>" +
+                "        <td>" + df.format(new Date(data.reportSumEndTime)) + "</td>" +
+                "    </tr>" +
+                "    <tr>" +
                 "        <td>完整性数量</td>" +
                 "        <td>" + data.integralityNum + "</td>" +
                 "        <td>完整性占比</td>" +