Merge branch 'develop' of https://hel.hand-china.com/hlcm/leaf-hlcm into feature/credit_feature

.gitignore

@@ -18,6 +18,9 @@ overlays/
 **/*.log
 **/*.tmp
 
+# sql
+*~sql
+
 # common config rename
 uncertain.local.xml
 config.properties

pom.xml

@@ -129,7 +129,11 @@
             <artifactId>httpclient</artifactId>
             <version>4.1.3</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.60</version>
+        </dependency>
         <dependency>
             <groupId>jaxen</groupId>
             <artifactId>jaxen</artifactId>

src/main/database/Init/INITIALIZE_SYS_FUNCTION_DYNAMIC.sql

+INSERT INTO SYS_FUNCTION_DYNAMIC
+  (FUNCTION_CODE,
+   FUNCTION_NAME,
+   SEQUENCE,
+   CREATION_DATE,
+   CREATED_BY,
+   LAST_UPDATE_DATE,
+   LAST_UPDATED_BY)
+VALUES
+  ('CON_REPO001D', '合同回购申请明细', 1, SYSDATE, -1, SYSDATE, -1);
\ No newline at end of file

src/main/database/Init/Layout_db_object/INITIALIZE_LAYOUT_DB_OBJECT.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool INITIALIZE_LAYOUT_DB_OBJECT.log
+
+set feedback off
+set define off
+begin
+
+insert into HLS_DOC_CATEGORY_DB_OBJECT (DOCUMENT_CATEGORY, OBJECT_NAME, OBJECT_TYPE, CREATED_BY, CREATION_DATE, LAST_UPDATED_BY, LAST_UPDATE_DATE)
+values ('CONTRACT', 'HLS_DOCUMENT_USE_SEAL', 'TABLE', -1, sysdate, -1, sysdate);
+
+insert into HLS_DOC_CATEGORY_DB_OBJECT (DOCUMENT_CATEGORY, OBJECT_NAME, OBJECT_TYPE, CREATED_BY, CREATION_DATE, LAST_UPDATED_BY, LAST_UPDATE_DATE)
+values ('CONTRACT', 'HLS_DOCUMENT_USE_SEAL_VL', 'VIEW', -1, sysdate, -1, sysdate);
+
+insert into HLS_DOC_CATEGORY_DB_OBJECT (DOCUMENT_CATEGORY, OBJECT_NAME, OBJECT_TYPE, CREATED_BY, CREATION_DATE, LAST_UPDATED_BY, LAST_UPDATE_DATE)
+values ('CONTRACT', 'CON_CONTRACT_REPO_LV', 'VIEW', -1, sysdate, -1, sysdate);
+
+insert into HLS_DOC_CATEGORY_DB_OBJECT (DOCUMENT_CATEGORY, OBJECT_NAME, OBJECT_TYPE, CREATED_BY, CREATION_DATE, LAST_UPDATED_BY, LAST_UPDATE_DATE)
+values ('CONTRACT', 'CON_CONTRACT_REPO_MODIFY_LV', 'VIEW', -1, sysdate, -1, sysdate);
+
+end;
+/
+commit;
+set feedback on
+set define on
+
+spool off
\ No newline at end of file

src/main/database/Init/Sys_code/INITIALIZE_SYSCODE_PAYMENT_FREQUENCY.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool INITIALIZE_SYSCODE_PAYMENT_FREQUENCY.log
+
+set feedback off
+set define off
+
+begin
+sys_code_pkg.delete_sys_code('PAYMENT_FREQUENCY');
+
+sys_code_pkg.insert_sys_code('PAYMENT_FREQUENCY', '支付频率（回购）', '支付频率（回购）', '支付频率（回购）', 'ZHS', '');
+sys_code_pkg.update_sys_code('PAYMENT_FREQUENCY', 'Payment_frequency', 'Payment_frequency', 'Payment_frequency', 'US', '');
+
+sys_code_pkg.insert_sys_code_value('PAYMENT_FREQUENCY','MONTH','按月','ZHS','');
+sys_code_pkg.update_sys_code_value('PAYMENT_FREQUENCY','MONTH','按月','US','');
+sys_code_pkg.insert_sys_code_value('PAYMENT_FREQUENCY','IRREGULAR','不规则','ZHS','');
+sys_code_pkg.update_sys_code_value('PAYMENT_FREQUENCY','IRREGULAR','不规则','US','');
+
+end;
+/
+commit;
+set feedback on
+set define on
+
+
+spool off
+
+exit
\ No newline at end of file

src/main/database/Init/Sys_code/INITIALIZE_SYSCODE_REPURCHASE_TYPES.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool INITIALIZE_SYSCODE_REPURCHASE_TYPES.log
+
+set feedback off
+set define off
+
+begin
+sys_code_pkg.delete_sys_code('REPURCHASE_TYPES');
+
+sys_code_pkg.insert_sys_code('REPURCHASE_TYPES', '回购类型', '回购类型', '回购类型', 'ZHS', '');
+sys_code_pkg.update_sys_code('REPURCHASE_TYPES', 'Repurchase_types', 'Repurchase_types', 'Repurchase_types', 'US', '');
+
+sys_code_pkg.insert_sys_code_value('REPURCHASE_TYPES','STAGE_REPURCHASE','分期回购','ZHS','');
+sys_code_pkg.update_sys_code_value('REPURCHASE_TYPES','STAGE_REPURCHASE','分期回购','US','');
+sys_code_pkg.insert_sys_code_value('REPURCHASE_TYPES','ONE_TIME_REPURCHASE','一次性回购回购','ZHS','');
+sys_code_pkg.update_sys_code_value('REPURCHASE_TYPES','ONE_TIME_REPURCHASE','一次性回购回购','US','');
+
+end;
+/
+commit;
+set feedback on
+set define on
+
+
+spool off
+
+exit
\ No newline at end of file

src/main/database/Init/Sys_code/INITIALIZE_SYSCODE_SEAL_NUMBER.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool INITIALIZE_SYSCODE_SEAL_NUMBER.log
+
+set feedback off
+set define off
+
+begin
+sys_code_pkg.delete_sys_code('SEAL_NUMBER');
+
+sys_code_pkg.insert_sys_code('SEAL_NUMBER', '文书部数', '文书部数', '文书部数', 'ZHS', '');
+sys_code_pkg.update_sys_code('SEAL_NUMBER', 'Seal Number', 'Seal Number', 'Seal Number', 'US', '');
+
+sys_code_pkg.insert_sys_code_value('SEAL_NUMBER','SEAL_O_TW_NUMBER','一式两份','ZHS','');
+sys_code_pkg.update_sys_code_value('SEAL_NUMBER','SEAL_O_TW_NUMBER','一式两份','US','');
+--
+-- sys_code_pkg.insert_sys_code_value('SEAL_NUMBER','SEAL_O_TH_NUMBER','一式三份','ZHS','');
+-- sys_code_pkg.update_sys_code_value('SEAL_NUMBER','SEAL_O_TH_NUMBER','一式三份','US','');
+
+end;
+/
+commit;
+set feedback on
+set define on
+
+
+spool off
+
+exit
\ No newline at end of file

src/main/database/Init/Sys_message/INITIALIZE_MESSAGE.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool INITIALIZE_MESSAGE.log
+
+set feedback off
+set define off
+begin
+
+sys_message_pkg.delete_message('ZJ_WFL_WORKFLOW_NODE_HIERARCHY_ERROR');
+sys_message_pkg.insert_message('ZJ_WFL_WORKFLOW_NODE_HIERARCHY_ERROR','错误','查找工作流节点接收人出现错误,请联系管理员!','ZHS');
+sys_message_pkg.insert_message('ZJ_WFL_WORKFLOW_NODE_HIERARCHY_ERROR','Error','查找工作流节点接收人出现错误,请联系管理员!','US');
+
+end;
+/
+commit;
+set feedback on
+set define on
+
+
+spool off
+
+exit

src/main/database/Init/Sys_prompt/INITIALIZE_PROMPT.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool INITIALIZE_PROMPT.log
+
+set feedback off
+set define off
+begin
+
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'error.login.name_password_not_match',
+                                  p_language => 'ZHS',
+                                  p_description => '用户名或密码错误',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'error.login.name_password_not_match',
+                                  p_language => 'US',
+                                  p_description => '用户名或密码错误',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'error.login.verification_code_error',
+                                  p_language => 'ZHS',
+                                  p_description => '验证码错误',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'error.login.verification_code_error',
+                                  p_language => 'US',
+                                  p_description => '验证码错误',
+                                  p_created_by => 1);
+	
+	
+end;
+/
+commit;
+set feedback on
+set define on
+
+spool off
+
+exit

