派单修改

wangqian
1 parent e4ae0e97
Showing 2 changed files with 4 additions and 8 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/AssignTasksInfoController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java
@@ -10,8 +10,6 @@ import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.Ass
 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoRespVO;
 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoSaveReqVO;
 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoUpdReqVO;
-import com.zteits.urbanops.module.garden.convert.AssignTaskConvert;
-import com.zteits.urbanops.module.garden.dal.dataobject.assigntasks.AssignTasksDO;
 import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO;
 import com.zteits.urbanops.module.garden.service.assigntasks.AssignTasksService;
 import com.zteits.urbanops.module.garden.service.assigntasksinfo.AssignTasksInfoService;
@@ -21,20 +19,16 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
  
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
  
 import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
-import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
-import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception0;
 import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getCompanyId;
  
 @Tag(name = "管理后台 - 派单任务-单位关联表（记录单位接收派单后的执行详情）")
 @RestController
@@ -95,6 +89,7 @@ public class AssignTasksInfoController {
     @Operation(summary = "获得派单任务-单位关联表（记录单位接收派单后的执行详情）分页")
     @PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:query')")
     public CommonResult<PageResult<AssignTasksInfoRespVO>> getAssignTasksInfoPage(@Valid AssignTasksInfoPageReqVO pageReqVO) {
+        pageReqVO.setCompanyId(getCompanyId());
         PageResult<AssignTasksInfoDO> pageResult = assignTasksInfoService.getAssignTasksInfoPage(pageReqVO);
 //        if (pageResult == null || pageResult.getList() == null || pageResult.getList().isEmpty()) {
 //            return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
@@ -121,6 +116,7 @@ public class AssignTasksInfoController {
     @Operation(summary = "获得派单任务-单位关联表（记录单位接收派单后的执行详情）分页")
     @PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:query')")
     public CommonResult<PageResult<AssignTasksInfoRespVO>> list(@Valid AssignTasksInfoPageReqVO pageReqVO) {
+        pageReqVO.setCompanyId(getCompanyId());
         PageResult<AssignTasksInfoDO> pageResult = assignTasksInfoService.getAssignTasksInfoPage(pageReqVO);
 //        if (pageResult == null || pageResult.getList() == null || pageResult.getList().isEmpty()) {
 //            return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
@@ -15,7 +15,7 @@ public class AssignTasksInfoPageReqVO extends PageParam {
  
  
     @Schema(description = "单位ID（关联单位表主键）", example = "11926")
-    private String companyId;
+    private Long companyId;
  
     @Schema(description = "填报人ID（单位指定的任务负责人）", example = "28216")
     private String writePersonId;