From 537d302507bf5bdc6f6b81ece701abb6e8b6a1e1 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 20 十一月 2025 17:26:39 +0800
Subject: [PATCH] 工位改为默认查询所有状态
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/mapper/WorkstationMapper.java | 14 +++++++++++++-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/IWorkstationService.java | 9 +++++++++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java | 2 +-
smart-man-boot/src/main/resources/application.yml | 2 +-
4 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/mapper/WorkstationMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/mapper/WorkstationMapper.java
index a9d5506..ba1fda1 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/mapper/WorkstationMapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/mapper/WorkstationMapper.java
@@ -22,8 +22,20 @@
public interface WorkstationMapper extends BaseMapper<Workstation> {
List<DmpVariablesVO> queryDmpList(@Param("workstationId") String workstationId);
+ /**
+ * 宸ヤ綅鍒嗛〉鏌ヨ
+ * @param groupIdList
+ * @param page 鍒嗛〉淇℃伅
+ * @param keyWord 鍏抽敭瀛�
+ * @param groupId 鍒嗙粍id
+ * @param allWorkstationId
+ * @param status 鐘舵��
+ * @param type 宸ヤ綅绫诲瀷
+ * @param year
+ * @return 鍒嗛〉鏁版嵁
+ */
@DataAuth(code = "workstation")
- List<WorkstationVO> listPage(List<String> groupIdList, IPage<WorkstationVO> page, String keyWord, Long groupId, Long allWorkstationId, Integer status, Integer type, Integer year);
+ List<WorkstationVO> listPage(List<String> groupIdList, IPage<WorkstationVO> page, String keyWord, Long groupId, Long allWorkstationId, @Param("status")Integer status,@Param("type") Integer type, Integer year);
@DataAuth(code = "workstation")
<P extends IPage<Workstation>> P selectPage(P page, @Param("ew") Wrapper<Workstation> queryWrapper);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/IWorkstationService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/IWorkstationService.java
index 8b3c90f..af151f5 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/IWorkstationService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/IWorkstationService.java
@@ -46,6 +46,15 @@
Boolean delete(List<Long> workstationIds, Integer type);
+ /**
+ * 宸ヤ綅鍒嗛〉鏌ヨ
+ * @param workstationVOIPage 鍒嗛〉淇℃伅
+ * @param keyWord 鍏抽敭瀛�
+ * @param groupId 鍒嗙粍id
+ * @param status 鐘舵��
+ * @param type 绫诲瀷
+ * @return 鍒嗛〉鏁版嵁
+ */
IPage<WorkstationVO> listPage(IPage<WorkstationVO> workstationVOIPage, String keyWord, Long groupId, Integer status, Integer type);
List<WorkstationVO> getWorkstationByGroupIds(final List<String> groupIds);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java
index 3977438..982bd70 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java
@@ -415,7 +415,7 @@
return String.valueOf(item.getId());
}).collect(Collectors.toList()));
}
- List<WorkstationVO> workstationVOS = this.workstationMapper.listPage(workStationGroupIdList, workstationVOIPage, keyWord, groupId, CommonGroupConstant.ALL_WORKSTATION_ID, status == null ? CommonConstant.ENABLE : status, type, LocalDate.now().getYear());
+ List<WorkstationVO> workstationVOS = this.workstationMapper.listPage(workStationGroupIdList, workstationVOIPage, keyWord, groupId, CommonGroupConstant.ALL_WORKSTATION_ID, status, type, LocalDate.now().getYear());
workstationVOS.forEach(workstationVO -> {
String calendarName = workstationVO.getCalendarName();
if (Func.isBlank(calendarName)) {
diff --git a/smart-man-boot/src/main/resources/application.yml b/smart-man-boot/src/main/resources/application.yml
index 615f020..facad48 100644
--- a/smart-man-boot/src/main/resources/application.yml
+++ b/smart-man-boot/src/main/resources/application.yml
@@ -150,7 +150,7 @@
#swagger鍏叡淇℃伅
swagger:
- enable: false
+ enable: falsed
title: smart 鎺ュ彛鏂囨。绯荤粺
description: smart 鎺ュ彛鏂囨。绯荤粺
version: 2.8.2.RELEASE
--
Gitblit v1.9.3