Browse Source

增加application/commons-server

guq 7 years ago
parent
commit
ed6bfce139
39 changed files with 2558 additions and 38 deletions
  1. 15 0
      applications/commons/commons-api/pom.xml
  2. 21 0
      applications/commons/commons-dto/pom.xml
  3. 1 1
      applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/dto/BatchDealBaseDTO.java
  4. 1 1
      applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/dto/ComboDTO.java
  5. 1 1
      applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/dto/DocBaseDTO.java
  6. 1 1
      applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/dto/DocReqDTO.java
  7. 1 1
      applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/dto/DocSavedDTO.java
  8. 1 1
      applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/dto/ProductBaseDTO.java
  9. 35 0
      applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/Maxnumbers.java
  10. 771 0
      applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/MaxnumbersExample.java
  11. 47 0
      applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/Maxnumbersdetail.java
  12. 761 0
      applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/MaxnumbersdetailExample.java
  13. 73 0
      applications/commons/commons-server/pom.xml
  14. 23 0
      applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/CommonsApplication.java
  15. 19 0
      applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/controller/CommonsController.java
  16. 33 0
      applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/mapper/MaxnumbersMapper.java
  17. 32 0
      applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/mapper/MaxnumbersdetailMapper.java
  18. 61 0
      applications/commons/commons-server/src/main/resources/application.yml
  19. BIN
      applications/commons/commons-server/src/main/resources/auth/pub.key
  20. 64 0
      applications/commons/commons-server/src/main/resources/logback-spring.xml
  21. 276 0
      applications/commons/commons-server/src/main/resources/mapper/MaxnumbersMapper.xml
  22. 276 0
      applications/commons/commons-server/src/main/resources/mapper/MaxnumbersdetailMapper.xml
  23. 6 7
      applications/commons/pom.xml
  24. 2 1
      applications/document/document-server/pom.xml
  25. 3 2
      applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/ProductController.java
  26. 2 1
      applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/VendorController.java
  27. 3 2
      applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/ProductMapper.java
  28. 2 1
      applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/VendorMapper.java
  29. 3 2
      applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/Impl/ProductServiceImpl.java
  30. 2 1
      applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/Impl/VendorServiceImpl.java
  31. 3 2
      applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/ProductService.java
  32. 2 1
      applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/VendorService.java
  33. 2 1
      applications/purchase/purchase-server/pom.xml
  34. 3 2
      applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/controller/PurchaseController.java
  35. 2 1
      applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/mapper/PurchaseMapper.java
  36. 3 2
      applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/PurchaseService.java
  37. 4 3
      applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java
  38. 2 2
      applications/purchase/purchase-server/src/main/resources/mapper/PurchaseListMapper.xml
  39. 1 1
      applications/purchase/purchase-server/src/main/resources/mapper/PurchasedetailMapper.xml

+ 15 - 0
applications/commons/commons-api/pom.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>commons</artifactId>
+        <groupId>com.usoftchina.saas</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>commons-api</artifactId>
+
+
+</project>

+ 21 - 0
applications/commons/commons-dto/pom.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>commons</artifactId>
+        <groupId>com.usoftchina.saas</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>commoms-dto</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>core</artifactId>
+        </dependency>
+    </dependencies>
+
+
+</project>

+ 1 - 1
applications/commons/src/main/java/com/usoftchina/saas/common/dto/BatchDealBaseDTO.java → applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/dto/BatchDealBaseDTO.java

@@ -1,4 +1,4 @@
-package com.usoftchina.saas.common.dto;
+package com.usoftchina.saas.commons.dto;
 
 import java.io.Serializable;
 import java.util.List;

+ 1 - 1
applications/commons/src/main/java/com/usoftchina/saas/common/dto/ComboDTO.java → applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/dto/ComboDTO.java

@@ -1,4 +1,4 @@
-package com.usoftchina.saas.common.dto;
+package com.usoftchina.saas.commons.dto;
 
 import java.io.Serializable;
 

+ 1 - 1
applications/commons/src/main/java/com/usoftchina/saas/common/dto/DocBaseDTO.java → applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/dto/DocBaseDTO.java

@@ -1,4 +1,4 @@
-package com.usoftchina.saas.common.dto;
+package com.usoftchina.saas.commons.dto;
 
 import java.io.Serializable;
 

+ 1 - 1
applications/commons/src/main/java/com/usoftchina/saas/common/dto/DocReqDTO.java → applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/dto/DocReqDTO.java

