pms 项目任务列表添加公司搜索

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojectinfo/IotProjectInfoController.java

@@ -26,7 +26,6 @@ import javax.validation.Valid;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojectinfo/vo/IotProjectInfoPageReqVO.java

@@ -99,4 +99,7 @@ public class IotProjectInfoPageReqVO extends PageParam {
      */
     @Schema(description = "项目id 集合", example = "[123,345]")
     private List<Long> projectIds;
+
+    @Schema(description = "公司id", example = "157")
+    private Long companyDeptId;
 }

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

@@ -143,7 +143,7 @@ public class IotProjectTaskController {
     @PreAuthorize("@ss.hasPermission('rq:iot-project-task:query')")
     public CommonResult<PageResult<IotProjectTaskRespVO>> getTaskList( IotProjectTaskPageReqVO pageReqVO) {
         Set<Long> idList = new HashSet<>();
-        PageResult<IotProjectTaskDO> taskList = iotProjectTaskService.taskList(pageReqVO,idList);
+        PageResult<IotProjectTaskDO> taskList = iotProjectTaskService.taskList(pageReqVO, idList);
         // 设置每个任务的施工队伍
 
         return success(new PageResult<>(buildProjectTaskList(taskList.getList()), taskList.getTotal()));

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

@@ -39,9 +39,10 @@ public interface IotProjectInfoMapper extends BaseMapperX<IotProjectInfoDO> {
                 .orderByDesc(IotProjectInfoDO::getId));
     }
 
-    default PageResult<IotProjectInfoDO> selectPage1(IotProjectInfoPageReqVO reqVO,Collection<Long> deptIds) {
+    default PageResult<IotProjectInfoDO> selectPage1(IotProjectInfoPageReqVO reqVO, Collection<Long> deptIds) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotProjectInfoDO>()
-                .inIfPresent(IotProjectInfoDO::getDeptId,  deptIds)
+                .eqIfPresent(IotProjectInfoDO::getDeptId, reqVO.getCompanyDeptId())
+                .inIfPresent(IotProjectInfoDO::getDeptId, deptIds)
                 .likeIfPresent(IotProjectInfoDO::getManufactureName, reqVO.getManufactureName())
                 .likeIfPresent(IotProjectInfoDO::getDeptName, reqVO.getDeptName())
                 .likeIfPresent(IotProjectInfoDO::getContractName, reqVO.getContractName())

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

@@ -99,6 +99,7 @@ public interface IotProjectTaskMapper extends BaseMapperX<IotProjectTaskDO> {
     }
 
     IPage<IotProjectTaskDO> taskList(IPage<IotProjectTaskPageReqVO> page,
+                                     @Param("companyId") Long companyId,
                                      @Param("manufactureName") String manufactureName,
                                      @Param("contractName") String contractName,
                                      @Param("contractCode") String contractCode,

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

@@ -155,7 +155,7 @@ public class IotProjectInfoServiceImpl implements IotProjectInfoService {
                 departmentIds.add(dept.getId());
             });
         }
-        return iotProjectInfoMapper.selectPage1(pageReqVO,departmentIds);
+        return iotProjectInfoMapper.selectPage1(pageReqVO, departmentIds);
     }
 
     @Override

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

@@ -192,7 +192,7 @@ public class IotProjectTaskServiceImpl implements IotProjectTaskService {
     }
 
     @Override
-    public PageResult<IotProjectTaskDO> taskList(IotProjectTaskPageReqVO vo,Collection<Long> deptIds) {
+    public PageResult<IotProjectTaskDO> taskList(IotProjectTaskPageReqVO vo, Collection<Long> deptIds) {
         // 查询当前登录人所属部门的公司级组织 查询组织下的项目任务
         List<DeptDO> depts = iotProjectInfoService.companyLevelDepts();
         Set<Long> departmentIds = new HashSet<>();
@@ -202,13 +202,14 @@ public class IotProjectTaskServiceImpl implements IotProjectTaskService {
             });
         }
         IPage<IotProjectTaskDO> taskDOIPage = iotProjectTaskMapper.taskList(Page.of(vo.getPageNo(), vo.getPageSize()),
+                vo.getCompanyId(),
                 vo.getManufactureName(),
                 vo.getContractName(),
                 vo.getContractCode(),
                 vo.getWellName(),
                 vo.getCreateTime(),
                 departmentIds);
-        return new PageResult<>(taskDOIPage.getRecords(),taskDOIPage.getTotal());
+        return new PageResult<>(taskDOIPage.getRecords(), taskDOIPage.getTotal());
     }
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/iotprojecttask/IotProjectTaskMapper.xml

@@ -42,6 +42,9 @@
         and a.deleted = 0
         and b.deleted = 0
         and (a.platform_well = 0 or a.platform_well = 1)
+        <if test="companyId != null and companyId != ''">
+        and a.dept_id = #{companyId}
+        </if>
         <if test="manufactureName != null  and manufactureName != ''">
         and b.manufacture_name like concat('%', #{manufactureName}, '%')
         </if>