温红权 8 жил өмнө
parent
commit
569299cd88

+ 32 - 12
VisualInspection/js/other_check/other_check.js

@@ -757,6 +757,15 @@ function static() {
 
         post_common_service("/checkOther/getOtherCheckStatistics", p, function(data) {
 
+            var t1 = 0,
+                t2 = 0,
+                t3 = 0,
+                t4 = 0,
+                t5 = 0,
+                t6 = 0,
+                t7 = 0,
+                t8 = 0;
+
             var datas = '';
             for (var key in data) {
                 for (var i in data[key]) {
@@ -765,26 +774,37 @@ function static() {
                     if (i == 0) {
                         datas += '<td rowspan=' + data[key].length + '>' + key + "</td>";
                     }
-                    datas += '<td></td>';
-                    datas += '<td></td>';
+                    datas += '<td>' + data[key][i].cranking + '</td>';
+                    datas += '<td>' + data[key][i].rranking + '</td>';
                     datas += '<td>' + data[key][i].deptname + "</td>";
-                    datas += '<td></td>';
-                    datas += '<td></td>';
-                    datas += '<td></td>';
-                    datas += '<td></td>';
-                    datas += '<td></td>';
-                    datas += '<td></td>';
-                    datas += '<td></td>';
-                    datas += '<td></td>';
-                    datas += '<td></td>';
+                    datas += '<td>' + data[key][i].scoremap["环境卫生"] + '</td>';
+                    datas += '<td>' + data[key][i].scoremap["仪容仪表"] + '</td>';
+                    datas += '<td>' + data[key][i].scoremap["动作规范"] + '</td>';
+                    datas += '<td>' + data[key][i].scoremap["表情"] + '</td>';
+                    datas += '<td>' + data[key][i].scoremap["礼貌用语"] + '</td>';
+                    datas += '<td>' + data[key][i].scoremap["行为举止"] + '</td>';
+                    datas += '<td>' + data[key][i].scoremap["便民服务"] + '</td>';
+                    datas += '<td>' + data[key][i].totalScore + '</td>';
+                    datas += '<td>' + data[key][i].level + '</td>';
                     datas += '</tr>';
+
+                    t1 += data[key][i].scoremap["环境卫生"];
+                    t2 += data[key][i].scoremap["仪容仪表"];
+                    t3 += data[key][i].scoremap["动作规范"];
+                    t4 += data[key][i].scoremap["表情"];
+                    t5 += data[key][i].scoremap["礼貌用语"];
+                    t6 += data[key][i].scoremap["行为举止"];
+                    t7 += data[key][i].scoremap["便民服务"];
+                    t8 += data[key][i].totalScore;
                 }
             }
 
+            datas += '<tr><td colspan=4>合计</td><td>' + t1 + '</td><td>' + t2 + '</td><td>' + t3 + '</td><td>' + t4 + '</td><td>' + t5 + '</td><td>' + t6 + '</td><td>' + t7 + '</td><td>' + t8 + '</td><td>-</td></tr>';
+
             var html = ' <table class="statable">' +
                 '            <thead style="font-size:  20px;text-align:  center;border:  0px;">' +
                 '                <tr>' +
-                '                    <td colspan="13" style="padding:  10px;border:  0px;">各站第三方暗访情况</td>' +
+                '                    <td colspan="13" style="padding:  10px;border:  0px;">' + $("#month_date").val() + '第三方暗访情况</td>' +
                 '                </tr>' +
                 '            </thead>' +
                 '            <tbody>' +

+ 2 - 0
VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/CheckOther.java

@@ -59,6 +59,8 @@ public class CheckOther {
     // 特情稽查类型名称
     private String special_check_type_name;
 
+    private String pcheckname;
+
 
     private String check_period;
 }

+ 1 - 1
VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/CheckOtherMapper.xml

@@ -14,7 +14,7 @@
 	resultType="com.xintong.visualinspection.bean.CheckOther" >
        SELECT
 		o.id,o.dept_id,o.user_id,o.check_person_id,o.check_score,o.check_item_id,o.remark,o.check_type,o.file_ids,o.check_num,o.check_time,
-		o.check_time_name,o.delete_flag,o.update_time , t.ORGANNAME organname,u.TRUENAME  username,c.name check_item_name, o.wrecker_check_type,o.special_check_type
+		o.check_time_name,o.delete_flag,o.update_time , t.ORGANNAME organname,u.TRUENAME  username,c.name check_item_name, o.wrecker_check_type,o.special_check_type,(select if(p.score is NULL,p.name,(select name from check_item where id = p.parent_id)) from check_item p where p.id =o.check_item_id) pcheckname
 		FROM
 			(SELECT * FROM other_check
 			where 1=1 and check_type = #{check_type}

+ 20 - 0
VisualInspection_server/src/main/java/com/xintong/visualinspection/pojo/OtherCheckStatistics.java

@@ -15,5 +15,25 @@ public class OtherCheckStatistics {
     private String deptname;
     private String pdeptname;
     private HashMap<String,Integer> scoremap;
+    private Integer totalScore;
+    private String level;
+    private Integer cranking;
+    private Integer rranking;
+
+
+
+    public void setScoremap(HashMap<String, Integer> scoremap) {
+        this.scoremap = scoremap;
+
+        this.totalScore = 0;
+        for (Integer i:scoremap.values()
+             ) {
+            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="差";}
+    }
 
 }

+ 75 - 0
VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/CheckOtherServiceImpl.java

@@ -155,6 +155,13 @@ public class CheckOtherServiceImpl  extends BaseService implements CheckOtherSer
 
         List<FeeStation> liststation = departmentDao.getAllFS();
         List<FeeStation> list = departmentDao.getAllRM();
+
+
+        CheckOther checkOther = new CheckOther();
+        checkOther.setCheck_time_name(checktime);
+        checkOther.setCheck_type(checktype);
+        List<CheckOther> checkOthers =  checkOtherDao.getCheckByDeptId(checkOther);
+
 	    if(checktype==1){
             for (FeeStation station:liststation
                  ) {
@@ -163,8 +170,49 @@ public class CheckOtherServiceImpl  extends BaseService implements CheckOtherSer
                 otherCheckStatistics1.setDeptname(station.getName().replaceAll("收费站",""));
                 otherCheckStatistics1.setPdeptid(station.getParentid());
 //                otherCheckStatistics1.setPdeptname(pstation.getName());
+                HashMap<String,Integer> s = new HashMap<>();
+                for (CheckOther c :checkOthers){
+                    if((c.getDept_id()+"").equals(station.getDeptid())){
+                        Integer i = s.get(getItemName(c.getPcheckname()));
+                        if(i==null){i=0;}
+                        s.put(getItemName(c.getPcheckname()), Integer.valueOf((int) (i+c.getCheck_score())));
+                    }
+                }
+
+
+                s.put("环境卫生",s.get("环境卫生")==null?230:230-s.get("环境卫生"));
+                s.put("仪容仪表",s.get("仪容仪表")==null?170:170-s.get("仪容仪表"));
+                s.put("表情",s.get("表情")==null?100:100-s.get("表情"));
+                s.put("动作规范",s.get("动作规范")==null?100:100-s.get("动作规范"));
+                s.put("礼貌用语",s.get("礼貌用语")==null?200:200-s.get("礼貌用语"));
+                s.put("行为举止",s.get("行为举止")==null?120:120-s.get("行为举止"));
+                s.put("便民服务",s.get("便民服务")==null?80:80-s.get("便民服务"));
+
+
+                otherCheckStatistics1.setScoremap(s);
                 otherCheckStatistics.add(otherCheckStatistics1);
+
             }
+            otherCheckStatistics.sort(new Comparator<OtherCheckStatistics>() {
+                @Override
+                public int compare(OtherCheckStatistics o1, OtherCheckStatistics o2) {
+                    return o1.getTotalScore()>o2.getTotalScore()?-1:1;
+                }
+            });
+
+//            公司排名
+            int scount = 1;
+            for (int i=0;i<otherCheckStatistics.size();i++
+                 ) {
+                if(i>0){
+                    if(otherCheckStatistics.get(i).getTotalScore()<otherCheckStatistics.get(i-1).getTotalScore()){
+                        scount = i+1;
+                    }
+                }
+                otherCheckStatistics.get(i).setCranking(scount);
+            }
+
+
 
             for (FeeStation a:list
                     ) {
@@ -176,6 +224,19 @@ public class CheckOtherServiceImpl  extends BaseService implements CheckOtherSer
                         s.add(o);
                     }
                 }
+
+                //道管排名
+                scount = 1;
+                for (int i=0;i<s.size();i++
+                        ) {
+                    if(i>0){
+                        if(s.get(i).getTotalScore()<s.get(i-1).getTotalScore()){
+                            scount = i+1;
+                        }
+                    }
+                    s.get(i).setRranking(scount);
+                }
+
                 datas.put(a.getName().replaceAll("道管中心",""),s);
             }
         }
@@ -183,4 +244,18 @@ public class CheckOtherServiceImpl  extends BaseService implements CheckOtherSer
         return datas;
     }
 
+    private String getItemName(String n){
+        if(n.contains("环境卫生")){ return "环境卫生";}
+        if(n.contains("表情")){ return "表情";}
+        if(n.contains("仪容仪表")){ return "仪容仪表";}
+        if(n.contains("行为举止")){ return "行为举止";}
+        if(n.contains("便民服务")){ return "便民服务";}
+        if(n.contains("用语")){ return "礼貌用语";}
+        if(n.contains("动作")){ return "动作规范";}
+
+        if(n.contains("站容站貌")){ return "环境卫生";}
+        if(n.contains("安全管理")){ return "便民服务";}
+        return n;
+    }
+
 }