@@ -1,4 +1,4 @@
-package com.usoftchina.saas.common.dto;
+package com.usoftchina.saas.commons.dto;
 
 
 /**

+ 1 - 1
applications/commons/src/main/java/com/usoftchina/saas/common/dto/DocSavedDTO.java → applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/dto/DocSavedDTO.java

@@ -1,4 +1,4 @@
-package com.usoftchina.saas.common.dto;
+package com.usoftchina.saas.commons.dto;
 
 import java.io.Serializable;
 

+ 1 - 1
applications/commons/src/main/java/com/usoftchina/saas/common/dto/ProductBaseDTO.java → applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/dto/ProductBaseDTO.java

@@ -1,4 +1,4 @@
-package com.usoftchina.saas.common.dto;
+package com.usoftchina.saas.commons.dto;
 
 import java.io.Serializable;
 

+ 35 - 0
applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/Maxnumbers.java

@@ -0,0 +1,35 @@
+package com.usoftchina.saas.commons.po;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+public class Maxnumbers extends CommonBaseEntity{
+    private String mn_caller;
+
+    private String mn_leadcode;
+
+    private String mn_number;
+
+    public String getMn_caller() {
+        return mn_caller;
+    }
+
+    public void setMn_caller(String mn_caller) {
+        this.mn_caller = mn_caller == null ? null : mn_caller.trim();
+    }
+
+    public String getMn_leadcode() {
+        return mn_leadcode;
+    }
+
+    public void setMn_leadcode(String mn_leadcode) {
+        this.mn_leadcode = mn_leadcode == null ? null : mn_leadcode.trim();
+    }
+
+    public String getMn_number() {
+        return mn_number;
+    }
+
+    public void setMn_number(String mn_number) {
+        this.mn_number = mn_number == null ? null : mn_number.trim();
+    }
+}

+ 771 - 0
applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/MaxnumbersExample.java

@@ -0,0 +1,771 @@
+package com.usoftchina.saas.commons.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class MaxnumbersExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public MaxnumbersExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andMn_idIsNull() {
+            addCriterion("mn_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_idIsNotNull() {
+            addCriterion("mn_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_idEqualTo(Integer value) {
+            addCriterion("mn_id =", value, "mn_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_idNotEqualTo(Integer value) {
+            addCriterion("mn_id <>", value, "mn_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_idGreaterThan(Integer value) {
+            addCriterion("mn_id >", value, "mn_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_idGreaterThanOrEqualTo(Integer value) {
+            addCriterion("mn_id >=", value, "mn_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_idLessThan(Integer value) {
+            addCriterion("mn_id <", value, "mn_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_idLessThanOrEqualTo(Integer value) {
+            addCriterion("mn_id <=", value, "mn_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_idIn(List<Integer> values) {
+            addCriterion("mn_id in", values, "mn_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_idNotIn(List<Integer> values) {
+            addCriterion("mn_id not in", values, "mn_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_idBetween(Integer value1, Integer value2) {
+            addCriterion("mn_id between", value1, value2, "mn_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_idNotBetween(Integer value1, Integer value2) {
+            addCriterion("mn_id not between", value1, value2, "mn_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_callerIsNull() {
+            addCriterion("mn_caller is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_callerIsNotNull() {
+            addCriterion("mn_caller is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_callerEqualTo(String value) {
+            addCriterion("mn_caller =", value, "mn_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_callerNotEqualTo(String value) {
+            addCriterion("mn_caller <>", value, "mn_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_callerGreaterThan(String value) {
+            addCriterion("mn_caller >", value, "mn_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_callerGreaterThanOrEqualTo(String value) {
+            addCriterion("mn_caller >=", value, "mn_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_callerLessThan(String value) {
+            addCriterion("mn_caller <", value, "mn_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_callerLessThanOrEqualTo(String value) {
+            addCriterion("mn_caller <=", value, "mn_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_callerLike(String value) {
+            addCriterion("mn_caller like", value, "mn_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_callerNotLike(String value) {
+            addCriterion("mn_caller not like", value, "mn_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_callerIn(List<String> values) {
+            addCriterion("mn_caller in", values, "mn_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_callerNotIn(List<String> values) {
+            addCriterion("mn_caller not in", values, "mn_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_callerBetween(String value1, String value2) {
+            addCriterion("mn_caller between", value1, value2, "mn_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_callerNotBetween(String value1, String value2) {
+            addCriterion("mn_caller not between", value1, value2, "mn_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_leadcodeIsNull() {
+            addCriterion("mn_leadcode is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_leadcodeIsNotNull() {
+            addCriterion("mn_leadcode is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_leadcodeEqualTo(String value) {
+            addCriterion("mn_leadcode =", value, "mn_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_leadcodeNotEqualTo(String value) {
+            addCriterion("mn_leadcode <>", value, "mn_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_leadcodeGreaterThan(String value) {
+            addCriterion("mn_leadcode >", value, "mn_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_leadcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("mn_leadcode >=", value, "mn_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_leadcodeLessThan(String value) {
+            addCriterion("mn_leadcode <", value, "mn_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_leadcodeLessThanOrEqualTo(String value) {
+            addCriterion("mn_leadcode <=", value, "mn_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_leadcodeLike(String value) {
+            addCriterion("mn_leadcode like", value, "mn_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_leadcodeNotLike(String value) {
+            addCriterion("mn_leadcode not like", value, "mn_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_leadcodeIn(List<String> values) {
+            addCriterion("mn_leadcode in", values, "mn_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_leadcodeNotIn(List<String> values) {
+            addCriterion("mn_leadcode not in", values, "mn_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_leadcodeBetween(String value1, String value2) {
+            addCriterion("mn_leadcode between", value1, value2, "mn_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_leadcodeNotBetween(String value1, String value2) {
+            addCriterion("mn_leadcode not between", value1, value2, "mn_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_numberIsNull() {
+            addCriterion("mn_number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_numberIsNotNull() {
+            addCriterion("mn_number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_numberEqualTo(String value) {
+            addCriterion("mn_number =", value, "mn_number");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_numberNotEqualTo(String value) {
+            addCriterion("mn_number <>", value, "mn_number");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_numberGreaterThan(String value) {
+            addCriterion("mn_number >", value, "mn_number");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_numberGreaterThanOrEqualTo(String value) {
+            addCriterion("mn_number >=", value, "mn_number");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_numberLessThan(String value) {
+            addCriterion("mn_number <", value, "mn_number");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_numberLessThanOrEqualTo(String value) {
+            addCriterion("mn_number <=", value, "mn_number");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_numberLike(String value) {
+            addCriterion("mn_number like", value, "mn_number");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_numberNotLike(String value) {
+            addCriterion("mn_number not like", value, "mn_number");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_numberIn(List<String> values) {
+            addCriterion("mn_number in", values, "mn_number");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_numberNotIn(List<String> values) {
+            addCriterion("mn_number not in", values, "mn_number");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_numberBetween(String value1, String value2) {
+            addCriterion("mn_number between", value1, value2, "mn_number");
+            return (Criteria) this;
+        }
+
+        public Criteria andMn_numberNotBetween(String value1, String value2) {
+            addCriterion("mn_number not between", value1, value2, "mn_number");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("companyId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("companyId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(Integer value) {
+            addCriterion("companyId =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(Integer value) {
+            addCriterion("companyId <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(Integer value) {
+            addCriterion("companyId >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("companyId >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(Integer value) {
+            addCriterion("companyId <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(Integer value) {
+            addCriterion("companyId <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<Integer> values) {
+            addCriterion("companyId in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<Integer> values) {
+            addCriterion("companyId not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(Integer value1, Integer value2) {
+            addCriterion("companyId between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("companyId not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("createTime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("createTime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("createTime =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("createTime <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("createTime >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("createTime >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("createTime <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("createTime <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("createTime in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("createTime not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("createTime between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("createTime not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdIsNull() {
+            addCriterion("creatorId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdIsNotNull() {
+            addCriterion("creatorId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdEqualTo(Integer value) {
+            addCriterion("creatorId =", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdNotEqualTo(Integer value) {
+            addCriterion("creatorId <>", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdGreaterThan(Integer value) {
+            addCriterion("creatorId >", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("creatorId >=", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdLessThan(Integer value) {
+            addCriterion("creatorId <", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdLessThanOrEqualTo(Integer value) {
+            addCriterion("creatorId <=", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdIn(List<Integer> values) {
+            addCriterion("creatorId in", values, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdNotIn(List<Integer> values) {
+            addCriterion("creatorId not in", values, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdBetween(Integer value1, Integer value2) {
+            addCriterion("creatorId between", value1, value2, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("creatorId not between", value1, value2, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("updateTime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("updateTime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("updateTime =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("updateTime <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("updateTime >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("updateTime >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("updateTime <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("updateTime <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("updateTime in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("updateTime not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("updateTime between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("updateTime not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdIsNull() {
+            addCriterion("updaterId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdIsNotNull() {
+            addCriterion("updaterId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdEqualTo(Integer value) {
+            addCriterion("updaterId =", value, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdNotEqualTo(Integer value) {
+            addCriterion("updaterId <>", value, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdGreaterThan(Integer value) {
+            addCriterion("updaterId >", value, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("updaterId >=", value, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdLessThan(Integer value) {
+            addCriterion("updaterId <", value, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdLessThanOrEqualTo(Integer value) {
+            addCriterion("updaterId <=", value, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdIn(List<Integer> values) {
+            addCriterion("updaterId in", values, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdNotIn(List<Integer> values) {
+            addCriterion("updaterId not in", values, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdBetween(Integer value1, Integer value2) {
+            addCriterion("updaterId between", value1, value2, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("updaterId not between", value1, value2, "updaterId");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 47 - 0
applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/Maxnumbersdetail.java

@@ -0,0 +1,47 @@
+package com.usoftchina.saas.commons.po;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.util.Date;
+
+public class Maxnumbersdetail extends CommonBaseEntity{
+    private String md_caller;
+
+    private String md_leadcode;
+
+    private Integer md_maxno;
+
+    private Integer companyId;
+
+    private Date createTime;
+
+    private Integer creatorId;
+
+    private Date updateTime;
+
+    private Integer updaterId;
+
+    public String getMd_caller() {
+        return md_caller;
+    }
+
+    public void setMd_caller(String md_caller) {
+        this.md_caller = md_caller == null ? null : md_caller.trim();
+    }
+
+    public String getMd_leadcode() {
+        return md_leadcode;
+    }
+
+    public void setMd_leadcode(String md_leadcode) {
+        this.md_leadcode = md_leadcode == null ? null : md_leadcode.trim();
+    }
+
+    public Integer getMd_maxno() {
+        return md_maxno;
+    }
+
+    public void setMd_maxno(Integer md_maxno) {
+        this.md_maxno = md_maxno;
+    }
+}

+ 761 - 0
applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/MaxnumbersdetailExample.java

@@ -0,0 +1,761 @@
+package com.usoftchina.saas.commons.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class MaxnumbersdetailExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public MaxnumbersdetailExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andMd_idIsNull() {
+            addCriterion("md_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_idIsNotNull() {
+            addCriterion("md_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_idEqualTo(Integer value) {
+            addCriterion("md_id =", value, "md_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_idNotEqualTo(Integer value) {
+            addCriterion("md_id <>", value, "md_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_idGreaterThan(Integer value) {
+            addCriterion("md_id >", value, "md_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_idGreaterThanOrEqualTo(Integer value) {
+            addCriterion("md_id >=", value, "md_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_idLessThan(Integer value) {
+            addCriterion("md_id <", value, "md_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_idLessThanOrEqualTo(Integer value) {
+            addCriterion("md_id <=", value, "md_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_idIn(List<Integer> values) {
+            addCriterion("md_id in", values, "md_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_idNotIn(List<Integer> values) {
+            addCriterion("md_id not in", values, "md_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_idBetween(Integer value1, Integer value2) {
+            addCriterion("md_id between", value1, value2, "md_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_idNotBetween(Integer value1, Integer value2) {
+            addCriterion("md_id not between", value1, value2, "md_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_callerIsNull() {
+            addCriterion("md_caller is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_callerIsNotNull() {
+            addCriterion("md_caller is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_callerEqualTo(String value) {
+            addCriterion("md_caller =", value, "md_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_callerNotEqualTo(String value) {
+            addCriterion("md_caller <>", value, "md_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_callerGreaterThan(String value) {
+            addCriterion("md_caller >", value, "md_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_callerGreaterThanOrEqualTo(String value) {
+            addCriterion("md_caller >=", value, "md_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_callerLessThan(String value) {
+            addCriterion("md_caller <", value, "md_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_callerLessThanOrEqualTo(String value) {
+            addCriterion("md_caller <=", value, "md_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_callerLike(String value) {
+            addCriterion("md_caller like", value, "md_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_callerNotLike(String value) {
+            addCriterion("md_caller not like", value, "md_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_callerIn(List<String> values) {
+            addCriterion("md_caller in", values, "md_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_callerNotIn(List<String> values) {
+            addCriterion("md_caller not in", values, "md_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_callerBetween(String value1, String value2) {
+            addCriterion("md_caller between", value1, value2, "md_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_callerNotBetween(String value1, String value2) {
+            addCriterion("md_caller not between", value1, value2, "md_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_leadcodeIsNull() {
+            addCriterion("md_leadcode is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_leadcodeIsNotNull() {
+            addCriterion("md_leadcode is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_leadcodeEqualTo(String value) {
+            addCriterion("md_leadcode =", value, "md_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_leadcodeNotEqualTo(String value) {
+            addCriterion("md_leadcode <>", value, "md_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_leadcodeGreaterThan(String value) {
+            addCriterion("md_leadcode >", value, "md_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_leadcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("md_leadcode >=", value, "md_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_leadcodeLessThan(String value) {
+            addCriterion("md_leadcode <", value, "md_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_leadcodeLessThanOrEqualTo(String value) {
+            addCriterion("md_leadcode <=", value, "md_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_leadcodeLike(String value) {
+            addCriterion("md_leadcode like", value, "md_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_leadcodeNotLike(String value) {
+            addCriterion("md_leadcode not like", value, "md_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_leadcodeIn(List<String> values) {
+            addCriterion("md_leadcode in", values, "md_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_leadcodeNotIn(List<String> values) {
+            addCriterion("md_leadcode not in", values, "md_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_leadcodeBetween(String value1, String value2) {
+            addCriterion("md_leadcode between", value1, value2, "md_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_leadcodeNotBetween(String value1, String value2) {
+            addCriterion("md_leadcode not between", value1, value2, "md_leadcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_maxnoIsNull() {
+            addCriterion("md_maxno is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_maxnoIsNotNull() {
+            addCriterion("md_maxno is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_maxnoEqualTo(Integer value) {
+            addCriterion("md_maxno =", value, "md_maxno");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_maxnoNotEqualTo(Integer value) {
+            addCriterion("md_maxno <>", value, "md_maxno");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_maxnoGreaterThan(Integer value) {
+            addCriterion("md_maxno >", value, "md_maxno");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_maxnoGreaterThanOrEqualTo(Integer value) {
+            addCriterion("md_maxno >=", value, "md_maxno");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_maxnoLessThan(Integer value) {
+            addCriterion("md_maxno <", value, "md_maxno");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_maxnoLessThanOrEqualTo(Integer value) {
+            addCriterion("md_maxno <=", value, "md_maxno");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_maxnoIn(List<Integer> values) {
+            addCriterion("md_maxno in", values, "md_maxno");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_maxnoNotIn(List<Integer> values) {
+            addCriterion("md_maxno not in", values, "md_maxno");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_maxnoBetween(Integer value1, Integer value2) {
+            addCriterion("md_maxno between", value1, value2, "md_maxno");
+            return (Criteria) this;
+        }
+
+        public Criteria andMd_maxnoNotBetween(Integer value1, Integer value2) {
+            addCriterion("md_maxno not between", value1, value2, "md_maxno");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("companyId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("companyId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(Integer value) {
+            addCriterion("companyId =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(Integer value) {
+            addCriterion("companyId <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(Integer value) {
+            addCriterion("companyId >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("companyId >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(Integer value) {
+            addCriterion("companyId <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(Integer value) {
+            addCriterion("companyId <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<Integer> values) {
+            addCriterion("companyId in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<Integer> values) {
+            addCriterion("companyId not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(Integer value1, Integer value2) {
+            addCriterion("companyId between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("companyId not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("createTime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("createTime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("createTime =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("createTime <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("createTime >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("createTime >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("createTime <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("createTime <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("createTime in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("createTime not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("createTime between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("createTime not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdIsNull() {
+            addCriterion("creatorId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdIsNotNull() {
+            addCriterion("creatorId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdEqualTo(Integer value) {
+            addCriterion("creatorId =", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdNotEqualTo(Integer value) {
+            addCriterion("creatorId <>", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdGreaterThan(Integer value) {
+            addCriterion("creatorId >", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("creatorId >=", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdLessThan(Integer value) {
+            addCriterion("creatorId <", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdLessThanOrEqualTo(Integer value) {
+            addCriterion("creatorId <=", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdIn(List<Integer> values) {
+            addCriterion("creatorId in", values, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdNotIn(List<Integer> values) {
+            addCriterion("creatorId not in", values, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdBetween(Integer value1, Integer value2) {
+            addCriterion("creatorId between", value1, value2, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("creatorId not between", value1, value2, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("updateTime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("updateTime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("updateTime =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("updateTime <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("updateTime >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("updateTime >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("updateTime <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("updateTime <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("updateTime in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("updateTime not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("updateTime between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("updateTime not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdIsNull() {
+            addCriterion("updaterId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdIsNotNull() {
+            addCriterion("updaterId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdEqualTo(Integer value) {
+            addCriterion("updaterId =", value, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdNotEqualTo(Integer value) {
+            addCriterion("updaterId <>", value, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdGreaterThan(Integer value) {
+            addCriterion("updaterId >", value, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("updaterId >=", value, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdLessThan(Integer value) {
+            addCriterion("updaterId <", value, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdLessThanOrEqualTo(Integer value) {
+            addCriterion("updaterId <=", value, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdIn(List<Integer> values) {
+            addCriterion("updaterId in", values, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdNotIn(List<Integer> values) {
+            addCriterion("updaterId not in", values, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdBetween(Integer value1, Integer value2) {
+            addCriterion("updaterId between", value1, value2, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("updaterId not between", value1, value2, "updaterId");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 73 - 0
applications/commons/commons-server/pom.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>commons</artifactId>
+        <groupId>com.usoftchina.saas</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>commons-server</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>commoms-dto</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>auth-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>server-starter</artifactId>
+        </dependency>
+        <!-- db -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+        </dependency>
+        <!-- sleuth -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.amqp</groupId>
+            <artifactId>spring-rabbit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+        </dependency>
+        <!-- feign -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

+ 23 - 0
applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/CommonsApplication.java

@@ -0,0 +1,23 @@
+package com.usoftchina.saas.commons;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * @author: guq
+ * @create: 2018-10-18 15:47
+ **/
+@SpringBootApplication
+@EnableEurekaClient
+@EnableTransactionManagement
+@EnableFeignClients("com.usoftchina.saas")
+@MapperScan("com.usoftchina.saas.commons.mapper")
+public class CommonsApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(CommonsApplication.class, args);
+    }
+}

