Merge remote-tracking branch 'origin/liuna'

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

@@ -90,7 +90,7 @@ public class QualityRuleOperationController {
         //查询出所有的指标
         List<Kpi> kpiList=(List<Kpi>)kpiDao.findAll();
         //查询出所有的业务
-        List<String> businessList=businessService.getAllBusinessIdAndBusinessName();
+        List<String> businessList=businessService.getBusinessIdAndBusinessName();
         //查询出所有的数据来源信息
         List<DataSource> datasourceList=dataSourceDao.findDataSource();
 

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

@@ -30,8 +30,9 @@
             <%--<td>${qualityRuleOperationDetail.kpiCode}</td>--%>
             <td>${qualityRuleOperationDetail.warningType}</td>
             <td>${qualityRuleOperationDetail.warningReason}</td>
+                <td><fmt:formatDate value="${qualityRuleOperationDetail.businessTime}" pattern="yyyy-MM-dd hh:mm:ss" /></td>
             <td><fmt:formatDate value="${qualityRuleOperationDetail.kpiMonitorRunTime}" pattern="yyyy-MM-dd hh:mm:ss" /> </td>
-            <td><fmt:formatDate value="${qualityRuleOperationDetail.businessTime}" pattern="yyyy-MM-dd hh:mm:ss" /></td>
+
         </tr>
     </c:forEach>
     </tbody>

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

@@ -16,7 +16,6 @@
     <script language="javascript">
 
         $(document).ready(function(){
-            $("#businessSelectAreaStats").hide();
             initDate();
             queryResult(1);
 
@@ -37,15 +36,15 @@
                                       method="post">
                                     <div class="slide-menu-option">
                                         <tags:PeriodTag />
-                                        <tags:ProvinceTag/>
-                                        <tags:GJFX_datasource_channle_business/>
+                                        <tags:ProvinceTag />
+                                        <tags:Quality_dataSource_channel_business/>
                                         <tags:QualityRule_IfFilter />
 
 
                                     </div>
                                     <div class="slide-menu-option">
                                         <button type="input" class="btn btn-primary" onclick="searchData();return false;">提交</button>
-                                        <button type="reset" class="btn btn-warning">重置</button>
+                                        <button type="reset" class="btn btn-warning" onclick="operationResultReset()">重置</button>
                                     </div>
                                 </form>
                             </div>
@@ -106,7 +105,6 @@
     }
 
     function queryResult(page) {
-
         $.ajax({
             type : 'post',
             'url' : '${ctx}/AnalysisSupport/QualityRuleOperation/queryOperationFrame',
@@ -126,6 +124,13 @@
         listForm.attr("action","#");
     });
 
+    function operationResultReset(){
+        initDate();
+        ProvinceReset();
+        RelFilterRest();
+        statsDataSourceReset();//三级联动重置
+    }
+
 </script>
 </body>
 </html>

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

@@ -39,8 +39,8 @@
             <td>${qualityRuleInfo.kpiCode}</td>
             <td>${qualityRuleInfo.warningType}</td>
             <td>${qualityRuleInfo.warningReason}</td>
-            <td><fmt:formatDate value="${qualityRuleInfo.kpiMonitorRunTime}" pattern="yyyy-MM-dd hh:mm" /></td>
             <td><fmt:formatDate value="${qualityRuleInfo.businessTime}" pattern="yyyy-MM-dd hh:mm" /></td>
+            <td><fmt:formatDate value="${qualityRuleInfo.kpiMonitorRunTime}" pattern="yyyy-MM-dd hh:mm" /></td>
             <td><a href='javascript:;' onclick='selectRule(${qualityRuleInfo.qualityRuleId})'>查看规则</a></td>
                 <%--<td>--%>
                 <%--<c:if test="${qualityRuleInfo.ifFilter == '1'}">无过滤规则</c:if>--%>