src/main/database/Package/con_repo_change_req_wfl_pkg.pck

+create or replace package con_repo_change_req_wfl_pkg is
+
+  -- Author  : Spencer 3893
+  -- Created : 9/18/2019 4:40:41 PM
+  -- Purpose : 
+
+  procedure workflow_start(p_change_req_rec in con_contract_change_req%rowtype,
+                           p_change_con_rec in con_contract%rowtype,
+                           p_layout_code    in varchar2,
+                           p_user_id        in number);
+
+  procedure workflow_approve(p_change_req_id in number,
+                             p_user_id       in number);
+
+  procedure workflow_reject(p_change_req_id in number, p_user_id in number);
+
+  procedure workflow_cancel(p_change_req_id in number, p_user_id in number);
+
+end con_repo_change_req_wfl_pkg;
+/
+create or replace package body con_repo_change_req_wfl_pkg is
+
+  procedure workflow_start(p_change_req_rec in con_contract_change_req%rowtype,
+                           p_change_con_rec in con_contract%rowtype,
+                           p_layout_code    in varchar2,
+                           p_user_id        in number) is
+    v_document_info varchar2(2000);
+    v_instance_id   number;
+    v_bp_name       varchar2(300);
+    v_workflow_desc varchar2(2000);
+  begin
+    select lv.bp_name
+      into v_bp_name
+      from con_contract_bp_tenant_lv lv
+     where lv.contract_id = p_change_con_rec.contract_id;
+  
+    update con_contract_change_req t
+       set t.req_status     = 'APPROVING',
+           t.submit_date    = sysdate,
+           last_updated_by  = p_user_id,
+           last_update_date = sysdate
+     where t.change_req_id = p_change_req_rec.change_req_id;
+  
+    v_instance_id := p_change_req_rec.wfl_instance_id;
+    begin
+      select t1.workflow_desc
+        into v_workflow_desc
+        from hls_document_type_v t1
+       where t1.enabled_flag = 'Y'
+         and t1.document_type = p_change_req_rec.document_type
+         and t1.document_category = p_change_req_rec.document_category;
+    exception
+      when others then
+        null;
+    end;
+    v_document_info := v_workflow_desc || '：' ||
+                       p_change_con_rec.contract_number || '-' || v_bp_name;
+
+    hls_workflow_pkg.workflow_start(p_instance_id           => v_instance_id,
+                                    p_document_id           => p_change_req_rec.change_req_id,
+                                    p_document_category     => p_change_req_rec.document_category,
+                                    p_document_type         => p_change_req_rec.document_type,
+                                    p_business_type         => p_change_req_rec.business_type,
+                                    p_business_type_2nd     => p_change_con_rec.business_type,
+                                    p_document_category_2nd => p_change_con_rec.document_category,
+                                    p_document_type_2nd     => p_change_con_rec.document_type,
+                                    p_company_id            => p_change_con_rec.company_id,
+                                    p_user_id               => p_user_id,
+                                    p_lease_org             => p_change_con_rec.lease_organization, --事业部
+                                    p_lease_channel         => p_change_con_rec.lease_channel,
+                                    p_division              => p_change_con_rec.division,
+                                    p_ccr_reschedule        => p_change_req_rec.reschedule_flag,
+                                    p_ccr_et                => p_change_req_rec.et_flag,
+                                    p_ccr_tenant_change     => p_change_req_rec.tenant_change_flag,
+                                    p_ccr_lease_item_change => p_change_req_rec.lease_item_change_flag,
+                                    p_ccr_mortgage_change   => p_change_req_rec.mortgage_change_flag,
+                                    p_ccr_guarantor_change  => p_change_req_rec.guarantor_change_flag,
+                                    p_ccr_bank_acc_change   => p_change_req_rec.bank_acc_change_flag,
+                                    p_ccr_contract_cancel   => p_change_req_rec.contract_cancel_flag,
+                                    p_ccr_cashflow_change   => p_change_req_rec.cashflow_change_flag,
+                                    -- parameter values
+                                    p_parameter_1       => 'CHANGE_REQ_ID',
+                                    p_parameter_1_value => p_change_req_rec.change_req_id,
+                                    p_parameter_2       => 'CHANGE_REQ_NUMBER',
+                                    p_parameter_2_value => p_change_req_rec.change_req_number,
+                                    p_parameter_3       => 'CONTRACT_ID',
+                                    p_parameter_3_value => p_change_req_rec.contract_id,
+                                    p_parameter_4       => 'CONTRACT_NUMBER',
+                                    p_parameter_4_value => p_change_con_rec.contract_number,
+                                    p_parameter_5       => 'OWNER_USER_ID',
+                                    p_parameter_5_value => nvl(p_change_req_rec.owner_user_id,
+                                                               p_user_id),
+                                    p_parameter_6       => 'DOCUMENT_INFO',
+                                    p_parameter_6_value => v_document_info,
+                                    p_parameter_7       => 'OLD_CONTRACT_ID',
+                                    p_parameter_7_value => p_change_req_rec.contract_id,
+                                    p_parameter_8       => 'NEW_CONTRACT_ID',
+                                    p_parameter_8_value => p_change_req_rec.change_req_id,
+                                    --add by Harry 9952 2017/1/13
+                                    p_parameter_9        => 'PROJECT_ID',
+                                    p_parameter_9_value  => p_change_con_rec.project_id,
+                                    p_parameter_10       => 'LAYOUT_CODE',
+                                    p_parameter_10_value => p_layout_code);
+    update con_contract_change_req t
+       set t.wfl_instance_id = v_instance_id
+     where t.change_req_id = p_change_req_rec.change_req_id;
+  
+  exception
+    when no_data_found then
+      sys_raise_app_error_pkg.raise_user_define_error(p_message_code            => 'CON_CONTRACT_CHG_REQ_WFL_PKG.NO_DATA_FOUND',
+                                                      p_created_by              => p_user_id,
+                                                      p_package_name            => 'con_repo_change_req_wfl_pkg',
+                                                      p_procedure_function_name => 'workflow_start');
+      raise_application_error(sys_raise_app_error_pkg.c_error_number,
+                              sys_raise_app_error_pkg.g_err_line_id);
+    when others then
+      sys_raise_app_error_pkg.raise_sys_others_error(p_message                 => dbms_utility.format_error_backtrace || ' ' ||
+                                                                                  sqlerrm,
+                                                     p_created_by              => p_user_id,
+                                                     p_package_name            => 'con_repo_change_req_wfl_pkg',
+                                                     p_procedure_function_name => 'workflow_start');
+      raise_application_error(sys_raise_app_error_pkg.c_error_number,
+                              sys_raise_app_error_pkg.g_err_line_id);
+  end;
+
+  procedure workflow_approve(p_change_req_id in number,
+                             p_user_id       in number) is
+  begin
+    con_contract_change_req_pkg.change_req_confirm(p_change_req_id => p_change_req_id,
+                                                   p_user_id       => p_user_id);
+  end;
+
+  procedure workflow_reject(p_change_req_id in number, p_user_id in number) is
+  begin
+    con_contract_change_req_pkg.change_req_reject(p_change_req_id => p_change_req_id,
+                                                  p_user_id       => p_user_id);
+  end;
+
+  procedure workflow_cancel(p_change_req_id in number, p_user_id in number) is
+  begin
+    con_contract_change_req_pkg.change_req_cancel(p_change_req_id => p_change_req_id,
+                                                  p_user_id       => p_user_id);
+  end;
+end con_repo_change_req_wfl_pkg;
+/

src/main/database/Register_function/REGISTER_CON_REPO001.sql

@@ -9,9 +9,31 @@ set define off
 begin
 
 --页面注册
