代码整理

house365-hgs-web/src/main/java/com/house365/web/controller/CustomerManagementController.java

@@ -134,7 +134,7 @@ public class CustomerManagementController extends BaseController {
         House365RestResponse<Map<String, Object>> seaSummary = customer.getSummarySimple(String.valueOf(userEntity.getId()));
         model.addAttribute("summary", seaSummary.getData().getEntity());
         //TODO: 统计数据可以整理为视图或一个sql
-        Map<String, Object> callSearchParams = new HashMap<>();
+        Map<String, Object> callSearchParams = new HashMap<>(10);
         callSearchParams.putAll(searchParams);
         filterParams(callSearchParams);
         callSearchParams.put("EQ_isDelete", "0");
@@ -418,7 +418,6 @@ public class CustomerManagementController extends BaseController {
                 searchParams.put("EQ_tabType", "8");
                 break;
             case "cloud":
-//                searchParams.put("EQ_customerSourceType2", "7");
                 searchParams.put("EQ_tabType", "9");
                 break;
             default:
@@ -490,9 +489,8 @@ public class CustomerManagementController extends BaseController {
         }
         // 自定义时间类型
         String customTimeType = String.valueOf(searchParams.get("EQ_customTimeType"));
-        if (!Strings.isNullOrEmpty(String.valueOf(searchParams.get
-                ("GTE_customTimeStart"))) || !Strings.isNullOrEmpty(String.valueOf(searchParams.get
-                ("LTE_customTimeEnd")))) {
+        if (!Strings.isNullOrEmpty(String.valueOf(searchParams.get("GTE_customTimeStart")))
+                || !Strings.isNullOrEmpty(String.valueOf(searchParams.get("LTE_customTimeEnd")))) {
             if ("1".equals(customTimeType)) {
                 // 回访时间
                 searchParams.put("EQ_customTimeTypeOne", "1");
@@ -500,7 +498,6 @@ public class CustomerManagementController extends BaseController {
                 // 约看时间
                 searchParams.put("EQ_customTimeTypeTwo", "1");
             } else if ("3".equals(customTimeType)) {
-
                 // 到访时间
                 searchParams.put("EQ_customTimeTypeThree", "1");
             } else if ("4".equals(customTimeType)) {
@@ -542,7 +539,6 @@ public class CustomerManagementController extends BaseController {
                 if (orderByTime < 6) {
                     sortColumn.append("desc");
                 }
-
             } else if (orderByTime <= 8) {
                 // 按倒计时排序
                 sortColumn.append("countdown_time ");
@@ -572,10 +568,10 @@ public class CustomerManagementController extends BaseController {
 
         listRequest.setPaging(page);
         listRequest.setSearchParams(searchParams);
-        CustomerListResponse response = new CustomerListResponse();
+        CustomerListResponse response;
         List<MarketingActivityEntity> alist = new ArrayList<>();
         //区分查询待回访
-        logger.error("-------------------------1:"+ new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        logger.error("-------------------------1:" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
         if ("waitCall".equalsIgnoreCase(type)) {
             response = customer.getCustomerListFromOld(listRequest);
             if (listRequest.getSearchParams().containsKey("EQ_activeId")) {
@@ -590,7 +586,7 @@ public class CustomerManagementController extends BaseController {
             }
         } else {
             response = customer.getCustomerManagementList4Label(listRequest);
-            logger.error("-------------------------2:"+ new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            logger.error("-------------------------2:" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
         }
 
         model.addAttribute("actList", alist);
@@ -743,7 +739,6 @@ public class CustomerManagementController extends BaseController {
                                     lids.add(oldLabEntity);
                                 }
                             }
-
                         }
                     }
 
@@ -838,7 +833,7 @@ public class CustomerManagementController extends BaseController {
             }
 
         }
-        logger.error("-------------------------3:"+ new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        logger.error("-------------------------3:" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
         //对回访时间逻辑排序
         List<CustomerListVO> newCustomers = new ArrayList<>();//新排序数据
         List<CustomerListVO> customers2 = new ArrayList<>();//可移除的客户集合
@@ -896,7 +891,7 @@ public class CustomerManagementController extends BaseController {
                 }
             }
         }
-        logger.error("-------------------------4:"+ new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        logger.error("-------------------------4:" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
         model.addAttribute("page", response.getPaging());
         model.addAttribute("customers", customers);
 

house365-hgs-ws/src/main/java/com/house365/ws/service/impl/CustomerServiceImpl.java

@@ -1519,9 +1519,10 @@ public class CustomerServiceImpl<T extends CustomerEntity> extends DefaultServic
                         if (!Strings.isNullOrEmpty(customerEntity.getManagerName())) {
                             customerEntity.setLastManager(customerEntity.getManagerName());
                         }
-                        customerEntity.setOceanDate(new Date());
+                        Date date = new Date();
+                        customerEntity.setOceanDate(date);
                         customerEntity.setUpdater(String.valueOf(userId));
-                        customerEntity.setUpdateTime(new Date());
+                        customerEntity.setUpdateTime(date);
                         customerEntity.setLastManager(customerEntity.getManagerName());
                         customerEntity.setManagerId(null);
                         customerEntity.setManagerName(null);