update id order
This commit is contained in:
parent
d51f1abf67
commit
6ee83119ee
@ -9,8 +9,8 @@
|
|||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.pudonghot.ambition</groupId>
|
<groupId>com.pudonghot.ambition</groupId>
|
||||||
<artifactId>ambition-crm</artifactId>
|
<artifactId>lemo-crm</artifactId>
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
package com.pudonghot.ambition.crm.controller;
|
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 lombok.val;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import javax.validation.Valid;
|
import javax.validation.Valid;
|
||||||
@ -16,7 +14,6 @@ import javax.validation.constraints.NotBlank;
|
|||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import com.pudonghot.ambition.crm.model.User;
|
import com.pudonghot.ambition.crm.model.User;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import com.pudonghot.ambition.crm.model.Customer;
|
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 com.pudonghot.ambition.crm.service.CustomerService;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
|
import com.pudonghot.ambition.crm.service.ExportTaskService;
|
||||||
import org.springframework.web.bind.annotation.RequestMethod;
|
import org.springframework.web.bind.annotation.RequestMethod;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import com.pudonghot.ambition.crm.model.CustomerYearToDateSale;
|
import com.pudonghot.ambition.crm.model.CustomerYearToDateSale;
|
||||||
import com.pudonghot.ambition.crm.form.create.CustomerFormForCreate;
|
import com.pudonghot.ambition.crm.form.create.CustomerFormForCreate;
|
||||||
import com.pudonghot.ambition.crm.form.update.CustomerFormForUpdate;
|
import com.pudonghot.ambition.crm.form.update.CustomerFormForUpdate;
|
||||||
|
import com.pudonghot.ambition.crm.common.controller.BaseQueryController;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Donghuang <br>
|
* @author Donghuang <br>
|
||||||
@ -59,7 +59,7 @@ public class CustomerController
|
|||||||
|
|
||||||
private static final Map<String, String> ORDER_COLS = new HashMap<>();
|
private static final Map<String, String> ORDER_COLS = new HashMap<>();
|
||||||
static {
|
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("dateAdded", "year(customer.date_added)");
|
||||||
ORDER_COLS.put(CustomerYearToDateSale.YEAR, CustomerYearToDateSale.YEAR);
|
ORDER_COLS.put(CustomerYearToDateSale.YEAR, CustomerYearToDateSale.YEAR);
|
||||||
ORDER_COLS.put("countryCode", "customer.country_code");
|
ORDER_COLS.put("countryCode", "customer.country_code");
|
||||||
|
@ -10,8 +10,8 @@
|
|||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.pudonghot.ambition</groupId>
|
<groupId>com.pudonghot.ambition</groupId>
|
||||||
<artifactId>ambition-crm</artifactId>
|
<artifactId>lemo-crm</artifactId>
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -9,8 +9,8 @@
|
|||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.pudonghot.ambition</groupId>
|
<groupId>com.pudonghot.ambition</groupId>
|
||||||
<artifactId>ambition-crm</artifactId>
|
<artifactId>lemo-crm</artifactId>
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -11,8 +11,8 @@
|
|||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.pudonghot.ambition</groupId>
|
<groupId>com.pudonghot.ambition</groupId>
|
||||||
<artifactId>ambition-crm</artifactId>
|
<artifactId>lemo-crm</artifactId>
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
@ -9,8 +9,8 @@
|
|||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.pudonghot.ambition</groupId>
|
<groupId>com.pudonghot.ambition</groupId>
|
||||||
<artifactId>ambition-crm</artifactId>
|
<artifactId>lemo-crm</artifactId>
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -15,8 +15,8 @@
|
|||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.pudonghot.ambition</groupId>
|
<groupId>com.pudonghot.ambition</groupId>
|
||||||
<artifactId>ambition-crm</artifactId>
|
<artifactId>lemo-crm</artifactId>
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -5,8 +5,8 @@
|
|||||||
http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>com.pudonghot.ambition</groupId>
|
<groupId>com.pudonghot.ambition</groupId>
|
||||||
<artifactId>ambition-crm</artifactId>
|
<artifactId>lemo-crm</artifactId>
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
<version>${revision}</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>Ambition CRM Server</name>
|
<name>Ambition CRM Server</name>
|
||||||
<description>Ambition CRM Server</description>
|
<description>Ambition CRM Server</description>
|
||||||
@ -17,6 +17,7 @@
|
|||||||
<maven.compiler.target>1.8</maven.compiler.target>
|
<maven.compiler.target>1.8</maven.compiler.target>
|
||||||
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
|
||||||
|
|
||||||
|
<revision>0.0.1-SNAPSHOT</revision>
|
||||||
<tigon.version>0.0.4-SNAPSHOT</tigon.version>
|
<tigon.version>0.0.4-SNAPSHOT</tigon.version>
|
||||||
<spring-boot.version>2.3.12.RELEASE</spring-boot.version>
|
<spring-boot.version>2.3.12.RELEASE</spring-boot.version>
|
||||||
<aspectj.version>1.8.10</aspectj.version>
|
<aspectj.version>1.8.10</aspectj.version>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user