标样管理 标样材料需要看到历史的上传附件

cement-business/src/main/java/cn/wise/sc/cement/business/controller/StandardController.java

@@ -89,6 +89,17 @@ public class StandardController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
+	@ApiOperation(value = "查看历史标样材料信息")
+	@GetMapping("/getHistoryStandard/{id}")
+	public BaseResponse getHistoryStandard(@PathVariable Integer id){
+		try {
+			return standardService.getHistoryStandard(id);
+		}catch (Exception e){
+			log.debug("查看历史标样材料信息{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
 	@ApiOperation(value = "标样详情")
 	@GetMapping("/{id}")
 	public BaseResponse getById(@PathVariable Integer id){

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

 package cn.wise.sc.cement.business.service;
 
+import cn.wise.sc.cement.business.entity.EntityEnclosure;
 import cn.wise.sc.cement.business.entity.Standard;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
@@ -32,6 +33,8 @@ public interface IStandardService extends IService<Standard> {
 
 	BaseResponse<Standard> update(StandardQuery query);
 
+	BaseResponse<List<EntityEnclosure> > getHistoryStandard(Integer id);
+
 	BaseResponse<StandardVo> getDetail(Integer id);
 
 	BaseResponse<String> enter(ChangeStockQuery query);

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

@@ -269,8 +269,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                         }
                     }
                     if(teamNameList.contains("Al2O3")){
-                        if(!teamNameList.contains("Fe2o3")){
-                            return BaseResponse.errorMsg("选择Al2O3必须要选择Fe2o3");
+                        if(!teamNameList.contains("Fe2O3")){
+                            return BaseResponse.errorMsg("选择Al2O3必须要选择Fe2O3");
                         }
                     }
                 }

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

 package cn.wise.sc.cement.business.service.impl;
 
 import cn.wise.sc.cement.business.entity.*;
+import cn.wise.sc.cement.business.mapper.EntityEnclosureMapper;
 import cn.wise.sc.cement.business.mapper.StandardEnterMapper;
 import cn.wise.sc.cement.business.mapper.StandardMapper;
 import cn.wise.sc.cement.business.mapper.StandardOutMapper;
@@ -247,6 +248,23 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
         return BaseResponse.okData(standard);
     }
 
+    @Resource
+    private EntityEnclosureMapper entityEnclosureMapper;
+
+    /**
+     * 查看历史标样材料信息
+     * @param id
+     * @return
+     */
+    @Override
+    public BaseResponse<List<EntityEnclosure> > getHistoryStandard(Integer id) {
+        QueryWrapper<EntityEnclosure> wrapper = new QueryWrapper<>();
+        wrapper.eq("entity_type", EntityEnclosure.EntityType.STANDARD_SAMPLE);
+        wrapper.eq("entity_id", id);
+        List<EntityEnclosure> entityEnclosureList = entityEnclosureMapper.selectList(wrapper);
+        return BaseResponse.okData(entityEnclosureList);
+    }
+
     /**
      * 标样详情
      *