|
@@ -1741,12 +1741,14 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
|
|
|
}
|
|
|
|
|
|
//钢结构
|
|
|
- if("10".equals(itpDo.getInspectiontype())) {
|
|
|
+ if("10".equals(itpDo.getInspectiontype())
|
|
|
+ || ("80".equals(itpDo.getInspectiontype())) && "10".equals(itpDo.getOthertype())) {
|
|
|
itpNdtResultService.copyByItpId(itpDo.getId(), newItpIdList);
|
|
|
}
|
|
|
String[] array = {"10", "20", "30", "60"};
|
|
|
List<String> qcTypeList = Arrays.asList(array);
|
|
|
- if(qcTypeList.contains(itpDo.getInspectiontype())) {
|
|
|
+ if(qcTypeList.contains(itpDo.getInspectiontype())
|
|
|
+ || ("80".equals(itpDo.getInspectiontype())) && ObjectUtil.isEmpty(itpDo.getOthertype())) {
|
|
|
qcItemResultService.copyByItpId(itpDo.getId(), newItpIdList);
|
|
|
}
|
|
|
}
|