2017年12月15日智能分析平台提交内容

--数据质量规则批量插入优化和投诉文本明细数据筛选项更新条件字段

2017年12月15日智能分析平台提交内容
793255b1 · liuna · 3708ac12 · 793255b1 · 793255b1 · 793255b1
Commit 793255b1 authored Dec 15, 2017 by liuna
14 changed files
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,11 +7,18 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleReportInfoDao.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleReportInfoService.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/ReportOperationTable.jsp" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleOperationDetail.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleOperationDetail.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleReportInfoDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleReportInfoDao.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_YZDetailDataDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_YZDetailDataDao.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleInfoService.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleInfoService.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleReportInfoService.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleReportInfoService.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleService.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleService.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/TSWBAnalysisService.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/TSWBAnalysisService.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp" />
    </list>
    <ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" />
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -36,88 +43,29 @@
    <select />
  </component>
  <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="FilterRuleResult.jsp" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="194">
-              <caret line="108" column="70" lean-forward="false" selection-start-line="108" selection-start-column="70" selection-end-line="108" selection-end-column="70" />
-              <folding>
-                <marker date="1512974178792" expanded="true" signature="7804:7814" ph="..." />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="FilterRuleConfiguration.jsp" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleConfiguration.jsp">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="279">
-              <caret line="117" column="0" lean-forward="false" selection-start-line="117" selection-start-column="0" selection-end-line="117" selection-end-column="0" />
-              <folding>
-                <marker date="1512985966834" expanded="true" signature="9368:9378" ph="..." />
-                <marker date="1512985966834" expanded="true" signature="12349:12359" ph="..." />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="QualityRuleOperationController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleOperationController.java">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="QualityRuleService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleService.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="567">
-              <caret line="157" column="57" lean-forward="true" selection-start-line="157" selection-start-column="57" selection-end-line="157" selection-end-column="57" />
+            <state relative-caret-position="308">
+              <caret line="38" column="5" lean-forward="false" selection-start-line="38" selection-start-column="5" selection-end-line="38" selection-end-column="5" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="QualityRuleReportController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="267">
-              <caret line="176" column="29" lean-forward="false" selection-start-line="176" selection-start-column="29" selection-end-line="176" selection-end-column="29" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="QualityRuleOperationDetail.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleOperationDetail.java">
+      <file leaf-file-name="QualityRuleMaintainController.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1021">
-              <caret line="84" column="4" lean-forward="false" selection-start-line="84" selection-start-column="4" selection-end-line="90" selection-end-column="7" />
+            <state relative-caret-position="7">
+              <caret line="288" column="12" lean-forward="true" selection-start-line="288" selection-start-column="12" selection-end-line="288" selection-end-column="12" />
              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#4130#4131#0" expanded="true" />
-                <element signature="e#4163#4164#0" expanded="true" />
+                <element signature="e#9340#9353#0" expanded="true" />
              </folding>
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="QualityRuleReportInfoDao.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleReportInfoDao.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="10" column="101" lean-forward="false" selection-start-line="10" selection-start-column="101" selection-end-line="10" selection-end-column="101" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="QualityRuleReportInfoService.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleReportInfoService.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="139">
-              <caret line="9" column="26" lean-forward="true" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
    </leaf>
  </component>
  <component name="FileTemplateManagerImpl">
@@ -125,16 +73,14 @@
      <list>
        <option value="Tag Library Descriptor" />
        <option value="JavaScript File" />
-        <option value="Jsp File" />
        <option value="Interface" />
        <option value="Class" />
+        <option value="Jsp File" />
      </list>
    </option>
  </component>
  <component name="FindInProjectRecents">
    <findStrings>
-      <find>labelModelPeriod</find>
-      <find>dataModelViewList</find>
      <find>receiveRulePageNum</find>
      <find>initDate</find>
      <find>#updateRule</find>
@@ -163,6 +109,8 @@
      <find>ruleId</find>
      <find>updateTag</find>
      <find>ruleBack</find>
+      <find>start</find>
+      <find>qualityRuleReportList</find>
    </findStrings>
    <replaceStrings>
      <replace>InsideXcdWorkingOrderInfoView</replace>
@@ -185,11 +133,6 @@
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleView.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleViewService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleView.java" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/QualityRule_IfFilter.tag" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoViewService.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/AccuracyRuleService.java" />
@@ -200,10 +143,8 @@
        <option value="$PROJECT_DIR$/src/main/webapp/static/js/ruleResultDetailTable.js" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRule.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleService.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/QualityRule_IfWarning.tag.jsp" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/QualityRule_IfWarn.jsp" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/QualityRule_IfWarn.tag.jsp" />
@@ -216,7 +157,6 @@
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/TSWBAnalysisController.java" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleOperation.jsp" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleReport.jsp" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/TswbYzDetail.jsp" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/QualityRuleInfo_IfWarning.tag" />
@@ -226,16 +166,24 @@
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/QualityReportType.tag" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleInfo.java" />
-        <option value="$PROJECT_DIR$/src/main/webapp/static/js/ruleReportDetailTable.js" />
        <option value="$PROJECT_DIR$/src/main/webapp/static/js/filterResultDetailTable.js" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleConfiguration.jsp" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleInfoDao.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleInfoService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleReportInfoDao.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleReportInfoService.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/paging.tag" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleOperationDetail.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleReport.jsp" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/ReportOperation.jsp" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/ReportOperationTable.jsp" />
+        <option value="$PROJECT_DIR$/src/main/webapp/static/js/ruleReportDetailTable.js" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_YZDetailDataDao.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/TSWBAnalysisService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" />
      </list>
    </option>
  </component>
@@ -288,9 +236,6 @@
    </navigator>
    <panes>
      <pane id="Scratches" />
-      <pane id="AndroidView" />
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
      <pane id="ProjectPane">
        <subPane>
          <expand>
@@ -331,19 +276,58 @@
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="webapp" type="462c0819:PsiDirectoryNode" />
            </path>
+            <path>
+              <item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
+              <item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
+              <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
+              <item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
+              <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
+              <item name="layouts" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
+              <item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
+              <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
+              <item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
+              <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+              <item name="AnalysisSupport" type="462c0819:PsiDirectoryNode" />
+            </path>
          </expand>
          <select />
        </subPane>
      </pane>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
+      <pane id="AndroidView" />
    </panes>
  </component>
  <component name="PropertiesComponent">
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
-    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.last.edited" value="Modules" />
    <property name="project.structure.proportion" value="0.15" />
    <property name="project.structure.side.proportion" value="0.2" />
-    <property name="last_opened_file_path" value="D:/CMSZMonitorAnalysis/apache-tomcat-7.0.47/lib/servlet-api.jar!/" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
    <property name="settings.editor.selected.configurable" value="Settings.JavaScript" />
    <property name="ignore_missing_gitignore" value="true" />
    <property name="SearchEverywhereHistoryKey" value="Timestamp&#9;null&#9;null&#10;afe&#9;PSI&#9;JAVA://org.apache.fop.afp.AFPEventProducer&#10;hea&#9;FILE&#9;file://D:/代码/智能分析平台/CmszMonitorAnalysis/trunk/src/main/webapp/WEB-INF/layouts/header.jsp" />
