excel

VisualInspection/js/config.js

@@ -47,6 +47,23 @@ function getExcelServeraddr() {
     }
 }
 
+function getQzdExcelServeraddr() {
+    if (base_ui_url.indexOf("file_yanhai.jsxt.jsjtyxt.com") != -1) {
+        return "http://server_fwq_yanhai.jsxt.jsjtyxt.com:8283/";
+    } else if (base_ui_url.indexOf("file_release_yanhai") != -1) {
+        return "http://server_fwq_release_yanhai.jsxt.jsjtyxt.com:8283/";
+    } else if (base_ui_url.indexOf("localhost") != -1) {
+        // return "http://server_release_yanhai.jsxt.jsjtyxt.com/"
+        return "http://localhost:9001/"
+    } else if (base_ui_url.indexOf("200.200.19.126") != -1) {
+        return "http://200.200.19.126:9001/"
+    } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
+        return "http://192.168.8.236:9001/"
+    } else {
+        return "http://10.112.0.199:9001/"
+    }
+}
+
 function getImageaddr() {
     if (base_ui_url.indexOf("file_yanhai.jsxt.jsjtyxt.com") != -1) {
         return "http://file_release_yanhai.jsxt.jsjtyxt.com:8283/";

VisualInspection/qzd/view/other_check/96777_check.html

@@ -159,7 +159,7 @@
             if (second != '') {
                 param += "&dept_id=" + second;
             }
-            window.open(getExcelServeraddr() + "f/file/other/check/excel?check_type=13" + param);
+            window.open(getExcelServeraddr() + "q/file/other/check/excel?check_type=13" + param);
         }
 
         function exportThirds() {
@@ -173,6 +173,6 @@
             if (second != '') {
                 param += "&dept_id=" + second;
             }
-            window.open(getExcelServeraddr() + "f/file/other/check/static/excel?check_type=13" + param);
+            window.open(getExcelServeraddr() + "q/file/other/check/static/excel?check_type=13" + param);
         }
     </script>

VisualInspection/qzd/view/other_check/onsite_check.html

@@ -159,7 +159,7 @@
             if (second != '') {
                 param += "&dept_id=" + second;
             }
-            window.open(getExcelServeraddr() + "f/file/other/check/excel?check_type=11" + param);
+            window.open(getQzdExcelServeraddr() + "q/file/other/check/excel?check_type=11" + param);
         }
 
         function exportThirds() {
@@ -173,6 +173,6 @@
             if (second != '') {
                 param += "&dept_id=" + second;
             }
-            window.open(getExcelServeraddr() + "f/file/other/check/static/excel?check_type=11" + param);
+            window.open(getQzdExcelServeraddr() + "q/file/other/check/static/excel?check_type=11" + param);
         }
     </script>

VisualInspection/qzd/view/other_check/other_check.html

@@ -159,7 +159,7 @@
             if (second != '') {
                 param += "&dept_id=" + second;
             }
-            window.open(getExcelServeraddr() + "f/file/other/check/excel?check_type=14" + param);
+            window.open(getQzdExcelServeraddr() + "q/file/other/check/excel?check_type=14" + param);
         }
 
         function exportThirds() {
@@ -173,6 +173,6 @@
             if (second != '') {
                 param += "&dept_id=" + second;
             }
-            window.open(getExcelServeraddr() + "f/file/other/check/static/excel?check_type=14" + param);
+            window.open(getQzdExcelServeraddr() + "q/file/other/check/static/excel?check_type=14" + param);
         }
     </script>

VisualInspection/qzd/view/other_check/third_unannounced_check.html

@@ -159,7 +159,7 @@
             if (second != '') {
                 param += "&dept_id=" + second;
             }
-            window.open(getExcelServeraddr() + "f/file/other/check/excel?check_type=12" + param);
+            window.open(getExcelServeraddr() + "q/file/other/check/excel?check_type=12" + param);
         }
 
         function exportThirds() {
@@ -173,6 +173,6 @@
             if (second != '') {
                 param += "&dept_id=" + second;
             }
-            window.open(getExcelServeraddr() + "f/file/other/check/static/excel?check_type=12" + param);
+            window.open(getExcelServeraddr() + "q/file/other/check/static/excel?check_type=12" + param);
         }
     </script>

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/controller/FileExcelController_Q.java

@@ -4,7 +4,7 @@ import com.xintong.visualinspection.bean.FwqCheckOther;
 import com.xintong.visualinspection.bean.FwqDeptStatistic;
 import com.xintong.visualinspection.bean.FwqStatisticsBean;
 import com.xintong.visualinspection.util.DateUtil;
-import com.xintong.visualinspection.visuallnspection_qzd.service.CheckOtherService_F;
+import com.xintong.visualinspection.visuallnspection_qzd.service.CheckOtherService_Q;
 import com.xintong.visualinspection.visuallnspection_qzd.service.StatisticsService_F;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,11 +17,11 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 
 @RestController
-@RequestMapping("/f/file")
+@RequestMapping("/q/file")
 public class FileExcelController_Q extends BaseController {
 
     @Autowired
-    private CheckOtherService_F checkOtherService_f;
+    private CheckOtherService_Q checkOtherService_f;
     @Autowired
     private StatisticsService_F statisticsService_f;
 

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/CheckOtherService_Q.java

@@ -0,0 +1,35 @@
+package com.xintong.visualinspection.visuallnspection_qzd.service;
+
+import com.xintong.visualinspection.bean.FwqCheckOther;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+public interface CheckOtherService_Q {
+
+    /**
+     * 统计数据
+     *
+     * @param fwqOtherCheck
+     * @return
+     */
+    Map<String, Object> getCheckOtherStatistics(FwqCheckOther fwqOtherCheck);
+
+    /**
+     * 统计数据导出
+     *
+     * @param fwqOtherCheck
+     * @param req
+     * @param resp
+     */
+    void getExcel(FwqCheckOther fwqOtherCheck, HttpServletRequest req, HttpServletResponse resp);
+
+    /**
+     * 第三方暗访稽查导出excel
+     * @param fwqOtherCheck
+     * @param req
+     * @param resp
+     */
+    void getOtherCheckExcel(FwqCheckOther fwqOtherCheck, HttpServletRequest req, HttpServletResponse resp);
+}

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/CheckOtherService_FImpl.java

@@ -11,6 +11,7 @@ import com.xintong.visualinspection.service.CommonService;
 import com.xintong.visualinspection.util.DateUtil;
 import com.xintong.visualinspection.visuallnspection_qzd.dao.QzdCheckOtherDao;
 import com.xintong.visualinspection.visuallnspection_qzd.service.CheckOtherService_F;
+import com.xintong.visualinspection.visuallnspection_qzd.service.CheckOtherService_Q;
 import org.jxls.common.Context;
 import org.jxls.util.JxlsHelper;
 import org.slf4j.Logger;
@@ -40,7 +41,7 @@ import java.util.Map;
  * @date 2018/05/02
  */
 @Service
-public class CheckOtherService_FImpl implements CheckOtherService_F {
+public class CheckOtherService_FImpl implements CheckOtherService_Q {
 
     private static final Logger logger = LoggerFactory.getLogger(CheckOtherService_FImpl.class);
 
@@ -127,19 +128,24 @@ public class CheckOtherService_FImpl implements CheckOtherService_F {
             }
         }
 
-        // 获得所有服务区数据
-        List<FeeStation> saList = commonService.getAllDeptByLayer("SA");
+        List<FeeStation> saList = commonService.getAllDeptByLayer("WG");
         // 获得所有道管中心数据
         List<FeeStation> rmList = commonService.getAllDeptByLayer("RM");
 
         int checkType = fwqCheckOther.getCheck_type();
-        if (checkType == 8 || checkType == 9) {
-            Long id = 26L;
-            if (checkType == 8) {
-                id = 26L;
+        if (checkType == 11 || checkType == 12 || checkType == 13 || checkType == 14) {
+            Long id = 25L;
+            if (checkType == 11) {
+                id = 29L;
             }
-            if (checkType == 9) {
-                id = 27L;
+            if (checkType == 12) {
+                id = 30L;
+            }
+            if (checkType == 13) {
+                id = 31L;
+            }
+            if (checkType == 14) {
+                id = 32L;
             }
             //获取考核办法对应的考核项
             List<String> itemName = commonService.getCheckItemName(id);
@@ -201,17 +207,23 @@ public class CheckOtherService_FImpl implements CheckOtherService_F {
         String title = fwqCheckOther.getCheck_time_name();
         int checkType = fwqCheckOther.getCheck_type();
         fwqCheckOther.setCheck_period(title);
-        if (checkType == 8 || checkType == 9) {
-            Map<String, Object> m = getCheckOtherStatistics(fwqCheckOther);
-            Map<String, Object> map = new HashMap<>();
-            map.put("datas", m);
-
-            if (checkType == 8) {
+        if (checkType == 11 || checkType == 12 || checkType == 13 || checkType == 14) {
+            Long id = 25L;
+            if (checkType == 11) {
+                title += "月份服务区第三方暗访情况";
+            }
+            if (checkType == 12) {
+                title += "月份服务区第三方暗访情况";
+            }
+            if (checkType == 13) {
                 title += "月份服务区第三方暗访情况";
             }
-            if (checkType == 9) {
-                title += "月份服务区现场检查情况";
+            if (checkType == 14) {
+                title += "月份服务区第三方暗访情况";
             }
+            Map<String, Object> m = getCheckOtherStatistics(fwqCheckOther);
+            Map<String, Object> map = new HashMap<>();
+            map.put("datas", m);
             map.put("title", title.replaceAll("/", "-"));
 
             exportExcel(title.replaceAll("/", "-"), "fwq_other_check_info_anfang", map, httpServletResponse);
@@ -230,10 +242,14 @@ public class CheckOtherService_FImpl implements CheckOtherService_F {
 
         Map<String, Object> map = new HashMap<>();
         map.put("list", checkOtherList);
-        if (fwqCheckOther.getCheck_type() == 8) {
-            exportExcel("服务区第三方暗访稽查", "fwq_third_check", map, resp);
-        } else if (fwqCheckOther.getCheck_type() == 9) {
-            exportExcel("服务区现场稽查", "fwq_duty_check", map, resp);
+        if (fwqCheckOther.getCheck_type() == 12) {
+            exportExcel("清障队第三方暗访稽查", "qzd_third_check", map, resp);
+        } else if (fwqCheckOther.getCheck_type() == 11) {
+            exportExcel("清障队现场稽查", "qzd_duty_check", map, resp);
+        }else if (fwqCheckOther.getCheck_type() == 13) {
+            exportExcel("清障队96777", "qzd_96777_check", map, resp);
+        }else if (fwqCheckOther.getCheck_type() == 14) {
+            exportExcel("清障队其它稽查", "qzd_other_check", map, resp);
         }
     }