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

Merge branch 'prod/20260204' into develop

This commit is contained in:
曹鹏飞 2026-02-04 09:50:54 +08:00
parent c88fd86abe 802334cdf5
commit bcfe4c3ea4
2 changed files with 2 additions and 2 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

@ -930,7 +930,6 @@ public class TicketController extends ControllerBase {
@PostMapping("saveSolutionMeasures") @PostMapping("saveSolutionMeasures")
@ApiMark(moduleName = "工单管理", apiName = "保存工单解决方案措施") @ApiMark(moduleName = "工单管理", apiName = "保存工单解决方案措施")
public ApiResult<Void> saveSolutionMeasures(@Valid @RequestBody SolutionMeasuresSaveRequest request) { public ApiResult<Void> saveSolutionMeasures(@Valid @RequestBody SolutionMeasuresSaveRequest request) {
Ticket ticket = ticketSolutionService.saveSolutionMeasures(request); Ticket ticket = ticketSolutionService.saveSolutionMeasures(request);
List<SolutionReviewDepartmentVO> audits = ticketSolutionAuditService.getByTicket(request.getTicketId()); List<SolutionReviewDepartmentVO> audits = ticketSolutionAuditService.getByTicket(request.getTicketId());
audits.forEach(audit -> { audits.forEach(audit -> {

3
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java
View File

@ -198,6 +198,7 @@ public class TicketSolutionServiceImpl extends ServiceImpl<TicketSolutionMapper,
.set(Ticket::getReason, request.getReason()) .set(Ticket::getReason, request.getReason())
.set(StrUtil.isNotBlank(request.getQuestion()), Ticket::getQuestion, request.getQuestion()) .set(StrUtil.isNotBlank(request.getQuestion()), Ticket::getQuestion, request.getQuestion())
.set(Ticket::getAccidentLevel, request.getAccidentLevel()) .set(Ticket::getAccidentLevel, request.getAccidentLevel())
.set(Ticket::getComponentId, request.getComponentId())
.eq(Ticket::getId, request.getTicketId()) .eq(Ticket::getId, request.getTicketId())
.update(); .update();
if (CollectionUtil.isNotEmpty(idForReserve)) { if (CollectionUtil.isNotEmpty(idForReserve)) {
@ -279,7 +280,7 @@ public class TicketSolutionServiceImpl extends ServiceImpl<TicketSolutionMapper,
} }
ticket1Service.lambdaUpdate() ticket1Service.lambdaUpdate()
.set(GongfuTicket::getReason, request.getReason()) .set(GongfuTicket::getReason, request.getReason())
.set(GongfuTicket::getQuestion, request.getQuestion()) .set(StrUtil.isNotBlank(request.getQuestion()), GongfuTicket::getQuestion, request.getQuestion())
.set(GongfuTicket::getAccidentLevel, request.getAccidentLevel()) .set(GongfuTicket::getAccidentLevel, request.getAccidentLevel())
.set(GongfuTicket::getComponentId, request.getComponentId()) .set(GongfuTicket::getComponentId, request.getComponentId())
.eq(GongfuTicket::getId, request.getTicketId()) .eq(GongfuTicket::getId, request.getTicketId())