@@ -595,6 +579,7 @@
      <workItem from="1512436761058" duration="22362000" />
      <workItem from="1512523323229" duration="32041000" />
      <workItem from="1512617826041" duration="45768000" />
+      <workItem from="1513234567411" duration="12666000" />
    </task>
    <task id="LOCAL-00001" summary="first commit">
      <created>1507828551888</created>
@@ -757,11 +742,25 @@
      <option name="project" value="LOCAL" />
      <updated>1513042121411</updated>
    </task>
-    <option name="localTasksCounter" value="24" />
+    <task id="LOCAL-00024" summary="2017年12月4日 智能分析平台提交内容&#10;      --质量报告页面点击详情修改">
+      <created>1513047537161</created>
+      <option name="number" value="00024" />
+      <option name="presentableId" value="LOCAL-00024" />
+      <option name="project" value="LOCAL" />
+      <updated>1513047537196</updated>
+    </task>
+    <task id="LOCAL-00025" summary="2017年12月14日 智能分析平台提交内容&#10;      --质量报告页面点击分页详情">
+      <created>1513231239552</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1513231239582</updated>
+    </task>
+    <option name="localTasksCounter" value="26" />
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="598013000" />
+    <option name="totallyTimeSpent" value="658737000" />
  </component>
  <component name="TodoView">
    <todo-panel id="selected-file">
@@ -775,43 +774,11 @@
  <component name="ToolWindowManager">
    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
    <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.58388156" sideWeight="0.5060606" order="8" side_tool="true" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39901477" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29836065" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.45409837" sideWeight="0.4939394" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.757377" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1732224" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
-      <window_info id="SVN Repositories" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.58388156" sideWeight="0.5060606" order="8" side_tool="true" content_ui="tabs" />
      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IvyIDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="17" side_tool="false" content_ui="tabs" />
      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -819,21 +786,28 @@
      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42459017" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32786885" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29836065" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32786885" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.37704918" sideWeight="0.4939394" order="5" side_tool="false" content_ui="tabs" />
      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.904918" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.61639345" sideWeight="0.4939394" order="5" side_tool="false" content_ui="tabs" />
      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32786885" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24205749" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24583964" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
+      <window_info id="SVN Repositories" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="IvyIDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
    </layout>
  </component>
  <component name="TypeScriptGeneratedFilesManager">
@@ -907,11 +881,13 @@
    <MESSAGE value="2017年12月4日 智能分析平台提交内容&#10;      --数据质量核查下质量规则运营页面数据展示改为一天" />
    <MESSAGE value="2017年12月4日 智能分析平台提交内容&#10;      --数据质量核查下质量规则运营页面数据修改" />
    <MESSAGE value="2017年12月4日 智能分析平台提交内容&#10;      --质量报告页面点击详情更换视图" />
-    <option name="LAST_COMMIT_MESSAGE" value="2017年12月4日 智能分析平台提交内容&#10;      --质量报告页面点击详情更换视图" />
+    <MESSAGE value="2017年12月4日 智能分析平台提交内容&#10;      --质量报告页面点击详情修改" />
+    <MESSAGE value="2017年12月14日 智能分析平台提交内容&#10;      --质量报告页面点击分页详情" />
+    <option name="LAST_COMMIT_MESSAGE" value="2017年12月14日 智能分析平台提交内容&#10;      --质量报告页面点击分页详情" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
-      <option name="time" value="78" />
+      <option name="time" value="87" />
    </breakpoint-manager>
    <watches-manager />
  </component>
@@ -928,87 +904,73 @@
    </buildFile>
  </component>
  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/TSWB_FocusData.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="9" column="4" lean-forward="false" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_WarningStatus.tag">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="660">
-          <caret line="30" column="9" lean-forward="false" selection-start-line="30" selection-start-column="9" selection-end-line="30" selection-end-column="9" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/GJFX_datasource_channle_business.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="44">
-          <caret line="2" column="19" lean-forward="false" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
-          <folding />
+        <state relative-caret-position="1712">
+          <caret line="108" column="70" lean-forward="false" selection-start-line="108" selection-start-column="70" selection-end-line="108" selection-end-column="70" />
+          <folding>
+            <marker date="1512974178792" expanded="true" signature="7804:7814" ph="..." />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleInfoService.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-4311">
-          <caret line="83" column="13" lean-forward="false" selection-start-line="83" selection-start-column="13" selection-end-line="83" selection-end-column="13" />
+        <state relative-caret-position="594">
+          <caret line="43" column="115" lean-forward="true" selection-start-line="43" selection-start-column="115" selection-end-line="43" selection-end-column="115" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/ProvinceTag.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleReportInfoService.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="32" column="33" lean-forward="false" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="33" />
-          <folding />
+        <state relative-caret-position="616">
+          <caret line="28" column="13" lean-forward="false" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="false" />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/Public_ProvinceTag.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleInfoDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="17" column="48" lean-forward="false" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="48" />
-          <folding />
+        <state relative-caret-position="85">
+          <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="5" selection-end-column="48" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleReportService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleReportInfoDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="22" column="53" lean-forward="false" selection-start-line="22" selection-start-column="53" selection-end-line="22" selection-end-column="53" />
+        <state relative-caret-position="44">
+          <caret line="2" column="7" lean-forward="false" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleReportDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleOperationDetail.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="11" column="17" lean-forward="false" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
+        <state relative-caret-position="95">
+          <caret line="166" column="5" lean-forward="true" selection-start-line="166" selection-start-column="5" selection-end-line="166" selection-end-column="5" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/TswbYzDetail.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="444">
-          <caret line="54" column="48" lean-forward="false" selection-start-line="54" selection-start-column="39" selection-end-line="54" selection-end-column="48" />
-          <folding />
+        <state relative-caret-position="-836">
+          <caret line="83" column="13" lean-forward="false" selection-start-line="83" selection-start-column="13" selection-end-line="83" selection-end-column="13" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/QualityRuleInfo_IfWarning.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderReasult.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="461">
-          <caret line="27" column="39" lean-forward="false" selection-start-line="27" selection-start-column="39" selection-end-line="27" selection-end-column="39" />
-          <folding />
+        <state relative-caret-position="1181">
+          <caret line="197" column="60" lean-forward="true" selection-start-line="197" selection-start-column="60" selection-end-line="197" selection-end-column="60" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <caret line="53" column="8" lean-forward="true" selection-start-line="53" selection-start-column="8" selection-end-line="53" selection-end-column="45" />
+        <state relative-caret-position="-3638">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
          <folding>
            <marker date="1512974178834" expanded="true" signature="47564:47620" ph="..." />
            <marker date="1512974178834" expanded="true" signature="47843:47854" ph="..." />