+ 19 - 0
applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/controller/CommonsController.java

@@ -0,0 +1,19 @@
+package com.usoftchina.saas.commons.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author: guq
+ * @create: 2018-10-18 15:53
+ **/
+@RestController
+@RequestMapping("/commons")
+public class CommonsController {
+
+    @RequestMapping("/test")
+    public String test() {
+        return "TEST";
+    }
+
+}

+ 33 - 0
applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/mapper/MaxnumbersMapper.java

@@ -0,0 +1,33 @@
+package com.usoftchina.saas.commons.mapper;
+
+
+
+import com.usoftchina.saas.commons.po.Maxnumbers;
+import com.usoftchina.saas.commons.po.MaxnumbersExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface MaxnumbersMapper {
+    int countByExample(MaxnumbersExample example);
+
+    int deleteByExample(MaxnumbersExample example);
+
+    int deleteByPrimaryKey(Integer mn_id);
+
+    int insert(Maxnumbers record);
+
+    int insertSelective(Maxnumbers record);
+
+    List<Maxnumbers> selectByExample(MaxnumbersExample example);
+
+    Maxnumbers selectByPrimaryKey(Integer mn_id);
+
+    int updateByExampleSelective(@Param("record") Maxnumbers record, @Param("example") MaxnumbersExample example);
+
+    int updateByExample(@Param("record") Maxnumbers record, @Param("example") MaxnumbersExample example);
+
+    int updateByPrimaryKeySelective(Maxnumbers record);
+
+    int updateByPrimaryKey(Maxnumbers record);
+}