-sys_function_assign_pkg.service_load('modules/csh/CSH510N/csh_transaction_import.lview','打开收款导入',1,1,0);
+sys_function_assign_pkg.service_load('modules/cont/CON_REPO001/con_contract_repo_create_entrance.lview','回购申请创建入口',1,1,0);
+sys_function_assign_pkg.service_load('modules/cont/CON_REPO001/con_contract_change_repo_detail.lview','回购申请明细',1,1,0);
+
+--功能定义
+SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('CON_REPO001','回购申请创建','回购申请创建','100','','','modules/cont/CON_REPO001/con_contract_repo_create_entrance.lview','ZHS',-1);
+SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('CON_REPO001','回购申请创建','回购申请创建','100','','','modules/cont/CON_REPO001/con_contract_repo_create_entrance.lview','US',-1);
+
 --分配页面
-sys_function_assign_pkg.func_service_load('CSH510','modules/csh/CSH510N/csh_transaction_import.lview');
+sys_function_assign_pkg.func_service_load('CON_REPO001','modules/cont/CON_REPO001/con_contract_repo_create_entrance.lview');
+sys_function_assign_pkg.func_service_load('CON_REPO001','modules/cont/CON500/con_contract_authority_list_validate.lview');
+sys_function_assign_pkg.func_service_load('CON_REPO001','modules/cont/CON500/con_contract_get_layout_code.lview');
+sys_function_assign_pkg.func_service_load('CON_REPO001','modules/cont/CON505/con_contract_modify.lview');
+sys_function_assign_pkg.func_service_load('CON_REPO001','modules/cont/CON_REPO001/con_contract_change_repo_detail.lview');
+sys_function_assign_pkg.func_service_load('CON_REPO001','modules/cont/CON501N/con_contract_modify.lview');
+
+--分配bm
+sys_function_assign_pkg.func_bm_load('CON_REPO001','cont.CON500.con_contract_get_layout_code');
+sys_function_assign_pkg.func_bm_load('CON_REPO001','cont.CON_REPO001.create_change_req');
+sys_function_assign_pkg.func_bm_load('CON_REPO001','cont.CON_REPO001.calc_repo_date_amount');
+sys_function_assign_pkg.func_bm_load('CON_REPO001','cont.CON_REPO001.calc_cashflow');
+sys_function_assign_pkg.func_bm_load('CON_REPO001','cont.CON_REPO001.submit_change_req');
+
+--分配菜单
+sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'CON_CHANGE_REQ',p_function_code=>'CON_REPO001',p_enabled_flag=>'Y',P_USER_ID=>-1);
+
 end;
 /
 commit;

src/main/database/Register_function/REGISTER_CON_REPO003.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool REGISTER_CON_REPO003.log
+
+set feedback off
+set define off
+
+begin
+
+--页面注册
+sys_function_assign_pkg.service_load('modules/cont/CON_REPO003/con_ccr_repo_modify_entrance.lview','回购申请维护',1,1,0);
+sys_function_assign_pkg.service_load('modules/cont/CON_REPO001/con_contract_change_repo_detail.lview','回购申请明细',1,1,0);
+
+--功能定义
+SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('CON_REPO003','回购申请维护','回购申请维护','100','','','modules/cont/CON_REPO003/con_ccr_repo_modify_entrance.lview','ZHS',-1);
+SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('CON_REPO003','回购申请维护','回购申请维护','100','','','modules/cont/CON_REPO003/con_ccr_repo_modify_entrance.lview','US',-1);
+
+--分配页面
+sys_function_assign_pkg.func_service_load('CON_REPO003','modules/cont/CON_REPO003/con_ccr_repo_modify_entrance.lview');
+sys_function_assign_pkg.func_service_load('CON_REPO003','modules/cont/CON500/con_contract_authority_list_validate.lview');
+sys_function_assign_pkg.func_service_load('CON_REPO003','modules/cont/CON500/con_contract_get_layout_code.lview');
+sys_function_assign_pkg.func_service_load('CON_REPO003','modules/cont/CON505/con_contract_modify.lview');
+sys_function_assign_pkg.func_service_load('CON_REPO003','modules/cont/CON_REPO001/con_contract_change_repo_detail.lview');
+sys_function_assign_pkg.func_service_load('CON_REPO003','modules/cont/CON501N/con_contract_modify.lview');
+
+--分配bm
+sys_function_assign_pkg.func_bm_load('CON_REPO003','cont.CON500.con_contract_get_layout_code');
+sys_function_assign_pkg.func_bm_load('CON_REPO003','cont.CON_REPO001.get_last_rent_due_date');
+sys_function_assign_pkg.func_bm_load('CON_REPO003','cont.CON_REPO001.calc_cashflow');
+sys_function_assign_pkg.func_bm_load('CON_REPO003','cont.CON_REPO001.submit_change_req');
+
+--分配菜单
+sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'CON_CHANGE_REQ',p_function_code=>'CON_REPO003',p_enabled_flag=>'Y',P_USER_ID=>-1);
+
+end;
+/
+commit;
+
+set feedback on
+set define on
+
+spool off
+exit
+

src/main/database/Sequence/HLS_DOCUMENT_USE_SEAL_S.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool HLS_DOCUMENT_USE_SEAL_S.log
+
+prompt
+prompt Creating sequence HLS_DOCUMENT_USE_SEAL_S
+prompt ====================================
+prompt
+whenever sqlerror continue
+drop sequence HLS_DOCUMENT_USE_SEAL_S;
+whenever sqlerror exit failure rollback
+
+Create sequence HLS_DOCUMENT_USE_SEAL_S;
+
+
+spool off
+exit

src/main/database/Table/Alter/CON_CONTRACT.sql

+alter table CON_CONTRACT add DEPOIST_REMAINING_AMOUNT number;
+comment on column CON_CONTRACT.DEPOIST_REMAINING_AMOUNT
+is '保证金余额';
+
+alter table CON_CONTRACT add REPURCHASE_TATAL_AMOUNT number;
+comment on column CON_CONTRACT.REPURCHASE_TATAL_AMOUNT
+is '回购价款总额';
+
+alter table CON_CONTRACT add REPURCHASE_COUNT_AMOUNT number;
+comment on column CON_CONTRACT.REPURCHASE_COUNT_AMOUNT
+is '回购价款计算基数';
+
+alter table CON_CONTRACT add REPURCHASE_SERVICE_CHARGES number;
+comment on column CON_CONTRACT.REPURCHASE_SERVICE_CHARGES
+is '回购手续费';
+
+alter table CON_CONTRACT add FUND_POSSESSION_COST number;
+comment on column CON_CONTRACT.FUND_POSSESSION_COST
+is '资金占用费';
+
+alter table CON_CONTRACT add REPURCHASE_INTEREST_RATE number;
+comment on column CON_CONTRACT.REPURCHASE_INTEREST_RATE
+is '回购利率';
+
+alter table CON_CONTRACT add DEPOIST_OFFSET_FLAG varchar2(1);
+comment on column CON_CONTRACT.DEPOIST_OFFSET_FLAG
+is '保证金是否冲抵';
+
+alter table CON_CONTRACT add PAYMENT_FREQUENCY varchar2(30);
+comment on column CON_CONTRACT.PAYMENT_FREQUENCY
+is '回购支付频率';
+
+alter table CON_CONTRACT add PAYMENT_PERIOD varchar2(30);
+comment on column CON_CONTRACT.PAYMENT_PERIOD
+is '回购支付期数';
+
+alter table CON_CONTRACT add SUM_RECEIVED_RENT_AMOUNT number;
+comment on column CON_CONTRACT.SUM_RECEIVED_RENT_AMOUNT
+is '已回收租金(回购)';
+
+alter table CON_CONTRACT add SUM_UNRECEIVED_RENT_AMOUNT number;
+comment on column CON_CONTRACT.SUM_UNRECEIVED_RENT_AMOUNT
+is '剩余租金(回购)';
+
+alter table CON_CONTRACT add SUM_OVERDUE_AMOUNT number;
+comment on column CON_CONTRACT.SUM_OVERDUE_AMOUNT
+is '逾期租金(回购)';
+
+alter table CON_CONTRACT add SUM_UNRECEIVED_PRINCIPAL number;
+comment on column CON_CONTRACT.SUM_UNRECEIVED_PRINCIPAL
+is '剩余本金(回购)';
\ No newline at end of file

src/main/database/Table/Alter/CON_CONTRACT_CHANGE_REQ.sql

