F2-4(一): 修 XML 实体污染并重批重入库,固化标准入库器
- run_eval: PG xpath(...)::text 保留实体转义(< → <),抽取后补 XML 预定义实体反转义 (等价手册 §5.3 dom4j getText() 语义);293 个污染产物清零,Groovy 编译失败根因消除 - 缓存重建(源=eip4dev,1428 条:1 模板改名+1 新增脚本属数据演进);全量重跑 497/30/86/815,自动化率 81.1% 守住 ≥80% - 重大发现:同模板内脚本顺序在两次抽取间会交换((templateId,seq) 非稳定键, welfare 模板 seq1↔seq2 实锤)——重批后 onEvent seq 已与磁盘对齐,长期需内容哈希键(登记 F2-4) - tools/page-schema-loader/load_page_schema.py:幂等标准入库器(etag=sha256,version 递增, 仅允许 localhost 双库);本次双库各更新 756/幂等跳过 733,e2e 28/28 保持全绿 - 坑:mvn exec:java 的 -Dexec.args 引号空参会被吞导致参数错位(密码用占位符代替空串) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,78 +0,0 @@
|
||||
// === EIP4 P4 脚本迁移产出 ===
|
||||
// template_id : ad1ffdd2-3af3-4809-b0d5-2fbbb73e22b3
|
||||
// template_name: 劳务分包合同评审
|
||||
// seq : 1
|
||||
// label : HARD
|
||||
// 硬 S3 原因 : 动态创建 Vaadin 组件
|
||||
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
|
||||
import com.vaadin.ui.Button;
|
||||
import com.vaadin.ui.Button.ClickEvent;
|
||||
import com.vaadin.ui.Button.ClickListener;
|
||||
import com.vaadin.ui.Notification;
|
||||
import com.vaadin.ui.Notification.Type;
|
||||
import com.dsasp.client.viewframework.util.TableImportExport;
|
||||
|
||||
bindField("FIRSTPARTY",GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY"));
|
||||
|
||||
|
||||
//绑定费率项
|
||||
def ratelist = [];
|
||||
def returnCol = [];
|
||||
def PM_LABOURSUBCONTRACTVIEWCONFIG_ID = null;
|
||||
def PM_LABOURSUBCONTRACTREVIEW_ID = null;
|
||||
returnCol.add("PM_LABOURSUBCONTRACTVIEWCONFIG_ID");
|
||||
returnCol.add("LABOURSUBCONTRACTVIEWID");
|
||||
returnCol.add("RATEITEM");
|
||||
returnCol.add("RATEVALUE");
|
||||
|
||||
def sql = "select PM_LABOURSUBCONTRACTVIEWCONFIG_ID,'"+PM_LABOURSUBCONTRACTREVIEW_ID+"' as LABOURSUBCONTRACTVIEWID,'' as LABOURSUBCONTRACTVIEWID_DISPLAY__,codevalue as rateitem,";
|
||||
sql += " case when rowcount > 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a ";
|
||||
sql += " left outer join PM_LABOURSUBCONTRACTVIEWCONFIG b on a.codevalue = b.rateitem and LABOURSUBCONTRACTVIEWID = '"+PM_LABOURSUBCONTRACTREVIEW_ID+"'";
|
||||
sql += " left outer join (";
|
||||
sql += " select count(rateitem) AS rowcount,LABOURSUBCONTRACTVIEWID from PM_LABOURSUBCONTRACTVIEWCONFIG where LABOURSUBCONTRACTVIEWID = '"+PM_LABOURSUBCONTRACTREVIEW_ID+"'";
|
||||
sql += " Group by LABOURSUBCONTRACTVIEWID) as temp1 on b.LABOURSUBCONTRACTVIEWID = temp1.LABOURSUBCONTRACTVIEWID";
|
||||
sql += " left OUTER JOIN PM_SUBCONTRACTBASICSCONFIG c on a.codevalue = c.rateitem"
|
||||
sql += " where sys_enumeratetype_id = 'SUBCONTRACT_BASICSCONFIG'";
|
||||
|
||||
def list = GetServicesFunction.listSelectResultBySql(map,"PM_LABOURSUBCONTRACTVIEWCONFIG",sql,returnCol);
|
||||
|
||||
if(list!=null && list.size()>0){
|
||||
for(i in 0..<list.size()){
|
||||
ratelist.add(list[i].toMap());
|
||||
}
|
||||
}
|
||||
|
||||
bindField("LABOURSUBCONTRACTVIEWID",ratelist);
|
||||
|
||||
|
||||
|
||||
|
||||
def contents = group.getField("CONTENTS");
|
||||
final Object table = contents?.table;
|
||||
table?.setImmediate(true);//设置验证
|
||||
|
||||
|
||||
def opertor = group.getField("BUTTON");
|
||||
def vl = opertor?.parent;
|
||||
Button button = new Button("根据分包明细计算合同价款");
|
||||
vl.addComponent(button,0);
|
||||
|
||||
button.addClickListener(new Button.ClickListener() {
|
||||
@Override
|
||||
public void buttonClick(Button.ClickEvent event) {
|
||||
def balancedetails = getFieldValue("CONTENTS");
|
||||
def sumamount = new BigDecimal("0");;
|
||||
def summoney = new BigDecimal("0");;
|
||||
if(balancedetails != null && balancedetails.size()>0){
|
||||
balancedetails?.each{
|
||||
if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
|
||||
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
|
||||
}
|
||||
}
|
||||
}
|
||||
bindField("CONTRACTMONEY",summoney);
|
||||
}
|
||||
});
|
||||
def tie = new TableImportExport(contents,"com.dsasp.pm.labourcontract.client.ContentsImport");
|
||||
tie.addImportButton(2);
|
||||
tie.addExportButton(3);
|
||||
@@ -1,7 +1,7 @@
|
||||
// === EIP4 P4 脚本迁移产出 ===
|
||||
// template_id : ad1ffdd2-3af3-4809-b0d5-2fbbb73e22b3
|
||||
// template_name: 劳务分包合同评审
|
||||
// seq : 3
|
||||
// seq : 1
|
||||
// label : NO_S3
|
||||
// 处置 : 无 S3 模式,原样进 P4
|
||||
page.setDataFilter(["PM_LABOURSUBCONTRACTREVIEW_ID":PM_LABOURSUBCONTRACTREVIEW_ID]);
|
||||
@@ -12,32 +12,67 @@ import com.vaadin.ui.Notification;
|
||||
import com.vaadin.ui.Notification.Type;
|
||||
import com.dsasp.client.viewframework.util.TableImportExport;
|
||||
|
||||
bindField("FIRSTPARTY",GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY"));
|
||||
|
||||
|
||||
//绑定费率项
|
||||
def ratelist = [];
|
||||
def returnCol = [];
|
||||
def PM_LABOURSUBCONTRACTVIEWCONFIG_ID = null;
|
||||
def PM_LABOURSUBCONTRACTREVIEW_ID = null;
|
||||
returnCol.add("PM_LABOURSUBCONTRACTVIEWCONFIG_ID");
|
||||
returnCol.add("LABOURSUBCONTRACTVIEWID");
|
||||
returnCol.add("RATEITEM");
|
||||
returnCol.add("RATEVALUE");
|
||||
|
||||
def sql = "select PM_LABOURSUBCONTRACTVIEWCONFIG_ID,'"+PM_LABOURSUBCONTRACTREVIEW_ID+"' as LABOURSUBCONTRACTVIEWID,'' as LABOURSUBCONTRACTVIEWID_DISPLAY__,codevalue as rateitem,";
|
||||
sql += " case when rowcount > 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a ";
|
||||
sql += " left outer join PM_LABOURSUBCONTRACTVIEWCONFIG b on a.codevalue = b.rateitem and LABOURSUBCONTRACTVIEWID = '"+PM_LABOURSUBCONTRACTREVIEW_ID+"'";
|
||||
sql += " left outer join (";
|
||||
sql += " select count(rateitem) AS rowcount,LABOURSUBCONTRACTVIEWID from PM_LABOURSUBCONTRACTVIEWCONFIG where LABOURSUBCONTRACTVIEWID = '"+PM_LABOURSUBCONTRACTREVIEW_ID+"'";
|
||||
sql += " Group by LABOURSUBCONTRACTVIEWID) as temp1 on b.LABOURSUBCONTRACTVIEWID = temp1.LABOURSUBCONTRACTVIEWID";
|
||||
sql += " left OUTER JOIN PM_SUBCONTRACTBASICSCONFIG c on a.codevalue = c.rateitem"
|
||||
sql += " where sys_enumeratetype_id = 'SUBCONTRACT_BASICSCONFIG'";
|
||||
|
||||
def list = GetServicesFunction.listSelectResultBySql(map,"PM_LABOURSUBCONTRACTVIEWCONFIG",sql,returnCol);
|
||||
|
||||
if(list!=null && list.size()>0){
|
||||
for(i in 0..<list.size()){
|
||||
ratelist.add(list[i].toMap());
|
||||
}
|
||||
}
|
||||
|
||||
bindField("LABOURSUBCONTRACTVIEWID",ratelist);
|
||||
|
||||
|
||||
|
||||
|
||||
def contents = group.getField("CONTENTS");
|
||||
final Object table = contents?.table;
|
||||
table?.setImmediate(true);//设置验证
|
||||
|
||||
|
||||
def opertor = group.getField("BUTTON");
|
||||
def vl = opertor?.parent;
|
||||
Button button = new Button("根据分包明细计算合同价款");
|
||||
vl.addComponent(button,0);
|
||||
|
||||
button.addClickListener(new Button.ClickListener() {
|
||||
@Override
|
||||
public void buttonClick(Button.ClickEvent event) {
|
||||
def balancedetails = getFieldValue("CONTENTS");
|
||||
def sumamount = new BigDecimal("0");;
|
||||
def summoney = new BigDecimal("0");;
|
||||
if(balancedetails != null && balancedetails.size()>0){
|
||||
if(balancedetails != null && balancedetails.size()>0){
|
||||
balancedetails?.each{
|
||||
if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
|
||||
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
|
||||
if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
|
||||
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
|
||||
}
|
||||
}
|
||||
}
|
||||
bindField("CONTRACTMONEY",summoney);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
def tie = new TableImportExport(contents,"com.dsasp.pm.labourcontract.client.ContentsImport");
|
||||
tie.addImportButton(2);
|
||||
tie.addExportButton(3);
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
// === EIP4 P4 脚本迁移产出 ===
|
||||
// template_id : ad1ffdd2-3af3-4809-b0d5-2fbbb73e22b3
|
||||
// template_name: 劳务分包合同评审
|
||||
// seq : 3
|
||||
// label : HARD
|
||||
// 硬 S3 原因 : 动态创建 Vaadin 组件
|
||||
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
|
||||
import com.vaadin.ui.Button;
|
||||
import com.vaadin.ui.Button.ClickEvent;
|
||||
import com.vaadin.ui.Button.ClickListener;
|
||||
import com.vaadin.ui.Notification;
|
||||
import com.vaadin.ui.Notification.Type;
|
||||
import com.dsasp.client.viewframework.util.TableImportExport;
|
||||
|
||||
def contents = group.getField("CONTENTS");
|
||||
final Object table = contents?.table;
|
||||
table?.setImmediate(true);//设置验证
|
||||
|
||||
def opertor = group.getField("BUTTON");
|
||||
def vl = opertor?.parent;
|
||||
Button button = new Button("根据分包明细计算合同价款");
|
||||
vl.addComponent(button,0);
|
||||
button.addClickListener(new Button.ClickListener() {
|
||||
@Override
|
||||
public void buttonClick(Button.ClickEvent event) {
|
||||
def balancedetails = getFieldValue("CONTENTS");
|
||||
def sumamount = new BigDecimal("0");;
|
||||
def summoney = new BigDecimal("0");;
|
||||
if(balancedetails != null && balancedetails.size()>0){
|
||||
balancedetails?.each{
|
||||
if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
|
||||
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
|
||||
}
|
||||
}
|
||||
}
|
||||
bindField("CONTRACTMONEY",summoney);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
def tie = new TableImportExport(contents,"com.dsasp.pm.labourcontract.client.ContentsImport");
|
||||
tie.addImportButton(2);
|
||||
tie.addExportButton(3);
|
||||
Reference in New Issue
Block a user