管控

blade-service-api/blade-control-api/src/main/java/org/springblade/control/dto/LogHistoryInfoDTO.java

@@ -0,0 +1,16 @@
+package org.springblade.control.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springblade.control.entity.LogHistoryInfo;
+
+@Data
+public class LogHistoryInfoDTO extends LogHistoryInfo {
+
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
+}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/dto/PlanInfoDTO.java

@@ -1,19 +0,0 @@
-package org.springblade.control.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.control.entity.PlanInfo;
-
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PlanInfoDTO extends PlanInfo {
-
-    @ApiModelProperty(value = "任务ids，字符串逗号拼接")
-    private String taskIds;
-
-    @ApiModelProperty(value = "任务数据状态 1=提交数据 2=暂存数据")
-    private String taskDataStatus;
-
-}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/dto/TaskInfoDTO.java

@@ -1,24 +0,0 @@
-package org.springblade.control.dto;
-
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.control.entity.TaskInfo;
-import org.springblade.core.mp.base.BaseEntity;
-
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class TaskInfoDTO extends TaskInfo {
-
-    @ApiModelProperty(value = "1=我的任务、2=我关联的计划任务、3=查看全部计划任务")
-    private String type;
-
-    @ApiModelProperty(value = "计划部门")
-    private String planDept;
-
-    @ApiModelProperty(value = "计划状态")
-    private String planStatus;
-
-}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/LogHistoryInfo.java

@@ -0,0 +1,31 @@
+package org.springblade.control.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+@Data
+@TableName("c_log_history_info")
+@EqualsAndHashCode(callSuper = true)
+public class LogHistoryInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    @ApiModelProperty(value = "组织部门id")
+    private Long orgDept;
+
+    @ApiModelProperty(value = "工作描述")
+    private String workDesc;
+
+    @ApiModelProperty(value = "风险预警")
+    private String riskWarning;
+
+    @ApiModelProperty(value = "报销金额")
+    private String expenseReimbursementAmount;
+
+}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/PlanInfo.java

@@ -1,42 +0,0 @@
-package org.springblade.control.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
-
-import java.util.Date;
-
-/**
- * 计划表
- */
-@Data
-@TableName("c_control_plan_info")
-@EqualsAndHashCode(callSuper = true)
-public class PlanInfo extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "计划名称")
-    private String planName;
-
-    @ApiModelProperty(value = "计划编号")
-    private String planNumber;
-
-    @ApiModelProperty(value = "计划部门")
-    private Integer planDept;
-
-    @ApiModelProperty(value = "计划类型")
-    private Integer planType;
-
-    @ApiModelProperty(value = "计划开始时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy/MM/dd", timezone = "GMT+8")
-    private Date planStartDate;
-
-    @ApiModelProperty(value = "计划结束时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy/MM/dd", timezone = "GMT+8")
-    private Date planEndDate;
-
-}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/TaskInfo.java

@@ -1,64 +0,0 @@
-package org.springblade.control.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
-
-import java.util.Date;
-
-
-/**
- * 计划任务表
- */
-@Data
-@TableName("c_control_task_info")
-@EqualsAndHashCode(callSuper = true)
-public class TaskInfo extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "任务描述")
-    private String taskDesc;
-
-    @ApiModelProperty(value = "任务类型")
-    private Integer taskType;
-
-    @ApiModelProperty(value = "任务完成指标")
-    private String taskStandard;
-
-    @ApiModelProperty(value = "任务开始日期")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy/MM/dd", timezone = "GMT+8")
-    private Date taskStartDate;
-
-    @ApiModelProperty(value = "任务结束日期")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy/MM/dd", timezone = "GMT+8")
-    private Date taskEndDate;
-
-    @ApiModelProperty(value = "总工作日")
-    private String totalWorkDays;
-
-    @ApiModelProperty(value = "关联项目id")
-    private Long relatedProjectId;
-
-    @ApiModelProperty(value = "是否关联预算 0=否 1=是")
-    private Integer isRelatedBudget;
-
-    @ApiModelProperty(value = "关联的项目环节")
-    private Integer projectProcess;
-
-    @ApiModelProperty(value = "任务人id")
-    private Long taskUserId;
-
-    @ApiModelProperty(value = "协助人id")
-    private Long taskUserIdAssist;
-
-    @ApiModelProperty(value = "部门负责人id")
-    private Long taskUserIdLeader;
-
-    @ApiModelProperty(value = "任务数据状态 1=提交数据 2=暂存数据")
-    private Integer isSubmitOrSuspend;
-
-}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/LogHistoryInfoReadVO.java

@@ -0,0 +1,15 @@
+package org.springblade.control.vo;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("c_log_history_read_record")
+public class LogHistoryInfoReadVO {
+
+    private Long id;
+    private Long logId;
+    private Long userId;
+
+}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/LogHistoryInfoVO.java