+alter table CON_CONTRACT_CHANGE_REQ add REPO_CHANGE_FLAG varchar2(1);
+comment on column CON_CONTRACT_CHANGE_REQ.REPO_CHANGE_FLAG
+is '是否回购';
\ No newline at end of file

src/main/database/Table/HLS_DOCUMENT_USE_SEAL.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool HLS_DOCUMENT_USE_SEAL.log
+
+PROMPT
+PROMPT CREATING TABLE HLS_DOCUMENT_USE_SEAL
+PROMPT ============================
+PROMPT
+WHENEVER SQLERROR CONTINUE
+ DROP TABLE HLS_DOCUMENT_USE_SEAL;
+WHENEVER SQLERROR EXIT FAILURE ROLLBACK
+
+-- Create table
+create table HLS_DOCUMENT_USE_SEAL
+(
+  document_use_seal_id  number not null,
+  document_table        varchar2(200),
+  document_id           number,
+  instruments_types     varchar2(200),
+  common_seal           varchar2(1),
+  corporate_visa_seal   varchar2(1),
+  legal_seal            varchar2(1),
+  con_special_seal      varchar2(1),
+  financial_seal        varchar2(1),
+  supervisio_seal       varchar2(1),
+  seal_number           varchar2(200),
+
+  --STADARD-WHO 不需修改
+  object_version_number NUMBER default 1,
+  request_id            NUMBER default -1,
+  program_id            NUMBER default -1,
+  created_by            NUMBER default -1 not null,
+  creation_date         DATE default sysdate not null,
+  last_updated_by       NUMBER default -1 not null,
+  last_update_date      DATE default sysdate not null,
+  last_update_login     NUMBER default -1
+);
+-- Add comments to the table
+comment on table HLS_DOCUMENT_USE_SEAL
+  is '用印信息';
+-- Add comments to the columns
+comment on column HLS_DOCUMENT_USE_SEAL.document_use_seal_id
+  is 'PK';
+  comment on column HLS_DOCUMENT_USE_SEAL.document_table
+  is '关联单据表';
+  comment on column HLS_DOCUMENT_USE_SEAL.document_id
+  is '关联单据PK';
+  comment on column HLS_DOCUMENT_USE_SEAL.instruments_types
+  is '文书种类';
+  comment on column HLS_DOCUMENT_USE_SEAL.common_seal
+  is '公章';
+  comment on column HLS_DOCUMENT_USE_SEAL.corporate_visa_seal
+  is '法人签证章';
+  comment on column HLS_DOCUMENT_USE_SEAL.legal_seal
+  is '法人章';
+  comment on column HLS_DOCUMENT_USE_SEAL.con_special_seal
+  is '合同专用章';
+  comment on column HLS_DOCUMENT_USE_SEAL.financial_seal
+  is '财务章';
+  comment on column HLS_DOCUMENT_USE_SEAL.supervisio_seal
+  is '监管专用章';
+  comment on column HLS_DOCUMENT_USE_SEAL.seal_number
+  is '文书部数';
+-- Create/Recreate primary, unique and foreign key constraints
+alter table HLS_DOCUMENT_USE_SEAL
+  add constraint HLS_DOCUMENT_USE_SEAL_PK primary key (document_use_seal_id);
+
+create index HLS_DOCUMENT_USE_SEAL_N1 on HLS_DOCUMENT_USE_SEAL (document_table,document_id);
+
+SPOOL OFF
+
+EXIT

src/main/database/View/CON_CONTRACT_REPO_MODIFY_LV.sql

+CREATE OR REPLACE VIEW CON_CONTRACT_REPO_MODIFY_LV AS
+SELECT t1.contract_id,
+       t1.data_class,
+       t1.calc_session_id,
+       t1.project_id,
+       t1.business_type,
+       t1.division,
+       t1.lease_organization,
+       t1.lease_channel,
+       t1.document_type,
+       t1.repurchase_contract_number,
+       t1.contract_number,
+       t1.contract_name,
+       t1.bp_id_tenant,
+       (SELECT m.bp_name
+          FROM hls_bp_master m
+         WHERE m.bp_id = t1.bp_id_tenant) AS bp_id_tenant_n,
+         t1.bp_id_agent_level1,
+       (SELECT hbm.bp_name
+          FROM hls_bp_master hbm
+         WHERE hbm.enabled_flag = 'Y'
+           AND hbm.bp_category = 'AGENT'
+           AND hbm.bp_id = t1.bp_id_agent_level1) bp_id_agent_level1_n, --代理店
+           (SELECT d.description
+          FROM hls_division d
+         WHERE d.division = t1.division) AS division_n,
+          t1.employee_id,
+       (SELECT e.name
+          FROM exp_employees e
+         WHERE e.employee_id = t1.employee_id) AS employee_id_n,
+         t1.REPURCHASE_TYPES,
+             (SELECT v.code_value_name
+             FROM sys_code_values_v v
+            WHERE     v.code = 'REPURCHASE_TYPES'
+                  AND v.code_value = t1.REPURCHASE_TYPES) AS REPURCHASE_TYPES_n,
+                  cr.created_by,
+       (SELECT su.description
+          FROM sys_user su
+         WHERE su.user_id = cr.created_by) change_created_by_n,
+                  t1.unit_id,
+       (SELECT u.description
+          FROM exp_org_unit_vl u
+         WHERE u.unit_id = t1.unit_id) AS unit_id_n,
+         t1.contract_status,
+       (SELECT v.code_value_name
+          FROM sys_code_values_v v
+         WHERE v.code = 'CON500_CONTRACT_STATUS'
+           AND v.code_value = t1.contract_status) AS contract_status_n,
+         cr.req_status,
+          (SELECT v.code_value_name
+          FROM sys_code_values_v v
+         WHERE v.code = 'CON_CHANGE_REQ_STATUS'
+           AND v.code_value = cr.req_status) AS req_status_n,
+           cr.repo_change_flag
+  FROM con_contract            t1,
+       con_contract_change_req cr
+ WHERE t1.contract_id = cr.contract_id
+ AND cr.repo_change_flag = 'Y'
+;

src/main/database/View/PRJ_PROJECT_LEASE_ITEM_HEAD_LV.sql

+CREATE OR REPLACE VIEW PRJ_PROJECT_LEASE_ITEM_HEAD_LV AS
+select t.vehicle_class,
+       t.Lease_Item_Seq,
+       t.Brand_Id,
+       t.Series_Id,
+       t.Truck_Class,
+       t.Price,
+       t.Quantity,
+       t.Item_Engine_Number,
+       t.Horsepower,
+       t.NOTICE_NUMBER,
+       t.Gps_Flag,
+       (SELECT a.description value_name
+          FROM hls_car_brands_vl a
+         WHERE t.brand_id = a.brand_id
+           AND a.enabled_flag = 'Y') brand_id_n,
+       (SELECT a.description
+          FROM hls_car_series_vl a
+         WHERE a.series_id = t.series_id) series_id_n,
+       (select code_value_name
+          from sys_code_values_v scv
+         where scv.code = 'TRUCK_CLASS'
+           and scv.code_value = t.Truck_Class) Truck_Class_n,
+       (t.price * t.quantity) TOTAL_AMOUNT,
+       t.project_id,
+       t.project_lease_item_id,
+       t.lease_item_id,
+       (select i.full_name from hls_lease_item i where i.lease_item_id = t.lease_item_id) lease_item_id_n,
+        t.Vehicles_Number,
+       (select COUNT(1)
+          from CON_CONTRACT_LEASE_ITEM CI
+         where CI.PROJECT_LEASE_ITEM_ID = T.PROJECT_LEASE_ITEM_ID) CONFIRM_NUMBER,
+        t.insurance_price,
+        t.gps_amount,
+				t.Purchase_Tax,
+        t.model_id,
+        (SELECT a.description
+          FROM hls_car_model_vl a
+         WHERE a.model_id = t.model_id) model_id_n,
+        t.guide_price,
+        t.VEHICLE_TYPE,
+        (select a.code_value_name
+          from sys_code_values_v a
+         where a.code = 'HLS_VEHICLE_TYPE'
+         and a.code_value=t.vehicle_type) vehicle_type_n,
+         --add by chenlingfeng
+         t.ton_code,
+         t.short_name,
+         t.full_name,
+         t.pattern,
+         (select v.code_value_name as value_name
+          from sys_code_values_v v
+         where v.code = 'DS_TON_NAME'
+           and t.ton_code = v.code_value) ton_code_n,
+         t.ITEM_TYPE  ,--物件类型
+          (select v.code_value_name as value_name
+          from sys_code_values_v v
+         where v.code = 'DS_ITEM_TYPE'
+           and t.ITEM_TYPE = v.code_value) ITEM_TYPE_n,
+         t.machine_number ,--机号
+         t.equipment_type,
+          (select v.code_value_name as value_name
+          from sys_code_values_v v
+         where v.code = 'EQUIPMENT_TYPE'
+           and t.EQUIPMENT_TYPE = v.code_value) EQUIPMENT_TYPE_n,
+         t.FACTORY_price,
+         t.DELIVERY_DATE,
+         t.sale_date,
+         --add  by  lijingjing
+            t.division,
+
+        t.machine_model,
+         t.equipments,
+             t.accessories,
+       t.origin_place,
+       t.machine_model_class,
+         (select v.code_value_name as value_name
+          from sys_code_values_v v
+         where v.code = 'MACHINE_MODEL_CLASS'
+           and t.machine_model_class = v.code_value) machine_model_class_n,
+            (select v.code_value_name as value_name
+          from sys_code_values_v v
+         where v.code = 'ORIGIN_PLACE'
+           and t.origin_place = v.code_value) origin_place_n,
+            (select v.code_value_name as value_name
+          from sys_code_values_v v
+         where v.code = 'DIVISION'
+           and t.division = v.code_value)  division_n,
+           t.full_name   full_name_n
+
+         --end
+  from prj_project_lease_item t;
\ No newline at end of file

