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

refactor(mobilebroken):调整解决方案为根本原因分析并优化权限判断逻辑 

- 将 TicketInfoVO 中的 solution 字段注释从"解决方案"改为"根本原因分析"
- 优化 TicketSolutionServiceImpl 中的权限判断逻辑，增加 SaTokenAdminUtil.isLogin() 判断
This commit is contained in:
曹鹏飞 2025-04-03 11:38:05 +08:00
parent 30cf997c7b
commit 4fa4e8cdf5
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TicketInfoVO.java
View File

@ -95,7 +95,7 @@ public class TicketInfoVO {
//评价 //评价
private TicketEvaluateVO evaluate; private TicketEvaluateVO evaluate;
//解决方案 //根本原因分析
private String solution; private String solution;
/** /**

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

@ -11,6 +11,7 @@ import com.nflg.mobilebroken.common.pojo.vo.SolutionMeasuresDataItemVO;
import com.nflg.mobilebroken.common.pojo.vo.SolutionMeasuresItemVO; import com.nflg.mobilebroken.common.pojo.vo.SolutionMeasuresItemVO;
import com.nflg.mobilebroken.common.pojo.vo.SolutionMeasuresVO; import com.nflg.mobilebroken.common.pojo.vo.SolutionMeasuresVO;
import com.nflg.mobilebroken.common.util.AdminUserUtil; import com.nflg.mobilebroken.common.util.AdminUserUtil;
import com.nflg.mobilebroken.common.util.SaTokenAdminUtil;
import com.nflg.mobilebroken.common.util.VUtils; import com.nflg.mobilebroken.common.util.VUtils;
import com.nflg.mobilebroken.repository.entity.DictionaryItem; import com.nflg.mobilebroken.repository.entity.DictionaryItem;
import com.nflg.mobilebroken.repository.entity.Ticket; import com.nflg.mobilebroken.repository.entity.Ticket;
@ -60,11 +61,13 @@ public class TicketSolutionServiceImpl extends ServiceImpl<TicketSolutionMapper,
List<TicketSolution> solutions = lambdaQuery().eq(TicketSolution::getTicketId, ticketId).orderByAsc(TicketSolution::getId).list(); List<TicketSolution> solutions = lambdaQuery().eq(TicketSolution::getTicketId, ticketId).orderByAsc(TicketSolution::getId).list();
Map<String, List<TicketSolution>> groupedSolutions = solutions.stream().collect(Collectors.groupingBy(TicketSolution::getDictionaryItemName, LinkedHashMap::new, Collectors.toList())); Map<String, List<TicketSolution>> groupedSolutions = solutions.stream().collect(Collectors.groupingBy(TicketSolution::getDictionaryItemName, LinkedHashMap::new, Collectors.toList()));
SolutionMeasuresVO vo=new SolutionMeasuresVO(); SolutionMeasuresVO vo=new SolutionMeasuresVO();
TicketSolutionAudit audit =ticketSolutionAuditService.getByTicketAndUser(ticketId,AdminUserUtil.getUserId()); if (SaTokenAdminUtil.isLogin()) {
TicketSolutionAudit audit = ticketSolutionAuditService.getByTicketAndUser(ticketId, AdminUserUtil.getUserId());
if (Objects.nonNull(audit)) { if (Objects.nonNull(audit)) {
vo.setInAudit(true); vo.setInAudit(true);
vo.setApproved(Objects.isNull(audit.getState()) ? null : Objects.equals(audit.getState(), 1)); vo.setApproved(Objects.isNull(audit.getState()) ? null : Objects.equals(audit.getState(), 1));
} }
}
List<SolutionMeasuresItemVO> items = new ArrayList<>(); List<SolutionMeasuresItemVO> items = new ArrayList<>();
if (CollectionUtil.isEmpty(groupedSolutions)) { if (CollectionUtil.isEmpty(groupedSolutions)) {
items= initial.stream().map(it -> new SolutionMeasuresItemVO() items= initial.stream().map(it -> new SolutionMeasuresItemVO()