Merge branch 'feature/bug_fix' into develop

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

 package com.hand.hls.hlcm.util;
 
-import com.hand.hls.hlcm.contact.service.IBusinessContactService;
-import org.springframework.beans.factory.annotation.Autowired;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -13,8 +10,7 @@ import java.util.regex.Pattern;
  * @description
  */
 public class DelHtmlScript {
-    @Autowired
-    private IBusinessContactService service;
+
     /**
      * 定义script的正则表达式
      */

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

@@ -93,10 +93,10 @@ public class MailSend {
             // 创建多重消息
             // 设置文本消息部分
             //判断是html格式还是文本格式
-            if (CONTENT_TYPE_HTML.equals(jsonObject.optString("content_type"))) {
-                //删除html标签
-                body=DelHtmlScript.delHtmlTag(body);
-            }
+//            if (CONTENT_TYPE_HTML.equals(jsonObject.optString("content_type"))) {
+//                //删除html标签
+//                body=DelHtmlScript.delHtmlTag(body);
+//            }
             messageBodyPart.setText(body);
 
             multipart.addBodyPart(messageBodyPart);
@@ -140,7 +140,7 @@ public class MailSend {
         jb.put("content_type", "text/html");
         jb.put("attch_flag", "Y");
         jb.put("attch_file_name", "财务收支一览表.xlsx");
-        jb.put("attch_file_path", "d:/222.txt");
+        jb.put("attch_file_path", "D:/u01/hls_file/task_excel/excel1589481201751.xlsx");
         try{
             mailSend.sendMain(jb.toString());
         }catch(Exception e){

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

@@ -3,7 +3,7 @@
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-          SELECT to_char(v.calendar_date,'yyyy/mm/dd')calendar_date,
+           SELECT to_char(v.calendar_date,'yyyy/mm/dd')calendar_date,
        v.named_day,
        v.purchase_amount,
        v.down_payment,
@@ -65,6 +65,7 @@
                   NVL((SELECT SUM(nvl(c.lease_item_amount, 0))
                      FROM con_contract c
                     WHERE c.contract_status <> 'CANCEL'
+                      AND c.data_class='NORMAL'
                       AND to_char(add_months(c.lease_start_date, 1),
                                   'yyyymm') = to_char(SYSDATE, 'yyyymm')
                       AND nvl(c.payment_deduction, 'NO_DEDUCTION') =
@@ -73,6 +74,7 @@
                               nvl(c.down_payment, 0))
                      FROM con_contract c
                     WHERE c.contract_status <> 'CANCEL'
+                      AND c.data_class='NORMAL'
                       AND to_char(add_months(c.lease_start_date, 1),
                                   'yyyymm') = to_char(SYSDATE, 'yyyymm')
                       AND nvl(c.payment_deduction, 'NO_DEDUCTION') <>
@@ -83,6 +85,7 @@
                   NVL((SELECT SUM(nvl(c.lease_item_amount, 0))
                      FROM con_contract c
                     WHERE c.contract_status <> 'CANCEL'
+                      AND c.data_class='NORMAL'
                       AND to_char(c.lease_start_date, 'yyyymm') =
                           to_char(SYSDATE, 'yyyymm')
                       AND nvl(c.payment_deduction, 'NO_DEDUCTION') =
@@ -91,6 +94,7 @@
                               nvl(c.down_payment, 0))
                      FROM con_contract c
                     WHERE c.contract_status <> 'CANCEL'
+                      AND c.data_class='NORMAL'
                       AND to_char(c.lease_start_date, 'yyyymm') =
                           to_char(SYSDATE, 'yyyymm')
                       AND nvl(c.payment_deduction, 'NO_DEDUCTION') <>

src/main/webapp/WEB-INF/leaf.plugin.export.task/report-task.config

 <?xml version="1.0" encoding="UTF-8"?>
-<et:ReportTask xmlns:t="leaf.application.action" xmlns:a="http://www.leaf-framework.org/application" xmlns:et="leaf.plugin.export.task" xmlns:p="uncertain.proc" reportDir="/u01/hls_file/task_excel/">
+<et:ReportTask xmlns:t="leaf.application.action" xmlns:a="http://www.leaf-framework.org/application" xmlns:et="leaf.plugin.export.task" xmlns:p="uncertain.proc" reportDir="D:/u01/hls_file/task_excel">
 	<!--下载报表的权限校验-->
     <p:procedure name="pre-service">
         <p:set field="@success" value="true"/>

src/main/webapp/modules/rpt/RPT5090/export_excel_sheets.lsc

@@ -7,7 +7,7 @@
 <!--            var para = $ctx.current_parameter || $ctx.parameter;-->
 <!--            println(para.toXML());-->
             $ctx.parameter.file_name='财务收支一览表.xlsx';
-            $ctx.parameter.file_path = '/u01/hls_file/task_excel/';
+            $ctx.parameter.file_path = 'D:/u01/hls_file/task_excel';
             ]]></s:server-script>
         <dr:excel-report enableTask="true" fileName="${/parameter/@file_name}">
             <dr:styles>

src/main/webapp/modules/sys/SYS405/sys_mail_send_by_java.lsc

@@ -29,6 +29,8 @@
             attch_file_path:mail_list_result[i].attch_file_path,
             attch_flag:mail_list_result[i].attch_flag  //附件标志
             };
+            println('1111');
+            println(mail_list_result[i].attch_file_path);
             var sm = new MailSend();
             var stringResult = sm.sendMain(JSON.stringify(jsonString));//调用接口
             var ob = JSON.parse(stringResult);//将接口返回的string字符串解析成对象