src/main/database/View/hls_document_use_seal_vl.sql

+create or replace view hls_document_use_seal_vl as
+select t.document_use_seal_id,
+         t.document_table,
+         t.document_id AS contract_id,
+         t.instruments_types,
+         (select v.code_value_name
+            from sys_code_values_v v
+           where v.code_value = t.instruments_types
+             and v.code = 'REPURCHASE_TYPES') as instruments_types_n,
+         t.common_seal,
+         (select v.code_value_name
+            from sys_code_values_v v
+           where v.code_value = t.common_seal
+             and v.code = 'YES_OR_NO') as common_seal_n,
+         t.corporate_visa_seal,
+         (select v.code_value_name
+            from sys_code_values_v v
+           where v.code_value = t.corporate_visa_seal
+             and v.code = 'YES_OR_NO') as corporate_visa_seal_n,
+         t.legal_seal,
+         (select v.code_value_name
+            from sys_code_values_v v
+           where v.code_value = t.legal_seal
+             and v.code = 'YES_OR_NO') as legal_seal_n,
+         t.con_special_seal,
+         (select v.code_value_name
+            from sys_code_values_v v
+           where v.code_value = t.con_special_seal
+             and v.code = 'YES_OR_NO') as con_special_seal_n,
+         t.financial_seal,
+         (select v.code_value_name
+            from sys_code_values_v v
+           where v.code_value = t.financial_seal
+             and v.code = 'YES_OR_NO') as financial_seal_n,
+         t.supervisio_seal,
+         (select v.code_value_name
+            from sys_code_values_v v
+           where v.code_value = t.supervisio_seal
+             and v.code = 'YES_OR_NO') as supervisio_seal_n,
+         t.seal_number as SEAL_QUANTITY
+    from HLS_DOCUMENT_USE_SEAL t;

src/main/webapp/WEB-INF/classes/cont/CON_REPO001/calc_cashflow.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="execute">
+            <bm:update-sql><![CDATA[
+                BEGIN
+                cus_con_contract_repo_pkg.calc_repo_cashflows(p_contract_id=>${@contract_id},
+                                                              p_user_id=>${/session/@user_id});
+                END;
+                ]]>
+            </bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/cont/CON_REPO001/calc_repo_date_amount.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="execute">
+            <bm:parameters>
+                <bm:parameter name="last_rent_due_date" dataType="java.util.Date" input="false" output="true" outputPath="@last_rent_due_date"/>
+                <bm:parameter name="sum_received_rent_amount" dataType="java.lang.Double" input="false" output="true" outputPath="@sum_received_rent_amount"/>
+                <bm:parameter name="sum_unreceived_rent_amount" dataType="java.lang.Double" input="false" output="true" outputPath="@sum_unreceived_rent_amount"/>
+                <bm:parameter name="sum_overdue_amount" dataType="java.lang.Double" input="false" output="true" outputPath="@sum_overdue_amount"/>
+                <bm:parameter name="sum_unreceived_principal" dataType="java.lang.Double" input="false" output="true" outputPath="@sum_unreceived_principal"/>
+                <bm:parameter name="due_amount" dataType="java.lang.Double" input="false" output="true" outputPath="@due_amount"/>
+            </bm:parameters>
+            <bm:update-sql><![CDATA[
+                BEGIN
+                cus_con_contract_repo_pkg.calc_repo_date_amount(p_contract_id                => ${@contract_id},
+                                                                p_repurchase_date            => to_date(${@repurchase_date},'yyyy-mm-dd'),
+                                                                p_last_rent_due_date         => ${@last_rent_due_date},
+                                                                p_sum_received_rent_amount   => ${@sum_received_rent_amount},
+                                                                p_sum_unreceived_rent_amount => ${@sum_unreceived_rent_amount},
+                                                                p_sum_overdue_amount         => ${@sum_overdue_amount},
+                                                                p_sum_unreceived_principal   => ${@sum_unreceived_principal},
+                                                                p_due_amount                 => ${@due_amount},
+                                                                p_user_id                    => ${/session/@user_id});
+                END;
+                ]]>
+            </bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/cont/CON_REPO001/create_change_req.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="execute">
+            <bm:parameters>
+                <bm:parameter name="change_req_id" dataType="java.lang.Long" input="false" output="true"/>
+            </bm:parameters>
+            <bm:update-sql><![CDATA[
+                DECLARE
+                    v_change_req_id NUMBER;
+                BEGIN
+                    cus_con_contract_repo_pkg.create_change_req_repo(p_contract_id=>${@contract_id},
+                                                                        p_req_type=>${@req_type},
+                                                                        p_user_id=>${/session/@user_id},
+                                                                        p_simulation_flag=>${@simulation_flag},
+                                                                        p_change_req_id=>v_change_req_id );
+                    ${@change_req_id}:=v_change_req_id;
+                END;
+                ]]>
+            </bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/cont/CON_REPO001/submit_change_req.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="execute">
+            <bm:parameters>
+                <bm:parameter name="change_req_id" dataType="java.lang.Long" input="true" output="false"/>
+                <bm:parameter name="user_id" dataType="java.lang.Long" input="true" output="false"/>
+            </bm:parameters>
+            <bm:update-sql><![CDATA[
+                begin
+                    cus_con_contract_repo_pkg.submit_change_req_repo(p_change_req_id=>${@change_req_id},
+                                                                     p_layout_code=>${@layout_code},
+                                                                     p_user_id=>${/session/@user_id});
+                end;]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/hls/HLS500N/check_prj_record.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: gaoyang
+    $Date: 2014-2-28 下午03:32:03
+    $Revision: 1.0
+    $Purpose:
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="execute">
+            <bm:update-sql><![CDATA[
+            	begin
+            		prj_project_check_pkg.check_prj_record(
+            				p_project_id   =>${@project_id},
+            				p_payment_deduction   =>${@payment_deduction},
+            				p_secondary_lease   =>${@secondary_lease},
+            				p_price_list  =>${@price_list}
+            		);
+            	end;
+            ]]></bm:update-sql>
+            <bm:parameters>
+                <bm:parameter name="payment_deduction" dataType="java.lang.String" input="false" output="true" outputPath="/parameter/@payment_deduction"/>
+                <bm:parameter name="secondary_lease" dataType="java.lang.String" input="false" output="true" outputPath="/parameter/@secondary_lease"/>
+
+                <bm:parameter name="price_list" dataType="java.lang.String" input="false" output="true" outputPath="/parameter/@price_list"/>
+            </bm:parameters>
+        </bm:operation>
+    </bm:operations>
+</bm:model>
+

src/main/webapp/WEB-INF/classes/prj/PRJ501N/prj_project_history_display.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: LIJINGJING
+    $Date: 2019-09-10 下午4:38:18
+    $Revision: 1.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+     select tt.*  from (       	SELECT t1.project_number,
+       t1.contract_number,
+       t1.bp_code,
+       t1.bp_name,
+       t1.overdue_max_days,
+       t1.overdue_max_amount,
+       t1.bp_type,
+        t1.bp_class,
+       t1.bp_id,
+       t1.description,
+       t1.project_id,
+       t1.contract_id
+  FROM prj_project_history_lv t1
+WHERE t1.bp_id = ${@bp_id}
+and  t1.project_id <> ${@project_id})   tt
+#WHERE_CLAUSE#
+            ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/prj/PRJ501N/project_approval.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: shenyamin
+    $Date: 2018-11_03 上午11:00:06  
+    $Revision: 3.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+                begin
+                    prj_project_pkg.project_submit(
+                    p_project_id =>${@project_id}, 
+                    p_user_id => ${/session/@user_id}
+
+                    );
+                end;
+            ]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/server-script/layoutconfig/con_buyback_01_g_result_queryfields.js

