表格

VisualInspection/js/other_check/other_check.js

@@ -836,7 +836,7 @@ function static() {
                 shadeClose: true,
                 skin: 'layui-layer-nobg', //没有背景色
                 resize: true,
-                content: "<div style='width:100%;background: #fff;text-align: center;padding:10px'>   <button class=\"btn btn-info3\" type=\"button\" style=\"    position: absolute;right: 10px;top: 17px;\" onclick=\"exportThird()\"> 导出Excel</button>" + html + "</div>"
+                content: "<div style='width:100%;background: #fff;text-align: center;padding:10px'>   <button class=\"btn btn-info3\" type=\"button\" style=\"    position: absolute;right: 10px;top: 17px;\" onclick=\"exportThirds()\"> 导出Excel</button>" + html + "</div>"
             });
         });
 

VisualInspection/view/other_check/third_unannounced_check.html

@@ -161,4 +161,18 @@
             }
             window.open(getserveraddr() + "/file/other/check/excel?check_type=1" + param);
         }
+
+        function exportThirds() {
+            var param = '';
+            var month_date = $("#month_date").val();
+            var first = $("#first").val();
+            var second = $("#second").val();
+            if (month_date != '') {
+                param = "&check_time_name=" + month_date;
+            }
+            if (second != '') {
+                param += "&dept_id=" + second;
+            }
+            window.open(getserveraddr() + "/file/other/check/static/excel?check_type=1" + param);
+        }
     </script>

VisualInspection/view/other_check/toubleshoot_check.html

@@ -29,7 +29,7 @@
             <div style="float:right;margin-right:30px;">
                 <button class="btn btn-primary" type="button" id="add_btn"><i class="icon icon-plus-sign"></i> 增加稽查记录</button>
 
-                <button class="btn btn-info3" type="button" style="margin-left:30px;" onclick="exportThird()" > 导出Excel</button>
+                <button class="btn btn-info3" type="button" style="margin-left:30px;" onclick="exportThird()"> 导出Excel</button>
             </div>
         </div>
     </div>
@@ -148,17 +148,31 @@
             init();
         });
 
-        function exportThird(){
-             var param = '';
-             var month_date = $("#month_date").val();
-             var first =  $("#first").val(); 
-             var second = $("#second").val();
-            if( month_date != '' ){
-                param = "&check_time_name="+month_date ;
+        function exportThird() {
+            var param = '';
+            var month_date = $("#month_date").val();
+            var first = $("#first").val();
+            var second = $("#second").val();
+            if (month_date != '') {
+                param = "&check_time_name=" + month_date;
             }
-            if( second != '' ){
-                param += "&dept_id="+ second ;
+            if (second != '') {
+                param += "&dept_id=" + second;
             }
             window.open(getserveraddr() + "/file/other/check/excel?check_type=5" + param);
         }
+
+        function exportThirds() {
+            var param = '';
+            var month_date = $("#month_date").val();
+            var first = $("#first").val();
+            var second = $("#second").val();
+            if (month_date != '') {
+                param = "&check_time_name=" + month_date;
+            }
+            if (second != '') {
+                param += "&dept_id=" + second;
+            }
+            window.open(getserveraddr() + "/file/other/check/static/excel?check_type=5" + param);
+        }
     </script>

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/FileExcelController.java

@@ -216,5 +216,12 @@ public class FileExcelController extends BaseController {
     	checkOtherService.getOtherCheckExcel(checkOther, req, resp);
     	return super.returnSuccessResult(null);
     }
+
+    @RequestMapping(value = "/other/check/static/excel",method=RequestMethod.GET)
+    public String getOtherCheckststic(HttpServletRequest req,HttpServletResponse resp,
+                                CheckOther checkOther){
+        checkOtherService.getexcel(checkOther, req, resp);
+        return super.returnSuccessResult(null);
+    }
     
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/pojo/OtherCheckStatistics.java

@@ -31,9 +31,9 @@ public class OtherCheckStatistics {
             this.totalScore+=i;
         }
         this.level="优秀";
-        if(this.totalScore<1000 && this.totalScore>900 ){ this.level="优良";}
-        if(this.totalScore<900 && this.totalScore>800 ){ this.level="中";}
-        if(this.totalScore<800 ){ this.level="差";}
+        if(this.totalScore<1000 && this.totalScore>=985 ){ this.level="优秀";}
+        if(this.totalScore<985 && this.totalScore>=950 ){ this.level="优良";}
+        if(this.totalScore<950 ){ this.level="合格";}
     }
 
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/CheckOtherService.java

@@ -43,6 +43,8 @@ public interface CheckOtherService {
 	 */
 	void update(CheckOther checkOther);
 
+    public void getexcel(CheckOther checkOther, HttpServletRequest req, HttpServletResponse resp);
+
 
 	public Map<String,Object> getOtherCheckStatistics(String checktime, int checktype);
 

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/CheckOtherServiceImpl.java

@@ -244,6 +244,18 @@ public class CheckOtherServiceImpl  extends BaseService implements CheckOtherSer
         return datas;
     }
 
+    @Override
+    public void getexcel(CheckOther checkOther, HttpServletRequest req, HttpServletResponse resp){
+        if(checkOther.getCheck_type() == 1){
+           Map<String,Object> m= getOtherCheckStatistics(checkOther.getCheck_time_name(),checkOther.getCheck_type());
+           Map<String,Object> map = new HashMap<>();
+           map.put("datas",m);
+            String a = (String) map.keySet().toArray()[0];
+           exportExcel("第三方暗访情况" , "other_check_info_anfang", map, resp);
+        }
+
+    }
+
     private String getItemName(String n){
         if(n.contains("环境卫生")){ return "环境卫生";}
         if(n.contains("表情")){ return "表情";}
@@ -254,7 +266,7 @@ public class CheckOtherServiceImpl  extends BaseService implements CheckOtherSer
         if(n.contains("动作")){ return "动作规范";}
 
         if(n.contains("站容站貌")){ return "环境卫生";}
-        if(n.contains("安全管理")){ return "便民服务";}
+        if(n.contains("安全管理")){ return "环境卫生";}
         return n;
     }