Skip to content

T
traffic-front
Commit ed6907a4 authored by frank.xa.zhang's avatar frank.xa.zhang
Browse files
Options

save data to org -- frank

parent b0faca2b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 957 additions and 223 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/OrganizationHKController.java
View file @ ed6907a4
......@@ -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
View file @ ed6907a4
......@@ -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
View file @ ed6907a4
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
View file @ ed6907a4
......@@ -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
View file @ ed6907a4
......@@ -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
View file @ ed6907a4
......@@ -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
View file @ ed6907a4
......@@ -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
View file @ ed6907a4
......@@ -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/OrganizationShareholder.java
View file @ ed6907a4
......@@ -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
View file @ ed6907a4
......@@ -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
View file @ ed6907a4
......@@ -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
View file @ ed6907a4
......@@ -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/OrganizationShareholderMapper.xml
View file @ ed6907a4
......@@ -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.html
View file @ ed6907a4
......@@ -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
View file @ ed6907a4
......@@ -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
View file @ ed6907a4
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment