app排序

.idea/workspace.xml

@@ -4,9 +4,8 @@
     <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/service/impl/ContractServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/util/ResultStatus.java" afterPath="$PROJECT_DIR$/src/main/java/util/ResultStatus.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" afterPath="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -30,8 +29,8 @@
       <file leaf-file-name="TkioAccountController.java" pinned="false" current-in-tab="false">
         <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="38" column="63" lean-forward="false" selection-start-line="38" selection-start-column="30" selection-end-line="38" selection-end-column="63" />
+            <state relative-caret-position="352">
+              <caret line="38" column="55" lean-forward="false" selection-start-line="38" selection-start-column="55" selection-end-line="38" selection-end-column="55" />
               <folding />
             </state>
           </provider>
@@ -40,8 +39,8 @@
       <file leaf-file-name="ResultStatus.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/util/ResultStatus.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="194">
-              <caret line="12" column="4" lean-forward="false" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
+            <state relative-caret-position="229">
+              <caret line="14" column="35" lean-forward="false" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
               <folding />
             </state>
           </provider>
@@ -60,8 +59,8 @@
       <file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1035">
-              <caret line="172" column="0" lean-forward="true" selection-start-line="172" selection-start-column="0" selection-end-line="172" selection-end-column="0" />
+            <state relative-caret-position="1746">
+              <caret line="260" column="71" lean-forward="true" selection-start-line="260" selection-start-column="71" selection-end-line="260" selection-end-column="71" />
               <folding />
             </state>
           </provider>
@@ -70,8 +69,8 @@
       <file leaf-file-name="TrackAccountController.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="504">
-              <caret line="37" column="8" lean-forward="false" selection-start-line="37" selection-start-column="8" selection-end-line="37" selection-end-column="65" />
+            <state relative-caret-position="343">
+              <caret line="31" column="5" lean-forward="true" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
               <folding />
             </state>
           </provider>
@@ -1320,14 +1319,7 @@
       <workItem from="1516932422302" duration="5866000" />
       <workItem from="1517189406074" duration="8333000" />
       <workItem from="1517275427548" duration="11524000" />
-      <workItem from="1517361892578" duration="3415000" />
-    </task>
-    <task id="LOCAL-00018" summary="pom">
-      <created>1514974104697</created>
-      <option name="number" value="00018" />
-      <option name="presentableId" value="LOCAL-00018" />
-      <option name="project" value="LOCAL" />
-      <updated>1514974104697</updated>
+      <workItem from="1517361892578" duration="5092000" />
     </task>
     <task id="LOCAL-00019" summary="pom">
       <created>1515032955423</created>
@@ -1665,11 +1657,18 @@
       <option name="project" value="LOCAL" />
       <updated>1517365959137</updated>
     </task>
-    <option name="localTasksCounter" value="67" />
+    <task id="LOCAL-00067" summary="app排序">
+      <created>1517381123222</created>
+      <option name="number" value="00067" />
+      <option name="presentableId" value="LOCAL-00067" />
+      <option name="project" value="LOCAL" />
+      <updated>1517381123222</updated>
+    </task>
+    <option name="localTasksCounter" value="68" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="301225000" />
+    <option name="totallyTimeSpent" value="302902000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -1693,7 +1692,7 @@
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5155483" sideWeight="0.49546143" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4304419" sideWeight="0.49016643" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33224222" sideWeight="0.49016643" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3289689" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5581015" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.30711043" sideWeight="0.5" order="8" side_tool="false" content_ui="combo" />
@@ -2245,40 +2244,40 @@
         <state relative-caret-position="283">
           <caret line="55" column="44" lean-forward="true" selection-start-line="55" selection-start-column="44" selection-end-line="55" selection-end-column="44" />
           <folding>
