代码备份

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -26,6 +26,7 @@ import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.BasicProductThirdSysResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.service.auth.CustomerService;
+import com.glxp.api.service.basic.BasicUdiProductService;
 import com.glxp.api.service.basic.ProductInfoService;
 import com.glxp.api.service.basic.UdiRelevanceService;
 
@@ -60,6 +61,8 @@ public class UdiRelevanceController extends BaseController {
     ThrDataService thrDataService;
     @Resource
     ProductInfoService productInfoService;
+    @Resource
+    BasicUdiProductService basicUdiProductService;
 
     //基础信息-耗材字典-查询页面、业务单据-选入耗材字典-查询页面
     @AuthRuleAnnotation("")
@@ -215,16 +218,36 @@ public class UdiRelevanceController extends BaseController {
     }
 
     //资质证书选入产品列表  产品名称，生产企业过滤
+//    @AuthRuleAnnotation("")
+//    @GetMapping("/udi/cert/filterUdi")
+//    public BaseResponse filterCertUdi(FilterUdiRelRequest filterUdiRelRequest) {
+//        List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterCertUdi(filterUdiRelRequest);
+//        PageInfo<UdiRelevanceResponse> pageInfo;
+//        pageInfo = new PageInfo<>(udiRelevanceResponses);
+//        PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
+//        pageSimpleResponse.setTotal(pageInfo.getTotal());
+//        pageSimpleResponse.setList(udiRelevanceResponses);
+//        return ResultVOUtils.success(pageSimpleResponse);
+//    }
+
     @AuthRuleAnnotation("")
     @GetMapping("/udi/cert/filterUdi")
     public BaseResponse filterCertUdi(FilterUdiRelRequest filterUdiRelRequest) {
-        List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterCertUdi(filterUdiRelRequest);
+//        List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterCertUdi(filterUdiRelRequest);
-        PageInfo<UdiRelevanceResponse> pageInfo;
+//        PageInfo<UdiRelevanceResponse> pageInfo;
-        pageInfo = new PageInfo<>(udiRelevanceResponses);
+//        pageInfo = new PageInfo<>(udiRelevanceResponses);
-        PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
+//        PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
-        pageSimpleResponse.setTotal(pageInfo.getTotal());
+//        pageSimpleResponse.setTotal(pageInfo.getTotal());
-        pageSimpleResponse.setList(udiRelevanceResponses);
+//        pageSimpleResponse.setList(udiRelevanceResponses);
-        return ResultVOUtils.success(pageSimpleResponse);
+//        return ResultVOUtils.success(pageSimpleResponse);
+
+
+        List<BasicUdiProductEntity> udiDlDeviceResponse = basicUdiProductService.filterList(filterUdiRelRequest);
+        PageInfo<BasicUdiProductEntity> basicUdiRelResponsePageInfo = new PageInfo<>(udiDlDeviceResponse);
+        PageSimpleResponse<BasicUdiProductEntity> basicUdiRelResponsePageSimpleResponse = new PageSimpleResponse<>();
+        basicUdiRelResponsePageSimpleResponse.setTotal(basicUdiRelResponsePageInfo.getTotal());
+        basicUdiRelResponsePageSimpleResponse.setList(udiDlDeviceResponse);
+        return ResultVOUtils.success(basicUdiRelResponsePageSimpleResponse);
     }