Skip to content

T
traffic-front
Commit 947cc277 authored by gary's avatar gary
Browse files
Options

mysql branch

parent 0739eb2e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 196 additions and 175 deletions
atms-api/pom.xml
View file @ 947cc277
......@@ -55,11 +55,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
<version>1.13.8.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
......@@ -111,12 +106,6 @@
<artifactId>mybatis-spring</artifactId>
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
<version>5.1.2</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/ProjectStatusManageServiceImpl.java
View file @ 947cc277
......@@ -29,7 +29,8 @@ public class ProjectStatusManageServiceImpl {
public OperationResultDto<ProjectStatusManageDto> setProjectStatus(String projectId, Integer periodId, Integer status, String creatorId) {
try {
ProjectStatusManageExample example = new ProjectStatusManageExample();
example.createCriteria().andProjectIdEqualTo(projectId).andPeriodIdEqualTo(periodId);
// todo example.createCriteria().andProjectIdEqualTo(projectId).andPeriodIdEqualTo(periodId);
example.createCriteria().andIdEqualTo(projectId).andPeriodIdEqualTo(periodId);
List<ProjectStatusManage> psmList = projectStatusManageMapper.selectByExample(example);
ProjectStatusManage psm = null;
......@@ -42,7 +43,7 @@ public class ProjectStatusManageServiceImpl {
} else {
psm = new ProjectStatusManage();
psm.setId(UUID.randomUUID().toString());
psm.setProjectId(projectId);
// todo psm.setProjectId(projectId);
psm.setPeriodId(periodId);
psm.setStatus(status);
psm.setCreatorId(creatorId);
......@@ -128,7 +129,8 @@ public class ProjectStatusManageServiceImpl {
public OperationResultDto<ProjectStatusManage> isProjectStatusExisted(String projectId, int periodId) {
ProjectStatusManageExample example = new ProjectStatusManageExample();
example.createCriteria().andProjectIdEqualTo(projectId).andPeriodIdEqualTo(periodId);
// todo example.createCriteria().andProjectIdEqualTo(projectId).andPeriodIdEqualTo(periodId);
example.createCriteria().andIdEqualTo(projectId).andPeriodIdEqualTo(periodId);
List<ProjectStatusManage> manage = projectStatusManageMapper.selectByExample(example);
OperationResultDto<ProjectStatusManage> dto = new OperationResultDto();
dto.setResult(true);
......
atms-api/src/main/resources/conf/conf_profile_dev.properties
View file @ 947cc277
jdbc_url=jdbc:oracle:thin:@10.158.230.144:11521:XE
jdbc_user=tax_admin_longi
jdbc_password=tax_admin_longi
jdbc_url=jdbc:mysql://10.158.230.144:3306/tax_admin?useUnicode=true&amp;characterEncoding=utf-8&amp;zeroDateTimeBehavior=convertToNull&amp;allowMultiQueries=true&amp;useSSL=false
jdbc_user=root
jdbc_password=tax@Admin2018
#jdbc_password=111111
jdbc_admin_db=tax_admin_longi
jdbc_admin_db=tax@Admin2018
jdbc2_url=jdbc:oracle:thin:@10.158.230.144:11521:XE
jdbc2_user=pwc_invoice
jdbc2_password=pwc_invoice
jdbc2_admin_db=pwc_invoice
jdbc2_url=jdbc:mysql://10.158.230.144:3306/tax_admin?useUnicode=true&amp;characterEncoding=utf-8&amp;zeroDateTimeBehavior=convertToNull&amp;allowMultiQueries=true&amp;useSSL=false
jdbc2_user=root
jdbc2_password=tax@Admin2018
jdbc2_admin_db=tax@Admin2018
jdbc_url_demo=jdbc:mysql://10.158.230.144:3306/demo_db_name?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
......
atms-dao/etc/generator-mysql/run.bat
View file @ 947cc277
rem see http://www.mybatis.org/generator/running/runningFromCmdLine.html
cd /d %~dp0
call java -classpath .;./* org.mybatis.generator.api.ShellRunner -configfile generatorConfig.xml -overwrite -verbose -tables AssetGroup
call java -classpath .;./* org.mybatis.generator.api.ShellRunner -configfile generatorConfig.xml -overwrite
echo @@@@@@@@@@@ DONE @@@@@@@@@@@
pause
atms-dao/src/main/java/pwc/taxtech/atms/dao/BusinessUnitMapper.java
View file @ 947cc277
......@@ -4,12 +4,14 @@ import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import org.springframework.stereotype.Repository;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.dpo.OrganizationDto;
import pwc.taxtech.atms.entity.BusinessUnit;
import pwc.taxtech.atms.entity.BusinessUnitExample;
@Mapper
@Repository
public interface BusinessUnitMapper extends MyMapper {
/**
* This method was generated by MyBatis Generator.
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/CellTemplateMapper.java
View file @ 947cc277
......@@ -3,6 +3,7 @@ package pwc.taxtech.atms.dao;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import org.springframework.stereotype.Repository;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.entity.CellTemplate;
import pwc.taxtech.atms.entity.CellTemplateExample;
......@@ -10,6 +11,7 @@ import pwc.taxtech.atms.entity.CellTemplateExample;
import java.util.List;
@Mapper
@Repository
public interface CellTemplateMapper extends MyMapper {
/**
* This method was generated by MyBatis Generator.
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/EnterpriseAccountSetMapper.java
View file @ 947cc277
......@@ -4,11 +4,13 @@ import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import org.springframework.stereotype.Repository;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.entity.EnterpriseAccountSet;
import pwc.taxtech.atms.entity.EnterpriseAccountSetExample;
@Mapper
@Repository
public interface EnterpriseAccountSetMapper extends MyMapper {
/**
* This method was generated by MyBatis Generator.
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/OrganizationServiceTemplateGroupMapper.java
View file @ 947cc277
......@@ -3,6 +3,7 @@ package pwc.taxtech.atms.dao;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import org.springframework.stereotype.Repository;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.dpo.OrganizationServiceTemplateGroupDto;
import pwc.taxtech.atms.entity.OrganizationServiceTemplateGroup;
......@@ -11,6 +12,7 @@ import pwc.taxtech.atms.entity.OrganizationServiceTemplateGroupExample;
import java.util.List;
@Mapper
@Repository
public interface OrganizationServiceTemplateGroupMapper extends MyMapper {
/**
* This method was generated by MyBatis Generator.
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/ProjectClientMapper.java
View file @ 947cc277
......@@ -4,11 +4,13 @@ import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import org.springframework.stereotype.Repository;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.entity.ProjectClient;
import pwc.taxtech.atms.entity.ProjectClientExample;
@Mapper
@Repository
public interface ProjectClientMapper extends MyMapper {
/**
* This method was generated by MyBatis Generator.
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/ProjectMapper.java
View file @ 947cc277
......@@ -4,6 +4,7 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.session.RowBounds;
import org.springframework.stereotype.Repository;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.dpo.ProjectDisplayDto;
import pwc.taxtech.atms.entity.Project;
......@@ -13,6 +14,7 @@ import pwc.taxtech.atms.entity.ProjectStatusManage;
import java.util.List;
@Mapper
@Repository
public interface ProjectMapper extends MyMapper {
/**
* This method was generated by MyBatis Generator.
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/ProjectServiceTypeMapper.java
View file @ 947cc277
......@@ -4,11 +4,13 @@ import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import org.springframework.stereotype.Repository;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.entity.ProjectServiceType;
import pwc.taxtech.atms.entity.ProjectServiceTypeExample;
@Mapper
@Repository
public interface ProjectServiceTypeMapper extends MyMapper {
/**
* This method was generated by MyBatis Generator.
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/ProjectStatusManageMapper.java
View file @ 947cc277
......@@ -4,11 +4,13 @@ import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import org.springframework.stereotype.Repository;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.entity.ProjectStatusManage;
import pwc.taxtech.atms.entity.ProjectStatusManageExample;
@Mapper
@Repository
public interface ProjectStatusManageMapper extends MyMapper {
/**
* This method was generated by MyBatis Generator.
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/ServiceTypeMapper.java
View file @ 947cc277
......@@ -4,11 +4,13 @@ import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import org.springframework.stereotype.Repository;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.entity.ServiceType;
import pwc.taxtech.atms.entity.ServiceTypeExample;
@Mapper
@Repository
public interface ServiceTypeMapper extends MyMapper {
/**
* This method was generated by MyBatis Generator.
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/TemplateGroupMapper.java
View file @ 947cc277
......@@ -4,11 +4,13 @@ import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import org.springframework.stereotype.Repository;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.entity.TemplateGroup;
import pwc.taxtech.atms.entity.TemplateGroupExample;
@Mapper
@Repository
public interface TemplateGroupMapper extends MyMapper {
/**
* This method was generated by MyBatis Generator.
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/TemplateMapper.java
View file @ 947cc277
......@@ -3,6 +3,7 @@ package pwc.taxtech.atms.dao;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import org.springframework.stereotype.Repository;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.dpo.ReportDto;
import pwc.taxtech.atms.dpo.TemplateAndGroupDbDto;
......@@ -14,6 +15,7 @@ import java.util.List;
import java.util.Map;
@Mapper
@Repository
public interface TemplateMapper extends MyMapper {
/**
* This method was generated by MyBatis Generator.
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/AccountMapping.java
View file @ 947cc277
......@@ -5,15 +5,15 @@ import java.io.Serializable;
/**
*
* This class was generated by MyBatis Generator.
* This class corresponds to the database table TAX_ADMIN.ACCOUNT_MAPPING
* This class corresponds to the database table AccountMapping
*
* @mbg.generated do_not_delete_during_merge
*/
public class AccountMapping extends BaseEntity implements Serializable {
public class AccountMapping implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.ACCOUNT_MAPPING.ID
* This field corresponds to the database column AccountMapping.ID
*
* @mbg.generated
*/
......@@ -22,7 +22,7 @@ public class AccountMapping extends BaseEntity implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.ACCOUNT_MAPPING.ENTERPRISE_ACCOUNT_CODE
* This field corresponds to the database column AccountMapping.EnterpriseAccountCode
*
* @mbg.generated
*/
......@@ -31,7 +31,7 @@ public class AccountMapping extends BaseEntity implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.ACCOUNT_MAPPING.STANDARD_ACCOUNT_CODE
* This field corresponds to the database column AccountMapping.StandardAccountCode
*
* @mbg.generated
*/
......@@ -40,7 +40,7 @@ public class AccountMapping extends BaseEntity implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.ACCOUNT_MAPPING.ENTERPRISE_ACCOUNT_SET_ID
* This field corresponds to the database column AccountMapping.EnterpriseAccountSetID
*
* @mbg.generated
*/
......@@ -49,7 +49,7 @@ public class AccountMapping extends BaseEntity implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.ACCOUNT_MAPPING.ORGANIZATION_ID
* This field corresponds to the database column AccountMapping.OrganizationID
*
* @mbg.generated
*/
......@@ -58,7 +58,7 @@ public class AccountMapping extends BaseEntity implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.ACCOUNT_MAPPING.INDUSTRY_ID
* This field corresponds to the database column AccountMapping.IndustryID
*
* @mbg.generated
*/
......@@ -66,7 +66,7 @@ public class AccountMapping extends BaseEntity implements Serializable {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table TAX_ADMIN.ACCOUNT_MAPPING
* This field corresponds to the database table AccountMapping
*
* @mbg.generated
*/
......@@ -74,9 +74,9 @@ public class AccountMapping extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.ACCOUNT_MAPPING.ID
* This method returns the value of the database column AccountMapping.ID
*
* @return the value of TAX_ADMIN.ACCOUNT_MAPPING.ID
* @return the value of AccountMapping.ID
*
* @mbg.generated
*/
......@@ -86,9 +86,9 @@ public class AccountMapping extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.ACCOUNT_MAPPING.ID
* This method sets the value of the database column AccountMapping.ID
*
* @param id the value for TAX_ADMIN.ACCOUNT_MAPPING.ID
* @param id the value for AccountMapping.ID
*
* @mbg.generated
*/
......@@ -98,9 +98,9 @@ public class AccountMapping extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.ACCOUNT_MAPPING.ENTERPRISE_ACCOUNT_CODE
* This method returns the value of the database column AccountMapping.EnterpriseAccountCode
*
* @return the value of TAX_ADMIN.ACCOUNT_MAPPING.ENTERPRISE_ACCOUNT_CODE
* @return the value of AccountMapping.EnterpriseAccountCode
*
* @mbg.generated
*/
......@@ -110,9 +110,9 @@ public class AccountMapping extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.ACCOUNT_MAPPING.ENTERPRISE_ACCOUNT_CODE
* This method sets the value of the database column AccountMapping.EnterpriseAccountCode
*
* @param enterpriseAccountCode the value for TAX_ADMIN.ACCOUNT_MAPPING.ENTERPRISE_ACCOUNT_CODE
* @param enterpriseAccountCode the value for AccountMapping.EnterpriseAccountCode
*
* @mbg.generated
*/
......@@ -122,9 +122,9 @@ public class AccountMapping extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.ACCOUNT_MAPPING.STANDARD_ACCOUNT_CODE
* This method returns the value of the database column AccountMapping.StandardAccountCode
*
* @return the value of TAX_ADMIN.ACCOUNT_MAPPING.STANDARD_ACCOUNT_CODE
* @return the value of AccountMapping.StandardAccountCode
*
* @mbg.generated
*/
......@@ -134,9 +134,9 @@ public class AccountMapping extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.ACCOUNT_MAPPING.STANDARD_ACCOUNT_CODE
* This method sets the value of the database column AccountMapping.StandardAccountCode
*
* @param standardAccountCode the value for TAX_ADMIN.ACCOUNT_MAPPING.STANDARD_ACCOUNT_CODE
* @param standardAccountCode the value for AccountMapping.StandardAccountCode
*
* @mbg.generated
*/
......@@ -146,9 +146,9 @@ public class AccountMapping extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.ACCOUNT_MAPPING.ENTERPRISE_ACCOUNT_SET_ID
* This method returns the value of the database column AccountMapping.EnterpriseAccountSetID
*
* @return the value of TAX_ADMIN.ACCOUNT_MAPPING.ENTERPRISE_ACCOUNT_SET_ID
* @return the value of AccountMapping.EnterpriseAccountSetID
*
* @mbg.generated
*/
......@@ -158,9 +158,9 @@ public class AccountMapping extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.ACCOUNT_MAPPING.ENTERPRISE_ACCOUNT_SET_ID
* This method sets the value of the database column AccountMapping.EnterpriseAccountSetID
*
* @param enterpriseAccountSetId the value for TAX_ADMIN.ACCOUNT_MAPPING.ENTERPRISE_ACCOUNT_SET_ID
* @param enterpriseAccountSetId the value for AccountMapping.EnterpriseAccountSetID
*
* @mbg.generated
*/
......@@ -170,9 +170,9 @@ public class AccountMapping extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.ACCOUNT_MAPPING.ORGANIZATION_ID
* This method returns the value of the database column AccountMapping.OrganizationID
*
* @return the value of TAX_ADMIN.ACCOUNT_MAPPING.ORGANIZATION_ID
* @return the value of AccountMapping.OrganizationID
*
* @mbg.generated
*/
......@@ -182,9 +182,9 @@ public class AccountMapping extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.ACCOUNT_MAPPING.ORGANIZATION_ID
* This method sets the value of the database column AccountMapping.OrganizationID
*
* @param organizationId the value for TAX_ADMIN.ACCOUNT_MAPPING.ORGANIZATION_ID
* @param organizationId the value for AccountMapping.OrganizationID
*
* @mbg.generated
*/
......@@ -194,9 +194,9 @@ public class AccountMapping extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.ACCOUNT_MAPPING.INDUSTRY_ID
* This method returns the value of the database column AccountMapping.IndustryID
*
* @return the value of TAX_ADMIN.ACCOUNT_MAPPING.INDUSTRY_ID
* @return the value of AccountMapping.IndustryID
*
* @mbg.generated
*/
......@@ -206,9 +206,9 @@ public class AccountMapping extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.ACCOUNT_MAPPING.INDUSTRY_ID
* This method sets the value of the database column AccountMapping.IndustryID
*
* @param industryId the value for TAX_ADMIN.ACCOUNT_MAPPING.INDUSTRY_ID
* @param industryId the value for AccountMapping.IndustryID
*
* @mbg.generated
*/
......@@ -218,7 +218,7 @@ public class AccountMapping extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_ADMIN.ACCOUNT_MAPPING
* This method corresponds to the database table AccountMapping
*
* @mbg.generated
*/
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/Area.java
View file @ 947cc277
......@@ -5,15 +5,15 @@ import java.io.Serializable;
/**
*
* This class was generated by MyBatis Generator.
* This class corresponds to the database table TAX_ADMIN.AREA
* This class corresponds to the database table Area
*
* @mbg.generated do_not_delete_during_merge
*/
public class Area extends BaseEntity implements Serializable {
public class Area implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.AREA.ID
* This field corresponds to the database column Area.ID
*
* @mbg.generated
*/
......@@ -22,7 +22,7 @@ public class Area extends BaseEntity implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.AREA.PARENT_ID
* This field corresponds to the database column Area.ParentID
*
* @mbg.generated
*/
......@@ -31,7 +31,7 @@ public class Area extends BaseEntity implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.AREA.NAME
* This field corresponds to the database column Area.Name
*
* @mbg.generated
*/
......@@ -40,7 +40,7 @@ public class Area extends BaseEntity implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.AREA.IS_ACTIVE
* This field corresponds to the database column Area.IsActive
*
* @mbg.generated
*/
......@@ -48,7 +48,7 @@ public class Area extends BaseEntity implements Serializable {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table TAX_ADMIN.AREA
* This field corresponds to the database table Area
*
* @mbg.generated
*/
......@@ -56,9 +56,9 @@ public class Area extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.AREA.ID
* This method returns the value of the database column Area.ID
*
* @return the value of TAX_ADMIN.AREA.ID
* @return the value of Area.ID
*
* @mbg.generated
*/
......@@ -68,9 +68,9 @@ public class Area extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.AREA.ID
* This method sets the value of the database column Area.ID
*
* @param id the value for TAX_ADMIN.AREA.ID
* @param id the value for Area.ID
*
* @mbg.generated
*/
......@@ -80,9 +80,9 @@ public class Area extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.AREA.PARENT_ID
* This method returns the value of the database column Area.ParentID
*
* @return the value of TAX_ADMIN.AREA.PARENT_ID
* @return the value of Area.ParentID
*
* @mbg.generated
*/
......@@ -92,9 +92,9 @@ public class Area extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.AREA.PARENT_ID
* This method sets the value of the database column Area.ParentID
*
* @param parentId the value for TAX_ADMIN.AREA.PARENT_ID
* @param parentId the value for Area.ParentID
*
* @mbg.generated
*/
......@@ -104,9 +104,9 @@ public class Area extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.AREA.NAME
* This method returns the value of the database column Area.Name
*
* @return the value of TAX_ADMIN.AREA.NAME
* @return the value of Area.Name
*
* @mbg.generated
*/
......@@ -116,9 +116,9 @@ public class Area extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.AREA.NAME
* This method sets the value of the database column Area.Name
*
* @param name the value for TAX_ADMIN.AREA.NAME
* @param name the value for Area.Name
*
* @mbg.generated
*/
......@@ -128,9 +128,9 @@ public class Area extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.AREA.IS_ACTIVE
* This method returns the value of the database column Area.IsActive
*
* @return the value of TAX_ADMIN.AREA.IS_ACTIVE
* @return the value of Area.IsActive
*
* @mbg.generated
*/
......@@ -140,9 +140,9 @@ public class Area extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.AREA.IS_ACTIVE
* This method sets the value of the database column Area.IsActive
*
* @param isActive the value for TAX_ADMIN.AREA.IS_ACTIVE
* @param isActive the value for Area.IsActive
*
* @mbg.generated
*/
......@@ -152,7 +152,7 @@ public class Area extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_ADMIN.AREA
* This method corresponds to the database table Area
*
* @mbg.generated
*/
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/AreaRegion.java
View file @ 947cc277
......@@ -3,54 +3,58 @@ package pwc.taxtech.atms.entity;
import java.io.Serializable;
/**
*
* This class was generated by MyBatis Generator.
* This class corresponds to the database table TAX_ADMIN.AREA_REGION
* This class corresponds to the database table AreaRegion
*
* @mbg.generated do_not_delete_during_merge
*/
public class AreaRegion extends BaseEntity implements Serializable {
public class AreaRegion implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.AREA_REGION.ID
* This field corresponds to the database column AreaRegion.ID
*
* @mbg.generated
*/
private String id;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.AREA_REGION.AREA_ID
* This field corresponds to the database column AreaRegion.AreaID
*
* @mbg.generated
*/
private String areaId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.AREA_REGION.REGION_ID
* This field corresponds to the database column AreaRegion.RegionID
*
* @mbg.generated
*/
private String regionId;
private Region region;
private Area area;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table TAX_ADMIN.AREA_REGION
* This field corresponds to the database table AreaRegion
*
* @mbg.generated
*/
private static final long serialVersionUID = 1L;
private Area area;
private Region region;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.AREA_REGION.ID
* This method returns the value of the database column AreaRegion.ID
*
* @return the value of AreaRegion.ID
*
* @return the value of TAX_ADMIN.AREA_REGION.ID
* @mbg.generated
*/
public String getId() {
......@@ -59,9 +63,10 @@ public class AreaRegion extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.AREA_REGION.ID
* This method sets the value of the database column AreaRegion.ID
*
* @param id the value for AreaRegion.ID
*
* @param id the value for TAX_ADMIN.AREA_REGION.ID
* @mbg.generated
*/
public void setId(String id) {
......@@ -70,9 +75,10 @@ public class AreaRegion extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.AREA_REGION.AREA_ID
* This method returns the value of the database column AreaRegion.AreaID
*
* @return the value of AreaRegion.AreaID
*
* @return the value of TAX_ADMIN.AREA_REGION.AREA_ID
* @mbg.generated
*/
public String getAreaId() {
......@@ -81,9 +87,10 @@ public class AreaRegion extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.AREA_REGION.AREA_ID
* This method sets the value of the database column AreaRegion.AreaID
*
* @param areaId the value for AreaRegion.AreaID
*
* @param areaId the value for TAX_ADMIN.AREA_REGION.AREA_ID
* @mbg.generated
*/
public void setAreaId(String areaId) {
......@@ -92,9 +99,10 @@ public class AreaRegion extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.AREA_REGION.REGION_ID
* This method returns the value of the database column AreaRegion.RegionID
*
* @return the value of AreaRegion.RegionID
*
* @return the value of TAX_ADMIN.AREA_REGION.REGION_ID
* @mbg.generated
*/
public String getRegionId() {
......@@ -103,18 +111,35 @@ public class AreaRegion extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.AREA_REGION.REGION_ID
* This method sets the value of the database column AreaRegion.RegionID
*
* @param regionId the value for AreaRegion.RegionID
*
* @param regionId the value for TAX_ADMIN.AREA_REGION.REGION_ID
* @mbg.generated
*/
public void setRegionId(String regionId) {
this.regionId = regionId == null ? null : regionId.trim();
}
public Region getRegion() {
return region;
}
public void setRegion(Region region) {
this.region = region;
}
public Area getArea() {
return area;
}
public void setArea(Area area) {
this.area = area;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_ADMIN.AREA_REGION
* This method corresponds to the database table AreaRegion
*
* @mbg.generated
*/
......@@ -130,20 +155,4 @@ public class AreaRegion extends BaseEntity implements Serializable {
sb.append("]");
return sb.toString();
}
public Area getArea() {
return area;
}
public void setArea(Area area) {
this.area = area;
}
public Region getRegion() {
return region;
}
public void setRegion(Region region) {
this.region = region;
}
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/entity/AssetGroup.java
View file @ 947cc277
......@@ -6,15 +6,15 @@ import java.util.Date;
/**
*
* This class was generated by MyBatis Generator.
* This class corresponds to the database table TAX_ADMIN.ASSET_GROUP
* This class corresponds to the database table AssetGroup
*
* @mbg.generated do_not_delete_during_merge
*/
public class AssetGroup extends BaseEntity implements Serializable {
public class AssetGroup implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.ASSET_GROUP.ID
* This field corresponds to the database column AssetGroup.ID
*
* @mbg.generated
*/
......@@ -23,7 +23,7 @@ public class AssetGroup extends BaseEntity implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.ASSET_GROUP.ASSET_GROUP_NAME
* This field corresponds to the database column AssetGroup.AssetGroupName
*
* @mbg.generated
*/
......@@ -32,7 +32,7 @@ public class AssetGroup extends BaseEntity implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.ASSET_GROUP.CREATE_TIME
* This field corresponds to the database column AssetGroup.CreateTime
*
* @mbg.generated
*/
......@@ -41,7 +41,7 @@ public class AssetGroup extends BaseEntity implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.ASSET_GROUP.UPDATE_TIME
* This field corresponds to the database column AssetGroup.UpdateTime
*
* @mbg.generated
*/
......@@ -49,7 +49,7 @@ public class AssetGroup extends BaseEntity implements Serializable {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table TAX_ADMIN.ASSET_GROUP
* This field corresponds to the database table AssetGroup
*
* @mbg.generated
*/
......@@ -57,9 +57,9 @@ public class AssetGroup extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.ASSET_GROUP.ID
* This method returns the value of the database column AssetGroup.ID
*
* @return the value of TAX_ADMIN.ASSET_GROUP.ID
* @return the value of AssetGroup.ID
*
* @mbg.generated
*/
......@@ -69,9 +69,9 @@ public class AssetGroup extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.ASSET_GROUP.ID
* This method sets the value of the database column AssetGroup.ID
*
* @param id the value for TAX_ADMIN.ASSET_GROUP.ID
* @param id the value for AssetGroup.ID
*
* @mbg.generated
*/
......@@ -81,9 +81,9 @@ public class AssetGroup extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.ASSET_GROUP.ASSET_GROUP_NAME
* This method returns the value of the database column AssetGroup.AssetGroupName
*
* @return the value of TAX_ADMIN.ASSET_GROUP.ASSET_GROUP_NAME
* @return the value of AssetGroup.AssetGroupName
*
* @mbg.generated
*/
......@@ -93,9 +93,9 @@ public class AssetGroup extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.ASSET_GROUP.ASSET_GROUP_NAME
* This method sets the value of the database column AssetGroup.AssetGroupName
*
* @param assetGroupName the value for TAX_ADMIN.ASSET_GROUP.ASSET_GROUP_NAME
* @param assetGroupName the value for AssetGroup.AssetGroupName
*
* @mbg.generated
*/
......@@ -105,9 +105,9 @@ public class AssetGroup extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.ASSET_GROUP.CREATE_TIME
* This method returns the value of the database column AssetGroup.CreateTime
*
* @return the value of TAX_ADMIN.ASSET_GROUP.CREATE_TIME
* @return the value of AssetGroup.CreateTime
*
* @mbg.generated
*/
......@@ -117,9 +117,9 @@ public class AssetGroup extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.ASSET_GROUP.CREATE_TIME
* This method sets the value of the database column AssetGroup.CreateTime
*
* @param createTime the value for TAX_ADMIN.ASSET_GROUP.CREATE_TIME
* @param createTime the value for AssetGroup.CreateTime
*
* @mbg.generated
*/
......@@ -129,9 +129,9 @@ public class AssetGroup extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.ASSET_GROUP.UPDATE_TIME
* This method returns the value of the database column AssetGroup.UpdateTime
*
* @return the value of TAX_ADMIN.ASSET_GROUP.UPDATE_TIME
* @return the value of AssetGroup.UpdateTime
*
* @mbg.generated
*/
......@@ -141,9 +141,9 @@ public class AssetGroup extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.ASSET_GROUP.UPDATE_TIME
* This method sets the value of the database column AssetGroup.UpdateTime
*
* @param updateTime the value for TAX_ADMIN.ASSET_GROUP.UPDATE_TIME
* @param updateTime the value for AssetGroup.UpdateTime
*
* @mbg.generated
*/
......@@ -153,7 +153,7 @@ public class AssetGroup extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_ADMIN.ASSET_GROUP
* This method corresponds to the database table AssetGroup
*
* @mbg.generated
*/
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/BusinessUnit.java
View file @ 947cc277
......@@ -6,15 +6,15 @@ import java.util.Date;
/**
*
* This class was generated by MyBatis Generator.
* This class corresponds to the database table TAX_ADMIN.BUSINESS_UNIT
* This class corresponds to the database table BusinessUnit
*
* @mbg.generated do_not_delete_during_merge
*/
public class BusinessUnit extends BaseEntity implements Serializable {
public class BusinessUnit implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.BUSINESS_UNIT.ID
* This field corresponds to the database column BusinessUnit.ID
*
* @mbg.generated
*/
......@@ -23,7 +23,7 @@ public class BusinessUnit extends BaseEntity implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.BUSINESS_UNIT.NAME
* This field corresponds to the database column BusinessUnit.Name
*
* @mbg.generated
*/
......@@ -32,7 +32,7 @@ public class BusinessUnit extends BaseEntity implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.BUSINESS_UNIT.IS_ACTIVE
* This field corresponds to the database column BusinessUnit.IsActive
*
* @mbg.generated
*/
......@@ -41,7 +41,7 @@ public class BusinessUnit extends BaseEntity implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.BUSINESS_UNIT.CREATE_TIME
* This field corresponds to the database column BusinessUnit.CreateTime
*
* @mbg.generated
*/
......@@ -50,7 +50,7 @@ public class BusinessUnit extends BaseEntity implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_ADMIN.BUSINESS_UNIT.UPDATE_TIME
* This field corresponds to the database column BusinessUnit.UpdateTime
*
* @mbg.generated
*/
......@@ -58,7 +58,7 @@ public class BusinessUnit extends BaseEntity implements Serializable {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table TAX_ADMIN.BUSINESS_UNIT
* This field corresponds to the database table BusinessUnit
*
* @mbg.generated
*/
......@@ -66,9 +66,9 @@ public class BusinessUnit extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.BUSINESS_UNIT.ID
* This method returns the value of the database column BusinessUnit.ID
*
* @return the value of TAX_ADMIN.BUSINESS_UNIT.ID
* @return the value of BusinessUnit.ID
*
* @mbg.generated
*/
......@@ -78,9 +78,9 @@ public class BusinessUnit extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.BUSINESS_UNIT.ID
* This method sets the value of the database column BusinessUnit.ID
*
* @param id the value for TAX_ADMIN.BUSINESS_UNIT.ID
* @param id the value for BusinessUnit.ID
*
* @mbg.generated
*/
......@@ -90,9 +90,9 @@ public class BusinessUnit extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.BUSINESS_UNIT.NAME
* This method returns the value of the database column BusinessUnit.Name
*
* @return the value of TAX_ADMIN.BUSINESS_UNIT.NAME
* @return the value of BusinessUnit.Name
*
* @mbg.generated
*/
......@@ -102,9 +102,9 @@ public class BusinessUnit extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.BUSINESS_UNIT.NAME
* This method sets the value of the database column BusinessUnit.Name
*
* @param name the value for TAX_ADMIN.BUSINESS_UNIT.NAME
* @param name the value for BusinessUnit.Name
*
* @mbg.generated
*/
......@@ -114,9 +114,9 @@ public class BusinessUnit extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.BUSINESS_UNIT.IS_ACTIVE
* This method returns the value of the database column BusinessUnit.IsActive
*
* @return the value of TAX_ADMIN.BUSINESS_UNIT.IS_ACTIVE
* @return the value of BusinessUnit.IsActive
*
* @mbg.generated
*/
......@@ -126,9 +126,9 @@ public class BusinessUnit extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.BUSINESS_UNIT.IS_ACTIVE
* This method sets the value of the database column BusinessUnit.IsActive
*
* @param isActive the value for TAX_ADMIN.BUSINESS_UNIT.IS_ACTIVE
* @param isActive the value for BusinessUnit.IsActive
*
* @mbg.generated
*/
......@@ -138,9 +138,9 @@ public class BusinessUnit extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.BUSINESS_UNIT.CREATE_TIME
* This method returns the value of the database column BusinessUnit.CreateTime
*
* @return the value of TAX_ADMIN.BUSINESS_UNIT.CREATE_TIME
* @return the value of BusinessUnit.CreateTime
*
* @mbg.generated
*/
......@@ -150,9 +150,9 @@ public class BusinessUnit extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.BUSINESS_UNIT.CREATE_TIME
* This method sets the value of the database column BusinessUnit.CreateTime
*
* @param createTime the value for TAX_ADMIN.BUSINESS_UNIT.CREATE_TIME
* @param createTime the value for BusinessUnit.CreateTime
*
* @mbg.generated
*/
......@@ -162,9 +162,9 @@ public class BusinessUnit extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_ADMIN.BUSINESS_UNIT.UPDATE_TIME
* This method returns the value of the database column BusinessUnit.UpdateTime
*
* @return the value of TAX_ADMIN.BUSINESS_UNIT.UPDATE_TIME
* @return the value of BusinessUnit.UpdateTime
*
* @mbg.generated
*/
......@@ -174,9 +174,9 @@ public class BusinessUnit extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_ADMIN.BUSINESS_UNIT.UPDATE_TIME
* This method sets the value of the database column BusinessUnit.UpdateTime
*
* @param updateTime the value for TAX_ADMIN.BUSINESS_UNIT.UPDATE_TIME
* @param updateTime the value for BusinessUnit.UpdateTime
*
* @mbg.generated
*/
......@@ -186,7 +186,7 @@ public class BusinessUnit extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_ADMIN.BUSINESS_UNIT
* This method corresponds to the database table BusinessUnit
*
* @mbg.generated
*/
......
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