Commit 2cb80504 authored by 竹天卫's avatar 竹天卫

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

parent fc0eef77
...@@ -89,6 +89,17 @@ public class StandardController { ...@@ -89,6 +89,17 @@ public class StandardController {
return BaseResponse.errorMsg("失败!"); 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 = "标样详情") @ApiOperation(value = "标样详情")
@GetMapping("/{id}") @GetMapping("/{id}")
public BaseResponse getById(@PathVariable Integer id){ public BaseResponse getById(@PathVariable Integer id){
......
package cn.wise.sc.cement.business.service; 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.entity.Standard;
import cn.wise.sc.cement.business.model.BaseResponse; import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery; import cn.wise.sc.cement.business.model.PageQuery;
...@@ -32,6 +33,8 @@ public interface IStandardService extends IService<Standard> { ...@@ -32,6 +33,8 @@ public interface IStandardService extends IService<Standard> {
BaseResponse<Standard> update(StandardQuery query); BaseResponse<Standard> update(StandardQuery query);
BaseResponse<List<EntityEnclosure> > getHistoryStandard(Integer id);
BaseResponse<StandardVo> getDetail(Integer id); BaseResponse<StandardVo> getDetail(Integer id);
BaseResponse<String> enter(ChangeStockQuery query); BaseResponse<String> enter(ChangeStockQuery query);
......
...@@ -269,8 +269,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -269,8 +269,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
} }
} }
if(teamNameList.contains("Al2O3")){ if(teamNameList.contains("Al2O3")){
if(!teamNameList.contains("Fe2o3")){ if(!teamNameList.contains("Fe2O3")){
return BaseResponse.errorMsg("选择Al2O3必须要选择Fe2o3"); return BaseResponse.errorMsg("选择Al2O3必须要选择Fe2O3");
} }
} }
} }
......
package cn.wise.sc.cement.business.service.impl; package cn.wise.sc.cement.business.service.impl;
import cn.wise.sc.cement.business.entity.*; 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.StandardEnterMapper;
import cn.wise.sc.cement.business.mapper.StandardMapper; import cn.wise.sc.cement.business.mapper.StandardMapper;
import cn.wise.sc.cement.business.mapper.StandardOutMapper; import cn.wise.sc.cement.business.mapper.StandardOutMapper;
...@@ -247,6 +248,23 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i ...@@ -247,6 +248,23 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
return BaseResponse.okData(standard); 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);
}
/** /**
* 标样详情 * 标样详情
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment