提案导出修复：1.导出全部提案里的文件没有建议落实的部门；2.导出上会提案表汇总表无无法加载和操作；

src/main/java/io/v/nutz/proposal/controller/export/proposalExportNotCaseController.java

@@ -13,6 +13,7 @@ import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.config.Configure;
 import com.deepoove.poi.policy.HackLoopTableRenderPolicy;
 import io.v.nutz.annontation.ViReturn;
+import io.v.nutz.base.utils.Html2Text;
 import io.v.nutz.base.utils.Vi;
 import io.v.nutz.jdh.model.cb.Jdh_jdhxx;
 import io.v.nutz.modules.models.PageForm;
@@ -350,9 +351,16 @@ public class proposalExportNotCaseController {
 
             for (NutMap info : infos) {
                 String implementUnitId = info.getString("implementUnitId");
-                List<String> implementUnitIds = Json.fromJsonAsList(String.class, implementUnitId);
-                String implementUnitName = proposalUndertakeList.stream().filter(u -> implementUnitIds.contains(u.getId())).map(u -> u.getUnitName()).collect(Collectors.joining("、"));
+                String implementUnitName = "";
+                if (StrUtil.isNotBlank(implementUnitId)) {
+                    List<String> implementUnitIds = Json.fromJsonAsList(String.class, implementUnitId);
+                    if (implementUnitIds != null) {
+                        implementUnitName = proposalUndertakeList.stream().filter(u -> implementUnitIds.contains(u.getId())).map(u -> u.getUnitName()).collect(Collectors.joining("、"));
+                    }
+                }
                 info.put("implementUnitName", implementUnitName);
+                info.put("brief", Html2Text.toPlainText(info.getString("brief")));
+                info.put("measures", Html2Text.toPlainText(info.getString("measures")));
                 Sql secondedSql = Sqls.create("""
                         SELECT
                         	u.username s_username,
@@ -371,12 +379,9 @@ public class proposalExportNotCaseController {
                 info.put("schoolName", Globals.MyConfig.getString("GxName"));
 
                 HackLoopTableRenderPolicy hackLoopTableRenderPolicy = new HackLoopTableRenderPolicy();
-                HtmlRenderPolicy htmlRenderPolicy = new HtmlRenderPolicy();
 
                 Configure config = Configure.newBuilder()
                         .bind("secondedList", hackLoopTableRenderPolicy)
-                        .bind("brief", htmlRenderPolicy)
-                        .bind("measures", htmlRenderPolicy)
                         .build();
 
 

src/main/java/io/v/nutz/proposal/services/impl/ProposalInfoServiceImpl.java

@@ -30,6 +30,7 @@ import org.nutz.dao.util.cri.SqlExpressionGroup;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.json.Json;
 import org.nutz.lang.Strings;
 import org.nutz.lang.util.NutMap;
 
@@ -229,6 +230,16 @@ public class ProposalInfoServiceImpl extends ViServiceImpl<ProposalInfo> impleme
 
             NutMap nutMap = proposalInfoService.fetch(sql);
 
+            String implementUnitId = nutMap.getString("implementUnitId");
+            String implementUnitName = "";
+            if (StrUtil.isNotBlank(implementUnitId)) {
+                List<String> implementUnitIds = Json.fromJsonAsList(String.class, implementUnitId);
+                if (implementUnitIds != null && !implementUnitIds.isEmpty()) {
+                    List<ProposalUndertake> implementUnitList = proposalInfoService.dao().query(ProposalUndertake.class, Cnd.where("id", "in", implementUnitIds));
+                    implementUnitName = implementUnitList.stream().map(ProposalUndertake::getUnitName).collect(Collectors.joining("、"));
+                }
+            }
+            nutMap.setv("implementUnitName", implementUnitName);
 
 //            nutMap.setv("brief", Html2Text.toPlainText(nutMap.getString("brief")));
             nutMap.setv("measures", HtmlUtil.cleanHtmlTag(nutMap.getString("measures")));

src/main/resources/views/platform/proposal/export/notCase.html

@@ -260,7 +260,9 @@ layout("/layouts/platform.html"){
                         window.URL.revokeObjectURL(url)
                         loading.close();
                     }).catch((err) => {
-                })
+                        loading.close();
+                        this.$message.error('导出失败，请稍后重试');
+                    })
             },
             oneProposalExport(id) {
                 window.location.href = "/platform/proposal/statistics/summary/oneProposalExport?isAll=0&proposalId=" + id
@@ -354,4 +356,4 @@ layout("/layouts/platform.html"){
 </script>
 <!--#
 }
-#-->
+#-->