质量管理第三方检查下的四个模块:增加上传附件的功能

src/main/java/com/chinaitop/depot/feign/FeignBusinessService.java

@@ -0,0 +1,15 @@
+package com.chinaitop.depot.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "depot-business")
+public interface FeignBusinessService {
+
+    //远程调用，更新上传的bid
+    @RequestMapping(value="/depot/business/file/updateFile", method=RequestMethod.POST)
+    void updateFile(@RequestParam(value = "fileIds") String fileIds, @RequestParam(value = "bid") Integer bid,@RequestParam(value = "fileType") String fileType);
+//String fileIds, Integer bid, String fileType
+}

src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.storage.controller;
 
 
+import com.chinaitop.depot.feign.FeignBusinessService;
 import com.chinaitop.depot.storage.model.*;
 import com.chinaitop.depot.storage.model.StorageQualitycheckExample.Criteria;
 import com.chinaitop.depot.storage.service.StorageQualitycheckService;
@@ -39,7 +40,9 @@ import java.util.Map;
 public class StorageQualitycheckController {
     @Resource
     private StorageQualitycheckService storageQualitycheckService;
-
+    //远程调用
+    @Resource
+    private FeignBusinessService businessFileService;
     @Resource
     private StorageQualitycheckSonService qualitycheckSonService;
 
@@ -165,10 +168,11 @@ public class StorageQualitycheckController {
     @ApiOperation(value="新增/修改数据", notes = "新增/修改数据")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "qualitycheckJson", value = "质量基础信息JSON数据对象", paramType = "form"),
+            @ApiImplicitParam(name="fileIds", value="文件数据", paramType="form"),
             @ApiImplicitParam(name = "qualityOneJson", value = "质量检测信息JSON数据对象", paramType = "form"),
             @ApiImplicitParam(name = "qualityJson", value = "质量检测信息JSON数据对象", paramType = "form")
     })
-    public Map<String, Object> save(String qualitycheckJson,String qualityOneJson,String qualityJson) {
+    public Map<String, Object> save(String qualitycheckJson,String qualityOneJson,String qualityJson, String fileIds) {
         Map<String, Object> modelMap = new HashMap<>();
         // JSON字符串转对象
         ObjectMapper mapper = new ObjectMapper();
@@ -197,6 +201,8 @@ public class StorageQualitycheckController {
                     storageQualitycheckService.saveOne(quality.get(i));
                 }
             }
+            // 修改fileIds对应附件的bid为当前质检的id.
+            businessFileService.updateFile(fileIds, qualitycheck.getId(),"qualitycheck");
             modelMap.put("status", "success");
         } catch (IOException e) {
             modelMap.put("status", "error");
@@ -407,7 +413,7 @@ public class StorageQualitycheckController {
      * @return getThirdCheckList
      */
     @RequestMapping(value="/getThirdCheckList",produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
-    @ApiOperation(value="查询获得第三方检查列表", notes = "查询获得第三方检查列表，支持分页")
+    @ApiOperation(value="查询获得质量检查列表", notes = "查询获得质量检查列表，支持分页")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),

src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitycheckMapper.xml

@@ -1840,7 +1840,6 @@
     WHERE
     sfs.foodbasicinfo_id =#{id}
     )
-    and sqk.type = '5'
     and sqk.house_id =#{houseId}
     and sqk.warehouse_id = #{warehouseId}