+ 32 - 0
applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/mapper/MaxnumbersdetailMapper.java

@@ -0,0 +1,32 @@
+package com.usoftchina.saas.commons.mapper;
+
+
+import com.usoftchina.saas.commons.po.Maxnumbersdetail;
+import com.usoftchina.saas.commons.po.MaxnumbersdetailExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface MaxnumbersdetailMapper {
+    int countByExample(MaxnumbersdetailExample example);
+
+    int deleteByExample(MaxnumbersdetailExample example);
+
+    int deleteByPrimaryKey(Integer md_id);
+
+    int insert(Maxnumbersdetail record);
+
+    int insertSelective(Maxnumbersdetail record);
+
+    List<Maxnumbersdetail> selectByExample(MaxnumbersdetailExample example);
+
+    Maxnumbersdetail selectByPrimaryKey(Integer md_id);
+
+    int updateByExampleSelective(@Param("record") Maxnumbersdetail record, @Param("example") MaxnumbersdetailExample example);
+
+    int updateByExample(@Param("record") Maxnumbersdetail record, @Param("example") MaxnumbersdetailExample example);
+
+    int updateByPrimaryKeySelective(Maxnumbersdetail record);
+
+    int updateByPrimaryKey(Maxnumbersdetail record);
+}

+ 61 - 0
applications/commons/commons-server/src/main/resources/application.yml

