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

修改

parent a928eca7
...@@ -15,6 +15,6 @@ public class OpenDto { ...@@ -15,6 +15,6 @@ public class OpenDto {
private String accord; //符合性 private String accord; //符合性
private String valid; //有效性 private String valid; //有效性
private String result;//结果 private String result;//结果
private String detailId;//跳转id private String sequenceNbr;//跳转id
} }
...@@ -790,7 +790,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper ...@@ -790,7 +790,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
if (StageEnum.焊前人员.getStage().equals(verify.getStage())) { if (StageEnum.焊前人员.getStage().equals(verify.getStage())) {
Long welderId = object.getLong("welderId"); Long welderId = object.getLong("welderId");
if (welderId != null) { if (welderId != null) {
openDto.setDetailId(String.valueOf(welderId)); openDto.setSequenceNbr(String.valueOf(welderId));
//焊工的老照片 //焊工的老照片
Map map = orgService.getdetialInfo(welderId.toString( )); Map map = orgService.getdetialInfo(welderId.toString( ));
if (!ValidationUtil.isEmpty(map)) { if (!ValidationUtil.isEmpty(map)) {
...@@ -815,7 +815,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper ...@@ -815,7 +815,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
if (StageEnum.焊前设备.getStage().equals(verify.getStage())) { if (StageEnum.焊前设备.getStage().equals(verify.getStage())) {
Long weldingId = object.getLong("weldingId"); Long weldingId = object.getLong("weldingId");
if (weldingId != null) { if (weldingId != null) {
openDto.setDetailId(String.valueOf(weldingId)); openDto.setSequenceNbr(String.valueOf(weldingId));
String image = this.getImage(weldingId); String image = this.getImage(weldingId);
if (!ValidationUtil.isEmpty(image)) { if (!ValidationUtil.isEmpty(image)) {
openDto.setOldPhoto(image); openDto.setOldPhoto(image);
...@@ -828,7 +828,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper ...@@ -828,7 +828,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
Material material = materialService.getMaterial(materialCode); Material material = materialService.getMaterial(materialCode);
if (!ValidationUtil.isEmpty(material)) { if (!ValidationUtil.isEmpty(material)) {
Long sequenceNbr1 = material.getSequenceNbr( );//管材id Long sequenceNbr1 = material.getSequenceNbr( );//管材id
openDto.setDetailId(String.valueOf(sequenceNbr1)); openDto.setSequenceNbr(String.valueOf(sequenceNbr1));
if (!ValidationUtil.isEmpty(sequenceNbr1)) { if (!ValidationUtil.isEmpty(sequenceNbr1)) {
String image = this.getImage(sequenceNbr1); String image = this.getImage(sequenceNbr1);
if (!ValidationUtil.isEmpty(image)) { 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