Merge: 办公用品采购报表修复(打印空白/审批意见/公司名占位) + dev 合库
Some checks failed
ci / build-test-parity (push) Has been cancelled
Some checks failed
ci / build-test-parity (push) Has been cancelled
- 套打打印按选中行主键直接渲染(修195页单据打印空白) - approve 默认记「同意」审批意见(供报表审批段显示) - 注入配置公司名覆盖模板占位「XXXXXX公司」 - dev 数据源合并为单库 eip4(业务+流程同库,对齐生产单库拓扑;env 可覆盖) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -16,15 +16,15 @@ flowable:
|
|||||||
datasource:
|
datasource:
|
||||||
# Hikari 原生属性名 jdbc-url(@ConfigurationProperties 绑到已 build 的 HikariDataSource,
|
# Hikari 原生属性名 jdbc-url(@ConfigurationProperties 绑到已 build 的 HikariDataSource,
|
||||||
# 须用 jdbc-url 而非 url,否则报 "jdbcUrl is required with driverClassName")
|
# 须用 jdbc-url 而非 url,否则报 "jdbcUrl is required with driverClassName")
|
||||||
jdbc-url: ${FLOWABLE_JDBC_URL:jdbc:postgresql://localhost:5433/eip4flow?currentSchema=eip3}
|
jdbc-url: ${FLOWABLE_JDBC_URL:jdbc:postgresql://localhost:5433/eip4?currentSchema=eip3}
|
||||||
username: ${FLOWABLE_JDBC_USER:zhengwr}
|
username: ${FLOWABLE_JDBC_USER:zhengwr}
|
||||||
password: ${FLOWABLE_JDBC_PASS:}
|
password: ${FLOWABLE_JDBC_PASS:}
|
||||||
driver-class-name: org.postgresql.Driver
|
driver-class-name: org.postgresql.Driver
|
||||||
|
|
||||||
biz:
|
biz:
|
||||||
datasource:
|
datasource:
|
||||||
# F2-13: 本地验证用本地 eip4dev(5435 不可达,人名解析正降级)
|
# F2-13: 本地验证用合并库 eip4(业务+流程同库;原 eip4dev 已并入)。5435 不可达,人名解析正降级。
|
||||||
jdbc-url: ${BIZ_JDBC_URL:jdbc:postgresql://localhost:5433/eip4dev?currentSchema=eip3}
|
jdbc-url: ${BIZ_JDBC_URL:jdbc:postgresql://localhost:5433/eip4?currentSchema=eip3}
|
||||||
username: ${BIZ_JDBC_USER:zhengwr}
|
username: ${BIZ_JDBC_USER:zhengwr}
|
||||||
password: ${BIZ_JDBC_PASS:}
|
password: ${BIZ_JDBC_PASS:}
|
||||||
driver-class-name: org.postgresql.Driver
|
driver-class-name: org.postgresql.Driver
|
||||||
|
|||||||
@@ -16,7 +16,9 @@ server:
|
|||||||
|
|
||||||
spring:
|
spring:
|
||||||
datasource:
|
datasource:
|
||||||
url: jdbc:postgresql://localhost:5433/eip4dev?currentSchema=eip3
|
# 合并库 eip4:业务表 + flowable(act_*) 同库(对齐生产单库拓扑),跨库报表(审批意见等)可直接 join。
|
||||||
|
# 原分库 eip4dev(业务)/eip4flow(流程)保留作回滚。覆盖:SPRING_DATASOURCE_URL。
|
||||||
|
url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5433/eip4?currentSchema=eip3}
|
||||||
username: zhengwr
|
username: zhengwr
|
||||||
password:
|
password:
|
||||||
hikari:
|
hikari:
|
||||||
|
|||||||
@@ -806,16 +806,28 @@ public class TemplateToAmisConverter {
|
|||||||
String navTitle = UiTypeMapper.firstNonBlank(b.attributeValue("funcname"), btnName);
|
String navTitle = UiTypeMapper.firstNonBlank(b.attributeValue("funcname"), btnName);
|
||||||
String pkCol = table + "_ID";
|
String pkCol = table + "_ID";
|
||||||
boolean needSelected = !"false".equals(b.attributeValue("isneedselected"));
|
boolean needSelected = !"false".equals(b.attributeValue("isneedselected"));
|
||||||
|
boolean reportNoSearch = "true".equals(b.attributeValue("reportnosearch"));
|
||||||
btn.put("actionType", "dialog");
|
btn.put("actionType", "dialog");
|
||||||
if (needSelected) {
|
if (needSelected) {
|
||||||
btn.put("disabledOn", DISABLED_ON_NO_SELECTION);
|
btn.put("disabledOn", DISABLED_ON_NO_SELECTION);
|
||||||
}
|
}
|
||||||
|
// 单据套打打印(reportnosearch + funcid→type=200 报表):老系统语义=对选中行直接出图、无查询表单。
|
||||||
|
// → 直接 iframe 渲染 /api/report/render,按目标报表 <search> 参数名注入选中行同名列。
|
||||||
|
// (原通用导航嵌报表查看器会把报表唯一的主键选择字段被 F3-1 剔除,选中行主键到不了 render → 空白单据。)
|
||||||
|
List<String> reportParams = reportNoSearch ? loadReportSearchParams(funcId) : List.of();
|
||||||
|
if (!reportParams.isEmpty()) {
|
||||||
|
btn.put("dialog", buildReportPrintDialog(navTitle, funcId, reportParams));
|
||||||
|
result.note("button[navigation] " + btnName + " → 套打直接渲染 /api/report/render/"
|
||||||
|
+ funcId + "(reportnosearch,参数 " + String.join(",", reportParams)
|
||||||
|
+ "=选中行同名列;funcname=" + navTitle + ")");
|
||||||
|
} else {
|
||||||
Map<String, Object> dlg = buildNavigationDialog(navTitle, funcId, pkCol, needSelected, result);
|
Map<String, Object> dlg = buildNavigationDialog(navTitle, funcId, pkCol, needSelected, result);
|
||||||
btn.put("dialog", dlg);
|
btn.put("dialog", dlg);
|
||||||
result.note("button[navigation] " + btnName + " → dialog service schemaApi=/api/page/schema/"
|
result.note("button[navigation] " + btnName + " → dialog service schemaApi=/api/page/schema/"
|
||||||
+ funcId + "(funcname=" + navTitle + ",注入默认查询 " + pkCol + "=选中行主键"
|
+ funcId + "(funcname=" + navTitle + ",注入默认查询 " + pkCol + "=选中行主键"
|
||||||
+ (needSelected ? ",需选中" : "") + ")");
|
+ (needSelected ? ",需选中" : "") + ")");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
default -> result.note("button[" + btnType + "] " + btnName + " → 普通按钮占位");
|
default -> result.note("button[" + btnType + "] " + btnName + " → 普通按钮占位");
|
||||||
}
|
}
|
||||||
toolbar.add(btn);
|
toolbar.add(btn);
|
||||||
@@ -921,6 +933,77 @@ public class TemplateToAmisConverter {
|
|||||||
return dlg;
|
return dlg;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 单据套打打印:navigation {@code reportnosearch=true} 按钮的目标 funcid 若指向 type=200 报表,
|
||||||
|
* 返回该报表 {@code <search>} 的参数名列表(调用方按选中行同名列回填 {@code ${selectedItems[0].P}})。
|
||||||
|
* 非报表 / 无 search 参 / 无库 / 查询异常 → 空表(调用方回退普通导航弹窗),保持零回归。
|
||||||
|
*/
|
||||||
|
private List<String> loadReportSearchParams(String funcId) {
|
||||||
|
if (funcId == null || funcId.isBlank() || jdbcTemplate == null) {
|
||||||
|
return List.of();
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
List<String> xmls = jdbcTemplate.query(
|
||||||
|
"SELECT xml::text FROM view_template WHERE trim(view_template_id) = ? AND type = 200",
|
||||||
|
(rs, n) -> rs.getString(1), funcId.trim());
|
||||||
|
if (xmls.isEmpty() || xmls.get(0) == null || xmls.get(0).isBlank()) {
|
||||||
|
return List.of();
|
||||||
|
}
|
||||||
|
Element search = DocumentHelper.parseText(xmls.get(0)).getRootElement().element("search");
|
||||||
|
if (search == null) {
|
||||||
|
return List.of();
|
||||||
|
}
|
||||||
|
List<String> params = new ArrayList<>();
|
||||||
|
for (Element f : search.elements("field")) {
|
||||||
|
String n = f.attributeValue("name", "");
|
||||||
|
if (n != null && !n.isBlank() && !params.contains(n.trim())) {
|
||||||
|
params.add(n.trim());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return params;
|
||||||
|
} catch (Exception e) {
|
||||||
|
return List.of();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 单据套打打印弹窗(navigation reportnosearch + funcid→type=200 报表):直接 iframe 渲染目标报表,
|
||||||
|
* 把选中行同名列按报表 {@code <search>} 参数名注入 dialog data({@code ${selectedItems[0].P}},按钮作用域求值),
|
||||||
|
* iframe / 导出 URL 内引用 {@code ${P}};无查询表单(reportnosearch 语义)。+ 导出 PDF/Excel + 关闭。
|
||||||
|
*
|
||||||
|
* <p>参数名为元数据字段名(IDENT,无 URL 特殊字符),裸拼安全;{@code ${P}} 须保持字面量供 amis 运行时插值。
|
||||||
|
* 服务端 {@code ReportParamGuard} 仅放行报表 {@code <search>} 引用的参数并做白名单校验,越权/注入再过一道。
|
||||||
|
*/
|
||||||
|
private Map<String, Object> buildReportPrintDialog(String title, String funcId, List<String> params) {
|
||||||
|
String tid = funcId.trim();
|
||||||
|
Map<String, Object> dlg = new LinkedHashMap<>();
|
||||||
|
dlg.put("type", "dialog");
|
||||||
|
dlg.put("title", title);
|
||||||
|
dlg.put("size", "lg");
|
||||||
|
|
||||||
|
Map<String, Object> data = new LinkedHashMap<>();
|
||||||
|
StringBuilder qp = new StringBuilder();
|
||||||
|
for (String p : params) {
|
||||||
|
data.put(p, selectedSingleIdExpr(p)); // ${selectedItems[0].P}
|
||||||
|
qp.append('&').append(p).append("=${").append(p).append('}');
|
||||||
|
}
|
||||||
|
dlg.put("data", data);
|
||||||
|
|
||||||
|
String renderBase = "/api/report/render/" + tid + "?format=";
|
||||||
|
Map<String, Object> html = new LinkedHashMap<>();
|
||||||
|
html.put("type", "html");
|
||||||
|
html.put("html", "<iframe src=\"" + renderBase + "html" + qp
|
||||||
|
+ "\" style=\"width:100%;min-height:680px;border:0;\" frameborder=\"0\"></iframe>");
|
||||||
|
dlg.put("body", html);
|
||||||
|
|
||||||
|
List<Map<String, Object>> actions = new ArrayList<>();
|
||||||
|
actions.add(reportExportButton("导出PDF", renderBase + "pdf" + qp));
|
||||||
|
actions.add(reportExportButton("导出Excel", renderBase + "xls" + qp));
|
||||||
|
actions.add(new LinkedHashMap<>(Map.of("type", "button", "actionType", "close", "label", "关闭")));
|
||||||
|
dlg.put("actions", actions);
|
||||||
|
return dlg;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* F2-17 / 服务流分派:构造 dialog body 为 service 加载 /api/page/schema/{templateId} 的 dialog。
|
* F2-17 / 服务流分派:构造 dialog body 为 service 加载 /api/page/schema/{templateId} 的 dialog。
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import org.junit.jupiter.api.BeforeEach;
|
|||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.springframework.jdbc.core.JdbcTemplate;
|
import org.springframework.jdbc.core.JdbcTemplate;
|
||||||
import org.springframework.jdbc.core.RowCallbackHandler;
|
import org.springframework.jdbc.core.RowCallbackHandler;
|
||||||
|
import org.springframework.jdbc.core.RowMapper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 各段转换规则单测(P4 转换器扩展)。JdbcTemplate 用 Mockito 桩,离线运行——
|
* 各段转换规则单测(P4 转换器扩展)。JdbcTemplate 用 Mockito 桩,离线运行——
|
||||||
@@ -1676,6 +1677,83 @@ class TemplateToAmisConverterTest {
|
|||||||
assertEquals("tpl", tpl.get("type"));
|
assertEquals("tpl", tpl.get("type"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 套打打印根因修复:navigation 按钮 {@code reportnosearch='true'} 且 funcid→type=200 报表
|
||||||
|
* → 「套打直接渲染」弹窗:iframe 指向 {@code /api/report/render} 并按目标报表 {@code <search>}
|
||||||
|
* 参数名注入选中行同名列({@code ${selectedItems[0].P}}),无查询表单。
|
||||||
|
*
|
||||||
|
* <p>修「打印内容空白」:原路径把报表查看器嵌入弹窗,报表唯一的主键选择字段被 F3-1 剔除,
|
||||||
|
* 选中行主键到不了 render → SQL 用设计期默认 ID(库内不存在)→ 空白单据。
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
void crud_navigation打印reportnosearch_直接渲染套打带选中行参数() {
|
||||||
|
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||||
|
// 源 crud 实体表(resolveTableName)故意设为 PM_DEMO,证明参数取自报表 <search> 而非源 pkCol
|
||||||
|
lenient().when(jdbc.queryForObject(any(String.class), eq(String.class), any(Object[].class)))
|
||||||
|
.thenReturn("PM_DEMO");
|
||||||
|
// 目标报表(type=200) XML:search 单字段=主键 OA_OFFICE_PURCHASEAPPLY_ID
|
||||||
|
String reportXml = "<report entityid='r1'><search>"
|
||||||
|
+ "<field name='OA_OFFICE_PURCHASEAPPLY_ID' designName='主键' uitype='SelectDialog' required='true'/>"
|
||||||
|
+ "</search><reportfile>x</reportfile></report>";
|
||||||
|
lenient().when(jdbc.query(any(String.class), any(RowMapper.class), any(Object[].class)))
|
||||||
|
.thenReturn(List.of(reportXml));
|
||||||
|
TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc);
|
||||||
|
|
||||||
|
String xml = "<crud entityid='e1'><display/>"
|
||||||
|
+ "<button type='navigation' name='打印' funcid='0a47a300-report'"
|
||||||
|
+ " funcname='办公用品采购申请单' reportnosearch='true' isneedselected='true'/></crud>";
|
||||||
|
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
|
Map<String, Object> crud = body(r.getSchema());
|
||||||
|
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||||
|
Map<String, Object> btn = (Map<String, Object>) toolbar.get(0);
|
||||||
|
assertEquals("打印", btn.get("label"));
|
||||||
|
assertEquals("dialog", btn.get("actionType"));
|
||||||
|
assertEquals("${!selectedItems || selectedItems.length === 0}", btn.get("disabledOn"));
|
||||||
|
|
||||||
|
Map<String, Object> dlg = (Map<String, Object>) btn.get("dialog");
|
||||||
|
assertEquals("办公用品采购申请单", dlg.get("title"));
|
||||||
|
// 选中行同名列注入 dialog data(键名=报表参数名,取自报表 <search>,非源 PM_DEMO_ID)
|
||||||
|
Map<String, Object> data = (Map<String, Object>) dlg.get("data");
|
||||||
|
assertEquals("${selectedItems[0].OA_OFFICE_PURCHASEAPPLY_ID}", data.get("OA_OFFICE_PURCHASEAPPLY_ID"));
|
||||||
|
assertNull(data.get("PM_DEMO_ID"), "参数应来自报表 <search>,不是源 crud 主键");
|
||||||
|
// body = html iframe → /api/report/render 带参数(无 service、无查询表单)
|
||||||
|
Map<String, Object> bodyEl = (Map<String, Object>) dlg.get("body");
|
||||||
|
assertEquals("html", bodyEl.get("type"));
|
||||||
|
String html = (String) bodyEl.get("html");
|
||||||
|
assertTrue(html.contains("<iframe"), "应直接 iframe 渲染报表");
|
||||||
|
assertTrue(html.contains("/api/report/render/0a47a300-report?format=html"), html);
|
||||||
|
assertTrue(html.contains("OA_OFFICE_PURCHASEAPPLY_ID=${OA_OFFICE_PURCHASEAPPLY_ID}"), html);
|
||||||
|
// 导出 PDF 按钮指向 render(format=pdf) 带同参
|
||||||
|
List<Map<String, Object>> actions = (List<Map<String, Object>>) dlg.get("actions");
|
||||||
|
boolean hasPdf = actions.stream().anyMatch(a -> "导出PDF".equals(a.get("label"))
|
||||||
|
&& String.valueOf(a.get("url")).contains("format=pdf")
|
||||||
|
&& String.valueOf(a.get("url")).contains("OA_OFFICE_PURCHASEAPPLY_ID=${OA_OFFICE_PURCHASEAPPLY_ID}"));
|
||||||
|
assertTrue(hasPdf, "应有导出PDF按钮带选中行参数");
|
||||||
|
}
|
||||||
|
|
||||||
|
/** reportnosearch=true 但 funcid 非 type=200 报表(查询空) → 回退普通导航弹窗(service 加载目标页),不误走直接渲染。 */
|
||||||
|
@Test
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
void crud_navigation_reportnosearch非报表回退普通导航() {
|
||||||
|
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||||
|
lenient().when(jdbc.queryForObject(any(String.class), eq(String.class), any(Object[].class)))
|
||||||
|
.thenReturn("PM_DEMO");
|
||||||
|
// jdbc.query 未桩 → Mockito 默认返回空 list → 非报表
|
||||||
|
TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc);
|
||||||
|
String xml = "<crud entityid='e1'><display/>"
|
||||||
|
+ "<button type='navigation' name='打印' funcid='not-a-report'"
|
||||||
|
+ " funcname='X' reportnosearch='true' isneedselected='true'/></crud>";
|
||||||
|
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
|
Map<String, Object> crud = body(r.getSchema());
|
||||||
|
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||||
|
Map<String, Object> btn = (Map<String, Object>) toolbar.get(0);
|
||||||
|
Map<String, Object> dlg = (Map<String, Object>) btn.get("dialog");
|
||||||
|
Map<String, Object> svc = (Map<String, Object>) dlg.get("body");
|
||||||
|
assertEquals("service", svc.get("type"), "非报表应回退普通导航 service 弹窗");
|
||||||
|
assertEquals("get:/api/page/schema/not-a-report?format=amis", svc.get("schemaApi"));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void crud_isshowFalse按钮跳过() {
|
void crud_isshowFalse按钮跳过() {
|
||||||
String xml = "<crud entityid='e1'><display/>"
|
String xml = "<crud entityid='e1'><display/>"
|
||||||
|
|||||||
@@ -319,7 +319,7 @@ public class ApprovalController {
|
|||||||
private ResponseEntity<Map<String, Object>> approve(String taskId, GatewayRequests.ApprovalActionRequest req) {
|
private ResponseEntity<Map<String, Object>> approve(String taskId, GatewayRequests.ApprovalActionRequest req) {
|
||||||
Map<String, Object> vars = new LinkedHashMap<>();
|
Map<String, Object> vars = new LinkedHashMap<>();
|
||||||
vars.put("approveResult", "agree");
|
vars.put("approveResult", "agree");
|
||||||
flowableClient.complete(taskId, vars, req.comment);
|
flowableClient.complete(taskId, vars, agreeComment(req.comment));
|
||||||
|
|
||||||
boolean ended = isProcessEnded(req.processInstanceId);
|
boolean ended = isProcessEnded(req.processInstanceId);
|
||||||
String table = resolveTable(req.tableName, req.businessKey);
|
String table = resolveTable(req.tableName, req.businessKey);
|
||||||
@@ -332,6 +332,19 @@ public class ApprovalController {
|
|||||||
return ResponseEntity.ok(r);
|
return ResponseEntity.ok(r);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 「同意」审批意见归一:保证以「同意」开头,对齐老系统并使报表审批段可见
|
||||||
|
* (报表 SQL 按 {@code message_ LIKE '同意%'} 匹配、{@code regexp_replace(message_,'^同意:|^同意','')} 取意见)。
|
||||||
|
* 空意见 → {@code "同意"};已以「同意」开头 → 原样;否则 → {@code "同意:" + 意见}。
|
||||||
|
*/
|
||||||
|
static String agreeComment(String opinion) {
|
||||||
|
String s = opinion == null ? "" : opinion.trim();
|
||||||
|
if (s.isEmpty()) {
|
||||||
|
return "同意";
|
||||||
|
}
|
||||||
|
return s.startsWith("同意") ? s : "同意:" + s;
|
||||||
|
}
|
||||||
|
|
||||||
/** 拒绝:终止流程(引擎 deleteProcessInstance)+回写 SYS_DATASTATUS=4(驳回)。 */
|
/** 拒绝:终止流程(引擎 deleteProcessInstance)+回写 SYS_DATASTATUS=4(驳回)。 */
|
||||||
private ResponseEntity<Map<String, Object>> reject(String taskId, GatewayRequests.ApprovalActionRequest req) {
|
private ResponseEntity<Map<String, Object>> reject(String taskId, GatewayRequests.ApprovalActionRequest req) {
|
||||||
Map<String, Object> engine = flowableClient.reject(taskId, req.comment);
|
Map<String, Object> engine = flowableClient.reject(taskId, req.comment);
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
package com.eip4.platform.flowgateway;
|
package com.eip4.platform.flowgateway;
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
|
import static org.mockito.ArgumentMatchers.eq;
|
||||||
import static org.mockito.Mockito.mock;
|
import static org.mockito.Mockito.mock;
|
||||||
import static org.mockito.Mockito.verify;
|
import static org.mockito.Mockito.verify;
|
||||||
import static org.mockito.Mockito.verifyNoInteractions;
|
import static org.mockito.Mockito.verifyNoInteractions;
|
||||||
@@ -92,6 +94,33 @@ class ApprovalControllerActionTest {
|
|||||||
verify(flowableClient).assist("t3", List.of("u-a", "u-z"), null);
|
verify(flowableClient).assist("t3", List.of("u-a", "u-z"), null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 同意意见落 act_hi_comment 必须以「同意」开头——报表审批段按 {@code message LIKE '同意%'} 匹配
|
||||||
|
* 并 {@code regexp_replace} 去前缀取意见。空意见 → 默认「同意」(修审批意见在报表不显示=原因B go-forward)。
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
void approve_blankComment_recordsDefault同意() {
|
||||||
|
ResponseEntity<Map<String, Object>> resp = controller.action("t1", req("approve"));
|
||||||
|
assertThat(resp.getStatusCode().is2xxSuccessful()).isTrue();
|
||||||
|
verify(flowableClient).complete(eq("t1"), any(), eq("同意"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void approve_withOpinion_prefixesWith同意() {
|
||||||
|
GatewayRequests.ApprovalActionRequest r = req("approve");
|
||||||
|
r.comment = "已审核无误";
|
||||||
|
controller.action("t2", r);
|
||||||
|
verify(flowableClient).complete(eq("t2"), any(), eq("同意:已审核无误"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void approve_opinionAlreadyStartsWith同意_keptAsIs() {
|
||||||
|
GatewayRequests.ApprovalActionRequest r = req("approve");
|
||||||
|
r.comment = "同意,按计划执行";
|
||||||
|
controller.action("t3", r);
|
||||||
|
verify(flowableClient).complete(eq("t3"), any(), eq("同意,按计划执行"));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void assist_withoutTargets_returns400() {
|
void assist_withoutTargets_returns400() {
|
||||||
ResponseEntity<Map<String, Object>> resp = controller.action("t4", req("assist"));
|
ResponseEntity<Map<String, Object>> resp = controller.action("t4", req("assist"));
|
||||||
|
|||||||
@@ -64,6 +64,10 @@ public class ReportController {
|
|||||||
@Value("${eip4.report.require-menu-grant:true}")
|
@Value("${eip4.report.require-menu-grant:true}")
|
||||||
private boolean requireMenuGrant;
|
private boolean requireMenuGrant;
|
||||||
|
|
||||||
|
/** 报表公司名(注入模板自定义 COMPANY 参数,覆盖设计期占位"XXXXXX公司")。与 JatoolsConfig 同源配置,部署时设为客户公司名。 */
|
||||||
|
@Value("${eip4.report.company:EIP4}")
|
||||||
|
private String reportCompany;
|
||||||
|
|
||||||
public ReportController(ReportService reportService,
|
public ReportController(ReportService reportService,
|
||||||
ReportTemplateRepository templateRepository,
|
ReportTemplateRepository templateRepository,
|
||||||
Environment environment) {
|
Environment environment) {
|
||||||
@@ -217,7 +221,10 @@ public class ReportController {
|
|||||||
new String(xmlBytes, StandardCharsets.ISO_8859_1));
|
new String(xmlBytes, StandardCharsets.ISO_8859_1));
|
||||||
Map<String, String> client = collectReportParams(request);
|
Map<String, String> client = collectReportParams(request);
|
||||||
Map<String, String> safe = ReportParamGuard.sanitizeClientParams(client, referenced);
|
Map<String, String> safe = ReportParamGuard.sanitizeClientParams(client, referenced);
|
||||||
return ReportParamGuard.applyTrustedIdentity(safe, referenced, trustedIdentity());
|
Map<String, String> withId = ReportParamGuard.applyTrustedIdentity(safe, referenced, trustedIdentity());
|
||||||
|
// COMPANY 经 jatools =COMPANY 绑定(非 ${}),按声明探测注入配置公司名,覆盖占位"XXXXXX公司"。
|
||||||
|
return ReportParamGuard.applyConfiguredCompany(withId,
|
||||||
|
new String(xmlBytes, StandardCharsets.ISO_8859_1), reportCompany);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -143,4 +143,26 @@ public final class ReportParamGuard {
|
|||||||
}
|
}
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 报表标题等用的公司名参数。模板常把它声明为自定义参数,默认值是占位符如「XXXXXX公司」。 */
|
||||||
|
static final String COMPANY_PARAM = "COMPANY";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 模板声明了 {@code COMPANY} 变量/参数时,注入服务端配置的公司名(覆盖设计期占位默认,如「XXXXXX公司」)。
|
||||||
|
*
|
||||||
|
* <p>{@code COMPANY} 经 jatools {@code =COMPANY} 表达式绑定(非 {@code ${}} 宏),不在
|
||||||
|
* {@link #extractReferencedParamNames} 覆盖内,故单独按声明 token 探测。值来自服务端配置
|
||||||
|
* ({@code eip4.report.company}),非客户端输入,无需走 {@link #isSafeValue}(且公司名常含中文/空格)。
|
||||||
|
*
|
||||||
|
* @param company 配置的真实公司名;空 / 模板未声明 COMPANY → 原样返回(保持占位,零回归)
|
||||||
|
*/
|
||||||
|
static Map<String, String> applyConfiguredCompany(Map<String, String> params, String templateXml, String company) {
|
||||||
|
if (company == null || company.isBlank() || templateXml == null
|
||||||
|
|| !(templateXml.contains("Name=\"COMPANY\"") || templateXml.contains("<Name>COMPANY</Name>"))) {
|
||||||
|
return params == null ? Map.of() : params;
|
||||||
|
}
|
||||||
|
Map<String, String> out = new LinkedHashMap<>(params == null ? Map.of() : params);
|
||||||
|
out.put(COMPANY_PARAM, company);
|
||||||
|
return out;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -201,4 +201,35 @@ class ReportParamGuardTest {
|
|||||||
assertEquals(safe, ReportParamGuard.applyTrustedIdentity(safe, referenced, null));
|
assertEquals(safe, ReportParamGuard.applyTrustedIdentity(safe, referenced, null));
|
||||||
assertEquals(safe, ReportParamGuard.applyTrustedIdentity(safe, referenced, Map.of()));
|
assertEquals(safe, ReportParamGuard.applyTrustedIdentity(safe, referenced, Map.of()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ---- applyConfiguredCompany:模板声明 COMPANY 参数时注入配置公司名,覆盖占位默认("XXXXXX公司") ----
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void applyConfiguredCompany_injects_when_template_declares_COMPANY() {
|
||||||
|
Map<String, String> params = new LinkedHashMap<>();
|
||||||
|
params.put("PROJECTID", "P-1");
|
||||||
|
String xml = "<Report><Variables><Item style=\"Parameter\" Name=\"COMPANY\">"
|
||||||
|
+ "<Name>COMPANY</Name><DefaultValue>XXXXXX公司</DefaultValue></Item></Variables></Report>";
|
||||||
|
|
||||||
|
Map<String, String> out = ReportParamGuard.applyConfiguredCompany(params, xml, "示例科技有限公司");
|
||||||
|
|
||||||
|
assertEquals("示例科技有限公司", out.get("COMPANY"), "声明 COMPANY 的模板应注入配置公司名");
|
||||||
|
assertEquals("P-1", out.get("PROJECTID"), "其他参数不动");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void applyConfiguredCompany_noop_when_no_COMPANY_param() {
|
||||||
|
Map<String, String> params = Map.of("PROJECTID", "P-1");
|
||||||
|
Map<String, String> out = ReportParamGuard.applyConfiguredCompany(params, "<Report><Variables/></Report>", "示例公司");
|
||||||
|
assertFalse(out.containsKey("COMPANY"), "未声明 COMPANY → 不注入");
|
||||||
|
assertEquals("P-1", out.get("PROJECTID"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void applyConfiguredCompany_noop_when_company_blank_or_null() {
|
||||||
|
String xml = "<Item Name=\"COMPANY\"><Name>COMPANY</Name></Item>";
|
||||||
|
assertFalse(ReportParamGuard.applyConfiguredCompany(new LinkedHashMap<>(), xml, "").containsKey("COMPANY"));
|
||||||
|
assertFalse(ReportParamGuard.applyConfiguredCompany(new LinkedHashMap<>(), xml, null).containsKey("COMPANY"));
|
||||||
|
assertFalse(ReportParamGuard.applyConfiguredCompany(new LinkedHashMap<>(), xml, " ").containsKey("COMPANY"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user