+var override_queryfields = [
+		{
+			name : 'bp_id',
+			queryexpression : "t1.bp_id_tenant=${@bp_id}"
+		},
+		{
+			name : 'bp_name',
+			queryexpression : "exists (select 1 from hls_bp_master hr where hr.bp_id=t1.bp_id_tenant and hr.bp_name like ${@bp_name})"
+		},
+		{
+			name : 'lease_start_date_from',
+			queryexpression : "t1.lease_start_date between to_date(${@lease_start_date_from},'yyyy-mm-dd') and nvl(to_date(${@lease_start_date_to},'yyyy-mm-dd'),t1.lease_start_date)"
+		},
+		{
+			name : 'lease_start_date_to',
+			queryexpression : "t1.lease_start_date between nvl(to_date(${@lease_start_date_from},'yyyy-mm-dd'),t1.lease_start_date) and to_date(${@lease_start_date_to},'yyyy-mm-dd')"
+		}, {
+			field : 'project_id',
+			queryoperator : "="
+		}, {
+			field : 'employee_id',
+			queryoperator : "="
+		}, {
+			field : 'lease_organization',
+			queryoperator : "="
+		}, {
+			field : 'contract_id',
+			queryoperator : "="
+		}, {
+			name : 'contract_number',
+			queryexpression : "t1.contract_number  like  ${@contract_number}"
+		}, {
+			field : 'lease_channel',
+			queryoperator : "="
+		}, {
+			field : 'document_type',
+			queryoperator : "="
+		}, {
+			field : 'lease_channel',
+			queryoperator : "="
+		}, {
+			field : 'document_type',
+			queryoperator : "="
+		}, {
+			field : 'business_type',
+			queryoperator : "="
+		}, {
+			field : 'contract_status',
+			queryoperator : "="
+		}, {
+			field : 'division',
+			queryoperator : "="
+		}
+
+];
+
+override();

src/main/webapp/WEB-INF/server-script/layoutconfig/con_buyback_03_g_result_queryfields.js

+var override_queryfields = [
+    {
+        name: 'bp_id',
+        queryexpression: "t1.bp_id_tenant=${@bp_id}"
+    },
+    {
+        name: 'bp_name',
+        queryexpression: "exists (select 1 from hls_bp_master hr where hr.bp_id=t1.bp_id_tenant and hr.bp_name like ${@bp_name})"
+    },
+    {
+        name: 'lease_start_date_from',
+        queryexpression: "t1.lease_start_date between to_date(${@lease_start_date_from},'yyyy-mm-dd') and nvl(to_date(${@lease_start_date_to},'yyyy-mm-dd'),t1.lease_start_date)"
+    },
+    {
+        name: 'lease_start_date_to',
+        queryexpression: "t1.lease_start_date between nvl(to_date(${@lease_start_date_from},'yyyy-mm-dd'),t1.lease_start_date) and to_date(${@lease_start_date_to},'yyyy-mm-dd')"
+    },
+    {
+        name: 'create_date_from',
+        queryexpression: "t1.create_date between to_date(${@create_date_from},'yyyy-mm-dd') and nvl(to_date(${@create_date_to},'yyyy-mm-dd'),t1.create_date)"
+    },
+    {
+        name: 'create_date_to',
+        queryexpression: "t1.create_date between nvl(to_date(${@create_date_from},'yyyy-mm-dd'),t1.create_date) and to_date(${@create_date_to},'yyyy-mm-dd')"
+    }, {
+        field: 'project_id',
+        queryoperator: "="
+    }, {
+        field: 'employee_id',
+        queryoperator: "="
+    }, {
+        field: 'lease_organization',
+        queryoperator: "="
+    }, {
+        field: 'contract_id',
+        queryoperator: "="
+    }, {
+        name: 'contract_name',
+        queryexpression: "t1.contract_number  like  ${@contract_number}"
+    }, {
+        field: 'lease_channel',
+        queryoperator: "="
+    }, {
+        field: 'document_type',
+        queryoperator: "="
+    }, {
+        field: 'lease_channel',
+        queryoperator: "="
+    }, {
+        field: 'document_type',
+        queryoperator: "="
+    }, {
+        field: 'business_type',
+        queryoperator: "="
+    }, {
+        field: 'contract_status',
+        queryoperator: "="
+    }, {
+        field: 'division',
+        queryoperator: "="
+    }, {
+        field: 'change_created_by_n',
+        queryoperator: "exists (select 1 from sys_user hr where hr.user_id=t1.created_by and hr.user_name like ${@change_created_by_n})"
+    }
+
+];
+
+var add_datafilters = [
+    {
+        name: "req_status",
+        expression: "t1.req_status = 'NEW' and Not Exists (Select 1 From prj_project p Where p.project_id = t1.project_id  And p.division = '09')"
+    }
+//		{
+//			name : "ccr_document_type",
+//			expression : "exists (select 1 from con_contract_change_req r where r.change_req_id = t1.contract_id and r.document_type = 'PAYCARD')"
+//		}
+];
+
+override();
+add_datafilter();

src/main/webapp/WEB-INF/server-script/layoutconfig/project_modify_entrance_g_project_result_queryfields.js

@@ -64,8 +64,8 @@ var override_queryfields = [
 //	queryoperator : "="
 //},
 {
-	name:'status_not_in',
-	queryexpression : "((t1.project_status in('NEW','PRE_APPROVING','APPROVED_RETURN')) Or (t1.project_status in('PRE_APPROVED','APPROVED_RETURN') and t1.pjd_instance_status in ('PRE_APPROVING','APPROVED'))) and t1.document_type='CARLS'"
+	name:'project_status',
+	queryexpression : "(t1.project_status in ('NEW','PRE_APPROVING','APPROVED_RETURN')"
 }
 
 

src/main/webapp/home_page/WIDGET504.lview

-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    $Author: hty
-    $Date: 2018/6/5 16:54
-    $Revision: 1.0 
--->
-<a:screen xmlns:a="http://www.leaf-framework.org/application">
-    <a:init-procedure/>
-    <a:view template="default" package="leaf.ui.std">
-        <script src="${/request/@context_path}/javascripts/home_page/init-tab-sheet.js" type="text/javascript"></script>
-        <script src="${/request/@context_path}/javascripts/home_page/init-my-approval.js"
-                type="text/javascript"></script>
-        <link href="${/request/@context_path}/lib/font-awesome-4.6.3/css/font-awesome.min.css" rel="stylesheet"
-              type="text/css"/>
-        <link href="${/request/@context_path}/lib/bootstrap-3.3.7/css/bootstrap.css" rel="stylesheet" type="text/css"/>
-        <script src="${/request/@context_path}/leafresource/hls/beyondChart/assets/js/bootstrap.min.js"></script>
-
-        <a:link id="bmLink_zj_wfl_instance_node_recipient_query" model="zjwfl.ZJWFL5110.zj_wfl_to_do_user"
-                modelaction="query"/>
-        <a:link id="bmLinl_zj_wfl_my_approved_application_query" model="zjwfl.ZJWFL3040.zj_wfl_my_approved_application"
-                modelaction="query"/>
-
-        <a:link id="pageLink_widget504_wfl_approve" url="${/request/@context_path}/modules/zjwfl/ZJWFL5110/zj_wfl_approve.lview"/>
-        <a:link id="pageLink_widget504_node_approve_history" url="${/request/@context_path}/modules/zjwfl/ZJWFL3040/zj_wfl_my_approved_application_history.lview"/>
-        <style>
-            html, body {
-                width: 870px;
-                height: 355px;
-                padding: 0;
-                margin: 0;
-            }
-
-            .foot-area-imags-detail {
-                margin-top: 12px;
-            }
-
-            .row-second-left-title > i {
-                margin-top: 5px;
-            }
-
-            .databox .databox-header {
-                font-size: 15px;
-            }
-
-            .portlet.light.bordered {
-                border: 1px solid #e7ecf1 !important;
-            }
-
-            .portlet.light {
-                padding: 12px 20px 15px 20px;
-                background-color: #fff;
-            }
-
-            .portlet.bordered {
-                border-left: 2px solid #e6e9ec !important;
-            }
-
-            .portlet {
-                margin-top: 0px;
-                margin-bottom: 25px;
-                padding: 0px;
-                -webkit-border-radius: 4px;
-                -moz-border-radius: 4px;
-                -ms-border-radius: 4px;
-                -o-border-radius: 4px;
-                border-radius: 4px;
-            }
-
-            .portlet.light.bordered > .portlet-title {
-                border-bottom: 1px solid #eef1f5;
-            }
-
-            .portlet.light > .portlet-title {
-                padding: 0;
-                min-height: 48px;
-            }
-
-            .portlet.light > .portlet-title > .caption {
-                color: #666;
-                padding: 10px 0;
-            }
-
-            .portlet > .portlet-title > .caption {
-                float: left;
-                display: inline-block;
-                font-size: 18px;
-                line-height: 18px;
-                padding: 10px 0;
-            }
-
-            .portlet.light > .portlet-title > .caption > i {
-                color: #777;
-                font-size: 15px;
-                font-weight: 300;
-                margin-top: 3px;
-            }
-
-            .portlet > .portlet-title > .caption > i {
-                float: left;
-                margin-top: 4px;
-                display: inline-block;
-                font-size: 13px;
-                margin-right: 5px;
-                color: #666;
-            }
-
-            .font-green-sharp {
-                color: #2ab4c0 !important;
-            }
-
-            [class^="icon-"] {
-                display: inline-block;
-                line-height: 14px;
-                -webkit-font-smoothing: antialiased;
-            }
-
-            .icon-globe {
-                font-family: Simple-Line-Icons;
-                speak: none;
-                font-style: normal;
-                font-variant: normal;
-                text-transform: none;
-            }
-
-            .portlet.light > .portlet-title > .caption > .caption-subject {
-                font-size: 16px;
-            }
-
-            .font-green-sharp {
-                color: #2ab4c0 !important;
-            }
-
-            .uppercase {
-                text-transform: uppercase !important;
-            }
-
-            .bold {
-                font-weight: 700 !important;
-            }
-
-            .portlet > .portlet-title:after {
-                clear: both;
-            }
-
-            .portlet.light .portlet-body {
-                padding-top: 8px;
-            }
-
-            .portlet > .portlet-body {
-                clear: both;
-                height: 278px;
-            }
-
-            .scroller {
-                padding: 0px;
-                margin: 0px;
-                padding-right: 12px;
-                overflow: hidden;
-            }
-
-            .feeds {
-                margin: 0px;
-                padding: 0px;
-                list-style: none;
-            }
-
-            .myApproval-tab {
-                padding: 4px 4px;
-                color: #2ab4c0;
-                cursor: pointer;
-            }
-
-            .myApproval-class {
-                height: 25px;
-                line-height: 25px;
-            }
-
-            #myApproval-container {
-                height: 250px;
-            }
-
-            .latest-event-item {
-                height: 76.5px;
-            }
-
-            .conAndPrj-class {
-                height: 25px;
-                line-height: 25px
-            }
-
-            .conAndPrj-tab {
-                padding: 4px 4px;
-                color: #2ab4c0;
-                cursor: pointer;
-            }
-
-            .grid-class {
-                color: #333;
-            }
-
-            .grid-class tbody > :nth-child(n+2):hover {
-                background-color: #fafbfd;
-            }
-
-            .grid-class th {
-                padding: 6px 0;
-            }
-
-            .grid-class tr {
-                border-bottom: 1px solid #cccccc;
-            }
-
-            .super-grid-footbtn {
-                margin: 0 auto;
-                text-align: center;
-                width: 100px;
-                height: 25px;
-            }
-
-            .super-grid-footbar {
-                position: absolute;
-                bottom: 23px;
-                width: 100%;
-            }
-        </style>
-
-        <div></div>
-        <script type="text/javascript"></script>
-        <a:dataSets/>
-        <div style="padding: 0;width: 870px;" class="col-md-6 col-sm-6">
-            <!-- BEGIN PORTLET-->
-            <div class="portlet light bordered" style="margin-bottom: 0">
-                <div class="portlet-title tabbable-line">
-                    <div class="caption" style="width: 100%;">
-                        <!--<i class="icon-globe font-green-sharp"></i>-->
-                        <img src="${/request/@context_path}/images/home_page/home-approval.png"
-                             style="margin-right: 5px;" width="14" height="14"/>
-                        <span class="caption-subject font-green-sharp bold uppercase">我的审批事项 </span>
-                        <span style="float: right;font-size: 14px;cursor: pointer;color: #2ab4c0;"
-                              onclick="mainGoToNotice('ZJWFL3040')">更多>></span>
-                    </div>
-                </div>
-                <div class="portlet-body" id="myApproval">
-
-                </div>
-            </div>
-        </div>
-        <script type="text/javascript"><![CDATA[
-        function mainGoToNotice(code) {
-            top.mainJumpCode(code, true);
-        }
-
-        renderTabs('myApproval', ['待办事项', '已办事项']);
-
-
-        renderApproval('myApproval-sheet0', $('bmLink_zj_wfl_instance_node_recipient_query').getUrl(), false);
-
-        renderApproval('myApproval-sheet1', $('bmLinl_zj_wfl_my_approved_application_query').getUrl(), true);
-        ]]></script>
-        <a:screenBody style="display:none;">
-        </a:screenBody>
-    </a:view>
-</a:screen>

src/main/webapp/home_page/WIDGET504/WIDGET504.lview

