diff --git a/tools/page-schema-loader/load_page_schema.py b/tools/page-schema-loader/load_page_schema.py
new file mode 100644
index 0000000..84c7036
--- /dev/null
+++ b/tools/page-schema-loader/load_page_schema.py
@@ -0,0 +1,99 @@
+"""
+load_page_schema.py — 把批量转换产物(转换产物/schema/*.json)幂等入库 sys_page_schema。
+
+P4-4 首次入库用的是一次性手段未固化;本脚本(F2-4)成为唯一标准入库器:
+ - etag = 文件内容 sha-256 hex(与 PageSchemaController 的 ETag/304 口径一致)
+ - 已存在且 etag 不同 → 更新 schema_json/schema_etag,version+1
+ - 不存在 → 插入 version=1,name 从同库 view_template 反查
+ - etag 相同 → 跳过(幂等)
+
+用法:
+ python3 load_page_schema.py --schema-dir
\
+ --target host:port:dbname:schema:user [--target ...]
+默认双库:localhost:5433:eip4dev:eip3:zhengwr 与 localhost:5433:eip4m0:public:zhengwr
+仅允许 localhost(本地双库是仅有的合法目标;客户库副本 5435 只读红线)。
+"""
+
+import argparse
+import hashlib
+import json
+import os
+import sys
+import time
+
+
+def upsert_target(schema_dir: str, host: str, port: str, dbname: str, schema: str, user: str):
+ import psycopg2
+
+ if host not in ("localhost", "127.0.0.1"):
+ raise SystemExit(f"拒绝目标 {host}:仅允许 localhost(5435 客户库只读红线)")
+
+ conn = psycopg2.connect(host=host, port=int(port), dbname=dbname, user=user,
+ options=f"-c search_path={schema}")
+ conn.autocommit = False
+ inserted = updated = skipped = 0
+ now_ms = int(time.time() * 1000)
+ try:
+ with conn.cursor() as cur:
+ for fn in sorted(os.listdir(schema_dir)):
+ if not fn.endswith(".json"):
+ continue
+ tid = fn[:-5]
+ with open(os.path.join(schema_dir, fn), "rb") as f:
+ raw = f.read()
+ # 入库内容 = 文件原文(jsonb 规范化由 PG 负责);etag 对原文计算
+ etag = hashlib.sha256(raw).hexdigest()
+ text = raw.decode("utf-8")
+ json.loads(text) # 入库前自检:JSON 必须合法
+
+ cur.execute("SELECT schema_etag FROM sys_page_schema WHERE template_id=%s", (tid,))
+ row = cur.fetchone()
+ if row is None:
+ cur.execute("SELECT name FROM view_template WHERE trim(view_template_id)=%s", (tid,))
+ nrow = cur.fetchone()
+ name = nrow[0] if nrow else tid
+ cur.execute(
+ "INSERT INTO sys_page_schema(template_id,name,schema_json,schema_etag,version,update_time) "
+ "VALUES (%s,%s,%s::jsonb,%s,1,%s)",
+ (tid, name, text, etag, now_ms))
+ inserted += 1
+ elif row[0] != etag:
+ cur.execute(
+ "UPDATE sys_page_schema SET schema_json=%s::jsonb, schema_etag=%s, "
+ "version=version+1, update_time=%s WHERE template_id=%s",
+ (text, etag, now_ms, tid))
+ updated += 1
+ else:
+ skipped += 1
+ conn.commit()
+ except Exception:
+ conn.rollback()
+ raise
+ finally:
+ conn.close()
+ print(f"[{dbname}.{schema}] 插入 {inserted} / 更新 {updated} / 幂等跳过 {skipped}")
+
+
+def main():
+ here = os.path.dirname(os.path.abspath(__file__))
+ default_dir = os.path.normpath(os.path.join(
+ here, "..", "..", "platform-converter", "转换产物", "schema"))
+ p = argparse.ArgumentParser()
+ p.add_argument("--schema-dir", default=default_dir)
+ p.add_argument("--target", action="append",
+ help="host:port:dbname:schema:user,可多次;缺省=eip4dev+eip4m0 双库")
+ args = p.parse_args()
+
+ targets = args.target or [
+ "localhost:5433:eip4dev:eip3:zhengwr",
+ "localhost:5433:eip4m0:public:zhengwr",
+ ]
+ if not os.path.isdir(args.schema_dir):
+ raise SystemExit(f"产物目录不存在: {args.schema_dir}")
+ print(f"产物目录: {args.schema_dir} ({len([f for f in os.listdir(args.schema_dir) if f.endswith('.json')])} 文件)")
+ for t in targets:
+ upsert_target(args.schema_dir, *t.split(":"))
+
+
+if __name__ == "__main__":
+ main()
diff --git a/tools/s3_rewriter/output/full_auto_index.json b/tools/s3_rewriter/output/full_auto_index.json
index abd69cb..2875042 100644
--- a/tools/s3_rewriter/output/full_auto_index.json
+++ b/tools/s3_rewriter/output/full_auto_index.json
@@ -2,7 +2,7 @@
{
"template_id": "021e3ba7-e03a-412a-9f0e-c20ef440a885",
"template_name": "办公用品领用申请(按库领用)",
- "seq": 2,
+ "seq": 1,
"rules": [
"addSubTableButton"
]
@@ -10,7 +10,7 @@
{
"template_id": "031d16c6-1944-47c9-98b7-08e40404f0b7",
"template_name": "加班登记",
- "seq": 1,
+ "seq": 2,
"rules": [
"addFieldOption",
"getContainerDataSource",
@@ -62,7 +62,7 @@
{
"template_id": "087739c4-3dee-4bac-b031-772497addc6b",
"template_name": "部版安管人员证书",
- "seq": 1,
+ "seq": 2,
"rules": [
"balanced_setFilter"
]
@@ -78,7 +78,7 @@
{
"template_id": "093cd444-7bff-4f47-ad30-3b9187ce8c4a",
"template_name": "培训计划",
- "seq": 1,
+ "seq": 2,
"rules": [
"addSubTableButton"
]
@@ -102,7 +102,7 @@
{
"template_id": "09aaa5dd-56d3-4364-a5ad-e77480d4d0a9",
"template_name": "总包合同登记(五建定制-列表模板)",
- "seq": 2,
+ "seq": 4,
"rules": [
"balanced_setFilter",
"getValue"
@@ -127,7 +127,7 @@
{
"template_id": "0b2e5f73-98c9-4f59-a9cc-0bc1cd87d201",
"template_name": "物资合同终止(五建定制)",
- "seq": 1,
+ "seq": 2,
"rules": [
"balanced_setFilter",
"getValue"
@@ -140,7 +140,8 @@
"rules": [
"addFieldOption",
"getContainerDataSource",
- "removeAllItems"
+ "removeAllItems",
+ "setConvertedValue"
]
},
{
@@ -150,8 +151,7 @@
"rules": [
"addFieldOption",
"getContainerDataSource",
- "removeAllItems",
- "setConvertedValue"
+ "removeAllItems"
]
},
{
@@ -165,7 +165,7 @@
{
"template_id": "0d9eac07-1978-4abb-ab1f-f1561f9bd902",
"template_name": "福利保险结算单",
- "seq": 1,
+ "seq": 2,
"rules": [
"setVisible"
]
@@ -173,7 +173,7 @@
{
"template_id": "0dab3418-8233-4f90-896e-f087b943a393",
"template_name": "员工档案-五建定制",
- "seq": 2,
+ "seq": 4,
"rules": [
"balanced_setFilter"
]
@@ -199,7 +199,7 @@
{
"template_id": "10ee75e7-0d90-493b-b9a3-6bbbbe214127",
"template_name": "项目开票申请(通用)",
- "seq": 2,
+ "seq": 1,
"rules": [
"addSubTableButton"
]
@@ -249,7 +249,7 @@
{
"template_id": "1760c344-641e-4dea-80c6-952a8e86e06a",
"template_name": "紧急放行",
- "seq": 2,
+ "seq": 1,
"rules": [
"balanced_setFilter"
]
@@ -257,7 +257,7 @@
{
"template_id": "1760c344-641e-4dea-80c6-952a8e86e06a",
"template_name": "紧急放行",
- "seq": 3,
+ "seq": 2,
"rules": [
"balanced_setFilter"
]
@@ -265,7 +265,7 @@
{
"template_id": "18fb15c9-160d-4bc3-b013-859d793ac8ba",
"template_name": "总包合同评审(五建定制-列表模板)",
- "seq": 1,
+ "seq": 3,
"rules": [
"balanced_setFilter",
"getValue"
@@ -315,7 +315,7 @@
{
"template_id": "1a66abc6-2d15-4194-b293-92c5d782cbc1",
"template_name": "施工方案审批(五建定制)",
- "seq": 2,
+ "seq": 3,
"rules": [
"balanced_setFilter",
"getValue"
@@ -324,7 +324,7 @@
{
"template_id": "1a7f5b05-adee-4a67-a311-ac9f76af2c15",
"template_name": "物资合同评审(五建定制)",
- "seq": 3,
+ "seq": 5,
"rules": [
"balanced_setFilter",
"getValue"
@@ -408,6 +408,25 @@
"template_id": "208996a7-fa97-4e99-8e35-4b592385eb37",
"template_name": "办公用品库初始化凭证",
"seq": 1,
+ "rules": [
+ "propertyDataSource_setReadOnly",
+ "setReadOnly_field"
+ ]
+ },
+ {
+ "template_id": "208996a7-fa97-4e99-8e35-4b592385eb37",
+ "template_name": "办公用品库初始化凭证",
+ "seq": 2,
+ "rules": [
+ "addSubTableButton",
+ "getContainerDataSource",
+ "setValue"
+ ]
+ },
+ {
+ "template_id": "208996a7-fa97-4e99-8e35-4b592385eb37",
+ "template_name": "办公用品库初始化凭证",
+ "seq": 4,
"rules": [
"getValue",
"setCaption",
@@ -417,34 +436,15 @@
{
"template_id": "208996a7-fa97-4e99-8e35-4b592385eb37",
"template_name": "办公用品库初始化凭证",
- "seq": 2,
+ "seq": 6,
"rules": [
"addSubTableButton"
]
},
- {
- "template_id": "208996a7-fa97-4e99-8e35-4b592385eb37",
- "template_name": "办公用品库初始化凭证",
- "seq": 3,
- "rules": [
- "propertyDataSource_setReadOnly",
- "setReadOnly_field"
- ]
- },
- {
- "template_id": "208996a7-fa97-4e99-8e35-4b592385eb37",
- "template_name": "办公用品库初始化凭证",
- "seq": 4,
- "rules": [
- "addSubTableButton",
- "getContainerDataSource",
- "setValue"
- ]
- },
{
"template_id": "209a68bd-77c9-48ce-9522-cbcb19b144e5",
"template_name": "劳务公司信息(五建定制)-暂时不用",
- "seq": 1,
+ "seq": 2,
"rules": [
"group_setReadOnly"
]
@@ -460,7 +460,7 @@
{
"template_id": "2164d1df-1f4a-4a89-9c67-ce7102206771",
"template_name": "项目报销确认",
- "seq": 1,
+ "seq": 3,
"rules": [
"setCaption"
]
@@ -468,7 +468,7 @@
{
"template_id": "218e2737-08c6-47f2-849f-f8b5ee8ee34c",
"template_name": "销项税预缴税金(五建定制)",
- "seq": 1,
+ "seq": 3,
"rules": [
"balanced_setFilter",
"getValue"
@@ -477,7 +477,7 @@
{
"template_id": "2213796d-03b0-4b74-b923-6be0415cd002",
"template_name": "劳务分包合同登记-不需要评审(五建定制)",
- "seq": 2,
+ "seq": 4,
"rules": [
"balanced_setFilter",
"getValue"
@@ -538,7 +538,7 @@
{
"template_id": "23664f1d-8525-4a82-a0ad-1a91795f9d2f",
"template_name": "考勤打卡异常表",
- "seq": 2,
+ "seq": 3,
"rules": [
"balanced_setFilter"
]
@@ -546,7 +546,7 @@
{
"template_id": "23664f1d-8525-4a82-a0ad-1a91795f9d2f",
"template_name": "考勤打卡异常表",
- "seq": 3,
+ "seq": 4,
"rules": [
"getDisplay"
]
@@ -554,8 +554,9 @@
{
"template_id": "2435b247-473c-4ac5-aa30-6a347ea70978",
"template_name": "(设计项目)项目报销申请",
- "seq": 1,
+ "seq": 3,
"rules": [
+ "getContainerDataSource",
"setCaption"
]
},
@@ -564,14 +565,13 @@
"template_name": "(设计项目)项目报销申请",
"seq": 4,
"rules": [
- "getContainerDataSource",
"setCaption"
]
},
{
"template_id": "245c5735-289b-4d14-8076-18f4c2b68896",
"template_name": "按经办人统计办公报销表",
- "seq": 1,
+ "seq": 4,
"rules": [
"setVisible"
]
@@ -598,7 +598,7 @@
{
"template_id": "24d30c00-6186-4103-8ba4-275a49d55163",
"template_name": "按经办人统计办公报销表(个人查看)",
- "seq": 2,
+ "seq": 4,
"rules": [
"setVisible"
]
@@ -606,7 +606,7 @@
{
"template_id": "24f98852-34b5-4c56-b485-ed5d638a286d",
"template_name": "施工方案审批-工程师",
- "seq": 1,
+ "seq": 3,
"rules": [
"addSubTableButton"
]
@@ -716,8 +716,9 @@
{
"template_id": "2adb5c40-b5ec-4644-b4bd-24c826640a17",
"template_name": "项目报销申请",
- "seq": 2,
+ "seq": 3,
"rules": [
+ "getContainerDataSource",
"setCaption"
]
},
@@ -726,14 +727,13 @@
"template_name": "项目报销申请",
"seq": 4,
"rules": [
- "getContainerDataSource",
"setCaption"
]
},
{
"template_id": "2c346067-eb1e-4f29-ac5d-dd09d2eaad08",
"template_name": "办公付款申请",
- "seq": 2,
+ "seq": 3,
"rules": [
"getContainerDataSource"
]
@@ -760,21 +760,21 @@
"template_name": "建造师注册证",
"seq": 1,
"rules": [
- "balanced_setFilter"
+ "setConvertedValue"
]
},
{
"template_id": "2cceb83c-4079-43e4-b7b7-c395fd68cbbc",
"template_name": "建造师注册证",
- "seq": 2,
+ "seq": 8,
"rules": [
- "setConvertedValue"
+ "balanced_setFilter"
]
},
{
"template_id": "2d046844-a126-4822-910e-bfe1283b5ebf",
"template_name": "办公用品领用申请",
- "seq": 2,
+ "seq": 3,
"rules": [
"Notification_show",
"addSubTableButton",
@@ -825,7 +825,7 @@
{
"template_id": "2fac21ea-2964-4295-b3e9-cad7c3391ff1",
"template_name": "合格供方对账(五建-分包合同结算)",
- "seq": 1,
+ "seq": 3,
"rules": [
"balanced_setFilter"
]
@@ -844,7 +844,10 @@
"template_name": "收发存明细",
"seq": 1,
"rules": [
- "setEnabled"
+ "Notification_show",
+ "getContainerDataSource",
+ "getValue",
+ "setValue"
]
},
{
@@ -852,10 +855,7 @@
"template_name": "收发存明细",
"seq": 2,
"rules": [
- "Notification_show",
- "getContainerDataSource",
- "getValue",
- "setValue"
+ "setEnabled"
]
},
{
@@ -910,18 +910,18 @@
{
"template_id": "328b3366-170f-4321-b06c-5593668b5535",
"template_name": "施工日志-审批",
- "seq": 3,
+ "seq": 1,
"rules": [
- "balanced_setFilter",
- "reload"
+ "balanced_setFilter"
]
},
{
"template_id": "328b3366-170f-4321-b06c-5593668b5535",
"template_name": "施工日志-审批",
- "seq": 4,
+ "seq": 2,
"rules": [
- "balanced_setFilter"
+ "balanced_setFilter",
+ "reload"
]
},
{
@@ -971,7 +971,7 @@
{
"template_id": "35b9139e-a491-44a8-b586-cfa50554377d",
"template_name": "计划成本申报",
- "seq": 1,
+ "seq": 3,
"rules": [
"balanced_setFilter",
"getValue"
@@ -980,7 +980,7 @@
{
"template_id": "36bbda1c-ab9e-4c30-ae14-be3b792a1841",
"template_name": "签证申请(不涉及费用)",
- "seq": 3,
+ "seq": 1,
"rules": [
"addSubTableButton"
]
@@ -1008,14 +1008,6 @@
"template_id": "3c853250-5dfb-4ad3-9501-a229337d77a7",
"template_name": "月度施工计划",
"seq": 1,
- "rules": [
- "balanced_setFilter"
- ]
- },
- {
- "template_id": "3c853250-5dfb-4ad3-9501-a229337d77a7",
- "template_name": "月度施工计划",
- "seq": 2,
"rules": [
"addFieldOption",
"getContainerDataSource",
@@ -1026,17 +1018,25 @@
{
"template_id": "3c853250-5dfb-4ad3-9501-a229337d77a7",
"template_name": "月度施工计划",
- "seq": 4,
+ "seq": 2,
"rules": [
"addFieldOption",
"getContainerDataSource",
"removeAllItems"
]
},
+ {
+ "template_id": "3c853250-5dfb-4ad3-9501-a229337d77a7",
+ "template_name": "月度施工计划",
+ "seq": 4,
+ "rules": [
+ "balanced_setFilter"
+ ]
+ },
{
"template_id": "3c9e1ae7-53bf-4e0f-bd0f-0961a895bec8",
"template_name": "培训需求",
- "seq": 1,
+ "seq": 2,
"rules": [
"addSubTableButton"
]
@@ -1055,8 +1055,7 @@
"template_name": "项目人员配置评审",
"seq": 1,
"rules": [
- "balanced_setFilter",
- "getValue"
+ "addSubTableButton"
]
},
{
@@ -1064,13 +1063,14 @@
"template_name": "项目人员配置评审",
"seq": 2,
"rules": [
- "addSubTableButton"
+ "balanced_setFilter",
+ "getValue"
]
},
{
"template_id": "3db3885a-e4ff-41d3-bd15-d8aa1c173519",
"template_name": "分包合同变更登记(五建定制)",
- "seq": 1,
+ "seq": 4,
"rules": [
"balanced_setFilter",
"getValue"
@@ -1087,15 +1087,18 @@
{
"template_id": "3e6d39b5-bb6f-4e2b-b756-fe9158cc57ec",
"template_name": "年度施工计划",
- "seq": 2,
+ "seq": 1,
"rules": [
- "balanced_setFilter"
+ "addFieldOption",
+ "getContainerDataSource",
+ "removeAllItems",
+ "setConvertedValue"
]
},
{
"template_id": "3e6d39b5-bb6f-4e2b-b756-fe9158cc57ec",
"template_name": "年度施工计划",
- "seq": 3,
+ "seq": 2,
"rules": [
"addFieldOption",
"getContainerDataSource",
@@ -1107,10 +1110,7 @@
"template_name": "年度施工计划",
"seq": 4,
"rules": [
- "addFieldOption",
- "getContainerDataSource",
- "removeAllItems",
- "setConvertedValue"
+ "balanced_setFilter"
]
},
{
@@ -1124,7 +1124,7 @@
{
"template_id": "3f77bb7a-5f68-4924-ad59-7522fd07904e",
"template_name": "付款确认选择框-五建定制(未付讫的付款申请)",
- "seq": 1,
+ "seq": 2,
"rules": [
"balanced_setFilter",
"getValue"
@@ -1143,7 +1143,7 @@
"template_name": "现场材料领用(土建-查看)",
"seq": 1,
"rules": [
- "balanced_setFilter"
+ "addSubTableButton"
]
},
{
@@ -1151,13 +1151,13 @@
"template_name": "现场材料领用(土建-查看)",
"seq": 2,
"rules": [
- "addSubTableButton"
+ "balanced_setFilter"
]
},
{
"template_id": "4176677f-8b2b-44f0-a623-52430c131146",
"template_name": "投标保证金登记(定制-退款带审批)",
- "seq": 2,
+ "seq": 1,
"rules": [
"setValue"
]
@@ -1165,7 +1165,7 @@
{
"template_id": "41790f50-c1b0-448e-98c7-c8c306a3fbf9",
"template_name": "投标保证金退款登记(通用)",
- "seq": 2,
+ "seq": 1,
"rules": [
"setValue"
]
@@ -1173,7 +1173,7 @@
{
"template_id": "4230b669-a107-4ffb-9aae-e814560d8c6e",
"template_name": "员工档案(带证书)",
- "seq": 4,
+ "seq": 1,
"rules": [
"addFieldOption",
"getContainerDataSource",
@@ -1183,7 +1183,7 @@
{
"template_id": "4230b669-a107-4ffb-9aae-e814560d8c6e",
"template_name": "员工档案(带证书)",
- "seq": 6,
+ "seq": 7,
"rules": [
"balanced_setFilter"
]
@@ -1217,18 +1217,18 @@
{
"template_id": "43416f91-33d7-46ed-8fd9-0e9f061fe671",
"template_name": "现场材料进场-有订单(土建)",
- "seq": 1,
+ "seq": 2,
"rules": [
- "addSubTableButton",
- "setVisible"
+ "addSubTableButton"
]
},
{
"template_id": "43416f91-33d7-46ed-8fd9-0e9f061fe671",
"template_name": "现场材料进场-有订单(土建)",
- "seq": 2,
+ "seq": 3,
"rules": [
- "addSubTableButton"
+ "addSubTableButton",
+ "setVisible"
]
},
{
@@ -1250,7 +1250,7 @@
{
"template_id": "44397c5d-ea09-4354-9dc1-0b9d01e8f89e",
"template_name": "福利保险缴交(项目)",
- "seq": 1,
+ "seq": 2,
"rules": [
"balanced_setFilter",
"getValue"
@@ -1275,7 +1275,7 @@
{
"template_id": "4694be71-c279-4e4d-abe1-95b71a64395d",
"template_name": "专业分包合同终止(五建定制)",
- "seq": 1,
+ "seq": 2,
"rules": [
"balanced_setFilter",
"getValue"
@@ -1300,7 +1300,7 @@
{
"template_id": "4a4fa51b-9667-4881-be2c-4ae6e4ade92e",
"template_name": "功能控制管理列表",
- "seq": 1,
+ "seq": 3,
"rules": [
"setReadOnly_field"
]
@@ -1309,6 +1309,14 @@
"template_id": "4aca8c8a-1c18-4645-81ff-f135905e91eb",
"template_name": "工程信息维护(五建定制)",
"seq": 1,
+ "rules": [
+ "balanced_setFilter"
+ ]
+ },
+ {
+ "template_id": "4aca8c8a-1c18-4645-81ff-f135905e91eb",
+ "template_name": "工程信息维护(五建定制)",
+ "seq": 4,
"rules": [
"setRequired",
"setRequiredError"
@@ -1317,15 +1325,7 @@
{
"template_id": "4aca8c8a-1c18-4645-81ff-f135905e91eb",
"template_name": "工程信息维护(五建定制)",
- "seq": 3,
- "rules": [
- "balanced_setFilter"
- ]
- },
- {
- "template_id": "4aca8c8a-1c18-4645-81ff-f135905e91eb",
- "template_name": "工程信息维护(五建定制)",
- "seq": 7,
+ "seq": 5,
"rules": [
"showDeleteButton"
]
@@ -1335,8 +1335,7 @@
"template_name": "预算资源计划",
"seq": 1,
"rules": [
- "balanced_setFilter",
- "reload"
+ "getDisplay"
]
},
{
@@ -1344,7 +1343,8 @@
"template_name": "预算资源计划",
"seq": 2,
"rules": [
- "getDisplay"
+ "balanced_setFilter",
+ "reload"
]
},
{
@@ -1358,33 +1358,33 @@
{
"template_id": "4bbd17b6-9a7c-4b54-93ff-1528de482a41",
"template_name": "进项税额转出(五建定制)",
- "seq": 1,
- "rules": [
- "balanced_setFilter",
- "getValue"
- ]
- },
- {
- "template_id": "4c36efd8-d1d8-4593-9420-57ea0fe02726",
- "template_name": "收房变更申请",
- "seq": 1,
- "rules": [
- "balanced_setFilter",
- "getValue"
- ]
- },
- {
- "template_id": "4c36efd8-d1d8-4593-9420-57ea0fe02726",
- "template_name": "收房变更申请",
"seq": 2,
+ "rules": [
+ "balanced_setFilter",
+ "getValue"
+ ]
+ },
+ {
+ "template_id": "4c36efd8-d1d8-4593-9420-57ea0fe02726",
+ "template_name": "收房变更申请",
+ "seq": 1,
"rules": [
"addSubTableButton"
]
},
+ {
+ "template_id": "4c36efd8-d1d8-4593-9420-57ea0fe02726",
+ "template_name": "收房变更申请",
+ "seq": 2,
+ "rules": [
+ "balanced_setFilter",
+ "getValue"
+ ]
+ },
{
"template_id": "4c604d7d-6b40-4b2b-9456-813ab7bcf0cf",
"template_name": "项目风险金登记(定制-退款带审批)",
- "seq": 2,
+ "seq": 1,
"rules": [
"setValue"
]
@@ -1393,6 +1393,14 @@
"template_id": "4d20f1f6-57b2-4263-8c44-b46963ce8efb",
"template_name": "预算资源耗用",
"seq": 1,
+ "rules": [
+ "getDisplay"
+ ]
+ },
+ {
+ "template_id": "4d20f1f6-57b2-4263-8c44-b46963ce8efb",
+ "template_name": "预算资源耗用",
+ "seq": 2,
"rules": [
"balanced_setFilter",
"reload"
@@ -1401,23 +1409,15 @@
{
"template_id": "4d20f1f6-57b2-4263-8c44-b46963ce8efb",
"template_name": "预算资源耗用",
- "seq": 4,
+ "seq": 3,
"rules": [
"balanced_setFilter"
]
},
- {
- "template_id": "4d20f1f6-57b2-4263-8c44-b46963ce8efb",
- "template_name": "预算资源耗用",
- "seq": 5,
- "rules": [
- "getDisplay"
- ]
- },
{
"template_id": "4ea83ef3-2c84-4525-a792-7a7097e4037d",
"template_name": "职称",
- "seq": 1,
+ "seq": 5,
"rules": [
"balanced_setFilter"
]
@@ -1425,7 +1425,7 @@
{
"template_id": "4ea90eab-86e5-4956-9dca-8fdc83fd8ff8",
"template_name": "项目月完成工作量",
- "seq": 2,
+ "seq": 1,
"rules": [
"addFieldOption",
"getContainerDataSource",
@@ -1530,7 +1530,7 @@
{
"template_id": "55f528a5-196d-4fef-a020-1b3dcba9d59a",
"template_name": "总包合同登记",
- "seq": 2,
+ "seq": 1,
"rules": [
"setReadOnly_field"
]
@@ -1555,7 +1555,7 @@
{
"template_id": "590bcbf9-9b17-4be6-8b2c-adf04e7e24b3",
"template_name": "物资采购订单(土建-查看全部)",
- "seq": 1,
+ "seq": 2,
"rules": [
"setCaption",
"setVisible"
@@ -1608,7 +1608,7 @@
{
"template_id": "5e618173-2ee1-406b-9829-28c58871316e",
"template_name": "专业分包合同评审(五建定制)",
- "seq": 4,
+ "seq": 5,
"rules": [
"balanced_setFilter",
"getValue"
@@ -1622,15 +1622,6 @@
"group_setReadOnly"
]
},
- {
- "template_id": "612b61ad-95e4-4575-a50f-c16f65a04829",
- "template_name": "安全隐患整改通知单(五建定制)",
- "seq": 1,
- "rules": [
- "balanced_setFilter",
- "getValue"
- ]
- },
{
"template_id": "612b61ad-95e4-4575-a50f-c16f65a04829",
"template_name": "安全隐患整改通知单(五建定制)",
@@ -1639,10 +1630,19 @@
"addSubTableButton"
]
},
+ {
+ "template_id": "612b61ad-95e4-4575-a50f-c16f65a04829",
+ "template_name": "安全隐患整改通知单(五建定制)",
+ "seq": 4,
+ "rules": [
+ "balanced_setFilter",
+ "getValue"
+ ]
+ },
{
"template_id": "623fa631-ed8d-47e1-9ec7-762fb4252615",
"template_name": "用车申请",
- "seq": 3,
+ "seq": 1,
"rules": [
"propertyDataSource_setReadOnly",
"setReadOnly_field",
@@ -1653,23 +1653,23 @@
"template_id": "6575d326-4a38-4d2b-aa38-6bf28a7ce96a",
"template_name": "印章废止申请",
"seq": 2,
- "rules": [
- "setValue"
- ]
- },
- {
- "template_id": "6575d326-4a38-4d2b-aa38-6bf28a7ce96a",
- "template_name": "印章废止申请",
- "seq": 4,
"rules": [
"balanced_setFilter",
"getValue"
]
},
+ {
+ "template_id": "6575d326-4a38-4d2b-aa38-6bf28a7ce96a",
+ "template_name": "印章废止申请",
+ "seq": 3,
+ "rules": [
+ "setValue"
+ ]
+ },
{
"template_id": "66dafe5b-cd77-4b78-aaea-314ca995478a",
"template_name": "部版特种作业人员证书",
- "seq": 3,
+ "seq": 2,
"rules": [
"balanced_setFilter"
]
@@ -1702,7 +1702,7 @@
{
"template_id": "6822d55e-ee60-4d87-8f11-377488ab748c",
"template_name": "考勤月统计表",
- "seq": 2,
+ "seq": 3,
"rules": [
"balanced_setFilter"
]
@@ -1710,7 +1710,7 @@
{
"template_id": "6822d55e-ee60-4d87-8f11-377488ab748c",
"template_name": "考勤月统计表",
- "seq": 3,
+ "seq": 4,
"rules": [
"getDisplay"
]
@@ -1738,7 +1738,7 @@
{
"template_id": "693aefa6-861e-4abd-98dc-9b972ad89198",
"template_name": "员工考勤统计表",
- "seq": 5,
+ "seq": 4,
"rules": [
"balanced_setFilter"
]
@@ -1781,7 +1781,7 @@
{
"template_id": "6c9bf668-0ef1-461e-a264-aad3e93a7f91",
"template_name": "考勤打卡记录表",
- "seq": 2,
+ "seq": 1,
"rules": [
"getDisplay"
]
@@ -1823,7 +1823,8 @@
"template_name": "印章刻制申请",
"seq": 1,
"rules": [
- "setValue"
+ "balanced_setFilter",
+ "getValue"
]
},
{
@@ -1831,8 +1832,7 @@
"template_name": "印章刻制申请",
"seq": 3,
"rules": [
- "balanced_setFilter",
- "getValue"
+ "setValue"
]
},
{
@@ -1855,7 +1855,7 @@
{
"template_id": "7311c9bf-9920-4368-a9e8-79535b692d0d",
"template_name": "履约保证金登记(定制-退款带审批)",
- "seq": 1,
+ "seq": 3,
"rules": [
"setValue"
]
@@ -1863,7 +1863,7 @@
{
"template_id": "745c9534-c755-4ef5-bc26-8b78a802ec4a",
"template_name": "验工月报区间",
- "seq": 3,
+ "seq": 2,
"rules": [
"addFieldOption",
"getContainerDataSource",
@@ -1933,11 +1933,19 @@
{
"template_id": "78d7a97c-19fe-433c-8781-afdf87e8b128",
"template_name": "公告管理",
- "seq": 1,
+ "seq": 2,
"rules": [
"setViewWithoutEditor"
]
},
+ {
+ "template_id": "7a0ac7a9-32bc-4d32-9231-4d1bbcd86002",
+ "template_name": "造价师注册证",
+ "seq": 1,
+ "rules": [
+ "setConvertedValue"
+ ]
+ },
{
"template_id": "7a0ac7a9-32bc-4d32-9231-4d1bbcd86002",
"template_name": "造价师注册证",
@@ -1946,14 +1954,6 @@
"balanced_setFilter"
]
},
- {
- "template_id": "7a0ac7a9-32bc-4d32-9231-4d1bbcd86002",
- "template_name": "造价师注册证",
- "seq": 5,
- "rules": [
- "setConvertedValue"
- ]
- },
{
"template_id": "7bcec5d4-1c4a-4cd4-b22f-20ad2c19aaca",
"template_name": "周转(公司自购)材料采购申请",
@@ -1979,6 +1979,16 @@
"setValue"
]
},
+ {
+ "template_id": "7c519a1d-b2a8-406f-b397-e5d866f63ead",
+ "template_name": "个人薪资汇总表",
+ "seq": 1,
+ "rules": [
+ "addFieldOption",
+ "getContainerDataSource",
+ "removeAllItems"
+ ]
+ },
{
"template_id": "7c519a1d-b2a8-406f-b397-e5d866f63ead",
"template_name": "个人薪资汇总表",
@@ -1995,16 +2005,6 @@
"balanced_setFilter"
]
},
- {
- "template_id": "7c519a1d-b2a8-406f-b397-e5d866f63ead",
- "template_name": "个人薪资汇总表",
- "seq": 4,
- "rules": [
- "addFieldOption",
- "getContainerDataSource",
- "removeAllItems"
- ]
- },
{
"template_id": "7d64df3f-070c-4e2d-814e-06e071052e32",
"template_name": "收文拟稿归档表单",
@@ -2016,7 +2016,7 @@
{
"template_id": "7db614d1-514e-4db5-8d13-0c4953e128a3",
"template_name": "项目风险金登记(通用)",
- "seq": 2,
+ "seq": 1,
"rules": [
"setValue"
]
@@ -2056,9 +2056,9 @@
{
"template_id": "7f349082-aa43-4324-a4f3-f204b42bd180",
"template_name": "休假、出差、外出统计表(分公司)",
- "seq": 2,
+ "seq": 3,
"rules": [
- "getDisplay"
+ "balanced_setFilter"
]
},
{
@@ -2066,7 +2066,7 @@
"template_name": "休假、出差、外出统计表(分公司)",
"seq": 4,
"rules": [
- "balanced_setFilter"
+ "getDisplay"
]
},
{
@@ -2115,7 +2115,7 @@
{
"template_id": "8269d5f9-d44a-46c6-90cc-f5d6cdd92c35",
"template_name": "安全技术交底(五建定制)",
- "seq": 1,
+ "seq": 4,
"rules": [
"balanced_setFilter",
"getValue"
@@ -2133,9 +2133,10 @@
{
"template_id": "86c05eb5-753d-46e5-b958-cdbcefe7eabc",
"template_name": "销项税发票",
- "seq": 2,
+ "seq": 4,
"rules": [
- "balanced_setFilter"
+ "getContainerDataSource",
+ "reload"
]
},
{
@@ -2143,14 +2144,13 @@
"template_name": "销项税发票",
"seq": 5,
"rules": [
- "getContainerDataSource",
- "reload"
+ "balanced_setFilter"
]
},
{
"template_id": "8712cb8c-0412-4132-9b21-9240c5a47c5e",
"template_name": "休假申请",
- "seq": 2,
+ "seq": 1,
"rules": [
"addFieldOption",
"getContainerDataSource",
@@ -2160,7 +2160,7 @@
{
"template_id": "8712cb8c-0412-4132-9b21-9240c5a47c5e",
"template_name": "休假申请",
- "seq": 3,
+ "seq": 2,
"rules": [
"addFieldOption",
"getContainerDataSource",
@@ -2170,16 +2170,7 @@
{
"template_id": "8769212f-daa2-4ac2-8d00-dfd49afb6ac6",
"template_name": "施工方案论证(五建定制)",
- "seq": 1,
- "rules": [
- "balanced_setFilter",
- "getValue"
- ]
- },
- {
- "template_id": "87ed6b66-6c3f-45f2-a889-606710c3ebd3",
- "template_name": "施工方案审批-工程师(五建定制)",
- "seq": 1,
+ "seq": 2,
"rules": [
"balanced_setFilter",
"getValue"
@@ -2209,10 +2200,19 @@
"addSubTableButton"
]
},
+ {
+ "template_id": "87ed6b66-6c3f-45f2-a889-606710c3ebd3",
+ "template_name": "施工方案审批-工程师(五建定制)",
+ "seq": 7,
+ "rules": [
+ "balanced_setFilter",
+ "getValue"
+ ]
+ },
{
"template_id": "884f0dde-564a-4e6e-9a5d-55d12d0a16e1",
"template_name": "物资采购申请(土建-项目)",
- "seq": 1,
+ "seq": 4,
"rules": [
"setVisible"
]
@@ -2279,7 +2279,7 @@
"template_name": "现场材料领用(土建)",
"seq": 1,
"rules": [
- "balanced_setFilter"
+ "addSubTableButton"
]
},
{
@@ -2287,7 +2287,7 @@
"template_name": "现场材料领用(土建)",
"seq": 2,
"rules": [
- "addSubTableButton"
+ "balanced_setFilter"
]
},
{
@@ -2301,7 +2301,7 @@
{
"template_id": "8b699c89-569d-4719-994d-b76f01bcde68",
"template_name": "周转(租赁)材料采购申请",
- "seq": 2,
+ "seq": 1,
"rules": [
"addSubTableButton"
]
@@ -2317,7 +2317,7 @@
{
"template_id": "8c4a3b9f-0272-4675-8363-dd2f96a4f955",
"template_name": "专业分包合同登记_需要评审(五建定制)",
- "seq": 2,
+ "seq": 3,
"rules": [
"balanced_setFilter",
"getValue"
@@ -2326,7 +2326,7 @@
{
"template_id": "8dabd087-ddc6-4750-903b-2be1e0d127f8",
"template_name": "考勤月分析表",
- "seq": 2,
+ "seq": 1,
"rules": [
"getDisplay"
]
@@ -2358,7 +2358,7 @@
{
"template_id": "8dbb3d79-4f87-450a-90c4-8c81ccc8a10f",
"template_name": "招投标工程",
- "seq": 4,
+ "seq": 3,
"rules": [
"getValue",
"setReadOnly_field"
@@ -2383,7 +2383,7 @@
{
"template_id": "8f22cab7-e475-4c5e-b575-e45486a7b281",
"template_name": "印章使用申请",
- "seq": 3,
+ "seq": 2,
"rules": [
"setCaption"
]
@@ -2401,7 +2401,9 @@
"template_name": "公司工资汇总报表",
"seq": 1,
"rules": [
- "getValue"
+ "addFieldOption",
+ "getContainerDataSource",
+ "removeAllItems"
]
},
{
@@ -2409,15 +2411,21 @@
"template_name": "公司工资汇总报表",
"seq": 2,
"rules": [
- "addFieldOption",
- "getContainerDataSource",
- "removeAllItems"
+ "getValue"
]
},
{
"template_id": "8fbf5298-4588-42e9-ab52-698fc9b380d3",
"template_name": "工程信息维护",
- "seq": 3,
+ "seq": 1,
+ "rules": [
+ "balanced_setFilter"
+ ]
+ },
+ {
+ "template_id": "8fbf5298-4588-42e9-ab52-698fc9b380d3",
+ "template_name": "工程信息维护",
+ "seq": 4,
"rules": [
"setRequired",
"setRequiredError"
@@ -2426,19 +2434,11 @@
{
"template_id": "8fbf5298-4588-42e9-ab52-698fc9b380d3",
"template_name": "工程信息维护",
- "seq": 4,
+ "seq": 5,
"rules": [
"showDeleteButton"
]
},
- {
- "template_id": "8fbf5298-4588-42e9-ab52-698fc9b380d3",
- "template_name": "工程信息维护",
- "seq": 7,
- "rules": [
- "balanced_setFilter"
- ]
- },
{
"template_id": "908652e1-fecf-427b-8be2-3da1675bf80d",
"template_name": "劳务分包合同登记-需要评审(五建定制)",
@@ -2460,7 +2460,7 @@
{
"template_id": "90b182aa-4d0f-4e26-a516-0acfc714e9c8",
"template_name": "办公用品采购申请",
- "seq": 2,
+ "seq": 3,
"rules": [
"addSubTableButton"
]
@@ -2503,7 +2503,7 @@
{
"template_id": "93a3c6d5-bdda-4fbc-b1f3-a496aea19575",
"template_name": "物资采购订单(土建)",
- "seq": 2,
+ "seq": 1,
"rules": [
"addSubTableButton",
"setCaption",
@@ -2530,7 +2530,7 @@
{
"template_id": "93af07e6-e00b-4908-a61f-49d455370301",
"template_name": "机械合同评审(五建定制)",
- "seq": 3,
+ "seq": 5,
"rules": [
"balanced_setFilter",
"getValue"
@@ -2540,31 +2540,23 @@
"template_id": "94cb7bac-3f71-46e2-a682-6f9df22fc28d",
"template_name": "印章使用状态变更",
"seq": 1,
+ "rules": [
+ "balanced_setFilter",
+ "getValue"
+ ]
+ },
+ {
+ "template_id": "94cb7bac-3f71-46e2-a682-6f9df22fc28d",
+ "template_name": "印章使用状态变更",
+ "seq": 2,
"rules": [
"setValue"
]
},
- {
- "template_id": "94cb7bac-3f71-46e2-a682-6f9df22fc28d",
- "template_name": "印章使用状态变更",
- "seq": 2,
- "rules": [
- "balanced_setFilter",
- "getValue"
- ]
- },
{
"template_id": "952aafd7-add7-4b49-9601-7a39b9ab5d9d",
"template_name": "个人薪资汇总表(仅自己)",
"seq": 1,
- "rules": [
- "balanced_setFilter"
- ]
- },
- {
- "template_id": "952aafd7-add7-4b49-9601-7a39b9ab5d9d",
- "template_name": "个人薪资汇总表(仅自己)",
- "seq": 2,
"rules": [
"addFieldOption",
"getContainerDataSource",
@@ -2574,11 +2566,19 @@
{
"template_id": "952aafd7-add7-4b49-9601-7a39b9ab5d9d",
"template_name": "个人薪资汇总表(仅自己)",
- "seq": 3,
+ "seq": 2,
"rules": [
"getValue"
]
},
+ {
+ "template_id": "952aafd7-add7-4b49-9601-7a39b9ab5d9d",
+ "template_name": "个人薪资汇总表(仅自己)",
+ "seq": 3,
+ "rules": [
+ "balanced_setFilter"
+ ]
+ },
{
"template_id": "959a1427-308d-4522-8e72-fd1998effea4",
"template_name": "周转(租赁)材料调整单",
@@ -2616,7 +2616,7 @@
{
"template_id": "99d77f69-b08f-49d3-937a-2ad8fcb5ca6f",
"template_name": "十大员证",
- "seq": 2,
+ "seq": 5,
"rules": [
"balanced_setFilter"
]
@@ -2640,7 +2640,7 @@
{
"template_id": "9c66344f-554d-48f0-8383-709baf917b67",
"template_name": "绩效管理-考核方案选择列表",
- "seq": 1,
+ "seq": 2,
"rules": [
"addFieldOption",
"getContainerDataSource",
@@ -2651,7 +2651,7 @@
{
"template_id": "9d8359da-c860-48b1-bf38-841c80cf15f5",
"template_name": "项目资金往来设置",
- "seq": 1,
+ "seq": 2,
"rules": [
"balanced_setFilter"
]
@@ -2667,7 +2667,7 @@
{
"template_id": "9f063c00-fdd0-494e-9564-f5372e8b62a8",
"template_name": "员工档案(显示离职日期)",
- "seq": 1,
+ "seq": 4,
"rules": [
"balanced_setFilter"
]
@@ -2675,7 +2675,7 @@
{
"template_id": "a0233e27-39ea-4dca-83ab-9e05831d84bb",
"template_name": "机械合同登记-需要评审(五建定制)",
- "seq": 1,
+ "seq": 2,
"rules": [
"balanced_setFilter",
"getValue"
@@ -2684,7 +2684,7 @@
{
"template_id": "a0307625-8abc-46b6-b835-93719a881e47",
"template_name": "周转(自购)材料盘点管理",
- "seq": 4,
+ "seq": 3,
"rules": [
"Notification_show",
"setValue"
@@ -2702,7 +2702,7 @@
{
"template_id": "a18b1f38-073c-4190-bfd5-b95274cf9f31",
"template_name": "付款确认",
- "seq": 3,
+ "seq": 1,
"rules": [
"getDetailButton_setVisible",
"getModifyButton_setVisible",
@@ -2712,7 +2712,7 @@
{
"template_id": "a1df0f12-8bfb-4807-882a-ca7b510e10f9",
"template_name": "专业分包合同登记_不需要评审(五建定制)",
- "seq": 2,
+ "seq": 4,
"rules": [
"balanced_setFilter",
"getValue"
@@ -2721,7 +2721,7 @@
{
"template_id": "a39b2ced-ba78-4174-86fc-1820753de959",
"template_name": "周转(自购)材料入库(回收)",
- "seq": 2,
+ "seq": 1,
"rules": [
"addSubTableButton"
]
@@ -2762,7 +2762,7 @@
{
"template_id": "a4ee4018-9baa-4fa7-a342-f2d121e9e41b",
"template_name": "签证申请(五建定制)",
- "seq": 2,
+ "seq": 4,
"rules": [
"balanced_setFilter",
"getValue"
@@ -2779,7 +2779,7 @@
{
"template_id": "a7486c04-c7ac-4cd6-a518-16ef68ee14df",
"template_name": "周转(自购)材料进场(购买)",
- "seq": 3,
+ "seq": 1,
"rules": [
"addSubTableButton"
]
@@ -2787,7 +2787,7 @@
{
"template_id": "a760fba0-693e-4f0a-8007-3bdca7fb0305",
"template_name": "项目人员配置",
- "seq": 3,
+ "seq": 1,
"rules": [
"removeItem"
]
@@ -2803,7 +2803,7 @@
{
"template_id": "a883973a-4d71-4b1d-ae7f-76200d228cb2",
"template_name": "周转(项目自购)材料采购申请(查看)",
- "seq": 2,
+ "seq": 1,
"rules": [
"addSubTableButton"
]
@@ -2811,7 +2811,7 @@
{
"template_id": "a90a5eb4-4d25-4898-822d-9ed157bce4de",
"template_name": "实名制考勤机管理",
- "seq": 5,
+ "seq": 2,
"rules": [
"addFieldOption",
"getContainerDataSource",
@@ -2850,7 +2850,8 @@
"template_name": "周转(租赁)材料进场(申请-进场)",
"seq": 1,
"rules": [
- "addSubTableButton"
+ "addSubTableButton",
+ "setVisible"
]
},
{
@@ -2858,8 +2859,7 @@
"template_name": "周转(租赁)材料进场(申请-进场)",
"seq": 2,
"rules": [
- "addSubTableButton",
- "setVisible"
+ "addSubTableButton"
]
},
{
@@ -2906,9 +2906,9 @@
{
"template_id": "afce5566-7ea5-43f3-8398-8a55f2a1f203",
"template_name": "项目回收资金情况统计表",
- "seq": 1,
+ "seq": 2,
"rules": [
- "balanced_setFilter"
+ "getDisplay"
]
},
{
@@ -2916,7 +2916,7 @@
"template_name": "项目回收资金情况统计表",
"seq": 3,
"rules": [
- "getDisplay"
+ "balanced_setFilter"
]
},
{
@@ -2938,7 +2938,7 @@
{
"template_id": "b233e091-ae6f-401a-bb5f-b145c8aa9ea4",
"template_name": "固定资产变动",
- "seq": 1,
+ "seq": 2,
"rules": [
"getValue",
"propertyDataSource_setReadOnly",
@@ -2995,8 +2995,7 @@
"template_name": "抵房变更申请",
"seq": 1,
"rules": [
- "balanced_setFilter",
- "getValue"
+ "addSubTableButton"
]
},
{
@@ -3004,7 +3003,8 @@
"template_name": "抵房变更申请",
"seq": 2,
"rules": [
- "addSubTableButton"
+ "balanced_setFilter",
+ "getValue"
]
},
{
@@ -3019,7 +3019,7 @@
{
"template_id": "b94d7d05-1f91-4d72-a733-5d10dc66f667",
"template_name": "安全隐患整改通知单-项目部(五建定制)",
- "seq": 2,
+ "seq": 3,
"rules": [
"balanced_setFilter",
"getValue"
@@ -3028,7 +3028,7 @@
{
"template_id": "bd835280-acb7-4ec3-9065-ce2deab35c76",
"template_name": "开票申请(非项目-工业设备用)",
- "seq": 3,
+ "seq": 1,
"rules": [
"addSubTableButton"
]
@@ -3036,7 +3036,7 @@
{
"template_id": "bf856f1b-1b1a-495f-85ba-59d4045a007d",
"template_name": "办公用品领用凭证-申请后登记",
- "seq": 1,
+ "seq": 2,
"rules": [
"addSubTableButton"
]
@@ -3066,7 +3066,7 @@
{
"template_id": "c2b26d79-3ea7-4455-b0f5-d5bf29618f17",
"template_name": "印章台帐管理",
- "seq": 1,
+ "seq": 2,
"rules": [
"balanced_setFilter",
"getValue"
@@ -3075,7 +3075,7 @@
{
"template_id": "c2b26d79-3ea7-4455-b0f5-d5bf29618f17",
"template_name": "印章台帐管理",
- "seq": 2,
+ "seq": 3,
"rules": [
"setValue"
]
@@ -3127,7 +3127,7 @@
{
"template_id": "c5b5160e-2289-4b8d-8f8e-57a4801a6e43",
"template_name": "分包合同结算",
- "seq": 2,
+ "seq": 3,
"rules": [
"balanced_setFilter"
]
@@ -3160,17 +3160,7 @@
{
"template_id": "c7b23419-22e1-4a5a-aa09-464b3bb2a242",
"template_name": "季度检查",
- "seq": 2,
- "rules": [
- "addFieldOption",
- "getContainerDataSource",
- "removeAllItems"
- ]
- },
- {
- "template_id": "c7b23419-22e1-4a5a-aa09-464b3bb2a242",
- "template_name": "季度检查",
- "seq": 3,
+ "seq": 1,
"rules": [
"addFieldOption",
"getContainerDataSource",
@@ -3178,6 +3168,16 @@
"setNullSelectionItemId"
]
},
+ {
+ "template_id": "c7b23419-22e1-4a5a-aa09-464b3bb2a242",
+ "template_name": "季度检查",
+ "seq": 2,
+ "rules": [
+ "addFieldOption",
+ "getContainerDataSource",
+ "removeAllItems"
+ ]
+ },
{
"template_id": "c804608f-eed6-45f6-accc-16414ff41e32",
"template_name": "培训结果登记",
@@ -3210,7 +3210,7 @@
{
"template_id": "c94f6988-84b9-4a86-a338-4a97b9219e3d",
"template_name": "其他合同评审(五建定制)",
- "seq": 1,
+ "seq": 5,
"rules": [
"balanced_setFilter",
"getValue"
@@ -3235,7 +3235,7 @@
{
"template_id": "ca0c2301-77c7-41d8-a073-ae0560206338",
"template_name": "其他合同登记-不需要评审(五建定制)",
- "seq": 2,
+ "seq": 3,
"rules": [
"balanced_setFilter",
"getValue"
@@ -3254,7 +3254,7 @@
{
"template_id": "cb1ef841-9c62-4593-9519-3832948e5144",
"template_name": "职称-五建定制",
- "seq": 1,
+ "seq": 4,
"rules": [
"balanced_setFilter"
]
@@ -3279,7 +3279,7 @@
{
"template_id": "cccda2a9-86fe-46d5-a496-449f2bfbf336",
"template_name": "休假登记",
- "seq": 1,
+ "seq": 2,
"rules": [
"addFieldOption",
"getContainerDataSource",
@@ -3289,7 +3289,7 @@
{
"template_id": "cccda2a9-86fe-46d5-a496-449f2bfbf336",
"template_name": "休假登记",
- "seq": 2,
+ "seq": 3,
"rules": [
"addFieldOption",
"getContainerDataSource",
@@ -3315,7 +3315,7 @@
{
"template_id": "cfc17233-cd75-4f64-8b83-822231acc4c7",
"template_name": "中标通知书登记",
- "seq": 1,
+ "seq": 2,
"rules": [
"balanced_setFilter"
]
@@ -3323,7 +3323,7 @@
{
"template_id": "d193b838-f8a3-4d72-9fef-300c7a97d23c",
"template_name": "劳务分包合同评审(五建定制)",
- "seq": 2,
+ "seq": 5,
"rules": [
"balanced_setFilter",
"getValue"
@@ -3340,7 +3340,7 @@
{
"template_id": "d2f620ce-8e06-470f-9f81-0285c2519450",
"template_name": "项目回收资金情况统计表(项目)",
- "seq": 1,
+ "seq": 2,
"rules": [
"getDisplay"
]
@@ -3356,7 +3356,7 @@
{
"template_id": "d32ae8ac-2c31-4fbe-acb9-eec07e9fda82",
"template_name": "员工档案",
- "seq": 2,
+ "seq": 4,
"rules": [
"balanced_setFilter"
]
@@ -3364,7 +3364,7 @@
{
"template_id": "d33294d5-4554-4d5b-a584-b6c5138a5220",
"template_name": "保修到期登记",
- "seq": 2,
+ "seq": 1,
"rules": [
"balanced_setFilter"
]
@@ -3372,7 +3372,7 @@
{
"template_id": "d33dbf7d-6e7b-4163-b54e-f401140aaf59",
"template_name": "周转(自购)材料移库",
- "seq": 2,
+ "seq": 1,
"rules": [
"addSubTableButton"
]
@@ -3397,7 +3397,7 @@
{
"template_id": "d5e08b2f-eda0-4268-ac1f-b0f0bbee440a",
"template_name": "我的日志",
- "seq": 1,
+ "seq": 2,
"rules": [
"setReadOnly_field"
]
@@ -3421,7 +3421,7 @@
{
"template_id": "d804c4bf-7422-4aba-8d4f-a73ea2261c3c",
"template_name": "建造师注册证-五建定制",
- "seq": 3,
+ "seq": 4,
"rules": [
"balanced_setFilter"
]
@@ -3429,7 +3429,7 @@
{
"template_id": "d82d75bb-60a8-4b79-a5f4-ee0c42556528",
"template_name": "物资需求总计划变更(土建)",
- "seq": 2,
+ "seq": 1,
"rules": [
"addSubTableButton"
]
@@ -3437,7 +3437,7 @@
{
"template_id": "da87f927-58ad-4b7a-a999-409146de8e39",
"template_name": "出差登记",
- "seq": 1,
+ "seq": 2,
"rules": [
"addFieldOption",
"getContainerDataSource",
@@ -3465,7 +3465,7 @@
{
"template_id": "dcff550a-dbfe-49d0-914b-35f6e16f4e72",
"template_name": "考勤机设备",
- "seq": 2,
+ "seq": 3,
"rules": [
"addFieldOption",
"getContainerDataSource",
@@ -3475,7 +3475,7 @@
{
"template_id": "ddb75614-ead0-470b-8050-a37111c383b8",
"template_name": "新闻管理",
- "seq": 1,
+ "seq": 2,
"rules": [
"setViewWithoutEditor"
]
@@ -3502,7 +3502,7 @@
{
"template_id": "dff0ae09-5b4c-4441-949f-044f7e0dc606",
"template_name": "总包合同变更(五建定制)",
- "seq": 1,
+ "seq": 3,
"rules": [
"balanced_setFilter",
"getValue"
@@ -3521,7 +3521,7 @@
{
"template_id": "e02569e9-9ed8-45d5-b9c5-64627062ba4d",
"template_name": "进项税发票",
- "seq": 1,
+ "seq": 2,
"rules": [
"getContainerDataSource",
"reload"
@@ -3530,7 +3530,7 @@
{
"template_id": "e02569e9-9ed8-45d5-b9c5-64627062ba4d",
"template_name": "进项税发票",
- "seq": 2,
+ "seq": 3,
"rules": [
"getContainerDataSource",
"reload"
@@ -3556,7 +3556,7 @@
{
"template_id": "e0a75ad2-7a6d-449e-98c9-d9162d1d166e",
"template_name": "项目月完成工作量确认",
- "seq": 2,
+ "seq": 1,
"rules": [
"addFieldOption",
"getContainerDataSource",
@@ -3608,7 +3608,7 @@
{
"template_id": "e4a2cca9-09ba-4776-b8c2-ab11dd9f2e25",
"template_name": "劳务分包合同终止(五建定制)",
- "seq": 1,
+ "seq": 2,
"rules": [
"balanced_setFilter",
"getValue"
@@ -3625,9 +3625,10 @@
{
"template_id": "e5a03e54-37b2-4122-971f-7f0ac57c2650",
"template_name": "进项税发票(批量调整抵扣日期)-五建定制",
- "seq": 1,
+ "seq": 2,
"rules": [
- "addSubTableButton"
+ "getContainerDataSource",
+ "reload"
]
},
{
@@ -3651,10 +3652,9 @@
{
"template_id": "e5a03e54-37b2-4122-971f-7f0ac57c2650",
"template_name": "进项税发票(批量调整抵扣日期)-五建定制",
- "seq": 5,
+ "seq": 7,
"rules": [
- "getContainerDataSource",
- "reload"
+ "addSubTableButton"
]
},
{
@@ -3680,6 +3680,7 @@
"template_name": "通知管理",
"seq": 1,
"rules": [
+ "setReadOnly_field",
"setViewWithoutEditor"
]
},
@@ -3688,14 +3689,13 @@
"template_name": "通知管理",
"seq": 3,
"rules": [
- "setReadOnly_field",
"setViewWithoutEditor"
]
},
{
"template_id": "e7670207-9cf7-4db9-a452-884b58408b96",
"template_name": "付款确认(五建定制)",
- "seq": 2,
+ "seq": 1,
"rules": [
"getDetailButton_setVisible",
"getModifyButton_setVisible",
@@ -3705,7 +3705,7 @@
{
"template_id": "e7670207-9cf7-4db9-a452-884b58408b96",
"template_name": "付款确认(五建定制)",
- "seq": 6,
+ "seq": 5,
"rules": [
"balanced_setFilter",
"getValue"
@@ -3714,7 +3714,7 @@
{
"template_id": "e7670207-9cf7-4db9-a452-884b58408b96",
"template_name": "付款确认(五建定制)",
- "seq": 7,
+ "seq": 6,
"rules": [
"addSubTableButton"
]
@@ -3730,7 +3730,7 @@
{
"template_id": "e81ca605-f14d-4f25-9b5a-37fdfbc6cffa",
"template_name": "项目收款统计表(分公司)",
- "seq": 1,
+ "seq": 2,
"rules": [
"balanced_setFilter"
]
@@ -3738,7 +3738,7 @@
{
"template_id": "e8281f72-6f44-4d21-bbf2-c20f57d42a18",
"template_name": "收发存汇总",
- "seq": 2,
+ "seq": 1,
"rules": [
"Notification_show",
"getContainerDataSource",
@@ -3749,7 +3749,7 @@
{
"template_id": "e8281f72-6f44-4d21-bbf2-c20f57d42a18",
"template_name": "收发存汇总",
- "seq": 3,
+ "seq": 2,
"rules": [
"setEnabled"
]
@@ -3757,7 +3757,7 @@
{
"template_id": "e8281f72-6f44-4d21-bbf2-c20f57d42a18",
"template_name": "收发存汇总",
- "seq": 4,
+ "seq": 3,
"rules": [
"setEnabled"
]
@@ -3773,7 +3773,7 @@
{
"template_id": "e9337bfe-992a-4dd4-a777-171bce57d481",
"template_name": "选择付款确认",
- "seq": 2,
+ "seq": 1,
"rules": [
"getDetailButton_setVisible",
"getModifyButton_setVisible",
@@ -3848,7 +3848,7 @@
{
"template_id": "ee540888-2963-4e99-b8dc-b4be5ecc1c4e",
"template_name": "(设计项目)项目报销确认",
- "seq": 1,
+ "seq": 3,
"rules": [
"setCaption"
]
@@ -3905,7 +3905,7 @@
{
"template_id": "f01a91fe-62a8-4b64-a871-bcb20d914d51",
"template_name": "绩效管理-评估记录",
- "seq": 1,
+ "seq": 2,
"rules": [
"addFieldOption",
"getContainerDataSource",
@@ -3915,26 +3915,26 @@
},
{
"template_id": "f01c2f57-1891-45de-9318-7246f9d6ac97",
- "template_name": "销项税发票(增加审批通过后修改加批量撤回)-五建定制",
- "seq": 1,
- "rules": [
- "balanced_setFilter",
- "getValue"
- ]
- },
- {
- "template_id": "f01c2f57-1891-45de-9318-7246f9d6ac97",
- "template_name": "销项税发票(增加审批通过后修改加批量撤回)-五建定制",
- "seq": 2,
+ "template_name": "销项税发票(增加审批通过后)-五建定制",
+ "seq": 4,
"rules": [
"getContainerDataSource",
"reload"
]
},
+ {
+ "template_id": "f01c2f57-1891-45de-9318-7246f9d6ac97",
+ "template_name": "销项税发票(增加审批通过后)-五建定制",
+ "seq": 6,
+ "rules": [
+ "balanced_setFilter",
+ "getValue"
+ ]
+ },
{
"template_id": "f0a66f6e-9983-4a6b-bce2-7cdfca754f5f",
"template_name": "签证申请",
- "seq": 2,
+ "seq": 1,
"rules": [
"addSubTableButton"
]
@@ -3967,7 +3967,7 @@
{
"template_id": "f44b7503-07a6-4997-8fe0-837c6a125088",
"template_name": "周转(项目自购)材料采购申请",
- "seq": 3,
+ "seq": 1,
"rules": [
"addSubTableButton"
]
@@ -3975,7 +3975,7 @@
{
"template_id": "f475e860-0026-49a8-b2ff-510101386c6a",
"template_name": "其他证书",
- "seq": 2,
+ "seq": 5,
"rules": [
"balanced_setFilter"
]
@@ -3999,17 +3999,17 @@
{
"template_id": "f612680b-dea7-44c1-99e3-cc067ea46780",
"template_name": "休假、出差、外出统计表",
- "seq": 2,
+ "seq": 3,
"rules": [
- "getDisplay"
+ "balanced_setFilter"
]
},
{
"template_id": "f612680b-dea7-44c1-99e3-cc067ea46780",
"template_name": "休假、出差、外出统计表",
- "seq": 3,
+ "seq": 4,
"rules": [
- "balanced_setFilter"
+ "getDisplay"
]
},
{
@@ -4041,7 +4041,7 @@
{
"template_id": "f78c44ca-4a23-4195-996b-2cd7cf629c41",
"template_name": "月度检查整改(五建定制)",
- "seq": 2,
+ "seq": 4,
"rules": [
"balanced_setFilter",
"getValue"
@@ -4052,18 +4052,18 @@
"template_name": "项目缴费规则",
"seq": 1,
"rules": [
- "balanced_setFilter",
- "getValue"
+ "addFieldOption",
+ "getContainerDataSource",
+ "removeAllItems"
]
},
{
"template_id": "f805a46c-3b12-4462-a3a5-7c7b2d6cea10",
"template_name": "项目缴费规则",
- "seq": 2,
+ "seq": 3,
"rules": [
- "addFieldOption",
- "getContainerDataSource",
- "removeAllItems"
+ "balanced_setFilter",
+ "getValue"
]
},
{
@@ -4093,7 +4093,7 @@
{
"template_id": "f9b884de-6d46-4242-b93f-f3babd358f36",
"template_name": "项目付款申请-五建定制",
- "seq": 1,
+ "seq": 5,
"rules": [
"balanced_setFilter",
"getValue"
@@ -4113,15 +4113,7 @@
{
"template_id": "fa65ccab-237a-42db-b824-9d5631d814e5",
"template_name": "计划执行",
- "seq": 2,
- "rules": [
- "addSubTableButton"
- ]
- },
- {
- "template_id": "faa6a5b4-71ec-4b98-90aa-c33dd14611cb",
- "template_name": "施工方案审批-工程师(加机械合同)-未用",
- "seq": 2,
+ "seq": 3,
"rules": [
"addSubTableButton"
]
@@ -4137,7 +4129,15 @@
{
"template_id": "faa6a5b4-71ec-4b98-90aa-c33dd14611cb",
"template_name": "施工方案审批-工程师(加机械合同)-未用",
- "seq": 6,
+ "seq": 4,
+ "rules": [
+ "addSubTableButton"
+ ]
+ },
+ {
+ "template_id": "faa6a5b4-71ec-4b98-90aa-c33dd14611cb",
+ "template_name": "施工方案审批-工程师(加机械合同)-未用",
+ "seq": 5,
"rules": [
"addSubTableButton"
]
@@ -4232,7 +4232,7 @@
{
"template_id": "fddf3a3e-4099-4606-8fbd-aa7c4a5b5750",
"template_name": "租赁材料结算单",
- "seq": 2,
+ "seq": 1,
"rules": [
"balanced_setFilter"
]
@@ -4248,7 +4248,7 @@
{
"template_id": "fe20a392-d4fd-402f-bbf8-be8cd41ab932",
"template_name": "项目人员配置(五建定制)",
- "seq": 3,
+ "seq": 4,
"rules": [
"balanced_setFilter",
"getValue"
diff --git a/tools/s3_rewriter/output/manual_workpackage/001_HARD_1a48f81b_建造师执业资格证.md b/tools/s3_rewriter/output/manual_workpackage/001_HARD_1a48f81b_建造师执业资格证.md
index 88504da..5f7133b 100644
--- a/tools/s3_rewriter/output/manual_workpackage/001_HARD_1a48f81b_建造师执业资格证.md
+++ b/tools/s3_rewriter/output/manual_workpackage/001_HARD_1a48f81b_建造师执业资格证.md
@@ -2,7 +2,7 @@
- 模板ID : `1a48f81b-e212-4af8-ac2f-f90ec0f3c7c3`
- 模板名 : 建造师执业资格证
-- 脚本序 : 2
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/002_HARD_1a7f5b05_物资合同评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/002_HARD_1a7f5b05_物资合同评审_五建定制.md
index b614d5f..1a4f154 100644
--- a/tools/s3_rewriter/output/manual_workpackage/002_HARD_1a7f5b05_物资合同评审_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/002_HARD_1a7f5b05_物资合同评审_五建定制.md
@@ -2,7 +2,7 @@
- 模板ID : `1a7f5b05-adee-4a67-a311-ac9f76af2c15`
- 模板名 : 物资合同评审(五建定制)
-- 脚本序 : 1
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -14,6 +14,37 @@ 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_MATERIALCONTRACTVIEWCONFIG_ID = null;
+def PM_MATERIALCONTRACTREVIEW_ID = null;
+returnCol.add("PM_MATERIALCONTRACTVIEWCONFIG_ID");
+returnCol.add("MATERIALCONTRACTVIEWID");
+returnCol.add("RATEITEM");
+returnCol.add("RATEVALUE");
+
+def sql = "select PM_MATERIALCONTRACTVIEWCONFIG_ID,'"+PM_MATERIALCONTRACTREVIEW_ID+"' as MATERIALCONTRACTVIEWID,'' as MATERIALCONTRACTVIEWID_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_MATERIALCONTRACTVIEWCONFIG b on a.codevalue = b.rateitem and MATERIALCONTRACTVIEWID = '"+PM_MATERIALCONTRACTREVIEW_ID+"'";
+sql += " left outer join (";
+sql += " select count(rateitem) AS rowcount,MATERIALCONTRACTVIEWID from PM_MATERIALCONTRACTVIEWCONFIG where MATERIALCONTRACTVIEWID = '"+PM_MATERIALCONTRACTREVIEW_ID+"'";
+sql += " Group by MATERIALCONTRACTVIEWID) as temp1 on b.MATERIALCONTRACTVIEWID = temp1.MATERIALCONTRACTVIEWID";
+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_MATERIALCONTRACTVIEWCONFIG",sql,returnCol);
+
+if(list!=null && list.size()>0){
+ for(i in 0..0){
meterialDetails?.each{
- if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
+ if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
summoney = summoney.add(new BigDecimal(it.get('TOTAL')))
}
}
@@ -43,30 +75,6 @@ button.addClickListener(new Button.ClickListener() {
bindField("CONTRACTMONEY",summoney);
}
})
-
-
-
-if(getFieldValue("PM_PROJECTID")!=null&&getFieldValue("PM_PROJECTID")!=""){
- def sql1 = "select coalesce(sum(p.CONTRACTMONEY),0) as TOTALCONTROLCOST from( ";
- sql1 += "select case when c.pm_plannedcostchange_id is null then coalesce(pp.MATERIALPLANNINGCOST,0)";
- sql1 += "else coalesce(c.MATERIALPLANNINGCOSTNOW,0) end as CONTRACTMONEY ";
- sql1 += "from PM_PLANNEDCOSTDECLARATION pp ";
- sql1 += "join SYS_DATASTATUS s on s.businesskey=pp.PM_PLANNEDCOSTDECLARATION_id and s.tablename = 'PM_PLANNEDCOSTDECLARATION'and s.DATASTATUS = 3 ";
- sql1 += "left join lateral(select PM_PLANNEDCOSTCHANGE_id,MATERIALPLANNINGCOSTNOW,PM_PROJECTID ";
- sql1 += "from PM_PLANNEDCOSTCHANGE p join SYS_DATASTATUS s on s.businesskey=p.PM_PLANNEDCOSTCHANGE_id ";
- sql1 += "and s.tablename = 'PM_PLANNEDCOSTCHANGE'and s.DATASTATUS = 3 where p.PM_PROJECTID = pp.PM_PROJECTID order by p.CHANGEDATE desc,p.createtime desc limit 1)c on true ";
- sql1 += "where pp.PM_PROJECTID = '"+getFieldValue("PM_PROJECTID")+"')p ";
- def map1 = GetServicesFunction.executeQueryForMap(sql1);
- if(map1 != null){
- bindField("TOTALCONTROLCOST",map1.get("TOTALCONTROLCOST"));
- };
- def sql2 = "select coalesce(sum(v.CONTRACTMONEY),0) as TOTALCONTRACTMONEY from VIEW_PM_CONTRACT v ";
- sql2 += "where v.CONTRACTTYPE = 3 and v.PM_PROJECT_ID = '"+getFieldValue("PM_PROJECTID")+"' ";
- def map2 = GetServicesFunction.executeQueryForMap(sql2);
- if(map2 != null){
- bindField("TOTALCONTRACTMONEY",map2.get("TOTALCONTRACTMONEY"));
- };
-}
```
## 2. 硬 S3 原因
diff --git a/tools/s3_rewriter/output/manual_workpackage/003_HARD_1a7f5b05_物资合同评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/003_HARD_1a7f5b05_物资合同评审_五建定制.md
index 49b106b..d782b60 100644
--- a/tools/s3_rewriter/output/manual_workpackage/003_HARD_1a7f5b05_物资合同评审_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/003_HARD_1a7f5b05_物资合同评审_五建定制.md
@@ -2,7 +2,7 @@
- 模板ID : `1a7f5b05-adee-4a67-a311-ac9f76af2c15`
- 模板名 : 物资合同评审(五建定制)
-- 脚本序 : 5
+- 脚本序 : 4
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -14,37 +14,6 @@ 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_MATERIALCONTRACTVIEWCONFIG_ID = null;
-def PM_MATERIALCONTRACTREVIEW_ID = null;
-returnCol.add("PM_MATERIALCONTRACTVIEWCONFIG_ID");
-returnCol.add("MATERIALCONTRACTVIEWID");
-returnCol.add("RATEITEM");
-returnCol.add("RATEVALUE");
-
-def sql = "select PM_MATERIALCONTRACTVIEWCONFIG_ID,'"+PM_MATERIALCONTRACTREVIEW_ID+"' as MATERIALCONTRACTVIEWID,'' as MATERIALCONTRACTVIEWID_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_MATERIALCONTRACTVIEWCONFIG b on a.codevalue = b.rateitem and MATERIALCONTRACTVIEWID = '"+PM_MATERIALCONTRACTREVIEW_ID+"'";
-sql += " left outer join (";
-sql += " select count(rateitem) AS rowcount,MATERIALCONTRACTVIEWID from PM_MATERIALCONTRACTVIEWCONFIG where MATERIALCONTRACTVIEWID = '"+PM_MATERIALCONTRACTREVIEW_ID+"'";
-sql += " Group by MATERIALCONTRACTVIEWID) as temp1 on b.MATERIALCONTRACTVIEWID = temp1.MATERIALCONTRACTVIEWID";
-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_MATERIALCONTRACTVIEWCONFIG",sql,returnCol);
-
-if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
- ratelist.add(list[i].toMap());
- }
-}
-
-bindField("MATERIALCONTRACTVIEWID",ratelist);
-
//将自定义的按钮添加至
def materialList = group.getField("MATERIALDETAILS");
@@ -53,7 +22,6 @@ materialList?.addButton(group.getField("SELECT"),0);
def tie = new TableImportExport(materialList,"com.dsasp.pm.materialcontract.client.MaterialContractDetailImport");
tie.addImportButton(3);
tie.addExportButton(4);
-
//绑定合计按钮
def opertor = group.getField("BUTTON");
def vl = opertor?.parent;
@@ -65,9 +33,9 @@ button.addClickListener(new Button.ClickListener() {
public void buttonClick(Button.ClickEvent event) {
def meterialDetails = getFieldValue("MATERIALDETAILS");
def summoney = new BigDecimal("0");;
- if(meterialDetails != null && meterialDetails.size()>0){
+ if(meterialDetails != null && meterialDetails.size()>0){
meterialDetails?.each{
- if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
+ if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
summoney = summoney.add(new BigDecimal(it.get('TOTAL')))
}
}
@@ -75,6 +43,30 @@ button.addClickListener(new Button.ClickListener() {
bindField("CONTRACTMONEY",summoney);
}
})
+
+
+
+if(getFieldValue("PM_PROJECTID")!=null&&getFieldValue("PM_PROJECTID")!=""){
+ def sql1 = "select coalesce(sum(p.CONTRACTMONEY),0) as TOTALCONTROLCOST from( ";
+ sql1 += "select case when c.pm_plannedcostchange_id is null then coalesce(pp.MATERIALPLANNINGCOST,0)";
+ sql1 += "else coalesce(c.MATERIALPLANNINGCOSTNOW,0) end as CONTRACTMONEY ";
+ sql1 += "from PM_PLANNEDCOSTDECLARATION pp ";
+ sql1 += "join SYS_DATASTATUS s on s.businesskey=pp.PM_PLANNEDCOSTDECLARATION_id and s.tablename = 'PM_PLANNEDCOSTDECLARATION'and s.DATASTATUS = 3 ";
+ sql1 += "left join lateral(select PM_PLANNEDCOSTCHANGE_id,MATERIALPLANNINGCOSTNOW,PM_PROJECTID ";
+ sql1 += "from PM_PLANNEDCOSTCHANGE p join SYS_DATASTATUS s on s.businesskey=p.PM_PLANNEDCOSTCHANGE_id ";
+ sql1 += "and s.tablename = 'PM_PLANNEDCOSTCHANGE'and s.DATASTATUS = 3 where p.PM_PROJECTID = pp.PM_PROJECTID order by p.CHANGEDATE desc,p.createtime desc limit 1)c on true ";
+ sql1 += "where pp.PM_PROJECTID = '"+getFieldValue("PM_PROJECTID")+"')p ";
+ def map1 = GetServicesFunction.executeQueryForMap(sql1);
+ if(map1 != null){
+ bindField("TOTALCONTROLCOST",map1.get("TOTALCONTROLCOST"));
+ };
+ def sql2 = "select coalesce(sum(v.CONTRACTMONEY),0) as TOTALCONTRACTMONEY from VIEW_PM_CONTRACT v ";
+ sql2 += "where v.CONTRACTTYPE = 3 and v.PM_PROJECT_ID = '"+getFieldValue("PM_PROJECTID")+"' ";
+ def map2 = GetServicesFunction.executeQueryForMap(sql2);
+ if(map2 != null){
+ bindField("TOTALCONTRACTMONEY",map2.get("TOTALCONTRACTMONEY"));
+ };
+}
```
## 2. 硬 S3 原因
diff --git a/tools/s3_rewriter/output/manual_workpackage/004_HARD_1e9bcd2c_江苏省中标公告.md b/tools/s3_rewriter/output/manual_workpackage/004_HARD_1e9bcd2c_江苏省中标公告.md
index cff7bf7..fa7d6a9 100644
--- a/tools/s3_rewriter/output/manual_workpackage/004_HARD_1e9bcd2c_江苏省中标公告.md
+++ b/tools/s3_rewriter/output/manual_workpackage/004_HARD_1e9bcd2c_江苏省中标公告.md
@@ -11,7 +11,7 @@
//import com.vaadin.server.ExternalResource;
//import com.vaadin.ui.Label;
//def url = group.getField("GSURL");
-//if(url.getValue()!= null && url?.isReadOnly()){
+//if(url.getValue()!= null && url?.isReadOnly()){
// Link link = new Link(" 中标公告链接 ",
// new ExternalResource(url.getValue()));
// link.setTargetName("_blank")
@@ -21,7 +21,7 @@
//}
//
//def url1 = group.getField("GGURL");
-//if(url1.getValue()!= null && url1?.isReadOnly()){
+//if(url1.getValue()!= null && url1?.isReadOnly()){
// Link link = new Link(" 招标公告链接 ",
// new ExternalResource(url1.getValue()));
// link.setTargetName("_blank")
diff --git a/tools/s3_rewriter/output/manual_workpackage/005_HARD_1edd6c1c_物资合同登记_需要评审.md b/tools/s3_rewriter/output/manual_workpackage/005_HARD_1edd6c1c_物资合同登记_需要评审.md
index e33deea..7e49d83 100644
--- a/tools/s3_rewriter/output/manual_workpackage/005_HARD_1edd6c1c_物资合同登记_需要评审.md
+++ b/tools/s3_rewriter/output/manual_workpackage/005_HARD_1edd6c1c_物资合同登记_需要评审.md
@@ -33,9 +33,9 @@ button.addClickListener(new Button.ClickListener() {
public void buttonClick(Button.ClickEvent event) {
def meterialDetails = getFieldValue("MATERIALDETAILS");
def summoney = new BigDecimal("0");;
- if(meterialDetails != null && meterialDetails.size()>0){
+ if(meterialDetails != null && meterialDetails.size()>0){
meterialDetails?.each{
- if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
+ if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
summoney = summoney.add(new BigDecimal(it.get('TOTAL')))
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/007_HARD_213d1b7e_劳务分包合同登记_不需要评审.md b/tools/s3_rewriter/output/manual_workpackage/007_HARD_213d1b7e_劳务分包合同登记_不需要评审.md
index a1ec659..034d27d 100644
--- a/tools/s3_rewriter/output/manual_workpackage/007_HARD_213d1b7e_劳务分包合同登记_不需要评审.md
+++ b/tools/s3_rewriter/output/manual_workpackage/007_HARD_213d1b7e_劳务分包合同登记_不需要评审.md
@@ -2,7 +2,7 @@
- 模板ID : `213d1b7e-e1b7-4ab4-ae4a-181ae4b40461`
- 模板名 : 劳务分包合同登记-不需要评审
-- 脚本序 : 2
+- 脚本序 : 1
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -14,13 +14,43 @@ 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_LABOURSUBCONTRACTREGISTERCONFIG_ID = null;
+def PM_LABOURSUBCONTRACTREGISTER_ID = null;
+returnCol.add("PM_LABOURSUBCONTRACTREGISTERCONFIG_ID");
+returnCol.add("LABOURSUBCONTRACTREGISTERID");
+returnCol.add("RATEITEM");
+returnCol.add("RATEVALUE");
+
+def sql = "select PM_LABOURSUBCONTRACTREGISTERCONFIG_ID,'"+PM_LABOURSUBCONTRACTREGISTER_ID+"' as LABOURSUBCONTRACTREGISTERID,'' as LABOURSUBCONTRACTREGISTERID_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_LABOURSUBCONTRACTREGISTERCONFIG b on a.codevalue = b.rateitem and LABOURSUBCONTRACTREGISTERID = '"+PM_LABOURSUBCONTRACTREGISTER_ID+"'";
+sql += " left outer join (";
+sql += " select count(rateitem) AS rowcount,LABOURSUBCONTRACTREGISTERID from PM_LABOURSUBCONTRACTREGISTERCONFIG where LABOURSUBCONTRACTREGISTERID = '"+PM_LABOURSUBCONTRACTREGISTER_ID+"'";
+sql += " Group by LABOURSUBCONTRACTREGISTERID) as temp1 on b.LABOURSUBCONTRACTREGISTERID = temp1.LABOURSUBCONTRACTREGISTERID";
+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_LABOURSUBCONTRACTREGISTERCONFIG",sql,returnCol);
+
+if(list!=null && list.size()>0){
+ for(i in 0..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')))
}
}
}
@@ -43,7 +73,6 @@ button.addClickListener(new Button.ClickListener() {
});
-
def tie = new TableImportExport(contents,"com.dsasp.pm.labourcontract.client.ContentsImport");
tie.addImportButton(2);
tie.addExportButton(3);
diff --git a/tools/s3_rewriter/output/manual_workpackage/008_HARD_213d1b7e_劳务分包合同登记_不需要评审.md b/tools/s3_rewriter/output/manual_workpackage/008_HARD_213d1b7e_劳务分包合同登记_不需要评审.md
index 7058717..6c9ac7b 100644
--- a/tools/s3_rewriter/output/manual_workpackage/008_HARD_213d1b7e_劳务分包合同登记_不需要评审.md
+++ b/tools/s3_rewriter/output/manual_workpackage/008_HARD_213d1b7e_劳务分包合同登记_不需要评审.md
@@ -2,7 +2,7 @@
- 模板ID : `213d1b7e-e1b7-4ab4-ae4a-181ae4b40461`
- 模板名 : 劳务分包合同登记-不需要评审
-- 脚本序 : 3
+- 脚本序 : 2
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -14,43 +14,13 @@ 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_LABOURSUBCONTRACTREGISTERCONFIG_ID = null;
-def PM_LABOURSUBCONTRACTREGISTER_ID = null;
-returnCol.add("PM_LABOURSUBCONTRACTREGISTERCONFIG_ID");
-returnCol.add("LABOURSUBCONTRACTREGISTERID");
-returnCol.add("RATEITEM");
-returnCol.add("RATEVALUE");
-
-def sql = "select PM_LABOURSUBCONTRACTREGISTERCONFIG_ID,'"+PM_LABOURSUBCONTRACTREGISTER_ID+"' as LABOURSUBCONTRACTREGISTERID,'' as LABOURSUBCONTRACTREGISTERID_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_LABOURSUBCONTRACTREGISTERCONFIG b on a.codevalue = b.rateitem and LABOURSUBCONTRACTREGISTERID = '"+PM_LABOURSUBCONTRACTREGISTER_ID+"'";
-sql += " left outer join (";
-sql += " select count(rateitem) AS rowcount,LABOURSUBCONTRACTREGISTERID from PM_LABOURSUBCONTRACTREGISTERCONFIG where LABOURSUBCONTRACTREGISTERID = '"+PM_LABOURSUBCONTRACTREGISTER_ID+"'";
-sql += " Group by LABOURSUBCONTRACTREGISTERID) as temp1 on b.LABOURSUBCONTRACTREGISTERID = temp1.LABOURSUBCONTRACTREGISTERID";
-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_LABOURSUBCONTRACTREGISTERCONFIG",sql,returnCol);
-
-if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
- ratelist.add(list[i].toMap());
- }
-}
-bindField("LABOURSUBCONTRACTREGISTERID",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("根据分包明细计算合同价款");
@@ -61,10 +31,10 @@ button.addClickListener(new Button.ClickListener() {
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')))
}
}
}
@@ -73,6 +43,7 @@ button.addClickListener(new Button.ClickListener() {
});
+
def tie = new TableImportExport(contents,"com.dsasp.pm.labourcontract.client.ContentsImport");
tie.addImportButton(2);
tie.addExportButton(3);
diff --git a/tools/s3_rewriter/output/manual_workpackage/009_HARD_2213796d_劳务分包合同登记_不需要评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/009_HARD_2213796d_劳务分包合同登记_不需要评审_五建定制.md
index 4315d09..664ce75 100644
--- a/tools/s3_rewriter/output/manual_workpackage/009_HARD_2213796d_劳务分包合同登记_不需要评审_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/009_HARD_2213796d_劳务分包合同登记_不需要评审_五建定制.md
@@ -2,7 +2,7 @@
- 模板ID : `2213796d-03b0-4b74-b923-6be0415cd002`
- 模板名 : 劳务分包合同登记-不需要评审(五建定制)
-- 脚本序 : 3
+- 脚本序 : 1
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -14,13 +14,43 @@ 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_LABOURSUBCONTRACTREGISTERCONFIG_ID = null;
+def PM_LABOURSUBCONTRACTREGISTER_ID = null;
+returnCol.add("PM_LABOURSUBCONTRACTREGISTERCONFIG_ID");
+returnCol.add("LABOURSUBCONTRACTREGISTERID");
+returnCol.add("RATEITEM");
+returnCol.add("RATEVALUE");
+
+def sql = "select PM_LABOURSUBCONTRACTREGISTERCONFIG_ID,'"+PM_LABOURSUBCONTRACTREGISTER_ID+"' as LABOURSUBCONTRACTREGISTERID,'' as LABOURSUBCONTRACTREGISTERID_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_LABOURSUBCONTRACTREGISTERCONFIG b on a.codevalue = b.rateitem and LABOURSUBCONTRACTREGISTERID = '"+PM_LABOURSUBCONTRACTREGISTER_ID+"'";
+sql += " left outer join (";
+sql += " select count(rateitem) AS rowcount,LABOURSUBCONTRACTREGISTERID from PM_LABOURSUBCONTRACTREGISTERCONFIG where LABOURSUBCONTRACTREGISTERID = '"+PM_LABOURSUBCONTRACTREGISTER_ID+"'";
+sql += " Group by LABOURSUBCONTRACTREGISTERID) as temp1 on b.LABOURSUBCONTRACTREGISTERID = temp1.LABOURSUBCONTRACTREGISTERID";
+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_LABOURSUBCONTRACTREGISTERCONFIG",sql,returnCol);
+
+if(list!=null && list.size()>0){
+ for(i in 0..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')))
}
}
}
@@ -43,7 +73,6 @@ button.addClickListener(new Button.ClickListener() {
});
-
def tie = new TableImportExport(contents,"com.dsasp.pm.labourcontract.client.ContentsImport");
tie.addImportButton(2);
tie.addExportButton(3);
diff --git a/tools/s3_rewriter/output/manual_workpackage/010_HARD_2213796d_劳务分包合同登记_不需要评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/010_HARD_2213796d_劳务分包合同登记_不需要评审_五建定制.md
index 8d1e2fd..478d3f9 100644
--- a/tools/s3_rewriter/output/manual_workpackage/010_HARD_2213796d_劳务分包合同登记_不需要评审_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/010_HARD_2213796d_劳务分包合同登记_不需要评审_五建定制.md
@@ -2,7 +2,7 @@
- 模板ID : `2213796d-03b0-4b74-b923-6be0415cd002`
- 模板名 : 劳务分包合同登记-不需要评审(五建定制)
-- 脚本序 : 4
+- 脚本序 : 2
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -14,43 +14,13 @@ 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_LABOURSUBCONTRACTREGISTERCONFIG_ID = null;
-def PM_LABOURSUBCONTRACTREGISTER_ID = null;
-returnCol.add("PM_LABOURSUBCONTRACTREGISTERCONFIG_ID");
-returnCol.add("LABOURSUBCONTRACTREGISTERID");
-returnCol.add("RATEITEM");
-returnCol.add("RATEVALUE");
-
-def sql = "select PM_LABOURSUBCONTRACTREGISTERCONFIG_ID,'"+PM_LABOURSUBCONTRACTREGISTER_ID+"' as LABOURSUBCONTRACTREGISTERID,'' as LABOURSUBCONTRACTREGISTERID_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_LABOURSUBCONTRACTREGISTERCONFIG b on a.codevalue = b.rateitem and LABOURSUBCONTRACTREGISTERID = '"+PM_LABOURSUBCONTRACTREGISTER_ID+"'";
-sql += " left outer join (";
-sql += " select count(rateitem) AS rowcount,LABOURSUBCONTRACTREGISTERID from PM_LABOURSUBCONTRACTREGISTERCONFIG where LABOURSUBCONTRACTREGISTERID = '"+PM_LABOURSUBCONTRACTREGISTER_ID+"'";
-sql += " Group by LABOURSUBCONTRACTREGISTERID) as temp1 on b.LABOURSUBCONTRACTREGISTERID = temp1.LABOURSUBCONTRACTREGISTERID";
-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_LABOURSUBCONTRACTREGISTERCONFIG",sql,returnCol);
-
-if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
- ratelist.add(list[i].toMap());
- }
-}
-bindField("LABOURSUBCONTRACTREGISTERID",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("根据分包明细计算合同价款");
@@ -61,10 +31,10 @@ button.addClickListener(new Button.ClickListener() {
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')))
}
}
}
@@ -73,6 +43,7 @@ button.addClickListener(new Button.ClickListener() {
});
+
def tie = new TableImportExport(contents,"com.dsasp.pm.labourcontract.client.ContentsImport");
tie.addImportButton(2);
tie.addExportButton(3);
diff --git a/tools/s3_rewriter/output/manual_workpackage/011_HARD_26fe10ae_专业分包合同评审.md b/tools/s3_rewriter/output/manual_workpackage/011_HARD_26fe10ae_专业分包合同评审.md
index c945a1e..39f2c67 100644
--- a/tools/s3_rewriter/output/manual_workpackage/011_HARD_26fe10ae_专业分包合同评审.md
+++ b/tools/s3_rewriter/output/manual_workpackage/011_HARD_26fe10ae_专业分包合同评审.md
@@ -2,7 +2,7 @@
- 模板ID : `26fe10ae-93a9-45c4-9f58-2183e6050100`
- 模板名 : 专业分包合同评审
-- 脚本序 : 1
+- 脚本序 : 2
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -12,6 +12,39 @@ 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("A_PART",GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY"));
+
+
+def ratelist = [];
+def returnCol = [];
+def PM_SPECIALTYSUBCONTRACTVIEWCONFIG_ID = null;
+def PM_SPECIALTYSUBCONTRACTREVIEW_ID = null;
+returnCol.add("PM_SPECIALTYSUBCONTRACTVIEWCONFIG_ID");
+returnCol.add("SPECIALTYSUBCONTRACTVIEWID");
+returnCol.add("RATEITEM");
+returnCol.add("RATEVALUE");
+
+def sql = "select PM_SPECIALTYSUBCONTRACTVIEWCONFIG_ID,'"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"' as SPECIALTYSUBCONTRACTVIEWID,'' as SPECIALTYSUBCONTRACTVIEWID_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_SPECIALTYSUBCONTRACTVIEWCONFIG b on a.codevalue = b.rateitem and SPECIALTYSUBCONTRACTVIEWID = '"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"'";
+sql += " left outer join (";
+sql += " select count(rateitem) AS rowcount,SPECIALTYSUBCONTRACTVIEWID from PM_SPECIALTYSUBCONTRACTVIEWCONFIG where SPECIALTYSUBCONTRACTVIEWID = '"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"'";
+sql += " Group by SPECIALTYSUBCONTRACTVIEWID) as temp1 on b.SPECIALTYSUBCONTRACTVIEWID = temp1.SPECIALTYSUBCONTRACTVIEWID";
+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_SPECIALTYSUBCONTRACTVIEWCONFIG",sql,returnCol);
+
+if(list!=null && list.size()>0){
+ for(i in 0..0){
balancedetails?.each{
- if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
@@ -38,8 +71,6 @@ button.addClickListener(new Button.ClickListener() {
}
});
-
-import com.dsasp.client.viewframework.util.TableImportExport;
def tie = new TableImportExport(contents,"com.dsasp.pm.specialtycontract.client.ContentsImport");
tie.addImportButton(2);
tie.addExportButton(3);
diff --git a/tools/s3_rewriter/output/manual_workpackage/012_HARD_26fe10ae_专业分包合同评审.md b/tools/s3_rewriter/output/manual_workpackage/012_HARD_26fe10ae_专业分包合同评审.md
index 1b4c624..9cf2d80 100644
--- a/tools/s3_rewriter/output/manual_workpackage/012_HARD_26fe10ae_专业分包合同评审.md
+++ b/tools/s3_rewriter/output/manual_workpackage/012_HARD_26fe10ae_专业分包合同评审.md
@@ -2,7 +2,7 @@
- 模板ID : `26fe10ae-93a9-45c4-9f58-2183e6050100`
- 模板名 : 专业分包合同评审
-- 脚本序 : 2
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -12,39 +12,6 @@ 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("A_PART",GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY"));
-
-
-def ratelist = [];
-def returnCol = [];
-def PM_SPECIALTYSUBCONTRACTVIEWCONFIG_ID = null;
-def PM_SPECIALTYSUBCONTRACTREVIEW_ID = null;
-returnCol.add("PM_SPECIALTYSUBCONTRACTVIEWCONFIG_ID");
-returnCol.add("SPECIALTYSUBCONTRACTVIEWID");
-returnCol.add("RATEITEM");
-returnCol.add("RATEVALUE");
-
-def sql = "select PM_SPECIALTYSUBCONTRACTVIEWCONFIG_ID,'"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"' as SPECIALTYSUBCONTRACTVIEWID,'' as SPECIALTYSUBCONTRACTVIEWID_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_SPECIALTYSUBCONTRACTVIEWCONFIG b on a.codevalue = b.rateitem and SPECIALTYSUBCONTRACTVIEWID = '"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"'";
-sql += " left outer join (";
-sql += " select count(rateitem) AS rowcount,SPECIALTYSUBCONTRACTVIEWID from PM_SPECIALTYSUBCONTRACTVIEWCONFIG where SPECIALTYSUBCONTRACTVIEWID = '"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"'";
-sql += " Group by SPECIALTYSUBCONTRACTVIEWID) as temp1 on b.SPECIALTYSUBCONTRACTVIEWID = temp1.SPECIALTYSUBCONTRACTVIEWID";
-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_SPECIALTYSUBCONTRACTVIEWCONFIG",sql,returnCol);
-
-if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
- ratelist.add(list[i].toMap());
- }
-}
-
-bindField("SPECIALTYSUBCONTRACTVIEWID",ratelist);
def contents = group.getField("CONTENTS");
final Object table = contents?.table;
@@ -56,13 +23,13 @@ Button button = new Button("根据分包明细计算合同价款");
vl.addComponent(button,0);
button.addClickListener(new Button.ClickListener() {
@Override
- public void buttonClick(Button.ClickEvent event) {
+ 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') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
@@ -71,6 +38,8 @@ button.addClickListener(new Button.ClickListener() {
}
});
+
+import com.dsasp.client.viewframework.util.TableImportExport;
def tie = new TableImportExport(contents,"com.dsasp.pm.specialtycontract.client.ContentsImport");
tie.addImportButton(2);
tie.addExportButton(3);
diff --git a/tools/s3_rewriter/output/manual_workpackage/013_HARD_279c4492_ABC三类人员证.md b/tools/s3_rewriter/output/manual_workpackage/013_HARD_279c4492_ABC三类人员证.md
index 33590a5..6bd9a98 100644
--- a/tools/s3_rewriter/output/manual_workpackage/013_HARD_279c4492_ABC三类人员证.md
+++ b/tools/s3_rewriter/output/manual_workpackage/013_HARD_279c4492_ABC三类人员证.md
@@ -2,7 +2,7 @@
- 模板ID : `279c4492-0851-4b82-a8dc-88e19922f08a`
- 模板名 : ABC三类人员证
-- 脚本序 : 2
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/014_HARD_2852ff22_计划成本变更.md b/tools/s3_rewriter/output/manual_workpackage/014_HARD_2852ff22_计划成本变更.md
index 37ab977..1dc4453 100644
--- a/tools/s3_rewriter/output/manual_workpackage/014_HARD_2852ff22_计划成本变更.md
+++ b/tools/s3_rewriter/output/manual_workpackage/014_HARD_2852ff22_计划成本变更.md
@@ -14,9 +14,7 @@ import com.vaadin.ui.Notification;
import com.vaadin.ui.Notification.Type;
import com.dsasp.client.viewframework.util.TableImportExport;
-setFieldReadOnly("REMIND",false);
-//group.getField("TOTALCONTROLCOST").setReadOnly("false");
-setFieldReadOnly("TOTALCONTROLCOST",false);
+
def opertor = group.getField("BUTTON");
def vl = opertor?.parent;
Button button = new Button("计算占比");
diff --git a/tools/s3_rewriter/output/manual_workpackage/015_HARD_2852ff22_计划成本变更.md b/tools/s3_rewriter/output/manual_workpackage/015_HARD_2852ff22_计划成本变更.md
index 48c0ea9..4e53e74 100644
--- a/tools/s3_rewriter/output/manual_workpackage/015_HARD_2852ff22_计划成本变更.md
+++ b/tools/s3_rewriter/output/manual_workpackage/015_HARD_2852ff22_计划成本变更.md
@@ -2,7 +2,7 @@
- 模板ID : `2852ff22-439c-4625-a2c5-c70b547d82ca`
- 模板名 : 计划成本变更
-- 脚本序 : 2
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -14,7 +14,9 @@ import com.vaadin.ui.Notification;
import com.vaadin.ui.Notification.Type;
import com.dsasp.client.viewframework.util.TableImportExport;
-
+setFieldReadOnly("REMIND",false);
+//group.getField("TOTALCONTROLCOST").setReadOnly("false");
+setFieldReadOnly("TOTALCONTROLCOST",false);
def opertor = group.getField("BUTTON");
def vl = opertor?.parent;
Button button = new Button("计算占比");
diff --git a/tools/s3_rewriter/output/manual_workpackage/016_HARD_2cceb83c_建造师注册证.md b/tools/s3_rewriter/output/manual_workpackage/016_HARD_2cceb83c_建造师注册证.md
index ca407fa..c59af6b 100644
--- a/tools/s3_rewriter/output/manual_workpackage/016_HARD_2cceb83c_建造师注册证.md
+++ b/tools/s3_rewriter/output/manual_workpackage/016_HARD_2cceb83c_建造师注册证.md
@@ -2,7 +2,7 @@
- 模板ID : `2cceb83c-4079-43e4-b7b7-c395fd68cbbc`
- 模板名 : 建造师注册证
-- 脚本序 : 4
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/017_HARD_2cceb83c_建造师注册证.md b/tools/s3_rewriter/output/manual_workpackage/017_HARD_2cceb83c_建造师注册证.md
index da326b7..2a423d4 100644
--- a/tools/s3_rewriter/output/manual_workpackage/017_HARD_2cceb83c_建造师注册证.md
+++ b/tools/s3_rewriter/output/manual_workpackage/017_HARD_2cceb83c_建造师注册证.md
@@ -2,7 +2,7 @@
- 模板ID : `2cceb83c-4079-43e4-b7b7-c395fd68cbbc`
- 模板名 : 建造师注册证
-- 脚本序 : 6
+- 脚本序 : 5
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/018_HARD_2cceb83c_建造师注册证.md b/tools/s3_rewriter/output/manual_workpackage/018_HARD_2cceb83c_建造师注册证.md
index 4dc42b9..4975666 100644
--- a/tools/s3_rewriter/output/manual_workpackage/018_HARD_2cceb83c_建造师注册证.md
+++ b/tools/s3_rewriter/output/manual_workpackage/018_HARD_2cceb83c_建造师注册证.md
@@ -2,7 +2,7 @@
- 模板ID : `2cceb83c-4079-43e4-b7b7-c395fd68cbbc`
- 模板名 : 建造师注册证
-- 脚本序 : 7
+- 脚本序 : 6
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/019_HARD_2fac21ea_合格供方对账_五建_分包合同结算.md b/tools/s3_rewriter/output/manual_workpackage/019_HARD_2fac21ea_合格供方对账_五建_分包合同结算.md
index d5eb69b..eb23857 100644
--- a/tools/s3_rewriter/output/manual_workpackage/019_HARD_2fac21ea_合格供方对账_五建_分包合同结算.md
+++ b/tools/s3_rewriter/output/manual_workpackage/019_HARD_2fac21ea_合格供方对账_五建_分包合同结算.md
@@ -2,7 +2,7 @@
- 模板ID : `2fac21ea-2964-4295-b3e9-cad7c3391ff1`
- 模板名 : 合格供方对账(五建-分包合同结算)
-- 脚本序 : 4
+- 脚本序 : 2
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -29,12 +29,12 @@ button.addClickListener(new Button.ClickListener() {
def balancedetails = getFieldValue("BALANCEDETAILS");
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('NUMBER') !=null && it.get('NUMBER') !=""){
+ if(it.get('NUMBER') !=null && it.get('NUMBER') !=""){
sumamount = sumamount.add(new BigDecimal(it.get('NUMBER')))
}
- if(it.get('MONEY') !=null && it.get('MONEY') !=""){
+ if(it.get('MONEY') !=null && it.get('MONEY') !=""){
summoney = summoney.add(new BigDecimal(it.get('MONEY')))
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/020_HARD_328b3366_施工日志_审批.md b/tools/s3_rewriter/output/manual_workpackage/020_HARD_328b3366_施工日志_审批.md
index 1ffb5d3..651861c 100644
--- a/tools/s3_rewriter/output/manual_workpackage/020_HARD_328b3366_施工日志_审批.md
+++ b/tools/s3_rewriter/output/manual_workpackage/020_HARD_328b3366_施工日志_审批.md
@@ -2,7 +2,7 @@
- 模板ID : `328b3366-170f-4321-b06c-5593668b5535`
- 模板名 : 施工日志-审批
-- 脚本序 : 1
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/021_HARD_35b9139e_计划成本申报.md b/tools/s3_rewriter/output/manual_workpackage/021_HARD_35b9139e_计划成本申报.md
index 8f26548..3b57cd5 100644
--- a/tools/s3_rewriter/output/manual_workpackage/021_HARD_35b9139e_计划成本申报.md
+++ b/tools/s3_rewriter/output/manual_workpackage/021_HARD_35b9139e_计划成本申报.md
@@ -2,7 +2,7 @@
- 模板ID : `35b9139e-a491-44a8-b586-cfa50554377d`
- 模板名 : 计划成本申报
-- 脚本序 : 3
+- 脚本序 : 1
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/022_HARD_38bebdb5_业绩库.md b/tools/s3_rewriter/output/manual_workpackage/022_HARD_38bebdb5_业绩库.md
index c0413f5..d522a88 100644
--- a/tools/s3_rewriter/output/manual_workpackage/022_HARD_38bebdb5_业绩库.md
+++ b/tools/s3_rewriter/output/manual_workpackage/022_HARD_38bebdb5_业绩库.md
@@ -10,7 +10,7 @@
import com.vaadin.ui.Link;
import com.vaadin.server.ExternalResource;
def url = group.getField("URL");
-if(url.getValue()!= null && url?.isReadOnly()){
+if(url.getValue()!= null && url?.isReadOnly()){
Link link = new Link(" 原地址 ",
new ExternalResource(url.getValue()));
link.setTargetName("_blank")
diff --git a/tools/s3_rewriter/output/manual_workpackage/023_HARD_3f77bb7a_付款确认选择框_五建定制_未付讫的付款申请.md b/tools/s3_rewriter/output/manual_workpackage/023_HARD_3f77bb7a_付款确认选择框_五建定制_未付讫的付款申请.md
index be4b0af..1170020 100644
--- a/tools/s3_rewriter/output/manual_workpackage/023_HARD_3f77bb7a_付款确认选择框_五建定制_未付讫的付款申请.md
+++ b/tools/s3_rewriter/output/manual_workpackage/023_HARD_3f77bb7a_付款确认选择框_五建定制_未付讫的付款申请.md
@@ -2,19 +2,19 @@
- 模板ID : `3f77bb7a-5f68-4924-ad59-7522fd07904e`
- 模板名 : 付款确认选择框-五建定制(未付讫的付款申请)
-- 脚本序 : 2
+- 脚本序 : 1
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
```groovy
import com.vaadin.ui.Label;
-def label4 = new Label("<font style=\"float:right\">入库金额(元)</font>");
+def label4 = new Label("入库金额(元)");
label4.setContentMode(Label.CONTENT_XHTML);
def formLayout4 =group.getField("LBLIMPORTMONEY").parent;
-if(formLayout4.getComponentCount()>1){
+if(formLayout4.getComponentCount()>1){
formLayout4.removeComponent(formLayout4.getComponent(1));
}
formLayout4.addComponent(label4);
diff --git a/tools/s3_rewriter/output/manual_workpackage/024_HARD_4230b669_员工档案_带证书.md b/tools/s3_rewriter/output/manual_workpackage/024_HARD_4230b669_员工档案_带证书.md
index 0f269a1..659c151 100644
--- a/tools/s3_rewriter/output/manual_workpackage/024_HARD_4230b669_员工档案_带证书.md
+++ b/tools/s3_rewriter/output/manual_workpackage/024_HARD_4230b669_员工档案_带证书.md
@@ -2,7 +2,7 @@
- 模板ID : `4230b669-a107-4ffb-9aae-e814560d8c6e`
- 模板名 : 员工档案(带证书)
-- 脚本序 : 3
+- 脚本序 : 6
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -185,7 +185,7 @@ jzsupdatebut?.addClickListener(new ClickListener() {
if(jzsfieldGroup.getPropertyId(f).equals("PROFESSIONALS")){
def list = pojo.get_Value(jzsfieldGroup.getPropertyId(f));
def newlist=[];
- if(list!=null && list.size()>0){
+ if(list!=null && list.size()>0){
list.each{
def submap = it.toMap();
newlist.add(submap);
@@ -233,7 +233,7 @@ jzsshowbut?.addClickListener(new ClickListener() {
if(jzsfieldGroup.getPropertyId(f).equals("PROFESSIONALS")){
def list = pojo.get_Value(jzsfieldGroup.getPropertyId(f));
def newlist=[];
- if(list!=null && list.size()>0){
+ if(list!=null && list.size()>0){
list.each{
def submap = it.toMap();
newlist.add(submap);
diff --git a/tools/s3_rewriter/output/manual_workpackage/025_HARD_4d4d019b_中标公示.md b/tools/s3_rewriter/output/manual_workpackage/025_HARD_4d4d019b_中标公示.md
index bb3c2b6..285b9db 100644
--- a/tools/s3_rewriter/output/manual_workpackage/025_HARD_4d4d019b_中标公示.md
+++ b/tools/s3_rewriter/output/manual_workpackage/025_HARD_4d4d019b_中标公示.md
@@ -10,7 +10,7 @@
import com.vaadin.ui.Link;
import com.vaadin.server.ExternalResource;
def url = group.getField("RESOURCEINFO");
-if(url.getValue()!= null && url?.isReadOnly()){
+if(url.getValue()!= null && url?.isReadOnly()){
Link link = new Link(" 信息来源 ",
new ExternalResource(url.getValue()));
link.setTargetName("_blank")
diff --git a/tools/s3_rewriter/output/manual_workpackage/026_HARD_4ea83ef3_职称.md b/tools/s3_rewriter/output/manual_workpackage/026_HARD_4ea83ef3_职称.md
index d0f84ac..456e350 100644
--- a/tools/s3_rewriter/output/manual_workpackage/026_HARD_4ea83ef3_职称.md
+++ b/tools/s3_rewriter/output/manual_workpackage/026_HARD_4ea83ef3_职称.md
@@ -2,7 +2,7 @@
- 模板ID : `4ea83ef3-2c84-4525-a792-7a7097e4037d`
- 模板名 : 职称
-- 脚本序 : 4
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/027_HARD_5440da49_招标工程.md b/tools/s3_rewriter/output/manual_workpackage/027_HARD_5440da49_招标工程.md
index b234a24..a786dd7 100644
--- a/tools/s3_rewriter/output/manual_workpackage/027_HARD_5440da49_招标工程.md
+++ b/tools/s3_rewriter/output/manual_workpackage/027_HARD_5440da49_招标工程.md
@@ -2,7 +2,7 @@
- 模板ID : `5440da49-89d6-4dc5-94e5-82693913d6e4`
- 模板名 : 招标工程
-- 脚本序 : 4
+- 脚本序 : 2
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -10,7 +10,7 @@
import com.vaadin.ui.Link;
import com.vaadin.server.ExternalResource;
def url = group.getField("ANNOUNCEMENTURL");
-if(url.getValue()!= null && url?.isReadOnly()){
+if(url.getValue()!= null && url?.isReadOnly()){
Link link = new Link("公告链接",
new ExternalResource(url.getValue()));
link.setTargetName("_blank")
diff --git a/tools/s3_rewriter/output/manual_workpackage/028_HARD_58684bbb_物资合同登记_不需要评审.md b/tools/s3_rewriter/output/manual_workpackage/028_HARD_58684bbb_物资合同登记_不需要评审.md
index aeec06c..4ebbce6 100644
--- a/tools/s3_rewriter/output/manual_workpackage/028_HARD_58684bbb_物资合同登记_不需要评审.md
+++ b/tools/s3_rewriter/output/manual_workpackage/028_HARD_58684bbb_物资合同登记_不需要评审.md
@@ -2,16 +2,47 @@
- 模板ID : `58684bbb-59e9-4a83-9788-ec91d15ec0e8`
- 模板名 : 物资合同登记-不需要评审
-- 脚本序 : 2
+- 脚本序 : 1
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
```groovy
+bindField("FIRSTPARTY",GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY"));
+
+ //绑定费率项
+ def ratelist = [];
+ def returnCol = [];
+ def PM_MATERIALCONTRACTREGISTERCONFIG_ID = null;
+ def PM_MATERIALCONTRACTREGISTER_ID = null;
+ returnCol.add("PM_MATERIALCONTRACTREGISTERCONFIG_ID");
+ returnCol.add("MATERIALCONTRACTREGISTERID");
+ returnCol.add("RATEITEM");
+ returnCol.add("RATEVALUE");
+
+ def sql = "select PM_MATERIALCONTRACTREGISTERCONFIG_ID,'"+PM_MATERIALCONTRACTREGISTER_ID+"' as MATERIALCONTRACTREGISTERID,'' as MATERIALCONTRACTREGISTERID_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_MATERIALCONTRACTREGISTERCONFIG b on a.codevalue = b.rateitem and MATERIALCONTRACTREGISTERID = '"+PM_MATERIALCONTRACTREGISTER_ID+"'";
+ sql += " left outer join (";
+ sql += " select count(rateitem) AS rowcount,MATERIALCONTRACTREGISTERID from PM_MATERIALCONTRACTREGISTERCONFIG where MATERIALCONTRACTREGISTERID = '"+PM_MATERIALCONTRACTREGISTER_ID+"'";
+ sql += " Group by MATERIALCONTRACTREGISTERID) as temp1 on b.MATERIALCONTRACTREGISTERID = temp1.MATERIALCONTRACTREGISTERID";
+ 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_MATERIALCONTRACTREGISTERCONFIG",sql,returnCol);
+
+ if(list!=null && list.size()>0){
+ for(i in 0..0){
meterialDetails?.each{
- if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
+ if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
summoney = summoney.add(new BigDecimal(it.get('TOTAL')))
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/029_HARD_58684bbb_物资合同登记_不需要评审.md b/tools/s3_rewriter/output/manual_workpackage/029_HARD_58684bbb_物资合同登记_不需要评审.md
index c1abccb..b04e69b 100644
--- a/tools/s3_rewriter/output/manual_workpackage/029_HARD_58684bbb_物资合同登记_不需要评审.md
+++ b/tools/s3_rewriter/output/manual_workpackage/029_HARD_58684bbb_物资合同登记_不需要评审.md
@@ -2,47 +2,16 @@
- 模板ID : `58684bbb-59e9-4a83-9788-ec91d15ec0e8`
- 模板名 : 物资合同登记-不需要评审
-- 脚本序 : 3
+- 脚本序 : 2
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
```groovy
-bindField("FIRSTPARTY",GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY"));
-
- //绑定费率项
- def ratelist = [];
- def returnCol = [];
- def PM_MATERIALCONTRACTREGISTERCONFIG_ID = null;
- def PM_MATERIALCONTRACTREGISTER_ID = null;
- returnCol.add("PM_MATERIALCONTRACTREGISTERCONFIG_ID");
- returnCol.add("MATERIALCONTRACTREGISTERID");
- returnCol.add("RATEITEM");
- returnCol.add("RATEVALUE");
-
- def sql = "select PM_MATERIALCONTRACTREGISTERCONFIG_ID,'"+PM_MATERIALCONTRACTREGISTER_ID+"' as MATERIALCONTRACTREGISTERID,'' as MATERIALCONTRACTREGISTERID_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_MATERIALCONTRACTREGISTERCONFIG b on a.codevalue = b.rateitem and MATERIALCONTRACTREGISTERID = '"+PM_MATERIALCONTRACTREGISTER_ID+"'";
- sql += " left outer join (";
- sql += " select count(rateitem) AS rowcount,MATERIALCONTRACTREGISTERID from PM_MATERIALCONTRACTREGISTERCONFIG where MATERIALCONTRACTREGISTERID = '"+PM_MATERIALCONTRACTREGISTER_ID+"'";
- sql += " Group by MATERIALCONTRACTREGISTERID) as temp1 on b.MATERIALCONTRACTREGISTERID = temp1.MATERIALCONTRACTREGISTERID";
- 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_MATERIALCONTRACTREGISTERCONFIG",sql,returnCol);
-
- if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
- ratelist.add(list[i].toMap());
- }
- }
-
- bindField("MATERIALCONTRACTREGISTERID",ratelist);
-
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.vaadin.ui.Notification.Type;
import com.dsasp.client.viewframework.util.TableImportExport;
//将自定义的按钮添加至
@@ -64,9 +33,9 @@ button.addClickListener(new Button.ClickListener() {
public void buttonClick(Button.ClickEvent event) {
def meterialDetails = getFieldValue("MATERIALDETAILS");
def summoney = new BigDecimal("0");;
- if(meterialDetails != null && meterialDetails.size()>0){
+ if(meterialDetails != null && meterialDetails.size()>0){
meterialDetails?.each{
- if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
+ if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
summoney = summoney.add(new BigDecimal(it.get('TOTAL')))
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/030_HARD_5a51c93c_文件监控.md b/tools/s3_rewriter/output/manual_workpackage/030_HARD_5a51c93c_文件监控.md
index 1145273..36b60cd 100644
--- a/tools/s3_rewriter/output/manual_workpackage/030_HARD_5a51c93c_文件监控.md
+++ b/tools/s3_rewriter/output/manual_workpackage/030_HARD_5a51c93c_文件监控.md
@@ -13,7 +13,7 @@ import com.vaadin.ui.Button.ClickListener;
import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.data.Property.ValueChangeEvent;
import com.dsasp.client.viewframework.listener.ConfirmDialogListener;
-def reads = group.getField("UNDERTAKES");
+def reads = group.getField("READS");
final Button cb = new Button("催办");
final Object table = reads?.table;
table?.setImmediate(true);
@@ -23,16 +23,16 @@ cb?.addClickListener(new ClickListener() {
Object o = table?.getValue();
if (o == null)
return;
- final id = o?.getField("VIEW_OA_UNDERTAKETOME_ID")?.getValue();
- final pojo = GetServicesFunction.loadPOJO(id,"VIEW_OA_UNDERTAKETOME",true);
+ final id = o?.getField("VIEW_OA_FILETOME_ID")?.getValue();
+ final pojo = GetServicesFunction.loadPOJO(id,"VIEW_OA_FILETOME",true);
def user = GetServicesFunction.loadPOJO(pojo?.get_Value("RECEIVER"),"SYS_USER",true)?.get_Value("NAME");
showConfirmDialog("确定要对" + user + "进行催办吗?",new ConfirmDialogListener(){
public void yes(){
def message = [:];
- message.put("title", "收到新的承办催办");
+ message.put("title", "收到新的阅读催办");
message.put("file", "文件名称:" + pojo?.get_Value("FILENAME")); //文件名
message.put("user", pojo?.get_Value("RECEIVER")); //接收人
- message.put("type", 6); //阅读消息
+ message.put("type", 7); //阅读消息
message.put("id", id); //uuid
/*
if ("收文".equals(pojo?.get_Value("FILECLASS"))) //标记
@@ -50,17 +50,17 @@ cb?.addClickListener(new ClickListener() {
table?.addValueChangeListener(new ValueChangeListener() {
public void valueChange(Property.ValueChangeEvent event) {
Object o = table?.getValue();
- final id = o?.getField("VIEW_OA_UNDERTAKETOME_ID")?.getValue();
- final pojo = GetServicesFunction.loadPOJO(id,"VIEW_OA_UNDERTAKETOME",true);
- if (o == null || pojo.get_Value("ISFINISH") == 1)
+ final id = o?.getField("VIEW_OA_FILETOME_ID")?.getValue();
+ final pojo = GetServicesFunction.loadPOJO(id,"VIEW_OA_FILETOME",true);
+ if (o == null || pojo.get_Value("ISREAD") == 1)
cb.setEnabled(false);
else
cb.setEnabled(true);
- }
+ }
});
cb?.setEnabled(false);
-reads?.addButton(cb, 1);
+reads.addButton(cb, 1);
```
## 2. 硬 S3 原因
diff --git a/tools/s3_rewriter/output/manual_workpackage/031_HARD_5a51c93c_文件监控.md b/tools/s3_rewriter/output/manual_workpackage/031_HARD_5a51c93c_文件监控.md
index 7fd087b..48f703a 100644
--- a/tools/s3_rewriter/output/manual_workpackage/031_HARD_5a51c93c_文件监控.md
+++ b/tools/s3_rewriter/output/manual_workpackage/031_HARD_5a51c93c_文件监控.md
@@ -13,7 +13,7 @@ import com.vaadin.ui.Button.ClickListener;
import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.data.Property.ValueChangeEvent;
import com.dsasp.client.viewframework.listener.ConfirmDialogListener;
-def reads = group.getField("READS");
+def reads = group.getField("UNDERTAKES");
final Button cb = new Button("催办");
final Object table = reads?.table;
table?.setImmediate(true);
@@ -23,16 +23,16 @@ cb?.addClickListener(new ClickListener() {
Object o = table?.getValue();
if (o == null)
return;
- final id = o?.getField("VIEW_OA_FILETOME_ID")?.getValue();
- final pojo = GetServicesFunction.loadPOJO(id,"VIEW_OA_FILETOME",true);
+ final id = o?.getField("VIEW_OA_UNDERTAKETOME_ID")?.getValue();
+ final pojo = GetServicesFunction.loadPOJO(id,"VIEW_OA_UNDERTAKETOME",true);
def user = GetServicesFunction.loadPOJO(pojo?.get_Value("RECEIVER"),"SYS_USER",true)?.get_Value("NAME");
showConfirmDialog("确定要对" + user + "进行催办吗?",new ConfirmDialogListener(){
public void yes(){
def message = [:];
- message.put("title", "收到新的阅读催办");
+ message.put("title", "收到新的承办催办");
message.put("file", "文件名称:" + pojo?.get_Value("FILENAME")); //文件名
message.put("user", pojo?.get_Value("RECEIVER")); //接收人
- message.put("type", 7); //阅读消息
+ message.put("type", 6); //阅读消息
message.put("id", id); //uuid
/*
if ("收文".equals(pojo?.get_Value("FILECLASS"))) //标记
@@ -50,17 +50,17 @@ cb?.addClickListener(new ClickListener() {
table?.addValueChangeListener(new ValueChangeListener() {
public void valueChange(Property.ValueChangeEvent event) {
Object o = table?.getValue();
- final id = o?.getField("VIEW_OA_FILETOME_ID")?.getValue();
- final pojo = GetServicesFunction.loadPOJO(id,"VIEW_OA_FILETOME",true);
- if (o == null || pojo.get_Value("ISREAD") == 1)
+ final id = o?.getField("VIEW_OA_UNDERTAKETOME_ID")?.getValue();
+ final pojo = GetServicesFunction.loadPOJO(id,"VIEW_OA_UNDERTAKETOME",true);
+ if (o == null || pojo.get_Value("ISFINISH") == 1)
cb.setEnabled(false);
else
cb.setEnabled(true);
- }
+ }
});
cb?.setEnabled(false);
-reads.addButton(cb, 1);
+reads?.addButton(cb, 1);
```
## 2. 硬 S3 原因
diff --git a/tools/s3_rewriter/output/manual_workpackage/032_HARD_5be37b88_专业分包合同登记_不需要评审.md b/tools/s3_rewriter/output/manual_workpackage/032_HARD_5be37b88_专业分包合同登记_不需要评审.md
index b2259b9..2a8ffb8 100644
--- a/tools/s3_rewriter/output/manual_workpackage/032_HARD_5be37b88_专业分包合同登记_不需要评审.md
+++ b/tools/s3_rewriter/output/manual_workpackage/032_HARD_5be37b88_专业分包合同登记_不需要评审.md
@@ -7,12 +7,44 @@
## 1. 原文(S3 原始 Groovy)
```groovy
+import com.dsasp.client.viewframework.util.TableImportExport;
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("A_PART",GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY"));
+
+//绑定费率项
+def ratelist = [];
+def returnCol = [];
+def PM_SPECIALTYSUBCONTRACTREGISTERCONFIG_ID = null;
+def PM_SPECIALTYSUBCONTRACTREGISTER_ID = null;
+returnCol.add("PM_SPECIALTYSUBCONTRACTREGISTERCONFIG_ID");
+returnCol.add("SPECIALTYSUBCONTRACTREGISTERID");
+returnCol.add("RATEITEM");
+returnCol.add("RATEVALUE");
+
+def sql = "select PM_SPECIALTYSUBCONTRACTREGISTERCONFIG_ID,'"+PM_SPECIALTYSUBCONTRACTREGISTER_ID+"' as SPECIALTYSUBCONTRACTREGISTERID,'' as SPECIALTYSUBCONTRACTREGISTERID_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_SPECIALTYSUBCONTRACTREGISTERCONFIG b on a.codevalue = b.rateitem and SPECIALTYSUBCONTRACTREGISTERID = '"+PM_SPECIALTYSUBCONTRACTREGISTER_ID+"'";
+sql += " left outer join (";
+sql += " select count(rateitem) AS rowcount,SPECIALTYSUBCONTRACTREGISTERID from PM_SPECIALTYSUBCONTRACTREGISTERCONFIG where SPECIALTYSUBCONTRACTREGISTERID = '"+PM_SPECIALTYSUBCONTRACTREGISTER_ID+"'";
+sql += " Group by SPECIALTYSUBCONTRACTREGISTERID) as temp1 on b.SPECIALTYSUBCONTRACTREGISTERID = temp1.SPECIALTYSUBCONTRACTREGISTERID";
+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_SPECIALTYSUBCONTRACTREGISTERCONFIG",sql,returnCol);
+
+if(list!=null && list.size()>0){
+ for(i in 0..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')))
}
}
}
@@ -40,7 +72,6 @@ button.addClickListener(new Button.ClickListener() {
}
});
-
def tie = new TableImportExport(contents,"com.dsasp.pm.specialtycontract.client.ContentsImport");
tie.addImportButton(2);
tie.addExportButton(3);
diff --git a/tools/s3_rewriter/output/manual_workpackage/033_HARD_5be37b88_专业分包合同登记_不需要评审.md b/tools/s3_rewriter/output/manual_workpackage/033_HARD_5be37b88_专业分包合同登记_不需要评审.md
index 0b4e375..642fe4c 100644
--- a/tools/s3_rewriter/output/manual_workpackage/033_HARD_5be37b88_专业分包合同登记_不需要评审.md
+++ b/tools/s3_rewriter/output/manual_workpackage/033_HARD_5be37b88_专业分包合同登记_不需要评审.md
@@ -7,44 +7,12 @@
## 1. 原文(S3 原始 Groovy)
```groovy
-import com.dsasp.client.viewframework.util.TableImportExport;
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;
-
-bindField("A_PART",GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY"));
-
-//绑定费率项
-def ratelist = [];
-def returnCol = [];
-def PM_SPECIALTYSUBCONTRACTREGISTERCONFIG_ID = null;
-def PM_SPECIALTYSUBCONTRACTREGISTER_ID = null;
-returnCol.add("PM_SPECIALTYSUBCONTRACTREGISTERCONFIG_ID");
-returnCol.add("SPECIALTYSUBCONTRACTREGISTERID");
-returnCol.add("RATEITEM");
-returnCol.add("RATEVALUE");
-
-def sql = "select PM_SPECIALTYSUBCONTRACTREGISTERCONFIG_ID,'"+PM_SPECIALTYSUBCONTRACTREGISTER_ID+"' as SPECIALTYSUBCONTRACTREGISTERID,'' as SPECIALTYSUBCONTRACTREGISTERID_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_SPECIALTYSUBCONTRACTREGISTERCONFIG b on a.codevalue = b.rateitem and SPECIALTYSUBCONTRACTREGISTERID = '"+PM_SPECIALTYSUBCONTRACTREGISTER_ID+"'";
-sql += " left outer join (";
-sql += " select count(rateitem) AS rowcount,SPECIALTYSUBCONTRACTREGISTERID from PM_SPECIALTYSUBCONTRACTREGISTERCONFIG where SPECIALTYSUBCONTRACTREGISTERID = '"+PM_SPECIALTYSUBCONTRACTREGISTER_ID+"'";
-sql += " Group by SPECIALTYSUBCONTRACTREGISTERID) as temp1 on b.SPECIALTYSUBCONTRACTREGISTERID = temp1.SPECIALTYSUBCONTRACTREGISTERID";
-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_SPECIALTYSUBCONTRACTREGISTERCONFIG",sql,returnCol);
-
-if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
- ratelist.add(list[i].toMap());
- }
-}
-
-bindField("SPECIALTYSUBCONTRACTREGISTERID",ratelist);
-
+import com.dsasp.client.viewframework.util.TableImportExport;
def contents = group.getField("CONTENTS");
final Object table = contents?.table;
@@ -61,10 +29,10 @@ button.addClickListener(new Button.ClickListener() {
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')))
}
}
}
@@ -72,6 +40,7 @@ button.addClickListener(new Button.ClickListener() {
}
});
+
def tie = new TableImportExport(contents,"com.dsasp.pm.specialtycontract.client.ContentsImport");
tie.addImportButton(2);
tie.addExportButton(3);
diff --git a/tools/s3_rewriter/output/manual_workpackage/034_HARD_5e618173_专业分包合同评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/034_HARD_5e618173_专业分包合同评审_五建定制.md
index e083816..92232b8 100644
--- a/tools/s3_rewriter/output/manual_workpackage/034_HARD_5e618173_专业分包合同评审_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/034_HARD_5e618173_专业分包合同评审_五建定制.md
@@ -2,7 +2,7 @@
- 模板ID : `5e618173-2ee1-406b-9829-28c58871316e`
- 模板名 : 专业分包合同评审(五建定制)
-- 脚本序 : 2
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -12,6 +12,39 @@ 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("A_PART",GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY"));
+
+
+def ratelist = [];
+def returnCol = [];
+def PM_SPECIALTYSUBCONTRACTVIEWCONFIG_ID = null;
+def PM_SPECIALTYSUBCONTRACTREVIEW_ID = null;
+returnCol.add("PM_SPECIALTYSUBCONTRACTVIEWCONFIG_ID");
+returnCol.add("SPECIALTYSUBCONTRACTVIEWID");
+returnCol.add("RATEITEM");
+returnCol.add("RATEVALUE");
+
+def sql = "select PM_SPECIALTYSUBCONTRACTVIEWCONFIG_ID,'"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"' as SPECIALTYSUBCONTRACTVIEWID,'' as SPECIALTYSUBCONTRACTVIEWID_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_SPECIALTYSUBCONTRACTVIEWCONFIG b on a.codevalue = b.rateitem and SPECIALTYSUBCONTRACTVIEWID = '"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"'";
+sql += " left outer join (";
+sql += " select count(rateitem) AS rowcount,SPECIALTYSUBCONTRACTVIEWID from PM_SPECIALTYSUBCONTRACTVIEWCONFIG where SPECIALTYSUBCONTRACTVIEWID = '"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"'";
+sql += " Group by SPECIALTYSUBCONTRACTVIEWID) as temp1 on b.SPECIALTYSUBCONTRACTVIEWID = temp1.SPECIALTYSUBCONTRACTVIEWID";
+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_SPECIALTYSUBCONTRACTVIEWCONFIG",sql,returnCol);
+
+if(list!=null && list.size()>0){
+ for(i in 0..0){
balancedetails?.each{
- if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
@@ -38,36 +71,9 @@ button.addClickListener(new Button.ClickListener() {
}
});
-
-import com.dsasp.client.viewframework.util.TableImportExport;
def tie = new TableImportExport(contents,"com.dsasp.pm.specialtycontract.client.ContentsImport");
tie.addImportButton(2);
tie.addExportButton(3);
-
-
-
-//带出金额
-if(getFieldValue("PM_PROJECTID") != null){
- def sql1 = "select coalesce(sum(p.CONTRACTMONEY),0) as TOTALCONTROLCOST from( ";
- sql1 += "select case when c.pm_plannedcostchange_id is null then coalesce(pp.PROFESSIONALSUBCONTRACTCOST,0)";
- sql1 += "else coalesce(c.PROFESSIONALSUBCONTRACTCOSTNOW,0) end as CONTRACTMONEY ";
- sql1 += "from PM_PLANNEDCOSTDECLARATION pp ";
- sql1 += "join SYS_DATASTATUS s on s.businesskey=pp.PM_PLANNEDCOSTDECLARATION_id and s.tablename = 'PM_PLANNEDCOSTDECLARATION'and s.DATASTATUS = 3 ";
- sql1 += "left join lateral(select PM_PLANNEDCOSTCHANGE_id,PROFESSIONALSUBCONTRACTCOSTNOW,PM_PROJECTID ";
- sql1 += "from PM_PLANNEDCOSTCHANGE p join SYS_DATASTATUS s on s.businesskey=p.PM_PLANNEDCOSTCHANGE_id ";
- sql1 += "and s.tablename = 'PM_PLANNEDCOSTCHANGE'and s.DATASTATUS = 3 where p.PM_PROJECTID = pp.PM_PROJECTID order by p.CHANGEDATE desc,p.createtime desc limit 1)c on true ";
- sql1 += " where pp.PM_PROJECTID = '"+getFieldValue("PM_PROJECTID")+"')p ";
- def map1 = GetServicesFunction.executeQueryForMap(sql1);
- if(map1 != null){
- bindField("TOTALCONTROLCOST",map1.get("TOTALCONTROLCOST"));
- };
- def sql2 = "select coalesce(sum(v.CONTRACTMONEY),0) as TOTALCONTRACTMONEY from VIEW_PM_CONTRACT v ";
- sql2 += "where v.CONTRACTTYPE = 2 and v.PM_PROJECT_ID = '"+getFieldValue("PM_PROJECTID")+"' ";
- def map2 = GetServicesFunction.executeQueryForMap(sql2);
- if(map2 != null){
- bindField("TOTALCONTRACTMONEY",map2.get("TOTALCONTRACTMONEY"));
- };
-}
```
## 2. 硬 S3 原因
diff --git a/tools/s3_rewriter/output/manual_workpackage/035_HARD_5e618173_专业分包合同评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/035_HARD_5e618173_专业分包合同评审_五建定制.md
index 65fc428..3b05f0f 100644
--- a/tools/s3_rewriter/output/manual_workpackage/035_HARD_5e618173_专业分包合同评审_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/035_HARD_5e618173_专业分包合同评审_五建定制.md
@@ -2,7 +2,7 @@
- 模板ID : `5e618173-2ee1-406b-9829-28c58871316e`
- 模板名 : 专业分包合同评审(五建定制)
-- 脚本序 : 3
+- 脚本序 : 4
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -12,39 +12,6 @@ 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("A_PART",GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY"));
-
-
-def ratelist = [];
-def returnCol = [];
-def PM_SPECIALTYSUBCONTRACTVIEWCONFIG_ID = null;
-def PM_SPECIALTYSUBCONTRACTREVIEW_ID = null;
-returnCol.add("PM_SPECIALTYSUBCONTRACTVIEWCONFIG_ID");
-returnCol.add("SPECIALTYSUBCONTRACTVIEWID");
-returnCol.add("RATEITEM");
-returnCol.add("RATEVALUE");
-
-def sql = "select PM_SPECIALTYSUBCONTRACTVIEWCONFIG_ID,'"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"' as SPECIALTYSUBCONTRACTVIEWID,'' as SPECIALTYSUBCONTRACTVIEWID_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_SPECIALTYSUBCONTRACTVIEWCONFIG b on a.codevalue = b.rateitem and SPECIALTYSUBCONTRACTVIEWID = '"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"'";
-sql += " left outer join (";
-sql += " select count(rateitem) AS rowcount,SPECIALTYSUBCONTRACTVIEWID from PM_SPECIALTYSUBCONTRACTVIEWCONFIG where SPECIALTYSUBCONTRACTVIEWID = '"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"'";
-sql += " Group by SPECIALTYSUBCONTRACTVIEWID) as temp1 on b.SPECIALTYSUBCONTRACTVIEWID = temp1.SPECIALTYSUBCONTRACTVIEWID";
-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_SPECIALTYSUBCONTRACTVIEWCONFIG",sql,returnCol);
-
-if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
- ratelist.add(list[i].toMap());
- }
-}
-
-bindField("SPECIALTYSUBCONTRACTVIEWID",ratelist);
def contents = group.getField("CONTENTS");
final Object table = contents?.table;
@@ -60,9 +27,9 @@ button.addClickListener(new Button.ClickListener() {
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') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
@@ -71,9 +38,36 @@ button.addClickListener(new Button.ClickListener() {
}
});
+
+import com.dsasp.client.viewframework.util.TableImportExport;
def tie = new TableImportExport(contents,"com.dsasp.pm.specialtycontract.client.ContentsImport");
tie.addImportButton(2);
tie.addExportButton(3);
+
+
+
+//带出金额
+if(getFieldValue("PM_PROJECTID") != null){
+ def sql1 = "select coalesce(sum(p.CONTRACTMONEY),0) as TOTALCONTROLCOST from( ";
+ sql1 += "select case when c.pm_plannedcostchange_id is null then coalesce(pp.PROFESSIONALSUBCONTRACTCOST,0)";
+ sql1 += "else coalesce(c.PROFESSIONALSUBCONTRACTCOSTNOW,0) end as CONTRACTMONEY ";
+ sql1 += "from PM_PLANNEDCOSTDECLARATION pp ";
+ sql1 += "join SYS_DATASTATUS s on s.businesskey=pp.PM_PLANNEDCOSTDECLARATION_id and s.tablename = 'PM_PLANNEDCOSTDECLARATION'and s.DATASTATUS = 3 ";
+ sql1 += "left join lateral(select PM_PLANNEDCOSTCHANGE_id,PROFESSIONALSUBCONTRACTCOSTNOW,PM_PROJECTID ";
+ sql1 += "from PM_PLANNEDCOSTCHANGE p join SYS_DATASTATUS s on s.businesskey=p.PM_PLANNEDCOSTCHANGE_id ";
+ sql1 += "and s.tablename = 'PM_PLANNEDCOSTCHANGE'and s.DATASTATUS = 3 where p.PM_PROJECTID = pp.PM_PROJECTID order by p.CHANGEDATE desc,p.createtime desc limit 1)c on true ";
+ sql1 += " where pp.PM_PROJECTID = '"+getFieldValue("PM_PROJECTID")+"')p ";
+ def map1 = GetServicesFunction.executeQueryForMap(sql1);
+ if(map1 != null){
+ bindField("TOTALCONTROLCOST",map1.get("TOTALCONTROLCOST"));
+ };
+ def sql2 = "select coalesce(sum(v.CONTRACTMONEY),0) as TOTALCONTRACTMONEY from VIEW_PM_CONTRACT v ";
+ sql2 += "where v.CONTRACTTYPE = 2 and v.PM_PROJECT_ID = '"+getFieldValue("PM_PROJECTID")+"' ";
+ def map2 = GetServicesFunction.executeQueryForMap(sql2);
+ if(map2 != null){
+ bindField("TOTALCONTRACTMONEY",map2.get("TOTALCONTRACTMONEY"));
+ };
+}
```
## 2. 硬 S3 原因
diff --git a/tools/s3_rewriter/output/manual_workpackage/036_HARD_71efbb03_项目部质量目标查看.md b/tools/s3_rewriter/output/manual_workpackage/036_HARD_71efbb03_项目部质量目标查看.md
index c1e52d7..a4eef6e 100644
--- a/tools/s3_rewriter/output/manual_workpackage/036_HARD_71efbb03_项目部质量目标查看.md
+++ b/tools/s3_rewriter/output/manual_workpackage/036_HARD_71efbb03_项目部质量目标查看.md
@@ -28,7 +28,7 @@ horLayout?.addComponent(fl);
def label = new Label("项目部质量管理目标、指标及管理方案");
//label?.setContentMode(ContentMode.HTML);
//label?.setWidth("100.0%");
-//label?.setValue("<span style='font-size: 13px; font-weight: bolder;'>项目部质量管理目标、指标及管理方案</span>");
+//label?.setValue("项目部质量管理目标、指标及管理方案");
horLayout?.addComponent(label);
horLayout?.setExpandRatio(label, 1.0f);
diff --git a/tools/s3_rewriter/output/manual_workpackage/038_HARD_7a0ac7a9_造价师注册证.md b/tools/s3_rewriter/output/manual_workpackage/038_HARD_7a0ac7a9_造价师注册证.md
index aeca496..bb55b92 100644
--- a/tools/s3_rewriter/output/manual_workpackage/038_HARD_7a0ac7a9_造价师注册证.md
+++ b/tools/s3_rewriter/output/manual_workpackage/038_HARD_7a0ac7a9_造价师注册证.md
@@ -2,7 +2,7 @@
- 模板ID : `7a0ac7a9-32bc-4d32-9231-4d1bbcd86002`
- 模板名 : 造价师注册证
-- 脚本序 : 2
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/039_HARD_7a2cbfcc_分_公司质量指标.md b/tools/s3_rewriter/output/manual_workpackage/039_HARD_7a2cbfcc_分_公司质量指标.md
index 2238060..4b601cc 100644
--- a/tools/s3_rewriter/output/manual_workpackage/039_HARD_7a2cbfcc_分_公司质量指标.md
+++ b/tools/s3_rewriter/output/manual_workpackage/039_HARD_7a2cbfcc_分_公司质量指标.md
@@ -33,7 +33,7 @@ horLayout?.addComponent(fl2);
def label = new Label("年度质量管理目标、指标及管理方案");
//label?.setContentMode(ContentMode.HTML);
//label?.setWidth("100.0%");
-//label?.setValue("<span style='font-size: 13px; font-weight: bolder;'>年度质量管理目标、指标及管理方案</span>");
+//label?.setValue("年度质量管理目标、指标及管理方案");
horLayout?.addComponent(label);
horLayout?.setExpandRatio(label, 1.0f);
diff --git a/tools/s3_rewriter/output/manual_workpackage/040_HARD_7a7c0ce5_评标结果公示.md b/tools/s3_rewriter/output/manual_workpackage/040_HARD_7a7c0ce5_评标结果公示.md
index 0929948..2a7b208 100644
--- a/tools/s3_rewriter/output/manual_workpackage/040_HARD_7a7c0ce5_评标结果公示.md
+++ b/tools/s3_rewriter/output/manual_workpackage/040_HARD_7a7c0ce5_评标结果公示.md
@@ -2,7 +2,7 @@
- 模板ID : `7a7c0ce5-7925-4c32-8c66-a68cca93ef9b`
- 模板名 : 评标结果公示
-- 脚本序 : 1
+- 脚本序 : 2
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -10,7 +10,7 @@
//import com.vaadin.ui.Link;
//import com.vaadin.server.ExternalResource;
//def url = group.getField("URL");
-//if(url.getValue()!= null && url?.isReadOnly()){
+//if(url.getValue()!= null && url?.isReadOnly()){
// Link link = new Link(" 原地址 ",
// new ExternalResource(url.getValue()));
// link.setTargetName("_blank")
@@ -22,7 +22,7 @@
////bindField("REPAIRUSERID",GetDefaultValueFunction.getCurrentUserId());
////bindField("REPAIRTIME",GetDefaultValueFunction.currentDate());
//def url1 = group.getField("ZBURL");
-//if(url1.getValue()!= null && url1?.isReadOnly()){
+//if(url1.getValue()!= null && url1?.isReadOnly()){
// Link link = new Link(" 招标公告链接 ",
// new ExternalResource(url1.getValue()));
// link.setTargetName("_blank")
diff --git a/tools/s3_rewriter/output/manual_workpackage/042_HARD_8350f440_中标登记_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/042_HARD_8350f440_中标登记_五建定制.md
index 784c333..c228dfd 100644
--- a/tools/s3_rewriter/output/manual_workpackage/042_HARD_8350f440_中标登记_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/042_HARD_8350f440_中标登记_五建定制.md
@@ -2,7 +2,7 @@
- 模板ID : `8350f440-bf6b-4d3f-b4e4-3769a8353d61`
- 模板名 : 中标登记-五建定制
-- 脚本序 : 2
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -10,7 +10,7 @@
import com.vaadin.ui.Link;
import com.vaadin.server.ExternalResource;
def url = group.getField("RESULTURL");
-if(url.getValue()!= null && url?.isReadOnly()){
+if(url.getValue()!= null && url?.isReadOnly()){
Link link = new Link("公示链接",
new ExternalResource(url.getValue()));
link.setTargetName("_blank")
diff --git a/tools/s3_rewriter/output/manual_workpackage/043_HARD_86c05eb5_销项税发票.md b/tools/s3_rewriter/output/manual_workpackage/043_HARD_86c05eb5_销项税发票.md
index 3a9f835..a7fa8f3 100644
--- a/tools/s3_rewriter/output/manual_workpackage/043_HARD_86c05eb5_销项税发票.md
+++ b/tools/s3_rewriter/output/manual_workpackage/043_HARD_86c05eb5_销项税发票.md
@@ -2,7 +2,7 @@
- 模板ID : `86c05eb5-753d-46e5-b958-cdbcefe7eabc`
- 模板名 : 销项税发票
-- 脚本序 : 3
+- 脚本序 : 6
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -30,7 +30,7 @@ cb?.addClickListener(new ClickListener() {
public void buttonClick(ClickEvent event) {
Object fplists = document?.getValue();
def documentfp = [];
- for (int i = 0; i < fplists.size(); i++) {
+ for (int i = 0; i < fplists.size(); i++) {
def item = fplists.get(i);
if(item.get("DOCUMENT")!=null){
documentfp.addAll(item.get("DOCUMENT"));
@@ -41,11 +41,11 @@ cb?.addClickListener(new ClickListener() {
Notification.show("请先上传发票信息!", Type.ERROR_MESSAGE);
return;
};
- if(documentfp && documentfp.size()>0){
+ if(documentfp && documentfp.size()>0){
def message = " ";//提示消息
- documentfp.eachWithIndex{it,index->
+ documentfp.eachWithIndex{it,index->
//批量选择发票类型后给子表赋值
- if(it && it.get("TEMPFILE")){
+ if(it && it.get("TEMPFILE")){
// 表示本地路径
def filePath = it.get("TEMPFILE");
//String endpointUrl = "http://192.168.20.63:5020/detection";//内网环境
@@ -58,79 +58,79 @@ cb?.addClickListener(new ClickListener() {
message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票接口请求超时,请检查该发票或联系管理员!\n"
}else{
def json = HTTPClientUtils.stringToJson(responseBody);
- if(json && json.getString("message") && json.get("message")=="ok"){
+ if(json && json.getString("message") && json.get("message")=="ok"){
def rows = json.get("data");
def item = rows?.get("data");
- if(rows && item){
+ if(rows && item){
//Console.debug(item);
def fplist = [:];
fplist.put("DOCUMENT",[it]);//附件图片
//发票类型
- if(rows?.get("invoiceType")!=null && rows?.get("invoiceType")!="null" && rows?.get("invoiceType")!="无"){
+ if(rows?.get("invoiceType")!=null && rows?.get("invoiceType")!="null" && rows?.get("invoiceType")!="无"){
fplist.put("RECEIPTTYPE",rows.get("invoiceType").contains("专用") ? 3 : rows.get("invoiceType").contains("普通") ? 2 : 1);
}else{
fplist.put("RECEIPTTYPE",null);
};
- if(item?.get("buyer_name")!=null && item?.getString("buyer_name")!="null" && item?.getString("buyer_name")!="无"){
+ if(item?.get("buyer_name")!=null && item?.getString("buyer_name")!="null" && item?.getString("buyer_name")!="无"){
fplist.put("PURCHASER",item.get("buyer_name"));
}else{
fplist.put("PURCHASER",null);
};
- if(item?.get("seller_name")!=null && item?.getString("seller_name")!="null" && item?.getString("seller_name")!="无"){
+ if(item?.get("seller_name")!=null && item?.getString("seller_name")!="null" && item?.getString("seller_name")!="无"){
fplist.put("SALESPARTY",item.get("seller_name"));
}else{
fplist.put("SALESPARTY",null);
};
- if(item?.get("invoice_code")!=null && item?.getString("invoice_code")!="null" && item?.getString("invoice_code")!="无"){
+ if(item?.get("invoice_code")!=null && item?.getString("invoice_code")!="null" && item?.getString("invoice_code")!="无"){
fplist.put("INVOICECODE",item.get("invoice_code"));
}else{
fplist.put("INVOICECODE",null);
};
- if(item?.get("invoice_number")!=null && item?.getString("invoice_number")!="null" && item?.getString("invoice_number")!="无"){
+ if(item?.get("invoice_number")!=null && item?.getString("invoice_number")!="null" && item?.getString("invoice_number")!="无"){
fplist.put("INVOICENO",item.get("invoice_number"));
}else{
fplist.put("INVOICENO",null);
};
- if(item?.get("money")!=null && item?.getString("money")!="null" && item?.getString("money")!="无"){
+ if(item?.get("money")!=null && item?.getString("money")!="null" && item?.getString("money")!="无"){
fplist.put("INVOICEMONEY",transformnum(item.getString("money")));
}else{
fplist.put("INVOICEMONEY",null);
};
- if(item?.get("tax")!=null && item?.getString("tax")!="null" && item?.getString("tax")!="无"){
+ if(item?.get("tax")!=null && item?.getString("tax")!="null" && item?.getString("tax")!="无"){
fplist.put("TAX",transformnum(item.getString("tax")));
}else{
fplist.put("TAX",null);
};
- if(item?.get("price")!=null && item?.getString("price")!="null" && item?.getString("price")!="无"){
+ if(item?.get("price")!=null && item?.getString("price")!="null" && item?.getString("price")!="无"){
fplist.put("TOTALMONEY",transformnum(item.getString("price")));
}else{
fplist.put("TOTALMONEY",null);
};
- if(item?.get("invoice_date")!=null && item?.getString("invoice_date")!="null" && item?.getString("invoice_date")!="无"){
+ if(item?.get("invoice_date")!=null && item?.getString("invoice_date")!="null" && item?.getString("invoice_date")!="无"){
def date = item.getString("invoice_date");
fplist.put("INVOICEDATE",GetValueFunction.toDate(date,"yyyy年MM月dd日"));
}else{
fplist.put("INVOICEDATE",null);
};
- if(item?.get("tax_rate")!=null && item?.getString("tax_rate")!="null" && item?.getString("tax_rate")!="无"){
+ if(item?.get("tax_rate")!=null && item?.getString("tax_rate")!="null" && item?.getString("tax_rate")!="无"){
fplist.put("TAXRATE",transformnum(item.getString("tax_rate")));
}else{
fplist.put("TAXRATE",null);
};
- if(item?.get("electronic_number")!=null && item?.getString("electronic_number")!="null" && item?.getString("electronic_number")!="无"){
+ if(item?.get("electronic_number")!=null && item?.getString("electronic_number")!="null" && item?.getString("electronic_number")!="无"){
def electronic_number = item.getString("electronic_number");
fplist.put("GLFPHM",electronic_number);
}else{
fplist.put("GLFPHM",null);
};
- if(item?.get("buyer_code")!=null && item?.getString("buyer_code")!="null" && item?.getString("buyer_code")!="无"){
+ if(item?.get("buyer_code")!=null && item?.getString("buyer_code")!="null" && item?.getString("buyer_code")!="无"){
def buyer_code = item.getString("buyer_code");
fplist.put("KHSH",buyer_code);
}else{
fplist.put("KHSH",null);
};
- if(item?.get("seller_code")!=null && item?.getString("seller_code")!="null" && item?.getString("seller_code")!="无"){
+ if(item?.get("seller_code")!=null && item?.getString("seller_code")!="null" && item?.getString("seller_code")!="无"){
def seller_code = item.getString("seller_code");
fplist.put("XFSH",seller_code);
}else{
@@ -138,10 +138,10 @@ cb?.addClickListener(new ClickListener() {
};
if(fplist!=null){
def flag = true;
- if(invoicelist.getValue() && invoicelist.getValue().size()>0){
- for (int j = 0; j < invoicelist.getValue().size(); j++) {
+ if(invoicelist.getValue() && invoicelist.getValue().size()>0){
+ for (int j = 0; j < invoicelist.getValue().size(); j++) {
def tempitem = invoicelist.getValue().get(j);
- if((fplist.get("INVOICENO")==null || (fplist.get("INVOICENO")!=null && tempitem.get("INVOICENO") == fplist.get("INVOICENO"))) && (fplist.get("INVOICECODE")==null || (fplist.get("INVOICECODE")!=null && tempitem.get("INVOICECODE") == fplist.get("INVOICECODE")))){
+ if((fplist.get("INVOICENO")==null || (fplist.get("INVOICENO")!=null && tempitem.get("INVOICENO") == fplist.get("INVOICENO"))) && (fplist.get("INVOICECODE")==null || (fplist.get("INVOICECODE")!=null && tempitem.get("INVOICECODE") == fplist.get("INVOICECODE")))){
flag = false;;
}
};
@@ -152,7 +152,7 @@ cb?.addClickListener(new ClickListener() {
}
}
}else{
- if(json && json.getString("message")){
+ if(json && json.getString("message")){
message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票"+json.getString("message")+"!\n";
} else{
message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票接口请求超时,请检查该发票或联系管理员!\n";
diff --git a/tools/s3_rewriter/output/manual_workpackage/044_HARD_884f0dde_物资采购申请_土建_项目.md b/tools/s3_rewriter/output/manual_workpackage/044_HARD_884f0dde_物资采购申请_土建_项目.md
index 6465d82..ce9a303 100644
--- a/tools/s3_rewriter/output/manual_workpackage/044_HARD_884f0dde_物资采购申请_土建_项目.md
+++ b/tools/s3_rewriter/output/manual_workpackage/044_HARD_884f0dde_物资采购申请_土建_项目.md
@@ -2,7 +2,7 @@
- 模板ID : `884f0dde-564a-4e6e-9a5d-55d12d0a16e1`
- 模板名 : 物资采购申请(土建-项目)
-- 脚本序 : 4
+- 脚本序 : 1
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/045_HARD_8c4a3b9f_专业分包合同登记_需要评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/045_HARD_8c4a3b9f_专业分包合同登记_需要评审_五建定制.md
index 4844c43..76a473d 100644
--- a/tools/s3_rewriter/output/manual_workpackage/045_HARD_8c4a3b9f_专业分包合同登记_需要评审_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/045_HARD_8c4a3b9f_专业分包合同登记_需要评审_五建定制.md
@@ -2,7 +2,7 @@
- 模板ID : `8c4a3b9f-0272-4675-8363-dd2f96a4f955`
- 模板名 : 专业分包合同登记_需要评审(五建定制)
-- 脚本序 : 1
+- 脚本序 : 2
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -29,9 +29,9 @@ button.addClickListener(new Button.ClickListener() {
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') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/046_HARD_908652e1_劳务分包合同登记_需要评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/046_HARD_908652e1_劳务分包合同登记_需要评审_五建定制.md
index dca96b8..34b6960 100644
--- a/tools/s3_rewriter/output/manual_workpackage/046_HARD_908652e1_劳务分包合同登记_需要评审_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/046_HARD_908652e1_劳务分包合同登记_需要评审_五建定制.md
@@ -28,9 +28,9 @@ button.addClickListener(new Button.ClickListener() {
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') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/047_HARD_90ab3b6d_物资合同登记_需要评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/047_HARD_90ab3b6d_物资合同登记_需要评审_五建定制.md
index d89c7d3..fc9b3cc 100644
--- a/tools/s3_rewriter/output/manual_workpackage/047_HARD_90ab3b6d_物资合同登记_需要评审_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/047_HARD_90ab3b6d_物资合同登记_需要评审_五建定制.md
@@ -2,7 +2,7 @@
- 模板ID : `90ab3b6d-3ea7-45d9-99d3-29740545a842`
- 模板名 : 物资合同登记-需要评审(五建定制)
-- 脚本序 : 1
+- 脚本序 : 2
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -33,9 +33,9 @@ button.addClickListener(new Button.ClickListener() {
public void buttonClick(Button.ClickEvent event) {
def meterialDetails = getFieldValue("MATERIALDETAILS");
def summoney = new BigDecimal("0");;
- if(meterialDetails != null && meterialDetails.size()>0){
+ if(meterialDetails != null && meterialDetails.size()>0){
meterialDetails?.each{
- if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
+ if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
summoney = summoney.add(new BigDecimal(it.get('TOTAL')))
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/048_HARD_91497e54_物资合同登记_不需要评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/048_HARD_91497e54_物资合同登记_不需要评审_五建定制.md
index 7fb513b..e04cd62 100644
--- a/tools/s3_rewriter/output/manual_workpackage/048_HARD_91497e54_物资合同登记_不需要评审_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/048_HARD_91497e54_物资合同登记_不需要评审_五建定制.md
@@ -20,7 +20,7 @@ bindField("FIRSTPARTY",GetDefaultValueFunction.getConfigValue("com.dsasp.server.
returnCol.add("RATEVALUE");
def sql = "select PM_MATERIALCONTRACTREGISTERCONFIG_ID,'"+PM_MATERIALCONTRACTREGISTER_ID+"' as MATERIALCONTRACTREGISTERID,'' as MATERIALCONTRACTREGISTERID_DISPLAY__,codevalue as rateitem,";
- sql += " case when rowcount > 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a ";
+ sql += " case when rowcount > 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a ";
sql += " left outer join PM_MATERIALCONTRACTREGISTERCONFIG b on a.codevalue = b.rateitem and MATERIALCONTRACTREGISTERID = '"+PM_MATERIALCONTRACTREGISTER_ID+"'";
sql += " left outer join (";
sql += " select count(rateitem) AS rowcount,MATERIALCONTRACTREGISTERID from PM_MATERIALCONTRACTREGISTERCONFIG where MATERIALCONTRACTREGISTERID = '"+PM_MATERIALCONTRACTREGISTER_ID+"'";
@@ -30,8 +30,8 @@ bindField("FIRSTPARTY",GetDefaultValueFunction.getConfigValue("com.dsasp.server.
def list = GetServicesFunction.listSelectResultBySql(map,"PM_MATERIALCONTRACTREGISTERCONFIG",sql,returnCol);
- if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
+ if(list!=null && list.size()>0){
+ for(i in 0..0){
meterialDetails?.each{
- if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
+ if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
summoney = summoney.add(new BigDecimal(it.get('TOTAL')))
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/049_HARD_91497e54_物资合同登记_不需要评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/049_HARD_91497e54_物资合同登记_不需要评审_五建定制.md
index ddf5d15..3665525 100644
--- a/tools/s3_rewriter/output/manual_workpackage/049_HARD_91497e54_物资合同登记_不需要评审_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/049_HARD_91497e54_物资合同登记_不需要评审_五建定制.md
@@ -2,7 +2,7 @@
- 模板ID : `91497e54-702d-47a7-bbcd-3f5d67b6fd91`
- 模板名 : 物资合同登记-不需要评审(五建定制)
-- 脚本序 : 3
+- 脚本序 : 2
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -33,9 +33,9 @@ button.addClickListener(new Button.ClickListener() {
public void buttonClick(Button.ClickEvent event) {
def meterialDetails = getFieldValue("MATERIALDETAILS");
def summoney = new BigDecimal("0");;
- if(meterialDetails != null && meterialDetails.size()>0){
+ if(meterialDetails != null && meterialDetails.size()>0){
meterialDetails?.each{
- if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
+ if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
summoney = summoney.add(new BigDecimal(it.get('TOTAL')))
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/050_HARD_938201e3_开标结果登记.md b/tools/s3_rewriter/output/manual_workpackage/050_HARD_938201e3_开标结果登记.md
index 2ab81f3..63c5218 100644
--- a/tools/s3_rewriter/output/manual_workpackage/050_HARD_938201e3_开标结果登记.md
+++ b/tools/s3_rewriter/output/manual_workpackage/050_HARD_938201e3_开标结果登记.md
@@ -2,7 +2,7 @@
- 模板ID : `938201e3-e6b1-4b46-b536-e195f5cfb90f`
- 模板名 : 开标结果登记
-- 脚本序 : 1
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -10,7 +10,7 @@
import com.vaadin.ui.Link;
import com.vaadin.server.ExternalResource;
def url = group.getField("RESULTURL");
-if(url.getValue()!= null && url?.isReadOnly()){
+if(url.getValue()!= null && url?.isReadOnly()){
Link link = new Link("公示链接",
new ExternalResource(url.getValue()));
link.setTargetName("_blank")
diff --git a/tools/s3_rewriter/output/manual_workpackage/051_HARD_99930d79_创优目标.md b/tools/s3_rewriter/output/manual_workpackage/051_HARD_99930d79_创优目标.md
index 0354014..c4fbd01 100644
--- a/tools/s3_rewriter/output/manual_workpackage/051_HARD_99930d79_创优目标.md
+++ b/tools/s3_rewriter/output/manual_workpackage/051_HARD_99930d79_创优目标.md
@@ -27,7 +27,7 @@ horLayout?.addComponent(fl);
def label = new Label("项目部质量管理目标、指标及管理方案");
//label?.setContentMode(ContentMode.HTML);
//label?.setWidth("100.0%");
-//label?.setValue("<span style='font-size: 13px; font-weight: bolder;'>项目部质量管理目标、指标及管理方案</span>");
+//label?.setValue("项目部质量管理目标、指标及管理方案");
horLayout?.addComponent(label);
horLayout?.setExpandRatio(label, 1.0f);
diff --git a/tools/s3_rewriter/output/manual_workpackage/052_HARD_99d77f69_十大员证.md b/tools/s3_rewriter/output/manual_workpackage/052_HARD_99d77f69_十大员证.md
index bb8d9a9..2c51527 100644
--- a/tools/s3_rewriter/output/manual_workpackage/052_HARD_99d77f69_十大员证.md
+++ b/tools/s3_rewriter/output/manual_workpackage/052_HARD_99d77f69_十大员证.md
@@ -2,7 +2,7 @@
- 模板ID : `99d77f69-b08f-49d3-937a-2ad8fcb5ca6f`
- 模板名 : 十大员证
-- 脚本序 : 4
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/053_HARD_9b0ea26a_项目付款申请.md b/tools/s3_rewriter/output/manual_workpackage/053_HARD_9b0ea26a_项目付款申请.md
index ee2ddd3..be46fa2 100644
--- a/tools/s3_rewriter/output/manual_workpackage/053_HARD_9b0ea26a_项目付款申请.md
+++ b/tools/s3_rewriter/output/manual_workpackage/053_HARD_9b0ea26a_项目付款申请.md
@@ -2,14 +2,14 @@
- 模板ID : `9b0ea26a-26a3-4dd2-be5e-2b18e7837005`
- 模板名 : 项目付款申请
-- 脚本序 : 2
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
```groovy
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("入库金额(元)");
+def label5 = new Label("超出控制金额后,本次申请付款金额以红色字体显示");
label4.setContentMode(Label.CONTENT_XHTML);
@@ -19,12 +19,12 @@ 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){
+if(formLayout5.getComponentCount()>1){
formLayout5.removeComponent(formLayout5.getComponent(1));
}
formLayout5.addComponent(label5);
@@ -78,8 +78,8 @@ 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..入库金额(元)");
label4.setContentMode(Label.CONTENT_XHTML);
def formLayout4 =group.getField("LBLIMPORTMONEY").parent;
-if(formLayout4.getComponentCount()>1){
+if(formLayout4.getComponentCount()>1){
formLayout4.removeComponent(formLayout4.getComponent(1));
}
formLayout4.addComponent(label4);
@@ -70,8 +70,8 @@ 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.. 0)
{
showConfirmDialog("重新生成盘点明细将清空原盘点明细,是否继续?",new ConfirmDialogListener(){
public void yes(){
diff --git a/tools/s3_rewriter/output/manual_workpackage/057_HARD_a18b1f38_付款确认.md b/tools/s3_rewriter/output/manual_workpackage/057_HARD_a18b1f38_付款确认.md
index 6816ad8..449bdad 100644
--- a/tools/s3_rewriter/output/manual_workpackage/057_HARD_a18b1f38_付款确认.md
+++ b/tools/s3_rewriter/output/manual_workpackage/057_HARD_a18b1f38_付款确认.md
@@ -9,12 +9,12 @@
```groovy
import com.vaadin.ui.Label;
-def label4 = new Label("<font style=\"float:right\">入库金额(元)</font>");
+def label4 = new Label("入库金额(元)");
label4.setContentMode(Label.CONTENT_XHTML);
def formLayout4 =group.getField("LBLIMPORTMONEY").parent;
-if(formLayout4.getComponentCount()>1){
+if(formLayout4.getComponentCount()>1){
formLayout4.removeComponent(formLayout4.getComponent(1));
}
formLayout4.addComponent(label4);
diff --git a/tools/s3_rewriter/output/manual_workpackage/059_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/059_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md
index edd66a9..fef9626 100644
--- a/tools/s3_rewriter/output/manual_workpackage/059_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/059_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md
@@ -27,7 +27,7 @@ returnCol.add("RATEITEM");
returnCol.add("RATEVALUE");
def sql = "select PM_SPECIALTYSUBCONTRACTREGISTERCONFIG_ID,'"+PM_SPECIALTYSUBCONTRACTREGISTER_ID+"' as SPECIALTYSUBCONTRACTREGISTERID,'' as SPECIALTYSUBCONTRACTREGISTERID_DISPLAY__,codevalue as rateitem,";
-sql += " case when rowcount > 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a ";
+sql += " case when rowcount > 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a ";
sql += " left outer join PM_SPECIALTYSUBCONTRACTREGISTERCONFIG b on a.codevalue = b.rateitem and SPECIALTYSUBCONTRACTREGISTERID = '"+PM_SPECIALTYSUBCONTRACTREGISTER_ID+"'";
sql += " left outer join (";
sql += " select count(rateitem) AS rowcount,SPECIALTYSUBCONTRACTREGISTERID from PM_SPECIALTYSUBCONTRACTREGISTERCONFIG where SPECIALTYSUBCONTRACTREGISTERID = '"+PM_SPECIALTYSUBCONTRACTREGISTER_ID+"'";
@@ -37,8 +37,8 @@ sql += " where sys_enumeratetype_id = 'SUBCONTRACT_BASICSCONFIG'";
def list = GetServicesFunction.listSelectResultBySql(map,"PM_SPECIALTYSUBCONTRACTREGISTERCONFIG",sql,returnCol);
-if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
+if(list!=null && list.size()>0){
+ for(i in 0..0){
balancedetails?.each{
- if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/060_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/060_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md
index 2397309..04a6486 100644
--- a/tools/s3_rewriter/output/manual_workpackage/060_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/060_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md
@@ -2,7 +2,7 @@
- 模板ID : `a1df0f12-8bfb-4807-882a-ca7b510e10f9`
- 模板名 : 专业分包合同登记_不需要评审(五建定制)
-- 脚本序 : 4
+- 脚本序 : 2
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -29,9 +29,9 @@ button.addClickListener(new Button.ClickListener() {
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') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/061_HARD_a760fba0_项目人员配置.md b/tools/s3_rewriter/output/manual_workpackage/061_HARD_a760fba0_项目人员配置.md
index 282443d..6efffe4 100644
--- a/tools/s3_rewriter/output/manual_workpackage/061_HARD_a760fba0_项目人员配置.md
+++ b/tools/s3_rewriter/output/manual_workpackage/061_HARD_a760fba0_项目人员配置.md
@@ -2,7 +2,7 @@
- 模板ID : `a760fba0-693e-4f0a-8007-3bdca7fb0305`
- 模板名 : 项目人员配置
-- 脚本序 : 2
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/062_HARD_ad1ffdd2_劳务分包合同评审.md b/tools/s3_rewriter/output/manual_workpackage/062_HARD_ad1ffdd2_劳务分包合同评审.md
index e2ba6a1..9578111 100644
--- a/tools/s3_rewriter/output/manual_workpackage/062_HARD_ad1ffdd2_劳务分包合同评审.md
+++ b/tools/s3_rewriter/output/manual_workpackage/062_HARD_ad1ffdd2_劳务分包合同评审.md
@@ -2,7 +2,7 @@
- 模板ID : `ad1ffdd2-3af3-4809-b0d5-2fbbb73e22b3`
- 模板名 : 劳务分包合同评审
-- 脚本序 : 1
+- 脚本序 : 2
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -28,7 +28,7 @@ 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 += " 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+"'";
@@ -38,8 +38,8 @@ 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()){
+if(list!=null && list.size()>0){
+ for(i in 0..0){
balancedetails?.each{
- if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/063_HARD_ad1ffdd2_劳务分包合同评审.md b/tools/s3_rewriter/output/manual_workpackage/063_HARD_ad1ffdd2_劳务分包合同评审.md
index dc989cb..9a14629 100644
--- a/tools/s3_rewriter/output/manual_workpackage/063_HARD_ad1ffdd2_劳务分包合同评审.md
+++ b/tools/s3_rewriter/output/manual_workpackage/063_HARD_ad1ffdd2_劳务分包合同评审.md
@@ -2,7 +2,7 @@
- 模板ID : `ad1ffdd2-3af3-4809-b0d5-2fbbb73e22b3`
- 模板名 : 劳务分包合同评审
-- 脚本序 : 2
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -28,9 +28,9 @@ button.addClickListener(new Button.ClickListener() {
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') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/064_HARD_b17684cf_技术工人证.md b/tools/s3_rewriter/output/manual_workpackage/064_HARD_b17684cf_技术工人证.md
index 66e91ad..ae3c9d5 100644
--- a/tools/s3_rewriter/output/manual_workpackage/064_HARD_b17684cf_技术工人证.md
+++ b/tools/s3_rewriter/output/manual_workpackage/064_HARD_b17684cf_技术工人证.md
@@ -2,7 +2,7 @@
- 模板ID : `b17684cf-061d-4006-b87f-048d128fe71a`
- 模板名 : 技术工人证
-- 脚本序 : 1
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/065_HARD_c0982679_报名申请.md b/tools/s3_rewriter/output/manual_workpackage/065_HARD_c0982679_报名申请.md
index fdeb2f4..3ce6390 100644
--- a/tools/s3_rewriter/output/manual_workpackage/065_HARD_c0982679_报名申请.md
+++ b/tools/s3_rewriter/output/manual_workpackage/065_HARD_c0982679_报名申请.md
@@ -2,7 +2,7 @@
- 模板ID : `c0982679-2ac1-4be9-8043-cbe47210beee`
- 模板名 : 报名申请
-- 脚本序 : 3
+- 脚本序 : 2
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -10,7 +10,7 @@
import com.vaadin.ui.Link;
import com.vaadin.server.ExternalResource;
def url = group.getField("ANNOUNCEMENTURL");
-if(url.getValue()!= null && url?.isReadOnly()){
+if(url.getValue()!= null && url?.isReadOnly()){
Link link = new Link("公告链接",
new ExternalResource(url.getValue()));
link.setTargetName("_blank")
diff --git a/tools/s3_rewriter/output/manual_workpackage/066_HARD_c5b5160e_分包合同结算.md b/tools/s3_rewriter/output/manual_workpackage/066_HARD_c5b5160e_分包合同结算.md
index 792638b..827986c 100644
--- a/tools/s3_rewriter/output/manual_workpackage/066_HARD_c5b5160e_分包合同结算.md
+++ b/tools/s3_rewriter/output/manual_workpackage/066_HARD_c5b5160e_分包合同结算.md
@@ -2,7 +2,7 @@
- 模板ID : `c5b5160e-2289-4b8d-8f8e-57a4801a6e43`
- 模板名 : 分包合同结算
-- 脚本序 : 3
+- 脚本序 : 2
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -29,12 +29,12 @@ button.addClickListener(new Button.ClickListener() {
def balancedetails = getFieldValue("BALANCEDETAILS");
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('NUMBER') !=null && it.get('NUMBER') !=""){
+ if(it.get('NUMBER') !=null && it.get('NUMBER') !=""){
sumamount = sumamount.add(new BigDecimal(it.get('NUMBER')))
}
- if(it.get('MONEY') !=null && it.get('MONEY') !=""){
+ if(it.get('MONEY') !=null && it.get('MONEY') !=""){
summoney = summoney.add(new BigDecimal(it.get('MONEY')))
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/067_HARD_c752e928_劳务分包合同登记_需要评审.md b/tools/s3_rewriter/output/manual_workpackage/067_HARD_c752e928_劳务分包合同登记_需要评审.md
index d1e9e25..8535780 100644
--- a/tools/s3_rewriter/output/manual_workpackage/067_HARD_c752e928_劳务分包合同登记_需要评审.md
+++ b/tools/s3_rewriter/output/manual_workpackage/067_HARD_c752e928_劳务分包合同登记_需要评审.md
@@ -28,9 +28,9 @@ button.addClickListener(new Button.ClickListener() {
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') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/068_HARD_cf71f83a_物资合同评审_明辉定制.md b/tools/s3_rewriter/output/manual_workpackage/068_HARD_cf71f83a_物资合同评审_明辉定制.md
index efde3fa..a0998d2 100644
--- a/tools/s3_rewriter/output/manual_workpackage/068_HARD_cf71f83a_物资合同评审_明辉定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/068_HARD_cf71f83a_物资合同评审_明辉定制.md
@@ -2,7 +2,7 @@
- 模板ID : `cf71f83a-0428-4e69-a736-97c91f998d19`
- 模板名 : 物资合同评审-明辉定制
-- 脚本序 : 1
+- 脚本序 : 2
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -14,6 +14,37 @@ 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_MATERIALCONTRACTVIEWCONFIG_ID = null;
+def PM_MATERIALCONTRACTREVIEW_ID = null;
+returnCol.add("PM_MATERIALCONTRACTVIEWCONFIG_ID");
+returnCol.add("MATERIALCONTRACTVIEWID");
+returnCol.add("RATEITEM");
+returnCol.add("RATEVALUE");
+
+def sql = "select PM_MATERIALCONTRACTVIEWCONFIG_ID,'"+PM_MATERIALCONTRACTREVIEW_ID+"' as MATERIALCONTRACTVIEWID,'' as MATERIALCONTRACTVIEWID_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_MATERIALCONTRACTVIEWCONFIG b on a.codevalue = b.rateitem and MATERIALCONTRACTVIEWID = '"+PM_MATERIALCONTRACTREVIEW_ID+"'";
+sql += " left outer join (";
+sql += " select count(rateitem) AS rowcount,MATERIALCONTRACTVIEWID from PM_MATERIALCONTRACTVIEWCONFIG where MATERIALCONTRACTVIEWID = '"+PM_MATERIALCONTRACTREVIEW_ID+"'";
+sql += " Group by MATERIALCONTRACTVIEWID) as temp1 on b.MATERIALCONTRACTVIEWID = temp1.MATERIALCONTRACTVIEWID";
+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_MATERIALCONTRACTVIEWCONFIG",sql,returnCol);
+
+if(list!=null && list.size()>0){
+ for(i in 0..0){
meterialDetails?.each{
- if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
+ if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
summoney = summoney.add(new BigDecimal(it.get('TOTAL')))
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/069_HARD_cf71f83a_物资合同评审_明辉定制.md b/tools/s3_rewriter/output/manual_workpackage/069_HARD_cf71f83a_物资合同评审_明辉定制.md
index e4e4caa..d5ca427 100644
--- a/tools/s3_rewriter/output/manual_workpackage/069_HARD_cf71f83a_物资合同评审_明辉定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/069_HARD_cf71f83a_物资合同评审_明辉定制.md
@@ -2,7 +2,7 @@
- 模板ID : `cf71f83a-0428-4e69-a736-97c91f998d19`
- 模板名 : 物资合同评审-明辉定制
-- 脚本序 : 2
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -14,37 +14,6 @@ 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_MATERIALCONTRACTVIEWCONFIG_ID = null;
-def PM_MATERIALCONTRACTREVIEW_ID = null;
-returnCol.add("PM_MATERIALCONTRACTVIEWCONFIG_ID");
-returnCol.add("MATERIALCONTRACTVIEWID");
-returnCol.add("RATEITEM");
-returnCol.add("RATEVALUE");
-
-def sql = "select PM_MATERIALCONTRACTVIEWCONFIG_ID,'"+PM_MATERIALCONTRACTREVIEW_ID+"' as MATERIALCONTRACTVIEWID,'' as MATERIALCONTRACTVIEWID_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_MATERIALCONTRACTVIEWCONFIG b on a.codevalue = b.rateitem and MATERIALCONTRACTVIEWID = '"+PM_MATERIALCONTRACTREVIEW_ID+"'";
-sql += " left outer join (";
-sql += " select count(rateitem) AS rowcount,MATERIALCONTRACTVIEWID from PM_MATERIALCONTRACTVIEWCONFIG where MATERIALCONTRACTVIEWID = '"+PM_MATERIALCONTRACTREVIEW_ID+"'";
-sql += " Group by MATERIALCONTRACTVIEWID) as temp1 on b.MATERIALCONTRACTVIEWID = temp1.MATERIALCONTRACTVIEWID";
-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_MATERIALCONTRACTVIEWCONFIG",sql,returnCol);
-
-if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
- ratelist.add(list[i].toMap());
- }
-}
-
-bindField("MATERIALCONTRACTVIEWID",ratelist);
-
//将自定义的按钮添加至
def materialList = group.getField("MATERIALDETAILS");
@@ -53,7 +22,6 @@ materialList?.addButton(group.getField("SELECT"),0);
def tie = new TableImportExport(materialList,"com.dsasp.pm.materialcontract.client.MaterialContractDetailImport");
tie.addImportButton(3);
tie.addExportButton(4);
-
//绑定合计按钮
def opertor = group.getField("BUTTON");
def vl = opertor?.parent;
@@ -65,9 +33,9 @@ button.addClickListener(new Button.ClickListener() {
public void buttonClick(Button.ClickEvent event) {
def meterialDetails = getFieldValue("MATERIALDETAILS");
def summoney = new BigDecimal("0");;
- if(meterialDetails != null && meterialDetails.size()>0){
+ if(meterialDetails != null && meterialDetails.size()>0){
meterialDetails?.each{
- if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
+ if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
summoney = summoney.add(new BigDecimal(it.get('TOTAL')))
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/070_HARD_d193b838_劳务分包合同评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/070_HARD_d193b838_劳务分包合同评审_五建定制.md
index 153f447..caf7ff3 100644
--- a/tools/s3_rewriter/output/manual_workpackage/070_HARD_d193b838_劳务分包合同评审_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/070_HARD_d193b838_劳务分包合同评审_五建定制.md
@@ -2,7 +2,7 @@
- 模板ID : `d193b838-f8a3-4d72-9fef-300c7a97d23c`
- 模板名 : 劳务分包合同评审(五建定制)
-- 脚本序 : 1
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -14,57 +14,70 @@ 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..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);
-
-
-def value = getFieldValue("PM_PROJECTID");
-def sql1 = "select coalesce(sum(p.CONTRACTMONEY),0) as TOTALCONTROLCOST from( ";
- sql1 += "select case when c.pm_plannedcostchange_id is null then coalesce(pp.ARTIFICIALLYPLANNEDCOST,0)";
- sql1 += "else coalesce(c.ARTIFICIALLYPLANNEDCOSTNOW,0) end as CONTRACTMONEY ";
- sql1 += "from PM_PLANNEDCOSTDECLARATION pp ";
- sql1 += "join SYS_DATASTATUS s on s.businesskey=pp.PM_PLANNEDCOSTDECLARATION_id and s.tablename = 'PM_PLANNEDCOSTDECLARATION'and s.DATASTATUS = 3 ";
- sql1 += "left join lateral(select PM_PLANNEDCOSTCHANGE_id,ARTIFICIALLYPLANNEDCOSTNOW,PM_PROJECTID ";
- sql1 += "from PM_PLANNEDCOSTCHANGE p join SYS_DATASTATUS s on s.businesskey=p.PM_PLANNEDCOSTCHANGE_id ";
- sql1 += "and s.tablename = 'PM_PLANNEDCOSTCHANGE'and s.DATASTATUS = 3 where p.PM_PROJECTID = pp.PM_PROJECTID order by p.CHANGEDATE desc,p.createtime desc limit 1)c on true ";
- sql1 += "where pp.PM_PROJECTID = '"+value+"')p ";
- def map1 = GetServicesFunction.executeQueryForMap(sql1);
- if(map1 != null){
- bindField("TOTALCONTROLCOST",map1.get("TOTALCONTROLCOST"));
- };
- def sql2 = "select coalesce(sum(v.CONTRACTMONEY),0) as TOTALCONTRACTMONEY from VIEW_PM_CONTRACT v ";
- sql2 += "where v.CONTRACTTYPE = 1 and v.PM_PROJECT_ID = '"+value+"' ";
- def map2 = GetServicesFunction.executeQueryForMap(sql2);
- if(map2 != null){
- bindField("TOTALCONTRACTMONEY",map2.get("TOTALCONTRACTMONEY"));
- };
```
## 2. 硬 S3 原因
diff --git a/tools/s3_rewriter/output/manual_workpackage/071_HARD_d193b838_劳务分包合同评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/071_HARD_d193b838_劳务分包合同评审_五建定制.md
index ae3639a..84a4734 100644
--- a/tools/s3_rewriter/output/manual_workpackage/071_HARD_d193b838_劳务分包合同评审_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/071_HARD_d193b838_劳务分包合同评审_五建定制.md
@@ -2,7 +2,7 @@
- 模板ID : `d193b838-f8a3-4d72-9fef-300c7a97d23c`
- 模板名 : 劳务分包合同评审(五建定制)
-- 脚本序 : 5
+- 脚本序 : 4
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -14,70 +14,57 @@ 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);
+
+
+def value = getFieldValue("PM_PROJECTID");
+def sql1 = "select coalesce(sum(p.CONTRACTMONEY),0) as TOTALCONTROLCOST from( ";
+ sql1 += "select case when c.pm_plannedcostchange_id is null then coalesce(pp.ARTIFICIALLYPLANNEDCOST,0)";
+ sql1 += "else coalesce(c.ARTIFICIALLYPLANNEDCOSTNOW,0) end as CONTRACTMONEY ";
+ sql1 += "from PM_PLANNEDCOSTDECLARATION pp ";
+ sql1 += "join SYS_DATASTATUS s on s.businesskey=pp.PM_PLANNEDCOSTDECLARATION_id and s.tablename = 'PM_PLANNEDCOSTDECLARATION'and s.DATASTATUS = 3 ";
+ sql1 += "left join lateral(select PM_PLANNEDCOSTCHANGE_id,ARTIFICIALLYPLANNEDCOSTNOW,PM_PROJECTID ";
+ sql1 += "from PM_PLANNEDCOSTCHANGE p join SYS_DATASTATUS s on s.businesskey=p.PM_PLANNEDCOSTCHANGE_id ";
+ sql1 += "and s.tablename = 'PM_PLANNEDCOSTCHANGE'and s.DATASTATUS = 3 where p.PM_PROJECTID = pp.PM_PROJECTID order by p.CHANGEDATE desc,p.createtime desc limit 1)c on true ";
+ sql1 += "where pp.PM_PROJECTID = '"+value+"')p ";
+ def map1 = GetServicesFunction.executeQueryForMap(sql1);
+ if(map1 != null){
+ bindField("TOTALCONTROLCOST",map1.get("TOTALCONTROLCOST"));
+ };
+ def sql2 = "select coalesce(sum(v.CONTRACTMONEY),0) as TOTALCONTRACTMONEY from VIEW_PM_CONTRACT v ";
+ sql2 += "where v.CONTRACTTYPE = 1 and v.PM_PROJECT_ID = '"+value+"' ";
+ def map2 = GetServicesFunction.executeQueryForMap(sql2);
+ if(map2 != null){
+ bindField("TOTALCONTRACTMONEY",map2.get("TOTALCONTRACTMONEY"));
+ };
```
## 2. 硬 S3 原因
diff --git a/tools/s3_rewriter/output/manual_workpackage/072_HARD_d2a01b24_项目部质量目标.md b/tools/s3_rewriter/output/manual_workpackage/072_HARD_d2a01b24_项目部质量目标.md
index 24ca7f2..37f9f19 100644
--- a/tools/s3_rewriter/output/manual_workpackage/072_HARD_d2a01b24_项目部质量目标.md
+++ b/tools/s3_rewriter/output/manual_workpackage/072_HARD_d2a01b24_项目部质量目标.md
@@ -28,7 +28,7 @@ horLayout?.addComponent(fl);
def label = new Label("项目部质量管理目标、指标及管理方案");
//label?.setContentMode(ContentMode.HTML);
//label?.setWidth("100.0%");
-//label?.setValue("<span style='font-size: 13px; font-weight: bolder;'>项目部质量管理目标、指标及管理方案</span>");
+//label?.setValue("项目部质量管理目标、指标及管理方案");
horLayout?.addComponent(label);
horLayout?.setExpandRatio(label, 1.0f);
diff --git a/tools/s3_rewriter/output/manual_workpackage/073_HARD_d41063b3_专业分包合同登记_需要评审.md b/tools/s3_rewriter/output/manual_workpackage/073_HARD_d41063b3_专业分包合同登记_需要评审.md
index c2c7387..8ee00c7 100644
--- a/tools/s3_rewriter/output/manual_workpackage/073_HARD_d41063b3_专业分包合同登记_需要评审.md
+++ b/tools/s3_rewriter/output/manual_workpackage/073_HARD_d41063b3_专业分包合同登记_需要评审.md
@@ -2,7 +2,7 @@
- 模板ID : `d41063b3-9189-42ce-8689-8ce022a99fc2`
- 模板名 : 专业分包合同登记_需要评审
-- 脚本序 : 1
+- 脚本序 : 2
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -29,9 +29,9 @@ button.addClickListener(new Button.ClickListener() {
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') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/074_HARD_e282bd37_物资合同评审.md b/tools/s3_rewriter/output/manual_workpackage/074_HARD_e282bd37_物资合同评审.md
index 5e2017c..7de4268 100644
--- a/tools/s3_rewriter/output/manual_workpackage/074_HARD_e282bd37_物资合同评审.md
+++ b/tools/s3_rewriter/output/manual_workpackage/074_HARD_e282bd37_物资合同评审.md
@@ -2,7 +2,7 @@
- 模板ID : `e282bd37-a9a7-4390-9c96-4411b2508a33`
- 模板名 : 物资合同评审
-- 脚本序 : 1
+- 脚本序 : 2
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -26,7 +26,7 @@ returnCol.add("RATEITEM");
returnCol.add("RATEVALUE");
def sql = "select PM_MATERIALCONTRACTVIEWCONFIG_ID,'"+PM_MATERIALCONTRACTREVIEW_ID+"' as MATERIALCONTRACTVIEWID,'' as MATERIALCONTRACTVIEWID_DISPLAY__,codevalue as rateitem,";
-sql += " case when rowcount > 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a ";
+sql += " case when rowcount > 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a ";
sql += " left outer join PM_MATERIALCONTRACTVIEWCONFIG b on a.codevalue = b.rateitem and MATERIALCONTRACTVIEWID = '"+PM_MATERIALCONTRACTREVIEW_ID+"'";
sql += " left outer join (";
sql += " select count(rateitem) AS rowcount,MATERIALCONTRACTVIEWID from PM_MATERIALCONTRACTVIEWCONFIG where MATERIALCONTRACTVIEWID = '"+PM_MATERIALCONTRACTREVIEW_ID+"'";
@@ -37,8 +37,8 @@ sql += " where sys_enumeratetype_id = 'SUBCONTRACT_BASICSCONFIG'";
def list = GetServicesFunction.listSelectResultBySql(map,"PM_MATERIALCONTRACTVIEWCONFIG",sql,returnCol);
-if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
+if(list!=null && list.size()>0){
+ for(i in 0..0){
meterialDetails?.each{
- if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
+ if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
summoney = summoney.add(new BigDecimal(it.get('TOTAL')))
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/075_HARD_e282bd37_物资合同评审.md b/tools/s3_rewriter/output/manual_workpackage/075_HARD_e282bd37_物资合同评审.md
index c97229b..7e11a6b 100644
--- a/tools/s3_rewriter/output/manual_workpackage/075_HARD_e282bd37_物资合同评审.md
+++ b/tools/s3_rewriter/output/manual_workpackage/075_HARD_e282bd37_物资合同评审.md
@@ -33,9 +33,9 @@ button.addClickListener(new Button.ClickListener() {
public void buttonClick(Button.ClickEvent event) {
def meterialDetails = getFieldValue("MATERIALDETAILS");
def summoney = new BigDecimal("0");;
- if(meterialDetails != null && meterialDetails.size()>0){
+ if(meterialDetails != null && meterialDetails.size()>0){
meterialDetails?.each{
- if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
+ if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
summoney = summoney.add(new BigDecimal(it.get('TOTAL')))
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/076_HARD_e5a03e54_进项税发票_批量调整抵扣日期_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/076_HARD_e5a03e54_进项税发票_批量调整抵扣日期_五建定制.md
index a503eeb..eb609f2 100644
--- a/tools/s3_rewriter/output/manual_workpackage/076_HARD_e5a03e54_进项税发票_批量调整抵扣日期_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/076_HARD_e5a03e54_进项税发票_批量调整抵扣日期_五建定制.md
@@ -2,7 +2,7 @@
- 模板ID : `e5a03e54-37b2-4122-971f-7f0ac57c2650`
- 模板名 : 进项税发票(批量调整抵扣日期)-五建定制
-- 脚本序 : 7
+- 脚本序 : 6
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -36,7 +36,7 @@ cb0?.addClickListener(new ClickListener() {
csql += " order by starttime desc";
def list = GetServicesFunction.listSelectResultBySql([:],"VIEW_ACT_RU_TASK",csql,returncol);
- if(list!=null && list.size()>0){
+ if(list!=null && list.size()>0){
for(ilist in list){
def imap = ilist?.toMap();
imap["ISSIGN"] = false;
diff --git a/tools/s3_rewriter/output/manual_workpackage/077_HARD_e5a03e54_进项税发票_批量调整抵扣日期_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/077_HARD_e5a03e54_进项税发票_批量调整抵扣日期_五建定制.md
new file mode 100644
index 0000000..993fbd6
--- /dev/null
+++ b/tools/s3_rewriter/output/manual_workpackage/077_HARD_e5a03e54_进项税发票_批量调整抵扣日期_五建定制.md
@@ -0,0 +1,192 @@
+# 人工作业单 #077 — HARD
+
+- 模板ID : `e5a03e54-37b2-4122-971f-7f0ac57c2650`
+- 模板名 : 进项税发票(批量调整抵扣日期)-五建定制
+- 脚本序 : 9
+- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
+
+## 1. 原文(S3 原始 Groovy)
+```groovy
+import com.dsasp.server.common.exception.ValidationException;
+import com.dsasp.server.common.util.HTTPClientUtils;
+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;
+
+def transformnum (moneyStr) {
+ def numericStr = moneyStr.replaceAll(/[^\d.]/, '') // 移除非数字字符:ml-citation{ref="5,11" data="citationList"}
+ def result = numericStr.isNumber() ? numericStr.toBigDecimal() : null // 高精度转换:ml-citation{ref="9,11" data="citationList"}
+ return result;
+}
+
+
+def invoicelist = group.getField("INVOICELIST");
+def document = group.getField("SELECT");
+
+final Button cb = new Button("识别");
+cb?.addClickListener(new ClickListener() {
+ public void buttonClick(ClickEvent event) {
+ Object fplists = document?.getValue();
+ def documentfp = [];
+ for (int i = 0; i < fplists.size(); i++) {
+ def item = fplists.get(i);
+ if(item.get("DOCUMENT")!=null){
+ documentfp.addAll(item.get("DOCUMENT"));
+ }
+ };
+// Console.debug(documentfp);
+ if (documentfp == null || documentfp.size()==0){
+ Notification.show("请先上传发票信息!", Type.ERROR_MESSAGE);
+ return;
+ };
+ if(documentfp && documentfp.size()>0){
+ def message = " ";//提示消息
+ documentfp.eachWithIndex{it,index->
+ //批量选择发票类型后给子表赋值
+ if(it && it.get("TEMPFILE")){
+ // 表示本地路径
+ def filePath = it.get("TEMPFILE");
+ //String endpointUrl = "http://192.168.20.63:5020/detection";//内网环境
+ String endpointUrl = "http://58.211.166.190:5020/detection";//正式环境
+
+ //文件流 上传方法
+ def responseBody = HTTPClientUtils.getTempFiletoFile(endpointUrl,filePath);
+// Console.debug(responseBody);
+ if(responseBody == null || !responseBody.contains("data")){
+ message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票接口请求超时,请检查该发票或联系管理员!\n"
+ }else{
+ def json = HTTPClientUtils.stringToJson(responseBody);
+ if(json && json.getString("message") && json.get("message")=="ok"){
+ def rows = json.get("data");
+ def item = rows?.get("data");
+ if(rows && item){
+ //Console.debug(item);
+ def fplist = [:];
+
+ //发票类型
+ if(rows?.get("invoiceType")!=null && rows?.get("invoiceType")!="null" && rows?.get("invoiceType")!="无"){
+ fplist.put("RECEIPTTYPE",rows.get("invoiceType").contains("专用") ? 3 : rows.get("invoiceType").contains("普通") ? 2 : 1);
+ }else{
+ fplist.put("RECEIPTTYPE",null);
+ };
+
+ if(item?.get("buyer_name")!=null && item?.getString("buyer_name")!="null" && item?.getString("buyer_name")!="无"){
+ fplist.put("PURCHASER",item.get("buyer_name"));
+ }else{
+ fplist.put("PURCHASER",null);
+ };
+ if(item?.get("seller_name")!=null && item?.getString("seller_name")!="null" && item?.getString("seller_name")!="无"){
+ fplist.put("SALESPARTY",item.get("seller_name"));
+ }else{
+ fplist.put("SALESPARTY",null);
+ };
+ if(item?.get("invoice_code")!=null && item?.getString("invoice_code")!="null" && item?.getString("invoice_code")!="无"){
+ fplist.put("INVOICECODE",item.get("invoice_code"));
+ }else{
+ fplist.put("INVOICECODE", "数电票");
+ };
+ if(item?.get("invoice_number")!=null && item?.getString("invoice_number")!="null" && item?.getString("invoice_number")!="无"){
+ fplist.put("INVOICENO",item.get("invoice_number"));
+ }else{
+ fplist.put("INVOICENO",null);
+ };
+ if(item?.get("money")!=null && item?.getString("money")!="null" && item?.getString("money")!="无"){
+ fplist.put("INVOICEMONEY",transformnum(item.getString("money")));
+ }else{
+ fplist.put("INVOICEMONEY",null);
+ };
+ if(item?.get("tax")!=null && item?.getString("tax")!="null" && item?.getString("tax")!="无"){
+ fplist.put("TAX",transformnum(item.getString("tax")));
+ }else{
+ fplist.put("TAX",null);
+ };
+ if(item?.get("price")!=null && item?.getString("price")!="null" && item?.getString("price")!="无"){
+ fplist.put("TOTALMONEY",transformnum(item.getString("price")));
+ }else{
+ fplist.put("TOTALMONEY",null);
+ };
+ if(item?.get("invoice_date")!=null && item?.getString("invoice_date")!="null" && item?.getString("invoice_date")!="无"){
+ def date = item.getString("invoice_date");
+ fplist.put("INVOICEDATE",GetValueFunction.toDate(date,"yyyy年MM月dd日"));
+ }else{
+ fplist.put("INVOICEDATE",null);
+ };
+ if(item?.get("tax_rate")!=null && item?.getString("tax_rate")!="null" && item?.getString("tax_rate")!="无"){
+ fplist.put("TAXRATE",transformnum(item.getString("tax_rate")));
+ }else{
+ fplist.put("TAXRATE",null);
+ };
+ if(item?.get("electronic_number")!=null && item?.getString("electronic_number")!="null" && item?.getString("electronic_number")!="无"){
+ def electronic_number = item.getString("electronic_number");
+ fplist.put("GLFPHM",electronic_number);
+ }else{
+ fplist.put("GLFPHM",null);
+ };
+ if(item?.get("buyer_code")!=null && item?.getString("buyer_code")!="null" && item?.getString("buyer_code")!="无"){
+ def buyer_code = item.getString("buyer_code");
+ fplist.put("KHSH",buyer_code);
+ }else{
+ fplist.put("KHSH",null);
+ };
+ if(item?.get("seller_code")!=null && item?.getString("seller_code")!="null" && item?.getString("seller_code")!="无"){
+ def seller_code = item.getString("seller_code");
+ fplist.put("XFSH",seller_code);
+ }else{
+ fplist.put("XFSH",null);
+ };
+ if(fplist!=null){
+ def flag = true;
+ if(invoicelist.getValue() && invoicelist.getValue().size()>0){
+ for (int j = 0; j < invoicelist.getValue().size(); j++) {
+ def tempitem = invoicelist.getValue().get(j);
+ if((fplist.get("INVOICENO")==null || (fplist.get("INVOICENO")!=null && tempitem.get("INVOICENO") == fplist.get("INVOICENO"))) && (fplist.get("INVOICECODE")==null || (fplist.get("INVOICECODE")!=null && tempitem.get("INVOICECODE") == fplist.get("INVOICECODE")))){
+ flag = false;;
+ }
+ };
+ };
+ if(flag){
+ fplist.put("DOCUMENT",[it]);//附件图片
+ invoicelist.addItem(fplist);
+ };
+ }
+ }
+ }else{
+ if(json && json.getString("message")){
+ message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票"+json.getString("message")+"!\n";
+ } else{
+ message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票接口请求超时,请检查该发票或联系管理员!\n";
+ }
+ }
+ }
+ }
+ }
+ if(message.trim()!=""){
+ Notification.show(message, Type.ERROR_MESSAGE);
+ }
+ }
+ };
+});
+
+//将自定义的按钮添加至
+invoicelist?.addButton(cb, 0);
+```
+
+## 2. 硬 S3 原因
+
+- 动态创建 Vaadin 组件
+
+## 3. 已改写部分
+
+无(HARD 整条不自动改写,原样保留)。
+
+## 4. 余留模式
+
+整条为硬 S3:动态创建 Vaadin 组件 / showConfirmDialog 同步确认框 / UI.getCurrent()。
+
+## 5. 建议改法
+
+- 动态组件:在 amis 页面 schema 侧用条件渲染/Dialog 组件声明式表达,脚本仅下发数据。
+- showConfirmDialog:改为 amis confirm 事件动作 + 回调链(异步),脚本中途交互拆为两段。
+- UI.getCurrent():amis 无全局 UI 单例,改用事件上下文/广播动作。
diff --git a/tools/s3_rewriter/output/manual_workpackage/078_HARD_e7670207_付款确认_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/078_HARD_e7670207_付款确认_五建定制.md
index a5be7d4..dbda453 100644
--- a/tools/s3_rewriter/output/manual_workpackage/078_HARD_e7670207_付款确认_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/078_HARD_e7670207_付款确认_五建定制.md
@@ -2,19 +2,19 @@
- 模板ID : `e7670207-9cf7-4db9-a452-884b58408b96`
- 模板名 : 付款确认(五建定制)
-- 脚本序 : 5
+- 脚本序 : 4
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
```groovy
import com.vaadin.ui.Label;
-def label4 = new Label("<font style=\"float:right\">入库金额(元)</font>");
+def label4 = new Label("入库金额(元)");
label4.setContentMode(Label.CONTENT_XHTML);
def formLayout4 =group.getField("LBLIMPORTMONEY").parent;
-if(formLayout4.getComponentCount()>1){
+if(formLayout4.getComponentCount()>1){
formLayout4.removeComponent(formLayout4.getComponent(1));
}
formLayout4.addComponent(label4);
diff --git a/tools/s3_rewriter/output/manual_workpackage/077_HARD_e7670207_付款确认_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/079_HARD_e7670207_付款确认_五建定制.md
similarity index 95%
rename from tools/s3_rewriter/output/manual_workpackage/077_HARD_e7670207_付款确认_五建定制.md
rename to tools/s3_rewriter/output/manual_workpackage/079_HARD_e7670207_付款确认_五建定制.md
index 89a80ab..fd4a600 100644
--- a/tools/s3_rewriter/output/manual_workpackage/077_HARD_e7670207_付款确认_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/079_HARD_e7670207_付款确认_五建定制.md
@@ -1,8 +1,8 @@
-# 人工作业单 #077 — HARD
+# 人工作业单 #079 — HARD
- 模板ID : `e7670207-9cf7-4db9-a452-884b58408b96`
- 模板名 : 付款确认(五建定制)
-- 脚本序 : 1
+- 脚本序 : 7
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -53,7 +53,7 @@ search?.addClickListener(new ClickListener() {
if(draftType==null){
content += "票据种类不能为空!\n";
}
- if(content !=null && content !=""){
+ if(content !=null && content !=""){
//throw new ValidationException(content);
Notification.show(content,Type.ERROR_MESSAGE);
return;
@@ -95,7 +95,7 @@ search?.addClickListener(new ClickListener() {
}
//得到付款结果
def tempretCode = tempreturnlist.get("retCode");
- if(tempretCode && tempretCode != "0000" && tempreturnlist.get("retMsg")){
+ if(tempretCode && tempretCode != "0000" && tempreturnlist.get("retMsg")){
Notification.show(tempreturnlist.get("retMsg"),Type.ERROR_MESSAGE);
return;
}
@@ -122,16 +122,16 @@ search?.addClickListener(new ClickListener() {
}
//得到付款结果
def retCode = returnlist.get("retCode");
- if(retCode && retCode != "0000" && returnlist.get("retMsg")){
+ if(retCode && retCode != "0000" && returnlist.get("retMsg")){
//throw new ValidationException(returnlist.get("retMsg"));
Notification.show(returnlist.get("retMsg"),Type.ERROR_MESSAGE);
return;
- }else if(retCode && retCode == "0000"){
+ }else if(retCode && retCode == "0000"){
//查询票据查询明细表中是否存在该信息,存在则删除后再新增,不存在则新增
def PROJECTIDAPIBATCHNO = getFieldValue("PROJECTID")+"-"+getFieldValue("APIBATCHNO");
def sql = " SELECT PM_ENDORSEAPPLY_ENDORSEDETAILS_ID FROM PM_ENDORSEAPPLY_ENDORSEDETAILS WHERE PROJECTIDAPIBATCHNO = '"+PROJECTIDAPIBATCHNO+"'";
def list = GetServicesFunction.listSelectResultBySql([:],"PM_ENDORSEAPPLY_ENDORSEDETAILS",sql,["PM_ENDORSEAPPLY_ENDORSEDETAILS_ID"]);
- if(list && list.size()>0){
+ if(list && list.size()>0){
list.each{
def tempmap = [:];
tempmap["PM_ENDORSEAPPLY_ENDORSEDETAILS_ID"] = it.get_Value("PM_ENDORSEAPPLY_ENDORSEDETAILS_ID");//主键
@@ -140,7 +140,7 @@ search?.addClickListener(new ClickListener() {
};
Console.debug(returnlist.get("draftList"));
def rows = returnlist.get("draftList");
- for (int i = 0; i < rows?.size(); i++) {
+ for (int i = 0; i < rows?.size(); i++) {
def it = rows.get(i);
def itemMap = [:];
itemMap["DRAFTCODE"] = it.get("draftCode");//票据(包)号
diff --git a/tools/s3_rewriter/output/manual_workpackage/079_HARD_ee9e2a39_物资采购申请_土建_公司.md b/tools/s3_rewriter/output/manual_workpackage/080_HARD_ee9e2a39_物资采购申请_土建_公司.md
similarity index 99%
rename from tools/s3_rewriter/output/manual_workpackage/079_HARD_ee9e2a39_物资采购申请_土建_公司.md
rename to tools/s3_rewriter/output/manual_workpackage/080_HARD_ee9e2a39_物资采购申请_土建_公司.md
index 61e7eb7..087d4d1 100644
--- a/tools/s3_rewriter/output/manual_workpackage/079_HARD_ee9e2a39_物资采购申请_土建_公司.md
+++ b/tools/s3_rewriter/output/manual_workpackage/080_HARD_ee9e2a39_物资采购申请_土建_公司.md
@@ -1,4 +1,4 @@
-# 人工作业单 #079 — HARD
+# 人工作业单 #080 — HARD
- 模板ID : `ee9e2a39-45e2-434a-b691-a02a2041b7e6`
- 模板名 : 物资采购申请(土建-公司)
diff --git a/tools/s3_rewriter/output/manual_workpackage/080_HARD_f01c2f57_销项税发票_增加审批通过后修改加批量撤回_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/081_HARD_f01c2f57_销项税发票_增加审批通过后_五建定制.md
similarity index 95%
rename from tools/s3_rewriter/output/manual_workpackage/080_HARD_f01c2f57_销项税发票_增加审批通过后修改加批量撤回_五建定制.md
rename to tools/s3_rewriter/output/manual_workpackage/081_HARD_f01c2f57_销项税发票_增加审批通过后_五建定制.md
index 34a0a33..a87242e 100644
--- a/tools/s3_rewriter/output/manual_workpackage/080_HARD_f01c2f57_销项税发票_增加审批通过后修改加批量撤回_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/081_HARD_f01c2f57_销项税发票_增加审批通过后_五建定制.md
@@ -1,7 +1,7 @@
-# 人工作业单 #080 — HARD
+# 人工作业单 #081 — HARD
- 模板ID : `f01c2f57-1891-45de-9318-7246f9d6ac97`
-- 模板名 : 销项税发票(增加审批通过后修改加批量撤回)-五建定制
+- 模板名 : 销项税发票(增加审批通过后)-五建定制
- 脚本序 : 5
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
@@ -36,7 +36,7 @@ cb0?.addClickListener(new ClickListener() {
csql += " order by starttime desc";
def list = GetServicesFunction.listSelectResultBySql([:],"VIEW_ACT_RU_TASK",csql,returncol);
- if(list!=null && list.size()>0){
+ if(list!=null && list.size()>0){
for(ilist in list){
def imap = ilist?.toMap();
imap["ISSIGN"] = false;
diff --git a/tools/s3_rewriter/output/manual_workpackage/081_HARD_f475e860_其他证书.md b/tools/s3_rewriter/output/manual_workpackage/082_HARD_f475e860_其他证书.md
similarity index 96%
rename from tools/s3_rewriter/output/manual_workpackage/081_HARD_f475e860_其他证书.md
rename to tools/s3_rewriter/output/manual_workpackage/082_HARD_f475e860_其他证书.md
index bb865af..a98b00d 100644
--- a/tools/s3_rewriter/output/manual_workpackage/081_HARD_f475e860_其他证书.md
+++ b/tools/s3_rewriter/output/manual_workpackage/082_HARD_f475e860_其他证书.md
@@ -1,8 +1,8 @@
-# 人工作业单 #081 — HARD
+# 人工作业单 #082 — HARD
- 模板ID : `f475e860-0026-49a8-b2ff-510101386c6a`
- 模板名 : 其他证书
-- 脚本序 : 4
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/083_HARD_f9b884de_项目付款申请_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/083_HARD_f9b884de_项目付款申请_五建定制.md
index df1cb8a..8bba10c 100644
--- a/tools/s3_rewriter/output/manual_workpackage/083_HARD_f9b884de_项目付款申请_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/083_HARD_f9b884de_项目付款申请_五建定制.md
@@ -2,14 +2,14 @@
- 模板ID : `f9b884de-6d46-4242-b93f-f3babd358f36`
- 模板名 : 项目付款申请-五建定制
-- 脚本序 : 5
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
```groovy
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("入库金额(元)");
+def label5 = new Label("超出控制金额后,本次申请付款金额以红色字体显示");
label4.setContentMode(Label.CONTENT_XHTML);
@@ -19,12 +19,12 @@ 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){
+if(formLayout5.getComponentCount()>1){
formLayout5.removeComponent(formLayout5.getComponent(1));
}
formLayout5.addComponent(label5);
@@ -65,8 +65,8 @@ 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..入库金额(元)");
label4.setContentMode(Label.CONTENT_XHTML);
def formLayout4 =group.getField("LBLIMPORTMONEY").parent;
-if(formLayout4.getComponentCount()>1){
+if(formLayout4.getComponentCount()>1){
formLayout4.removeComponent(formLayout4.getComponent(1));
}
formLayout4.addComponent(label4);
@@ -57,8 +57,8 @@ 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..=12){
Notification.show("间隔月数要小于12!", Type.ERROR_MESSAGE);
return;
}
- if(totalmoney >0){
+ if(totalmoney >0){
def m = totalmoney/monthsize;
def details = [];
def syear = startyear;
def smonth = startmonth;
- for(int i=0;i<monthsize;i++){
+ for(int i=0;i12){
smonth=1;
syear++;
}
}
- if(details.size()>0){
+ if(details.size()>0){
bindField("PLANDETAILS",details)
}
}
diff --git a/tools/s3_rewriter/output/manual_workpackage/085_HARD_fe20a392_项目人员配置_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/086_HARD_fe20a392_项目人员配置_五建定制.md
similarity index 97%
rename from tools/s3_rewriter/output/manual_workpackage/085_HARD_fe20a392_项目人员配置_五建定制.md
rename to tools/s3_rewriter/output/manual_workpackage/086_HARD_fe20a392_项目人员配置_五建定制.md
index 9427467..15dbf86 100644
--- a/tools/s3_rewriter/output/manual_workpackage/085_HARD_fe20a392_项目人员配置_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/086_HARD_fe20a392_项目人员配置_五建定制.md
@@ -1,8 +1,8 @@
-# 人工作业单 #085 — HARD
+# 人工作业单 #086 — HARD
- 模板ID : `fe20a392-d4fd-402f-bbf8-be8cd41ab932`
- 模板名 : 项目人员配置(五建定制)
-- 脚本序 : 2
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/086_PARTIAL_0567316f_车辆维修保养登记.md b/tools/s3_rewriter/output/manual_workpackage/087_PARTIAL_0567316f_车辆维修保养登记.md
similarity index 98%
rename from tools/s3_rewriter/output/manual_workpackage/086_PARTIAL_0567316f_车辆维修保养登记.md
rename to tools/s3_rewriter/output/manual_workpackage/087_PARTIAL_0567316f_车辆维修保养登记.md
index db9c390..e2d1d3a 100644
--- a/tools/s3_rewriter/output/manual_workpackage/086_PARTIAL_0567316f_车辆维修保养登记.md
+++ b/tools/s3_rewriter/output/manual_workpackage/087_PARTIAL_0567316f_车辆维修保养登记.md
@@ -1,4 +1,4 @@
-# 人工作业单 #086 — PARTIAL
+# 人工作业单 #087 — PARTIAL
- 模板ID : `0567316f-6a71-47f6-a669-eb8c91670e45`
- 模板名 : 车辆维修保养登记
diff --git a/tools/s3_rewriter/output/manual_workpackage/087_PARTIAL_208996a7_办公用品库初始化凭证.md b/tools/s3_rewriter/output/manual_workpackage/088_PARTIAL_208996a7_办公用品库初始化凭证.md
similarity index 94%
rename from tools/s3_rewriter/output/manual_workpackage/087_PARTIAL_208996a7_办公用品库初始化凭证.md
rename to tools/s3_rewriter/output/manual_workpackage/088_PARTIAL_208996a7_办公用品库初始化凭证.md
index 0743e60..347cf9a 100644
--- a/tools/s3_rewriter/output/manual_workpackage/087_PARTIAL_208996a7_办公用品库初始化凭证.md
+++ b/tools/s3_rewriter/output/manual_workpackage/088_PARTIAL_208996a7_办公用品库初始化凭证.md
@@ -1,8 +1,8 @@
-# 人工作业单 #087 — PARTIAL
+# 人工作业单 #088 — PARTIAL
- 模板ID : `208996a7-fa97-4e99-8e35-4b592385eb37`
- 模板名 : 办公用品库初始化凭证
-- 脚本序 : 5
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/088_PARTIAL_292e76e6_月度检查.md b/tools/s3_rewriter/output/manual_workpackage/089_PARTIAL_292e76e6_月度检查.md
similarity index 97%
rename from tools/s3_rewriter/output/manual_workpackage/088_PARTIAL_292e76e6_月度检查.md
rename to tools/s3_rewriter/output/manual_workpackage/089_PARTIAL_292e76e6_月度检查.md
index 3c11edf..0a00e91 100644
--- a/tools/s3_rewriter/output/manual_workpackage/088_PARTIAL_292e76e6_月度检查.md
+++ b/tools/s3_rewriter/output/manual_workpackage/089_PARTIAL_292e76e6_月度检查.md
@@ -1,4 +1,4 @@
-# 人工作业单 #088 — PARTIAL
+# 人工作业单 #089 — PARTIAL
- 模板ID : `292e76e6-df04-4be3-9108-73eaa1565b4c`
- 模板名 : 月度检查
diff --git a/tools/s3_rewriter/output/manual_workpackage/089_PARTIAL_2b39c3e1_项目部污染源申报.md b/tools/s3_rewriter/output/manual_workpackage/090_PARTIAL_2b39c3e1_项目部污染源申报.md
similarity index 99%
rename from tools/s3_rewriter/output/manual_workpackage/089_PARTIAL_2b39c3e1_项目部污染源申报.md
rename to tools/s3_rewriter/output/manual_workpackage/090_PARTIAL_2b39c3e1_项目部污染源申报.md
index 36f7021..16fd1f3 100644
--- a/tools/s3_rewriter/output/manual_workpackage/089_PARTIAL_2b39c3e1_项目部污染源申报.md
+++ b/tools/s3_rewriter/output/manual_workpackage/090_PARTIAL_2b39c3e1_项目部污染源申报.md
@@ -1,4 +1,4 @@
-# 人工作业单 #089 — PARTIAL
+# 人工作业单 #090 — PARTIAL
- 模板ID : `2b39c3e1-3bf9-4664-8e02-53d426c5db84`
- 模板名 : 项目部污染源申报
diff --git a/tools/s3_rewriter/output/manual_workpackage/090_PARTIAL_2d046844_办公用品领用申请.md b/tools/s3_rewriter/output/manual_workpackage/091_PARTIAL_2d046844_办公用品领用申请.md
similarity index 96%
rename from tools/s3_rewriter/output/manual_workpackage/090_PARTIAL_2d046844_办公用品领用申请.md
rename to tools/s3_rewriter/output/manual_workpackage/091_PARTIAL_2d046844_办公用品领用申请.md
index 9107ba8..87c188b 100644
--- a/tools/s3_rewriter/output/manual_workpackage/090_PARTIAL_2d046844_办公用品领用申请.md
+++ b/tools/s3_rewriter/output/manual_workpackage/091_PARTIAL_2d046844_办公用品领用申请.md
@@ -1,8 +1,8 @@
-# 人工作业单 #090 — PARTIAL
+# 人工作业单 #091 — PARTIAL
- 模板ID : `2d046844-a126-4822-910e-bfe1283b5ebf`
- 模板名 : 办公用品领用申请
-- 脚本序 : 3
+- 脚本序 : 2
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/091_PARTIAL_3cfaeaa6_项目部危险源申报.md b/tools/s3_rewriter/output/manual_workpackage/092_PARTIAL_3cfaeaa6_项目部危险源申报.md
similarity index 99%
rename from tools/s3_rewriter/output/manual_workpackage/091_PARTIAL_3cfaeaa6_项目部危险源申报.md
rename to tools/s3_rewriter/output/manual_workpackage/092_PARTIAL_3cfaeaa6_项目部危险源申报.md
index 3cfc830..c78bb54 100644
--- a/tools/s3_rewriter/output/manual_workpackage/091_PARTIAL_3cfaeaa6_项目部危险源申报.md
+++ b/tools/s3_rewriter/output/manual_workpackage/092_PARTIAL_3cfaeaa6_项目部危险源申报.md
@@ -1,4 +1,4 @@
-# 人工作业单 #091 — PARTIAL
+# 人工作业单 #092 — PARTIAL
- 模板ID : `3cfaeaa6-2cf9-4364-8f98-25aee16cbda3`
- 模板名 : 项目部危险源申报
diff --git a/tools/s3_rewriter/output/manual_workpackage/092_PARTIAL_459103d3_测试树.md b/tools/s3_rewriter/output/manual_workpackage/093_PARTIAL_459103d3_测试树.md
similarity index 87%
rename from tools/s3_rewriter/output/manual_workpackage/092_PARTIAL_459103d3_测试树.md
rename to tools/s3_rewriter/output/manual_workpackage/093_PARTIAL_459103d3_测试树.md
index c2f8779..a5bbeab 100644
--- a/tools/s3_rewriter/output/manual_workpackage/092_PARTIAL_459103d3_测试树.md
+++ b/tools/s3_rewriter/output/manual_workpackage/093_PARTIAL_459103d3_测试树.md
@@ -1,4 +1,4 @@
-# 人工作业单 #092 — PARTIAL
+# 人工作业单 #093 — PARTIAL
- 模板ID : `459103d3-9cc9-43f5-87ca-a322c10d2200`
- 模板名 : 测试树
@@ -7,7 +7,7 @@
## 1. 原文(S3 原始 Groovy)
```groovy
-Map<String,Object> map = new HashMap<String,Object>();
+Map map = new HashMap();
map.put("TYPE",3);
((SingleSelectField)group.getField("DD")).setFilter(map);
((SingleSelectField)group.getField("DD")).setDefault(map);
@@ -15,7 +15,7 @@ map.put("TYPE",3);
## 2. 已改写部分(自动产出)
```groovy
-Map<String,Object> map = new HashMap<String,Object>();
+Map map = new HashMap();
map.put("TYPE",3);
((SingleSelectField)group.getField("DD")).setFilter(map);
((SingleSelectField)group.getField("DD")).setDefault(map);
diff --git a/tools/s3_rewriter/output/manual_workpackage/093_PARTIAL_5440da49_招标工程.md b/tools/s3_rewriter/output/manual_workpackage/094_PARTIAL_5440da49_招标工程.md
similarity index 96%
rename from tools/s3_rewriter/output/manual_workpackage/093_PARTIAL_5440da49_招标工程.md
rename to tools/s3_rewriter/output/manual_workpackage/094_PARTIAL_5440da49_招标工程.md
index c978a9d..32d29b3 100644
--- a/tools/s3_rewriter/output/manual_workpackage/093_PARTIAL_5440da49_招标工程.md
+++ b/tools/s3_rewriter/output/manual_workpackage/094_PARTIAL_5440da49_招标工程.md
@@ -1,8 +1,8 @@
-# 人工作业单 #093 — PARTIAL
+# 人工作业单 #094 — PARTIAL
- 模板ID : `5440da49-89d6-4dc5-94e5-82693913d6e4`
- 模板名 : 招标工程
-- 脚本序 : 2
+- 脚本序 : 4
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/094_PARTIAL_68dc06dc_组织缴费规则.md b/tools/s3_rewriter/output/manual_workpackage/095_PARTIAL_68dc06dc_组织缴费规则.md
similarity index 98%
rename from tools/s3_rewriter/output/manual_workpackage/094_PARTIAL_68dc06dc_组织缴费规则.md
rename to tools/s3_rewriter/output/manual_workpackage/095_PARTIAL_68dc06dc_组织缴费规则.md
index c4e1e5f..287b8bf 100644
--- a/tools/s3_rewriter/output/manual_workpackage/094_PARTIAL_68dc06dc_组织缴费规则.md
+++ b/tools/s3_rewriter/output/manual_workpackage/095_PARTIAL_68dc06dc_组织缴费规则.md
@@ -1,4 +1,4 @@
-# 人工作业单 #094 — PARTIAL
+# 人工作业单 #095 — PARTIAL
- 模板ID : `68dc06dc-bc4e-47cc-a9e8-fb089c51fc17`
- 模板名 : 组织缴费规则
diff --git a/tools/s3_rewriter/output/manual_workpackage/096_PARTIAL_6c11d228_季度检查整改.md b/tools/s3_rewriter/output/manual_workpackage/096_PARTIAL_6c11d228_季度检查整改.md
index c6cc89a..cfe5f28 100644
--- a/tools/s3_rewriter/output/manual_workpackage/096_PARTIAL_6c11d228_季度检查整改.md
+++ b/tools/s3_rewriter/output/manual_workpackage/096_PARTIAL_6c11d228_季度检查整改.md
@@ -2,7 +2,7 @@
- 模板ID : `6c11d228-a9d7-43de-85e4-d56e43cad10c`
- 模板名 : 季度检查整改
-- 脚本序 : 2
+- 脚本序 : 1
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/095_PARTIAL_6c11d228_季度检查整改.md b/tools/s3_rewriter/output/manual_workpackage/097_PARTIAL_6c11d228_季度检查整改.md
similarity index 97%
rename from tools/s3_rewriter/output/manual_workpackage/095_PARTIAL_6c11d228_季度检查整改.md
rename to tools/s3_rewriter/output/manual_workpackage/097_PARTIAL_6c11d228_季度检查整改.md
index a0d4118..b81a028 100644
--- a/tools/s3_rewriter/output/manual_workpackage/095_PARTIAL_6c11d228_季度检查整改.md
+++ b/tools/s3_rewriter/output/manual_workpackage/097_PARTIAL_6c11d228_季度检查整改.md
@@ -1,8 +1,8 @@
-# 人工作业单 #095 — PARTIAL
+# 人工作业单 #097 — PARTIAL
- 模板ID : `6c11d228-a9d7-43de-85e4-d56e43cad10c`
- 模板名 : 季度检查整改
-- 脚本序 : 1
+- 脚本序 : 2
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/097_PARTIAL_6e412e62_物资需求总计划_土建.md b/tools/s3_rewriter/output/manual_workpackage/098_PARTIAL_6e412e62_物资需求总计划_土建.md
similarity index 97%
rename from tools/s3_rewriter/output/manual_workpackage/097_PARTIAL_6e412e62_物资需求总计划_土建.md
rename to tools/s3_rewriter/output/manual_workpackage/098_PARTIAL_6e412e62_物资需求总计划_土建.md
index b502724..9932595 100644
--- a/tools/s3_rewriter/output/manual_workpackage/097_PARTIAL_6e412e62_物资需求总计划_土建.md
+++ b/tools/s3_rewriter/output/manual_workpackage/098_PARTIAL_6e412e62_物资需求总计划_土建.md
@@ -1,4 +1,4 @@
-# 人工作业单 #097 — PARTIAL
+# 人工作业单 #098 — PARTIAL
- 模板ID : `6e412e62-7cde-4efd-942c-ec4da5877ec7`
- 模板名 : 物资需求总计划(土建)
diff --git a/tools/s3_rewriter/output/manual_workpackage/098_PARTIAL_745c9534_验工月报区间.md b/tools/s3_rewriter/output/manual_workpackage/099_PARTIAL_745c9534_验工月报区间.md
similarity index 98%
rename from tools/s3_rewriter/output/manual_workpackage/098_PARTIAL_745c9534_验工月报区间.md
rename to tools/s3_rewriter/output/manual_workpackage/099_PARTIAL_745c9534_验工月报区间.md
index ac6cb54..e5dd220 100644
--- a/tools/s3_rewriter/output/manual_workpackage/098_PARTIAL_745c9534_验工月报区间.md
+++ b/tools/s3_rewriter/output/manual_workpackage/099_PARTIAL_745c9534_验工月报区间.md
@@ -1,4 +1,4 @@
-# 人工作业单 #098 — PARTIAL
+# 人工作业单 #099 — PARTIAL
- 模板ID : `745c9534-c755-4ef5-bc26-8b78a802ec4a`
- 模板名 : 验工月报区间
@@ -19,7 +19,7 @@ def currentYear = GetDefaultValueFunction.currentYear();
def startYear = currentYear - 4;
def endYear = currentYear + 11;
-for(i in startYear..<endYear){
+for(i in startYear..0){
+ for(i in 0..0){
+ for(i in 0..0){
+ for(i in 0..0){
+ for(i in 0..0){
+ for(i in 0..0){
+ for(i in 0..0){
+ for(i in 0..0){
+ for(i in 0.. resultMap = GetServicesFunction.listSelect(searchMap,"SYS_USER",null);
List list = (List)resultMap.get(POJOCRUDService.LIST_RESULT);
- if(list != null && list.size() > 0){
+ if(list != null && list.size() > 0){
GeneralPOJO _hm = (GeneralPOJO) list.get(0);
def mobileNumber = _hm.get_Value("MOBILE");
def accountNumber = _hm.get_Value("ACCOUNT");
@@ -59,10 +59,10 @@ if(value != null){
//returnColumns.add("SYS_USER_ID");
//returnColumns.add("MOBILE");
//searchMap.put(POJOCRUDService.RETURN_COLUMNS_LIST,returnColumns);
- Map<String, Object> resultMap = GetServicesFunction.listSelect(searchMap,"SYS_USER",null);
+ Map resultMap = GetServicesFunction.listSelect(searchMap,"SYS_USER",null);
List list = (List)resultMap.get(POJOCRUDService.LIST_RESULT);
- if(list != null && list.size() > 0){
+ if(list != null && list.size() > 0){
GeneralPOJO _hm = (GeneralPOJO) list.get(0);
def mobileNumber = _hm.get_Value("MOBILE");
def accountNumber = _hm.get_Value("ACCOUNT");
diff --git a/tools/s3_rewriter/output/manual_workpackage/105_PARTIAL_b233e091_固定资产变动.md b/tools/s3_rewriter/output/manual_workpackage/105_PARTIAL_b233e091_固定资产变动.md
deleted file mode 100644
index 1615a68..0000000
--- a/tools/s3_rewriter/output/manual_workpackage/105_PARTIAL_b233e091_固定资产变动.md
+++ /dev/null
@@ -1,346 +0,0 @@
-# 人工作业单 #105 — PARTIAL
-
-- 模板ID : `b233e091-ae6f-401a-bb5f-b145c8aa9ea4`
-- 模板名 : 固定资产变动
-- 脚本序 : 2
-- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
-
-## 1. 原文(S3 原始 Groovy)
-```groovy
-import com.dsasp.server.common.dataDic.service.POJOCRUDService;
-import com.vaadin.ui.PopupDateField;
-def value = event.getProperty().getValue();
-
-def ASSETSCARDNO = group.getField("ASSETSCARDNO");//卡片编号
-def ASSETSNO = group.getField("ASSETSNO");//资产编码
-def STANDARD = group.getField("STANDARD");//规格型号
-PopupDateField STARTUSERDATE = group.getField("STARTUSERDATE");//开始使用日期
-////////////////////////////////////////////////////////
-def useDepartId= group.getField("USEDEPARTID");//原使用部门
-def keeper= group.getField("KEEPER");//原保管人
-def installationsite= group.getField("INSTALLATIONSITE");//原安装地点
-def usestatus= group.getField("USESTATUS");//原使用状态
-def assetssortId= group.getField("ASSETSSORTID");//原资产类别
-/////////////////////////////////////////////////////////////////
-def newUseDepartId= group.getField("NEWUSEDEPARTID");//原使用部门
-def newKeeper= group.getField("NEWKEEPER");//原保管人
-def newInstallationsite= group.getField("NEWINSTALLATIONSITE");//原安装地点
-def newUsestatus= group.getField("NEWUSESTATUS");//原使用状态
-def newAssetssortId= group.getField("NEWASSETSSORTID");//原资产类别
-
-//设置只读状态为false
-ASSETSCARDNO?.getPropertyDataSource().setReadOnly(false);
-ASSETSCARDNO?.setReadOnly(false);
-ASSETSNO?.getPropertyDataSource().setReadOnly(false);
-ASSETSNO?.setReadOnly(false);
-STANDARD?.getPropertyDataSource().setReadOnly(false);
-STANDARD?.setReadOnly(false);
-STARTUSERDATE?.getPropertyDataSource().setReadOnly(false);
-STARTUSERDATE?.setReadOnly(false);
-
-useDepartId?.getPropertyDataSource().setReadOnly(false);
-useDepartId?.setReadOnly(false);
-keeper?.getPropertyDataSource().setReadOnly(false);
-keeper?.setReadOnly(false);
-installationsite?.getPropertyDataSource().setReadOnly(false);
-installationsite?.setReadOnly(false);
-usestatus?.getPropertyDataSource().setReadOnly(false);
-usestatus?.setReadOnly(false);
-assetssortId?.getPropertyDataSource().setReadOnly(false);
-assetssortId?.setReadOnly(false);
-
-
-
-if(value != null){
- def searchMap = new HashMap();
- //要查询的表
- searchMap.put("OA_FIXEDASSETS_LEDGERMANAGE_ID",value);
-
- List returnColumns = new ArrayList();
- //要查询出的(字段)条件
- returnColumns.add("OA_FIXEDASSETS_LEDGERMANAGE_ID");
-
- returnColumns.add("ASSETSCARDNO");//卡片编号
- returnColumns.add("ASSETSNO");//资产编码
- returnColumns.add("STANDARD");//规格型号
- returnColumns.add("STARTUSERDATE");//开始使用日期
-
- returnColumns.add("USEDEPARTID");//原使用部门
- returnColumns.add("KEEPER");//原保管人
- returnColumns.add("INSTALLATIONSITE");//原安装地点
- returnColumns.add("USESTATUS");//原使用状态
- returnColumns.add("ASSETSSORT_ID");//原资产类别
-
- //查询
- searchMap.put(POJOCRUDService.RETURN_COLUMNS_LIST,returnColumns);
- Map<String, Object> resultMap = GetServicesFunction.listSelect(searchMap,"OA_FIXEDASSETS_LEDGERMANAGE",null);
- List list = (List)resultMap.get(POJOCRUDService.LIST_RESULT);
- //赋值
- if(list != null && list.size() > 0){
- GeneralPOJO _hm = (GeneralPOJO) list.get(0);
-
- def ASSETSCARDNO_VALUE = _hm.get_Value("ASSETSCARDNO");
- ASSETSCARDNO_VALUE = ASSETSCARDNO_VALUE == null ? "":ASSETSCARDNO_VALUE.toString()
- ASSETSCARDNO?.setValue(ASSETSCARDNO_VALUE);
-
- def ASSETSNO_VALUE = _hm.get_Value("ASSETSNO");
- ASSETSNO_VALUE = ASSETSNO_VALUE == null ? "":ASSETSNO_VALUE.toString()
- ASSETSNO?.setValue(ASSETSNO_VALUE);
-
- def STANDARD_VALUE = _hm.get_Value("STANDARD");
- STANDARD_VALUE = STANDARD_VALUE == null ? "":STANDARD_VALUE.toString()
- STANDARD?.setValue(STANDARD_VALUE);
-
- def STARTUSERDATE_VALUE = _hm.get_Value("STARTUSERDATE");
- STARTUSERDATE_VALUE = STARTUSERDATE_VALUE == null ? "":STARTUSERDATE_VALUE.toDate()
- STARTUSERDATE?.setValue(STARTUSERDATE_VALUE);
- /////////////////////////////////////////////////////////////////////////////////////
- def useDeptId_value = _hm.get_Value("USEDEPARTID");//原使用部门
- useDeptId_value = useDeptId_value ==null ? "":useDeptId_value.toString();
- useDepartId?.setValue(useDeptId_value);
-
- def keeper_value = _hm.get_Value("KEEPER");//原保管人
- keeper_value = keeper_value == null ? "":keeper_value.toString();
- keeper?.setValue(keeper_value);
-
- def installationsite_value = _hm.get_Value("INSTALLATIONSITE");//原安装地点
- installationsite_value = installationsite_value == null ? "":installationsite_value.toString();
- installationsite?.setValue(installationsite_value);
-
- def useStatus_value = _hm.get_Value("USESTATUS");//原使用状态
- useStatus_value = useStatus_value == null ? "":useStatus_value.toString();
- usestatus?.setValue(useStatus_value);
-
- def assetssortId_value = _hm.get_Value("ASSETSSORT_ID");//原资产类别
- assetssortId_value = assetssortId_value == null ? "":assetssortId_value.toString();
- assetssortId?.setValue(assetssortId_value);
-
-
- def newUseDeptId_value = _hm.get_Value("USEDEPARTID");//现使用部门
- newUseDeptId_value = newUseDeptId_value ==null ? "":newUseDeptId_value.toString();
- newUseDepartId?.setValue(newUseDeptId_value);
-
- def newKeeper_value = _hm.get_Value("KEEPER");//现保管人
- newKeeper_value = newKeeper_value == null ? "":newKeeper_value.toString();
- newKeeper?.setValue(newKeeper_value);
-
- def newInstallationsite_value = _hm.get_Value("INSTALLATIONSITE");//现安装地点
- newInstallationsite_value = newInstallationsite_value == null ? "":newInstallationsite_value.toString();
- newInstallationsite?.setValue(newInstallationsite_value);
-
- def newUseStatus_value = _hm.get_Value("USESTATUS");//现使用状态
- newUseStatus_value = newUseStatus_value == null ? "":newUseStatus_value.toString();
- newUsestatus?.setValue(newUseStatus_value);
-
- def newAssetssortId_value = _hm.get_Value("ASSETSSORT_ID");//现资产类别
- newAssetssortId_value = newAssetssortId_value == null ? "":newAssetssortId_value.toString();
- newAssetssortId?.setValue(newAssetssortId_value);
-
- } else{
- ASSETSCARDNO?.setValue("");
- ASSETSNO?.setValue("");
- STANDARD?.setValue("");
- STARTUSERDATE?.setValue(null);
- useDepartId?.setValue("");
- keeper?.setValue("");
- installationsite?.setValue("");
- usestatus?.setValue("");
- assetssortId?.setValue("");
- }
-}
-//设置只读
-ASSETSCARDNO?.getPropertyDataSource().setReadOnly(true);
-ASSETSCARDNO?.setReadOnly(true);
-ASSETSNO?.getPropertyDataSource().setReadOnly(true);
-ASSETSNO?.setReadOnly(true);
-STANDARD?.getPropertyDataSource().setReadOnly(true);
-STANDARD?.setReadOnly(true);
-STARTUSERDATE?.getPropertyDataSource().setReadOnly(true);
-STARTUSERDATE?.setReadOnly(true);
-
-useDepartId?.setReadOnly(true);
-keeper?.setReadOnly(true);
-installationsite?.setReadOnly(true);
-usestatus?.setReadOnly(true);
-assetssortId?.setReadOnly(true);
-```
-
-## 2. 已改写部分(自动产出)
-```groovy
-import com.dsasp.server.common.dataDic.service.POJOCRUDService;
-import com.vaadin.ui.PopupDateField;
-def value = event.getProperty().getValue();
-
-
-
-
-PopupDateField STARTUSERDATE = group.getField("STARTUSERDATE");//开始使用日期
-////////////////////////////////////////////////////////
-
-
-
-
-
-/////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-//设置只读状态为false
-setFieldReadOnly("ASSETSCARDNO", false);
-setFieldReadOnly("ASSETSCARDNO", false);
-setFieldReadOnly("ASSETSNO", false);
-setFieldReadOnly("ASSETSNO", false);
-setFieldReadOnly("STANDARD", false);
-setFieldReadOnly("STANDARD", false);
-STARTUSERDATE?.getPropertyDataSource().setReadOnly(false);
-STARTUSERDATE?.setReadOnly(false);
-
-setFieldReadOnly("USEDEPARTID", false);
-setFieldReadOnly("USEDEPARTID", false);
-setFieldReadOnly("KEEPER", false);
-setFieldReadOnly("KEEPER", false);
-setFieldReadOnly("INSTALLATIONSITE", false);
-setFieldReadOnly("INSTALLATIONSITE", false);
-setFieldReadOnly("USESTATUS", false);
-setFieldReadOnly("USESTATUS", false);
-setFieldReadOnly("ASSETSSORTID", false);
-setFieldReadOnly("ASSETSSORTID", false);
-
-
-
-if(value != null){
- def searchMap = new HashMap();
- //要查询的表
- searchMap.put("OA_FIXEDASSETS_LEDGERMANAGE_ID",value);
-
- List returnColumns = new ArrayList();
- //要查询出的(字段)条件
- returnColumns.add("OA_FIXEDASSETS_LEDGERMANAGE_ID");
-
- returnColumns.add("ASSETSCARDNO");//卡片编号
- returnColumns.add("ASSETSNO");//资产编码
- returnColumns.add("STANDARD");//规格型号
- returnColumns.add("STARTUSERDATE");//开始使用日期
-
- returnColumns.add("USEDEPARTID");//原使用部门
- returnColumns.add("KEEPER");//原保管人
- returnColumns.add("INSTALLATIONSITE");//原安装地点
- returnColumns.add("USESTATUS");//原使用状态
- returnColumns.add("ASSETSSORT_ID");//原资产类别
-
- //查询
- searchMap.put(POJOCRUDService.RETURN_COLUMNS_LIST,returnColumns);
- Map<String, Object> resultMap = GetServicesFunction.listSelect(searchMap,"OA_FIXEDASSETS_LEDGERMANAGE",null);
- List list = (List)resultMap.get(POJOCRUDService.LIST_RESULT);
- //赋值
- if(list != null && list.size() > 0){
- GeneralPOJO _hm = (GeneralPOJO) list.get(0);
-
- def ASSETSCARDNO_VALUE = _hm.get_Value("ASSETSCARDNO");
- ASSETSCARDNO_VALUE = ASSETSCARDNO_VALUE == null ? "":ASSETSCARDNO_VALUE.toString()
- setFieldValue("ASSETSCARDNO", ASSETSCARDNO_VALUE);
-
- def ASSETSNO_VALUE = _hm.get_Value("ASSETSNO");
- ASSETSNO_VALUE = ASSETSNO_VALUE == null ? "":ASSETSNO_VALUE.toString()
- setFieldValue("ASSETSNO", ASSETSNO_VALUE);
-
- def STANDARD_VALUE = _hm.get_Value("STANDARD");
- STANDARD_VALUE = STANDARD_VALUE == null ? "":STANDARD_VALUE.toString()
- setFieldValue("STANDARD", STANDARD_VALUE);
-
- def STARTUSERDATE_VALUE = _hm.get_Value("STARTUSERDATE");
- STARTUSERDATE_VALUE = STARTUSERDATE_VALUE == null ? "":STARTUSERDATE_VALUE.toDate()
- STARTUSERDATE?.setValue(STARTUSERDATE_VALUE);
- /////////////////////////////////////////////////////////////////////////////////////
- def useDeptId_value = _hm.get_Value("USEDEPARTID");//原使用部门
- useDeptId_value = useDeptId_value ==null ? "":useDeptId_value.toString();
- setFieldValue("USEDEPARTID", useDeptId_value);
-
- def keeper_value = _hm.get_Value("KEEPER");//原保管人
- keeper_value = keeper_value == null ? "":keeper_value.toString();
- setFieldValue("KEEPER", keeper_value);
-
- def installationsite_value = _hm.get_Value("INSTALLATIONSITE");//原安装地点
- installationsite_value = installationsite_value == null ? "":installationsite_value.toString();
- setFieldValue("INSTALLATIONSITE", installationsite_value);
-
- def useStatus_value = _hm.get_Value("USESTATUS");//原使用状态
- useStatus_value = useStatus_value == null ? "":useStatus_value.toString();
- setFieldValue("USESTATUS", useStatus_value);
-
- def assetssortId_value = _hm.get_Value("ASSETSSORT_ID");//原资产类别
- assetssortId_value = assetssortId_value == null ? "":assetssortId_value.toString();
- setFieldValue("ASSETSSORTID", assetssortId_value);
-
-
- def newUseDeptId_value = _hm.get_Value("USEDEPARTID");//现使用部门
- newUseDeptId_value = newUseDeptId_value ==null ? "":newUseDeptId_value.toString();
- setFieldValue("NEWUSEDEPARTID", newUseDeptId_value);
-
- def newKeeper_value = _hm.get_Value("KEEPER");//现保管人
- newKeeper_value = newKeeper_value == null ? "":newKeeper_value.toString();
- setFieldValue("NEWKEEPER", newKeeper_value);
-
- def newInstallationsite_value = _hm.get_Value("INSTALLATIONSITE");//现安装地点
- newInstallationsite_value = newInstallationsite_value == null ? "":newInstallationsite_value.toString();
- setFieldValue("NEWINSTALLATIONSITE", newInstallationsite_value);
-
- def newUseStatus_value = _hm.get_Value("USESTATUS");//现使用状态
- newUseStatus_value = newUseStatus_value == null ? "":newUseStatus_value.toString();
- setFieldValue("NEWUSESTATUS", newUseStatus_value);
-
- def newAssetssortId_value = _hm.get_Value("ASSETSSORT_ID");//现资产类别
- newAssetssortId_value = newAssetssortId_value == null ? "":newAssetssortId_value.toString();
- setFieldValue("NEWASSETSSORTID", newAssetssortId_value);
-
- } else{
- setFieldValue("ASSETSCARDNO", "");
- setFieldValue("ASSETSNO", "");
- setFieldValue("STANDARD", "");
- STARTUSERDATE?.setValue(null);
- setFieldValue("USEDEPARTID", "");
- setFieldValue("KEEPER", "");
- setFieldValue("INSTALLATIONSITE", "");
- setFieldValue("USESTATUS", "");
- setFieldValue("ASSETSSORTID", "");
- }
-}
-//设置只读
-setFieldReadOnly("ASSETSCARDNO", true);
-setFieldReadOnly("ASSETSCARDNO", true);
-setFieldReadOnly("ASSETSNO", true);
-setFieldReadOnly("ASSETSNO", true);
-setFieldReadOnly("STANDARD", true);
-setFieldReadOnly("STANDARD", true);
-STARTUSERDATE?.getPropertyDataSource().setReadOnly(true);
-STARTUSERDATE?.setReadOnly(true);
-
-setFieldReadOnly("USEDEPARTID", true);
-setFieldReadOnly("KEEPER", true);
-setFieldReadOnly("INSTALLATIONSITE", true);
-setFieldReadOnly("USESTATUS", true);
-setFieldReadOnly("ASSETSSORTID", true);
-```
-
-## 3. 余留模式与建议改法
-
-### 余留:属性数据源链(非 setReadOnly 收尾)(2 行)
-
-样例行:
-```groovy
-STARTUSERDATE?.getPropertyDataSource().setReadOnly(false);
-STARTUSERDATE?.getPropertyDataSource().setReadOnly(true);
-```
-建议改法:非只读收尾的属性数据源链;人工确认目标语义
-
-### 余留:残留字段句柄链(未覆盖动词)(1 行)
-
-样例行:
-```groovy
-PopupDateField STARTUSERDATE = group.getField("STARTUSERDATE");//开始使用日期
-```
-建议改法:字段句柄上挂了未登记动词;人工确认动词语义后补登记或手改
-
diff --git a/tools/s3_rewriter/output/manual_workpackage/106_PARTIAL_b233e091_固定资产变动.md b/tools/s3_rewriter/output/manual_workpackage/106_PARTIAL_b233e091_固定资产变动.md
index d6367d3..1893412 100644
--- a/tools/s3_rewriter/output/manual_workpackage/106_PARTIAL_b233e091_固定资产变动.md
+++ b/tools/s3_rewriter/output/manual_workpackage/106_PARTIAL_b233e091_固定资产变动.md
@@ -2,211 +2,327 @@
- 模板ID : `b233e091-ae6f-401a-bb5f-b145c8aa9ea4`
- 模板名 : 固定资产变动
-- 脚本序 : 3
+- 脚本序 : 1
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
```groovy
-def assetId = group.getField("ASSETSID");
-def value = assetId?.getValue();
-def fields = [
- "ASSETSNO",
- "ASSETSNAME",
- "STANDARD",
- "STARTUSERDATE",
- "USEDEPARTID",
- "KEEPER",
- "INSTALLATIONSITE",
- "USESTATUS",
- "ASSETSSORTID",
- "NEWUSEDEPARTID",
- "NEWKEEPER",
- "NEWINSTALLATIONSITE",
- "NEWUSESTATUS",
- "NEWASSETSSORTID"
-];
-fields.each{
- f = group.getField(it)
- f?.getPropertyDataSource().setReadOnly(false);
- f?.setReadOnly(false);
-}
-if(!StringUtil.isEmpty(value)){
- def po = GetServicesFunction.loadPOJO(value,"OA_FIXEDASSETS_LEDGERMANAGE",false);
- if(po != null){
- ////////////////////////////////////////////////////////
- //def assetsCardNo = group.getField("ASSETSCARDNO");//卡片编号
- def assetsNo = group.getField("ASSETSNO");//资产编号
- def assetsName = group.getField("ASSETSNAME");//资产名称
- def standard = group.getField("STANDARD");//规格型号
- def startUseDate = group.getField("STARTUSERDATE");//开始使用日期
- def useDepartId = group.getField("USEDEPARTID");//原使用部门
- def keeper = group.getField("KEEPER");//保管人
- def installationsite = group.getField("INSTALLATIONSITE");//原安装地点
- def usestatus = group.getField("USESTATUS");//原使用状态
- def assetssortId = group.getField("ASSETSSORTID");//原资产类别
+import com.dsasp.server.common.dataDic.service.POJOCRUDService;
+import com.vaadin.ui.PopupDateField;
+def value = event.getProperty().getValue();
- //assetsCardNo?.setConvertedValue(po.get_Value("ASSETSCARDNO"));
- assetsNo?.setConvertedValue(po.get_Value("ASSETSNO"));
- assetsName?.setConvertedValue(po.get_Value("ASSETSNAME"));
- standard?.setConvertedValue(po.get_Value("STANDARD"));
- startUseDate?.setConvertedValue(po.get_Value("STARTUSERDATE"));
+def ASSETSCARDNO = group.getField("ASSETSCARDNO");//卡片编号
+def ASSETSNO = group.getField("ASSETSNO");//资产编码
+def STANDARD = group.getField("STANDARD");//规格型号
+PopupDateField STARTUSERDATE = group.getField("STARTUSERDATE");//开始使用日期
+////////////////////////////////////////////////////////
+def useDepartId= group.getField("USEDEPARTID");//原使用部门
+def keeper= group.getField("KEEPER");//原保管人
+def installationsite= group.getField("INSTALLATIONSITE");//原安装地点
+def usestatus= group.getField("USESTATUS");//原使用状态
+def assetssortId= group.getField("ASSETSSORTID");//原资产类别
+/////////////////////////////////////////////////////////////////
+def newUseDepartId= group.getField("NEWUSEDEPARTID");//原使用部门
+def newKeeper= group.getField("NEWKEEPER");//原保管人
+def newInstallationsite= group.getField("NEWINSTALLATIONSITE");//原安装地点
+def newUsestatus= group.getField("NEWUSESTATUS");//原使用状态
+def newAssetssortId= group.getField("NEWASSETSSORTID");//原资产类别
- if(useDepartId?.getValue() == null || useDepartId?.getValue() == ""){
- useDepartId?.setConvertedValue(po.get_Value("USEDEPARTID"));
- }
- if(keeper?.getValue() == null || keeper?.getValue() == ""){
- keeper?.setConvertedValue(po.get_Value("KEEPER"));
- }
- if(installationsite?.getValue() == null || installationsite?.getValue() == ""){
- installationsite?.setConvertedValue(po.get_Value("INSTALLATIONSITE"));
- }
- if(usestatus?.getValue() == null || usestatus?.getValue() == ""){
- usestatus?.setConvertedValue(po.get_Value("USESTATUS"));
- }
- if(assetssortId?.getValue() == null || assetssortId?.getValue() == ""){
- assetssortId?.setConvertedValue(po.get_Value("ASSETSSORT_ID"));
- }
- /////////////////////////////////////////////////////////////////
- def newUseDepartId = group.getField("NEWUSEDEPARTID");//原使用部门
- def newKeeper = group.getField("NEWKEEPER");//原保管人
- def newInstallationsite = group.getField("NEWINSTALLATIONSITE");//原安装地点
- def newUsestatus = group.getField("NEWUSESTATUS");//原使用状态
- def newAssetssortId = group.getField("NEWASSETSSORTID");//原资产类别
+//设置只读状态为false
+ASSETSCARDNO?.getPropertyDataSource().setReadOnly(false);
+ASSETSCARDNO?.setReadOnly(false);
+ASSETSNO?.getPropertyDataSource().setReadOnly(false);
+ASSETSNO?.setReadOnly(false);
+STANDARD?.getPropertyDataSource().setReadOnly(false);
+STANDARD?.setReadOnly(false);
+STARTUSERDATE?.getPropertyDataSource().setReadOnly(false);
+STARTUSERDATE?.setReadOnly(false);
- if(newUseDepartId?.getValue() == null || newUseDepartId?.getValue() == ""){
- newUseDepartId?.setConvertedValue(po.get_Value("USEDEPARTID"));
- }
- if(newKeeper?.getValue() == null || newKeeper?.getValue() == ""){
- newKeeper?.setConvertedValue(po.get_Value("KEEPER"));
- }
- if(newInstallationsite?.getValue() == null || newInstallationsite?.getValue() == ""){
- newInstallationsite?.setConvertedValue(po.get_Value("INSTALLATIONSITE"));
- }
- if(newUsestatus?.getValue() == null || newUsestatus?.getValue() == ""){
- newUsestatus?.setConvertedValue(po.get_Value("USESTATUS"));
- }
- if(newAssetssortId?.getValue() == null || newAssetssortId?.getValue() == ""){
- newAssetssortId?.setConvertedValue(po.get_Value("ASSETSSORT_ID"));
- }
- }else{
- fields.each{
- f = group.getField(it)
- f?.setValue(null);
- }
- }
-}else{
- fields.each{
- f = group.getField(it)
- f?.setValue(null);
- }
-}
-fields.each{
- f = group.getField(it)
- f?.getPropertyDataSource().setReadOnly(true); //设置为true数据不能提交
- f?.setReadOnly(true);
+useDepartId?.getPropertyDataSource().setReadOnly(false);
+useDepartId?.setReadOnly(false);
+keeper?.getPropertyDataSource().setReadOnly(false);
+keeper?.setReadOnly(false);
+installationsite?.getPropertyDataSource().setReadOnly(false);
+installationsite?.setReadOnly(false);
+usestatus?.getPropertyDataSource().setReadOnly(false);
+usestatus?.setReadOnly(false);
+assetssortId?.getPropertyDataSource().setReadOnly(false);
+assetssortId?.setReadOnly(false);
+
+
+
+if(value != null){
+ def searchMap = new HashMap();
+ //要查询的表
+ searchMap.put("OA_FIXEDASSETS_LEDGERMANAGE_ID",value);
+
+ List returnColumns = new ArrayList();
+ //要查询出的(字段)条件
+ returnColumns.add("OA_FIXEDASSETS_LEDGERMANAGE_ID");
+
+ returnColumns.add("ASSETSCARDNO");//卡片编号
+ returnColumns.add("ASSETSNO");//资产编码
+ returnColumns.add("STANDARD");//规格型号
+ returnColumns.add("STARTUSERDATE");//开始使用日期
+
+ returnColumns.add("USEDEPARTID");//原使用部门
+ returnColumns.add("KEEPER");//原保管人
+ returnColumns.add("INSTALLATIONSITE");//原安装地点
+ returnColumns.add("USESTATUS");//原使用状态
+ returnColumns.add("ASSETSSORT_ID");//原资产类别
+
+ //查询
+ searchMap.put(POJOCRUDService.RETURN_COLUMNS_LIST,returnColumns);
+ Map resultMap = GetServicesFunction.listSelect(searchMap,"OA_FIXEDASSETS_LEDGERMANAGE",null);
+ List list = (List)resultMap.get(POJOCRUDService.LIST_RESULT);
+ //赋值
+ if(list != null && list.size() > 0){
+ GeneralPOJO _hm = (GeneralPOJO) list.get(0);
+
+ def ASSETSCARDNO_VALUE = _hm.get_Value("ASSETSCARDNO");
+ ASSETSCARDNO_VALUE = ASSETSCARDNO_VALUE == null ? "":ASSETSCARDNO_VALUE.toString()
+ ASSETSCARDNO?.setValue(ASSETSCARDNO_VALUE);
+
+ def ASSETSNO_VALUE = _hm.get_Value("ASSETSNO");
+ ASSETSNO_VALUE = ASSETSNO_VALUE == null ? "":ASSETSNO_VALUE.toString()
+ ASSETSNO?.setValue(ASSETSNO_VALUE);
+
+ def STANDARD_VALUE = _hm.get_Value("STANDARD");
+ STANDARD_VALUE = STANDARD_VALUE == null ? "":STANDARD_VALUE.toString()
+ STANDARD?.setValue(STANDARD_VALUE);
+
+ def STARTUSERDATE_VALUE = _hm.get_Value("STARTUSERDATE");
+ STARTUSERDATE_VALUE = STARTUSERDATE_VALUE == null ? "":STARTUSERDATE_VALUE.toDate()
+ STARTUSERDATE?.setValue(STARTUSERDATE_VALUE);
+ /////////////////////////////////////////////////////////////////////////////////////
+ def useDeptId_value = _hm.get_Value("USEDEPARTID");//原使用部门
+ useDeptId_value = useDeptId_value ==null ? "":useDeptId_value.toString();
+ useDepartId?.setValue(useDeptId_value);
+
+ def keeper_value = _hm.get_Value("KEEPER");//原保管人
+ keeper_value = keeper_value == null ? "":keeper_value.toString();
+ keeper?.setValue(keeper_value);
+
+ def installationsite_value = _hm.get_Value("INSTALLATIONSITE");//原安装地点
+ installationsite_value = installationsite_value == null ? "":installationsite_value.toString();
+ installationsite?.setValue(installationsite_value);
+
+ def useStatus_value = _hm.get_Value("USESTATUS");//原使用状态
+ useStatus_value = useStatus_value == null ? "":useStatus_value.toString();
+ usestatus?.setValue(useStatus_value);
+
+ def assetssortId_value = _hm.get_Value("ASSETSSORT_ID");//原资产类别
+ assetssortId_value = assetssortId_value == null ? "":assetssortId_value.toString();
+ assetssortId?.setValue(assetssortId_value);
+
+
+ def newUseDeptId_value = _hm.get_Value("USEDEPARTID");//现使用部门
+ newUseDeptId_value = newUseDeptId_value ==null ? "":newUseDeptId_value.toString();
+ newUseDepartId?.setValue(newUseDeptId_value);
+
+ def newKeeper_value = _hm.get_Value("KEEPER");//现保管人
+ newKeeper_value = newKeeper_value == null ? "":newKeeper_value.toString();
+ newKeeper?.setValue(newKeeper_value);
+
+ def newInstallationsite_value = _hm.get_Value("INSTALLATIONSITE");//现安装地点
+ newInstallationsite_value = newInstallationsite_value == null ? "":newInstallationsite_value.toString();
+ newInstallationsite?.setValue(newInstallationsite_value);
+
+ def newUseStatus_value = _hm.get_Value("USESTATUS");//现使用状态
+ newUseStatus_value = newUseStatus_value == null ? "":newUseStatus_value.toString();
+ newUsestatus?.setValue(newUseStatus_value);
+
+ def newAssetssortId_value = _hm.get_Value("ASSETSSORT_ID");//现资产类别
+ newAssetssortId_value = newAssetssortId_value == null ? "":newAssetssortId_value.toString();
+ newAssetssortId?.setValue(newAssetssortId_value);
+
+ } else{
+ ASSETSCARDNO?.setValue("");
+ ASSETSNO?.setValue("");
+ STANDARD?.setValue("");
+ STARTUSERDATE?.setValue(null);
+ useDepartId?.setValue("");
+ keeper?.setValue("");
+ installationsite?.setValue("");
+ usestatus?.setValue("");
+ assetssortId?.setValue("");
+ }
}
+//设置只读
+ASSETSCARDNO?.getPropertyDataSource().setReadOnly(true);
+ASSETSCARDNO?.setReadOnly(true);
+ASSETSNO?.getPropertyDataSource().setReadOnly(true);
+ASSETSNO?.setReadOnly(true);
+STANDARD?.getPropertyDataSource().setReadOnly(true);
+STANDARD?.setReadOnly(true);
+STARTUSERDATE?.getPropertyDataSource().setReadOnly(true);
+STARTUSERDATE?.setReadOnly(true);
+
+useDepartId?.setReadOnly(true);
+keeper?.setReadOnly(true);
+installationsite?.setReadOnly(true);
+usestatus?.setReadOnly(true);
+assetssortId?.setReadOnly(true);
```
## 2. 已改写部分(自动产出)
```groovy
+import com.dsasp.server.common.dataDic.service.POJOCRUDService;
+import com.vaadin.ui.PopupDateField;
+def value = event.getProperty().getValue();
-def value = getFieldValue("ASSETSID");
-def fields = [
- "ASSETSNO",
- "ASSETSNAME",
- "STANDARD",
- "STARTUSERDATE",
- "USEDEPARTID",
- "KEEPER",
- "INSTALLATIONSITE",
- "USESTATUS",
- "ASSETSSORTID",
- "NEWUSEDEPARTID",
- "NEWKEEPER",
- "NEWINSTALLATIONSITE",
- "NEWUSESTATUS",
- "NEWASSETSSORTID"
-];
-fields.each{
- f = group.getField(it)
- f?.getPropertyDataSource().setReadOnly(false);
- f?.setReadOnly(false);
+
+
+
+PopupDateField STARTUSERDATE = group.getField("STARTUSERDATE");//开始使用日期
+////////////////////////////////////////////////////////
+
+
+
+
+
+/////////////////////////////////////////////////////////////////
+
+
+
+
+
+
+//设置只读状态为false
+setFieldReadOnly("ASSETSCARDNO", false);
+setFieldReadOnly("ASSETSCARDNO", false);
+setFieldReadOnly("ASSETSNO", false);
+setFieldReadOnly("ASSETSNO", false);
+setFieldReadOnly("STANDARD", false);
+setFieldReadOnly("STANDARD", false);
+STARTUSERDATE?.getPropertyDataSource().setReadOnly(false);
+STARTUSERDATE?.setReadOnly(false);
+
+setFieldReadOnly("USEDEPARTID", false);
+setFieldReadOnly("USEDEPARTID", false);
+setFieldReadOnly("KEEPER", false);
+setFieldReadOnly("KEEPER", false);
+setFieldReadOnly("INSTALLATIONSITE", false);
+setFieldReadOnly("INSTALLATIONSITE", false);
+setFieldReadOnly("USESTATUS", false);
+setFieldReadOnly("USESTATUS", false);
+setFieldReadOnly("ASSETSSORTID", false);
+setFieldReadOnly("ASSETSSORTID", false);
+
+
+
+if(value != null){
+ def searchMap = new HashMap();
+ //要查询的表
+ searchMap.put("OA_FIXEDASSETS_LEDGERMANAGE_ID",value);
+
+ List returnColumns = new ArrayList();
+ //要查询出的(字段)条件
+ returnColumns.add("OA_FIXEDASSETS_LEDGERMANAGE_ID");
+
+ returnColumns.add("ASSETSCARDNO");//卡片编号
+ returnColumns.add("ASSETSNO");//资产编码
+ returnColumns.add("STANDARD");//规格型号
+ returnColumns.add("STARTUSERDATE");//开始使用日期
+
+ returnColumns.add("USEDEPARTID");//原使用部门
+ returnColumns.add("KEEPER");//原保管人
+ returnColumns.add("INSTALLATIONSITE");//原安装地点
+ returnColumns.add("USESTATUS");//原使用状态
+ returnColumns.add("ASSETSSORT_ID");//原资产类别
+
+ //查询
+ searchMap.put(POJOCRUDService.RETURN_COLUMNS_LIST,returnColumns);
+ Map resultMap = GetServicesFunction.listSelect(searchMap,"OA_FIXEDASSETS_LEDGERMANAGE",null);
+ List list = (List)resultMap.get(POJOCRUDService.LIST_RESULT);
+ //赋值
+ if(list != null && list.size() > 0){
+ GeneralPOJO _hm = (GeneralPOJO) list.get(0);
+
+ def ASSETSCARDNO_VALUE = _hm.get_Value("ASSETSCARDNO");
+ ASSETSCARDNO_VALUE = ASSETSCARDNO_VALUE == null ? "":ASSETSCARDNO_VALUE.toString()
+ setFieldValue("ASSETSCARDNO", ASSETSCARDNO_VALUE);
+
+ def ASSETSNO_VALUE = _hm.get_Value("ASSETSNO");
+ ASSETSNO_VALUE = ASSETSNO_VALUE == null ? "":ASSETSNO_VALUE.toString()
+ setFieldValue("ASSETSNO", ASSETSNO_VALUE);
+
+ def STANDARD_VALUE = _hm.get_Value("STANDARD");
+ STANDARD_VALUE = STANDARD_VALUE == null ? "":STANDARD_VALUE.toString()
+ setFieldValue("STANDARD", STANDARD_VALUE);
+
+ def STARTUSERDATE_VALUE = _hm.get_Value("STARTUSERDATE");
+ STARTUSERDATE_VALUE = STARTUSERDATE_VALUE == null ? "":STARTUSERDATE_VALUE.toDate()
+ STARTUSERDATE?.setValue(STARTUSERDATE_VALUE);
+ /////////////////////////////////////////////////////////////////////////////////////
+ def useDeptId_value = _hm.get_Value("USEDEPARTID");//原使用部门
+ useDeptId_value = useDeptId_value ==null ? "":useDeptId_value.toString();
+ setFieldValue("USEDEPARTID", useDeptId_value);
+
+ def keeper_value = _hm.get_Value("KEEPER");//原保管人
+ keeper_value = keeper_value == null ? "":keeper_value.toString();
+ setFieldValue("KEEPER", keeper_value);
+
+ def installationsite_value = _hm.get_Value("INSTALLATIONSITE");//原安装地点
+ installationsite_value = installationsite_value == null ? "":installationsite_value.toString();
+ setFieldValue("INSTALLATIONSITE", installationsite_value);
+
+ def useStatus_value = _hm.get_Value("USESTATUS");//原使用状态
+ useStatus_value = useStatus_value == null ? "":useStatus_value.toString();
+ setFieldValue("USESTATUS", useStatus_value);
+
+ def assetssortId_value = _hm.get_Value("ASSETSSORT_ID");//原资产类别
+ assetssortId_value = assetssortId_value == null ? "":assetssortId_value.toString();
+ setFieldValue("ASSETSSORTID", assetssortId_value);
+
+
+ def newUseDeptId_value = _hm.get_Value("USEDEPARTID");//现使用部门
+ newUseDeptId_value = newUseDeptId_value ==null ? "":newUseDeptId_value.toString();
+ setFieldValue("NEWUSEDEPARTID", newUseDeptId_value);
+
+ def newKeeper_value = _hm.get_Value("KEEPER");//现保管人
+ newKeeper_value = newKeeper_value == null ? "":newKeeper_value.toString();
+ setFieldValue("NEWKEEPER", newKeeper_value);
+
+ def newInstallationsite_value = _hm.get_Value("INSTALLATIONSITE");//现安装地点
+ newInstallationsite_value = newInstallationsite_value == null ? "":newInstallationsite_value.toString();
+ setFieldValue("NEWINSTALLATIONSITE", newInstallationsite_value);
+
+ def newUseStatus_value = _hm.get_Value("USESTATUS");//现使用状态
+ newUseStatus_value = newUseStatus_value == null ? "":newUseStatus_value.toString();
+ setFieldValue("NEWUSESTATUS", newUseStatus_value);
+
+ def newAssetssortId_value = _hm.get_Value("ASSETSSORT_ID");//现资产类别
+ newAssetssortId_value = newAssetssortId_value == null ? "":newAssetssortId_value.toString();
+ setFieldValue("NEWASSETSSORTID", newAssetssortId_value);
+
+ } else{
+ setFieldValue("ASSETSCARDNO", "");
+ setFieldValue("ASSETSNO", "");
+ setFieldValue("STANDARD", "");
+ STARTUSERDATE?.setValue(null);
+ setFieldValue("USEDEPARTID", "");
+ setFieldValue("KEEPER", "");
+ setFieldValue("INSTALLATIONSITE", "");
+ setFieldValue("USESTATUS", "");
+ setFieldValue("ASSETSSORTID", "");
+ }
}
-if(!StringUtil.isEmpty(value)){
- def po = GetServicesFunction.loadPOJO(value,"OA_FIXEDASSETS_LEDGERMANAGE",false);
- if(po != null){
- ////////////////////////////////////////////////////////
- //def assetsCardNo = group.getField("ASSETSCARDNO");//卡片编号
+//设置只读
+setFieldReadOnly("ASSETSCARDNO", true);
+setFieldReadOnly("ASSETSCARDNO", true);
+setFieldReadOnly("ASSETSNO", true);
+setFieldReadOnly("ASSETSNO", true);
+setFieldReadOnly("STANDARD", true);
+setFieldReadOnly("STANDARD", true);
+STARTUSERDATE?.getPropertyDataSource().setReadOnly(true);
+STARTUSERDATE?.setReadOnly(true);
-
-
-
-
-
-
-
-
-
- //assetsCardNo?.setConvertedValue(po.get_Value("ASSETSCARDNO"));
- setFieldConvertedValue("ASSETSNO", po.get_Value("ASSETSNO"));
- setFieldConvertedValue("ASSETSNAME", po.get_Value("ASSETSNAME"));
- setFieldConvertedValue("STANDARD", po.get_Value("STANDARD"));
- setFieldConvertedValue("STARTUSERDATE", po.get_Value("STARTUSERDATE"));
-
- if(getFieldValue("USEDEPARTID") == null || getFieldValue("USEDEPARTID") == ""){
- setFieldConvertedValue("USEDEPARTID", po.get_Value("USEDEPARTID"));
- }
- if(getFieldValue("KEEPER") == null || getFieldValue("KEEPER") == ""){
- setFieldConvertedValue("KEEPER", po.get_Value("KEEPER"));
- }
- if(getFieldValue("INSTALLATIONSITE") == null || getFieldValue("INSTALLATIONSITE") == ""){
- setFieldConvertedValue("INSTALLATIONSITE", po.get_Value("INSTALLATIONSITE"));
- }
- if(getFieldValue("USESTATUS") == null || getFieldValue("USESTATUS") == ""){
- setFieldConvertedValue("USESTATUS", po.get_Value("USESTATUS"));
- }
- if(getFieldValue("ASSETSSORTID") == null || getFieldValue("ASSETSSORTID") == ""){
- setFieldConvertedValue("ASSETSSORTID", po.get_Value("ASSETSSORT_ID"));
- }
- /////////////////////////////////////////////////////////////////
-
-
-
-
-
-
- if(getFieldValue("NEWUSEDEPARTID") == null || getFieldValue("NEWUSEDEPARTID") == ""){
- setFieldConvertedValue("NEWUSEDEPARTID", po.get_Value("USEDEPARTID"));
- }
- if(getFieldValue("NEWKEEPER") == null || getFieldValue("NEWKEEPER") == ""){
- setFieldConvertedValue("NEWKEEPER", po.get_Value("KEEPER"));
- }
- if(getFieldValue("NEWINSTALLATIONSITE") == null || getFieldValue("NEWINSTALLATIONSITE") == ""){
- setFieldConvertedValue("NEWINSTALLATIONSITE", po.get_Value("INSTALLATIONSITE"));
- }
- if(getFieldValue("NEWUSESTATUS") == null || getFieldValue("NEWUSESTATUS") == ""){
- setFieldConvertedValue("NEWUSESTATUS", po.get_Value("USESTATUS"));
- }
- if(getFieldValue("NEWASSETSSORTID") == null || getFieldValue("NEWASSETSSORTID") == ""){
- setFieldConvertedValue("NEWASSETSSORTID", po.get_Value("ASSETSSORT_ID"));
- }
- }else{
- fields.each{
- f = group.getField(it)
- f?.setValue(null);
- }
- }
-}else{
- fields.each{
- f = group.getField(it)
- f?.setValue(null);
- }
-}
-fields.each{
- f = group.getField(it)
- f?.getPropertyDataSource().setReadOnly(true); //设置为true数据不能提交
- f?.setReadOnly(true);
-}
+setFieldReadOnly("USEDEPARTID", true);
+setFieldReadOnly("KEEPER", true);
+setFieldReadOnly("INSTALLATIONSITE", true);
+setFieldReadOnly("USESTATUS", true);
+setFieldReadOnly("ASSETSSORTID", true);
```
## 3. 余留模式与建议改法
@@ -215,18 +331,16 @@ fields.each{
样例行:
```groovy
-f?.getPropertyDataSource().setReadOnly(false);
-f?.getPropertyDataSource().setReadOnly(true); //设置为true数据不能提交
+STARTUSERDATE?.getPropertyDataSource().setReadOnly(false);
+STARTUSERDATE?.getPropertyDataSource().setReadOnly(true);
```
建议改法:非只读收尾的属性数据源链;人工确认目标语义
-### 余留:残留字段句柄链(未覆盖动词)(5 行)
+### 余留:残留字段句柄链(未覆盖动词)(1 行)
样例行:
```groovy
-f = group.getField(it)
-//def assetsCardNo = group.getField("ASSETSCARDNO");//卡片编号
-f = group.getField(it)
+PopupDateField STARTUSERDATE = group.getField("STARTUSERDATE");//开始使用日期
```
建议改法:字段句柄上挂了未登记动词;人工确认动词语义后补登记或手改
diff --git a/tools/s3_rewriter/output/manual_workpackage/107_PARTIAL_b233e091_固定资产变动.md b/tools/s3_rewriter/output/manual_workpackage/107_PARTIAL_b233e091_固定资产变动.md
new file mode 100644
index 0000000..1f2ec1e
--- /dev/null
+++ b/tools/s3_rewriter/output/manual_workpackage/107_PARTIAL_b233e091_固定资产变动.md
@@ -0,0 +1,232 @@
+# 人工作业单 #107 — PARTIAL
+
+- 模板ID : `b233e091-ae6f-401a-bb5f-b145c8aa9ea4`
+- 模板名 : 固定资产变动
+- 脚本序 : 3
+- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
+
+## 1. 原文(S3 原始 Groovy)
+```groovy
+def assetId = group.getField("ASSETSID");
+def value = assetId?.getValue();
+def fields = [
+ "ASSETSNO",
+ "ASSETSNAME",
+ "STANDARD",
+ "STARTUSERDATE",
+ "USEDEPARTID",
+ "KEEPER",
+ "INSTALLATIONSITE",
+ "USESTATUS",
+ "ASSETSSORTID",
+ "NEWUSEDEPARTID",
+ "NEWKEEPER",
+ "NEWINSTALLATIONSITE",
+ "NEWUSESTATUS",
+ "NEWASSETSSORTID"
+];
+fields.each{
+ f = group.getField(it)
+ f?.getPropertyDataSource().setReadOnly(false);
+ f?.setReadOnly(false);
+}
+if(!StringUtil.isEmpty(value)){
+ def po = GetServicesFunction.loadPOJO(value,"OA_FIXEDASSETS_LEDGERMANAGE",false);
+ if(po != null){
+ ////////////////////////////////////////////////////////
+ //def assetsCardNo = group.getField("ASSETSCARDNO");//卡片编号
+ def assetsNo = group.getField("ASSETSNO");//资产编号
+ def assetsName = group.getField("ASSETSNAME");//资产名称
+ def standard = group.getField("STANDARD");//规格型号
+ def startUseDate = group.getField("STARTUSERDATE");//开始使用日期
+ def useDepartId = group.getField("USEDEPARTID");//原使用部门
+ def keeper = group.getField("KEEPER");//保管人
+ def installationsite = group.getField("INSTALLATIONSITE");//原安装地点
+ def usestatus = group.getField("USESTATUS");//原使用状态
+ def assetssortId = group.getField("ASSETSSORTID");//原资产类别
+
+ //assetsCardNo?.setConvertedValue(po.get_Value("ASSETSCARDNO"));
+ assetsNo?.setConvertedValue(po.get_Value("ASSETSNO"));
+ assetsName?.setConvertedValue(po.get_Value("ASSETSNAME"));
+ standard?.setConvertedValue(po.get_Value("STANDARD"));
+ startUseDate?.setConvertedValue(po.get_Value("STARTUSERDATE"));
+
+ if(useDepartId?.getValue() == null || useDepartId?.getValue() == ""){
+ useDepartId?.setConvertedValue(po.get_Value("USEDEPARTID"));
+ }
+ if(keeper?.getValue() == null || keeper?.getValue() == ""){
+ keeper?.setConvertedValue(po.get_Value("KEEPER"));
+ }
+ if(installationsite?.getValue() == null || installationsite?.getValue() == ""){
+ installationsite?.setConvertedValue(po.get_Value("INSTALLATIONSITE"));
+ }
+ if(usestatus?.getValue() == null || usestatus?.getValue() == ""){
+ usestatus?.setConvertedValue(po.get_Value("USESTATUS"));
+ }
+ if(assetssortId?.getValue() == null || assetssortId?.getValue() == ""){
+ assetssortId?.setConvertedValue(po.get_Value("ASSETSSORT_ID"));
+ }
+ /////////////////////////////////////////////////////////////////
+ def newUseDepartId = group.getField("NEWUSEDEPARTID");//原使用部门
+ def newKeeper = group.getField("NEWKEEPER");//原保管人
+ def newInstallationsite = group.getField("NEWINSTALLATIONSITE");//原安装地点
+ def newUsestatus = group.getField("NEWUSESTATUS");//原使用状态
+ def newAssetssortId = group.getField("NEWASSETSSORTID");//原资产类别
+
+ if(newUseDepartId?.getValue() == null || newUseDepartId?.getValue() == ""){
+ newUseDepartId?.setConvertedValue(po.get_Value("USEDEPARTID"));
+ }
+ if(newKeeper?.getValue() == null || newKeeper?.getValue() == ""){
+ newKeeper?.setConvertedValue(po.get_Value("KEEPER"));
+ }
+ if(newInstallationsite?.getValue() == null || newInstallationsite?.getValue() == ""){
+ newInstallationsite?.setConvertedValue(po.get_Value("INSTALLATIONSITE"));
+ }
+ if(newUsestatus?.getValue() == null || newUsestatus?.getValue() == ""){
+ newUsestatus?.setConvertedValue(po.get_Value("USESTATUS"));
+ }
+ if(newAssetssortId?.getValue() == null || newAssetssortId?.getValue() == ""){
+ newAssetssortId?.setConvertedValue(po.get_Value("ASSETSSORT_ID"));
+ }
+ }else{
+ fields.each{
+ f = group.getField(it)
+ f?.setValue(null);
+ }
+ }
+}else{
+ fields.each{
+ f = group.getField(it)
+ f?.setValue(null);
+ }
+}
+fields.each{
+ f = group.getField(it)
+ f?.getPropertyDataSource().setReadOnly(true); //设置为true数据不能提交
+ f?.setReadOnly(true);
+}
+```
+
+## 2. 已改写部分(自动产出)
+```groovy
+
+def value = getFieldValue("ASSETSID");
+def fields = [
+ "ASSETSNO",
+ "ASSETSNAME",
+ "STANDARD",
+ "STARTUSERDATE",
+ "USEDEPARTID",
+ "KEEPER",
+ "INSTALLATIONSITE",
+ "USESTATUS",
+ "ASSETSSORTID",
+ "NEWUSEDEPARTID",
+ "NEWKEEPER",
+ "NEWINSTALLATIONSITE",
+ "NEWUSESTATUS",
+ "NEWASSETSSORTID"
+];
+fields.each{
+ f = group.getField(it)
+ f?.getPropertyDataSource().setReadOnly(false);
+ f?.setReadOnly(false);
+}
+if(!StringUtil.isEmpty(value)){
+ def po = GetServicesFunction.loadPOJO(value,"OA_FIXEDASSETS_LEDGERMANAGE",false);
+ if(po != null){
+ ////////////////////////////////////////////////////////
+ //def assetsCardNo = group.getField("ASSETSCARDNO");//卡片编号
+
+
+
+
+
+
+
+
+
+
+ //assetsCardNo?.setConvertedValue(po.get_Value("ASSETSCARDNO"));
+ setFieldConvertedValue("ASSETSNO", po.get_Value("ASSETSNO"));
+ setFieldConvertedValue("ASSETSNAME", po.get_Value("ASSETSNAME"));
+ setFieldConvertedValue("STANDARD", po.get_Value("STANDARD"));
+ setFieldConvertedValue("STARTUSERDATE", po.get_Value("STARTUSERDATE"));
+
+ if(getFieldValue("USEDEPARTID") == null || getFieldValue("USEDEPARTID") == ""){
+ setFieldConvertedValue("USEDEPARTID", po.get_Value("USEDEPARTID"));
+ }
+ if(getFieldValue("KEEPER") == null || getFieldValue("KEEPER") == ""){
+ setFieldConvertedValue("KEEPER", po.get_Value("KEEPER"));
+ }
+ if(getFieldValue("INSTALLATIONSITE") == null || getFieldValue("INSTALLATIONSITE") == ""){
+ setFieldConvertedValue("INSTALLATIONSITE", po.get_Value("INSTALLATIONSITE"));
+ }
+ if(getFieldValue("USESTATUS") == null || getFieldValue("USESTATUS") == ""){
+ setFieldConvertedValue("USESTATUS", po.get_Value("USESTATUS"));
+ }
+ if(getFieldValue("ASSETSSORTID") == null || getFieldValue("ASSETSSORTID") == ""){
+ setFieldConvertedValue("ASSETSSORTID", po.get_Value("ASSETSSORT_ID"));
+ }
+ /////////////////////////////////////////////////////////////////
+
+
+
+
+
+
+ if(getFieldValue("NEWUSEDEPARTID") == null || getFieldValue("NEWUSEDEPARTID") == ""){
+ setFieldConvertedValue("NEWUSEDEPARTID", po.get_Value("USEDEPARTID"));
+ }
+ if(getFieldValue("NEWKEEPER") == null || getFieldValue("NEWKEEPER") == ""){
+ setFieldConvertedValue("NEWKEEPER", po.get_Value("KEEPER"));
+ }
+ if(getFieldValue("NEWINSTALLATIONSITE") == null || getFieldValue("NEWINSTALLATIONSITE") == ""){
+ setFieldConvertedValue("NEWINSTALLATIONSITE", po.get_Value("INSTALLATIONSITE"));
+ }
+ if(getFieldValue("NEWUSESTATUS") == null || getFieldValue("NEWUSESTATUS") == ""){
+ setFieldConvertedValue("NEWUSESTATUS", po.get_Value("USESTATUS"));
+ }
+ if(getFieldValue("NEWASSETSSORTID") == null || getFieldValue("NEWASSETSSORTID") == ""){
+ setFieldConvertedValue("NEWASSETSSORTID", po.get_Value("ASSETSSORT_ID"));
+ }
+ }else{
+ fields.each{
+ f = group.getField(it)
+ f?.setValue(null);
+ }
+ }
+}else{
+ fields.each{
+ f = group.getField(it)
+ f?.setValue(null);
+ }
+}
+fields.each{
+ f = group.getField(it)
+ f?.getPropertyDataSource().setReadOnly(true); //设置为true数据不能提交
+ f?.setReadOnly(true);
+}
+```
+
+## 3. 余留模式与建议改法
+
+### 余留:属性数据源链(非 setReadOnly 收尾)(2 行)
+
+样例行:
+```groovy
+f?.getPropertyDataSource().setReadOnly(false);
+f?.getPropertyDataSource().setReadOnly(true); //设置为true数据不能提交
+```
+建议改法:非只读收尾的属性数据源链;人工确认目标语义
+
+### 余留:残留字段句柄链(未覆盖动词)(5 行)
+
+样例行:
+```groovy
+f = group.getField(it)
+//def assetsCardNo = group.getField("ASSETSCARDNO");//卡片编号
+f = group.getField(it)
+```
+建议改法:字段句柄上挂了未登记动词;人工确认动词语义后补登记或手改
+
diff --git a/tools/s3_rewriter/output/manual_workpackage/107_PARTIAL_c0684b1a_办公用品库_结账成本汇总.md b/tools/s3_rewriter/output/manual_workpackage/108_PARTIAL_c0684b1a_办公用品库_结账成本汇总.md
similarity index 89%
rename from tools/s3_rewriter/output/manual_workpackage/107_PARTIAL_c0684b1a_办公用品库_结账成本汇总.md
rename to tools/s3_rewriter/output/manual_workpackage/108_PARTIAL_c0684b1a_办公用品库_结账成本汇总.md
index e53077d..7e64ae6 100644
--- a/tools/s3_rewriter/output/manual_workpackage/107_PARTIAL_c0684b1a_办公用品库_结账成本汇总.md
+++ b/tools/s3_rewriter/output/manual_workpackage/108_PARTIAL_c0684b1a_办公用品库_结账成本汇总.md
@@ -1,4 +1,4 @@
-# 人工作业单 #107 — PARTIAL
+# 人工作业单 #108 — PARTIAL
- 模板ID : `c0684b1a-c91a-4aa1-befe-029340cb67f5`
- 模板名 : 办公用品库-结账成本汇总
@@ -15,13 +15,13 @@ def endPeriod = group.getField("END_PERIOD_ID");
def startId = getFieldValue("START_PERIOD_ID");
def endId = getFieldValue("END_PERIOD_ID");
def currentStr = "当前期间:";
-if(startId != null && endId != null){//开始期间和结束期间都不为空
+if(startId != null && endId != null){//开始期间和结束期间都不为空
def startPo = GetServicesFunction.loadPOJO(startId,"OA_OFFICE_ACCOUNT_PERIOD",true);
- if(startPo != null && endId == startId){//开始期间等于结束期间
+ if(startPo != null && endId == startId){//开始期间等于结束期间
currentStr += startPo.get_DisplayValue("STARTDATE",true, DateTimeZone.getDefault());
currentStr += "至";
currentStr += startPo.get_DisplayValue("ENDDATE",true, DateTimeZone.getDefault());
- }else if(startPo != null && endId != startId){//开始期间不等于结束期间
+ }else if(startPo != null && endId != startId){//开始期间不等于结束期间
def endPo = GetServicesFunction.loadPOJO(endId,"OA_OFFICE_ACCOUNT_PERIOD",true);
currentStr += startPo.get_DisplayValue("STARTDATE",true, DateTimeZone.getDefault());
currentStr += "至";
@@ -63,13 +63,13 @@ import org.joda.time.DateTimeZone;
def startId = getFieldValue("START_PERIOD_ID");
def endId = getFieldValue("END_PERIOD_ID");
def currentStr = "当前期间:";
-if(startId != null && endId != null){//开始期间和结束期间都不为空
+if(startId != null && endId != null){//开始期间和结束期间都不为空
def startPo = GetServicesFunction.loadPOJO(startId,"OA_OFFICE_ACCOUNT_PERIOD",true);
- if(startPo != null && endId == startId){//开始期间等于结束期间
+ if(startPo != null && endId == startId){//开始期间等于结束期间
currentStr += startPo.get_DisplayValue("STARTDATE",true, DateTimeZone.getDefault());
currentStr += "至";
currentStr += startPo.get_DisplayValue("ENDDATE",true, DateTimeZone.getDefault());
- }else if(startPo != null && endId != startId){//开始期间不等于结束期间
+ }else if(startPo != null && endId != startId){//开始期间不等于结束期间
def endPo = GetServicesFunction.loadPOJO(endId,"OA_OFFICE_ACCOUNT_PERIOD",true);
currentStr += startPo.get_DisplayValue("STARTDATE",true, DateTimeZone.getDefault());
currentStr += "至";
diff --git a/tools/s3_rewriter/output/manual_workpackage/108_PARTIAL_c0982679_报名申请.md b/tools/s3_rewriter/output/manual_workpackage/109_PARTIAL_c0982679_报名申请.md
similarity index 96%
rename from tools/s3_rewriter/output/manual_workpackage/108_PARTIAL_c0982679_报名申请.md
rename to tools/s3_rewriter/output/manual_workpackage/109_PARTIAL_c0982679_报名申请.md
index 060308d..daf7a65 100644
--- a/tools/s3_rewriter/output/manual_workpackage/108_PARTIAL_c0982679_报名申请.md
+++ b/tools/s3_rewriter/output/manual_workpackage/109_PARTIAL_c0982679_报名申请.md
@@ -1,8 +1,8 @@
-# 人工作业单 #108 — PARTIAL
+# 人工作业单 #109 — PARTIAL
- 模板ID : `c0982679-2ac1-4be9-8043-cbe47210beee`
- 模板名 : 报名申请
-- 脚本序 : 2
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/109_PARTIAL_c3aebaa5_周转_租赁_材料报废_查看.md b/tools/s3_rewriter/output/manual_workpackage/110_PARTIAL_c3aebaa5_周转_租赁_材料报废_查看.md
similarity index 97%
rename from tools/s3_rewriter/output/manual_workpackage/109_PARTIAL_c3aebaa5_周转_租赁_材料报废_查看.md
rename to tools/s3_rewriter/output/manual_workpackage/110_PARTIAL_c3aebaa5_周转_租赁_材料报废_查看.md
index 8041028..2125391 100644
--- a/tools/s3_rewriter/output/manual_workpackage/109_PARTIAL_c3aebaa5_周转_租赁_材料报废_查看.md
+++ b/tools/s3_rewriter/output/manual_workpackage/110_PARTIAL_c3aebaa5_周转_租赁_材料报废_查看.md
@@ -1,4 +1,4 @@
-# 人工作业单 #109 — PARTIAL
+# 人工作业单 #110 — PARTIAL
- 模板ID : `c3aebaa5-f445-423e-9dd6-f217dc9521fa`
- 模板名 : 周转(租赁)材料报废(查看)
diff --git a/tools/s3_rewriter/output/manual_workpackage/110_PARTIAL_c7b23419_季度检查.md b/tools/s3_rewriter/output/manual_workpackage/111_PARTIAL_c7b23419_季度检查.md
similarity index 96%
rename from tools/s3_rewriter/output/manual_workpackage/110_PARTIAL_c7b23419_季度检查.md
rename to tools/s3_rewriter/output/manual_workpackage/111_PARTIAL_c7b23419_季度检查.md
index 91e7a81..d024fae 100644
--- a/tools/s3_rewriter/output/manual_workpackage/110_PARTIAL_c7b23419_季度检查.md
+++ b/tools/s3_rewriter/output/manual_workpackage/111_PARTIAL_c7b23419_季度检查.md
@@ -1,8 +1,8 @@
-# 人工作业单 #110 — PARTIAL
+# 人工作业单 #111 — PARTIAL
- 模板ID : `c7b23419-22e1-4a5a-aa09-464b3bb2a242`
- 模板名 : 季度检查
-- 脚本序 : 1
+- 脚本序 : 3
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/111_PARTIAL_e70d25ef_农民工工资发放.md b/tools/s3_rewriter/output/manual_workpackage/112_PARTIAL_e70d25ef_农民工工资发放.md
similarity index 96%
rename from tools/s3_rewriter/output/manual_workpackage/111_PARTIAL_e70d25ef_农民工工资发放.md
rename to tools/s3_rewriter/output/manual_workpackage/112_PARTIAL_e70d25ef_农民工工资发放.md
index 5d31cb6..23eb000 100644
--- a/tools/s3_rewriter/output/manual_workpackage/111_PARTIAL_e70d25ef_农民工工资发放.md
+++ b/tools/s3_rewriter/output/manual_workpackage/112_PARTIAL_e70d25ef_农民工工资发放.md
@@ -1,8 +1,8 @@
-# 人工作业单 #111 — PARTIAL
+# 人工作业单 #112 — PARTIAL
- 模板ID : `e70d25ef-9e82-48ba-bdd2-8150c41121b6`
- 模板名 : 农民工工资发放
-- 脚本序 : 2
+- 脚本序 : 1
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
diff --git a/tools/s3_rewriter/output/manual_workpackage/112_PARTIAL_f01c2f57_销项税发票_增加审批通过后修改加批量撤回_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/113_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md
similarity index 83%
rename from tools/s3_rewriter/output/manual_workpackage/112_PARTIAL_f01c2f57_销项税发票_增加审批通过后修改加批量撤回_五建定制.md
rename to tools/s3_rewriter/output/manual_workpackage/113_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md
index 3c6eec2..4783399 100644
--- a/tools/s3_rewriter/output/manual_workpackage/112_PARTIAL_f01c2f57_销项税发票_增加审批通过后修改加批量撤回_五建定制.md
+++ b/tools/s3_rewriter/output/manual_workpackage/113_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md
@@ -1,8 +1,8 @@
-# 人工作业单 #112 — PARTIAL
+# 人工作业单 #113 — PARTIAL
- 模板ID : `f01c2f57-1891-45de-9318-7246f9d6ac97`
-- 模板名 : 销项税发票(增加审批通过后修改加批量撤回)-五建定制
-- 脚本序 : 3
+- 模板名 : 销项税发票(增加审批通过后)-五建定制
+- 脚本序 : 2
- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此)
## 1. 原文(S3 原始 Groovy)
@@ -18,8 +18,8 @@ if(invoiceform == 1){
smap["EXTENDATTRIBUTEONE"] = 2;
smap["SYS_ENUMERATETYPE_ID"] = "INVOICEMANAGEMENT_INVOICETYPE";
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..0){
+ for(i in 0..0){
+ for(i in 0..0){
+ for(i in 0..0){
+ for(i in 0..0){
+ for(i in 0..0){
+ for(i in 0..0){
+ for(i in 0.. 0){
enableButton("修改",false);
enableButton("删除",false);
}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/021e3ba7-e03a-412a-9f0e-c20ef440a885/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/021e3ba7-e03a-412a-9f0e-c20ef440a885/1.FULL_AUTO.groovy
similarity index 94%
rename from tools/s3_rewriter/output/rewritten/021e3ba7-e03a-412a-9f0e-c20ef440a885/2.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/021e3ba7-e03a-412a-9f0e-c20ef440a885/1.FULL_AUTO.groovy
index a14757a..1d312ab 100644
--- a/tools/s3_rewriter/output/rewritten/021e3ba7-e03a-412a-9f0e-c20ef440a885/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/021e3ba7-e03a-412a-9f0e-c20ef440a885/1.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 021e3ba7-e03a-412a-9f0e-c20ef440a885
// template_name: 办公用品领用申请(按库领用)
-// seq : 2
+// seq : 1
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
addSubTableButton("GOODSDETAIL", "SELECT", 0);
diff --git a/tools/s3_rewriter/output/rewritten/021e3ba7-e03a-412a-9f0e-c20ef440a885/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/021e3ba7-e03a-412a-9f0e-c20ef440a885/2.NO_S3.groovy
similarity index 95%
rename from tools/s3_rewriter/output/rewritten/021e3ba7-e03a-412a-9f0e-c20ef440a885/1.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/021e3ba7-e03a-412a-9f0e-c20ef440a885/2.NO_S3.groovy
index e66a058..1adcd5b 100644
--- a/tools/s3_rewriter/output/rewritten/021e3ba7-e03a-412a-9f0e-c20ef440a885/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/021e3ba7-e03a-412a-9f0e-c20ef440a885/2.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 021e3ba7-e03a-412a-9f0e-c20ef440a885
// template_name: 办公用品领用申请(按库领用)
-// seq : 1
+// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
page.setDataFilter(["OA_OFFICE_COLLARAPPLY_ID":OA_OFFICE_COLLARAPPLY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
diff --git a/tools/s3_rewriter/output/rewritten/023fe74b-3d5b-4551-ac90-b8b4e6341bd0/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/023fe74b-3d5b-4551-ac90-b8b4e6341bd0/1.NO_S3.groovy
index baf6d38..8906990 100644
--- a/tools/s3_rewriter/output/rewritten/023fe74b-3d5b-4551-ac90-b8b4e6341bd0/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/023fe74b-3d5b-4551-ac90-b8b4e6341bd0/1.NO_S3.groovy
@@ -4,4 +4,10 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["OA_REIMBURSEMENTAPPLY_ID":OA_REIMBURSEMENTAPPLY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
\ No newline at end of file
+if(item['CONFIRMATIONPEOPLE'] != null){//所选凭证已经是确认状态!
+ enableButton("确认",false);//确认不可用
+}else{//所选凭证已经是未确认状态!
+ enableButton("取消确认",false);//取消确认不可用
+}
+
+
diff --git a/tools/s3_rewriter/output/rewritten/023fe74b-3d5b-4551-ac90-b8b4e6341bd0/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/023fe74b-3d5b-4551-ac90-b8b4e6341bd0/2.NO_S3.groovy
index 0bf6f60..8236acb 100644
--- a/tools/s3_rewriter/output/rewritten/023fe74b-3d5b-4551-ac90-b8b4e6341bd0/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/023fe74b-3d5b-4551-ac90-b8b4e6341bd0/2.NO_S3.groovy
@@ -4,10 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-if(item['CONFIRMATIONPEOPLE'] != null){//所选凭证已经是确认状态!
- enableButton("确认",false);//确认不可用
-}else{//所选凭证已经是未确认状态!
- enableButton("取消确认",false);//取消确认不可用
-}
-
-
+page.setDataFilter(["OA_REIMBURSEMENTAPPLY_ID":OA_REIMBURSEMENTAPPLY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/0267be11-591a-4533-b7cc-079cef81086e/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/0267be11-591a-4533-b7cc-079cef81086e/1.NO_S3.groovy
index 5493456..a56cf43 100644
--- a/tools/s3_rewriter/output/rewritten/0267be11-591a-4533-b7cc-079cef81086e/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/0267be11-591a-4533-b7cc-079cef81086e/1.NO_S3.groovy
@@ -11,7 +11,7 @@ def cardList = [];
//查询此人的证书集合
def list = GetServicesFunction.listSelectResult(['USERID':userID],"VIEW_HR_PERSONNELCERTIFICATION");
-if(list!=null && list.size()>0){
+if(list!=null && list.size()>0){
//循环list取出证书信息
list.each{
def newMap = [:];
diff --git a/tools/s3_rewriter/output/rewritten/031d16c6-1944-47c9-98b7-08e40404f0b7/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/031d16c6-1944-47c9-98b7-08e40404f0b7/1.NO_S3.groovy
similarity index 97%
rename from tools/s3_rewriter/output/rewritten/031d16c6-1944-47c9-98b7-08e40404f0b7/2.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/031d16c6-1944-47c9-98b7-08e40404f0b7/1.NO_S3.groovy
index 04b3f02..cc089e1 100644
--- a/tools/s3_rewriter/output/rewritten/031d16c6-1944-47c9-98b7-08e40404f0b7/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/031d16c6-1944-47c9-98b7-08e40404f0b7/1.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 031d16c6-1944-47c9-98b7-08e40404f0b7
// template_name: 加班登记
-// seq : 2
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
diff --git a/tools/s3_rewriter/output/rewritten/031d16c6-1944-47c9-98b7-08e40404f0b7/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/031d16c6-1944-47c9-98b7-08e40404f0b7/2.FULL_AUTO.groovy
similarity index 67%
rename from tools/s3_rewriter/output/rewritten/031d16c6-1944-47c9-98b7-08e40404f0b7/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/031d16c6-1944-47c9-98b7-08e40404f0b7/2.FULL_AUTO.groovy
index 900cb90..b268139 100644
--- a/tools/s3_rewriter/output/rewritten/031d16c6-1944-47c9-98b7-08e40404f0b7/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/031d16c6-1944-47c9-98b7-08e40404f0b7/2.FULL_AUTO.groovy
@@ -1,18 +1,25 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 031d16c6-1944-47c9-98b7-08e40404f0b7
// template_name: 加班登记
-// seq : 1
+// seq : 2
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
+
/* *****************以下脚本绑定加班类型下拉框***************** */
+def recordValue = getFieldValue("OVERTIMETYPE");
+
//绑定之前,清空下拉框
bindField("OVERTIMETYPE",null);
clearFieldData("OVERTIMETYPE");
-def polist = GetServicesFunction.listSelectResult(["CODEVALUE":new CustomSearchConditional("P.CODEVALUE>=41 AND P.CODEVALUE<=60 AND P.SYS_ENUMERATETYPE_ID = 'HR_CHECKATTENDANCESTATE'")],"SYS_ENUMERATE");
-addFieldOption("OVERTIMETYPE", "请选择", "请选择");
+def polist = GetServicesFunction.listSelectResult(["CODEVALUE":new CustomSearchConditional("P.CODEVALUE>=41 AND P.CODEVALUE<=60 AND P.SYS_ENUMERATETYPE_ID = 'HR_CHECKATTENDANCESTATE'")],"SYS_ENUMERATE");
//循环polist,为下拉框绑值
for(list in polist){
addFieldOption("OVERTIMETYPE", list.get_Value("CODEVALUE"), list.get_Value("CODEDES"));
-}
\ No newline at end of file
+}
+
+//设置默认值
+if(recordValue!=null){
+ bindField("OVERTIMETYPE",recordValue);
+}
diff --git a/tools/s3_rewriter/output/rewritten/031d16c6-1944-47c9-98b7-08e40404f0b7/3.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/031d16c6-1944-47c9-98b7-08e40404f0b7/3.FULL_AUTO.groovy
index 601451b..a206e69 100644
--- a/tools/s3_rewriter/output/rewritten/031d16c6-1944-47c9-98b7-08e40404f0b7/3.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/031d16c6-1944-47c9-98b7-08e40404f0b7/3.FULL_AUTO.groovy
@@ -4,22 +4,15 @@
// seq : 3
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-
/* *****************以下脚本绑定加班类型下拉框***************** */
-def recordValue = getFieldValue("OVERTIMETYPE");
-
//绑定之前,清空下拉框
bindField("OVERTIMETYPE",null);
clearFieldData("OVERTIMETYPE");
-def polist = GetServicesFunction.listSelectResult(["CODEVALUE":new CustomSearchConditional("P.CODEVALUE>=41 AND P.CODEVALUE<=60 AND P.SYS_ENUMERATETYPE_ID = 'HR_CHECKATTENDANCESTATE'")],"SYS_ENUMERATE");
+def polist = GetServicesFunction.listSelectResult(["CODEVALUE":new CustomSearchConditional("P.CODEVALUE>=41 AND P.CODEVALUE<=60 AND P.SYS_ENUMERATETYPE_ID = 'HR_CHECKATTENDANCESTATE'")],"SYS_ENUMERATE");
+addFieldOption("OVERTIMETYPE", "请选择", "请选择");
//循环polist,为下拉框绑值
for(list in polist){
addFieldOption("OVERTIMETYPE", list.get_Value("CODEVALUE"), list.get_Value("CODEDES"));
-}
-
-//设置默认值
-if(recordValue!=null){
- bindField("OVERTIMETYPE",recordValue);
-}
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/0670aaf9-a045-450d-9ebc-06f3ac36ca19/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/0670aaf9-a045-450d-9ebc-06f3ac36ca19/1.NO_S3.groovy
index 75fd01e..0f4abd1 100644
--- a/tools/s3_rewriter/output/rewritten/0670aaf9-a045-450d-9ebc-06f3ac36ca19/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/0670aaf9-a045-450d-9ebc-06f3ac36ca19/1.NO_S3.groovy
@@ -11,7 +11,7 @@ def sql = "select PM_BIDDERSPERFORMANCEID,PM_BIDDERSPERFORMANCEID as PM_BIDDERSP
def listPojo = GetServicesFunction.listSelectResultBySql([:],"PM_PUBLICOFBID_SPERFORMANCE",sql,["PM_BIDDERSPERFORMANCEID"]);
def lastList = [];
if(listPojo != null){
- for(int i=0;i<listPojo.size();i++){
+ for(int i=0;i0){
list2.each{
solvelist.add(it.get_ID());
}
diff --git a/tools/s3_rewriter/output/rewritten/087739c4-3dee-4bac-b031-772497addc6b/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/087739c4-3dee-4bac-b031-772497addc6b/2.FULL_AUTO.groovy
similarity index 84%
rename from tools/s3_rewriter/output/rewritten/087739c4-3dee-4bac-b031-772497addc6b/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/087739c4-3dee-4bac-b031-772497addc6b/2.FULL_AUTO.groovy
index cea795c..40a1c71 100644
--- a/tools/s3_rewriter/output/rewritten/087739c4-3dee-4bac-b031-772497addc6b/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/087739c4-3dee-4bac-b031-772497addc6b/2.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 087739c4-3dee-4bac-b031-772497addc6b
// template_name: 部版安管人员证书
-// seq : 1
+// seq : 2
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def searchMap=[:];
diff --git a/tools/s3_rewriter/output/rewritten/093cd444-7bff-4f47-ad30-3b9187ce8c4a/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/093cd444-7bff-4f47-ad30-3b9187ce8c4a/1.NO_S3.groovy
similarity index 90%
rename from tools/s3_rewriter/output/rewritten/093cd444-7bff-4f47-ad30-3b9187ce8c4a/2.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/093cd444-7bff-4f47-ad30-3b9187ce8c4a/1.NO_S3.groovy
index 3200f5e..2258e46 100644
--- a/tools/s3_rewriter/output/rewritten/093cd444-7bff-4f47-ad30-3b9187ce8c4a/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/093cd444-7bff-4f47-ad30-3b9187ce8c4a/1.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 093cd444-7bff-4f47-ad30-3b9187ce8c4a
// template_name: 培训计划
-// seq : 2
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
page.setDataFilter(["HR_TRAIN_PLAN_ID":HR_TRAIN_PLAN_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/093cd444-7bff-4f47-ad30-3b9187ce8c4a/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/093cd444-7bff-4f47-ad30-3b9187ce8c4a/2.FULL_AUTO.groovy
similarity index 83%
rename from tools/s3_rewriter/output/rewritten/093cd444-7bff-4f47-ad30-3b9187ce8c4a/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/093cd444-7bff-4f47-ad30-3b9187ce8c4a/2.FULL_AUTO.groovy
index 5531803..41ede73 100644
--- a/tools/s3_rewriter/output/rewritten/093cd444-7bff-4f47-ad30-3b9187ce8c4a/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/093cd444-7bff-4f47-ad30-3b9187ce8c4a/2.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 093cd444-7bff-4f47-ad30-3b9187ce8c4a
// template_name: 培训计划
-// seq : 1
+// seq : 2
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
//添加需求选择按钮
diff --git a/tools/s3_rewriter/output/rewritten/09aaa5dd-56d3-4364-a5ad-e77480d4d0a9/4.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/09aaa5dd-56d3-4364-a5ad-e77480d4d0a9/2.NO_S3.groovy
similarity index 95%
rename from tools/s3_rewriter/output/rewritten/09aaa5dd-56d3-4364-a5ad-e77480d4d0a9/4.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/09aaa5dd-56d3-4364-a5ad-e77480d4d0a9/2.NO_S3.groovy
index 7fba0fd..c587e3e 100644
--- a/tools/s3_rewriter/output/rewritten/09aaa5dd-56d3-4364-a5ad-e77480d4d0a9/4.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/09aaa5dd-56d3-4364-a5ad-e77480d4d0a9/2.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 09aaa5dd-56d3-4364-a5ad-e77480d4d0a9
// template_name: 总包合同登记(五建定制-列表模板)
-// seq : 4
+// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
if(item["PUTONRECORD"] == "是"){
diff --git a/tools/s3_rewriter/output/rewritten/09aaa5dd-56d3-4364-a5ad-e77480d4d0a9/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/09aaa5dd-56d3-4364-a5ad-e77480d4d0a9/4.FULL_AUTO.groovy
similarity index 86%
rename from tools/s3_rewriter/output/rewritten/09aaa5dd-56d3-4364-a5ad-e77480d4d0a9/2.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/09aaa5dd-56d3-4364-a5ad-e77480d4d0a9/4.FULL_AUTO.groovy
index e5cf89a..7b15f63 100644
--- a/tools/s3_rewriter/output/rewritten/09aaa5dd-56d3-4364-a5ad-e77480d4d0a9/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/09aaa5dd-56d3-4364-a5ad-e77480d4d0a9/4.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 09aaa5dd-56d3-4364-a5ad-e77480d4d0a9
// template_name: 总包合同登记(五建定制-列表模板)
-// seq : 2
+// seq : 4
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def list = getFieldValue("ORGIDLIST");
diff --git a/tools/s3_rewriter/output/rewritten/0af7b134-7975-462f-bfa2-268e5201d8ce/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/0af7b134-7975-462f-bfa2-268e5201d8ce/1.FULL_AUTO.groovy
index e9f4028..290b8f2 100644
--- a/tools/s3_rewriter/output/rewritten/0af7b134-7975-462f-bfa2-268e5201d8ce/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/0af7b134-7975-462f-bfa2-268e5201d8ce/1.FULL_AUTO.groovy
@@ -9,7 +9,7 @@ import com.dsasp.server.common.dataDic.bean.CustomSearchConditional;
def searchMap = [:];
def sql = "";
def projectId = getFieldValue("GBPROJECTID");
-if(projectId != null && projectId != '') {
+if(projectId != null && projectId != '') {
def project = GetServicesFunction.loadPOJO(projectId,"GB_PROJECTINFO",false);
def prjnumber = project.get_Value("PRJNUMBER");
// def sql = " p.prjnumber = '" + prjnumber "'";
diff --git a/tools/s3_rewriter/output/rewritten/0b2c7a3f-4a8c-48b7-9f4d-239e36a29c72/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/0b2c7a3f-4a8c-48b7-9f4d-239e36a29c72/1.NO_S3.groovy
index 0c3b58a..ecf1d08 100644
--- a/tools/s3_rewriter/output/rewritten/0b2c7a3f-4a8c-48b7-9f4d-239e36a29c72/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/0b2c7a3f-4a8c-48b7-9f4d-239e36a29c72/1.NO_S3.groovy
@@ -4,4 +4,19 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-bindField("IFJC",1);
\ No newline at end of file
+
+def loadPo = GetServicesFunction.loadPOJO(item["VIEW_PM_MATERIALSUPPLIER_ID"],"PM_MATERIALSUPPLIER",false);
+
+if(loadPo != null){
+ def eligibility = loadPo.get_Value("ELIGIBILITY").toString();
+ //供应商状态(1:待调查;2:未评审;3:评审中;4:合格;5:不合格;6:黑名)
+ if(!"4".equals(eligibility) && !"5".equals(eligibility) && !"6".equals(eligibility)){//"只有状态为“合格”、“不合格”或“黑名”的记录才能复评!"
+ enableButton("复评",false);
+ }
+ if("3".equals(eligibility) || "6".equals(eligibility)){
+ enableButton("加入黑名单",false);
+ }
+}else{
+ enableButton("复评",false);
+ enableButton("加入黑名单",false);
+}
diff --git a/tools/s3_rewriter/output/rewritten/0b2c7a3f-4a8c-48b7-9f4d-239e36a29c72/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/0b2c7a3f-4a8c-48b7-9f4d-239e36a29c72/2.NO_S3.groovy
index bf16ebc..c9f930e 100644
--- a/tools/s3_rewriter/output/rewritten/0b2c7a3f-4a8c-48b7-9f4d-239e36a29c72/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/0b2c7a3f-4a8c-48b7-9f4d-239e36a29c72/2.NO_S3.groovy
@@ -4,19 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-
-def loadPo = GetServicesFunction.loadPOJO(item["VIEW_PM_MATERIALSUPPLIER_ID"],"PM_MATERIALSUPPLIER",false);
-
-if(loadPo != null){
- def eligibility = loadPo.get_Value("ELIGIBILITY").toString();
- //供应商状态(1:待调查;2:未评审;3:评审中;4:合格;5:不合格;6:黑名)
- if(!"4".equals(eligibility) && !"5".equals(eligibility) && !"6".equals(eligibility)){//"只有状态为“合格”、“不合格”或“黑名”的记录才能复评!"
- enableButton("复评",false);
- }
- if("3".equals(eligibility) || "6".equals(eligibility)){
- enableButton("加入黑名单",false);
- }
-}else{
- enableButton("复评",false);
- enableButton("加入黑名单",false);
-}
+page.setDataFilter(["MATERIALNAME":VIEW_PM_MATERIALSUPPLIER_ID]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/0b2c7a3f-4a8c-48b7-9f4d-239e36a29c72/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/0b2c7a3f-4a8c-48b7-9f4d-239e36a29c72/3.NO_S3.groovy
index 3b09b3f..a944595 100644
--- a/tools/s3_rewriter/output/rewritten/0b2c7a3f-4a8c-48b7-9f4d-239e36a29c72/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/0b2c7a3f-4a8c-48b7-9f4d-239e36a29c72/3.NO_S3.groovy
@@ -4,4 +4,4 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["MATERIALNAME":VIEW_PM_MATERIALSUPPLIER_ID]);
\ No newline at end of file
+bindField("IFJC",1);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/0b2e5f73-98c9-4f59-a9cc-0bc1cd87d201/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/0b2e5f73-98c9-4f59-a9cc-0bc1cd87d201/1.NO_S3.groovy
similarity index 97%
rename from tools/s3_rewriter/output/rewritten/0b2e5f73-98c9-4f59-a9cc-0bc1cd87d201/2.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/0b2e5f73-98c9-4f59-a9cc-0bc1cd87d201/1.NO_S3.groovy
index 1c90057..5935679 100644
--- a/tools/s3_rewriter/output/rewritten/0b2e5f73-98c9-4f59-a9cc-0bc1cd87d201/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/0b2e5f73-98c9-4f59-a9cc-0bc1cd87d201/1.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 0b2e5f73-98c9-4f59-a9cc-0bc1cd87d201
// template_name: 物资合同终止(五建定制)
-// seq : 2
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
//获取选中列的实体
diff --git a/tools/s3_rewriter/output/rewritten/0b2e5f73-98c9-4f59-a9cc-0bc1cd87d201/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/0b2e5f73-98c9-4f59-a9cc-0bc1cd87d201/2.FULL_AUTO.groovy
similarity index 85%
rename from tools/s3_rewriter/output/rewritten/0b2e5f73-98c9-4f59-a9cc-0bc1cd87d201/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/0b2e5f73-98c9-4f59-a9cc-0bc1cd87d201/2.FULL_AUTO.groovy
index 61d84dd..de2f81b 100644
--- a/tools/s3_rewriter/output/rewritten/0b2e5f73-98c9-4f59-a9cc-0bc1cd87d201/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/0b2e5f73-98c9-4f59-a9cc-0bc1cd87d201/2.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 0b2e5f73-98c9-4f59-a9cc-0bc1cd87d201
// template_name: 物资合同终止(五建定制)
-// seq : 1
+// seq : 2
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def list = getFieldValue("ORGIDLIST");
diff --git a/tools/s3_rewriter/output/rewritten/0baf0faa-342d-4bac-bdf7-bc14479ba29e/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/0baf0faa-342d-4bac-bdf7-bc14479ba29e/1.FULL_AUTO.groovy
index f713575..afe75af 100644
--- a/tools/s3_rewriter/output/rewritten/0baf0faa-342d-4bac-bdf7-bc14479ba29e/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/0baf0faa-342d-4bac-bdf7-bc14479ba29e/1.FULL_AUTO.groovy
@@ -5,8 +5,6 @@
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
//在下拉列表框调用removeAllItems()方法前,应清空下拉列表中的值,之后赋值才能生效
-def yearvalue = getFieldValue('YEAR');
-def monthvalue = getFieldValue('MONTH');
bindField("YEAR",null);
bindField("MONTH",null);
@@ -20,7 +18,7 @@ def currentYear = GetDefaultValueFunction.currentYear();
def startYear = currentYear - 10;
def endYear = currentYear + 11;
-for(i in startYear..<endYear){
+for(i in startYear.. 0){
+ def syncplat = list.get(0).get_Value("SYNCPLAT");
+ if(syncplat != null)
+ flag = true;
+}
-
-page.setDataFilter(["PRJNUMBER":po.get_Value("PRJNUMBER"),"DATANUMBER":po.get_Value("DATANUMBER"),"GB_PROJECTINFO_ID":GB_PROJECTINFO_ID]);
-page.setReceiveMap(["PRJNUMBER":po.get_Value("PRJNUMBER"),"DATANUMBER":po.get_Value("DATANUMBER"),"GB_PROJECTINFO_ID":GB_PROJECTINFO_ID])
\ No newline at end of file
+enableButton("批量上传扬尘数据",flag);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/0d674631-7a53-44b0-bb41-6aa201ede8ec/7.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/0d674631-7a53-44b0-bb41-6aa201ede8ec/7.NO_S3.groovy
index c0b7e1f..df9d35d 100644
--- a/tools/s3_rewriter/output/rewritten/0d674631-7a53-44b0-bb41-6aa201ede8ec/7.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/0d674631-7a53-44b0-bb41-6aa201ede8ec/7.NO_S3.groovy
@@ -4,7 +4,17 @@
// seq : 7
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-//page.setDefaultSearch(["GB_PROJECTINFOID":GB_PROJECTINFO_ID]);
-page.setDataFilter(["GB_PROJECTINFOID":GB_PROJECTINFO_ID,"PROJECTID":GB_PROJECTINFO_ID]);
-page.setReceiveMap(["GB_PROJECTINFOID":GB_PROJECTINFO_ID])
+def project = GetServicesFunction.loadPOJO(GB_PROJECTINFO_ID,"GB_PROJECTINFO",false);
+def prjnumber = project.get_Value("PRJNUMBER");
+def sql = " p.prjnumber = '" + prjnumber + "' and p.isactive = 1";
+def sec = new CustomSearchConditional(sql);
+def workers = GetServicesFunction.listSelectResult(["GB_PRJ_WORKER_ID":sec],"GB_PRJ_WORKER",["ZJHM"]);
+def zjhms = "(''";
+workers?.each{
+ def zjhm = it.get_Value("ZJHM");
+ zjhms += ",'" + zjhm + "'";
+}
+zjhms += ")";
+
+page.setDataFilter(["ZJHMS":zjhms]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/0d9eac07-1978-4abb-ab1f-f1561f9bd902/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/0d9eac07-1978-4abb-ab1f-f1561f9bd902/1.NO_S3.groovy
similarity index 84%
rename from tools/s3_rewriter/output/rewritten/0d9eac07-1978-4abb-ab1f-f1561f9bd902/2.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/0d9eac07-1978-4abb-ab1f-f1561f9bd902/1.NO_S3.groovy
index ce5ed34..cf26310 100644
--- a/tools/s3_rewriter/output/rewritten/0d9eac07-1978-4abb-ab1f-f1561f9bd902/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/0d9eac07-1978-4abb-ab1f-f1561f9bd902/1.NO_S3.groovy
@@ -1,14 +1,14 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 0d9eac07-1978-4abb-ab1f-f1561f9bd902
// template_name: 福利保险结算单
-// seq : 2
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
def year = getFieldValue("BEGINYEAR");
def month = getFieldValue("BEGINMONTH");
-if(year!=null&&month!=null){
+if(year!=null&&month!=null){
bindField("BEGINDATE",(year*100+month));
}
diff --git a/tools/s3_rewriter/output/rewritten/0d9eac07-1978-4abb-ab1f-f1561f9bd902/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/0d9eac07-1978-4abb-ab1f-f1561f9bd902/2.FULL_AUTO.groovy
similarity index 80%
rename from tools/s3_rewriter/output/rewritten/0d9eac07-1978-4abb-ab1f-f1561f9bd902/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/0d9eac07-1978-4abb-ab1f-f1561f9bd902/2.FULL_AUTO.groovy
index 9fb60d5..3373a43 100644
--- a/tools/s3_rewriter/output/rewritten/0d9eac07-1978-4abb-ab1f-f1561f9bd902/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/0d9eac07-1978-4abb-ab1f-f1561f9bd902/2.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 0d9eac07-1978-4abb-ab1f-f1561f9bd902
// template_name: 福利保险结算单
-// seq : 1
+// seq : 2
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
diff --git a/tools/s3_rewriter/output/rewritten/0d9eac07-1978-4abb-ab1f-f1561f9bd902/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/0d9eac07-1978-4abb-ab1f-f1561f9bd902/3.NO_S3.groovy
index 97c9402..115c4d5 100644
--- a/tools/s3_rewriter/output/rewritten/0d9eac07-1978-4abb-ab1f-f1561f9bd902/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/0d9eac07-1978-4abb-ab1f-f1561f9bd902/3.NO_S3.groovy
@@ -8,8 +8,8 @@
def idlist = getFieldValue("WELFARECATEGORYIDS");
def text = "";
-if(idlist!=null && idlist.size()>0){
- for(i in 0..<idlist.size()){
+if(idlist!=null && idlist.size()>0){
+ for(i in 0..0){
list.each{
solvelist.add(it.get_ID());
}
diff --git a/tools/s3_rewriter/output/rewritten/0dab3418-8233-4f90-896e-f087b943a393/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/0dab3418-8233-4f90-896e-f087b943a393/4.FULL_AUTO.groovy
similarity index 84%
rename from tools/s3_rewriter/output/rewritten/0dab3418-8233-4f90-896e-f087b943a393/2.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/0dab3418-8233-4f90-896e-f087b943a393/4.FULL_AUTO.groovy
index 3569531..6c8fe18 100644
--- a/tools/s3_rewriter/output/rewritten/0dab3418-8233-4f90-896e-f087b943a393/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/0dab3418-8233-4f90-896e-f087b943a393/4.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 0dab3418-8233-4f90-896e-f087b943a393
// template_name: 员工档案-五建定制
-// seq : 2
+// seq : 4
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def searchMap=[:];
diff --git a/tools/s3_rewriter/output/rewritten/0f00e2e5-7360-47ed-b580-e1c1df685b65/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/0f00e2e5-7360-47ed-b580-e1c1df685b65/1.FULL_AUTO.groovy
index c7aa362..ec02d0b 100644
--- a/tools/s3_rewriter/output/rewritten/0f00e2e5-7360-47ed-b580-e1c1df685b65/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/0f00e2e5-7360-47ed-b580-e1c1df685b65/1.FULL_AUTO.groovy
@@ -4,7 +4,7 @@
// seq : 1
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-if(getFieldValue("YEAR") == null && getFieldValue("MONTH") == null){
+if(getFieldValue("YEAR") == null && getFieldValue("MONTH") == null){
clearFieldData("YEAR");
@@ -12,7 +12,7 @@ if(getFieldValue("YEAR") == null && getFieldValue("MONTH") == null){
currentYear = GetDefaultValueFunction.currentYear();
lastYear = currentYear - 7;
nextYear = currentYear + 8;
- for(i in lastYear..<currentYear){
+ for(i in lastYear..0){
id = po.get(0).get_Value("ID");
x = id.substring(0,id.indexOf("."));
diff --git a/tools/s3_rewriter/output/rewritten/18fb15c9-160d-4bc3-b013-859d793ac8ba/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/18fb15c9-160d-4bc3-b013-859d793ac8ba/1.NO_S3.groovy
similarity index 75%
rename from tools/s3_rewriter/output/rewritten/18fb15c9-160d-4bc3-b013-859d793ac8ba/3.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/18fb15c9-160d-4bc3-b013-859d793ac8ba/1.NO_S3.groovy
index 8e932fb..eb255c0 100644
--- a/tools/s3_rewriter/output/rewritten/18fb15c9-160d-4bc3-b013-859d793ac8ba/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/18fb15c9-160d-4bc3-b013-859d793ac8ba/1.NO_S3.groovy
@@ -1,9 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 18fb15c9-160d-4bc3-b013-859d793ac8ba
// template_name: 总包合同评审(五建定制-列表模板)
-// seq : 3
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-//bindField("TYPE",5);
-setFieldReadOnly("TYPE",true);
-
+page.setDataFilter(["ID":PM_CONTRACTUALREVIEW_ID]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/18fb15c9-160d-4bc3-b013-859d793ac8ba/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/18fb15c9-160d-4bc3-b013-859d793ac8ba/2.NO_S3.groovy
index 16057f3..0672fd3 100644
--- a/tools/s3_rewriter/output/rewritten/18fb15c9-160d-4bc3-b013-859d793ac8ba/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/18fb15c9-160d-4bc3-b013-859d793ac8ba/2.NO_S3.groovy
@@ -4,4 +4,6 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["ID":PM_CONTRACTUALREVIEW_ID]);
\ No newline at end of file
+//bindField("TYPE",5);
+setFieldReadOnly("TYPE",true);
+
diff --git a/tools/s3_rewriter/output/rewritten/18fb15c9-160d-4bc3-b013-859d793ac8ba/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/18fb15c9-160d-4bc3-b013-859d793ac8ba/3.FULL_AUTO.groovy
similarity index 86%
rename from tools/s3_rewriter/output/rewritten/18fb15c9-160d-4bc3-b013-859d793ac8ba/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/18fb15c9-160d-4bc3-b013-859d793ac8ba/3.FULL_AUTO.groovy
index 05a2f6c..e1d3b1a 100644
--- a/tools/s3_rewriter/output/rewritten/18fb15c9-160d-4bc3-b013-859d793ac8ba/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/18fb15c9-160d-4bc3-b013-859d793ac8ba/3.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 18fb15c9-160d-4bc3-b013-859d793ac8ba
// template_name: 总包合同评审(五建定制-列表模板)
-// seq : 1
+// seq : 3
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def list = getFieldValue("ORGIDLIST");
diff --git a/tools/s3_rewriter/output/rewritten/193ef769-a04d-4d77-9fec-a7d9ff802c83/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/193ef769-a04d-4d77-9fec-a7d9ff802c83/1.NO_S3.groovy
index 87a521a..8ecd812 100644
--- a/tools/s3_rewriter/output/rewritten/193ef769-a04d-4d77-9fec-a7d9ff802c83/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/193ef769-a04d-4d77-9fec-a7d9ff802c83/1.NO_S3.groovy
@@ -4,4 +4,4 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["ID":PM_COMPLETIONMATEAPPROVAL_ID]);
\ No newline at end of file
+bindField("APPROVALTYPE", 1);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/193ef769-a04d-4d77-9fec-a7d9ff802c83/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/193ef769-a04d-4d77-9fec-a7d9ff802c83/2.NO_S3.groovy
index 509cbd7..77a84e3 100644
--- a/tools/s3_rewriter/output/rewritten/193ef769-a04d-4d77-9fec-a7d9ff802c83/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/193ef769-a04d-4d77-9fec-a7d9ff802c83/2.NO_S3.groovy
@@ -4,4 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-bindField("APPROVALTYPE", 1);
\ No newline at end of file
+page.setDataFilter(["ID":PM_COMPLETIONMATEAPPROVAL_ID]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/195c3bae-cba7-4660-984c-998209224f12/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/195c3bae-cba7-4660-984c-998209224f12/1.NO_S3.groovy
index ec4f1a3..9a7253b 100644
--- a/tools/s3_rewriter/output/rewritten/195c3bae-cba7-4660-984c-998209224f12/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/195c3bae-cba7-4660-984c-998209224f12/1.NO_S3.groovy
@@ -4,8 +4,4 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-if(item['STATUS'] =="通过"){
- enableButton("打印报销申请单",true);
-}else{
- enableButton("打印报销申请单",false);
-}
\ No newline at end of file
+page.setDataFilter(["OA_REIMBURSEMENTAPPLY_ID":OA_REIMBURSEMENTAPPLY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/195c3bae-cba7-4660-984c-998209224f12/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/195c3bae-cba7-4660-984c-998209224f12/2.NO_S3.groovy
index f3c3fb4..de48a56 100644
--- a/tools/s3_rewriter/output/rewritten/195c3bae-cba7-4660-984c-998209224f12/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/195c3bae-cba7-4660-984c-998209224f12/2.NO_S3.groovy
@@ -4,4 +4,8 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["OA_REIMBURSEMENTAPPLY_ID":OA_REIMBURSEMENTAPPLY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
\ No newline at end of file
+if(item['STATUS'] =="通过"){
+ enableButton("打印报销申请单",true);
+}else{
+ enableButton("打印报销申请单",false);
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/195c3bae-cba7-4660-984c-998209224f12/3.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/195c3bae-cba7-4660-984c-998209224f12/3.FULL_AUTO.groovy
index f3b1e64..8e3d9b5 100644
--- a/tools/s3_rewriter/output/rewritten/195c3bae-cba7-4660-984c-998209224f12/3.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/195c3bae-cba7-4660-984c-998209224f12/3.FULL_AUTO.groovy
@@ -20,8 +20,8 @@ def smap=[:];
smap["EXTENDATTRIBUTEONE"] = 2;
smap["SYS_ENUMERATETYPE_ID"] = "REIMBURSEMENT_APPROVALTYPE";
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..0){
+ for(i in 0.. 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a ";
sql += " left outer join PM_MATERIALCONTRACTVIEWCONFIG b on a.codevalue = b.rateitem and MATERIALCONTRACTVIEWID = '"+PM_MATERIALCONTRACTREVIEW_ID+"'";
sql += " left outer join (";
sql += " select count(rateitem) AS rowcount,MATERIALCONTRACTVIEWID from PM_MATERIALCONTRACTVIEWCONFIG where MATERIALCONTRACTVIEWID = '"+PM_MATERIALCONTRACTREVIEW_ID+"'";
@@ -35,8 +35,8 @@ sql += " where sys_enumeratetype_id = 'SUBCONTRACT_BASICSCONFIG'";
def list = GetServicesFunction.listSelectResultBySql(map,"PM_MATERIALCONTRACTVIEWCONFIG",sql,returnCol);
-if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
+if(list!=null && list.size()>0){
+ for(i in 0..0){
meterialDetails?.each{
- if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
+ if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
summoney = summoney.add(new BigDecimal(it.get('TOTAL')))
}
}
diff --git a/tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/4.HARD.groovy
similarity index 91%
rename from tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/1.HARD.groovy
rename to tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/4.HARD.groovy
index c7d8c9c..d47112c 100644
--- a/tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/1.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/4.HARD.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 1a7f5b05-adee-4a67-a311-ac9f76af2c15
// template_name: 物资合同评审(五建定制)
-// seq : 1
+// seq : 4
// label : HARD
// 硬 S3 原因 : 动态创建 Vaadin 组件
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
@@ -31,9 +31,9 @@ button.addClickListener(new Button.ClickListener() {
public void buttonClick(Button.ClickEvent event) {
def meterialDetails = getFieldValue("MATERIALDETAILS");
def summoney = new BigDecimal("0");;
- if(meterialDetails != null && meterialDetails.size()>0){
+ if(meterialDetails != null && meterialDetails.size()>0){
meterialDetails?.each{
- if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
+ if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
summoney = summoney.add(new BigDecimal(it.get('TOTAL')))
}
}
@@ -44,7 +44,7 @@ button.addClickListener(new Button.ClickListener() {
-if(getFieldValue("PM_PROJECTID")!=null&&getFieldValue("PM_PROJECTID")!=""){
+if(getFieldValue("PM_PROJECTID")!=null&&getFieldValue("PM_PROJECTID")!=""){
def sql1 = "select coalesce(sum(p.CONTRACTMONEY),0) as TOTALCONTROLCOST from( ";
sql1 += "select case when c.pm_plannedcostchange_id is null then coalesce(pp.MATERIALPLANNINGCOST,0)";
sql1 += "else coalesce(c.MATERIALPLANNINGCOSTNOW,0) end as CONTRACTMONEY ";
diff --git a/tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/4.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/4.NO_S3.groovy
deleted file mode 100644
index 3a19d65..0000000
--- a/tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/4.NO_S3.groovy
+++ /dev/null
@@ -1,7 +0,0 @@
-// === EIP4 P4 脚本迁移产出 ===
-// template_id : 1a7f5b05-adee-4a67-a311-ac9f76af2c15
-// template_name: 物资合同评审(五建定制)
-// seq : 4
-// label : NO_S3
-// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["PM_MATERIALCONTRACTREVIEW_ID":PM_MATERIALCONTRACTREVIEW_ID]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/3.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/5.FULL_AUTO.groovy
similarity index 85%
rename from tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/3.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/5.FULL_AUTO.groovy
index 91b95ad..222f176 100644
--- a/tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/3.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/5.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 1a7f5b05-adee-4a67-a311-ac9f76af2c15
// template_name: 物资合同评审(五建定制)
-// seq : 3
+// seq : 5
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def list = getFieldValue("ORGIDLIST");
diff --git a/tools/s3_rewriter/output/rewritten/1b776125-e3af-4098-a426-1f2a5a6e3009/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/1b776125-e3af-4098-a426-1f2a5a6e3009/1.NO_S3.groovy
index 22b0773..96031d0 100644
--- a/tools/s3_rewriter/output/rewritten/1b776125-e3af-4098-a426-1f2a5a6e3009/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/1b776125-e3af-4098-a426-1f2a5a6e3009/1.NO_S3.groovy
@@ -8,7 +8,7 @@ def name = '合同';
def title = '';
def id = PM_PROJECT_ID;
-if(id.indexOf(name)>-1){
+if(id.indexOf(name)>-1){
id = id.substring(0,id.indexOf(name));
}
def po = GetServicesFunction.loadPOJO(id,"PM_PROJECT",false);
diff --git a/tools/s3_rewriter/output/rewritten/1b823255-c2d0-477b-8f56-f25d6613503f/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/1b823255-c2d0-477b-8f56-f25d6613503f/3.NO_S3.groovy
index 9d06972..320e974 100644
--- a/tools/s3_rewriter/output/rewritten/1b823255-c2d0-477b-8f56-f25d6613503f/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/1b823255-c2d0-477b-8f56-f25d6613503f/3.NO_S3.groovy
@@ -4,7 +4,7 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-if(item["DEALTYPE"]!=null && item["DEALTYPE"] == "已完结"){
+if(item["DEALTYPE"]!=null && item["DEALTYPE"] == "已完结"){
enableButton("修改",false);
enableButton("删除",false);
enableButton("处理情况登记",false);
diff --git a/tools/s3_rewriter/output/rewritten/1c19ab34-97cf-427e-af36-9b6ee3fd37e1/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/1c19ab34-97cf-427e-af36-9b6ee3fd37e1/1.NO_S3.groovy
index 72fe931..aff6775 100644
--- a/tools/s3_rewriter/output/rewritten/1c19ab34-97cf-427e-af36-9b6ee3fd37e1/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/1c19ab34-97cf-427e-af36-9b6ee3fd37e1/1.NO_S3.groovy
@@ -5,7 +5,10 @@
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-bindField("ISRETURN",true);
-bindField("RETURNDATE",GetDefaultValueFunction.currentDate());
-bindField("RETURNREGISTERUSE",GetDefaultValueFunction.getCurrentUserId());
-bindField("RETURNREGISTERDATE",GetDefaultValueFunction.currentDateTime());
+def count = GetServicesFunction.findCount("select count(tablename) from sys_entity where tablename = 'PM_PROJECT'");
+if(count==0){
+ bindField("PROJECTID",null);
+ setFieldReadOnly("PROJECTID",true);
+}else{
+ setFieldReadOnly("PROJECTID",false);
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/1c19ab34-97cf-427e-af36-9b6ee3fd37e1/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/1c19ab34-97cf-427e-af36-9b6ee3fd37e1/2.NO_S3.groovy
index 9a55b06..4c9be0c 100644
--- a/tools/s3_rewriter/output/rewritten/1c19ab34-97cf-427e-af36-9b6ee3fd37e1/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/1c19ab34-97cf-427e-af36-9b6ee3fd37e1/2.NO_S3.groovy
@@ -4,8 +4,8 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-if(item["ISRETURN"]=='是'){
- enableButton("归还登记",false);
-}else{
- enableButton("归还登记",true);
-}
\ No newline at end of file
+
+bindField("ISRETURN",true);
+bindField("RETURNDATE",GetDefaultValueFunction.currentDate());
+bindField("RETURNREGISTERUSE",GetDefaultValueFunction.getCurrentUserId());
+bindField("RETURNREGISTERDATE",GetDefaultValueFunction.currentDateTime());
diff --git a/tools/s3_rewriter/output/rewritten/1c19ab34-97cf-427e-af36-9b6ee3fd37e1/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/1c19ab34-97cf-427e-af36-9b6ee3fd37e1/3.NO_S3.groovy
index ead87d6..a24731d 100644
--- a/tools/s3_rewriter/output/rewritten/1c19ab34-97cf-427e-af36-9b6ee3fd37e1/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/1c19ab34-97cf-427e-af36-9b6ee3fd37e1/3.NO_S3.groovy
@@ -4,11 +4,8 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-
-def count = GetServicesFunction.findCount("select count(tablename) from sys_entity where tablename = 'PM_PROJECT'");
-if(count==0){
- bindField("PROJECTID",null);
- setFieldReadOnly("PROJECTID",true);
+if(item["ISRETURN"]=='是'){
+ enableButton("归还登记",false);
}else{
- setFieldReadOnly("PROJECTID",false);
+ enableButton("归还登记",true);
}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/1cc15e59-460e-4949-8a2f-41ea39bad097/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/1cc15e59-460e-4949-8a2f-41ea39bad097/2.NO_S3.groovy
index 8939b4d..95cb064 100644
--- a/tools/s3_rewriter/output/rewritten/1cc15e59-460e-4949-8a2f-41ea39bad097/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/1cc15e59-460e-4949-8a2f-41ea39bad097/2.NO_S3.groovy
@@ -4,4 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-bindField("ENDDATEVIEW",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("ENDDATE"),"yyyy-MM-dd")));
\ No newline at end of file
+bindField("STARTDATEVIEW",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("STARTDATE"),"yyyy-MM-dd")));
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/1cc15e59-460e-4949-8a2f-41ea39bad097/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/1cc15e59-460e-4949-8a2f-41ea39bad097/3.NO_S3.groovy
index 8addae9..06a9cfc 100644
--- a/tools/s3_rewriter/output/rewritten/1cc15e59-460e-4949-8a2f-41ea39bad097/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/1cc15e59-460e-4949-8a2f-41ea39bad097/3.NO_S3.groovy
@@ -4,4 +4,4 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-bindField("STARTDATEVIEW",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("STARTDATE"),"yyyy-MM-dd")));
\ No newline at end of file
+bindField("ENDDATEVIEW",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("ENDDATE"),"yyyy-MM-dd")));
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/1d3c0d8c-b74b-45f4-87c4-79ff17fdd180/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/1d3c0d8c-b74b-45f4-87c4-79ff17fdd180/1.NO_S3.groovy
index 8b1ee99..0b6a03d 100644
--- a/tools/s3_rewriter/output/rewritten/1d3c0d8c-b74b-45f4-87c4-79ff17fdd180/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/1d3c0d8c-b74b-45f4-87c4-79ff17fdd180/1.NO_S3.groovy
@@ -5,15 +5,13 @@
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
page.setDataFilter(["MATERIALREPOSITORYID":PM_MATERIALREPOSITORY_ID]);
-page.setReceiveMap(["MATERIALREPOSITORYID":PM_MATERIALREPOSITORY_ID]);
-def id = PM_MATERIALREPOSITORY_ID +"GYSBJ";
+def id = PM_MATERIALREPOSITORY_ID +"LSCJJ";
page.setId(id);
def po = GetServicesFunction.loadPOJO(PM_MATERIALREPOSITORY_ID,"PM_MATERIALREPOSITORY",false);
-
if(po != null){
- def title = po.get_EntityDisplayName() + "-供应商报价";
+ def title = po.get_EntityDisplayName() + "-历史成交价";
page.setCaption(title);
}else{
- page.setCaption('供应商报价');
+ page.setCaption('历史成交价');
}
diff --git a/tools/s3_rewriter/output/rewritten/1d3c0d8c-b74b-45f4-87c4-79ff17fdd180/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/1d3c0d8c-b74b-45f4-87c4-79ff17fdd180/2.NO_S3.groovy
index 27dafe8..652594b 100644
--- a/tools/s3_rewriter/output/rewritten/1d3c0d8c-b74b-45f4-87c4-79ff17fdd180/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/1d3c0d8c-b74b-45f4-87c4-79ff17fdd180/2.NO_S3.groovy
@@ -5,13 +5,15 @@
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
page.setDataFilter(["MATERIALREPOSITORYID":PM_MATERIALREPOSITORY_ID]);
-def id = PM_MATERIALREPOSITORY_ID +"LSCJJ";
+page.setReceiveMap(["MATERIALREPOSITORYID":PM_MATERIALREPOSITORY_ID]);
+def id = PM_MATERIALREPOSITORY_ID +"GYSBJ";
page.setId(id);
def po = GetServicesFunction.loadPOJO(PM_MATERIALREPOSITORY_ID,"PM_MATERIALREPOSITORY",false);
+
if(po != null){
- def title = po.get_EntityDisplayName() + "-历史成交价";
+ def title = po.get_EntityDisplayName() + "-供应商报价";
page.setCaption(title);
}else{
- page.setCaption('历史成交价');
+ page.setCaption('供应商报价');
}
diff --git a/tools/s3_rewriter/output/rewritten/1dedc569-128d-42cf-a04f-537ab5ca788e/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/1dedc569-128d-42cf-a04f-537ab5ca788e/1.NO_S3.groovy
index 90767c5..436152c 100644
--- a/tools/s3_rewriter/output/rewritten/1dedc569-128d-42cf-a04f-537ab5ca788e/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/1dedc569-128d-42cf-a04f-537ab5ca788e/1.NO_S3.groovy
@@ -5,7 +5,7 @@
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
def id = item["OA_OFFICE_GOODS_COLLARVOUCHER_ID"];
-if(id != null && id != ""){
+if(id != null && id != ""){
def po = GetServicesFunction.loadPOJO(id,"OA_OFFICE_GOODS_COLLARVOUCHER",false);
if(po != null){
if(po.get_Value("ISKEEPACCOUNT")){
diff --git a/tools/s3_rewriter/output/rewritten/1e9bcd2c-e1e2-4e35-a21a-a5c26b17741e/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/1e9bcd2c-e1e2-4e35-a21a-a5c26b17741e/1.HARD.groovy
index eac921f..0379c8b 100644
--- a/tools/s3_rewriter/output/rewritten/1e9bcd2c-e1e2-4e35-a21a-a5c26b17741e/1.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/1e9bcd2c-e1e2-4e35-a21a-a5c26b17741e/1.HARD.groovy
@@ -9,7 +9,7 @@
//import com.vaadin.server.ExternalResource;
//import com.vaadin.ui.Label;
//def url = group.getField("GSURL");
-//if(url.getValue()!= null && url?.isReadOnly()){
+//if(url.getValue()!= null && url?.isReadOnly()){
// Link link = new Link(" 中标公告链接 ",
// new ExternalResource(url.getValue()));
// link.setTargetName("_blank")
@@ -19,7 +19,7 @@
//}
//
//def url1 = group.getField("GGURL");
-//if(url1.getValue()!= null && url1?.isReadOnly()){
+//if(url1.getValue()!= null && url1?.isReadOnly()){
// Link link = new Link(" 招标公告链接 ",
// new ExternalResource(url1.getValue()));
// link.setTargetName("_blank")
diff --git a/tools/s3_rewriter/output/rewritten/1edd6c1c-2d17-4504-8ee5-faf12822c0c2/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/1edd6c1c-2d17-4504-8ee5-faf12822c0c2/2.HARD.groovy
index 144be1e..4ce9f51 100644
--- a/tools/s3_rewriter/output/rewritten/1edd6c1c-2d17-4504-8ee5-faf12822c0c2/2.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/1edd6c1c-2d17-4504-8ee5-faf12822c0c2/2.HARD.groovy
@@ -31,9 +31,9 @@ button.addClickListener(new Button.ClickListener() {
public void buttonClick(Button.ClickEvent event) {
def meterialDetails = getFieldValue("MATERIALDETAILS");
def summoney = new BigDecimal("0");;
- if(meterialDetails != null && meterialDetails.size()>0){
+ if(meterialDetails != null && meterialDetails.size()>0){
meterialDetails?.each{
- if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
+ if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
summoney = summoney.add(new BigDecimal(it.get('TOTAL')))
}
}
diff --git a/tools/s3_rewriter/output/rewritten/1f33b3dd-2f95-49d3-acb1-986051aa50de/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/1f33b3dd-2f95-49d3-acb1-986051aa50de/1.NO_S3.groovy
index 8baa4f6..090e83f 100644
--- a/tools/s3_rewriter/output/rewritten/1f33b3dd-2f95-49d3-acb1-986051aa50de/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/1f33b3dd-2f95-49d3-acb1-986051aa50de/1.NO_S3.groovy
@@ -4,36 +4,24 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def ordersStatus = GetServicesFunction.getEnumerateItemValue("WFSTATUS",item['STATUS']);
-if(ordersStatus == 3){
- enableButton("核销",true);
-}else{
- enableButton("核销",false);
-}
-if(item['WRITEOFF'] != null){
- enableButton("确认核销",true);
-}else{
- enableButton("确认核销",false);
- enableButton("取消核销",false);
-}
+def id = getFieldValue("PM_EXTERNALAPPLY_ID");
-if(item['WRITEOFFSTATUS'] == "已核销"){
- enableButton("取消核销",true);
- enableButton("确认核销",false);
-}else if(item['WRITEOFFSTATUS'] == "待核销"){
- enableButton("取消核销",false);
- enableButton("确认核销",true);
-}
+def sql = "";
+sql+=" select c.externalmoney-coalesce(a.externalmoney,0) as lastmoney";
+sql+=" from pm_externalapply c ";
+sql+=" left join lateral(";
+sql+=" select sum(coalesce(a.externalmoney,0)) as externalmoney ";
+sql+=" from pm_invoiceapply_external a ";
+sql+=" join pm_invoiceapply b on a.invoiceapplyid = b.pm_invoiceapply_id ";
+sql+=" left join sys_datastatus s on b.pm_invoiceapply_id = s.businesskey and s.tablename = 'PM_INVOICEAPPLY' ";
+sql+=" where coalesce(s.datastatus,1) in (1,2,3,5) and a.externalapplyid = c.pm_externalapply_id";
+sql+=" ) a on true ";
+sql+=" where c.pm_externalapply_id ='"+id+"'";
-//只有审批通过后才能作废
-if(item["STATUS"] == "通过"){
- enableButton("作废",true);
-}else if(item["STATUS"] == "作废"){
- enableButton("作废",false);
- enableButton("修改",false);
- enableButton("删除",false);
- enableButton("提交审批",false);
+def returnmap = GetServicesFunction.executeQueryForMap(sql);
+if(returnmap!=null){
+ bindField("WRITEOFF",returnmap["LASTMONEY"]);
}else{
- enableButton("作废",false);
+ bindField("WRITEOFF",null);
}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/1f33b3dd-2f95-49d3-acb1-986051aa50de/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/1f33b3dd-2f95-49d3-acb1-986051aa50de/2.NO_S3.groovy
index 6c3dde5..f8263e0 100644
--- a/tools/s3_rewriter/output/rewritten/1f33b3dd-2f95-49d3-acb1-986051aa50de/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/1f33b3dd-2f95-49d3-acb1-986051aa50de/2.NO_S3.groovy
@@ -4,4 +4,36 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["ID":PM_EXTERNALAPPLY_ID]);
\ No newline at end of file
+def ordersStatus = GetServicesFunction.getEnumerateItemValue("WFSTATUS",item['STATUS']);
+if(ordersStatus == 3){
+ enableButton("核销",true);
+}else{
+ enableButton("核销",false);
+}
+
+if(item['WRITEOFF'] != null){
+ enableButton("确认核销",true);
+}else{
+ enableButton("确认核销",false);
+ enableButton("取消核销",false);
+}
+
+if(item['WRITEOFFSTATUS'] == "已核销"){
+ enableButton("取消核销",true);
+ enableButton("确认核销",false);
+}else if(item['WRITEOFFSTATUS'] == "待核销"){
+ enableButton("取消核销",false);
+ enableButton("确认核销",true);
+}
+
+//只有审批通过后才能作废
+if(item["STATUS"] == "通过"){
+ enableButton("作废",true);
+}else if(item["STATUS"] == "作废"){
+ enableButton("作废",false);
+ enableButton("修改",false);
+ enableButton("删除",false);
+ enableButton("提交审批",false);
+}else{
+ enableButton("作废",false);
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/1f33b3dd-2f95-49d3-acb1-986051aa50de/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/1f33b3dd-2f95-49d3-acb1-986051aa50de/3.NO_S3.groovy
index 7dad147..ad03d2a 100644
--- a/tools/s3_rewriter/output/rewritten/1f33b3dd-2f95-49d3-acb1-986051aa50de/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/1f33b3dd-2f95-49d3-acb1-986051aa50de/3.NO_S3.groovy
@@ -4,24 +4,4 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-
-def id = getFieldValue("PM_EXTERNALAPPLY_ID");
-
-def sql = "";
-sql+=" select c.externalmoney-coalesce(a.externalmoney,0) as lastmoney";
-sql+=" from pm_externalapply c ";
-sql+=" left join lateral(";
-sql+=" select sum(coalesce(a.externalmoney,0)) as externalmoney ";
-sql+=" from pm_invoiceapply_external a ";
-sql+=" join pm_invoiceapply b on a.invoiceapplyid = b.pm_invoiceapply_id ";
-sql+=" left join sys_datastatus s on b.pm_invoiceapply_id = s.businesskey and s.tablename = 'PM_INVOICEAPPLY' ";
-sql+=" where coalesce(s.datastatus,1) in (1,2,3,5) and a.externalapplyid = c.pm_externalapply_id";
-sql+=" ) a on true ";
-sql+=" where c.pm_externalapply_id ='"+id+"'";
-
-def returnmap = GetServicesFunction.executeQueryForMap(sql);
-if(returnmap!=null){
- bindField("WRITEOFF",returnmap["LASTMONEY"]);
-}else{
- bindField("WRITEOFF",null);
-}
\ No newline at end of file
+page.setDataFilter(["ID":PM_EXTERNALAPPLY_ID]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/1.FULL_AUTO.groovy
index 6e4edc6..5388402 100644
--- a/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/1.FULL_AUTO.groovy
@@ -5,12 +5,6 @@
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-setFieldCaption("REGISTER_DATE", "记账日期");
-def sql = "SELECT COUNT(*) from OA_OFFICE_STORETOPERIOD WHERE ISINIT=1 AND STORE_ID = '"+getFieldValue("STORE_ID")+"'"
-def count = GetServicesFunction.findCount(sql);
-if(count>0){
- setFieldVisible("REGISTER_DATE", true);
-}else{
- setFieldVisible("REGISTER_DATE", false);
-}
+setFieldReadOnly("VOUCHER_ID", false);
+setFieldReadOnly("VOUCHER_ID", false);
diff --git a/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/2.FULL_AUTO.groovy
index a0215c1..f4314be 100644
--- a/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/2.FULL_AUTO.groovy
@@ -4,4 +4,7 @@
// seq : 2
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-addSubTableButton("GOODSDETAIL", "SELECT", 0);//设置添加按钮
\ No newline at end of file
+addSubTableButton("GOODSDETAIL", "SELECT", 0);//设置添加按钮
+
+
+setFieldValue("STORE_ID", getFieldDataSource("STORE_ID")?.firstItemId());
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/5.PARTIAL.groovy b/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/3.PARTIAL.groovy
similarity index 85%
rename from tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/5.PARTIAL.groovy
rename to tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/3.PARTIAL.groovy
index 1ae111b..1380e0f 100644
--- a/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/5.PARTIAL.groovy
+++ b/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/3.PARTIAL.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 208996a7-fa97-4e99-8e35-4b592385eb37
// template_name: 办公用品库初始化凭证
-// seq : 5
+// seq : 3
// label : PARTIAL
// 余留模式 : 残留字段句柄链(未覆盖动词)
// 处置 : 大部分已自动改写,余留行人工补全(见作业单)
diff --git a/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/4.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/4.FULL_AUTO.groovy
index 48b98e2..4591b53 100644
--- a/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/4.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/4.FULL_AUTO.groovy
@@ -4,7 +4,13 @@
// seq : 4
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-addSubTableButton("GOODSDETAIL", "SELECT", 0);//设置添加按钮
+setFieldCaption("REGISTER_DATE", "记账日期");
-setFieldValue("STORE_ID", getFieldDataSource("STORE_ID")?.firstItemId());
\ No newline at end of file
+def sql = "SELECT COUNT(*) from OA_OFFICE_STORETOPERIOD WHERE ISINIT=1 AND STORE_ID = '"+getFieldValue("STORE_ID")+"'"
+def count = GetServicesFunction.findCount(sql);
+if(count>0){
+ setFieldVisible("REGISTER_DATE", true);
+}else{
+ setFieldVisible("REGISTER_DATE", false);
+}
diff --git a/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/6.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/5.NO_S3.groovy
similarity index 91%
rename from tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/6.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/5.NO_S3.groovy
index 86aaaa4..999963d 100644
--- a/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/6.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/5.NO_S3.groovy
@@ -1,11 +1,11 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 208996a7-fa97-4e99-8e35-4b592385eb37
// template_name: 办公用品库初始化凭证
-// seq : 6
+// seq : 5
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
def id = item["OA_OFFICE_GOODS_INITIALIZEVOUCHER_ID"];
-if(id != null && id != ""){
+if(id != null && id != ""){
def po = GetServicesFunction.loadPOJO(id,"OA_OFFICE_GOODS_INITIALIZEVOUCHER",false);
if(po != null){
if(po.get_Value("ISKEEPACCOUNT")){//已记账
diff --git a/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/3.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/6.FULL_AUTO.groovy
similarity index 70%
rename from tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/3.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/6.FULL_AUTO.groovy
index 52fe318..5780bed 100644
--- a/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/3.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/208996a7-fa97-4e99-8e35-4b592385eb37/6.FULL_AUTO.groovy
@@ -1,10 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 208996a7-fa97-4e99-8e35-4b592385eb37
// template_name: 办公用品库初始化凭证
-// seq : 3
+// seq : 6
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-
-
-setFieldReadOnly("VOUCHER_ID", false);
-setFieldReadOnly("VOUCHER_ID", false);
+addSubTableButton("GOODSDETAIL", "SELECT", 0);//设置添加按钮
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/209698e6-38fb-4c4e-8106-bf28fc9ca87e/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/209698e6-38fb-4c4e-8106-bf28fc9ca87e/1.NO_S3.groovy
index 15cdab7..c029fe7 100644
--- a/tools/s3_rewriter/output/rewritten/209698e6-38fb-4c4e-8106-bf28fc9ca87e/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/209698e6-38fb-4c4e-8106-bf28fc9ca87e/1.NO_S3.groovy
@@ -4,4 +4,24 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["ID":PM_EXTERNALAPPLY_ID]);
\ No newline at end of file
+
+def id = getFieldValue("PM_EXTERNALAPPLY_ID");
+
+def sql = "";
+sql+=" select c.externalmoney-coalesce(a.externalmoney,0) as lastmoney";
+sql+=" from pm_externalapply c ";
+sql+=" left join lateral(";
+sql+=" select sum(coalesce(a.externalmoney,0)) as externalmoney ";
+sql+=" from pm_invoiceapply_external a ";
+sql+=" join pm_invoiceapply b on a.invoiceapplyid = b.pm_invoiceapply_id ";
+sql+=" left join sys_datastatus s on b.pm_invoiceapply_id = s.businesskey and s.tablename = 'PM_INVOICEAPPLY' ";
+sql+=" where coalesce(s.datastatus,1) in (1,2,3,5) and a.externalapplyid = c.pm_externalapply_id";
+sql+=" ) a on true ";
+sql+=" where c.pm_externalapply_id ='"+id+"'";
+
+def returnmap = GetServicesFunction.executeQueryForMap(sql);
+if(returnmap!=null){
+ bindField("WRITEOFF",returnmap["LASTMONEY"]);
+}else{
+ bindField("WRITEOFF",null);
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/209698e6-38fb-4c4e-8106-bf28fc9ca87e/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/209698e6-38fb-4c4e-8106-bf28fc9ca87e/3.NO_S3.groovy
index 7732a6a..6c92a6f 100644
--- a/tools/s3_rewriter/output/rewritten/209698e6-38fb-4c4e-8106-bf28fc9ca87e/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/209698e6-38fb-4c4e-8106-bf28fc9ca87e/3.NO_S3.groovy
@@ -4,24 +4,4 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-
-def id = getFieldValue("PM_EXTERNALAPPLY_ID");
-
-def sql = "";
-sql+=" select c.externalmoney-coalesce(a.externalmoney,0) as lastmoney";
-sql+=" from pm_externalapply c ";
-sql+=" left join lateral(";
-sql+=" select sum(coalesce(a.externalmoney,0)) as externalmoney ";
-sql+=" from pm_invoiceapply_external a ";
-sql+=" join pm_invoiceapply b on a.invoiceapplyid = b.pm_invoiceapply_id ";
-sql+=" left join sys_datastatus s on b.pm_invoiceapply_id = s.businesskey and s.tablename = 'PM_INVOICEAPPLY' ";
-sql+=" where coalesce(s.datastatus,1) in (1,2,3,5) and a.externalapplyid = c.pm_externalapply_id";
-sql+=" ) a on true ";
-sql+=" where c.pm_externalapply_id ='"+id+"'";
-
-def returnmap = GetServicesFunction.executeQueryForMap(sql);
-if(returnmap!=null){
- bindField("WRITEOFF",returnmap["LASTMONEY"]);
-}else{
- bindField("WRITEOFF",null);
-}
\ No newline at end of file
+page.setDataFilter(["ID":PM_EXTERNALAPPLY_ID]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/209a68bd-77c9-48ce-9522-cbcb19b144e5/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/209a68bd-77c9-48ce-9522-cbcb19b144e5/1.NO_S3.groovy
similarity index 78%
rename from tools/s3_rewriter/output/rewritten/209a68bd-77c9-48ce-9522-cbcb19b144e5/2.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/209a68bd-77c9-48ce-9522-cbcb19b144e5/1.NO_S3.groovy
index 2f2a730..0bf3adf 100644
--- a/tools/s3_rewriter/output/rewritten/209a68bd-77c9-48ce-9522-cbcb19b144e5/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/209a68bd-77c9-48ce-9522-cbcb19b144e5/1.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 209a68bd-77c9-48ce-9522-cbcb19b144e5
// template_name: 劳务公司信息(五建定制)-暂时不用
-// seq : 2
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
@@ -10,7 +10,7 @@ def loadPo = GetServicesFunction.loadPOJO(item["PM_LABORCOMPANY_ID"],"PM_LABORCO
if(loadPo != null){
def eligibility = loadPo.get_Value("ELIGIBILITY").toString();
//供应商状态(1:待调查;2:未评审;3:评审中;4:合格;5:不合格;6:黑名)
- if(!"4".equals(eligibility) && !"5".equals(eligibility) && !"6".equals(eligibility)){//"只有状态为“合格”、“不合格”或“黑名”的记录才能复评!"
+ if(!"4".equals(eligibility) && !"5".equals(eligibility) && !"6".equals(eligibility)){//"只有状态为“合格”、“不合格”或“黑名”的记录才能复评!"
enableButton("复评",false);
}
if("3".equals(eligibility) || "6".equals(eligibility)){
diff --git a/tools/s3_rewriter/output/rewritten/209a68bd-77c9-48ce-9522-cbcb19b144e5/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/209a68bd-77c9-48ce-9522-cbcb19b144e5/2.FULL_AUTO.groovy
similarity index 86%
rename from tools/s3_rewriter/output/rewritten/209a68bd-77c9-48ce-9522-cbcb19b144e5/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/209a68bd-77c9-48ce-9522-cbcb19b144e5/2.FULL_AUTO.groovy
index c51f504..21108c5 100644
--- a/tools/s3_rewriter/output/rewritten/209a68bd-77c9-48ce-9522-cbcb19b144e5/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/209a68bd-77c9-48ce-9522-cbcb19b144e5/2.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 209a68bd-77c9-48ce-9522-cbcb19b144e5
// template_name: 劳务公司信息(五建定制)-暂时不用
-// seq : 1
+// seq : 2
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
setGroupReadOnly(true)
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/3.HARD.groovy b/tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/1.HARD.groovy
similarity index 88%
rename from tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/3.HARD.groovy
rename to tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/1.HARD.groovy
index 48264ae..96d11a7 100644
--- a/tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/3.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/1.HARD.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 213d1b7e-e1b7-4ab4-ae4a-181ae4b40461
// template_name: 劳务分包合同登记-不需要评审
-// seq : 3
+// seq : 1
// label : HARD
// 硬 S3 原因 : 动态创建 Vaadin 组件
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
@@ -26,7 +26,7 @@ returnCol.add("RATEITEM");
returnCol.add("RATEVALUE");
def sql = "select PM_LABOURSUBCONTRACTREGISTERCONFIG_ID,'"+PM_LABOURSUBCONTRACTREGISTER_ID+"' as LABOURSUBCONTRACTREGISTERID,'' as LABOURSUBCONTRACTREGISTERID_DISPLAY__,codevalue as rateitem,";
-sql += " case when rowcount > 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a ";
+sql += " case when rowcount > 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a ";
sql += " left outer join PM_LABOURSUBCONTRACTREGISTERCONFIG b on a.codevalue = b.rateitem and LABOURSUBCONTRACTREGISTERID = '"+PM_LABOURSUBCONTRACTREGISTER_ID+"'";
sql += " left outer join (";
sql += " select count(rateitem) AS rowcount,LABOURSUBCONTRACTREGISTERID from PM_LABOURSUBCONTRACTREGISTERCONFIG where LABOURSUBCONTRACTREGISTERID = '"+PM_LABOURSUBCONTRACTREGISTER_ID+"'";
@@ -36,8 +36,8 @@ sql += " where sys_enumeratetype_id = 'SUBCONTRACT_BASICSCONFIG'";
def list = GetServicesFunction.listSelectResultBySql(map,"PM_LABOURSUBCONTRACTREGISTERCONFIG",sql,returnCol);
-if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
+if(list!=null && list.size()>0){
+ for(i in 0..0){
balancedetails?.each{
- if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
diff --git a/tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/2.HARD.groovy
index 42d0ccf..32e5e92 100644
--- a/tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/2.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/2.HARD.groovy
@@ -29,9 +29,9 @@ button.addClickListener(new Button.ClickListener() {
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') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
diff --git a/tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/3.NO_S3.groovy
similarity index 95%
rename from tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/1.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/3.NO_S3.groovy
index 26e3d4a..38c02d8 100644
--- a/tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/3.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 213d1b7e-e1b7-4ab4-ae4a-181ae4b40461
// template_name: 劳务分包合同登记-不需要评审
-// seq : 1
+// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
if(item["PUTONRECORD"] == "是"){
diff --git a/tools/s3_rewriter/output/rewritten/2164d1df-1f4a-4a89-9c67-ce7102206771/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/2164d1df-1f4a-4a89-9c67-ce7102206771/1.NO_S3.groovy
similarity index 95%
rename from tools/s3_rewriter/output/rewritten/2164d1df-1f4a-4a89-9c67-ce7102206771/3.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/2164d1df-1f4a-4a89-9c67-ce7102206771/1.NO_S3.groovy
index 5bf5ab4..bd4d90a 100644
--- a/tools/s3_rewriter/output/rewritten/2164d1df-1f4a-4a89-9c67-ce7102206771/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/2164d1df-1f4a-4a89-9c67-ce7102206771/1.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 2164d1df-1f4a-4a89-9c67-ce7102206771
// template_name: 项目报销确认
-// seq : 3
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
if(item['CONFIRMATIONPEOPLE'] != null){//所选凭证已经是确认状态!
diff --git a/tools/s3_rewriter/output/rewritten/2164d1df-1f4a-4a89-9c67-ce7102206771/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/2164d1df-1f4a-4a89-9c67-ce7102206771/3.FULL_AUTO.groovy
similarity index 76%
rename from tools/s3_rewriter/output/rewritten/2164d1df-1f4a-4a89-9c67-ce7102206771/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/2164d1df-1f4a-4a89-9c67-ce7102206771/3.FULL_AUTO.groovy
index 4081acd..e74f018 100644
--- a/tools/s3_rewriter/output/rewritten/2164d1df-1f4a-4a89-9c67-ce7102206771/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/2164d1df-1f4a-4a89-9c67-ce7102206771/3.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 2164d1df-1f4a-4a89-9c67-ce7102206771
// template_name: 项目报销确认
-// seq : 1
+// seq : 3
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
setFieldCaption("ISPERCOST", "项目前期费用");
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/10ee75e7-0d90-493b-b9a3-6bbbbe214127/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/218e2737-08c6-47f2-849f-f8b5ee8ee34c/1.NO_S3.groovy
similarity index 82%
rename from tools/s3_rewriter/output/rewritten/10ee75e7-0d90-493b-b9a3-6bbbbe214127/1.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/218e2737-08c6-47f2-849f-f8b5ee8ee34c/1.NO_S3.groovy
index ff35cdd..2a51735 100644
--- a/tools/s3_rewriter/output/rewritten/10ee75e7-0d90-493b-b9a3-6bbbbe214127/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/218e2737-08c6-47f2-849f-f8b5ee8ee34c/1.NO_S3.groovy
@@ -1,6 +1,6 @@
// === EIP4 P4 脚本迁移产出 ===
-// template_id : 10ee75e7-0d90-493b-b9a3-6bbbbe214127
-// template_name: 项目开票申请(通用)
+// template_id : 218e2737-08c6-47f2-849f-f8b5ee8ee34c
+// template_name: 销项税预缴税金(五建定制)
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
diff --git a/tools/s3_rewriter/output/rewritten/218e2737-08c6-47f2-849f-f8b5ee8ee34c/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/218e2737-08c6-47f2-849f-f8b5ee8ee34c/2.NO_S3.groovy
index 0d9d8a8..6913c25 100644
--- a/tools/s3_rewriter/output/rewritten/218e2737-08c6-47f2-849f-f8b5ee8ee34c/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/218e2737-08c6-47f2-849f-f8b5ee8ee34c/2.NO_S3.groovy
@@ -4,15 +4,19 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def ordersStatus = GetServicesFunction.getEnumerateItemValue("WFSTATUS",item['STATUS']);
-
-if(ordersStatus == 3){
- enableButton("作废",true);
-}else if(ordersStatus == 6){
- enableButton("作废",false);
- enableButton("修改",false);
- enableButton("删除",false);
- enableButton("提交审批",false);
-}else{
- enableButton("作废",false);
-}
\ No newline at end of file
+ def map = [:];
+ def resultlist = [];
+ def returnCol = [];
+ returnCol.add("CODEVALUE");
+ def sql="select CODEVALUE from SYS_ENUMERATE where SYS_ENUMERATETYPE_ID='PM_OUTPUTTAXINVOICE_ADVANCE_DETAIL'";
+ def list = GetServicesFunction.listSelectResultBySql(map,"SYS_ENUMERATE",sql,returnCol);
+
+ if(list!=null && list.size()>0){
+ for(i in 0.. 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a ";
sql += " left outer join PM_LABOURSUBCONTRACTREGISTERCONFIG b on a.codevalue = b.rateitem and LABOURSUBCONTRACTREGISTERID = '"+PM_LABOURSUBCONTRACTREGISTER_ID+"'";
sql += " left outer join (";
sql += " select count(rateitem) AS rowcount,LABOURSUBCONTRACTREGISTERID from PM_LABOURSUBCONTRACTREGISTERCONFIG where LABOURSUBCONTRACTREGISTERID = '"+PM_LABOURSUBCONTRACTREGISTER_ID+"'";
@@ -36,8 +36,8 @@ sql += " where sys_enumeratetype_id = 'SUBCONTRACT_BASICSCONFIG'";
def list = GetServicesFunction.listSelectResultBySql(map,"PM_LABOURSUBCONTRACTREGISTERCONFIG",sql,returnCol);
-if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
+if(list!=null && list.size()>0){
+ for(i in 0..0){
balancedetails?.each{
- if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
diff --git a/tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/3.HARD.groovy b/tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/2.HARD.groovy
similarity index 89%
rename from tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/3.HARD.groovy
rename to tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/2.HARD.groovy
index 5eb2a8a..a69d27a 100644
--- a/tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/3.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/2.HARD.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 2213796d-03b0-4b74-b923-6be0415cd002
// template_name: 劳务分包合同登记-不需要评审(五建定制)
-// seq : 3
+// seq : 2
// label : HARD
// 硬 S3 原因 : 动态创建 Vaadin 组件
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
@@ -29,9 +29,9 @@ button.addClickListener(new Button.ClickListener() {
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') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
diff --git a/tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/3.NO_S3.groovy
similarity index 95%
rename from tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/1.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/3.NO_S3.groovy
index a6fd510..bf3b88a 100644
--- a/tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/3.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 2213796d-03b0-4b74-b923-6be0415cd002
// template_name: 劳务分包合同登记-不需要评审(五建定制)
-// seq : 1
+// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
if(item["PUTONRECORD"] == "是"){
diff --git a/tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/4.FULL_AUTO.groovy
similarity index 86%
rename from tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/2.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/4.FULL_AUTO.groovy
index 71a4908..af463cb 100644
--- a/tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/4.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 2213796d-03b0-4b74-b923-6be0415cd002
// template_name: 劳务分包合同登记-不需要评审(五建定制)
-// seq : 2
+// seq : 4
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def list = getFieldValue("ORGIDLIST");
diff --git a/tools/s3_rewriter/output/rewritten/2341298b-1ba4-4d86-bed3-f4c3f3135072/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/2341298b-1ba4-4d86-bed3-f4c3f3135072/1.FULL_AUTO.groovy
index 8488122..fc495b7 100644
--- a/tools/s3_rewriter/output/rewritten/2341298b-1ba4-4d86-bed3-f4c3f3135072/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/2341298b-1ba4-4d86-bed3-f4c3f3135072/1.FULL_AUTO.groovy
@@ -6,7 +6,7 @@
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-if(getFieldValue("YEAR") != null && getFieldValue("YEAR") != ""){
+if(getFieldValue("YEAR") != null && getFieldValue("YEAR") != ""){
setFieldReadOnly("YEAR", true);
setFieldReadOnly("MONTH", true);
}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/2341298b-1ba4-4d86-bed3-f4c3f3135072/3.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/2341298b-1ba4-4d86-bed3-f4c3f3135072/3.FULL_AUTO.groovy
index bfa6490..84eb144 100644
--- a/tools/s3_rewriter/output/rewritten/2341298b-1ba4-4d86-bed3-f4c3f3135072/3.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/2341298b-1ba4-4d86-bed3-f4c3f3135072/3.FULL_AUTO.groovy
@@ -16,7 +16,7 @@ setFieldNullSelection("YEAR", nullitem);
def currentYear = GetDefaultValueFunction.currentYear();
def lastYear = currentYear - 7;
def nextYear = currentYear + 8;
-for(i in lastYear..<currentYear){
+for(i in lastYear..0){
+ for(i in 0..0){
+ for(i in 0..0){
+ for(i in 0..-1){
id = id.substring(0,id.indexOf(name));
}
def po = GetServicesFunction.loadPOJO(id,"PM_PROJECT",false);
diff --git a/tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/1.NO_S3.groovy
similarity index 85%
rename from tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/3.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/1.NO_S3.groovy
index cb86687..801738d 100644
--- a/tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/1.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 26fe10ae-93a9-45c4-9f58-2183e6050100
// template_name: 专业分包合同评审
-// seq : 3
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
page.setDataFilter(["PM_SPECIALTYSUBCONTRACTREVIEW_ID":PM_SPECIALTYSUBCONTRACTREVIEW_ID]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/2.HARD.groovy
index b051272..ef518f3 100644
--- a/tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/2.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/2.HARD.groovy
@@ -26,7 +26,7 @@ returnCol.add("RATEITEM");
returnCol.add("RATEVALUE");
def sql = "select PM_SPECIALTYSUBCONTRACTVIEWCONFIG_ID,'"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"' as SPECIALTYSUBCONTRACTVIEWID,'' as SPECIALTYSUBCONTRACTVIEWID_DISPLAY__,codevalue as rateitem,";
-sql += " case when rowcount > 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a ";
+sql += " case when rowcount > 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a ";
sql += " left outer join PM_SPECIALTYSUBCONTRACTVIEWCONFIG b on a.codevalue = b.rateitem and SPECIALTYSUBCONTRACTVIEWID = '"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"'";
sql += " left outer join (";
sql += " select count(rateitem) AS rowcount,SPECIALTYSUBCONTRACTVIEWID from PM_SPECIALTYSUBCONTRACTVIEWCONFIG where SPECIALTYSUBCONTRACTVIEWID = '"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"'";
@@ -36,8 +36,8 @@ sql += " where sys_enumeratetype_id = 'SUBCONTRACT_BASICSCONFIG'";
def list = GetServicesFunction.listSelectResultBySql(map,"PM_SPECIALTYSUBCONTRACTVIEWCONFIG",sql,returnCol);
-if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
+if(list!=null && list.size()>0){
+ for(i in 0..0){
balancedetails?.each{
- if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
diff --git a/tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/3.HARD.groovy
similarity index 89%
rename from tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/1.HARD.groovy
rename to tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/3.HARD.groovy
index 08f1934..13cd68a 100644
--- a/tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/1.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/3.HARD.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 26fe10ae-93a9-45c4-9f58-2183e6050100
// template_name: 专业分包合同评审
-// seq : 1
+// seq : 3
// label : HARD
// 硬 S3 原因 : 动态创建 Vaadin 组件
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
@@ -25,9 +25,9 @@ button.addClickListener(new Button.ClickListener() {
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') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
diff --git a/tools/s3_rewriter/output/rewritten/279c4492-0851-4b82-a8dc-88e19922f08a/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/279c4492-0851-4b82-a8dc-88e19922f08a/2.NO_S3.groovy
similarity index 90%
rename from tools/s3_rewriter/output/rewritten/279c4492-0851-4b82-a8dc-88e19922f08a/3.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/279c4492-0851-4b82-a8dc-88e19922f08a/2.NO_S3.groovy
index d27f86d..d99109d 100644
--- a/tools/s3_rewriter/output/rewritten/279c4492-0851-4b82-a8dc-88e19922f08a/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/279c4492-0851-4b82-a8dc-88e19922f08a/2.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 279c4492-0851-4b82-a8dc-88e19922f08a
// template_name: ABC三类人员证
-// seq : 3
+// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
//证书ID
@@ -24,8 +24,8 @@ def result=[];
def sql="select BORROWUSE,BORROWDATE,PREDICTRETURNDATE,RETURNDATE,DEPOSITPLACE,BORROWREASON from HR_CARDBORROWREGISTER ";
sql+="where CARDID='"+CARDID+"'";
def list=GetServicesFunction.listSelectResultBySql(Map,"HR_CARDBORROWREGISTER",sql,con);
-if(list!=null&&list.size()>0){
- for(i in 0..<list.size()){
+if(list!=null&&list.size()>0){
+ for(i in 0..0){
+ for(i in 0..0){
+ for(i in 0..0){
+ for(i in 0..0){
list.each{
solvelist.add(it.get_ID());
}
diff --git a/tools/s3_rewriter/output/rewritten/2d046844-a126-4822-910e-bfe1283b5ebf/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/2d046844-a126-4822-910e-bfe1283b5ebf/1.NO_S3.groovy
index 99e0943..23fa9dd 100644
--- a/tools/s3_rewriter/output/rewritten/2d046844-a126-4822-910e-bfe1283b5ebf/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/2d046844-a126-4822-910e-bfe1283b5ebf/1.NO_S3.groovy
@@ -5,7 +5,7 @@
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
//只有未提交或重新提交状态才能删除及修改!
-if(item['STATUS'] !=null && item['STATUS'] !="重新提交" && item['STATUS'] !="未提交"){
+if(item['STATUS'] !=null && item['STATUS'] !="重新提交" && item['STATUS'] !="未提交"){
enableButton("删除",false);//删除不可用
enableButton("修改",false);//修改不可用
}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/2d046844-a126-4822-910e-bfe1283b5ebf/3.PARTIAL.groovy b/tools/s3_rewriter/output/rewritten/2d046844-a126-4822-910e-bfe1283b5ebf/2.PARTIAL.groovy
similarity index 96%
rename from tools/s3_rewriter/output/rewritten/2d046844-a126-4822-910e-bfe1283b5ebf/3.PARTIAL.groovy
rename to tools/s3_rewriter/output/rewritten/2d046844-a126-4822-910e-bfe1283b5ebf/2.PARTIAL.groovy
index 7c2b8ec..d5cd896 100644
--- a/tools/s3_rewriter/output/rewritten/2d046844-a126-4822-910e-bfe1283b5ebf/3.PARTIAL.groovy
+++ b/tools/s3_rewriter/output/rewritten/2d046844-a126-4822-910e-bfe1283b5ebf/2.PARTIAL.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 2d046844-a126-4822-910e-bfe1283b5ebf
// template_name: 办公用品领用申请
-// seq : 3
+// seq : 2
// label : PARTIAL
// 余留模式 : 残留字段句柄链(未覆盖动词)
// 处置 : 大部分已自动改写,余留行人工补全(见作业单)
diff --git a/tools/s3_rewriter/output/rewritten/2d046844-a126-4822-910e-bfe1283b5ebf/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/2d046844-a126-4822-910e-bfe1283b5ebf/3.FULL_AUTO.groovy
similarity index 96%
rename from tools/s3_rewriter/output/rewritten/2d046844-a126-4822-910e-bfe1283b5ebf/2.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/2d046844-a126-4822-910e-bfe1283b5ebf/3.FULL_AUTO.groovy
index d98207d..7815749 100644
--- a/tools/s3_rewriter/output/rewritten/2d046844-a126-4822-910e-bfe1283b5ebf/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/2d046844-a126-4822-910e-bfe1283b5ebf/3.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 2d046844-a126-4822-910e-bfe1283b5ebf
// template_name: 办公用品领用申请
-// seq : 2
+// seq : 3
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
import com.vaadin.ui.Notification;
diff --git a/tools/s3_rewriter/output/rewritten/2edacc15-6ca8-44be-9417-eba97358db8e/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/2edacc15-6ca8-44be-9417-eba97358db8e/1.NO_S3.groovy
index 393ef2a..00cfb40 100644
--- a/tools/s3_rewriter/output/rewritten/2edacc15-6ca8-44be-9417-eba97358db8e/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/2edacc15-6ca8-44be-9417-eba97358db8e/1.NO_S3.groovy
@@ -4,7 +4,6 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-//选择开始日期计算结束日期
-def starttime = getFieldValue("BEGINDATE");
-bindField("BEGINDATE",GetValueFunction.firstDateOfMonth(starttime));
-bindField("ENDDATE",GetValueFunction.lastDateOfMonth(starttime));
\ No newline at end of file
+def endtime = getFieldValue("ENDDATE");
+bindField("BEGINDATE",GetValueFunction.firstDateOfMonth(endtime));
+bindField("ENDDATE",GetValueFunction.lastDateOfMonth(endtime));
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/2edacc15-6ca8-44be-9417-eba97358db8e/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/2edacc15-6ca8-44be-9417-eba97358db8e/2.NO_S3.groovy
index dad8f30..388a6ba 100644
--- a/tools/s3_rewriter/output/rewritten/2edacc15-6ca8-44be-9417-eba97358db8e/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/2edacc15-6ca8-44be-9417-eba97358db8e/2.NO_S3.groovy
@@ -4,6 +4,7 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def endtime = getFieldValue("ENDDATE");
-bindField("BEGINDATE",GetValueFunction.firstDateOfMonth(endtime));
-bindField("ENDDATE",GetValueFunction.lastDateOfMonth(endtime));
\ No newline at end of file
+//选择开始日期计算结束日期
+def starttime = getFieldValue("BEGINDATE");
+bindField("BEGINDATE",GetValueFunction.firstDateOfMonth(starttime));
+bindField("ENDDATE",GetValueFunction.lastDateOfMonth(starttime));
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/1.NO_S3.groovy
similarity index 88%
rename from tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/3.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/1.NO_S3.groovy
index a97882f..fe9b7f7 100644
--- a/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/1.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 2fac21ea-2964-4295-b3e9-cad7c3391ff1
// template_name: 合格供方对账(五建-分包合同结算)
-// seq : 3
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
page.setDataFilter(["PM_CONTRACTBALANCE_ID":PM_CONTRACTBALANCE_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/4.HARD.groovy b/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/2.HARD.groovy
similarity index 84%
rename from tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/4.HARD.groovy
rename to tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/2.HARD.groovy
index 6e481b1..7d71477 100644
--- a/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/4.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/2.HARD.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 2fac21ea-2964-4295-b3e9-cad7c3391ff1
// template_name: 合格供方对账(五建-分包合同结算)
-// seq : 4
+// seq : 2
// label : HARD
// 硬 S3 原因 : 动态创建 Vaadin 组件
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
@@ -27,12 +27,12 @@ button.addClickListener(new Button.ClickListener() {
def balancedetails = getFieldValue("BALANCEDETAILS");
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('NUMBER') !=null && it.get('NUMBER') !=""){
+ if(it.get('NUMBER') !=null && it.get('NUMBER') !=""){
sumamount = sumamount.add(new BigDecimal(it.get('NUMBER')))
}
- if(it.get('MONEY') !=null && it.get('MONEY') !=""){
+ if(it.get('MONEY') !=null && it.get('MONEY') !=""){
summoney = summoney.add(new BigDecimal(it.get('MONEY')))
}
}
diff --git a/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/2.NO_S3.groovy
deleted file mode 100644
index c0bc7a9..0000000
--- a/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/2.NO_S3.groovy
+++ /dev/null
@@ -1,7 +0,0 @@
-// === EIP4 P4 脚本迁移产出 ===
-// template_id : 2fac21ea-2964-4295-b3e9-cad7c3391ff1
-// template_name: 合格供方对账(五建-分包合同结算)
-// seq : 2
-// label : NO_S3
-// 处置 : 无 S3 模式,原样进 P4
-setFieldReadOnly("REMIND",false);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/3.FULL_AUTO.groovy
similarity index 96%
rename from tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/3.FULL_AUTO.groovy
index bd9bc5f..e22d0b7 100644
--- a/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/3.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 2fac21ea-2964-4295-b3e9-cad7c3391ff1
// template_name: 合格供方对账(五建-分包合同结算)
-// seq : 1
+// seq : 3
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
diff --git a/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/4.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/4.NO_S3.groovy
new file mode 100644
index 0000000..51f9e49
--- /dev/null
+++ b/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/4.NO_S3.groovy
@@ -0,0 +1,12 @@
+// === EIP4 P4 脚本迁移产出 ===
+// template_id : 2fac21ea-2964-4295-b3e9-cad7c3391ff1
+// template_name: 合格供方对账(五建-分包合同结算)
+// seq : 4
+// label : NO_S3
+// 处置 : 无 S3 模式,原样进 P4
+def ordersStatus = GetServicesFunction.getEnumerateItemValue("WFSTATUS",item['STATUS']);
+if(ordersStatus == 3){
+ enableButton("审批通过记录修改",true);
+}else{
+ enableButton("审批通过记录修改",false);
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/6.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/6.NO_S3.groovy
index d8cd65e..b3feaf3 100644
--- a/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/6.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/6.NO_S3.groovy
@@ -4,9 +4,4 @@
// seq : 6
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def ordersStatus = GetServicesFunction.getEnumerateItemValue("WFSTATUS",item['STATUS']);
-if(ordersStatus == 3){
- enableButton("审批通过记录修改",true);
-}else{
- enableButton("审批通过记录修改",false);
-}
\ No newline at end of file
+setFieldReadOnly("REMIND",false);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/2fb53bc0-ec8e-425d-a75e-7369f77200cc/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/2fb53bc0-ec8e-425d-a75e-7369f77200cc/1.FULL_AUTO.groovy
index 2dff01d..124e4d9 100644
--- a/tools/s3_rewriter/output/rewritten/2fb53bc0-ec8e-425d-a75e-7369f77200cc/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/2fb53bc0-ec8e-425d-a75e-7369f77200cc/1.FULL_AUTO.groovy
@@ -4,30 +4,14 @@
// seq : 1
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
+import com.vaadin.ui.Notification;
+import com.vaadin.ui.Notification.Type;
-def value = event.getProperty().getValue();
-if(value){//只列出本期
- def list = new DateTime[2];
- def storeId = getFieldValue("STORE_ID");
- if(storeId != null){//默认绑定当前可结账期间的开始日期和结束日期
- sql = "SELECT YEAR||'年'||MONTH||'月' AS PERIODNAME,* FROM OA_OFFICE_ACCOUNT_PERIOD WHERE OA_OFFICE_ACCOUNT_PERIOD_ID IN(SELECT PERIOD_ID FROM OA_OFFICE_STORETOPERIOD WHERE ISCLOSED=0 AND STORE_ID='"+storeId+"') ORDER BY year*100+month DESC";
- def listPeriod = GetServicesFunction.listSelectResultBySql([:],"OA_OFFICE_ACCOUNT_PERIOD",sql,[]);
- if(listPeriod != null && listPeriod.size()>0){
- def po = listPeriod.get(0).toMap();
- list[0] = po["STARTDATE"];
- list[1] = po["ENDDATE"];
- }else{
- list[0] = null;
- list[1] = null;
- }
- }else{
- list[0] = null;
- list[1] = null;
- }
- bindField("REGISTER_DATE",list);
- setFieldEnabled("REGISTER_DATE", false);
-}else{
- setFieldEnabled("REGISTER_DATE", true);
+if(getFieldValue("STORE_ID") == null){
+ setFieldValue("STORE_ID", getFieldDataSource("STORE_ID")?.firstItemId());
+}
+if(getFieldDataSource("STORE_ID")?.firstItemId() == null || getFieldDataSource("STORE_ID")?.firstItemId() ==""){
+ showToast("没有可选的办公用品库!", Type.ERROR_MESSAGE);
}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/2fb53bc0-ec8e-425d-a75e-7369f77200cc/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/2fb53bc0-ec8e-425d-a75e-7369f77200cc/2.FULL_AUTO.groovy
index aff266e..5e1ca16 100644
--- a/tools/s3_rewriter/output/rewritten/2fb53bc0-ec8e-425d-a75e-7369f77200cc/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/2fb53bc0-ec8e-425d-a75e-7369f77200cc/2.FULL_AUTO.groovy
@@ -4,14 +4,30 @@
// seq : 2
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-import com.vaadin.ui.Notification;
-import com.vaadin.ui.Notification.Type;
+def value = event.getProperty().getValue();
+if(value){//只列出本期
+ def list = new DateTime[2];
+ def storeId = getFieldValue("STORE_ID");
+ if(storeId != null){//默认绑定当前可结账期间的开始日期和结束日期
+ sql = "SELECT YEAR||'年'||MONTH||'月' AS PERIODNAME,* FROM OA_OFFICE_ACCOUNT_PERIOD WHERE OA_OFFICE_ACCOUNT_PERIOD_ID IN(SELECT PERIOD_ID FROM OA_OFFICE_STORETOPERIOD WHERE ISCLOSED=0 AND STORE_ID='"+storeId+"') ORDER BY year*100+month DESC";
+ def listPeriod = GetServicesFunction.listSelectResultBySql([:],"OA_OFFICE_ACCOUNT_PERIOD",sql,[]);
+ if(listPeriod != null && listPeriod.size()>0){
+ def po = listPeriod.get(0).toMap();
+ list[0] = po["STARTDATE"];
+ list[1] = po["ENDDATE"];
+ }else{
+ list[0] = null;
+ list[1] = null;
+ }
+ }else{
+ list[0] = null;
+ list[1] = null;
+ }
+ bindField("REGISTER_DATE",list);
+ setFieldEnabled("REGISTER_DATE", false);
-if(getFieldValue("STORE_ID") == null){
- setFieldValue("STORE_ID", getFieldDataSource("STORE_ID")?.firstItemId());
-}
-if(getFieldDataSource("STORE_ID")?.firstItemId() == null || getFieldDataSource("STORE_ID")?.firstItemId() ==""){
- showToast("没有可选的办公用品库!", Type.ERROR_MESSAGE);
+}else{
+ setFieldEnabled("REGISTER_DATE", true);
}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/2fb53bc0-ec8e-425d-a75e-7369f77200cc/3.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/2fb53bc0-ec8e-425d-a75e-7369f77200cc/3.FULL_AUTO.groovy
index 4aaf5c6..6ccfde7 100644
--- a/tools/s3_rewriter/output/rewritten/2fb53bc0-ec8e-425d-a75e-7369f77200cc/3.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/2fb53bc0-ec8e-425d-a75e-7369f77200cc/3.FULL_AUTO.groovy
@@ -8,10 +8,10 @@
def value = event.getProperty().getValue();
def list = new DateTime[2];
-if(value != null && getFieldValue("ISNOLYCURRENT")){//默认绑定当前可结账期间的开始日期和结束日期
+if(value != null && getFieldValue("ISNOLYCURRENT")){//默认绑定当前可结账期间的开始日期和结束日期
def sql = "SELECT YEAR||'年'||MONTH||'月' AS PERIODNAME,* FROM OA_OFFICE_ACCOUNT_PERIOD WHERE OA_OFFICE_ACCOUNT_PERIOD_ID IN(SELECT PERIOD_ID FROM OA_OFFICE_STORETOPERIOD WHERE ISCLOSED=0 AND STORE_ID='"+value+"') ORDER BY year*100+month DESC";
def listPeriod = GetServicesFunction.listSelectResultBySql([:],"OA_OFFICE_ACCOUNT_PERIOD",sql,[]);
- if(listPeriod != null && listPeriod.size()>0){
+ if(listPeriod != null && listPeriod.size()>0){
def po = listPeriod.get(0).toMap();
list[0] = po["STARTDATE"];
list[1] = po["ENDDATE"];
diff --git a/tools/s3_rewriter/output/rewritten/30b8f8fb-26be-4a07-87cf-2d66053acfb0/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/30b8f8fb-26be-4a07-87cf-2d66053acfb0/1.NO_S3.groovy
index c7b09cf..da51993 100644
--- a/tools/s3_rewriter/output/rewritten/30b8f8fb-26be-4a07-87cf-2d66053acfb0/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/30b8f8fb-26be-4a07-87cf-2d66053acfb0/1.NO_S3.groovy
@@ -4,4 +4,19 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["MATERIALNAME":VIEW_PM_MATERIALSUPPLIER_ID]);
\ No newline at end of file
+
+def loadPo = GetServicesFunction.loadPOJO(item["VIEW_PM_MATERIALSUPPLIER_ID"],"PM_MATERIALSUPPLIER",false);
+
+if(loadPo != null){
+ def eligibility = loadPo.get_Value("ELIGIBILITY").toString();
+ //供应商状态(1:待调查;2:未评审;3:评审中;4:合格;5:不合格;6:黑名)
+ if(!"4".equals(eligibility) && !"5".equals(eligibility) && !"6".equals(eligibility)){//"只有状态为“合格”、“不合格”或“黑名”的记录才能复评!"
+ enableButton("复评",false);
+ }
+ if("3".equals(eligibility) || "6".equals(eligibility)){
+ enableButton("加入黑名单",false);
+ }
+}else{
+ enableButton("复评",false);
+ enableButton("加入黑名单",false);
+}
diff --git a/tools/s3_rewriter/output/rewritten/30b8f8fb-26be-4a07-87cf-2d66053acfb0/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/30b8f8fb-26be-4a07-87cf-2d66053acfb0/2.NO_S3.groovy
index a0e2a4a..0f29e8b 100644
--- a/tools/s3_rewriter/output/rewritten/30b8f8fb-26be-4a07-87cf-2d66053acfb0/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/30b8f8fb-26be-4a07-87cf-2d66053acfb0/2.NO_S3.groovy
@@ -4,19 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-
-def loadPo = GetServicesFunction.loadPOJO(item["VIEW_PM_MATERIALSUPPLIER_ID"],"PM_MATERIALSUPPLIER",false);
-
-if(loadPo != null){
- def eligibility = loadPo.get_Value("ELIGIBILITY").toString();
- //供应商状态(1:待调查;2:未评审;3:评审中;4:合格;5:不合格;6:黑名)
- if(!"4".equals(eligibility) && !"5".equals(eligibility) && !"6".equals(eligibility)){//"只有状态为“合格”、“不合格”或“黑名”的记录才能复评!"
- enableButton("复评",false);
- }
- if("3".equals(eligibility) || "6".equals(eligibility)){
- enableButton("加入黑名单",false);
- }
-}else{
- enableButton("复评",false);
- enableButton("加入黑名单",false);
-}
+page.setDataFilter(["MATERIALNAME":VIEW_PM_MATERIALSUPPLIER_ID]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/30faea2c-95f0-4685-b3e8-358e6b73ab41/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/30faea2c-95f0-4685-b3e8-358e6b73ab41/1.NO_S3.groovy
index 3731050..7646538 100644
--- a/tools/s3_rewriter/output/rewritten/30faea2c-95f0-4685-b3e8-358e6b73ab41/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/30faea2c-95f0-4685-b3e8-358e6b73ab41/1.NO_S3.groovy
@@ -7,7 +7,7 @@
def ft = GetServicesFunction.getEnumerateItemValue("DM_FILE_TYPE",item['FILETYPE']);
def ss = GetServicesFunction.getEnumerateItemValue("DM_ARCHIVE_BORROWSTATUS",item['BORROWSTATUS']);
-if(ft == 1 && ss != 2){
+if(ft == 1 && ss != 2){
enableButton("借阅",true);
}else{
enableButton("借阅",false);
diff --git a/tools/s3_rewriter/output/rewritten/324388a6-ace2-43fc-ac53-dc57c9a0573f/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/324388a6-ace2-43fc-ac53-dc57c9a0573f/2.NO_S3.groovy
index e5a7149..1d5d465 100644
--- a/tools/s3_rewriter/output/rewritten/324388a6-ace2-43fc-ac53-dc57c9a0573f/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/324388a6-ace2-43fc-ac53-dc57c9a0573f/2.NO_S3.groovy
@@ -4,10 +4,16 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def list = new DateTime[2];
-
-def currentDate= GetDefaultValueFunction.currentDate();
-list[0] = GetValueFunction.addMonths(currentDate,-1);
-list[1] = GetValueFunction.addDays(currentDate,1);;
-bindField("OPTIMES",list);
+def searchMap =[:];
+def userids = [];
+userids.add(VIEW_SYS_USERLOGINFO_ID);
+searchMap["UPDATEBY"] = userids;
+page.setDefaultSearch(searchMap);
+//def nameStr = "";
+//def entity = GetServicesFunction.loadPOJO(VIEW_SYS_USERLOGINFO_ID,"VIEW_SYS_USERLOGINFO",false);
+//if(entity != null){
+// nameStr = entity.get_Value("DISPLAYNAME");
+//}
+//nameStr +="-操作记录";
+//page.setCaption(nameStr);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/324388a6-ace2-43fc-ac53-dc57c9a0573f/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/324388a6-ace2-43fc-ac53-dc57c9a0573f/3.NO_S3.groovy
index aedcb9b..ed07fd6 100644
--- a/tools/s3_rewriter/output/rewritten/324388a6-ace2-43fc-ac53-dc57c9a0573f/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/324388a6-ace2-43fc-ac53-dc57c9a0573f/3.NO_S3.groovy
@@ -4,16 +4,10 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def searchMap =[:];
-def userids = [];
-userids.add(VIEW_SYS_USERLOGINFO_ID);
-searchMap["UPDATEBY"] = userids;
-page.setDefaultSearch(searchMap);
+def list = new DateTime[2];
+
+def currentDate= GetDefaultValueFunction.currentDate();
+list[0] = GetValueFunction.addMonths(currentDate,-1);
+list[1] = GetValueFunction.addDays(currentDate,1);;
+bindField("OPTIMES",list);
-//def nameStr = "";
-//def entity = GetServicesFunction.loadPOJO(VIEW_SYS_USERLOGINFO_ID,"VIEW_SYS_USERLOGINFO",false);
-//if(entity != null){
-// nameStr = entity.get_Value("DISPLAYNAME");
-//}
-//nameStr +="-操作记录";
-//page.setCaption(nameStr);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/4.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/1.FULL_AUTO.groovy
similarity index 87%
rename from tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/4.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/1.FULL_AUTO.groovy
index d4bd843..c9852b8 100644
--- a/tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/4.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/1.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 328b3366-170f-4321-b06c-5593668b5535
// template_name: 施工日志-审批
-// seq : 4
+// seq : 1
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def projectId = getFieldValue("PROJECTID");
diff --git a/tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/3.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/2.FULL_AUTO.groovy
similarity index 91%
rename from tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/3.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/2.FULL_AUTO.groovy
index 2d0d085..b80b586 100644
--- a/tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/3.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/2.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 328b3366-170f-4321-b06c-5593668b5535
// template_name: 施工日志-审批
-// seq : 3
+// seq : 2
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def map = [:];
diff --git a/tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/3.HARD.groovy
similarity index 99%
rename from tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/1.HARD.groovy
rename to tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/3.HARD.groovy
index e135116..e4dc17c 100644
--- a/tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/1.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/3.HARD.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 328b3366-170f-4321-b06c-5593668b5535
// template_name: 施工日志-审批
-// seq : 1
+// seq : 3
// label : HARD
// 硬 S3 原因 : 动态创建 Vaadin 组件
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
diff --git a/tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/4.NO_S3.groovy
similarity index 95%
rename from tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/2.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/4.NO_S3.groovy
index 47fa349..a51644f 100644
--- a/tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/328b3366-170f-4321-b06c-5593668b5535/4.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 328b3366-170f-4321-b06c-5593668b5535
// template_name: 施工日志-审批
-// seq : 2
+// seq : 4
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
def list = new DateTime[2];
diff --git a/tools/s3_rewriter/output/rewritten/338ca81d-899a-4998-8e85-9fdaab24ffc0/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/338ca81d-899a-4998-8e85-9fdaab24ffc0/1.NO_S3.groovy
index 9a51ecb..d79927a 100644
--- a/tools/s3_rewriter/output/rewritten/338ca81d-899a-4998-8e85-9fdaab24ffc0/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/338ca81d-899a-4998-8e85-9fdaab24ffc0/1.NO_S3.groovy
@@ -9,7 +9,7 @@ def isplace = GetServicesFunction.getEnumerateItemValue("SYS_FILINGUP_STATUS",it
def isused = GetServicesFunction.getEnumerateItemValue("OA_FILERECEIVE_ZUOFEI",item['ISUSED']);
//审批通过且文件有效
-if(ws==3 && isused == 1){
+if(ws==3 && isused == 1){
enableButton("文件分发",true);
enableButton("无效",true);
enableButton("有效",false);
@@ -18,7 +18,7 @@ if(ws==3 && isused == 1){
enableButton("文件归档",true);
else
enableButton("文件归档",false);
-}else if(ws==3 && isused == 2){//审批通过且文件无效
+}else if(ws==3 && isused == 2){//审批通过且文件无效
enableButton("文件分发",false);
enableButton("无效",false);
enableButton("有效",true);
diff --git a/tools/s3_rewriter/output/rewritten/34334084-4ff0-40e7-805c-21bcc52d54fa/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/34334084-4ff0-40e7-805c-21bcc52d54fa/3.NO_S3.groovy
index 5e466c2..327af3a 100644
--- a/tools/s3_rewriter/output/rewritten/34334084-4ff0-40e7-805c-21bcc52d54fa/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/34334084-4ff0-40e7-805c-21bcc52d54fa/3.NO_S3.groovy
@@ -10,7 +10,7 @@ searchMap["SYS_ENUMERATETYPE_ID"] = 'HR_EMPLOYEE_STATUS';
//searchMap["CODEDES"]=["处理中","已派工"];
searchMap["CODEVALUE"]=[1,4,5];
def list = GetServicesFunction.listSelectResult(searchMap,"SYS_ENUMERATE");
-if(list!=null && list.size()>0){
+if(list!=null && list.size()>0){
list.each{
solvelist.add(it.get_ID());
}
diff --git a/tools/s3_rewriter/output/rewritten/34dbb511-d2e9-4404-a14c-724f50e36856/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/34dbb511-d2e9-4404-a14c-724f50e36856/1.NO_S3.groovy
index 44221c4..f8df33f 100644
--- a/tools/s3_rewriter/output/rewritten/34dbb511-d2e9-4404-a14c-724f50e36856/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/34dbb511-d2e9-4404-a14c-724f50e36856/1.NO_S3.groovy
@@ -4,4 +4,14 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-setFieldReadOnly("PM_PROJECTID",true);
\ No newline at end of file
+enableButton("修改",false);
+enableButton("删除",false);
+def register = GetServicesFunction.loadPOJO(item['PM_TENDERREGISTER_ID'],'PM_TENDERREGISTER',false)
+if(register != null){
+ def proj = GetServicesFunction.loadPOJO(register.get_Value("PM_PROJECTID"),'PM_PROJECT',false)
+ if(proj != null && proj.get_Value("PROJECTSTAGE")==7){
+ enableButton("修改",true);
+ enableButton("删除",true);
+ }
+}
+
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/34dbb511-d2e9-4404-a14c-724f50e36856/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/34dbb511-d2e9-4404-a14c-724f50e36856/2.NO_S3.groovy
index a7f79c1..beb4e1a 100644
--- a/tools/s3_rewriter/output/rewritten/34dbb511-d2e9-4404-a14c-724f50e36856/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/34dbb511-d2e9-4404-a14c-724f50e36856/2.NO_S3.groovy
@@ -4,14 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-enableButton("修改",false);
-enableButton("删除",false);
-def register = GetServicesFunction.loadPOJO(item['PM_TENDERREGISTER_ID'],'PM_TENDERREGISTER',false)
-if(register != null){
- def proj = GetServicesFunction.loadPOJO(register.get_Value("PM_PROJECTID"),'PM_PROJECT',false)
- if(proj != null && proj.get_Value("PROJECTSTAGE")==7){
- enableButton("修改",true);
- enableButton("删除",true);
- }
-}
-
\ No newline at end of file
+setFieldReadOnly("PM_PROJECTID",true);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/3566d257-98ad-457a-ae1c-0ef05aa80b99/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/3566d257-98ad-457a-ae1c-0ef05aa80b99/1.NO_S3.groovy
index ea41a9e..b948a09 100644
--- a/tools/s3_rewriter/output/rewritten/3566d257-98ad-457a-ae1c-0ef05aa80b99/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/3566d257-98ad-457a-ae1c-0ef05aa80b99/1.NO_S3.groovy
@@ -9,7 +9,7 @@ def name = '发票';
def title = '';
def id = PM_PROJECT_ID;
-if(id.indexOf(name)>-1){
+if(id.indexOf(name)>-1){
id = id.substring(0,id.indexOf(name));
}
def po = GetServicesFunction.loadPOJO(id,"PM_PROJECT",false);
diff --git a/tools/s3_rewriter/output/rewritten/35b9139e-a491-44a8-b586-cfa50554377d/3.HARD.groovy b/tools/s3_rewriter/output/rewritten/35b9139e-a491-44a8-b586-cfa50554377d/1.HARD.groovy
similarity index 99%
rename from tools/s3_rewriter/output/rewritten/35b9139e-a491-44a8-b586-cfa50554377d/3.HARD.groovy
rename to tools/s3_rewriter/output/rewritten/35b9139e-a491-44a8-b586-cfa50554377d/1.HARD.groovy
index 97e0bb8..1af31c6 100644
--- a/tools/s3_rewriter/output/rewritten/35b9139e-a491-44a8-b586-cfa50554377d/3.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/35b9139e-a491-44a8-b586-cfa50554377d/1.HARD.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 35b9139e-a491-44a8-b586-cfa50554377d
// template_name: 计划成本申报
-// seq : 3
+// seq : 1
// label : HARD
// 硬 S3 原因 : 动态创建 Vaadin 组件
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
diff --git a/tools/s3_rewriter/output/rewritten/35b9139e-a491-44a8-b586-cfa50554377d/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/35b9139e-a491-44a8-b586-cfa50554377d/3.FULL_AUTO.groovy
similarity index 85%
rename from tools/s3_rewriter/output/rewritten/35b9139e-a491-44a8-b586-cfa50554377d/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/35b9139e-a491-44a8-b586-cfa50554377d/3.FULL_AUTO.groovy
index 510bf2e..b78beae 100644
--- a/tools/s3_rewriter/output/rewritten/35b9139e-a491-44a8-b586-cfa50554377d/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/35b9139e-a491-44a8-b586-cfa50554377d/3.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 35b9139e-a491-44a8-b586-cfa50554377d
// template_name: 计划成本申报
-// seq : 1
+// seq : 3
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def list = getFieldValue("ORGIDLIST");
diff --git a/tools/s3_rewriter/output/rewritten/36bbda1c-ab9e-4c30-ae14-be3b792a1841/3.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/36bbda1c-ab9e-4c30-ae14-be3b792a1841/1.FULL_AUTO.groovy
similarity index 78%
rename from tools/s3_rewriter/output/rewritten/36bbda1c-ab9e-4c30-ae14-be3b792a1841/3.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/36bbda1c-ab9e-4c30-ae14-be3b792a1841/1.FULL_AUTO.groovy
index 80f43c8..171a54f 100644
--- a/tools/s3_rewriter/output/rewritten/36bbda1c-ab9e-4c30-ae14-be3b792a1841/3.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/36bbda1c-ab9e-4c30-ae14-be3b792a1841/1.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 36bbda1c-ab9e-4c30-ae14-be3b792a1841
// template_name: 签证申请(不涉及费用)
-// seq : 3
+// seq : 1
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
addSubTableButton("VISALIST2", "VISALIST", 0);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/36bbda1c-ab9e-4c30-ae14-be3b792a1841/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/36bbda1c-ab9e-4c30-ae14-be3b792a1841/3.NO_S3.groovy
similarity index 97%
rename from tools/s3_rewriter/output/rewritten/36bbda1c-ab9e-4c30-ae14-be3b792a1841/1.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/36bbda1c-ab9e-4c30-ae14-be3b792a1841/3.NO_S3.groovy
index 7b0d5e2..16b374c 100644
--- a/tools/s3_rewriter/output/rewritten/36bbda1c-ab9e-4c30-ae14-be3b792a1841/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/36bbda1c-ab9e-4c30-ae14-be3b792a1841/3.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 36bbda1c-ab9e-4c30-ae14-be3b792a1841
// template_name: 签证申请(不涉及费用)
-// seq : 1
+// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
import com.dsasp.server.common.exception.ValidationException;
diff --git a/tools/s3_rewriter/output/rewritten/36f33460-15df-4674-bae1-93c722337ae4/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/36f33460-15df-4674-bae1-93c722337ae4/1.NO_S3.groovy
index 5b984e2..f9c59d6 100644
--- a/tools/s3_rewriter/output/rewritten/36f33460-15df-4674-bae1-93c722337ae4/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/36f33460-15df-4674-bae1-93c722337ae4/1.NO_S3.groovy
@@ -4,4 +4,10 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-bindField("JOB",getFieldValue("TEMPDEPARTID"));
\ No newline at end of file
+Object status = item['JOBSTATUS'];
+if(GetServicesFunction.getEnumerateItemDes("HR_EMPLOYEE_STATUS",3).equals(status)) {
+ enableButton("取消留用",false);
+}else if(GetServicesFunction.getEnumerateItemDes("HR_EMPLOYEE_STATUS",4).equals(status)) {
+ enableButton("留用",false);
+ enableButton("退回",false);
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/36f33460-15df-4674-bae1-93c722337ae4/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/36f33460-15df-4674-bae1-93c722337ae4/2.NO_S3.groovy
index 889005d..c4844c3 100644
--- a/tools/s3_rewriter/output/rewritten/36f33460-15df-4674-bae1-93c722337ae4/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/36f33460-15df-4674-bae1-93c722337ae4/2.NO_S3.groovy
@@ -4,10 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-Object status = item['JOBSTATUS'];
-if(GetServicesFunction.getEnumerateItemDes("HR_EMPLOYEE_STATUS",3).equals(status)) {
- enableButton("取消留用",false);
-}else if(GetServicesFunction.getEnumerateItemDes("HR_EMPLOYEE_STATUS",4).equals(status)) {
- enableButton("留用",false);
- enableButton("退回",false);
-}
\ No newline at end of file
+bindField("JOB",getFieldValue("TEMPDEPARTID"));
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/38bebdb5-ebd4-4fdc-b1e6-e676ba7c4c2a/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/38bebdb5-ebd4-4fdc-b1e6-e676ba7c4c2a/1.HARD.groovy
index dacf602..63184b1 100644
--- a/tools/s3_rewriter/output/rewritten/38bebdb5-ebd4-4fdc-b1e6-e676ba7c4c2a/1.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/38bebdb5-ebd4-4fdc-b1e6-e676ba7c4c2a/1.HARD.groovy
@@ -8,7 +8,7 @@
import com.vaadin.ui.Link;
import com.vaadin.server.ExternalResource;
def url = group.getField("URL");
-if(url.getValue()!= null && url?.isReadOnly()){
+if(url.getValue()!= null && url?.isReadOnly()){
Link link = new Link(" 原地址 ",
new ExternalResource(url.getValue()));
link.setTargetName("_blank")
diff --git a/tools/s3_rewriter/output/rewritten/3903da01-6aa3-4834-bfca-be72592d9a02/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/3903da01-6aa3-4834-bfca-be72592d9a02/1.NO_S3.groovy
index e133c73..33fc9ea 100644
--- a/tools/s3_rewriter/output/rewritten/3903da01-6aa3-4834-bfca-be72592d9a02/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/3903da01-6aa3-4834-bfca-be72592d9a02/1.NO_S3.groovy
@@ -4,4 +4,7 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["OA_FIXEDASSETS_SCRAPAPPLY_ID":OA_FIXEDASSETS_SCRAPAPPLY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
+//只有未提交或重新提交状态才能删除!
+if(item['STATUS'] !=null && item['STATUS'] !="重新提交" && item['STATUS'] !="未提交"){
+ enableButton("删除",false);//删除不可用
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/3903da01-6aa3-4834-bfca-be72592d9a02/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/3903da01-6aa3-4834-bfca-be72592d9a02/2.NO_S3.groovy
index 2d69460..a089336 100644
--- a/tools/s3_rewriter/output/rewritten/3903da01-6aa3-4834-bfca-be72592d9a02/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/3903da01-6aa3-4834-bfca-be72592d9a02/2.NO_S3.groovy
@@ -4,7 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-//只有未提交或重新提交状态才能删除!
-if(item['STATUS'] !=null && item['STATUS'] !="重新提交" && item['STATUS'] !="未提交"){
- enableButton("删除",false);//删除不可用
-}
\ No newline at end of file
+page.setDataFilter(["OA_FIXEDASSETS_SCRAPAPPLY_ID":OA_FIXEDASSETS_SCRAPAPPLY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
diff --git a/tools/s3_rewriter/output/rewritten/3bfe7f69-6c10-47d2-9147-476ce9031c85/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/3bfe7f69-6c10-47d2-9147-476ce9031c85/1.NO_S3.groovy
index a001754..f58bd16 100644
--- a/tools/s3_rewriter/output/rewritten/3bfe7f69-6c10-47d2-9147-476ce9031c85/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/3bfe7f69-6c10-47d2-9147-476ce9031c85/1.NO_S3.groovy
@@ -5,18 +5,7 @@
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-if(item["RETURNSTATUS"]=="已归还"){//所选记录已退款
- enableButton("归还",false);//退款按钮不可用
- enableButton("归还情况",true);//退款情况按钮可用
-}else if(item["RETURNSTATUS"]=="未归还"){//所选记录未退款
- enableButton("归还",true);//退款按钮可用
- enableButton("归还情况",false);//退款情况按钮不可用
-}
-else{
- enableButton("归还",true);//退款按钮可用
- enableButton("归还情况",true);//退款情况按钮可用
-}
-
-if(item["STATUS"]!="通过") {
- enableButton("归还",false);//退款按钮不可用
+if(getFieldValue("RETURNMONEY")==null){
+ bindField("RETURNDATE",GetDefaultValueFunction.currentDate());
+ bindField("RETURNMONEY",getFieldValue("MONEY"));
}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/3bfe7f69-6c10-47d2-9147-476ce9031c85/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/3bfe7f69-6c10-47d2-9147-476ce9031c85/2.NO_S3.groovy
index 54ae02d..aa385f2 100644
--- a/tools/s3_rewriter/output/rewritten/3bfe7f69-6c10-47d2-9147-476ce9031c85/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/3bfe7f69-6c10-47d2-9147-476ce9031c85/2.NO_S3.groovy
@@ -5,7 +5,18 @@
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-if(getFieldValue("RETURNMONEY")==null){
- bindField("RETURNDATE",GetDefaultValueFunction.currentDate());
- bindField("RETURNMONEY",getFieldValue("MONEY"));
+if(item["RETURNSTATUS"]=="已归还"){//所选记录已退款
+ enableButton("归还",false);//退款按钮不可用
+ enableButton("归还情况",true);//退款情况按钮可用
+}else if(item["RETURNSTATUS"]=="未归还"){//所选记录未退款
+ enableButton("归还",true);//退款按钮可用
+ enableButton("归还情况",false);//退款情况按钮不可用
+}
+else{
+ enableButton("归还",true);//退款按钮可用
+ enableButton("归还情况",true);//退款情况按钮可用
+}
+
+if(item["STATUS"]!="通过") {
+ enableButton("归还",false);//退款按钮不可用
}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/3c6c1257-56b3-4f39-a41a-ae78307eb8f5/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/3c6c1257-56b3-4f39-a41a-ae78307eb8f5/1.FULL_AUTO.groovy
index ced0c54..e6c033a 100644
--- a/tools/s3_rewriter/output/rewritten/3c6c1257-56b3-4f39-a41a-ae78307eb8f5/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/3c6c1257-56b3-4f39-a41a-ae78307eb8f5/1.FULL_AUTO.groovy
@@ -32,11 +32,11 @@ if(value != null){
returnColumns.add("REGISTERNUMBER");
//查询
searchMap.put(POJOCRUDService.RETURN_COLUMNS_LIST,returnColumns);
- Map<String, Object> resultMap = GetServicesFunction.listSelect(searchMap,"OA_ENTERPRISECERTIFICATE",null);
+ Map resultMap = GetServicesFunction.listSelect(searchMap,"OA_ENTERPRISECERTIFICATE",null);
List list = (List)resultMap.get(POJOCRUDService.LIST_RESULT);
//赋值
- if(list != null && list.size() > 0){
+ if(list != null && list.size() > 0){
GeneralPOJO _hm = (GeneralPOJO) list.get(0);
def UNIT_VALUE = _hm.get_Value("UNIT");
setFieldValue("UNIT", UNIT_VALUE);
diff --git a/tools/s3_rewriter/output/rewritten/3c853250-5dfb-4ad3-9501-a229337d77a7/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/3c853250-5dfb-4ad3-9501-a229337d77a7/1.FULL_AUTO.groovy
index 668ef24..e068fab 100644
--- a/tools/s3_rewriter/output/rewritten/3c853250-5dfb-4ad3-9501-a229337d77a7/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/3c853250-5dfb-4ad3-9501-a229337d77a7/1.FULL_AUTO.groovy
@@ -4,6 +4,33 @@
// seq : 1
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-def searchMap=[:];
-searchMap["PROJECTID"] = getFieldValue("PROJECTID");//单项工程ID
-setFieldFilter("UNITPROJECTID", searchMap);
+//在下拉列表框调用removeAllItems()方法前,应清空下拉列表中的值,之后赋值才能生效
+bindField("YEAR",null);
+bindField("MONTH",null);
+
+//--设置年份下拉框默认值--
+//获取组件(年份)
+
+clearFieldData("YEAR");
+
+def currentYear = GetDefaultValueFunction.currentYear();
+//设置开始年份和结束年份
+def startYear = currentYear - 10;
+def endYear = currentYear + 11;
+
+for(i in startYear..入库金额(元)");
label4.setContentMode(Label.CONTENT_XHTML);
def formLayout4 =group.getField("LBLIMPORTMONEY").parent;
-if(formLayout4.getComponentCount()>1){
+if(formLayout4.getComponentCount()>1){
formLayout4.removeComponent(formLayout4.getComponent(1));
}
formLayout4.addComponent(label4);
diff --git a/tools/s3_rewriter/output/rewritten/3f77bb7a-5f68-4924-ad59-7522fd07904e/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/3f77bb7a-5f68-4924-ad59-7522fd07904e/2.FULL_AUTO.groovy
similarity index 87%
rename from tools/s3_rewriter/output/rewritten/3f77bb7a-5f68-4924-ad59-7522fd07904e/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/3f77bb7a-5f68-4924-ad59-7522fd07904e/2.FULL_AUTO.groovy
index 9b0f433..7d66d5a 100644
--- a/tools/s3_rewriter/output/rewritten/3f77bb7a-5f68-4924-ad59-7522fd07904e/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/3f77bb7a-5f68-4924-ad59-7522fd07904e/2.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 3f77bb7a-5f68-4924-ad59-7522fd07904e
// template_name: 付款确认选择框-五建定制(未付讫的付款申请)
-// seq : 1
+// seq : 2
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def list = getFieldValue("ORGIDLIST");
diff --git a/tools/s3_rewriter/output/rewritten/40bbb38f-4e85-4246-a78a-6a08d85e53cd/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/40bbb38f-4e85-4246-a78a-6a08d85e53cd/1.NO_S3.groovy
index b5233c2..0521a94 100644
--- a/tools/s3_rewriter/output/rewritten/40bbb38f-4e85-4246-a78a-6a08d85e53cd/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/40bbb38f-4e85-4246-a78a-6a08d85e53cd/1.NO_S3.groovy
@@ -4,19 +4,15 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
- def map = [:];
- def resultlist = [];
- def returnCol = [];
- returnCol.add("CODEVALUE");
- def sql="select CODEVALUE from SYS_ENUMERATE where SYS_ENUMERATETYPE_ID='PM_OUTPUTTAXINVOICE_ADVANCE_DETAIL' order by orderasc";
- def list = GetServicesFunction.listSelectResultBySql(map,"SYS_ENUMERATE",sql,returnCol);
-
- if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
- def map2=list[i].toMap();
- map2['TAXCLASS']=map2['CODEVALUE'];
- resultlist.add(map2);
- }
- }
- bindField("TAXDETAIL",resultlist);
-
\ No newline at end of file
+def ordersStatus = GetServicesFunction.getEnumerateItemValue("WFSTATUS",item['STATUS']);
+
+if(ordersStatus == 3){
+ enableButton("作废",true);
+}else if(ordersStatus == 6){
+ enableButton("作废",false);
+ enableButton("修改",false);
+ enableButton("删除",false);
+ enableButton("提交审批",false);
+}else{
+ enableButton("作废",false);
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/40bbb38f-4e85-4246-a78a-6a08d85e53cd/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/40bbb38f-4e85-4246-a78a-6a08d85e53cd/2.NO_S3.groovy
index abf1caa..f1fbe80 100644
--- a/tools/s3_rewriter/output/rewritten/40bbb38f-4e85-4246-a78a-6a08d85e53cd/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/40bbb38f-4e85-4246-a78a-6a08d85e53cd/2.NO_S3.groovy
@@ -4,15 +4,19 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def ordersStatus = GetServicesFunction.getEnumerateItemValue("WFSTATUS",item['STATUS']);
-
-if(ordersStatus == 3){
- enableButton("作废",true);
-}else if(ordersStatus == 6){
- enableButton("作废",false);
- enableButton("修改",false);
- enableButton("删除",false);
- enableButton("提交审批",false);
-}else{
- enableButton("作废",false);
-}
\ No newline at end of file
+ def map = [:];
+ def resultlist = [];
+ def returnCol = [];
+ returnCol.add("CODEVALUE");
+ def sql="select CODEVALUE from SYS_ENUMERATE where SYS_ENUMERATETYPE_ID='PM_OUTPUTTAXINVOICE_ADVANCE_DETAIL' order by orderasc";
+ def list = GetServicesFunction.listSelectResultBySql(map,"SYS_ENUMERATE",sql,returnCol);
+
+ if(list!=null && list.size()>0){
+ for(i in 0..0){
+ for(i in 0..0){
list.each{
def submap = it.toMap();
newlist.add(submap);
@@ -231,7 +231,7 @@ jzsshowbut?.addClickListener(new ClickListener() {
if(jzsfieldGroup.getPropertyId(f).equals("PROFESSIONALS")){
def list = pojo.get_Value(jzsfieldGroup.getPropertyId(f));
def newlist=[];
- if(list!=null && list.size()>0){
+ if(list!=null && list.size()>0){
list.each{
def submap = it.toMap();
newlist.add(submap);
diff --git a/tools/s3_rewriter/output/rewritten/4230b669-a107-4ffb-9aae-e814560d8c6e/6.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/4230b669-a107-4ffb-9aae-e814560d8c6e/7.FULL_AUTO.groovy
similarity index 84%
rename from tools/s3_rewriter/output/rewritten/4230b669-a107-4ffb-9aae-e814560d8c6e/6.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/4230b669-a107-4ffb-9aae-e814560d8c6e/7.FULL_AUTO.groovy
index 9aa4f7c..e042d8d 100644
--- a/tools/s3_rewriter/output/rewritten/4230b669-a107-4ffb-9aae-e814560d8c6e/6.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/4230b669-a107-4ffb-9aae-e814560d8c6e/7.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 4230b669-a107-4ffb-9aae-e814560d8c6e
// template_name: 员工档案(带证书)
-// seq : 6
+// seq : 7
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def searchMap=[:];
diff --git a/tools/s3_rewriter/output/rewritten/4230b669-a107-4ffb-9aae-e814560d8c6e/7.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/4230b669-a107-4ffb-9aae-e814560d8c6e/7.NO_S3.groovy
deleted file mode 100644
index 1e6961e..0000000
--- a/tools/s3_rewriter/output/rewritten/4230b669-a107-4ffb-9aae-e814560d8c6e/7.NO_S3.groovy
+++ /dev/null
@@ -1,9 +0,0 @@
-// === EIP4 P4 脚本迁移产出 ===
-// template_id : 4230b669-a107-4ffb-9aae-e814560d8c6e
-// template_name: 员工档案(带证书)
-// seq : 7
-// label : NO_S3
-// 处置 : 无 S3 模式,原样进 P4
-
-//绑定默认
-bindField("SERIALNO",getFieldValue("ACCOUNT"));
diff --git a/tools/s3_rewriter/output/rewritten/4230b669-a107-4ffb-9aae-e814560d8c6e/8.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/4230b669-a107-4ffb-9aae-e814560d8c6e/8.NO_S3.groovy
index a9fac48..9853c9f 100644
--- a/tools/s3_rewriter/output/rewritten/4230b669-a107-4ffb-9aae-e814560d8c6e/8.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/4230b669-a107-4ffb-9aae-e814560d8c6e/8.NO_S3.groovy
@@ -4,14 +4,15 @@
// seq : 8
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-if(item["JOBSTATUS"] == "在职" || item["JOBSTATUS"] == "退休留用"){
- enableButton("离职",true);
-}else{
- enableButton("离职",false);
+def searchMap=[:];
+def solvelist=[];
+searchMap["SYS_ENUMERATETYPE_ID"] = 'HR_EMPLOYEE_STATUS';
+//searchMap["CODEDES"]=["处理中","已派工"];
+searchMap["CODEVALUE"]=[1,4,5];
+def list = GetServicesFunction.listSelectResult(searchMap,"SYS_ENUMERATE");
+if(list!=null && list.size()>0){
+ list.each{
+ solvelist.add(it.get_ID());
+ }
}
-
-if(item["JOBSTATUS"] == "在职"){
- enableButton("退休",true);
-}else{
- enableButton("退休",false);
-}
\ No newline at end of file
+bindField("JOBSTATUSS",solvelist);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/432c4b6d-6e90-4e3a-bc63-de429678aa61/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/432c4b6d-6e90-4e3a-bc63-de429678aa61/1.FULL_AUTO.groovy
index 19af247..0622f69 100644
--- a/tools/s3_rewriter/output/rewritten/432c4b6d-6e90-4e3a-bc63-de429678aa61/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/432c4b6d-6e90-4e3a-bc63-de429678aa61/1.FULL_AUTO.groovy
@@ -4,11 +4,6 @@
// seq : 1
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-import com.dsasp.server.common.dataDic.bean.CustomSearchConditional;
-
-//组合查询条(排除集中合同,只取劳务合同和专业分包合同)
-def strSql = " P.pm_project_id is not null AND P.contracttype in (1,2)";
-
-def conditions = new CustomSearchConditional(strSql);//条件
-def searchmap = ["VIEW_PM_SUBCONTRACT_ID":conditions];
-setFieldFilter("SUBCONTRACTID", searchmap);
+def searchMap=[:];
+searchMap["MANAGEMENTMODE"] = 4;//经营模式:直营部分分包
+setFieldFilter("PROJECTID", searchMap);
diff --git a/tools/s3_rewriter/output/rewritten/432c4b6d-6e90-4e3a-bc63-de429678aa61/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/432c4b6d-6e90-4e3a-bc63-de429678aa61/2.FULL_AUTO.groovy
index b816231..a4665f2 100644
--- a/tools/s3_rewriter/output/rewritten/432c4b6d-6e90-4e3a-bc63-de429678aa61/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/432c4b6d-6e90-4e3a-bc63-de429678aa61/2.FULL_AUTO.groovy
@@ -4,6 +4,11 @@
// seq : 2
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-def searchMap=[:];
-searchMap["MANAGEMENTMODE"] = 4;//经营模式:直营部分分包
-setFieldFilter("PROJECTID", searchMap);
+import com.dsasp.server.common.dataDic.bean.CustomSearchConditional;
+
+//组合查询条(排除集中合同,只取劳务合同和专业分包合同)
+def strSql = " P.pm_project_id is not null AND P.contracttype in (1,2)";
+
+def conditions = new CustomSearchConditional(strSql);//条件
+def searchmap = ["VIEW_PM_SUBCONTRACT_ID":conditions];
+setFieldFilter("SUBCONTRACTID", searchmap);
diff --git a/tools/s3_rewriter/output/rewritten/43416f91-33d7-46ed-8fd9-0e9f061fe671/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/43416f91-33d7-46ed-8fd9-0e9f061fe671/1.NO_S3.groovy
new file mode 100644
index 0000000..1fc00d1
--- /dev/null
+++ b/tools/s3_rewriter/output/rewritten/43416f91-33d7-46ed-8fd9-0e9f061fe671/1.NO_S3.groovy
@@ -0,0 +1,8 @@
+// === EIP4 P4 脚本迁移产出 ===
+// template_id : 43416f91-33d7-46ed-8fd9-0e9f061fe671
+// template_name: 现场材料进场-有订单(土建)
+// seq : 1
+// label : NO_S3
+// 处置 : 无 S3 模式,原样进 P4
+
+page.setDataFilter(["PM_PROJECTIMPORTBATCH_TJ_ID":PM_PROJECTIMPORTBATCH_TJ_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
diff --git a/tools/s3_rewriter/output/rewritten/43416f91-33d7-46ed-8fd9-0e9f061fe671/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/43416f91-33d7-46ed-8fd9-0e9f061fe671/3.FULL_AUTO.groovy
similarity index 87%
rename from tools/s3_rewriter/output/rewritten/43416f91-33d7-46ed-8fd9-0e9f061fe671/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/43416f91-33d7-46ed-8fd9-0e9f061fe671/3.FULL_AUTO.groovy
index 32a45a8..cd4c5f7 100644
--- a/tools/s3_rewriter/output/rewritten/43416f91-33d7-46ed-8fd9-0e9f061fe671/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/43416f91-33d7-46ed-8fd9-0e9f061fe671/3.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 43416f91-33d7-46ed-8fd9-0e9f061fe671
// template_name: 现场材料进场-有订单(土建)
-// seq : 1
+// seq : 3
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
setFieldVisible("SELECT_LIST", false);
diff --git a/tools/s3_rewriter/output/rewritten/43416f91-33d7-46ed-8fd9-0e9f061fe671/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/43416f91-33d7-46ed-8fd9-0e9f061fe671/3.NO_S3.groovy
deleted file mode 100644
index 8e52bab..0000000
--- a/tools/s3_rewriter/output/rewritten/43416f91-33d7-46ed-8fd9-0e9f061fe671/3.NO_S3.groovy
+++ /dev/null
@@ -1,16 +0,0 @@
-// === EIP4 P4 脚本迁移产出 ===
-// template_id : 43416f91-33d7-46ed-8fd9-0e9f061fe671
-// template_name: 现场材料进场-有订单(土建)
-// seq : 3
-// label : NO_S3
-// 处置 : 无 S3 模式,原样进 P4
-if(item["ISACCOUNTS"] == "是"){
- enableButton("取消记账",true);
- enableButton("记账",false);
-// enableButton("收款登记",false);
-
-}else if(item["ISACCOUNTS"] == "否"){
- enableButton("取消记账",false);
- enableButton("记账",true);
-// enableButton("收款登记",true);
-}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/43416f91-33d7-46ed-8fd9-0e9f061fe671/4.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/43416f91-33d7-46ed-8fd9-0e9f061fe671/4.NO_S3.groovy
index 7fcb1e8..d19cfd3 100644
--- a/tools/s3_rewriter/output/rewritten/43416f91-33d7-46ed-8fd9-0e9f061fe671/4.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/43416f91-33d7-46ed-8fd9-0e9f061fe671/4.NO_S3.groovy
@@ -4,5 +4,13 @@
// seq : 4
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-
-page.setDataFilter(["PM_PROJECTIMPORTBATCH_TJ_ID":PM_PROJECTIMPORTBATCH_TJ_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
+if(item["ISACCOUNTS"] == "是"){
+ enableButton("取消记账",true);
+ enableButton("记账",false);
+// enableButton("收款登记",false);
+
+}else if(item["ISACCOUNTS"] == "否"){
+ enableButton("取消记账",false);
+ enableButton("记账",true);
+// enableButton("收款登记",true);
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/43ea5aea-42b5-4ae4-8f25-4d40828d5c1b/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/43ea5aea-42b5-4ae4-8f25-4d40828d5c1b/1.NO_S3.groovy
index 74beea4..c270e3f 100644
--- a/tools/s3_rewriter/output/rewritten/43ea5aea-42b5-4ae4-8f25-4d40828d5c1b/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/43ea5aea-42b5-4ae4-8f25-4d40828d5c1b/1.NO_S3.groovy
@@ -4,4 +4,7 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["ID":HR_RELEGATIONREQUEST_ID]);
\ No newline at end of file
+ import com.dsasp.server.common.exception.ValidationException;
+ def search = ["USERID" : GetDefaultValueFunction.getCurrentUserId()];
+ def employeeId = GetServicesFunction.listSelectResult(search,"HR_EMPLOYEE")?.get(0)?.get_Value("HR_EMPLOYEE_ID");
+ bindField("EMPLOYEE", employeeId);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/43ea5aea-42b5-4ae4-8f25-4d40828d5c1b/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/43ea5aea-42b5-4ae4-8f25-4d40828d5c1b/2.NO_S3.groovy
index 68dcfc1..1930669 100644
--- a/tools/s3_rewriter/output/rewritten/43ea5aea-42b5-4ae4-8f25-4d40828d5c1b/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/43ea5aea-42b5-4ae4-8f25-4d40828d5c1b/2.NO_S3.groovy
@@ -4,10 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def userid = GetDefaultValueFunction.getCurrentUserId();
-def searchMap = [:];
-searchMap["USERID"] = userid;
-def emPolist = GetServicesFunction.listSelectResult(searchMap,"HR_EMPLOYEE");
-if(emPolist != null && emPolist.size() > 0){
- bindField("EMPLOYEE",emPolist.get(0).get_ID());
-}
+page.setDataFilter(["ID":HR_RELEGATIONREQUEST_ID]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/43ea5aea-42b5-4ae4-8f25-4d40828d5c1b/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/43ea5aea-42b5-4ae4-8f25-4d40828d5c1b/3.NO_S3.groovy
index 7e13f58..043ac4e 100644
--- a/tools/s3_rewriter/output/rewritten/43ea5aea-42b5-4ae4-8f25-4d40828d5c1b/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/43ea5aea-42b5-4ae4-8f25-4d40828d5c1b/3.NO_S3.groovy
@@ -4,7 +4,10 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
- import com.dsasp.server.common.exception.ValidationException;
- def search = ["USERID" : GetDefaultValueFunction.getCurrentUserId()];
- def employeeId = GetServicesFunction.listSelectResult(search,"HR_EMPLOYEE")?.get(0)?.get_Value("HR_EMPLOYEE_ID");
- bindField("EMPLOYEE", employeeId);
\ No newline at end of file
+def userid = GetDefaultValueFunction.getCurrentUserId();
+def searchMap = [:];
+searchMap["USERID"] = userid;
+def emPolist = GetServicesFunction.listSelectResult(searchMap,"HR_EMPLOYEE");
+if(emPolist != null && emPolist.size() > 0){
+ bindField("EMPLOYEE",emPolist.get(0).get_ID());
+}
diff --git a/tools/s3_rewriter/output/rewritten/44397c5d-ea09-4354-9dc1-0b9d01e8f89e/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/44397c5d-ea09-4354-9dc1-0b9d01e8f89e/1.NO_S3.groovy
similarity index 89%
rename from tools/s3_rewriter/output/rewritten/44397c5d-ea09-4354-9dc1-0b9d01e8f89e/2.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/44397c5d-ea09-4354-9dc1-0b9d01e8f89e/1.NO_S3.groovy
index 76ef86c..8fa5079 100644
--- a/tools/s3_rewriter/output/rewritten/44397c5d-ea09-4354-9dc1-0b9d01e8f89e/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/44397c5d-ea09-4354-9dc1-0b9d01e8f89e/1.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 44397c5d-ea09-4354-9dc1-0b9d01e8f89e
// template_name: 福利保险缴交(项目)
-// seq : 2
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
page.setDataFilter(["HR_WELFAREPAY_ID":HR_WELFAREPAY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
diff --git a/tools/s3_rewriter/output/rewritten/44397c5d-ea09-4354-9dc1-0b9d01e8f89e/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/44397c5d-ea09-4354-9dc1-0b9d01e8f89e/2.FULL_AUTO.groovy
similarity index 86%
rename from tools/s3_rewriter/output/rewritten/44397c5d-ea09-4354-9dc1-0b9d01e8f89e/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/44397c5d-ea09-4354-9dc1-0b9d01e8f89e/2.FULL_AUTO.groovy
index 1cfe7d5..675dfcf 100644
--- a/tools/s3_rewriter/output/rewritten/44397c5d-ea09-4354-9dc1-0b9d01e8f89e/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/44397c5d-ea09-4354-9dc1-0b9d01e8f89e/2.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 44397c5d-ea09-4354-9dc1-0b9d01e8f89e
// template_name: 福利保险缴交(项目)
-// seq : 1
+// seq : 2
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def list = getFieldValue("ORGIDLIST");
diff --git a/tools/s3_rewriter/output/rewritten/4517ff64-36e0-46ad-8ed9-9803e0c23c63/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/4517ff64-36e0-46ad-8ed9-9803e0c23c63/1.NO_S3.groovy
index 6ef4eaf..1a0fbb7 100644
--- a/tools/s3_rewriter/output/rewritten/4517ff64-36e0-46ad-8ed9-9803e0c23c63/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/4517ff64-36e0-46ad-8ed9-9803e0c23c63/1.NO_S3.groovy
@@ -8,7 +8,7 @@
def name = '成本';
def title = '';
def id = PM_PROJECT_ID;
-if(id.indexOf(name)>-1){
+if(id.indexOf(name)>-1){
id = id.substring(0,id.indexOf(name));
}
def po = GetServicesFunction.loadPOJO(id,"PM_PROJECT",false);
diff --git a/tools/s3_rewriter/output/rewritten/459103d3-9cc9-43f5-87ca-a322c10d2200/1.PARTIAL.groovy b/tools/s3_rewriter/output/rewritten/459103d3-9cc9-43f5-87ca-a322c10d2200/1.PARTIAL.groovy
index bc625b3..3291cc9 100644
--- a/tools/s3_rewriter/output/rewritten/459103d3-9cc9-43f5-87ca-a322c10d2200/1.PARTIAL.groovy
+++ b/tools/s3_rewriter/output/rewritten/459103d3-9cc9-43f5-87ca-a322c10d2200/1.PARTIAL.groovy
@@ -5,7 +5,7 @@
// label : PARTIAL
// 余留模式 : 残留 setFilter(参数无法静态解析); 残留字段句柄链(未覆盖动词)
// 处置 : 大部分已自动改写,余留行人工补全(见作业单)
-Map<String,Object> map = new HashMap<String,Object>();
+Map map = new HashMap();
map.put("TYPE",3);
((SingleSelectField)group.getField("DD")).setFilter(map);
((SingleSelectField)group.getField("DD")).setDefault(map);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/462633b5-5351-4140-8e01-581f553c9b59/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/462633b5-5351-4140-8e01-581f553c9b59/1.NO_S3.groovy
index 91011de..5dd1e65 100644
--- a/tools/s3_rewriter/output/rewritten/462633b5-5351-4140-8e01-581f553c9b59/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/462633b5-5351-4140-8e01-581f553c9b59/1.NO_S3.groovy
@@ -5,5 +5,10 @@
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-bindField("ENDYEAR",GetDefaultValueFunction.currentYear());
-bindField("ENDMONTH",GetDefaultValueFunction.currentMonth());
\ No newline at end of file
+def year = getFieldValue("ENDYEAR");
+def month = getFieldValue("ENDMONTH");
+Console.debug(year);
+Console.debug(month);
+if(year!=null&&month!=null){
+ bindField("ENDTIME",(year*100+month));
+}
diff --git a/tools/s3_rewriter/output/rewritten/462633b5-5351-4140-8e01-581f553c9b59/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/462633b5-5351-4140-8e01-581f553c9b59/2.NO_S3.groovy
index 0f2f9b1..17231b1 100644
--- a/tools/s3_rewriter/output/rewritten/462633b5-5351-4140-8e01-581f553c9b59/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/462633b5-5351-4140-8e01-581f553c9b59/2.NO_S3.groovy
@@ -5,10 +5,5 @@
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def year = getFieldValue("ENDYEAR");
-def month = getFieldValue("ENDMONTH");
-Console.debug(year);
-Console.debug(month);
-if(year!=null&&month!=null){
- bindField("ENDTIME",(year*100+month));
-}
+bindField("ENDYEAR",GetDefaultValueFunction.currentYear());
+bindField("ENDMONTH",GetDefaultValueFunction.currentMonth());
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/4694be71-c279-4e4d-abe1-95b71a64395d/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/4694be71-c279-4e4d-abe1-95b71a64395d/1.NO_S3.groovy
similarity index 98%
rename from tools/s3_rewriter/output/rewritten/4694be71-c279-4e4d-abe1-95b71a64395d/2.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/4694be71-c279-4e4d-abe1-95b71a64395d/1.NO_S3.groovy
index e06771e..3b57e46 100644
--- a/tools/s3_rewriter/output/rewritten/4694be71-c279-4e4d-abe1-95b71a64395d/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/4694be71-c279-4e4d-abe1-95b71a64395d/1.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 4694be71-c279-4e4d-abe1-95b71a64395d
// template_name: 专业分包合同终止(五建定制)
-// seq : 2
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
//获取选中列的实体
diff --git a/tools/s3_rewriter/output/rewritten/4694be71-c279-4e4d-abe1-95b71a64395d/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/4694be71-c279-4e4d-abe1-95b71a64395d/2.FULL_AUTO.groovy
similarity index 85%
rename from tools/s3_rewriter/output/rewritten/4694be71-c279-4e4d-abe1-95b71a64395d/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/4694be71-c279-4e4d-abe1-95b71a64395d/2.FULL_AUTO.groovy
index 844f761..a29db3e 100644
--- a/tools/s3_rewriter/output/rewritten/4694be71-c279-4e4d-abe1-95b71a64395d/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/4694be71-c279-4e4d-abe1-95b71a64395d/2.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 4694be71-c279-4e4d-abe1-95b71a64395d
// template_name: 专业分包合同终止(五建定制)
-// seq : 1
+// seq : 2
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def list = getFieldValue("ORGIDLIST");
diff --git a/tools/s3_rewriter/output/rewritten/47dec384-ca6e-4991-8ea0-21cf7a983328/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/47dec384-ca6e-4991-8ea0-21cf7a983328/1.NO_S3.groovy
index a20ee03..a4c4660 100644
--- a/tools/s3_rewriter/output/rewritten/47dec384-ca6e-4991-8ea0-21cf7a983328/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/47dec384-ca6e-4991-8ea0-21cf7a983328/1.NO_S3.groovy
@@ -6,8 +6,8 @@
// 处置 : 无 S3 模式,原样进 P4
def idlist = getFieldValue("PROJECTIDS");
def text = "";
-if(idlist!=null && idlist.size()>0){
- for(i in 0..<idlist.size()){
+if(idlist!=null && idlist.size()>0){
+ for(i in 0..0){
+ for(i in 0..0){
list.each{
solvelist.add(it.get_ID());
}
diff --git a/tools/s3_rewriter/output/rewritten/4ea83ef3-2c84-4525-a792-7a7097e4037d/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/4ea83ef3-2c84-4525-a792-7a7097e4037d/5.FULL_AUTO.groovy
similarity index 83%
rename from tools/s3_rewriter/output/rewritten/4ea83ef3-2c84-4525-a792-7a7097e4037d/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/4ea83ef3-2c84-4525-a792-7a7097e4037d/5.FULL_AUTO.groovy
index 6c5a3e1..c62f03c 100644
--- a/tools/s3_rewriter/output/rewritten/4ea83ef3-2c84-4525-a792-7a7097e4037d/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/4ea83ef3-2c84-4525-a792-7a7097e4037d/5.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 4ea83ef3-2c84-4525-a792-7a7097e4037d
// template_name: 职称
-// seq : 1
+// seq : 5
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def searchMap=[:];
diff --git a/tools/s3_rewriter/output/rewritten/4ea90eab-86e5-4956-9dca-8fdc83fd8ff8/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/4ea90eab-86e5-4956-9dca-8fdc83fd8ff8/1.FULL_AUTO.groovy
similarity index 94%
rename from tools/s3_rewriter/output/rewritten/4ea90eab-86e5-4956-9dca-8fdc83fd8ff8/2.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/4ea90eab-86e5-4956-9dca-8fdc83fd8ff8/1.FULL_AUTO.groovy
index ce21003..2846f92 100644
--- a/tools/s3_rewriter/output/rewritten/4ea90eab-86e5-4956-9dca-8fdc83fd8ff8/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/4ea90eab-86e5-4956-9dca-8fdc83fd8ff8/1.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 4ea90eab-86e5-4956-9dca-8fdc83fd8ff8
// template_name: 项目月完成工作量
-// seq : 2
+// seq : 1
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
@@ -22,7 +22,7 @@ clearFieldData("YEAR");
//绑定前后当前年份,前后五年
def lastYear = year - 5;
def nextYear = year + 6;
-for(i in lastYear..<nextYear){
+for(i in lastYear.. 0){
list.each{
def groupId = it?.get_Value("USERGROUPID");
list1.add(groupId);
diff --git a/tools/s3_rewriter/output/rewritten/52f17756-7652-43dc-aaba-206da85c44da/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/52f17756-7652-43dc-aaba-206da85c44da/1.FULL_AUTO.groovy
index 037f515..97e987f 100644
--- a/tools/s3_rewriter/output/rewritten/52f17756-7652-43dc-aaba-206da85c44da/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/52f17756-7652-43dc-aaba-206da85c44da/1.FULL_AUTO.groovy
@@ -24,8 +24,8 @@ addFieldOption("ROLEID", 0, "项目经理");
//绑其他项目角色
def roleList = GetServicesFunction.listSelectResult(["SYS_ENUMERATETYPE_ID":'PM_PROJECTMANAGERROLE',"POJOCRUDService.ORDER":'order by P.ORDERASC ASC'],"SYS_ENUMERATE");
-if(roleList!=null && roleList.size()>0){
- for(i in 0..<roleList.size()){
+if(roleList!=null && roleList.size()>0){
+ for(i in 0.. 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a ";
sql += " left outer join PM_MACHINECONTRACTREGISTERCONFIG b on a.codevalue = b.rateitem and MACHINECONTRACTREGISTERID = '"+PM_MACHINECONTRACTREGISTER_ID+"'";
sql += " left outer join (";
sql += " select count(rateitem) AS rowcount,MACHINECONTRACTREGISTERID from PM_MACHINECONTRACTREGISTERCONFIG where MACHINECONTRACTREGISTERID = '"+PM_MACHINECONTRACTREGISTER_ID+"'";
@@ -29,8 +29,8 @@ bindField("A_PART",GetDefaultValueFunction.getConfigValue("com.dsasp.server.orga
def list = GetServicesFunction.listSelectResultBySql(map,"PM_MACHINECONTRACTREGISTERCONFIG",sql,returnCol);
- if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
+ if(list!=null && list.size()>0){
+ for(i in 0.. 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a ";
sql += " left outer join PM_MATERIALCONTRACTREGISTERCONFIG b on a.codevalue = b.rateitem and MATERIALCONTRACTREGISTERID = '"+PM_MATERIALCONTRACTREGISTER_ID+"'";
sql += " left outer join (";
sql += " select count(rateitem) AS rowcount,MATERIALCONTRACTREGISTERID from PM_MATERIALCONTRACTREGISTERCONFIG where MATERIALCONTRACTREGISTERID = '"+PM_MATERIALCONTRACTREGISTER_ID+"'";
@@ -28,8 +28,8 @@ bindField("FIRSTPARTY",GetDefaultValueFunction.getConfigValue("com.dsasp.server.
def list = GetServicesFunction.listSelectResultBySql(map,"PM_MATERIALCONTRACTREGISTERCONFIG",sql,returnCol);
- if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
+ if(list!=null && list.size()>0){
+ for(i in 0..0){
meterialDetails?.each{
- if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
+ if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
summoney = summoney.add(new BigDecimal(it.get('TOTAL')))
}
}
diff --git a/tools/s3_rewriter/output/rewritten/58684bbb-59e9-4a83-9788-ec91d15ec0e8/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/58684bbb-59e9-4a83-9788-ec91d15ec0e8/2.HARD.groovy
index 1d0c922..20721a1 100644
--- a/tools/s3_rewriter/output/rewritten/58684bbb-59e9-4a83-9788-ec91d15ec0e8/2.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/58684bbb-59e9-4a83-9788-ec91d15ec0e8/2.HARD.groovy
@@ -31,9 +31,9 @@ button.addClickListener(new Button.ClickListener() {
public void buttonClick(Button.ClickEvent event) {
def meterialDetails = getFieldValue("MATERIALDETAILS");
def summoney = new BigDecimal("0");;
- if(meterialDetails != null && meterialDetails.size()>0){
+ if(meterialDetails != null && meterialDetails.size()>0){
meterialDetails?.each{
- if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
+ if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
summoney = summoney.add(new BigDecimal(it.get('TOTAL')))
}
}
diff --git a/tools/s3_rewriter/output/rewritten/58684bbb-59e9-4a83-9788-ec91d15ec0e8/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/58684bbb-59e9-4a83-9788-ec91d15ec0e8/3.NO_S3.groovy
similarity index 95%
rename from tools/s3_rewriter/output/rewritten/58684bbb-59e9-4a83-9788-ec91d15ec0e8/1.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/58684bbb-59e9-4a83-9788-ec91d15ec0e8/3.NO_S3.groovy
index 07ec4dc..0c03400 100644
--- a/tools/s3_rewriter/output/rewritten/58684bbb-59e9-4a83-9788-ec91d15ec0e8/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/58684bbb-59e9-4a83-9788-ec91d15ec0e8/3.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 58684bbb-59e9-4a83-9788-ec91d15ec0e8
// template_name: 物资合同登记-不需要评审
-// seq : 1
+// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
if(item["PUTONRECORD"] == "是"){
diff --git a/tools/s3_rewriter/output/rewritten/590bcbf9-9b17-4be6-8b2c-adf04e7e24b3/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/590bcbf9-9b17-4be6-8b2c-adf04e7e24b3/1.NO_S3.groovy
similarity index 90%
rename from tools/s3_rewriter/output/rewritten/590bcbf9-9b17-4be6-8b2c-adf04e7e24b3/2.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/590bcbf9-9b17-4be6-8b2c-adf04e7e24b3/1.NO_S3.groovy
index d9b5e3b..fea8322 100644
--- a/tools/s3_rewriter/output/rewritten/590bcbf9-9b17-4be6-8b2c-adf04e7e24b3/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/590bcbf9-9b17-4be6-8b2c-adf04e7e24b3/1.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 590bcbf9-9b17-4be6-8b2c-adf04e7e24b3
// template_name: 物资采购订单(土建-查看全部)
-// seq : 2
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
page.setDataFilter(["PM_MATERIALPURCHASEORDERS_TJ_ID":PM_MATERIALPURCHASEORDERS_TJ_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
diff --git a/tools/s3_rewriter/output/rewritten/590bcbf9-9b17-4be6-8b2c-adf04e7e24b3/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/590bcbf9-9b17-4be6-8b2c-adf04e7e24b3/2.FULL_AUTO.groovy
similarity index 89%
rename from tools/s3_rewriter/output/rewritten/590bcbf9-9b17-4be6-8b2c-adf04e7e24b3/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/590bcbf9-9b17-4be6-8b2c-adf04e7e24b3/2.FULL_AUTO.groovy
index fef9e48..ab3da91 100644
--- a/tools/s3_rewriter/output/rewritten/590bcbf9-9b17-4be6-8b2c-adf04e7e24b3/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/590bcbf9-9b17-4be6-8b2c-adf04e7e24b3/2.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 590bcbf9-9b17-4be6-8b2c-adf04e7e24b3
// template_name: 物资采购订单(土建-查看全部)
-// seq : 1
+// seq : 2
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
//setFieldCaption("ISPREPARATION", "公司备料");
diff --git a/tools/s3_rewriter/output/rewritten/5a51c93c-a758-413a-b174-63b3ba05efaa/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/5a51c93c-a758-413a-b174-63b3ba05efaa/1.HARD.groovy
index 000978e..8f4855c 100644
--- a/tools/s3_rewriter/output/rewritten/5a51c93c-a758-413a-b174-63b3ba05efaa/1.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/5a51c93c-a758-413a-b174-63b3ba05efaa/1.HARD.groovy
@@ -11,7 +11,7 @@ import com.vaadin.ui.Button.ClickListener;
import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.data.Property.ValueChangeEvent;
import com.dsasp.client.viewframework.listener.ConfirmDialogListener;
-def reads = group.getField("UNDERTAKES");
+def reads = group.getField("READS");
final Button cb = new Button("催办");
final Object table = reads?.table;
table?.setImmediate(true);
@@ -21,16 +21,16 @@ cb?.addClickListener(new ClickListener() {
Object o = table?.getValue();
if (o == null)
return;
- final id = o?.getField("VIEW_OA_UNDERTAKETOME_ID")?.getValue();
- final pojo = GetServicesFunction.loadPOJO(id,"VIEW_OA_UNDERTAKETOME",true);
+ final id = o?.getField("VIEW_OA_FILETOME_ID")?.getValue();
+ final pojo = GetServicesFunction.loadPOJO(id,"VIEW_OA_FILETOME",true);
def user = GetServicesFunction.loadPOJO(pojo?.get_Value("RECEIVER"),"SYS_USER",true)?.get_Value("NAME");
showConfirmDialog("确定要对" + user + "进行催办吗?",new ConfirmDialogListener(){
public void yes(){
def message = [:];
- message.put("title", "收到新的承办催办");
+ message.put("title", "收到新的阅读催办");
message.put("file", "文件名称:" + pojo?.get_Value("FILENAME")); //文件名
message.put("user", pojo?.get_Value("RECEIVER")); //接收人
- message.put("type", 6); //阅读消息
+ message.put("type", 7); //阅读消息
message.put("id", id); //uuid
/*
if ("收文".equals(pojo?.get_Value("FILECLASS"))) //标记
@@ -48,14 +48,14 @@ cb?.addClickListener(new ClickListener() {
table?.addValueChangeListener(new ValueChangeListener() {
public void valueChange(Property.ValueChangeEvent event) {
Object o = table?.getValue();
- final id = o?.getField("VIEW_OA_UNDERTAKETOME_ID")?.getValue();
- final pojo = GetServicesFunction.loadPOJO(id,"VIEW_OA_UNDERTAKETOME",true);
- if (o == null || pojo.get_Value("ISFINISH") == 1)
+ final id = o?.getField("VIEW_OA_FILETOME_ID")?.getValue();
+ final pojo = GetServicesFunction.loadPOJO(id,"VIEW_OA_FILETOME",true);
+ if (o == null || pojo.get_Value("ISREAD") == 1)
cb.setEnabled(false);
else
cb.setEnabled(true);
- }
+ }
});
cb?.setEnabled(false);
-reads?.addButton(cb, 1);
+reads.addButton(cb, 1);
diff --git a/tools/s3_rewriter/output/rewritten/5a51c93c-a758-413a-b174-63b3ba05efaa/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/5a51c93c-a758-413a-b174-63b3ba05efaa/2.HARD.groovy
index 1bdfd5e..2185ab7 100644
--- a/tools/s3_rewriter/output/rewritten/5a51c93c-a758-413a-b174-63b3ba05efaa/2.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/5a51c93c-a758-413a-b174-63b3ba05efaa/2.HARD.groovy
@@ -11,7 +11,7 @@ import com.vaadin.ui.Button.ClickListener;
import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.data.Property.ValueChangeEvent;
import com.dsasp.client.viewframework.listener.ConfirmDialogListener;
-def reads = group.getField("READS");
+def reads = group.getField("UNDERTAKES");
final Button cb = new Button("催办");
final Object table = reads?.table;
table?.setImmediate(true);
@@ -21,16 +21,16 @@ cb?.addClickListener(new ClickListener() {
Object o = table?.getValue();
if (o == null)
return;
- final id = o?.getField("VIEW_OA_FILETOME_ID")?.getValue();
- final pojo = GetServicesFunction.loadPOJO(id,"VIEW_OA_FILETOME",true);
+ final id = o?.getField("VIEW_OA_UNDERTAKETOME_ID")?.getValue();
+ final pojo = GetServicesFunction.loadPOJO(id,"VIEW_OA_UNDERTAKETOME",true);
def user = GetServicesFunction.loadPOJO(pojo?.get_Value("RECEIVER"),"SYS_USER",true)?.get_Value("NAME");
showConfirmDialog("确定要对" + user + "进行催办吗?",new ConfirmDialogListener(){
public void yes(){
def message = [:];
- message.put("title", "收到新的阅读催办");
+ message.put("title", "收到新的承办催办");
message.put("file", "文件名称:" + pojo?.get_Value("FILENAME")); //文件名
message.put("user", pojo?.get_Value("RECEIVER")); //接收人
- message.put("type", 7); //阅读消息
+ message.put("type", 6); //阅读消息
message.put("id", id); //uuid
/*
if ("收文".equals(pojo?.get_Value("FILECLASS"))) //标记
@@ -48,14 +48,14 @@ cb?.addClickListener(new ClickListener() {
table?.addValueChangeListener(new ValueChangeListener() {
public void valueChange(Property.ValueChangeEvent event) {
Object o = table?.getValue();
- final id = o?.getField("VIEW_OA_FILETOME_ID")?.getValue();
- final pojo = GetServicesFunction.loadPOJO(id,"VIEW_OA_FILETOME",true);
- if (o == null || pojo.get_Value("ISREAD") == 1)
+ final id = o?.getField("VIEW_OA_UNDERTAKETOME_ID")?.getValue();
+ final pojo = GetServicesFunction.loadPOJO(id,"VIEW_OA_UNDERTAKETOME",true);
+ if (o == null || pojo.get_Value("ISFINISH") == 1)
cb.setEnabled(false);
else
cb.setEnabled(true);
- }
+ }
});
cb?.setEnabled(false);
-reads.addButton(cb, 1);
+reads?.addButton(cb, 1);
diff --git a/tools/s3_rewriter/output/rewritten/5a6f7f3d-a66e-45f4-8036-0e672ee89886/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/5a6f7f3d-a66e-45f4-8036-0e672ee89886/2.NO_S3.groovy
index a0294ca..d921ea1 100644
--- a/tools/s3_rewriter/output/rewritten/5a6f7f3d-a66e-45f4-8036-0e672ee89886/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/5a6f7f3d-a66e-45f4-8036-0e672ee89886/2.NO_S3.groovy
@@ -4,4 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-bindField("ENDDATEVIEW",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("ENDDATE"),"yyyy-MM-dd")));
+bindField("STARTDATEVIEW",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("STARTDATE"),"yyyy-MM-dd")));
diff --git a/tools/s3_rewriter/output/rewritten/5a6f7f3d-a66e-45f4-8036-0e672ee89886/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/5a6f7f3d-a66e-45f4-8036-0e672ee89886/3.NO_S3.groovy
index 45b4782..068977c 100644
--- a/tools/s3_rewriter/output/rewritten/5a6f7f3d-a66e-45f4-8036-0e672ee89886/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/5a6f7f3d-a66e-45f4-8036-0e672ee89886/3.NO_S3.groovy
@@ -4,4 +4,4 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-bindField("STARTDATEVIEW",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("STARTDATE"),"yyyy-MM-dd")));
+bindField("ENDDATEVIEW",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("ENDDATE"),"yyyy-MM-dd")));
diff --git a/tools/s3_rewriter/output/rewritten/5bdb3837-e72c-43df-840b-d2852effdba3/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/5bdb3837-e72c-43df-840b-d2852effdba3/1.NO_S3.groovy
index ffbea11..0bf635c 100644
--- a/tools/s3_rewriter/output/rewritten/5bdb3837-e72c-43df-840b-d2852effdba3/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/5bdb3837-e72c-43df-840b-d2852effdba3/1.NO_S3.groovy
@@ -8,7 +8,7 @@ def id = item['HR_TRAIN_PLAN_ID'];
def countSql = "SELECT COUNT(*) FROM HR_TRAIN_EVAL WHERE TRAINPLAN_ID='"+id+"'";
long num = GetServicesFunction.findCount(countSql);
-if(num > 0 ){//存在评估
+if(num > 0 ){//存在评估
enableButton("添加评估",false);
}else{
enableButton("查看评估",false);
diff --git a/tools/s3_rewriter/output/rewritten/5be37b88-fd93-4070-8060-c5e660372d90/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/5be37b88-fd93-4070-8060-c5e660372d90/1.HARD.groovy
index 2994c4c..61ce803 100644
--- a/tools/s3_rewriter/output/rewritten/5be37b88-fd93-4070-8060-c5e660372d90/1.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/5be37b88-fd93-4070-8060-c5e660372d90/1.HARD.groovy
@@ -5,12 +5,44 @@
// label : HARD
// 硬 S3 原因 : 动态创建 Vaadin 组件
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
+import com.dsasp.client.viewframework.util.TableImportExport;
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("A_PART",GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY"));
+
+//绑定费率项
+def ratelist = [];
+def returnCol = [];
+def PM_SPECIALTYSUBCONTRACTREGISTERCONFIG_ID = null;
+def PM_SPECIALTYSUBCONTRACTREGISTER_ID = null;
+returnCol.add("PM_SPECIALTYSUBCONTRACTREGISTERCONFIG_ID");
+returnCol.add("SPECIALTYSUBCONTRACTREGISTERID");
+returnCol.add("RATEITEM");
+returnCol.add("RATEVALUE");
+
+def sql = "select PM_SPECIALTYSUBCONTRACTREGISTERCONFIG_ID,'"+PM_SPECIALTYSUBCONTRACTREGISTER_ID+"' as SPECIALTYSUBCONTRACTREGISTERID,'' as SPECIALTYSUBCONTRACTREGISTERID_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_SPECIALTYSUBCONTRACTREGISTERCONFIG b on a.codevalue = b.rateitem and SPECIALTYSUBCONTRACTREGISTERID = '"+PM_SPECIALTYSUBCONTRACTREGISTER_ID+"'";
+sql += " left outer join (";
+sql += " select count(rateitem) AS rowcount,SPECIALTYSUBCONTRACTREGISTERID from PM_SPECIALTYSUBCONTRACTREGISTERCONFIG where SPECIALTYSUBCONTRACTREGISTERID = '"+PM_SPECIALTYSUBCONTRACTREGISTER_ID+"'";
+sql += " Group by SPECIALTYSUBCONTRACTREGISTERID) as temp1 on b.SPECIALTYSUBCONTRACTREGISTERID = temp1.SPECIALTYSUBCONTRACTREGISTERID";
+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_SPECIALTYSUBCONTRACTREGISTERCONFIG",sql,returnCol);
+
+if(list!=null && list.size()>0){
+ for(i in 0..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')))
}
}
}
@@ -38,7 +70,6 @@ button.addClickListener(new Button.ClickListener() {
}
});
-
def tie = new TableImportExport(contents,"com.dsasp.pm.specialtycontract.client.ContentsImport");
tie.addImportButton(2);
tie.addExportButton(3);
diff --git a/tools/s3_rewriter/output/rewritten/5be37b88-fd93-4070-8060-c5e660372d90/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/5be37b88-fd93-4070-8060-c5e660372d90/2.HARD.groovy
index 0f75880..d279304 100644
--- a/tools/s3_rewriter/output/rewritten/5be37b88-fd93-4070-8060-c5e660372d90/2.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/5be37b88-fd93-4070-8060-c5e660372d90/2.HARD.groovy
@@ -5,44 +5,12 @@
// label : HARD
// 硬 S3 原因 : 动态创建 Vaadin 组件
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
-import com.dsasp.client.viewframework.util.TableImportExport;
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;
-
-bindField("A_PART",GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY"));
-
-//绑定费率项
-def ratelist = [];
-def returnCol = [];
-def PM_SPECIALTYSUBCONTRACTREGISTERCONFIG_ID = null;
-def PM_SPECIALTYSUBCONTRACTREGISTER_ID = null;
-returnCol.add("PM_SPECIALTYSUBCONTRACTREGISTERCONFIG_ID");
-returnCol.add("SPECIALTYSUBCONTRACTREGISTERID");
-returnCol.add("RATEITEM");
-returnCol.add("RATEVALUE");
-
-def sql = "select PM_SPECIALTYSUBCONTRACTREGISTERCONFIG_ID,'"+PM_SPECIALTYSUBCONTRACTREGISTER_ID+"' as SPECIALTYSUBCONTRACTREGISTERID,'' as SPECIALTYSUBCONTRACTREGISTERID_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_SPECIALTYSUBCONTRACTREGISTERCONFIG b on a.codevalue = b.rateitem and SPECIALTYSUBCONTRACTREGISTERID = '"+PM_SPECIALTYSUBCONTRACTREGISTER_ID+"'";
-sql += " left outer join (";
-sql += " select count(rateitem) AS rowcount,SPECIALTYSUBCONTRACTREGISTERID from PM_SPECIALTYSUBCONTRACTREGISTERCONFIG where SPECIALTYSUBCONTRACTREGISTERID = '"+PM_SPECIALTYSUBCONTRACTREGISTER_ID+"'";
-sql += " Group by SPECIALTYSUBCONTRACTREGISTERID) as temp1 on b.SPECIALTYSUBCONTRACTREGISTERID = temp1.SPECIALTYSUBCONTRACTREGISTERID";
-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_SPECIALTYSUBCONTRACTREGISTERCONFIG",sql,returnCol);
-
-if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
- ratelist.add(list[i].toMap());
- }
-}
-
-bindField("SPECIALTYSUBCONTRACTREGISTERID",ratelist);
-
+import com.dsasp.client.viewframework.util.TableImportExport;
def contents = group.getField("CONTENTS");
final Object table = contents?.table;
@@ -59,10 +27,10 @@ button.addClickListener(new Button.ClickListener() {
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')))
}
}
}
@@ -70,6 +38,7 @@ button.addClickListener(new Button.ClickListener() {
}
});
+
def tie = new TableImportExport(contents,"com.dsasp.pm.specialtycontract.client.ContentsImport");
tie.addImportButton(2);
tie.addExportButton(3);
diff --git a/tools/s3_rewriter/output/rewritten/5c5bf95c-3354-4e49-a421-e63906116228/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/5c5bf95c-3354-4e49-a421-e63906116228/1.NO_S3.groovy
index 12219d9..c2285dd 100644
--- a/tools/s3_rewriter/output/rewritten/5c5bf95c-3354-4e49-a421-e63906116228/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/5c5bf95c-3354-4e49-a421-e63906116228/1.NO_S3.groovy
@@ -4,4 +4,8 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["ID":PM_QUALITYCOMPANYACCEPTANCE_ID]);
\ No newline at end of file
+if(item['REFORM'] != null && item['REFORM'].equals("是")) {
+ enableButton("查看整改情况",true);
+} else {
+ enableButton("查看整改情况",false);
+}
diff --git a/tools/s3_rewriter/output/rewritten/5c5bf95c-3354-4e49-a421-e63906116228/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/5c5bf95c-3354-4e49-a421-e63906116228/2.NO_S3.groovy
index 98a06f7..ba6c6b0 100644
--- a/tools/s3_rewriter/output/rewritten/5c5bf95c-3354-4e49-a421-e63906116228/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/5c5bf95c-3354-4e49-a421-e63906116228/2.NO_S3.groovy
@@ -4,8 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-if(item['REFORM'] != null && item['REFORM'].equals("是")) {
- enableButton("查看整改情况",true);
-} else {
- enableButton("查看整改情况",false);
-}
+page.setDataFilter(["ID":PM_QUALITYCOMPANYACCEPTANCE_ID]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/5e3d26d0-0bda-47aa-afab-7e8dd645d69c/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/5e3d26d0-0bda-47aa-afab-7e8dd645d69c/2.NO_S3.groovy
index 95e6c46..046e1d7 100644
--- a/tools/s3_rewriter/output/rewritten/5e3d26d0-0bda-47aa-afab-7e8dd645d69c/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/5e3d26d0-0bda-47aa-afab-7e8dd645d69c/2.NO_S3.groovy
@@ -4,4 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-bindField("ENDDATEVIEW",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("ENDDATE"),"yyyy-MM-dd")));
\ No newline at end of file
+bindField("STARTDATEVIEW",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("STARTDATE"),"yyyy-MM-dd")));
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/5e3d26d0-0bda-47aa-afab-7e8dd645d69c/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/5e3d26d0-0bda-47aa-afab-7e8dd645d69c/3.NO_S3.groovy
index 100c7e2..cfc8faf 100644
--- a/tools/s3_rewriter/output/rewritten/5e3d26d0-0bda-47aa-afab-7e8dd645d69c/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/5e3d26d0-0bda-47aa-afab-7e8dd645d69c/3.NO_S3.groovy
@@ -4,4 +4,4 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-bindField("STARTDATEVIEW",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("STARTDATE"),"yyyy-MM-dd")));
\ No newline at end of file
+bindField("ENDDATEVIEW",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("ENDDATE"),"yyyy-MM-dd")));
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/5e51a9c3-f252-4231-8db3-d417fd623165/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/5e51a9c3-f252-4231-8db3-d417fd623165/1.NO_S3.groovy
index 697dc82..62a8fba 100644
--- a/tools/s3_rewriter/output/rewritten/5e51a9c3-f252-4231-8db3-d417fd623165/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/5e51a9c3-f252-4231-8db3-d417fd623165/1.NO_S3.groovy
@@ -5,8 +5,10 @@
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-bindField("BEGINYEAR",GetDefaultValueFunction.currentYear());
-bindField("BEGINMONTH",GetDefaultValueFunction.currentMonth());
+def year = getFieldValue("BEGINYEAR");
+def month = getFieldValue("BEGINMONTH");
-bindField("ENDYEAR",GetDefaultValueFunction.currentYear());
-bindField("ENDMONTH",GetDefaultValueFunction.currentMonth());
\ No newline at end of file
+if(year!=null&&month!=null){
+
+ bindField("BEGINTIME",(year*100+month));
+}
diff --git a/tools/s3_rewriter/output/rewritten/5e51a9c3-f252-4231-8db3-d417fd623165/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/5e51a9c3-f252-4231-8db3-d417fd623165/2.NO_S3.groovy
index dbdcfd7..9c24da4 100644
--- a/tools/s3_rewriter/output/rewritten/5e51a9c3-f252-4231-8db3-d417fd623165/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/5e51a9c3-f252-4231-8db3-d417fd623165/2.NO_S3.groovy
@@ -5,10 +5,10 @@
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def year = getFieldValue("BEGINYEAR");
-def month = getFieldValue("BEGINMONTH");
-
-if(year!=null&&month!=null){
-
- bindField("BEGINTIME",(year*100+month));
+def year = getFieldValue("ENDYEAR");
+def month = getFieldValue("ENDMONTH");
+Console.debug(year);
+Console.debug(month);
+if(year!=null&&month!=null){
+ bindField("ENDTIME",(year*100+month));
}
diff --git a/tools/s3_rewriter/output/rewritten/5e51a9c3-f252-4231-8db3-d417fd623165/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/5e51a9c3-f252-4231-8db3-d417fd623165/3.NO_S3.groovy
index de48ae3..87d90ff 100644
--- a/tools/s3_rewriter/output/rewritten/5e51a9c3-f252-4231-8db3-d417fd623165/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/5e51a9c3-f252-4231-8db3-d417fd623165/3.NO_S3.groovy
@@ -5,10 +5,8 @@
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def year = getFieldValue("ENDYEAR");
-def month = getFieldValue("ENDMONTH");
-Console.debug(year);
-Console.debug(month);
-if(year!=null&&month!=null){
- bindField("ENDTIME",(year*100+month));
-}
+bindField("BEGINYEAR",GetDefaultValueFunction.currentYear());
+bindField("BEGINMONTH",GetDefaultValueFunction.currentMonth());
+
+bindField("ENDYEAR",GetDefaultValueFunction.currentYear());
+bindField("ENDMONTH",GetDefaultValueFunction.currentMonth());
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/1.NO_S3.groovy
index 293e5e9..2d018d6 100644
--- a/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/1.NO_S3.groovy
@@ -5,7 +5,7 @@
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
def ordersStatus = GetServicesFunction.getEnumerateItemValue("WFSTATUS",item['STATUS']);
-if(ordersStatus == 3 && item['ISREGISTER'] =="否"){
+if(ordersStatus == 3 && item['ISREGISTER'] =="否"){
enableButton("作废",true);
}else if(ordersStatus == 6){
enableButton("作废",false);
diff --git a/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/5.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/2.NO_S3.groovy
similarity index 86%
rename from tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/5.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/2.NO_S3.groovy
index 53fe098..af0d084 100644
--- a/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/5.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/2.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 5e618173-2ee1-406b-9829-28c58871316e
// template_name: 专业分包合同评审(五建定制)
-// seq : 5
+// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
page.setDataFilter(["PM_SPECIALTYSUBCONTRACTREVIEW_ID":PM_SPECIALTYSUBCONTRACTREVIEW_ID]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/3.HARD.groovy b/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/3.HARD.groovy
index 3ba25ea..092e995 100644
--- a/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/3.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/3.HARD.groovy
@@ -26,7 +26,7 @@ returnCol.add("RATEITEM");
returnCol.add("RATEVALUE");
def sql = "select PM_SPECIALTYSUBCONTRACTVIEWCONFIG_ID,'"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"' as SPECIALTYSUBCONTRACTVIEWID,'' as SPECIALTYSUBCONTRACTVIEWID_DISPLAY__,codevalue as rateitem,";
-sql += " case when rowcount > 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a ";
+sql += " case when rowcount > 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a ";
sql += " left outer join PM_SPECIALTYSUBCONTRACTVIEWCONFIG b on a.codevalue = b.rateitem and SPECIALTYSUBCONTRACTVIEWID = '"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"'";
sql += " left outer join (";
sql += " select count(rateitem) AS rowcount,SPECIALTYSUBCONTRACTVIEWID from PM_SPECIALTYSUBCONTRACTVIEWCONFIG where SPECIALTYSUBCONTRACTVIEWID = '"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"'";
@@ -36,8 +36,8 @@ sql += " where sys_enumeratetype_id = 'SUBCONTRACT_BASICSCONFIG'";
def list = GetServicesFunction.listSelectResultBySql(map,"PM_SPECIALTYSUBCONTRACTVIEWCONFIG",sql,returnCol);
-if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
+if(list!=null && list.size()>0){
+ for(i in 0..0){
balancedetails?.each{
- if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
diff --git a/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/4.HARD.groovy
similarity index 94%
rename from tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/2.HARD.groovy
rename to tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/4.HARD.groovy
index 99f013b..6509b86 100644
--- a/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/2.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/4.HARD.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 5e618173-2ee1-406b-9829-28c58871316e
// template_name: 专业分包合同评审(五建定制)
-// seq : 2
+// seq : 4
// label : HARD
// 硬 S3 原因 : 动态创建 Vaadin 组件
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
@@ -25,9 +25,9 @@ button.addClickListener(new Button.ClickListener() {
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') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
diff --git a/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/4.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/5.FULL_AUTO.groovy
similarity index 85%
rename from tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/4.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/5.FULL_AUTO.groovy
index 8b035c3..aa7c5bb 100644
--- a/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/4.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/5.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 5e618173-2ee1-406b-9829-28c58871316e
// template_name: 专业分包合同评审(五建定制)
-// seq : 4
+// seq : 5
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def list = getFieldValue("ORGIDLIST");
diff --git a/tools/s3_rewriter/output/rewritten/5f442be1-5e97-437f-8de2-c7a383fc17cf/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/5f442be1-5e97-437f-8de2-c7a383fc17cf/1.NO_S3.groovy
index 3afb8b5..a4a5e45 100644
--- a/tools/s3_rewriter/output/rewritten/5f442be1-5e97-437f-8de2-c7a383fc17cf/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/5f442be1-5e97-437f-8de2-c7a383fc17cf/1.NO_S3.groovy
@@ -4,16 +4,14 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["MATERIALREPOSITORYID":PM_MATERIALREPOSITORY_ID]);
-page.setReceiveMap(["MATERIALREPOSITORYID":PM_MATERIALREPOSITORY_ID]);
-def id = PM_MATERIALREPOSITORY_ID +"GYSBJ";
+page.setDataFilter(["MATERIALREPOSITORY":PM_MATERIALREPOSITORY_ID]);
+def id = PM_MATERIALREPOSITORY_ID +"LSCJJ";
page.setId(id);
def po = GetServicesFunction.loadPOJO(PM_MATERIALREPOSITORY_ID,"PM_MATERIALREPOSITORY",false);
-
if(po != null){
- def title = po.get_EntityDisplayName() + "-供应商报价";
+ def title = po.get_EntityDisplayName() + "-历史成交价";
page.setCaption(title);
}else{
- page.setCaption('供应商报价');
+ page.setCaption('历史成交价');
}
diff --git a/tools/s3_rewriter/output/rewritten/5f442be1-5e97-437f-8de2-c7a383fc17cf/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/5f442be1-5e97-437f-8de2-c7a383fc17cf/2.NO_S3.groovy
index 91e6e50..94fbcaa 100644
--- a/tools/s3_rewriter/output/rewritten/5f442be1-5e97-437f-8de2-c7a383fc17cf/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/5f442be1-5e97-437f-8de2-c7a383fc17cf/2.NO_S3.groovy
@@ -4,14 +4,16 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["MATERIALREPOSITORY":PM_MATERIALREPOSITORY_ID]);
-def id = PM_MATERIALREPOSITORY_ID +"LSCJJ";
+page.setDataFilter(["MATERIALREPOSITORYID":PM_MATERIALREPOSITORY_ID]);
+page.setReceiveMap(["MATERIALREPOSITORYID":PM_MATERIALREPOSITORY_ID]);
+def id = PM_MATERIALREPOSITORY_ID +"GYSBJ";
page.setId(id);
def po = GetServicesFunction.loadPOJO(PM_MATERIALREPOSITORY_ID,"PM_MATERIALREPOSITORY",false);
+
if(po != null){
- def title = po.get_EntityDisplayName() + "-历史成交价";
+ def title = po.get_EntityDisplayName() + "-供应商报价";
page.setCaption(title);
}else{
- page.setCaption('历史成交价');
+ page.setCaption('供应商报价');
}
diff --git a/tools/s3_rewriter/output/rewritten/612b61ad-95e4-4575-a50f-c16f65a04829/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/612b61ad-95e4-4575-a50f-c16f65a04829/1.NO_S3.groovy
new file mode 100644
index 0000000..deec1ff
--- /dev/null
+++ b/tools/s3_rewriter/output/rewritten/612b61ad-95e4-4575-a50f-c16f65a04829/1.NO_S3.groovy
@@ -0,0 +1,18 @@
+// === EIP4 P4 脚本迁移产出 ===
+// template_id : 612b61ad-95e4-4575-a50f-c16f65a04829
+// template_name: 安全隐患整改通知单(五建定制)
+// seq : 1
+// label : NO_S3
+// 处置 : 无 S3 模式,原样进 P4
+def po = GetServicesFunction.loadPOJO(item["PM_PUB_SAFETYRECTIFICATION_ID"],"PM_PUB_SAFETYRECTIFICATION",false);
+if(po != null){
+ if(po?.get_Value("ISSAFE")==0){
+ enableButton("修改",false);
+ enableButton("删除",false);
+ enableButton("提交审批",false);
+ }
+}else{
+ enableButton("修改",false);
+ enableButton("删除",false);
+ enableButton("提交审批",false);
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/612b61ad-95e4-4575-a50f-c16f65a04829/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/612b61ad-95e4-4575-a50f-c16f65a04829/2.NO_S3.groovy
index 8ca27b7..6612f1b 100644
--- a/tools/s3_rewriter/output/rewritten/612b61ad-95e4-4575-a50f-c16f65a04829/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/612b61ad-95e4-4575-a50f-c16f65a04829/2.NO_S3.groovy
@@ -4,15 +4,5 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def po = GetServicesFunction.loadPOJO(item["PM_PUB_SAFETYRECTIFICATION_ID"],"PM_PUB_SAFETYRECTIFICATION",false);
-if(po != null){
- if(po?.get_Value("ISSAFE")==0){
- enableButton("修改",false);
- enableButton("删除",false);
- enableButton("提交审批",false);
- }
-}else{
- enableButton("修改",false);
- enableButton("删除",false);
- enableButton("提交审批",false);
-}
\ No newline at end of file
+page.setDataFilter(["PM_PUB_SAFETYRECTIFICATION_ID":PM_PUB_SAFETYRECTIFICATION_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
+page.noSearch(false);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/612b61ad-95e4-4575-a50f-c16f65a04829/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/612b61ad-95e4-4575-a50f-c16f65a04829/4.FULL_AUTO.groovy
similarity index 85%
rename from tools/s3_rewriter/output/rewritten/612b61ad-95e4-4575-a50f-c16f65a04829/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/612b61ad-95e4-4575-a50f-c16f65a04829/4.FULL_AUTO.groovy
index 714b0c6..6470ed0 100644
--- a/tools/s3_rewriter/output/rewritten/612b61ad-95e4-4575-a50f-c16f65a04829/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/612b61ad-95e4-4575-a50f-c16f65a04829/4.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 612b61ad-95e4-4575-a50f-c16f65a04829
// template_name: 安全隐患整改通知单(五建定制)
-// seq : 1
+// seq : 4
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def list = getFieldValue("ORGIDLIST");
diff --git a/tools/s3_rewriter/output/rewritten/612b61ad-95e4-4575-a50f-c16f65a04829/4.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/612b61ad-95e4-4575-a50f-c16f65a04829/4.NO_S3.groovy
deleted file mode 100644
index 7c52848..0000000
--- a/tools/s3_rewriter/output/rewritten/612b61ad-95e4-4575-a50f-c16f65a04829/4.NO_S3.groovy
+++ /dev/null
@@ -1,8 +0,0 @@
-// === EIP4 P4 脚本迁移产出 ===
-// template_id : 612b61ad-95e4-4575-a50f-c16f65a04829
-// template_name: 安全隐患整改通知单(五建定制)
-// seq : 4
-// label : NO_S3
-// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["PM_PUB_SAFETYRECTIFICATION_ID":PM_PUB_SAFETYRECTIFICATION_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
-page.noSearch(false);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/62336698-73a0-45cf-b774-91eb5ea61f38/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/62336698-73a0-45cf-b774-91eb5ea61f38/1.NO_S3.groovy
index 7388c47..574b405 100644
--- a/tools/s3_rewriter/output/rewritten/62336698-73a0-45cf-b774-91eb5ea61f38/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/62336698-73a0-45cf-b774-91eb5ea61f38/1.NO_S3.groovy
@@ -4,9 +4,15 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-import com.dsasp.server.common.util.EnviromentGet;
-def businesskey = getFieldValue("LAWTYPE");
-def subMap=[:];
-subMap["LAWTYPE"] = businesskey;
-def newformno = EnviromentGet.get(EnviromentGet.AUTOGENERATECODE,"PM_LAWMANAGEMENT","FORMNO",subMap);
-bindField("FORMNO",newformno);
\ No newline at end of file
+def id = getFieldValue("PM_LAWMANAGEMENT_ID");
+bindField("LAWID",id);
+bindField("REMARK",null);
+bindField("DOCUMENT",null);
+bindField("DEALTYPE",null);
+bindField("NEXTDEALTIME",null);
+
+def seq = 0;
+def sql = " select * from PM_LAWMANAGEMENT_DETAILS where SEQUENCE_NUMBER is not null and LAWID = '"+id+"' order by SEQUENCE_NUMBER desc";
+def po = GetServicesFunction.listSelectResultBySql([:],"PM_LAWMANAGEMENT_DETAILS",sql,["SEQUENCE_NUMBER"]);
+seq = po?.get(0)?.get_Value("SEQUENCE_NUMBER") ? po?.get(0)?.get_Value("SEQUENCE_NUMBER")+1 : seq+1;
+bindField("SEQUENCE_NUMBER",seq);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/62336698-73a0-45cf-b774-91eb5ea61f38/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/62336698-73a0-45cf-b774-91eb5ea61f38/2.NO_S3.groovy
index 76fc5d9..69c71d4 100644
--- a/tools/s3_rewriter/output/rewritten/62336698-73a0-45cf-b774-91eb5ea61f38/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/62336698-73a0-45cf-b774-91eb5ea61f38/2.NO_S3.groovy
@@ -4,16 +4,9 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-if(item["DEALTYPE"]!=null && item["DEALTYPE"] == "已完结"){
- enableButton("修改",false);
- enableButton("删除",false);
- enableButton("处理情况登记",false);
- enableButton("解锁",true);
- enableButton("付款提醒登记",true);
-}else{
- enableButton("修改",true);
- enableButton("删除",true);
- enableButton("处理情况登记",true);
- enableButton("解锁",false);
- enableButton("付款提醒登记",false);
-}
\ No newline at end of file
+import com.dsasp.server.common.util.EnviromentGet;
+def businesskey = getFieldValue("LAWTYPE");
+def subMap=[:];
+subMap["LAWTYPE"] = businesskey;
+def newformno = EnviromentGet.get(EnviromentGet.AUTOGENERATECODE,"PM_LAWMANAGEMENT","FORMNO",subMap);
+bindField("FORMNO",newformno);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/62336698-73a0-45cf-b774-91eb5ea61f38/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/62336698-73a0-45cf-b774-91eb5ea61f38/3.NO_S3.groovy
index 2b1b741..a302b6a 100644
--- a/tools/s3_rewriter/output/rewritten/62336698-73a0-45cf-b774-91eb5ea61f38/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/62336698-73a0-45cf-b774-91eb5ea61f38/3.NO_S3.groovy
@@ -4,15 +4,16 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def id = getFieldValue("PM_LAWMANAGEMENT_ID");
-bindField("LAWID",id);
-bindField("REMARK",null);
-bindField("DOCUMENT",null);
-bindField("DEALTYPE",null);
-bindField("NEXTDEALTIME",null);
-
-def seq = 0;
-def sql = " select * from PM_LAWMANAGEMENT_DETAILS where SEQUENCE_NUMBER is not null and LAWID = '"+id+"' order by SEQUENCE_NUMBER desc";
-def po = GetServicesFunction.listSelectResultBySql([:],"PM_LAWMANAGEMENT_DETAILS",sql,["SEQUENCE_NUMBER"]);
-seq = po?.get(0)?.get_Value("SEQUENCE_NUMBER") ? po?.get(0)?.get_Value("SEQUENCE_NUMBER")+1 : seq+1;
-bindField("SEQUENCE_NUMBER",seq);
\ No newline at end of file
+if(item["DEALTYPE"]!=null && item["DEALTYPE"] == "已完结"){
+ enableButton("修改",false);
+ enableButton("删除",false);
+ enableButton("处理情况登记",false);
+ enableButton("解锁",true);
+ enableButton("付款提醒登记",true);
+}else{
+ enableButton("修改",true);
+ enableButton("删除",true);
+ enableButton("处理情况登记",true);
+ enableButton("解锁",false);
+ enableButton("付款提醒登记",false);
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/623fa631-ed8d-47e1-9ec7-762fb4252615/3.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/623fa631-ed8d-47e1-9ec7-762fb4252615/1.FULL_AUTO.groovy
similarity index 89%
rename from tools/s3_rewriter/output/rewritten/623fa631-ed8d-47e1-9ec7-762fb4252615/3.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/623fa631-ed8d-47e1-9ec7-762fb4252615/1.FULL_AUTO.groovy
index e81a24f..3fe33d8 100644
--- a/tools/s3_rewriter/output/rewritten/623fa631-ed8d-47e1-9ec7-762fb4252615/3.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/623fa631-ed8d-47e1-9ec7-762fb4252615/1.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 623fa631-ed8d-47e1-9ec7-762fb4252615
// template_name: 用车申请
-// seq : 3
+// seq : 1
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
import com.dsasp.server.common.dataDic.service.POJOCRUDService;
@@ -20,10 +20,10 @@ if(value != null){
returnColumns.add("BURDEN");
returnColumns.add("VEHICLETYPEID");
searchMap.put(POJOCRUDService.RETURN_COLUMNS_LIST,returnColumns);
- Map<String, Object> resultMap = GetServicesFunction.listSelect(searchMap,"OA_VEHICLEINFORMATION",null);
+ Map resultMap = GetServicesFunction.listSelect(searchMap,"OA_VEHICLEINFORMATION",null);
List list = (List)resultMap.get(POJOCRUDService.LIST_RESULT);
- if(list != null && list.size() > 0){
+ if(list != null && list.size() > 0){
GeneralPOJO _hm = (GeneralPOJO) list.get(0);
def burdenValue = _hm.get_Value("BURDEN");//直接获取字段值
burdenValue = burdenValue == null ? "":burdenValue.toString()
diff --git a/tools/s3_rewriter/output/rewritten/623fa631-ed8d-47e1-9ec7-762fb4252615/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/623fa631-ed8d-47e1-9ec7-762fb4252615/3.NO_S3.groovy
similarity index 97%
rename from tools/s3_rewriter/output/rewritten/623fa631-ed8d-47e1-9ec7-762fb4252615/1.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/623fa631-ed8d-47e1-9ec7-762fb4252615/3.NO_S3.groovy
index 1db9350..c3a16ee 100644
--- a/tools/s3_rewriter/output/rewritten/623fa631-ed8d-47e1-9ec7-762fb4252615/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/623fa631-ed8d-47e1-9ec7-762fb4252615/3.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 623fa631-ed8d-47e1-9ec7-762fb4252615
// template_name: 用车申请
-// seq : 1
+// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
if (item['ALLOCATIONSTATUS'] == '已派车')
diff --git a/tools/s3_rewriter/output/rewritten/629463ae-81e7-4c03-9c6f-943cb0b175e1/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/629463ae-81e7-4c03-9c6f-943cb0b175e1/1.NO_S3.groovy
index fdf684c..70f542a 100644
--- a/tools/s3_rewriter/output/rewritten/629463ae-81e7-4c03-9c6f-943cb0b175e1/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/629463ae-81e7-4c03-9c6f-943cb0b175e1/1.NO_S3.groovy
@@ -4,4 +4,10 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["USERID":SYS_USER_ID]);
\ No newline at end of file
+if(item['STATE']?.equals(GetServicesFunction.getEnumerateItemDes("USERSTATE",4))){
+ enableButton("修改",false)
+ enableButton("设置主岗位",false)
+ enableButton("设置直属领导",false)
+ enableButton("删除",false)
+ enableButton("重置密码",false)
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/629463ae-81e7-4c03-9c6f-943cb0b175e1/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/629463ae-81e7-4c03-9c6f-943cb0b175e1/2.NO_S3.groovy
index eda2fb5..5d9c154 100644
--- a/tools/s3_rewriter/output/rewritten/629463ae-81e7-4c03-9c6f-943cb0b175e1/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/629463ae-81e7-4c03-9c6f-943cb0b175e1/2.NO_S3.groovy
@@ -4,10 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-if(item['STATE']?.equals(GetServicesFunction.getEnumerateItemDes("USERSTATE",4))){
- enableButton("修改",false)
- enableButton("设置主岗位",false)
- enableButton("设置直属领导",false)
- enableButton("删除",false)
- enableButton("重置密码",false)
-}
\ No newline at end of file
+page.setDataFilter(["USERID":SYS_USER_ID]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/64ded1dc-5164-4872-adfb-16340d0d486e/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/64ded1dc-5164-4872-adfb-16340d0d486e/1.NO_S3.groovy
index 64dbe23..ac7ebaf 100644
--- a/tools/s3_rewriter/output/rewritten/64ded1dc-5164-4872-adfb-16340d0d486e/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/64ded1dc-5164-4872-adfb-16340d0d486e/1.NO_S3.groovy
@@ -4,11 +4,4 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-//金额
-def applymoneypara = getFieldValue("TOTALMONEY");
-if(applymoneypara!=null){
- def capital = applymoneypara<0?(0-applymoneypara):applymoneypara;
- bindField("CAPITAL",(applymoneypara<0?"负":"")+GetValueFunction.toChineseMoney(capital));
-}else{
- bindField("CAPITAL",null);
-}
+page.setDataFilter(["ID":PM_CONTRACTUALREGISTERCHANGE_ID]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/64ded1dc-5164-4872-adfb-16340d0d486e/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/64ded1dc-5164-4872-adfb-16340d0d486e/2.NO_S3.groovy
index f103078..c3e2dd0 100644
--- a/tools/s3_rewriter/output/rewritten/64ded1dc-5164-4872-adfb-16340d0d486e/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/64ded1dc-5164-4872-adfb-16340d0d486e/2.NO_S3.groovy
@@ -4,4 +4,11 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["ID":PM_CONTRACTUALREGISTERCHANGE_ID]);
\ No newline at end of file
+//金额
+def applymoneypara = getFieldValue("TOTALMONEY");
+if(applymoneypara!=null){
+ def capital = applymoneypara<0?(0-applymoneypara):applymoneypara;
+ bindField("CAPITAL",(applymoneypara<0?"负":"")+GetValueFunction.toChineseMoney(capital));
+}else{
+ bindField("CAPITAL",null);
+}
diff --git a/tools/s3_rewriter/output/rewritten/6575d326-4a38-4d2b-aa38-6bf28a7ce96a/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/6575d326-4a38-4d2b-aa38-6bf28a7ce96a/1.NO_S3.groovy
index 232cb29..43d5e76 100644
--- a/tools/s3_rewriter/output/rewritten/6575d326-4a38-4d2b-aa38-6bf28a7ce96a/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/6575d326-4a38-4d2b-aa38-6bf28a7ce96a/1.NO_S3.groovy
@@ -5,7 +5,7 @@
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
//只有未提交或重新提交状态才能删除及修改!
-if(item['STATUS'] !=null && item['STATUS'] !="重新提交" && item['STATUS'] !="未提交"){
+if(item['STATUS'] !=null && item['STATUS'] !="重新提交" && item['STATUS'] !="未提交"){
enableButton("删除",false);//删除不可用
enableButton("修改",false);//修改不可用
}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/6575d326-4a38-4d2b-aa38-6bf28a7ce96a/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/6575d326-4a38-4d2b-aa38-6bf28a7ce96a/2.FULL_AUTO.groovy
index b63222a..f97fe3f 100644
--- a/tools/s3_rewriter/output/rewritten/6575d326-4a38-4d2b-aa38-6bf28a7ce96a/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/6575d326-4a38-4d2b-aa38-6bf28a7ce96a/2.FULL_AUTO.groovy
@@ -4,5 +4,12 @@
// seq : 2
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
+def map = [:];
-setFieldValue("SEALTYPE", null);
\ No newline at end of file
+if(getFieldValue("SEALUSEBOUND") != null && getFieldValue("SEALUSEBOUND") != ""){
+ map['SEALUSEBOUND'] = getFieldValue("SEALUSEBOUND");
+}else{
+ map['SEALUSEBOUND'] = "NULL";
+}
+
+setFieldFilter("SEALTYPE", map);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/6575d326-4a38-4d2b-aa38-6bf28a7ce96a/3.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/6575d326-4a38-4d2b-aa38-6bf28a7ce96a/3.FULL_AUTO.groovy
new file mode 100644
index 0000000..93d533e
--- /dev/null
+++ b/tools/s3_rewriter/output/rewritten/6575d326-4a38-4d2b-aa38-6bf28a7ce96a/3.FULL_AUTO.groovy
@@ -0,0 +1,8 @@
+// === EIP4 P4 脚本迁移产出 ===
+// template_id : 6575d326-4a38-4d2b-aa38-6bf28a7ce96a
+// template_name: 印章废止申请
+// seq : 3
+// label : FULL_AUTO
+// 处置 : 全自动改写完成,直接入 P4 转换流水线
+
+setFieldValue("SEALTYPE", null);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/6575d326-4a38-4d2b-aa38-6bf28a7ce96a/4.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/6575d326-4a38-4d2b-aa38-6bf28a7ce96a/4.FULL_AUTO.groovy
deleted file mode 100644
index 366c09b..0000000
--- a/tools/s3_rewriter/output/rewritten/6575d326-4a38-4d2b-aa38-6bf28a7ce96a/4.FULL_AUTO.groovy
+++ /dev/null
@@ -1,15 +0,0 @@
-// === EIP4 P4 脚本迁移产出 ===
-// template_id : 6575d326-4a38-4d2b-aa38-6bf28a7ce96a
-// template_name: 印章废止申请
-// seq : 4
-// label : FULL_AUTO
-// 处置 : 全自动改写完成,直接入 P4 转换流水线
-def map = [:];
-
-if(getFieldValue("SEALUSEBOUND") != null && getFieldValue("SEALUSEBOUND") != ""){
- map['SEALUSEBOUND'] = getFieldValue("SEALUSEBOUND");
-}else{
- map['SEALUSEBOUND'] = "NULL";
-}
-
-setFieldFilter("SEALTYPE", map);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/6575d326-4a38-4d2b-aa38-6bf28a7ce96a/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/6575d326-4a38-4d2b-aa38-6bf28a7ce96a/4.NO_S3.groovy
similarity index 94%
rename from tools/s3_rewriter/output/rewritten/6575d326-4a38-4d2b-aa38-6bf28a7ce96a/3.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/6575d326-4a38-4d2b-aa38-6bf28a7ce96a/4.NO_S3.groovy
index 32dd67a..b1a7ce5 100644
--- a/tools/s3_rewriter/output/rewritten/6575d326-4a38-4d2b-aa38-6bf28a7ce96a/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/6575d326-4a38-4d2b-aa38-6bf28a7ce96a/4.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 6575d326-4a38-4d2b-aa38-6bf28a7ce96a
// template_name: 印章废止申请
-// seq : 3
+// seq : 4
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
page.setDataFilter(["OA_SEALABOLISHAPPLY_ID":OA_SEALABOLISHAPPLY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
diff --git a/tools/s3_rewriter/output/rewritten/6608e0e0-19f6-4897-a781-7010be218d30/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/6608e0e0-19f6-4897-a781-7010be218d30/3.NO_S3.groovy
index afe183d..6555bbb 100644
--- a/tools/s3_rewriter/output/rewritten/6608e0e0-19f6-4897-a781-7010be218d30/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/6608e0e0-19f6-4897-a781-7010be218d30/3.NO_S3.groovy
@@ -4,7 +4,7 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-if(item["DEALTYPE"]!=null && item["DEALTYPE"] == "已完结"){
+if(item["DEALTYPE"]!=null && item["DEALTYPE"] == "已完结"){
enableButton("修改",false);
enableButton("删除",false);
enableButton("处理情况登记",false);
diff --git a/tools/s3_rewriter/output/rewritten/66dafe5b-cd77-4b78-aaea-314ca995478a/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/66dafe5b-cd77-4b78-aaea-314ca995478a/1.NO_S3.groovy
index 3fb973e..3bbd6f6 100644
--- a/tools/s3_rewriter/output/rewritten/66dafe5b-cd77-4b78-aaea-314ca995478a/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/66dafe5b-cd77-4b78-aaea-314ca995478a/1.NO_S3.groovy
@@ -4,14 +4,23 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
+def list = new DateTime[2];
+def time1 = GetDefaultValueFunction.currentDate();
+//def time2 = GetValueFunction.lastDateOfMonth(GetDefaultValueFunction.currentDate());
+list[0]=time1;
+//list[1] = time2;
+bindField("VALIDDATE",list);
+
+
+
def searchMap=[:];
def solvelist=[];
searchMap["SYS_ENUMERATETYPE_ID"] = 'HR_EMPLOYEE_STATUS';
//searchMap["CODEDES"]=["处理中","已派工"];
searchMap["CODEVALUE"]=[1,4,5];
-def list = GetServicesFunction.listSelectResult(searchMap,"SYS_ENUMERATE");
-if(list!=null && list.size()>0){
- list.each{
+def list2 = GetServicesFunction.listSelectResult(searchMap,"SYS_ENUMERATE");
+if(list2!=null && list2.size()>0){
+ list2.each{
solvelist.add(it.get_ID());
}
}
diff --git a/tools/s3_rewriter/output/rewritten/66dafe5b-cd77-4b78-aaea-314ca995478a/3.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/66dafe5b-cd77-4b78-aaea-314ca995478a/2.FULL_AUTO.groovy
similarity index 84%
rename from tools/s3_rewriter/output/rewritten/66dafe5b-cd77-4b78-aaea-314ca995478a/3.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/66dafe5b-cd77-4b78-aaea-314ca995478a/2.FULL_AUTO.groovy
index 3df20dc..c009c60 100644
--- a/tools/s3_rewriter/output/rewritten/66dafe5b-cd77-4b78-aaea-314ca995478a/3.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/66dafe5b-cd77-4b78-aaea-314ca995478a/2.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 66dafe5b-cd77-4b78-aaea-314ca995478a
// template_name: 部版特种作业人员证书
-// seq : 3
+// seq : 2
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def searchMap=[:];
diff --git a/tools/s3_rewriter/output/rewritten/66dafe5b-cd77-4b78-aaea-314ca995478a/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/66dafe5b-cd77-4b78-aaea-314ca995478a/3.NO_S3.groovy
similarity index 50%
rename from tools/s3_rewriter/output/rewritten/66dafe5b-cd77-4b78-aaea-314ca995478a/2.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/66dafe5b-cd77-4b78-aaea-314ca995478a/3.NO_S3.groovy
index d2680e6..0b568cf 100644
--- a/tools/s3_rewriter/output/rewritten/66dafe5b-cd77-4b78-aaea-314ca995478a/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/66dafe5b-cd77-4b78-aaea-314ca995478a/3.NO_S3.groovy
@@ -1,26 +1,17 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 66dafe5b-cd77-4b78-aaea-314ca995478a
// template_name: 部版特种作业人员证书
-// seq : 2
+// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def list = new DateTime[2];
-def time1 = GetDefaultValueFunction.currentDate();
-//def time2 = GetValueFunction.lastDateOfMonth(GetDefaultValueFunction.currentDate());
-list[0]=time1;
-//list[1] = time2;
-bindField("VALIDDATE",list);
-
-
-
def searchMap=[:];
def solvelist=[];
searchMap["SYS_ENUMERATETYPE_ID"] = 'HR_EMPLOYEE_STATUS';
//searchMap["CODEDES"]=["处理中","已派工"];
searchMap["CODEVALUE"]=[1,4,5];
-def list2 = GetServicesFunction.listSelectResult(searchMap,"SYS_ENUMERATE");
-if(list2!=null && list2.size()>0){
- list2.each{
+def list = GetServicesFunction.listSelectResult(searchMap,"SYS_ENUMERATE");
+if(list!=null && list.size()>0){
+ list.each{
solvelist.add(it.get_ID());
}
}
diff --git a/tools/s3_rewriter/output/rewritten/67f976d2-dc64-4e94-96e2-4e5e62944e5f/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/67f976d2-dc64-4e94-96e2-4e5e62944e5f/3.NO_S3.groovy
index 03c9ddd..2f19411 100644
--- a/tools/s3_rewriter/output/rewritten/67f976d2-dc64-4e94-96e2-4e5e62944e5f/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/67f976d2-dc64-4e94-96e2-4e5e62944e5f/3.NO_S3.groovy
@@ -4,7 +4,7 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-if(item["DEALTYPE"]!=null && item["DEALTYPE"] == "已完结"){
+if(item["DEALTYPE"]!=null && item["DEALTYPE"] == "已完结"){
enableButton("修改",false);
enableButton("删除",false);
enableButton("处理情况登记",false);
diff --git a/tools/s3_rewriter/output/rewritten/6822d55e-ee60-4d87-8f11-377488ab748c/4.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/6822d55e-ee60-4d87-8f11-377488ab748c/2.NO_S3.groovy
similarity index 94%
rename from tools/s3_rewriter/output/rewritten/6822d55e-ee60-4d87-8f11-377488ab748c/4.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/6822d55e-ee60-4d87-8f11-377488ab748c/2.NO_S3.groovy
index 6afc608..f7483da 100644
--- a/tools/s3_rewriter/output/rewritten/6822d55e-ee60-4d87-8f11-377488ab748c/4.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/6822d55e-ee60-4d87-8f11-377488ab748c/2.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 6822d55e-ee60-4d87-8f11-377488ab748c
// template_name: 考勤月统计表
-// seq : 4
+// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
def endtime = getFieldValue("ENDDATE");
diff --git a/tools/s3_rewriter/output/rewritten/6822d55e-ee60-4d87-8f11-377488ab748c/3.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/6822d55e-ee60-4d87-8f11-377488ab748c/3.FULL_AUTO.groovy
index 16bf892..cdb33aa 100644
--- a/tools/s3_rewriter/output/rewritten/6822d55e-ee60-4d87-8f11-377488ab748c/3.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/6822d55e-ee60-4d87-8f11-377488ab748c/3.FULL_AUTO.groovy
@@ -4,4 +4,11 @@
// seq : 3
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-bindField("ORGNAME",getFieldDisplay("ORGID"));
\ No newline at end of file
+def userorg = getFieldValue("ORGID");
+if(userorg==null){
+ userorg = "NULL";
+}
+
+def searchMap = [:];
+searchMap.put("USERORGID",userorg );
+setFieldFilter("USERID", searchMap);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/6822d55e-ee60-4d87-8f11-377488ab748c/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/6822d55e-ee60-4d87-8f11-377488ab748c/4.FULL_AUTO.groovy
similarity index 53%
rename from tools/s3_rewriter/output/rewritten/6822d55e-ee60-4d87-8f11-377488ab748c/2.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/6822d55e-ee60-4d87-8f11-377488ab748c/4.FULL_AUTO.groovy
index bbdd383..12b167e 100644
--- a/tools/s3_rewriter/output/rewritten/6822d55e-ee60-4d87-8f11-377488ab748c/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/6822d55e-ee60-4d87-8f11-377488ab748c/4.FULL_AUTO.groovy
@@ -1,14 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 6822d55e-ee60-4d87-8f11-377488ab748c
// template_name: 考勤月统计表
-// seq : 2
+// seq : 4
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-def userorg = getFieldValue("ORGID");
-if(userorg==null){
- userorg = "NULL";
-}
-
-def searchMap = [:];
-searchMap.put("USERORGID",userorg );
-setFieldFilter("USERID", searchMap);
\ No newline at end of file
+bindField("ORGNAME",getFieldDisplay("ORGID"));
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/686100b9-ca14-4c02-b3c5-e86e93894159/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/686100b9-ca14-4c02-b3c5-e86e93894159/1.NO_S3.groovy
index a02fea4..9ac4350 100644
--- a/tools/s3_rewriter/output/rewritten/686100b9-ca14-4c02-b3c5-e86e93894159/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/686100b9-ca14-4c02-b3c5-e86e93894159/1.NO_S3.groovy
@@ -8,7 +8,7 @@
def year = getFieldValue("BEGINYEAR");
def month = getFieldValue("BEGINMONTH");
-if(year!=null&&month!=null){
+if(year!=null&&month!=null){
bindField("BEGINDATE",(year*100+month));
}
diff --git a/tools/s3_rewriter/output/rewritten/686100b9-ca14-4c02-b3c5-e86e93894159/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/686100b9-ca14-4c02-b3c5-e86e93894159/2.NO_S3.groovy
index ec3d618..66c3ad0 100644
--- a/tools/s3_rewriter/output/rewritten/686100b9-ca14-4c02-b3c5-e86e93894159/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/686100b9-ca14-4c02-b3c5-e86e93894159/2.NO_S3.groovy
@@ -8,7 +8,7 @@
def year = getFieldValue("ENDYEAR");
def month = getFieldValue("ENDMONTH");
-if(year!=null&&month!=null){
+if(year!=null&&month!=null){
bindField("ENDDATE",(year*100+month));
}
diff --git a/tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/1.NO_S3.groovy
index e43fe85..6d1f587 100644
--- a/tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/1.NO_S3.groovy
@@ -4,6 +4,10 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def orgid = getFieldValue("DEPARTID");
-bindField("USERID",null);
\ No newline at end of file
+
+def orgid = getFieldValue("ORGID");
+
+bindField("USERID",null);
+
+bindField("DEPARTID",null);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/2.NO_S3.groovy
index 9ef8ace..1c7911d 100644
--- a/tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/2.NO_S3.groovy
@@ -4,10 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-
-
-def orgid = getFieldValue("ORGID");
-
-bindField("USERID",null);
-
-bindField("DEPARTID",null);
\ No newline at end of file
+bindField("STARTDATEVIEW",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("STARTDATE"),"yyyy-MM-dd")));
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/3.NO_S3.groovy
index 73b7bbe..2722824 100644
--- a/tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/3.NO_S3.groovy
@@ -4,4 +4,4 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-bindField("STARTDATEVIEW",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("STARTDATE"),"yyyy-MM-dd")));
\ No newline at end of file
+bindField("ENDDATEVIEW",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("ENDDATE"),"yyyy-MM-dd")));
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/5.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/4.FULL_AUTO.groovy
similarity index 90%
rename from tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/5.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/4.FULL_AUTO.groovy
index 4acce4e..bf72168 100644
--- a/tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/5.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/4.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 693aefa6-861e-4abd-98dc-9b972ad89198
// template_name: 员工考勤统计表
-// seq : 5
+// seq : 4
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def userorg = getFieldValue("ORGID");
diff --git a/tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/4.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/5.NO_S3.groovy
similarity index 59%
rename from tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/4.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/5.NO_S3.groovy
index 4827b70..b980a8f 100644
--- a/tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/4.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/693aefa6-861e-4abd-98dc-9b972ad89198/5.NO_S3.groovy
@@ -1,7 +1,9 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 693aefa6-861e-4abd-98dc-9b972ad89198
// template_name: 员工考勤统计表
-// seq : 4
+// seq : 5
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-bindField("ENDDATEVIEW",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("ENDDATE"),"yyyy-MM-dd")));
\ No newline at end of file
+def orgid = getFieldValue("DEPARTID");
+
+bindField("USERID",null);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/694cd9a3-d159-453a-a81f-c721a17564a0/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/694cd9a3-d159-453a-a81f-c721a17564a0/1.NO_S3.groovy
index 908dee1..045777d 100644
--- a/tools/s3_rewriter/output/rewritten/694cd9a3-d159-453a-a81f-c721a17564a0/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/694cd9a3-d159-453a-a81f-c721a17564a0/1.NO_S3.groovy
@@ -4,26 +4,24 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-//证书ID
-def CARDID=getFieldValue('HR_PARTIALSAFETYMANPERCERTI_ID');
+def list = new DateTime[2];
+def time1 = GetDefaultValueFunction.currentDate();
+//def time2 = GetValueFunction.lastDateOfMonth(GetDefaultValueFunction.currentDate());
+list[0]=time1;
+//list[1] = time2;
+bindField("VALIDDATE",list);
-def con=[];
-con.add("CIRCULATIONDATE");
-con.add("FLOWTYPE");
-con.add("USEPROJECTID");
-con.add("BINDDATE");
-con.add("UNLOCKDATE");
-con.add("CREATEBY");
-con.add("CREATETIME");
-con.add("UPDATETIME");
-def Map=[:];
-def result=[];
-def sql="select CIRCULATIONDATE,FLOWTYPE,USEPROJECTID,BINDDATE,UNLOCKDATE,CREATEBY,CREATETIME,UPDATETIME from HR_CARDCIRCULATION ";
-sql+="where CARDID='"+CARDID+"'";
-def list=GetServicesFunction.listSelectResultBySql(Map,"HR_CARDCIRCULATION",sql,con);
-if(list!=null&&list.size()>0){
- for(i in 0..<list.size()){
- result.add(list[i].toMap());
- }
+
+
+def searchMap=[:];
+def solvelist=[];
+searchMap["SYS_ENUMERATETYPE_ID"] = 'HR_EMPLOYEE_STATUS';
+//searchMap["CODEDES"]=["处理中","已派工"];
+searchMap["CODEVALUE"]=[1,4,5];
+def list2 = GetServicesFunction.listSelectResult(searchMap,"SYS_ENUMERATE");
+if(list2!=null && list2.size()>0){
+ list2.each{
+ solvelist.add(it.get_ID());
}
-bindField("FLOWDETAILS",result);
+}
+bindField("JOBSTATUSS",solvelist);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/694cd9a3-d159-453a-a81f-c721a17564a0/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/694cd9a3-d159-453a-a81f-c721a17564a0/3.NO_S3.groovy
index 8b85943..372fbb8 100644
--- a/tools/s3_rewriter/output/rewritten/694cd9a3-d159-453a-a81f-c721a17564a0/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/694cd9a3-d159-453a-a81f-c721a17564a0/3.NO_S3.groovy
@@ -4,24 +4,44 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def list = new DateTime[2];
-def time1 = GetDefaultValueFunction.currentDate();
-//def time2 = GetValueFunction.lastDateOfMonth(GetDefaultValueFunction.currentDate());
-list[0]=time1;
-//list[1] = time2;
-bindField("VALIDDATE",list);
+if(item["CARDSTATEINT"]=="空闲"){
+ enableButton("绑定项目",true);
+ enableButton("解绑",false);
+ enableButton("变更证书",false);
+ enableButton("锁定",true);
+ enableButton("解锁",false);
+
+ //enableButton("修改",true);
+ //enableButton("删除",true);
+}else if(item["CARDSTATEINT"]=="使用中"){
+ enableButton("绑定项目",false);
+ enableButton("解绑",true);
+ enableButton("变更证书",true);
+ enableButton("锁定",false);
+ enableButton("解锁",false);
+
+ enableButton("修改",false);
+ enableButton("删除",false);
-def searchMap=[:];
-def solvelist=[];
-searchMap["SYS_ENUMERATETYPE_ID"] = 'HR_EMPLOYEE_STATUS';
-//searchMap["CODEDES"]=["处理中","已派工"];
-searchMap["CODEVALUE"]=[1,4,5];
-def list2 = GetServicesFunction.listSelectResult(searchMap,"SYS_ENUMERATE");
-if(list2!=null && list2.size()>0){
- list2.each{
- solvelist.add(it.get_ID());
- }
-}
-bindField("JOBSTATUSS",solvelist);
\ No newline at end of file
+}else if(item["CARDSTATEINT"]=="锁定"){
+ enableButton("绑定项目",false);
+ enableButton("解绑",false);
+ enableButton("变更证书",false);
+ enableButton("锁定",false);
+ enableButton("解锁",true);
+
+ enableButton("修改",false);
+ enableButton("删除",false);
+
+}else if(item["CARDSTATEINT"]=="冻结"){
+ enableButton("绑定项目",false);
+ enableButton("解绑",false);
+ enableButton("变更证书",false);
+ enableButton("锁定",false);
+ enableButton("解锁",false);
+
+ enableButton("修改",false);
+ enableButton("删除",false);
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/694cd9a3-d159-453a-a81f-c721a17564a0/4.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/694cd9a3-d159-453a-a81f-c721a17564a0/4.NO_S3.groovy
index 13df06b..2053714 100644
--- a/tools/s3_rewriter/output/rewritten/694cd9a3-d159-453a-a81f-c721a17564a0/4.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/694cd9a3-d159-453a-a81f-c721a17564a0/4.NO_S3.groovy
@@ -4,44 +4,26 @@
// seq : 4
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
+//证书ID
+def CARDID=getFieldValue('HR_PARTIALSAFETYMANPERCERTI_ID');
-if(item["CARDSTATEINT"]=="空闲"){
- enableButton("绑定项目",true);
- enableButton("解绑",false);
- enableButton("变更证书",false);
- enableButton("锁定",true);
- enableButton("解锁",false);
-
- //enableButton("修改",true);
- //enableButton("删除",true);
-
-}else if(item["CARDSTATEINT"]=="使用中"){
- enableButton("绑定项目",false);
- enableButton("解绑",true);
- enableButton("变更证书",true);
- enableButton("锁定",false);
- enableButton("解锁",false);
-
- enableButton("修改",false);
- enableButton("删除",false);
-
-}else if(item["CARDSTATEINT"]=="锁定"){
- enableButton("绑定项目",false);
- enableButton("解绑",false);
- enableButton("变更证书",false);
- enableButton("锁定",false);
- enableButton("解锁",true);
-
- enableButton("修改",false);
- enableButton("删除",false);
-
-}else if(item["CARDSTATEINT"]=="冻结"){
- enableButton("绑定项目",false);
- enableButton("解绑",false);
- enableButton("变更证书",false);
- enableButton("锁定",false);
- enableButton("解锁",false);
-
- enableButton("修改",false);
- enableButton("删除",false);
-}
\ No newline at end of file
+def con=[];
+con.add("CIRCULATIONDATE");
+con.add("FLOWTYPE");
+con.add("USEPROJECTID");
+con.add("BINDDATE");
+con.add("UNLOCKDATE");
+con.add("CREATEBY");
+con.add("CREATETIME");
+con.add("UPDATETIME");
+def Map=[:];
+def result=[];
+def sql="select CIRCULATIONDATE,FLOWTYPE,USEPROJECTID,BINDDATE,UNLOCKDATE,CREATEBY,CREATETIME,UPDATETIME from HR_CARDCIRCULATION ";
+sql+="where CARDID='"+CARDID+"'";
+def list=GetServicesFunction.listSelectResultBySql(Map,"HR_CARDCIRCULATION",sql,con);
+if(list!=null&&list.size()>0){
+ for(i in 0..0){
+ for(i in 0..项目部质量管理目标、指标及管理方案");
horLayout?.addComponent(label);
horLayout?.setExpandRatio(label, 1.0f);
diff --git a/tools/s3_rewriter/output/rewritten/7262d8fd-932a-4602-8d96-f0005d8c09bd/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/7262d8fd-932a-4602-8d96-f0005d8c09bd/1.NO_S3.groovy
index ac19829..5d099b6 100644
--- a/tools/s3_rewriter/output/rewritten/7262d8fd-932a-4602-8d96-f0005d8c09bd/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/7262d8fd-932a-4602-8d96-f0005d8c09bd/1.NO_S3.groovy
@@ -4,4 +4,19 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["MATERIALNAME":VIEW_PM_MATERIALSUPPLIER_ID]);
\ No newline at end of file
+
+def loadPo = GetServicesFunction.loadPOJO(item["VIEW_PM_MATERIALSUPPLIER_ID"],"PM_MATERIALSUPPLIER",false);
+
+if(loadPo != null){
+ def eligibility = loadPo.get_Value("ELIGIBILITY").toString();
+ //供应商状态(1:待调查;2:未评审;3:评审中;4:合格;5:不合格;6:黑名)
+ if(!"4".equals(eligibility) && !"5".equals(eligibility) && !"6".equals(eligibility)){//"只有状态为“合格”、“不合格”或“黑名”的记录才能复评!"
+ enableButton("复评",false);
+ }
+ if("3".equals(eligibility) || "6".equals(eligibility)){
+ enableButton("加入黑名单",false);
+ }
+}else{
+ enableButton("复评",false);
+ enableButton("加入黑名单",false);
+}
diff --git a/tools/s3_rewriter/output/rewritten/7262d8fd-932a-4602-8d96-f0005d8c09bd/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/7262d8fd-932a-4602-8d96-f0005d8c09bd/2.NO_S3.groovy
index 577ded5..a8ff643 100644
--- a/tools/s3_rewriter/output/rewritten/7262d8fd-932a-4602-8d96-f0005d8c09bd/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/7262d8fd-932a-4602-8d96-f0005d8c09bd/2.NO_S3.groovy
@@ -4,19 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-
-def loadPo = GetServicesFunction.loadPOJO(item["VIEW_PM_MATERIALSUPPLIER_ID"],"PM_MATERIALSUPPLIER",false);
-
-if(loadPo != null){
- def eligibility = loadPo.get_Value("ELIGIBILITY").toString();
- //供应商状态(1:待调查;2:未评审;3:评审中;4:合格;5:不合格;6:黑名)
- if(!"4".equals(eligibility) && !"5".equals(eligibility) && !"6".equals(eligibility)){//"只有状态为“合格”、“不合格”或“黑名”的记录才能复评!"
- enableButton("复评",false);
- }
- if("3".equals(eligibility) || "6".equals(eligibility)){
- enableButton("加入黑名单",false);
- }
-}else{
- enableButton("复评",false);
- enableButton("加入黑名单",false);
-}
+page.setDataFilter(["MATERIALNAME":VIEW_PM_MATERIALSUPPLIER_ID]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/7311c9bf-9920-4368-a9e8-79535b692d0d/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/7311c9bf-9920-4368-a9e8-79535b692d0d/1.NO_S3.groovy
similarity index 95%
rename from tools/s3_rewriter/output/rewritten/7311c9bf-9920-4368-a9e8-79535b692d0d/3.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/7311c9bf-9920-4368-a9e8-79535b692d0d/1.NO_S3.groovy
index 97bc94f..9f34ad5 100644
--- a/tools/s3_rewriter/output/rewritten/7311c9bf-9920-4368-a9e8-79535b692d0d/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/7311c9bf-9920-4368-a9e8-79535b692d0d/1.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 7311c9bf-9920-4368-a9e8-79535b692d0d
// template_name: 履约保证金登记(定制-退款带审批)
-// seq : 3
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
diff --git a/tools/s3_rewriter/output/rewritten/7311c9bf-9920-4368-a9e8-79535b692d0d/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/7311c9bf-9920-4368-a9e8-79535b692d0d/3.FULL_AUTO.groovy
similarity index 95%
rename from tools/s3_rewriter/output/rewritten/7311c9bf-9920-4368-a9e8-79535b692d0d/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/7311c9bf-9920-4368-a9e8-79535b692d0d/3.FULL_AUTO.groovy
index 985f9bf..ad2f7ad 100644
--- a/tools/s3_rewriter/output/rewritten/7311c9bf-9920-4368-a9e8-79535b692d0d/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/7311c9bf-9920-4368-a9e8-79535b692d0d/3.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 7311c9bf-9920-4368-a9e8-79535b692d0d
// template_name: 履约保证金登记(定制-退款带审批)
-// seq : 1
+// seq : 3
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
diff --git a/tools/s3_rewriter/output/rewritten/732d3183-95f1-4c19-bcf6-ce16c53bdc19/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/732d3183-95f1-4c19-bcf6-ce16c53bdc19/1.NO_S3.groovy
index 393ca48..eb4146a 100644
--- a/tools/s3_rewriter/output/rewritten/732d3183-95f1-4c19-bcf6-ce16c53bdc19/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/732d3183-95f1-4c19-bcf6-ce16c53bdc19/1.NO_S3.groovy
@@ -8,7 +8,7 @@ def id = item['HR_RECRUITEVALSCHEME_ID'];
def countSql = "SELECT COUNT(*) FROM HR_RECRUITPLANDETAIL WHERE SCHEME='"+id+"'";
long num = GetServicesFunction.findCount(countSql);
-if(num > 0 ){//方案已被使用
+if(num > 0 ){//方案已被使用
enableButton("修改",false);
enableButton("删除",false);
}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/73603832-7385-4fbd-8fde-cdf0b0d6f08e/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/73603832-7385-4fbd-8fde-cdf0b0d6f08e/1.NO_S3.groovy
index 25eeef4..2194b96 100644
--- a/tools/s3_rewriter/output/rewritten/73603832-7385-4fbd-8fde-cdf0b0d6f08e/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/73603832-7385-4fbd-8fde-cdf0b0d6f08e/1.NO_S3.groovy
@@ -4,4 +4,15 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["PM_CONTRACTACCOUNTS_ID":PM_CONTRACTACCOUNTS_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
\ No newline at end of file
+def ordersStatus = GetServicesFunction.getEnumerateItemValue("WFSTATUS",item['STATUS']);
+
+if(ordersStatus == 3){
+ enableButton("作废",true);
+}else if(ordersStatus == 6){
+ enableButton("作废",false);
+ enableButton("修改",false);
+ enableButton("删除",false);
+ enableButton("提交审批",false);
+}else{
+ enableButton("作废",false);
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/73603832-7385-4fbd-8fde-cdf0b0d6f08e/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/73603832-7385-4fbd-8fde-cdf0b0d6f08e/2.NO_S3.groovy
index ffc6c8a..201528b 100644
--- a/tools/s3_rewriter/output/rewritten/73603832-7385-4fbd-8fde-cdf0b0d6f08e/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/73603832-7385-4fbd-8fde-cdf0b0d6f08e/2.NO_S3.groovy
@@ -4,15 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def ordersStatus = GetServicesFunction.getEnumerateItemValue("WFSTATUS",item['STATUS']);
-
-if(ordersStatus == 3){
- enableButton("作废",true);
-}else if(ordersStatus == 6){
- enableButton("作废",false);
- enableButton("修改",false);
- enableButton("删除",false);
- enableButton("提交审批",false);
-}else{
- enableButton("作废",false);
-}
\ No newline at end of file
+page.setDataFilter(["PM_CONTRACTACCOUNTS_ID":PM_CONTRACTACCOUNTS_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/73cf2dfb-9c03-405f-bfe7-762a57e900ed/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/73cf2dfb-9c03-405f-bfe7-762a57e900ed/1.NO_S3.groovy
index 70c896c..e752774 100644
--- a/tools/s3_rewriter/output/rewritten/73cf2dfb-9c03-405f-bfe7-762a57e900ed/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/73cf2dfb-9c03-405f-bfe7-762a57e900ed/1.NO_S3.groovy
@@ -9,7 +9,7 @@ def loadPo = GetServicesFunction.loadPOJO(item["VIEW_PM_SPECIALTY_SUBPACKAGE_ID"
if(loadPo != null){
def eligibility = loadPo.get_Value("SUBPACKAGE_STATUS").toString();
//供应商状态(1:待调查;2:未评审;3:评审中;4:合格;5:不合格;6:黑名)
- if(!"4".equals(eligibility) && !"5".equals(eligibility) && !"6".equals(eligibility)){//"只有状态为“合格”、“不合格”或“黑名”的记录才能复评!"
+ if(!"4".equals(eligibility) && !"5".equals(eligibility) && !"6".equals(eligibility)){//"只有状态为“合格”、“不合格”或“黑名”的记录才能复评!"
enableButton("复评",false);
}
if("3".equals(eligibility) || "6".equals(eligibility)){
diff --git a/tools/s3_rewriter/output/rewritten/745c9534-c755-4ef5-bc26-8b78a802ec4a/1.PARTIAL.groovy b/tools/s3_rewriter/output/rewritten/745c9534-c755-4ef5-bc26-8b78a802ec4a/1.PARTIAL.groovy
index 3c697d1..b69515d 100644
--- a/tools/s3_rewriter/output/rewritten/745c9534-c755-4ef5-bc26-8b78a802ec4a/1.PARTIAL.groovy
+++ b/tools/s3_rewriter/output/rewritten/745c9534-c755-4ef5-bc26-8b78a802ec4a/1.PARTIAL.groovy
@@ -17,7 +17,7 @@ def currentYear = GetDefaultValueFunction.currentYear();
def startYear = currentYear - 4;
def endYear = currentYear + 11;
-for(i in startYear..<endYear){
+for(i in startYear.. (SELECT enddate FROM PM_MREPORTINTERVAL";
strSql += " WHERE projectid = '" + GetDefaultValueFunction.getCurrentProjectId() + "'";
strSql += " AND PM_MREPORTINTERVAL_ID = '" + strMReportIntervalid + "')";
diff --git a/tools/s3_rewriter/output/rewritten/75c5f614-b927-4d94-bd09-ecac3f2506da/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/75c5f614-b927-4d94-bd09-ecac3f2506da/1.FULL_AUTO.groovy
index 4b38ff5..6d3bf46 100644
--- a/tools/s3_rewriter/output/rewritten/75c5f614-b927-4d94-bd09-ecac3f2506da/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/75c5f614-b927-4d94-bd09-ecac3f2506da/1.FULL_AUTO.groovy
@@ -13,9 +13,9 @@ if(getFieldValue("PARENTID") != null){
def map = new HashMap();
map.put("OA_KNOWLEDGE_FOLDER_ID",parentId);
def resultMap = GetServicesFunction.listSelect(map,"OA_KNOWLEDGE_FOLDER",null);
- List<GeneralPOJO> list = (List<GeneralPOJO>) resultMap
+ List list = (List) resultMap
.get(POJOCRUDService.LIST_RESULT);
- if (list != null && list.size() > 0) {
+ if (list != null && list.size() > 0) {
GeneralPOJO po = list.get(0);
//System.out.println("==============="+po.get_Value("ISSHARE"));
diff --git a/tools/s3_rewriter/output/rewritten/78c9235f-5786-40a6-a484-94d5aee2738f/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/78c9235f-5786-40a6-a484-94d5aee2738f/1.NO_S3.groovy
index f432e61..b609776 100644
--- a/tools/s3_rewriter/output/rewritten/78c9235f-5786-40a6-a484-94d5aee2738f/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/78c9235f-5786-40a6-a484-94d5aee2738f/1.NO_S3.groovy
@@ -4,6 +4,4 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-System.out.println(GetDefaultValueFunction.currentDate());
-System.out.println(GetValueFunction.firstDateOfMonth(GetDefaultValueFunction.currentDate()));
-bindField("STARTDATE",GetValueFunction.firstDateOfMonth(GetDefaultValueFunction.currentDate()));
\ No newline at end of file
+bindField("STARTDATEVIEW",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("STARTDATE"),"yyyy-MM-dd")));
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/78c9235f-5786-40a6-a484-94d5aee2738f/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/78c9235f-5786-40a6-a484-94d5aee2738f/2.NO_S3.groovy
index 98112b1..525a4b6 100644
--- a/tools/s3_rewriter/output/rewritten/78c9235f-5786-40a6-a484-94d5aee2738f/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/78c9235f-5786-40a6-a484-94d5aee2738f/2.NO_S3.groovy
@@ -4,4 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-bindField("STARTDATEVIEW",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("STARTDATE"),"yyyy-MM-dd")));
\ No newline at end of file
+bindField("ENDDATEVIEW",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("ENDDATE"),"yyyy-MM-dd")));
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/78c9235f-5786-40a6-a484-94d5aee2738f/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/78c9235f-5786-40a6-a484-94d5aee2738f/3.NO_S3.groovy
index d7dfc79..773fb9a 100644
--- a/tools/s3_rewriter/output/rewritten/78c9235f-5786-40a6-a484-94d5aee2738f/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/78c9235f-5786-40a6-a484-94d5aee2738f/3.NO_S3.groovy
@@ -4,4 +4,6 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-bindField("ENDDATEVIEW",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("ENDDATE"),"yyyy-MM-dd")));
\ No newline at end of file
+System.out.println(GetDefaultValueFunction.currentDate());
+System.out.println(GetValueFunction.firstDateOfMonth(GetDefaultValueFunction.currentDate()));
+bindField("STARTDATE",GetValueFunction.firstDateOfMonth(GetDefaultValueFunction.currentDate()));
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/78d7a97c-19fe-433c-8781-afdf87e8b128/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/78d7a97c-19fe-433c-8781-afdf87e8b128/1.NO_S3.groovy
similarity index 82%
rename from tools/s3_rewriter/output/rewritten/78d7a97c-19fe-433c-8781-afdf87e8b128/2.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/78d7a97c-19fe-433c-8781-afdf87e8b128/1.NO_S3.groovy
index d16bb6b..ddb74d0 100644
--- a/tools/s3_rewriter/output/rewritten/78d7a97c-19fe-433c-8781-afdf87e8b128/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/78d7a97c-19fe-433c-8781-afdf87e8b128/1.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 78d7a97c-19fe-433c-8781-afdf87e8b128
// template_name: 公告管理
-// seq : 2
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
def po = GetServicesFunction.loadPOJO(item['OA_BULLETINMANAGE_ID'],"OA_BULLETINMANAGE",false);
@@ -14,13 +14,13 @@ if(po != null){
enableButton("隐藏",false);
enableButton("文件归档",false);
}
- if(status == 3 && poMap.get("ISSEND") == 0){
+ if(status == 3 && poMap.get("ISSEND") == 0){
enableButton("发布",true);
}
- if(status == 3 && poMap.get("ISSHOW") == 1){
+ if(status == 3 && poMap.get("ISSHOW") == 1){
enableButton("隐藏",true);
- }else if(status == 3 && poMap.get("ISSHOW") == 0){
+ }else if(status == 3 && poMap.get("ISSHOW") == 0){
enableButton("显示",true);
}
if(status == 3){
diff --git a/tools/s3_rewriter/output/rewritten/78d7a97c-19fe-433c-8781-afdf87e8b128/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/78d7a97c-19fe-433c-8781-afdf87e8b128/2.FULL_AUTO.groovy
similarity index 78%
rename from tools/s3_rewriter/output/rewritten/78d7a97c-19fe-433c-8781-afdf87e8b128/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/78d7a97c-19fe-433c-8781-afdf87e8b128/2.FULL_AUTO.groovy
index e0e6e0b..b07083a 100644
--- a/tools/s3_rewriter/output/rewritten/78d7a97c-19fe-433c-8781-afdf87e8b128/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/78d7a97c-19fe-433c-8781-afdf87e8b128/2.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 78d7a97c-19fe-433c-8781-afdf87e8b128
// template_name: 公告管理
-// seq : 1
+// seq : 2
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
diff --git a/tools/s3_rewriter/output/rewritten/79aec889-3108-4450-9256-aa02aba38b7a/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/79aec889-3108-4450-9256-aa02aba38b7a/1.NO_S3.groovy
index 7e12a4a..e94c8d1 100644
--- a/tools/s3_rewriter/output/rewritten/79aec889-3108-4450-9256-aa02aba38b7a/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/79aec889-3108-4450-9256-aa02aba38b7a/1.NO_S3.groovy
@@ -4,4 +4,8 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["OA_FIXEDASSETS_PURCHASEAPPLY_ID":OA_FIXEDASSETS_PURCHASEAPPLY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
+//只有未提交或重新提交状态才能删除及修改!
+if(item['STATUS'] !=null && item['STATUS'] !="重新提交" && item['STATUS'] !="未提交"){
+ enableButton("删除",false);//删除不可用
+ enableButton("修改",false);//修改不可用
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/79aec889-3108-4450-9256-aa02aba38b7a/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/79aec889-3108-4450-9256-aa02aba38b7a/2.NO_S3.groovy
index eddacbf..eab62c4 100644
--- a/tools/s3_rewriter/output/rewritten/79aec889-3108-4450-9256-aa02aba38b7a/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/79aec889-3108-4450-9256-aa02aba38b7a/2.NO_S3.groovy
@@ -4,8 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-//只有未提交或重新提交状态才能删除及修改!
-if(item['STATUS'] !=null && item['STATUS'] !="重新提交" && item['STATUS'] !="未提交"){
- enableButton("删除",false);//删除不可用
- enableButton("修改",false);//修改不可用
-}
\ No newline at end of file
+page.setDataFilter(["OA_FIXEDASSETS_PURCHASEAPPLY_ID":OA_FIXEDASSETS_PURCHASEAPPLY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
diff --git a/tools/s3_rewriter/output/rewritten/79cbbe9b-3543-41b7-b463-fd6326592362/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/79cbbe9b-3543-41b7-b463-fd6326592362/1.NO_S3.groovy
index 648f60c..ad96ef4 100644
--- a/tools/s3_rewriter/output/rewritten/79cbbe9b-3543-41b7-b463-fd6326592362/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/79cbbe9b-3543-41b7-b463-fd6326592362/1.NO_S3.groovy
@@ -20,8 +20,8 @@ sql+=" from OA_EC_OLENDINGREGISTER a";
sql+=" join OA_EC_OLENDINGREGISTERDETAIL b on a.OA_EC_OLENDINGREGISTER_ID = b.registerid";
sql+=" where b.EC_ID='"+zsid+"'";
def list=GetServicesFunction.listSelectResultBySql(map,"OA_EC_OLENDINGREGISTER",sql,con2);
-if(list!=null&&list.size()>0){
- for(i in 0..<list.size()){
+if(list!=null&&list.size()>0){
+ for(i in 0..0){
list.each{
solvelist.add(it.get_ID());
}
diff --git a/tools/s3_rewriter/output/rewritten/7a2cbfcc-d60b-491a-8992-c3c955a3b027/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/7a2cbfcc-d60b-491a-8992-c3c955a3b027/1.HARD.groovy
index e519dee..432e751 100644
--- a/tools/s3_rewriter/output/rewritten/7a2cbfcc-d60b-491a-8992-c3c955a3b027/1.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/7a2cbfcc-d60b-491a-8992-c3c955a3b027/1.HARD.groovy
@@ -31,7 +31,7 @@ horLayout?.addComponent(fl2);
def label = new Label("年度质量管理目标、指标及管理方案");
//label?.setContentMode(ContentMode.HTML);
//label?.setWidth("100.0%");
-//label?.setValue("<span style='font-size: 13px; font-weight: bolder;'>年度质量管理目标、指标及管理方案</span>");
+//label?.setValue("年度质量管理目标、指标及管理方案");
horLayout?.addComponent(label);
horLayout?.setExpandRatio(label, 1.0f);
diff --git a/tools/s3_rewriter/output/rewritten/7a7c0ce5-7925-4c32-8c66-a68cca93ef9b/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/7a7c0ce5-7925-4c32-8c66-a68cca93ef9b/1.NO_S3.groovy
similarity index 73%
rename from tools/s3_rewriter/output/rewritten/7a7c0ce5-7925-4c32-8c66-a68cca93ef9b/2.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/7a7c0ce5-7925-4c32-8c66-a68cca93ef9b/1.NO_S3.groovy
index 9dd0e61..05c6890 100644
--- a/tools/s3_rewriter/output/rewritten/7a7c0ce5-7925-4c32-8c66-a68cca93ef9b/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/7a7c0ce5-7925-4c32-8c66-a68cca93ef9b/1.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 7a7c0ce5-7925-4c32-8c66-a68cca93ef9b
// template_name: 评标结果公示
-// seq : 2
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
page.setDataFilter(["PROJECTID":PM_PUBLICOFBID_ID]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/7a7c0ce5-7925-4c32-8c66-a68cca93ef9b/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/7a7c0ce5-7925-4c32-8c66-a68cca93ef9b/2.HARD.groovy
similarity index 92%
rename from tools/s3_rewriter/output/rewritten/7a7c0ce5-7925-4c32-8c66-a68cca93ef9b/1.HARD.groovy
rename to tools/s3_rewriter/output/rewritten/7a7c0ce5-7925-4c32-8c66-a68cca93ef9b/2.HARD.groovy
index a93a027..7f907a3 100644
--- a/tools/s3_rewriter/output/rewritten/7a7c0ce5-7925-4c32-8c66-a68cca93ef9b/1.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/7a7c0ce5-7925-4c32-8c66-a68cca93ef9b/2.HARD.groovy
@@ -1,14 +1,14 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 7a7c0ce5-7925-4c32-8c66-a68cca93ef9b
// template_name: 评标结果公示
-// seq : 1
+// seq : 2
// label : HARD
// 硬 S3 原因 : 动态创建 Vaadin 组件
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
//import com.vaadin.ui.Link;
//import com.vaadin.server.ExternalResource;
//def url = group.getField("URL");
-//if(url.getValue()!= null && url?.isReadOnly()){
+//if(url.getValue()!= null && url?.isReadOnly()){
// Link link = new Link(" 原地址 ",
// new ExternalResource(url.getValue()));
// link.setTargetName("_blank")
@@ -20,7 +20,7 @@
////bindField("REPAIRUSERID",GetDefaultValueFunction.getCurrentUserId());
////bindField("REPAIRTIME",GetDefaultValueFunction.currentDate());
//def url1 = group.getField("ZBURL");
-//if(url1.getValue()!= null && url1?.isReadOnly()){
+//if(url1.getValue()!= null && url1?.isReadOnly()){
// Link link = new Link(" 招标公告链接 ",
// new ExternalResource(url1.getValue()));
// link.setTargetName("_blank")
diff --git a/tools/s3_rewriter/output/rewritten/7bcec5d4-1c4a-4cd4-b22f-20ad2c19aaca/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/7bcec5d4-1c4a-4cd4-b22f-20ad2c19aaca/2.NO_S3.groovy
index 1bfbe89..27a9f34 100644
--- a/tools/s3_rewriter/output/rewritten/7bcec5d4-1c4a-4cd4-b22f-20ad2c19aaca/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/7bcec5d4-1c4a-4cd4-b22f-20ad2c19aaca/2.NO_S3.groovy
@@ -4,4 +4,22 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["PM_TURNOVERMATERIALPURCHASEAPPLY_ID":PM_TURNOVERMATERIALPURCHASEAPPLY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
+def isImport = GetServicesFunction.getEnumerateItemValue("YESNO",item['ISIMPORT']);
+def status = GetServicesFunction.getEnumerateItemValue("WFSTATUS",item['STATUS']);
+
+if(status != 3){
+ enableButton("确认进场完毕",false);
+ enableButton("取消进场",false);
+}else{
+ //true:可用;false:不可用
+ switch(isImport){
+ case 0:
+ enableButton("确认进场完毕",true);
+ enableButton("取消进场",false);
+ break;
+ default:
+ enableButton("确认进场完毕",false);
+ enableButton("取消进场",true);
+ break;
+ }
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/7bcec5d4-1c4a-4cd4-b22f-20ad2c19aaca/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/7bcec5d4-1c4a-4cd4-b22f-20ad2c19aaca/3.NO_S3.groovy
index 527d84a..a5f67c1 100644
--- a/tools/s3_rewriter/output/rewritten/7bcec5d4-1c4a-4cd4-b22f-20ad2c19aaca/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/7bcec5d4-1c4a-4cd4-b22f-20ad2c19aaca/3.NO_S3.groovy
@@ -4,22 +4,4 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def isImport = GetServicesFunction.getEnumerateItemValue("YESNO",item['ISIMPORT']);
-def status = GetServicesFunction.getEnumerateItemValue("WFSTATUS",item['STATUS']);
-
-if(status != 3){
- enableButton("确认进场完毕",false);
- enableButton("取消进场",false);
-}else{
- //true:可用;false:不可用
- switch(isImport){
- case 0:
- enableButton("确认进场完毕",true);
- enableButton("取消进场",false);
- break;
- default:
- enableButton("确认进场完毕",false);
- enableButton("取消进场",true);
- break;
- }
-}
\ No newline at end of file
+page.setDataFilter(["PM_TURNOVERMATERIALPURCHASEAPPLY_ID":PM_TURNOVERMATERIALPURCHASEAPPLY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
diff --git a/tools/s3_rewriter/output/rewritten/7c0b30a5-9798-4120-8db3-1be55d18a886/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/7c0b30a5-9798-4120-8db3-1be55d18a886/1.FULL_AUTO.groovy
index 0c5883e..2c7ea44 100644
--- a/tools/s3_rewriter/output/rewritten/7c0b30a5-9798-4120-8db3-1be55d18a886/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/7c0b30a5-9798-4120-8db3-1be55d18a886/1.FULL_AUTO.groovy
@@ -6,7 +6,7 @@
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def map = [:];
-if(getFieldValue("SEALUSEBOUND") != null && getFieldValue("SEALUSEBOUND") != ""){
+if(getFieldValue("SEALUSEBOUND") != null && getFieldValue("SEALUSEBOUND") != ""){
map['SEALUSEBOUND'] = getFieldValue("SEALUSEBOUND");
}else{
map['SEALUSEBOUND'] = "NULL";
diff --git a/tools/s3_rewriter/output/rewritten/7c519a1d-b2a8-406f-b397-e5d866f63ead/4.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/7c519a1d-b2a8-406f-b397-e5d866f63ead/1.FULL_AUTO.groovy
similarity index 88%
rename from tools/s3_rewriter/output/rewritten/7c519a1d-b2a8-406f-b397-e5d866f63ead/4.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/7c519a1d-b2a8-406f-b397-e5d866f63ead/1.FULL_AUTO.groovy
index 76b5042..f210e72 100644
--- a/tools/s3_rewriter/output/rewritten/7c519a1d-b2a8-406f-b397-e5d866f63ead/4.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/7c519a1d-b2a8-406f-b397-e5d866f63ead/1.FULL_AUTO.groovy
@@ -1,17 +1,17 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 7c519a1d-b2a8-406f-b397-e5d866f63ead
// template_name: 个人薪资汇总表
-// seq : 4
+// seq : 1
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-if(getFieldValue("ENDYEAR") == null && getFieldValue("ENDMONTH") == null){
+if(getFieldValue("ENDYEAR") == null && getFieldValue("ENDMONTH") == null){
clearFieldData("STARTYEAR");
def currentYear = GetDefaultValueFunction.currentYear();
def lastYear = currentYear - 7;
def nextYear = currentYear + 8;
- for(i in lastYear..<currentYear){
+ for(i in lastYear.. 0 ){//已经初始化
enableButton("初始化",false);//
enableButton("删除",false);//
}else{
diff --git a/tools/s3_rewriter/output/rewritten/81228b15-8442-48a7-8d3d-2830529d5785/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/81228b15-8442-48a7-8d3d-2830529d5785/1.NO_S3.groovy
index 5147e55..ce0574c 100644
--- a/tools/s3_rewriter/output/rewritten/81228b15-8442-48a7-8d3d-2830529d5785/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/81228b15-8442-48a7-8d3d-2830529d5785/1.NO_S3.groovy
@@ -4,4 +4,4 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-bindField("FIRSTPARTY",GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY"));
\ No newline at end of file
+page.setDataFilter(["ID":PM_OTHERCONTRACTREVIEW_ID]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/81228b15-8442-48a7-8d3d-2830529d5785/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/81228b15-8442-48a7-8d3d-2830529d5785/2.NO_S3.groovy
index b404f62..b19169b 100644
--- a/tools/s3_rewriter/output/rewritten/81228b15-8442-48a7-8d3d-2830529d5785/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/81228b15-8442-48a7-8d3d-2830529d5785/2.NO_S3.groovy
@@ -4,4 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["ID":PM_OTHERCONTRACTREVIEW_ID]);
\ No newline at end of file
+bindField("FIRSTPARTY",GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY"));
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/81f2610f-5c9b-4249-98de-b07815b0842c/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/81f2610f-5c9b-4249-98de-b07815b0842c/1.FULL_AUTO.groovy
index 05ccf41..bd893a3 100644
--- a/tools/s3_rewriter/output/rewritten/81f2610f-5c9b-4249-98de-b07815b0842c/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/81f2610f-5c9b-4249-98de-b07815b0842c/1.FULL_AUTO.groovy
@@ -20,7 +20,7 @@ clearFieldData("YEAR");
//绑定从2008年至当前年份
def beforeYear = 2008;
-for(i in beforeYear..<year+1){
+for(i in beforeYear..> datas){
def map = [:];
def usamecount = 0;
def isSame = false;
- if(inventorydetailslist != null && inventorydetailslist.size() > 0){
+ if(inventorydetailslist != null && inventorydetailslist.size() > 0){
for(inventory in inventorydetailslist){
- if(datas != null && datas.size() > 0){
+ if(datas != null && datas.size() > 0){
for(importmap in datas){
isSame = false;
if(inventory["MATERIALNAME"] == importmap["MATERIALNAME"]
- && inventory["SPECIFICATIONS"] == importmap["SPECIFICATIONS"]
- && inventory["SIZE"] == importmap["SIZE"]
- && inventory["CONFIGINFO"] == importmap["CONFIGINFO"]
- && inventory["UNITPRICE"].compareTo(importmap["UNITPRICE"]) == 0){
+ && inventory["SPECIFICATIONS"] == importmap["SPECIFICATIONS"]
+ && inventory["SIZE"] == importmap["SIZE"]
+ && inventory["CONFIGINFO"] == importmap["CONFIGINFO"]
+ && inventory["UNITPRICE"].compareTo(importmap["UNITPRICE"]) == 0){
isSame = true;
//showToast("材料("+ map["MATERIALNAME"] + map["SPECIFICATIONS"]?"":" " + map["SPECIFICATIONS"] +
//map["SIZE"]?"":" " + map["SIZE"] + map["CONFIGINFO"]?"":" " + map["CONFIGINFO"] +
@@ -115,7 +115,7 @@ def tie = new TableImportExport(inventorydetails,"com.dsasp.hr.checkattendancema
setFieldValue("INVENTORYDETAILS", inventorydetailslist);
- if(usamecount > 0){
+ if(usamecount > 0){
showToast("实盘材料与盘点单中的材料不符或部份不符,未能导入实盘量,请核对!");
}
}
diff --git a/tools/s3_rewriter/output/rewritten/8269d5f9-d44a-46c6-90cc-f5d6cdd92c35/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8269d5f9-d44a-46c6-90cc-f5d6cdd92c35/1.NO_S3.groovy
new file mode 100644
index 0000000..eb8c11e
--- /dev/null
+++ b/tools/s3_rewriter/output/rewritten/8269d5f9-d44a-46c6-90cc-f5d6cdd92c35/1.NO_S3.groovy
@@ -0,0 +1,32 @@
+// === EIP4 P4 脚本迁移产出 ===
+// template_id : 8269d5f9-d44a-46c6-90cc-f5d6cdd92c35
+// template_name: 安全技术交底(五建定制)
+// seq : 1
+// label : NO_S3
+// 处置 : 无 S3 模式,原样进 P4
+def pojo = GetServicesFunction.loadPOJO(item["PM_SAFE_CLARIFICATION_ID"],"PM_SAFE_CLARIFICATION",false);
+if(pojo != null){
+ def isXmb = pojo.get_Value("ISXMB");
+ def cProjectId = GetDefaultValueFunction.getCurrentProjectId();
+ def projectId = pojo.get_Value("PROJECTID");
+
+ if(cProjectId == null){
+ if(isXmb == 1){
+ enableButton("修改",false);
+ enableButton("删除",false);
+ enableButton("交底至项目",false);
+ }
+ } else {
+ if(isXmb == 0){
+ enableButton("修改",false);
+ enableButton("删除",false);
+ enableButton("交底至项目",false);
+ } else {
+ if(projectId != cProjectId){
+ enableButton("修改",false);
+ enableButton("删除",false);
+ enableButton("交底至项目",false);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/8269d5f9-d44a-46c6-90cc-f5d6cdd92c35/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8269d5f9-d44a-46c6-90cc-f5d6cdd92c35/2.NO_S3.groovy
index 6de6de4..993bf87 100644
--- a/tools/s3_rewriter/output/rewritten/8269d5f9-d44a-46c6-90cc-f5d6cdd92c35/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8269d5f9-d44a-46c6-90cc-f5d6cdd92c35/2.NO_S3.groovy
@@ -4,29 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def pojo = GetServicesFunction.loadPOJO(item["PM_SAFE_CLARIFICATION_ID"],"PM_SAFE_CLARIFICATION",false);
-if(pojo != null){
- def isXmb = pojo.get_Value("ISXMB");
- def cProjectId = GetDefaultValueFunction.getCurrentProjectId();
- def projectId = pojo.get_Value("PROJECTID");
-
- if(cProjectId == null){
- if(isXmb == 1){
- enableButton("修改",false);
- enableButton("删除",false);
- enableButton("交底至项目",false);
- }
- } else {
- if(isXmb == 0){
- enableButton("修改",false);
- enableButton("删除",false);
- enableButton("交底至项目",false);
- } else {
- if(projectId != cProjectId){
- enableButton("修改",false);
- enableButton("删除",false);
- enableButton("交底至项目",false);
- }
- }
- }
-}
\ No newline at end of file
+page.setDataFilter(["PM_SAFE_CLARIFICATION_ID":PM_SAFE_CLARIFICATION_ID]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/8269d5f9-d44a-46c6-90cc-f5d6cdd92c35/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8269d5f9-d44a-46c6-90cc-f5d6cdd92c35/3.NO_S3.groovy
index 426f1bb..dd20783 100644
--- a/tools/s3_rewriter/output/rewritten/8269d5f9-d44a-46c6-90cc-f5d6cdd92c35/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8269d5f9-d44a-46c6-90cc-f5d6cdd92c35/3.NO_S3.groovy
@@ -4,4 +4,35 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["PM_SAFE_CLARIFICATION_ID":PM_SAFE_CLARIFICATION_ID]);
\ No newline at end of file
+def pojoId = getFieldValue("PM_SAFE_CLARIFICATION_ID");
+
+def pojo = GetServicesFunction.loadPOJO(pojoId,"PM_SAFE_CLARIFICATION",false);
+
+def isXmb = pojo.get_Value("ISXMB");
+
+def list = [];
+
+def tableName = "";
+
+if(true){
+ tableName = "PM_SAFE_CLARIFICATIONRECEIVER_XMB";
+ def result = GetServicesFunction.listSelectResult(["CLARIFICATIONID":pojoId],tableName);
+
+ result?.each{
+ def receive = it.get_Value("RECEIVER");
+ list.add(receive);
+ }
+}
+
+if(true){
+ tableName = "PM_SAFE_CLARIFICATIONRECEIVER_BZ";
+ def result = GetServicesFunction.listSelectResult(["CLARIFICATIONID":pojoId],tableName);
+
+ result?.each{
+ def receive = it.get_Value("RECEIVER");
+ list.add(receive);
+ }
+}
+
+
+bindField("RECEIVERS",list);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/8269d5f9-d44a-46c6-90cc-f5d6cdd92c35/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/8269d5f9-d44a-46c6-90cc-f5d6cdd92c35/4.FULL_AUTO.groovy
similarity index 86%
rename from tools/s3_rewriter/output/rewritten/8269d5f9-d44a-46c6-90cc-f5d6cdd92c35/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/8269d5f9-d44a-46c6-90cc-f5d6cdd92c35/4.FULL_AUTO.groovy
index 74fcbf8..422ac8e 100644
--- a/tools/s3_rewriter/output/rewritten/8269d5f9-d44a-46c6-90cc-f5d6cdd92c35/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/8269d5f9-d44a-46c6-90cc-f5d6cdd92c35/4.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 8269d5f9-d44a-46c6-90cc-f5d6cdd92c35
// template_name: 安全技术交底(五建定制)
-// seq : 1
+// seq : 4
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def list = getFieldValue("ORGIDLIST");
diff --git a/tools/s3_rewriter/output/rewritten/8269d5f9-d44a-46c6-90cc-f5d6cdd92c35/4.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8269d5f9-d44a-46c6-90cc-f5d6cdd92c35/4.NO_S3.groovy
deleted file mode 100644
index 1bf28fb..0000000
--- a/tools/s3_rewriter/output/rewritten/8269d5f9-d44a-46c6-90cc-f5d6cdd92c35/4.NO_S3.groovy
+++ /dev/null
@@ -1,38 +0,0 @@
-// === EIP4 P4 脚本迁移产出 ===
-// template_id : 8269d5f9-d44a-46c6-90cc-f5d6cdd92c35
-// template_name: 安全技术交底(五建定制)
-// seq : 4
-// label : NO_S3
-// 处置 : 无 S3 模式,原样进 P4
-def pojoId = getFieldValue("PM_SAFE_CLARIFICATION_ID");
-
-def pojo = GetServicesFunction.loadPOJO(pojoId,"PM_SAFE_CLARIFICATION",false);
-
-def isXmb = pojo.get_Value("ISXMB");
-
-def list = [];
-
-def tableName = "";
-
-if(true){
- tableName = "PM_SAFE_CLARIFICATIONRECEIVER_XMB";
- def result = GetServicesFunction.listSelectResult(["CLARIFICATIONID":pojoId],tableName);
-
- result?.each{
- def receive = it.get_Value("RECEIVER");
- list.add(receive);
- }
-}
-
-if(true){
- tableName = "PM_SAFE_CLARIFICATIONRECEIVER_BZ";
- def result = GetServicesFunction.listSelectResult(["CLARIFICATIONID":pojoId],tableName);
-
- result?.each{
- def receive = it.get_Value("RECEIVER");
- list.add(receive);
- }
-}
-
-
-bindField("RECEIVERS",list);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/8350f440-bf6b-4d3f-b4e4-3769a8353d61/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8350f440-bf6b-4d3f-b4e4-3769a8353d61/1.NO_S3.groovy
index 5802bfc..a0156f2 100644
--- a/tools/s3_rewriter/output/rewritten/8350f440-bf6b-4d3f-b4e4-3769a8353d61/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8350f440-bf6b-4d3f-b4e4-3769a8353d61/1.NO_S3.groovy
@@ -9,7 +9,7 @@
//def register = GetServicesFunction.loadPOJO(item['PM_BIDOPENINGRESULTREGISTER_ID'],'PM_BIDOPENINGRESULTREGISTER',false)
//if(register != null){
// def proj = GetServicesFunction.loadPOJO(register.get_Value("PM_PROJECTID"),'PM_PROJECT',false)
-// if(proj != null && (proj.get_Value("PROJECTSTAGE")==-1 || proj.get_Value("PROJECTSTAGE") == 8)){
+// if(proj != null && (proj.get_Value("PROJECTSTAGE")==-1 || proj.get_Value("PROJECTSTAGE") == 8)){
// if(item['STATUS'] == "未提交" || item['STATUS'] == "重新提交" ){
// enableButton("修改",true);
// enableButton("删除",true);
diff --git a/tools/s3_rewriter/output/rewritten/8350f440-bf6b-4d3f-b4e4-3769a8353d61/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8350f440-bf6b-4d3f-b4e4-3769a8353d61/2.NO_S3.groovy
similarity index 78%
rename from tools/s3_rewriter/output/rewritten/8350f440-bf6b-4d3f-b4e4-3769a8353d61/3.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/8350f440-bf6b-4d3f-b4e4-3769a8353d61/2.NO_S3.groovy
index b273be8..c2b51f7 100644
--- a/tools/s3_rewriter/output/rewritten/8350f440-bf6b-4d3f-b4e4-3769a8353d61/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8350f440-bf6b-4d3f-b4e4-3769a8353d61/2.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 8350f440-bf6b-4d3f-b4e4-3769a8353d61
// template_name: 中标登记-五建定制
-// seq : 3
+// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
setFieldReadOnly("PM_PROJECTID",true);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/8350f440-bf6b-4d3f-b4e4-3769a8353d61/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/8350f440-bf6b-4d3f-b4e4-3769a8353d61/3.HARD.groovy
similarity index 88%
rename from tools/s3_rewriter/output/rewritten/8350f440-bf6b-4d3f-b4e4-3769a8353d61/2.HARD.groovy
rename to tools/s3_rewriter/output/rewritten/8350f440-bf6b-4d3f-b4e4-3769a8353d61/3.HARD.groovy
index 139f6ea..7f222bf 100644
--- a/tools/s3_rewriter/output/rewritten/8350f440-bf6b-4d3f-b4e4-3769a8353d61/2.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/8350f440-bf6b-4d3f-b4e4-3769a8353d61/3.HARD.groovy
@@ -1,14 +1,14 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 8350f440-bf6b-4d3f-b4e4-3769a8353d61
// template_name: 中标登记-五建定制
-// seq : 2
+// seq : 3
// label : HARD
// 硬 S3 原因 : 动态创建 Vaadin 组件
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
import com.vaadin.ui.Link;
import com.vaadin.server.ExternalResource;
def url = group.getField("RESULTURL");
-if(url.getValue()!= null && url?.isReadOnly()){
+if(url.getValue()!= null && url?.isReadOnly()){
Link link = new Link("公示链接",
new ExternalResource(url.getValue()));
link.setTargetName("_blank")
diff --git a/tools/s3_rewriter/output/rewritten/84d69d03-9d61-400d-a0f6-9bdea5a97d1b/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/84d69d03-9d61-400d-a0f6-9bdea5a97d1b/1.NO_S3.groovy
index 77218d0..bebe54c 100644
--- a/tools/s3_rewriter/output/rewritten/84d69d03-9d61-400d-a0f6-9bdea5a97d1b/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/84d69d03-9d61-400d-a0f6-9bdea5a97d1b/1.NO_S3.groovy
@@ -4,7 +4,7 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-if(item['REFORM'] != null && item['REFORM'].equals("是")) {
+if(item['REFORM'] != null && item['REFORM'].equals("是")) {
enableButton("查看整改情况",true);
} else {
enableButton("查看整改情况",false);
diff --git a/tools/s3_rewriter/output/rewritten/8588e7dc-2118-4882-a45c-60cb03648ce7/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8588e7dc-2118-4882-a45c-60cb03648ce7/1.NO_S3.groovy
index f63f7dd..9e25e21 100644
--- a/tools/s3_rewriter/output/rewritten/8588e7dc-2118-4882-a45c-60cb03648ce7/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8588e7dc-2118-4882-a45c-60cb03648ce7/1.NO_S3.groovy
@@ -4,35 +4,29 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def pojoId = getFieldValue("PM_PUB_CLARIFICATION_ID");
-
-def pojo = GetServicesFunction.loadPOJO(pojoId,"PM_PUB_CLARIFICATION",false);
-
-def isXmb = pojo.get_Value("ISXMB");
-
-def list = [];
-
-def tableName = "";
-
-if(true){
- tableName = "PM_PUB_CLARIFICATIONRECEIVER_XMB";
- def result = GetServicesFunction.listSelectResult(["CLARIFICATIONID":pojoId],tableName);
-
- result?.each{
- def receive = it.get_Value("RECEIVER");
- list.add(receive);
- }
-}
-
-if(true){
- tableName = "PM_PUB_CLARIFICATIONRECEIVER_BZ";
- def result = GetServicesFunction.listSelectResult(["CLARIFICATIONID":pojoId],tableName);
-
- result?.each{
- def receive = it.get_Value("RECEIVER");
- list.add(receive);
- }
-}
-
-
-bindField("RECEIVERS",list);
\ No newline at end of file
+//def pojo = GetServicesFunction.loadPOJO(item["PM_PUB_CLARIFICATION_ID"],"PM_PUB_CLARIFICATION",false);
+//if(pojo != null){
+// def isXmb = pojo.get_Value("ISXMB");
+// def cProjectId = GetDefaultValueFunction.getCurrentProjectId();
+// def projectId = pojo.get_Value("PROJECTID");
+//
+// if(cProjectId == null){
+// if(isXmb == 1){
+// enableButton("修改",false);
+// enableButton("删除",false);
+// enableButton("交底至项目",false);
+// }
+// } else {
+// if(isXmb == 0){
+// enableButton("修改",false);
+// enableButton("删除",false);
+// enableButton("交底至项目",false);
+// } else {
+// if(projectId != cProjectId){
+// enableButton("修改",false);
+// enableButton("删除",false);
+// enableButton("交底至项目",false);
+// }
+// }
+// }
+//}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/8588e7dc-2118-4882-a45c-60cb03648ce7/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8588e7dc-2118-4882-a45c-60cb03648ce7/3.NO_S3.groovy
index a122ee7..c5be07a 100644
--- a/tools/s3_rewriter/output/rewritten/8588e7dc-2118-4882-a45c-60cb03648ce7/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8588e7dc-2118-4882-a45c-60cb03648ce7/3.NO_S3.groovy
@@ -4,29 +4,35 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-//def pojo = GetServicesFunction.loadPOJO(item["PM_PUB_CLARIFICATION_ID"],"PM_PUB_CLARIFICATION",false);
-//if(pojo != null){
-// def isXmb = pojo.get_Value("ISXMB");
-// def cProjectId = GetDefaultValueFunction.getCurrentProjectId();
-// def projectId = pojo.get_Value("PROJECTID");
-//
-// if(cProjectId == null){
-// if(isXmb == 1){
-// enableButton("修改",false);
-// enableButton("删除",false);
-// enableButton("交底至项目",false);
-// }
-// } else {
-// if(isXmb == 0){
-// enableButton("修改",false);
-// enableButton("删除",false);
-// enableButton("交底至项目",false);
-// } else {
-// if(projectId != cProjectId){
-// enableButton("修改",false);
-// enableButton("删除",false);
-// enableButton("交底至项目",false);
-// }
-// }
-// }
-//}
\ No newline at end of file
+def pojoId = getFieldValue("PM_PUB_CLARIFICATION_ID");
+
+def pojo = GetServicesFunction.loadPOJO(pojoId,"PM_PUB_CLARIFICATION",false);
+
+def isXmb = pojo.get_Value("ISXMB");
+
+def list = [];
+
+def tableName = "";
+
+if(true){
+ tableName = "PM_PUB_CLARIFICATIONRECEIVER_XMB";
+ def result = GetServicesFunction.listSelectResult(["CLARIFICATIONID":pojoId],tableName);
+
+ result?.each{
+ def receive = it.get_Value("RECEIVER");
+ list.add(receive);
+ }
+}
+
+if(true){
+ tableName = "PM_PUB_CLARIFICATIONRECEIVER_BZ";
+ def result = GetServicesFunction.listSelectResult(["CLARIFICATIONID":pojoId],tableName);
+
+ result?.each{
+ def receive = it.get_Value("RECEIVER");
+ list.add(receive);
+ }
+}
+
+
+bindField("RECEIVERS",list);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/6.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/1.NO_S3.groovy
similarity index 96%
rename from tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/6.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/1.NO_S3.groovy
index 4dffee4..c3f6a74 100644
--- a/tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/6.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/1.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 86c05eb5-753d-46e5-b958-cdbcefe7eabc
// template_name: 销项税发票
-// seq : 6
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
def ordersStatus = GetServicesFunction.getEnumerateItemValue("WFSTATUS",item['STATUS']);
diff --git a/tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/2.FULL_AUTO.groovy
deleted file mode 100644
index 37f8daf..0000000
--- a/tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/2.FULL_AUTO.groovy
+++ /dev/null
@@ -1,9 +0,0 @@
-// === EIP4 P4 脚本迁移产出 ===
-// template_id : 86c05eb5-753d-46e5-b958-cdbcefe7eabc
-// template_name: 销项税发票
-// seq : 2
-// label : FULL_AUTO
-// 处置 : 全自动改写完成,直接入 P4 转换流水线
-def searchMap = ["UNITTYPE":7];//建设单位
-
-setFieldFilter("BUILDCOMPANY", searchMap);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/4.PARTIAL.groovy b/tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/2.PARTIAL.groovy
similarity index 86%
rename from tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/4.PARTIAL.groovy
rename to tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/2.PARTIAL.groovy
index b874d25..63ea4d6 100644
--- a/tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/4.PARTIAL.groovy
+++ b/tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/2.PARTIAL.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 86c05eb5-753d-46e5-b958-cdbcefe7eabc
// template_name: 销项税发票
-// seq : 4
+// seq : 2
// label : PARTIAL
// 余留模式 : 残留字段句柄链(未覆盖动词)
// 处置 : 大部分已自动改写,余留行人工补全(见作业单)
@@ -16,8 +16,8 @@ if(invoiceform == 1){
smap["EXTENDATTRIBUTEONE"] = 2;
smap["SYS_ENUMERATETYPE_ID"] = "INVOICEMANAGEMENT_INVOICETYPE";
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..0){
+ for(i in 0..0){
+ for(i in 0..0){
+ for(i in 0..0){
+ for(i in 0..0){
+ for(i in 0..0){
def message = " ";//提示消息
- documentfp.eachWithIndex{it,index->
+ documentfp.eachWithIndex{it,index->
//批量选择发票类型后给子表赋值
- if(it && it.get("TEMPFILE")){
+ if(it && it.get("TEMPFILE")){
// 表示本地路径
def filePath = it.get("TEMPFILE");
//String endpointUrl = "http://192.168.20.63:5020/detection";//内网环境
@@ -56,79 +56,79 @@ cb?.addClickListener(new ClickListener() {
message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票接口请求超时,请检查该发票或联系管理员!\n"
}else{
def json = HTTPClientUtils.stringToJson(responseBody);
- if(json && json.getString("message") && json.get("message")=="ok"){
+ if(json && json.getString("message") && json.get("message")=="ok"){
def rows = json.get("data");
def item = rows?.get("data");
- if(rows && item){
+ if(rows && item){
//Console.debug(item);
def fplist = [:];
fplist.put("DOCUMENT",[it]);//附件图片
//发票类型
- if(rows?.get("invoiceType")!=null && rows?.get("invoiceType")!="null" && rows?.get("invoiceType")!="无"){
+ if(rows?.get("invoiceType")!=null && rows?.get("invoiceType")!="null" && rows?.get("invoiceType")!="无"){
fplist.put("RECEIPTTYPE",rows.get("invoiceType").contains("专用") ? 3 : rows.get("invoiceType").contains("普通") ? 2 : 1);
}else{
fplist.put("RECEIPTTYPE",null);
};
- if(item?.get("buyer_name")!=null && item?.getString("buyer_name")!="null" && item?.getString("buyer_name")!="无"){
+ if(item?.get("buyer_name")!=null && item?.getString("buyer_name")!="null" && item?.getString("buyer_name")!="无"){
fplist.put("PURCHASER",item.get("buyer_name"));
}else{
fplist.put("PURCHASER",null);
};
- if(item?.get("seller_name")!=null && item?.getString("seller_name")!="null" && item?.getString("seller_name")!="无"){
+ if(item?.get("seller_name")!=null && item?.getString("seller_name")!="null" && item?.getString("seller_name")!="无"){
fplist.put("SALESPARTY",item.get("seller_name"));
}else{
fplist.put("SALESPARTY",null);
};
- if(item?.get("invoice_code")!=null && item?.getString("invoice_code")!="null" && item?.getString("invoice_code")!="无"){
+ if(item?.get("invoice_code")!=null && item?.getString("invoice_code")!="null" && item?.getString("invoice_code")!="无"){
fplist.put("INVOICECODE",item.get("invoice_code"));
}else{
fplist.put("INVOICECODE",null);
};
- if(item?.get("invoice_number")!=null && item?.getString("invoice_number")!="null" && item?.getString("invoice_number")!="无"){
+ if(item?.get("invoice_number")!=null && item?.getString("invoice_number")!="null" && item?.getString("invoice_number")!="无"){
fplist.put("INVOICENO",item.get("invoice_number"));
}else{
fplist.put("INVOICENO",null);
};
- if(item?.get("money")!=null && item?.getString("money")!="null" && item?.getString("money")!="无"){
+ if(item?.get("money")!=null && item?.getString("money")!="null" && item?.getString("money")!="无"){
fplist.put("INVOICEMONEY",transformnum(item.getString("money")));
}else{
fplist.put("INVOICEMONEY",null);
};
- if(item?.get("tax")!=null && item?.getString("tax")!="null" && item?.getString("tax")!="无"){
+ if(item?.get("tax")!=null && item?.getString("tax")!="null" && item?.getString("tax")!="无"){
fplist.put("TAX",transformnum(item.getString("tax")));
}else{
fplist.put("TAX",null);
};
- if(item?.get("price")!=null && item?.getString("price")!="null" && item?.getString("price")!="无"){
+ if(item?.get("price")!=null && item?.getString("price")!="null" && item?.getString("price")!="无"){
fplist.put("TOTALMONEY",transformnum(item.getString("price")));
}else{
fplist.put("TOTALMONEY",null);
};
- if(item?.get("invoice_date")!=null && item?.getString("invoice_date")!="null" && item?.getString("invoice_date")!="无"){
+ if(item?.get("invoice_date")!=null && item?.getString("invoice_date")!="null" && item?.getString("invoice_date")!="无"){
def date = item.getString("invoice_date");
fplist.put("INVOICEDATE",GetValueFunction.toDate(date,"yyyy年MM月dd日"));
}else{
fplist.put("INVOICEDATE",null);
};
- if(item?.get("tax_rate")!=null && item?.getString("tax_rate")!="null" && item?.getString("tax_rate")!="无"){
+ if(item?.get("tax_rate")!=null && item?.getString("tax_rate")!="null" && item?.getString("tax_rate")!="无"){
fplist.put("TAXRATE",transformnum(item.getString("tax_rate")));
}else{
fplist.put("TAXRATE",null);
};
- if(item?.get("electronic_number")!=null && item?.getString("electronic_number")!="null" && item?.getString("electronic_number")!="无"){
+ if(item?.get("electronic_number")!=null && item?.getString("electronic_number")!="null" && item?.getString("electronic_number")!="无"){
def electronic_number = item.getString("electronic_number");
fplist.put("GLFPHM",electronic_number);
}else{
fplist.put("GLFPHM",null);
};
- if(item?.get("buyer_code")!=null && item?.getString("buyer_code")!="null" && item?.getString("buyer_code")!="无"){
+ if(item?.get("buyer_code")!=null && item?.getString("buyer_code")!="null" && item?.getString("buyer_code")!="无"){
def buyer_code = item.getString("buyer_code");
fplist.put("KHSH",buyer_code);
}else{
fplist.put("KHSH",null);
};
- if(item?.get("seller_code")!=null && item?.getString("seller_code")!="null" && item?.getString("seller_code")!="无"){
+ if(item?.get("seller_code")!=null && item?.getString("seller_code")!="null" && item?.getString("seller_code")!="无"){
def seller_code = item.getString("seller_code");
fplist.put("XFSH",seller_code);
}else{
@@ -136,10 +136,10 @@ cb?.addClickListener(new ClickListener() {
};
if(fplist!=null){
def flag = true;
- if(invoicelist.getValue() && invoicelist.getValue().size()>0){
- for (int j = 0; j < invoicelist.getValue().size(); j++) {
+ if(invoicelist.getValue() && invoicelist.getValue().size()>0){
+ for (int j = 0; j < invoicelist.getValue().size(); j++) {
def tempitem = invoicelist.getValue().get(j);
- if((fplist.get("INVOICENO")==null || (fplist.get("INVOICENO")!=null && tempitem.get("INVOICENO") == fplist.get("INVOICENO"))) && (fplist.get("INVOICECODE")==null || (fplist.get("INVOICECODE")!=null && tempitem.get("INVOICECODE") == fplist.get("INVOICECODE")))){
+ if((fplist.get("INVOICENO")==null || (fplist.get("INVOICENO")!=null && tempitem.get("INVOICENO") == fplist.get("INVOICENO"))) && (fplist.get("INVOICECODE")==null || (fplist.get("INVOICECODE")!=null && tempitem.get("INVOICECODE") == fplist.get("INVOICECODE")))){
flag = false;;
}
};
@@ -150,7 +150,7 @@ cb?.addClickListener(new ClickListener() {
}
}
}else{
- if(json && json.getString("message")){
+ if(json && json.getString("message")){
message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票"+json.getString("message")+"!\n";
} else{
message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票接口请求超时,请检查该发票或联系管理员!\n";
diff --git a/tools/s3_rewriter/output/rewritten/8712cb8c-0412-4132-9b21-9240c5a47c5e/3.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/8712cb8c-0412-4132-9b21-9240c5a47c5e/1.FULL_AUTO.groovy
similarity index 81%
rename from tools/s3_rewriter/output/rewritten/8712cb8c-0412-4132-9b21-9240c5a47c5e/3.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/8712cb8c-0412-4132-9b21-9240c5a47c5e/1.FULL_AUTO.groovy
index f36cc80..f4942a5 100644
--- a/tools/s3_rewriter/output/rewritten/8712cb8c-0412-4132-9b21-9240c5a47c5e/3.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/8712cb8c-0412-4132-9b21-9240c5a47c5e/1.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 8712cb8c-0412-4132-9b21-9240c5a47c5e
// template_name: 休假申请
-// seq : 3
+// seq : 1
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
@@ -13,7 +13,7 @@ bindField("HOLIDAYTYPE",null);
clearFieldData("HOLIDAYTYPE");
-def polist = GetServicesFunction.listSelectResult(["CODEVALUE":new CustomSearchConditional("P.CODEVALUE>=21 AND P.CODEVALUE<=40 AND P.SYS_ENUMERATETYPE_ID = 'HR_CHECKATTENDANCESTATE'")],"SYS_ENUMERATE");
+def polist = GetServicesFunction.listSelectResult(["CODEVALUE":new CustomSearchConditional("P.CODEVALUE>=21 AND P.CODEVALUE<=40 AND P.SYS_ENUMERATETYPE_ID = 'HR_CHECKATTENDANCESTATE'")],"SYS_ENUMERATE");
//循环polist,为下拉框绑值
for(list in polist){
addFieldOption("HOLIDAYTYPE", list.get_Value("CODEVALUE"), list.get_Value("CODEDES"));
diff --git a/tools/s3_rewriter/output/rewritten/8712cb8c-0412-4132-9b21-9240c5a47c5e/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/8712cb8c-0412-4132-9b21-9240c5a47c5e/2.FULL_AUTO.groovy
index 9bccec8..19baf84 100644
--- a/tools/s3_rewriter/output/rewritten/8712cb8c-0412-4132-9b21-9240c5a47c5e/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/8712cb8c-0412-4132-9b21-9240c5a47c5e/2.FULL_AUTO.groovy
@@ -11,7 +11,7 @@ bindField("HOLIDAYTYPE",null);
clearFieldData("HOLIDAYTYPE");
-def polist = GetServicesFunction.listSelectResult(["CODEVALUE":new CustomSearchConditional("P.CODEVALUE>=21 AND P.CODEVALUE<=40 AND P.SYS_ENUMERATETYPE_ID = 'HR_CHECKATTENDANCESTATE'")],"SYS_ENUMERATE");
+def polist = GetServicesFunction.listSelectResult(["CODEVALUE":new CustomSearchConditional("P.CODEVALUE>=21 AND P.CODEVALUE<=40 AND P.SYS_ENUMERATETYPE_ID = 'HR_CHECKATTENDANCESTATE'")],"SYS_ENUMERATE");
addFieldOption("HOLIDAYTYPE", "请选择", "请选择");
//循环polist,为下拉框绑值
for(list in polist){
diff --git a/tools/s3_rewriter/output/rewritten/8712cb8c-0412-4132-9b21-9240c5a47c5e/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8712cb8c-0412-4132-9b21-9240c5a47c5e/3.NO_S3.groovy
similarity index 89%
rename from tools/s3_rewriter/output/rewritten/8712cb8c-0412-4132-9b21-9240c5a47c5e/1.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/8712cb8c-0412-4132-9b21-9240c5a47c5e/3.NO_S3.groovy
index 121cf4a..6e162f5 100644
--- a/tools/s3_rewriter/output/rewritten/8712cb8c-0412-4132-9b21-9240c5a47c5e/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8712cb8c-0412-4132-9b21-9240c5a47c5e/3.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 8712cb8c-0412-4132-9b21-9240c5a47c5e
// template_name: 休假申请
-// seq : 1
+// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
page.setDataFilter(["HR_HOLIDAYAPPLY_ID":HR_HOLIDAYAPPLY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/8769212f-daa2-4ac2-8d00-dfd49afb6ac6/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8769212f-daa2-4ac2-8d00-dfd49afb6ac6/1.NO_S3.groovy
similarity index 95%
rename from tools/s3_rewriter/output/rewritten/8769212f-daa2-4ac2-8d00-dfd49afb6ac6/2.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/8769212f-daa2-4ac2-8d00-dfd49afb6ac6/1.NO_S3.groovy
index 9104f9a..7837bf0 100644
--- a/tools/s3_rewriter/output/rewritten/8769212f-daa2-4ac2-8d00-dfd49afb6ac6/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8769212f-daa2-4ac2-8d00-dfd49afb6ac6/1.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 8769212f-daa2-4ac2-8d00-dfd49afb6ac6
// template_name: 施工方案论证(五建定制)
-// seq : 2
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
page.setDataFilter(["PM_PUB_SCHEME_PROOF_ID":PM_PUB_SCHEME_PROOF_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
diff --git a/tools/s3_rewriter/output/rewritten/8769212f-daa2-4ac2-8d00-dfd49afb6ac6/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/8769212f-daa2-4ac2-8d00-dfd49afb6ac6/2.FULL_AUTO.groovy
similarity index 85%
rename from tools/s3_rewriter/output/rewritten/8769212f-daa2-4ac2-8d00-dfd49afb6ac6/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/8769212f-daa2-4ac2-8d00-dfd49afb6ac6/2.FULL_AUTO.groovy
index f07b954..79d81fa 100644
--- a/tools/s3_rewriter/output/rewritten/8769212f-daa2-4ac2-8d00-dfd49afb6ac6/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/8769212f-daa2-4ac2-8d00-dfd49afb6ac6/2.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 8769212f-daa2-4ac2-8d00-dfd49afb6ac6
// template_name: 施工方案论证(五建定制)
-// seq : 1
+// seq : 2
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def list = getFieldValue("ORGIDLIST");
diff --git a/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/7.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/1.NO_S3.groovy
similarity index 93%
rename from tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/7.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/1.NO_S3.groovy
index 93c2ddf..fa3cf95 100644
--- a/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/7.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/1.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 87ed6b66-6c3f-45f2-a889-606710c3ebd3
// template_name: 施工方案审批-工程师(五建定制)
-// seq : 7
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
page.setDataFilter(["SCHEMEID":PM_PUB_CONSTRUCTIONSCHEMEAPPROVAL_ID]);
diff --git a/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/2.NO_S3.groovy
index 431f86a..7de9218 100644
--- a/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/2.NO_S3.groovy
@@ -4,4 +4,15 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["PM_PUB_CONSTRUCTIONSCHEMEAPPROVAL_ID":PM_PUB_CONSTRUCTIONSCHEMEAPPROVAL_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
+def po = GetServicesFunction.loadPOJO(item['PM_PUB_CONSTRUCTIONSCHEMEAPPROVAL_ID'],"PM_PUB_CONSTRUCTIONSCHEMEAPPROVAL",false);
+
+if(po != null && po?.get_Value("STATUS")==3){
+ enableButton("关联危险源",true);
+ enableButton("关联污染源",true);
+ enableButton("关联重大危险源",true);
+}else{
+ enableButton("关联危险源",false);
+ enableButton("关联污染源",false);
+ enableButton("关联重大危险源",false);
+}
+
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/3.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/3.FULL_AUTO.groovy
index e3a2d46..5ce07f1 100644
--- a/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/3.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/3.FULL_AUTO.groovy
@@ -4,4 +4,4 @@
// seq : 3
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-addSubTableButton("BIGDANGERRELATIONS", "SELECT", 0);
\ No newline at end of file
+addSubTableButton("DANGERRELATIONS", "SELECT", 0);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/5.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/5.FULL_AUTO.groovy
index 6c96559..eb9ed64 100644
--- a/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/5.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/5.FULL_AUTO.groovy
@@ -4,4 +4,4 @@
// seq : 5
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-addSubTableButton("DANGERRELATIONS", "SELECT", 0);
\ No newline at end of file
+addSubTableButton("BIGDANGERRELATIONS", "SELECT", 0);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/6.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/6.NO_S3.groovy
index 76c43d0..4ade8be 100644
--- a/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/6.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/6.NO_S3.groovy
@@ -4,15 +4,4 @@
// seq : 6
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def po = GetServicesFunction.loadPOJO(item['PM_PUB_CONSTRUCTIONSCHEMEAPPROVAL_ID'],"PM_PUB_CONSTRUCTIONSCHEMEAPPROVAL",false);
-
-if(po != null && po?.get_Value("STATUS")==3){
- enableButton("关联危险源",true);
- enableButton("关联污染源",true);
- enableButton("关联重大危险源",true);
-}else{
- enableButton("关联危险源",false);
- enableButton("关联污染源",false);
- enableButton("关联重大危险源",false);
-}
-
\ No newline at end of file
+page.setDataFilter(["PM_PUB_CONSTRUCTIONSCHEMEAPPROVAL_ID":PM_PUB_CONSTRUCTIONSCHEMEAPPROVAL_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
diff --git a/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/7.FULL_AUTO.groovy
similarity index 85%
rename from tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/7.FULL_AUTO.groovy
index 11da5a1..a1afadd 100644
--- a/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/87ed6b66-6c3f-45f2-a889-606710c3ebd3/7.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 87ed6b66-6c3f-45f2-a889-606710c3ebd3
// template_name: 施工方案审批-工程师(五建定制)
-// seq : 1
+// seq : 7
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def list = getFieldValue("ORGIDLIST");
diff --git a/tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/4.HARD.groovy b/tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/1.HARD.groovy
similarity index 97%
rename from tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/4.HARD.groovy
rename to tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/1.HARD.groovy
index 3415e22..f4cb362 100644
--- a/tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/4.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/1.HARD.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 884f0dde-564a-4e6e-9a5d-55d12d0a16e1
// template_name: 物资采购申请(土建-项目)
-// seq : 4
+// seq : 1
// label : HARD
// 硬 S3 原因 : 动态创建 Vaadin 组件
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
diff --git a/tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/2.NO_S3.groovy
index 752c6ba..20ae0ad 100644
--- a/tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/2.NO_S3.groovy
@@ -4,19 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def applyStatus = GetServicesFunction.getEnumerateItemValue("WFSTATUS",item['STATUS']);
-
-switch(applyStatus){
- case 3:
- enableButton("作废",true);
- break;
- case 6:
- enableButton("作废",false);
- enableButton("修改",false);
- enableButton("删除",false);
- enableButton("提交审批",false);
- break;
- default:
- enableButton("作废",false);
- break;
-}
+page.setDataFilter(["PM_MATERIALPURCHASEAPPLY_TJ_ID":PM_MATERIALPURCHASEAPPLY_TJ_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
diff --git a/tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/3.NO_S3.groovy
index 4bbb110..2c70764 100644
--- a/tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/3.NO_S3.groovy
@@ -4,4 +4,19 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["PM_MATERIALPURCHASEAPPLY_TJ_ID":PM_MATERIALPURCHASEAPPLY_TJ_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
+def applyStatus = GetServicesFunction.getEnumerateItemValue("WFSTATUS",item['STATUS']);
+
+switch(applyStatus){
+ case 3:
+ enableButton("作废",true);
+ break;
+ case 6:
+ enableButton("作废",false);
+ enableButton("修改",false);
+ enableButton("删除",false);
+ enableButton("提交审批",false);
+ break;
+ default:
+ enableButton("作废",false);
+ break;
+}
diff --git a/tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/4.FULL_AUTO.groovy
similarity index 80%
rename from tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/4.FULL_AUTO.groovy
index b48d226..e4b473a 100644
--- a/tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/4.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 884f0dde-564a-4e6e-9a5d-55d12d0a16e1
// template_name: 物资采购申请(土建-项目)
-// seq : 1
+// seq : 4
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
setFieldVisible("ISPREPARATION", false);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/88a1f260-7dc8-425c-b961-fbc051c9c852/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/88a1f260-7dc8-425c-b961-fbc051c9c852/1.NO_S3.groovy
index 8bc6aa4..bce8ce8 100644
--- a/tools/s3_rewriter/output/rewritten/88a1f260-7dc8-425c-b961-fbc051c9c852/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/88a1f260-7dc8-425c-b961-fbc051c9c852/1.NO_S3.groovy
@@ -4,7 +4,6 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-//选择开始日期计算结束日期
-def starttime = getFieldValue("BEGINDATE");
-bindField("BEGINDATE",GetValueFunction.firstDateOfMonth(starttime));
-bindField("ENDDATE",GetValueFunction.lastDateOfMonth(starttime));
+def endtime = getFieldValue("ENDDATE");
+bindField("BEGINDATE",GetValueFunction.firstDateOfMonth(endtime));
+bindField("ENDDATE",GetValueFunction.lastDateOfMonth(endtime));
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/88a1f260-7dc8-425c-b961-fbc051c9c852/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/88a1f260-7dc8-425c-b961-fbc051c9c852/2.NO_S3.groovy
index 0de3a62..7ce7b69 100644
--- a/tools/s3_rewriter/output/rewritten/88a1f260-7dc8-425c-b961-fbc051c9c852/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/88a1f260-7dc8-425c-b961-fbc051c9c852/2.NO_S3.groovy
@@ -4,6 +4,7 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def endtime = getFieldValue("ENDDATE");
-bindField("BEGINDATE",GetValueFunction.firstDateOfMonth(endtime));
-bindField("ENDDATE",GetValueFunction.lastDateOfMonth(endtime));
\ No newline at end of file
+//选择开始日期计算结束日期
+def starttime = getFieldValue("BEGINDATE");
+bindField("BEGINDATE",GetValueFunction.firstDateOfMonth(starttime));
+bindField("ENDDATE",GetValueFunction.lastDateOfMonth(starttime));
diff --git a/tools/s3_rewriter/output/rewritten/88ec27dd-b900-47c8-abbf-aeafc796f15d/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/88ec27dd-b900-47c8-abbf-aeafc796f15d/1.FULL_AUTO.groovy
index d882c87..e1ff7dd 100644
--- a/tools/s3_rewriter/output/rewritten/88ec27dd-b900-47c8-abbf-aeafc796f15d/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/88ec27dd-b900-47c8-abbf-aeafc796f15d/1.FULL_AUTO.groovy
@@ -4,14 +4,14 @@
// seq : 1
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-if(getFieldValue("ENDYEAR") == null && getFieldValue("ENDMONTH") == null){
+if(getFieldValue("ENDYEAR") == null && getFieldValue("ENDMONTH") == null){
clearFieldData("STARTYEAR");
def currentYear = GetDefaultValueFunction.currentYear();
def lastYear = currentYear - 7;
def nextYear = currentYear + 8;
- for(i in lastYear..<currentYear){
+ for(i in lastYear..=41 AND P.CODEVALUE<=60 AND P.SYS_ENUMERATETYPE_ID = 'HR_CHECKATTENDANCESTATE'")],"SYS_ENUMERATE");
//循环polist,为下拉框绑值
for(list in polist){
addFieldOption("OVERTIMETYPE", list.get_Value("CODEVALUE"), list.get_Value("CODEDES"));
-}
\ No newline at end of file
+}
+
+//设置默认值
+if(recordValue!=null){
+ bindField("OVERTIMETYPE",recordValue);
+}
diff --git a/tools/s3_rewriter/output/rewritten/8a61f894-ea0b-4576-90c7-d218e949c4ea/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/8a61f894-ea0b-4576-90c7-d218e949c4ea/2.FULL_AUTO.groovy
index e9cffe3..21e9ed8 100644
--- a/tools/s3_rewriter/output/rewritten/8a61f894-ea0b-4576-90c7-d218e949c4ea/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/8a61f894-ea0b-4576-90c7-d218e949c4ea/2.FULL_AUTO.groovy
@@ -6,20 +6,14 @@
// 处置 : 全自动改写完成,直接入 P4 转换流水线
/* *****************以下脚本绑定加班类型下拉框***************** */
-def recordValue = getFieldValue("OVERTIMETYPE");
-
//绑定之前,清空下拉框
bindField("OVERTIMETYPE",null);
clearFieldData("OVERTIMETYPE");
-def polist = GetServicesFunction.listSelectResult(["CODEVALUE":new CustomSearchConditional("P.CODEVALUE>=41 AND P.CODEVALUE<=60 AND P.SYS_ENUMERATETYPE_ID = 'HR_CHECKATTENDANCESTATE'")],"SYS_ENUMERATE");
+def polist = GetServicesFunction.listSelectResult(["CODEVALUE":new CustomSearchConditional("P.CODEVALUE>=41 AND P.CODEVALUE<=60 AND P.SYS_ENUMERATETYPE_ID = 'HR_CHECKATTENDANCESTATE'")],"SYS_ENUMERATE");
+addFieldOption("OVERTIMETYPE", "请选择", "请选择");
//循环polist,为下拉框绑值
for(list in polist){
addFieldOption("OVERTIMETYPE", list.get_Value("CODEVALUE"), list.get_Value("CODEDES"));
-}
-
-//设置默认值
-if(recordValue!=null){
- bindField("OVERTIMETYPE",recordValue);
-}
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/8a91a987-eae1-40cd-a16c-700e32ea26bb/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8a91a987-eae1-40cd-a16c-700e32ea26bb/1.NO_S3.groovy
index d782075..99b4deb 100644
--- a/tools/s3_rewriter/output/rewritten/8a91a987-eae1-40cd-a16c-700e32ea26bb/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8a91a987-eae1-40cd-a16c-700e32ea26bb/1.NO_S3.groovy
@@ -5,10 +5,10 @@
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def year = getFieldValue("ENDYEAR");
-def month = getFieldValue("ENDMONTH");
-Console.debug(year);
-Console.debug(month);
-if(year!=null&&month!=null){
- bindField("ENDTIME",(year*100+month));
+def year = getFieldValue("BEGINYEAR");
+def month = getFieldValue("BEGINMONTH");
+
+if(year!=null&&month!=null){
+
+ bindField("BEGINTIME",(year*100+month));
}
diff --git a/tools/s3_rewriter/output/rewritten/8a91a987-eae1-40cd-a16c-700e32ea26bb/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8a91a987-eae1-40cd-a16c-700e32ea26bb/2.NO_S3.groovy
index 5295ea3..874841e 100644
--- a/tools/s3_rewriter/output/rewritten/8a91a987-eae1-40cd-a16c-700e32ea26bb/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8a91a987-eae1-40cd-a16c-700e32ea26bb/2.NO_S3.groovy
@@ -5,8 +5,10 @@
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-bindField("BEGINYEAR",GetDefaultValueFunction.currentYear());
-bindField("BEGINMONTH",GetDefaultValueFunction.currentMonth());
-
-bindField("ENDYEAR",GetDefaultValueFunction.currentYear());
-bindField("ENDMONTH",GetDefaultValueFunction.currentMonth());
\ No newline at end of file
+def year = getFieldValue("ENDYEAR");
+def month = getFieldValue("ENDMONTH");
+Console.debug(year);
+Console.debug(month);
+if(year!=null&&month!=null){
+ bindField("ENDTIME",(year*100+month));
+}
diff --git a/tools/s3_rewriter/output/rewritten/8a91a987-eae1-40cd-a16c-700e32ea26bb/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8a91a987-eae1-40cd-a16c-700e32ea26bb/3.NO_S3.groovy
index 3f945d0..8ca5451 100644
--- a/tools/s3_rewriter/output/rewritten/8a91a987-eae1-40cd-a16c-700e32ea26bb/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8a91a987-eae1-40cd-a16c-700e32ea26bb/3.NO_S3.groovy
@@ -5,10 +5,8 @@
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def year = getFieldValue("BEGINYEAR");
-def month = getFieldValue("BEGINMONTH");
+bindField("BEGINYEAR",GetDefaultValueFunction.currentYear());
+bindField("BEGINMONTH",GetDefaultValueFunction.currentMonth());
-if(year!=null&&month!=null){
-
- bindField("BEGINTIME",(year*100+month));
-}
+bindField("ENDYEAR",GetDefaultValueFunction.currentYear());
+bindField("ENDMONTH",GetDefaultValueFunction.currentMonth());
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/8af471c2-effe-4821-af1b-0937008b05fe/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8af471c2-effe-4821-af1b-0937008b05fe/1.NO_S3.groovy
index 3debdae..b161478 100644
--- a/tools/s3_rewriter/output/rewritten/8af471c2-effe-4821-af1b-0937008b05fe/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8af471c2-effe-4821-af1b-0937008b05fe/1.NO_S3.groovy
@@ -4,5 +4,4 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-bindField("ENDDATE",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("IMPORTENDDATE"),"yyyy-MM-dd")));
-
+bindField("STARTDATE",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("IMPORTSTARTDATE"),"yyyy-MM-dd")));
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/8af471c2-effe-4821-af1b-0937008b05fe/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8af471c2-effe-4821-af1b-0937008b05fe/2.NO_S3.groovy
index 81a187d..5b6dc50 100644
--- a/tools/s3_rewriter/output/rewritten/8af471c2-effe-4821-af1b-0937008b05fe/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8af471c2-effe-4821-af1b-0937008b05fe/2.NO_S3.groovy
@@ -4,4 +4,5 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-bindField("STARTDATE",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("IMPORTSTARTDATE"),"yyyy-MM-dd")));
\ No newline at end of file
+bindField("ENDDATE",GetValueFunction.toString(GetValueFunction.dateFormate(getFieldValue("IMPORTENDDATE"),"yyyy-MM-dd")));
+
diff --git a/tools/s3_rewriter/output/rewritten/8b1473e7-1310-42fa-9a04-bf62550b481d/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/8b1473e7-1310-42fa-9a04-bf62550b481d/1.FULL_AUTO.groovy
index f749e02..401e1fb 100644
--- a/tools/s3_rewriter/output/rewritten/8b1473e7-1310-42fa-9a04-bf62550b481d/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/8b1473e7-1310-42fa-9a04-bf62550b481d/1.FULL_AUTO.groovy
@@ -5,7 +5,4 @@
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-//组合查询条件(只查询状态为合格的劳务队组信息1:合格;2:不合格;3:黑名)
-def searchMap = [:];
-searchMap["STATE"] = 1;
-setFieldFilter("WORKSUBCONID", searchMap);
+addSubTableButton("MATERIALLIST", "SELECT_MATERIAL", 0);
diff --git a/tools/s3_rewriter/output/rewritten/8b1473e7-1310-42fa-9a04-bf62550b481d/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/8b1473e7-1310-42fa-9a04-bf62550b481d/2.FULL_AUTO.groovy
index c6b78d0..26580a4 100644
--- a/tools/s3_rewriter/output/rewritten/8b1473e7-1310-42fa-9a04-bf62550b481d/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/8b1473e7-1310-42fa-9a04-bf62550b481d/2.FULL_AUTO.groovy
@@ -5,4 +5,7 @@
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-addSubTableButton("MATERIALLIST", "SELECT_MATERIAL", 0);
+//组合查询条件(只查询状态为合格的劳务队组信息1:合格;2:不合格;3:黑名)
+def searchMap = [:];
+searchMap["STATE"] = 1;
+setFieldFilter("WORKSUBCONID", searchMap);
diff --git a/tools/s3_rewriter/output/rewritten/8b699c89-569d-4719-994d-b76f01bcde68/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/8b699c89-569d-4719-994d-b76f01bcde68/1.FULL_AUTO.groovy
similarity index 93%
rename from tools/s3_rewriter/output/rewritten/8b699c89-569d-4719-994d-b76f01bcde68/2.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/8b699c89-569d-4719-994d-b76f01bcde68/1.FULL_AUTO.groovy
index 57520a8..274f890 100644
--- a/tools/s3_rewriter/output/rewritten/8b699c89-569d-4719-994d-b76f01bcde68/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/8b699c89-569d-4719-994d-b76f01bcde68/1.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 8b699c89-569d-4719-994d-b76f01bcde68
// template_name: 周转(租赁)材料采购申请
-// seq : 2
+// seq : 1
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
addSubTableButton("STJH", "SELECT", 0);
diff --git a/tools/s3_rewriter/output/rewritten/f44b7503-07a6-4997-8fe0-837c6a125088/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8b699c89-569d-4719-994d-b76f01bcde68/2.NO_S3.groovy
similarity index 84%
rename from tools/s3_rewriter/output/rewritten/f44b7503-07a6-4997-8fe0-837c6a125088/1.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/8b699c89-569d-4719-994d-b76f01bcde68/2.NO_S3.groovy
index 7364bac..9d94d82 100644
--- a/tools/s3_rewriter/output/rewritten/f44b7503-07a6-4997-8fe0-837c6a125088/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8b699c89-569d-4719-994d-b76f01bcde68/2.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
-// template_id : f44b7503-07a6-4997-8fe0-837c6a125088
-// template_name: 周转(项目自购)材料采购申请
-// seq : 1
+// template_id : 8b699c89-569d-4719-994d-b76f01bcde68
+// template_name: 周转(租赁)材料采购申请
+// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
def isImport = GetServicesFunction.getEnumerateItemValue("YESNO",item['ISIMPORT']);
diff --git a/tools/s3_rewriter/output/rewritten/8b699c89-569d-4719-994d-b76f01bcde68/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8b699c89-569d-4719-994d-b76f01bcde68/3.NO_S3.groovy
index 96cc2af..f3060eb 100644
--- a/tools/s3_rewriter/output/rewritten/8b699c89-569d-4719-994d-b76f01bcde68/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8b699c89-569d-4719-994d-b76f01bcde68/3.NO_S3.groovy
@@ -4,22 +4,4 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def isImport = GetServicesFunction.getEnumerateItemValue("YESNO",item['ISIMPORT']);
-def status = GetServicesFunction.getEnumerateItemValue("WFSTATUS",item['STATUS']);
-
-if(status != 3){
- enableButton("确认进场完毕",false);
- enableButton("取消进场",false);
-}else{
- //true:可用;false:不可用
- switch(isImport){
- case 0:
- enableButton("确认进场完毕",true);
- enableButton("取消进场",false);
- break;
- default:
- enableButton("确认进场完毕",false);
- enableButton("取消进场",true);
- break;
- }
-}
\ No newline at end of file
+page.setDataFilter(["PM_TURNOVERMATERIALPURCHASEAPPLY_ID":PM_TURNOVERMATERIALPURCHASEAPPLY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
diff --git a/tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/1.NO_S3.groovy
similarity index 97%
rename from tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/3.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/1.NO_S3.groovy
index 4f8bc32..e82fa74 100644
--- a/tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/1.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 8c4a3b9f-0272-4675-8363-dd2f96a4f955
// template_name: 专业分包合同登记_需要评审(五建定制)
-// seq : 3
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
if(item['PROTOCOLTYPE'] == '谈判合同') {
diff --git a/tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/2.HARD.groovy
similarity index 89%
rename from tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/1.HARD.groovy
rename to tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/2.HARD.groovy
index cc6e3da..a998207 100644
--- a/tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/1.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/2.HARD.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 8c4a3b9f-0272-4675-8363-dd2f96a4f955
// template_name: 专业分包合同登记_需要评审(五建定制)
-// seq : 1
+// seq : 2
// label : HARD
// 硬 S3 原因 : 动态创建 Vaadin 组件
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
@@ -27,9 +27,9 @@ button.addClickListener(new Button.ClickListener() {
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') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
diff --git a/tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/3.FULL_AUTO.groovy
similarity index 86%
rename from tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/2.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/3.FULL_AUTO.groovy
index 3a6ad46..6edd33c 100644
--- a/tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/3.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 8c4a3b9f-0272-4675-8363-dd2f96a4f955
// template_name: 专业分包合同登记_需要评审(五建定制)
-// seq : 2
+// seq : 3
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def list = getFieldValue("ORGIDLIST");
diff --git a/tools/s3_rewriter/output/rewritten/8d7030a1-916e-40a0-8a79-44aee177af7d/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8d7030a1-916e-40a0-8a79-44aee177af7d/1.NO_S3.groovy
index 75978af..3e3a82f 100644
--- a/tools/s3_rewriter/output/rewritten/8d7030a1-916e-40a0-8a79-44aee177af7d/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8d7030a1-916e-40a0-8a79-44aee177af7d/1.NO_S3.groovy
@@ -6,5 +6,5 @@
// 处置 : 无 S3 模式,原样进 P4
def pojo = GetServicesFunction.loadPOJO(VIEW_PM_ARTIFICIALSUM_ID,"VIEW_PM_ARTIFICIALSUM",false);
page.setDataFilter(["PROJECTID" : pojo.get_Value("PROJECTID")]);
-page.setCaption(pojo.get_DisplayValue("PROJECTID", true, null)+ '-已关联人工');
-page.setId(VIEW_PM_ARTIFICIALSUM_ID + "VIEW_PM_ARTIFICIALSUM_ID_1");
\ No newline at end of file
+page.setCaption(pojo.get_DisplayValue("PROJECTID", true, null)+ '-未关联人工');
+page.setId(VIEW_PM_ARTIFICIALSUM_ID + "VIEW_PM_ARTIFICIALSUM_ID_2");
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/8d7030a1-916e-40a0-8a79-44aee177af7d/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8d7030a1-916e-40a0-8a79-44aee177af7d/2.NO_S3.groovy
index d40641b..ba8f450 100644
--- a/tools/s3_rewriter/output/rewritten/8d7030a1-916e-40a0-8a79-44aee177af7d/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8d7030a1-916e-40a0-8a79-44aee177af7d/2.NO_S3.groovy
@@ -4,7 +4,15 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def pojo = GetServicesFunction.loadPOJO(VIEW_PM_ARTIFICIALSUM_ID,"VIEW_PM_ARTIFICIALSUM",false);
-page.setDataFilter(["PROJECTID" : pojo.get_Value("PROJECTID")]);
-page.setCaption(pojo.get_DisplayValue("PROJECTID", true, null)+ '-未关联人工');
-page.setId(VIEW_PM_ARTIFICIALSUM_ID + "VIEW_PM_ARTIFICIALSUM_ID_2");
\ No newline at end of file
+if (item['UNRELATIONCOUNT'] != '0') {
+ enableButton("关联未关联人工",true);
+} else {
+ enableButton("关联未关联人工",false);
+}
+
+
+if (item['RELATIONCOUNT'] != '0') {
+ enableButton("修改已关联人工",true);
+} else {
+ enableButton("修改已关联人工",false);
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/8d7030a1-916e-40a0-8a79-44aee177af7d/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8d7030a1-916e-40a0-8a79-44aee177af7d/3.NO_S3.groovy
index 69f8909..313c5d3 100644
--- a/tools/s3_rewriter/output/rewritten/8d7030a1-916e-40a0-8a79-44aee177af7d/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8d7030a1-916e-40a0-8a79-44aee177af7d/3.NO_S3.groovy
@@ -4,15 +4,7 @@
// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-if (item['UNRELATIONCOUNT'] != '0') {
- enableButton("关联未关联人工",true);
-} else {
- enableButton("关联未关联人工",false);
-}
-
-
-if (item['RELATIONCOUNT'] != '0') {
- enableButton("修改已关联人工",true);
-} else {
- enableButton("修改已关联人工",false);
-}
\ No newline at end of file
+def pojo = GetServicesFunction.loadPOJO(VIEW_PM_ARTIFICIALSUM_ID,"VIEW_PM_ARTIFICIALSUM",false);
+page.setDataFilter(["PROJECTID" : pojo.get_Value("PROJECTID")]);
+page.setCaption(pojo.get_DisplayValue("PROJECTID", true, null)+ '-已关联人工');
+page.setId(VIEW_PM_ARTIFICIALSUM_ID + "VIEW_PM_ARTIFICIALSUM_ID_1");
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/8dabd087-ddc6-4750-903b-2be1e0d127f8/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/8dabd087-ddc6-4750-903b-2be1e0d127f8/1.FULL_AUTO.groovy
similarity index 63%
rename from tools/s3_rewriter/output/rewritten/8dabd087-ddc6-4750-903b-2be1e0d127f8/2.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/8dabd087-ddc6-4750-903b-2be1e0d127f8/1.FULL_AUTO.groovy
index 76a88df..aff424e 100644
--- a/tools/s3_rewriter/output/rewritten/8dabd087-ddc6-4750-903b-2be1e0d127f8/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/8dabd087-ddc6-4750-903b-2be1e0d127f8/1.FULL_AUTO.groovy
@@ -1,7 +1,13 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 8dabd087-ddc6-4750-903b-2be1e0d127f8
// template_name: 考勤月分析表
-// seq : 2
+// seq : 1
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
+
+
+def orgid = getFieldValue("ORGID");
+
+bindField("USERID",null);
+
bindField("ORGNAME",getFieldDisplay("ORGID"));
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/8dabd087-ddc6-4750-903b-2be1e0d127f8/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8dabd087-ddc6-4750-903b-2be1e0d127f8/2.NO_S3.groovy
similarity index 94%
rename from tools/s3_rewriter/output/rewritten/8dabd087-ddc6-4750-903b-2be1e0d127f8/1.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/8dabd087-ddc6-4750-903b-2be1e0d127f8/2.NO_S3.groovy
index a50bc58..a790895 100644
--- a/tools/s3_rewriter/output/rewritten/8dabd087-ddc6-4750-903b-2be1e0d127f8/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8dabd087-ddc6-4750-903b-2be1e0d127f8/2.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 8dabd087-ddc6-4750-903b-2be1e0d127f8
// template_name: 考勤月分析表
-// seq : 1
+// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
def endtime = getFieldValue("ENDDATE");
diff --git a/tools/s3_rewriter/output/rewritten/8dabd087-ddc6-4750-903b-2be1e0d127f8/4.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/8dabd087-ddc6-4750-903b-2be1e0d127f8/4.FULL_AUTO.groovy
index a3e7c6f..51b54e2 100644
--- a/tools/s3_rewriter/output/rewritten/8dabd087-ddc6-4750-903b-2be1e0d127f8/4.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/8dabd087-ddc6-4750-903b-2be1e0d127f8/4.FULL_AUTO.groovy
@@ -4,10 +4,4 @@
// seq : 4
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-
-
-def orgid = getFieldValue("ORGID");
-
-bindField("USERID",null);
-
bindField("ORGNAME",getFieldDisplay("ORGID"));
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/8dbb3d79-4f87-450a-90c4-8c81ccc8a10f/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8dbb3d79-4f87-450a-90c4-8c81ccc8a10f/2.NO_S3.groovy
index 7d37371..3ded2cc 100644
--- a/tools/s3_rewriter/output/rewritten/8dbb3d79-4f87-450a-90c4-8c81ccc8a10f/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8dbb3d79-4f87-450a-90c4-8c81ccc8a10f/2.NO_S3.groovy
@@ -4,4 +4,47 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["PROJECTID":PM_PROJECT_ID]);
+def project = GetServicesFunction.loadPOJO(item["PM_PROJECT_ID"],"PM_PROJECT",false);
+if(project != null){
+ def po = project?.toMap();
+ if(po["PROJECTSTAGE"]==10){//合同实施
+ enableButton("修改",false);//修改按钮不可用
+ }
+// if(!(po["PROJECTSTAGE"]==1)){//非工程收集阶段,则工程不能删除
+// enableButton("删除",false);//删除按钮不可用
+// }
+
+ if(po["PROJECTSTAGE"]==100){//工程竣工
+ enableButton("设置为工程竣工",false);//设置为工程竣工按钮不可用
+ }else if((po['STATUS']==3) && (po["PROJECTSTAGE"]!=100)){
+ enableButton("设置为工程竣工",true);//设置为工程竣工按钮可用
+ }
+// if((po['STATUS']==1) && !(po["PROJECTSTAGE"]==1)){//非工程收集阶段,且是未提交审批的记录不能提交审批
+// enableButton("提交审批",false);
+// }
+}else{
+ enableButton("修改",false);//修改按钮不可用
+ enableButton("删除",false);//删除按钮不可用
+ enableButton("设置为工程竣工",false);//设置为工程竣工按钮不可用
+ enableButton("提交审批",false);
+}
+
+//def projectStage = GetServicesFunction.getEnumerateItemDes("PM_PROJECT_PROJECTSTAGE",10);//工程阶段:合同实施
+//def projectStage1 = GetServicesFunction.getEnumerateItemDes("PM_PROJECT_PROJECTSTAGE",1);//工程阶段:工程收集
+//def projectStage2 = GetServicesFunction.getEnumerateItemDes("PM_PROJECT_PROJECTSTAGE",100);//工程阶段:工程竣工
+//
+//if(projectStage?.equals(item["PROJECTSTAGE"])){//合同实施
+// enableButton("修改",false);//修改按钮不可用
+//}
+//if(!projectStage1?.equals(item["PROJECTSTAGE"])){//非工程收集阶段,则工程不能删除
+// enableButton("删除",false);//删除按钮不可用
+//}
+//
+//if(projectStage2?.equals(item["PROJECTSTAGE"])){//工程竣工
+// enableButton("设置为工程竣工",false);//设置为工程竣工按钮不可用
+//}
+//
+//def status = GetServicesFunction.getEnumerateItemDes("WFSTATUS",1);//审批状态:未提交
+//if(status?.equals(item["STATUS"]) && !projectStage1?.equals(item["PROJECTSTAGE"])){//非工程收集阶段,且是未提交审批的记录不能提交审批
+// enableButton("提交审批",false);
+//}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/8dbb3d79-4f87-450a-90c4-8c81ccc8a10f/4.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/8dbb3d79-4f87-450a-90c4-8c81ccc8a10f/3.FULL_AUTO.groovy
similarity index 96%
rename from tools/s3_rewriter/output/rewritten/8dbb3d79-4f87-450a-90c4-8c81ccc8a10f/4.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/8dbb3d79-4f87-450a-90c4-8c81ccc8a10f/3.FULL_AUTO.groovy
index c8b0849..36a88a3 100644
--- a/tools/s3_rewriter/output/rewritten/8dbb3d79-4f87-450a-90c4-8c81ccc8a10f/4.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/8dbb3d79-4f87-450a-90c4-8c81ccc8a10f/3.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 8dbb3d79-4f87-450a-90c4-8c81ccc8a10f
// template_name: 招投标工程
-// seq : 4
+// seq : 3
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
diff --git a/tools/s3_rewriter/output/rewritten/8dbb3d79-4f87-450a-90c4-8c81ccc8a10f/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8dbb3d79-4f87-450a-90c4-8c81ccc8a10f/3.NO_S3.groovy
deleted file mode 100644
index 3db5788..0000000
--- a/tools/s3_rewriter/output/rewritten/8dbb3d79-4f87-450a-90c4-8c81ccc8a10f/3.NO_S3.groovy
+++ /dev/null
@@ -1,50 +0,0 @@
-// === EIP4 P4 脚本迁移产出 ===
-// template_id : 8dbb3d79-4f87-450a-90c4-8c81ccc8a10f
-// template_name: 招投标工程
-// seq : 3
-// label : NO_S3
-// 处置 : 无 S3 模式,原样进 P4
-def project = GetServicesFunction.loadPOJO(item["PM_PROJECT_ID"],"PM_PROJECT",false);
-if(project != null){
- def po = project?.toMap();
- if(po["PROJECTSTAGE"]==10){//合同实施
- enableButton("修改",false);//修改按钮不可用
- }
-// if(!(po["PROJECTSTAGE"]==1)){//非工程收集阶段,则工程不能删除
-// enableButton("删除",false);//删除按钮不可用
-// }
-
- if(po["PROJECTSTAGE"]==100){//工程竣工
- enableButton("设置为工程竣工",false);//设置为工程竣工按钮不可用
- }else if((po['STATUS']==3) && (po["PROJECTSTAGE"]!=100)){
- enableButton("设置为工程竣工",true);//设置为工程竣工按钮可用
- }
-// if((po['STATUS']==1) && !(po["PROJECTSTAGE"]==1)){//非工程收集阶段,且是未提交审批的记录不能提交审批
-// enableButton("提交审批",false);
-// }
-}else{
- enableButton("修改",false);//修改按钮不可用
- enableButton("删除",false);//删除按钮不可用
- enableButton("设置为工程竣工",false);//设置为工程竣工按钮不可用
- enableButton("提交审批",false);
-}
-
-//def projectStage = GetServicesFunction.getEnumerateItemDes("PM_PROJECT_PROJECTSTAGE",10);//工程阶段:合同实施
-//def projectStage1 = GetServicesFunction.getEnumerateItemDes("PM_PROJECT_PROJECTSTAGE",1);//工程阶段:工程收集
-//def projectStage2 = GetServicesFunction.getEnumerateItemDes("PM_PROJECT_PROJECTSTAGE",100);//工程阶段:工程竣工
-//
-//if(projectStage?.equals(item["PROJECTSTAGE"])){//合同实施
-// enableButton("修改",false);//修改按钮不可用
-//}
-//if(!projectStage1?.equals(item["PROJECTSTAGE"])){//非工程收集阶段,则工程不能删除
-// enableButton("删除",false);//删除按钮不可用
-//}
-//
-//if(projectStage2?.equals(item["PROJECTSTAGE"])){//工程竣工
-// enableButton("设置为工程竣工",false);//设置为工程竣工按钮不可用
-//}
-//
-//def status = GetServicesFunction.getEnumerateItemDes("WFSTATUS",1);//审批状态:未提交
-//if(status?.equals(item["STATUS"]) && !projectStage1?.equals(item["PROJECTSTAGE"])){//非工程收集阶段,且是未提交审批的记录不能提交审批
-// enableButton("提交审批",false);
-//}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/8dbb3d79-4f87-450a-90c4-8c81ccc8a10f/4.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8dbb3d79-4f87-450a-90c4-8c81ccc8a10f/4.NO_S3.groovy
new file mode 100644
index 0000000..27acb12
--- /dev/null
+++ b/tools/s3_rewriter/output/rewritten/8dbb3d79-4f87-450a-90c4-8c81ccc8a10f/4.NO_S3.groovy
@@ -0,0 +1,7 @@
+// === EIP4 P4 脚本迁移产出 ===
+// template_id : 8dbb3d79-4f87-450a-90c4-8c81ccc8a10f
+// template_name: 招投标工程
+// seq : 4
+// label : NO_S3
+// 处置 : 无 S3 模式,原样进 P4
+page.setDataFilter(["PROJECTID":PM_PROJECT_ID]);
diff --git a/tools/s3_rewriter/output/rewritten/8e0c3b85-9c29-40bf-b7d4-c636b9f6cc41/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/8e0c3b85-9c29-40bf-b7d4-c636b9f6cc41/1.FULL_AUTO.groovy
index 066ca15..3ca6fd4 100644
--- a/tools/s3_rewriter/output/rewritten/8e0c3b85-9c29-40bf-b7d4-c636b9f6cc41/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/8e0c3b85-9c29-40bf-b7d4-c636b9f6cc41/1.FULL_AUTO.groovy
@@ -11,14 +11,14 @@ def sql = "";
def projectId = getFieldValue("PROJECTID");
def orgId = getFieldValue("ORGID");
-if(projectId != null && projectId != '') {
+if(projectId != null && projectId != '') {
def project = GetServicesFunction.loadPOJO(projectId,"PM_PROJECT",false);
def prjnumber = project.get_Value("PROJECTCODE");
// sql = " p.userid in (select userid from pm_project_user where pm_projectid = '"+projectId+"')";
sql = " p.userid in (select userid from pm_project_user where pm_projectid = '"+projectId+"') and p.idcard in (select zjhm from gb_prj_worker where prjnumber = '"+prjnumber+"')";
-} else if(orgId != null && orgId != '') {
+} else if(orgId != null && orgId != '') {
sql = " p.userid in (select userid from pm_project_user where pm_projectid in (select pm_project_id from pm_project a where a.filiale = '"+orgId+"')) ";
sql += " and p.idcard in (select zjhm from gb_prj_worker where prjnumber in (select projectcode from pm_project b where b.filiale = '"+orgId+"'))";
}
diff --git a/tools/s3_rewriter/output/rewritten/8e0c3b85-9c29-40bf-b7d4-c636b9f6cc41/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/8e0c3b85-9c29-40bf-b7d4-c636b9f6cc41/2.FULL_AUTO.groovy
index 8e4c6c8..793aa22 100644
--- a/tools/s3_rewriter/output/rewritten/8e0c3b85-9c29-40bf-b7d4-c636b9f6cc41/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/8e0c3b85-9c29-40bf-b7d4-c636b9f6cc41/2.FULL_AUTO.groovy
@@ -10,8 +10,8 @@ def orgId = getFieldValue("ORGID");
def searchMap = [:];
def sql = "";
-if(orgId != null && orgId != '') {
- sql += " p.filiale = '" + orgId + "' and p.projectcode <> '' and p.projectcode in (select prjnumber from gb_projectinfo a where a.isactive = 1)";
+if(orgId != null && orgId != '') {
+ sql += " p.filiale = '" + orgId + "' and p.projectcode <> '' and p.projectcode in (select prjnumber from gb_projectinfo a where a.isactive = 1)";
searchMap["PM_PROJECT_ID"] = new CustomSearchConditional(sql);
setFieldFilter("PROJECTID", searchMap);
diff --git a/tools/s3_rewriter/output/rewritten/8f22ba0d-60c3-4f5a-8548-ed21529b83a1/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8f22ba0d-60c3-4f5a-8548-ed21529b83a1/1.NO_S3.groovy
index 613cabf..80bea0e 100644
--- a/tools/s3_rewriter/output/rewritten/8f22ba0d-60c3-4f5a-8548-ed21529b83a1/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8f22ba0d-60c3-4f5a-8548-ed21529b83a1/1.NO_S3.groovy
@@ -5,7 +5,7 @@
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
if(item['ISCOLLECTED']?.equals(GetServicesFunction.getEnumerateItemDes("YESNO",1))
-&&item['ISAUTH']?.equals(GetServicesFunction.getEnumerateItemDes("YESNO",1))){
+&&item['ISAUTH']?.equals(GetServicesFunction.getEnumerateItemDes("YESNO",1))){
enableButton("下发用户",true)
}else{
diff --git a/tools/s3_rewriter/output/rewritten/8f22cab7-e475-4c5e-b575-e45486a7b281/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8f22cab7-e475-4c5e-b575-e45486a7b281/1.NO_S3.groovy
index 9116a70..9e17de1 100644
--- a/tools/s3_rewriter/output/rewritten/8f22cab7-e475-4c5e-b575-e45486a7b281/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8f22cab7-e475-4c5e-b575-e45486a7b281/1.NO_S3.groovy
@@ -5,7 +5,7 @@
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
//只有未提交或重新提交状态才能删除及修改!
-if(item['STATUS'] !=null && item['STATUS'] !="重新提交" && item['STATUS'] !="未提交"){
+if(item['STATUS'] !=null && item['STATUS'] !="重新提交" && item['STATUS'] !="未提交"){
enableButton("删除",false);//删除不可用
enableButton("修改",false);//修改不可用
}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/8f22cab7-e475-4c5e-b575-e45486a7b281/3.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/8f22cab7-e475-4c5e-b575-e45486a7b281/2.FULL_AUTO.groovy
similarity index 78%
rename from tools/s3_rewriter/output/rewritten/8f22cab7-e475-4c5e-b575-e45486a7b281/3.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/8f22cab7-e475-4c5e-b575-e45486a7b281/2.FULL_AUTO.groovy
index 8933b59..19335a3 100644
--- a/tools/s3_rewriter/output/rewritten/8f22cab7-e475-4c5e-b575-e45486a7b281/3.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/8f22cab7-e475-4c5e-b575-e45486a7b281/2.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 8f22cab7-e475-4c5e-b575-e45486a7b281
// template_name: 印章使用申请
-// seq : 3
+// seq : 2
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
diff --git a/tools/s3_rewriter/output/rewritten/8f22cab7-e475-4c5e-b575-e45486a7b281/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/8f22cab7-e475-4c5e-b575-e45486a7b281/3.NO_S3.groovy
similarity index 94%
rename from tools/s3_rewriter/output/rewritten/8f22cab7-e475-4c5e-b575-e45486a7b281/2.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/8f22cab7-e475-4c5e-b575-e45486a7b281/3.NO_S3.groovy
index d28dae4..f5dbae2 100644
--- a/tools/s3_rewriter/output/rewritten/8f22cab7-e475-4c5e-b575-e45486a7b281/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/8f22cab7-e475-4c5e-b575-e45486a7b281/3.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 8f22cab7-e475-4c5e-b575-e45486a7b281
// template_name: 印章使用申请
-// seq : 2
+// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
page.setDataFilter(["OA_SEALUSEAPPLY_ID":OA_SEALUSEAPPLY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
diff --git a/tools/s3_rewriter/output/rewritten/8f95fff7-c534-4671-ac3b-53a3f017ef61/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/8f95fff7-c534-4671-ac3b-53a3f017ef61/1.FULL_AUTO.groovy
index 50dd92a..62edf9f 100644
--- a/tools/s3_rewriter/output/rewritten/8f95fff7-c534-4671-ac3b-53a3f017ef61/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/8f95fff7-c534-4671-ac3b-53a3f017ef61/1.FULL_AUTO.groovy
@@ -4,7 +4,54 @@
// seq : 1
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
-def list = getFieldValue("SCHEMEITEMLIST");
-def data = com.dsasp.server.common.util.StringUtil.convertListStrToSql(list);
-bindField("SCHEMEITEM", data);
+if(getFieldValue("ENDYEAR") == null && getFieldValue("ENDMONTH") == null){
+ clearFieldData("STARTYEAR");
+
+ def currentYear = GetDefaultValueFunction.currentYear();
+ def lastYear = currentYear - 7;
+ def nextYear = currentYear + 8;
+ for(i in lastYear..0){
balancedetails?.each{
- if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
+ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){
summoney = summoney.add(new BigDecimal(it.get('VALENCE')))
}
}
diff --git a/tools/s3_rewriter/output/rewritten/90ab3b6d-3ea7-45d9-99d3-29740545a842/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/90ab3b6d-3ea7-45d9-99d3-29740545a842/1.NO_S3.groovy
similarity index 97%
rename from tools/s3_rewriter/output/rewritten/90ab3b6d-3ea7-45d9-99d3-29740545a842/2.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/90ab3b6d-3ea7-45d9-99d3-29740545a842/1.NO_S3.groovy
index a04e4a8..c2de039 100644
--- a/tools/s3_rewriter/output/rewritten/90ab3b6d-3ea7-45d9-99d3-29740545a842/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/90ab3b6d-3ea7-45d9-99d3-29740545a842/1.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 90ab3b6d-3ea7-45d9-99d3-29740545a842
// template_name: 物资合同登记-需要评审(五建定制)
-// seq : 2
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
if(item['PROTOCOLTYPE'] == '谈判合同') {
diff --git a/tools/s3_rewriter/output/rewritten/90ab3b6d-3ea7-45d9-99d3-29740545a842/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/90ab3b6d-3ea7-45d9-99d3-29740545a842/2.HARD.groovy
similarity index 89%
rename from tools/s3_rewriter/output/rewritten/90ab3b6d-3ea7-45d9-99d3-29740545a842/1.HARD.groovy
rename to tools/s3_rewriter/output/rewritten/90ab3b6d-3ea7-45d9-99d3-29740545a842/2.HARD.groovy
index 8c288ea..1d6dd2e 100644
--- a/tools/s3_rewriter/output/rewritten/90ab3b6d-3ea7-45d9-99d3-29740545a842/1.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/90ab3b6d-3ea7-45d9-99d3-29740545a842/2.HARD.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 90ab3b6d-3ea7-45d9-99d3-29740545a842
// template_name: 物资合同登记-需要评审(五建定制)
-// seq : 1
+// seq : 2
// label : HARD
// 硬 S3 原因 : 动态创建 Vaadin 组件
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
@@ -31,9 +31,9 @@ button.addClickListener(new Button.ClickListener() {
public void buttonClick(Button.ClickEvent event) {
def meterialDetails = getFieldValue("MATERIALDETAILS");
def summoney = new BigDecimal("0");;
- if(meterialDetails != null && meterialDetails.size()>0){
+ if(meterialDetails != null && meterialDetails.size()>0){
meterialDetails?.each{
- if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
+ if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
summoney = summoney.add(new BigDecimal(it.get('TOTAL')))
}
}
diff --git a/tools/s3_rewriter/output/rewritten/90b182aa-4d0f-4e26-a516-0acfc714e9c8/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/90b182aa-4d0f-4e26-a516-0acfc714e9c8/1.NO_S3.groovy
index ddea431..71bb051 100644
--- a/tools/s3_rewriter/output/rewritten/90b182aa-4d0f-4e26-a516-0acfc714e9c8/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/90b182aa-4d0f-4e26-a516-0acfc714e9c8/1.NO_S3.groovy
@@ -4,4 +4,8 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-page.setDataFilter(["OA_OFFICE_PURCHASEAPPLY_ID":OA_OFFICE_PURCHASEAPPLY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
+//只有未提交或重新提交状态才能删除及修改!
+if(item['STATUS'] !=null && item['STATUS'] !="重新提交" && item['STATUS'] !="未提交"){
+ enableButton("删除",false);//删除不可用
+ enableButton("修改",false);//修改不可用
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/90b182aa-4d0f-4e26-a516-0acfc714e9c8/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/90b182aa-4d0f-4e26-a516-0acfc714e9c8/2.NO_S3.groovy
new file mode 100644
index 0000000..e7b40cb
--- /dev/null
+++ b/tools/s3_rewriter/output/rewritten/90b182aa-4d0f-4e26-a516-0acfc714e9c8/2.NO_S3.groovy
@@ -0,0 +1,7 @@
+// === EIP4 P4 脚本迁移产出 ===
+// template_id : 90b182aa-4d0f-4e26-a516-0acfc714e9c8
+// template_name: 办公用品采购申请
+// seq : 2
+// label : NO_S3
+// 处置 : 无 S3 模式,原样进 P4
+page.setDataFilter(["OA_OFFICE_PURCHASEAPPLY_ID":OA_OFFICE_PURCHASEAPPLY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
diff --git a/tools/s3_rewriter/output/rewritten/90b182aa-4d0f-4e26-a516-0acfc714e9c8/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/90b182aa-4d0f-4e26-a516-0acfc714e9c8/3.FULL_AUTO.groovy
similarity index 94%
rename from tools/s3_rewriter/output/rewritten/90b182aa-4d0f-4e26-a516-0acfc714e9c8/2.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/90b182aa-4d0f-4e26-a516-0acfc714e9c8/3.FULL_AUTO.groovy
index 4ac9bed..3e9267c 100644
--- a/tools/s3_rewriter/output/rewritten/90b182aa-4d0f-4e26-a516-0acfc714e9c8/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/90b182aa-4d0f-4e26-a516-0acfc714e9c8/3.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 90b182aa-4d0f-4e26-a516-0acfc714e9c8
// template_name: 办公用品采购申请
-// seq : 2
+// seq : 3
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
addSubTableButton("GOODSDETAIL", "SELECT", 0);
diff --git a/tools/s3_rewriter/output/rewritten/90b182aa-4d0f-4e26-a516-0acfc714e9c8/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/90b182aa-4d0f-4e26-a516-0acfc714e9c8/3.NO_S3.groovy
deleted file mode 100644
index 4ddfca9..0000000
--- a/tools/s3_rewriter/output/rewritten/90b182aa-4d0f-4e26-a516-0acfc714e9c8/3.NO_S3.groovy
+++ /dev/null
@@ -1,11 +0,0 @@
-// === EIP4 P4 脚本迁移产出 ===
-// template_id : 90b182aa-4d0f-4e26-a516-0acfc714e9c8
-// template_name: 办公用品采购申请
-// seq : 3
-// label : NO_S3
-// 处置 : 无 S3 模式,原样进 P4
-//只有未提交或重新提交状态才能删除及修改!
-if(item['STATUS'] !=null && item['STATUS'] !="重新提交" && item['STATUS'] !="未提交"){
- enableButton("删除",false);//删除不可用
- enableButton("修改",false);//修改不可用
-}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/1.HARD.groovy
index 313dd78..9be0419 100644
--- a/tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/1.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/1.HARD.groovy
@@ -18,7 +18,7 @@ bindField("FIRSTPARTY",GetDefaultValueFunction.getConfigValue("com.dsasp.server.
returnCol.add("RATEVALUE");
def sql = "select PM_MATERIALCONTRACTREGISTERCONFIG_ID,'"+PM_MATERIALCONTRACTREGISTER_ID+"' as MATERIALCONTRACTREGISTERID,'' as MATERIALCONTRACTREGISTERID_DISPLAY__,codevalue as rateitem,";
- sql += " case when rowcount > 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a ";
+ sql += " case when rowcount > 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a ";
sql += " left outer join PM_MATERIALCONTRACTREGISTERCONFIG b on a.codevalue = b.rateitem and MATERIALCONTRACTREGISTERID = '"+PM_MATERIALCONTRACTREGISTER_ID+"'";
sql += " left outer join (";
sql += " select count(rateitem) AS rowcount,MATERIALCONTRACTREGISTERID from PM_MATERIALCONTRACTREGISTERCONFIG where MATERIALCONTRACTREGISTERID = '"+PM_MATERIALCONTRACTREGISTER_ID+"'";
@@ -28,8 +28,8 @@ bindField("FIRSTPARTY",GetDefaultValueFunction.getConfigValue("com.dsasp.server.
def list = GetServicesFunction.listSelectResultBySql(map,"PM_MATERIALCONTRACTREGISTERCONFIG",sql,returnCol);
- if(list!=null && list.size()>0){
- for(i in 0..<list.size()){
+ if(list!=null && list.size()>0){
+ for(i in 0..0){
meterialDetails?.each{
- if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
+ if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
summoney = summoney.add(new BigDecimal(it.get('TOTAL')))
}
}
diff --git a/tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/3.HARD.groovy b/tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/2.HARD.groovy
similarity index 89%
rename from tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/3.HARD.groovy
rename to tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/2.HARD.groovy
index 75046f0..d3d3f79 100644
--- a/tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/3.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/2.HARD.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 91497e54-702d-47a7-bbcd-3f5d67b6fd91
// template_name: 物资合同登记-不需要评审(五建定制)
-// seq : 3
+// seq : 2
// label : HARD
// 硬 S3 原因 : 动态创建 Vaadin 组件
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
@@ -31,9 +31,9 @@ button.addClickListener(new Button.ClickListener() {
public void buttonClick(Button.ClickEvent event) {
def meterialDetails = getFieldValue("MATERIALDETAILS");
def summoney = new BigDecimal("0");;
- if(meterialDetails != null && meterialDetails.size()>0){
+ if(meterialDetails != null && meterialDetails.size()>0){
meterialDetails?.each{
- if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
+ if(it.get('TOTAL') !=null && it.get('TOTAL') !=""){
summoney = summoney.add(new BigDecimal(it.get('TOTAL')))
}
}
diff --git a/tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/3.NO_S3.groovy
similarity index 95%
rename from tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/2.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/3.NO_S3.groovy
index f89342e..ba8365b 100644
--- a/tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/3.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 91497e54-702d-47a7-bbcd-3f5d67b6fd91
// template_name: 物资合同登记-不需要评审(五建定制)
-// seq : 2
+// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
if(item["PUTONRECORD"] == "是"){
diff --git a/tools/s3_rewriter/output/rewritten/919dc174-e44a-45fc-8d1c-0b1119ad512c/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/919dc174-e44a-45fc-8d1c-0b1119ad512c/1.FULL_AUTO.groovy
index 42f2735..8e922fa 100644
--- a/tools/s3_rewriter/output/rewritten/919dc174-e44a-45fc-8d1c-0b1119ad512c/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/919dc174-e44a-45fc-8d1c-0b1119ad512c/1.FULL_AUTO.groovy
@@ -5,7 +5,7 @@
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
import com.dsasp.server.common.dataDic.bean.CustomSearchConditional;
-def strSql = " P.PROJECTSTAGE >= 10";//条件1:工程阶段>=合同实施阶段(10)
+def strSql = " P.PROJECTSTAGE >= 10";//条件1:工程阶段>=合同实施阶段(10)
def searchMap = ["PROJECTSTAGE":new CustomSearchConditional(strSql)];
setFieldFilter("PROJECTID", searchMap);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/92072d44-33e8-4110-a8cc-aeb8ae300ef5/3.PARTIAL.groovy b/tools/s3_rewriter/output/rewritten/92072d44-33e8-4110-a8cc-aeb8ae300ef5/2.PARTIAL.groovy
similarity index 96%
rename from tools/s3_rewriter/output/rewritten/92072d44-33e8-4110-a8cc-aeb8ae300ef5/3.PARTIAL.groovy
rename to tools/s3_rewriter/output/rewritten/92072d44-33e8-4110-a8cc-aeb8ae300ef5/2.PARTIAL.groovy
index b0f379d..e9c8b2c 100644
--- a/tools/s3_rewriter/output/rewritten/92072d44-33e8-4110-a8cc-aeb8ae300ef5/3.PARTIAL.groovy
+++ b/tools/s3_rewriter/output/rewritten/92072d44-33e8-4110-a8cc-aeb8ae300ef5/2.PARTIAL.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 92072d44-33e8-4110-a8cc-aeb8ae300ef5
// template_name: 月度检查整改
-// seq : 3
+// seq : 2
// label : PARTIAL
// 余留模式 : raw .comboBox 组件访问; 残留字段句柄链(未覆盖动词)
// 处置 : 大部分已自动改写,余留行人工补全(见作业单)
diff --git a/tools/s3_rewriter/output/rewritten/92072d44-33e8-4110-a8cc-aeb8ae300ef5/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/92072d44-33e8-4110-a8cc-aeb8ae300ef5/3.NO_S3.groovy
similarity index 94%
rename from tools/s3_rewriter/output/rewritten/92072d44-33e8-4110-a8cc-aeb8ae300ef5/2.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/92072d44-33e8-4110-a8cc-aeb8ae300ef5/3.NO_S3.groovy
index 7a34774..9effc45 100644
--- a/tools/s3_rewriter/output/rewritten/92072d44-33e8-4110-a8cc-aeb8ae300ef5/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/92072d44-33e8-4110-a8cc-aeb8ae300ef5/3.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 92072d44-33e8-4110-a8cc-aeb8ae300ef5
// template_name: 月度检查整改
-// seq : 2
+// seq : 3
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
page.setDataFilter(["PM_PUB_CHECKQUARTER_ID":PM_PUB_CHECKQUARTER_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
diff --git a/tools/s3_rewriter/output/rewritten/938201e3-e6b1-4b46-b536-e195f5cfb90f/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/938201e3-e6b1-4b46-b536-e195f5cfb90f/1.NO_S3.groovy
new file mode 100644
index 0000000..b389a14
--- /dev/null
+++ b/tools/s3_rewriter/output/rewritten/938201e3-e6b1-4b46-b536-e195f5cfb90f/1.NO_S3.groovy
@@ -0,0 +1,27 @@
+// === EIP4 P4 脚本迁移产出 ===
+// template_id : 938201e3-e6b1-4b46-b536-e195f5cfb90f
+// template_name: 开标结果登记
+// seq : 1
+// label : NO_S3
+// 处置 : 无 S3 模式,原样进 P4
+enableButton("修改",false);
+enableButton("删除",false);
+def register = GetServicesFunction.loadPOJO(item['PM_BIDOPENINGRESULTREGISTER_ID'],'PM_BIDOPENINGRESULTREGISTER',false)
+if(register != null){
+ def proj = GetServicesFunction.loadPOJO(register.get_Value("PM_PROJECTID"),'PM_PROJECT',false)
+ if(proj != null && (proj.get_Value("PROJECTSTAGE")==-1 || proj.get_Value("PROJECTSTAGE") == 8)){
+ if(item['STATUS'] == "未提交" || item['STATUS'] == "重新提交" ){
+ enableButton("修改",true);
+ enableButton("删除",true);
+ }
+ }
+}
+if(item['ISSUCCESSFUL'] != "否"){//是否中标
+ enableButton("查看未中标信息",false);//查看未中标信息按钮不可用
+}
+
+if(item['ISAFFIRM'] == "是"){//已确认
+ enableButton("确认",false);//确认按钮不可用
+}else{
+ enableButton("确认",true);
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/938201e3-e6b1-4b46-b536-e195f5cfb90f/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/938201e3-e6b1-4b46-b536-e195f5cfb90f/2.NO_S3.groovy
index 16f89f6..ae76d9d 100644
--- a/tools/s3_rewriter/output/rewritten/938201e3-e6b1-4b46-b536-e195f5cfb90f/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/938201e3-e6b1-4b46-b536-e195f5cfb90f/2.NO_S3.groovy
@@ -4,24 +4,4 @@
// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-enableButton("修改",false);
-enableButton("删除",false);
-def register = GetServicesFunction.loadPOJO(item['PM_BIDOPENINGRESULTREGISTER_ID'],'PM_BIDOPENINGRESULTREGISTER',false)
-if(register != null){
- def proj = GetServicesFunction.loadPOJO(register.get_Value("PM_PROJECTID"),'PM_PROJECT',false)
- if(proj != null && (proj.get_Value("PROJECTSTAGE")==-1 || proj.get_Value("PROJECTSTAGE") == 8)){
- if(item['STATUS'] == "未提交" || item['STATUS'] == "重新提交" ){
- enableButton("修改",true);
- enableButton("删除",true);
- }
- }
-}
-if(item['ISSUCCESSFUL'] != "否"){//是否中标
- enableButton("查看未中标信息",false);//查看未中标信息按钮不可用
-}
-
-if(item['ISAFFIRM'] == "是"){//已确认
- enableButton("确认",false);//确认按钮不可用
-}else{
- enableButton("确认",true);
-}
\ No newline at end of file
+setFieldReadOnly("PM_PROJECTID",true);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/938201e3-e6b1-4b46-b536-e195f5cfb90f/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/938201e3-e6b1-4b46-b536-e195f5cfb90f/3.HARD.groovy
similarity index 88%
rename from tools/s3_rewriter/output/rewritten/938201e3-e6b1-4b46-b536-e195f5cfb90f/1.HARD.groovy
rename to tools/s3_rewriter/output/rewritten/938201e3-e6b1-4b46-b536-e195f5cfb90f/3.HARD.groovy
index 8c77a97..7fec8c1 100644
--- a/tools/s3_rewriter/output/rewritten/938201e3-e6b1-4b46-b536-e195f5cfb90f/1.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/938201e3-e6b1-4b46-b536-e195f5cfb90f/3.HARD.groovy
@@ -1,14 +1,14 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 938201e3-e6b1-4b46-b536-e195f5cfb90f
// template_name: 开标结果登记
-// seq : 1
+// seq : 3
// label : HARD
// 硬 S3 原因 : 动态创建 Vaadin 组件
// 处置 : 原文保留,进人工排期(amis dialog/service 重写)
import com.vaadin.ui.Link;
import com.vaadin.server.ExternalResource;
def url = group.getField("RESULTURL");
-if(url.getValue()!= null && url?.isReadOnly()){
+if(url.getValue()!= null && url?.isReadOnly()){
Link link = new Link("公示链接",
new ExternalResource(url.getValue()));
link.setTargetName("_blank")
diff --git a/tools/s3_rewriter/output/rewritten/938201e3-e6b1-4b46-b536-e195f5cfb90f/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/938201e3-e6b1-4b46-b536-e195f5cfb90f/3.NO_S3.groovy
deleted file mode 100644
index f105b49..0000000
--- a/tools/s3_rewriter/output/rewritten/938201e3-e6b1-4b46-b536-e195f5cfb90f/3.NO_S3.groovy
+++ /dev/null
@@ -1,7 +0,0 @@
-// === EIP4 P4 脚本迁移产出 ===
-// template_id : 938201e3-e6b1-4b46-b536-e195f5cfb90f
-// template_name: 开标结果登记
-// seq : 3
-// label : NO_S3
-// 处置 : 无 S3 模式,原样进 P4
-setFieldReadOnly("PM_PROJECTID",true);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/93a3c6d5-bdda-4fbc-b1f3-a496aea19575/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/93a3c6d5-bdda-4fbc-b1f3-a496aea19575/1.FULL_AUTO.groovy
similarity index 85%
rename from tools/s3_rewriter/output/rewritten/93a3c6d5-bdda-4fbc-b1f3-a496aea19575/2.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/93a3c6d5-bdda-4fbc-b1f3-a496aea19575/1.FULL_AUTO.groovy
index 85618b0..9edcc78 100644
--- a/tools/s3_rewriter/output/rewritten/93a3c6d5-bdda-4fbc-b1f3-a496aea19575/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/93a3c6d5-bdda-4fbc-b1f3-a496aea19575/1.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 93a3c6d5-bdda-4fbc-b1f3-a496aea19575
// template_name: 物资采购订单(土建)
-// seq : 2
+// seq : 1
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
addSubTableButton("ORDERSDETAILS", "SELECT", 0);
diff --git a/tools/s3_rewriter/output/rewritten/93a3c6d5-bdda-4fbc-b1f3-a496aea19575/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/93a3c6d5-bdda-4fbc-b1f3-a496aea19575/2.NO_S3.groovy
similarity index 90%
rename from tools/s3_rewriter/output/rewritten/93a3c6d5-bdda-4fbc-b1f3-a496aea19575/1.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/93a3c6d5-bdda-4fbc-b1f3-a496aea19575/2.NO_S3.groovy
index ec214cb..c1825e4 100644
--- a/tools/s3_rewriter/output/rewritten/93a3c6d5-bdda-4fbc-b1f3-a496aea19575/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/93a3c6d5-bdda-4fbc-b1f3-a496aea19575/2.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 93a3c6d5-bdda-4fbc-b1f3-a496aea19575
// template_name: 物资采购订单(土建)
-// seq : 1
+// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
page.setDataFilter(["PM_MATERIALPURCHASEORDERS_TJ_ID":PM_MATERIALPURCHASEORDERS_TJ_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
diff --git a/tools/s3_rewriter/output/rewritten/93a3c6d5-bdda-4fbc-b1f3-a496aea19575/4.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/93a3c6d5-bdda-4fbc-b1f3-a496aea19575/4.NO_S3.groovy
index 2e28aee..a3b2951 100644
--- a/tools/s3_rewriter/output/rewritten/93a3c6d5-bdda-4fbc-b1f3-a496aea19575/4.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/93a3c6d5-bdda-4fbc-b1f3-a496aea19575/4.NO_S3.groovy
@@ -16,7 +16,7 @@ switch(ordersStatus){
strSql += " where datastatus = 3 and a.pm_materialpurchaseorders_tj_id = '" + item['PM_MATERIALPURCHASEORDERS_TJ_ID'] + "'";
def applycount = GetServicesFunction.findCount(strSql);
- if(applycount > 0){
+ if(applycount > 0){
enableButton("确认下单",true);
}else{
enableButton("确认下单",false);
@@ -36,7 +36,7 @@ switch(ordersStatus){
sqlStr += " and pm_materialpurchaseordersdetails_tj_id in (SELECT ordersdetails_tj_id from PM_PROJECTIMPORT_TJ)";
def count = GetServicesFunction.findCount(sqlStr);
- if(count > 0){
+ if(count > 0){
enableButton("取消下单",false);
enableButton("作废",false);
}else{
diff --git a/tools/s3_rewriter/output/rewritten/93af07e6-e00b-4908-a61f-49d455370301/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/93af07e6-e00b-4908-a61f-49d455370301/1.NO_S3.groovy
index 22300a7..71e58ef 100644
--- a/tools/s3_rewriter/output/rewritten/93af07e6-e00b-4908-a61f-49d455370301/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/93af07e6-e00b-4908-a61f-49d455370301/1.NO_S3.groovy
@@ -4,24 +4,14 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-if(getFieldValue("PROJECTID")!=null){
- def sql1 = "select coalesce(sum(p.CONTRACTMONEY),0) as TOTALCONTROLCOST from( ";
- sql1 += "select case when c.pm_plannedcostchange_id is null then coalesce(pp.MECHANICALPLANCOST,0)";
- sql1 += "else coalesce(c.MECHANICALPLANCOSTNOW,0) end as CONTRACTMONEY ";
- sql1 += "from PM_PLANNEDCOSTDECLARATION pp ";
- sql1 += "join SYS_DATASTATUS s on s.businesskey=pp.PM_PLANNEDCOSTDECLARATION_id and s.tablename = 'PM_PLANNEDCOSTDECLARATION'and s.DATASTATUS = 3 ";
- sql1 += "left join lateral(select PM_PLANNEDCOSTCHANGE_id,MECHANICALPLANCOSTNOW,PM_PROJECTID ";
- sql1 += "from PM_PLANNEDCOSTCHANGE p join SYS_DATASTATUS s on s.businesskey=p.PM_PLANNEDCOSTCHANGE_id ";
- sql1 += "and s.tablename = 'PM_PLANNEDCOSTCHANGE'and s.DATASTATUS = 3 where p.PM_PROJECTID = pp.PM_PROJECTID order by p.CHANGEDATE desc,p.createtime desc limit 1)c on true ";
- sql1 += "where pp.PM_PROJECTID = '"+getFieldValue("PROJECTID")+"')p ";
- def map1 = GetServicesFunction.executeQueryForMap(sql1);
- if(map1 != null){
- bindField("TOTALCONTROLCOST",map1.get("TOTALCONTROLCOST"));
- };
- def sql2 = "select coalesce(sum(v.CONTRACTMONEY),0) as TOTALCONTRACTMONEY from VIEW_PM_CONTRACT v ";
- sql2 += "where v.CONTRACTTYPE = 4 and v.PM_PROJECT_ID = '"+getFieldValue("PROJECTID")+"' ";
- def map2 = GetServicesFunction.executeQueryForMap(sql2);
- if(map2 != null){
- bindField("TOTALCONTRACTMONEY",map2.get("TOTALCONTRACTMONEY"));
- };
+def ordersStatus = GetServicesFunction.getEnumerateItemValue("WFSTATUS",item['STATUS']);
+if(ordersStatus == 3 && item['ISREGISTER'] =="否"){
+ enableButton("作废",true);
+}else if(ordersStatus == 6){
+ enableButton("作废",false);
+ enableButton("修改",false);
+ enableButton("删除",false);
+ enableButton("提交审批",false);
+}else{
+ enableButton("作废",false);
}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/93af07e6-e00b-4908-a61f-49d455370301/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/93af07e6-e00b-4908-a61f-49d455370301/3.NO_S3.groovy
new file mode 100644
index 0000000..4623912
--- /dev/null
+++ b/tools/s3_rewriter/output/rewritten/93af07e6-e00b-4908-a61f-49d455370301/3.NO_S3.groovy
@@ -0,0 +1,36 @@
+// === EIP4 P4 脚本迁移产出 ===
+// template_id : 93af07e6-e00b-4908-a61f-49d455370301
+// template_name: 机械合同评审(五建定制)
+// seq : 3
+// label : NO_S3
+// 处置 : 无 S3 模式,原样进 P4
+bindField("A_PART",GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY"));
+
+ def ratelist = [];
+ def returnCol = [];
+ def PM_MACHINECONTRACTVIEWCONFIG_ID = null;
+ def PM_MACHINECONTRACTREVIEW_ID = null;
+ returnCol.add("PM_MACHINECONTRACTVIEWCONFIG_ID");
+ returnCol.add("MACHINECONTRACTVIEWID");
+ returnCol.add("RATEITEM");
+ returnCol.add("RATEVALUE");
+
+ def sql = "select PM_MACHINECONTRACTVIEWCONFIG_ID,'"+PM_MACHINECONTRACTREVIEW_ID+"' as MACHINECONTRACTVIEWID,'' as MACHINECONTRACTVIEWID_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_MACHINECONTRACTVIEWCONFIG b on a.codevalue = b.rateitem and MACHINECONTRACTVIEWID = '"+PM_MACHINECONTRACTREVIEW_ID+"'";
+ sql += " left outer join (";
+ sql += " select count(rateitem) AS rowcount,MACHINECONTRACTVIEWID from PM_MACHINECONTRACTVIEWCONFIG where MACHINECONTRACTVIEWID = '"+PM_MACHINECONTRACTREVIEW_ID+"'";
+ sql += " Group by MACHINECONTRACTVIEWID) as temp1 on b.MACHINECONTRACTVIEWID = temp1.MACHINECONTRACTVIEWID";
+ 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_MACHINECONTRACTVIEWCONFIG",sql,returnCol);
+
+ if(list!=null && list.size()>0){
+ for(i in 0..项目部质量管理目标、指标及管理方案");
horLayout?.addComponent(label);
horLayout?.setExpandRatio(label, 1.0f);
diff --git a/tools/s3_rewriter/output/rewritten/99d77f69-b08f-49d3-937a-2ad8fcb5ca6f/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/99d77f69-b08f-49d3-937a-2ad8fcb5ca6f/1.NO_S3.groovy
index 42f4073..9867da9 100644
--- a/tools/s3_rewriter/output/rewritten/99d77f69-b08f-49d3-937a-2ad8fcb5ca6f/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/99d77f69-b08f-49d3-937a-2ad8fcb5ca6f/1.NO_S3.groovy
@@ -4,15 +4,55 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def searchMap=[:];
-def solvelist=[];
-searchMap["SYS_ENUMERATETYPE_ID"] = 'HR_EMPLOYEE_STATUS';
-//searchMap["CODEDES"]=["处理中","已派工"];
-searchMap["CODEVALUE"]=[1,4,5];
-def list = GetServicesFunction.listSelectResult(searchMap,"SYS_ENUMERATE");
-if(list!=null && list.size()>0){
- list.each{
- solvelist.add(it.get_ID());
- }
+if(item["USERMODETEXT"]=="已注销"){
+ enableButton("修改",false);
+ enableButton("借用登记",false);
+ enableButton("归还登记",false);
+ enableButton("继续教育",false);
+
+ enableButton("添加",true);
+ enableButton("删除",true);
+ enableButton("查看",true);
+}else if(item["USERMODETEXT"]=="已转出"){
+ enableButton("修改",false);
+ enableButton("借用登记",false);
+ enableButton("归还登记",false);
+ enableButton("继续教育",false);
+
+ enableButton("添加",true);
+ enableButton("删除",true);
+ enableButton("查看",true);
+}else if(item["USERMODETEXT"]=="使用中"){
+ enableButton("修改",true);
+ enableButton("借用登记",false);
+ enableButton("归还登记",true);
+ enableButton("继续教育",true);
+
+ enableButton("添加",true);
+ enableButton("删除",false);
+ enableButton("查看",true);
+}else if(item["USERMODETEXT"]=="空闲"){
+ enableButton("修改",true);
+ enableButton("借用登记",true);
+ enableButton("归还登记",false);
+ enableButton("继续教育",true);
+
+ enableButton("添加",true);
+ enableButton("删除",true);
+ enableButton("查看",true);
+}else{
+ enableButton("修改",true);
+ enableButton("借用登记",false);
+ enableButton("归还登记",false);
+ enableButton("继续教育",false);
+
+ enableButton("添加",true);
+ enableButton("删除",false);
+ enableButton("查看",true);
}
-bindField("JOBSTATUSS",solvelist);
\ No newline at end of file
+
+def dow = GetDefaultValueFunction.getConfigValue("com.dsasp.pm.projectbasemanager.ISUSERCARDWINDOW")== null?1:Integer.parseInt(GetDefaultValueFunction.getConfigValue("com.dsasp.pm.projectbasemanager.ISUSERCARDWINDOW"));
+if(dow==1){//1:启用(通过招投标和总包合同备案控制证书状态)。
+ enableButton("借用登记",false);
+ enableButton("归还登记",false);
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/99d77f69-b08f-49d3-937a-2ad8fcb5ca6f/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/99d77f69-b08f-49d3-937a-2ad8fcb5ca6f/2.NO_S3.groovy
similarity index 90%
rename from tools/s3_rewriter/output/rewritten/99d77f69-b08f-49d3-937a-2ad8fcb5ca6f/3.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/99d77f69-b08f-49d3-937a-2ad8fcb5ca6f/2.NO_S3.groovy
index 6cbfc61..779e960 100644
--- a/tools/s3_rewriter/output/rewritten/99d77f69-b08f-49d3-937a-2ad8fcb5ca6f/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/99d77f69-b08f-49d3-937a-2ad8fcb5ca6f/2.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 99d77f69-b08f-49d3-937a-2ad8fcb5ca6f
// template_name: 十大员证
-// seq : 3
+// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
//证书ID
@@ -24,8 +24,8 @@ def result=[];
def sql="select BORROWUSE,BORROWDATE,PREDICTRETURNDATE,RETURNDATE,DEPOSITPLACE,BORROWREASON from HR_CARDBORROWREGISTER ";
sql+="where CARDID='"+CARDID+"'";
def list=GetServicesFunction.listSelectResultBySql(Map,"HR_CARDBORROWREGISTER",sql,con);
-if(list!=null&&list.size()>0){
- for(i in 0..<list.size()){
+if(list!=null&&list.size()>0){
+ for(i in 0..0){
+ list.each{
+ solvelist.add(it.get_ID());
+ }
+}
+bindField("JOBSTATUSS",solvelist);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/99d77f69-b08f-49d3-937a-2ad8fcb5ca6f/2.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/99d77f69-b08f-49d3-937a-2ad8fcb5ca6f/5.FULL_AUTO.groovy
similarity index 83%
rename from tools/s3_rewriter/output/rewritten/99d77f69-b08f-49d3-937a-2ad8fcb5ca6f/2.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/99d77f69-b08f-49d3-937a-2ad8fcb5ca6f/5.FULL_AUTO.groovy
index 9c7f208..f001c32 100644
--- a/tools/s3_rewriter/output/rewritten/99d77f69-b08f-49d3-937a-2ad8fcb5ca6f/2.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/99d77f69-b08f-49d3-937a-2ad8fcb5ca6f/5.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 99d77f69-b08f-49d3-937a-2ad8fcb5ca6f
// template_name: 十大员证
-// seq : 2
+// seq : 5
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def searchMap=[:];
diff --git a/tools/s3_rewriter/output/rewritten/9b0ea26a-26a3-4dd2-be5e-2b18e7837005/3.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/9b0ea26a-26a3-4dd2-be5e-2b18e7837005/2.NO_S3.groovy
similarity index 94%
rename from tools/s3_rewriter/output/rewritten/9b0ea26a-26a3-4dd2-be5e-2b18e7837005/3.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/9b0ea26a-26a3-4dd2-be5e-2b18e7837005/2.NO_S3.groovy
index 587f391..d1b0df4 100644
--- a/tools/s3_rewriter/output/rewritten/9b0ea26a-26a3-4dd2-be5e-2b18e7837005/3.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/9b0ea26a-26a3-4dd2-be5e-2b18e7837005/2.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 9b0ea26a-26a3-4dd2-be5e-2b18e7837005
// template_name: 项目付款申请
-// seq : 3
+// seq : 2
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
if(item['STATUS'] =="通过"){
diff --git a/tools/s3_rewriter/output/rewritten/9b0ea26a-26a3-4dd2-be5e-2b18e7837005/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/9b0ea26a-26a3-4dd2-be5e-2b18e7837005/3.HARD.groovy
similarity index 83%
rename from tools/s3_rewriter/output/rewritten/9b0ea26a-26a3-4dd2-be5e-2b18e7837005/2.HARD.groovy
rename to tools/s3_rewriter/output/rewritten/9b0ea26a-26a3-4dd2-be5e-2b18e7837005/3.HARD.groovy
index 84046fc..58321bc 100644
--- a/tools/s3_rewriter/output/rewritten/9b0ea26a-26a3-4dd2-be5e-2b18e7837005/2.HARD.groovy
+++ b/tools/s3_rewriter/output/rewritten/9b0ea26a-26a3-4dd2-be5e-2b18e7837005/3.HARD.groovy
@@ -1,13 +1,13 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 9b0ea26a-26a3-4dd2-be5e-2b18e7837005
// template_name: 项目付款申请
-// seq : 2
+// seq : 3
// 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("入库金额(元)");
+def label5 = new Label("超出控制金额后,本次申请付款金额以红色字体显示");
label4.setContentMode(Label.CONTENT_XHTML);
@@ -17,12 +17,12 @@ 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){
+if(formLayout5.getComponentCount()>1){
formLayout5.removeComponent(formLayout5.getComponent(1));
}
formLayout5.addComponent(label5);
@@ -76,8 +76,8 @@ 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..入库金额(元)");
label4.setContentMode(Label.CONTENT_XHTML);
def formLayout4 =group.getField("LBLIMPORTMONEY").parent;
-if(formLayout4.getComponentCount()>1){
+if(formLayout4.getComponentCount()>1){
formLayout4.removeComponent(formLayout4.getComponent(1));
}
formLayout4.addComponent(label4);
@@ -68,8 +68,8 @@ 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..0){
+ list.each{
+ solvelist.add(it.get_ID());
+ }
+}
+bindField("JOBSTATUSS",solvelist);
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/9f063c00-fdd0-494e-9564-f5372e8b62a8/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/9f063c00-fdd0-494e-9564-f5372e8b62a8/4.FULL_AUTO.groovy
similarity index 84%
rename from tools/s3_rewriter/output/rewritten/9f063c00-fdd0-494e-9564-f5372e8b62a8/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/9f063c00-fdd0-494e-9564-f5372e8b62a8/4.FULL_AUTO.groovy
index 5221833..1c73b97 100644
--- a/tools/s3_rewriter/output/rewritten/9f063c00-fdd0-494e-9564-f5372e8b62a8/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/9f063c00-fdd0-494e-9564-f5372e8b62a8/4.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : 9f063c00-fdd0-494e-9564-f5372e8b62a8
// template_name: 员工档案(显示离职日期)
-// seq : 1
+// seq : 4
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def searchMap=[:];
diff --git a/tools/s3_rewriter/output/rewritten/9f063c00-fdd0-494e-9564-f5372e8b62a8/4.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/9f063c00-fdd0-494e-9564-f5372e8b62a8/4.NO_S3.groovy
deleted file mode 100644
index 300fdf3..0000000
--- a/tools/s3_rewriter/output/rewritten/9f063c00-fdd0-494e-9564-f5372e8b62a8/4.NO_S3.groovy
+++ /dev/null
@@ -1,7 +0,0 @@
-// === EIP4 P4 脚本迁移产出 ===
-// template_id : 9f063c00-fdd0-494e-9564-f5372e8b62a8
-// template_name: 员工档案(显示离职日期)
-// seq : 4
-// label : NO_S3
-// 处置 : 无 S3 模式,原样进 P4
-page.setShowPdf(true)
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/a0233e27-39ea-4dca-83ab-9e05831d84bb/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/a0233e27-39ea-4dca-83ab-9e05831d84bb/1.NO_S3.groovy
similarity index 95%
rename from tools/s3_rewriter/output/rewritten/a0233e27-39ea-4dca-83ab-9e05831d84bb/2.NO_S3.groovy
rename to tools/s3_rewriter/output/rewritten/a0233e27-39ea-4dca-83ab-9e05831d84bb/1.NO_S3.groovy
index ebd4183..cd7026b 100644
--- a/tools/s3_rewriter/output/rewritten/a0233e27-39ea-4dca-83ab-9e05831d84bb/2.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/a0233e27-39ea-4dca-83ab-9e05831d84bb/1.NO_S3.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : a0233e27-39ea-4dca-83ab-9e05831d84bb
// template_name: 机械合同登记-需要评审(五建定制)
-// seq : 2
+// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
if(item["PUTONRECORD"] == "是"){
diff --git a/tools/s3_rewriter/output/rewritten/a0233e27-39ea-4dca-83ab-9e05831d84bb/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/a0233e27-39ea-4dca-83ab-9e05831d84bb/2.FULL_AUTO.groovy
similarity index 86%
rename from tools/s3_rewriter/output/rewritten/a0233e27-39ea-4dca-83ab-9e05831d84bb/1.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/a0233e27-39ea-4dca-83ab-9e05831d84bb/2.FULL_AUTO.groovy
index 4ef95dc..9f04962 100644
--- a/tools/s3_rewriter/output/rewritten/a0233e27-39ea-4dca-83ab-9e05831d84bb/1.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/a0233e27-39ea-4dca-83ab-9e05831d84bb/2.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : a0233e27-39ea-4dca-83ab-9e05831d84bb
// template_name: 机械合同登记-需要评审(五建定制)
-// seq : 1
+// seq : 2
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
def list = getFieldValue("ORGIDLIST");
diff --git a/tools/s3_rewriter/output/rewritten/a0307625-8abc-46b6-b835-93719a881e47/1.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/a0307625-8abc-46b6-b835-93719a881e47/1.NO_S3.groovy
index 9e5798f..a593e62 100644
--- a/tools/s3_rewriter/output/rewritten/a0307625-8abc-46b6-b835-93719a881e47/1.NO_S3.groovy
+++ b/tools/s3_rewriter/output/rewritten/a0307625-8abc-46b6-b835-93719a881e47/1.NO_S3.groovy
@@ -4,28 +4,5 @@
// seq : 1
// label : NO_S3
// 处置 : 无 S3 模式,原样进 P4
-def inventorystatus = GetServicesFunction.getEnumerateItemValue("MATERIAL_INVENTORYSTATUS",item['INVENTORYSTATUS']);
-
-//true:可用;false:不可用
-switch(inventorystatus){
- case 1://盘点准备
- enableButton("修改",true);
- enableButton("删除",true);
- enableButton("实盘数录入",true);
- enableButton("盘点结束",false);
- //enableButton("打印盘点单",true);
- break;
- case 2://实盘数录入
- enableButton("修改",false);
- enableButton("删除",true);
- enableButton("盘点结束",true);
- //enableButton("打印盘点单",true);
- break;
- default://盘点结束
- enableButton("修改",false);
- enableButton("删除",false);
- enableButton("实盘数录入",false);
- enableButton("盘点结束",false);
- //enableButton("打印盘点单",false);
- break;
-}
\ No newline at end of file
+page.setDataFilter(["PM_TURNOVERMATERIALBUYINVENTORY_ID":PM_TURNOVERMATERIALBUYINVENTORY_ID,"COMPANY":GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")]);
+page.noSearch(false);
diff --git a/tools/s3_rewriter/output/rewritten/a0307625-8abc-46b6-b835-93719a881e47/2.NO_S3.groovy b/tools/s3_rewriter/output/rewritten/a0307625-8abc-46b6-b835-93719a881e47/2.NO_S3.groovy
new file mode 100644
index 0000000..f53a8ac
--- /dev/null
+++ b/tools/s3_rewriter/output/rewritten/a0307625-8abc-46b6-b835-93719a881e47/2.NO_S3.groovy
@@ -0,0 +1,31 @@
+// === EIP4 P4 脚本迁移产出 ===
+// template_id : a0307625-8abc-46b6-b835-93719a881e47
+// template_name: 周转(自购)材料盘点管理
+// seq : 2
+// label : NO_S3
+// 处置 : 无 S3 模式,原样进 P4
+def inventorystatus = GetServicesFunction.getEnumerateItemValue("MATERIAL_INVENTORYSTATUS",item['INVENTORYSTATUS']);
+
+//true:可用;false:不可用
+switch(inventorystatus){
+ case 1://盘点准备
+ enableButton("修改",true);
+ enableButton("删除",true);
+ enableButton("实盘数录入",true);
+ enableButton("盘点结束",false);
+ //enableButton("打印盘点单",true);
+ break;
+ case 2://实盘数录入
+ enableButton("修改",false);
+ enableButton("删除",true);
+ enableButton("盘点结束",true);
+ //enableButton("打印盘点单",true);
+ break;
+ default://盘点结束
+ enableButton("修改",false);
+ enableButton("删除",false);
+ enableButton("实盘数录入",false);
+ enableButton("盘点结束",false);
+ //enableButton("打印盘点单",false);
+ break;
+}
\ No newline at end of file
diff --git a/tools/s3_rewriter/output/rewritten/a0307625-8abc-46b6-b835-93719a881e47/4.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/a0307625-8abc-46b6-b835-93719a881e47/3.FULL_AUTO.groovy
similarity index 88%
rename from tools/s3_rewriter/output/rewritten/a0307625-8abc-46b6-b835-93719a881e47/4.FULL_AUTO.groovy
rename to tools/s3_rewriter/output/rewritten/a0307625-8abc-46b6-b835-93719a881e47/3.FULL_AUTO.groovy
index 2408222..4e3ce4d 100644
--- a/tools/s3_rewriter/output/rewritten/a0307625-8abc-46b6-b835-93719a881e47/4.FULL_AUTO.groovy
+++ b/tools/s3_rewriter/output/rewritten/a0307625-8abc-46b6-b835-93719a881e47/3.FULL_AUTO.groovy
@@ -1,7 +1,7 @@
// === EIP4 P4 脚本迁移产出 ===
// template_id : a0307625-8abc-46b6-b835-93719a881e47
// template_name: 周转(自购)材料盘点管理
-// seq : 4
+// seq : 3
// label : FULL_AUTO
// 处置 : 全自动改写完成,直接入 P4 转换流水线
/*
@@ -18,21 +18,21 @@ def inventorydetailslist = getFieldValue("INVENTORYDETAILS");//盘点明细值
//导入功能
import com.dsasp.client.viewframework.util.TableImportExport;
def tie = new TableImportExport(inventorydetails,"com.dsasp.pm.turnovermaterialmanager.client.TurnOverMaterialInventoryDetailsImport"){
- public void importData(List<Map<String,Object>> datas){
+ public void importData(List