From 2ec4d52a3a36e49516260911d59d19c3e8d6f4e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E4=B9=94=E6=96=87?= <zs@bjpowernode.com>
Date: Thu, 10 Nov 2022 17:34:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=98=A0=E5=B0=84=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/rzyc/bean/task/dto/SpeWorkDto.java  | 2 +-
 .../src/main/java/com/rzyc/bean/task/dto/WorkDto.java     | 2 +-
 .../src/main/resources/mapper/OADistributionMapper.xml    | 8 ++++++++
 inventory-dao/src/main/resources/mapper/OATaskMapper.xml  | 2 +-
 .../java/com/rzyc/controller/AppletsTaskController.java   | 6 +++---
 utils/pom.xml                                             | 6 ++++++
 6 files changed, 20 insertions(+), 6 deletions(-)

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 2fd640d..4c41504 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,7 +13,7 @@ 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)
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 b5ff3f5..cd7be30 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/resources/mapper/OADistributionMapper.xml b/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml
index d726725..84ddba7 100644
--- a/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml
@@ -255,6 +255,14 @@
     where OADistributionId = #{oaDistribution.oadistributionid}
   </update>
 
+  <!--专项工作详情-->
+  <!--<select id="singleWorkDetail" resultType="com.rzyc.bean.task.vo.SingleWorkVo">
+    select ot.OATaskId,ot.send_id,ot.StartDate,ot.EndDate,ot.Subject,ot.send_id,ot.AppStatus,ot.title,ot.CreatedOn
+    from oatask ot
+    join OADistribution od on ot.OATaskId = od.OATaskId
+    where od.OADistributionId = #{idDto.id}
+  </select>-->
+
   <!--专项工作详情-->
   <select id="singleWorkDetail" resultType="com.rzyc.bean.task.vo.SingleWorkVo">
     select ot.OATaskId,ot.send_id,ot.StartDate,ot.EndDate,ot.Subject,ot.send_id,ot.AppStatus,ot.title,ot.CreatedOn
diff --git a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml
index 28df477..3ba1734 100644
--- a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml
@@ -536,7 +536,7 @@
 
 
   <!--查询待办事项-->
-  <select id="workList" resultMap="ReceiveTail">
+  <select id="workList" resultType="com.rzyc.bean.task.vo.WorkPriorityVo">
     select ot.OATaskId,od.OADistributionId,ot.title,ot.TaskType
     from oatask ot
     join OADistribution od on ot.OATaskId = od.OATaskId
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 7e1a4a4..a3ffce9 100644
--- a/inventory-gov/src/main/java/com/rzyc/controller/AppletsTaskController.java
+++ b/inventory-gov/src/main/java/com/rzyc/controller/AppletsTaskController.java
@@ -115,7 +115,7 @@ public class AppletsTaskController extends BaseController{
      */
     @ApiOperation(value = "履职记录列表",position = 3)
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "id",value = "任务接收id")
+            @ApiImplicitParam(name = "id",value = "任务接收id(OADistributionId)")
     })
     @GetMapping("preList")
     @PreAuthorize("hasAnyAuthority('preList','preList:update')")
@@ -151,13 +151,13 @@ public class AppletsTaskController extends BaseController{
     @ApiOperation(value = "专项工作任务详情",position = 12)
     @GetMapping("singleWorkDetail")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "id",value = "任务接收id")
+            @ApiImplicitParam(name = "id",value = "任务接收id(OADistributionId)")
     })
     @PreAuthorize("hasAnyAuthority('singleWorkDetail','singleWorkDetail:update')")
     @MethodAnnotation(authorizations = {"singleWorkDetail","singleWorkDetail:update"},name = "工作要务列表")
     public SingleResult<SingleWorkVo> singleWorkDetail(@Valid IdDto idDto){
         SingleResult<SingleWorkVo> result = new SingleResult();
-        OADistribution oaDistribution = oaDistributionMapper.selectByPrimaryKey(idDto.getId());
+        OADistribution oaDistribution = oaDistributionMapper.selectDistribution(idDto.getId());
         String sendUser = oaDistribution.getSysuserid();
         SysUser user = sysUserMapper.selectUser(sendUser);
 
diff --git a/utils/pom.xml b/utils/pom.xml
index 82fef27..8aae5ff 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -318,6 +318,12 @@
             <version>5.1.4</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.13.3</version>
+            <scope>compile</scope>
+        </dependency>
         <!--分页 end-->
 
     </dependencies>