@@ -1016,309 +978,158 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/ruleResultDetailTable.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="8" column="44" lean-forward="true" selection-start-line="8" selection-start-column="44" selection-end-line="8" selection-end-column="44" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/YWTZ_PeriodTag.tag">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-137">
-          <caret line="96" column="9" lean-forward="false" selection-start-line="96" selection-start-column="9" selection-end-line="96" selection-end-column="9" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/DataManage/KnowledgeShare.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-533">
-          <caret line="176" column="13" lean-forward="false" selection-start-line="176" selection-start-column="13" selection-end-line="176" selection-end-column="13" />
+        <state relative-caret-position="-5676">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/AssociateDetails.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/TSWBAnalysisController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="72" lean-forward="false" selection-start-line="98" selection-start-column="72" selection-end-line="98" selection-end-column="72" />
+        <state relative-caret-position="169">
+          <caret line="89" column="5" lean-forward="true" selection-start-line="89" selection-start-column="5" selection-end-line="89" selection-end-column="5" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/PeriodTag.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/TswbFocus.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="457">
-          <caret line="124" column="9" lean-forward="false" selection-start-line="124" selection-start-column="9" selection-end-line="124" selection-end-column="9" />
+        <state relative-caret-position="1415">
+          <caret line="115" column="26" lean-forward="true" selection-start-line="115" selection-start-column="26" selection-end-line="115" selection-end-column="26" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleOperation.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="449">
-          <caret line="24" column="80" lean-forward="false" selection-start-line="24" selection-start-column="80" selection-end-line="24" selection-end-column="80" />
-          <folding>
-            <marker date="1512974178797" expanded="false" signature="2387:2401" ph="..." />
-            <marker date="1512974178797" expanded="false" signature="2511:2525" ph="..." />
-            <marker date="1512974178797" expanded="false" signature="2590:2602" ph="..." />
-          </folding>
+        <state relative-caret-position="-1068">
+          <caret line="18" column="30" lean-forward="true" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdChangeOrderDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/modernizr.custom.js">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-185">
-          <caret line="18" column="17" lean-forward="false" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
+        <state relative-caret-position="44">
+          <caret line="2" column="3" lean-forward="true" selection-start-line="2" selection-start-column="3" selection-end-line="2" selection-end-column="3" />
          <folding>
-            <marker date="1511516636212" expanded="true" signature="1814:2485" ph="select chang... xcd_change_order_info_t" />
-            <marker date="1511516636212" expanded="true" signature="1938:2155" ph="select occur... gjfx_warning_info_t" />
+            <element signature="n#!!doc" expanded="false" />
          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_FocusDataDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/classie.js">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="27">
-          <caret line="10" column="17" lean-forward="false" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/PzxDetailInfoViewDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1747">
-          <caret line="20" column="18" lean-forward="false" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="18" />
+        <state relative-caret-position="-430">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
          <folding>
-            <marker date="1511516636198" expanded="true" signature="827:1349" ph="SELECT to_ch... " />
-            <marker date="1511516636198" expanded="true" signature="1444:2035" ph="SELECT to_ch... " />
-            <marker date="1511516636198" expanded="true" signature="2355:3165" ph="SELECT to_ch... " />
-            <marker date="1511516636198" expanded="true" signature="3370:4124" ph="SELECT TO_CH... to_char" />
-            <marker date="1511516636198" expanded="true" signature="3475:4093" ph="SELECT to_ch... PZX_DETAIL_INFO_V" />
-            <marker date="1511516636198" expanded="true" signature="4401:5072" ph="SELECT A.mon... to_char" />
-            <marker date="1511516636198" expanded="true" signature="4446:4605" ph="select disti... DIM_DATE_INFO_T" />
-            <marker date="1511516636198" expanded="true" signature="4619:4987" ph="select to_ch... PZX_ATTRIBUTE_DETAIL_INFO_V" />
-            <marker date="1511516636198" expanded="true" signature="5210:5526" ph="SELECT A.CI_... CI_ATTRIBUTE_ID" />
-            <marker date="1511516636198" expanded="true" signature="5241:5441" ph="select CI_AT... DIM_CI_ATTRIBUTE_INFO_T" />
-            <marker date="1511516636198" expanded="true" signature="5665:6422" ph="SELECT A.mon... to_char" />
-            <marker date="1511516636198" expanded="true" signature="5710:5843" ph="select disti... DIM_DATE_INFO_T" />
-            <marker date="1511516636198" expanded="true" signature="5857:6337" ph="select to_ch... PZX_ATTRIBUTE_DETAIL_INFO_V" />
-            <marker date="1511516636198" expanded="true" signature="6673:7598" ph="SELECT A.mon... to_char" />
-            <marker date="1511516636198" expanded="true" signature="6718:6851" ph="select disti... DIM_DATE_INFO_T" />
-            <marker date="1511516636198" expanded="true" signature="6865:7513" ph="select to_ch... PZX_ATTRIBUTE_VALUE_DETAIL_INFO_V" />
-            <marker date="1511516636198" expanded="true" signature="7903:8853" ph="SELECT to_ch... WEEKEND_DATE" />
-            <marker date="1511516636198" expanded="true" signature="7973:8072" ph="SELECT disti... DIM_DATE_INFO_T" />
-            <marker date="1511516636198" expanded="true" signature="8087:8805" ph="select PZX_A... PZX_ATTRIBUTE_VALUE_DETAIL_INFO_V" />
-            <marker date="1511516636198" expanded="true" signature="9159:10211" ph="SELECT A.eve... TO_CHAR" />
-            <marker date="1511516636198" expanded="true" signature="9218:9375" ph="SELECT DISTI... DIM_DATE_INFO_T" />
-            <marker date="1511516636198" expanded="true" signature="9390:10110" ph="SELECT to_ch... PZX_ATTRIBUTE_VALUE_DETAIL_INFO_V" />
-            <marker date="1511516636198" expanded="true" signature="10474:11138" ph="SELECT A.PRO... PROVINCE_NAME" />
-            <marker date="1511516636198" expanded="true" signature="10526:10591" ph="SELECT PROVI... DIM_PROVINCE_INFO_T" />
-            <marker date="1511516636198" expanded="true" signature="10605:11066" ph="select PZX_D... PZX_DETAIL_INFO_V" />
-            <marker date="1511516636198" expanded="true" signature="11260:11874" ph="SELECT A.PRO... PROVINCE_NAME" />
-            <marker date="1511516636198" expanded="true" signature="11308:11373" ph="SELECT PROVI... DIM_PROVINCE_INFO_T" />
-            <marker date="1511516636198" expanded="true" signature="11387:11803" ph="select PZX_D... PZX_DETAIL_INFO_V" />
-            <marker date="1511516636198" expanded="true" signature="12044:12702" ph="SELECT A.CI_... CI_CATEGORY_NAME" />
-            <marker date="1511516636198" expanded="true" signature="12096:12142" ph="SELECT CI_CA... DIM_CI_CATEGORY_T" />
-            <marker date="1511516636198" expanded="true" signature="12157:12622" ph="select PZX_D... PZX_DETAIL_INFO_V" />
-            <marker date="1511516636198" expanded="true" signature="12885:13175" ph="select to_ch... pzx_detail_info_v" />
-            <marker date="1511516636198" expanded="true" signature="13291:13586" ph="select to_ch... pzx_detail_info_v" />
-            <marker date="1511516636198" expanded="true" signature="13747:14082" ph="select to_ch... pzx_detail_info_v" />
-            <marker date="1511516636198" expanded="true" signature="14345:14672" ph="select to_ch... pzx_detail_info_v" />
-            <marker date="1511516636198" expanded="true" signature="14878:15230" ph="select to_ch... pzx_detail_info_v" />
-            <marker date="1511516636198" expanded="true" signature="15433:15800" ph="select to_ch... pzx_detail_info_v" />
-            <marker date="1511516636198" expanded="true" signature="16021:16414" ph="select to_ch... pzx_detail_info_v" />
+            <element signature="n#!!doc" expanded="false" />
          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/DimKpiDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/ReportOperation.jsp" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleOperationController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-281">
