diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/accessTicket/dto/request/AccessTicketPageReqDTO.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/accessTicket/dto/request/AccessTicketPageReqDTO.java index 6e898c0..9c48039 100644 --- a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/accessTicket/dto/request/AccessTicketPageReqDTO.java +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/accessTicket/dto/request/AccessTicketPageReqDTO.java @@ -19,4 +19,7 @@ public class AccessTicketPageReqDTO implements Serializable { @ApiModelProperty("过滤未完成任务:false-全部任务 true-过滤未完成任务") private Boolean isComplete; + + @ApiModelProperty("创建用户ID") + private Long creator; } \ No newline at end of file diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/accessTicket/controller/AccessTicketController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/accessTicket/controller/AccessTicketController.java index 3f0f4fe..a6a8708 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/accessTicket/controller/AccessTicketController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/accessTicket/controller/AccessTicketController.java @@ -15,6 +15,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.system.user.entity.User; import org.springframework.web.bind.annotation.*; @@ -75,6 +76,14 @@ public class AccessTicketController extends BladeController { return R.data(accessTicketService.pageCondition(param,query)); } + @GetMapping("/archive") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "报单档案") + public R> archive(AccessTicketPageReqDTO param,Query query) { + param.setCreator(AuthUtil.getUserId()); + return R.data(accessTicketService.pageCondition(param,query)); + } + @PostMapping("/detail") @ApiOperationSupport(order = 4) @ApiOperation(value = "检修工作票详情信息") diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/accessTicket/mapper/AccessTicketMapper.xml b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/accessTicket/mapper/AccessTicketMapper.xml index f252660..99c16ca 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/accessTicket/mapper/AccessTicketMapper.xml +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/accessTicket/mapper/AccessTicketMapper.xml @@ -15,6 +15,9 @@ AND TASK_NAME = '流程结束' + + AND CREATE_USER = #{param.creator} + ORDER BY CREATE_TIME DESC diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/accessTicket/service/impl/AccessTicketServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/accessTicket/service/impl/AccessTicketServiceImpl.java index 5fb7af9..7614eeb 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/accessTicket/service/impl/AccessTicketServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/accessTicket/service/impl/AccessTicketServiceImpl.java @@ -175,10 +175,12 @@ public class AccessTicketServiceImpl extends ServiceImpl