@@ -0,0 +1,24 @@
+package org.springblade.control.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springblade.control.entity.LogHistoryInfo;
+
+import java.util.List;
+
+@Data
+public class LogHistoryInfoVO extends LogHistoryInfo {
+
+    @ApiModelProperty(value = "用户头像")
+    private String headPicture;
+
+    @ApiModelProperty(value = "日志名称")
+    private String logTitle;
+
+    @ApiModelProperty(value = "已读状态 0=未读 1=已读")
+    private Integer isRead;
+
+    @ApiModelProperty(value = "当前日志关联的任务信息List")
+    private List<TaskInfo> taskList;
+
+}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/PlanInfoVO.java

@@ -1,39 +0,0 @@
-package org.springblade.control.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class PlanInfoVO implements Serializable {
-
-    @ApiModelProperty(value = "计划id")
-    private String id;
-
-    @ApiModelProperty(value = "计划编号")
-    private String planNumber;
-
-    @ApiModelProperty(value = "计划名称")
-    private String planName;
-
-    @ApiModelProperty(value = "计划类型")
-    private String planTypeName;
-
-    @ApiModelProperty(value = "计划起止日期")
-    private String planStartAndEndDate;
-
-    @ApiModelProperty(value = "任务总数量")
-    private String taskCount;
-
-    @ApiModelProperty(value = "已完成计划")
-    private String taskComplete;
-
-    @ApiModelProperty(value = "未完成计划")
-    private String taskIncomplete;
-
-    @ApiModelProperty(value = "计划制定人")
-    private String planFormulateUserName;
-
-
-}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/PlanTaskRecordVO.java

@@ -1,16 +0,0 @@
-package org.springblade.control.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-@TableName("c_control_plan_task_record")
-public class PlanTaskRecordVO implements Serializable {
-
-    private Long id;
-    private Long planId;
-    private Long taskId;
-
-}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/TaskPageVO.java

@@ -1,47 +0,0 @@
-package org.springblade.control.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class TaskPageVO implements Serializable {
-
-    @ApiModelProperty(value = "任务id")
-    private String id;
-
-    @ApiModelProperty(value = "计划名称")
-    private String planName;
-
-    @ApiModelProperty(value = "任务状态")
-    private String status;
-
-    @ApiModelProperty(value = "任务描述")
-    private String taskDesc;
-
-    @ApiModelProperty(value = "任务完成指标")
-    private String taskStandard;
-
-    @ApiModelProperty(value = "任务完成期限")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy/MM/dd", timezone = "GMT+8")
-    private Date taskEndDate;
-
-    @ApiModelProperty(value = "任务人")
-    private String taskUserName;
-
-    @ApiModelProperty(value = "协助人")
-    private String taskUserAssistName;
-
-    @ApiModelProperty(value = "部门负责人")
-    private String taskUserLeaderName;
-
-    @ApiModelProperty(value = "关联的项目环节名称")
-    private String projectProcessName;
-
-    @ApiModelProperty(value = "关联项目")
-    private String relatedProjectName;
-
-}

blade-service/blade-control/src/main/java/org/springblade/control/controller/LogHistoryController.java

@@ -0,0 +1,46 @@
+package org.springblade.control.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.control.dto.LogHistoryInfoDTO;
+import org.springblade.control.service.LogHistoryService;
+import org.springblade.control.vo.LogHistoryInfoVO;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/log")
+@Api(value = "日志填报接口", tags = "日志填报接口")
+public class LogHistoryController extends BladeController {
+
+    private final LogHistoryService logHistoryService;
+
+    @PostMapping("/list")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "日志填报列表查询", notes = "传入HistoryLogInfoDTO")
+    public R<Map<String, List<LogHistoryInfoVO>>> logList(@RequestBody LogHistoryInfoDTO dto) {
+        return R.data(logHistoryService.logList(dto));
+    }
+
+    @PostMapping("/submit")
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "日志填报新增或者修改", notes = "传入HistoryLogInfoDTO")
+    public R<Object> logSubmit(@RequestBody LogHistoryInfoDTO dto) {
+        return R.status(logHistoryService.logSubmit(dto));
+    }
+
+    @PostMapping("/detail")
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "日志填报详情", notes = "传入日志id")
+    public R<LogHistoryInfoVO> logDetail(@RequestParam Long id) {
+        return R.data(logHistoryService.logDetail(id));
+    }
+
+}

blade-service/blade-control/src/main/java/org/springblade/control/controller/PlanInfoController.java

@@ -1,56 +0,0 @@
-package org.springblade.control.controller;
-
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springblade.control.dto.PlanInfoDTO;
-import org.springblade.control.entity.PlanInfo;
-import org.springblade.control.service.PlanInfoService;
-import org.springblade.control.vo.PlanInfoVO;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.*;
-
-
-@RestController
-@AllArgsConstructor
-@RequestMapping("/plan")
-@Api(value = "计划接口", tags = "计划接口")
-public class PlanInfoController extends BladeController {
-
-    private final PlanInfoService planInfoService;
-
-    @PostMapping("/page")
-    @ApiOperationSupport(order = 1)
-    @ApiOperation(value = "计划分页查询", notes = "传入Query、PlanInfoDTO")
-    public R<IPage<PlanInfoVO>> planPage(@RequestBody Query query, @RequestBody PlanInfoDTO dto) {
-        return R.data(planInfoService.planPage(Condition.getPage(query), dto));
-    }
-
-    @PostMapping("/submit")
-    @ApiOperationSupport(order = 2)
-    @ApiOperation(value = "计划新增或编辑", notes = "传入PlanInfoDTO")
-    public R<Object> planSubmit(PlanInfoDTO dto) {
-        return R.status(planInfoService.planSubmit(dto));
-    }
-
-    @PostMapping("/remove")
-    @ApiOperationSupport(order = 3)
-    @ApiOperation(value = "计划删除", notes = "传入计划id")
-    public R<Object> planRemove(@RequestParam String id) {
-        return R.status(planInfoService.planRemove(id));
-    }
-
-    @GetMapping("/detail")
-    @ApiOperationSupport(order = 4)
-    @ApiOperation(value = "计划详情", notes = "传入计划id")
-    public R<PlanInfo> planDetail(@RequestParam String id) {
-        return R.data(planInfoService.planDetail(id));
-    }
-
-}

blade-service/blade-control/src/main/java/org/springblade/control/controller/TaskInfoController.java

@@ -1,71 +0,0 @@
-package org.springblade.control.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springblade.control.dto.TaskInfoDTO;
-import org.springblade.control.entity.TaskInfo;
-import org.springblade.control.service.TaskInfoService;
-import org.springblade.control.vo.TaskPageVO;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@RestController
-@AllArgsConstructor
-@RequestMapping("/task")
-@Api(value = "计划任务接口", tags = "计划任务接口")
-public class TaskInfoController extends BladeController {
-
-    private final TaskInfoService taskInfoService;
-
-    @PostMapping("/submit")
-    @ApiOperationSupport(order = 1)
-    @ApiOperation(value = "任务新增或修改", notes = "传入TaskInfo")
-    public R<Object> taskSubmit(@RequestBody TaskInfo obj) {
-        return R.status(taskInfoService.taskSubmit(obj));
-    }
-
-    @GetMapping("/list")
-    @ApiOperationSupport(order = 2)
-    @ApiOperation(value = "任务列表", notes = "传入计划id")
-    public R<List<TaskInfo>> taskList(@RequestParam String id) {
-        return R.data(taskInfoService.taskList(id));
-    }
-
-    @PostMapping("/remove")
-    @ApiOperationSupport(order = 3)
-    @ApiOperation(value = "任务删除", notes = "传入任务id")
-    public R<Object> taskRemove(@RequestParam String id) {
-        return R.status(taskInfoService.taskRemove(id));
-    }
-
-    @PostMapping("/repeal")
-    @ApiOperationSupport(order = 4)
-    @ApiOperation(value = "任务废除", notes = "传入任务id")
-    public R<Object> taskRepeal(@RequestParam String id) {
-        return R.status(taskInfoService.taskRepeal(id));
-    }
-
-    @PostMapping("/page")
-    @ApiOperationSupport(order = 5)
-    @ApiOperation(value = "我的任务page分页", notes = "传入Query、TaskInfoDTO")
-    public R<IPage<TaskPageVO>> taskPage(@RequestBody Query query, @RequestBody TaskInfoDTO dto) {
-        return R.data(taskInfoService.taskPage(Condition.getPage(query), dto));
-    }
-
-    @PostMapping("/relation/submit")
-    @ApiOperationSupport(order = 6)
-    @ApiOperation(value = "关联任务提交", notes = "传入任务ids、当前用户信息")
-    public R<Object> taskRelationSubmit(String taskIds, BladeUser user) {
-        return R.status(taskInfoService.taskRelationSubmit(taskIds, user));
-    }
-
-}

blade-service/blade-control/src/main/java/org/springblade/control/mapper/LogHistoryMapper.java

@@ -0,0 +1,7 @@
+package org.springblade.control.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.control.entity.LogHistoryInfo;
+
+public interface LogHistoryMapper extends BaseMapper<LogHistoryInfo> {
+}

blade-service/blade-control/src/main/java/org/springblade/control/mapper/LogHistoryMapper.xml

@@ -0,0 +1,14 @@
+<?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="org.springblade.control.mapper.LogHistoryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="resultMap" type="org.springblade.control.entity.LogHistoryInfo">
+        <result column="user_id" property="userId"/>
+        <result column="risk_warning" property="riskWarning"/>
+        <result column="work_desc" property="workDesc"/>
+        <result column="expense_reimbursement_amount" property="expenseReimbursementAmount"/>
+    </resultMap>
+
+
+</mapper>

blade-service/blade-control/src/main/java/org/springblade/control/mapper/PlanInfoMapper.java

@@ -1,7 +0,0 @@
-package org.springblade.control.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.control.entity.PlanInfo;
-
-public interface PlanInfoMapper extends BaseMapper<PlanInfo> {
-}

blade-service/blade-control/src/main/java/org/springblade/control/mapper/PlanInfoMapper.xml