-          <caret line="13" column="17" lean-forward="false" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
+        <state relative-caret-position="-49">
+          <caret line="162" column="0" lean-forward="true" selection-start-line="162" selection-start-column="0" selection-end-line="162" selection-end-column="0" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_YZDetailDataDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="27">
-          <caret line="11" column="17" lean-forward="false" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
+        <state relative-caret-position="-7155">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdDetailInfoViewDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/decorators.xml">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-944">
-          <caret line="22" column="18" lean-forward="false" selection-start-line="22" selection-start-column="18" selection-end-line="22" selection-end-column="18" />
-          <folding>
-            <marker date="1511516636213" expanded="true" signature="4082:4291" ph="select WORKI... XCD_WORKING_ORDER_INFO_T" />
-            <marker date="1511516636213" expanded="true" signature="4157:4245" ph="select 1 fro... GJFX_WARNING_INFO_T" />
-            <marker date="1511516636213" expanded="true" signature="4390:4599" ph="select WORKI... XCD_WORKING_ORDER_INFO_T" />
-            <marker date="1511516636213" expanded="true" signature="4465:4553" ph="select 1 fro... GJFX_WARNING_INFO_T" />
-            <marker date="1511516636213" expanded="true" signature="4759:4971" ph="select WORKI... XCD_WORKING_ORDER_INFO_T" />
-            <marker date="1511516636213" expanded="true" signature="4834:4922" ph="select 1 fro... GJFX_WARNING_INFO_T" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdWorkingOrderInfoDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1678">
-          <caret line="28" column="18" lean-forward="false" selection-start-line="28" selection-start-column="18" selection-end-line="28" selection-end-column="18" />
-          <folding>
-            <marker date="1511516636216" expanded="true" signature="5458:5690" ph="select worki... xcd_working_order_info_t" />
-            <marker date="1511516636216" expanded="true" signature="5603:5689" ph="select relev... gjfx_warning_info_t" />
-            <marker date="1511516636216" expanded="true" signature="5842:10196" ph="select worki... working_order_code" />
-            <marker date="1511516636216" expanded="true" signature="5939:6897" ph="select worki... working_order_code" />
-            <marker date="1511516636216" expanded="true" signature="6036:6709" ph="select worki... working_order_code" />
-            <marker date="1511516636216" expanded="true" signature="6198:6703" ph="select disti... gjfx_warning_info_t" />
-            <marker date="1511516636216" expanded="true" signature="6358:6448" ph="select kpi_i... gjfx_warning_info_t" />
-            <marker date="1511516636216" expanded="true" signature="6718:6860" ph="select cast(... dim_system_parameter_info_t" />
-            <marker date="1511516636216" expanded="true" signature="6908:7881" ph="select worki... working_order_code" />
-            <marker date="1511516636216" expanded="true" signature="7005:7694" ph="select worki... working_order_code" />
-            <marker date="1511516636216" expanded="true" signature="7167:7688" ph="select disti... gjfx_warning_info_t" />
-            <marker date="1511516636216" expanded="true" signature="7327:7422" ph="select busin... gjfx_warning_info_t" />
-            <marker date="1511516636216" expanded="true" signature="7702:7844" ph="select cast(... dim_system_parameter_info_t" />
-            <marker date="1511516636216" expanded="true" signature="7892:9009" ph="select worki... working_order_code" />
-            <marker date="1511516636216" expanded="true" signature="7991:8822" ph="select worki... working_order_code" />
-            <marker date="1511516636216" expanded="true" signature="8154:8816" ph="select disti... gjfx_warning_info_t" />
-            <marker date="1511516636216" expanded="true" signature="8405:8522" ph="select kpi_i... gjfx_warning_info_t" />
-            <marker date="1511516636216" expanded="true" signature="8830:8972" ph="select cast(... dim_system_parameter_info_t" />
-            <marker date="1511516636216" expanded="true" signature="9020:10160" ph="select worki... working_order_code" />
-            <marker date="1511516636216" expanded="true" signature="9119:9975" ph="select worki... working_order_code" />
-            <marker date="1511516636216" expanded="true" signature="9282:9969" ph="select disti... gjfx_warning_info_t" />
-            <marker date="1511516636216" expanded="true" signature="9553:9674" ph="select busin... gjfx_warning_info_t" />
-            <marker date="1511516636216" expanded="true" signature="9983:10123" ph="select cast(... dim_system_parameter_info_t" />
-            <marker date="1511516636216" expanded="true" signature="11027:12741" ph="select disti... working_order_code" />
-            <marker date="1511516636216" expanded="true" signature="11135:12706" ph="select worki... working_order_code" />
-            <marker date="1511516636216" expanded="true" signature="11240:12518" ph="select worki... working_order_code" />
-            <marker date="1511516636216" expanded="true" signature="11406:12512" ph="select disti... gjfx_warning_info_t" />
-            <marker date="1511516636216" expanded="true" signature="11844:11956" ph="select disti... gjfx_warning_info_t" />
-            <marker date="1511516636216" expanded="true" signature="12525:12669" ph="select cast(... dim_system_parameter_info_t" />
-            <marker date="1511516636216" expanded="true" signature="12915:13001" ph="update XCD_W... " />
-            <marker date="1511516636216" expanded="true" signature="13145:13210" ph="delete from " />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ProvinceVersionConfigDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-7">
-          <caret line="18" column="4" lean-forward="true" selection-start-line="18" selection-start-column="4" selection-end-line="18" selection-end-column="4" />
+        <state relative-caret-position="374">
+          <caret line="17" column="19" lean-forward="false" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="24" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/DataModelTypeDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/defaultNoHeaderAndFooter.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-249">
-          <caret line="16" column="17" lean-forward="false" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
+        <state relative-caret-position="-433">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/DataModelViewDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-381">
-          <caret line="16" column="17" lean-forward="false" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxDetailInfoDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="177">
-          <caret line="70" column="49" lean-forward="true" selection-start-line="70" selection-start-column="49" selection-end-line="70" selection-end-column="49" />
-          <folding>
-            <marker date="1511516636169" expanded="true" signature="7474:8209" ph="SELECT gjfx.... GJFX_DETAIL_INFO_V" />
-            <marker date="1511516636169" expanded="true" signature="7474:9192" ph="SELECT gjfx.... " />
-            <marker date="1511516636169" expanded="true" signature="8227:9160" ph="SELECT gjfx.... GJFX_DETAIL_INFO_V" />
-            <marker date="1511516636169" expanded="true" signature="9723:10413" ph="SELECT gjfx.... GJFX_DETAIL_INFO_V" />
-            <marker date="1511516636169" expanded="true" signature="9723:11351" ph="SELECT gjfx.... " />
-            <marker date="1511516636169" expanded="true" signature="10431:11319" ph="SELECT gjfx.... GJFX_DETAIL_INFO_V" />
-            <marker date="1511516636169" expanded="true" signature="15595:15959" ph="SELECT gjfx.... GJFX_DETAIL_INFO_V" />
-            <marker date="1511516636169" expanded="true" signature="15595:16570" ph="SELECT gjfx.... " />
-            <marker date="1511516636169" expanded="true" signature="15977:16538" ph="SELECT gjfx.... GJFX_DETAIL_INFO_V" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="30" column="56" lean-forward="true" selection-start-line="30" selection-start-column="56" selection-end-line="30" selection-end-column="72" />
+        <state relative-caret-position="2090">
+          <caret line="95" column="64" lean-forward="true" selection-start-line="95" selection-start-column="64" selection-end-line="95" selection-end-column="64" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/ruleResultDetailTable.js">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
-          <caret line="106" column="19" lean-forward="false" selection-start-line="106" selection-start-column="19" selection-end-line="106" selection-end-column="19" />
-          <folding />
+        <state relative-caret-position="-12870">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperation.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="181">
-          <caret line="96" column="97" lean-forward="false" selection-start-line="96" selection-start-column="97" selection-end-line="96" selection-end-column="97" />
+        <state relative-caret-position="2244">
+          <caret line="102" column="0" lean-forward="true" selection-start-line="102" selection-start-column="0" selection-end-line="102" selection-end-column="0" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/QualityReportType.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/paging.tag">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="7" column="15" lean-forward="false" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
+        <state relative-caret-position="493">
+          <caret line="45" column="65" lean-forward="false" selection-start-line="45" selection-start-column="54" selection-end-line="45" selection-end-column="65" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="529">
-          <caret line="113" column="82" lean-forward="true" selection-start-line="113" selection-start-column="82" selection-end-line="113" selection-end-column="82" />
+        <state relative-caret-position="238">
+          <caret line="20" column="34" lean-forward="true" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/RiskEarlyWarningDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/ReportOperationTable.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
-          <caret line="20" column="17" lean-forward="false" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
+        <state relative-caret-position="279">
+          <caret line="33" column="16" lean-forward="false" selection-start-line="33" selection-start-column="16" selection-end-line="33" selection-end-column="115" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleInfo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="182" column="33" lean-forward="false" selection-start-line="182" selection-start-column="33" selection-end-line="182" selection-end-column="33" />
-          <folding>
-            <element signature="e#4189#4190#0" expanded="true" />
-            <element signature="e#4239#4240#0" expanded="true" />
-            <element signature="e#4283#4284#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="24">
-          <caret line="24" column="42" lean-forward="false" selection-start-line="24" selection-start-column="42" selection-end-line="24" selection-end-column="42" />
+        <state relative-caret-position="0">
+          <caret line="121" column="45" lean-forward="false" selection-start-line="121" selection-start-column="45" selection-end-line="121" selection-end-column="45" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/ruleReportDetailTable.js">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="682">
-          <caret line="542" column="16" lean-forward="false" selection-start-line="542" selection-start-column="16" selection-end-line="542" selection-end-column="16" />
+        <state relative-caret-position="71">
+          <caret line="562" column="15" lean-forward="false" selection-start-line="562" selection-start-column="15" selection-end-line="562" selection-end-column="15" />
          <folding>
            <element signature="e#5827#5868#0" expanded="false" />
            <element signature="e#5921#7148#0" expanded="false" />
