donghuang/lemo-crm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update id order

Browse Source
This commit is contained in:
Donghuang 2023-05-29 09:36:58 +08:00
parent d51f1abf67
commit 6ee83119ee
8 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/crm/pom.xml
View File

@ -9,8 +9,8 @@
<parent>
<groupId>com.pudonghot.ambition</groupId>
<artifactId>ambition-crm</artifactId>
<version>0.0.1-SNAPSHOT</version>
<artifactId>lemo-crm</artifactId>
<version>${revision}</version>
</parent>
<properties>

8
server/crm/src/main/java/com/pudonghot/ambition/crm/controller/CustomerController.java
View File

@ -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 <br>
@ -59,7 +59,7 @@ public class CustomerController
private static final Map<String, String> 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");

4
server/file-api/pom.xml
View File

@ -10,8 +10,8 @@
<parent>
<groupId>com.pudonghot.ambition</groupId>
<artifactId>ambition-crm</artifactId>
<version>0.0.1-SNAPSHOT</version>
<artifactId>lemo-crm</artifactId>
<version>${revision}</version>
</parent>
<dependencies>

4
server/file-disk/pom.xml
View File

@ -9,8 +9,8 @@
<parent>
<groupId>com.pudonghot.ambition</groupId>
<artifactId>ambition-crm</artifactId>
<version>0.0.1-SNAPSHOT</version>
<artifactId>lemo-crm</artifactId>
<version>${revision}</version>
</parent>
<dependencies>

4
server/lib/pom.xml
View File

@ -11,8 +11,8 @@
<parent>
<groupId>com.pudonghot.ambition</groupId>
<artifactId>ambition-crm</artifactId>
<version>0.0.1-SNAPSHOT</version>
<artifactId>lemo-crm</artifactId>
<version>${revision}</version>
</parent>
<modules>

4
server/mapper/pom.xml
View File

@ -9,8 +9,8 @@
<parent>
<groupId>com.pudonghot.ambition</groupId>
<artifactId>ambition-crm</artifactId>
<version>0.0.1-SNAPSHOT</version>
<artifactId>lemo-crm</artifactId>
<version>${revision}</version>
</parent>
<dependencies>

4
server/model/pom.xml
View File

@ -15,8 +15,8 @@
<parent>
<groupId>com.pudonghot.ambition</groupId>
<artifactId>ambition-crm</artifactId>
<version>0.0.1-SNAPSHOT</version>
<artifactId>lemo-crm</artifactId>
<version>${revision}</version>
</parent>
<dependencies>

5
server/pom.xml
View File

@ -5,8 +5,8 @@
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.pudonghot.ambition</groupId>
<artifactId>ambition-crm</artifactId>
<version>0.0.1-SNAPSHOT</version>
<artifactId>lemo-crm</artifactId>
<version>${revision}</version>
<packaging>pom</packaging>
<name>Ambition CRM Server</name>
<description>Ambition CRM Server</description>
@ -17,6 +17,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<revision>0.0.1-SNAPSHOT</revision>
<tigon.version>0.0.4-SNAPSHOT</tigon.version>
<spring-boot.version>2.3.12.RELEASE</spring-boot.version>
<aspectj.version>1.8.10</aspectj.version>