工位改为默认查询所有状态

yangys

2025-11-20 537d302507bf5bdc6f6b81ece701abb6e8b6a1e1

工位改为默认查询所有状态

 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);

 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);

 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)) {

 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