顽症报告导出

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxPersistentManageServiceImpl.java

@@ -60,6 +60,9 @@ public class ZhcxPersistentManageServiceImpl extends ServiceImpl<ZhcxPersistentM
         String year = (String) yearObj;
         map.put("period","第"+period+"期");
         List<ZhcxPersistentManageDo> list = zhcxPersistentManageDao.listData(map);
+        if(list.size() == 0){
+            return 1;
+        }
         if(list.size() > 0){
             list.forEach(ev ->{
                 String sitepic = ev.getSitepic();
@@ -413,16 +416,16 @@ public class ZhcxPersistentManageServiceImpl extends ServiceImpl<ZhcxPersistentM
                             builder.insertImage(inputStream, 100, 80); // 设置图片宽度和高度
                         }
                     }
-                }else{
-                    range.replace("pic", "");
                 }
             }
             range.replace("index",String.valueOf(i));
-
+            range.replace("pic", "");
             range.replace("content",projectcode+projectename+content);
             range.replace("code", baseinfonum);
             if (amount != null) {
                 range.replace("amount", String.valueOf(amount));
+            }else{
+                range.replace("amount", "");
             }
             if("未整改".equals(rectifystatus)){
                 rectifystatus = "/";

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxPersistentController.java

@@ -28,6 +28,8 @@ public class ZhcxPersistentController {
         int i = zhcxPersistentManageService.wordExport(map,response);
         if(i == 0){
             throw new CustomException("导出失败");
+        }else if(i == 1){
+            throw new CustomException("当前周期暂无数据");
         }
     }