@@ -1350,136 +1161,197 @@
            <element signature="e#8758#8789#0" expanded="false" />
            <element signature="e#8838#8896#0" expanded="false" />
            <element signature="e#9133#9197#0" expanded="false" />
-            <marker date="1512985082209" expanded="true" signature="12471:12483" ph="..." />
-            <marker date="1512985082209" expanded="true" signature="17855:17865" ph="..." />
-            <marker date="1512985082209" expanded="true" signature="19081:19114" ph="..." />
-            <marker date="1512985082209" expanded="true" signature="19239:19253" ph="..." />
+            <element signature="e#13184#13222#0" expanded="false" />
+            <element signature="e#13364#13863#0" expanded="false" />
+            <element signature="e#13919#14181#0" expanded="false" />
+            <element signature="e#14222#14317#0" expanded="false" />
+            <element signature="e#14366#14493#0" expanded="false" />
+            <element signature="e#14554#17864#0" expanded="false" />
+            <element signature="e#17913#18670#0" expanded="false" />
+            <element signature="e#18695#18816#0" expanded="false" />
+            <marker date="1513222706555" expanded="true" signature="12403:12415" ph="..." />
+            <marker date="1513222706555" expanded="true" signature="17787:17797" ph="..." />
+            <marker date="1513222706555" expanded="true" signature="19779:19825" ph="..." />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleReport.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="174">
-          <caret line="99" column="68" lean-forward="false" selection-start-line="99" selection-start-column="68" selection-end-line="99" selection-end-column="68" />
+        <state relative-caret-position="220">
+          <caret line="45" column="17" lean-forward="true" selection-start-line="45" selection-start-column="17" selection-end-line="45" selection-end-column="17" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleConfigurationController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="108" column="70" lean-forward="false" selection-start-line="108" selection-start-column="70" selection-end-line="108" selection-end-column="70" />
-          <folding>
-            <marker date="1512974178792" expanded="true" signature="7804:7814" ph="..." />
-          </folding>
+        <state relative-caret-position="-1117">
+          <caret line="31" column="13" lean-forward="false" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/filterResultDetailTable.js">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleMaintainController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="357" column="0" lean-forward="false" selection-start-line="357" selection-start-column="0" selection-end-line="357" selection-end-column="0" />
+        <state relative-caret-position="63">
+          <caret line="151" column="35" lean-forward="false" selection-start-line="151" selection-start-column="35" selection-end-line="151" selection-end-column="35" />
          <folding>
-            <marker date="1512985469047" expanded="true" signature="11021:11033" ph="..." />
-            <marker date="1512985469047" expanded="true" signature="17276:17286" ph="..." />
+            <element signature="e#3339#3351#0" expanded="false" />
          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleConfiguration.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/FilterRuleService.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="557" column="17" lean-forward="true" selection-start-line="557" selection-start-column="17" selection-end-line="557" selection-end-column="17" />
+        <state relative-caret-position="660">
+          <caret line="35" column="0" lean-forward="true" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleConfiguration.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleService.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="279">
-          <caret line="117" column="0" lean-forward="false" selection-start-line="117" selection-start-column="0" selection-end-line="117" selection-end-column="0" />
-          <folding>
-            <marker date="1512985966834" expanded="true" signature="9368:9378" ph="..." />
-            <marker date="1512985966834" expanded="true" signature="12349:12359" ph="..." />
-          </folding>
+        <state relative-caret-position="308">
+          <caret line="38" column="5" lean-forward="false" selection-start-line="38" selection-start-column="5" selection-end-line="38" selection-end-column="5" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleConfigurationController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/AppDataDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2457">
-          <caret line="31" column="13" lean-forward="false" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" />
+        <state relative-caret-position="88">
+          <caret line="7" column="66" lean-forward="false" selection-start-line="7" selection-start-column="66" selection-end-line="7" selection-end-column="66" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleInfoDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/AnalysisTypeDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="32" column="194" lean-forward="true" selection-start-line="32" selection-start-column="4" selection-end-line="32" selection-end-column="194" />
+        <state relative-caret-position="147">
+          <caret line="15" column="73" lean-forward="false" selection-start-line="15" selection-start-column="73" selection-end-line="15" selection-end-column="73" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleReport.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/AnalysisType.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        <state relative-caret-position="147">
+          <caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleInfoService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_FocusDataDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="53" column="5" lean-forward="false" selection-start-line="51" selection-start-column="3" selection-end-line="53" selection-end-column="5" />
+        <state relative-caret-position="154">
+          <caret line="11" column="44" lean-forward="false" selection-start-line="11" selection-start-column="44" selection-end-line="11" selection-end-column="44" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleReportInfoDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/TSWB_FocusData.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="10" column="101" lean-forward="false" selection-start-line="10" selection-start-column="101" selection-end-line="10" selection-end-column="101" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="147">
+          <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleReportInfoService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_TZTemplateDataDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="139">
-          <caret line="9" column="26" lean-forward="true" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" />
+        <state relative-caret-position="88">
+          <caret line="9" column="81" lean-forward="false" selection-start-line="9" selection-start-column="81" selection-end-line="9" selection-end-column="81" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleOperationController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/TSWB_YZTemplateData.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="567">
-          <caret line="157" column="57" lean-forward="true" selection-start-line="157" selection-start-column="57" selection-end-line="157" selection-end-column="57" />
+        <state relative-caret-position="132">
+          <caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/AppData.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="267">
-          <caret line="176" column="29" lean-forward="false" selection-start-line="176" selection-start-column="29" selection-end-line="176" selection-end-column="29" />
+        <state relative-caret-position="147">
+          <caret line="17" column="13" lean-forward="false" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleOperationDetail.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/TswbYzDetail.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-968">
+          <caret line="28" column="21" lean-forward="true" selection-start-line="28" selection-start-column="21" selection-end-line="28" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/TswbYzDetailDataTable.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/springside-core-4.1.0.GA.jar!/org/springside/modules/persistence/SearchFilter.class">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1021">
-          <caret line="84" column="4" lean-forward="false" selection-start-line="84" selection-start-column="4" selection-end-line="90" selection-end-column="7" />
+        <state relative-caret-position="110">
+          <caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_YZFocusDataDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="9" column="79" lean-forward="false" selection-start-line="9" selection-start-column="79" selection-end-line="9" selection-end-column="79" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/TSWB_YZFocusData.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/TSWBAnalysisService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1144">
+          <caret line="96" column="41" lean-forward="false" selection-start-line="96" selection-start-column="41" selection-end-line="96" selection-end-column="41" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/TSWB_YZDetailData.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_YZDetailDataDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="34" lean-forward="false" selection-start-line="14" selection-start-column="34" selection-end-line="14" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="7">
+          <caret line="288" column="12" lean-forward="true" selection-start-line="288" selection-start-column="12" selection-end-line="288" selection-end-column="12" />
          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#4130#4131#0" expanded="true" />
-            <element signature="e#4163#4164#0" expanded="true" />
+            <element signature="e#9340#9353#0" expanded="true" />
          </folding>
        </state>
      </provider>
@@ -1491,9 +1363,9 @@
        <settings>
          <artifact-editor>
            <show-content>
-              <type id="library" />
              <type id="artifact" />
              <type id="javaee-facet-resources" />
+              <type id="library" />
              <type id="jpa-descriptors" />
            </show-content>
          </artifact-editor>
@@ -1546,7 +1418,7 @@
      </state>
      <state key="ModuleStructureConfigurable.UI">
        <settings>
-          <last-edited>Web|CmszMonitorAnalysis</last-edited>
+          <last-edited>CmszMonitorAnalysis</last-edited>
          <splitter-proportions>
            <option name="proportions">
              <list>

--- a/src/main/java/com/hp/cmsz/entity/QualityRuleOperationDetail.java
+++ b/src/main/java/com/hp/cmsz/entity/QualityRuleOperationDetail.java
@@ -185,4 +185,28 @@ public class QualityRuleOperationDetail {
    public void setWarningNum(Long warningNum) {
        this.warningNum = warningNum;
    }
+
+    @Override
+    public String toString() {
+        return "QualityRuleOperationDetail{" +
+                "qualityRuleId=" + qualityRuleId +
+                ", kpiId=" + kpiId +
+                ", businessId=" + businessId +
+                ", channelId=" + channelId +
+                ", dataSourceId=" + dataSourceId +
+                ", provinceId=" + provinceId +
+                ", kpiMonitorRunTime=" + kpiMonitorRunTime +
+                ", businessTime=" + businessTime +
+                ", kpiName='" + kpiName + '\'' +
+                ", kpiCode='" + kpiCode + '\'' +
+                ", businessName='" + businessName + '\'' +
+                ", channelName='" + channelName + '\'' +
+                ", dataSourceName='" + dataSourceName + '\'' +
+                ", provinceName='" + provinceName + '\'' +
+                ", warningType='" + warningType + '\'' +
+                ", ifFilter=" + ifFilter +
+                ", warningReason='" + warningReason + '\'' +
+                ", warningNum=" + warningNum +
+                '}';
+    }
 }
--- a/src/main/java/com/hp/cmsz/repository/QualityRuleReportInfoDao.java
+++ b/src/main/java/com/hp/cmsz/repository/QualityRuleReportInfoDao.java
@@ -2,6 +2,8 @@ package com.hp.cmsz.repository;

 import com.hp.cmsz.entity.QualityRuleOperationDetail;
 import com.hp.cmsz.entity.QualityRuleReport;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.PagingAndSortingRepository;

