增加判空

db/update.sql

@@ -23,8 +23,8 @@ ALTER TABLE huzhou_sub_projectinfo
 
 
 # 2025-03-16 新增菜单
-INSERT INTO `guoyan_huzhou`.`sys_permission`(`id`, `parent_id`, `type`, `title`, `name`, `code`, `icon`, `path`, `component`, `external`, `order_no`, `display`, `open_mode`, `status`, `remarks`, `version`, `create_user`, `create_date`, `edit_user`, `edit_date`) VALUES ('1899280234855800833', '1803680740161212418', 'menu', '机制建设', NULL, NULL, 'ant-design:book-filled', '/informationSub/mechanism/index', '/informationSub/mechanism/index', '0', 3, '1', '1', '1', NULL, 0, '1', '2025-03-11 10:04:29', '1', '2025-03-11 10:04:29');
-INSERT INTO `guoyan_huzhou`.`sys_permission`(`id`, `parent_id`, `type`, `title`, `name`, `code`, `icon`, `path`, `component`, `external`, `order_no`, `display`, `open_mode`, `status`, `remarks`, `version`, `create_user`, `create_date`, `edit_user`, `edit_date`) VALUES ('1899280498354561025', '1803680740161212418', 'menu', '标志性成果', NULL, NULL, 'ant-design:book-filled', '/informationSub/iconic/index', '/informationSub/iconic/index', '0', 4, '1', '1', '1', NULL, 0, '1', '2025-03-11 10:05:32', '1', '2025-03-11 10:05:32');
+INSERT INTO `sys_permission`(`id`, `parent_id`, `type`, `title`, `name`, `code`, `icon`, `path`, `component`, `external`, `order_no`, `display`, `open_mode`, `status`, `remarks`, `version`, `create_user`, `create_date`, `edit_user`, `edit_date`) VALUES ('1899280234855800833', '1803680740161212418', 'menu', '机制建设', NULL, NULL, 'ant-design:book-filled', '/informationSub/mechanism/index', '/informationSub/mechanism/index', '0', 3, '1', '1', '1', NULL, 0, '1', '2025-03-11 10:04:29', '1', '2025-03-11 10:04:29');
+INSERT INTO `sys_permission`(`id`, `parent_id`, `type`, `title`, `name`, `code`, `icon`, `path`, `component`, `external`, `order_no`, `display`, `open_mode`, `status`, `remarks`, `version`, `create_user`, `create_date`, `edit_user`, `edit_date`) VALUES ('1899280498354561025', '1803680740161212418', 'menu', '标志性成果', NULL, NULL, 'ant-design:book-filled', '/informationSub/iconic/index', '/informationSub/iconic/index', '0', 4, '1', '1', '1', NULL, 0, '1', '2025-03-11 10:05:32', '1', '2025-03-11 10:05:32');
 INSERT INTO `sys_permission`(`id`, `parent_id`, `type`, `title`, `name`, `code`, `icon`, `path`, `component`, `external`, `order_no`, `display`, `open_mode`, `status`, `remarks`, `version`, `create_user`, `create_date`, `edit_user`, `edit_date`) VALUES ('1901553744693288961', '1797801685624832001', 'menu', '项目节点未完成数', NULL, NULL, 'ant-design:bars-outlined', '/projectBoard/unfinishNode/index', '/projectBoard/unfinishNode/index', '0', 19, '1', '1', '1', NULL, 0, '1', '2025-03-17 16:38:36', '1', '2025-03-17 16:38:36');
 
 # 创建信息材料表

huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/projectResultExportDTO.java

@@ -0,0 +1,25 @@
+package com.easy.admin.modules.huzhou.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.HeadStyle;
+import lombok.Data;
+
+/**
+ * 用于 项目成果显著性 导出
+ */
+@HeadStyle(fillForegroundColor = 44)
+@Data
+public class projectResultExportDTO {
+    @ExcelProperty("配套工作制度")
+    private int count1;
+    @ExcelProperty("宣传报道")
+    private int count2;
+    @ExcelProperty("荣誉奖项")
+    private int count3;
+    @ExcelProperty("专利、软件著作")
+    private int count4;
+    @ExcelProperty("试点工作")
+    private int count5;
+    @ExcelProperty("课题研究")
+    private int count6;
+}

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java

@@ -2751,8 +2751,9 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
 
         // 按照责任工作地点排序
         projectInfoList = projectInfoList.stream()
-                .sorted(Comparator.comparing(HuzhouProjectinfo::getReformName)
-                        .thenComparing(HuzhouProjectinfo::getCurrentStage))
+                .filter(Objects::nonNull) // 确保stream中的元素非null
+                .sorted(Comparator.comparing((HuzhouProjectinfo p) -> Optional.ofNullable(p.getReformName()).orElse(""))
+                        .thenComparing(p -> Optional.ofNullable(p.getCurrentStage()).orElse("")))
                 .collect(Collectors.toList());
 
         // 记录结束时间并计算耗时