作业服务相关修改

src/main/java/com/mmc/pms/controller/inspection/CompanyInspectionController.java

@@ -56,7 +56,7 @@ public class CompanyInspectionController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CompanyInspectionDTO.class)})
     @GetMapping("getCompanyInspectionById")
     public ResultBody<CompanyInspectionDTO> getCompanyInspectionById(@RequestParam Integer id, HttpServletRequest request){
-        return companyInspectionService.getCompanyInspectionById(id, this.getUserLoginInfoFromRedis(request));
+        return companyInspectionService.getCompanyInspectionById(id);
     }
 
     @ApiOperation(value = "pc-单位服务列表")
@@ -89,4 +89,12 @@ public class CompanyInspectionController extends BaseController {
                                                                       @RequestBody CompanyInspectionQO companyInspectionQO, HttpServletRequest request){
         return companyInspectionService.listAPPCompanyInspectionPage(companyInspectionQO, this.getUserLoginInfoFromRedis(request));
     }
+
+    @ApiOperation(value = "根据公司id查询服务")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CompanyInspectionDTO.class)})
+    @PostMapping("listAPPCompanyInspectionPageByCompanyId")
+    public ResultBody<CompanyInspectionDTO> listAPPCompanyInspectionPageByCompanyId(@Validated(value = {Page.class})
+                                                                    @RequestBody CompanyInspectionQO companyInspectionQO){
+        return companyInspectionService.listAPPCompanyInspectionPageByCompanyId(companyInspectionQO);
+    }
 }

src/main/java/com/mmc/pms/service/inspection/CompanyInspectionService.java

@@ -18,7 +18,7 @@ public interface CompanyInspectionService {
 
     ResultBody remove(Integer id);
 
-    ResultBody<CompanyInspectionDTO> getCompanyInspectionById(Integer id, LoginSuccessDTO loginSuccessDTO);
+    ResultBody<CompanyInspectionDTO> getCompanyInspectionById(Integer id);
 
     ResultBody<CompanyInspectionDTO> listCompanyInspectionPage(CompanyInspectionQO companyInspectionQO, LoginSuccessDTO loginSuccessDTO);
 
@@ -29,4 +29,6 @@ public interface CompanyInspectionService {
     ResultBody<IndustryTypeDTO> listAPPCompanyInspectionPage(CompanyInspectionQO companyInspectionQO, LoginSuccessDTO loginSuccessDTO);
 
     void removeCompanyInspectionByCompanyInfoId(Integer companyInfoId);
+
+    ResultBody<CompanyInspectionDTO> listAPPCompanyInspectionPageByCompanyId(CompanyInspectionQO companyInspectionQO);
 }

src/main/java/com/mmc/pms/service/inspection/impl/CompanyInspectionServiceImpl.java

@@ -83,11 +83,11 @@ public class CompanyInspectionServiceImpl implements CompanyInspectionService {
     }
 
     @Override
-    public ResultBody<CompanyInspectionDTO> getCompanyInspectionById(Integer id, LoginSuccessDTO loginSuccessDTO) {
+    public ResultBody<CompanyInspectionDTO> getCompanyInspectionById(Integer id) {
         CompanyInspectionDO companyInspectionDO = companyInspectionDao.getCompanyInspectionById(id);
         if (companyInspectionDO != null) {
             CompanyInspectionDTO companyInspectionDTO = companyInspectionDO.buildCompanyInspectionDTO();
-            ResultBody<CompanyInfoVO> res = userAppApi.getCompanyInfoById(companyInspectionDO.getCompanyInfoId(), loginSuccessDTO.getToken());
+            ResultBody<CompanyInfoVO> res = userAppApi.getCompanyInfoById(companyInspectionDO.getCompanyInfoId(), null);
             if (res.getResult() != null) {
                 companyInspectionDTO.setCompanyName(res.getResult().getCompanyName());
             }
@@ -151,6 +151,12 @@ public class CompanyInspectionServiceImpl implements CompanyInspectionService {
         companyInspectionDao.removeByCompanyInfoId(companyInfoId);
     }
 
+    @Override
+    public ResultBody<CompanyInspectionDTO> listAPPCompanyInspectionPageByCompanyId(CompanyInspectionQO companyInspectionQO) {
+
+        return null;
+    }
+
     public void setCompanyName(List<CompanyInspectionDTO> companyInspectionDTOS, String token){
         // 单位名称查询
         List<Integer> companyInfoIds = companyInspectionDTOS.stream().map(i -> i.getCompanyInfoId()).collect(Collectors.toList());