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

后台接口修改

seyason 4 years ago
parent
e46046989d
commit
59d70faf9a
21 changed files with 200 additions and 115 deletions
Split View Show Diff Stats
  1. 5 5
      fhKeeper/formulahousekeeper/inva_4_tivo/index.html
  2. 1 2
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectDocumentController.java
  3. 1 3
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java
  4. 2 4
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/StagesController.java
  5. 49 1
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskCommentController.java
  6. 29 3
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskController.java
  7. 6 6
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Task.java
  8. 4 10
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/TaskComment.java
  9. 6 0
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/TaskMapper.java
  10. 7 0
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/TaskService.java
  11. 0 2
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/FinanceServiceImpl.java
  12. 0 1
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java
  13. 0 4
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java
  14. 8 0
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/TaskServiceImpl.java
  15. 0 2
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/OpenOfficeService.java
  16. 0 2
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/ProcessUtil.java
  17. 3 3
      fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml
  18. 2 3
      fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TaskCommentMapper.xml
  19. 5 0
      fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TaskMapper.xml
  20. 52 52
      fhKeeper/formulahousekeeper/timesheet/package-lock.json
  21. 20 12
      fhKeeper/formulahousekeeper/timesheet/src/views/Home.vue

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

@@ -3,9 +3,9 @@
 
 <head>
 
     <meta charset="utf-8">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
-    <meta name="keywords" content="工时管理,成本管理,工时统计,项目成本统计,生产工时管理系统" />
 
-    <meta name="description" content="工时管家是专业的工时管理软件,提供专业的工时填报，审核和统计功能。引进现代工时管理的理念，核算项目投入成本准确便捷，企业IPO利器"/>
 
-    <title>工时管理|工时记录|成本管理-工时管家是专业便捷的工时管理系统。 手机移动填报|核算项目成本|企业IPO利器！</title>
 
+    <meta name="keywords" content="工时管理,项目成本管理,工时统计,项目成本统计" />
 
+    <meta name="description" content="工时管家是专业的工时管理软件,提供专业的工时填报，审核和统计功能。引进现代工时管理和项目管理的理念，核算项目投入成本准确便捷，企业IPO利器"/>
 
+    <title>工时管理|工时记录|项目成本管理-工时管家是专业便捷的工时管理系统。 手机移动填报|核算项目成本|企业IPO利器！</title>
 
     <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/fontawesome-all.css" rel="stylesheet"> -->
 
@@ -99,13 +99,13 @@
 
                 <div class="row">
 
                     <div class="col-lg-12 col-xl-12">
 
                         <div class="text-container">
 
-                            <h2 style="color: #fff;">专注企业成本管理，提升团队工作效率</h2>
 
+                            <h2 style="color: #fff;">专注企业项目成本管理，提升团队工作效率</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>
 
                                 <img src="images/z1.png">
 
                             </div>
 
-                            <p class="p-large">为工时填报/审核/统计提供专业解决方案，支持PC端和<b>手机端</b>。基于项目/部门/岗位<b>多维度统计</b>工时，实现可视化工时数据展示。</p>
 
+                            <p class="p-large">为工时填报/审核/统计提供专业解决方案，支持PC端、微信和钉钉。基于项目/部门/人员<b>多维度统计</b>工时，实现可视化工时数据展示。</p>
 
                             <p class="p-large">OKR项目管理方案践行者，实现高度灵活且配合紧密的团队协作</p>
 
                             <div class="col-lg-9 col-md-9 col-xl-9" style="margin: 0 auto;">
 
                                 <a class="btn-solid-lg btn-solid-lg-white page-scroll overload" style="margin-right: 5rem;">软件演示

+ 1 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectDocumentController.java
View File 

