Commit 25087161 authored by 曹盼盼's avatar 曹盼盼

修改弹窗

parent 08d3fbd3
......@@ -15,6 +15,6 @@ public class OpenDto {
private String accord; //符合性
private String valid; //有效性
private String result;//结果
private String detailId;//跳转id 或者管材编码
private String detailId;//跳转id
}
......@@ -118,8 +118,6 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
* stage 阶段
* page 分页
*/
public Page<SmartListDto> commonality(String stage, Page<SmartListDto> page, SmartListDto smartListDto){
Page<Verify> objectPage = new Page<>( );
objectPage.setCurrent(page.getCurrent());
......@@ -818,13 +816,12 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
}
}
if (StageEnum.焊前管材质量.getStage().equals(verify.getStage())) {
// 改为管材编号materialId
String materialCode = object.getString("materialId");
String materialCode = object.getString("materialId");//管材编号
if (!ValidationUtil.isEmpty(materialCode)) {
openDto.setDetailId(materialCode);//管材的编号
Material material = materialService.getMaterial(materialCode);
if (!ValidationUtil.isEmpty(material)) {
Long sequenceNbr1 = material.getSequenceNbr( );//管材id
openDto.setDetailId(String.valueOf(sequenceNbr1));
if (!ValidationUtil.isEmpty(sequenceNbr1)) {
String image = this.getImage(sequenceNbr1);
if (!ValidationUtil.isEmpty(image)) {
......
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