save data to org -- frank

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

@@ -24,41 +24,49 @@ public class OrganizationHKController {
     @RequestMapping(value = "getOrgInfoList", method = RequestMethod.GET)
     public @ResponseBody
     List<OrganizationHK> getOrgInfoList() {
-        logger.info("GET /api/v1/org/getOrgInfoList");
+        logger.info("GET /api/v1/orgHK/getOrgInfoList");
         return organizationHKService.getOrgInfo();
     }
 
     @RequestMapping(value = "enableOrgs", method = RequestMethod.GET)
     public @ResponseBody
     OperationResultDto enableOrgs(@RequestParam("orgId") Long orgId) {
-        logger.info("POST /api/v1/org/enableOrgs");
+        logger.info("POST /api/v1/orgHK/enableOrgs");
         return organizationHKService.enableOrgs(orgId);
     }
 
     @RequestMapping(value = "disableOrgs", method = RequestMethod.POST)
     public @ResponseBody
     OperationResultDto disableOrgs(@RequestBody List<Long> orgIds) {
-        logger.info("POST /api/v1/org/disableOrgs");
+        logger.info("POST /api/v1/orgHK/disableOrgs");
         return organizationHKService.disableOrgs(orgIds);
     }
 
     @RequestMapping(value = "update", method = RequestMethod.PUT)
     public @ResponseBody
     OperationResultDto<Object> updateOrg(@RequestBody OrganizationHKDto orgDto) {
-        logger.info("PUT /api/v1/org/update");
+        logger.info("PUT /api/v1/orgHK/update");
         return organizationHKService.updateOrg(orgDto);
     }
 
     @RequestMapping(value = "getjson", method = RequestMethod.GET)
     public @ResponseBody
     List<NavTreeDto> getOrgListToJson(@RequestParam("useType") Integer useType) {
+        logger.info("GET /api/v1/orgHK/getjson");
         return organizationHKService.getOrgListToJson(useType);
     }
 
     @RequestMapping(value = "displaySingle", method = RequestMethod.GET)
     public @ResponseBody
     OrganizationHKDto getSingleOrgByOrgId(@RequestParam("orgId") Long orgId) {
-        logger.info("POST /api/v1/org/displaySingle");
+        logger.info("POST /api/v1/orgHK/displaySingle");
         return organizationHKService.getSingleOrgByOrgId(orgId);
     }
+
+    @RequestMapping(value = "add", method = RequestMethod.POST)
+    public @ResponseBody
+    OperationResultDto<Object> addOrg(@RequestBody OrganizationHKDto orgDto) {
+        logger.info("POST /api/v1/orgHK/add");
+        return organizationHKService.addOrg(orgDto);
+    }
 }

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

@@ -12,6 +12,7 @@ import pwc.taxtech.atms.common.*;
 import pwc.taxtech.atms.common.message.LogMessage;
 import pwc.taxtech.atms.common.message.OrganizationMessage;
 import pwc.taxtech.atms.common.util.BeanUtil;
+import pwc.taxtech.atms.constant.OrganizationConstant;
 import pwc.taxtech.atms.dto.OperationLogDto;
 import pwc.taxtech.atms.dto.OperationResultDto;
 import pwc.taxtech.atms.dto.UpdateLogParams;
@@ -26,7 +27,11 @@ import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static pwc.taxtech.atms.common.CommonConstants.SystemError;
+import static pwc.taxtech.atms.common.CommonUtils.copyProperties;
 import static pwc.taxtech.atms.common.OperateLogType.OperationLogOrganization;
+import static pwc.taxtech.atms.common.message.LogMessage.AddOrganization;
+import static pwc.taxtech.atms.common.util.SpringContextUtil.distributedIdService;
 
 @Service
 public class OrganizationHKServiceImpl {
@@ -165,7 +170,7 @@ public class OrganizationHKServiceImpl {
                 orgDtoList.add(subOrgs);
             }
         }
-        orgDtoList.sort(Comparator.comparing(OrganizationHK::getName));
+        orgDtoList.sort(Comparator.comparing(OrganizationHKDto::getName));
         return orgDtoList;
     }
 
@@ -231,4 +236,76 @@ public class OrganizationHKServiceImpl {
         }
         return result;
     }
+
+    public OperationResultDto<Object> addOrg(OrganizationHKDto orgDto) {
+        try {
+            OperationResultDto result = checkExist(orgDto);
+            if (result != null && !BooleanUtils.isTrue(result.getResult())) {
+                return new OperationResultDto(result.getResult(), result.getResultMsg());
+            }
+            if (Objects.equals(orgDto.getParentId(), OrganizationConstant.NoParentId)) {
+                orgDto.setParentId(null);
+                orgDto.setpLevel(0);
+            } else {
+
+            }
+
+            orgDto.setId(distributedIdService.nextId());
+            Date now = new Date();
+            OrganizationHK org = copyProperties(orgDto, new OrganizationHK());
+            org.setCreateTime(now);
+            org.setUpdateTime(now);
+            organizationHKMapper.insertSelective(org);
+
+            UpdateLogParams tempCommonLogParms = new UpdateLogParams();
+            tempCommonLogParms.setOperationModule(OperationModule.Organization.value());
+            tempCommonLogParms.setComment(AddOrganization);
+            tempCommonLogParms.setOperateLogType(OperationLogOrganization.value());
+            tempCommonLogParms.setOperationContent(org.getName());
+            tempCommonLogParms.setOperationAction(OperationAction.New.value());
+            tempCommonLogParms.setOperationObject(orgDto.getName());
+            tempCommonLogParms.setUpdateState("");
+            tempCommonLogParms.setOriginalState("");
+            operationLogService.addOrDeleteDataAddLog(tempCommonLogParms);
+            return new OperationResultDto(true);
+        } catch (Exception e) {
+            logger.error("addOrg出错:" + e, e);
+            logger.error("标记回滚, ready to call setRollbackOnly");
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return new OperationResultDto(false, SystemError);
+        }
+    }
+
+    private OperationResultDto checkExist(OrganizationHKDto orgDto) {
+        Assert.notNull(orgDto, "orgDto null point error");
+        OrganizationHK queryRoot = null;
+            OrganizationHKExample example = new OrganizationHKExample();
+            OrganizationHKExample.Criteria criteria = example.createCriteria();
+            criteria.andCodeEqualTo(orgDto.getCode());
+            if (orgDto.getId() != null) {
+                criteria.andIdNotEqualTo(orgDto.getId());
+            }
+            queryRoot = organizationHKMapper.selectByExample(example).stream().findFirst().orElse(null);
+
+        if (queryRoot != null && orgDto.getId() != null && orgDto.getId()==0) {
+            return new OperationResultDto(false, OrganizationMessage.ClientCodeIsExist);
+        }
+        OperationResultDto operationResult = checkOrgNameOrOrgCode(orgDto);
+        return operationResult;
+    }
+
+    private OperationResultDto checkOrgNameOrOrgCode(OrganizationHKDto orgDto) {
+        OrganizationHKExample example = new OrganizationHKExample();
+        if (orgDto.getId() == null) {
+            example.or().andCodeEqualTo(orgDto.getCode()).andNameEqualTo(orgDto.getName());
+        } else {
+            example.or().andCodeEqualTo(orgDto.getCode()).andIdNotEqualTo(orgDto.getId())
+                    .andNameEqualTo(orgDto.getName());
+        }
+        OrganizationHK query = organizationHKMapper.selectByExample(example).stream().findFirst().orElse(null);
+        if (query != null) {
+            return new OperationResultDto(false, OrganizationMessage.OrgNameOrCodeIsExiste);
+        }
+        return new OperationResultDto(true);
+    }
 }

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

 package pwc.taxtech.atms.organization.dpo;
 
 
-import pwc.taxtech.atms.organization.entity.OrganizationHK;
-
 import java.util.List;
 
