From 72d3215c49490a86f831cc16ffe90f93f91800c5 Mon Sep 17 00:00:00 2001 From: zhengqiaowen <1275811465@qq.com> Date: Thu, 17 Nov 2022 09:35:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E4=B8=8E=E4=BB=BB=E5=8A=A1=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=A7=93=E5=90=8D=E6=98=BE=E7=A4=BA1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/rzyc/bean/task/dto/DeliverDto.java | 3 -- .../rzyc/bean/task/vo/ImplementationVo.java | 27 ++++++------ .../java/com/rzyc/bean/task/vo/NameVo.java | 13 +++++- .../com/rzyc/bean/task/vo/TaskDetailVo.java | 20 +++++++++ .../com/rzyc/mapper/OADistributionMapper.java | 5 ++- .../com/rzyc/mapper/OaTaskTypeMapper.java | 2 + .../resources/mapper/OADistributionMapper.xml | 11 ++++- .../main/resources/mapper/OATaskMapper.xml | 4 +- .../resources/mapper/OaTaskTypeMapper.xml | 4 ++ .../com/rzyc/controller/WorkController.java | 42 ++++++++++++++++++- 10 files changed, 110 insertions(+), 21 deletions(-) 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 index 5558401..d7ac665 100644 --- 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 @@ -15,9 +15,6 @@ 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; 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 index 79db8f6..9df091e 100644 --- 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 @@ -16,8 +16,8 @@ import java.util.Date; @ApiModel("查看发布人任务执行情况") public class ImplementationVo { - @ApiModelProperty("用户id") - private String OADistributionId; + @ApiModelProperty("任务分配id") + private String oADistributionId; @ApiModelProperty("任务id") private String oataskid; @@ -45,15 +45,23 @@ public class ImplementationVo { @ApiModelProperty("任务内容") private String subject; - @ApiModelProperty("任务内容") - private Integer AppStatus; + @ApiModelProperty("1、未执行 2、执行中 3、执行完成") + private Integer appStatus; + + public String getoADistributionId() { + return oADistributionId; + } + + public void setoADistributionId(String oADistributionId) { + this.oADistributionId = oADistributionId; + } public Integer getAppStatus() { - return AppStatus; + return appStatus; } public void setAppStatus(Integer appStatus) { - AppStatus = appStatus; + this.appStatus = appStatus; } public String getOataskid() { @@ -64,13 +72,6 @@ public class ImplementationVo { this.oataskid = oataskid; } - public String getOADistributionId() { - return OADistributionId; - } - - public void setOADistributionId(String OADistributionId) { - this.OADistributionId = OADistributionId; - } public String getSysuserId() { return sysuserId; diff --git a/inventory-dao/src/main/java/com/rzyc/bean/task/vo/NameVo.java b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/NameVo.java index b555f0a..4fb1e1c 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/task/vo/NameVo.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/NameVo.java @@ -13,9 +13,12 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel("参与人员姓名返回实体类") public class NameVo { - @ApiModelProperty("姓名") + @ApiModelProperty("姓名（中文名）") private String name; + @ApiModelProperty("职务") + private String sysDeptName; + public String getName() { return name; } @@ -23,4 +26,12 @@ public class NameVo { public void setName(String name) { this.name = name; } + + public String getSysDeptName() { + return sysDeptName; + } + + public void setSysDeptName(String sysDeptName) { + this.sysDeptName = sysDeptName; + } } diff --git a/inventory-dao/src/main/java/com/rzyc/bean/task/vo/TaskDetailVo.java b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/TaskDetailVo.java index 2478774..7e818eb 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/task/vo/TaskDetailVo.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/TaskDetailVo.java @@ -24,6 +24,8 @@ public class TaskDetailVo { @ApiModelProperty("任务id") private String oataskid; + @ApiModelProperty("任务id") + private String taskType; @TableField("StartDate") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd ") @@ -35,6 +37,8 @@ public class TaskDetailVo { @ApiModelProperty("结束时间") private Date enddate; + @ApiModelProperty("任务发布人id") + private String sendId; @ApiModelProperty("任务名称") private String remark; @@ -48,6 +52,22 @@ public class TaskDetailVo { @ApiModelProperty("任务接收人完成情况") private List distributions = new ArrayList<>(); + public String getTaskType() { + return taskType; + } + + public String getSendId() { + return sendId; + } + + public void setSendId(String sendId) { + this.sendId = sendId; + } + + public void setTaskType(String taskType) { + this.taskType = taskType; + } + public String getWorkState() { return workState; } 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 c0670c9..739a4cd 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java @@ -6,6 +6,7 @@ import com.rzyc.bean.task.vo.*; import com.rzyc.model.OADistribution; import com.rzyc.model.oth.ManualLable; import com.rzyc.model.task.dto.TaskAddOrUpdateDto; +import com.rzyc.model.user.SysUser; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -69,5 +70,7 @@ public interface OADistributionMapper extends BaseMapper { OADistribution selectDistribution(@Param("oaDistributionId") String oaDistributionId); //查看接收任务状态 - List selectImplementation(@Param("deliverDto") DeliverDto deliverDto,@Param("status") Integer status); + List selectImplementation(@Param("deliverDto") DeliverDto deliverDto); + + List selectJoinUser(@Param("addWorkDto") AddWorkDto addWorkDto); } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/OaTaskTypeMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/OaTaskTypeMapper.java index 7e96ab1..7fd39a5 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/OaTaskTypeMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/OaTaskTypeMapper.java @@ -17,4 +17,6 @@ public interface OaTaskTypeMapper { List findBySortId(); OaTaskType selectById(@Param("typeId") String typeId); + + List selectFull(); } diff --git a/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml b/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml index 84ddba7..732f98e 100644 --- a/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml +++ b/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml @@ -322,6 +322,15 @@ 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} + where od.sned_id = #{deliverDto.send_id} and od.OATaskId = #{deliverDto.OATaskId} + + + + diff --git a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml index 3ba1734..e882259 100644 --- a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml +++ b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml @@ -472,6 +472,8 @@ + + @@ -496,7 +498,7 @@ select tt.* from oa_task_type tt where tt.type_id = #{typeId} + + 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 add7623..3196d0d 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/WorkController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/WorkController.java @@ -10,6 +10,7 @@ import com.rzyc.config.MethodAnnotation; import com.rzyc.mapper.OATaskMapper; import com.rzyc.model.OADistribution; import com.rzyc.model.OATask; +import com.rzyc.model.OaTaskType; import com.rzyc.model.OaTaskUser; import com.rzyc.model.task.dto.TaskAddOrUpdateDto; import com.rzyc.model.user.SysUser; @@ -21,6 +22,7 @@ import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.converters.DateConverter; import org.apache.commons.beanutils.converters.SqlDateConverter; +import org.apache.poi.ss.formula.functions.Na; import org.springframework.beans.propertyeditors.CustomDateEditor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -446,7 +448,45 @@ public class WorkController extends BaseController{ @MethodAnnotation(authorizations = {"selectImplementation","selectImplementation:update"},name = "查看发布人任务执行情况") public MultiResult selectImplementation(@Valid DeliverDto deliverDto){ MultiResult result = new MultiResult(); - List list = oaDistributionMapper.selectImplementation(deliverDto,2); + List list = oaDistributionMapper.selectImplementation(deliverDto); + result.setData(list); + return result; + } + + /** + * @Description: 查询任务类型id + * @Author ZQW + * @CreateTime 2022/11/16 10:07 + */ + @ApiOperation(value = "查询任务类型id",position = 20) + @GetMapping ("selectTypeId") + @PreAuthorize("hasAnyAuthority('selectTypeId','selectTypeId:update')") + @MethodAnnotation(authorizations = {"selectTypeId","selectTypeId:update"},name = "查询任务类型id") + public MultiResult selectTypeId(){ + MultiResult result = new MultiResult(); + List list = oaTaskTypeMapper.selectFull(); + result.setData(list); + return result; + } + + /** + * @Description: 查询参与人员姓名 + * @Author ZQW + * @CreateTime 2022/11/16 11:19 + */ + @ApiOperation(value = "查询参与人员姓名",position = 21) + @GetMapping ("selectName") + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "userId",value = "任务发送人id",required = true) + }) + @PreAuthorize("hasAnyAuthority('selectName','selectName:update')") + @MethodAnnotation(authorizations = {"selectName","selectName:update"},name = "查询参与人员姓名") + public MultiResult selectName(@Valid AddWorkDto addWorkDto){ + MultiResult result = new MultiResult(); + + List nameVos = new ArrayList<>(); + List list = oaDistributionMapper.selectJoinUser(addWorkDto); + result.setData(list); return result; }