Merge remote-tracking branch 'origin/master' into origin/feature/addVoice

esua-epdc/epdc-cloud-commons-shibei

@@ -1 +1 @@
-Subproject commit 032e26816f8684315be8927b47ab85d69854398b
+Subproject commit 85189cbe8b37992b69b4b1e94a835b645bfa814a

esua-epdc/kettle-Code/dcp_job/dcp_job.kjb

@@ -294,11 +294,11 @@
       <attributes/>
       <start>Y</start>
       <dummy>N</dummy>
-      <repeat>N</repeat>
-      <schedulerType>0</schedulerType>
+      <repeat>Y</repeat>
+      <schedulerType>2</schedulerType>
       <intervalSeconds>0</intervalSeconds>
       <intervalMinutes>60</intervalMinutes>
-      <hour>12</hour>
+      <hour>1</hour>
       <minutes>0</minutes>
       <weekDay>1</weekDay>
       <DayOfMonth>1</DayOfMonth>

esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/epmet_gov_issue.kjb

@@ -499,13 +499,13 @@
       <attributes_kjc/>
     </entry>
     <entry>
-      <name>issue_vote_detail</name>
+      <name>issue_project_relation</name>
       <description/>
       <type>TRANS</type>
       <attributes/>
       <specification_method>filename</specification_method>
       <trans_object_id/>
-      <filename>D:/亿联科技/kettle/dcp_job/epmet_gov_issue/issue_vote_detail.ktr</filename>
+      <filename>${Internal.Entry.Current.Directory}/issue_project_relation.ktr</filename>
       <transname/>
       <arg_from_previous>N</arg_from_previous>
       <params_from_previous>N</params_from_previous>
@@ -533,17 +533,17 @@
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>640</xloc>
-      <yloc>544</yloc>
+      <yloc>624</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
-      <name>issue_project_relation</name>
+      <name>issue_vote_detail</name>
       <description/>
       <type>TRANS</type>
       <attributes/>
       <specification_method>filename</specification_method>
       <trans_object_id/>
-      <filename>D:/亿联科技/kettle/dcp_job/epmet_gov_issue/issue_project_relation.ktr</filename>
+      <filename>${Internal.Entry.Current.Directory}/issue_vote_detail.ktr</filename>
       <transname/>
       <arg_from_previous>N</arg_from_previous>
       <params_from_previous>N</params_from_previous>
@@ -571,7 +571,7 @@
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>640</xloc>
-      <yloc>624</yloc>
+      <yloc>560</yloc>
       <attributes_kjc/>
     </entry>
   </entries>
@@ -623,7 +623,7 @@
     </hop>
     <hop>
       <from>Start</from>
-      <to>issue_vote_detail</to>
+      <to>issue_project_relation</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
@@ -632,7 +632,7 @@
     </hop>
     <hop>
       <from>Start</from>
-      <to>issue_project_relation</to>
+      <to>issue_vote_detail</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>

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,

esua-epdc/kettle-Code/dcp_job/user/user.kjb

@@ -506,7 +506,7 @@
       <attributes/>
       <specification_method>filename</specification_method>
       <trans_object_id/>
-      <filename>D:/ideaWorkSpace/Elink/shibei/esua-epdc-cloud/esua-epdc/kettle-Code/dcp_job/user/register_relation.ktr</filename>
+      <filename>${Internal.Entry.Current.Directory}/register_relation.ktr</filename>
       <transname/>
       <arg_from_previous>N</arg_from_previous>
       <params_from_previous>N</params_from_previous>