fix schedule job notify editor
Some checks failed
ci / build-test-parity (push) Has been cancelled

This commit is contained in:
2026-06-18 17:15:10 +08:00
parent 62188a557f
commit ccd74710fa
6 changed files with 149 additions and 38 deletions

View File

@@ -162,17 +162,64 @@ public class FormDefaultsController {
}
}
/**
* 取字段默认值所在的 view_page xml。templateId 有两种来路:
* <ol>
* <li>view_page id(A3 路径:按钮 pageid 直指 view_page)—— 直接命中。</li>
* <li><b>view_template id(type=7「表单模板」)</b>—— 转换器把「添加」dialog 的 defaults
* templateId 写成表单模板 id,而 initvalue 默认值字段住在它的 {@code <form pageid="...">}
* 指向的 view_page 里。此时 view_page 直查 miss,须穿这层间接:读表单模板 xml 取 pageid 再查。</li>
* </ol>
* 不穿这层间接就是「申请人/申请日期等默认值全空」的根因(端点拿表单模板 id 去 view_page 查恒 miss)。
*/
private String queryViewPageXml(String templateId) {
String xml = queryViewPageXmlById(templateId);
if (xml != null && !xml.isBlank()) {
return xml;
}
// 兜底:templateId 实为 view_template(表单模板)id → 取其 pageid 再查 view_page
String pageId = resolvePageIdFromTemplate(templateId);
if (pageId != null && !pageId.isBlank()) {
log.debug("[FormDefaults] templateId={} 非 view_page,按表单模板解析得 pageid={}", templateId, pageId);
return queryViewPageXmlById(pageId);
}
return null;
}
private String queryViewPageXmlById(String viewPageId) {
try {
List<Map<String, Object>> rows = jdbcTemplate.queryForList(
"SELECT xml::text AS xml FROM view_page WHERE view_page_id = ?", templateId);
"SELECT xml::text AS xml FROM view_page WHERE view_page_id = ?", viewPageId);
if (!rows.isEmpty()) {
Object xml = rows.get(0).get("xml");
return xml == null ? null : xml.toString();
}
} catch (Exception e) {
log.debug("[FormDefaults] 查 view_page xml 失败 templateId={}: {}", templateId, e.toString());
log.debug("[FormDefaults] 查 view_page xml 失败 viewPageId={}: {}", viewPageId, e.toString());
}
return null;
}
/**
* 表单模板 view_template(type=7) 的 xml 根 {@code <form entityid="..." pageid="...">} → 取 pageid。
* 非表单模板 / 无 pageid / 解析失败 → null(调用方据此放弃,端点返回空 data,与原行为一致)。
*/
private String resolvePageIdFromTemplate(String templateId) {
try {
List<Map<String, Object>> rows = jdbcTemplate.queryForList(
"SELECT xml::text AS xml FROM view_template WHERE view_template_id = ?", templateId);
if (rows.isEmpty()) {
return null;
}
Object xmlObj = rows.get(0).get("xml");
if (xmlObj == null || xmlObj.toString().isBlank()) {
return null;
}
Element root = DocumentHelper.parseText(xmlObj.toString().trim()).getRootElement();
return root.attributeValue("pageid");
} catch (Exception e) {
log.debug("[FormDefaults] 查 view_template pageid 失败 templateId={}: {}", templateId, e.toString());
return null;
}
}
}

View File

@@ -99,9 +99,10 @@ public class ScheduleJobNotifyController {
List<Map<String, Object>> options = new ArrayList<>();
options.add(option("行政维度", "administrative"));
if (tableExists("sys_dimension")) {
String orderBy = columnExists("sys_dimension", "seq") ? "SEQ, NAME" : "NAME";
List<Map<String, Object>> rows = jdbcTemplate.queryForList(
"SELECT SYS_DIMENSION_ID AS value, NAME AS label "
+ "FROM SYS_DIMENSION WHERE ISACTIVE = 1 ORDER BY SEQ, NAME");
+ "FROM SYS_DIMENSION WHERE ISACTIVE = 1 ORDER BY " + orderBy);
for (Map<String, Object> row : rows) {
Object value = first(row, "value", "VALUE", "sys_dimension_id", "SYS_DIMENSION_ID");
Object label = first(row, "label", "LABEL", "name", "NAME");
@@ -281,6 +282,16 @@ public class ScheduleJobNotifyController {
return Boolean.TRUE.equals(exists);
}
private boolean columnExists(String tableName, String columnName) {
Boolean exists = jdbcTemplate.queryForObject(
"SELECT EXISTS (SELECT 1 FROM information_schema.columns "
+ "WHERE table_schema = current_schema() "
+ "AND lower(table_name) = lower(?) "
+ "AND lower(column_name) = lower(?))",
Boolean.class, tableName, columnName);
return Boolean.TRUE.equals(exists);
}
private static Map<String, Object> defaultRow() {
Map<String, Object> row = new LinkedHashMap<>();
row.put("type", TYPE_USER);

View File

@@ -66,6 +66,30 @@ class ScheduleJobNotifyControllerTest {
assertThat(resp).containsEntry("status", 0);
}
@Test
@SuppressWarnings("unchecked")
void dimensions_维度表无seq列时按名称排序并返回选项() {
when(jdbcTemplate.queryForObject(eq("SELECT to_regclass(?) IS NOT NULL"),
eq(Boolean.class), eq("sys_dimension"))).thenReturn(true);
when(jdbcTemplate.queryForObject(eq("SELECT EXISTS (SELECT 1 FROM information_schema.columns "
+ "WHERE table_schema = current_schema() "
+ "AND lower(table_name) = lower(?) "
+ "AND lower(column_name) = lower(?))"),
eq(Boolean.class), eq("sys_dimension"), eq("seq"))).thenReturn(false);
when(jdbcTemplate.queryForList(eq("SELECT SYS_DIMENSION_ID AS value, NAME AS label "
+ "FROM SYS_DIMENSION WHERE ISACTIVE = 1 ORDER BY NAME")))
.thenReturn(List.of(Map.of("value", "D1", "label", "经营维度")));
Map<String, Object> resp = controller.dimensions();
assertThat(resp).containsEntry("status", 0);
Map<String, Object> data = (Map<String, Object>) resp.get("data");
List<Map<String, Object>> options = (List<Map<String, Object>>) data.get("options");
assertThat(options)
.extracting(v -> v.get("label"))
.containsExactly("行政维度", "经营维度");
}
private static Map<String, Object> option(String label, String value) {
Map<String, Object> item = new LinkedHashMap<>();
item.put("_label", label);