@@ -0,0 +1,61 @@
+spring:
+  application:
+    name: commons-server
+  security:
+    user:
+      name: admin
+      password: select111***
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://192.168.253.12:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    username: root
+    password: select111***
+    hikari:
+      minimum-idle: 5
+      maximum-pool-size: 50
+      idle-timeout: 30000
+      max-lifetime: 1800000
+      connection-timeout: 30000
+  messages:
+    basename: i18n/messages
+  rabbitmq:
+    host: 192.168.0.176
+    port: 5672
+    password: guest
+    username: guest
+  zipkin:
+    sender:
+      type: rabbit
+    locator:
+      discovery:
+        enabled: true
+  sleuth:
+    sampler:
+      probability: 1.0
+eureka:
+  instance:
+    leaseRenewalIntervalInSeconds: 10
+    health-check-url-path: /actuator/health
+    status-page-url-path: /actuator/info
+    metadata-map:
+      user.name: ${spring.security.user.name}
+      user.password: ${spring.security.user.password}
+  client:
+    registryFetchIntervalSeconds: 5
+    serviceUrl:
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
+server:
+  port: 8900
+  tomcat:
+    uri-encoding: UTF-8
+info:
+  name: '@project.artifactId@'
+  description: '@project.description@'
+  version: '@project.version@'
+  spring-boot-version: '@spring.boot.version@'
+  spring-cloud-version: '@spring.cloud.version@'
+mybatis:
+  type-aliases-package: com.usoftchina.saas.commons.po
+  mapper-locations: classpath:mapper/*.xml
+auth:
+  public-key: auth/pub.key

BIN
applications/commons/commons-server/src/main/resources/auth/pub.key


+ 64 - 0
applications/commons/commons-server/src/main/resources/logback-spring.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <jmxConfigurator/>
+
+    <!--
+    %m
+    输出代码中指定的消息
+    %p
+    输出优先级,即DEBUG,INFO,WARN,ERROR,FATAL
+    %r
+    输出自应用启动到输出该log信息耗费的毫秒数
+    %c
+    输出所属的类目,通常就是所在类的全名
+    %t
+    输出产生该日志事件的线程名
+    %n
+    输出一个回车换行符,Windows平台为“\r\n”,Unix平台为“\n”
+    %d
+    输出日志时间点的日期或时间,默认格式为ISO8601,也可以在其后指定格式,比如:%d{yyy MMM dd HH:mm:ss,SSS},
+    输出类似:2002年10月18日 22:10:28,921
+    %l
+    输出日志事件的发生位置,包括类目名、发生的线程,以及在代码中的行数。举例:Testlog4.main(TestLog4.java:10)
+    -->
+
+    <springProperty scope="context" name="log.path" source="logging.path" defaultValue="/var/log/saas/commons-server"/>
+    <springProperty scope="context" name="spring.application.name" source="spring.application.name" defaultValue="commons-server"/>
+    <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
+    <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
+    <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
+
+    <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
+
+
+    <appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>${log.level.console}</level>
+        </filter>
+        <encoder>
+            <pattern>${common-pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="ROOT_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/root.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- 每天一归档 -->
+            <fileNamePattern>${log.path}/%d{yyyy-MM}/root-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
+            <!-- 单个日志文件最多 100MB, 60天的日志周期,最大不能超过20GB -->
+            <maxFileSize>128MB</maxFileSize>
+            <maxHistory>60</maxHistory>
+            <totalSizeCap>20GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${common-pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <root level="${log.level.console}">
+        <appender-ref ref="CONSOLE_APPENDER"/>
+        <appender-ref ref="ROOT_APPENDER"/>
+    </root>
+
+</configuration>

+ 276 - 0
applications/commons/commons-server/src/main/resources/mapper/MaxnumbersMapper.xml

@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.usoftchina.saas.commons.mapper.MaxnumbersMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.commons.po.Maxnumbers" >
+    <id column="mn_id" property="id" jdbcType="INTEGER" />
+    <result column="mn_caller" property="mn_caller" jdbcType="VARCHAR" />
+    <result column="mn_leadcode" property="mn_leadcode" jdbcType="VARCHAR" />
+    <result column="mn_number" property="mn_number" jdbcType="VARCHAR" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
+    <result column="createTime" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="creatorId" property="creatorId" jdbcType="INTEGER" />
+    <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    mn_id, mn_caller, mn_leadcode, mn_number, companyId, createTime, creatorId, updateTime, 
+    updaterId
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.usoftchina.saas.commons.po.MaxnumbersExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from maxnumbers
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from maxnumbers
+    where mn_id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from maxnumbers
+    where mn_id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.usoftchina.saas.commons.po.MaxnumbersExample" >
+    delete from maxnumbers
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.usoftchina.saas.commons.po.Maxnumbers" >
+    insert into maxnumbers (mn_id, mn_caller, mn_leadcode, 
+      mn_number, companyId, createTime, 
+      creatorId, updateTime, updaterId
+      )
+    values (#{id,jdbcType=INTEGER}, #{mn_caller,jdbcType=VARCHAR}, #{mn_leadcode,jdbcType=VARCHAR},
+      #{mn_number,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{creatorId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, #{updaterId,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.commons.po.Maxnumbers" >
+    insert into maxnumbers
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        mn_id,
+      </if>
+      <if test="mn_caller != null" >
+        mn_caller,
+      </if>
+      <if test="mn_leadcode != null" >
+        mn_leadcode,
+      </if>
+      <if test="mn_number != null" >
+        mn_number,
+      </if>
+      <if test="companyId != null" >
+        companyId,
+      </if>
+      <if test="createTime != null" >
+        createTime,
+      </if>
+      <if test="creatorId != null" >
+        creatorId,
+      </if>
+      <if test="updateTime != null" >
+        updateTime,
+      </if>
+      <if test="updaterId != null" >
+        updaterId,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="mn_caller != null" >
+        #{mn_caller,jdbcType=VARCHAR},
+      </if>
+      <if test="mn_leadcode != null" >
+        #{mn_leadcode,jdbcType=VARCHAR},
+      </if>
+      <if test="mn_number != null" >
+        #{mn_number,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorId != null" >
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updaterId != null" >
+        #{updaterId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.usoftchina.saas.commons.po.MaxnumbersExample" resultType="java.lang.Integer" >
+    select count(*) from maxnumbers
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update maxnumbers
+    <set >
+      <if test="record.id != null" >
+        mn_id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.mn_caller != null" >
+        mn_caller = #{record.mn_caller,jdbcType=VARCHAR},
+      </if>
+      <if test="record.mn_leadcode != null" >
+        mn_leadcode = #{record.mn_leadcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.mn_number != null" >
+        mn_number = #{record.mn_number,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyId != null" >
+        companyId = #{record.companyId,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null" >
+        createTime = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.creatorId != null" >
+        creatorId = #{record.creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="record.updateTime != null" >
+        updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updaterId != null" >
+        updaterId = #{record.updaterId,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update maxnumbers
+    set mn_id = #{record.id,jdbcType=INTEGER},
+      mn_caller = #{record.mn_caller,jdbcType=VARCHAR},
+      mn_leadcode = #{record.mn_leadcode,jdbcType=VARCHAR},
+      mn_number = #{record.mn_number,jdbcType=VARCHAR},
+      companyId = #{record.companyId,jdbcType=INTEGER},
+      createTime = #{record.createTime,jdbcType=TIMESTAMP},
+      creatorId = #{record.creatorId,jdbcType=INTEGER},
+      updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
+      updaterId = #{record.updaterId,jdbcType=INTEGER}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.commons.po.Maxnumbers" >
+    update maxnumbers
+    <set >
+      <if test="mn_caller != null" >
+        mn_caller = #{mn_caller,jdbcType=VARCHAR},
+      </if>
+      <if test="mn_leadcode != null" >
+        mn_leadcode = #{mn_leadcode,jdbcType=VARCHAR},
+      </if>
+      <if test="mn_number != null" >
+        mn_number = #{mn_number,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        companyId = #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        createTime = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorId != null" >
+        creatorId = #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null" >
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updaterId != null" >
+        updaterId = #{updaterId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where mn_id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.commons.po.Maxnumbers" >
+    update maxnumbers
+    set mn_caller = #{mn_caller,jdbcType=VARCHAR},
+      mn_leadcode = #{mn_leadcode,jdbcType=VARCHAR},
+      mn_number = #{mn_number,jdbcType=VARCHAR},
+      companyId = #{companyId,jdbcType=INTEGER},
+      createTime = #{createTime,jdbcType=TIMESTAMP},
+      creatorId = #{creatorId,jdbcType=INTEGER},
+      updateTime = #{updateTime,jdbcType=TIMESTAMP},
+      updaterId = #{updaterId,jdbcType=INTEGER}
+    where mn_id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

+ 276 - 0
applications/commons/commons-server/src/main/resources/mapper/MaxnumbersdetailMapper.xml

@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.usoftchina.saas.commons.mapper.MaxnumbersdetailMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.commons.po.Maxnumbersdetail" >
+    <id column="md_id" property="id" jdbcType="INTEGER" />
+    <result column="md_caller" property="md_caller" jdbcType="VARCHAR" />
+    <result column="md_leadcode" property="md_leadcode" jdbcType="VARCHAR" />
+    <result column="md_maxno" property="md_maxno" jdbcType="INTEGER" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
+    <result column="createTime" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="creatorId" property="creatorId" jdbcType="INTEGER" />
+    <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    md_id, md_caller, md_leadcode, md_maxno, companyId, createTime, creatorId, updateTime, 
+    updaterId
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.usoftchina.saas.commons.po.MaxnumbersdetailExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from maxnumbersdetail
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from maxnumbersdetail
+    where md_id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from maxnumbersdetail
+    where md_id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.usoftchina.saas.commons.po.MaxnumbersdetailExample" >
+    delete from maxnumbersdetail
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.usoftchina.saas.commons.po.Maxnumbersdetail" >
+    insert into maxnumbersdetail (md_id, md_caller, md_leadcode, 
+      md_maxno, companyId, createTime, 
+      creatorId, updateTime, updaterId
+      )
+    values (#{id,jdbcType=INTEGER}, #{md_caller,jdbcType=VARCHAR}, #{md_leadcode,jdbcType=VARCHAR},
+      #{md_maxno,jdbcType=INTEGER}, #{companyId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{creatorId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, #{updaterId,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.commons.po.Maxnumbersdetail" >
+    insert into maxnumbersdetail
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        md_id,
+      </if>
+      <if test="md_caller != null" >
+        md_caller,
+      </if>
+      <if test="md_leadcode != null" >
+        md_leadcode,
+      </if>
+      <if test="md_maxno != null" >
+        md_maxno,
+      </if>
+      <if test="companyId != null" >
+        companyId,
+      </if>
+      <if test="createTime != null" >
+        createTime,
+      </if>
+      <if test="creatorId != null" >
+        creatorId,
+      </if>
+      <if test="updateTime != null" >
+        updateTime,
+      </if>
+      <if test="updaterId != null" >
+        updaterId,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="md_caller != null" >
+        #{md_caller,jdbcType=VARCHAR},
+      </if>
+      <if test="md_leadcode != null" >
+        #{md_leadcode,jdbcType=VARCHAR},
+      </if>
+      <if test="md_maxno != null" >
+        #{md_maxno,jdbcType=INTEGER},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorId != null" >
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updaterId != null" >
+        #{updaterId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.usoftchina.saas.commons.po.MaxnumbersdetailExample" resultType="java.lang.Integer" >
+    select count(*) from maxnumbersdetail
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update maxnumbersdetail
+    <set >
+      <if test="record.id != null" >
+        md_id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.md_caller != null" >
+        md_caller = #{record.md_caller,jdbcType=VARCHAR},
+      </if>
+      <if test="record.md_leadcode != null" >
+        md_leadcode = #{record.md_leadcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.md_maxno != null" >
+        md_maxno = #{record.md_maxno,jdbcType=INTEGER},
+      </if>
+      <if test="record.companyId != null" >
+        companyId = #{record.companyId,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null" >
+        createTime = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.creatorId != null" >
+        creatorId = #{record.creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="record.updateTime != null" >
+        updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updaterId != null" >
+        updaterId = #{record.updaterId,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update maxnumbersdetail
+    set md_id = #{record.id,jdbcType=INTEGER},
+      md_caller = #{record.md_caller,jdbcType=VARCHAR},
+      md_leadcode = #{record.md_leadcode,jdbcType=VARCHAR},
+      md_maxno = #{record.md_maxno,jdbcType=INTEGER},
+      companyId = #{record.companyId,jdbcType=INTEGER},
+      createTime = #{record.createTime,jdbcType=TIMESTAMP},
+      creatorId = #{record.creatorId,jdbcType=INTEGER},
+      updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
+      updaterId = #{record.updaterId,jdbcType=INTEGER}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.commons.po.Maxnumbersdetail" >
+    update maxnumbersdetail
+    <set >
+      <if test="md_caller != null" >
+        md_caller = #{md_caller,jdbcType=VARCHAR},
+      </if>
+      <if test="md_leadcode != null" >
+        md_leadcode = #{md_leadcode,jdbcType=VARCHAR},
+      </if>
+      <if test="md_maxno != null" >
+        md_maxno = #{md_maxno,jdbcType=INTEGER},
+      </if>
+      <if test="companyId != null" >
+        companyId = #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        createTime = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorId != null" >
+        creatorId = #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null" >
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updaterId != null" >
+        updaterId = #{updaterId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where md_id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.commons.po.Maxnumbersdetail" >
+    update maxnumbersdetail
+    set md_caller = #{md_caller,jdbcType=VARCHAR},
+      md_leadcode = #{md_leadcode,jdbcType=VARCHAR},
+      md_maxno = #{md_maxno,jdbcType=INTEGER},
+      companyId = #{companyId,jdbcType=INTEGER},
+      createTime = #{createTime,jdbcType=TIMESTAMP},
+      creatorId = #{creatorId,jdbcType=INTEGER},
+      updateTime = #{updateTime,jdbcType=TIMESTAMP},
+      updaterId = #{updaterId,jdbcType=INTEGER}
+    where md_id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

+ 6 - 7
applications/commons/pom.xml

@@ -8,14 +8,13 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
     <artifactId>commons</artifactId>
-    <dependencies>
-        <dependency>
-            <groupId>com.usoftchina.saas</groupId>
-            <artifactId>core</artifactId>
-        </dependency>
-    </dependencies>
+    <modules>
+        <module>commons-api</module>
+        <module>commons-dto</module>
+        <module>commons-server</module>
+    </modules>
+    <packaging>pom</packaging>
 
 
 </project>

+ 2 - 1
applications/document/document-server/pom.xml

@@ -59,7 +59,8 @@
         </dependency>
         <dependency>
             <groupId>com.usoftchina.saas</groupId>
-            <artifactId>commons</artifactId>
+            <artifactId>commoms-dto</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

+ 3 - 2
applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/ProductController.java

@@ -2,8 +2,9 @@ package com.usoftchina.saas.document.controller;
 
 import com.usoftchina.saas.base.Result;
 
-import com.usoftchina.saas.common.dto.ComboDTO;
-import com.usoftchina.saas.common.dto.DocReqDTO;
+
+import com.usoftchina.saas.commons.dto.ComboDTO;
+import com.usoftchina.saas.commons.dto.DocReqDTO;
 import com.usoftchina.saas.document.dto.ProductDTO;
 import com.usoftchina.saas.document.entities.Product;
 import com.usoftchina.saas.document.service.ProductService;

+ 2 - 1
applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/VendorController.java

@@ -1,7 +1,8 @@
 package com.usoftchina.saas.document.controller;
 
 import com.usoftchina.saas.base.Result;
-import com.usoftchina.saas.common.dto.DocReqDTO;
+
+import com.usoftchina.saas.commons.dto.DocReqDTO;
 import com.usoftchina.saas.document.dto.VendorDTO;
 import com.usoftchina.saas.document.service.VendorService;
 import com.usoftchina.saas.page.PageRequest;

+ 3 - 2
applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/ProductMapper.java

@@ -1,8 +1,9 @@
 package com.usoftchina.saas.document.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
-import com.usoftchina.saas.common.dto.ComboDTO;
-import com.usoftchina.saas.common.dto.DocReqDTO;
+
+import com.usoftchina.saas.commons.dto.ComboDTO;
+import com.usoftchina.saas.commons.dto.DocReqDTO;
 import com.usoftchina.saas.document.entities.Product;
 
 import java.util.List;

+ 2 - 1
applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/VendorMapper.java

@@ -2,7 +2,8 @@ package com.usoftchina.saas.document.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 
-import com.usoftchina.saas.common.dto.DocReqDTO;
+
+import com.usoftchina.saas.commons.dto.DocReqDTO;
 import com.usoftchina.saas.document.entities.Vendor;
 
 import java.util.List;

+ 3 - 2
applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/Impl/ProductServiceImpl.java

@@ -4,8 +4,9 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 
-import com.usoftchina.saas.common.dto.ComboDTO;
-import com.usoftchina.saas.common.dto.DocReqDTO;
+
+import com.usoftchina.saas.commons.dto.ComboDTO;
+import com.usoftchina.saas.commons.dto.DocReqDTO;
 import com.usoftchina.saas.document.dto.ProductDTO;
 import com.usoftchina.saas.document.entities.Product;
 import com.usoftchina.saas.document.mapper.ProductMapper;

+ 2 - 1
applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/Impl/VendorServiceImpl.java

@@ -3,7 +3,8 @@ package com.usoftchina.saas.document.service.Impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
-import com.usoftchina.saas.common.dto.DocReqDTO;
+
+import com.usoftchina.saas.commons.dto.DocReqDTO;
 import com.usoftchina.saas.document.dto.VendorDTO;
 import com.usoftchina.saas.document.entities.Vendor;
 import com.usoftchina.saas.document.mapper.VendorMapper;

+ 3 - 2
applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/ProductService.java

@@ -2,8 +2,9 @@ package com.usoftchina.saas.document.service;
 
 import com.usoftchina.saas.base.service.CommonBaseService;
 
-import com.usoftchina.saas.common.dto.ComboDTO;
-import com.usoftchina.saas.common.dto.DocReqDTO;
+
+import com.usoftchina.saas.commons.dto.ComboDTO;
+import com.usoftchina.saas.commons.dto.DocReqDTO;
 import com.usoftchina.saas.document.dto.ProductDTO;
 import com.usoftchina.saas.document.entities.Product;
 import com.usoftchina.saas.document.mapper.ProductMapper;

+ 2 - 1
applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/VendorService.java

@@ -2,7 +2,8 @@ package com.usoftchina.saas.document.service;
 
 import com.usoftchina.saas.base.service.CommonBaseService;
 
-import com.usoftchina.saas.common.dto.DocReqDTO;
+
+import com.usoftchina.saas.commons.dto.DocReqDTO;
 import com.usoftchina.saas.document.dto.VendorDTO;
 import com.usoftchina.saas.document.entities.Vendor;
 import com.usoftchina.saas.document.mapper.VendorMapper;

+ 2 - 1
applications/purchase/purchase-server/pom.xml

@@ -62,7 +62,8 @@
         </dependency>
         <dependency>
             <groupId>com.usoftchina.saas</groupId>
-            <artifactId>commons</artifactId>
+            <artifactId>commoms-dto</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

+ 3 - 2
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/controller/PurchaseController.java

@@ -2,8 +2,9 @@ package com.usoftchina.saas.purchase.controller;
 
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
-import com.usoftchina.saas.common.dto.BatchDealBaseDTO;
-import com.usoftchina.saas.common.dto.DocSavedDTO;
+
+import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
+import com.usoftchina.saas.commons.dto.DocSavedDTO;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.purchase.dto.*;
 import com.usoftchina.saas.purchase.po.PurchaseList;

+ 2 - 1
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/mapper/PurchaseMapper.java

@@ -1,7 +1,8 @@
 package com.usoftchina.saas.purchase.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
-import com.usoftchina.saas.common.dto.DocBaseDTO;
+
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.purchase.po.Purchase;
 import java.util.List;
 

+ 3 - 2
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/PurchaseService.java

@@ -3,8 +3,9 @@ package com.usoftchina.saas.purchase.service;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseService;
 
-import com.usoftchina.saas.common.dto.BatchDealBaseDTO;
-import com.usoftchina.saas.common.dto.DocSavedDTO;
+
+import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
+import com.usoftchina.saas.commons.dto.DocSavedDTO;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.purchase.dto.PurchaseFormDTO;
 import com.usoftchina.saas.purchase.dto.PurchaseReqDTO;

+ 4 - 3
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -4,9 +4,10 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
-import com.usoftchina.saas.common.dto.BatchDealBaseDTO;
-import com.usoftchina.saas.common.dto.DocBaseDTO;
-import com.usoftchina.saas.common.dto.DocSavedDTO;
+
+import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
+import com.usoftchina.saas.commons.dto.DocSavedDTO;
 import com.usoftchina.saas.document.api.ProductApi;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.page.PageRequest;

+ 2 - 2
applications/purchase/purchase-server/src/main/resources/mapper/PurchaseListMapper.xml

@@ -70,7 +70,7 @@
             <if test="keyword != null">
                 AND ${keyword}
             </if>
-            order by pu_id,pd_detno desc
+            order by pu_id,pd_detno
         </where>
     </select>
 
@@ -90,7 +90,7 @@
                 AND ${keyword}
             </if>
         </where>
-        order by pu_id desc
+        order by pu_id
     </select>
     <insert id="batchInsert" parameterType="java.util.List" >
         insert into purchasedetail ( PD_PUID, PD_CODE,

+ 1 - 1
applications/purchase/purchase-server/src/main/resources/mapper/PurchasedetailMapper.xml

@@ -412,6 +412,6 @@
   </delete>
   <select id="selectByFK" parameterType="long" resultMap="BaseResultMap">
     select * from purchasedetail a left join product b on pr_id=pd_prodid and a.companyid = b.companyid
-      where pd_puid=#{pu_id} order by pd_detno desc
+      where pd_puid=#{pu_id} order by pd_detno
   </select>
 </mapper>