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:
@@ -0,0 +1,43 @@
|
||||
// === EIP4 P4 脚本迁移产出 ===
|
||||
// template_id : f9b884de-6d46-4242-b93f-f3babd358f36
|
||||
// template_name: 项目付款申请-五建定制
|
||||
// seq : 1
|
||||
// label : NO_S3
|
||||
// 处置 : 无 S3 模式,原样进 P4
|
||||
import com.dsasp.server.common.util.HTTPClientUtils;
|
||||
|
||||
def id = PM_PAYMENTAPPLY_ID;
|
||||
//根据主键来获取信息
|
||||
def po = GetServicesFunction.loadPOJO(id,"PM_PAYMENTAPPLY",false);
|
||||
def text = id+","+po?.get_Value("PAYMENTAPPLYCODE")+","+po?.get_DisplayValue("PARTB",true,null)+","+po?.get_Value("APPROVEDAMOUNT");
|
||||
def tempdoc = HTTPClientUtils.saveimgDoc(text,id);
|
||||
//Console.debug(text);
|
||||
|
||||
def sql = " select PM_PAYMENTAPPLY_QRCODE_ID from PM_PAYMENTAPPLY_QRCODE where PM_PAYMENTAPPLY_ID = '"+id+"'";
|
||||
def po1 = GetServicesFunction.listSelectResultBySql([:],"PM_PAYMENTAPPLY_QRCODE",sql,["PM_PAYMENTAPPLY_QRCODE_ID"]);
|
||||
if(po1!=null && po1.size()>0){
|
||||
def list = [:];
|
||||
list["PM_PAYMENTAPPLY_QRCODE_ID"] = po1.get(0).get_Value("PM_PAYMENTAPPLY_QRCODE_ID");
|
||||
list["DOCUMENT"] = tempdoc;
|
||||
GetServicesFunction.excuteFlow(list,"PM_PAYMENTAPPLY_QRCODE_UPDATE");
|
||||
}else{
|
||||
def list = [:];
|
||||
list["PM_PAYMENTAPPLY_ID"] = id;
|
||||
list["DOCUMENT"] = tempdoc;
|
||||
GetServicesFunction.excuteFlow(list,"PM_PAYMENTAPPLY_QRCODE_ADD");
|
||||
|
||||
}
|
||||
|
||||
//重复打印给补打次数赋值
|
||||
def list2 = po.toMap();
|
||||
def sql2 = " select PRINTNUM from PM_PAYMENTAPPLY where PM_PAYMENTAPPLY_ID = '"+id+"'";
|
||||
def map2 = GetServicesFunction.executeQueryForMap(sql2);
|
||||
if(map2!=null && map2.get("PRINTNUM")!=null){
|
||||
list2["PRINTNUM"] = map2.get("PRINTNUM")+1;
|
||||
}else{
|
||||
list2["PRINTNUM"] = 0;
|
||||
}
|
||||
GetServicesFunction.excuteFlow(list2,"PM_PAYMENTAPPLY_UPDATE");
|
||||
|
||||
page.setDataFilter(["PM_PAYMENTAPPLY_ID":PM_PAYMENTAPPLY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
|
||||
|
||||
@@ -4,40 +4,43 @@
|
||||
// seq : 2
|
||||
// label : NO_S3
|
||||
// 处置 : 无 S3 模式,原样进 P4
|
||||
import com.dsasp.server.common.util.HTTPClientUtils;
|
||||
enableButton("打印项目分包劳务付款申请单",false);
|
||||
enableButton("打印项目付款申请单",false);
|
||||
enableButton("打印五建基础付款申请单",false);
|
||||
enableButton("打印五建基础分包劳务付款申请单",false);
|
||||
|
||||
def id = PM_PAYMENTAPPLY_ID;
|
||||
//根据主键来获取信息
|
||||
/** 影响页面加载速度
|
||||
def id = item['PM_PAYMENTAPPLY_ID'];
|
||||
//根据主键来获取信息
|
||||
def po = GetServicesFunction.loadPOJO(id,"PM_PAYMENTAPPLY",false);
|
||||
def text = id+","+po?.get_Value("PAYMENTAPPLYCODE")+","+po?.get_DisplayValue("PARTB",true,null)+","+po?.get_Value("APPROVEDAMOUNT");
|
||||
def tempdoc = HTTPClientUtils.saveimgDoc(text,id);
|
||||
//Console.debug(text);
|
||||
def projectpo = GetServicesFunction.loadPOJO(po?.get_Value("PROJECTID"),"PM_PROJECT",false);
|
||||
|
||||
def sql = " select PM_PAYMENTAPPLY_QRCODE_ID from PM_PAYMENTAPPLY_QRCODE where PM_PAYMENTAPPLY_ID = '"+id+"'";
|
||||
def po1 = GetServicesFunction.listSelectResultBySql([:],"PM_PAYMENTAPPLY_QRCODE",sql,["PM_PAYMENTAPPLY_QRCODE_ID"]);
|
||||
if(po1!=null && po1.size()>0){
|
||||
def list = [:];
|
||||
list["PM_PAYMENTAPPLY_QRCODE_ID"] = po1.get(0).get_Value("PM_PAYMENTAPPLY_QRCODE_ID");
|
||||
list["DOCUMENT"] = tempdoc;
|
||||
GetServicesFunction.excuteFlow(list,"PM_PAYMENTAPPLY_QRCODE_UPDATE");
|
||||
//打印五建基础付款申请单
|
||||
if(projectpo?.get_Value("FILIALE") == '50c8e776-750e-46a6-bc81-8e4313d02259'){
|
||||
**/
|
||||
//Console.debug(item['ORGID']);
|
||||
if(item['ORGID'].contains('五建基础')){
|
||||
if((item['STATUS'] =="通过"||item['STATUS'] =="处理中") && item['MONEYITEM'] =="分包项目-劳务(专户)"){
|
||||
enableButton("打印五建基础分包劳务付款申请单",true);
|
||||
enableButton("打印五建基础付款申请单",false);
|
||||
}else if(item['STATUS'] =="通过"||item['STATUS'] =="处理中") {
|
||||
enableButton("打印五建基础分包劳务付款申请单",false);
|
||||
enableButton("打印五建基础付款申请单",true);
|
||||
}
|
||||
}else{
|
||||
def list = [:];
|
||||
list["PM_PAYMENTAPPLY_ID"] = id;
|
||||
list["DOCUMENT"] = tempdoc;
|
||||
GetServicesFunction.excuteFlow(list,"PM_PAYMENTAPPLY_QRCODE_ADD");
|
||||
|
||||
if((item['STATUS'] =="通过"||item['STATUS'] =="处理中") && item['MONEYITEM'] =="分包项目-劳务(专户)"){
|
||||
enableButton("打印项目分包劳务付款申请单",true);
|
||||
enableButton("打印项目付款申请单",false);
|
||||
}else if(item['STATUS'] =="通过"||item['STATUS'] =="处理中") {
|
||||
enableButton("打印项目分包劳务付款申请单",false);
|
||||
enableButton("打印项目付款申请单",true);
|
||||
}
|
||||
}
|
||||
|
||||
//重复打印给补打次数赋值
|
||||
def list2 = po.toMap();
|
||||
def sql2 = " select PRINTNUM from PM_PAYMENTAPPLY where PM_PAYMENTAPPLY_ID = '"+id+"'";
|
||||
def map2 = GetServicesFunction.executeQueryForMap(sql2);
|
||||
if(map2!=null && map2.get("PRINTNUM")!=null){
|
||||
list2["PRINTNUM"] = map2.get("PRINTNUM")+1;
|
||||
def ordersStatus = GetServicesFunction.getEnumerateItemValue("WFSTATUS",item['STATUS']);
|
||||
if(ordersStatus == 3){
|
||||
enableButton("审批通过记录修改",true);
|
||||
}else{
|
||||
list2["PRINTNUM"] = 0;
|
||||
enableButton("审批通过记录修改",false);
|
||||
}
|
||||
GetServicesFunction.excuteFlow(list2,"PM_PAYMENTAPPLY_UPDATE");
|
||||
|
||||
page.setDataFilter(["PM_PAYMENTAPPLY_ID":PM_PAYMENTAPPLY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
|
||||
|
||||
|
||||
@@ -6,17 +6,27 @@
|
||||
// 硬 S3 原因 : 动态创建 Vaadin 组件
|
||||
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
|
||||
import com.vaadin.ui.Label;
|
||||
def label4 = new Label("<font style=\"float:right\">入库金额(元)</font>");
|
||||
def label5 = new Label("<font style=\"float:left\">超出控制金额后,本次申请付款金额以红色字体显示</font>");
|
||||
|
||||
def label4 = new Label("<font style=\"float:right\">入库金额(元)</font>");
|
||||
|
||||
label4.setContentMode(Label.CONTENT_XHTML);
|
||||
label5.setContentMode(Label.CONTENT_XHTML);
|
||||
|
||||
def formLayout4 =group.getField("LBLIMPORTMONEY").parent;
|
||||
if(formLayout4.getComponentCount()>1){
|
||||
def formLayout5 =group.getField("LBLDESCRIBE").parent;
|
||||
|
||||
|
||||
if(formLayout4.getComponentCount()>1){
|
||||
formLayout4.removeComponent(formLayout4.getComponent(1));
|
||||
}
|
||||
formLayout4.addComponent(label4);
|
||||
|
||||
if(formLayout5.getComponentCount()>1){
|
||||
formLayout5.removeComponent(formLayout5.getComponent(1));
|
||||
}
|
||||
formLayout5.addComponent(label5);
|
||||
|
||||
def txt4 = group.getField("IMPORTMONEY");
|
||||
|
||||
def controlmode = GetDefaultValueFunction.getConfigValue("com.dsasp.pm.projectsubpayment.CONTROLMODE");
|
||||
@@ -42,12 +52,10 @@ switch(controlmode){
|
||||
|
||||
|
||||
def type = getFieldValue("APPROVALTYPE");
|
||||
|
||||
if(type==null){
|
||||
type = 1;
|
||||
}
|
||||
|
||||
|
||||
def icType = group.getField("APPROVALTYPE")?.getContainerDataSource();
|
||||
|
||||
//排除“项目付款的审批类型”
|
||||
@@ -55,14 +63,14 @@ def smap=[:];
|
||||
smap["EXTENDATTRIBUTEONE"] = 1;
|
||||
smap["SYS_ENUMERATETYPE_ID"] = "APPROVAL_TYPE";
|
||||
def typelist = GetServicesFunction.listSelectResult(smap,"SYS_ENUMERATE");
|
||||
if(typelist!=null && typelist.size()>0){
|
||||
for(i in 0..<typelist.size()){
|
||||
if(typelist!=null && typelist.size()>0){
|
||||
for(i in 0..<typelist.size()){
|
||||
def po = typelist[i]
|
||||
icType?.removeItem(po.get_Value("CODEVALUE"));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//绑定默认
|
||||
bindField("APPROVALTYPE",type);
|
||||
|
||||
|
||||
|
||||
@@ -1,32 +1,22 @@
|
||||
// === EIP4 P4 脚本迁移产出 ===
|
||||
// template_id : f9b884de-6d46-4242-b93f-f3babd358f36
|
||||
// template_name: 项目付款申请-五建定制
|
||||
// seq : 5
|
||||
// seq : 4
|
||||
// label : HARD
|
||||
// 硬 S3 原因 : 动态创建 Vaadin 组件
|
||||
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
|
||||
import com.vaadin.ui.Label;
|
||||
def label4 = new Label("<font style=\"float:right\">入库金额(元)</font>");
|
||||
def label5 = new Label("<font style=\"float:left\">超出控制金额后,本次申请付款金额以红色字体显示</font>");
|
||||
|
||||
def label4 = new Label("<font style=\"float:right\">入库金额(元)</font>");
|
||||
|
||||
label4.setContentMode(Label.CONTENT_XHTML);
|
||||
label5.setContentMode(Label.CONTENT_XHTML);
|
||||
|
||||
def formLayout4 =group.getField("LBLIMPORTMONEY").parent;
|
||||
def formLayout5 =group.getField("LBLDESCRIBE").parent;
|
||||
|
||||
|
||||
if(formLayout4.getComponentCount()>1){
|
||||
if(formLayout4.getComponentCount()>1){
|
||||
formLayout4.removeComponent(formLayout4.getComponent(1));
|
||||
}
|
||||
formLayout4.addComponent(label4);
|
||||
|
||||
if(formLayout5.getComponentCount()>1){
|
||||
formLayout5.removeComponent(formLayout5.getComponent(1));
|
||||
}
|
||||
formLayout5.addComponent(label5);
|
||||
|
||||
def txt4 = group.getField("IMPORTMONEY");
|
||||
|
||||
def controlmode = GetDefaultValueFunction.getConfigValue("com.dsasp.pm.projectsubpayment.CONTROLMODE");
|
||||
@@ -52,10 +42,12 @@ switch(controlmode){
|
||||
|
||||
|
||||
def type = getFieldValue("APPROVALTYPE");
|
||||
|
||||
if(type==null){
|
||||
type = 1;
|
||||
}
|
||||
|
||||
|
||||
def icType = group.getField("APPROVALTYPE")?.getContainerDataSource();
|
||||
|
||||
//排除“项目付款的审批类型”
|
||||
@@ -63,14 +55,14 @@ def smap=[:];
|
||||
smap["EXTENDATTRIBUTEONE"] = 1;
|
||||
smap["SYS_ENUMERATETYPE_ID"] = "APPROVAL_TYPE";
|
||||
def typelist = GetServicesFunction.listSelectResult(smap,"SYS_ENUMERATE");
|
||||
if(typelist!=null && typelist.size()>0){
|
||||
for(i in 0..<typelist.size()){
|
||||
if(typelist!=null && typelist.size()>0){
|
||||
for(i in 0..<typelist.size()){
|
||||
def po = typelist[i]
|
||||
icType?.removeItem(po.get_Value("CODEVALUE"));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//绑定默认
|
||||
bindField("APPROVALTYPE",type);
|
||||
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
// === EIP4 P4 脚本迁移产出 ===
|
||||
// template_id : f9b884de-6d46-4242-b93f-f3babd358f36
|
||||
// template_name: 项目付款申请-五建定制
|
||||
// seq : 4
|
||||
// label : NO_S3
|
||||
// 处置 : 无 S3 模式,原样进 P4
|
||||
enableButton("打印项目分包劳务付款申请单",false);
|
||||
enableButton("打印项目付款申请单",false);
|
||||
enableButton("打印五建基础付款申请单",false);
|
||||
enableButton("打印五建基础分包劳务付款申请单",false);
|
||||
|
||||
/** 影响页面加载速度
|
||||
def id = item['PM_PAYMENTAPPLY_ID'];
|
||||
//根据主键来获取信息
|
||||
def po = GetServicesFunction.loadPOJO(id,"PM_PAYMENTAPPLY",false);
|
||||
def projectpo = GetServicesFunction.loadPOJO(po?.get_Value("PROJECTID"),"PM_PROJECT",false);
|
||||
|
||||
//打印五建基础付款申请单
|
||||
if(projectpo?.get_Value("FILIALE") == '50c8e776-750e-46a6-bc81-8e4313d02259'){
|
||||
**/
|
||||
//Console.debug(item['ORGID']);
|
||||
if(item['ORGID'].contains('五建基础')){
|
||||
if((item['STATUS'] =="通过"||item['STATUS'] =="处理中") && item['MONEYITEM'] =="分包项目-劳务(专户)"){
|
||||
enableButton("打印五建基础分包劳务付款申请单",true);
|
||||
enableButton("打印五建基础付款申请单",false);
|
||||
}else if(item['STATUS'] =="通过"||item['STATUS'] =="处理中") {
|
||||
enableButton("打印五建基础分包劳务付款申请单",false);
|
||||
enableButton("打印五建基础付款申请单",true);
|
||||
}
|
||||
}else{
|
||||
if((item['STATUS'] =="通过"||item['STATUS'] =="处理中") && item['MONEYITEM'] =="分包项目-劳务(专户)"){
|
||||
enableButton("打印项目分包劳务付款申请单",true);
|
||||
enableButton("打印项目付款申请单",false);
|
||||
}else if(item['STATUS'] =="通过"||item['STATUS'] =="处理中") {
|
||||
enableButton("打印项目分包劳务付款申请单",false);
|
||||
enableButton("打印项目付款申请单",true);
|
||||
}
|
||||
}
|
||||
|
||||
def ordersStatus = GetServicesFunction.getEnumerateItemValue("WFSTATUS",item['STATUS']);
|
||||
if(ordersStatus == 3){
|
||||
enableButton("审批通过记录修改",true);
|
||||
}else{
|
||||
enableButton("审批通过记录修改",false);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// === EIP4 P4 脚本迁移产出 ===
|
||||
// template_id : f9b884de-6d46-4242-b93f-f3babd358f36
|
||||
// template_name: 项目付款申请-五建定制
|
||||
// seq : 1
|
||||
// seq : 5
|
||||
// label : FULL_AUTO
|
||||
// 处置 : 全自动改写完成,直接入 P4 转换流水线
|
||||
def list = getFieldValue("ORGIDLIST");
|
||||
Reference in New Issue
Block a user