修改部分bug

VisualInspection/fwq/view/statistics/dept_check_statistics.html

@@ -1,4 +1,4 @@
-<!--服务区-营运管理提升综合成绩汇总表-->
+<!--服务区-综合成绩汇总表-->
 <script src="/js/statistics/common_statistic.js?__inline"></script>
 <script src="/fwq/js/statistics/dept_check_statistics.js"></script>
 

VisualInspection/fwq/view/statistics/service_area_data_statistics.html

@@ -14,8 +14,8 @@
         </div>
         <!-- <div class="div-select col-sm-2"><select class="form-control" id="select-personal"></select></button>
         </div> 2期无人员-->
-        <div class="col-sm-3">
-            <div class="div-start col-sm-5">
+        <div class="col-sm-1">
+            <div class="div-start">
                 <input class="form-control" id="start-time" placeholder="选择年月"></input>
             </div>
             <!-- <div class="div-to col-sm-1"><label for="exampleInputAccount1">-</label></div>
@@ -46,14 +46,14 @@
             </div>
         </div> -->
         <div class="line-5"></div>
-        <div class="current-month">
+        <div class="current-month" style="width: 89.8%;">
             <span style="margin-left:20px;">本月：</span>
             <span>公司排名：</span><span style="display: -moz-inline-box;display: inline-block;width:100px" id="c_com_ranking">-</span>
             <span>总扣分：</span><span style="display: -moz-inline-box;display: inline-block;width:100px" id="c_score_ranking">-</span>
 
         </div>
-        <div class="line-6"></div>
-        <div class="next-month">
+        <div class="line-6" style="width: 89.8%;"></div>
+        <div class="next-month" style="width: 89.8%;">
             <span style="margin-left:20px;">上月：</span>
             <span>公司排名：</span><span style="display: -moz-inline-box;display: inline-block;width:100px" id="l_com_ranking">-</span>
             <span>总扣分：</span><span style="display: -moz-inline-box;display: inline-block;width:100px" id="l_score_ranking">-</span>

VisualInspection/fwq/view/statistics/total_company_statistics.html

@@ -47,54 +47,31 @@
             </div>
         </div>
     </div>
-    <!-- <div class="border-line">
-        <div class="row-4">
-            <div class="col-sm-6"><span>公司考核扣分情况占比</span></div>
-             <div class="line-2"></div>
-            <div class="col-sm-6"><span>道管中心得分排名</span></div>
-        </div>
-        <div class="row-5">
-            <div id="company-points-assess" style="width:49%;height:400px;float:left;"></div>
-             <div class="line-3"></div>
-            <div id="roadManager-score-rank" style="width:49%;height:400px;float:left;"></div>
-        </div>
-    </div> -->
-
 
-
-    <div class="border-line">
-        <div class="row-6">
-            <div class="title-div"><span>公司全体服务区排名</span></div>
-        </div>
-        <div id="company-stationAll-rank" style="width:100%;height:400px;"></div>
-    </div>
-
-    <div class="row">
+    <div class="row" style="margin-top: 15px;">
         <div class="col-sm-6">
             <div class="border-no">
-                <div class="title-div"><span>温馨服务检查问题类别占比</span></div>
-                <div id="server-check-type" style="width:100%;height:400px;float:left;"></div>
+                <div class="title-div"><span>公司全体服务区排名</span></div>
+                <div id="company-stationAll-rank" style="width:100%;height:400px;float:left;background-color: #fff;"></div>
             </div>
         </div>
+        <!-- <div class="line-3"></div> -->
         <div class="col-sm-6">
             <div class="border-no">
+                <div class="title-div"><span class="title-span">温馨服务检查问题类别占比</span></div>
+                <div id="server-check-type" style="width:100%;height:400px;float:left;background-color: #fff;"></div>
+            </div>
+        </div>
+    </div>
+
+    <div class="border-line">
+        <div>
+            <div class="border-no">
                 <div class="title-div"><span>各个问题类别的扣分情况</span></div>
                 <div id="each-people-points" style="width:100%;height:400px;float:left;"></div>
             </div>
         </div>
     </div>
-    <!-- <div class="border-line">
-        <div class="row-7">
-            <div class="col-1"><span>温馨服务检查问题类别占比</span></div>
-            <div class="line-2"></div>
-            <div class="col-1"><span>各个问题类别的扣分情况</span></div>
-        </div>
-        <div class="row-8">
-            <div id="server-check-type" style="width:49%;height:400px;float:left;"></div>
-            <div class="line-3"></div>
-            <div id="each-people-points" style="width:49%;height:400px;float:left;"></div>
-        </div>
-    </div> -->
 
 </div>
 <script>

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/mapper/master/StatisticsMapper.xml

@@ -14,7 +14,7 @@
         WHERE
         o.check_type = #{check_type}
         <if test="start_date!=null and end_date != null">
-            AND o.check_time &gt;= #{start_date} AND o.check_time &lt;= #{end_date}
+            AND o.check_time &gt;= #{start_date} AND o.check_time &lt; #{end_date}
         </if>
         GROUP BY
         dept_id
@@ -28,7 +28,7 @@
         FROM view_check_task t
         WHERE 1=1
         <if test="start_date!=null and end_date != null">
-            AND t.start_time &gt;= #{start_date} AND t.end_time &lt;= #{end_date}
+            AND t.start_time &gt;= #{start_date} AND t.end_time &lt; #{end_date}
         </if>
         <if test="period_id != null and period_id != ''">
             AND t.period_id = #{period_id}
@@ -47,7 +47,7 @@
         JOIN view_check_task ct ON ct.id = t.task_id
         WHERE t.check_item_score IS NOT NULL
         <if test="start_date!=null and end_date != null">
-            AND ct.start_time &gt;= #{start_date} AND ct.end_time &lt;= #{end_date}
+            AND ct.start_time &gt;= #{start_date} AND ct.end_time &lt; #{end_date}
         </if>
         <if test="period_id != null and period_id != ''">
             AND ct.period_id = #{period_id}
@@ -69,7 +69,7 @@
         JOIN view_check_task ct ON ct.id = t.task_id
         WHERE 1 = 1
         <if test="start_date!=null and end_date != null">
-            AND ct.start_time &gt;= #{start_date} AND ct.end_time &lt;= #{end_date}
+            AND ct.start_time &gt;= #{start_date} AND ct.end_time &lt; #{end_date}
         </if>
         <if test="dept_id!=null">
             AND t.checked_dept =#{dept_id}

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/service/impl/StatisticsServiceImpl.java

@@ -152,7 +152,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
             }
         }
 
-        CheckTaskPeriod period = commonService.getCheckTaskPeriod(obj.getStart_date().getTime(), obj.getEnd_date().getTime());
+        CheckTaskPeriod period = commonService.getCheckTaskPeriod(obj.getStart_date().getTime()+1 * 1000 * 60 * 60, obj.getEnd_date().getTime()+1 * 1000 * 60 * 60);
 
         if (period != null) {
             for (FwqStatisticsBean s : sortList) {
@@ -263,8 +263,19 @@ public class StatisticsServiceImpl implements StatisticsService_F {
                                 return o1.getTotal_integral() > o2.getTotal_integral() ? -1 : 1;
                             }
                         });
-                        for (int i = 0; i < deptStatistics1.size(); i++) {
-                            deptStatistics1.get(i).setTotal_ranking(i + 1);
+                        for (int j = 0; j < deptStatistics1.size(); j++) {
+                            FwqDeptStatistic statisticsBean = deptStatistics1.get(j);
+                            // 排名
+                            if (j == 0) {
+                                statisticsBean.setTotal_ranking(1);
+                            } else {
+                                FwqDeptStatistic bean = deptStatistics1.get(j - 1);
+                                if (statisticsBean.getTotal_integral().equals(bean.getTotal_integral())) {
+                                    statisticsBean.setTotal_ranking(bean.getTotal_ranking());
+                                } else {
+                                    statisticsBean.setTotal_ranking(j + 1);
+                                }
+                            }
                         }
                     }
 
@@ -376,7 +387,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
         }
 
         if (obj.getStart_date() != null && obj.getEnd_date() != null) {
-            CheckTaskPeriod p = commonService.getCheckTaskPeriod(obj.getStart_date().getTime(), obj.getEnd_date().getTime());
+            CheckTaskPeriod p = commonService.getCheckTaskPeriod(obj.getStart_date().getTime()+1 * 1000 * 60 * 60, obj.getEnd_date().getTime()+1 * 1000 * 60 * 60);
             if (p != null) {
                 obj.setPeriod_id(p.getId());
             }
@@ -466,7 +477,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
     public FwqRankingData getEmployeeRankingData(FwqStatisticsBean obj) {
         FwqRankingData data = new FwqRankingData();
 
-        CheckTaskPeriod lastTaskPeriod = commonService.getCheckTaskPeriod(obj.getStart_date().getTime(), obj.getEnd_date().getTime());
+        CheckTaskPeriod lastTaskPeriod = commonService.getCheckTaskPeriod(obj.getStart_date().getTime()+1 * 1000 * 60 * 60, obj.getEnd_date().getTime()+1 * 1000 * 60 * 60);
         if (lastTaskPeriod != null) {
             FwqStatisticsBean temp = new FwqStatisticsBean();
             temp.setStart_date(new Date(lastTaskPeriod.getStarttime().getTime() - 1 * 1000 * 60 * 60));
@@ -744,33 +755,8 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 
     @Override
     public List<FwqStatisticsBean> getYearScoreChange(FwqStatisticsBean obj) {
-        // 道管中心
-//        if (obj.getQueryType() != null && obj.getQueryType() == 1) {
-//            // 检索当前导管中心下的deptid
-//            Organ organ = new Organ();
-//            if (obj.getDept_id() == null) {
-//                return null;
-//            }
-//            organ.setParentid(obj.getDept_id().intValue());
-//
-//            List<Organ> list = departmentDao.getOrgan(organ);
-//            // 将导管中心下的收费站部门id 列表放入到list中
-//            obj.setDept_list(list);
-//        }
-
-        // Constant t = CodeUtil.getCodeByFlagAndValue("feestation_check_jobs",
-        // "1");
-        // String[] postions = t.getCode_name().split(",");
-        // List<Integer> positionList = new ArrayList<Integer>();
-        // for (int i = 0; i < postions.length; i++) {
-        // positionList.add(Integer.parseInt(postions[i]));
-        // }
-        // //未计算未扣分的稽查次数
-        // obj.setPosition_ids(positionList);
-        // List<StatisticsBean> listCheckNum =
-        // statisticsDao.selectFeeStationCheckNum(obj);
-
-        return fwqStatisticsDao.selectYearScoreInfo(obj);
+        List<FwqStatisticsBean> list = fwqStatisticsDao.selectYearScoreInfo(obj);
+        return list;
 
     }
 
@@ -796,7 +782,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
         }
 
         if (obj.getStart_date() != null && obj.getEnd_date() != null) {
-            CheckTaskPeriod p = commonService.getCheckTaskPeriod(obj.getStart_date().getTime(), obj.getEnd_date().getTime());
+            CheckTaskPeriod p = commonService.getCheckTaskPeriod(obj.getStart_date().getTime()+1 * 1000 * 60 * 60, obj.getEnd_date().getTime()+1 * 1000 * 60 * 60);
             if (p != null) {
                 obj.setPeriod_id(p.getId());
             }

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/service/impl/StatisticsService_FImpl.java

@@ -168,23 +168,23 @@ public class StatisticsService_FImpl implements StatisticsService_F {
         SimpleDateFormat ff1 = new SimpleDateFormat("MM月");
 
         for (CheckTaskPeriod p : checkTaskPeriods) {
-            if (obj.getStart_date() == p.getEndtime().getTime()) {
+            if (obj.getStart_date() + 1 * 1000 * 60 * 60 == p.getEndtime().getTime()) {
                 obj.setStartperiod_id(p.getId());
             }
-            if (obj.getEnd_date() == p.getEndtime().getTime()) {
+            if (obj.getEnd_date() + 1 * 1000 * 60 * 60 == p.getEndtime().getTime()) {
                 obj.setEndperiod_id(p.getId());
             }
         }
-        if (obj.getStart_date() > (checkTaskPeriods.get(checkTaskPeriods.size() - 1).getEndtime().getTime())) {
+        if (obj.getStart_date() > (checkTaskPeriods.get(checkTaskPeriods.size() - 1).getEndtime().getTime() - 1 * 1000 * 60 * 60)) {
             return null;
         }
-        if (obj.getEnd_date() < (checkTaskPeriods.get(0).getEndtime().getTime())) {
+        if (obj.getEnd_date() < (checkTaskPeriods.get(0).getEndtime().getTime() - 1 * 1000 * 60 * 60)) {
             return null;
         }
-        if (obj.getStart_date() < (checkTaskPeriods.get(0).getEndtime().getTime())) {
+        if (obj.getStart_date() < (checkTaskPeriods.get(0).getEndtime().getTime() - 1 * 1000 * 60 * 60)) {
             obj.setStartperiod_id(checkTaskPeriods.get(0).getId());
         }
-        if (obj.getEnd_date() > (checkTaskPeriods.get(checkTaskPeriods.size() - 1).getEndtime().getTime())) {
+        if (obj.getEnd_date() > (checkTaskPeriods.get(checkTaskPeriods.size() - 1).getEndtime().getTime() - 1 * 1000 * 60 * 60)) {
             obj.setEndperiod_id(checkTaskPeriods.get(checkTaskPeriods.size() - 1).getId());
         }
 
@@ -255,8 +255,19 @@ public class StatisticsService_FImpl implements StatisticsService_F {
                                 return o1.getTotal_integral() > o2.getTotal_integral() ? -1 : 1;
                             }
                         });
-                        for (int i = 0; i < deptStatistics1.size(); i++) {
-                            deptStatistics1.get(i).setTotal_ranking(i + 1);
+                        for (int j = 0; j < deptStatistics1.size(); j++) {
+                            FwqDeptStatistic statisticsBean = deptStatistics1.get(j);
+                            // 排名
+                            if (j == 0) {
+                                statisticsBean.setTotal_ranking(1);
+                            } else {
+                                FwqDeptStatistic bean = deptStatistics1.get(j - 1);
+                                if (statisticsBean.getTotal_integral().equals(bean.getTotal_integral())) {
+                                    statisticsBean.setTotal_ranking(bean.getTotal_ranking());
+                                } else {
+                                    statisticsBean.setTotal_ranking(j + 1);
+                                }
+                            }
                         }
                     }
 
@@ -384,7 +395,7 @@ public class StatisticsService_FImpl implements StatisticsService_F {
         }
 
         if (obj.getStart_date() != null && obj.getEnd_date() != null) {
-            CheckTaskPeriod p = commonService.getCheckTaskPeriod(obj.getStart_date().getTime(), obj.getEnd_date().getTime());
+            CheckTaskPeriod p = commonService.getCheckTaskPeriod(obj.getStart_date().getTime()+1 * 1000 * 60 * 60, obj.getEnd_date().getTime()+1 * 1000 * 60 * 60);
             if (p != null) {
                 obj.setPeriod_id(p.getId());
             }