ganzi/ganzi-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

收到任务详情，修改时间格式

Browse Source
This commit is contained in:
zhengqiaowen 2022-11-01 10:48:22 +08:00
parent afeaea4c60
commit 4d1ff86920
7 changed files with 181 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inventory-dao/src/main/java/com/rzyc/bean/task/vo/OADistributionVo.java
View File

@ -2,6 +2,7 @@ package com.rzyc.bean.task.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -52,10 +53,12 @@ public class OADistributionVo {
private String subject;
@ApiModelProperty("开始时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd ")
@TableField("start_time")
private Date startTime;
@ApiModelProperty("结束时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd ")
@TableField("end_time")
private Date endTime;

97
inventory-dao/src/main/java/com/rzyc/bean/task/vo/ReceiveTaskVo.java Normal file
View File

@ -0,0 +1,97 @@
package com.rzyc.bean.task.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* @Description:
* @Author: ZQW
* @CreateTime: 2022/10/31 16:07
*/
@ApiModel("收到任务返回实体类")
public class ReceiveTaskVo {
@TableId("OATaskId")
@ApiModelProperty("任务id")
private String oataskid;
@TableField("StartDate")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("开始时间")
private Date startdate;
@TableField("EndDate")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("结束时间")
private Date enddate;
@TableField("title")
@ApiModelProperty("任务名称")
private String title;
@TableField("Subject")
@ApiModelProperty("任务要求")
private String subject;
@ApiModelProperty("任务接收人完成情况")
private OADistributionVo oaDistributionVo;
public OADistributionVo getOaDistributionVo() {
return oaDistributionVo;
}
public void setOaDistributionVo(OADistributionVo oaDistributionVo) {
this.oaDistributionVo = oaDistributionVo;
}
public String getOataskid() {
return oataskid;
}
public void setOataskid(String oataskid) {
this.oataskid = oataskid;
}
public Date getStartdate() {
return startdate;
}
public void setStartdate(Date startdate) {
this.startdate = startdate;
}
public Date getEnddate() {
return enddate;
}
public void setEnddate(Date enddate) {
this.enddate = enddate;
}
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;
}
}

14
inventory-dao/src/main/java/com/rzyc/bean/task/vo/TaskDetailVo.java
View File

