diff --git a/server/crm/pom.xml b/server/crm/pom.xml index 8eb5f04..aa9fc59 100644 --- a/server/crm/pom.xml +++ b/server/crm/pom.xml @@ -9,8 +9,8 @@ com.pudonghot.ambition - ambition-crm - 0.0.1-SNAPSHOT + lemo-crm + ${revision} diff --git a/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/CustomerController.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/CustomerController.java index dc11429..77b025e 100644 --- a/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/CustomerController.java +++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/CustomerController.java @@ -1,7 +1,5 @@ package com.pudonghot.ambition.crm.controller; -import com.pudonghot.ambition.crm.common.controller.BaseQueryController; -import com.pudonghot.ambition.crm.service.ExportTaskService; import lombok.val; import java.util.*; import javax.validation.Valid; @@ -16,7 +14,6 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import org.apache.commons.lang3.StringUtils; import com.pudonghot.ambition.crm.model.User; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import com.pudonghot.ambition.crm.model.Customer; @@ -27,11 +24,14 @@ import com.pudonghot.ambition.crm.model.CustomerProperty; import com.pudonghot.ambition.crm.service.CustomerService; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; +import com.pudonghot.ambition.crm.service.ExportTaskService; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import com.pudonghot.ambition.crm.model.CustomerYearToDateSale; import com.pudonghot.ambition.crm.form.create.CustomerFormForCreate; import com.pudonghot.ambition.crm.form.update.CustomerFormForUpdate; +import com.pudonghot.ambition.crm.common.controller.BaseQueryController; /** * @author Donghuang
@@ -59,7 +59,7 @@ public class CustomerController private static final Map ORDER_COLS = new HashMap<>(); static { - ORDER_COLS.put(Customer.ID, "customer.id"); + ORDER_COLS.put(Customer.ID, "customer.id2"); ORDER_COLS.put("dateAdded", "year(customer.date_added)"); ORDER_COLS.put(CustomerYearToDateSale.YEAR, CustomerYearToDateSale.YEAR); ORDER_COLS.put("countryCode", "customer.country_code"); diff --git a/server/file-api/pom.xml b/server/file-api/pom.xml index f335789..353d10b 100644 --- a/server/file-api/pom.xml +++ b/server/file-api/pom.xml @@ -10,8 +10,8 @@ com.pudonghot.ambition - ambition-crm - 0.0.1-SNAPSHOT + lemo-crm + ${revision} diff --git a/server/file-disk/pom.xml b/server/file-disk/pom.xml index f4b5bdf..9a5862d 100644 --- a/server/file-disk/pom.xml +++ b/server/file-disk/pom.xml @@ -9,8 +9,8 @@ com.pudonghot.ambition - ambition-crm - 0.0.1-SNAPSHOT + lemo-crm + ${revision} diff --git a/server/lib/pom.xml b/server/lib/pom.xml index 01f018b..6a97e9c 100644 --- a/server/lib/pom.xml +++ b/server/lib/pom.xml @@ -11,8 +11,8 @@ com.pudonghot.ambition - ambition-crm - 0.0.1-SNAPSHOT + lemo-crm + ${revision} diff --git a/server/mapper/pom.xml b/server/mapper/pom.xml index 6b045a6..82508f3 100644 --- a/server/mapper/pom.xml +++ b/server/mapper/pom.xml @@ -9,8 +9,8 @@ com.pudonghot.ambition - ambition-crm - 0.0.1-SNAPSHOT + lemo-crm + ${revision} diff --git a/server/model/pom.xml b/server/model/pom.xml index e2f5c33..a95ff22 100644 --- a/server/model/pom.xml +++ b/server/model/pom.xml @@ -15,8 +15,8 @@ com.pudonghot.ambition - ambition-crm - 0.0.1-SNAPSHOT + lemo-crm + ${revision} diff --git a/server/pom.xml b/server/pom.xml index e253171..14cfacd 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -5,8 +5,8 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.pudonghot.ambition - ambition-crm - 0.0.1-SNAPSHOT + lemo-crm + ${revision} pom Ambition CRM Server Ambition CRM Server @@ -17,6 +17,7 @@ 1.8 utf-8 + 0.0.1-SNAPSHOT 0.0.4-SNAPSHOT 2.3.12.RELEASE 1.8.10