diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/FirstWorkTicketController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/FirstWorkTicketController.java index 17d49c9..589df0b 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/FirstWorkTicketController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/FirstWorkTicketController.java @@ -123,4 +123,5 @@ public class FirstWorkTicketController extends BladeController { public void exportFirstTicket(HttpServletResponse response,@RequestParam Long ticketId) throws Exception { firstWorkTicketService.preview(response,ticketId); } + } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/WorkTicketInfoMapper.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/WorkTicketInfoMapper.java index e623b2a..5f94f31 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/WorkTicketInfoMapper.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/WorkTicketInfoMapper.java @@ -67,10 +67,7 @@ public interface WorkTicketInfoMapper extends UserDataScopeBaseMapper selectPages(Page pageEntity, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); - List getWorkTicketBill(@Param("deviceCodes") List deviceCodes, @Param("startTime") String startTime, @Param("endTime") String endTime); - - @UserDataAuth - List selectTicketList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + List getWorkTicketBill(@Param("path") String path, @Param("startTime") String startTime, @Param("endTime") String endTime); IPage pageCondition(IPage page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); -} +} \ No newline at end of file diff --git a/hzims-service/ticket/src/main/resources/template/大隆水电站倒闸操作票模板.xlsx b/hzims-service/ticket/src/main/resources/template/大隆水电站倒闸操作票模板.xlsx deleted file mode 100644 index 329221a..0000000 Binary files a/hzims-service/ticket/src/main/resources/template/大隆水电站倒闸操作票模板.xlsx and /dev/null differ diff --git a/hzims-service/ticket/src/main/resources/template/大隆水电站水力机械工作票模板.xlsx b/hzims-service/ticket/src/main/resources/template/大隆水电站水力机械工作票模板.xlsx deleted file mode 100644 index 0a7678a..0000000 Binary files a/hzims-service/ticket/src/main/resources/template/大隆水电站水力机械工作票模板.xlsx and /dev/null differ diff --git a/hzims-service/ticket/src/main/resources/template/大隆水电站电气第一种工作票模板.xlsx b/hzims-service/ticket/src/main/resources/template/大隆水电站电气第一种工作票模板.xlsx deleted file mode 100644 index bc095f4..0000000 Binary files a/hzims-service/ticket/src/main/resources/template/大隆水电站电气第一种工作票模板.xlsx and /dev/null differ diff --git a/hzims-service/ticket/src/main/resources/template/大隆水电站电气第二种工作票模板.xlsx b/hzims-service/ticket/src/main/resources/template/大隆水电站电气第二种工作票模板.xlsx deleted file mode 100644 index 85e1d0d..0000000 Binary files a/hzims-service/ticket/src/main/resources/template/大隆水电站电气第二种工作票模板.xlsx and /dev/null differ