@@ -1,19 +0,0 @@
-<?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="org.springblade.control.mapper.PlanInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="resultMap" type="org.springblade.control.entity.PlanInfo">
-        <result column="id" property="id"/>
-        <result column="plan_name" property="planName"/>
-        <result column="plan_number" property="planNumber"/>
-        <result column="plan_dept" property="planDept"/>
-        <result column="plan_type" property="planType"/>
-        <result column="plan_start_date" property="planStartDate"/>
-        <result column="plan_end_date" property="planEndDate"/>
-        <result column="status" property="status"/>
-        <result column="is_deleted" property="isDeleted"/>
-    </resultMap>
-
-
-</mapper>

blade-service/blade-control/src/main/java/org/springblade/control/mapper/TaskInfoMapper.java

@@ -1,7 +0,0 @@
-package org.springblade.control.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.control.entity.TaskInfo;
-
-public interface TaskInfoMapper extends BaseMapper<TaskInfo> {
-}

blade-service/blade-control/src/main/java/org/springblade/control/mapper/TaskInfoMapper.xml

@@ -1,13 +0,0 @@
-<?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="org.springblade.control.mapper.TaskInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="resultMap" type="org.springblade.control.entity.TaskInfo">
-        <result column="id" property="id"/>
-        <result column="status" property="status"/>
-        <result column="is_deleted" property="isDeleted"/>
-    </resultMap>
-
-
-</mapper>

blade-service/blade-control/src/main/java/org/springblade/control/service/LogHistoryService.java

@@ -0,0 +1,19 @@
+package org.springblade.control.service;
+
+import org.springblade.control.dto.LogHistoryInfoDTO;
+import org.springblade.control.entity.LogHistoryInfo;
+import org.springblade.control.vo.LogHistoryInfoVO;
+import org.springblade.core.mp.base.BaseService;
+
+import java.util.List;
+import java.util.Map;
+
+public interface LogHistoryService extends BaseService<LogHistoryInfo> {
+
+    Map<String, List<LogHistoryInfoVO>> logList(LogHistoryInfoDTO dto);
+
+    boolean logSubmit(LogHistoryInfoDTO dto);
+
+    LogHistoryInfoVO logDetail(Long id);
+
+}

blade-service/blade-control/src/main/java/org/springblade/control/service/PlanInfoService.java

@@ -1,19 +0,0 @@
-package org.springblade.control.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.control.dto.PlanInfoDTO;
-import org.springblade.control.entity.PlanInfo;
-import org.springblade.control.vo.PlanInfoVO;
-import org.springblade.core.mp.base.BaseService;
-
-public interface PlanInfoService extends BaseService<PlanInfo> {
-
-    IPage<PlanInfoVO> planPage(IPage<PlanInfo> page, PlanInfoDTO dto);
-
-    boolean planSubmit(PlanInfoDTO dto);
-
-    boolean planRemove(String id);
-
-    PlanInfo planDetail(String id);
-
-}

blade-service/blade-control/src/main/java/org/springblade/control/service/TaskInfoService.java

@@ -1,26 +0,0 @@
-package org.springblade.control.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.control.dto.TaskInfoDTO;
-import org.springblade.control.entity.TaskInfo;
-import org.springblade.control.vo.TaskPageVO;
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.core.secure.BladeUser;
-
-import java.util.List;
-
-public interface TaskInfoService extends BaseService<TaskInfo> {
-
-    boolean taskSubmit(TaskInfo obj);
-
-    List<TaskInfo> taskList(String id);
-
-    boolean taskRemove(String id);
-
-    boolean taskRepeal(String id);
-
-    IPage<TaskPageVO> taskPage(IPage<TaskInfo> page, TaskInfoDTO dto);
-
-    boolean taskRelationSubmit(String taskIds, BladeUser user);
-
-}

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/LogHistoryServiceImpl.java