-            <element signature="e#1195#1196#0" expanded="true" />
-            <element signature="e#1240#1241#0" expanded="true" />
+            <element signature="e#1195#1196#0" expanded="false" />
+            <element signature="e#1240#1241#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/util/ResultStatus.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="194">
-          <caret line="12" column="4" lean-forward="false" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
+        <state relative-caret-position="352">
+          <caret line="38" column="55" lean-forward="false" selection-start-line="38" selection-start-column="55" selection-end-line="38" selection-end-column="55" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="38" column="63" lean-forward="false" selection-start-line="38" selection-start-column="30" selection-end-line="38" selection-end-column="63" />
+        <state relative-caret-position="343">
+          <caret line="31" column="5" lean-forward="true" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/util/ResultStatus.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="504">
-          <caret line="37" column="8" lean-forward="false" selection-start-line="37" selection-start-column="8" selection-end-line="37" selection-end-column="65" />
+        <state relative-caret-position="229">
+          <caret line="14" column="35" lean-forward="false" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1035">
-          <caret line="172" column="0" lean-forward="true" selection-start-line="172" selection-start-column="0" selection-end-line="172" selection-end-column="0" />
+        <state relative-caret-position="1746">
+          <caret line="260" column="71" lean-forward="true" selection-start-line="260" selection-start-column="71" selection-end-line="260" selection-end-column="71" />
           <folding />
         </state>
       </provider>

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -119,6 +119,8 @@ public class ContractServiceImpl implements ContractService{
 
     @Override
     public Contract update(User loginUser, Contract resource) {
+        Map<Long, String> packageMap = getPackageMap();
+        Map<Long, String> saleMap = getSaleMap();
         Contract contract = contractRepository.findOne(resource.getId());
 
         ContractChange cc = new ContractChange();
@@ -131,7 +133,7 @@ public class ContractServiceImpl implements ContractService{
         cc.setContractCode(contract.getContractCode());
 
         if(!resource.getStartDate().equals(contract.getStartDate())){
-            cc.setContent(cc.getContent() + "startDate changed : " + contract.getStartDate() + "-->" + resource.getStartDate());
+            cc.setContent(cc.getContent() + "开始时间变更 : " + contract.getStartDate() + "-->" + resource.getStartDate());
             contract.setStartDate(resource.getStartDate());
             if(DateUtil.getBeforeDays(0).compareTo(resource.getStartDate()) > 0){
                 contract.setStatus("wait");
@@ -140,25 +142,25 @@ public class ContractServiceImpl implements ContractService{
             }
         }
         if(!resource.getEndDate().equals(contract.getEndDate())){
-            cc.setContent(cc.getContent() + "   endDate changed : " + contract.getEndDate() + "-->" + resource.getEndDate());
+            cc.setContent(cc.getContent() + "   结束时间变更 : " + contract.getEndDate() + "-->" + resource.getEndDate());
             contract.setEndDate(resource.getEndDate());
         }
 
         boolean newRebat = false;
         if(!resource.getPriceLevel().equals(contract.getPriceLevel())){
-            cc.setContent(cc.getContent() + "   priceLevel changed : " + contract.getPriceLevel() + "-->" + resource.getPriceLevel());
+            cc.setContent(cc.getContent() +  "  " + packageMap.get(contract.getPriceLevel()) + "-->" + packageMap.get(resource.getPriceLevel()));
             newRebat = true;
             contract.setPriceLevel(resource.getPriceLevel());
         }
 
         if(!resource.getMoney().equals(contract.getMoney())){
-            cc.setContent(cc.getContent() + "   money changed : " + contract.getMoney() + "-->" + resource.getMoney());
+            cc.setContent(cc.getContent() + "   金额 " + contract.getMoney() + "-->金额 " + resource.getMoney());
             newRebat = true;
             contract.setMoney(resource.getMoney());
         }
 
         if(!resource.getSale().equals(contract.getSale())){
-            cc.setContent(cc.getContent() + "   slae changed : " + contract.getSale() + "-->" + resource.getSale());
+            cc.setContent(cc.getContent() + "   销售 " + saleMap.get(contract.getSale()) + "-->销售 " + saleMap.get(resource.getSale()));
             contract.setSale(resource.getSale());
         }
 
@@ -252,10 +254,12 @@ public class ContractServiceImpl implements ContractService{
 
     @Override
     public Contract change(User loginUser, ContractChange resource) {
+        Map<Long, String> packageMap = getPackageMap();
+        Map<Long, String> saleMap = getSaleMap();
         Contract contract = contractRepository.findByCode(resource.getContractCode());
         if(resource.getType().equals("price")){
-            resource.setContent(" priceLevel changed : " + contract.getPriceLevel() + "-->" + resource.getLevel()
-                    + " money changed :" + contract.getMoney() + "-->" +(resource.getMoney() + contract.getMoney()));
+            resource.setContent("  " + packageMap.get(contract.getPriceLevel()) + "-->" + packageMap.get(resource.getLevel())
+                    + " 金额" + contract.getMoney() + "--> 金额 " +(resource.getMoney() + contract.getMoney()));
 
             contract.setMoney(resource.getMoney() + contract.getMoney());
             contract.setPriceLevel(resource.getLevel());
@@ -386,4 +390,26 @@ public class ContractServiceImpl implements ContractService{
         }
         return result;
     }
+
+    public Map<Long, String> getPackageMap(){
+        List<PackageType> typeList = packageTypeRepository.findAll();
+        Map<Long, String> typeMap = new HashMap<>();
+        if(ValidateUtil.isValid(typeList)){
+            for(PackageType s: typeList){
+                typeMap.put(s.getId(), s.getPackageName());
+            }
+        }
+        return typeMap;
+    }
+
+    public Map<Long, String> getSaleMap(){
+        List<User> sales = userRepository.findAll();
+        Map<Long, String> saleMap = new HashMap<>();
+        if(ValidateUtil.isValid(sales)){
+            for(User s: sales){
+                saleMap.put(s.getId(), s.getName());
+            }
+        }
+        return saleMap;
+    }
 }

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

 package tkio.controller;
 
-import common.model.BackVisit;
-import common.model.Payment;
-import common.model.Reminder;
-import common.model.User;
+import common.model.*;
 import common.service.UserService;
 import dic.OperateObjectTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +9,7 @@ import org.springframework.web.bind.annotation.*;
 import security.annotation.CurrentAccount;
 import tkio.service.TkioAccountService;
 import util.ResultModel;
+import util.ResultStatus;
 import util.UserLogThread;
 
 import javax.servlet.http.HttpServletRequest;
@@ -36,7 +34,11 @@ public class TkioAccountController {
     @RequestMapping(value = "/findone", method = RequestMethod.GET)
     @ResponseBody
     public ResultModel findOne(@CurrentAccount User loginAccount, @RequestParam String email) {
-        return ResultModel.OK(tkioAccountService.findOne(email));
+        Account4Web account4Web = tkioAccountService.findOne(email);
+        if(null == account4Web){
+            return ResultModel.ERROR(ResultStatus.USER_EMPTY);
+        }
+        return ResultModel.OK(account4Web);
     }
     @RequestMapping(value = "/find/reminderlevel", method = RequestMethod.GET)
     @ResponseBody

src/main/java/track/controller/TrackAccountController.java

 package track.controller;
 
-import common.model.BackVisit;
-import common.model.Payment;
-import common.model.Reminder;
-import common.model.User;
+import common.model.*;
 import dic.OperateObjectTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -12,6 +9,7 @@ import security.annotation.CurrentAccount;
 import tkio.service.TkioAccountService;
 import track.service.TrackAccountService;
 import util.ResultModel;
+import util.ResultStatus;
 import util.UserLogThread;
 
 import javax.servlet.http.HttpServletRequest;
@@ -35,7 +33,11 @@ public class TrackAccountController {
     @RequestMapping(value = "/findone", method = RequestMethod.GET)
     @ResponseBody
     public ResultModel findOne(@CurrentAccount User loginAccount, @RequestParam String email) {
-        return ResultModel.OK(tkioAccountService.findOne(email));
+        TrackAccount4Web account4Web = tkioAccountService.findOne(email);
+        if(null == account4Web){
+            return ResultModel.ERROR(ResultStatus.USER_EMPTY);
+        }
+        return ResultModel.OK(account4Web);
     }
 
     //关闭到期提醒