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

src/main/webapp/WEB-INF/classes/efile/EFILE1020/efile_generated_selected.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: trd
+    $Date: 2023-2-7 下午2:36:27
+    $Revision: 1.0
+    $Purpose:
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="insert">
+            <bm:update-sql><![CDATA[
+				begin
+					 elec_wfl_pkg.efile_generate_pool(p_e_archives_id					=> ${@e_archives_id},
+													p_base_archive_code					=> ${@base_archive_code},
+													p_archive_type         				=> ${@archive_type},
+						                            p_document_id       				=> ${@document_id},
+						                            p_document_number                  => ${@document_number},
+						                            p_document_info                    => ${@document_info},
+						                            p_user_id			  			=> ${/session/@user_id});
+				end;
+			]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/zjwfl/ZJWFL1060/zj_wfl_monitoring_query.lwm

@@ -58,12 +58,20 @@
         <!--<bm:data-filter name="query" expression="( (${/session/@role_id} = (select role_id from sys_role where role_code = '0006') and t1.workflow_code in (&apos;CONTRACT_INCEPT_WFL&apos;, &apos;DCFL_CSH_PAYMENT_REQ&apos;)) or (${/session/@role_id} in (select role_id from sys_role where role_code in ('0012', '0013', '0014')) and t1.workflow_code in (&apos;DCFL_CSH_PAYMENT_REQ&apos;, &apos;DEPOSIT_RETURN&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0005') and t1.workflow_code in (&apos;PROJECT_WFL&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0008') and t1.workflow_code in (&apos;CON_ET_WFL&apos;,&apos;TENANT_CHANGE_WFL&apos;,&apos;CON_BUYBACK_WFL&apos;,&apos;DEPOSIT_RETURN&apos;)) or (${/session/@role_id} not in (select role_id from sys_role where role_code in('0005', '0006', '0008', '0012', '0013', '0014')) and 1 = 1))"/>-->
         <!--凭证导出工作流只能由提交人和审批人看到，其余人无法在工作流监控中看到-->
         <bm:data-filter name="query" expression="( (${/session/@role_id} = (select role_id from sys_role where role_code = '0006') and t1.workflow_code in (&apos;CONTRACT_INCEPT_WFL&apos;, &apos;DCFL_CSH_PAYMENT_REQ&apos;)) or (${/session/@role_id} in (select role_id from sys_role where role_code in ('0012', '0013', '0014')) and t1.workflow_code in (&apos;DCFL_CSH_PAYMENT_REQ&apos;, &apos;DEPOSIT_RETURN&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0005') and t1.workflow_code in (&apos;PROJECT_WFL&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0008') and t1.workflow_code in (&apos;CON_ET_WFL&apos;,&apos;TENANT_CHANGE_WFL&apos;,&apos;CON_BUYBACK_WFL&apos;,&apos;DEPOSIT_RETURN&apos;)) or (${/session/@role_id} not in (select role_id from sys_role where role_code in('0005', '0006', '0008', '0012', '0013', '0014')) and 1 = 1)
-       or( ((t1.SUBMITTED_BY = ${/session/@user_id}) or  ( (Select t.user_name From sys_user t  Where t.user_id = ${/session/@user_id})
-       in (Select u.user_name
-                  From zj_wfl_instance_node_recipient t, sys_user u
+       or( ((t1.SUBMITTED_BY = ${/session/@user_id}) or  (
+       (${/session/@user_id}
+       in (Select t.user_id
+                  From zj_wfl_instance_node_recipient t
                  Where t.instance_id = t1.instance_id
-                   And t.user_id = u.user_id
                    And t.record_type = 'APPROVER')
+                   and t1.instance_status = 1)
+        or
+       (${/session/@user_id}
+       in (Select t.user_id
+                  From zj_wfl_instance_node_rcpt_ht t
+                 Where t.instance_id = t1.instance_id
+                   And t.record_type = 'APPROVER')
+                   and t1.instance_status in (-1000,-1,10))
    ) ) and t1.workflow_code in('HLS_JOURNAL_WFL','HLS_JOURNAL_REVERSE_WFL')))"/>
-    </bm:data-filters>
+       </bm:data-filters>
 </bm:model>

src/main/webapp/modules/efile/EFILE1020/archives_post_list.lview

@@ -7,6 +7,7 @@
 -->
 <a:screen xmlns:a="http://www.leaf-framework.org/application">
     <a:view>
+        <a:link id="efile1020_generated_save_link" url="${/request/@context_path}/modules/efile/EFILE1020/efile_generated_save_selected.lsc"/>
        <script type="text/javascript"><![CDATA[
          function efile1020_query(){
                   $('archives_pool_list_ds').query();
@@ -16,6 +17,40 @@
           $('archives_post_list_query').reset();
       }
 
+
+       function efile1020_generated(){
+           var datas = [];
+           var records = $('archives_pool_list_ds').getSelected();
+           for (var i=0;i<records.length;i++){
+               var record = records[i];
+               datas.push(record.data);
+           }
+           var param = {};
+           param['details'] = datas;
+           Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认生成电子档案？', function () {
+               Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
+               Leaf.request({
+                   url: $('efile1020_generated_save_link').getUrl(),
+                   para: datas,
+                   success: function (res) {
+                       Leaf.SideBar.show({
+                           msg: '生成成功',
+                           duration: 2000
+                       });
+                       Leaf.Masker.unmask(Ext.getBody());
+                       $('archives_pool_list_ds').query();
+                   },
+                   failure: function () {
+                       Leaf.Masker.unmask(Ext.getBody());
+                   },
+                   error: function () {
+                       Leaf.Masker.unmask(Ext.getBody());
+                   },
+                   scope: this
+               });
+           }, null);
+       }
+
    ]]></script>
         <a:dataSets>
             <a:dataSet id="archive_type_ds" lookupCode="ELEC_FILE_TYPE"/>