haogh 8 ヶ月 前
コミット
744837932a

+ 3 - 3
sop-business/src/main/java/com/qmth/sop/business/service/impl/ServiceUnitAnalyseServiceImpl.java

@@ -227,12 +227,12 @@ public class ServiceUnitAnalyseServiceImpl extends ServiceImpl<ServiceUnitAnalys
         List<SopWarnExportResult> warnExportResultList = new ArrayList<>();
         for (ProjectMonitorResult result : resultList) {
             SopInfoExportResult exportResult = getSopInfoExportResult(result);
-            if (type == null) {// 预警导出
+            if (StringUtils.isEmpty(type)) {// 其他导出
                 SopProcessExportResult sopProcessExportResult = new SopProcessExportResult();
                 sopProcessExportResult.setProcess(Objects.requireNonNull(CrmProcessEnum.findCrmProcessByDesc(result.getTaskName())).getTitle());
                 BeanUtils.copyProperties(exportResult, sopProcessExportResult);
                 exportResultList.add(sopProcessExportResult);
-            } else {// 其他导出
+            } else {// 预警导出
                 SopWarnExportResult sopWarnExportResult = new SopWarnExportResult();
                 sopWarnExportResult.setFieldObj(Objects.requireNonNull(WarnFieldEnum.findWarnFieldEnumByTitle(result.getFieldObj())).getDesc());
                 BeanUtils.copyProperties(exportResult, sopWarnExportResult);
@@ -243,7 +243,7 @@ public class ServiceUnitAnalyseServiceImpl extends ServiceImpl<ServiceUnitAnalys
         File fileTemp = null;
         try {
             fileTemp = SystemConstant.getFileTempVar(SystemConstant.XLSX_PREFIX);
-            if (type == null) {
+            if (StringUtils.isEmpty(type)) {
                 EasyExcel.write(fileTemp, SopProcessExportResult.class).sheet("sop信息").doWrite(exportResultList);
             } else {
                 EasyExcel.write(fileTemp, SopWarnExportResult.class).sheet("sop信息").doWrite(warnExportResultList);