diff --git a/inventory-dao/src/main/java/com/rzyc/bean/task/dto/DeliverDto.java b/inventory-dao/src/main/java/com/rzyc/bean/task/dto/DeliverDto.java new file mode 100644 index 0000000..5558401 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/bean/task/dto/DeliverDto.java @@ -0,0 +1,39 @@ +package com.rzyc.bean.task.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: + * @Author: ZQW + * @CreateTime: 2022/11/8 15:07 + */ + +@ApiModel("查询任务执行状态请求参数") +public class DeliverDto { + + @ApiModelProperty(value = "任务id",required = true) + private String OATaskId; + + /*@ApiModelProperty(value = "任务分配id") + private String OADistributionId;*/ + + @ApiModelProperty(value = "发送人id",required = true) + private String send_id; + + public String getOATaskId() { + return OATaskId; + } + + public void setOATaskId(String OATaskId) { + this.OATaskId = OATaskId; + } + + public String getSend_id() { + return send_id; + } + + public void setSend_id(String send_id) { + this.send_id = send_id; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/bean/task/vo/ImplementationVo.java b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/ImplementationVo.java new file mode 100644 index 0000000..79db8f6 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/ImplementationVo.java @@ -0,0 +1,130 @@ +package com.rzyc.bean.task.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.util.Date; + +/** + * @Description: + * @Author: ZQW + * @CreateTime: 2022/11/9 11:24 + */ + +@ApiModel("查看发布人任务执行情况") +public class ImplementationVo { + + @ApiModelProperty("用户id") + private String OADistributionId; + + @ApiModelProperty("任务id") + private String oataskid; + + @ApiModelProperty("接收人id") + private String sysuserId; + + @ApiModelProperty("职务") + private String sysdeptName; + + @ApiModelProperty("中文名") + private String chinaName; + + @ApiModelProperty("发布任务时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creatTime; + + @ApiModelProperty("完成任务时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date finishTime; + + @ApiModelProperty("任务摘要") + private String title; + + @ApiModelProperty("任务内容") + private String subject; + + @ApiModelProperty("任务内容") + private Integer AppStatus; + + public Integer getAppStatus() { + return AppStatus; + } + + public void setAppStatus(Integer appStatus) { + AppStatus = appStatus; + } + + public String getOataskid() { + return oataskid; + } + + public void setOataskid(String oataskid) { + this.oataskid = oataskid; + } + + public String getOADistributionId() { + return OADistributionId; + } + + public void setOADistributionId(String OADistributionId) { + this.OADistributionId = OADistributionId; + } + + public String getSysuserId() { + return sysuserId; + } + + public void setSysuserId(String sysuserId) { + this.sysuserId = sysuserId; + } + + public String getSysdeptName() { + return sysdeptName; + } + + public void setSysdeptName(String sysdeptName) { + this.sysdeptName = sysdeptName; + } + + public String getChinaName() { + return chinaName; + } + + public void setChinaName(String chinaName) { + this.chinaName = chinaName; + } + + public Date getCreatTime() { + return creatTime; + } + + public void setCreatTime(Date creatTime) { + this.creatTime = creatTime; + } + + public Date getFinishTime() { + return finishTime; + } + + public void setFinishTime(Date finishTime) { + this.finishTime = finishTime; + } + + 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; + } +} 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 5e05659..c0670c9 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java @@ -67,4 +67,7 @@ public interface OADistributionMapper extends BaseMapper { FlowDetailVo FlowUserDetail(@Param("idDto") IdDto idDto); OADistribution selectDistribution(@Param("oaDistributionId") String oaDistributionId); + + //查看接收任务状态 + List selectImplementation(@Param("deliverDto") DeliverDto deliverDto,@Param("status") Integer status); } 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 258d70c..02d0e20 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/OATaskMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/OATaskMapper.java @@ -1,10 +1,7 @@ package com.rzyc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.rzyc.bean.task.dto.IdDto; -import com.rzyc.bean.task.dto.SpeWorkDto; -import com.rzyc.bean.task.dto.WorkDetailDto; -import com.rzyc.bean.task.dto.WorkDto; +import com.rzyc.bean.task.dto.*; import com.rzyc.bean.task.vo.*; import com.rzyc.model.OADistribution; import com.rzyc.model.OATask; @@ -148,4 +145,6 @@ public interface OATaskMapper extends BaseMapper { List getUserNameList(@Param("ids") String ids); List selectWorkState(@Param("id") String id); + + } diff --git a/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml b/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml index c082317..d726725 100644 --- a/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml +++ b/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml @@ -306,4 +306,14 @@ + + + diff --git a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml index 8960c3a..28df477 100644 --- a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml +++ b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml @@ -630,4 +630,6 @@ on ot.OATaskId = od.OATaskId where ot.OATaskId = #{id} + + 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 6f41126..add7623 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/WorkController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/WorkController.java @@ -7,6 +7,7 @@ import com.common.utils.model.SingleResult; import com.rzyc.bean.task.dto.*; import com.rzyc.bean.task.vo.*; import com.rzyc.config.MethodAnnotation; +import com.rzyc.mapper.OATaskMapper; import com.rzyc.model.OADistribution; import com.rzyc.model.OATask; import com.rzyc.model.OaTaskUser; @@ -418,7 +419,7 @@ public class WorkController extends BaseController{ * @Author ZQW * @CreateTime 2022/11/8 17:31 */ - @ApiOperation(value = "修改任务完成状态",position = 15) + @ApiOperation(value = "修改任务完成状态",position = 17) @PostMapping ("modifyState") @ApiImplicitParams(value = { @ApiImplicitParam(name = "id",value = "任务id") @@ -433,4 +434,20 @@ public class WorkController extends BaseController{ System.err.println("任务状态==== " + oaTask.getAppstatus()); return result; } + + /** + * @Description: 查看发布人任务执行情况 + * @Author ZQW + * @CreateTime 2022/11/9 11:15 + */ + @ApiOperation(value = "查看发布人任务执行情况",position = 18) + @GetMapping ("selectImplementation") + @PreAuthorize("hasAnyAuthority('selectImplementation','selectImplementation:update')") + @MethodAnnotation(authorizations = {"selectImplementation","selectImplementation:update"},name = "查看发布人任务执行情况") + public MultiResult selectImplementation(@Valid DeliverDto deliverDto){ + MultiResult result = new MultiResult(); + List list = oaDistributionMapper.selectImplementation(deliverDto,2); + result.setData(list); + return result; + } }