提交代码

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringCivilServiceImpl.java

@@ -291,20 +291,20 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                     zEngineeringCivilExportVos.setBHGspecifications(zEngineeringCivilExportVo.getSpecifications());
                     zEngineeringCivilExportVos.setBHGnumber(zEngineeringCivilExportVo.getNumber().toString());
                 }
-                if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getBHGmaterialQuality())) {
-                    zEngineeringCivilExportVos.setBHGmaterialQuality("");
+                if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getBJQmaterialQuality())) {
+                    zEngineeringCivilExportVos.setBJQmaterialQuality("");
                 }
-                if ("".equals(zEngineeringCivilExportVos.getBHGmaterialQuality()) && "报警器".equals(zEngineeringCivilExportVo.getType()))
-                    zEngineeringCivilExportVos.setBJQmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
+                if ("".equals(zEngineeringCivilExportVos.getBJQmaterialQuality()) && "报警器".equals(zEngineeringCivilExportVo.getType()))
+                    zEngineeringCivilExportVos.setBJQmaterialQuality(zEngineeringCivilExportVo.getBrand());
                 else if ("报警器".equals(zEngineeringCivilExportVo.getType()))
-                    zEngineeringCivilExportVos.setBJQmaterialQuality(zEngineeringCivilExportVos.getBJQmaterialQuality() + "/" + zEngineeringCivilExportVo.getMaterialQuality());
+                    zEngineeringCivilExportVos.setBJQmaterialQuality(zEngineeringCivilExportVos.getBJQmaterialQuality() + "/" + zEngineeringCivilExportVo.getBrand());
                 if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getQDFmaterialQuality())) {
                     zEngineeringCivilExportVos.setQDFmaterialQuality("");
                 }
                 if ("".equals(zEngineeringCivilExportVos.getQDFmaterialQuality())&&"切断阀".equals(zEngineeringCivilExportVo.getType()))
-                    zEngineeringCivilExportVos.setQDFmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
+                    zEngineeringCivilExportVos.setQDFmaterialQuality(zEngineeringCivilExportVo.getBrand());
                 else if ("切断阀".equals(zEngineeringCivilExportVo.getType()))
-                    zEngineeringCivilExportVos.setQDFmaterialQuality(zEngineeringCivilExportVos.getQDFmaterialQuality() + "/" + zEngineeringCivilExportVo.getMaterialQuality());
+                    zEngineeringCivilExportVos.setQDFmaterialQuality(zEngineeringCivilExportVos.getQDFmaterialQuality() + "/" + zEngineeringCivilExportVo.getBrand());
                 if ("阀管".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setVisitType(zEngineeringCivilExportVo.getVisitType());
                     zEngineeringCivilExportVos.setFGmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());