@@ -10,5 +12,6 @@ import java.util.List;

 public interface QualityRuleReportInfoDao extends JpaSpecificationExecutor<QualityRuleOperationDetail>,
        PagingAndSortingRepository<QualityRuleOperationDetail, Long> {
-    List<QualityRuleOperationDetail> findByProvinceIdAndKpiIdAndBusinessTimeBetweenOrderByBusinessTimeDescProvinceIdDescWarningNumAsc(Long provinceId, Long kpiId, Timestamp startTime, Timestamp endTime);
+
+    Page<QualityRuleOperationDetail> findByProvinceIdAndKpiIdAndBusinessTimeBetweenOrderByBusinessTimeDescProvinceIdDescWarningNumAsc(Long provinceId, Long kpiId, Timestamp startTime, Timestamp endTime,Pageable pageable);
 }
--- a/src/main/java/com/hp/cmsz/repository/TSWB_YZDetailDataDao.java
+++ b/src/main/java/com/hp/cmsz/repository/TSWB_YZDetailDataDao.java
@@ -12,7 +12,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 public interface TSWB_YZDetailDataDao extends JpaSpecificationExecutor<TSWB_YZDetailData>,
        PagingAndSortingRepository<TSWB_YZDetailData, Long> {

-    Page<TSWB_YZDetailData> findByProcessingTime(String month, Pageable pageable);
+    Page<TSWB_YZDetailData> findByFilingTime(String month, Pageable pageable);


 }
