I-21941系统合同工作流结束优化客户需求调整点1

src/main/webapp/WEB-INF/classes/cont/CON301N/con_contract_owner_print.lwm

@@ -24,6 +24,7 @@
                        ('0018', '0019'))
                     and t.contract_id =   ${@contract_id}
                     and t.lease_type = '10'
+                    and t.created_by <> 1
                     order by t.print_date desc
             ]]></bm:query-sql>
         </bm:operation>

src/main/webapp/WEB-INF/classes/cont/CON560/con_contract_finish_for_query.lwm

@@ -80,9 +80,8 @@
 <!--        <bm:query-field field="lease_organization" queryOperator="="/>-->
         <bm:query-field field="contract_status" queryOperator="="/>
         <bm:query-field field="bp_id_agent_desc" queryExpression="bp_id_agent_desc like upper(&apos;%&apos;||${@bp_id_agent_desc}||&apos;%&apos;)"/>
-        <bm:query-field name="amount_unreceived_penalty_from" queryExpression="t1.amount_unreceived_penalty &gt;= ${@amount_unreceived_penalty_from}"/>
-        <bm:query-field name="amount_unreceived_penalty_to" queryExpression="t1.amount_unreceived_penalty &lt;= ${@amount_unreceived_penalty_to}"/>
-        <bm:query-field field="is_sbo_zero" queryOperator="="/>
+        <bm:query-field name="amount_unreceived_penalty" queryExpression="((${@amount_unreceived_penalty}='1' and t1.amount_unreceived_penalty = 0) or(${@amount_unreceived_penalty}='2' and t1.amount_unreceived_penalty &gt; 0 and t1.amount_unreceived_penalty &lt;= 1000) or (${@amount_unreceived_penalty}='3' and t1.amount_unreceived_penalty &gt;  1000))"/>
+     <bm:query-field field="is_sbo_zero" queryOperator="="/>
       </bm:query-fields>
     <bm:data-filters>
         <bm:field name="is_terminate" expression="((t1.contract_status not in('REPURING') and (SELECT ccc.write_off_flag from con_contract_cashflow ccc WHERE ccc.contract_id=t1.contract_id AND ccc.cf_item=8 AND ccc.cf_status=&apos;RELEASE&apos;)=&apos;FULL&apos;)or(t1.contract_status='REPURING'))"/>

src/main/webapp/modules/cont/CON560/con_contract_finish_maintain.lview

@@ -341,6 +341,13 @@
                        model="basic.hls_lease_organization_for_lov"/>
             <a:dataSet id="con560_contract_status_grid_ds" lookupCode="CON500_CONTRACT_STATUS"/>
             <a:dataSet id="con560_is_sbo_zero_ds" lookupCode="YES_OR_NO"/>
+            <a:dataSet id="QUERY_PEANLTY_FLAG_DS">
+                <a:datas>
+                    <a:record code_value="1" code_value_name="0"/>
+                    <a:record code_value="2" code_value_name="≤1000（不含0）"/>
+                    <a:record code_value="3" code_value_name="＞1000"/>
+                </a:datas>
+            </a:dataSet>
             <a:dataSet id="seal_number_ds" lookupCode="SEAL_NUMBER_FINISH"/>
             <a:dataSet id="con560_contract_query_ds" autoCreate="true">
                 <a:fields>
@@ -374,20 +381,18 @@
                     <a:field name="is_sbo_zero_desc" displayField="code_value_name"
                              options="con560_is_sbo_zero_ds" returnField="is_sbo_zero"
                              valueField="code_value"/>
-                   <a:field name="amount_unreceived_penalty_from"/>
-                   <a:field name="amount_unreceived_penalty_to"/>
                    <a:field name="contract_status_n" displayField="code_value_name"
                             options="con560_contract_status_ds" returnField="contract_status"
                             valueField="code_value"/>
-                </a:fields>
+                    <a:field name="amount_unreceived_penalty_n" options="QUERY_PEANLTY_FLAG_DS"
+                       returnField="amount_unreceived_penalty" displayField="code_value_name" valueField="code_value"
+                       defaultValue="0"/>
+                 </a:fields>
             </a:dataSet>
             <a:dataSet id="con560_contract_result_ds" autoPageSize="true" autoQuery="true" pageSize="4"
                        model="cont.CON560.con_contract_finish_for_query" queryDataSet="con560_contract_query_ds"
                        queryUrl="${/request/@context_path}/autocrud/cont.CON560.con_contract_finish_for_query/query"
                        selectable="true">
-                <!--<a:fields>
-                    <a:field name="et_date" required="true" readOnly="false"/>
-                </a:fields>-->
                 <a:events>
                     <a:event name="indexChange" handler="onIndexChange"/>
                     <a:event name="query" handler="aut_authority_list_validate_query"/>
@@ -435,8 +440,7 @@
                 <!--<a:lov name="owner_user_id_n" bindTarget="con560_contract_query_ds" prompt="出单人"/>-->
 <!--                <a:comboBox name="lease_organization_name" bindTarget="con560_contract_query_ds" prompt="事业部"/>-->
                 <a:comboBox name="contract_status_n" bindTarget="con560_contract_query_ds" prompt="合同状态"/>
-                <a:numberField name="amount_unreceived_penalty_from"  bindTarget="con560_contract_query_ds" prompt="未核销违约金从" align="right"/>
-                <a:numberField name="amount_unreceived_penalty_to"  bindTarget="con560_contract_query_ds" prompt="未核销违约金到" align="right"/>
+                <a:comboBox name="amount_unreceived_penalty_n" bindTarget="con560_contract_query_ds" prompt="未收违约金"/>
                 <a:comboBox name="is_sbo_zero_desc" bindTarget="con560_contract_query_ds" prompt="SBO是否结零"/>
               </a:form>
             <a:tabPanel id="con560_con_contract_id" marginHeight="100" marginWidth="5">