Browse Source

编号代码完善

guq 7 years ago
parent
commit
d43f320f38

+ 1 - 1
applications/commons/commons-dto/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>commoms-dto</artifactId>
+    <artifactId>commons-dto</artifactId>
     <dependencies>
         <dependency>
             <groupId>com.usoftchina.saas</groupId>

+ 19 - 7
applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/Maxnumbers.java

@@ -7,7 +7,25 @@ public class Maxnumbers extends CommonBaseEntity{
 
     private String mn_leadcode;
 
-    private String mn_number;
+    private String mn_rule;
+
+    public String getMn_rule() {
+        return mn_rule;
+    }
+
+    public void setMn_rule(String mn_rule) {
+        this.mn_rule = mn_rule;
+    }
+
+    private Integer mn_number;
+
+    public Integer getMn_number() {
+        return mn_number;
+    }
+
+    public void setMn_number(Integer mn_number) {
+        this.mn_number = mn_number;
+    }
 
     public String getMn_caller() {
         return mn_caller;
@@ -25,11 +43,5 @@ public class Maxnumbers extends CommonBaseEntity{
         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();
-    }
 }

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

@@ -385,7 +385,7 @@ public class MaxnumbersExample {
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdEqualTo(Integer value) {
+        public Criteria andCompanyIdEqualTo(Long value) {
             addCriterion("companyId =", value, "companyId");
             return (Criteria) this;
         }

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

@@ -375,7 +375,7 @@ public class MaxnumbersdetailExample {
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdEqualTo(Integer value) {
+        public Criteria andCompanyIdEqualTo(Long value) {
             addCriterion("companyId =", value, "companyId");
             return (Criteria) this;
         }

+ 1 - 1
applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/impl/MaxnumberServiceImpl.java

@@ -217,7 +217,7 @@ public class MaxnumberServiceImpl extends CommonBaseServiceImpl<MaxnumbersMapper
     */
     private String getRulecode(Maxnumbers maxnumbers) {
         String rulecode = maxnumbers.getMn_leadcode();
-        Integer ength = maxnumbers.getMn_number();
+        Integer length = maxnumbers.getMn_number();
         String mn_rule = maxnumbers.getMn_rule();
         String date = "YYYYMM".equals(mn_rule) ? DateUtils.format(new Date(), "yyyyMM") :
                 DateUtils.format(new Date(), "yyyyMMdd");