待分配时长

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/TimeCalculationMapper.java

@@ -19,10 +19,10 @@ import java.util.Map;
  */
 public interface TimeCalculationMapper extends BaseMapper<TimeCalculation> {
     List<Map<String, Object>> getDevianceList(Page page,
-                                               @Param("userId") String userId,
-                                               @Param("actionCode") Integer actionCode,
-                                               @Param("date") String date,
-                                               @Param("companyId") Integer companyId);
+                                              @Param("userId") String userId,
+                                              @Param("actionCode") Integer actionCode,
+                                              @Param("date") String date,
+                                              @Param("companyId") Integer companyId);
 
     Integer countDeviance(@Param("userId") String userId,
                           @Param("actionCode") Integer actionCode,

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

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.text.DecimalFormat;
 import java.time.LocalDate;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
@@ -178,7 +179,7 @@ public class TimeCalculationServiceImpl extends ServiceImpl<TimeCalculationMappe
                 dataMap.put("time", list);
                 //这里检查如果只需要一天记录的话 说明是pc端界面那个地方 那就再多计算一个当天总工作时间
                 if (dateList.size() == 1) {
-                    dataMap.put("total", total);
+                    dataMap.put("total", new DecimalFormat("#.00").format((double) total / 3600));
                 }
                 resultList.add(dataMap);
             }

fhKeeper/formulahousekeeper/timesheet/src/views/desktop/index.vue

@@ -102,22 +102,24 @@ export default {
     converType(type) {
       switch (type) {
         case 0:
-          return "编程";
+          return "其他";
         case 1:
-          return "查资料";
+          return "编程";
         case 2:
-          return "看文档";
+          return "上网";
         case 3:
-          return "做设计";
+          return "文档";
         case 4:
-          return "美工";
+          return "设计";
         case 5:
-          return "运营";
+          return "美工";
         case 6:
-          return "看小说";
+          return "运营";
         case 7:
-          return "打游戏";
+          return "看小说";
         case 8:
+          return "影视娱乐";
+        case 9:
           return "听音乐";
         default:
           return "未知";

fhKeeper/formulahousekeeper/timesheet/src/views/desktop/unusual.vue

@@ -95,22 +95,24 @@ export default {
     converType(type) {
       switch (type) {
         case 0:
-          return "编程";
+          return "其他";
         case 1:
-          return "查资料";
+          return "编程";
         case 2:
-          return "看文档";
+          return "上网";
         case 3:
-          return "做设计";
+          return "文档";
         case 4:
-          return "美工";
+          return "设计";
         case 5:
-          return "运营";
+          return "美工";
         case 6:
-          return "看小说";
+          return "运营";
         case 7:
-          return "打游戏";
+          return "看小说";
         case 8:
+          return "影视娱乐";
+        case 9:
           return "听音乐";
         default:
           return "未知";

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/statistics.vue

@@ -31,7 +31,7 @@
     >
       <el-table-column type="index" width="60"></el-table-column>
       <el-table-column prop="name" label="姓名" width="140" sortable></el-table-column>
-      <el-table-column prop="phone" label="手机" width="180"></el-table-column>
+      <el-table-column prop="phone" label="手机" width="120"></el-table-column>
       <el-table-column prop="statistics[0]" label="编程" sortable></el-table-column>
       <el-table-column prop="statistics[1]" label="上网" sortable></el-table-column>
       <el-table-column prop="statistics[5]" label="文档" sortable></el-table-column>
@@ -39,7 +39,7 @@
       <el-table-column prop="statistics[4]" label="运营" sortable></el-table-column>
       <el-table-column prop="statistics[5]" label="娱乐" sortable></el-table-column>
       <el-table-column prop="statistics[6]" label="其他" sortable></el-table-column>
-      <el-table-column prop="sum" label="总时长" width="180" sortable></el-table-column>
+      <el-table-column prop="sum" label="总时长" sortable></el-table-column>
     </el-table>
 
     <!--工具条-->