pms 日报 项目 任务 选择设备

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/ErrorCodeConstant.java

@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 public interface ErrorCodeConstant{
     ErrorCode IOT_PRODUCT_CLASSIFY_NOT_EXISTS = new ErrorCode(100, "设备分类不存在");
     ErrorCode IOT_DEVICE_NOT_EXISTS = new ErrorCode(101, "设备台账不存在");
+    ErrorCode IOT_DEPT_NOT_SELECTED = new ErrorCode(101, "请选择施工队伍");
     ErrorCode IOT_DEVICE_EXISTED = new ErrorCode(101, "设备台账已存在");
     ErrorCode NOT_EXISTS = new ErrorCode( 122, "供应商主数据不存在");
     ErrorCode SUPPLIER_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS = new ErrorCode(1-060-000-002, "更新供应商审核状态失败，原因：供应商不是审核中状态");

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttask/vo/IotProjectTaskRespVO.java

@@ -35,7 +35,7 @@ public class IotProjectTaskRespVO {
 
     @Schema(description = "施工设备")
     @ExcelProperty("施工设备")
-    private String deviceIds;
+    private Set<Long> deviceIds;
 
     @Schema(description = "施工工艺")
     @ExcelProperty("施工工艺")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttask/vo/IotProjectTaskSaveReqVO.java

@@ -25,7 +25,7 @@ public class IotProjectTaskSaveReqVO {
     private String location;
 
     @Schema(description = "施工设备")
-    private String deviceIds;
+    private Set<Long> deviceIds;
 
     @Schema(description = "施工工艺")
     private String technique;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotprojecttask/IotProjectTaskDO.java

@@ -49,7 +49,8 @@ public class IotProjectTaskDO extends BaseDO {
     /**
      * 施工设备
      */
-    private String deviceIds;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private Set<Long> deviceIds;
     /**
      * 施工工艺
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/IotDeviceMapper.java

@@ -149,6 +149,7 @@ public interface IotDeviceMapper extends BaseMapperX<IotDeviceDO> {
     default List<IotDeviceDO> selectSimpleList(IotDevicePageReqVO reqVO, Collection<Long> deptIds) {
         return selectList(new LambdaQueryWrapperX<IotDeviceDO>()
                 .inIfPresent(IotDeviceDO::getDeptId, reqVO.getDeptIds())
+                .inIfPresent(IotDeviceDO::getId, reqVO.getDeviceIds())
                 .likeIfPresent(IotDeviceDO::getDeviceCode, reqVO.getDeviceCode())
                 .likeIfPresent(IotDeviceDO::getDeviceName, reqVO.getDeviceName())
                 .inIfPresent(IotDeviceDO::getDeptId, deptIds));

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/IotDeviceServiceImpl.java

@@ -67,8 +67,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_DEVICE_EXISTED;
-import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_DEVICE_NOT_EXISTS;
+import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.*;
 
 /**
  * 设备台账 Service 实现类
@@ -368,6 +367,9 @@ public class IotDeviceServiceImpl implements IotDeviceService {
 
     @Override
     public List<IotDeviceDO> getDevicesByDepts(IotDevicePageReqVO reqVO) {
+        if (CollUtil.isEmpty(reqVO.getDeviceIds()) && CollUtil.isEmpty(reqVO.getDeptIds())) {
+            throw new ServiceException(IOT_DEPT_NOT_SELECTED);
+        }
         AtomicReference<List<IotDeviceDO>> devices = new AtomicReference<>(new ArrayList<>());
         // 忽略数据权限
         DataPermissionUtils.executeIgnore(() -> {