rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/gongfu' into feature/data-permission

This commit is contained in:
曹鹏飞 2026-01-16 16:23:28 +08:00
parent 81d10ba5d1 392956408e
commit 6f845e50ae
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java
View File

@ -538,7 +538,6 @@ public class TicketController extends ControllerBase {
@GetMapping("exportPdf") @GetMapping("exportPdf")
@ApiMark(moduleName = "工单管理", apiName = "导出工单为pdf") @ApiMark(moduleName = "工单管理", apiName = "导出工单为pdf")
public void exportPdf(HttpServletResponse response, @Valid @RequestParam @NotNull(message = "工单编号不能为空") Integer id) { public void exportPdf(HttpServletResponse response, @Valid @RequestParam @NotNull(message = "工单编号不能为空") Integer id) {
Ticket ticket = ticketService.getById(id); Ticket ticket = ticketService.getById(id);
VUtils.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("工单不存在"); VUtils.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("工单不存在");
DeviceInfoVO device = deviceService.getByDeviceNo(ticket.getDeviceNo()); DeviceInfoVO device = deviceService.getByDeviceNo(ticket.getDeviceNo());

5
nflg-mobilebroken-admin/src/main/resources/templates/ticketpdf.html
View File

@ -63,8 +63,11 @@
<td colspan="2" th:text="${ticket.useTime}+'小时'"></td> <td colspan="2" th:text="${ticket.useTime}+'小时'"></td>
</tr> </tr>
<tr> <tr>
<td class="desc1">主要负责人</td>
<td colspan="2"
th:text="${#strings.arraySplit(ticket.handleUserName, ',').length > 0 ? #strings.arraySplit(ticket.handleUserName, ',')[0] : ''}"></td>
<td class="desc1">处理人</td> <td class="desc1">处理人</td>
<td colspan="11" th:text="${ticket.handleUserName}"></td> <td colspan="8" th:text="${ticket.handleUserName}"></td>
</tr> </tr>
<tr> <tr>
<td class="desc1">问题描述</td> <td class="desc1">问题描述</td>

5
nflg-mobilebroken-gongfu/src/main/resources/templates/ticketpdf.html
View File

@ -67,8 +67,11 @@
<td colspan="2" th:text="${base.v1}"></td> <td colspan="2" th:text="${base.v1}"></td>
</tr> </tr>
<tr> <tr>
<td class="desc1">主要负责人</td>
<td colspan="2"
th:text="${#strings.arraySplit(ticket.handleUserName, ',').length > 0 ? #strings.arraySplit(ticket.handleUserName, ',')[0] : ''}"></td>
<td class="desc1">处理人</td> <td class="desc1">处理人</td>
<td colspan="11" th:text="${ticket.handleUserName}"></td> <td colspan="8" th:text="${ticket.handleUserName}"></td>
</tr> </tr>
<tr> <tr>
<td class="desc1">问题描述</td> <td class="desc1">问题描述</td>