联教编辑报错

2026-09-20 15:24:07 +08:00
parent 5e3bee9c5f
commit f5a5c89ee3
6 changed files with 165 additions and 21 deletions
@@ -163,11 +163,70 @@ public class DownloadController {
    }

    /**
-     * 联教连训管理模板
+     * 联教联训导入模板（动态生成：宋体表头 + 测试样例）。
+     * 列序与 ExcelParseUtil.parseKSBZXMExcel 一致。
     */
    @GetMapping("/joint-training")
    public void downloadJointTraining(HttpServletResponse response) throws IOException {
-        downloadTemplate(response, "联教连训管理.xls");
+        org.apache.poi.ss.usermodel.Workbook workbook = new org.apache.poi.xssf.usermodel.XSSFWorkbook();
+        try {
+            org.apache.poi.ss.usermodel.Font headerFont = workbook.createFont();
+            headerFont.setFontName("宋体");
+            headerFont.setBold(true);
+            headerFont.setFontHeightInPoints((short) 11);
+            org.apache.poi.ss.usermodel.CellStyle headerStyle = workbook.createCellStyle();
+            headerStyle.setFont(headerFont);
+
+            org.apache.poi.ss.usermodel.Font dataFont = workbook.createFont();
+            dataFont.setFontName("宋体");
+            dataFont.setFontHeightInPoints((short) 11);
+            org.apache.poi.ss.usermodel.CellStyle dataStyle = workbook.createCellStyle();
+            dataStyle.setFont(dataFont);
+
+            String[] headers = {
+                    "序号", "补助项目名称", "性质", "依据", "开始日期", "结束日期",
+                    "项目说明", "项目备注", "教研室名称", "补助教员姓名", "补助课时量", "课时量备注"
+            };
+            org.apache.poi.ss.usermodel.Sheet sheet = workbook.createSheet("联教联训");
+            org.apache.poi.ss.usermodel.Row headerRow = sheet.createRow(0);
+            for (int i = 0; i < headers.length; i++) {
+                org.apache.poi.ss.usermodel.Cell cell = headerRow.createCell(i);
+                cell.setCellValue(headers[i]);
+                cell.setCellStyle(headerStyle);
+                sheet.setColumnWidth(i, 18 * 256);
+            }
+
+            String[][] samples = {
+                    {"1", "联教联训测试项目甲", "集中", "训练计划〔2026〕1号", "2026-03-01", "2026-03-10",
+                            "联合教学演练", "导入测试样例1", "战术教研室", "张三", "16", "含备课课时"},
+                    {"2", "联教联训测试项目乙", "分散", "训练计划〔2026〕2号", "2026-05-08", "2026-05-20",
+                            "跨校区联训", "导入测试样例2", "射击教研室", "李四", "24", ""},
+                    {"3", "联教联训测试项目丙", "集中", "训练计划〔2026〕3号", "2026-09-01", "2026-09-15",
+                            "联训考核", "导入测试样例3", "指挥教研室", "王五", "12", "按天数核算"}
+            };
+            for (int r = 0; r < samples.length; r++) {
+                org.apache.poi.ss.usermodel.Row row = sheet.createRow(r + 1);
+                for (int c = 0; c < samples[r].length; c++) {
+                    org.apache.poi.ss.usermodel.Cell cell = row.createCell(c);
+                    cell.setCellValue(samples[r][c]);
+                    cell.setCellStyle(dataStyle);
+                }
+            }
+
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            FileUtils.setAttachmentResponseHeader(response, "联教联训数据文件模板.xlsx");
+            workbook.write(response.getOutputStream());
+            response.getOutputStream().flush();
+        } catch (IOException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new ServiceException("生成联教联训导入模板失败：" + e.getMessage());
+        } finally {
+            try {
+                workbook.close();
+            } catch (IOException ignored) {
+            }
+        }
    }

    /**
@@ -0,0 +1,37 @@
+package com.roomroot.framework.config;
+
+import org.springframework.boot.jackson.autoconfigure.JsonMapperBuilderCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import tools.jackson.databind.ext.javatime.deser.LocalDateTimeDeserializer;
+import tools.jackson.databind.json.JsonMapper;
+import tools.jackson.databind.module.SimpleModule;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+
+/**
+ * 兼容前端常用的 {@code yyyy-MM-dd HH:mm:ss} 与 ISO {@code yyyy-MM-ddTHH:mm:ss}。
+ */
+@Configuration
+public class JacksonConfig {
+
+    @Bean
+    public JsonMapperBuilderCustomizer flexibleLocalDateTimeCustomizer() {
+        DateTimeFormatter formatter = new DateTimeFormatterBuilder()
+                .parseCaseInsensitive()
+                .append(DateTimeFormatter.ISO_LOCAL_DATE)
+                .optionalStart()
+                .optionalStart().appendLiteral('T').optionalEnd()
+                .optionalStart().appendLiteral(' ').optionalEnd()
+                .append(DateTimeFormatter.ISO_LOCAL_TIME)
+                .optionalEnd()
+                .toFormatter();
+        return (JsonMapper.Builder builder) -> {
+            SimpleModule module = new SimpleModule("FlexibleLocalDateTime");
+            module.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(formatter));
+            builder.addModule(module);
+        };
+    }
+}
@@ -577,6 +577,7 @@ public class LogServiceImpl implements LogService {
    @Override
    @Transactional
    public void addSubsidyProject(KSBZXM entity) {
+        fillSubsidyProjectDefaults(entity);
        entity.setCjsj(LocalDateTime.now());
        entity.setXgsj(LocalDateTime.now());
        ksbzxmMapper.insert(entity);
@@ -622,12 +623,7 @@ public class LogServiceImpl implements LogService {
        }
        LocalDateTime now = LocalDateTime.now();
        for (KSBZXM entity : list) {
-            if (entity.getBh() == null || entity.getBh().isEmpty()) {
-                entity.setBh(com.roomroot.jwgl.utils.UuidUtil.getUUID());
-            }
-            if (entity.getXmlx() == null || entity.getXmlx().isEmpty()) {
-                entity.setXmlx("联教联训");
-            }
+            fillSubsidyProjectDefaults(entity);
            entity.setCjsj(now);
            entity.setXgsj(now);
            ksbzxmMapper.insert(entity);
@@ -635,6 +631,46 @@ public class LogServiceImpl implements LogService {
        return list.size();
    }

+    /** 课时补助项目非空列兜底。达梦空串等同 NULL。 */
+    private void fillSubsidyProjectDefaults(KSBZXM entity) {
+        if (entity.getBh() == null || entity.getBh().trim().isEmpty()) {
+            entity.setBh(UuidUtil.getUUID());
+        }
+        if (entity.getMc() == null || entity.getMc().trim().isEmpty()) {
+            throw new ServiceException("名称不能为空");
+        }
+        if (entity.getXmlx() == null || entity.getXmlx().trim().isEmpty()) {
+            entity.setXmlx("联教联训");
+        }
+        if (entity.getXz() == null || entity.getXz().trim().isEmpty()) {
+            entity.setXz("-");
+        }
+        if (entity.getYj() == null || entity.getYj().trim().isEmpty()) {
+            entity.setYj("-");
+        }
+        if (entity.getKslx() == null || entity.getKslx().trim().isEmpty()) {
+            entity.setKslx("-");
+        }
+        if (entity.getSm() == null || entity.getSm().trim().isEmpty()) {
+            entity.setSm("-");
+        }
+        if (entity.getBz() == null || entity.getBz().trim().isEmpty()) {
+            entity.setBz("-");
+        }
+        if (entity.getTs() == null) {
+            entity.setTs(0f);
+        }
+        if (entity.getJbksl() == null) {
+            entity.setJbksl(0f);
+        }
+        if (entity.getTjzt() == null) {
+            entity.setTjzt(0);
+        }
+        if (entity.getSpzt() == null) {
+            entity.setSpzt(0);
+        }
+    }
+
    @Override
    public void exportSubsidyProject(jakarta.servlet.http.HttpServletResponse response) throws Exception {
        List<KSBZXM> list = ksbzxmMapper.selectList(