[FIX]测试内容修改

src/main/java/com/hand/hls/hlcm/util/MailSend.java

@@ -100,7 +100,7 @@ public class MailSend {
             messageBodyPart.setText(body);
 
             multipart.addBodyPart(messageBodyPart);
-            if(ATTACHMENT_FLAG){
+            if(isNotEmpty(attchFlag)&&YES.equals(attchFlag)){
                 String fileName=jsonObject.optString("attch_file_name");
                 String filePath=jsonObject.optString("attch_file_path");
                 // 附件部分

src/main/webapp/WEB-INF/classes/cont/CON3600/contract_lease_report.lwm

@@ -328,10 +328,11 @@ SELECT h.extra_nam,
  WHERE t.data_class = 'NORMAL'
    AND t.bp_id_agent_level1 = h.bp_id
    AND (t.contract_status IN ('INCEPT',
-                             'PENDING',
+
                              'TERMINATING',
                              'ETING',
-                             'REPURING')or (to_char(t.et_date,'yyyy-mm')>=${@period_name} and t.contract_status='TERMINATE' ))
+                             'REPURING',
+                             'ET')or (to_char(t.et_date,'yyyy-mm')>=${@period_name} and t.contract_status='TERMINATE' ))
    and trunc(t.lease_start_date) <= trunc(last_day(to_date(${@start_calc_date},'yyyy-mm-dd')))
 
 

src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_transaction_query.lwm

@@ -124,8 +124,8 @@
         <bm:query-field name="currency_code_to" queryExpression="t1.currency_code &lt;= ${@currency_code_to}"/>
         <bm:query-field name="bank_account_code_from" queryExpression="(select a.bank_account_code from csh_bank_account a where a.bank_account_id=t1.bank_account_id) &gt;= ${@bank_account_code_from}"/>
         <bm:query-field name="bank_account_code_to" queryExpression="(select a.bank_account_code from csh_bank_account a where a.bank_account_id=t1.bank_account_id) &lt;= ${@bank_account_code_to}"/>
-        <bm:query-field name="transaction_date_from" queryExpression="transaction_date &gt;= to_date(${@transaction_date_from},&apos;yyyy-mm-dd&apos;)"/>
-        <bm:query-field name="transaction_date_to" queryExpression="transaction_date &lt;= to_date(${@transaction_date_to},&apos;yyyy-mm-dd&apos;)"/>
+        <bm:query-field name="transaction_date_from" queryExpression="trunc(transaction_date, &apos;fmdd&apos;) &gt;= to_date(${@transaction_date_from},&apos;yyyy-mm-dd&apos;)"/>
+        <bm:query-field name="transaction_date_to" queryExpression="trunc(transaction_date, &apos;fmdd&apos;) &lt;= to_date(${@transaction_date_to},&apos;yyyy-mm-dd&apos;)"/>
         <bm:query-field name="user_id" queryExpression="t1.created_by=${@user_id}"/>
         <bm:query-field name="receipt" queryExpression="(t1.transaction_type=${@receipt} or t1.transaction_type=${@advance_receipt} or t1.transaction_type=${@deposit} or t1.transaction_type=${@risk})"/>
         <!--<bm:query-field name="full_write_off_flag" queryExpression="t1.write_off_flag!=${@full_write_off_flag}"/>-->

src/main/webapp/WEB-INF/classes/hls/HLS801/csh_current_period_query.lwm

@@ -34,8 +34,10 @@
 				  From csh_transaction t
 				  Where t.confirmed_flag in ('ACCAUDITED','APPROVED', 'WF_REJECTED', 'WF_APPROVING')
 				  And t.transaction_type not in ('DEPOSIT', 'PAYMENT')
-				  And t.returned_flag <> 'RETURN') t1
-		  Where to_char(t1.transaction_date, 'yyyymm') < to_char(sysdate, 'yyyymm')
+				  And t.returned_flag not in ('RETURN', 'FULL')
+				  And nvl(t.reversed_flag, 'N') = 'N') t1
+		  Where to_char(t1.transaction_date, 'yyyymm') <= to_char(sysdate, 'yyyymm')
+		  And   to_char(t1.transaction_date, 'yyyymm') > '201906'
 		 Group By to_char(t1.transaction_date, 'yyyy-mm'), t1.ref_v04
 		 Order By to_char(t1.transaction_date, 'yyyy-mm') desc
             ]]></bm:query-sql>

src/main/webapp/WEB-INF/classes/hls/HLS801/sys_role_flag.lwm