@@ -0,0 +1,143 @@
+package org.springblade.control.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateUtils;
+import org.springblade.common.utils.SnowFlakeUtil;
+import org.springblade.control.dto.LogHistoryInfoDTO;
+import org.springblade.control.entity.LogHistoryInfo;
+import org.springblade.control.mapper.LogHistoryMapper;
+import org.springblade.control.service.LogHistoryService;
+import org.springblade.control.vo.LogHistoryInfoReadVO;
+import org.springblade.control.vo.LogHistoryInfoVO;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.utils.SecureUtil;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+@AllArgsConstructor
+public class LogHistoryServiceImpl extends BaseServiceImpl<LogHistoryMapper, LogHistoryInfo> implements LogHistoryService {
+
+    private final IUserClient iUserClient;
+    private final JdbcTemplate jdbcTemplate;
+
+    @Override
+    public Map<String, List<LogHistoryInfoVO>> logList(LogHistoryInfoDTO dto) {
+        LambdaQueryWrapper<LogHistoryInfo> queryWrapper = new LambdaQueryWrapper<>();
+        if (ObjectUtil.isNotEmpty(dto.getOrgDept())) {
+            queryWrapper.eq(LogHistoryInfo::getOrgDept, dto.getOrgDept());
+        }
+        if (ObjectUtil.isNotEmpty(dto.getUserId())) {
+            queryWrapper.eq(LogHistoryInfo::getUserId, dto.getUserId());
+        }
+        if (StringUtils.isNotEmpty(dto.getStartTime()) && StringUtils.isNotEmpty(dto.getEndTime())) {
+            String endTime = dto.getEndTime();
+            endTime = DateUtil.format(DateUtils.addDays(DateUtil.parse(endTime, "yyyy-MM-dd"), 1), "yyyy-MM-dd");
+            queryWrapper.between(LogHistoryInfo::getCreateTime, dto.getStartTime(), endTime);
+        } else {
+            //默认查询7天内日志
+            LocalDate today = LocalDate.now();
+            LocalDate tomorrow = today.plusDays(1);
+            LocalDate sevenDaysAgo = today.minusDays(6);
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            String todayStr = tomorrow.format(formatter);
+            String sevenDaysAgoStr = sevenDaysAgo.format(formatter);
+            queryWrapper.between(LogHistoryInfo::getCreateTime, sevenDaysAgoStr, todayStr);
+        }
+        queryWrapper.orderByDesc(true, LogHistoryInfo::getCreateTime);
+        List<LogHistoryInfo> logHistoryInfos = baseMapper.selectList(queryWrapper);
+        List<LogHistoryInfoVO> voList = BeanUtil.copyProperties(logHistoryInfos, LogHistoryInfoVO.class);
+        List<Long> logIds = voList.stream().map(LogHistoryInfo::getId).collect(Collectors.toList());
+        if (logIds.size() > 0) {
+            //用户信息
+            List<User> userList = iUserClient.selectUserAll();
+            Map<Long, User> userMap = new HashMap<>();
+            for (User user : userList) {
+                userMap.put(user.getId(), user);
+            }
+            //7天内已读日志记录信息
+            List<LogHistoryInfoReadVO> infoReadVOS = jdbcTemplate.query("select * from c_log_history_read_record where log_id in(" + StringUtils.join(logIds, ",") + ")", new BeanPropertyRowMapper<>(LogHistoryInfoReadVO.class));
+            Map<String, LogHistoryInfoReadVO> readMap = new HashMap<>();
+            for (LogHistoryInfoReadVO readVO : infoReadVOS) {
+                readMap.put(readVO.getUserId() + readVO.getLogId() + "", readVO);
+            }
+
+            for (LogHistoryInfoVO vo : voList) {
+                User user = userMap.get(vo.getUserId());
+                if (user != null) {
+                    vo.setLogTitle(user.getRealName() + "的日志");
+                    vo.setHeadPicture(StringUtils.isNotEmpty(user.getAvatar()) ? user.getAvatar() : "");
+                }
+                String readIndex = SecureUtil.getUserId() + vo.getId() + "";
+                LogHistoryInfoReadVO readVO = readMap.get(readIndex);
+                if (readVO != null) {
+                    vo.setIsRead(1);
+                } else {
+                    vo.setIsRead(0);
+                }
+            }
+        }
+        return voList.stream()
+                .collect(Collectors.groupingBy(vo -> {
+                    LocalDateTime localDateTime = LocalDateTime.ofInstant(vo.getCreateTime().toInstant(), ZoneId.systemDefault());
+                    return localDateTime.toLocalDate().toString();
+                }, LinkedHashMap::new, Collectors.toList()));
+    }
+
+    @Override
+    public boolean logSubmit(LogHistoryInfoDTO dto) {
+        this.saveOrUpdate(dto);
+
+        if (ObjectUtil.isNotEmpty(dto.getExpenseReimbursementAmount())) {
+            //报销金额不为空，在财务报销里面新增一条草稿箱内容 TODO
+        }
+
+        return true;
+    }
+
+    @Override
+    public LogHistoryInfoVO logDetail(Long id) {
+        if (ObjectUtil.isEmpty(SecureUtil.getUserId())) {
+            throw new ServiceException("获取当前用户信息失败，请联系管理员");
+        }
+        LogHistoryInfo obj = baseMapper.selectById(id);
+        if (obj != null) {
+            LogHistoryInfoVO vo = BeanUtil.copyProperties(obj, LogHistoryInfoVO.class);
+            if (vo != null) {
+                User user = iUserClient.userInfoById(vo.getUserId()).getData();
+                if (user != null) {
+                    vo.setLogTitle(user.getRealName() + "的日志");
+                    vo.setHeadPicture(StringUtils.isNotEmpty(user.getAvatar()) ? user.getAvatar() : "");
+                }
+
+                //处理当前用户查看当前日志信息为已读状态
+                Long row = jdbcTemplate.queryForObject("select count(1) from c_log_history_read_record where log_id = " + vo.getId() + " and user_id = " + SecureUtil.getUserId(), Long.class);
+                if (row == null || row == 0L) {
+                    jdbcTemplate.execute("insert into c_log_history_read_record(id,log_id,user_id) values (" + SnowFlakeUtil.getId() + "," + vo.getId() + "," + SecureUtil.getUserId() + ")");
+                }
+
+                //处理当前日志taskList任务列表 TODO
+
+
+                return vo;
+            }
+        }
+        return null;
+    }
+}

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/PlanInfoServiceImpl.java

