upadte codes

.idea/workspace.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="18c38e3b-9b7f-4a3f-b141-edcb320b1d24" name="Default Changelist" comment="" />
+    <list default="true" id="18c38e3b-9b7f-4a3f-b141-edcb320b1d24" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/sqls/demo/demo_bak.sql" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sqls/demo/demo.sql" beforeDir="false" afterPath="$PROJECT_DIR$/sqls/demo/demo.sql" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -58,17 +61,13 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="ignore_missing_gitignore" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/sqls/demo" />
     <property name="project.structure.last.edited" value="Global Libraries" />
     <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="File.Encoding" />
   </component>
   <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/lib/shell" />
-      <recent name="$PROJECT_DIR$/jobs/demo" />
-    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/sqls/demo_param" />
       <recent name="$PROJECT_DIR$/sqls/demo" />
@@ -76,6 +75,11 @@
       <recent name="$PROJECT_DIR$/lib/python" />
       <recent name="$PROJECT_DIR$/lib/shell" />
     </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/sqls/demo" />
+      <recent name="$PROJECT_DIR$/lib/shell" />
+      <recent name="$PROJECT_DIR$/jobs/demo" />
+    </key>
   </component>
   <component name="RunManager">
     <configuration default="true" type="ClojureREPL" factoryName="Local" activateToolWindowBeforeRun="false">
@@ -120,7 +124,7 @@
       <workItem from="1588154352798" duration="195000" />
       <workItem from="1588220085338" duration="7993000" />
       <workItem from="1588248522289" duration="2820000" />
-      <workItem from="1588344251422" duration="1793000" />
+      <workItem from="1588344251422" duration="2995000" />
     </task>
     <task id="LOCAL-00001" summary="add init codes.">
       <created>1587723565207</created>

lib/java/bi-report-service/.idea/workspace.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="73604af3-3cbc-41f8-9a5f-e6a14a2ada76" name="Default Changelist" comment="add" />
+    <list default="true" id="73604af3-3cbc-41f8-9a5f-e6a14a2ada76" name="Default Changelist" comment="add">
+      <change afterPath="$PROJECT_DIR$/../../../sqls/demo/demo_bak.sql" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../sqls/demo/demo.sql" beforeDir="false" afterPath="$PROJECT_DIR$/../../../sqls/demo/demo.sql" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -216,7 +219,7 @@
       <workItem from="1588148891822" duration="2318000" />
       <workItem from="1588152718016" duration="1463000" />
       <workItem from="1588154601852" duration="28557000" />
-      <workItem from="1588344252163" duration="3401000" />
+      <workItem from="1588344252163" duration="4375000" />
     </task>
     <servers />
   </component>

lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/impl/EmailServiceImpl.java

@@ -66,7 +66,7 @@ public class EmailServiceImpl implements EmailService {
             String fileNameSrc = name + "-" + DateUtils.getCurrentDateSimpleStr() + ".xlsx";
             FileSystemResource file = new FileSystemResource(new File(filePath + fileNameSrc));
             helper.addAttachment(fileName, file);
-            helper.addAttachment(MimeUtility.encodeWord(file.getFilename(),"utf-8","B"), file);
+            //helper.addAttachment(MimeUtility.encodeWord(file.getFilename(),"utf-8","B"), file);
             mailSender.send(message);
             logger.info("带附件的邮件已经发送。");
         } catch (Exception e) {

sqls/demo/demo_bak.sql

+SELECT partition_date
+     ,device_os_type AS device_type
+     ,CASE WHEN active_type = '4'  THEN '老活'
+           WHEN active_type  IN ('1','2')  THEN '新增' END AS active_type
+     ,device_id
+FROM online.ml_device_day_active_status
+WHERE partition_date between '20200401' and '20200408'
+  AND active_type IN ('1','2','4')
+  AND first_channel_source_type not IN ('yqxiu1','yqxiu2','yqxiu3','yqxiu4','yqxiu5','mxyc1','mxyc2','mxyc3'
+    ,'wanpu','jinshan','jx','maimai','zhuoyi','huatian','suopingjingling','mocha','mizhe','meika','lamabang'
+    ,'js-az1','js-az2','js-az3','js-az4','js-az5','jfq-az1','jfq-az2','jfq-az3','jfq-az4','jfq-az5','toufang1'
+    ,'toufang2','toufang3','toufang4','toufang5','toufang6','TF-toufang1','TF-toufang2','TF-toufang3','TF-toufang4'
+    ,'TF-toufang5','tf-toufang1','tf-toufang2','tf-toufang3','tf-toufang4','tf-toufang5','benzhan','promotion_aso100'
+    ,'promotion_qianka','promotion_xiaoyu','promotion_dianru','promotion_malioaso','promotion_malioaso-shequ'
+    ,'promotion_shike','promotion_julang_jl03','promotion_zuimei')
+  AND first_channel_source_type not LIKE 'promotion\_jf\_%'
+limit 10
\ No newline at end of file