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

src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderReasultController.java

@@ -69,6 +69,7 @@ import com.hp.cmsz.service.monitoroperation.GjfxWarningInfoService;
 import com.hp.cmsz.service.monitoroperation.XcdWarningInfoViewService;
 
 import com.hp.cmsz.repository.XcdDetailInfoViewDao;
+
 /**
  * WorkingOrderReasultControll类负责对协查单管理页面进行控制
  *
@@ -437,7 +438,7 @@ public class WorkingOrderReasultController {
             if (size2 >= 4) {
                 if (report == -1) {
                     xcdWorkingOrderInfoS = xcdWorkingOrderInfoService.getAllXcdWorkingOrderInfoNotRelBy(time1, time2, providerS, datasourceS, channelS, provinceS);
-                }else{
+                } else {
                     xcdWorkingOrderInfoS = xcdWorkingOrderInfoService.getAllXcdWorkingOrderInfoNotRelBy1(time1, time2, providerS, datasourceS, channelS, provinceS, report);
                 }
                 staticXcdDetailInfoView = xcdWorkingOrderInfoS;
@@ -451,13 +452,13 @@ public class WorkingOrderReasultController {
                     }
                     if (report == -1) {
                         xcdWorkingOrderInfoS = xcdWorkingOrderInfoService.getAllXcdWorkingOrderInfoNotRelBy(time1, time2, providerS, datasourceS, channelS, provinceS);
-                    }else{
+                    } else {
                         xcdWorkingOrderInfoS = xcdWorkingOrderInfoService.getAllXcdWorkingOrderInfoNotRelBy1(time1, time2, providerS, datasourceS, channelS, provinceS, report);
                     }
                 } else {
                     if (report == -1) {
                         xcdWorkingOrderInfoS = xcdWorkingOrderInfoService.getAllXcdWorkingOrderInfoNotRelBy(time1, time2, providerS, datasourceS, channelS, provinceS);
-                    }else{
+                    } else {
                         xcdWorkingOrderInfoS = xcdWorkingOrderInfoService.getAllXcdWorkingOrderInfoNotRelBy1(time1, time2, providerS, datasourceS, channelS, provinceS, report);
                     }
                 }
@@ -797,6 +798,8 @@ public class WorkingOrderReasultController {
             if (xcdWorkingOrderInfo.getActualCompletionTime() != null)
                 row.createCell(12).setCellValue(df.format(xcdWorkingOrderInfo.getActualCompletionTime()));
 
+
+
 //			if(xcdWorkingOrderInfo.getClosed()!=null)row.createCell(11).setCellValue(xcdWorkingOrderInfo.getClosed());
 //			if(xcdWorkingOrderInfo.getOccurReason()!=null)row.createCell(12).setCellValue(xcdWorkingOrderInfo.getOccurReason());
             if (xcdWorkingOrderInfo.getResolvingStatus() != null)
@@ -814,7 +817,23 @@ public class WorkingOrderReasultController {
                 row.createCell(18).setCellValue(xcdWorkingOrderInfo.getFailureReason());
             if (xcdWorkingOrderInfo.getAffectregion() != null)
                 row.createCell(19).setCellValue(xcdWorkingOrderInfo.getAffectregion());
-
+            if (xcdWorkingOrderInfo.getIfReportFile() != '\0') {
+                char c = xcdWorkingOrderInfo.getIfReportFile();
+                String s = "";
+                switch (c) {
+                    case '1':
+                        s = "有";
+                        break;
+                    case '0':
+                        s = "无";
+                        break;
+                    default:
+                        s = "";
+                }
+                System.out.println("分析报告== "+xcdWorkingOrderInfo.getIfReportFile());
+                System.out.println("分析报告== "+ s);
+                row.createCell(20).setCellValue(s);
+            } ;
 
         }
 

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

@@ -320,6 +320,11 @@
         initDataSource();//数据来源
         initBusiness();//业务
         initKpi();//指标
+
+        $('input[name="allDataSource"]').prop("checked", true);
+        $('input[name="datasource"]').prop("checked", true);
+
+
 //        initReport();//定制分析
     });
 

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

@@ -453,7 +453,8 @@ $(function () {
         + "&province2=" + "-1"
         + "&datasource=" + "-1"
         + "&provider=" + "-1"
-        + "&xcdcode=" + "-1";
+        + "&xcdcode=" + "-1"
+        + "&report=" + "-1";
 
 
     $("#submit2").click(function () {