@@ -1,131 +0,0 @@
-package org.springblade.control.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.AllArgsConstructor;
-import org.apache.commons.lang.StringUtils;
-import org.springblade.common.utils.SnowFlakeUtil;
-import org.springblade.control.dto.PlanInfoDTO;
-import org.springblade.control.entity.PlanInfo;
-import org.springblade.control.entity.TaskInfo;
-import org.springblade.control.mapper.PlanInfoMapper;
-import org.springblade.control.service.PlanInfoService;
-import org.springblade.control.vo.PlanInfoVO;
-import org.springblade.control.vo.PlanTaskRecordVO;
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.utils.SecureUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.system.entity.DictBiz;
-import org.springframework.beans.BeanUtils;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@AllArgsConstructor
-@Service
-public class PlanInfoServiceImpl extends BaseServiceImpl<PlanInfoMapper, PlanInfo> implements PlanInfoService {
-
-    private final JdbcTemplate jdbcTemplate;
-
-    @Override
-    public IPage<PlanInfoVO> planPage(IPage<PlanInfo> page, PlanInfoDTO dto) {
-        QueryWrapper<PlanInfo> queryWrapper = Condition.getQueryWrapper(dto);
-        if (ObjectUtil.isNotEmpty(dto.getPlanType())) {
-            queryWrapper.lambda().eq(PlanInfo::getPlanType, dto.getPlanType());
-        }
-        if (ObjectUtil.isNotEmpty(dto.getPlanDept())) {
-            queryWrapper.lambda().eq(PlanInfo::getPlanDept, dto.getPlanDept());
-        }
-        if (ObjectUtil.isNotEmpty(dto.getPlanName())) {
-            queryWrapper.lambda().eq(PlanInfo::getPlanName, dto.getPlanName());
-        }
-        if (ObjectUtil.isNotEmpty(dto.getPlanStartDate()) && ObjectUtil.isNotEmpty(dto.getPlanEndDate())) {
-            queryWrapper.lambda().ge(PlanInfo::getPlanStartDate, dto.getPlanStartDate()).le(PlanInfo::getPlanEndDate, dto.getPlanEndDate());
-        }
-        IPage<PlanInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, true, PlanInfo::getCreateTime));
-        List<DictBiz> query = jdbcTemplate.query("select dict_key,dict_value from blade_dict_biz where code= 'plan_type' and parent_id != 0", new BeanPropertyRowMapper<>(DictBiz.class));
-        List<PlanInfo> records = pages.getRecords();
-
-        List<Long> planIds = records.stream().map(PlanInfo::getId).collect(Collectors.toList());
-        Map<Long, List<PlanTaskRecordVO>> mapsRecord = jdbcTemplate.queryForList("select plan_id,task_id from c_control_plan_task_record where plan_id in(" + StringUtils.join(planIds, ",") + ")", PlanTaskRecordVO.class).stream().collect(Collectors.groupingBy(PlanTaskRecordVO::getPlanId));
-
-        return pages.convert(planInfo -> {
-            PlanInfoVO vo = new PlanInfoVO();
-            BeanUtils.copyProperties(planInfo, vo);
-
-            vo.setId(planInfo.getId() + "");
-            vo.setPlanName(StringUtils.isNotEmpty(planInfo.getPlanName()) ? planInfo.getPlanName() : "");
-            vo.setPlanNumber(StringUtils.isNotEmpty(planInfo.getPlanNumber()) ? planInfo.getPlanNumber() : "");
-
-            for (DictBiz dictBiz : query) {
-                if (dictBiz.getDictKey().equals(planInfo.getPlanType() + "")) {
-                    vo.setPlanTypeName(dictBiz.getDictValue());
-                    break;
-                }
-            }
-
-            vo.setPlanStartAndEndDate(planInfo.getPlanStartDate() + "~" + planInfo.getPlanEndDate());
-
-            List<PlanTaskRecordVO> planTaskRecordVOS = mapsRecord.get(planInfo.getId());
-            if (planTaskRecordVOS != null && planTaskRecordVOS.size() > 0) {
-                //任务总数
-                vo.setTaskCount(planTaskRecordVOS.size() + "");
-                List<Long> taskIds = planTaskRecordVOS.stream().map(PlanTaskRecordVO::getTaskId).collect(Collectors.toList());
-                //已完成任务数
-                Long taskCompletedCount = jdbcTemplate.queryForObject("select count(1) from c_control_task_info where status = 2 and id in(" + StringUtils.join(taskIds, ",") + ")", Long.class);
-                vo.setTaskComplete(taskCompletedCount + "");
-                //未完成任务数
-                Long taskIncompleteCount = jdbcTemplate.queryForObject("select count(1) from c_control_task_info where status != 2 and id in(" + StringUtils.join(taskIds, ",") + ")", Long.class);
-                vo.setTaskIncomplete(taskIncompleteCount + "");
-            }
-            vo.setPlanFormulateUserName(StringUtils.isNotEmpty(SecureUtil.getUserName()) ? SecureUtil.getUserName() : "");
-            return vo;
-        });
-    }
-
-    @Override
-    public boolean planSubmit(PlanInfoDTO dto) {
-        this.saveOrUpdate(dto);
-        if (ObjectUtil.isNotEmpty(dto.getId()) && StringUtils.isNotEmpty(dto.getTaskIds()) && StringUtils.isNotEmpty(dto.getTaskDataStatus())) {
-            //绑定计划与任务关系
-            List<String> taskIds = Func.toStrList(dto.getTaskIds());
-            for (String taskId : taskIds) {
-                jdbcTemplate.execute("insert into c_control_plan_task_record(id,plan_id,task_id) values(" + SnowFlakeUtil.getId() + "," + dto.getId() + "," + taskId + ")");
-            }
-            //修改任务数据状态为提交或暂存（任务数据状态 1=提交数据 2=暂存数据）
-            jdbcTemplate.execute("update from c_control_task_info set is_submit_or_suspend = " + dto.getTaskDataStatus() + " where id in(" + StringUtils.join(taskIds, ",") + ")");
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean planRemove(String id) {
-        //删除计划
-        jdbcTemplate.execute("delete from c_control_plan_info where id = " + id);
-
-        //删除计划内任务
-        List<PlanTaskRecordVO> planTaskRecordVOS = jdbcTemplate.queryForList("select task_id from c_control_plan_task_record where plan_id = " + id, PlanTaskRecordVO.class);
-        List<Long> taskIds = planTaskRecordVOS.stream().map(PlanTaskRecordVO::getTaskId).collect(Collectors.toList());
-        jdbcTemplate.execute("delete from c_control_task_info where id in(" + StringUtils.join(taskIds, ",") + ")");
-
-        //删除关联关系
-        jdbcTemplate.execute("delete from c_control_plan_task_record where plan_id = " + id);
-        return true;
-    }
-
-    @Override
-    public PlanInfo planDetail(String id) {
-        return baseMapper.selectById(id);
-    }
-
-
-}

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/TaskInfoServiceImpl.java

@@ -1,161 +0,0 @@
-package org.springblade.control.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.AllArgsConstructor;
-import org.apache.commons.lang.StringUtils;
-import org.springblade.control.dto.TaskInfoDTO;
-import org.springblade.control.entity.PlanInfo;
-import org.springblade.control.entity.TaskInfo;
-import org.springblade.control.mapper.TaskInfoMapper;
-import org.springblade.control.service.TaskInfoService;
-import org.springblade.control.vo.TaskPageVO;
-import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.utils.SecureUtil;
-import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.system.user.entity.User;
-import org.springframework.beans.BeanUtils;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-@AllArgsConstructor
-@Service
-public class TaskInfoServiceImpl extends BaseServiceImpl<TaskInfoMapper, TaskInfo> implements TaskInfoService {
-
-    private final JdbcTemplate jdbcTemplate;
-    private final PlanInfoServiceImpl planInfoServiceImpl;
-
-    @Override
-    public boolean taskSubmit(TaskInfo obj) {
-        obj.setStatus(0); //默认未完成
-        return this.saveOrUpdate(obj);
-    }
-
-    @Override
-    public List<TaskInfo> taskList(String id) {
-        if (StringUtils.isNotEmpty(id)) {
-            List<Long> taskIds = jdbcTemplate.queryForList("select task_id from c_control_plan_task_record where plan_id = " + id, Long.class);
-            //List<TaskInfo> taskInfos = baseMapper.selectBatchIds(taskIds);
-
-            //TODO 项目名称、进度等，返回VO
-//            for (TaskInfo taskInfo : taskInfos) {
-//
-//            }
-            return null;
-        }
-        return null;
-    }
-
-    @Override
-    public boolean taskRemove(String id) {
-        if (StringUtils.isNotEmpty(id)) {
-            //物理删除
-            jdbcTemplate.execute("delete from c_control_task_info where id = " + id);
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean taskRepeal(String id) {
-        return this.update(Wrappers.<TaskInfo>lambdaUpdate().set(TaskInfo::getStatus, 3).eq(TaskInfo::getId, id));
-    }
-
-    @Override
-    public IPage<TaskPageVO> taskPage(IPage<TaskInfo> page, TaskInfoDTO dto) {
-        if (("1").equals(dto.getType()) || ("3").equals(dto.getType())) {
-            //我的任务、全部任务
-            List<Long> taskIds = null;
-            if (ObjectUtil.isNotEmpty(dto.getPlanDept())) {
-                //获取对应部门计划任务信息
-                List<PlanInfo> planInfos = planInfoServiceImpl.getBaseMapper().selectList(Wrappers.<PlanInfo>lambdaQuery().eq(PlanInfo::getPlanDept, dto.getPlanDept()));
-                List<Long> planIds = planInfos.stream().map(PlanInfo::getId).collect(Collectors.toList());
-                taskIds = jdbcTemplate.queryForList("select task_id from c_control_plan_task_record where plan_id in(" + StringUtils.join(planIds, ",") + ")", Long.class);
-            }
-            QueryWrapper<TaskInfo> queryWrapper = Condition.getQueryWrapper(dto);
-            if (("1").equals(dto.getType())) {
-                if (ObjectUtil.isEmpty(SecureUtil.getUserId())) {
-                    throw new ServiceException("未获取到当前用户信息，原因：userId is null");
-                }
-                //查询当前用户的任务，我的任务，否则查询全部任务
-                queryWrapper.lambda().eq(TaskInfo::getTaskUserId, SecureUtil.getUserId());
-            }
-            if (ObjectUtil.isNotEmpty(dto.getStatus())) {
-                //任务状态
-                queryWrapper.lambda().eq(TaskInfo::getStatus, dto.getStatus());
-            }
-            if (ObjectUtil.isNotEmpty(dto.getTaskStartDate()) && ObjectUtil.isNotEmpty(dto.getTaskEndDate())) {
-                //开始时间、结束时间
-                queryWrapper.lambda().ge(TaskInfo::getTaskStartDate, dto.getTaskStartDate()).le(TaskInfo::getTaskEndDate, dto.getTaskEndDate());
-            }
-            if (ObjectUtil.isNotEmpty(taskIds)) {
-                //部门对应的计划中的任务
-                queryWrapper.lambda().in(TaskInfo::getId, taskIds);
-            }
-            IPage<TaskInfo> taskInfoPage = this.page(page, queryWrapper.lambda().orderBy(true, true, TaskInfo::getCreateTime));
-
-            List<Long> taskIdsResult = taskInfoPage.getRecords().stream().map(TaskInfo::getId).collect(Collectors.toList());
-            String sql = "SELECT cctr.task_id, pi.plan_name FROM c_control_plan_task_record cctr LEFT JOIN plan_info pi ON cctr.plan_id = pi.id WHERE cctr.task_id IN (" + StringUtils.join(taskIdsResult, ",") + ")";
-            List<Map<String, Object>> result = jdbcTemplate.queryForList(sql);
-            Map<Long, String> taskPlanMap = new HashMap<>();
-            for (Map<String, Object> row : result) {
-                Long taskId = (Long) row.get("task_id");
-                String planName = (String) row.get("plan_name");
-                if (!taskPlanMap.containsKey(taskId)) {
-                    taskPlanMap.put(taskId, planName);
-                }
-            }
-
-            List<Long> taskUserIds = taskInfoPage.getRecords().stream().map(TaskInfo::getTaskUserId).collect(Collectors.toList());
-            List<Long> taskUserIdsAssist = taskInfoPage.getRecords().stream().map(TaskInfo::getTaskUserIdAssist).collect(Collectors.toList());
-            List<Long> taskUserIdsLeader = taskInfoPage.getRecords().stream().map(TaskInfo::getTaskUserIdLeader).collect(Collectors.toList());
-            taskUserIds.addAll(taskUserIdsAssist);
-            taskUserIds.addAll(taskUserIdsLeader);
-            Set<Long> sets = new HashSet<>(taskUserIds);
-            List<User> query = jdbcTemplate.query("select id,name from blade_user where id in(" + StringUtils.join(sets, ",") + ")", new BeanPropertyRowMapper<>(User.class));
-            Map<Long, String> idNameMap = new HashMap<>();
-            for (User user : query) {
-                idNameMap.put(user.getId(), user.getName());
-            }
-
-            return taskInfoPage.convert(taskInfo -> {
-                TaskPageVO vo = new TaskPageVO();
-                BeanUtils.copyProperties(taskInfo, vo);
-                vo.setId(taskInfo.getId() + "");
-                vo.setStatus(ObjectUtil.isNotEmpty(taskInfo.getStatus()) ? taskInfo.getStatus().toString() : "");
-                vo.setPlanName(StringUtils.isNotEmpty(taskPlanMap.get(taskInfo.getId())) ? taskPlanMap.get(taskInfo.getId()) : "");
-                vo.setTaskDesc(ObjectUtil.isNotEmpty(taskInfo.getTaskDesc()) ? taskInfo.getTaskDesc() : "");
-                vo.setTaskStandard(ObjectUtil.isNotEmpty(taskInfo.getTaskStandard()) ? taskInfo.getTaskStandard() : "");
-                vo.setTaskEndDate(ObjectUtil.isNotEmpty(taskInfo.getTaskEndDate()) ? taskInfo.getTaskEndDate() : null);
-                vo.setTaskUserName(StringUtils.isNotEmpty(idNameMap.get(taskInfo.getTaskUserId())) ? idNameMap.get(taskInfo.getTaskUserId()) : "");
-                vo.setTaskUserAssistName(StringUtils.isNotEmpty(idNameMap.get(taskInfo.getTaskUserIdAssist())) ? idNameMap.get(taskInfo.getTaskUserIdAssist()) : "");
-                vo.setTaskUserLeaderName(StringUtils.isNotEmpty(idNameMap.get(taskInfo.getTaskUserIdLeader())) ? idNameMap.get(taskInfo.getTaskUserIdLeader()) : "");
-                //TODO 项目环节、项目
-
-
-                return vo;
-            });
-
-        } else if (("2").equals(dto.getType())) {
-            //我关联的任务 TODO
-
-        }
-        return null;
-    }
-
-    @Override
-    public boolean taskRelationSubmit(String taskIds, BladeUser user) {
-        //TODO
-        return false;
-    }
-
-
-}