-public class OrganizationHKDto extends OrganizationHK {
+public class OrganizationHKDto {
+    private Long id;
+    private String name;
+    private String code;
+    private Boolean isActive;
+    private Long parentId;
+    private String legalForm;
+    private String registerAddress;
+    private Float authorisedCapital;
+    private Float issuedCapital;
+    private String industry;
+    private String paymentOfAnnualGovernmentFee;
+    private String annualReturnFillings;
+    private String boardMeetingRequirement;
+    private String businessLicense;
+    private String renewalOfBusinessLicense;
+    private String entityLevel;
+    private String dateOfIncorporation;
+    private String jurisdictionOfFormation;
+    private String financialYearEnd;
+    private String annualAuditRequirement;
+    private String registeredAgent;
+    private String ownershipForm;
+    private String residentSecretary;
+    private String createTime;
+    private String updateTime;
+    private String areaId;
+    private String regionId;
+    private String structureId;
+    private String industryId;
+    private String businessUnitId;
+
     private String parentName;
 
     private List<OrganizationHKDto> subOrgs;
 
+    private Integer pLevel;
+
     public Integer getLevel() {
         return level;
     }
@@ -35,4 +66,252 @@ public class OrganizationHKDto extends OrganizationHK {
     public void setSubOrgs(List<OrganizationHKDto> subOrgs) {
         this.subOrgs = subOrgs;
     }
+
+    public Integer getpLevel() {
+        return pLevel;
+    }
+
+    public void setpLevel(Integer pLevel) {
+        this.pLevel = pLevel;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Boolean getActive() {
+        return isActive;
+    }
+
+    public void setActive(Boolean active) {
+        isActive = active;
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getLegalForm() {
+        return legalForm;
+    }
+
+    public void setLegalForm(String legalForm) {
+        this.legalForm = legalForm;
+    }
+
+    public String getRegisterAddress() {
+        return registerAddress;
+    }
+
+    public void setRegisterAddress(String registerAddress) {
+        this.registerAddress = registerAddress;
+    }
+
+    public Float getAuthorisedCapital() {
+        return authorisedCapital;
+    }
+
+    public void setAuthorisedCapital(Float authorisedCapital) {
+        this.authorisedCapital = authorisedCapital;
+    }
+
+    public Float getIssuedCapital() {
+        return issuedCapital;
+    }
+
+    public void setIssuedCapital(Float issuedCapital) {
+        this.issuedCapital = issuedCapital;
+    }
+
+    public String getIndustry() {
+        return industry;
+    }
+
+    public void setIndustry(String industry) {
+        this.industry = industry;
+    }
+
+    public String getPaymentOfAnnualGovernmentFee() {
+        return paymentOfAnnualGovernmentFee;
+    }
+
+    public void setPaymentOfAnnualGovernmentFee(String paymentOfAnnualGovernmentFee) {
+        this.paymentOfAnnualGovernmentFee = paymentOfAnnualGovernmentFee;
+    }
+
+    public String getAnnualReturnFillings() {
+        return annualReturnFillings;
+    }
+
+    public void setAnnualReturnFillings(String annualReturnFillings) {
+        this.annualReturnFillings = annualReturnFillings;
+    }
+
+    public String getBoardMeetingRequirement() {
+        return boardMeetingRequirement;
+    }
+
+    public void setBoardMeetingRequirement(String boardMeetingRequirement) {
+        this.boardMeetingRequirement = boardMeetingRequirement;
+    }
+
+    public String getBusinessLicense() {
+        return businessLicense;
+    }
+
+    public void setBusinessLicense(String businessLicense) {
+        this.businessLicense = businessLicense;
+    }
+
+    public String getRenewalOfBusinessLicense() {
+        return renewalOfBusinessLicense;
+    }
+
+    public void setRenewalOfBusinessLicense(String renewalOfBusinessLicense) {
+        this.renewalOfBusinessLicense = renewalOfBusinessLicense;
+    }
+
+    public String getEntityLevel() {
+        return entityLevel;
+    }
+
+    public void setEntityLevel(String entityLevel) {
+        this.entityLevel = entityLevel;
+    }
+
+    public String getDateOfIncorporation() {
+        return dateOfIncorporation;
+    }
+
+    public void setDateOfIncorporation(String dateOfIncorporation) {
+        this.dateOfIncorporation = dateOfIncorporation;
+    }
+
+    public String getJurisdictionOfFormation() {
+        return jurisdictionOfFormation;
+    }
+
+    public void setJurisdictionOfFormation(String jurisdictionOfFormation) {
+        this.jurisdictionOfFormation = jurisdictionOfFormation;
+    }
+
+    public String getFinancialYearEnd() {
+        return financialYearEnd;
+    }
+
+    public void setFinancialYearEnd(String financialYearEnd) {
+        this.financialYearEnd = financialYearEnd;
+    }
+
+    public String getAnnualAuditRequirement() {
+        return annualAuditRequirement;
+    }
+
+    public void setAnnualAuditRequirement(String annualAuditRequirement) {
+        this.annualAuditRequirement = annualAuditRequirement;
+    }
+
+    public String getRegisteredAgent() {
+        return registeredAgent;
+    }
+
+    public void setRegisteredAgent(String registeredAgent) {
+        this.registeredAgent = registeredAgent;
+    }
+
+    public String getOwnershipForm() {
+        return ownershipForm;
+    }
+
+    public void setOwnershipForm(String ownershipForm) {
+        this.ownershipForm = ownershipForm;
+    }
+
+    public String getResidentSecretary() {
+        return residentSecretary;
+    }
+
+    public void setResidentSecretary(String residentSecretary) {
+        this.residentSecretary = residentSecretary;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getAreaId() {
+        return areaId;
+    }
+
+    public void setAreaId(String areaId) {
+        this.areaId = areaId;
+    }
+
+    public String getRegionId() {
+        return regionId;
+    }
+
+    public void setRegionId(String regionId) {
+        this.regionId = regionId;
+    }
+
+    public String getStructureId() {
+        return structureId;
+    }
+
+    public void setStructureId(String structureId) {
+        this.structureId = structureId;
+    }
+
+    public String getIndustryId() {
+        return industryId;
+    }
+
+    public void setIndustryId(String industryId) {
+        this.industryId = industryId;
+    }
+
+    public String getBusinessUnitId() {
+        return businessUnitId;
+    }
+
+    public void setBusinessUnitId(String businessUnitId) {
+        this.businessUnitId = businessUnitId;
+    }
 }

atms-dao/src/main/java/pwc/taxtech/atms/organization/entity/OrganizationAttachment.java

@@ -31,6 +31,24 @@ public class OrganizationAttachment extends BaseEntity implements Serializable {
      */
     private Long entityId;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_attachment.calendar_event_id
+     *
+     * @mbg.generated
+     */
+    private Long calendarEventId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_attachment.calendar_config_id
+     *
+     * @mbg.generated
+     */
+    private Long calendarConfigId;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -136,6 +154,54 @@ public class OrganizationAttachment extends BaseEntity implements Serializable {
         this.entityId = entityId;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_attachment.calendar_event_id
+     *
+     * @return the value of organization_attachment.calendar_event_id
+     *
+     * @mbg.generated
+     */
+    public Long getCalendarEventId() {
+        return calendarEventId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_attachment.calendar_event_id
+     *
+     * @param calendarEventId the value for organization_attachment.calendar_event_id
+     *
+     * @mbg.generated
+     */
+    public void setCalendarEventId(Long calendarEventId) {
+        this.calendarEventId = calendarEventId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_attachment.calendar_config_id
+     *
+     * @return the value of organization_attachment.calendar_config_id
+     *
+     * @mbg.generated
+     */
+    public Long getCalendarConfigId() {
+        return calendarConfigId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_attachment.calendar_config_id
+     *
+     * @param calendarConfigId the value for organization_attachment.calendar_config_id
+     *
+     * @mbg.generated
+     */
+    public void setCalendarConfigId(Long calendarConfigId) {
+        this.calendarConfigId = calendarConfigId;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column organization_attachment.document_name
@@ -270,6 +336,8 @@ public class OrganizationAttachment extends BaseEntity implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", entityId=").append(entityId);
+        sb.append(", calendarEventId=").append(calendarEventId);
+        sb.append(", calendarConfigId=").append(calendarConfigId);
         sb.append(", documentName=").append(documentName);
         sb.append(", documentPath=").append(documentPath);
         sb.append(", documentExtension=").append(documentExtension);

atms-dao/src/main/java/pwc/taxtech/atms/organization/entity/OrganizationAttachmentExample.java

@@ -315,6 +315,126 @@ public class OrganizationAttachmentExample {
             return (Criteria) this;
         }
 
+        public Criteria andCalendarEventIdIsNull() {
+            addCriterion("calendar_event_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarEventIdIsNotNull() {
+            addCriterion("calendar_event_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarEventIdEqualTo(Long value) {
+            addCriterion("calendar_event_id =", value, "calendarEventId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarEventIdNotEqualTo(Long value) {
+            addCriterion("calendar_event_id <>", value, "calendarEventId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarEventIdGreaterThan(Long value) {
+            addCriterion("calendar_event_id >", value, "calendarEventId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarEventIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("calendar_event_id >=", value, "calendarEventId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarEventIdLessThan(Long value) {
+            addCriterion("calendar_event_id <", value, "calendarEventId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarEventIdLessThanOrEqualTo(Long value) {
+            addCriterion("calendar_event_id <=", value, "calendarEventId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarEventIdIn(List<Long> values) {
+            addCriterion("calendar_event_id in", values, "calendarEventId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarEventIdNotIn(List<Long> values) {
+            addCriterion("calendar_event_id not in", values, "calendarEventId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarEventIdBetween(Long value1, Long value2) {
+            addCriterion("calendar_event_id between", value1, value2, "calendarEventId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarEventIdNotBetween(Long value1, Long value2) {
+            addCriterion("calendar_event_id not between", value1, value2, "calendarEventId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarConfigIdIsNull() {
+            addCriterion("calendar_config_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarConfigIdIsNotNull() {
+            addCriterion("calendar_config_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarConfigIdEqualTo(Long value) {
+            addCriterion("calendar_config_id =", value, "calendarConfigId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarConfigIdNotEqualTo(Long value) {
+            addCriterion("calendar_config_id <>", value, "calendarConfigId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarConfigIdGreaterThan(Long value) {
+            addCriterion("calendar_config_id >", value, "calendarConfigId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarConfigIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("calendar_config_id >=", value, "calendarConfigId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarConfigIdLessThan(Long value) {
+            addCriterion("calendar_config_id <", value, "calendarConfigId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarConfigIdLessThanOrEqualTo(Long value) {
+            addCriterion("calendar_config_id <=", value, "calendarConfigId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarConfigIdIn(List<Long> values) {
+            addCriterion("calendar_config_id in", values, "calendarConfigId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarConfigIdNotIn(List<Long> values) {
+            addCriterion("calendar_config_id not in", values, "calendarConfigId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarConfigIdBetween(Long value1, Long value2) {
+            addCriterion("calendar_config_id between", value1, value2, "calendarConfigId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCalendarConfigIdNotBetween(Long value1, Long value2) {
+            addCriterion("calendar_config_id not between", value1, value2, "calendarConfigId");
+            return (Criteria) this;
+        }
+
         public Criteria andDocumentNameIsNull() {
             addCriterion("document_name is null");
             return (Criteria) this;

atms-dao/src/main/java/pwc/taxtech/atms/organization/entity/OrganizationDirector.java

@@ -85,6 +85,15 @@ public class OrganizationDirector extends BaseEntity implements Serializable {
      */
     private String otherRoles;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_director.is_delete
+     *
+     * @mbg.generated
+     */
+    private Boolean isDelete;
+
     /**
      * Database Column Remarks:
      *   创建时间
@@ -307,6 +316,30 @@ public class OrganizationDirector extends BaseEntity implements Serializable {
         this.otherRoles = otherRoles == null ? null : otherRoles.trim();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_director.is_delete
+     *
+     * @return the value of organization_director.is_delete
+     *
+     * @mbg.generated
+     */
+    public Boolean getIsDelete() {
+        return isDelete;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_director.is_delete
+     *
+     * @param isDelete the value for organization_director.is_delete
+     *
+     * @mbg.generated
+     */
+    public void setIsDelete(Boolean isDelete) {
+        this.isDelete = isDelete;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column organization_director.create_time
@@ -375,6 +408,7 @@ public class OrganizationDirector extends BaseEntity implements Serializable {
         sb.append(", dateOfResignation=").append(dateOfResignation);
         sb.append(", isExecutive=").append(isExecutive);
         sb.append(", otherRoles=").append(otherRoles);
+        sb.append(", isDelete=").append(isDelete);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
         sb.append("]");

atms-dao/src/main/java/pwc/taxtech/atms/organization/entity/OrganizationDirectorExample.java

@@ -705,6 +705,66 @@ public class OrganizationDirectorExample {
             return (Criteria) this;
         }
 
+        public Criteria andIsDeleteIsNull() {
+            addCriterion("is_delete is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteIsNotNull() {
+            addCriterion("is_delete is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteEqualTo(Boolean value) {
+            addCriterion("is_delete =", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteNotEqualTo(Boolean value) {
+            addCriterion("is_delete <>", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteGreaterThan(Boolean value) {
+            addCriterion("is_delete >", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("is_delete >=", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteLessThan(Boolean value) {
+            addCriterion("is_delete <", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteLessThanOrEqualTo(Boolean value) {
+            addCriterion("is_delete <=", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteIn(List<Boolean> values) {
+            addCriterion("is_delete in", values, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteNotIn(List<Boolean> values) {
+            addCriterion("is_delete not in", values, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_delete between", value1, value2, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_delete not between", value1, value2, "isDelete");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;

atms-dao/src/main/java/pwc/taxtech/atms/organization/entity/OrganizationHK.java

@@ -73,7 +73,7 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    private Integer legalForm;
+    private String legalForm;
 
     /**
      *
@@ -139,7 +139,7 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    private Integer boardMeetingRequirement;
+    private String boardMeetingRequirement;
 
     /**
      *
@@ -170,7 +170,7 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    private Integer entityLevel;
+    private String entityLevel;
 
     /**
      *
@@ -192,7 +192,7 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    private Integer jurisdictionOfFormation;
+    private String jurisdictionOfFormation;
 
     /**
      *
@@ -231,7 +231,7 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    private Integer ownershipForm;
+    private String ownershipForm;
 
     /**
      *
@@ -441,7 +441,7 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public Integer getLegalForm() {
+    public String getLegalForm() {
         return legalForm;
     }
 
@@ -453,8 +453,8 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public void setLegalForm(Integer legalForm) {
-        this.legalForm = legalForm;
+    public void setLegalForm(String legalForm) {
+        this.legalForm = legalForm == null ? null : legalForm.trim();
     }
 
     /**
@@ -609,7 +609,7 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public Integer getBoardMeetingRequirement() {
+    public String getBoardMeetingRequirement() {
         return boardMeetingRequirement;
     }
 
@@ -621,8 +621,8 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public void setBoardMeetingRequirement(Integer boardMeetingRequirement) {
-        this.boardMeetingRequirement = boardMeetingRequirement;
+    public void setBoardMeetingRequirement(String boardMeetingRequirement) {
+        this.boardMeetingRequirement = boardMeetingRequirement == null ? null : boardMeetingRequirement.trim();
     }
 
     /**
@@ -681,7 +681,7 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public Integer getEntityLevel() {
+    public String getEntityLevel() {
         return entityLevel;
     }
 
@@ -693,8 +693,8 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public void setEntityLevel(Integer entityLevel) {
-        this.entityLevel = entityLevel;
+    public void setEntityLevel(String entityLevel) {
+        this.entityLevel = entityLevel == null ? null : entityLevel.trim();
     }
 
     /**
@@ -729,7 +729,7 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public Integer getJurisdictionOfFormation() {
+    public String getJurisdictionOfFormation() {
         return jurisdictionOfFormation;
     }
 
@@ -741,8 +741,8 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public void setJurisdictionOfFormation(Integer jurisdictionOfFormation) {
-        this.jurisdictionOfFormation = jurisdictionOfFormation;
+    public void setJurisdictionOfFormation(String jurisdictionOfFormation) {
+        this.jurisdictionOfFormation = jurisdictionOfFormation == null ? null : jurisdictionOfFormation.trim();
     }
 
     /**
@@ -825,7 +825,7 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public Integer getOwnershipForm() {
+    public String getOwnershipForm() {
         return ownershipForm;
     }
 
@@ -837,8 +837,8 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public void setOwnershipForm(Integer ownershipForm) {
-        this.ownershipForm = ownershipForm;
+    public void setOwnershipForm(String ownershipForm) {
+        this.ownershipForm = ownershipForm == null ? null : ownershipForm.trim();
     }
 
     /**

atms-dao/src/main/java/pwc/taxtech/atms/organization/entity/OrganizationHKExample.java

@@ -525,52 +525,62 @@ public class OrganizationHKExample {
             return (Criteria) this;
         }
 
-        public Criteria andLegalFormEqualTo(Integer value) {
+        public Criteria andLegalFormEqualTo(String value) {
             addCriterion("legal_form =", value, "legalForm");
             return (Criteria) this;
         }
 
-        public Criteria andLegalFormNotEqualTo(Integer value) {
+        public Criteria andLegalFormNotEqualTo(String value) {
             addCriterion("legal_form <>", value, "legalForm");
             return (Criteria) this;
         }
 
-        public Criteria andLegalFormGreaterThan(Integer value) {
+        public Criteria andLegalFormGreaterThan(String value) {
             addCriterion("legal_form >", value, "legalForm");
             return (Criteria) this;
         }
 
-        public Criteria andLegalFormGreaterThanOrEqualTo(Integer value) {
+        public Criteria andLegalFormGreaterThanOrEqualTo(String value) {
             addCriterion("legal_form >=", value, "legalForm");
             return (Criteria) this;
         }
 
-        public Criteria andLegalFormLessThan(Integer value) {
+        public Criteria andLegalFormLessThan(String value) {
             addCriterion("legal_form <", value, "legalForm");
             return (Criteria) this;
         }
 
-        public Criteria andLegalFormLessThanOrEqualTo(Integer value) {
+        public Criteria andLegalFormLessThanOrEqualTo(String value) {
             addCriterion("legal_form <=", value, "legalForm");
             return (Criteria) this;
         }
 
-        public Criteria andLegalFormIn(List<Integer> values) {
+        public Criteria andLegalFormLike(String value) {
+            addCriterion("legal_form like", value, "legalForm");
+            return (Criteria) this;
+        }
+
+        public Criteria andLegalFormNotLike(String value) {
+            addCriterion("legal_form not like", value, "legalForm");
+            return (Criteria) this;
+        }
+
+        public Criteria andLegalFormIn(List<String> values) {
             addCriterion("legal_form in", values, "legalForm");
             return (Criteria) this;
         }
 
-        public Criteria andLegalFormNotIn(List<Integer> values) {
+        public Criteria andLegalFormNotIn(List<String> values) {
             addCriterion("legal_form not in", values, "legalForm");
             return (Criteria) this;
         }
 
-        public Criteria andLegalFormBetween(Integer value1, Integer value2) {
+        public Criteria andLegalFormBetween(String value1, String value2) {
             addCriterion("legal_form between", value1, value2, "legalForm");
             return (Criteria) this;
         }
 
-        public Criteria andLegalFormNotBetween(Integer value1, Integer value2) {
+        public Criteria andLegalFormNotBetween(String value1, String value2) {
             addCriterion("legal_form not between", value1, value2, "legalForm");
             return (Criteria) this;
         }
@@ -965,52 +975,62 @@ public class OrganizationHKExample {
             return (Criteria) this;
         }
 
-        public Criteria andBoardMeetingRequirementEqualTo(Integer value) {
+        public Criteria andBoardMeetingRequirementEqualTo(String value) {
             addCriterion("board_meeting_requirement =", value, "boardMeetingRequirement");
             return (Criteria) this;
         }
 
-        public Criteria andBoardMeetingRequirementNotEqualTo(Integer value) {
+        public Criteria andBoardMeetingRequirementNotEqualTo(String value) {
             addCriterion("board_meeting_requirement <>", value, "boardMeetingRequirement");
             return (Criteria) this;
         }
 
-        public Criteria andBoardMeetingRequirementGreaterThan(Integer value) {
+        public Criteria andBoardMeetingRequirementGreaterThan(String value) {
             addCriterion("board_meeting_requirement >", value, "boardMeetingRequirement");
             return (Criteria) this;
         }
 
-        public Criteria andBoardMeetingRequirementGreaterThanOrEqualTo(Integer value) {
+        public Criteria andBoardMeetingRequirementGreaterThanOrEqualTo(String value) {
             addCriterion("board_meeting_requirement >=", value, "boardMeetingRequirement");
             return (Criteria) this;
         }
 
-        public Criteria andBoardMeetingRequirementLessThan(Integer value) {
+        public Criteria andBoardMeetingRequirementLessThan(String value) {
             addCriterion("board_meeting_requirement <", value, "boardMeetingRequirement");
             return (Criteria) this;
         }
 
-        public Criteria andBoardMeetingRequirementLessThanOrEqualTo(Integer value) {
+        public Criteria andBoardMeetingRequirementLessThanOrEqualTo(String value) {
             addCriterion("board_meeting_requirement <=", value, "boardMeetingRequirement");
             return (Criteria) this;
         }
 
-        public Criteria andBoardMeetingRequirementIn(List<Integer> values) {
+        public Criteria andBoardMeetingRequirementLike(String value) {
+            addCriterion("board_meeting_requirement like", value, "boardMeetingRequirement");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoardMeetingRequirementNotLike(String value) {
+            addCriterion("board_meeting_requirement not like", value, "boardMeetingRequirement");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoardMeetingRequirementIn(List<String> values) {
             addCriterion("board_meeting_requirement in", values, "boardMeetingRequirement");
             return (Criteria) this;
         }
 
-        public Criteria andBoardMeetingRequirementNotIn(List<Integer> values) {
+        public Criteria andBoardMeetingRequirementNotIn(List<String> values) {
             addCriterion("board_meeting_requirement not in", values, "boardMeetingRequirement");
             return (Criteria) this;
         }
 
-        public Criteria andBoardMeetingRequirementBetween(Integer value1, Integer value2) {
+        public Criteria andBoardMeetingRequirementBetween(String value1, String value2) {
             addCriterion("board_meeting_requirement between", value1, value2, "boardMeetingRequirement");
             return (Criteria) this;
         }
 
-        public Criteria andBoardMeetingRequirementNotBetween(Integer value1, Integer value2) {
+        public Criteria andBoardMeetingRequirementNotBetween(String value1, String value2) {
             addCriterion("board_meeting_requirement not between", value1, value2, "boardMeetingRequirement");
             return (Criteria) this;
         }
@@ -1155,52 +1175,62 @@ public class OrganizationHKExample {
             return (Criteria) this;
         }
 
-        public Criteria andEntityLevelEqualTo(Integer value) {
+        public Criteria andEntityLevelEqualTo(String value) {
             addCriterion("entity_level =", value, "entityLevel");
             return (Criteria) this;
         }
 
-        public Criteria andEntityLevelNotEqualTo(Integer value) {
+        public Criteria andEntityLevelNotEqualTo(String value) {
             addCriterion("entity_level <>", value, "entityLevel");
             return (Criteria) this;
         }
 
-        public Criteria andEntityLevelGreaterThan(Integer value) {
+        public Criteria andEntityLevelGreaterThan(String value) {
             addCriterion("entity_level >", value, "entityLevel");
             return (Criteria) this;
         }
 
-        public Criteria andEntityLevelGreaterThanOrEqualTo(Integer value) {
+        public Criteria andEntityLevelGreaterThanOrEqualTo(String value) {
             addCriterion("entity_level >=", value, "entityLevel");
             return (Criteria) this;
         }
 
-        public Criteria andEntityLevelLessThan(Integer value) {
+        public Criteria andEntityLevelLessThan(String value) {
             addCriterion("entity_level <", value, "entityLevel");
             return (Criteria) this;
         }
 
-        public Criteria andEntityLevelLessThanOrEqualTo(Integer value) {
+        public Criteria andEntityLevelLessThanOrEqualTo(String value) {
             addCriterion("entity_level <=", value, "entityLevel");
             return (Criteria) this;
         }
 
-        public Criteria andEntityLevelIn(List<Integer> values) {
+        public Criteria andEntityLevelLike(String value) {
+            addCriterion("entity_level like", value, "entityLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andEntityLevelNotLike(String value) {
+            addCriterion("entity_level not like", value, "entityLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andEntityLevelIn(List<String> values) {
             addCriterion("entity_level in", values, "entityLevel");
             return (Criteria) this;
         }
 
-        public Criteria andEntityLevelNotIn(List<Integer> values) {
+        public Criteria andEntityLevelNotIn(List<String> values) {
             addCriterion("entity_level not in", values, "entityLevel");
             return (Criteria) this;
         }
 
-        public Criteria andEntityLevelBetween(Integer value1, Integer value2) {
+        public Criteria andEntityLevelBetween(String value1, String value2) {
             addCriterion("entity_level between", value1, value2, "entityLevel");
             return (Criteria) this;
         }
 
-        public Criteria andEntityLevelNotBetween(Integer value1, Integer value2) {
+        public Criteria andEntityLevelNotBetween(String value1, String value2) {
             addCriterion("entity_level not between", value1, value2, "entityLevel");
             return (Criteria) this;
         }
@@ -1275,52 +1305,62 @@ public class OrganizationHKExample {
             return (Criteria) this;
         }
 
-        public Criteria andJurisdictionOfFormationEqualTo(Integer value) {
+        public Criteria andJurisdictionOfFormationEqualTo(String value) {
             addCriterion("jurisdiction_of_formation =", value, "jurisdictionOfFormation");
             return (Criteria) this;
         }
 
-        public Criteria andJurisdictionOfFormationNotEqualTo(Integer value) {
+        public Criteria andJurisdictionOfFormationNotEqualTo(String value) {
             addCriterion("jurisdiction_of_formation <>", value, "jurisdictionOfFormation");
             return (Criteria) this;
         }
 
-        public Criteria andJurisdictionOfFormationGreaterThan(Integer value) {
+        public Criteria andJurisdictionOfFormationGreaterThan(String value) {
             addCriterion("jurisdiction_of_formation >", value, "jurisdictionOfFormation");
             return (Criteria) this;
         }
 
-        public Criteria andJurisdictionOfFormationGreaterThanOrEqualTo(Integer value) {
+        public Criteria andJurisdictionOfFormationGreaterThanOrEqualTo(String value) {
             addCriterion("jurisdiction_of_formation >=", value, "jurisdictionOfFormation");
             return (Criteria) this;
         }
 
-        public Criteria andJurisdictionOfFormationLessThan(Integer value) {
+        public Criteria andJurisdictionOfFormationLessThan(String value) {
             addCriterion("jurisdiction_of_formation <", value, "jurisdictionOfFormation");
             return (Criteria) this;
         }
 
-        public Criteria andJurisdictionOfFormationLessThanOrEqualTo(Integer value) {
+        public Criteria andJurisdictionOfFormationLessThanOrEqualTo(String value) {
             addCriterion("jurisdiction_of_formation <=", value, "jurisdictionOfFormation");
             return (Criteria) this;
         }
 
-        public Criteria andJurisdictionOfFormationIn(List<Integer> values) {
+        public Criteria andJurisdictionOfFormationLike(String value) {
+            addCriterion("jurisdiction_of_formation like", value, "jurisdictionOfFormation");
+            return (Criteria) this;
+        }
+
+        public Criteria andJurisdictionOfFormationNotLike(String value) {
+            addCriterion("jurisdiction_of_formation not like", value, "jurisdictionOfFormation");
+            return (Criteria) this;
+        }
+
+        public Criteria andJurisdictionOfFormationIn(List<String> values) {
             addCriterion("jurisdiction_of_formation in", values, "jurisdictionOfFormation");
             return (Criteria) this;
         }
 
-        public Criteria andJurisdictionOfFormationNotIn(List<Integer> values) {
+        public Criteria andJurisdictionOfFormationNotIn(List<String> values) {
             addCriterion("jurisdiction_of_formation not in", values, "jurisdictionOfFormation");
             return (Criteria) this;
         }
 
-        public Criteria andJurisdictionOfFormationBetween(Integer value1, Integer value2) {
+        public Criteria andJurisdictionOfFormationBetween(String value1, String value2) {
             addCriterion("jurisdiction_of_formation between", value1, value2, "jurisdictionOfFormation");
             return (Criteria) this;
         }
 
-        public Criteria andJurisdictionOfFormationNotBetween(Integer value1, Integer value2) {
+        public Criteria andJurisdictionOfFormationNotBetween(String value1, String value2) {
             addCriterion("jurisdiction_of_formation not between", value1, value2, "jurisdictionOfFormation");
             return (Criteria) this;
         }
@@ -1535,52 +1575,62 @@ public class OrganizationHKExample {
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormEqualTo(Integer value) {
+        public Criteria andOwnershipFormEqualTo(String value) {
             addCriterion("ownership_form =", value, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormNotEqualTo(Integer value) {
+        public Criteria andOwnershipFormNotEqualTo(String value) {
             addCriterion("ownership_form <>", value, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormGreaterThan(Integer value) {
+        public Criteria andOwnershipFormGreaterThan(String value) {
             addCriterion("ownership_form >", value, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormGreaterThanOrEqualTo(Integer value) {
+        public Criteria andOwnershipFormGreaterThanOrEqualTo(String value) {
             addCriterion("ownership_form >=", value, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormLessThan(Integer value) {
+        public Criteria andOwnershipFormLessThan(String value) {
             addCriterion("ownership_form <", value, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormLessThanOrEqualTo(Integer value) {
+        public Criteria andOwnershipFormLessThanOrEqualTo(String value) {
             addCriterion("ownership_form <=", value, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormIn(List<Integer> values) {
+        public Criteria andOwnershipFormLike(String value) {
+            addCriterion("ownership_form like", value, "ownershipForm");
+            return (Criteria) this;
+        }
+
+        public Criteria andOwnershipFormNotLike(String value) {
+            addCriterion("ownership_form not like", value, "ownershipForm");
+            return (Criteria) this;
+        }
+
+        public Criteria andOwnershipFormIn(List<String> values) {
             addCriterion("ownership_form in", values, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormNotIn(List<Integer> values) {
+        public Criteria andOwnershipFormNotIn(List<String> values) {
             addCriterion("ownership_form not in", values, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormBetween(Integer value1, Integer value2) {
+        public Criteria andOwnershipFormBetween(String value1, String value2) {
             addCriterion("ownership_form between", value1, value2, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormNotBetween(Integer value1, Integer value2) {
+        public Criteria andOwnershipFormNotBetween(String value1, String value2) {
             addCriterion("ownership_form not between", value1, value2, "ownershipForm");
             return (Criteria) this;
         }

atms-dao/src/main/java/pwc/taxtech/atms/organization/entity/OrganizationShareholder.java

@@ -52,38 +52,38 @@ public class OrganizationShareholder extends BaseEntity implements Serializable
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column organization_shareholder.is_common
+     * This field corresponds to the database column organization_shareholder.common_preferred
      *
      * @mbg.generated
      */
-    private Boolean isCommon;
+    private Boolean commonPreferred;
 
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column organization_shareholder.is_preferred
+     * This field corresponds to the database column organization_shareholder.class_of_shares
      *
      * @mbg.generated
      */
-    private Boolean isPreferred;
+    private String classOfShares;
 
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column organization_shareholder.class_of_shares
+     * This field corresponds to the database column organization_shareholder.voting_percentage
      *
      * @mbg.generated
      */
-    private String classOfShares;
+    private String votingPercentage;
 
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column organization_shareholder.voting_percentage
+     * This field corresponds to the database column organization_shareholder.is_delete
      *
      * @mbg.generated
      */
-    private String votingPercentage;
+    private Boolean isDelete;
 
     /**
      * Database Column Remarks:
@@ -213,50 +213,26 @@ public class OrganizationShareholder extends BaseEntity implements Serializable
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column organization_shareholder.is_common
-     *
-     * @return the value of organization_shareholder.is_common
-     *
-     * @mbg.generated
-     */
-    public Boolean getIsCommon() {
-        return isCommon;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column organization_shareholder.is_common
-     *
-     * @param isCommon the value for organization_shareholder.is_common
-     *
-     * @mbg.generated
-     */
-    public void setIsCommon(Boolean isCommon) {
-        this.isCommon = isCommon;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column organization_shareholder.is_preferred
+     * This method returns the value of the database column organization_shareholder.common_preferred
      *
-     * @return the value of organization_shareholder.is_preferred
+     * @return the value of organization_shareholder.common_preferred
      *
      * @mbg.generated
      */
-    public Boolean getIsPreferred() {
-        return isPreferred;
+    public Boolean getCommonPreferred() {
+        return commonPreferred;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column organization_shareholder.is_preferred
+     * This method sets the value of the database column organization_shareholder.common_preferred
      *
-     * @param isPreferred the value for organization_shareholder.is_preferred
+     * @param commonPreferred the value for organization_shareholder.common_preferred
      *
      * @mbg.generated
      */
-    public void setIsPreferred(Boolean isPreferred) {
-        this.isPreferred = isPreferred;
+    public void setCommonPreferred(Boolean commonPreferred) {
+        this.commonPreferred = commonPreferred;
     }
 
     /**
@@ -307,6 +283,30 @@ public class OrganizationShareholder extends BaseEntity implements Serializable
         this.votingPercentage = votingPercentage == null ? null : votingPercentage.trim();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_shareholder.is_delete
+     *
+     * @return the value of organization_shareholder.is_delete
+     *
+     * @mbg.generated
+     */
+    public Boolean getIsDelete() {
+        return isDelete;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_shareholder.is_delete
+     *
+     * @param isDelete the value for organization_shareholder.is_delete
+     *
+     * @mbg.generated
+     */
+    public void setIsDelete(Boolean isDelete) {
+        this.isDelete = isDelete;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column organization_shareholder.create_time
@@ -371,10 +371,10 @@ public class OrganizationShareholder extends BaseEntity implements Serializable
         sb.append(", entityId=").append(entityId);
         sb.append(", investmentEntityId=").append(investmentEntityId);
         sb.append(", ownershipForm=").append(ownershipForm);
-        sb.append(", isCommon=").append(isCommon);
-        sb.append(", isPreferred=").append(isPreferred);
+        sb.append(", commonPreferred=").append(commonPreferred);
         sb.append(", classOfShares=").append(classOfShares);
         sb.append(", votingPercentage=").append(votingPercentage);
+        sb.append(", isDelete=").append(isDelete);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
         sb.append("]");

atms-dao/src/main/java/pwc/taxtech/atms/organization/entity/OrganizationShareholderExample.java

@@ -435,123 +435,63 @@ public class OrganizationShareholderExample {
             return (Criteria) this;
         }
 
-        public Criteria andIsCommonIsNull() {
-            addCriterion("is_common is null");
+        public Criteria andCommonPreferredIsNull() {
+            addCriterion("common_preferred is null");
             return (Criteria) this;
         }
 
-        public Criteria andIsCommonIsNotNull() {
-            addCriterion("is_common is not null");
+        public Criteria andCommonPreferredIsNotNull() {
+            addCriterion("common_preferred is not null");
             return (Criteria) this;
         }
 
-        public Criteria andIsCommonEqualTo(Boolean value) {
-            addCriterion("is_common =", value, "isCommon");
+        public Criteria andCommonPreferredEqualTo(Boolean value) {
+            addCriterion("common_preferred =", value, "commonPreferred");
             return (Criteria) this;
         }
 
-        public Criteria andIsCommonNotEqualTo(Boolean value) {
-            addCriterion("is_common <>", value, "isCommon");
+        public Criteria andCommonPreferredNotEqualTo(Boolean value) {
+            addCriterion("common_preferred <>", value, "commonPreferred");
             return (Criteria) this;
         }
 
-        public Criteria andIsCommonGreaterThan(Boolean value) {
-            addCriterion("is_common >", value, "isCommon");
+        public Criteria andCommonPreferredGreaterThan(Boolean value) {
+            addCriterion("common_preferred >", value, "commonPreferred");
             return (Criteria) this;
         }
 
-        public Criteria andIsCommonGreaterThanOrEqualTo(Boolean value) {
-            addCriterion("is_common >=", value, "isCommon");
+        public Criteria andCommonPreferredGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("common_preferred >=", value, "commonPreferred");
             return (Criteria) this;
         }
 
-        public Criteria andIsCommonLessThan(Boolean value) {
-            addCriterion("is_common <", value, "isCommon");
+        public Criteria andCommonPreferredLessThan(Boolean value) {
+            addCriterion("common_preferred <", value, "commonPreferred");
             return (Criteria) this;
         }
 
-        public Criteria andIsCommonLessThanOrEqualTo(Boolean value) {
-            addCriterion("is_common <=", value, "isCommon");
+        public Criteria andCommonPreferredLessThanOrEqualTo(Boolean value) {
+            addCriterion("common_preferred <=", value, "commonPreferred");
             return (Criteria) this;
         }
 
-        public Criteria andIsCommonIn(List<Boolean> values) {
-            addCriterion("is_common in", values, "isCommon");
+        public Criteria andCommonPreferredIn(List<Boolean> values) {
+            addCriterion("common_preferred in", values, "commonPreferred");
             return (Criteria) this;
         }
 
-        public Criteria andIsCommonNotIn(List<Boolean> values) {
-            addCriterion("is_common not in", values, "isCommon");
+        public Criteria andCommonPreferredNotIn(List<Boolean> values) {
+            addCriterion("common_preferred not in", values, "commonPreferred");
             return (Criteria) this;
         }
 
-        public Criteria andIsCommonBetween(Boolean value1, Boolean value2) {
-            addCriterion("is_common between", value1, value2, "isCommon");
+        public Criteria andCommonPreferredBetween(Boolean value1, Boolean value2) {
+            addCriterion("common_preferred between", value1, value2, "commonPreferred");
             return (Criteria) this;
         }
 
-        public Criteria andIsCommonNotBetween(Boolean value1, Boolean value2) {
-            addCriterion("is_common not between", value1, value2, "isCommon");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsPreferredIsNull() {
-            addCriterion("is_preferred is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsPreferredIsNotNull() {
-            addCriterion("is_preferred is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsPreferredEqualTo(Boolean value) {
-            addCriterion("is_preferred =", value, "isPreferred");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsPreferredNotEqualTo(Boolean value) {
-            addCriterion("is_preferred <>", value, "isPreferred");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsPreferredGreaterThan(Boolean value) {
-            addCriterion("is_preferred >", value, "isPreferred");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsPreferredGreaterThanOrEqualTo(Boolean value) {
-            addCriterion("is_preferred >=", value, "isPreferred");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsPreferredLessThan(Boolean value) {
-            addCriterion("is_preferred <", value, "isPreferred");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsPreferredLessThanOrEqualTo(Boolean value) {
-            addCriterion("is_preferred <=", value, "isPreferred");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsPreferredIn(List<Boolean> values) {
-            addCriterion("is_preferred in", values, "isPreferred");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsPreferredNotIn(List<Boolean> values) {
-            addCriterion("is_preferred not in", values, "isPreferred");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsPreferredBetween(Boolean value1, Boolean value2) {
-            addCriterion("is_preferred between", value1, value2, "isPreferred");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsPreferredNotBetween(Boolean value1, Boolean value2) {
-            addCriterion("is_preferred not between", value1, value2, "isPreferred");
+        public Criteria andCommonPreferredNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("common_preferred not between", value1, value2, "commonPreferred");
             return (Criteria) this;
         }
 
@@ -695,6 +635,66 @@ public class OrganizationShareholderExample {
             return (Criteria) this;
         }
 
+        public Criteria andIsDeleteIsNull() {
+            addCriterion("is_delete is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteIsNotNull() {
+            addCriterion("is_delete is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteEqualTo(Boolean value) {
+            addCriterion("is_delete =", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteNotEqualTo(Boolean value) {
+            addCriterion("is_delete <>", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteGreaterThan(Boolean value) {
+            addCriterion("is_delete >", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("is_delete >=", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteLessThan(Boolean value) {
+            addCriterion("is_delete <", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteLessThanOrEqualTo(Boolean value) {
+            addCriterion("is_delete <=", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteIn(List<Boolean> values) {
+            addCriterion("is_delete in", values, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteNotIn(List<Boolean> values) {
+            addCriterion("is_delete not in", values, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_delete between", value1, value2, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_delete not between", value1, value2, "isDelete");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;

atms-dao/src/main/resources/pwc/taxtech/atms/organization/dao/OrganizationAttachmentMapper.xml

@@ -8,6 +8,8 @@
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="entity_id" jdbcType="BIGINT" property="entityId" />
+    <result column="calendar_event_id" jdbcType="BIGINT" property="calendarEventId" />
+    <result column="calendar_config_id" jdbcType="BIGINT" property="calendarConfigId" />
     <result column="document_name" jdbcType="VARCHAR" property="documentName" />
     <result column="document_path" jdbcType="VARCHAR" property="documentPath" />
     <result column="document_extension" jdbcType="VARCHAR" property="documentExtension" />
@@ -85,7 +87,8 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, entity_id, document_name, document_path, document_extension, create_time, update_time
+    id, entity_id, calendar_event_id, calendar_config_id, document_name, document_path, 
+    document_extension, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.organization.entity.OrganizationAttachmentExample" resultMap="BaseResultMap">
     <!--
@@ -138,12 +141,14 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into organization_attachment (id, entity_id, document_name, 
-      document_path, document_extension, create_time, 
-      update_time)
-    values (#{id,jdbcType=BIGINT}, #{entityId,jdbcType=BIGINT}, #{documentName,jdbcType=VARCHAR}, 
-      #{documentPath,jdbcType=VARCHAR}, #{documentExtension,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP})
+    insert into organization_attachment (id, entity_id, calendar_event_id, 
+      calendar_config_id, document_name, document_path, 
+      document_extension, create_time, update_time
+      )
+    values (#{id,jdbcType=BIGINT}, #{entityId,jdbcType=BIGINT}, #{calendarEventId,jdbcType=BIGINT}, 
+      #{calendarConfigId,jdbcType=BIGINT}, #{documentName,jdbcType=VARCHAR}, #{documentPath,jdbcType=VARCHAR}, 
+      #{documentExtension,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.organization.entity.OrganizationAttachment">
     <!--
@@ -158,6 +163,12 @@
       <if test="entityId != null">
         entity_id,
       </if>
+      <if test="calendarEventId != null">
+        calendar_event_id,
+      </if>
+      <if test="calendarConfigId != null">
+        calendar_config_id,
+      </if>
       <if test="documentName != null">
         document_name,
       </if>
@@ -181,6 +192,12 @@
       <if test="entityId != null">
         #{entityId,jdbcType=BIGINT},
       </if>
+      <if test="calendarEventId != null">
+        #{calendarEventId,jdbcType=BIGINT},
+      </if>
+      <if test="calendarConfigId != null">
+        #{calendarConfigId,jdbcType=BIGINT},
+      </if>
       <if test="documentName != null">
         #{documentName,jdbcType=VARCHAR},
       </if>
@@ -221,6 +238,12 @@
       <if test="record.entityId != null">
         entity_id = #{record.entityId,jdbcType=BIGINT},
       </if>
+      <if test="record.calendarEventId != null">
+        calendar_event_id = #{record.calendarEventId,jdbcType=BIGINT},
+      </if>
+      <if test="record.calendarConfigId != null">
+        calendar_config_id = #{record.calendarConfigId,jdbcType=BIGINT},
+      </if>
       <if test="record.documentName != null">
         document_name = #{record.documentName,jdbcType=VARCHAR},
       </if>
@@ -249,6 +272,8 @@
     update organization_attachment
     set id = #{record.id,jdbcType=BIGINT},
       entity_id = #{record.entityId,jdbcType=BIGINT},
+      calendar_event_id = #{record.calendarEventId,jdbcType=BIGINT},
+      calendar_config_id = #{record.calendarConfigId,jdbcType=BIGINT},
       document_name = #{record.documentName,jdbcType=VARCHAR},
       document_path = #{record.documentPath,jdbcType=VARCHAR},
       document_extension = #{record.documentExtension,jdbcType=VARCHAR},
@@ -268,6 +293,12 @@
       <if test="entityId != null">
         entity_id = #{entityId,jdbcType=BIGINT},
       </if>
+      <if test="calendarEventId != null">
+        calendar_event_id = #{calendarEventId,jdbcType=BIGINT},
+      </if>
+      <if test="calendarConfigId != null">
+        calendar_config_id = #{calendarConfigId,jdbcType=BIGINT},
+      </if>
       <if test="documentName != null">
         document_name = #{documentName,jdbcType=VARCHAR},
       </if>
@@ -293,6 +324,8 @@
     -->
     update organization_attachment
     set entity_id = #{entityId,jdbcType=BIGINT},
+      calendar_event_id = #{calendarEventId,jdbcType=BIGINT},
+      calendar_config_id = #{calendarConfigId,jdbcType=BIGINT},
       document_name = #{documentName,jdbcType=VARCHAR},
       document_path = #{documentPath,jdbcType=VARCHAR},
       document_extension = #{documentExtension,jdbcType=VARCHAR},

atms-dao/src/main/resources/pwc/taxtech/atms/organization/dao/OrganizationDirectorMapper.xml

@@ -14,6 +14,7 @@
     <result column="date_of_resignation" jdbcType="TIMESTAMP" property="dateOfResignation" />
     <result column="is_executive" jdbcType="BIT" property="isExecutive" />
     <result column="other_roles" jdbcType="VARCHAR" property="otherRoles" />
+    <result column="is_delete" jdbcType="BIT" property="isDelete" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
@@ -89,7 +90,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     id, entity_id, director_name, residency, date_of_appointment, date_of_resignation, 
-    is_executive, other_roles, create_time, update_time
+    is_executive, other_roles, is_delete, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.organization.entity.OrganizationDirectorExample" resultMap="BaseResultMap">
     <!--
@@ -144,12 +145,12 @@
     -->
     insert into organization_director (id, entity_id, director_name, 
       residency, date_of_appointment, date_of_resignation, 
-      is_executive, other_roles, create_time, 
-      update_time)
+      is_executive, other_roles, is_delete, 
+      create_time, update_time)
     values (#{id,jdbcType=BIGINT}, #{entityId,jdbcType=BIGINT}, #{directorName,jdbcType=VARCHAR}, 
       #{residency,jdbcType=VARCHAR}, #{dateOfAppointment,jdbcType=TIMESTAMP}, #{dateOfResignation,jdbcType=TIMESTAMP}, 
-      #{isExecutive,jdbcType=BIT}, #{otherRoles,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP})
+      #{isExecutive,jdbcType=BIT}, #{otherRoles,jdbcType=VARCHAR}, #{isDelete,jdbcType=BIT}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.organization.entity.OrganizationDirector">
     <!--
@@ -182,6 +183,9 @@
       <if test="otherRoles != null">
         other_roles,
       </if>
+      <if test="isDelete != null">
+        is_delete,
+      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -214,6 +218,9 @@
       <if test="otherRoles != null">
         #{otherRoles,jdbcType=VARCHAR},
       </if>
+      <if test="isDelete != null">
+        #{isDelete,jdbcType=BIT},
+      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -263,6 +270,9 @@
       <if test="record.otherRoles != null">
         other_roles = #{record.otherRoles,jdbcType=VARCHAR},
       </if>
+      <if test="record.isDelete != null">
+        is_delete = #{record.isDelete,jdbcType=BIT},
+      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
@@ -288,6 +298,7 @@
       date_of_resignation = #{record.dateOfResignation,jdbcType=TIMESTAMP},
       is_executive = #{record.isExecutive,jdbcType=BIT},
       other_roles = #{record.otherRoles,jdbcType=VARCHAR},
+      is_delete = #{record.isDelete,jdbcType=BIT},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
@@ -322,6 +333,9 @@
       <if test="otherRoles != null">
         other_roles = #{otherRoles,jdbcType=VARCHAR},
       </if>
+      <if test="isDelete != null">
+        is_delete = #{isDelete,jdbcType=BIT},
+      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -344,6 +358,7 @@
       date_of_resignation = #{dateOfResignation,jdbcType=TIMESTAMP},
       is_executive = #{isExecutive,jdbcType=BIT},
       other_roles = #{otherRoles,jdbcType=VARCHAR},
+      is_delete = #{isDelete,jdbcType=BIT},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=BIGINT}

atms-dao/src/main/resources/pwc/taxtech/atms/organization/dao/OrganizationHKMapper.xml

@@ -11,23 +11,23 @@
     <result column="code" jdbcType="VARCHAR" property="code" />
     <result column="is_active" jdbcType="BIT" property="isActive" />
     <result column="parent_id" jdbcType="BIGINT" property="parentId" />
-    <result column="legal_form" jdbcType="INTEGER" property="legalForm" />
+    <result column="legal_form" jdbcType="VARCHAR" property="legalForm" />
     <result column="register_address" jdbcType="VARCHAR" property="registerAddress" />
     <result column="authorised_capital" jdbcType="REAL" property="authorisedCapital" />
     <result column="issued_capital" jdbcType="REAL" property="issuedCapital" />
     <result column="industry" jdbcType="VARCHAR" property="industry" />
     <result column="payment_of_annual_government_fee" jdbcType="TIMESTAMP" property="paymentOfAnnualGovernmentFee" />
     <result column="annual_return_fillings" jdbcType="TIMESTAMP" property="annualReturnFillings" />
-    <result column="board_meeting_requirement" jdbcType="INTEGER" property="boardMeetingRequirement" />
+    <result column="board_meeting_requirement" jdbcType="VARCHAR" property="boardMeetingRequirement" />
     <result column="business_license" jdbcType="VARCHAR" property="businessLicense" />
     <result column="renewal_of_business_license" jdbcType="TIMESTAMP" property="renewalOfBusinessLicense" />
-    <result column="entity_level" jdbcType="INTEGER" property="entityLevel" />
+    <result column="entity_level" jdbcType="VARCHAR" property="entityLevel" />
     <result column="date_of_incorporation" jdbcType="TIMESTAMP" property="dateOfIncorporation" />
-    <result column="jurisdiction_of_formation" jdbcType="INTEGER" property="jurisdictionOfFormation" />
+    <result column="jurisdiction_of_formation" jdbcType="VARCHAR" property="jurisdictionOfFormation" />
     <result column="financial_year_end" jdbcType="VARCHAR" property="financialYearEnd" />
     <result column="annual_audit_requirement" jdbcType="TIMESTAMP" property="annualAuditRequirement" />
     <result column="registered_agent" jdbcType="VARCHAR" property="registeredAgent" />
-    <result column="ownership_form" jdbcType="INTEGER" property="ownershipForm" />
+    <result column="ownership_form" jdbcType="VARCHAR" property="ownershipForm" />
     <result column="resident_secretary" jdbcType="VARCHAR" property="residentSecretary" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -179,14 +179,14 @@
       region_id, structure_id, industry_id, 
       business_unit_id)
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, 
-      #{isActive,jdbcType=BIT}, #{parentId,jdbcType=BIGINT}, #{legalForm,jdbcType=INTEGER}, 
+      #{isActive,jdbcType=BIT}, #{parentId,jdbcType=BIGINT}, #{legalForm,jdbcType=VARCHAR}, 
       #{registerAddress,jdbcType=VARCHAR}, #{authorisedCapital,jdbcType=REAL}, #{issuedCapital,jdbcType=REAL}, 
       #{industry,jdbcType=VARCHAR}, #{paymentOfAnnualGovernmentFee,jdbcType=TIMESTAMP}, 
-      #{annualReturnFillings,jdbcType=TIMESTAMP}, #{boardMeetingRequirement,jdbcType=INTEGER}, 
+      #{annualReturnFillings,jdbcType=TIMESTAMP}, #{boardMeetingRequirement,jdbcType=VARCHAR}, 
       #{businessLicense,jdbcType=VARCHAR}, #{renewalOfBusinessLicense,jdbcType=TIMESTAMP}, 
-      #{entityLevel,jdbcType=INTEGER}, #{dateOfIncorporation,jdbcType=TIMESTAMP}, #{jurisdictionOfFormation,jdbcType=INTEGER}, 
+      #{entityLevel,jdbcType=VARCHAR}, #{dateOfIncorporation,jdbcType=TIMESTAMP}, #{jurisdictionOfFormation,jdbcType=VARCHAR}, 
       #{financialYearEnd,jdbcType=VARCHAR}, #{annualAuditRequirement,jdbcType=TIMESTAMP}, 
-      #{registeredAgent,jdbcType=VARCHAR}, #{ownershipForm,jdbcType=INTEGER}, #{residentSecretary,jdbcType=VARCHAR}, 
+      #{registeredAgent,jdbcType=VARCHAR}, #{ownershipForm,jdbcType=VARCHAR}, #{residentSecretary,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{areaId,jdbcType=VARCHAR}, 
       #{regionId,jdbcType=VARCHAR}, #{structureId,jdbcType=VARCHAR}, #{industryId,jdbcType=VARCHAR}, 
       #{businessUnitId,jdbcType=VARCHAR})
@@ -306,7 +306,7 @@
         #{parentId,jdbcType=BIGINT},
       </if>
       <if test="legalForm != null">
-        #{legalForm,jdbcType=INTEGER},
+        #{legalForm,jdbcType=VARCHAR},
       </if>
       <if test="registerAddress != null">
         #{registerAddress,jdbcType=VARCHAR},
@@ -327,7 +327,7 @@
         #{annualReturnFillings,jdbcType=TIMESTAMP},
       </if>
       <if test="boardMeetingRequirement != null">
-        #{boardMeetingRequirement,jdbcType=INTEGER},
+        #{boardMeetingRequirement,jdbcType=VARCHAR},
       </if>
       <if test="businessLicense != null">
         #{businessLicense,jdbcType=VARCHAR},
@@ -336,13 +336,13 @@
         #{renewalOfBusinessLicense,jdbcType=TIMESTAMP},
       </if>
       <if test="entityLevel != null">
-        #{entityLevel,jdbcType=INTEGER},
+        #{entityLevel,jdbcType=VARCHAR},
       </if>
       <if test="dateOfIncorporation != null">
         #{dateOfIncorporation,jdbcType=TIMESTAMP},
       </if>
       <if test="jurisdictionOfFormation != null">
-        #{jurisdictionOfFormation,jdbcType=INTEGER},
+        #{jurisdictionOfFormation,jdbcType=VARCHAR},
       </if>
       <if test="financialYearEnd != null">
         #{financialYearEnd,jdbcType=VARCHAR},
@@ -354,7 +354,7 @@
         #{registeredAgent,jdbcType=VARCHAR},
       </if>
       <if test="ownershipForm != null">
-        #{ownershipForm,jdbcType=INTEGER},
+        #{ownershipForm,jdbcType=VARCHAR},
       </if>
       <if test="residentSecretary != null">
         #{residentSecretary,jdbcType=VARCHAR},
@@ -415,7 +415,7 @@
         parent_id = #{record.parentId,jdbcType=BIGINT},
       </if>
       <if test="record.legalForm != null">
-        legal_form = #{record.legalForm,jdbcType=INTEGER},
+        legal_form = #{record.legalForm,jdbcType=VARCHAR},
       </if>
       <if test="record.registerAddress != null">
         register_address = #{record.registerAddress,jdbcType=VARCHAR},
@@ -436,7 +436,7 @@
         annual_return_fillings = #{record.annualReturnFillings,jdbcType=TIMESTAMP},
       </if>
       <if test="record.boardMeetingRequirement != null">
-        board_meeting_requirement = #{record.boardMeetingRequirement,jdbcType=INTEGER},
+        board_meeting_requirement = #{record.boardMeetingRequirement,jdbcType=VARCHAR},
       </if>
       <if test="record.businessLicense != null">
         business_license = #{record.businessLicense,jdbcType=VARCHAR},
@@ -445,13 +445,13 @@
         renewal_of_business_license = #{record.renewalOfBusinessLicense,jdbcType=TIMESTAMP},
       </if>
       <if test="record.entityLevel != null">
-        entity_level = #{record.entityLevel,jdbcType=INTEGER},
+        entity_level = #{record.entityLevel,jdbcType=VARCHAR},
       </if>
       <if test="record.dateOfIncorporation != null">
         date_of_incorporation = #{record.dateOfIncorporation,jdbcType=TIMESTAMP},
       </if>
       <if test="record.jurisdictionOfFormation != null">
-        jurisdiction_of_formation = #{record.jurisdictionOfFormation,jdbcType=INTEGER},
+        jurisdiction_of_formation = #{record.jurisdictionOfFormation,jdbcType=VARCHAR},
       </if>
       <if test="record.financialYearEnd != null">
         financial_year_end = #{record.financialYearEnd,jdbcType=VARCHAR},
@@ -463,7 +463,7 @@
         registered_agent = #{record.registeredAgent,jdbcType=VARCHAR},
       </if>
       <if test="record.ownershipForm != null">
-        ownership_form = #{record.ownershipForm,jdbcType=INTEGER},
+        ownership_form = #{record.ownershipForm,jdbcType=VARCHAR},
       </if>
       <if test="record.residentSecretary != null">
         resident_secretary = #{record.residentSecretary,jdbcType=VARCHAR},
@@ -505,23 +505,23 @@
       code = #{record.code,jdbcType=VARCHAR},
       is_active = #{record.isActive,jdbcType=BIT},
       parent_id = #{record.parentId,jdbcType=BIGINT},
-      legal_form = #{record.legalForm,jdbcType=INTEGER},
+      legal_form = #{record.legalForm,jdbcType=VARCHAR},
       register_address = #{record.registerAddress,jdbcType=VARCHAR},
       authorised_capital = #{record.authorisedCapital,jdbcType=REAL},
       issued_capital = #{record.issuedCapital,jdbcType=REAL},
       industry = #{record.industry,jdbcType=VARCHAR},
       payment_of_annual_government_fee = #{record.paymentOfAnnualGovernmentFee,jdbcType=TIMESTAMP},
       annual_return_fillings = #{record.annualReturnFillings,jdbcType=TIMESTAMP},
-      board_meeting_requirement = #{record.boardMeetingRequirement,jdbcType=INTEGER},
+      board_meeting_requirement = #{record.boardMeetingRequirement,jdbcType=VARCHAR},
       business_license = #{record.businessLicense,jdbcType=VARCHAR},
       renewal_of_business_license = #{record.renewalOfBusinessLicense,jdbcType=TIMESTAMP},
-      entity_level = #{record.entityLevel,jdbcType=INTEGER},
+      entity_level = #{record.entityLevel,jdbcType=VARCHAR},
       date_of_incorporation = #{record.dateOfIncorporation,jdbcType=TIMESTAMP},
-      jurisdiction_of_formation = #{record.jurisdictionOfFormation,jdbcType=INTEGER},
+      jurisdiction_of_formation = #{record.jurisdictionOfFormation,jdbcType=VARCHAR},
       financial_year_end = #{record.financialYearEnd,jdbcType=VARCHAR},
       annual_audit_requirement = #{record.annualAuditRequirement,jdbcType=TIMESTAMP},
       registered_agent = #{record.registeredAgent,jdbcType=VARCHAR},
-      ownership_form = #{record.ownershipForm,jdbcType=INTEGER},
+      ownership_form = #{record.ownershipForm,jdbcType=VARCHAR},
       resident_secretary = #{record.residentSecretary,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
@@ -554,7 +554,7 @@
         parent_id = #{parentId,jdbcType=BIGINT},
       </if>
       <if test="legalForm != null">
-        legal_form = #{legalForm,jdbcType=INTEGER},
+        legal_form = #{legalForm,jdbcType=VARCHAR},
       </if>
       <if test="registerAddress != null">
         register_address = #{registerAddress,jdbcType=VARCHAR},
@@ -575,7 +575,7 @@
         annual_return_fillings = #{annualReturnFillings,jdbcType=TIMESTAMP},
       </if>
       <if test="boardMeetingRequirement != null">
-        board_meeting_requirement = #{boardMeetingRequirement,jdbcType=INTEGER},
+        board_meeting_requirement = #{boardMeetingRequirement,jdbcType=VARCHAR},
       </if>
       <if test="businessLicense != null">
         business_license = #{businessLicense,jdbcType=VARCHAR},
@@ -584,13 +584,13 @@
         renewal_of_business_license = #{renewalOfBusinessLicense,jdbcType=TIMESTAMP},
       </if>
       <if test="entityLevel != null">
-        entity_level = #{entityLevel,jdbcType=INTEGER},
+        entity_level = #{entityLevel,jdbcType=VARCHAR},
       </if>
       <if test="dateOfIncorporation != null">
         date_of_incorporation = #{dateOfIncorporation,jdbcType=TIMESTAMP},
       </if>
       <if test="jurisdictionOfFormation != null">
-        jurisdiction_of_formation = #{jurisdictionOfFormation,jdbcType=INTEGER},
+        jurisdiction_of_formation = #{jurisdictionOfFormation,jdbcType=VARCHAR},
       </if>
       <if test="financialYearEnd != null">
         financial_year_end = #{financialYearEnd,jdbcType=VARCHAR},
@@ -602,7 +602,7 @@
         registered_agent = #{registeredAgent,jdbcType=VARCHAR},
       </if>
       <if test="ownershipForm != null">
-        ownership_form = #{ownershipForm,jdbcType=INTEGER},
+        ownership_form = #{ownershipForm,jdbcType=VARCHAR},
       </if>
       <if test="residentSecretary != null">
         resident_secretary = #{residentSecretary,jdbcType=VARCHAR},
@@ -641,23 +641,23 @@
       code = #{code,jdbcType=VARCHAR},
       is_active = #{isActive,jdbcType=BIT},
       parent_id = #{parentId,jdbcType=BIGINT},
-      legal_form = #{legalForm,jdbcType=INTEGER},
+      legal_form = #{legalForm,jdbcType=VARCHAR},
       register_address = #{registerAddress,jdbcType=VARCHAR},
       authorised_capital = #{authorisedCapital,jdbcType=REAL},
       issued_capital = #{issuedCapital,jdbcType=REAL},
       industry = #{industry,jdbcType=VARCHAR},
       payment_of_annual_government_fee = #{paymentOfAnnualGovernmentFee,jdbcType=TIMESTAMP},
       annual_return_fillings = #{annualReturnFillings,jdbcType=TIMESTAMP},
-      board_meeting_requirement = #{boardMeetingRequirement,jdbcType=INTEGER},
+      board_meeting_requirement = #{boardMeetingRequirement,jdbcType=VARCHAR},
       business_license = #{businessLicense,jdbcType=VARCHAR},
       renewal_of_business_license = #{renewalOfBusinessLicense,jdbcType=TIMESTAMP},
-      entity_level = #{entityLevel,jdbcType=INTEGER},
+      entity_level = #{entityLevel,jdbcType=VARCHAR},
       date_of_incorporation = #{dateOfIncorporation,jdbcType=TIMESTAMP},
-      jurisdiction_of_formation = #{jurisdictionOfFormation,jdbcType=INTEGER},
+      jurisdiction_of_formation = #{jurisdictionOfFormation,jdbcType=VARCHAR},
       financial_year_end = #{financialYearEnd,jdbcType=VARCHAR},
       annual_audit_requirement = #{annualAuditRequirement,jdbcType=TIMESTAMP},
       registered_agent = #{registeredAgent,jdbcType=VARCHAR},
-      ownership_form = #{ownershipForm,jdbcType=INTEGER},
+      ownership_form = #{ownershipForm,jdbcType=VARCHAR},
       resident_secretary = #{residentSecretary,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},

atms-dao/src/main/resources/pwc/taxtech/atms/organization/dao/OrganizationShareholderMapper.xml

@@ -10,10 +10,10 @@
     <result column="entity_id" jdbcType="BIGINT" property="entityId" />
     <result column="investment_entity_id" jdbcType="BIGINT" property="investmentEntityId" />
     <result column="ownership_form" jdbcType="INTEGER" property="ownershipForm" />
-    <result column="is_common" jdbcType="BIT" property="isCommon" />
-    <result column="is_preferred" jdbcType="BIT" property="isPreferred" />
+    <result column="common_preferred" jdbcType="BIT" property="commonPreferred" />
     <result column="class_of_shares" jdbcType="VARCHAR" property="classOfShares" />
     <result column="voting_percentage" jdbcType="VARCHAR" property="votingPercentage" />
+    <result column="is_delete" jdbcType="BIT" property="isDelete" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
@@ -88,8 +88,8 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, entity_id, investment_entity_id, ownership_form, is_common, is_preferred, class_of_shares, 
-    voting_percentage, create_time, update_time
+    id, entity_id, investment_entity_id, ownership_form, common_preferred, class_of_shares, 
+    voting_percentage, is_delete, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.organization.entity.OrganizationShareholderExample" resultMap="BaseResultMap">
     <!--
@@ -143,12 +143,12 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     insert into organization_shareholder (id, entity_id, investment_entity_id, 
-      ownership_form, is_common, is_preferred, 
-      class_of_shares, voting_percentage, create_time, 
+      ownership_form, common_preferred, class_of_shares, 
+      voting_percentage, is_delete, create_time, 
       update_time)
     values (#{id,jdbcType=BIGINT}, #{entityId,jdbcType=BIGINT}, #{investmentEntityId,jdbcType=BIGINT}, 
-      #{ownershipForm,jdbcType=INTEGER}, #{isCommon,jdbcType=BIT}, #{isPreferred,jdbcType=BIT}, 
-      #{classOfShares,jdbcType=VARCHAR}, #{votingPercentage,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{ownershipForm,jdbcType=INTEGER}, #{commonPreferred,jdbcType=BIT}, #{classOfShares,jdbcType=VARCHAR}, 
+      #{votingPercentage,jdbcType=VARCHAR}, #{isDelete,jdbcType=BIT}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.organization.entity.OrganizationShareholder">
@@ -170,11 +170,8 @@
       <if test="ownershipForm != null">
         ownership_form,
       </if>
-      <if test="isCommon != null">
-        is_common,
-      </if>
-      <if test="isPreferred != null">
-        is_preferred,
+      <if test="commonPreferred != null">
+        common_preferred,
       </if>
       <if test="classOfShares != null">
         class_of_shares,
@@ -182,6 +179,9 @@
       <if test="votingPercentage != null">
         voting_percentage,
       </if>
+      <if test="isDelete != null">
+        is_delete,
+      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -202,11 +202,8 @@
       <if test="ownershipForm != null">
         #{ownershipForm,jdbcType=INTEGER},
       </if>
-      <if test="isCommon != null">
-        #{isCommon,jdbcType=BIT},
-      </if>
-      <if test="isPreferred != null">
-        #{isPreferred,jdbcType=BIT},
+      <if test="commonPreferred != null">
+        #{commonPreferred,jdbcType=BIT},
       </if>
       <if test="classOfShares != null">
         #{classOfShares,jdbcType=VARCHAR},
@@ -214,6 +211,9 @@
       <if test="votingPercentage != null">
         #{votingPercentage,jdbcType=VARCHAR},
       </if>
+      <if test="isDelete != null">
+        #{isDelete,jdbcType=BIT},
+      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -251,11 +251,8 @@
       <if test="record.ownershipForm != null">
         ownership_form = #{record.ownershipForm,jdbcType=INTEGER},
       </if>
-      <if test="record.isCommon != null">
-        is_common = #{record.isCommon,jdbcType=BIT},
-      </if>
-      <if test="record.isPreferred != null">
-        is_preferred = #{record.isPreferred,jdbcType=BIT},
+      <if test="record.commonPreferred != null">
+        common_preferred = #{record.commonPreferred,jdbcType=BIT},
       </if>
       <if test="record.classOfShares != null">
         class_of_shares = #{record.classOfShares,jdbcType=VARCHAR},
@@ -263,6 +260,9 @@
       <if test="record.votingPercentage != null">
         voting_percentage = #{record.votingPercentage,jdbcType=VARCHAR},
       </if>
+      <if test="record.isDelete != null">
+        is_delete = #{record.isDelete,jdbcType=BIT},
+      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
@@ -284,10 +284,10 @@
       entity_id = #{record.entityId,jdbcType=BIGINT},
       investment_entity_id = #{record.investmentEntityId,jdbcType=BIGINT},
       ownership_form = #{record.ownershipForm,jdbcType=INTEGER},
-      is_common = #{record.isCommon,jdbcType=BIT},
-      is_preferred = #{record.isPreferred,jdbcType=BIT},
+      common_preferred = #{record.commonPreferred,jdbcType=BIT},
       class_of_shares = #{record.classOfShares,jdbcType=VARCHAR},
       voting_percentage = #{record.votingPercentage,jdbcType=VARCHAR},
+      is_delete = #{record.isDelete,jdbcType=BIT},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
@@ -310,11 +310,8 @@
       <if test="ownershipForm != null">
         ownership_form = #{ownershipForm,jdbcType=INTEGER},
       </if>
-      <if test="isCommon != null">
-        is_common = #{isCommon,jdbcType=BIT},
-      </if>
-      <if test="isPreferred != null">
-        is_preferred = #{isPreferred,jdbcType=BIT},
+      <if test="commonPreferred != null">
+        common_preferred = #{commonPreferred,jdbcType=BIT},
       </if>
       <if test="classOfShares != null">
         class_of_shares = #{classOfShares,jdbcType=VARCHAR},
@@ -322,6 +319,9 @@
       <if test="votingPercentage != null">
         voting_percentage = #{votingPercentage,jdbcType=VARCHAR},
       </if>
+      <if test="isDelete != null">
+        is_delete = #{isDelete,jdbcType=BIT},
+      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -340,10 +340,10 @@
     set entity_id = #{entityId,jdbcType=BIGINT},
       investment_entity_id = #{investmentEntityId,jdbcType=BIGINT},
       ownership_form = #{ownershipForm,jdbcType=INTEGER},
-      is_common = #{isCommon,jdbcType=BIT},
-      is_preferred = #{isPreferred,jdbcType=BIT},
+      common_preferred = #{commonPreferred,jdbcType=BIT},
       class_of_shares = #{classOfShares,jdbcType=VARCHAR},
       voting_percentage = #{votingPercentage,jdbcType=VARCHAR},
+      is_delete = #{isDelete,jdbcType=BIT},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=BIGINT}

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js

-commonModule.controller('editOrganizationModalController', ['$scope', '$log', '$translate', 'uiGridConstants', '$location', '$timeout', '$interval', 'areaRegionService', '$filter', 'SweetAlert', 'regionService', 'orgService', 'organizationStructureService', 'businessUnitService', 'projectService', 'dimensionService',
-    function ($scope, $log, $translate, uiGridConstants, $location, $timeout, $interval, areaRegionService, $filter, SweetAlert, regionService, orgService, organizationStructureService, businessUnitService, projectService, dimensionService) {
+commonModule.controller('editOrganizationModalController', ['$scope', '$log', '$translate', 'uiGridConstants', '$location', '$timeout', '$interval', '$filter', 'SweetAlert', 'orgHKService',
+    function ($scope, $log, $translate, uiGridConstants, $location, $timeout, $interval, $filter, SweetAlert, orgHKService) {
 
         var selectedModel = '.addOrgControlPop'; //'#addOrgControlPop' + $scope.dimensionId;
 
@@ -97,103 +97,7 @@
 
         // 保存机构
         $scope.saveOrg = function () {
-            if ($scope.isInternational) {
-                saveInternationalOrg();
-            } else {
             saveLocalOrg();
-            }
-        };
-
-        var saveInternationalOrg = function () {
-            $scope.orgControlForm.$setSubmitted();
-            if (saveVerify()) return;
-            var editModel = $scope.editOrgModel;
-
-            // 是否为境外企业
-            editModel.oversea = $scope.isInternational;
-
-            if ((typeof $scope.editOrgModel.logoutTime) === "string") {
-                if ("" !== ($scope.editOrgModel.logoutTime)) {
-                    $scope.editOrgModel.logoutTime = new Date($scope.editOrgModel.logoutTime);
-                }
-            }
-
-            if ((typeof $scope.editOrgModel.foundationDate) === "string") {
-                if ("" !== ($scope.editOrgModel.foundationDate)) {
-                    $scope.editOrgModel.foundationDate = new Date($scope.editOrgModel.foundationDate);
-                }
-            }
-
-            //事业部
-            if ($scope.selectBusinessUnit) {
-                editModel.businessUnitID = $scope.selectBusinessUnit.ID;
-            }
-            //区域
-            if ($scope.componentSelectedArea) {
-                editModel.areaID = $scope.selectedAreaId;
-            }
-
-            //所属业务线校验
-            if (!editModel.businessUnitID) {
-                SweetAlert.error("请检查必填项");
-                return;
-            }
-            //区域校验
-            if (editModel.areaID === "") {
-                SweetAlert.error("请检查必填项");
-                return;
-            }
-
-            if ($scope.isAdd) {
-                editModel.isActive = true;
-                orgService.addOrg(editModel).success(function (orgId) {
-                    if (orgId && !orgId.result) {
-                        SweetAlert.warning($translate.instant(orgId.resultMsg));
-                        return;
-                    }
-
-                    $(selectedModel).modal('hide');
-
-                    SweetAlert.success($translate.instant('SaveSuccess'));
-
-                    refreshOrg();
-                    $scope.operateType = null;
-                    $scope.isUpdate = true;
-                });
-            } else {
-                if (editModel.parentID && $scope.selectedOrganization.suborgList) {
-
-                    if (editModel.parentID === editModel.id) {
-                        SweetAlert.warning('上级机构不能为机构本身');
-                        return;
-                    }
-
-                    var subOrg = _.find($scope.selectedOrganization.suborgList, function (row) {
-                        return row.id === editModel.parentID;
-                    });
-
-                    if (subOrg) {
-                        SweetAlert.warning('不能将当前机构的下级机构设置为其上级公司');
-                        return;
-                    }
-                }
-                // editModel.isActive = !editModel.isActive;
-                orgService.updateOrg(editModel).success(function (data) {
-                    if (data && !data.result) {
-                        //SweetAlert.info("Disable", orgId);
-                        SweetAlert.warning($translate.instant(data.resultMsg));
-                        return;
-                    }
-
-                    $(selectedModel).modal('hide');
-
-                    SweetAlert.success($translate.instant('SaveSuccess'));
-
-                    refreshOrg();
-                    $scope.operateType = null;
-                    $scope.isUpdate = true;
-                });
-            }
         };
 
         var saveVerify = function () {
@@ -216,12 +120,6 @@
                     return false;
                 }
             });
-            var taxPlayer = $scope.editOrgModel.taxPayerNumber;
-            if (!(taxPlayer.length === 18)) {
-                SweetAlert.error($translate.instant('UnifiedSocialCreditCode') + "长度必须为18位");
-                fail = true;
-                return fail;
-            }
             return fail;
         };
 
@@ -246,37 +144,11 @@
                 $scope.isShowBasic = false;
             }
 
-            if (checkEnterpriseSetOrg() || checkTemplateList()) {
-                $scope.isShowAdvanced = true;
-                return;
-            } else {
-                $scope.isShowAdvanced = false;
-            }
-
             var editModel = $scope.editOrgModel;
 
-            // 是否为境外企业
-            editModel.oversea = $scope.isInternational;
-
-            if ($scope.selectProjectIndustry) {
-                editModel.industryID = $scope.selectProjectIndustry.id;
-            }
-
-            var pId = editModel.parentID;
-            //上级公司
-            if (!pId || pId === constant.organization.parentIdNull) {
-                editModel.parentID = constant.organization.parentIdNull;
-            }
-
-            if ((typeof $scope.editOrgModel.foundationDate) === "string") {
-                if ("" !== ($scope.editOrgModel.foundationDate)) {
-                    $scope.editOrgModel.foundationDate = new Date($scope.editOrgModel.foundationDate);
-                }
-            }
-
             if ($scope.isAdd) {
                 editModel.isActive = true;
-                orgService.addOrg(editModel).success(function (orgId) {
+                orgHKService.addOrg(editModel).success(function (orgId) {
                     if (orgId && !orgId.result) {
                         SweetAlert.warning($translate.instant(orgId.resultMsg));
                         return;
@@ -290,23 +162,7 @@
                     $scope.isUpdate = true;
                 });
             } else {
-                if (editModel.parentID && $scope.selectedOrganization.suborgList) {
-
-                    if (editModel.parentID === editModel.id) {
-                        SweetAlert.warning('上级机构不能为机构本身');
-                        return;
-                    }
-                    var subOrg = _.find($scope.selectedOrganization.suborgList, function (row) {
-                        return row.id === editModel.parentID;
-                    });
-
-                    if (subOrg) {
-                        SweetAlert.warning('不能将当前机构的下级机构设置为其上级公司');
-                        return;
-                    }
-                }
-                // editModel.isActive = !editModel.isActive;
-                orgService.updateOrg(editModel).success(function (data) {
+                orgHKService.updateOrg(editModel).success(function (data) {
                     if (data && !data.result) {
                         //SweetAlert.info("Disable", orgId);
                         SweetAlert.warning($translate.instant(data.resultMsg));
@@ -342,7 +198,7 @@
             $("#selectedOrgName-error").hide();
             $scope.isAdd = false;
             $scope.orgHasAccountMapping = false;
-            orgService.getSingleOrg(orgId).success(function (orgData) {
+            orgHKService.getSingleOrg(orgId).success(function (orgData) {
                 $scope.selectCompany = orgData;
                 $scope.editOrgModel = orgData;
                 $scope.editOrgModel.foundationDate = ($filter('date')(new Date($scope.editOrgModel.foundationDate), "yyyy-MM-dd"));
@@ -493,39 +349,6 @@
             DateMonthFormatError: $translate.instant('DateMonthFormatError')
         };
 
-        // 行业发生改变时，只有在已经做过科目对应的机构，且行业是非房地产和房地产 切换时，才需要给出需要重新做科目对应的提示
-        $scope.ProjectIndustryChanged = function () {
-
-            //添加机构，过滤,  如果没有做过科目对应，过滤
-            if ($scope.isAdd || !$scope.orgHasAccountMapping) {
-                return;
-            }
-
-            var com = $scope.selectCompany;
-            var industry = $scope.selectProjectIndustry;
-            if (!industry || !com)
-                return;
-
-            var orgID = $scope.selectCompany.id;
-            //房地产行业ID
-            var Estateid = constant.organization.EstateIndustryId;
-            ////仅仅在房地产行业和非房地产行业之间切换时给予提示
-            if (com.industryID != industry.id) {
-                if (com.industryID == Estateid && industry.id != Estateid) {
-                    SweetAlert.warning($translate.instant("OrganizationIndustryChanged"));
-                }
-                else if (com.industryID != Estateid && industry.id == Estateid) {
-                    SweetAlert.warning($translate.instant("OrganizationIndustryChanged"));
-                }
-                ////仅仅在房地产行业和非房地产行业之间切换时给予提示
-                //if (com.industryID != Estateid && industry.id != Estateid)
-                //    return;
-
-                //SweetAlert.warning($translate.instant("OrganizationIndustryChanged"));
-            }
-        };
-
-
         $scope.$watch('operateType', function (newValue, oldValue) {
             if (newValue) {
 
@@ -540,15 +363,6 @@
             }
         });
 
-        $scope.$watch('forceUpdate', function (newValue, oldValue) {
-            if (newValue) {
-                $scope.forceUpdate = false;
-                initParams();
-                init();
-            }
-        });
-
-
         $scope.changeInternational = function () {
             $scope.isLocal = false;
             $scope.isInternational = true;
@@ -580,6 +394,14 @@
             $scope.operateType = null;
         };
 
+        $scope.addEquity = function () {
+            $scope.isShowShareholderModal = true;
+        };
+
+        $scope.addDirector = function () {
+            $scope.isShowDirectorModal = true;
+        };
+
         // 初始化参数信息
         var initParams = function () {
             $scope.editOrgModel = {};
@@ -591,6 +413,10 @@
             $scope.nationalEconomicIndustryList = constant.NationalEconomicIndustryList;
             $scope.trueFalse = constant.trueFalse;
             $scope.countryCNList = constant.countryCNList;
+            $scope.legalFormTypeList = constant.organizationHK.legalFormTypeList;
+            $scope.entityLevelTypeList = constant.organizationHK.EntityLevel;
+            $scope.jurisdictionOfFormationTypeList=constant.organizationHK.JurisdictionOfFormation;
+            $scope.ownershipFormTypeList = constant.organizationHK.OwnershipForm;
             $('.localRequired').attr("required", true);
             $('.orgAreaRequired').attr("required", true);
 

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.html

@@ -69,7 +69,7 @@
                                                  ng-class="{'has-error':orgControlForm.legalForm.$invalid && (orgControlForm.legalForm.$dirty || orgControlForm.$submitted)}">
                                                 <select class="form-control" id='legalForm'
                                                         name="legalForm" ng-model="editOrgModel.legalForm"
-                                                        ng-options="item for item in legalFormTypeList">
+                                                        ng-options="item.type as item.type for item in legalFormTypeList">
                                                     <option value="">{{resources.LegalForm}}</option>
                                                 </select>
                                                 <!--<p ng-show="orgControlForm.clientCode.$error.required && (orgControlForm.clientCode.$dirty || orgControlForm.$submitted)"-->
@@ -149,7 +149,7 @@
                                                  ng-class="{'has-error':orgControlForm.entityLevel.$invalid && (orgControlForm.entityLevel.$dirty || orgControlForm.$submitted)}">
                                                 <select class="form-control" id='entityLevel'
                                                         name="entityLevel" ng-model="editOrgModel.entityLevel"
-                                                        ng-options="item for item in entityLevelTypeList">
+                                                        ng-options="item.type as item.type for item in entityLevelTypeList">
                                                     <option value="">{{resources.entityLevel}}</option>
                                                 </select>
                                             </div>
@@ -176,7 +176,7 @@
                                             <div class="col-sm-9" ng-class="{'has-error':orgControlForm.jurisdictionOfFormation.$invalid && (orgControlForm.jurisdictionOfFormation.$dirty || orgControlForm.$submitted)}">
                                                 <select class="form-control" id='jurisdictionOfFormation'
                                                         name="jurisdictionOfFormation" ng-model="editOrgModel.jurisdictionOfFormation"
-                                                        ng-options="item for item in jurisdictionOfFormationTypeList">
+                                                        ng-options="item.type as item.type for item in jurisdictionOfFormationTypeList">
                                                     <option value="">{{resources.jurisdictionOfFormation}}</option>
                                                 </select>
                                                 <!-- <p ng-show="orgControlForm.code.$error.required && (orgControlForm.name.$dirty || orgControlForm.$submitted)"
@@ -219,7 +219,7 @@
                                                 <select class="form-control" id='ownershipForm'
                                                         name="ownershipForm"
                                                         ng-model="editOrgModel.ownershipForm"
-                                                        ng-options="item for item in ownershipFormTypeList">
+                                                        ng-options="item.type as item.type for item in ownershipFormTypeList">
                                                     <option value="">{{resources.ownershipForm}}
                                                     </option>
                                                 </select>
@@ -234,7 +234,7 @@
                             </div>
                         </form>
                     </div>
-                    <div id="advancedOptions" class="tab-pane fade" ng-if="isAdd">
+                    <div id="advancedOptions" class="tab-pane fade">
                         <!--Equity information-->
                         <div class="label-current-holding">
                             <label class="basic-label" style="font-weight: bold;font-size: large;">{{'ShareHolder' | translate}}</label>
@@ -271,6 +271,6 @@
             </div>
         </div>
     </div>
-    <edit-organization-shareholder-modal is-show="isShowShareholderModal" parent-page=".edit-organization-modal-wrapper" edit-model=""></edit-organization-shareholder-modal>
-    <edit-organization-director-modal is-show="isShowDirectorModal" parent-page=".edit-organization-modal-wrapper" edit-model=""></edit-organization-director-modal>
+    <edit-organization-shareholder-modal is-show="isShowShareholderModal" parent-page=".edit-organization-modal-wrapper" edit-model="editShareholder"></edit-organization-shareholder-modal>
+    <edit-organization-director-modal is-show="isShowDirectorModal" parent-page=".edit-organization-modal-wrapper" edit-model="editDirector"></edit-organization-director-modal>
 </div>
\ No newline at end of file

atms-web/src/main/webapp/app/common/utils/constant.js

@@ -916,7 +916,7 @@ constant.menuListApprovalPermission = {
 
 constant.InteractionPermission = {
     code: '09',
-    tagOperate : {code : '09.001.001'}
+    tagOperate: {code: '09.001.001'}
 };
 constant.citMenuList = [
     // constant.citPermission.dataImport.balanceSheet.queryCode,
@@ -1646,32 +1646,32 @@ constant.countryCNNAMEList = [{'name': '安哥拉'}, {'name': '阿富汗'}, {'na
 constant.countryENList = ['Angola', 'Afghanistan', 'Albania', 'Algeria', 'Andorra', 'Anguilla', 'Antigua and Barbuda', 'Argentina', 'Armenia', 'Ascension', 'Australia', 'Austria', 'Azerbaijan', 'Bahamas', 'Bahrain', 'Bangladesh', 'Barbados', 'Belarus', 'Belgium', 'Belize', 'Benin', 'Bermuda Is', 'Bolivia', 'Botswana', 'Brazil', 'Brunei', 'Bulgaria', 'Burkina Faso', 'Burma', 'Burundi', 'Cameroon', 'Canada', 'Cayman Is', 'Central African Republic', 'Chad', 'Chile', 'China', 'Colombia', 'Congo', 'Cook Is', 'Costa Rica', 'Cuba', 'Cyprus', 'Czech Republic', 'Denmark', 'Djibouti', 'Dominica Rep', 'Ecuador', 'Egypt', 'EI Salvador', 'Estonia', 'Ethiopia', 'Fiji', 'Finland', 'France', 'French Guiana', 'French Polynesia', 'Gabon', 'Gambia', 'Georgia', 'Germany', 'Ghana', 'Gibraltar', 'Greece', 'Grenada', 'Guam', 'Guatemala', 'Guinea', 'Guyana', 'Haiti', 'Honduras', 'Hongkong', 'Hungary', 'Iceland', 'India', 'Indonesia', 'Iran', 'Iraq', 'Ireland', 'Israel', 'Italy', 'Ivory Coast', 'Jamaica', 'Japan', 'Jordan', 'Kampuchea (Cambodia )', 'Kazakstan', 'Kenya', 'Korea', 'Kuwait', 'Kyrgyzstan', 'Laos', 'Latvia', 'Lebanon', 'Lesotho', 'Liberia', 'Libya', 'Liechtenstein', 'Lithuania', 'Luxembourg', 'Macao', 'Madagascar', 'Malawi', 'Malaysia', 'Maldives', 'Mali', 'Malta', 'Mariana Is', 'Martinique', 'Mauritius', 'Mexico', 'Moldova', 'Monaco', 'Mongolia', 'Montserrat Is', 'Morocco', 'Mozambique', 'Namibia', 'Nauru', 'Nepal', 'Netheriands Antilles', 'Netherlands', 'New Zealand', 'Nicaragua', 'Niger', 'Nigeria', 'North Korea', 'Norway', 'Oman', 'Pakistan', 'Panama', 'Papua New Cuinea', 'Paraguay', 'Peru', 'Philippines', 'Poland', 'Portugal', 'Puerto Rico', 'Qatar', 'Reunion', 'Romania', 'Russia', 'Saint Lueia', 'Saint Vincent', 'Samoa Eastern', 'Samoa Western', 'San Marino', 'Sao Tome and Principe', 'Saudi Arabia', 'Senegal', 'Seychelles', 'Sierra Leone', 'Singapore', 'Slovakia', 'Slovenia', 'Solomon Is', 'Somali', 'South Africa', 'Spain', 'SriLanka', 'St.Lucia', 'St.Vincent', 'Sudan', 'Suriname', 'Swaziland', 'Sweden', 'Switzerland', 'Syria', 'Taiwan', 'Tajikstan', 'Tanzania', 'Thailand', 'Togo', 'Tonga', 'Trinidad and Tobago', 'Tunisia', 'Turkey', 'Turkmenistan', 'Uganda', 'Ukraine', 'United Arab Emirates', 'United Kiongdom', 'United States of America', 'Uruguay', 'Uzbekistan', 'Venezuela', 'Vietnam', 'Yemen', 'Yugoslavia', 'Zimbabwe', 'Zaire', 'Zambia'];
 
 constant.communuityMenus = [
-    { id :'1', 'name' : '税界', 'code' : 'taxCommunity', 'url': '#/commounity/taxCommunity'}
-    ,{id : '2', 'name' : '税享', 'code' : 'taxEnjoyment', 'url' : '#/commounity/taxEnjoyment'}
-    ,{'id' : '3', 'name' : '国际税制', 'code' : 'internationalTaxSystem', "url" : '#/commounity/internationalTaxSystem'}
-    , {'id' : '4', 'name' : '互动', 'code' : 'interactive', 'url' : '#/commounity/interactive'}
-    , {'id': '5', 'name' : 'DD税管', 'code' : 'DIDITaxManagement', 'url' : '#/commounity/DIDITaxManagement'}
-    , {'id' : '6', 'name' : '友情链接', 'code' : 'communityLinks', 'url' : '#/commounity/communityLinks'}
-    ];
+    {id: '1', 'name': '税界', 'code': 'taxCommunity', 'url': '#/commounity/taxCommunity'}
+    , {id: '2', 'name': '税享', 'code': 'taxEnjoyment', 'url': '#/commounity/taxEnjoyment'}
+    , {'id': '3', 'name': '国际税制', 'code': 'internationalTaxSystem', "url": '#/commounity/internationalTaxSystem'}
+    , {'id': '4', 'name': '互动', 'code': 'interactive', 'url': '#/commounity/interactive'}
+    , {'id': '5', 'name': 'DD税管', 'code': 'DIDITaxManagement', 'url': '#/commounity/DIDITaxManagement'}
+    , {'id': '6', 'name': '友情链接', 'code': 'communityLinks', 'url': '#/commounity/communityLinks'}
+];
 constant.taxCommunity = "https://taxnews.pwchk.com/Home/Main?id=4F3038A6859F96E34460F0B74EA403DD&source=didi&key=ShjUESN#/latestTrends/topPickStories";//
 constant.shareTypeFlag = {
-    addShare : "New tax enjoyment",
+    addShare: "New tax enjoyment",
     editShare: "Edit tax enjoyment",
     addInternationTax: "New international international tax system",
-    editInternationTax : "Edit international international tax system",
+    editInternationTax: "Edit international international tax system",
     addPDFInternationTax: "New PDF international tax system",
-    editPDFInternationTax : "Edit PDF international tax system",
+    editPDFInternationTax: "Edit PDF international tax system",
 };
 constant.tagTypeList = {
-    "share" : 1,
-    "interactionInternationSystem" : 2
+    "share": 1,
+    "interactionInternationSystem": 2
 };
 
 
 /********key value*****************/
 constant.keyValueType = [
-    { value: 1, name: '系统公共' },
-    { value: 2, name: '自定义' }
+    {value: 1, name: '系统公共'},
+    {value: 2, name: '自定义'}
 ]
 
 // 税务日历事项状态
@@ -1684,5 +1684,39 @@ constant.EnumTaxEventFinishStatus = {
 constant.EnumTaxEventType = {
     UserDefine: 1,
     SystemConfig: 2
-}
+};
+
+
+constant.organizationHK = {
+    legalFormTypeList: [
+        {code: 1, type: "LimitedPartnership"},
+        {code: 2, type: "LimitedCompany"},
+        {code: 3, type: "Trustee"}
+    ],
+    EntityLevel: [
+        {code: 1, type: "InvestmentFund"},
+        {code: 2, type: "InvestmentHolding"},
+        {code: 3, type: "PortfolioCompany"}
+    ],
+    JurisdictionOfFormation: [
+        {code: 1, type: "HongKong"},
+        {code: 2, type: "BritishVirginIslands"},
+        {code: 3, type: "CaymanIslands"}
+    ],
+    OwnershipForm: [
+        {code: 1, type: "OrdinaryShares"},
+        {code: 2, type: "PreferenceShares"}
+    ],
+    BoardMeetingRequirement: [
+        {code: 1, type: "Annual"},
+        {code: 2, type: "SemiQnnual"},
+        {code: 3, type: "Quarter"},
+        {code: 4, type: "Monthly"}
+    ],
+    OtherRoles: [
+        {code: 1, type: "CEO"},
+        {code: 2, type: "CFO"},
+        {code: 3, type: "NA"}
+    ]
+};
 /************************************************cit constant end*************************************************/
\ No newline at end of file

atms-web/src/main/webapp/app/common/webservices/organizationHK.svc.js

@@ -18,7 +18,10 @@ webservices.factory('orgHKService', ['$http', 'apiConfig', function ($http, apiC
             return $http.get('/orgHK/getjson?useType=' + type, apiConfig.create());
         },
         getSingleOrg: function (orgId) {
-            return $http.get('/org/displaySingle?orgId=' + orgId, apiConfig.create());
+            return $http.get('/orgHK/displaySingle?orgId=' + orgId, apiConfig.create());
         },
+        addOrg: function (org) {
+            return $http.post('/orgHK/add', org, apiConfig.create());
+        }
     }
 }]);
\ No newline at end of file