任务挣值分析

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskController.java

@@ -61,6 +61,8 @@ public class TaskController {
     private TaskCommentService taskCommentService;
     @Resource
     private InformationService informationService;
+    @Resource
+    private TaskProgressService taskProgressService;
 
     @RequestMapping("/save")
     public HttpRespMsg save(Task task) {
@@ -381,6 +383,12 @@ public class TaskController {
         //查询直接子任务
         QueryWrapper<Task> subQuery = new QueryWrapper<Task>().eq("parent_tid", id);
         t.setSubTaskList(taskService.list(subQuery));
+
+        //查询最新的一条任务进展
+        List<TaskProgress> list = taskProgressService.list(new QueryWrapper<TaskProgress>().eq("task_id", id).orderByDesc("id").last("limit 1"));
+        if (list.size() > 0) {
+            t.setProgress(list.get(0));
+        }
         msg.data = t;
         return msg;
     }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskProgressController.java

@@ -0,0 +1,54 @@
+package com.management.platform.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.management.platform.entity.TaskProgress;
+import com.management.platform.entity.TprogressPaticipators;
+import com.management.platform.entity.User;
+import com.management.platform.mapper.UserMapper;
+import com.management.platform.service.TaskProgressService;
+import com.management.platform.service.TprogressPaticipatorsService;
+import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.ListUtil;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.util.StringUtils;
+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.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2021-05-17
+ */
+@RestController
+@RequestMapping("/task-progress")
+public class TaskProgressController {
+    @Resource
+    private HttpServletRequest request;
+    @Resource
+    private TaskProgressService taskProgressService;
+
+    @RequestMapping("/addProgress")
+    public HttpRespMsg addProgress(TaskProgress progress, String participatorIds) {
+        return taskProgressService.addProgress(progress, participatorIds, request);
+    }
+
+    @RequestMapping("/deleteProgress")
+    public HttpRespMsg deleteProgress(Integer id) {
+        return taskProgressService.deleteProgress(id, request);
+    }
+
+    @RequestMapping("/list")
+    public HttpRespMsg list(Integer taskId) {
+        return taskProgressService.getList(taskId);
+    }
+}
+

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TprogressPaticipatorsController.java

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2021-05-17
+ */
+@RestController
+@RequestMapping("/tprogress-paticipators")
+public class TprogressPaticipatorsController {
+
+}
+

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Information.java

@@ -15,8 +15,8 @@ import lombok.experimental.Accessors;
  * 提示消息
  * </p>
  *
- * @author 吴涛涛
- * @since 2020-02-18
+ * @author Seyason
+ * @since 2021-05-17
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -38,13 +38,13 @@ public class Information extends Model<Information> {
     private String userId;
 
     /**
-     * 类型 0-审批未通过或撤销
+     * 类型 0-审批未通过或撤销，1-任务待执行， 2-任务有进展
      */
     @TableField("type")
     private Integer type;
 
     /**
-     * 具体内容
+     * 附加数据
      */
     @TableField("content")
     private String content;
@@ -61,6 +61,12 @@ public class Information extends Model<Information> {
     @TableField("checked")
     private Integer checked;
 
+    /**
+     * 通知内容
+     */
+    @TableField("msg")
+    private String msg;
+
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Task.java

@@ -180,6 +180,9 @@ public class Task extends Model<Task> {
     @TableField(exist = false)
     private String stagesName;
 
+    @TableField(exist = false)
+    private TaskProgress progress;
+
     @Override
     protected Serializable pkVal() {
         return this.id;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/TaskProgress.java

@@ -0,0 +1,71 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import java.util.List;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2021-05-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaskProgress extends Model<TaskProgress> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 任务ID
+     */
+    @TableField("task_id")
+    private Integer taskId;
+
+    /**
+     * 状态
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 内容
+     */
+    @TableField("content")
+    private String content;
+
+    /**
+     * 发布人id
+     */
+    @TableField("creator_id")
+    private String creatorId;
+
+    /**
+     * 发布时间
+     */
+    @TableField("indate")
+    private LocalDateTime indate;
+
+    @TableField(exist = false)
+    private List<TprogressPaticipators> paticipatorsList;
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/TprogressPaticipators.java

@@ -0,0 +1,54 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2021-05-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TprogressPaticipators extends Model<TprogressPaticipators> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 任务进展id
+     */
+    @TableField("progress_id")
+    private Integer progressId;
+
+    /**
+     * 参与人id
+     */
+    @TableField("user_id")
+    private String userId;
+
+    /**
+     * 参与人姓名
+     */
+    @TableField("user_name")
+    private String userName;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.TaskProgress;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2021-05-17
+ */
+public interface TaskProgressMapper extends BaseMapper<TaskProgress> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.TprogressPaticipators;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2021-05-17
+ */
+public interface TprogressPaticipatorsMapper extends BaseMapper<TprogressPaticipators> {
+
+}

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

@@ -0,0 +1,24 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.TaskProgress;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.management.platform.util.HttpRespMsg;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2021-05-17
+ */
+public interface TaskProgressService extends IService<TaskProgress> {
+
+    HttpRespMsg addProgress(TaskProgress progress, String participatorIds, HttpServletRequest request);
+
+    HttpRespMsg deleteProgress(Integer id, HttpServletRequest request);
+
+    HttpRespMsg getList(Integer taskId);
+}

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

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.TprogressPaticipators;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2021-05-17
+ */
+public interface TprogressPaticipatorsService extends IService<TprogressPaticipators> {
+
+}

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

@@ -0,0 +1,99 @@
+package com.management.platform.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.management.platform.entity.*;
+import com.management.platform.mapper.*;
+import com.management.platform.service.TaskProgressService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.management.platform.service.TprogressPaticipatorsService;
+import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.ListUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2021-05-17
+ */
+@Service
+@Transactional
+public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, TaskProgress> implements TaskProgressService {
+    @Resource
+    private TaskProgressMapper taskProgressMapper;
+    @Resource
+    private TprogressPaticipatorsMapper tprogressPaticipatorsMapper;
+    @Resource
+    private UserMapper userMapper;
+    @Resource
+    private InformationMapper informationMapper;
+    @Resource
+    private TaskMapper taskMapper;
+    @Resource
+    private ProjectMapper projectMapper;
+
+    @Override
+    public HttpRespMsg addProgress(TaskProgress progress, String participatorIds, HttpServletRequest request) {
+        HttpRespMsg msg = new HttpRespMsg();
+        User creator = userMapper.selectById(request.getHeader("Token"));
+        progress.setCreatorId(request.getHeader("Token"));
+        taskProgressMapper.insert(progress);
+        if (!StringUtils.isEmpty(participatorIds)) {
+            List<String> ids = ListUtil.convertLongIdsArrayToList(participatorIds);
+            List<User> userList = userMapper.selectList(new QueryWrapper<User>().in("id", ids));
+            for (User user : userList) {
+                TprogressPaticipators item = new TprogressPaticipators();
+                item.setProgressId(progress.getId());
+                item.setUserId(user.getId());
+                item.setUserName(user.getName());
+                tprogressPaticipatorsMapper.insert(item);
+
+                //发消息通知进展
+                Information information = new Information();
+                information.setContent(""+progress.getTaskId());
+                information.setMsg("任务有新进展");
+                information.setUserId(user.getId());
+                information.setType(2);
+                informationMapper.insert(information);
+            }
+        }
+
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg deleteProgress(Integer id, HttpServletRequest request) {
+        String userId = request.getHeader("Token");
+        HttpRespMsg msg = new HttpRespMsg();
+        TaskProgress taskProgress = taskProgressMapper.selectById(id);
+        Task task = taskMapper.selectById(taskProgress.getTaskId());
+        Project project = projectMapper.selectById(task.getProjectId());
+        if (taskProgress.getCreatorId().equals(userId)
+            ||userId.equals(project.getInchargerId())) {
+            taskProgressMapper.deleteById(id);
+            tprogressPaticipatorsMapper.delete(new QueryWrapper<TprogressPaticipators>().eq("progress_id", id));
+        } else {
+            msg.setError("只有创建人和项目经理可以删除");
+        }
+
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg getList(Integer taskId) {
+        //倒序，最新的在最上面
+        List<TaskProgress> taskProgressList
+                = taskProgressMapper.selectList(new QueryWrapper<TaskProgress>().eq("task_id", taskId).orderByDesc("id"));
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = taskProgressList;
+        return msg;
+    }
+}

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

@@ -185,7 +185,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
             sheet.setColumnWidth(7, 20 * 256);
             sheet.setColumnWidth(8, 20 * 256);
             sheet.setColumnWidth(9, 20 * 256);
-            sheet.setColumnWidth(10, 20 * 256);
             //设置为居中加粗
             HSSFCellStyle headStyle = workbook.createCellStyle();
             HSSFFont font = workbook.createFont();
@@ -222,10 +221,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
             headCell.setCellValue("是否逾期");
             headCell.setCellStyle(headStyle);
             headCell = headRow.createCell(8);
-            headCell.setCellValue("计划工时");
+            headCell.setCellValue("计划工时(h)");
             headCell.setCellStyle(headStyle);
-            headCell = headRow.createCell(10);
-            headCell.setCellValue("实际工时");
+            headCell = headRow.createCell(9);
+            headCell.setCellValue("实际工时(h)");
             headCell.setCellStyle(headStyle);
             int rowNum = 1;
             for (TimeTask task : list) {
@@ -234,11 +233,11 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 row.createCell(1).setCellValue(project.getProjectName());
                 row.createCell(2).setCellValue(task.getExecutorName());
                 row.createCell(3).setCellValue(dateTimeFormatter.format(task.getCreateDate()));
-                row.createCell(4).setCellValue(dateTimeFormatter.format(task.getEndDate()));
-                row.createCell(5).setCellValue(dateTimeFormatter.format(task.getFinishDate()));
+                row.createCell(4).setCellValue(task.getEndDate() != null?dateTimeFormatter.format(task.getEndDate()):"");
+                row.createCell(5).setCellValue(task.getFinishDate() !=null?dateTimeFormatter.format(task.getFinishDate()):"");
                 row.createCell(6).setCellValue(task.getTaskStatus() == 1?"Y":"N");
                 boolean isExpired = false;
-                if (task.getTaskStatus() == 0 && !task.getEndDate().isAfter(LocalDate.now())) {
+                if (task.getTaskStatus() == 0 && task.getEndDate() !=null&& !task.getEndDate().isAfter(LocalDate.now())) {
                     isExpired = true;
                 }
                 row.createCell(7).setCellValue(isExpired?"Y":"N");
@@ -255,9 +254,11 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
             //返回生成的文件地址/upload文件夹下
             httpRespMsg.data = "/upload/" + fileUrlSuffix;
         } catch (NullPointerException e) {
+            e.printStackTrace();
             httpRespMsg.setError("验证失败或缺少数据");
             return httpRespMsg;
         } catch (IOException e) {
+            e.printStackTrace();
             httpRespMsg.setError("文件生成错误");
             return httpRespMsg;
         }

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

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.TprogressPaticipators;
+import com.management.platform.mapper.TprogressPaticipatorsMapper;
+import com.management.platform.service.TprogressPaticipatorsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2021-05-17
+ */
+@Service
+public class TprogressPaticipatorsServiceImpl extends ServiceImpl<TprogressPaticipatorsMapper, TprogressPaticipators> implements TprogressPaticipatorsService {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/InformationMapper.xml

@@ -10,11 +10,12 @@
         <result column="content" property="content" />
         <result column="time" property="time" />
         <result column="checked" property="checked" />
+        <result column="msg" property="msg" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, type, content, time, checked
+        id, user_id, type, content, time, checked, msg
     </sql>
 
 </mapper>

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TaskMapper.xml

@@ -96,16 +96,16 @@
     <!-- 查询任务实际工时和计划工时对比,仅查询有实际工时的数据 -->
     <select id="getTaskTimeCompare" resultType="java.util.Map">
         SELECT task.id , task.name AS name, task.plan_hours as planHours, IFNULL(SUM(report.`working_time`),0) AS workHours FROM report
-        LEFT JOIN task ON report.`task_id` = task.id
-        WHERE task.project_id = #{projectId} AND report.state = 1
-        GROUP BY task.id ORDER BY SUM(report.`working_time`) DESC
+        LEFT JOIN task ON report.`task_id` = task.id AND report.state = 1
+        WHERE task.project_id = #{projectId}
+        GROUP BY task.id
     </select>
 
     <!--查询任务，带实际工时-->
     <select id="getTaskWithWorktime" resultMap="timeResultMap">
         SELECT task.* , IFNULL(SUM(report.`working_time`),0) AS work_hours FROM task
-        LEFT JOIN report ON report.`task_id` = task.id
-        WHERE task.project_id = #{projectId} and report.state = 1
+        LEFT JOIN report ON report.`task_id` = task.id and report.state = 1
+        WHERE task.project_id = #{projectId}
         GROUP BY task.id ORDER BY SUM(report.`working_time`) DESC LIMIT 10
     </select>
 </mapper>

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TaskProgressMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.TaskProgressMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.TaskProgress">
+        <id column="id" property="id" />
+        <result column="task_id" property="taskId" />
+        <result column="status" property="status" />
+        <result column="content" property="content" />
+        <result column="creator_id" property="creatorId" />
+        <result column="indate" property="indate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, task_id, status, content, creator_id, indate
+    </sql>
+
+</mapper>

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TprogressPaticipatorsMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.TprogressPaticipatorsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.TprogressPaticipators">
+        <id column="id" property="id" />
+        <result column="progress_id" property="progressId" />
+        <result column="user_id" property="userId" />
+        <result column="user_name" property="userName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, progress_id, user_id, user_name
+    </sql>
+
+</mapper>

fhKeeper/formulahousekeeper/timesheet/src/views/Home.vue

@@ -41,7 +41,7 @@
                         <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)">
-                                    {{scope.row.type==0?"审批未通过":"有新任务啦"}}
+                                    {{msgTypeTxt[scope.row.type]}}
                                 </el-link>
                             </template>
                         </el-table-column>
@@ -167,7 +167,7 @@
                 collapsed: sessionStorage.collapsed!=null?(sessionStorage.collapsed=='true'?true:false):false,
                 sysUserName: "",
                 menu: [],
-
+                msgTypeTxt:["审批未通过","有新任务啦","任务有新进展"],
                 editInformation: false,
                 editPassWord: false,
                 editLoading: false,
@@ -376,10 +376,14 @@
                             }
                             this.$router.push("/daily");
                             this.drawer = true;
-                        } else{
+                        } else if (type == 1) {
                             //1- 有新任务待执行
                             this.$router.push("/projectInside/"+date);
                             this.drawer = false;
+                        } else if (type == 2) {
+                            //2- 任务有新进展
+                            this.$router.push("/projectInside/"+date);
+                            this.drawer = false;
                         }
                         
                     } else {

fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -662,6 +662,21 @@ toolbar: 'bold italic underline strikethrough | fontsizeselect | forecolor backc
             };
         },
         methods: {
+            exportTask() {
+                let _this = this;
+                this.http.post('/task/exportTask', {projectId: this.curProjectId},
+                res => {
+                    if (res.code == "ok") {
+                        location.href = res.data;
+                    } else {
+                        this.$message({
+                            message: res.msg,
+                            type: "error"
+                        });
+                    }
+                }
+                );
+            },
             addprogress(){ // 添加子任务进展事件
                 this.$refs.proBox.style.display="block"
                 this.$refs.addPro.style.display="none"