12.21 陈宇

RMS/src/main/java/cn/cslg/report/controller/ProductController.java

@@ -50,16 +50,19 @@ public class ProductController {
 
     @Operation(summary = "根据报告id查询产品数据信息")
     @GetMapping("/getProduct")
-    public JsonResult getProduct(Integer reportId) {
+    public String getProduct(Integer reportId) {
         log.info("开始处理【根据报告id查询产品数据信息】的请求，参数为：{}", reportId);
         if (reportId != null) {
             ProductStandardVO queryResult = productService.getProduct(reportId);
             if (queryResult == null) {
-                return JsonResult.fail(ServiceCode.ERROR_NOT_FOUND, "产品不存在");
+                //return JsonResult.fail(ServiceCode.ERROR_NOT_FOUND, "产品不存在");
+                return Response.error("报告id对应产品不存在");
             }
-            return JsonResult.ok(queryResult);
+            //return JsonResult.ok(queryResult);
+            return Response.success(queryResult);
         } else {
-            return JsonResult.fail(ServiceCode.ERROR_BAD_REQUEST, "报告id不能为空");
+            //return JsonResult.fail(ServiceCode.ERROR_BAD_REQUEST, "报告id不能为空");
+            return Response.error("报告id不能为空");
         }
 
     }

RMS/src/main/java/cn/cslg/report/mapper/AssoProductFileMapper.java

@@ -1,6 +1,6 @@
 package cn.cslg.report.mapper;
 
-import cn.cslg.report.pojo.entity.AssoProductFile;
+import cn.cslg.report.entity.AssoProductFile;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

RMS/src/main/java/cn/cslg/report/service/impl/AssoProductFileServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.cslg.report.service.impl;
 
+import cn.cslg.report.entity.AssoProductFile;
 import cn.cslg.report.mapper.AssoProductFileMapper;
-import cn.cslg.report.pojo.entity.AssoProductFile;
 import cn.cslg.report.service.IAssoProductFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,7 +25,6 @@ public class AssoProductFileServiceImpl implements IAssoProductFileService {
      *
      * @param productId 产品id
      * @param fileIds   文件ids
-     * @return 返回插入成功/失败信息
      */
     @Override
     public void addAsso(Integer productId, List<Integer> fileIds) {