From 1904b3257e7dc2deeb8feb996f3d1a5b6c5a5d91 Mon Sep 17 00:00:00 2001 From: zhengqiaowen <1275811465@qq.com> Date: Mon, 21 Nov 2022 10:45:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/rzyc/bean/task/vo/ThingVo.java | 15 +++-- .../java/com/rzyc/mapper/OATaskMapper.java | 3 +- .../main/resources/mapper/OATaskMapper.xml | 7 +- .../com/rzyc/controller/TaskController.java | 66 +------------------ .../com/rzyc/controller/WorkController.java | 14 ++-- 5 files changed, 28 insertions(+), 77 deletions(-) diff --git a/inventory-dao/src/main/java/com/rzyc/bean/task/vo/ThingVo.java b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/ThingVo.java index 4b33bc1..910e20d 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/task/vo/ThingVo.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/ThingVo.java @@ -20,29 +20,34 @@ import java.util.List; @ApiModel("待办事项返回参数") public class ThingVo { - @TableId("OATaskId") @ApiModelProperty("任务id") private String oataskid; + @ApiModelProperty("任务分配id") + private String oADistributionId; - @TableField("TaskType") @ApiModelProperty("任务类型") private String tasktype; - @TableField("StartDate") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("开始时间") private Date startdate; - @TableField("EndDate") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("结束时间") private Date enddate; - @TableField("Subject") @ApiModelProperty("任务内容") private String subject; + public String getoADistributionId() { + return oADistributionId; + } + + public void setoADistributionId(String oADistributionId) { + this.oADistributionId = oADistributionId; + } + public String getOataskid() { return oataskid; } 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 02d0e20..d06024e 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/OATaskMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/OATaskMapper.java @@ -107,7 +107,8 @@ public interface OATaskMapper extends BaseMapper { List taskList(@Param("condition") String condition); //待办事项列表 - List thingsList(@Param("idDto") IdDto idDto); + List thingsList(@Param("idDto") IdDto idDto, + @Param("userId") String userId); //插入任务 int insertTask(@Param("oaTask") OATask oaTask); diff --git a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml index 6346c4c..ff9ba36 100644 --- a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml +++ b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml @@ -561,9 +561,9 @@ diff --git a/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java b/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java index c8130fa..972e58a 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java @@ -43,59 +43,16 @@ import java.util.List; @Validated public class TaskController extends BaseController{ - /** - * @Description: 新增任务 - * @Author ZQW - * @CreateTime 2022/9/23 14:38 - */ - @ApiOperation(value = "新增任务",position = 1) - @PostMapping("addTask") - public SingleResult addTask(@Valid AddTaskDto addTaskDto) throws Exception{ - SingleResult result = new SingleResult<>(); - OATask oaTask = new OATask(); - BeanUtils.copyProperties(oaTask,addTaskDto); - //日期格式转换 - ConvertUtils.register(new DateConverter(null), Date.class); - //发布人 - SysUser sysUser = sysUserMapper.selectByPrimaryKey(addTaskDto.getSendId()); - //接收人 - //SysUser receiveUser = sysUserMapper.selectByPrimaryKey(addTaskDto.getUserId()); - if(null == sysUser){ - result.setCode(0); - result.setMessage("未知错误"); - return result; - } - if(StringUtils.isBlank(addTaskDto.getOataskid())){ - oaTask.setOataskid(RandomNumber.getUUid()); - oaTask.setCreatedby(getUserId()); - oaTask.setCreatedon(new Date()); - oaTaskMapper.insertTask(oaTask); - System.out.println("用户id======" + oaTask.getUserId()); - }else { - oaTask.setModifiedby(getUserId()); - oaTask.setModifiedon(new Date()); - oaTaskMapper.updateById(oaTask); - } - - /* //增加默认任务执行情况 - OADistribution oaDistribution = new OADistribution(); - oaDistribution.setOadistributionid(RandomNumber.getUUid()); - oaDistribution.setSnedId(addTaskDto.getSendId()); - oaDistribution.setSyschinaname(receiveUser.getChinaname()); - oaDistribution.setCreatedby(getUserId()); - oaDistribution.setCreatedon(new Date());*/ - return result; - } /** * @Description: 待办事项列表 * @Author ZQW * @CreateTime 2022/9/23 10:20 */ - @ApiOperation(value = "待办事项列表",position = 2) + /* @ApiOperation(value = "待办事项列表",position = 2) @GetMapping("thingsList") @ApiImplicitParams(value = { @ApiImplicitParam(name = "id",value = "任务类型id") @@ -106,7 +63,7 @@ public class TaskController extends BaseController{ System.out.println("查询的数据=====" + thingVos); result.setData(thingVos); return result; - } + }*/ /** * @return: 查询我发布的任务 @@ -162,24 +119,7 @@ public class TaskController extends BaseController{ return result; } - /** - * @Description:查询任务名称 - * @Author ZQW - * @CreateTime 2022/9/29 9:44 - */ - /*@ApiOperation(value = "查询任务名称",position = 5) - @ApiImplicitParams(value = { - @ApiImplicitParam(name = "id",value = "任务类型1id") - }) - @GetMapping("getTaskName") - public SingleResult getTaskName(@Valid IdDto idDto){ - SingleResult result = new SingleResult<>(); - TaskNameVo taskNameVo = new TaskNameVo(); - OaTaskType oaTaskType = oaTaskTypeMapper.selectById(idDto.getId()); - taskNameVo.setName(oaTaskType.getName()); - result.setData(taskNameVo); - return result; - }*/ + /** * @return: 新增任务执行情况 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 658a782..98b808b 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/WorkController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/WorkController.java @@ -159,11 +159,14 @@ public class WorkController extends BaseController{ @ApiOperation(value = "待办事项列表",position = 4) @GetMapping("thingsList") @ApiImplicitParams(value = { - @ApiImplicitParam(name = "id",value = "任务类型id") + @ApiImplicitParam(name = "id",value = "任务类型id"), + @ApiImplicitParam(name = "userId", value = "用户id",required = true, dataType = "string"), }) - public MultiResult thingsList(@Valid IdDto idDto){ + @PreAuthorize("hasAnyAuthority('thingsList','thingsList:update')") + @MethodAnnotation(authorizations = {"thingsList","thingsList:update"},name = "待办事项列表") + public MultiResult thingsList(@Valid IdDto idDto,@RequestParam(required = true) String userId){ MultiResult result = new MultiResult<>(); - List thingVos = oaTaskMapper.thingsList(idDto); + List thingVos = oaTaskMapper.thingsList(idDto,userId); System.out.println("查询的数据=====" + thingVos); result.setData(thingVos); return result; @@ -505,11 +508,10 @@ public class WorkController extends BaseController{ @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; } + + }