--- a/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleInfoService.java
+++ b/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleInfoService.java
@@ -52,6 +52,7 @@ public class QualityRuleInfoService {
    public List<QualityRuleReport> findBy(Long provinceId, Long kpiId, Timestamp startTime, Timestamp endTime){
        return qualityRuleInfoDao.findByProvinceIdAndKpiIdAndBusinessTimeBetweenOrderByBusinessTimeDescProvinceIdDescWarningNumAsc(provinceId,kpiId,startTime,endTime);
    }
+
    /**
     * 创建分页请求.
     */

--- a/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleReportInfoService.java
+++ b/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleReportInfoService.java
 package com.hp.cmsz.service.analysissupport;

+import com.hp.cmsz.entity.QualityRuleInfo;
 import com.hp.cmsz.entity.QualityRuleOperationDetail;
 import com.hp.cmsz.entity.QualityRuleReport;
 import com.hp.cmsz.repository.QualityRuleReportInfoDao;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
 import java.sql.Timestamp;
 import java.util.List;

 @Service
 @Transactional
 public class QualityRuleReportInfoService {
+
    @Autowired
    private QualityRuleReportInfoDao qualityRuleReportInfoDao;

-    public List<QualityRuleOperationDetail> findBy(Long provinceId, Long kpiId, Timestamp startTime, Timestamp endTime){
-        return qualityRuleReportInfoDao.findByProvinceIdAndKpiIdAndBusinessTimeBetweenOrderByBusinessTimeDescProvinceIdDescWarningNumAsc(provinceId,kpiId,startTime,endTime);
+    @PersistenceContext
+    EntityManager em;
+
+    public Page<QualityRuleOperationDetail> findBy(QualityRuleOperationDetail qualityRuleOperationDetail, int pageNumber, int pageSize, String sortType, Long provinceId, Long kpiId, Timestamp startTime, Timestamp endTime){
+        PageRequest pageRequest = buildPageRequest(pageNumber, pageSize, sortType, "qualityRuleId");
+        return qualityRuleReportInfoDao.findByProvinceIdAndKpiIdAndBusinessTimeBetweenOrderByBusinessTimeDescProvinceIdDescWarningNumAsc(provinceId,kpiId,startTime,endTime,pageRequest);
+    }
+
+    /**
+     * 创建分页请求.
+     */
+    private PageRequest buildPageRequest(int pageNumber, int pagzSize, String sortType, String sortFiled) {
+        Sort sort = new Sort(Sort.Direction.DESC, sortFiled);
+        return new PageRequest(pageNumber - 1, pagzSize, sort);
+    }
+    public List getData(String jhql) {
+        List dataList = em.createNativeQuery(jhql).getResultList();
+        em.close();
+        return dataList;
    }
 }
--- a/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleService.java
+++ b/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleService.java
 package com.hp.cmsz.service.analysissupport;

+import com.hp.cmsz.entity.QualityRule;
 import com.hp.cmsz.repository.QualityRuleDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
 import java.sql.Timestamp;
 import java.util.List;

@@ -17,9 +20,24 @@ import java.util.List;
 @Transactional
 public class QualityRuleService {

+    @PersistenceContext
+    protected EntityManager em;
+
    @Autowired
    private QualityRuleDao qualityRuleDao;

+    //批量插入
+    @Transactional
+    public void insertIntoRule(List<QualityRule> qualityRules){
+        for (int i = 0; i < qualityRules.size(); i++) {
+            em.persist(qualityRules.get(i));
+            if (i % 100 == 0) {
+                em.flush();
+                em.clear();
+            }
+        }
+    }
+
    //根据质量规则ID删除质量规则
    @Transactional(readOnly=false)
    public void deleteByQualityRuleId(List<Long> qualityRuleId){

--- a/src/main/java/com/hp/cmsz/service/analysissupport/TSWBAnalysisService.java
+++ b/src/main/java/com/hp/cmsz/service/analysissupport/TSWBAnalysisService.java
@@ -98,11 +98,11 @@ public class TSWBAnalysisService {
                                                                    Date endTime) {
        List<SearchFilter> filterList = new ArrayList<SearchFilter>();
        if (startTime != null ) {
-                filterList.add(new SearchFilter("processingTime", SearchFilter.Operator.GTE, startTime));
+                filterList.add(new SearchFilter("filingTime", SearchFilter.Operator.GTE, startTime));

        }
        if (endTime != null ) {
-                filterList.add(new SearchFilter("processingTime", SearchFilter.Operator.LTE, endTime));
+                filterList.add(new SearchFilter("filingTime", SearchFilter.Operator.LTE, endTime));
        }
        Specification<TSWB_YZDetailData> spec = DynamicSpecifications.bySearchFilter(filterList, TSWB_YZDetailData.class);
        return spec;

--- a/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java
+++ b/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java
@@ -260,22 +260,18 @@ public class QualityRuleMaintainController {
 								   		@RequestParam(value="frequencyValue") String frequencyValue,
 								   		@RequestParam(value="businessTime") String businessTime,
 				HttpServletResponse response, HttpServletRequest request) throws ParseException {
-
-		System.out.println("frequencyType:"+frequencyType+"kpiMonitorTimeValue:"+frequencyValue);
 			SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

 		List<Long> provinceIdList = new ArrayList<Long>();
 		for(int i=0;i<province.split(",").length;i++){
 			provinceIdList.add(Long.parseLong(province.split(",")[i]));
 		}
-		List<Long> businessIdList = new ArrayList<Long>();
-		for(int i=0;i<business.split(",").length;i++){
-			businessIdList.add(Long.parseLong(business.split(",")[i]));
-		}
+
 		List<Long> kpiIdList = new ArrayList<Long>();
 		for(int i=0;i<kpi.split(",").length;i++){
 			kpiIdList.add(Long.parseLong(kpi.split(",")[i]));
 		}
+		List<QualityRule> qualityRuleList = new ArrayList<QualityRule>();
 		for(int j=0; j<provinceIdList.size(); j++) {
 			for(int l=0; l<kpiIdList.size(); l++){
 				QualityRule qualityRule = new QualityRule();
@@ -312,17 +308,18 @@ public class QualityRuleMaintainController {
 				qualityRule.setRuleUpdateTime(Timestamp.valueOf(sd.format(new Date())));
 				qualityRule.setRuleValidFlag("1");
 				qualityRule.setIfSystemValue("1");
-				qualityRuleDao.save(qualityRule);
-				cmszOperationLogService.createLog("增加", "新建质量模型", "quality_rule_warehouse_info_t. QUALITY_RULE_ID=" + qualityRule.getQualityRuleId().toString());
+				cmszOperationLogService.createLog("增加", "新建质量模型","");
 				Long qualityRuleId = qualityRule.getQualityRuleId();
 				if(!qualityRuleIdList.isEmpty()){
 					accuracyRuleService.updateAccuracyRuleByAccuracyRuleIds(qualityRuleId, qualityRuleIdList);
 					qualityRuleIdList.clear();
 				}
-
+				qualityRuleList.add(qualityRule);
 				}
 			}

+			qualityRuleService.insertIntoRule(qualityRuleList);
+
 			return "redirect:/AnalysisSupport/QualityRuleResult";
 		}
 }
--- a/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java
+++ b/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java
@@ -14,11 +14,14 @@ import com.hp.cmsz.service.analysissupport.QualityRuleReportInfoService;
 import com.hp.cmsz.service.analysissupport.QualityRuleReportService;
 import com.hp.cmsz.web.PageURLController;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.util.HtmlUtils;

 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -162,31 +165,30 @@ public class QualityRuleReportController {
    }

    //查看数据质量运营内容
-    @RequestMapping(value = "/findOperation*",method = RequestMethod.GET)
-    @ResponseBody
-    public void findQuality(
+    @RequestMapping(value = "/findOperationFrame")
+    public ModelAndView findQuality(
            @RequestParam(value = "provinceId") String provinceId,
            @RequestParam(value = "kpiId") String kpiId,
            @RequestParam(value = "reportSumStartTime") String reportSumStartTime,
            @RequestParam(value = "reportSumEndTime") String reportSumEndTime,
+            @RequestParam(value = "sortType", defaultValue = "parameterId") String sortType,
+            @RequestParam(value = "page", defaultValue = "1") int pageNumber,
+            @RequestParam(value = "pageSize", defaultValue = "30") int pageSize,
            HttpServletResponse response) throws ParseException{
+        ModelAndView modelAndView = new ModelAndView("AnalysisSupport/ReportOperationTable");
+        QualityRuleOperationDetail qualityRuleOperationDetail = new QualityRuleOperationDetail();
        Long province = Long.parseLong(provinceId);
        Long kpi = Long.parseLong(kpiId);
        Timestamp startTime = Timestamp.valueOf(reportSumStartTime);
        Timestamp endTime =Timestamp.valueOf(reportSumEndTime);
-        List<QualityRuleOperationDetail> qualityRuleReportList = qualityRuleReportInfoService.findBy(province,kpi,startTime,endTime);
+        sortType = HtmlUtils.htmlEscape(sortType);
+        Page<QualityRuleOperationDetail> qualityRuleOperationDetailPage = qualityRuleReportInfoService.findBy(qualityRuleOperationDetail, pageNumber, pageSize, sortType,province,kpi,startTime,endTime);
+        modelAndView.addObject("qualityRuleOperationDetailPage", qualityRuleOperationDetailPage);
+        modelAndView.addObject("pageSize", pageSize);
+        modelAndView.addObject("sortType", sortType);
        cmszOperationLogService.createLog("查询","数据质量规则运营","查询数据质量运营明细");
-        Gson gson = new Gson();
-        response.setContentType("text/Xml;charset=gbk");
-        PrintWriter out = null;

-        try {
-            out = response.getWriter();
-            out.println(gson.toJson(qualityRuleReportList));
-        } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
+        return modelAndView;
    }

 }
--- a/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/TSWB_YZDetailDataDao.class
+++ b/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/TSWB_YZDetailDataDao.class
--- a/src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/analysissupport/TSWBAnalysisService.class
+++ b/src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/analysissupport/TSWBAnalysisService.class
--- a/src/main/webapp/WEB-INF/views/AnalysisSupport/ReportOperationTable.jsp
+++ b/src/main/webapp/WEB-INF/views/AnalysisSupport/ReportOperationTable.jsp
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags"%>
+<table class="table table-hover table-striped">
+    <thead>
+    <tr>
+        <th width="6.4%">省份</th>
+        <th width="6.4%">数据来源</th>
+        <th width="6.4%">渠道</th>
+        <th width="6.4%">业务</th>
+        <th width="6.4%">指标名称</th>
+        <th width="6.4%">指标编码</th>
+        <th width="6.4%">告警类型</th>
+        <th width="6.4%">告警原因</th>
+        <th width="6.4%">指标监控范围</th>
+        <th width="6.4%">指标采集时间</th>
+    </tr>
+    </thead>
+    <tbody>
+
+    <c:forEach items="${qualityRuleOperationDetailPage.content}" var="qualityRuleOperationDetail">
+        <tr>
+            <td>${qualityRuleOperationDetail.provinceName} </td>
+            <td>${qualityRuleOperationDetail.dataSourceName}</td>
+            <td>${qualityRuleOperationDetail.channelName}</td>
+            <td>${qualityRuleOperationDetail.businessName}</td>
+            <td>${qualityRuleOperationDetail.kpiName}</td>
+            <td>${qualityRuleOperationDetail.kpiCode}</td>
+            <td>${qualityRuleOperationDetail.warningType}</td>
+            <td>${qualityRuleOperationDetail.warningReason}</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>
+</table>
+<tags:paging page="${qualityRuleOperationDetailPage}" paginationSize="${pageSize}" />
--- a/src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp
+++ b/src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp
@@ -38,8 +38,8 @@
            <td>${qualityRuleInfo.kpiCode}</td>
            <td>${qualityRuleInfo.warningType}</td>
            <td>${qualityRuleInfo.warningReason}</td>
-            <td>${qualityRuleInfo.kpiMonitorRunTime}</td>
-            <td>${qualityRuleInfo.businessTime}</td>
+            <td><fmt:formatDate value="${qualityRuleInfo.kpiMonitorRunTime}" pattern="yyyy-MM-dd hh:mm:ss" /></td>
+            <td><fmt:formatDate value="${qualityRuleInfo.businessTime}" pattern="yyyy-MM-dd hh:mm:ss" /></td>
            <%--<td>--%>
                <%--<c:if test="${qualityRuleInfo.ifFilter == '0'}">未过滤</c:if>--%>
                <%--<c:if test="${qualityRuleInfo.ifFilter == '1'}">已过滤</c:if>--%>