-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    $Author: hty
-    $Date: 2018/6/5 16:54
-    $Revision: 1.0 
--->
-<a:screen xmlns:a="http://www.leaf-framework.org/application">
-    <a:init-procedure/>
-    <a:view template="default" package="leaf.ui.std">
-        <script src="${/request/@context_path}/javascripts/home_page/init-tab-sheet.js" type="text/javascript"></script>
-        <script src="${/request/@context_path}/javascripts/home_page/init-my-approval.js"
-                type="text/javascript"></script>
-        <link href="${/request/@context_path}/lib/font-awesome-4.6.3/css/font-awesome.min.css" rel="stylesheet"
-              type="text/css"/>
-        <link href="${/request/@context_path}/lib/bootstrap-3.3.7/css/bootstrap.css" rel="stylesheet" type="text/css"/>
-        <script src="${/request/@context_path}/leafresource/hls/beyondChart/assets/js/bootstrap.min.js"></script>
-
-        <a:link id="bmLink_zj_wfl_instance_node_recipient_query" model="zjwfl.ZJWFL5110.zj_wfl_to_do_user"
-                modelaction="query"/>
-        <a:link id="bmLinl_zj_wfl_my_approved_application_query" model="zjwfl.ZJWFL3040.zj_wfl_my_approved_application"
-                modelaction="query"/>
-
-        <a:link id="pageLink_widget504_wfl_approve" url="${/request/@context_path}/modules/zjwfl/ZJWFL5110/zj_wfl_approve.lview?_csrf=${/session/@_csrf.token}"/>
-        <a:link id="pageLink_widget504_node_approve_history" url="${/request/@context_path}/modules/zjwfl/ZJWFL3040/zj_wfl_my_approved_application_history.lview?_csrf=${/session/@_csrf.token}"/>
-        <style>
-            html, body {
-                width: 870px;
-                height: 355px;
-                padding: 0;
-                margin: 0;
-            }
-
-            .foot-area-imags-detail {
-                margin-top: 12px;
-            }
-
-            .row-second-left-title > i {
-                margin-top: 5px;
-            }
-
-            .databox .databox-header {
-                font-size: 15px;
-            }
-
-            .portlet.light.bordered {
-                border: 1px solid #e7ecf1 !important;
-            }
-
-            .portlet.light {
-                padding: 12px 20px 15px 20px;
-                background-color: #fff;
-            }
-
-            .portlet.bordered {
-                border-left: 2px solid #e6e9ec !important;
-            }
-
-            .portlet {
-                margin-top: 0px;
-                margin-bottom: 25px;
-                padding: 0px;
-                -webkit-border-radius: 4px;
-                -moz-border-radius: 4px;
-                -ms-border-radius: 4px;
-                -o-border-radius: 4px;
-                border-radius: 4px;
-            }
-
-            .portlet.light.bordered > .portlet-title {
-                border-bottom: 1px solid #eef1f5;
-            }
-
-            .portlet.light > .portlet-title {
-                padding: 0;
-                min-height: 48px;
-            }
-
-            .portlet.light > .portlet-title > .caption {
-                color: #666;
-                padding: 10px 0;
-            }
-
-            .portlet > .portlet-title > .caption {
-                float: left;
-                display: inline-block;
-                font-size: 18px;
-                line-height: 18px;
-                padding: 10px 0;
-            }
-
-            .portlet.light > .portlet-title > .caption > i {
-                color: #777;
-                font-size: 15px;
-                font-weight: 300;
-                margin-top: 3px;
-            }
-
-            .portlet > .portlet-title > .caption > i {
-                float: left;
-                margin-top: 4px;
-                display: inline-block;
-                font-size: 13px;
-                margin-right: 5px;
-                color: #666;
-            }
-
-            .font-green-sharp {
-                color: #2ab4c0 !important;
-            }
-
-            [class^="icon-"] {
-                display: inline-block;
-                line-height: 14px;
-                -webkit-font-smoothing: antialiased;
-            }
-
-            .icon-globe {
-                font-family: Simple-Line-Icons;
-                speak: none;
-                font-style: normal;
-                font-variant: normal;
-                text-transform: none;
-            }
-
-            .portlet.light > .portlet-title > .caption > .caption-subject {
-                font-size: 16px;
-            }
-
-            .font-green-sharp {
-                color: #2ab4c0 !important;
-            }
-
-            .uppercase {
-                text-transform: uppercase !important;
-            }
-
-            .bold {
-                font-weight: 700 !important;
-            }
-
-            .portlet > .portlet-title:after {
-                clear: both;
-            }
-
-            .portlet.light .portlet-body {
-                padding-top: 8px;
-            }
-
-            .portlet > .portlet-body {
-                clear: both;
-                height: 278px;
-            }
-
-            .scroller {
-                padding: 0px;
-                margin: 0px;
-                padding-right: 12px;
-                overflow: hidden;
-            }
-
-            .feeds {
-                margin: 0px;
-                padding: 0px;
-                list-style: none;
-            }
-
-            .myApproval-tab {
-                padding: 4px 4px;
-                color: #2ab4c0;
-                cursor: pointer;
-            }
-
-            .myApproval-class {
-                height: 25px;
-                line-height: 25px;
-            }
-
-            #myApproval-container {
-                height: 250px;
-            }
-
-            .latest-event-item {
-                height: 76.5px;
-            }
-
-            .conAndPrj-class {
-                height: 25px;
-                line-height: 25px
-            }
-
-            .conAndPrj-tab {
-                padding: 4px 4px;
-                color: #2ab4c0;
-                cursor: pointer;
-            }
-
-            .grid-class {
-                color: #333;
-            }
-
-            .grid-class tbody > :nth-child(n+2):hover {
-                background-color: #fafbfd;
-            }
-
-            .grid-class th {
-                padding: 6px 0;
-            }
-
-            .grid-class tr {
-                border-bottom: 1px solid #cccccc;
-            }
-
-            .super-grid-footbtn {
-                margin: 0 auto;
-                text-align: center;
-                width: 100px;
-                height: 25px;
-            }
-
-            .super-grid-footbar {
-                position: absolute;
-                bottom: 23px;
-                width: 100%;
-            }
-        </style>
-
-        <div></div>
-        <script type="text/javascript"></script>
-        <a:dataSets/>
-        <div style="padding: 0;width: 870px;" class="col-md-6 col-sm-6">
-            <!-- BEGIN PORTLET-->
-            <div class="portlet light bordered" style="margin-bottom: 0">
-                <div class="portlet-title tabbable-line">
-                    <div class="caption" style="width: 100%;">
-                        <!--<i class="icon-globe font-green-sharp"></i>-->
-                        <img src="${/request/@context_path}/images/home_page/home-approval.png"
-                             style="margin-right: 5px;" width="14" height="14"/>
-                        <span class="caption-subject font-green-sharp bold uppercase">我的审批事项 </span>
-                        <span style="float: right;font-size: 14px;cursor: pointer;color: #2ab4c0;"
-                              onclick="mainGoToNotice('ZJWFL3040')">更多>></span>
-                    </div>
-                </div>
-                <div class="portlet-body" id="myApproval">
-
-                </div>
-            </div>
-        </div>
-        <script type="text/javascript"><![CDATA[
-        function mainGoToNotice(code) {
-            top.mainJumpCode(code, true);
-        }
-
-        renderTabs('myApproval', ['待办事项', '已办事项']);
-
-
-        renderApproval('myApproval-sheet0', $('bmLink_zj_wfl_instance_node_recipient_query').getUrl(), false);
-
-        renderApproval('myApproval-sheet1', $('bmLinl_zj_wfl_my_approved_application_query').getUrl(), true);
-        ]]></script>
-        <a:screenBody style="display:none;">
-        </a:screenBody>
-    </a:view>
-</a:screen>

src/main/webapp/home_page/WIDGET511/WIDGET511.lview

-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    $Author: huangtianyang
-    $Date: 2018/7/3 下午6:09
-    $Revision: 1.0 
--->
-<a:screen xmlns:a="http://www.leaf-framework.org/application">
-    <a:init-procedure/>
-    <a:view template="default" package="leaf.ui.std">
-        <div></div>
-        <style>
-            html, body {
-                padding: 0;
-                width: 870px;
-                height: 355px;
-            }
-        </style>
-        <script type="text/javascript"><![CDATA[
-        function widget511_valid_temp(rowData) {
-            return rowData.data.valid_from.format('yyyy-mm-dd');
-        }
-
-        function widget511_money_temp(rowData) {
-            return Leaf.formatMoney(rowData.data.open_to_buy);
-        }
-
-        function click3(data) {
-            alert(data);
-        }
-
-        function widget511_line_amt_temp(rowData) {
-            return Leaf.formatMoney(rowData.data.credit_line_amt);
-        }
-
-        ]]></script>
-        <a:dataSets>
-            <a:dataSet id="widget511_leg_contract_result_ds" pageSize="5" autoPageSize="true" autoQuery="true"
-                       model="lon.lon110w.lon_credit_contract_lv">
-                <a:fields>
-                </a:fields>
-            </a:dataSet>
-        </a:dataSets>
-        <a:hapGrid id="widget511_leg_contract_result_grid" title="授信额度明细" bindTarget="widget511_leg_contract_result_ds"
-                   titleimg="/images/lon/contract.png">
-            <a:toolBar>
-                <!--<a:button text="按钮测试" click="click1"/>-->
-                <!--<a:button icon="/images/home_page/next.png" click="click2"/>-->
-                <!--<a:button type="search" click="click3" width="150px" placeholder="请输入合同编号"/>-->
-            </a:toolBar>
-            <a:columns>
-                <!--<a:column name="contract_number" prompt="分类" width="150"/>-->
-                <a:column name="valid_from" prompt="时间" width="200" template="widget511_valid_temp"/>
-                <a:column name="description" prompt="摘要"/>
-                <a:column name="credit_contract_name" prompt="对象"/>
-                <a:column name="currency_n" prompt="币种"/>
-                <a:column name="now_rate" prompt="当时汇率"/>
-                <a:column name="credit_line_amt" prompt="授信额度" template="widget511_line_amt_temp"/>
-                <a:column name="open_to_buy" prompt="金额" template="widget511_money_temp"/>
-
-            </a:columns>
-        </a:hapGrid>
-        <a:screenBody/>
-    </a:view>
-</a:screen>
\ No newline at end of file