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

feat: 一些调整

This commit is contained in:
曹鹏飞 2025-02-17 01:10:26 +08:00
parent b106b431e5
commit 44281ff108
7 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -386,7 +386,7 @@ public class TicketController extends ControllerBase {
}
private TicketEvaluateVO getTicketEvaluate(Integer ticketId) {
TicketEvaluate ticketEvaluate = ticketEvaluateService.getById(ticketId);
TicketEvaluate ticketEvaluate = ticketEvaluateService.lambdaQuery().eq(TicketEvaluate::getTicketId,ticketId).one();
if (Objects.isNull(ticketEvaluate)) {
return null;
}

2
nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java
View File

@ -221,7 +221,7 @@ public class TiketController extends ControllerBase {
}
private TicketEvaluateVO getTicketEvaluate(Integer ticketId) {
TicketEvaluate ticketEvaluate = ticketEvaluateService.getById(ticketId);
TicketEvaluate ticketEvaluate = ticketEvaluateService.lambdaQuery().eq(TicketEvaluate::getTicketId,ticketId).one();
if (Objects.isNull(ticketEvaluate)) {
return null;
}

10
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppMessageVO.java
View File

@ -1,5 +1,6 @@
package com.nflg.mobilebroken.common.pojo.vo;
import com.nflg.mobilebroken.common.constant.MessageSubType;
import lombok.Data;
import lombok.experimental.Accessors;
@ -20,9 +21,16 @@ public class AppMessageVO {
//工单标题
private String ticketTitle;
//提醒事项
//任务事项，5：工单新消息；6：工单完成；10：工单超时
private Integer subType;
//任务事项描述
private String content;
public String getContent() {
return MessageSubType.findByValue(subType).getDescription();
}
//消息时间
private LocalDateTime createTime;

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
View File

@ -369,7 +369,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
.setUserName(d.getUserName())
.setCompanyName(company.getAgencyCompanyName())
.setLanguageCode(d.getLanguageCode())
.setName(d.getSalesUserName())
.setName(d.getUserName())
.setEmail(d.getUserEmail())
.setSalesUserName(d.getSalesUserName())
.setAreaName(area.getName())

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

@ -105,6 +105,9 @@ public class DictionaryItemServiceImpl extends ServiceImpl<DictionaryItemMapper,
List<DictionaryItemTranslate> forAdd = new ArrayList<>();
List<DictionaryItemTranslate> forUpdate = new ArrayList<>();
for (TranslateMap translate : request.getLanguages()) {
if(StrUtil.isBlank(translate.getValue())){
continue;
}
DictionaryItemTranslate t = new DictionaryItemTranslate()
.setDictionaryItemId(id)
.setLanguageCode(translate.getCode())

4
nflg-mobilebroken-repository/src/main/resources/mapper/AppMessageMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.nflg.mobilebroken.repository.mapper.AppMessageMapper">
<select id="getNotReadMessage" resultType="com.nflg.mobilebroken.common.pojo.vo.AppMessageVO">
SELECT m.id,t.id AS 'ticketId',t.`no` AS 'ticketNo',t.title AS 'ticketTitle',m.content,m.create_time AS 'createTime',u.`name` AS 'ticketCreateBy',t.create_time AS 'ticketCreateTime',t.handle AS 'ticketHandleBy',m.is_read AS 'isRead'
SELECT m.id,t.id AS 'ticketId',t.`no` AS 'ticketNo',m.sub_type AS 'subType',t.title AS 'ticketTitle',m.create_time AS 'createTime',u.`name` AS 'ticketCreateBy',t.create_time AS 'ticketCreateTime',t.handle AS 'ticketHandleBy',m.is_read AS 'isRead'
FROM app_message m
INNER JOIN ticket t ON m.ticket_id=t.id
INNER JOIN app_user u ON t.user_id=u.id
@ -11,7 +11,7 @@
ORDER BY m.create_time DESC
</select>
<select id="search" resultType="com.nflg.mobilebroken.common.pojo.vo.AppMessageVO">
SELECT m.id,t.id AS 'ticketId',t.`no` AS 'ticketNo',t.title AS 'ticketTitle',m.content,m.create_time AS 'createTime',u.`name` AS 'ticketCreateBy',t.create_time AS 'ticketCreateTime',t.handle AS 'ticketHandleBy',m.is_read AS 'isRead'
SELECT m.id,t.id AS 'ticketId',t.`no` AS 'ticketNo',m.sub_type AS 'subType',t.title AS 'ticketTitle',m.create_time AS 'createTime',u.`name` AS 'ticketCreateBy',t.create_time AS 'ticketCreateTime',t.handle AS 'ticketHandleBy',m.is_read AS 'isRead'
FROM app_message m
INNER JOIN ticket t ON m.ticket_id=t.id
INNER JOIN app_user u ON t.user_id=u.id

2
nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
View File

@ -82,7 +82,7 @@
INNER JOIN app_area a ON u.area_id=a.id
LEFT JOIN app_user uc ON u.create_by=uc.id
LEFT JOIN t_base_position p ON u.title_id=p.id
WHERE u.company_id=#{companyId}
WHERE u.state=0 AND u.company_id=#{companyId}
<if test="state > 0">
AND 1=2
</if>