diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index 032e26816..85189cbe8 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit 032e26816f8684315be8927b47ab85d69854398b +Subproject commit 85189cbe8b37992b69b4b1e94a835b645bfa814a diff --git a/esua-epdc/kettle-Code/dcp_job/dcp_job.kjb b/esua-epdc/kettle-Code/dcp_job/dcp_job.kjb index 8d33d25b8..7a892acb7 100644 --- a/esua-epdc/kettle-Code/dcp_job/dcp_job.kjb +++ b/esua-epdc/kettle-Code/dcp_job/dcp_job.kjb @@ -294,11 +294,11 @@ Y N - N - 0 + Y + 2 0 60 - 12 + 1 0 1 1 diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/epmet_gov_issue.kjb b/esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/epmet_gov_issue.kjb index 66ed0f341..9d23692fe 100644 --- a/esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/epmet_gov_issue.kjb +++ b/esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/epmet_gov_issue.kjb @@ -499,13 +499,13 @@ - issue_vote_detail + issue_project_relation TRANS filename - D:/亿联科技/kettle/dcp_job/epmet_gov_issue/issue_vote_detail.ktr + ${Internal.Entry.Current.Directory}/issue_project_relation.ktr N N @@ -533,17 +533,17 @@ Y 0 640 - 544 + 624 - issue_project_relation + issue_vote_detail TRANS filename - D:/亿联科技/kettle/dcp_job/epmet_gov_issue/issue_project_relation.ktr + ${Internal.Entry.Current.Directory}/issue_vote_detail.ktr N N @@ -571,7 +571,7 @@ Y 0 640 - 624 + 560 @@ -623,7 +623,7 @@ Start - issue_vote_detail + issue_project_relation 0 0 Y @@ -632,7 +632,7 @@ Start - issue_project_relation + issue_vote_detail 0 0 Y diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue_project_category_dict.ktr b/esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue_project_category_dict.ktr index e6728423a..f1a2d4894 100644 --- a/esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue_project_category_dict.ktr +++ b/esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue_project_category_dict.ktr @@ -732,7 +732,7 @@ cast(ec.id as char) ID, ec.pid PID, ec.pids PIDS, IFNULL(pec.category_code,'') PARENT_CATEGORY_CODE, -CASE WHEN LENGTH(ec.category_code) = 1 OR LENGTH(t.CATEGORY_CODE) = 1 THEN CONCAT('0',ec.category_code) ELSE ec.category_code END as CATEGORY_CODE, +CASE WHEN LENGTH(ec.category_code) = 1 OR LENGTH(ec.CATEGORY_CODE) = 1 THEN CONCAT('0',ec.category_code) ELSE ec.category_code END as CATEGORY_CODE, ec.category_name CATEGORY_NAME, cast(ec.category_type as SIGNED INTEGER)+1 CATEGORY_TYPE, ec.sort SORT, diff --git a/esua-epdc/kettle-Code/dcp_job/user/user.kjb b/esua-epdc/kettle-Code/dcp_job/user/user.kjb index a91500014..0ce9d98a0 100644 --- a/esua-epdc/kettle-Code/dcp_job/user/user.kjb +++ b/esua-epdc/kettle-Code/dcp_job/user/user.kjb @@ -506,7 +506,7 @@ filename - D:/ideaWorkSpace/Elink/shibei/esua-epdc-cloud/esua-epdc/kettle-Code/dcp_job/user/register_relation.ktr + ${Internal.Entry.Current.Directory}/register_relation.ktr N N