Home Explore Help
Register Sign In
wutt
/
manHourHousekeeper
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

# Conflicts:
#	fhKeeper/formulahousekeeper/inva_4_tivo/index.html
seyason 5 years ago
parent
c48d13aec7
commit
9371d9e45c
2 changed files with 33 additions and 12 deletions
Unified View Show Diff Stats
  1. 7 7
      fhKeeper/formulahousekeeper/inva_4_tivo/index.html
  2. 26 5
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

+ 7 - 7
fhKeeper/formulahousekeeper/inva_4_tivo/index.html
View File 

@@ -3,9 +3,9 @@
 
 <head>
 
 <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
-    <meta name="keywords" content="工时管理，项目成本统计，远程办公，员工管理，项目管理，绩效考核，远程监控，兼职软件开发，软件外包，外包人员管理" />
 
-    <meta name="description" content="工时管家利用智能图像识别技术，统计员工每日实际的工作时长，并能自动分析员工每天时间分配情况，如研发，设计，上网，影视娱乐等，能有效提高领导对团队工作时间的把控，进而制定降低成本、提高效率的措施。同时领导可以查看员工在每个项目上投入的时间，核算项目的人力成本。"/>
 
-    <title>工时管家|反馈真实工作情况，提供员工考核数据</title>
 
+    <meta name="keywords" content="工时管理，工时统计，项目成本统计，远程监控" />
 
+    <meta name="description" content="工时管家利用智能图像识别技术实现工时管理和工时统计。可按项目，部门，岗位等多维度统计成本。软件可实现远程监管，有效反馈工作实际情况，对非工作情况主动检测上报。"/>
 
+    <title>工时管家-工时管理和统计的好助手，反馈真实工作情况，降低企业成本！</title>
 
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,400i,700&display=swap&subset=latin-ext" rel="stylesheet">
 
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,400i,700&display=swap&subset=latin-ext" rel="stylesheet">
 
     <link href="css/bootstrap.css" rel="stylesheet">
 
     <link href="css/bootstrap.css" rel="stylesheet">
 
     <!-- <link href="css/fontawesome-all.css" rel="stylesheet"> -->
 
     <!-- <link href="css/fontawesome-all.css" rel="stylesheet"> -->
 
@@ -82,9 +82,9 @@
 
                 <div class="row">
 
                 <div class="row">
 
                     <div class="col-lg-6 col-xl-5">
 
                     <div class="col-lg-6 col-xl-5">
 
                         <div class="text-container">
 
                         <div class="text-container">
 
-                            <h2 style="color: #fff;">助企业远程办公，共抗疫情</h2>
 
+                            <h2 style="color: #fff;">助企业远程办公，提供真实可靠的工时数据</h2>
 
 <!--                            <p class="p-large">工时管家利用图像识别技术，精准判断员工桌面运行软件，可统计员工每天工时分配情况，如工作、娱乐等；领导可通过后台查看员工实时桌面，并对员工异常工作状态做出提醒。</p>-->
 
 <!--                            <p class="p-large">工时管家利用图像识别技术，精准判断员工桌面运行软件，可统计员工每天工时分配情况，如工作、娱乐等；领导可通过后台查看员工实时桌面，并对员工异常工作状态做出提醒。</p>-->
 
-                            <p class="p-large">工时管家利用智能图像识别技术，统计员工每日实际的工作时长，并能自动分析员工每天时间分配情况，如研发，设计，上网，影视娱乐等，能有效提高领导对团队工作时间的把控，进而制定降低成本、提高效率的措施。同时领导可以查看员工在每个项目上投入的时间，核算项目的人力成本。</p>
 
+                            <p class="p-large">工时管家利用智能图像识别技术，统计员工每日实际的工作时长，并能自动分析员工每天时间分配情况，如研发，设计，上网，影视娱乐等，能有效提高领导对团队工作时间的把控，进而制定降低成本、提高效率的措施。同时领导可以查看每个项目、每个部门的统计工时，核算项目的人力成本。</p>
 
                             <a class="btn-solid-lg page-scroll" href="http://worktime.ttkuaiban.com/#/login" target="_blank">免费试用</a>
 
                             <a class="btn-solid-lg page-scroll" href="http://worktime.ttkuaiban.com/#/login" target="_blank">免费试用</a>
 
                         </div>
 
                         </div>
 
                     </div>
 
                     </div>
 
@@ -178,7 +178,7 @@
 
                     <div class="scenes card">
 
                     <div class="scenes card">
 
                         <div class="scenes-head">
 
                         <div class="scenes-head">
 
                             <img class="img-fluid" src="images/pic_0.png" alt="alternative">
 
                             <img class="img-fluid" src="images/pic_0.png" alt="alternative">
 
-                            网上兼职人员办公
 
+                            网上兼职薪酬统计
 
                         </div>
 
                         </div>
 
                         <div class="scenes-body">
 
                         <div class="scenes-body">
 
                             <img class="img-fluid" src="images/pic_1.png" alt="alternative">
 
                             <img class="img-fluid" src="images/pic_1.png" alt="alternative">
 
@@ -473,7 +473,7 @@
 
         <div class="container">
 
         <div class="container">
 
             <div class="row">
 
             <div class="row">
 
                 <div class="col-lg-12">
 
                 <div class="col-lg-12">
 
-                    <p class="p-small">Copyright © 南京火石闪信网络有限公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;苏ICP备18064522号-1</p>
 
+                    <p class="p-small">Copyright©2016 南京火石闪信网络有限公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;苏ICP备18064522号-1</p>
 
                 </div>
 
                 </div>
 
             </div>
 
             </div>
 
         </div>
 
         </div>

+ 26 - 5
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java
View File 

@@ -5,12 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import com.management.platform.entity.Project;
 
 import com.management.platform.entity.Project;
 
 import com.management.platform.entity.Report;
 
 import com.management.platform.entity.Report;
 
 import com.management.platform.entity.TimeCalculation;
 
 import com.management.platform.entity.TimeCalculation;
 
-import com.management.platform.mapper.ProjectMapper;
 
-import com.management.platform.mapper.ReportMapper;
 
-import com.management.platform.mapper.TimeCalculationMapper;
 
-import com.management.platform.mapper.UserMapper;
 
+import com.management.platform.entity.TimeCalculationShow;
 
+import com.management.platform.mapper.*;
 
 import com.management.platform.service.ReportService;
 
 import com.management.platform.service.ReportService;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import com.management.platform.service.TimeCalculationService;
 
 import com.management.platform.util.HttpRespMsg;
 
 import com.management.platform.util.HttpRespMsg;
 
 import org.apache.poi.hssf.usermodel.*;
 
 import org.apache.poi.hssf.usermodel.*;
 
 import org.springframework.beans.factory.annotation.Value;
 
 import org.springframework.beans.factory.annotation.Value;
 
@@ -50,6 +49,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 
     @Resource
 
     @Resource
 
     private ProjectMapper projectMapper;
 
     private ProjectMapper projectMapper;
 
 
 
+    @Resource
 
+    private TimeCalculationShowMapper timeCalculationShowMapper;
 
+
 
+
 
     @Value(value = "${upload.path}")
 
     @Value(value = "${upload.path}")
 
     private String path;
 
     private String path;
 
 
 
@@ -63,10 +66,28 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 
                     userMapper.selectById(request.getHeader("Token")).getCompanyId());
 
                     userMapper.selectById(request.getHeader("Token")).getCompanyId());
 
             for (Map<String, Object> map : nameList) {
 
             for (Map<String, Object> map : nameList) {
 
                 //再根据人分别获取当天的报告
 
                 //再根据人分别获取当天的报告
 
-                map.put("data", reportMapper.getReportByDate(date, (String) map.get("id")));
 
+                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));
 
             }
 
             }
 
+
 
             httpRespMsg.data = nameList;
 
             httpRespMsg.data = nameList;
 
         } catch (NullPointerException e) {
 
         } catch (NullPointerException e) {
 
+            e.printStackTrace();
 
             httpRespMsg.setError("验证失败");
 
             httpRespMsg.setError("验证失败");
 
             return httpRespMsg;
 
             return httpRespMsg;
 
         }
 
         }