@ -24,14 +24,16 @@ public class TaskDetailVo {
@ApiModelProperty("任务id")
private String oataskid;
@ApiModelProperty("主键id")
private String oadistributionid;
@TableField("StartDate")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd ")
@ApiModelProperty("开始时间")
private Date startdate;
@TableField("EndDate")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd ")
@ApiModelProperty("结束时间")
private Date enddate;
@ -48,6 +50,14 @@ public class TaskDetailVo {
@ApiModelProperty("任务接收人完成情况")
private List<OADistributionVo> distributions = new ArrayList<>();
public String getOadistributionid() {
return oadistributionid;
}
public void setOadistributionid(String oadistributionid) {
this.oadistributionid = oadistributionid;
}
public String getOataskid() {
return oataskid;
}

11
inventory-dao/src/main/java/com/rzyc/bean/task/vo/TaskVo.java
View File

@ -20,6 +20,9 @@ public class TaskVo {
@ApiModelProperty("任务id")
private String oataskid;
@ApiModelProperty("主键id")
private String oadistributionid;
@ApiModelProperty("任务类型名称")
private String taskTypeName;
@ -38,6 +41,14 @@ public class TaskVo {
@ApiModelProperty("结束时间")
private Date enddate;
public String getOadistributionid() {
return oadistributionid;
}
public void setOadistributionid(String oadistributionid) {
this.oadistributionid = oadistributionid;
}
public String getOataskid() {
return oataskid;
}

5
inventory-dao/src/main/java/com/rzyc/mapper/OATaskMapper.java
View File

@ -123,9 +123,12 @@ public interface OATaskMapper extends BaseMapper<OATask> {
List<TaskVo> getTaskList(@Param("condition")String condition,
@Param("sendId")String sendId);
//发布（收到）任务详情
//发布任务详情
TaskDetailVo selectDetail(@Param("OATaskId") String OATaskId);
//收到任务详情
ReceiveTaskVo selectReceive(@Param("OADistributionId") String OADistributionId);
//查询待办事项
List<WorkPriorityVo> workList(@Param("workDto") WorkDto workDto);

34
inventory-dao/src/main/resources/mapper/OATaskMapper.xml
View File

@ -452,7 +452,7 @@
<!--查询我收到的任务-->
<select id="getTaskList" resultType="com.rzyc.bean.task.vo.TaskVo">
select ot.OATaskId,ty.name as taskTypeName,ot.title,u.SysUserName as send_name,u.SysDeptName as unit_name,ot.EndDate as enddate
select ot.OATaskId,oa.OADistributionId,ty.name as taskTypeName,ot.title,u.SysUserName as send_name,u.SysDeptName as unit_name,ot.EndDate as enddate
from OADistribution oa
left join OATask ot on ot.OATaskId = oa.OATaskId
left join sysuser u on ot.send_id = u.SysUserId
@ -466,7 +466,6 @@
<!--定义resultMap-->
<resultMap id="TaskDetail" type="com.rzyc.bean.task.vo.TaskDetailVo">
<id column="OATaskId" property="oataskid"/>
<result column="user_id" property="userId"/>
<result column="StartDate" property="startdate"/>
<result column="EndDate" property="enddate"/>
<result column="title" property="title"/>
@ -503,8 +502,37 @@
where ot.oataskid = #{OATaskId}
</select>
<resultMap id="ReceiveTail" type="com.rzyc.bean.task.vo.ReceiveTaskVo">
<id column="OATaskId" property="oataskid"/>
<result column="StartDate" property="startdate"/>
<result column="EndDate" property="enddate"/>
<result column="title" property="title"/>
<result column="Subject" property="subject"/>
<association property="oaDistributionVo" javaType="com.rzyc.bean.task.vo.OADistributionVo">
<id column="OADistributionId" property="oadistributionid"/>
<result column="OATaskId" property="oataskid"/>
<result column="sned_id" property="snedId"/>
<result column="SysUserId" property="sysuserid"/>
<result column="SysChinaName" property="syschinaname"/>
<result column="title" property="title"/>
<result column="Subject" property="subject"/>
<result column="start_time" property="startTime"/>
<result column="end_time" property="endTime"/>
<result column="AppStatus" property="appstatus"/>
</association>
</resultMap>
<!--收到任务详情-->
<select id="selectReceive" resultMap="ReceiveTail">
select ot.oataskid,ot.title,ot.subject,ot.startdate,ot.enddate,od.*
from OADistribution od
join OATask ot
on ot.oataskid = od.oataskid
where od.OADistributionId = #{OADistributionId}
</select>
<!--查询待办事项-->
<select id="workList" resultType="com.rzyc.bean.task.vo.WorkPriorityVo">
<select id="workList" resultMap="ReceiveTail">
select ot.OATaskId,od.OADistributionId,ot.title,ot.TaskType
from oatask ot
join OADistribution od on ot.OATaskId = od.OATaskId

26
inventory-gov/src/main/java/com/rzyc/controller/WorkController.java
View File

@ -8,6 +8,7 @@ import com.rzyc.bean.task.dto.AddTaskDto;
import com.rzyc.bean.task.dto.AddWorkDto;
import com.rzyc.bean.task.dto.IdDto;
import com.rzyc.bean.task.dto.WorkFlowDto;
import com.rzyc.bean.task.vo.ReceiveTaskVo;
import com.rzyc.bean.task.vo.TaskDetailVo;
import com.rzyc.bean.task.vo.TaskVo;
import com.rzyc.bean.task.vo.ThingVo;
@ -29,6 +30,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@ -259,9 +261,9 @@ public class WorkController extends BaseController{
* @Author ZQW
* @CreateTime 2022/9/29 13:56
*/
@ApiOperation(value = "发布(收到)任务详情",position = 10)
@ApiOperation(value = "发布任务详情",position = 10)
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id",value = "任务1id")
@ApiImplicitParam(name = "id",value = "任务id")
})
@GetMapping("deliverTaskDetail")
public SingleResult<TaskDetailVo> deliverTaskDetail(@Valid IdDto idDto){
@ -270,7 +272,25 @@ public class WorkController extends BaseController{
result.setData(detailVo);
return result;
}
/**
* @Description: 收到任务详情
* @Author ZQW
* @CreateTime 2022/10/31 16:04
*/
@ApiOperation(value = "收到任务详情",position = 11)
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id",value = "任务id")
})
@GetMapping("receiveTaskDetail")
public SingleResult<ReceiveTaskVo> receiveTaskDetail(@Valid IdDto idDto){
SingleResult<ReceiveTaskVo> result = new SingleResult<>();
ReceiveTaskVo receiveTaskVo = oaTaskMapper.selectReceive(idDto.getId());
result.setData(receiveTaskVo);
return result;
}
/**
* @Description: 任务流转
* @Author ZQW