From 0db404563a80a775c2aea5ddfe95c55a5deee88f Mon Sep 17 00:00:00 2001 From: zhengqiaowen <1275811465@qq.com> Date: Thu, 3 Nov 2022 15:46:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=98=BE=E7=A4=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rzyc/bean/task/vo/OADistributionVo.java | 31 +++++----- .../com/rzyc/bean/task/vo/ReceiveTaskVo.java | 21 +++---- .../com/rzyc/bean/task/vo/TaskDetailVo.java | 32 +++++------ .../com/rzyc/bean/task/vo/WorkStateVo.java | 25 +++++++++ .../java/com/rzyc/mapper/OATaskMapper.java | 2 + .../main/resources/mapper/OATaskMapper.xml | 43 +++++++------- .../com/rzyc/controller/WorkController.java | 56 ++++++++++--------- 7 files changed, 121 insertions(+), 89 deletions(-) create mode 100644 inventory-dao/src/main/java/com/rzyc/bean/task/vo/WorkStateVo.java diff --git a/inventory-dao/src/main/java/com/rzyc/bean/task/vo/OADistributionVo.java b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/OADistributionVo.java index 4ae5cc3..246591e 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/task/vo/OADistributionVo.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/OADistributionVo.java @@ -46,11 +46,11 @@ public class OADistributionVo { @ApiModelProperty("任务摘要") @TableField("title") - private String remark; + private String title; @ApiModelProperty("任务内容") @TableField("subject") - private String content; + private String subject; @ApiModelProperty("开始时间") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd ") @@ -66,8 +66,7 @@ public class OADistributionVo { * 未执行 执行中 执行完成 */ @ApiModelProperty("1、未执行 2、执行中 3、执行完成") - @TableField("AppStatus") - private String appstatus; + private String appStatus; public String getOadistributionid() { return oadistributionid; @@ -110,20 +109,20 @@ public class OADistributionVo { } - public String getRemark() { - return remark; + public String getTitle() { + return title; } - public void setRemark(String remark) { - this.remark = remark; + public void setTitle(String title) { + this.title = title; } - public String getContent() { - return content; + public String getSubject() { + return subject; } - public void setContent(String content) { - this.content = content; + public void setSubject(String subject) { + this.subject = subject; } public Date getStartTime() { @@ -142,11 +141,11 @@ public class OADistributionVo { this.endTime = endTime; } - public String getAppstatus() { - return appstatus; + public String getAppStatus() { + return appStatus; } - public void setAppstatus(String appstatus) { - this.appstatus = appstatus; + public void setAppStatus(String appStatus) { + this.appStatus = appStatus; } } diff --git a/inventory-dao/src/main/java/com/rzyc/bean/task/vo/ReceiveTaskVo.java b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/ReceiveTaskVo.java index 498465e..1b50656 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/task/vo/ReceiveTaskVo.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/ReceiveTaskVo.java @@ -37,16 +37,17 @@ public class ReceiveTaskVo { @TableField("title") @ApiModelProperty("任务名称") - private String title; + private String remark; @TableField("Subject") @ApiModelProperty("任务要求") - private String subject; + private String content; @ApiModelProperty("任务接收人完成情况") private OADistributionVo oaDistributionVo; + public OADistributionVo getOaDistributionVo() { return oaDistributionVo; } @@ -79,19 +80,19 @@ public class ReceiveTaskVo { this.enddate = enddate; } - public String getTitle() { - return title; + public String getRemark() { + return remark; } - public void setTitle(String title) { - this.title = title; + public void setRemark(String remark) { + this.remark = remark; } - public String getSubject() { - return subject; + public String getContent() { + return content; } - public void setSubject(String subject) { - this.subject = subject; + public void setContent(String content) { + this.content = content; } } 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 ee2279e..2478774 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 @@ -36,26 +36,24 @@ public class TaskDetailVo { private Date enddate; - @TableField("title") @ApiModelProperty("任务名称") - private String title; + private String remark; - @TableField("Subject") @ApiModelProperty("任务要求") - private String subject; + private String content; @ApiModelProperty("任务状态：1、执行中 2、执行完成 3、已超时") - private String appStatus; + private String workState; @ApiModelProperty("任务接收人完成情况") private List distributions = new ArrayList<>(); - public String getAppStatus() { - return appStatus; + public String getWorkState() { + return workState; } - public void setAppStatus(String appStatus) { - this.appStatus = appStatus; + public void setWorkState(String workState) { + this.workState = workState; } public String getOataskid() { @@ -83,20 +81,20 @@ public class TaskDetailVo { this.enddate = enddate; } - public String getTitle() { - return title; + public String getRemark() { + return remark; } - public void setTitle(String title) { - this.title = title; + public void setRemark(String remark) { + this.remark = remark; } - public String getSubject() { - return subject; + public String getContent() { + return content; } - public void setSubject(String subject) { - this.subject = subject; + public void setContent(String content) { + this.content = content; } public List getDistributions() { diff --git a/inventory-dao/src/main/java/com/rzyc/bean/task/vo/WorkStateVo.java b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/WorkStateVo.java new file mode 100644 index 0000000..19bcff2 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/WorkStateVo.java @@ -0,0 +1,25 @@ +package com.rzyc.bean.task.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: + * @Author: ZQW + * @CreateTime: 2022/11/3 11:23 + */ + +@ApiModel("任务分配人状返回实体类") +public class WorkStateVo { + + @ApiModelProperty("任务状态") + private String AppStatus; + + public String getAppStatus() { + return AppStatus; + } + + public void setAppStatus(String appStatus) { + AppStatus = appStatus; + } +} 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 9df8be5..258d70c 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/OATaskMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/OATaskMapper.java @@ -146,4 +146,6 @@ public interface OATaskMapper extends BaseMapper { List selectName(@Param("id") String id); List getUserNameList(@Param("ids") String ids); + + List selectWorkState(@Param("id") String id); } diff --git a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml index 99c5a29..7f092f6 100644 --- a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml +++ b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml @@ -474,9 +474,9 @@ - - - + + + @@ -486,17 +486,17 @@ - - + + - + - select ot.oataskid,ot.title,ot.subject,ot.startdate,ot.enddate,od.* + select ot.oataskid,ot.title as remark,ot.subject as content,ot.startdate,ot.enddate,od.* from OADistribution od join OATask ot on ot.oataskid = od.oataskid @@ -533,13 +533,6 @@ - + + + + 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 5ae9601..b999f78 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/WorkController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/WorkController.java @@ -136,8 +136,8 @@ public class WorkController extends BaseController{ oaDistribution.setOataskid(addTaskDto.getOataskid()); oaDistribution.setSnedId(oaTask.getSendId()); oaDistribution.setSysuserid(uid); - oaDistribution.setStartTime(oaTask.getStartdate()); - oaDistribution.setEndTime(oaTask.getEnddate()); + /* oaDistribution.setStartTime(oaTask.getStartdate()); + oaDistribution.setEndTime(oaTask.getEnddate());*/ oaDistribution.setAppstatus("1"); oaDistribution.setCreatedby(getUserId()); oaDistribution.setCreatedon(new Date()); @@ -145,30 +145,6 @@ public class WorkController extends BaseController{ } oaDistributionMapper.deliverTask(list); -// List list = new ArrayList<>(); -// for (TaskAddOrUpdateDto taskDto : list) { -// String sysuserid = addTaskDto.getSysuserid(); -// String[] split = sysuserid.split(","); -// for (String s : split) { -// SysUser sysUser = sysUserMapper.selectByPrimaryKey(s); -// OADistribution oaDistribution = new OADistribution(); -// BeanUtils.copyProperties(oaDistribution,taskDto); -// //日期格式转换 -// ConvertUtils.register(new DateConverter(null), Date.class); -// oaDistribution.setOadistributionid(RandomNumber.getUUid()); -// oaDistribution.setSnedId(oaTask.getSendId()); -// oaDistribution.setSyschinaname(sysUser.getChinaname()); -// oaDistribution.setSystelephone(sysUser.getMobiletel()); -// oaDistribution.setStartTime(oaTask.getStartdate()); -// oaDistribution.setEndTime(oaTask.getEnddate()); -// oaDistribution.setAppstatus("1"); -// oaDistribution.setCreatedby(getUserId()); -// oaDistribution.setCreatedon(new Date()); -// list.add(taskDto); -// } -// oaDistributionMapper.deliverTask(list); -// } - return result; } @@ -363,4 +339,32 @@ public class WorkController extends BaseController{ result.setData(userVoList); return result; } + + /** + * @Description: 查询任务是否完成 + * @Author ZQW + * @CreateTime 2022/11/3 11:14 + */ + @ApiOperation(value = "查询任务是否完成",position = 14) + @GetMapping ("checkFinish") + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "id",value = "任务id") + }) + @PreAuthorize("hasAnyAuthority('checkFinish','checkFinish:update')") + @MethodAnnotation(authorizations = {"checkFinish","checkFinish:update"},name = "查询任务是否完成") + public SingleResult checkFinish(@Valid IdDto idDto){ + SingleResult result = new SingleResult<>(); + List stateVoList = oaTaskMapper.selectWorkState(idDto.getId()); + OATask oaTask = oaTaskMapper.selectOATask(idDto.getId()); + for (WorkStateVo list : stateVoList) { + if ((list.getAppStatus()).equals("3")){ + oaTask.setAppstatus("3"); + }else { + oaTask.setAppstatus("2"); + } + } + oaTaskMapper.updateOATask(oaTask); + System.err.println("任务状态=======" + oaTask.getAppstatus()); + return result; + } }