소스 검색

核心检验指标模板excel导入细节优化

wangxuan 3 달 전
부모
커밋
17ac14e117
1개의 변경된 파일9개의 추가작업 그리고 7개의 파일을 삭제
  1. 9 7
      business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxItpTemplateNodesServiceImpl.java

+ 9 - 7
business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxItpTemplateNodesServiceImpl.java

@@ -624,13 +624,15 @@ public class ZhcxItpTemplateNodesServiceImpl extends ServiceImpl<ZhcxItpTemplate
                 templateDo.setProduct_type(indicatorsBOS.get(0).getProduct_type());
                 result1.add(templateDo);
                 for (ImportInspectionIndicatorsBO indicatorsBO : indicatorsBOS) {
-                    // 子表1
-                    ZhcxCheckBeforeQualifiedDo qualifiedDo = new ZhcxCheckBeforeQualifiedDo();
-                    qualifiedDo.setId(SecurityUtil.getUUID());
-                    qualifiedDo.setDeleted("0");
-                    qualifiedDo.setPid(templateDo.getId());
-                    qualifiedDo.setAll_qualified(indicatorsBO.getAll_qualified());
-                    result2.add(qualifiedDo);
+                    // 子表1 +空判断
+                    if(StringUtils.isNotBlank(indicatorsBO.getAll_qualified())) {
+                        ZhcxCheckBeforeQualifiedDo qualifiedDo = new ZhcxCheckBeforeQualifiedDo();
+                        qualifiedDo.setId(SecurityUtil.getUUID());
+                        qualifiedDo.setDeleted("0");
+                        qualifiedDo.setPid(templateDo.getId());
+                        qualifiedDo.setAll_qualified(indicatorsBO.getAll_qualified());
+                        result2.add(qualifiedDo);
+                    }
                     // 子表2
                     ZhcxCoreInspectionDetailDo detailDo = new ZhcxCoreInspectionDetailDo();
                     detailDo.setId(SecurityUtil.getUUID());