fixed shareholder structure -- frank

atms-api/src/main/java/pwc/taxtech/atms/service/impl/OrganizationHKServiceImpl.java

@@ -279,7 +279,7 @@ public class OrganizationHKServiceImpl {
                     .collect(Collectors.toList()).get(0);
             parentOrg.setParentName(organization == null ? null : organization.getName());
         }
-        List<OrganizationHK> subOrgs = null;
+        List<OrganizationHK> subOrgs;
         if (useType == 1) {
             subOrgs = orgs.stream().filter(x -> parentOrg.getId().equals(x.getParentId())).collect(Collectors.toList());
         } else {
@@ -297,15 +297,14 @@ public class OrganizationHKServiceImpl {
         return parentOrg;
     }
 
-    public List<OrganizationHK> findAllOrganizations() {
+    private List<OrganizationHK> findAllOrganizations() {
         OrganizationHKExample organizationExample = new OrganizationHKExample();
         return organizationHKMapper.selectByExample(organizationExample);
     }
 
     public OrganizationHKDto getSingleOrgByOrgId(Long orgId) {
         OrganizationHK organizationHK = organizationHKMapper.selectByPrimaryKey(orgId);
-        OrganizationHKDto result = new OrganizationHKDto();
-        CommonUtils.copyProperties(organizationHK, result);
+        OrganizationHKDto result =organizationHKTMapper.toOrganizationHKDto(organizationHK);
         Assert.notNull(result, "result is null");
         result.setLevel(result.getLevel() == null ? 0 : result.getLevel());
         result.setParentName("");
@@ -393,7 +392,7 @@ public class OrganizationHKServiceImpl {
 
     private OperationResultDto checkExist(OrganizationHKDto orgDto) {
         Assert.notNull(orgDto, "orgDto null point error");
-        OrganizationHK queryRoot = null;
+        OrganizationHK queryRoot;
         OrganizationHKExample example = new OrganizationHKExample();
         OrganizationHKExample.Criteria criteria = example.createCriteria();
         criteria.andCodeEqualTo(orgDto.getCode());

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

@@ -11,9 +11,13 @@ import pwc.taxtech.atms.organization.entity.OrganizationHK;
 public interface OrganizationHKTMapper {
     OrganizationHKTMapper ORGANIZATION_HK_MAPPER = Mappers.getMapper(OrganizationHKTMapper.class);
 
-    @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 = "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")
     OrganizationHKDto toOrganizationHKDto(OrganizationHK organizationHK);
 
     OrgInfoDto toOrgInfoDto(OrganizationHK organizationHK);

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html

@@ -332,8 +332,7 @@
                                 </div>
                                 <div class="right-option">
                                     <button type="button" class="btn btn-in-grid" style="width: 117px;"
-                                            ng-click="addDirector()"><i
-                                            class="material-icons middle">create</i>{{'Create' | translate}}
+                                            ng-click="addDirector()"><i class="material-icons middle">create</i>{{'Create' | translate}}
                                     </button>
                                 </div>
                                 <div class="current-holding-info">
@@ -353,7 +352,7 @@
                                         <span class="compliance-lable">{{'ComplianceCheckList'|translate}}</span>
                                     </div>
                                     <div class="org-compliance-info-body">
-<!--                                        <div id="ComplianceGridContainer" dx-data-grid="complianceGridOptions" style="margin-top: 10px;"></div>-->
+                                        <!--                                        <div id="ComplianceGridContainer" dx-data-grid="complianceGridOptions" style="margin-top: 10px;"></div>-->
                                         <div id="data-grid-compliance">
                                             <div style="color: red;float: left;margin: 10px 20px;">+ New Action Item</div>
                                             <div class="complianceSaveSelected" dx-button="complianceRevertButtonOptions"></div>