app排序

.idea/workspace.xml

@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <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$/src/main/java/common/task/ReportCallable.java" afterPath="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -54,11 +54,21 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ReportCallable.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="ReportCallable.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="344">
-              <caret line="169" column="36" lean-forward="true" selection-start-line="169" selection-start-column="36" selection-end-line="169" selection-end-column="36" />
+            <state relative-caret-position="183">
+              <caret line="162" column="13" lean-forward="true" selection-start-line="162" selection-start-column="13" selection-end-line="162" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="TkioAccountController.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="306">
+              <caret line="59" column="170" lean-forward="false" selection-start-line="59" selection-start-column="170" selection-end-line="59" selection-end-column="170" />
               <folding />
             </state>
           </provider>
@@ -156,7 +166,6 @@
         <option value="$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/repository/ReminderLevelRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
         <option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/model/ReminderLevel.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
@@ -169,6 +178,7 @@
         <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
         <option value="$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java" />
+        <option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
       </list>
     </option>
   </component>
@@ -1222,14 +1232,7 @@
       <workItem from="1516843795236" duration="8291000" />
       <workItem from="1516932422302" duration="5866000" />
       <workItem from="1517189406074" duration="8333000" />
-      <workItem from="1517275427548" duration="6544000" />
-    </task>
-    <task id="LOCAL-00012" summary="test pom">
-      <created>1514887175849</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1514887175849</updated>
+      <workItem from="1517275427548" duration="7651000" />
     </task>
     <task id="LOCAL-00013" summary="test pom">
       <created>1514888243971</created>
@@ -1567,11 +1570,18 @@
       <option name="project" value="LOCAL" />
       <updated>1517299262540</updated>
     </task>
-    <option name="localTasksCounter" value="61" />
+    <task id="LOCAL-00061" summary="app排序">
+      <created>1517299766015</created>
+      <option name="number" value="00061" />
+      <option name="presentableId" value="LOCAL-00061" />
+      <option name="project" value="LOCAL" />
+      <updated>1517299766015</updated>
+    </task>
+    <option name="localTasksCounter" value="62" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="292830000" />
+    <option name="totallyTimeSpent" value="293937000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -1700,7 +1710,8 @@
     <MESSAGE value="定时任务 删除appinfo重复数据" />
     <MESSAGE value="定时任务 刷新tkio表数据" />
     <MESSAGE value="合同" />
-    <option name="LAST_COMMIT_MESSAGE" value="合同" />
+    <MESSAGE value="app排序" />
+    <option name="LAST_COMMIT_MESSAGE" value="app排序" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -2167,18 +2178,18 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="214">
-          <caret line="32" column="52" lean-forward="false" selection-start-line="32" selection-start-column="52" selection-end-line="32" selection-end-column="52" />
+        <state relative-caret-position="183">
+          <caret line="162" column="13" lean-forward="true" selection-start-line="162" selection-start-column="13" selection-end-line="162" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="344">
-          <caret line="169" column="36" lean-forward="true" selection-start-line="169" selection-start-column="36" selection-end-line="169" selection-end-column="36" />
+        <state relative-caret-position="306">
+          <caret line="59" column="170" lean-forward="false" selection-start-line="59" selection-start-column="170" selection-end-line="59" selection-end-column="170" />
           <folding />
         </state>
       </provider>

src/main/java/tkio/controller/TkioAccountController.java

@@ -48,7 +48,7 @@ public class TkioAccountController {
     @RequestMapping(value = "/forbiden", method = RequestMethod.PUT)
     @ResponseBody
     public ResultModel forbiden(@CurrentAccount User loginAccount, @RequestBody Reminder resource, HttpServletRequest request) {
-        UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "关闭到期提醒", request);
+        UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "关闭异常状态跟进", request);
         userlog.start();
         return ResultModel.OK(tkioAccountService.forbiden(loginAccount, resource));
     }
@@ -57,7 +57,7 @@ public class TkioAccountController {
     @RequestMapping(value = "/enable", method = RequestMethod.PUT)
     @ResponseBody
     public ResultModel enable(@CurrentAccount User loginAccount, @RequestBody Reminder resource, HttpServletRequest request) {
-        UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "开启到期提醒", request);
+        UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "开启异常状态跟进", request);
         userlog.start();
         return ResultModel.OK(tkioAccountService.enable(loginAccount, resource));
     }