修改日报个人只能看自己的

fhKeeper/formulahousekeeper/inva_4_tivo/index.html

@@ -85,10 +85,10 @@
                             <h2 style="color: #fff;">专注工时管理，AI智能升级</h2>
                             <div class="image-z">
                                 <img src="images/z2.png">
-                                <span>专业&nbsp;&nbsp;&nbsp;&nbsp;·&nbsp;&nbsp;&nbsp;&nbsp;安全&nbsp;&nbsp;&nbsp;&nbsp;·&nbsp;&nbsp;&nbsp;&nbsp;未来&nbsp;&nbsp;&nbsp;&nbsp;·&nbsp;&nbsp;&nbsp;&nbsp;便捷</span>
+                                <span>专业&nbsp;&nbsp;&nbsp;&nbsp;·&nbsp;&nbsp;&nbsp;&nbsp;安全&nbsp;&nbsp;&nbsp;&nbsp;·&nbsp;&nbsp;&nbsp;&nbsp;可靠&nbsp;&nbsp;&nbsp;&nbsp;·&nbsp;&nbsp;&nbsp;&nbsp;便捷</span>
                                 <img src="images/z1.png">
                             </div>
-                            <p class="p-large">无论是生产车间计算工时效率、企业管理研发成本还是按工时计算酬劳的场景都可以完美匹配。对于电脑办公的情况，我们独创智能图像识别技术，自动统计工作时长并分析工作类型，如研发，设计，上网，影视娱乐等，能有效提高领导提高团队成员利用率和工作饱和度。同时提供项目/部门/岗位多维度统计工时，核算企业人力成本。</p>
+                            <p class="p-large">无论是生产车间计算工时效率、企业管理研发成本还是按工时计算酬劳的场景都可以完美匹配。对于电脑办公的情况，我们独创智能图像识别技术，自动统计工作时长并分析工作类型，如研发，设计，上网，影视娱乐等，能有效提高团队成员利用率和工作饱和度。同时提供项目/部门/岗位多维度统计工时，核算企业人力成本。</p>
                             <div class="col-lg-6 col-md-6 col-xl-6" style="margin: 0 auto;">
                                 <a class="btn-solid-lg btn-solid-lg-white page-scroll" style="margin-right: 5rem;" data-toggle="modal" data-target=".bs-example-modal-lg">视频演示</a>
                                 <a class="btn-solid-lg page-scroll" href="http://worktime.ttkuaiban.com/#/login" target="_blank">免费试用</a>

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -62,38 +62,55 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             String userId = request.getHeader("Token");
             User user = userMapper.selectById(userId);
             List<Map<String, Object>> nameList = new ArrayList<>();
-            if (user.getRole().equals("0")) {
+            if (user.getRole() == 0) {
                 //普通员工只能看自己的
                 Map map = new HashMap();
                 map.put("id", user.getId());
                 map.put("name", user.getName());
-                nameList.add(map);
+                List<Map<String, Object>> list = reportMapper.getReportByDate(date, (String) map.get("id"));
+                if (list.size() > 0) {
+                    nameList.add(map);
+                    map.put("data", list);
+                    double reportTime = 0;
+                    for (Map<String, Object> m : list) {
+                        double t = (double) m.get("time");
+                        reportTime += t;
+                    }
+                    DecimalFormat df = new DecimalFormat("0.00");
+                    map.put("reportTime", df.format(reportTime));
+                    List<TimeCalculationShow> timeList = timeCalculationShowMapper.selectList(new QueryWrapper<TimeCalculationShow>().eq("user_id", (String) map.get("id")).eq("date", date));
+                    int calculateTime = 0;
+                    for (TimeCalculationShow show : timeList) {
+                        calculateTime += show.getDuration();
+                    }
+                    //数据库是秒，时间转换为小时；
+                    double d = calculateTime*1.0/3600;
+                    map.put("calculateTime", df.format(d));
+                }
             } else {
                 nameList = reportMapper.getReportNameByDate(date,
                         userMapper.selectById(request.getHeader("Token")).getCompanyId());
-            }
-
-            for (Map<String, Object> map : nameList) {
-                //再根据人分别获取当天的报告
-                List<Map<String, Object>> list = reportMapper.getReportByDate(date, (String) map.get("id"));
-                map.put("data", list);
-                double reportTime = 0;
-                for (Map<String, Object> m : list) {
-                    double t = (double) m.get("time");
-                    reportTime += t;
-                }
-                DecimalFormat df = new DecimalFormat("0.00");
-                map.put("reportTime", df.format(reportTime));
-                List<TimeCalculationShow> timeList = timeCalculationShowMapper.selectList(new QueryWrapper<TimeCalculationShow>().eq("user_id", (String) map.get("id")).eq("date", date));
-                int calculateTime = 0;
-                for (TimeCalculationShow show : timeList) {
-                    calculateTime += show.getDuration();
+                for (Map<String, Object> map : nameList) {
+                    //再根据人分别获取当天的报告
+                    List<Map<String, Object>> list = reportMapper.getReportByDate(date, (String) map.get("id"));
+                    map.put("data", list);
+                    double reportTime = 0;
+                    for (Map<String, Object> m : list) {
+                        double t = (double) m.get("time");
+                        reportTime += t;
+                    }
+                    DecimalFormat df = new DecimalFormat("0.00");
+                    map.put("reportTime", df.format(reportTime));
+                    List<TimeCalculationShow> timeList = timeCalculationShowMapper.selectList(new QueryWrapper<TimeCalculationShow>().eq("user_id", (String) map.get("id")).eq("date", date));
+                    int calculateTime = 0;
+                    for (TimeCalculationShow show : timeList) {
+                        calculateTime += show.getDuration();
+                    }
+                    //数据库是秒，时间转换为小时；
+                    double d = calculateTime*1.0/3600;
+                    map.put("calculateTime", df.format(d));
                 }
-                //数据库是秒，时间转换为小时；
-                double d = calculateTime*1.0/3600;
-                map.put("calculateTime", df.format(d));
             }
-
             httpRespMsg.data = nameList;
         } catch (NullPointerException e) {
             e.printStackTrace();