@@ -13,22 +13,22 @@
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-            	 Select nvl((Select decode(t.role_code,
-                                         '0006',
-                                         'NO',
-                                         '0014',
-                                         'YES',
-                                         '0013',
-                                         'YES',
-                                         '0017',
-                                         'YES',
-                                         'HAND',
-                                         'YES',
-                                         'N')
-                             From sys_role t
-                            Where t.role_id = ${/session/@role_id}),
-                           'N') As role_code
-                  From dual
+            	 Select nvl(decode(${/session/@user_id},
+                        10413,
+                        'NO',
+                        (Select decode(t.role_code,
+                                       '0014',
+                                       'YES',
+                                       '0013',
+                                       'YES',
+                                       '0017',
+                                       'YES',
+                                       'HAND',
+                                       'YES',
+                                       'N')
+                           From sys_role t
+                          Where t.role_id = ${/session/@role_id})), 'N') as role_code
+            From dual
     		]]></bm:query-sql>
         </bm:operation>
     </bm:operations>

src/main/webapp/WEB-INF/classes/rpt/RPT5090/atm_update.lwm

@@ -60,7 +60,7 @@
                (CASE
                  WHEN to_char(SYSDATE, 'dd') <= 20 AND
                       to_char(t.calendar_date, 'yyyymmdd') =
-                      to_char(SYSDATE, 'yyyymm') || 20 THEN
+                      to_char(SYSDATE, 'yyyymm') || decode(to_char(t.calendar_date, 'd'), 1, 18, 7, 19, 20) THEN
                  --当月的二十号统计数据
                   NVL((SELECT SUM(nvl(c.lease_item_amount, 0))
                      FROM con_contract c
@@ -80,8 +80,19 @@
                       AND nvl(c.payment_deduction, 'NO_DEDUCTION') <>
                           'NO_DEDUCTION'),0)
                  WHEN to_char(SYSDATE, 'dd') > 20 AND
-                      to_char(add_months(t.calendar_date, -1), 'yyyymmdd') =
-                      to_char(SYSDATE, 'yyyymm') || 20 THEN
+                     -- to_char(add_months(t.calendar_date, -1), 'yyyymmdd') =
+                     -- to_char(SYSDATE, 'yyyymm') || 20
+                     to_char(t.calendar_date, 'yyyymmdd') =
+                      decode(to_char(to_date((to_char(add_months(Sysdate, 1),
+                                                      'yyyymm') || 20),
+                                             'yyyymmdd'),
+                                     'd'),
+                             1,
+                             to_char(add_months(Sysdate, 1), 'yyyymm') || 18,
+                             7,
+                             to_char(add_months(Sysdate, 1), 'yyyymm') || 19,
+                             to_char(add_months(Sysdate, 1), 'yyyymm') || 20)
+                      THEN
                   NVL((SELECT SUM(nvl(c.lease_item_amount, 0))
                      FROM con_contract c
                     WHERE c.contract_status <> 'CANCEL'

src/main/webapp/modules/hls/HLS801/hls_monthly_statement.lview

@@ -33,6 +33,7 @@
         <a:link id="period_month_close_link" model="hls.HLS801.period_month_close" modelaction="execute"/>
         <a:link id="tre_interest_confirm_link" model="hls.HLS801.tre_interest_confirm" modelaction="execute"/>
         <a:link id="main_link" url="${/request/@context_path}/welcome.lview"/>
+        <a:link id="user_main_link" url="${/request/@context_path}/user_role_home_page.lview"/>
         <a:link id="csh_current_period_link" model="hls.HLS801.csh_current_period_query" modelaction="update"/>
         <script><![CDATA[
         //HLS801.NEXT_STEP
@@ -41,6 +42,14 @@
         var g_company_id_2;
         //alert('${/model/sys_role_path/record/@role_code}');
 
+        $L.onReady(function () {
+            if('${/model/sys_role_path/record/@role_code}' == 'N'){
+                var win = $L.showInfoMessage('${l:PROMPT}', '您暂无权限查看!');
+                win.on('close', function() {
+                    history.back();
+                });
+            }
+        });
         function nextStep() {
             var stepTabPanel = $('step');
             step = step + 1;
@@ -327,7 +336,7 @@
                     para: {
                         internal_period_num: record.get('internal_period_num')
                     },
-                    success: function (args) { //debugger;
+                    success: function (args) {
                         var result = args.result;
                         if (!result) {
                             Leaf.showWarningMessage('', '${l:PRJ509.DATA_NOT_BACK}', null, 200, 100);
@@ -497,7 +506,7 @@
                         internal_period_num: record.get('internal_period_num'),
                         calc_end_date: record.get('calc_end_date')
                     },
-                    success: function (args) { //debugger;
+                    success: function (args) {
                         var result = args.result;
                         if (!result) {
                             Leaf.showWarningMessage('', '${l:PRJ509.DATA_NOT_BACK}', null, 200, 100);