From 49d0adbe94798080f39b35b6ccf098221e5d19b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 28 Apr 2025 11:40:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E3=80=90bug-125=E3=80=91=E7=BB=93?= =?UTF-8?q?=E6=A1=88=E5=AE=A1=E6=A0=B8=E6=97=B6=EF=BC=8C=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E4=BA=BA=E4=B8=8D=E5=90=8C=E6=84=8F=E4=BA=86=EF=BC=8C=E7=84=B6?= =?UTF-8?q?=E5=90=8ECQM=E6=9B=B4=E6=AD=A3=E6=8E=AA=E6=96=BD=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E9=87=8D=E6=96=B0=E7=82=B9=E5=87=BB=E7=BB=93=E6=A1=88?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=A1=AE=E5=AE=9A=E4=BA=86=EF=BC=8C=E4=BD=86?= =?UTF-8?q?=E6=98=AF=E4=B9=8B=E5=89=8D=E7=9A=84=E5=AE=A1=E6=A0=B8=E4=BA=BA?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=94=B6=E5=88=B0=E5=BE=85=E5=8A=9E=E6=8F=90?= =?UTF-8?q?=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 保存解决方案后，给所有拒绝了之前方案的审核人添加待办消息 --- .../admin/controller/TicketController.java | 19 ++++++++++++++++++- .../pojo/vo/SolutionReviewDepartmentVO.java | 4 ++++ .../service/ITicketSolutionService.java | 3 ++- .../impl/TicketSolutionServiceImpl.java | 3 ++- .../mapper/TicketSolutionAuditMapper.xml | 3 ++- 5 files changed, 28 insertions(+), 4 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java index edd9475f..c68d289c 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java @@ -765,7 +765,24 @@ public class TicketController extends ControllerBase { @PostMapping("saveSolutionMeasures") @ApiMark(moduleName = "工单管理", apiName = "保存工单解决方案措施") public ApiResult saveSolutionMeasures(@Valid @RequestBody SolutionMeasuresSaveRequest request){ - ticketSolutionService.saveSolutionMeasures(request); + Ticket ticket = ticketSolutionService.saveSolutionMeasures(request); + List audits = ticketSolutionAuditService.getByTicket(request.getTicketId()); + audits.forEach(audit -> { + if (audit.getState() == 0) { + adminMessageService.add( + new AdminMessage() + .setNo(ticket.getNo()) + .setTitle(ticket.getTitle()) + .setUserId(audit.getUserId()) + .setSourceId(ticket.getId()) + .setSource(0) + .setType(MessageType.WorkOrderAssignment.getState()) + .setSubType(MessageSubType.TicketSolutionAudit.getState()) + .setIsRead(false) + .setCreateTime(LocalDateTime.now()) + ); + } + }); return ApiResult.success(); } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/SolutionReviewDepartmentVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/SolutionReviewDepartmentVO.java index 7f8435ff..72889d82 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/SolutionReviewDepartmentVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/SolutionReviewDepartmentVO.java @@ -4,6 +4,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; @Data public class SolutionReviewDepartmentVO { @@ -35,4 +36,7 @@ public class SolutionReviewDepartmentVO { //审核不通过原因 private String reason; + + //审核时间 + private LocalDateTime createTime; } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketSolutionService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketSolutionService.java index ebee294a..ecfbc8d8 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketSolutionService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketSolutionService.java @@ -3,6 +3,7 @@ package com.nflg.mobilebroken.repository.service; import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.mobilebroken.common.pojo.request.SolutionMeasuresSaveRequest; import com.nflg.mobilebroken.common.pojo.vo.SolutionMeasuresVO; +import com.nflg.mobilebroken.repository.entity.Ticket; import com.nflg.mobilebroken.repository.entity.TicketSolution; /** @@ -17,5 +18,5 @@ public interface ITicketSolutionService extends IService { SolutionMeasuresVO getSolutionMeasures(Integer ticketId); - void saveSolutionMeasures(SolutionMeasuresSaveRequest request); + Ticket saveSolutionMeasures(SolutionMeasuresSaveRequest request); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java index 958d8d42..0dfbcfb4 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java @@ -115,7 +115,7 @@ public class TicketSolutionServiceImpl extends ServiceImpl Date: Mon, 28 Apr 2025 11:49:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/AppUserMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml index c5f41624..ac3a9649 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml @@ -156,7 +156,7 @@ AND fun_getUserCompanys(aua.company_id) LIKE concat('%', #{companyName}, '%') - AND 0=#{userState} + AND 1=2 AND 1=2