Skip to content

M
manager
Commit 0df998dc by manxiaoqiang
Options

sendemail

parent 09e290ea
master … 0727_bugfix 1082_bugfix 1151_bugfix 1209_bugfix 1315_bugfix 1439_bugfix 1608_bugfix 1608_from_1619 1619_bugfix 1990_bugfix 20180328_sale 20180411 20180525_adi 20180530_bpu 2578_bugfix 2580_fix 31762_2_bugfix 31762_bugfix 31969_bugfix 32400_fix 32599_bugfix 649_bugfix back_version back_version2 bigfix_20201028 bugfix_1608_new bugfix_1760 bugfix_master_1760 change_double contract_rela develper feature_20180116_new liushaowei manager_new master_mv mobvista_master month_flow
No related merge requests found
Showing with 45 additions and 28 deletions
.idea/workspace.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment=""> <list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java" />
</list> </list>
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -44,6 +44,16 @@ ...@@ -44,6 +44,16 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Account4WebRepository.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="20" column="84" lean-forward="false" selection-start-line="20" selection-start-column="84" selection-end-line="20" selection-end-column="84" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SyncAppDataTask.java" pinned="false" current-in-tab="false"> <file leaf-file-name="SyncAppDataTask.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -54,11 +64,11 @@ ...@@ -54,11 +64,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="applicationContext-schedule.xml" pinned="false" current-in-tab="true"> <file leaf-file-name="applicationContext-schedule.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"> <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69"> <state relative-caret-position="92">
<caret line="24" column="67" lean-forward="false" selection-start-line="24" selection-start-column="67" selection-end-line="24" selection-end-column="67" /> <caret line="25" column="27" lean-forward="true" selection-start-line="25" selection-start-column="27" selection-end-line="25" selection-end-column="27" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -120,7 +130,6 @@ ...@@ -120,7 +130,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java" /> <option value="$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/task/SyncAppDataTask.java" /> <option value="$PROJECT_DIR$/src/main/java/tkio/task/SyncAppDataTask.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/AppInfoRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/AppInfoRepository.java" />
...@@ -171,6 +180,7 @@ ...@@ -171,6 +180,7 @@
<option value="$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java" /> <option value="$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java" /> <option value="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java" />
<option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" /> <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -970,7 +980,7 @@ ...@@ -970,7 +980,7 @@
<workItem from="1514949451448" duration="1759000" /> <workItem from="1514949451448" duration="1759000" />
<workItem from="1514965514914" duration="4827000" /> <workItem from="1514965514914" duration="4827000" />
<workItem from="1515031568274" duration="15108000" /> <workItem from="1515031568274" duration="15108000" />
<workItem from="1515114726844" duration="9945000" /> <workItem from="1515114726844" duration="10693000" />
</task> </task>
<task id="LOCAL-00003" summary="Merge branch 'master' of git.minrow.com:reyun/manager&#10;&#10;# Conflicts:&#10;#&#9;pom.xml&#10;#&#9;target/classes/common.properties&#10;#&#9;target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst&#10;"> <task id="LOCAL-00003" summary="Merge branch 'master' of git.minrow.com:reyun/manager&#10;&#10;# Conflicts:&#10;#&#9;pom.xml&#10;#&#9;target/classes/common.properties&#10;#&#9;target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst&#10;">
<created>1514871143365</created> <created>1514871143365</created>
...@@ -1175,11 +1185,18 @@ ...@@ -1175,11 +1185,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1515142158539</updated> <updated>1515142158539</updated>
</task> </task>
<option name="localTasksCounter" value="32" /> <task id="LOCAL-00032" summary="sendemail">
<created>1515143555554</created>
<option name="number" value="00032" />
<option name="presentableId" value="LOCAL-00032" />
<option name="project" value="LOCAL" />
<updated>1515143555554</updated>
</task>
<option name="localTasksCounter" value="33" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="107507000" /> <option name="totallyTimeSpent" value="108255000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
...@@ -1630,22 +1647,6 @@ ...@@ -1630,22 +1647,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="12" column="53" lean-forward="false" selection-start-line="12" selection-start-column="53" selection-end-line="12" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/SendEmailTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="284">
<caret line="49" column="69" lean-forward="false" selection-start-line="49" selection-start-column="69" selection-end-line="49" selection-end-column="69" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/AppServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/AppServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="529"> <state relative-caret-position="529">
...@@ -1694,6 +1695,14 @@ ...@@ -1694,6 +1695,14 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="92">
<caret line="25" column="27" lean-forward="true" selection-start-line="25" selection-start-column="27" selection-end-line="25" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="91"> <state relative-caret-position="91">
...@@ -1702,10 +1711,18 @@ ...@@ -1702,10 +1711,18 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/SendEmailTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="284">
<caret line="49" column="69" lean-forward="false" selection-start-line="49" selection-start-column="69" selection-end-line="49" selection-end-column="69" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69"> <state relative-caret-position="299">
<caret line="24" column="67" lean-forward="false" selection-start-line="24" selection-start-column="67" selection-end-line="24" selection-end-column="67" /> <caret line="20" column="84" lean-forward="false" selection-start-line="20" selection-start-column="84" selection-end-line="20" selection-end-column="84" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
src/main/java/common/repository/Account4WebRepository.java
...@@ -18,7 +18,7 @@ public interface Account4WebRepository extends JpaRepository<Account4Web, Long> ...@@ -18,7 +18,7 @@ public interface Account4WebRepository extends JpaRepository<Account4Web, Long>
@Query(value = "SELECT * from account4web where past_date = ?1", nativeQuery = true) @Query(value = "SELECT * from account4web where past_date = ?1", nativeQuery = true)
List<Account4Web> findByPast(String yesterday); List<Account4Web> findByPast(String yesterday);
@Query(value = "SELECT * from account4web where status = '已过期'", nativeQuery = true) @Query(value = "SELECT * from account4web where status = '已过期' or status = '流量用尽'", nativeQuery = true)
List<Account4Web> findPast(); List<Account4Web> findPast();
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment