batch upload for template download -- frank

atms-api/src/main/java/pwc/taxtech/atms/constant/enums/BoardMeetingRequirementEnum.java

+package pwc.taxtech.atms.constant.enums;
+
+public enum BoardMeetingRequirementEnum {
+    Annual("Annual", 1),
+    SemiQnnual("Semi Qnnual", 2),
+    Quarter("Quarter", 3),
+    Monthly("Monthly", 3);
+
+    private String name;
+    private Integer value;
+
+    BoardMeetingRequirementEnum(String name, Integer value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/constant/enums/ClassOfSharesEnum.java

+package pwc.taxtech.atms.constant.enums;
+
+public enum ClassOfSharesEnum {
+    A("A", 1),
+    B("B", 2);
+
+    private String name;
+    private Integer value;
+
+    ClassOfSharesEnum(String name, Integer value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/constant/enums/CommonOrPreferredEnum.java

+package pwc.taxtech.atms.constant.enums;
+
+public enum CommonOrPreferredEnum {
+    Common("Common", 1),
+    Preferred("Preferred", 2);
+
+    private String name;
+    private Integer value;
+
+    CommonOrPreferredEnum(String name, Integer value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EntityLevelEnum.java

+package pwc.taxtech.atms.constant.enums;
+
+public enum  EntityLevelEnum {
+    InvestmentFund("Investment Fund", 1),
+    InvestmentHolding("Investment Holding", 2),
+    PortfolioCompany("Portfolio Company", 3);
+
+    private String name;
+    private Integer value;
+
+    EntityLevelEnum(String name, Integer value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/constant/enums/ExecutiveEnum.java

+package pwc.taxtech.atms.constant.enums;
+
+public enum ExecutiveEnum {
+    Y("Y", 1),
+    N("N", 2);
+
+    private String name;
+    private Integer value;
+
+    ExecutiveEnum(String name, Integer value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/constant/enums/JurisdictionOfFormationEnum.java

+package pwc.taxtech.atms.constant.enums;
+
+public enum JurisdictionOfFormationEnum {
+    HongKong("Hong Kong", 1),
+    BritishVirginIslands("British Virgin Islands", 2),
+    CaymanIslands("Cayman Islands", 3);
+
+    private String name;
+    private Integer value;
+
+    JurisdictionOfFormationEnum(String name, Integer value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/constant/enums/LegalFormEnum.java

+package pwc.taxtech.atms.constant.enums;
+
+public enum LegalFormEnum {
+    LimitedPartnership("Limited Partnership", 1),
+    LimitedCompany("Limited Company", 2),
+    Trustee("Trustee", 2);
+
+    private String name;
+    private Integer value;
+
+    LegalFormEnum(String name, Integer value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/constant/enums/OwnershipFormEnum.java

+package pwc.taxtech.atms.constant.enums;
+
+public enum OwnershipFormEnum {
+    OrdinaryShares("Ordinary Shares", 1),
+    PreferenceShares("Preference Shares", 2);
+
+    private String name;
+    private Integer value;
+
+    OwnershipFormEnum(String name, Integer value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/constant/enums/RolesEnum.java

+package pwc.taxtech.atms.constant.enums;
+
+public enum RolesEnum {
+    CEO("CEO", 1),
+    CFO("CFO", 2),
+    NA("NA", 3);
+
+    private String name;
+    private Integer value;
+
+    RolesEnum(String name, Integer value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+}

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

 package pwc.taxtech.atms.controller;
 
-import com.alibaba.fastjson.JSONArray;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -10,7 +9,6 @@ import pwc.taxtech.atms.exception.ServiceException;
 import pwc.taxtech.atms.service.impl.DataImportService;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 @RestController
 @RequestMapping("/api/v1/DataImport/")
@@ -20,33 +18,26 @@ public class DataImportController extends BaseController {
     private DataImportService dataImportService;
 
     @ResponseBody
-    @RequestMapping(value = "RLITExcelFile", method = RequestMethod.POST)
-    public OperationResultDto importRLITExcelFile(@RequestParam MultipartFile file,@RequestParam String orgIds,@RequestParam String periodDate,@RequestParam Integer importType) {
+    @RequestMapping(value = "OrgExcelFile", method = RequestMethod.POST)
+    public OperationResultDto importRLITExcelFile(@RequestParam MultipartFile file) {
         try {
-            List<String> orgList = (List<String>)JSONArray.parse(orgIds);
-            String valMsg = valParameter(file,orgList,periodDate);
-            if(StringUtils.isNotEmpty(valMsg)){
+            String valMsg = valParameter(file);
+            if (StringUtils.isNotEmpty(valMsg)) {
                 return OperationResultDto.error(valMsg);
             }
-            return dataImportService.importRLITExcelFile(file,orgList, periodDate,importType);
+            return dataImportService.importOrgExcelFile(file);
         } catch (ServiceException e) {
             return OperationResultDto.error(e.getMessage());
         } catch (Exception e) {
-            logger.error("importRLITExcelFile error.", e);
+            logger.error("OrgExcelFile error.", e);
             return OperationResultDto.error(ErrorMessage.SystemError);
         }
     }
 
-    private String valParameter(MultipartFile file,List<String> orgList,String periodDate){
+    private String valParameter(MultipartFile file) {
         if (null == file) {
             return ErrorMessage.NoFile;
         }
-        if(orgList.size()<1){
-            return ErrorMessage.DidntSelectedCompany;
-        }
-        if(StringUtils.isEmpty(periodDate)){
-            return ErrorMessage.DidntSelectedPeriod;
-        }
         return null;
     }
 

atms-dao/src/main/java/pwc/taxtech/atms/organization/dpo/OrganizationDirectorDto.java

@@ -19,4 +19,6 @@ public class OrganizationDirectorDto {
     Integer isExecutive;
     Integer otherRoles;
     String isDelete;
+    String internalEntityCode;
+    String companyName;
 }

atms-dao/src/main/java/pwc/taxtech/atms/organization/dpo/OrganizationHKDto.java

@@ -20,7 +20,7 @@ public class OrganizationHKDto {
     private String code;
     private Boolean isActive;
     private Long parentId;
-    private String legalForm;
+    private Integer legalForm;
     private String registerAddress;
     private Float authorisedCapital;
     private Float issuedCapital;
@@ -30,9 +30,9 @@ public class OrganizationHKDto {
     private String boardMeetingRequirement;
     private String businessLicense;
     private String renewalOfBusinessLicense;
-    private String entityLevel;
+    private Integer entityLevel;
     private String dateOfIncorporation;
-    private String jurisdictionOfFormation;
+    private Integer jurisdictionOfFormation;
     private String financialYearEnd;
     private String annualAuditRequirement;
     private String registeredAgent;

atms-dao/src/main/java/pwc/taxtech/atms/organization/dpo/OrganizationShareholderDto.java

@@ -17,4 +17,7 @@ public class OrganizationShareholderDto {
     Integer commonPreferred;
     Integer classOfShares;
     String votingPercentage;
+    String internalEntityCode;
+    String companyName;
+    String shareholderName;
 }

atms-dao/src/main/java/pwc/taxtech/atms/organization/mapper/OrganizationHKTMapper.java

@@ -21,4 +21,13 @@ public interface OrganizationHKTMapper {
     OrganizationHKDto toOrganizationHKDto(OrganizationHK organizationHK);
 
     OrgInfoDto toOrgInfoDto(OrganizationHK organizationHK);
+
+    @Mapping(source = "createTime", target = "createTime", dateFormat = "yyyy/MM/dd")
+    @Mapping(source = "updateTime", target = "updateTime", dateFormat = "yyyy/MM/dd")
+    @Mapping(source = "dateOfIncorporation", target = "dateOfIncorporation", dateFormat = "yyyy/MM/dd")
+    @Mapping(source = "paymentOfAnnualGovernmentFee", target = "paymentOfAnnualGovernmentFee", dateFormat = "yyyy/MM/dd")
+    @Mapping(source = "annualReturnFillings", target = "annualReturnFillings", dateFormat = "yyyy/MM/dd")
+    @Mapping(source = "renewalOfBusinessLicense", target = "renewalOfBusinessLicense", dateFormat = "yyyy/MM/dd")
+    @Mapping(source = "annualAuditRequirement", target = "annualAuditRequirement", dateFormat = "yyyy/MM/dd")
+    OrganizationHK toOrganiztionHK(OrganizationHKDto organizationHKDto);
 }

atms-web/src/main/webapp/app/common/controls/upload-org-modal/upload-org-modal.ctrl.js

@@ -29,7 +29,7 @@ commonModule.controller('uploadOrgModalController', ['$scope', '$log', '$transla
             importExcelF: null
         };
 
-        $scope.importRLITExcelFile = apiInterceptor.webApiHostUrl + '/DataImport/RLITExcelFile';
+        $scope.importOrgExcelFile = apiInterceptor.webApiHostUrl + '/DataImport/OrgExcelFile';
         $scope.downloadTemplate = function () {
             templateService.downloadTemplate().success(function (data, status, headers) {
                 var octetStreamMime = 'application/octet-stream';
@@ -81,9 +81,8 @@ commonModule.controller('uploadOrgModalController', ['$scope', '$log', '$transla
 
 
             Upload.upload({
-                url: $scope.importRLITExcelFile,
+                url: $scope.importOrgExcelFile,
                 data: {
-                    importType: importType
                 },
                 file: impExl,
                 headers: {