From e22e20ae10dffb84c37c32d6a39a9b649de30dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 8 Aug 2025 15:31:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-500=20=E7=AE=A1=E7=90=86=E7=AB=AF?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E7=9A=84=E8=81=8C=E4=BD=8D=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=BF=9B=E6=9D=A5=EF=BC=8C=E7=BB=99=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BA=86=E8=81=8C=E4=BD=8D=E5=92=8C=E8=A7=92?= =?UTF-8?q?=E8=89=B2=EF=BC=8C=E6=B2=A1=E6=B3=95=E9=85=8D=E7=BD=AE=E5=85=B6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=EF=BC=8C=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E7=9C=8B=E5=88=B0=E5=85=A8=E9=83=A8=E5=B7=A5=E5=8D=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/PositionController.java | 3 +++ .../admin/pojo/dto/PositionDetailDTO.java | 6 +++++- .../mobilebroken/admin/pojo/vo/PositionDetailVO.java | 5 +++++ .../nflg/mobilebroken/common/constant/Constant.java | 7 +------ .../repository/entity/TBasePosition.java | 10 ++++++++-- .../repository/mapper/AdminUserMapper.java | 4 +++- .../service/impl/AdminUserServiceImpl.java | 5 ++--- .../src/main/resources/mapper/AdminUserMapper.xml | 12 ++++++++---- .../main/resources/mapper/TBasePositionMapper.xml | 4 +--- 9 files changed, 36 insertions(+), 20 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java index d73560c8..70cbee71 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java @@ -90,6 +90,7 @@ public class PositionController extends ControllerBase { } } result.setLanguage(positionLanguageResult); + result.setTicketManage(ent.getTicketManage()); return ApiResult.success(result); @@ -121,6 +122,7 @@ public class PositionController extends ControllerBase { // ent.setDataModifyUserNo(AdminUserUtil.getUserNo()); // ent.setDataModifyUserName(AdminUserUtil.getUserName()); // ent.setDataModifyTime(LocalDateTime.now()); + ent.setTicketManage(positionDetailDto.getTicketManage()); positionService.save(ent); return ApiResult.success(true); } @@ -136,6 +138,7 @@ public class PositionController extends ControllerBase { ent.setDataModifyUserNo(AdminUserUtil.getUserNo()); ent.setDataModifyUserName(AdminUserUtil.getUserName()); ent.setDataModifyTime(LocalDateTime.now()); + ent.setTicketManage(positionDetailDto.getTicketManage()); positionService.updateById(ent); return ApiResult.success(true); } diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/PositionDetailDTO.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/PositionDetailDTO.java index 8dcb1e29..62313f0c 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/PositionDetailDTO.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/PositionDetailDTO.java @@ -6,7 +6,6 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; import java.util.List; /** @@ -31,6 +30,11 @@ public class PositionDetailDTO { @NotNull(message = "属性不能为空") private Integer positionAttribute; + /** + * 是否授予工单权限 + */ + private Boolean ticketManage; + diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/vo/PositionDetailVO.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/vo/PositionDetailVO.java index 7f0c74c8..c889349e 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/vo/PositionDetailVO.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/vo/PositionDetailVO.java @@ -28,6 +28,11 @@ public class PositionDetailVO { */ private Integer positionAttribute; + /** + * 是否授予工单权限 + */ + private Boolean ticketManage; + /** * 创建人-账号 */ diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/constant/Constant.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/constant/Constant.java index 459bedb2..37916b17 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/constant/Constant.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/constant/Constant.java @@ -1,9 +1,5 @@ package com.nflg.mobilebroken.common.constant; -import cn.hutool.core.collection.ListUtil; - -import java.util.List; - public class Constant { public static final String FROM_APP = "app"; @@ -112,9 +108,8 @@ public class Constant { public static final String DICTIONARY_ITEM_ACCOUNT_HAS_EXPIRED="AccountHasExpired"; - public static final List ROLE_CODE_TICKET_MANAGERS = ListUtil.of(TITLE_DIRECTOROF_BUSINESS_UNIT,TITLE_TECHNICAL_MANAGER,TITLE_SALES_MANAGER,TITLE_TEST_MANAGER,TITLE_QUALITY_MANAGER,DICTIONARY_TYPE_TITLE_CQM); - public static final String DICTIONARY_SOLUTION_MEASURES = "SolutionMeasures"; + public static final String DICTIONARY_SOLUTION_REVIEW_DEPARTMENT = "SolutionReviewDepartment"; public static final String DICTIONARY_DEVICE_STATE ="deviceState"; diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBasePosition.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBasePosition.java index 065631ff..f4e71cbd 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBasePosition.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBasePosition.java @@ -3,12 +3,13 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 职位管理 @@ -85,4 +86,9 @@ public class TBasePosition implements Serializable { * 语言-json */ private String positionLanguage; + + /** + * 是否授予工单权限 + */ + private Boolean ticketManage; } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/AdminUserMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/AdminUserMapper.java index 82180517..c7ebeef5 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/AdminUserMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/AdminUserMapper.java @@ -20,5 +20,7 @@ public interface AdminUserMapper extends BaseMapper { List getSimples(List userIds); - List getTickerMangagers(List titleCodes); + List getTickerMangagers(); + + List getCQMIds(String titleCode); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java index 5a1b362d..3c87ed04 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java @@ -1,7 +1,6 @@ package com.nflg.mobilebroken.repository.service.impl; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -340,12 +339,12 @@ public class AdminUserServiceImpl extends ServiceImpl getTickerMangagers() { - return baseMapper.getTickerMangagers(Constant.ROLE_CODE_TICKET_MANAGERS); + return baseMapper.getTickerMangagers(); } @Override public List getCQMIds() { - return baseMapper.getTickerMangagers(ListUtil.of(Constant.DICTIONARY_TYPE_TITLE_CQM)); + return baseMapper.getCQMIds(Constant.DICTIONARY_TYPE_TITLE_CQM); } private String getDepartmentName(Long departmentId) { diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AdminUserMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AdminUserMapper.xml index 9cd0f769..c89589b8 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/AdminUserMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AdminUserMapper.xml @@ -28,9 +28,13 @@ SELECT au.id FROM t_base_position p INNER JOIN admin_user au ON au.title_id=p.id - WHERE au.state=1 AND au.is_del=0 AND p.position_code IN - - #{titleCode} - + WHERE au.state=1 AND au.is_del=0 AND p.ticket_manage + + + diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TBasePositionMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TBasePositionMapper.xml index fd42b69d..577e695b 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/TBasePositionMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TBasePositionMapper.xml @@ -12,9 +12,7 @@