查看任务状态

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;
+    }
+}

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;
+    }
+}

inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java

@@ -67,4 +67,7 @@ public interface OADistributionMapper extends BaseMapper<OADistribution> {
     FlowDetailVo FlowUserDetail(@Param("idDto") IdDto idDto);
 
     OADistribution selectDistribution(@Param("oaDistributionId") String oaDistributionId);
+
+    //查看接收任务状态
+    List<ImplementationVo> selectImplementation(@Param("deliverDto") DeliverDto deliverDto,@Param("status") Integer status);
 }

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.*;
-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.vo.*;
 import com.rzyc.model.OADistribution;
 import com.rzyc.model.OATask;
@@ -148,4 +145,6 @@ public interface OATaskMapper  extends BaseMapper<OATask> {
     List<UserVo> getUserNameList(@Param("ids") String ids);
 
     List<WorkStateVo> selectWorkState(@Param("id") String id);
+
+
 }

inventory-dao/src/main/resources/mapper/OADistributionMapper.xml

@@ -306,4 +306,14 @@
   <select id="selectDistribution" resultType="com.rzyc.model.OADistribution">
     select od.* from OADistribution od where od.OADistributionId = #{oaDistributionId}
   </select>
+
+  <!--查看接收任务状态-->
+  <select id="selectImplementation" resultType="com.rzyc.bean.task.vo.ImplementationVo">
+    select od.OADistributionId,od.OATaskId,od.CreatedOn as creatTime,od.ModifiedOn as finishTime,od.SysUserId,
+           su.SysDeptName ,su.ChinaName,od.title,od.subject,od.AppStatus
+    from OADistribution od
+    join sysuser su
+    on od.SysUserId = su.SysUserId
+    where od.sned_id = #{deliverDto.send_id}  and od.OATaskId = #{deliverDto.OATaskId} and od.AppStatus = #{status}
+  </select>
 </mapper>

inventory-dao/src/main/resources/mapper/OATaskMapper.xml

@@ -630,4 +630,6 @@
     on ot.OATaskId = od.OATaskId
     where ot.OATaskId = #{id}
   </select>
+
+
 </mapper>

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<ImplementationVo> selectImplementation(@Valid DeliverDto deliverDto){
+        MultiResult<ImplementationVo> result = new MultiResult();
+        List<ImplementationVo> list = oaDistributionMapper.selectImplementation(deliverDto,2);
+        result.setData(list);
+        return result;
+    }
 }