Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

atms-api/pom.xml

@@ -416,6 +416,11 @@
             <artifactId>jxls-core</artifactId>
             <version>1.0.6</version>
         </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>1.0.0.GA</version>
+        </dependency>
 
     </dependencies>
 

atms-api/src/main/java/pwc/taxtech/atms/controller/EbsApiController.java

@@ -12,6 +12,7 @@ import pwc.taxtech.atms.dto.ebsdto.*;
 import pwc.taxtech.atms.service.EbsApiService;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.util.Collections;
 import java.util.List;
 
@@ -144,7 +145,7 @@ public class EbsApiController {
     }
 
     @RequestMapping(value = "/updateOrg", method = RequestMethod.POST)
-    public ApiResultDto updateOrg(@RequestBody List<OrganizationQueryDto> items) {
+    public ApiResultDto updateOrg(@RequestBody @Valid List<OrganizationQueryDto> items) {
         if (CollectionUtils.isEmpty(items)) {
             logger.debug("the updateOrg return items is empty");
             return ApiResultDto.success(Collections.emptyList());

atms-api/src/main/java/pwc/taxtech/atms/dto/ebsdto/OrganizationQueryDto.java

 package pwc.taxtech.atms.dto.ebsdto;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
@@ -9,40 +11,58 @@ import java.io.Serializable;
  */
 public class OrganizationQueryDto implements Serializable {
 
+    @Size(max=50,message = "纳税人识别号超长,最长为50")
     private String taxPayerNumber;
 
+    @Size(max=50,message = "机构代码超长,最长为50")
     private String code;
 
+    @Size(max=50,message = "机构名称超长,最长为50")
     private String name;
 
+    @Size(max=128,message = "机构名称超长,最长为128")
     private String enterpriseAccountCode;
 
+    @Size(max=200,message = "法定负责人名称超长,最长为200")
     private String legalPersonName;
 
+    @Size(max=500,message = "注册资本超长,最长为500")
     private String registrationCapital;
 
+    @Size(max=500,message = "实缴资本超长,最长为500")
     private String paidInCapital;
 
+    @Size(max=100,message = "注册负责人手机超长,最长为100")
     private String legalPersonPhoneNumber;
 
+    @Size(max=100,message = "注册负责人座机超长,最长为100")
     private String legalPersonLandlineNum;
 
+    @Size(max=100,message = "注册负责人邮箱超长,最长为100")
     private String legalPersonEmailAddress;
 
+    @Size(max=200,message = "注册登记财务负责人姓名超长,最长为200")
     private String regFinancialOfficerName;
 
+    @Size(max=200,message = "注册登记财务负责人手机超长,最长为200")
     private String regFinancialOfficerPhoneNum;
 
+    @Size(max=100,message = "注册登记财务负责人座机超长,最长为100")
     private String regFinancialOfficerLandlineNum;
 
+    @Size(max=100,message = "注册登记财务负责人手机超长,最长为100")
     private String regFinancialOfficerEmailAddress;
 
+    @Size(max=50,message = "记账本位币超长,最长为50")
     private String currencyCode;
 
+    @Size(max=500,message = "注册地址超长,最长为500")
     private String registerAddress;
 
+    @Size(max=300,message = "上级公司名称超长,最长为300")
     private String parentName;
 
+    @Max(value = 99999999,message = "雇员人数超过最大限制")
     private int staffSize;
 
     public String getTaxPayerNumber() {