委托列表增加委托报告下载功能

cement-business/src/main/java/cn/wise/sc/cement/business/entity/EntityEnclosure.java

@@ -64,6 +64,7 @@ public class EntityEnclosure implements Serializable {
 		int HEAD = 0;
 		int EQUIPMENT_TEST = 3;
 		int STANDARD_SAMPLE = 4;
+		int ENTRUST_REPORT = 5;
 
 	}
 

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/EntrustVo.java

@@ -126,4 +126,17 @@ public class EntrustVo {
 	@ApiModelProperty("评审意见")
 	private String opinion;
 
+	@ApiModelProperty("文件名")
+	private String alias;
+
+	@ApiModelProperty("扩展名")
+	private String extName;
+
+	@ApiModelProperty("路径")
+	private String enclosureUrl;
+
+
+
+
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java

@@ -119,8 +119,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
     private INormProductionService iNormProductionService;
     @Autowired
     private IPrecipriceService iPrecipriceService;
-
-
+    @Resource
+    private EntityEnclosureMapper entityEnclosureMapper;
     /**
      * 委托分页
      *
@@ -186,6 +186,19 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                     entrustVo.setCheckTeam(checkTeam);
                     entrustVo.setCheckMethodNumber(sampleTmp.getMethodNumbers());
                 }
+
+                //查询报告,如果有上传的委托报告，用户可已进行下载
+                QueryWrapper<EntityEnclosure> wrapper = new QueryWrapper<>();
+                wrapper.eq("entity_type", EntityEnclosure.EntityType.ENTRUST_REPORT);
+                wrapper.eq("entity_id", entrustVo.getId());
+                wrapper.eq("is_deleted", 1);
+                List<EntityEnclosure> entityEnclosureList = entityEnclosureMapper.selectList(wrapper);
+                if(entityEnclosureList != null && entityEnclosureList.size()>0 ){
+                    EntityEnclosure entityEnclosure = entityEnclosureList.get(0);
+                    entrustVo.setAlias(entityEnclosure.getAlias());
+                    entrustVo.setEnclosureUrl(entityEnclosure.getEnclosureUrl());
+                    entrustVo.setExtName(entityEnclosure.getExtName());
+                }
             }
         }
         pages.setRecords(list);