@@ -105,13 +105,12 @@ public class ProjectDocumentController {
 
                 String fileName= "";
 
                 if (file!=null && !file.isEmpty()) {
 
                     fileName = file.getOriginalFilename();
 
-                    System.out.println("上传文件名称"+file.getName() +  "， dir = " + dir.getAbsolutePath());
 
+
 
                     int pos = fileName.lastIndexOf(".");
 
                     String suffix = fileName.substring(pos).toLowerCase();
 
                     //用uuid替换原始的文件名
 
                     String purFName = UUID.randomUUID().toString().replaceAll("-", "");
 
                     fileName = purFName + suffix;
 
-                    System.out.println(fileName);
 
                     File saveFile = new File(dir, fileName);
 
                     try {
 
                         saveFile.createNewFile();

+ 1 - 3
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java
View File 

@@ -94,8 +94,6 @@ public class ReportController {
 
 
 
         try {
 
-            System.out.println("reportTimeType.length=="+reportTimeType.length);
 
-            System.out.println("content.length=="+content.length);
 
             for (int i = 0; i < id.length; i++) {
 
                 Report report = new Report()
 
                         .setId(id[i] == -1 ? null : id[i])
 
@@ -110,7 +108,7 @@ public class ReportController {
 
                     report.setTaskId(taskId[i]);
 
                 }
 
                 if (isOvertime != null && isOvertime[i] != null) {
 
-                    report.setTaskId(taskId[i]);
 
+                    report.setIsOvertime(isOvertime[i]);
 
                 }
 
                 if (report.getReportTimeType() == 0) {
 
                     report.setWorkingTime(workingTime[i])

+ 2 - 4
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/StagesController.java
View File 

@@ -158,13 +158,12 @@ public class StagesController {
 
         } else {
 
             queryWrapper.orderByAsc(order);
 
         }
 
-        List<Task> tasks = taskService.list(queryWrapper);
 
+        List<Task> tasks = taskService.simpleList(queryWrapper);
 
         List<Task> subTasks = new ArrayList<>();
 
         if (tasks.size() > 0) {
 
             List<Integer> collect = tasks.stream().map(Task::getId).collect(Collectors.toList());
 
-            subTasks.addAll(taskService.list(new QueryWrapper<Task>().in("parent_tid", collect)));
 
+            subTasks.addAll(taskService.simpleList(new QueryWrapper<Task>().in("parent_tid", collect)));
 
         }
 
-        System.out.println("总任务数量"+tasks.size()+","+item.getGroupId());
 
 
         list.forEach(stages -> {
 
             List<Task> taskList = tasks.stream().filter(t -> t.getStagesId().equals(stages.getId())).collect(Collectors.toList());
 
@@ -202,7 +201,6 @@ public class StagesController {
 
             List<Stages> dataList = stagesService.list(queryWrapper);
 
             if (dataList.size() > 0) {
 
                 Stages beforeItem = dataList.get(0);
 
-                System.out.println("前面的列表:"+beforeItem.getStagesName()+", seq="+beforeItem.getSequence());
 
                 startSeq = beforeItem.getSequence() + 1;
 
             } else {
 
                 startSeq = 1;

+ 49 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskCommentController.java
View File 

@@ -1,13 +1,24 @@
 
 package com.management.platform.controller;
 
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
+import com.management.platform.entity.TaskComment;
 
+import com.management.platform.entity.User;
 
+import com.management.platform.service.TaskCommentService;
 
+import com.management.platform.service.UserService;
 
+import com.management.platform.util.HttpRespMsg;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 
 
 import org.springframework.web.bind.annotation.RestController;
 
 
+import javax.annotation.Resource;
 
+import javax.servlet.http.HttpServletRequest;
 
+import java.time.LocalDateTime;
 
+import java.util.List;
 
+
 
 /**
 
  * <p>
 
- *  前端控制器
 
+ *  任务留言接口
 
  * </p>
 
  *
 
  * @author Seyason
 
@@ -16,6 +27,43 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 
 @RequestMapping("/task-comment")
 
 public class TaskCommentController {
 
+    @Resource
 
+    private HttpServletRequest request;
 
+    @Resource
 
+    private TaskCommentService taskCommentService;
 
+    @Resource
 
+    private UserService userService;
 
+    /**
 
+     * 添加任务留言
 
+     * @param taskId 任务id
 
+     * @param userId 用户id
 
+     * @param content 内容
 
+     * @return
 
+     */
 
+    @RequestMapping("/add")
 
+    public HttpRespMsg add(TaskComment comment) {
 
+        String userId = request.getHeader("Token");
 
+        User user = userService.getById(userId);
 
+        comment.setCreateTime(LocalDateTime.now());
 
+        comment.setUserColor(user.getColor());
 
+        comment.setUserName(user.getName());
 
+        taskCommentService.save(comment);
 
+        HttpRespMsg msg = new HttpRespMsg();
 
+        msg.data = comment;
 
+        return msg;
 
+    }
 
 
+    /**
 
+     * 获取留言列表
 
+     * @param taskId 任务id
 
+     * @return
 
+     */
 
+    @RequestMapping("getList")
 
+    public HttpRespMsg getList(Integer taskId) {
 
+        List<TaskComment> taskComments = taskCommentService.list(new QueryWrapper<TaskComment>().eq("task_id", taskId));
 
+        HttpRespMsg msg = new HttpRespMsg();
 
+        msg.data = taskComments;
 
+        return msg;
 
+    }
 
 }

+ 29 - 3
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskController.java
View File 

@@ -7,14 +7,25 @@ import com.management.platform.entity.*;
 
 import com.management.platform.mapper.UserMapper;
 
 import com.management.platform.service.*;
 
 import com.management.platform.util.HttpRespMsg;
 
+import org.opencv.features2d.SimpleBlobDetector;
 
+import org.springframework.format.annotation.DateTimeFormat;
 
 import org.springframework.util.StringUtils;
 
+import org.springframework.web.bind.WebDataBinder;
 
+import org.springframework.web.bind.annotation.InitBinder;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 
 
 import org.springframework.web.bind.annotation.RestController;
 
+import org.springframework.web.context.request.WebRequest;
 
 
 import javax.annotation.Resource;
 
 import javax.servlet.http.HttpServletRequest;
 
+import java.awt.*;
 
+import java.beans.PropertyChangeListener;
 
+import java.beans.PropertyEditor;
 
+import java.sql.Blob;
 
+import java.text.SimpleDateFormat;
 
 import java.time.LocalDate;
 
+import java.time.format.DateTimeFormatter;
 
 import java.util.ArrayList;
 
 import java.util.List;
 
 import java.util.Optional;
 
@@ -48,6 +59,9 @@ public class TaskController {
 
     private TaskLogService taskLogService;
 
     @Resource
 
     private TaskCommentService taskCommentService;
 
+    @Resource
 
+    private InformationService informationService;
 
+
 
     @RequestMapping("/save")
 
     public HttpRespMsg save(Task task) {
 
         String userId = request.getHeader("Token");
 
@@ -70,6 +84,7 @@ public class TaskController {
 
             task.setParentTname(taskService.getById(task.getParentTid()).getName());
 
         }
 
         boolean isNew = false;
 
+        String msgRecepient = null;
 
         //新建的任务需要计算排序
 
         if (task.getId() == null) {
 
             isNew = true;
 
@@ -81,9 +96,13 @@ public class TaskController {
 
             } else {
 
                 task.setSeq(taskList.get(0).getSeq() + 1);
 
             }
 
+            if (task.getExecutorId() != null) {
 
+                msgRecepient = task.getExecutorId();
 
+            }
 
         } else {
 
             //更新的情况，需要对比是否修改了任务标题，更新子任务的parentTname
 
-            if (!taskService.getById(task.getId()).getName().equals(task.getName())) {
 
+            Task oldTask = taskService.getById(task.getId());
 
+            if (!oldTask.getName().equals(task.getName())) {
 
                 Task sample = new Task();
 
                 sample.setParentTname(task.getName());
 
                 taskService.update(sample, new QueryWrapper<Task>().eq("parent_tid", task.getId()));
 
@@ -92,6 +111,10 @@ public class TaskController {
 
                 userRecentTask.setTaskName(task.getName());
 
                 userRecentTaskService.update(userRecentTask, new QueryWrapper<UserRecentTask>().eq("task_id", task.getId()));
 
             }
 
+            if (task.getExecutorId() != null && !task.getExecutorId().equals(oldTask.getExecutorId())) {
 
+                //执行人发生变化
 
+                msgRecepient = task.getExecutorId();
 
+            }
 
         }
 
 
         taskService.saveOrUpdate(task);
 
@@ -104,6 +127,10 @@ public class TaskController {
 
         if (isNew) {
 
             updateProjectProgress(task.getProjectId());
 
         }
 
+        if (msgRecepient != null) {
 
+            //发消息通知执行人, 待项目id
 
+            informationService.save(new Information().setType(1).setContent(String.valueOf(task.getProjectId())).setUserId(msgRecepient));
 
+        }
 
         return msg;
 
     }
 
 
@@ -207,7 +234,6 @@ public class TaskController {
 
             List<Task> taskList = taskService.list(queryWrapper);
 
             if (taskList.size() > 0) {
 
                 Task beforeItem = taskList.get(0);
 
-                System.out.println("前面的任务:"+beforeItem.getName()+", seq="+beforeItem.getSeq());
 
                 startSeq = beforeItem.getSeq() + 1;
 
             } else {
 
                 startSeq = 1;
 
@@ -277,7 +303,7 @@ public class TaskController {
 
             //已超期的任务,未完成的任务
 
             queryWrapper.lt("end_date", LocalDate.now()).eq("task_status", 0);
 
         }
 
-        List<Task> list = taskService.list(queryWrapper);
 
+        List<Task> list = taskService.simpleList(queryWrapper);
 
         //设置列表名称
 
         list.forEach(item->{
 
             Optional<Stages> first = stagesList.stream().filter(s -> s.getId().equals(item.getStagesId())).findFirst();

+ 6 - 6
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Task.java
View File 

@@ -21,7 +21,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
  * </p>
 
  *
 
  * @author Seyason
 
- * @since 2021-05-01
 
+ * @since 2021-05-11
 
  */
 
 @Data
 
 @EqualsAndHashCode(callSuper = false)
 
@@ -103,7 +103,6 @@ public class Task extends Model<Task> {
 
     @DateTimeFormat(pattern = "yyyy-MM-dd")
 
     private LocalDate endDate;
 
 
-
 
     /**
 
      * 项目id
 
      */
 
@@ -164,6 +163,7 @@ public class Task extends Model<Task> {
 
     @TableField("parent_tname")
 
     private String parentTname;
 
 
+
 
     /**
 
      * 完成日期
 
      */
 
@@ -172,14 +172,14 @@ public class Task extends Model<Task> {
 
     @DateTimeFormat(pattern = "yyyy-MM-dd")
 
     private LocalDate finishDate;
 
 
-
 
     @TableField(exist = false)
 
-    private String stagesName;
 
+    private List<Task> subTaskList;
 
 
     @TableField(exist = false)
 
-    private List<Task> subTaskList;
 
+    private int subTaskFinishNum;
 
     @TableField(exist = false)
 
-    private Integer subTaskFinishNum;
 
+    private String stagesName;
 
+
 
     @Override
 
     protected Serializable pkVal() {
 
         return this.id;

+ 4 - 10
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/TaskComment.java
View File 

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
 
  * </p>
 
  *
 
  * @author Seyason
 
- * @since 2021-04-19
 
+ * @since 2021-05-10
 
  */
 
 @Data
 
 @EqualsAndHashCode(callSuper = false)
 
@@ -34,12 +34,6 @@ public class TaskComment extends Model<TaskComment> {
 
     @TableField("task_id")
 
     private Integer taskId;
 
 
-    /**
 
-     * 阶段id
 
-     */
 
-    @TableField("stages_id")
 
-    private String stagesId;
 
-
 
     /**
 
      * 留言人id
 
      */
 
@@ -65,10 +59,10 @@ public class TaskComment extends Model<TaskComment> {
 
     private LocalDateTime createTime;
 
 
     /**
 
-     * 修改时间
 
+     * 留言人颜色
 
      */
 
-    @TableField("mod_time")
 
-    private LocalDateTime modTime;
 
+    @TableField("user_color")
 
+    private String userColor;
 
 
 
     @Override

+ 6 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/TaskMapper.java
View File 

@@ -1,7 +1,11 @@
 
 package com.management.platform.mapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 
 import com.management.platform.entity.Task;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import org.apache.ibatis.annotations.Param;
 
+import org.apache.poi.ss.formula.functions.T;
 
 
 import java.util.List;
 
 
@@ -17,4 +21,6 @@ public interface TaskMapper extends BaseMapper<Task> {
 
     List getExecutorPanel(Integer projectId);
 
     List getStagesPanel(Integer projectId);
 
     List getTopCostTask(Integer projectId);
 
+
 
+    List<Task> simpleList(@Param(Constants.WRAPPER) Wrapper wrapper);
 
 }

+ 7 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/TaskService.java
View File 

@@ -1,8 +1,12 @@
 
 package com.management.platform.service;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 
 import com.management.platform.entity.Task;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import com.management.platform.util.HttpRespMsg;
 
+import org.apache.poi.ss.formula.functions.T;
 
+
 
+import java.util.List;
 
 
 /**
 
  * <p>
 
@@ -19,4 +23,7 @@ public interface TaskService extends IService<Task> {
 
     HttpRespMsg getStagesPanel(Integer projectId);
 
 
     HttpRespMsg getTopCostTask(Integer projectId);
 
+
 
+    //获取不带任务描述的列表数据
 
+    List<Task> simpleList(Wrapper<Task> queryWrapper);
 
 }

+ 0 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/FinanceServiceImpl.java
View File 

@@ -106,7 +106,6 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
 
 
             //由于第一行需要指明列对应的标题
 
             int rowNum = sheet.getLastRowNum();
 
-            System.out.println("总行数=="+rowNum);
 
             for (int rowIndex = 0; rowIndex < sheet.getLastRowNum(); rowIndex++) {
 
                 XSSFRow row = sheet.getRow(rowIndex);
 
                 if (row == null) {
 
@@ -125,7 +124,6 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
 
 
 
                 nameCell.setCellType(CellType.STRING);
 
-                System.out.println("name=="+nameCell.getStringCellValue());
 
                 salaryCell.setCellType(CellType.STRING);
 
                 bonusCell.setCellType(CellType.STRING);
 
                 allowanceCell.setCellType(CellType.STRING);

+ 0 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java
View File 

@@ -255,7 +255,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
     public static void main(String[] args) {
 
         String startDate = "2020-12-01";
 
         String endDate = "2021-01-31";
 
-        System.out.println(monthsNum(startDate, endDate));
 
     }
 
 
     //获取查询者所在公司每个项目的工时成本

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

@@ -405,10 +405,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 
             List<Map<String, Object>> nameList = reportMapper.getDetailByState(state, companyId, leaderId);
 
             List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId));
 
 
-            System.out.println("人员列表："+nameList.size());
 
             for (Map<String, Object> map2 : nameList) {
 
                 java.sql.Date createDate = (java.sql.Date)map2.get("date");
 
-                System.out.println("姓名="+map2.get("name")+", "+createDate.toString());
 
                 List<Map<String, Object>> list2 = null;
 
                 if (leaderId == null) {
 
                     //管理员，直接获取每个人的报告
 
@@ -416,10 +414,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 
                 } else {
 
                     //获取相关项目的报告
 
                     List<Map<String, Object>> inchargeReportList= reportMapper.getInchargeReportByDate(createDate.toString(), leaderId, state);
 
-                    System.out.println("再根据人分别获取当天的报告="+inchargeReportList.size());
 
                     list2 =
 
                             inchargeReportList.stream().filter(i->i.get("creatorId").equals(map2.get("id"))).collect(Collectors.toList());
 
-                    System.out.println("再根据人分别获取当天的报告list2="+list2.size());
 
                 }
 
 
                 map2.put("data", list2);

+ 8 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/TaskServiceImpl.java
View File 

@@ -1,13 +1,16 @@
 
 package com.management.platform.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 
 import com.management.platform.entity.Task;
 
 import com.management.platform.mapper.TaskMapper;
 
 import com.management.platform.service.TaskService;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.management.platform.util.HttpRespMsg;
 
+import org.apache.poi.ss.formula.functions.T;
 
 import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
 
+import java.util.List;
 
 
 /**
 
  * <p>
 
@@ -41,4 +44,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
 
         msg.data = taskMapper.getTopCostTask(projectId);
 
         return msg;
 
     }
 
+
 
+    @Override
 
+    public List<Task> simpleList(Wrapper<Task> queryWrapper) {
 
+        return taskMapper.simpleList(queryWrapper);
 
+    }
 
 }

+ 0 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/OpenOfficeService.java
View File 

@@ -98,10 +98,8 @@ public class OpenOfficeService {
 
         if (inputFile.exists()) {// 找不到源文件, 则返回
 
             converter.convert(inputFile, outputFile);
 
         } else {
 
-        	System.out.println("转换失败，目标文件不存在");
 
         	return -1;
 
         }
 
-        System.out.println("转换成功");
 
         return 0;
 
 	}

+ 0 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/ProcessUtil.java
View File 

@@ -102,14 +102,12 @@ public class ProcessUtil {
 
 //                        "svchost.exe                   1848 Services";
 
         List<String> exeprocessList = new ArrayList<>();
 
         String[] list = processStr.toLowerCase().split("\\n");
 
-        System.out.println("list.length=="+list.length);
 
         for (int i = 1; i < list.length; i++) {
 
             if (list[i].length() > 79 && list[i].contains(".app")) {
 
                 String procName = list[i].substring(79, list[i].indexOf(".app") + 4).trim();
 
                 if (procName.lastIndexOf('/') != -1) {
 
                     procName = procName.substring(procName.lastIndexOf('/') + 1);
 
                 }
 
-                System.out.println("应用名称==" + procName);
 
                 exeprocessList.add(procName); // 进程名
 
             }
 
         }

+ 3 - 3
fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml
View File 

@@ -159,10 +159,10 @@
 
         ORDER BY a.create_date DESC
 
     </select>
 
     <select id="getRealProjectTime" resultType="java.util.Map">
 
-        SELECT project.project_name as project,creator_id AS creatorId,sum(working_time) as workingTime, SUM(cost) as cost
 
+        SELECT project.project_name as project,report.creator_id AS creatorId,sum(working_time) as workingTime, SUM(cost) as cost
 
         FROM report
 
         left join project on project.id = report.project_id
 
-        WHERE creator_id IN
 
+        WHERE report.creator_id IN
 
         (select id from user where company_id = #{companyId})
 
         and state = 1
 
         <if test="startDate != null">
 
@@ -171,6 +171,6 @@
 
         <if test="endDate != null">
 
             AND create_time &lt; #{endDate}
 
         </if>
 
-        GROUP BY project_id, creator_id;
 
+        GROUP BY project_id, report.creator_id;
 
     </select>
 
 </mapper>

+ 2 - 3
fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TaskCommentMapper.xml
View File 

@@ -6,17 +6,16 @@
 
     <resultMap id="BaseResultMap" type="com.management.platform.entity.TaskComment">
 
         <id column="id" property="id" />
 
         <result column="task_id" property="taskId" />
 
-        <result column="stages_id" property="stagesId" />
 
         <result column="user_id" property="userId" />
 
         <result column="user_name" property="userName" />
 
         <result column="content" property="content" />
 
         <result column="create_time" property="createTime" />
 
-        <result column="mod_time" property="modTime" />
 
+        <result column="user_color" property="userColor" />
 
     </resultMap>
 
 
     <!-- 通用查询结果列 -->
 
     <sql id="Base_Column_List">
 
-        id, task_id, stages_id, user_id, user_name, content, create_time, mod_time
 
+        id, task_id, user_id, user_name, content, create_time, user_color
 
     </sql>
 
 
 </mapper>

+ 5 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TaskMapper.xml
View File 

@@ -34,6 +34,11 @@
 
     <sql id="Base_Column_List">
 
         id, name, task_desc, creater_id, creater_name, creator_color, executor_id, executor_name, executor_color, task_level, task_status, create_date, end_date, project_id, stages_id, company_id, indate, parent_tid, group_id, seq, plan_hours, task_type, parent_tname, finish_date
 
     </sql>
 
+    <select id="simpleList" resultMap="BaseResultMap">
 
+        select id, name, creater_id, creater_name, creator_color, executor_id, executor_name, executor_color, task_level, task_status, create_date, end_date, project_id, stages_id, company_id, indate, parent_tid, group_id, seq, plan_hours, task_type, parent_tname, finish_date
 
+        from task
 
+        ${ew.customSqlSegment}
 
+    </select>
 
 
     <!--计算执行人任务分布-->
 
     <select id="getExecutorPanel" resultType="java.util.Map">

+ 52 - 52
fhKeeper/formulahousekeeper/timesheet/package-lock.json
View File 

@@ -90,7 +90,7 @@
 
     },
 
     "amdefine": {
 
       "version": "1.0.1",
 
-      "resolved": "https://registry.npm.taobao.org/amdefine/download/amdefine-1.0.1.tgz",
 
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
 
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
 
       "dev": true
 
     },
 
@@ -446,7 +446,7 @@
 
     },
 
     "array-find-index": {
 
       "version": "1.0.2",
 
-      "resolved": "https://registry.npm.taobao.org/array-find-index/download/array-find-index-1.0.2.tgz",
 
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
 
       "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
 
       "dev": true
 
     },
 
@@ -526,7 +526,7 @@
 
     },
 
     "assert-plus": {
 
       "version": "1.0.0",
 
-      "resolved": "https://registry.npm.taobao.org/assert-plus/download/assert-plus-1.0.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
 
       "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
 
       "dev": true
 
     },
 
@@ -553,7 +553,7 @@
 
     },
 
     "async-foreach": {
 
       "version": "0.1.3",
 
-      "resolved": "https://registry.npm.taobao.org/async-foreach/download/async-foreach-0.1.3.tgz",
 
+      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
 
       "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
 
       "dev": true
 
     },
 
@@ -573,7 +573,7 @@
 
     },
 
     "asynckit": {
 
       "version": "0.4.0",
 
-      "resolved": "https://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
 
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
 
       "dev": true
 
     },
 
@@ -599,7 +599,7 @@
 
     },
 
     "aws-sign2": {
 
       "version": "0.7.0",
 
-      "resolved": "https://registry.npm.taobao.org/aws-sign2/download/aws-sign2-0.7.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
 
       "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
 
       "dev": true
 
     },
 
@@ -1531,7 +1531,7 @@
 
     },
 
     "bcrypt-pbkdf": {
 
       "version": "1.0.2",
 
-      "resolved": "https://registry.npm.taobao.org/bcrypt-pbkdf/download/bcrypt-pbkdf-1.0.2.tgz",
 
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
 
       "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
 
       "dev": true,
 
       "requires": {
 
@@ -1563,7 +1563,7 @@
 
     },
 
     "block-stream": {
 
       "version": "0.0.9",
 
-      "resolved": "https://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz",
 
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
 
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
 
       "dev": true,
 
       "requires": {
 
@@ -1807,13 +1807,13 @@
 
     },
 
     "camelcase": {
 
       "version": "2.1.1",
 
-      "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-2.1.1.tgz?cache=0&sync_timestamp=1603921884289&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcamelcase%2Fdownload%2Fcamelcase-2.1.1.tgz",
 
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
 
       "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
 
       "dev": true
 
     },
 
     "camelcase-keys": {
 
       "version": "2.1.0",
 
-      "resolved": "https://registry.npm.taobao.org/camelcase-keys/download/camelcase-keys-2.1.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
 
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
 
       "dev": true,
 
       "requires": {
 
@@ -1847,7 +1847,7 @@
 
     },
 
     "caseless": {
 
       "version": "0.12.0",
 
-      "resolved": "https://registry.npm.taobao.org/caseless/download/caseless-0.12.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
 
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
 
       "dev": true
 
     },
 
@@ -2342,7 +2342,7 @@
 
     },
 
     "console-control-strings": {
 
       "version": "1.1.0",
 
-      "resolved": "https://registry.npm.taobao.org/console-control-strings/download/console-control-strings-1.1.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
 
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
 
       "dev": true
 
     },
 
@@ -2569,7 +2569,7 @@
 
     },
 
     "cross-spawn": {
 
       "version": "3.0.1",
 
-      "resolved": "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-3.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcross-spawn%2Fdownload%2Fcross-spawn-3.0.1.tgz",
 
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
 
       "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
 
       "dev": true,
 
       "requires": {
 
@@ -2756,7 +2756,7 @@
 
     },
 
     "currently-unhandled": {
 
       "version": "0.4.1",
 
-      "resolved": "https://registry.npm.taobao.org/currently-unhandled/download/currently-unhandled-0.4.1.tgz",
 
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
 
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
 
       "dev": true,
 
       "requires": {
 
@@ -2771,7 +2771,7 @@
 
     },
 
     "dashdash": {
 
       "version": "1.14.1",
 
-      "resolved": "https://registry.npm.taobao.org/dashdash/download/dashdash-1.14.1.tgz?cache=0&sync_timestamp=1601073602368&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdashdash%2Fdownload%2Fdashdash-1.14.1.tgz",
 
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
 
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
 
       "dev": true,
 
       "requires": {
 
@@ -2786,7 +2786,7 @@
 
     },
 
     "dayjs": {
 
       "version": "1.10.4",
 
-      "resolved": "https://registry.npm.taobao.org/dayjs/download/dayjs-1.10.4.tgz?cache=0&sync_timestamp=1611310021152&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdayjs%2Fdownload%2Fdayjs-1.10.4.tgz",
 
+      "resolved": "https://registry.npm.taobao.org/dayjs/download/dayjs-1.10.4.tgz",
 
       "integrity": "sha1-jlRKm4aD9heD9XCYCoqA6vVKseI="
 
     },
 
     "de-indent": {
 
@@ -2886,7 +2886,7 @@
 
     },
 
     "delayed-stream": {
 
       "version": "1.0.0",
 
-      "resolved": "https://registry.npm.taobao.org/delayed-stream/download/delayed-stream-1.0.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
 
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
 
       "dev": true
 
     },
 
@@ -2897,7 +2897,7 @@
 
     },
 
     "delegates": {
 
       "version": "1.0.0",
 
-      "resolved": "https://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
 
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
 
       "dev": true
 
     },
 
@@ -3022,7 +3022,7 @@
 
     },
 
     "ecc-jsbn": {
 
       "version": "0.1.2",
 
-      "resolved": "https://registry.npm.taobao.org/ecc-jsbn/download/ecc-jsbn-0.1.2.tgz",
 
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
 
       "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
 
       "dev": true,
 
       "requires": {
 
@@ -3381,7 +3381,7 @@
 
     },
 
     "extsprintf": {
 
       "version": "1.3.0",
 
-      "resolved": "https://registry.npm.taobao.org/extsprintf/download/extsprintf-1.3.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
 
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
 
       "dev": true
 
     },
 
@@ -3557,7 +3557,7 @@
 
     },
 
     "forever-agent": {
 
       "version": "0.6.1",
 
-      "resolved": "https://registry.npm.taobao.org/forever-agent/download/forever-agent-0.6.1.tgz",
 
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
 
       "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
 
       "dev": true
 
     },
 
@@ -4200,7 +4200,7 @@
 
     },
 
     "gauge": {
 
       "version": "2.7.4",
 
-      "resolved": "https://registry.npm.taobao.org/gauge/download/gauge-2.7.4.tgz",
 
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
 
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
 
       "dev": true,
 
       "requires": {
 
@@ -4216,7 +4216,7 @@
 
       "dependencies": {
 
         "is-fullwidth-code-point": {
 
           "version": "1.0.0",
 
-          "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz",
 
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
 
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
 
           "dev": true,
 
           "requires": {
 
@@ -4225,7 +4225,7 @@
 
         },
 
         "string-width": {
 
           "version": "1.0.2",
 
-          "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz?cache=0&sync_timestamp=1618558821529&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-1.0.2.tgz",
 
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
 
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
 
           "dev": true,
 
           "requires": {
 
@@ -4253,7 +4253,7 @@
 
     },
 
     "get-stdin": {
 
       "version": "4.0.1",
 
-      "resolved": "https://registry.npm.taobao.org/get-stdin/download/get-stdin-4.0.1.tgz?cache=0&sync_timestamp=1618557606273&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fget-stdin%2Fdownload%2Fget-stdin-4.0.1.tgz",
 
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
 
       "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
 
       "dev": true
 
     },
 
@@ -4265,7 +4265,7 @@
 
     },
 
     "getpass": {
 
       "version": "0.1.7",
 
-      "resolved": "https://registry.npm.taobao.org/getpass/download/getpass-0.1.7.tgz",
 
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
 
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
 
       "dev": true,
 
       "requires": {
 
@@ -4396,7 +4396,7 @@
 
     },
 
     "har-schema": {
 
       "version": "2.0.0",
 
-      "resolved": "https://registry.npm.taobao.org/har-schema/download/har-schema-2.0.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
 
       "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
 
       "dev": true
 
     },
 
@@ -4462,7 +4462,7 @@
 
     },
 
     "has-unicode": {
 
       "version": "2.0.1",
 
-      "resolved": "https://registry.npm.taobao.org/has-unicode/download/has-unicode-2.0.1.tgz",
 
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
 
       "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
 
       "dev": true
 
     },
 
@@ -4710,7 +4710,7 @@
 
     },
 
     "http-signature": {
 
       "version": "1.2.0",
 
-      "resolved": "https://registry.npm.taobao.org/http-signature/download/http-signature-1.2.0.tgz?cache=0&sync_timestamp=1600868441269&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhttp-signature%2Fdownload%2Fhttp-signature-1.2.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
 
       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
 
       "dev": true,
 
       "requires": {
 
@@ -4772,7 +4772,7 @@
 
     },
 
     "indent-string": {
 
       "version": "2.1.0",
 
-      "resolved": "https://registry.nlark.com/indent-string/download/indent-string-2.1.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
 
       "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
 
       "dev": true,
 
       "requires": {
 
@@ -5010,7 +5010,7 @@
 
     },
 
     "is-typedarray": {
 
       "version": "1.0.0",
 
-      "resolved": "https://registry.npm.taobao.org/is-typedarray/download/is-typedarray-1.0.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
 
       "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
 
       "dev": true
 
     },
 
@@ -5034,7 +5034,7 @@
 
     },
 
     "isexe": {
 
       "version": "2.0.0",
 
-      "resolved": "https://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
 
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
 
       "dev": true
 
     },
 
@@ -5049,7 +5049,7 @@
 
     },
 
     "isstream": {
 
       "version": "0.1.2",
 
-      "resolved": "https://registry.npm.taobao.org/isstream/download/isstream-0.1.2.tgz",
 
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
 
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
 
       "dev": true
 
     },
 
@@ -5107,7 +5107,7 @@
 
     },
 
     "jsbn": {
 
       "version": "0.1.1",
 
-      "resolved": "https://registry.npm.taobao.org/jsbn/download/jsbn-0.1.1.tgz",
 
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
 
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
 
       "dev": true
 
     },
 
@@ -5125,7 +5125,7 @@
 
     },
 
     "json-schema": {
 
       "version": "0.2.3",
 
-      "resolved": "https://registry.npm.taobao.org/json-schema/download/json-schema-0.2.3.tgz?cache=0&sync_timestamp=1609553686459&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson-schema%2Fdownload%2Fjson-schema-0.2.3.tgz",
 
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
 
       "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
 
       "dev": true
 
     },
 
@@ -5146,7 +5146,7 @@
 
     },
 
     "json-stringify-safe": {
 
       "version": "5.0.1",
 
-      "resolved": "https://registry.npm.taobao.org/json-stringify-safe/download/json-stringify-safe-5.0.1.tgz?cache=0&sync_timestamp=1573614722142&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson-stringify-safe%2Fdownload%2Fjson-stringify-safe-5.0.1.tgz",
 
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
 
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
 
       "dev": true
 
     },
 
@@ -5164,7 +5164,7 @@
 
     },
 
     "jsprim": {
 
       "version": "1.4.1",
 
-      "resolved": "https://registry.npm.taobao.org/jsprim/download/jsprim-1.4.1.tgz",
 
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
 
       "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
 
       "dev": true,
 
       "requires": {
 
@@ -5348,7 +5348,7 @@
 
     },
 
     "loud-rejection": {
 
       "version": "1.6.0",
 
-      "resolved": "https://registry.npm.taobao.org/loud-rejection/download/loud-rejection-1.6.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
 
       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
 
       "dev": true,
 
       "requires": {
 
@@ -5389,7 +5389,7 @@
 
     },
 
     "map-obj": {
 
       "version": "1.0.1",
 
-      "resolved": "https://registry.nlark.com/map-obj/download/map-obj-1.0.1.tgz",
 
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
 
       "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
 
       "dev": true
 
     },
 
@@ -5443,7 +5443,7 @@
 
     },
 
     "meow": {
 
       "version": "3.7.0",
 
-      "resolved": "https://registry.nlark.com/meow/download/meow-3.7.0.tgz?cache=0&sync_timestamp=1620227947636&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmeow%2Fdownload%2Fmeow-3.7.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
 
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
 
       "dev": true,
 
       "requires": {
 
@@ -5835,7 +5835,7 @@
 
     },
 
     "nopt": {
 
       "version": "3.0.6",
 
-      "resolved": "https://registry.npm.taobao.org/nopt/download/nopt-3.0.6.tgz?cache=0&sync_timestamp=1597649942437&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnopt%2Fdownload%2Fnopt-3.0.6.tgz",
 
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
 
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
 
       "dev": true,
 
       "requires": {
 
@@ -6340,7 +6340,7 @@
 
     },
 
     "performance-now": {
 
       "version": "2.1.0",
 
-      "resolved": "https://registry.npm.taobao.org/performance-now/download/performance-now-2.1.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
 
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
 
       "dev": true
 
     },
 
@@ -7131,12 +7131,12 @@
 
       "dependencies": {
 
         "clone": {
 
           "version": "2.1.2",
 
-          "resolved": "https://registry.npm.taobao.org/clone/download/clone-2.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fclone%2Fdownload%2Fclone-2.1.2.tgz",
 
+          "resolved": "https://registry.npm.taobao.org/clone/download/clone-2.1.2.tgz",
 
           "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
 
         },
 
         "eventemitter3": {
 
           "version": "2.0.3",
 
-          "resolved": "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-2.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feventemitter3%2Fdownload%2Feventemitter3-2.0.3.tgz",
 
+          "resolved": "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-2.0.3.tgz",
 
           "integrity": "sha1-teEHm1n7XhuidxwKmTvgYKWMmbo="
 
         }
 
       }
 
@@ -7646,7 +7646,7 @@
 
     },
 
     "redent": {
 
       "version": "1.0.0",
 
-      "resolved": "https://registry.nlark.com/redent/download/redent-1.0.0.tgz?cache=0&sync_timestamp=1620070119923&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fredent%2Fdownload%2Fredent-1.0.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
 
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
 
       "dev": true,
 
       "requires": {
 
@@ -8041,7 +8041,7 @@
 
     },
 
     "scss-tokenizer": {
 
       "version": "0.2.3",
 
-      "resolved": "https://registry.npm.taobao.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz",
 
+      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
 
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
 
       "dev": true,
 
       "requires": {
 
@@ -8051,7 +8051,7 @@
 
       "dependencies": {
 
         "source-map": {
 
           "version": "0.4.4",
 
-          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.4.4.tgz",
 
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
 
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
 
           "dev": true,
 
           "requires": {
 
@@ -8595,7 +8595,7 @@
 
     },
 
     "strip-indent": {
 
       "version": "1.0.1",
 
-      "resolved": "https://registry.nlark.com/strip-indent/download/strip-indent-1.0.1.tgz?cache=0&sync_timestamp=1620053263051&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstrip-indent%2Fdownload%2Fstrip-indent-1.0.1.tgz",
 
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
 
       "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
 
       "dev": true,
 
       "requires": {
 
@@ -8761,7 +8761,7 @@
 
     },
 
     "trim-newlines": {
 
       "version": "1.0.0",
 
-      "resolved": "https://registry.nlark.com/trim-newlines/download/trim-newlines-1.0.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
 
       "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
 
       "dev": true
 
     },
 
@@ -8794,7 +8794,7 @@
 
     },
 
     "tunnel-agent": {
 
       "version": "0.6.0",
 
-      "resolved": "https://registry.npm.taobao.org/tunnel-agent/download/tunnel-agent-0.6.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
 
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
 
       "dev": true,
 
       "requires": {
 
@@ -8803,7 +8803,7 @@
 
     },
 
     "tweetnacl": {
 
       "version": "0.14.5",
 
-      "resolved": "https://registry.npm.taobao.org/tweetnacl/download/tweetnacl-0.14.5.tgz?cache=0&sync_timestamp=1581365004105&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftweetnacl%2Fdownload%2Ftweetnacl-0.14.5.tgz",
 
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
 
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
 
       "dev": true
 
     },
 
@@ -9119,7 +9119,7 @@
 
     },
 
     "verror": {
 
       "version": "1.10.0",
 
-      "resolved": "https://registry.npm.taobao.org/verror/download/verror-1.10.0.tgz",
 
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
 
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
 
       "dev": true,
 
       "requires": {

+ 20 - 12
fhKeeper/formulahousekeeper/timesheet/src/views/Home.vue
View File 

@@ -40,8 +40,8 @@
 
                     <el-table :data="popoverData" :height="tableHeight">
 
                         <el-table-column property="type" label="消息中心" align="center">
 
                             <template slot-scope="scope">
 
-                                <el-link type="primary" :underline="false" @click="locationHerf(scope.row.id,scope.row.content)">
 
-                                    {{scope.row.type==0?"审批未通过":"审批通过"}}
 
+                                <el-link type="primary" :underline="false" @click="locationHerf(scope.row.id,scope.row.content, scope.row.type)">
 
+                                    {{scope.row.type==0?"审批未通过":"有新任务啦"}}
 
                                 </el-link>
 
                             </template>
 
                         </el-table-column>
 
@@ -359,21 +359,29 @@
 
             },
 
 
             //点击消息的跳转
 
-            locationHerf(id, date) {
 
+            locationHerf(id, date, type) {
 
                 this.http.post( this.port.manage.check, { id: id },
 
                 res => {
 
                     if (res.code == "ok") {
 
                         this.loadNotice();
 
-                        sessionStorage.msg = date;
 
-                        sessionStorage.from = 1;
 
-                        //本页面再点的话强制转移一下
 
-                        var currentRoute = this.$route.path.split("/");
 
-                        if (currentRoute[1] == "daily") {
 
-                            this.$router.go(0);
 
-                            return false;
 
+                        if (type == 0) {
 
+                            //审批未通过的消息
 
+                            sessionStorage.msg = date;
 
+                            sessionStorage.from = 1;
 
+                            //本页面再点的话强制转移一下
 
+                            var currentRoute = this.$route.path.split("/");
 
+                            if (currentRoute[1] == "daily") {
 
+                                this.$router.go(0);
 
+                                return false;
 
+                            }
 
+                            this.$router.push("/daily");
 
+                            this.drawer = true;
 
+                        } else{
 
+                            //1- 有新任务待执行
 
+                            this.$router.push("/projectInside/"+date);
 
+                            this.drawer = false;
 
                         }
 
-                        this.$router.push("/daily");
 
-                        this.drawer = true;
 
+                        
                     } else {
 
                         this.$message({
 
                             message: res.msg,