fixed db error

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

@@ -58,10 +58,10 @@ public class CustomerController {
 
     @ApiOperation(value = "财务数据账套下客户查询")
     @ApiImplicitParam(name = "id", value = "记录Id", required = true, dataType = "java.lang.String")
-    @RequestMapping(value = "/getById", method = RequestMethod.GET)
+    @RequestMapping(value = "/getByID", method = RequestMethod.GET)
     public @ResponseBody
-    CustomerValidateInfoDto getById(@RequestParam(name = "id") String setId) {
-        logger.debug("enter getById");
+    CustomerValidateInfoDto getById(@RequestParam(name = "ID") String setId) {
+        logger.debug("enter getByID");
         return customerService.getByEnterpriseAccountSetId(setId);
     }
 

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

@@ -219,10 +219,10 @@ public class EnterpriseAccountManagerController {
     }
 	
 	@ApiOperation(value = "Gets the list by enterprise account set identifier.")
-    @RequestMapping(value = { "/getListByEnterpriseAccountSetId" }, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @RequestMapping(value = { "/getListByEnterpriseAccountSetID" }, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public @ResponseBody
-    EnterpriseAccountAndValidateInfo getListByEnterpriseAccountSetId(@RequestParam String enterpriseAccountSetId) {
-        return enterpriseAccountService.getListByEnterpriseAccountSetId(enterpriseAccountSetId);
+    EnterpriseAccountAndValidateInfo getListByEnterpriseAccountSetId(@RequestParam String enterpriseAccountSetID) {
+        return enterpriseAccountService.getListByEnterpriseAccountSetId(enterpriseAccountSetID);
     }
 	
 	@ApiOperation(value = "Gets the specified enterprise account by identifier")

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

@@ -27,11 +27,11 @@ public class PermissionController {
     private PermissionService permissionService;
 
     @ApiOperation(value = "Active or Deactive the specific area.")
-    @RequestMapping(value = "getIvhTreePermissionsByRoleId", method = RequestMethod.GET)
-    public @ResponseBody RolePermissionDisplayDto getIvhTreePermissionsByRoleId(@RequestParam String roleId,
+    @RequestMapping(value = "getIvhTreePermissionsByRoleID", method = RequestMethod.GET)
+    public @ResponseBody RolePermissionDisplayDto getIvhTreePermissionsByRoleId(@RequestParam String roleID,
             @RequestParam String serviceType) {
-        logger.info("getIvhTreePermissionsByRoleId: roleId={}, serviceType={}.", roleId, serviceType);
-        return permissionService.getIvhTreePermissionsByRoleId(roleId, serviceType);
+        logger.info("getIvhTreePermissionsByRoleId: roleId={}, serviceType={}.", roleID, serviceType);
+        return permissionService.getIvhTreePermissionsByRoleId(roleID, serviceType);
     }
 
     @ApiOperation(value = "通过传入的角色Id列表获取树形结构权限")

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

@@ -78,13 +78,13 @@ public class RoleController {
     }
 
     @ApiOperation(value = "获取角色下用户列表")
-    @RequestMapping(value = "getUsersByRoleId", method = RequestMethod.GET)
+    @RequestMapping(value = "getUsersByRoleID", method = RequestMethod.GET)
     public @ResponseBody List<UserRoleDto> getUsersByRoleId(@RequestParam("roleId") String roleId) {
         return roleService.getUsersByRoleId(roleId);
     }
 
     @ApiOperation(value = "获取角色下额外用户列表")
-    @RequestMapping(value = "getExtraUsersByRoleId", method = RequestMethod.GET)
+    @RequestMapping(value = "getExtraUsersByRoleID", method = RequestMethod.GET)
     public @ResponseBody List<UserRoleDto> getExtraUsersByRoleId(@RequestParam("roleId") String roleId) {
         return roleService.getExtraUsersByRoleId(roleId);
     }
@@ -186,7 +186,7 @@ public class RoleController {
     @ApiOperation(value = "Get all role permission list by serviceType")
     @RequestMapping(value = "getAllRolePermission", method = RequestMethod.GET)
     public @ResponseBody List<RolePermissionDto> getAllRolePermission(
-            @RequestParam("serviceTypeId") String serviceTypeId) {
+            @RequestParam("serviceTypeID") String serviceTypeId) {
 
         return roleService.getAllRolePermission(serviceTypeId);
     }

atms-api/src/main/java/pwc/taxtech/atms/dto/AreaStatistics.java

@@ -14,7 +14,7 @@ public class AreaStatistics {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getName() {

atms-api/src/main/java/pwc/taxtech/atms/dto/BusinessUnitDto.java

@@ -14,7 +14,7 @@ public class BusinessUnitDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getName() {

atms-api/src/main/java/pwc/taxtech/atms/dto/BusinessUnitInputDto.java

@@ -19,7 +19,7 @@ public class BusinessUnitInputDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getName() {

atms-api/src/main/java/pwc/taxtech/atms/dto/CacheDto.java

@@ -15,7 +15,7 @@ public class CacheDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getCacheKey() {

atms-api/src/main/java/pwc/taxtech/atms/dto/IdModel.java

@@ -9,6 +9,6 @@ public class IdModel {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 }

atms-api/src/main/java/pwc/taxtech/atms/dto/IndustryDto.java

@@ -11,7 +11,7 @@ public class IndustryDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getName() {

atms-api/src/main/java/pwc/taxtech/atms/dto/MenuDisplayDto.java

@@ -28,7 +28,7 @@ public class MenuDisplayDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getName() {

atms-api/src/main/java/pwc/taxtech/atms/dto/MenuDto.java

@@ -37,7 +37,7 @@ public class MenuDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getName() {

atms-api/src/main/java/pwc/taxtech/atms/dto/OperationLogDto.java

@@ -52,7 +52,7 @@ public class OperationLogDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getOperationContent() {

atms-api/src/main/java/pwc/taxtech/atms/dto/OrganizationStatistics.java

@@ -42,7 +42,7 @@ public class OrganizationStatistics {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getName() {

atms-api/src/main/java/pwc/taxtech/atms/dto/OrganizationStructureDto.java

@@ -18,7 +18,7 @@ public class OrganizationStructureDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getName() {

atms-api/src/main/java/pwc/taxtech/atms/dto/OrganizationStructureInputDto.java

@@ -18,7 +18,7 @@ public class OrganizationStructureInputDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getName() {

atms-api/src/main/java/pwc/taxtech/atms/dto/ProjectClientDto.java

@@ -17,7 +17,7 @@ public class ProjectClientDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getCode() {

atms-api/src/main/java/pwc/taxtech/atms/dto/RegionShortDto.java

@@ -27,7 +27,7 @@ public class RegionShortDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getParentId() {

atms-api/src/main/java/pwc/taxtech/atms/dto/RoleCategoryDto.java

@@ -22,7 +22,7 @@ public class RoleCategoryDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getName() {

atms-api/src/main/java/pwc/taxtech/atms/dto/ServiceTypeDto.java

@@ -16,7 +16,7 @@ public class ServiceTypeDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getName() {

atms-api/src/main/java/pwc/taxtech/atms/dto/StatisticAttributeDimensionDto.java

@@ -11,7 +11,7 @@ public class StatisticAttributeDimensionDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getDimensionId() {

atms-api/src/main/java/pwc/taxtech/atms/dto/StatisticAttributeDto.java

@@ -15,7 +15,7 @@ public class StatisticAttributeDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getName() {

atms-api/src/main/java/pwc/taxtech/atms/dto/TaxControlDiskDto.java

@@ -44,7 +44,7 @@ public class TaxControlDiskDto {
      * @param id the id to set
      */
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
     /**
      * @return the kPJH

atms-api/src/main/java/pwc/taxtech/atms/dto/TemplateFormulaDto.java

@@ -29,7 +29,7 @@ public class TemplateFormulaDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public int getRowIndex() {

atms-api/src/main/java/pwc/taxtech/atms/dto/TemplateGroupDto.java

@@ -24,7 +24,7 @@ public class TemplateGroupDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getName() {

atms-api/src/main/java/pwc/taxtech/atms/dto/role/RoleDtoBase.java

@@ -14,7 +14,7 @@ public class RoleDtoBase {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getName() {

atms-api/src/main/java/pwc/taxtech/atms/dto/user/NameDto.java

@@ -16,7 +16,7 @@ public class NameDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getName() {

atms-api/src/main/java/pwc/taxtech/atms/dto/user/OrganizationRoleInfo.java

@@ -27,7 +27,7 @@ public class OrganizationRoleInfo {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getDimensionId() {

atms-api/src/main/java/pwc/taxtech/atms/dto/user/UserAndUserRoleSaveDto.java

@@ -29,7 +29,7 @@ public class UserAndUserRoleSaveDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getUserName() {

atms-api/src/main/java/pwc/taxtech/atms/dto/user/UserDimensionValueRoleDto.java

@@ -20,7 +20,7 @@ public class UserDimensionValueRoleDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getUserDimensionValueId() {

atms-api/src/main/java/pwc/taxtech/atms/dto/user/UserOrganizationRoleDto.java

@@ -15,7 +15,7 @@ public class UserOrganizationRoleDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getUserOrganizationId() {

atms-api/src/main/java/pwc/taxtech/atms/dto/user/UserRoleDimensionValueDto.java

@@ -51,7 +51,7 @@ public class UserRoleDimensionValueDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getDimensionValueId() {

atms-api/src/main/java/pwc/taxtech/atms/dto/user/UserRoleDto.java

@@ -26,7 +26,7 @@ public class UserRoleDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getUserId() {

atms-api/src/main/java/pwc/taxtech/atms/dto/user/UserRoleSimpleDto.java

@@ -22,7 +22,7 @@ public class UserRoleSimpleDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getUserId() {

atms-api/src/main/java/pwc/taxtech/atms/dto/user/VMUser.java

@@ -21,7 +21,7 @@ public class VMUser {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getUserName() {

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

@@ -201,12 +201,12 @@ public class AreaServiceImpl implements AreaService {
 
         if (type == 1) {
             AreaExample example = new AreaExample();
-            example.setOrderByClause("id ASC, ParentId ASC");
+            example.setOrderByClause("ID ASC, PARENT_ID ASC");
             areaList = areaMapper.selectByExample(example);
         } else if (type == 0) {
             AreaExample example = new AreaExample();
             example.createCriteria().andIsActiveEqualTo(CommonConstants.ACTIVE_STATUS);
-            example.setOrderByClause("id ASC, ParentId ASC");
+            example.setOrderByClause("ID ASC, PARENT_ID ASC");
             areaList = areaMapper.selectByExample(example);
         }
 

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

@@ -218,7 +218,7 @@ public class DimensionServiceImpl extends AbstractService implements DimensionSe
     @Override
     public List<DimensionDto> getDimensionList() {
         DimensionExample example = new DimensionExample();
-        example.setOrderByClause("IsActive desc, OrderIndex asc");
+        example.setOrderByClause("IS_ACTIVE desc, ORDER_INDEX asc");
         List<Dimension> dimensionList = dimensionMapper.selectByExample(example);
         return convertToDimensionList(dimensionList);
     }

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

@@ -94,7 +94,7 @@ public class EnterpriseAccountServiceImpl extends AbstractService implements Ent
         enterpriseAccountExample.createCriteria()
             .andRuleTypeEqualTo(2)
             .andEnterpriseAccountSetIdEqualTo(enterpriseAccountSetId);
-        enterpriseAccountExample.setOrderByClause("ParentCode ASC, IsActive DESC, Code ASC");
+        enterpriseAccountExample.setOrderByClause("PARENT_CODE ASC, IS_ACTIVE DESC, CODE ASC");
         List<EnterpriseAccount> epAccounts = enterpriseAccountMapper.selectByExample(enterpriseAccountExample);
         
         //no enterprise account

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

@@ -135,7 +135,7 @@ public class ProjectServiceImpl implements ProjectService {
     public List<ProjectClientDto> getProjectClientList() {
         logger.debug("获取ProjectClient Start");
         ProjectClientExample example = new ProjectClientExample();
-        example.setOrderByClause("CreateTime desc");
+        example.setOrderByClause("CREATE_TIME desc");
         Criteria criteria = example.createCriteria();
         criteria.andIsActiveEqualTo(true);
         List<ProjectClient> projectClientList = projectClientMapper.selectByExample(example);

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

@@ -798,7 +798,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
     private List<RoleCategory> findRoleCategoryByIsActiveOrderByCreateTime(Boolean isActive) {
         RoleCategoryExample roleCategoryExample = new RoleCategoryExample();
         roleCategoryExample.createCriteria().andIsActiveEqualTo(isActive);
-        roleCategoryExample.setOrderByClause("createTime ASC");
+        roleCategoryExample.setOrderByClause("CREATE_TIME ASC");
         return roleCategoryMapper.selectByExample(roleCategoryExample);
     }
 

atms-api/src/test/java/pwc/taxtech/atms/common/JsonIT.java

@@ -72,7 +72,7 @@ public class JsonIT extends CommonIT {
         }
 
         public void setId(String id) {
-            id = id;
+            this.id = id;
         }
     }
 }

atms-dao/src/main/java/pwc/taxtech/atms/dao/UserDimensionValueRoleMapper.java

@@ -111,8 +111,8 @@ public interface UserDimensionValueRoleMapper extends MyMapper {
 
     List<UserOrgRoleDto> getUserDimensionValueRoleList();
 
-    @Select("SELECT USER_DIMENSION_VALUE_ROLE.USERID FROM USER_DIMENSION_VALUE_ROLE "
+    @Select("SELECT USER_DIMENSION_VALUE.USER_ID FROM USER_DIMENSION_VALUE_ROLE "
             + "JOIN USER_DIMENSION_VALUE ON USER_DIMENSION_VALUE_ROLE.USER_DIMENSION_VALUE_ID = USER_DIMENSION_VALUE.ID "
-            + "WHERE USER_DIMENSION_VALUE_ROLE.ROLE_ID=#{ROLEID}")
+            + "WHERE USER_DIMENSION_VALUE_ROLE.ROLE_ID=#{roleId}")
     List<String> getUserIdByUserDimensionValueRole(@Param("roleId") String roleId);
 }
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/dao/UserOrganizationRoleMapper.java

@@ -113,6 +113,6 @@ public interface UserOrganizationRoleMapper extends MyMapper {
 
     @Select("SELECT USER_ORGANIZATION.USERID FROM USER_ORGANIZATION_ROLE "
             + "JOIN USER_ORGANIZATION ON USER_ORGANIZATION_ROLE.USER_ORGANIZATION_ID = USER_ORGANIZATION.ID "
-            + "WHERE USER_ORGANIZATION_ROLE.ROLEID=#{ROLEID}")
+            + "WHERE USER_ORGANIZATION_ROLE.ROLEID=#{roleId}")
     List<String> getUserIdByUserOrganizationRole(@Param("roleId") String roleId);
 }
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/dpo/DimensionValueJoinDimensionDto.java

@@ -13,7 +13,7 @@ public class DimensionValueJoinDimensionDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getDimensionName() {

atms-dao/src/main/java/pwc/taxtech/atms/dpo/OrganizationDto.java

@@ -59,11 +59,11 @@ public class OrganizationDto {
     public List<TaxControlDiskDto> taxControlDiskList;
 
     public String getId() {
-        return id;
+        return this.id;
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getClientCode() {

atms-dao/src/main/java/pwc/taxtech/atms/dpo/UserOrgDto.java

@@ -14,7 +14,7 @@ public class UserOrgDto {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getUserId() {

atms-dao/src/main/java/pwc/taxtech/atms/dpo/UserRoleInfo.java

@@ -55,7 +55,7 @@ public class UserRoleInfo {
      *            the id to set
      */
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     /**

atms-dao/src/main/java/pwc/taxtech/atms/dpo/UserRoleQuery.java

@@ -21,7 +21,7 @@ public class UserRoleQuery {
     }
 
     public void setId(String id) {
-        id = id;
+        this.id = id;
     }
 
     public String getUserId() {

atms-dao/src/main/resources/pwc/taxtech/atms/dao/OrganizationMapper.xml

@@ -32,7 +32,7 @@
     <result column="PHONE_NUMBER" jdbcType="VARCHAR" property="phoneNumber" />
     <result column="REGISTRATION_TYPE" jdbcType="VARCHAR" property="registrationType" />
     <result column="REMARK" jdbcType="VARCHAR" property="remark" />
-    <result column="VEHICLEROUTINGLOCATION" jdbcType="VARCHAR" property="vehicleroutinglocation" />
+    <result column="VEHICLE_ROUTING_LOCATION" jdbcType="VARCHAR" property="vehicleroutinglocation" />
     <result column="RATEPAYER" jdbcType="VARCHAR" property="ratepayer" />
     <result column="ADDRESS" jdbcType="VARCHAR" property="address" />
     <result column="FOUNDATION_DATE" jdbcType="TIMESTAMP" property="foundationDate" />
@@ -118,7 +118,7 @@
     INDUSTRY_ID, BUSINESS_UNIT_ID, IS_ACTIVE, P_LEVEL, CREATE_TIME, UPDATE_TIME, AREA_ID, 
     ENGLISH_NAME, ABBREVIATION, INVOICE_TYPE, LEGAL_PERSON_NAME, MANUFACTURE_ADDRESS, 
     REGISTER_ADDRESS, BANK_ACCOUNT_NAME, BANK_ACCOUNT_NUMBER, PHONE_NUMBER, REGISTRATION_TYPE, 
-    REMARK, VEHICLEROUTINGLOCATION, RATEPAYER, ADDRESS, FOUNDATION_DATE, REGISTRATION_DATE, 
+    REMARK, VEHICLE_ROUTING_LOCATION, RATEPAYER, ADDRESS, FOUNDATION_DATE, REGISTRATION_DATE,
     REGISTRATION_LOCATION, REGISTRATION_CAPITAL, BUSINESS_ALLOTTED_TIME_FROM, BUSINESS_ALLOTTED_TIME_TO, 
     LEGAL_CODE
   </sql>
@@ -181,7 +181,7 @@
       ENGLISH_NAME, ABBREVIATION, INVOICE_TYPE, 
       LEGAL_PERSON_NAME, MANUFACTURE_ADDRESS, REGISTER_ADDRESS, 
       BANK_ACCOUNT_NAME, BANK_ACCOUNT_NUMBER, PHONE_NUMBER, 
-      REGISTRATION_TYPE, REMARK, VEHICLEROUTINGLOCATION, 
+      REGISTRATION_TYPE, REMARK, VEHICLE_ROUTING_LOCATION,
       RATEPAYER, ADDRESS, FOUNDATION_DATE, 
       REGISTRATION_DATE, REGISTRATION_LOCATION, 
       REGISTRATION_CAPITAL, BUSINESS_ALLOTTED_TIME_FROM, 
@@ -286,7 +286,7 @@
         REMARK,
       </if>
       <if test="vehicleroutinglocation != null">
-        VEHICLEROUTINGLOCATION,
+        VEHICLE_ROUTING_LOCATION,
       </if>
       <if test="ratepayer != null">
         RATEPAYER,
@@ -523,7 +523,7 @@
         REMARK = #{record.remark,jdbcType=VARCHAR},
       </if>
       <if test="record.vehicleroutinglocation != null">
-        VEHICLEROUTINGLOCATION = #{record.vehicleroutinglocation,jdbcType=VARCHAR},
+        VEHICLE_ROUTING_LOCATION = #{record.vehicleroutinglocation,jdbcType=VARCHAR},
       </if>
       <if test="record.ratepayer != null">
         RATEPAYER = #{record.ratepayer,jdbcType=VARCHAR},
@@ -589,7 +589,7 @@
       PHONE_NUMBER = #{record.phoneNumber,jdbcType=VARCHAR},
       REGISTRATION_TYPE = #{record.registrationType,jdbcType=VARCHAR},
       REMARK = #{record.remark,jdbcType=VARCHAR},
-      VEHICLEROUTINGLOCATION = #{record.vehicleroutinglocation,jdbcType=VARCHAR},
+      VEHICLE_ROUTING_LOCATION = #{record.vehicleroutinglocation,jdbcType=VARCHAR},
       RATEPAYER = #{record.ratepayer,jdbcType=VARCHAR},
       ADDRESS = #{record.address,jdbcType=VARCHAR},
       FOUNDATION_DATE = #{record.foundationDate,jdbcType=TIMESTAMP},
@@ -686,7 +686,7 @@
         REMARK = #{remark,jdbcType=VARCHAR},
       </if>
       <if test="vehicleroutinglocation != null">
-        VEHICLEROUTINGLOCATION = #{vehicleroutinglocation,jdbcType=VARCHAR},
+        VEHICLE_ROUTING_LOCATION = #{vehicleroutinglocation,jdbcType=VARCHAR},
       </if>
       <if test="ratepayer != null">
         RATEPAYER = #{ratepayer,jdbcType=VARCHAR},
@@ -749,7 +749,7 @@
       PHONE_NUMBER = #{phoneNumber,jdbcType=VARCHAR},
       REGISTRATION_TYPE = #{registrationType,jdbcType=VARCHAR},
       REMARK = #{remark,jdbcType=VARCHAR},
-      VEHICLEROUTINGLOCATION = #{vehicleroutinglocation,jdbcType=VARCHAR},
+      VEHICLE_ROUTING_LOCATION = #{vehicleroutinglocation,jdbcType=VARCHAR},
       RATEPAYER = #{ratepayer,jdbcType=VARCHAR},
       ADDRESS = #{address,jdbcType=VARCHAR},
       FOUNDATION_DATE = #{foundationDate,jdbcType=TIMESTAMP},

atms-dao/src/main/resources/pwc/taxtech/atms/dao/UserMapper.xml

@@ -107,7 +107,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from USER
+    from "USER"
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -122,7 +122,7 @@
     -->
     select 
     <include refid="Base_Column_List" />
-    from USER
+    from "USER"
     where ID = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -130,7 +130,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    delete from USER
+    delete from "USER"
     where ID = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="pwc.taxtech.atms.entity.UserExample">
@@ -138,7 +138,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    delete from USER
+    delete from "USER"
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -148,7 +148,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into USER (ID, USER_NAME, EMAIL, 
+    insert into "USER" (ID, USER_NAME, EMAIL,
       "PASSWORD", LOGIN_TYPE, "STATUS", 
       EXPIRATION_DATE, CREATE_TIME, UPDATE_TIME, 
       IS_ADMIN, PASSWORD_UPDATE_TIME, ATTEMPT_TIMES, 
@@ -166,7 +166,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into USER
+    insert into "USER"
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         ID,
@@ -267,7 +267,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    select count(*) from USER
+    select count(*) from "USER"
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -277,7 +277,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update USER
+    update "USER"
     <set>
       <if test="record.id != null">
         ID = #{record.id,jdbcType=VARCHAR},
@@ -334,7 +334,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update USER
+    update "USER"
     set ID = #{record.id,jdbcType=VARCHAR},
       USER_NAME = #{record.userName,jdbcType=VARCHAR},
       EMAIL = #{record.email,jdbcType=VARCHAR},
@@ -411,7 +411,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update USER
+    update "USER"
     set USER_NAME = #{userName,jdbcType=VARCHAR},
       EMAIL = #{email,jdbcType=VARCHAR},
       "PASSWORD" = #{password,jdbcType=VARCHAR},
@@ -438,7 +438,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from USER
+    from "USER"
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/AreaRegionExtendsMapper.xml

@@ -75,9 +75,9 @@
         P.NAME AS REGION_NAME,
         P.ID AS REGION_ID
         FROM
-        REGION AS P
+        "REGION"  P
         LEFT JOIN
-        AREA_REGION AS AREA_REGION_REAL
+        AREA_REGION  AREA_REGION_REAL
         ON
         P.ID = AREA_REGION_REAL.REGION_ID
         WHERE

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/BusinessUnitExtendsMapper.xml

@@ -43,26 +43,26 @@
         ORG.P_LEVEL AS P_LEVEL,
         ORG.TAX_PAYER_NUMBER AS TAX_PAYER_NUMBER
         FROM
-        BUSINESS_UNIT AS BU
+        BUSINESS_UNIT  BU
         LEFT JOIN
-        ORGANIZATION AS ORG
+        ORGANIZATION  ORG
         ON
         BU.ID = ORG.BUSINESS_UNIT_ID
         AND ORG.IS_ACTIVE = 1
         LEFT JOIN
-        INDUSTRY AS IND
+        INDUSTRY  IND
         ON
         ORG.INDUSTRY_ID = IND.ID
         LEFT JOIN
-        AREA AS AREA
+        AREA  AREA
         ON
         ORG.AREA_ID = AREA.ID
         LEFT JOIN
-        ORGANIZATION_STRUCTURE AS OS
+        ORGANIZATION_STRUCTURE  OS
         ON
         ORG.STRUCTURE_ID = OS.ID
         LEFT JOIN
-        REGION AS REG
+        REGION  REG
         ON
         ORG.REGION_ID = REG.ID
         WHERE

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CellTemplateConfigExtendsMapper.xml

@@ -13,7 +13,7 @@
     </select>
 
     <delete id="deleteCellTemplateConfigByCellTemplate" parameterType="java.lang.Long">
-        DELETE A . * FROM CELL_TEMPLATE_CONFIG A
+        DELETE FROM CELL_TEMPLATE_CONFIG A
         WHERE
         ID IN (SELECT
         ID
@@ -24,7 +24,7 @@
         CELL_TEMPLATE_CONFIG B
         INNER JOIN CELL_TEMPLATE C ON B.CELL_TEMPLATE_ID = C.ID
 
-        WHER
+        WHERE
         C.REPORT_TEMPLATE_ID = #{templateId,jdbcType=VARCHAR}) X)
     </delete>
 

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/DimensionExtendsMapper.xml

@@ -50,41 +50,41 @@
         ORG.PARENT_ID AS PARENT_ID,
         ORG.P_LEVEL AS P_LEVEL
         FROM
-        DIMENSION AS D
+        DIMENSION D
         JOIN
-        DIMENSION_VALUE AS DV
+        DIMENSION_VALUE DV
         ON
         D.ID = DV.DIMENSION_ID
         AND DV.IS_ACTIVE = 1
         LEFT JOIN
-        DIMENSION_VALUE_ORG AS DVG
+        DIMENSION_VALUE_ORG DVG
         ON
         DV.ID = DVG.DIMENSION_VALUE_ID
         LEFT JOIN
-        ORGANIZATION AS ORG
+        ORGANIZATION ORG
         ON
         ORG.ID = DVG.ORGANIZATION_ID
         <if test="orgIsActive != null and orgIsActive == true">
             AND ORG.IS_ACTIVE = 1
         </if>
         LEFT JOIN
-        INDUSTRY AS IND
+        INDUSTRY IND
         ON
         ORG.INDUSTRY_ID = IND.ID
         LEFT JOIN
-        BUSINESS_UNIT AS BU
+        BUSINESS_UNIT BU
         ON
         BU.ID = ORG.BUSINESS_UNIT_ID
         LEFT JOIN
-        AREA AS AREA
+        AREA AREA
         ON
         ORG.AREA_ID = AREA.ID
         LEFT JOIN
-        ORGANIZATION_STRUCTURE AS OS
+        ORGANIZATION_STRUCTURE OS
         ON
         ORG.STRUCTURE_ID = OS.ID
         LEFT JOIN
-        REGION AS REG
+        REGION REG
         ON
         ORG.REGION_ID = REG.ID
         WHERE

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/DimensionValueExtendsMapper.xml

@@ -26,9 +26,9 @@
         P.NAME AS DIMENSION_VALUE,
         P.ID AS DIMENSION_VALUE_ID
         FROM
-        DIMENSION_VALUE AS P
+        DIMENSION_VALUE P
         JOIN
-        DIMENSION AS Q
+        DIMENSION Q
         ON
         P.DIMENSION_ID = Q.ID
     </select>

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/DimensionValueOrgExtendsMapper.xml

@@ -47,7 +47,7 @@
         FROM
         DIMENSION_VALUE_ORG
         )
-        AS Q
+        Q
         JOIN
         (
         SELECT
@@ -83,11 +83,9 @@
         NAME AS DIMENSION_VALUE_NAME,
         IS_ACTIVE,
         #{areaID} AS DIMENSION_ID,
-        NOW (
-        )
+        SYSDATE
         AS CREATE_TIME,
-        NOW (
-        )
+        SYSDATE
         AS UPDATE_TIME
         FROM
         AREA
@@ -108,11 +106,11 @@
         WHERE
         IS_ACTIVE=1
         )
-        AS P
+        P
         ON
         P.DIMENSION_VALUE_ID = Q.DIMENSION_VALUE_ID
         JOIN
-        DIMENSION AS R
+        DIMENSION R
         ON
         R.IS_ACTIVE = 1
         AND P.DIMENSION_ID = R.ID

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/EnterpriseAccountExtendsMapper.xml

@@ -28,7 +28,7 @@
         FROM
         ENTERPRISE_ACCOUNT
         WHERE
-        ENTERPRISE_ACCOUNTSET_ID = #{epAccountSetID}
+        ENTERPRISE_ACCOUNT_SET_ID = #{epAccountSetID}
         )
         EA
         LEFT JOIN

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/EnterpriseAccountSetOrgExtendsMapper.xml

@@ -39,9 +39,9 @@
         M.EXPIRED_DATE AS EXPIRED_DATE,
         N.NAME AS ENTERPRISE_ACCOUNT_SET_NAME
         FROM
-        ENTERPRISE_ACCOUNT_SET_ORG AS M
+        ENTERPRISE_ACCOUNT_SET_ORG M
         LEFT JOIN
-        ENTERPRISE_ACCOUNT_SET AS N
+        ENTERPRISE_ACCOUNT_SET N
         ON
         M.ENTERPRISE_ACCOUNT_SET_ID = N.ID
         WHERE

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/IndustryExtendsMapper.xml

@@ -8,7 +8,7 @@
         FROM
         INDUSTRY
         WHERE
-        isActive = 1
+        is_Active = 1
         AND NAME IN (
         '通用行业',
         '房地产业',
@@ -45,7 +45,8 @@
         A.ID = B.INDUSTRY_IDS
         WHERE
         A.NAME = '通用行业'
-        AND B.GROUP_TYPE = 2 LIMIT 1
+        AND B.GROUP_TYPE = 2
+        AND rownum =1
     </select>
 
 </mapper>
\ No newline at end of file

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/KeyValueReferenceExtendsMapper.xml

@@ -4,7 +4,7 @@
 
     <delete id="deleteKeyValueReferenceByCellTemplate" parameterType="java.lang.Long">
         delete
-        a.* FROM
+        FROM
         KEY_VALUE_REFERENCE a
         WHERE
         ID IN (
@@ -73,19 +73,18 @@
     </resultMap>
 
     <select id="getTaxReturnDetails" parameterType="java.lang.String" resultMap="taxReturnDetail">
-        SELECT DISTINCT
+SELECT DISTINCT
         t.ID,
         '增值税纳税申报表' AS CATEGORY,
         g.PAY_TAX_TYPE,
         g.ID AS TEMPLATE_GROUP_ID,
         g.NAME AS TEMPLATE_GROUP_NAME,
-        t.NAME AS NAME,
+        t.NAME AS "NAME",
         c.ID AS CELL_TEMPLATE_ID,
-        c.ROW_INDEX AS ROW,
-        c.COLUMN_INDEX AS '_COLUMN_',
+        c.ROW_INDEX AS "ROW",
+        c.COLUMN_INDEX AS "_COLUMN_",
         g.INDUSTRY_IDS AS INDUSTRY
-        FROM
-        KEY_VALUE_REFERENCE s
+        FROM KEY_VALUE_REFERENCE s
         JOIN
         CELL_TEMPLATE c
         ON

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/OrganizationExtendsMapper.xml

@@ -172,25 +172,25 @@
         city.NAME AS REGION_NAME,
         city.PARENT_ID AS PARENT_NAME
         FROM
-        DBO.ORGANIZATION p
+        ORGANIZATION p
         LEFT JOIN
-        DBO.BUSINESS_UNIT unit
+        BUSINESS_UNIT unit
         on
         p.BUSINESS_UNIT_ID = unit.ID --tempq
         left JOIN
-        DBO.INDUSTRY industry
+        INDUSTRY industry
         on
         p.INDUSTRY_ID = industry.ID --industryReal
         left JOIN
-        DBO.ORGANIZATION_STRUCTURE structure
+        ORGANIZATION_STRUCTURE structure
         on
         p.STRUCTURE_ID = structure.ID --structureReal
         left JOIN
-        DBO.AREA area
+        AREA area
         on
         p.AREA_ID = area.ID --areaReal
         left JOIN
-        DBO.REGION city
+        REGION city
         on
         p.REGION_ID = city.ID --cityReal
         where
@@ -237,7 +237,7 @@
         SELECT DISTINCT
         ORG.ID AS ID,
         ORG.NAME AS NAME,
-        D.ATTRIBUTEID AS ATTRIBUTE_ID,
+        D.ATTRIBUTE_ID AS ATTRIBUTE_ID,
         S.NAME AS ATTRIBUTE_NAME,
         D.ID AS DIMENSION_ID,
         D.NAME AS DIMENSION_NAME,
@@ -322,11 +322,9 @@
         AREA.NAME AS DIMENSION_VALUE_NAME,
         AREA.IS_ACTIVE AS IS_ACTIVE,
         'c61a5bd6-a996-4952-9869-d053995237e6' DIMENSION_ID,
-        now (
-        )
+        SYSDATE
         AS CREATE_TIME,
-        now (
-        )
+        SYSDATE
         AS UPDATE_TIME
         FROM
         AREA
@@ -343,9 +341,9 @@
         dv.CREATE_TIME AS CREATE_TIME,
         dv.UPDATE_TIME AS UPDATE_TIME
         FROM
-        DIMENSION_VALUE AS dv
+        DIMENSION_VALUE dv
         )
-        AS DVQ
+        DVQ
         JOIN
         (
         SELECT
@@ -356,7 +354,7 @@
         WHERE
         IS_ACTIVE = 1
         )
-        AS d
+        d
         on
         dvq.DIMENSION_ID = d.ID
         JOIN
@@ -367,7 +365,7 @@
         org.ID AS ORGANIZATION_ID,
         org.NAME AS NAME
         FROM
-        ORGANIZATION AS org
+        ORGANIZATION org
         WHERE
         org.IS_ACTIVE = 1
 
@@ -411,7 +409,7 @@
         WHERE
         org.IS_ACTIVE = 1
         )
-        AS DVGQ
+        DVGQ
         on
         dvq.DIMENSION_VALUE_ID = dvgq.DIMENSION_VALUE_ID
     </select>
@@ -447,7 +445,7 @@
         WHERE
         P.IS_ACTIVE = 1
         )
-        AS Q
+        Q
         JOIN
         DIMENSION_VALUE_ORG  DVG
         ON
@@ -534,7 +532,7 @@
         M.REMARK,
         M.VEHICLE_ROUTING_LOCATION,
         N.NAME AS INDUSTRY_NAME,
-        PREGION.NAME + T.NAME AS REGION_NAME,
+       CONCAT(PREGION.NAME,T.NAME) AS REGION_NAME,
         S.NAME AS STRUCTURE_NAME,
         T.PARENT_ID AS PARENT_REGION_ID,
         AR.NAME AS AREA_NAME,
@@ -602,7 +600,7 @@
         M.ID AS ID,
         M.NAME AS ORG_NAME,
         M.TAX_PAYER_NUMBER AS TAX_PAYER_NUMBER,
-        ACCSET.NAME AS ACCOUNT_SET_NAME,
+        ACC_SET.NAME AS ACCOUNT_SET_NAME,
         ST.NAME AS SERVICE_NAME,
         T.NAME AS BUSINESS_UNIT_NAME,
         N.NAME AS INDUSTRY_NAME,
@@ -616,7 +614,7 @@
         ON
         M.INDUSTRY_ID = N.ID
         LEFT JOIN
-        ORGANIZATION_SERVICE_TEMP_LATE_GROUP  STG
+        ORG_SERVICE_TEMPLATE_GROUP  STG
         ON
         M.ID = STG.ORGANIZATION_ID
         LEFT JOIN
@@ -632,15 +630,15 @@
         AREA  AR
         ON
         AR.IS_ACTIVE = 1
-        AND M.AREAID = AR.ID
+        AND M.AREA_ID = AR.ID
         LEFT JOIN
         ENTERPRISE_ACCOUNT_SET_ORG  SET_ORG
         ON
-        M.ID = SETORG.ORGANIZATION_ID
+        M.ID = SET_ORG.ORGANIZATION_ID
         LEFT JOIN
         ENTERPRISE_ACCOUNT_SET  ACC_SET
         ON
-        ACCSET.IS_ACTIVE = 1
-        AND SET_ORG.ENTERPRISE_ACCOUNTS_ET_ID = ACCSET.ID
+        ACC_SET.IS_ACTIVE = 1
+        AND SET_ORG.ENTERPRISE_ACCOUNT_SET_ID = ACC_SET.ID
     </select>
 </mapper>
\ No newline at end of file

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/OrganizationServiceTemplateGroupExtendsMapper.xml

@@ -18,9 +18,9 @@
         M.TEMPLATE_GROUP_ID AS TEMPLATE_GROUP_ID,
         T.NAME AS TEMPLATE_GROUP_NAME
         FROM
-        ORGANIZATION_SERVICE_TEMPLATE_GROUP AS M
+        ORG_SERVICE_TEMPLATE_GROUP M
         LEFT JOIN
-        TEMPLATE_GROUP AS T
+        TEMPLATE_GROUP T
         ON
         M.TEMPLATE_GROUP_ID = T.ID
         WHERE
@@ -33,7 +33,7 @@
         SELECT
         Q.NAME
         FROM
-        ORGANIZATION_SERVICE_TEMPLATE_GROUP P
+        ORG_SERVICE_TEMPLATE_GROUP P
         LEFT JOIN
         ORGANIZATION Q
         ON

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/RolePermissionExtendsMapper.xml

@@ -70,8 +70,8 @@
         on
         p.ID = rp.PERMISSION_ID
         where
-        rp.ROLE_ID_= #{roleID,jdbcType=VARCHAR}
-        AND R.SERVICE_TYPE_ID_= #{serviceTypeID,jdbcType=VARCHAR}
+        rp.ROLE_ID_= #{roleId,jdbcType=VARCHAR}
+        AND R.SERVICE_TYPE_ID= #{serviceTypeId,jdbcType=VARCHAR}
     </select>
 
     <select id="selectByRoleListAndServiceTypeWithAssociation" resultMap="ResultMapWithAssociation">
@@ -108,7 +108,7 @@
         on
         p.ID = rp.PERMISSION_ID
         where
-        r.SERVICE_TYPE_ID_= #{serviceTypeID,jdbcType=VARCHAR}
+        r.SERVICE_TYPE_ID= #{serviceTypeID,jdbcType=VARCHAR}
         AND RP.ROLE_ID in
         <foreach close=")" collection="roleList" index="index" item="roleID" open="(" separator=",">
             #{roleID}

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/TemplateExtendsMapper.xml

@@ -36,16 +36,16 @@
         <where>
             1=1
             <if test="serviceTypeId!=null">
-                AND Q.service_type_id= #{serviceTypeId,jdbcType=VARCHAR}
+                AND Q.SERVICE_TYPE_ID= #{serviceTypeId,jdbcType=VARCHAR}
             </if>
             <if test="payTaxType!=null">
-                AND Q.pay_tax_type = #{payTaxType,jdbcType=INTEGER}
+                AND Q.PAY_TAX_TYPE = #{payTaxType,jdbcType=INTEGER}
             </if>
             <if test="reportType!=null">
-                AND P.report_type = #{reportType,jdbcType=INTEGER}
+                AND P.REPORT_TYPE = #{reportType,jdbcType=INTEGER}
             </if>
             <if test="industryIds!=null">
-                AND Q.industry_ids = #{industryID,jdbcType=VARCHAR}
+                AND Q.INDUSTRY_IDS = #{industryID,jdbcType=VARCHAR}
             </if>
         </where>
         ORDER BY
@@ -71,7 +71,7 @@
         ON
         P.TEMPLATE_GROUP_ID=Q.ID
         WHERE
-        p.ID_= #{id,jdbcType=VARCHAR} LIMIT 1
+        p.ID= #{id,jdbcType=VARCHAR} AND ROWNUM=1
     </select>
 
     <select id="getCountOfTemplateAndGroupByTemplateName" parameterType="map" resultType="java.lang.Long">
@@ -91,10 +91,10 @@
                 AND Q.ID = #{templateGroupId,jdbcType=VARCHAR}
             </if>
             <if test="templateId!=null">
-                AND P.ID_&lt;&gt; #{templateId,jdbcType=VARCHAR}
+                AND P.ID&lt;&gt; #{templateId,jdbcType=VARCHAR}
             </if>
             <if test="templateName!=null">
-                AND P.NAME_= #{templateName,jdbcType=VARCHAR}
+                AND P.NAME= #{templateName,jdbcType=VARCHAR}
             </if>
         </where>
     </select>
@@ -107,6 +107,7 @@
         <result column="TEMPLATE_CODE" jdbcType="VARCHAR" property="templateCode"/>
     </resultMap>
 
+    <!--TODO: 考虑项目库表迁移-->
     <select id="getTemplateLeftJoinReport" parameterType="map" resultMap="reportDto">
         SELECT
         D.ID AS ID,
@@ -136,7 +137,7 @@
         B.PERIOD,
         B.TEMPLATE_ID
         FROM
-        ${DB_NAME_}.REPORT b
+        ${DB_NAME}.REPORT b
         WHERE
         b.PERIOD = #{period,jdbcType=INTEGER}
         AND B.PROJECT_ID = #{projectID,jdbcType=VARCHAR}

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/UserDimensionValueExtendsMapper.xml

@@ -11,9 +11,9 @@
         Q.HAS_ORIGINAL_ROLE AS HAS_ORIGINAL_ROLE,
         Q.IS_ACCESSIBLE AS IS_ACCESSIBLE
         FROM
-        USER_DIMENSION_VALUE AS Q
+        USER_DIMENSION_VALUE Q
         JOIN
-        "USER" AS U
+        "USER" U
         ON
         Q.USER_ID = U.ID
         AND U.STATUS =1

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/UserDimensionValueRoleExtendsMapper.xml

@@ -9,16 +9,13 @@
     </resultMap>
 
     <select id="getUserDimensionValueRoleList" resultMap="UserOrgRoleDto">
-        SELECT
-        UDV.USER_DIMENSION_VALUE_ID AS ID,
-        UDV.ROLE_ID AS ROLE_ID,
-        R.NAME AS ROLE_NAME
-        FROM
-        USER_DIMENSION_VALUE_ROLE AS UDV
-        JOIN
-        ROLE AS R
-        ON
-        UDV.ROLE_ID = R.ID
+         SELECT UDV.USER_DIMENSION_VALUE_ID AS ID,
+        UDV.ROLE_ID                 AS ROLE_ID,
+        R.NAME                      AS ROLE_NAME
+           FROM USER_DIMENSION_VALUE_ROLE UDV
+           JOIN ROLE R
+             ON UDV.ROLE_ID = R.ID
+
     </select>
 
 </mapper>
\ No newline at end of file

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/UserOrganizationExtendsMapper.xml

@@ -10,9 +10,9 @@
         Q.IS_ACCESSIBLE AS IS_ACCESSIBLE,
         Q.HAS_ORIGINAL_ROLE AS HAS_ORIGINAL_ROLE
         FROM
-        USER_ORGANIZATION AS Q
+        USER_ORGANIZATION Q
         JOIN
-        "USER" AS U
+        "USER" U
         ON
         Q.USER_ID = U.ID
         WHERE

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/UserOrganizationRoleExtendsMapper.xml

@@ -14,9 +14,9 @@
         Q.ROLE_ID AS ROLE_ID,
         R.NAME AS ROLE_NAME
         FROM
-        USER_ORGANIZATION_ROLE AS Q
+        USER_ORGANIZATION_ROLE Q
         JOIN
-        ROLE AS R
+        ROLE  R
         ON
         Q.ROLE_ID = R.ID
     </select>

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/UserRoleExtendsMapper.xml

@@ -34,36 +34,36 @@
         U.EMAIL AS EMAIL,
         U.STATUS AS STATUS
         FROM
-        USER AS U
+        "USER" U
         LEFT JOIN
-        USER_ROLE AS UR
+        USER_ROLE UR
         ON
         U.ID = UR
         .USER_ID
         LEFT JOIN
-        ROLE AS R
+        ROLE R
         ON UR
         .ROLE_ID = R.ID
         LEFT JOIN
-        SERVICE_TYPE AS S
+        SERVICE_TYPE S
         ON
         S.ID = R.SERVICE_TYPE_ID
         AND S.IS_ACTIVE = 1
         AND S.ID = #{serviceTypeID}
         LEFT JOIN
-        ROLE_CATEGORY AS RC
+        ROLE_CATEGORY RC
         ON
         RC.ID = R.ROLE_CATEGORY_ID
         AND RC.IS_ACTIVE = 1
         LEFT JOIN
-        ORGANIZATION AS ORG
+        ORGANIZATION ORG
         ON
         U.ORGANIZATION_ID = ORG.ID
         WHERE
         U.STATUS = 1
         AND U.IS_SUPER_ADMIN = 0
         ORDER BY
-        USERNAME
+        USER_NAME
     </select>
 
     <resultMap id="UserOrgRoleDto" type="pwc.taxtech.atms.dpo.UserOrgRoleDto">
@@ -79,9 +79,9 @@
         R.ID AS ROLE_ID,
         R.NAME AS ROLE_NAME
         FROM
-        USER_ROLE AS UR
+        USER_ROLE UR
         JOIN
-        ROLE AS R
+        ROLE R
         ON UR
         .ROLE_ID = R.ID
     </select>