From afeaea4c60cd3930808d993ad8dd3b6886f04d47 Mon Sep 17 00:00:00 2001 From: zhengqiaowen <1275811465@qq.com> Date: Mon, 31 Oct 2022 09:40:53 +0800 Subject: [PATCH] =?UTF-8?q?pc=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=94=BF=E5=BA=9C?= =?UTF-8?q?=E7=AB=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/rzyc/bean/task/dto/NameDto.java | 37 +++++ .../com/rzyc/bean/task/dto/PerRecordDto.java | 33 ++-- .../com/rzyc/bean/task/dto/SpeWorkDto.java | 4 +- .../com/rzyc/bean/task/dto/WorkDetailDto.java | 4 +- .../java/com/rzyc/bean/task/dto/WorkDto.java | 2 +- .../com/rzyc/bean/task/vo/SingleWorkVo.java | 12 -- .../com/rzyc/bean/task/vo/SpecialWorkVo.java | 11 ++ .../com/rzyc/bean/task/vo/WorkPriorityVo.java | 11 ++ .../com/rzyc/mapper/OADistributionMapper.java | 18 +-- .../java/com/rzyc/mapper/OATaskMapper.java | 5 +- .../com/rzyc/mapper/TaskRecordMapper.java | 28 ++++ .../main/java/com/rzyc/model/TaskRecord.java | 151 ++++++++++++++++++ .../model/task/dto/TaskAddOrUpdateDto.java | 39 +---- .../resources/mapper/OADistributionMapper.xml | 33 ++-- .../main/resources/mapper/OATaskMapper.xml | 26 +-- .../resources/mapper/TaskRecordMapper.xml | 40 +++++ .../controller/AppletsTaskController.java | 117 +++++--------- .../com/rzyc/controller/BaseController.java | 3 + .../com/rzyc/controller/WorkController.java | 1 + 19 files changed, 378 insertions(+), 197 deletions(-) create mode 100644 inventory-dao/src/main/java/com/rzyc/bean/task/dto/NameDto.java create mode 100644 inventory-dao/src/main/java/com/rzyc/mapper/TaskRecordMapper.java create mode 100644 inventory-dao/src/main/java/com/rzyc/model/TaskRecord.java create mode 100644 inventory-dao/src/main/resources/mapper/TaskRecordMapper.xml diff --git a/inventory-dao/src/main/java/com/rzyc/bean/task/dto/NameDto.java b/inventory-dao/src/main/java/com/rzyc/bean/task/dto/NameDto.java new file mode 100644 index 0000000..2e699b2 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/bean/task/dto/NameDto.java @@ -0,0 +1,37 @@ +package com.rzyc.bean.task.dto; + +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: + * @Author: ZQW + * @CreateTime: 2022/10/28 13:53 + */ + +@ApiModel("姓名显示请求参数") +public class NameDto { + + @ApiModelProperty("任务id") + private String taskId; + + @ApiModelProperty("任务类型id") + private String taskTypeId; + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getTaskTypeId() { + return taskTypeId; + } + + public void setTaskTypeId(String taskTypeId) { + this.taskTypeId = taskTypeId; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/bean/task/dto/PerRecordDto.java b/inventory-dao/src/main/java/com/rzyc/bean/task/dto/PerRecordDto.java index 13386e3..7e32a12 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/task/dto/PerRecordDto.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/task/dto/PerRecordDto.java @@ -17,20 +17,19 @@ import java.util.Date; @ApiModel("新增履职记录请求参数") public class PerRecordDto { - @ApiModelProperty(value = "主键id") - @TableId("OADistributionId") - private String oadistributionid; + @ApiModelProperty(value = "工作记录id") + @TableId("record_id") + private String recordId; - @ApiModelProperty(value = "任务id",required = true) - @TableField("OATaskId") - private String oataskid; + @ApiModelProperty(value = "任务接收id",required = true) + @TableField("OADistributionId") + private String OADistributionId; - - @ApiModelProperty(value = "任务摘要") + @ApiModelProperty(value = "工作摘要") @TableField("title") private String title; - @ApiModelProperty(value = "任务内容") + @ApiModelProperty(value = "工作内容") @TableField("subject") private String subject; @@ -44,20 +43,20 @@ public class PerRecordDto { @TableField("end_time") private Date endTime; - public String getOadistributionid() { - return oadistributionid; + public String getRecordId() { + return recordId; } - public void setOadistributionid(String oadistributionid) { - this.oadistributionid = oadistributionid; + public void setRecordId(String recordId) { + this.recordId = recordId; } - public String getOataskid() { - return oataskid; + public String getOADistributionId() { + return OADistributionId; } - public void setOataskid(String oataskid) { - this.oataskid = oataskid; + public void setOADistributionId(String OADistributionId) { + this.OADistributionId = OADistributionId; } public String getTitle() { diff --git a/inventory-dao/src/main/java/com/rzyc/bean/task/dto/SpeWorkDto.java b/inventory-dao/src/main/java/com/rzyc/bean/task/dto/SpeWorkDto.java index 74c0144..2fd640d 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/task/dto/SpeWorkDto.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/task/dto/SpeWorkDto.java @@ -13,10 +13,10 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel("专项工作请求参数") public class SpeWorkDto { - @ApiModelProperty(value = "任务id",required = true) + @ApiModelProperty(value = "任务类型id",required = true) private String taskTypeId; - @ApiModelProperty(value = "任务发布人id",required = true) + @ApiModelProperty(value = "任务接收人id",required = true) private String sendId; @ApiModelProperty(value = "关键词") diff --git a/inventory-dao/src/main/java/com/rzyc/bean/task/dto/WorkDetailDto.java b/inventory-dao/src/main/java/com/rzyc/bean/task/dto/WorkDetailDto.java index 86d2f0d..bc22ddd 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/task/dto/WorkDetailDto.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/task/dto/WorkDetailDto.java @@ -12,10 +12,10 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel("待办任务详情请求参数") public class WorkDetailDto { - @ApiModelProperty(value = "任务id",required = true) + @ApiModelProperty(value = "任务接收id",required = true) private String oaTaskId; - @ApiModelProperty(value = "任务发布人id",required = true) + @ApiModelProperty(value = "任务发布人id") private String sendId; public String getOaTaskId() { diff --git a/inventory-dao/src/main/java/com/rzyc/bean/task/dto/WorkDto.java b/inventory-dao/src/main/java/com/rzyc/bean/task/dto/WorkDto.java index 491e0f4..b5ff3f5 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/task/dto/WorkDto.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/task/dto/WorkDto.java @@ -14,7 +14,7 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel("待办任务请求参数") public class WorkDto { - @ApiModelProperty(value = "任务id",required = true) + @ApiModelProperty(value = "任务类型id",required = true) private String taskTypeId; @ApiModelProperty(value = "用户id") diff --git a/inventory-dao/src/main/java/com/rzyc/bean/task/vo/SingleWorkVo.java b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/SingleWorkVo.java index b08ed95..2364d31 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/task/vo/SingleWorkVo.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/SingleWorkVo.java @@ -25,10 +25,6 @@ public class SingleWorkVo { @ApiModelProperty("任务发布人") private String sendId; - @ApiModelProperty(value = "接收用户id",required = true) - @TableField("user_id") - private String userId; - @TableField("StartDate") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("开始时间") @@ -79,14 +75,6 @@ public class SingleWorkVo { this.sendId = sendId; } - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } - public Date getStartdate() { return startdate; } diff --git a/inventory-dao/src/main/java/com/rzyc/bean/task/vo/SpecialWorkVo.java b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/SpecialWorkVo.java index 2da6549..c18f342 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/task/vo/SpecialWorkVo.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/SpecialWorkVo.java @@ -22,6 +22,9 @@ public class SpecialWorkVo { @ApiModelProperty("任务id") private String oataskid; + @ApiModelProperty("任务接收id") + private String OADistributionId; + @TableField("TaskType") @ApiModelProperty("任务类型") private String tasktype; @@ -58,6 +61,14 @@ public class SpecialWorkVo { @ApiModelProperty("发布人") private String sendName; + public String getOADistributionId() { + return OADistributionId; + } + + public void setOADistributionId(String OADistributionId) { + this.OADistributionId = OADistributionId; + } + public String getOataskid() { return oataskid; } diff --git a/inventory-dao/src/main/java/com/rzyc/bean/task/vo/WorkPriorityVo.java b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/WorkPriorityVo.java index b3ec482..7526eb5 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/task/vo/WorkPriorityVo.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/WorkPriorityVo.java @@ -19,6 +19,9 @@ public class WorkPriorityVo { @ApiModelProperty("任务id") private String oataskid; + @ApiModelProperty("任务接收id") + private String OADistributionId; + @ApiModelProperty("任务摘要") @TableField("title") private String title; @@ -35,6 +38,14 @@ public class WorkPriorityVo { @TableField("totalNum") private Integer totalNum = 4; + public String getOADistributionId() { + return OADistributionId; + } + + public void setOADistributionId(String OADistributionId) { + this.OADistributionId = OADistributionId; + } + public String getTasktype() { return tasktype; } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java index fad1ca1..975e778 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java @@ -2,10 +2,10 @@ package com.rzyc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.rzyc.bean.task.dto.IdDto; +import com.rzyc.bean.task.dto.NameDto; +import com.rzyc.bean.task.dto.WorkDetailDto; import com.rzyc.bean.task.dto.WorkDto; -import com.rzyc.bean.task.vo.PerformanceVo; -import com.rzyc.bean.task.vo.ThingVo; -import com.rzyc.bean.task.vo.WorkPriorityVo; +import com.rzyc.bean.task.vo.*; import com.rzyc.model.OADistribution; import com.rzyc.model.oth.ManualLable; import org.apache.ibatis.annotations.Param; @@ -50,12 +50,12 @@ public interface OADistributionMapper extends BaseMapper { @Param("snedId")String snedId); - //履职记录详情 - List preList(@Param("id") String id); - - //统计完成次数 - int countNum(@Param("taskTypeId")String taskTypeId); - //跟新任务执行表 int updateDistriubtion(@Param("oaDistribution")OADistribution oaDistribution); + + //专项工作详情 + SingleWorkVo singleWorkDetail(@Param("idDto")IdDto idDto); + + //人员姓名显示 + List selectName(@Param("nameDto") NameDto nameDto); } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/OATaskMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/OATaskMapper.java index d0108c4..ddfe712 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/OATaskMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/OATaskMapper.java @@ -130,12 +130,9 @@ public interface OATaskMapper extends BaseMapper { List workList(@Param("workDto") WorkDto workDto); - //待办任务列表 + //专项工作列表 List speWorkList(@Param("speWorkDto")SpeWorkDto speWorkDto); - //待办任务详情 - SingleWorkVo singleWorkDetail(@Param("workDetailDto")WorkDetailDto workDetailDto); - //查找oaTask OATask selectOATask(@Param("oaTaskId") String oaTaskId); diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/TaskRecordMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/TaskRecordMapper.java new file mode 100644 index 0000000..7242bdc --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/mapper/TaskRecordMapper.java @@ -0,0 +1,28 @@ +package com.rzyc.mapper; + +import com.rzyc.bean.task.vo.PerformanceVo; +import com.rzyc.model.TaskRecord; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + *

+ * 任务记录表 Mapper 接口 + *

+ * + * @author + * @since 2022-10-28 + */ +@Repository +public interface TaskRecordMapper extends BaseMapper { + + //履职记录详情 + List preList(@Param("id") String id); + + //统计完成次数 + int countNum(@Param("taskTypeId")String taskTypeId); +} +/**/ \ No newline at end of file diff --git a/inventory-dao/src/main/java/com/rzyc/model/TaskRecord.java b/inventory-dao/src/main/java/com/rzyc/model/TaskRecord.java new file mode 100644 index 0000000..ec5a31d --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/TaskRecord.java @@ -0,0 +1,151 @@ +package com.rzyc.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *

+ * 任务记录表 + *

+ * + * @author + * @since 2022-10-28 + */ +@TableName("task_record") +@ApiModel(value="TaskRecord对象", description="任务记录表") +public class TaskRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "工作记录id") + @TableId("record_id") + private String recordId; + + @ApiModelProperty(value = "任务接收id") + @TableField("OADistributionId") + private String OADistributionId; + + @ApiModelProperty(value = "工作摘要") + @TableField("title") + private String title; + + @ApiModelProperty(value = "工作内容") + @TableField("subject") + private String subject; + + @ApiModelProperty(value = "开始时间") + @TableField("start_time") + private Date startTime; + + @ApiModelProperty(value = "结束时间") + @TableField("end_time") + private Date endTime; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "创建人") + @TableField("create_by") + private String createBy; + + @ApiModelProperty(value = "修改时间") + @TableField("modfiy_time") + private Date modfiyTime; + + @ApiModelProperty(value = "修改人") + @TableField("modfiy_by") + private String modfiyBy; + + public String getRecordId() { + return recordId; + } + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + public String getOADistributionId() { + return OADistributionId; + } + + public void setOADistributionId(String OADistributionId) { + this.OADistributionId = OADistributionId; + } + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + public String getSubject() { + return subject; + } + + public void setSubject(String subject) { + this.subject = subject; + } + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + public Date getModfiyTime() { + return modfiyTime; + } + + public void setModfiyTime(Date modfiyTime) { + this.modfiyTime = modfiyTime; + } + public String getModfiyBy() { + return modfiyBy; + } + + public void setModfiyBy(String modfiyBy) { + this.modfiyBy = modfiyBy; + } + + @Override + public String toString() { + return "TaskRecord{" + + "recordId=" + recordId + + ", OADistributionId=" + OADistributionId + + ", title=" + title + + ", subject=" + subject + + ", startTime=" + startTime + + ", endTime=" + endTime + + ", createTime=" + createTime + + ", createBy=" + createBy + + ", modfiyTime=" + modfiyTime + + ", modfiyBy=" + modfiyBy + + "}"; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/task/dto/TaskAddOrUpdateDto.java b/inventory-dao/src/main/java/com/rzyc/model/task/dto/TaskAddOrUpdateDto.java index 0fc10f3..5b84213 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/task/dto/TaskAddOrUpdateDto.java +++ b/inventory-dao/src/main/java/com/rzyc/model/task/dto/TaskAddOrUpdateDto.java @@ -26,31 +26,10 @@ public class TaskAddOrUpdateDto { @TableField("OATaskId") private String oataskid; - @ApiModelProperty(value = "接收用户id") + @ApiModelProperty(value = "接收用户id",required = true) @TableField("SysUserId") private String sysuserid; - /** - * 接收人名 - */ - @ApiModelProperty(value = "接收人名") - private String receiveName; - - - /* @ApiModelProperty(value = "开始时间,格式 yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField("start_time") - private Date startTime;*/ - - /*@ApiModelProperty(value = "结束时间,格式 yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField("end_time") - private Date endTime;*/ - - @ApiModelProperty("1、未执行 2、执行中 3、执行完成") - @TableField("AppStatus") - private String appstatus ; - public String getOadistributionid() { return oadistributionid; } @@ -74,20 +53,4 @@ public class TaskAddOrUpdateDto { public void setSysuserid(String sysuserid) { this.sysuserid = sysuserid; } - - public String getReceiveName() { - return receiveName; - } - - public void setReceiveName(String receiveName) { - this.receiveName = receiveName; - } - - public String getAppstatus() { - return appstatus; - } - - public void setAppstatus(String appstatus) { - this.appstatus = appstatus; - } } diff --git a/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml b/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml index 4eb0a8f..0efa4a3 100644 --- a/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml +++ b/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml @@ -236,22 +236,6 @@ order by ob.end_time asc --> - - - - update OADistribution @@ -269,4 +253,21 @@ ModifiedBy = #{oaDistribution.modifiedby,jdbcType=VARCHAR} where OADistributionId = #{oaDistribution.oadistributionid} + + + + + diff --git a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml index 391404c..4285273 100644 --- a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml +++ b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml @@ -505,8 +505,9 @@ @@ -540,39 +541,26 @@ - - + select t.title,t.start_time + from task_record t + join OADistribution od + on t.OADistributionId = od.OADistributionId + where t.OADistributionId = #{id} + order by t.start_time asc + + + + + diff --git a/inventory-gov/src/main/java/com/rzyc/controller/AppletsTaskController.java b/inventory-gov/src/main/java/com/rzyc/controller/AppletsTaskController.java index 96762b0..ac4c779 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/AppletsTaskController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/AppletsTaskController.java @@ -5,15 +5,13 @@ import com.common.utils.StringUtils; import com.common.utils.model.MultiResult; import com.common.utils.model.SingleResult; import com.rzyc.bean.task.dto.*; -import com.rzyc.bean.task.vo.PerformanceVo; -import com.rzyc.bean.task.vo.SingleWorkVo; -import com.rzyc.bean.task.vo.SpecialWorkVo; -import com.rzyc.bean.task.vo.WorkPriorityVo; +import com.rzyc.bean.task.vo.*; import com.rzyc.config.MethodAnnotation; import com.rzyc.enums.TaskState; import com.rzyc.model.OADistribution; import com.rzyc.model.OATask; import com.rzyc.model.OaTaskUser; +import com.rzyc.model.TaskRecord; import com.rzyc.model.user.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -57,8 +55,10 @@ public class AppletsTaskController extends BaseController{ public MultiResult workList(@Valid WorkDto workDto){ MultiResult result = new MultiResult<>(); List workList = oaTaskMapper.workList(workDto); - int finishNum = oaDistributionMapper.countNum(workDto.getTaskTypeId()); + for (WorkPriorityVo priorityVo : workList) { + String oaDistributionId = priorityVo.getOADistributionId(); + int finishNum = taskRecordMapper.countNum(oaDistributionId); priorityVo.setFinishNum(finishNum); } result.setData(workList); @@ -76,35 +76,34 @@ public class AppletsTaskController extends BaseController{ @MethodAnnotation(authorizations = {"addExecute","addExecute:update"},name = "工作要务列表") public SingleResult addExecute(@Valid PerRecordDto perRecordDto) throws Exception{ SingleResult result = new SingleResult<>(); - OADistribution oaDistribution = new OADistribution(); - BeanUtils.copyProperties(oaDistribution,perRecordDto); + TaskRecord taskRecord = new TaskRecord(); + BeanUtils.copyProperties(taskRecord,perRecordDto); //日期格式转换 ConvertUtils.register(new DateConverter(null), Date.class); - OATask oaTask = oaTaskMapper.findById(perRecordDto.getOataskid()); - System.out.println("任务 ========" + oaTask); + OADistribution oaDistribution = oaDistributionMapper.selectByPrimaryKey(perRecordDto.getOADistributionId()); + System.out.println("任务 ========" + oaDistribution); - if(null == oaTask){ + if(null == oaDistribution){ result.setCode(0); result.setMessage("未知任务"); return result; } - if(StringUtils.isBlank(perRecordDto.getOadistributionid())){ - oaDistribution.setOadistributionid(RandomNumber.getUUid()); - oaDistribution.setCreatedby(getUserId()); - oaDistribution.setCreatedon(new Date()); - oaDistributionMapper.insert(oaDistribution); - System.out.println("插入的数据===" + oaDistribution); + if(StringUtils.isBlank(perRecordDto.getRecordId())){ + taskRecord.setRecordId(RandomNumber.getUUid()); + taskRecord.setOADistributionId(taskRecord.getOADistributionId()); + taskRecord.setCreateBy(getUserId()); + taskRecord.setCreateTime(new Date()); + taskRecordMapper.insert(taskRecord); + System.err.println("插入的数据===" + taskRecord); }else { - oaDistribution.setModifiedby(getUserId()); - oaDistribution.setModifiedon(new Date()); - oaDistributionMapper.updateById(oaDistribution); - System.out.println("修改的数据===" + oaDistribution); + taskRecord.setModfiyBy(getUserId()); + taskRecord.setModfiyTime(new Date()); + taskRecordMapper.updateById(taskRecord); + System.err.println("修改的数据===" + taskRecord); } - oaTask.setAppstatus(TaskState.FINISH.getState()); - oaTaskMapper.updateById(oaTask); return result; } @@ -115,14 +114,14 @@ public class AppletsTaskController extends BaseController{ */ @ApiOperation(value = "履职记录列表",position = 3) @ApiImplicitParams(value = { - @ApiImplicitParam(name = "id",value = "任务1id") + @ApiImplicitParam(name = "id",value = "任务接收id") }) @GetMapping("preList") @PreAuthorize("hasAnyAuthority('preList','preList:update')") @MethodAnnotation(authorizations = {"preList","preList:update"},name = "工作要务列表") public MultiResult preList(@Valid IdDto idDto){ MultiResult result = new MultiResult<>(); - List preList = oaDistributionMapper.preList(idDto.getId()); + List preList = taskRecordMapper.preList(idDto.getId()); result.setData(preList); return result; } @@ -150,12 +149,21 @@ public class AppletsTaskController extends BaseController{ */ @ApiOperation(value = "专项工作任务详情",position = 12) @GetMapping("singleWorkDetail") + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "id",value = "任务接收id") + }) @PreAuthorize("hasAnyAuthority('singleWorkDetail','singleWorkDetail:update')") @MethodAnnotation(authorizations = {"singleWorkDetail","singleWorkDetail:update"},name = "工作要务列表") - public SingleResult singleWorkDetail(@Valid WorkDetailDto workDetailDto){ + public SingleResult singleWorkDetail(@Valid IdDto idDto){ SingleResult result = new SingleResult(); - SingleWorkVo specialWorkVos = oaTaskMapper.singleWorkDetail(workDetailDto); + OADistribution oaDistribution = oaDistributionMapper.selectByPrimaryKey(idDto.getId()); + String sendUser = oaDistribution.getSysuserid(); + SysUser user = sysUserMapper.selectUser(sendUser); + + SingleWorkVo specialWorkVos = oaDistributionMapper.singleWorkDetail(idDto); + specialWorkVos.setSendName(user.getSysusername()); result.setData(specialWorkVos); + System.err.println("任务详情========" + specialWorkVos); return result; } @@ -194,67 +202,22 @@ public class AppletsTaskController extends BaseController{ return result; } - /** - * @Description: 任务流转 - * @Author ZQW - * @CreateTime 2022/10/24 10:23 - */ - /* @ApiOperation(value = "任务流转",position = 14) - @PostMapping("taskFlow") - @PreAuthorize("hasAnyAuthority('taskFlow:update')") - @MethodAnnotation(authorizations = {"taskFlow:update"},name = "任务流转") - public SingleResult taskFlow(@Valid WorkFlowDto flowDto) throws Exception{ - SingleResult result = new SingleResult<>(); - OaTaskUser oaTaskUser = new OaTaskUser(); - OATask oaTask = oaTaskMapper.selectOATask(flowDto.getOaDistributionId()); - SysUser user = sysUserMapper.selectUser(flowDto.getSysUserId()); - - if(null == oaTask){ - result.setCode(0); - result.setMessage("未知任务"); - return result; - } - - if(null == user){ - result.setCode(0); - result.setMessage("查无此人"); - return result; - } - - oaTask.setOataskid(RandomNumber.getUUid()); - oaTask.setSendId(oaTask.getUserId()); - oaTask.setUserId(flowDto.getSysUserId()); - oaTaskUser.setCreateTime(new Date()); - oaTaskUser.setCreateBy(getUserId()); - oaTaskMapper.insertTask(oaTask); - System.err.println("插入的内容" + oaTask); - return result; - }*/ - /** * @Description: 参与人员姓名显示 * @Author ZQW * @CreateTime 2022/10/25 11:00 */ - /* @ApiOperation(value = "参与人员姓名显示",position = 15) + @ApiOperation(value = "参与人员姓名显示",position = 14) @GetMapping("nameList") @PreAuthorize("hasAnyAuthority('nameList','nameList:update')") @MethodAnnotation(authorizations = {"nameList","nameList:update"},name = "参与人员姓名显示") - public MultiResult nameList(@Valid IdDto idDto){ + public MultiResult nameList(@Valid NameDto nameDto){ MultiResult result = new MultiResult<>(); - oaTaskMapper.selectName(workDto); - //查询任务 - *//*List taskList = (List) oaTaskMapper.selectOATask(workDto.getTaskTypeId()); - for (OATask oaTask : taskList) { - String sendId = oaTask.getSendId(); - List nameVo = oaTaskMapper.selectName(sendId); - for (NameVo name : nameVo) { - name.setName(); - } - }*//* - + List nameVoList = oaDistributionMapper.selectName(nameDto); + System.err.println("输出====" + nameVoList); + result.setData(nameVoList); return result; - }*/ + } } diff --git a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java index 62d84a6..3366ced 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java @@ -461,6 +461,9 @@ public class BaseController { @Autowired protected OaTaskUserMapper oaTaskUserMapper; + //任务记录 + @Autowired + protected TaskRecordMapper taskRecordMapper; /** * 岗位不需要的字符串 */ diff --git a/inventory-gov/src/main/java/com/rzyc/controller/WorkController.java b/inventory-gov/src/main/java/com/rzyc/controller/WorkController.java index 563cd36..03c5a85 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/WorkController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/WorkController.java @@ -71,6 +71,7 @@ public class WorkController extends BaseController{ if(StringUtils.isBlank(addTaskDto.getOataskid())){ oaTask.setOataskid(RandomNumber.getUUid()); + oaTask.setAppstatus("1"); oaTask.setCreatedby(getUserId()); oaTask.setCreatedon(new Date()); oaTaskMapper.insertTask(oaTask);