fixed db sql error

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

@@ -45,7 +45,7 @@ public class AreaRegionController {
 
     @ApiOperation(value = "Get cities")
     @RequestMapping(value = "getCities", method = RequestMethod.GET)
-    public @ResponseBody List<AreaRegionDto> getCities(@RequestParam(name = "parentId") String parentId) {
+    public @ResponseBody List<AreaRegionDto> getCities(@RequestParam(name = "parentID") String parentId) {
         logger.info("/api/v1/areaRegion/getProvinces");
         return areaRegionService.getCities(parentId);
     }

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

@@ -252,7 +252,7 @@ public class EnterpriseAccountManagerController {
 	
 	@ApiOperation(value = "获取企业账套Mapping")
     @RequestMapping(value = { "/getAccountMappingOrg" }, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public @ResponseBody List<AccountMappingDto> getAccountMappingOrg(@RequestParam String organizationId) {
+    public @ResponseBody List<AccountMappingDto> getAccountMappingOrg(@RequestParam(name="organizationID") String organizationId) {
         return enterpriseAccountService.getAccountMappingOrg(organizationId);
     }
 

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

@@ -94,7 +94,7 @@ public class OrganizationController {
     public @ResponseBody
     List<DimensionOrgDtoDashboard> getOrgDashboardPost(
             @RequestBody(required = false) List<String> expandedOrgList,
-            @RequestParam("dimensionId") String dimensionId, @RequestParam("parentOrgId") String parentOrgId) {
+            @RequestParam("dimensionID") String dimensionId, @RequestParam("parentOrgID") String parentOrgId) {
         logger.info("POST /api/v1/org/getOrgDashboard");
         OrgDashboardParams param = new OrgDashboardParams();
         param.setExpandedOrgList(expandedOrgList);

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

@@ -172,9 +172,9 @@ public class RoleController {
 
     @ApiOperation(value = "Get user role list by organizationId, dimensionId and dimensionValueId")
     @RequestMapping(value = "getUserRoleList", method = RequestMethod.GET)
-    public @ResponseBody List<UserRoleInfo> getUserRoleList(@RequestParam("organizationId") String organizationId,
-            @RequestParam("dimensionId") String dimensionId,
-            @RequestParam("dimensionValueId") String dimensionValueId) {
+    public @ResponseBody List<UserRoleInfo> getUserRoleList(@RequestParam("organizationID") String organizationId,
+            @RequestParam("dimensionID") String dimensionId,
+            @RequestParam("dimensionValueID") String dimensionValueId) {
 
         UserRoleDimensionValueDto userRoleDimensionValueDto = new UserRoleDimensionValueDto();
         userRoleDimensionValueDto.setOrganizationId(organizationId);

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

@@ -24,9 +24,9 @@ public class StatisticAttributeController {
     private StatisticAttributeService statisticAttributeService;
 
     @ApiOperation(value = "显示自定义显示字段")
-    @RequestMapping(value = "getByParentDimensionId", method = RequestMethod.GET)
+    @RequestMapping(value = "getByParentDimensionID", method = RequestMethod.GET)
     public @ResponseBody List<StatisticAttributeDisplayDto> getDimensionStatics(
-            @RequestParam("parentDimensionId") String parentDimensionId) {
+            @RequestParam("parentDimensionID") String parentDimensionId) {
         return statisticAttributeService.getStatisticAttributeListByDimensionId(parentDimensionId, null);
     }
 

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

@@ -76,7 +76,7 @@ public class UserController {
 
     @ApiOperation(value = "获取所有的用户角色列表")
     @RequestMapping(value = "getAllUserRoleList", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public List<UserRoleDisplayInfo> getAllUserRoleList(@RequestParam("serviceTypeId") String serviceTypeId) {
+    public List<UserRoleDisplayInfo> getAllUserRoleList(@RequestParam("serviceTypeID") String serviceTypeId) {
         return userRoleService.getAllUserRoleList(serviceTypeId);
     }
 

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

@@ -25,7 +25,7 @@ public class MenuDto {
     private Boolean isActive;
 
     private Integer orderIndex;
-    @JsonProperty("parentID")
+    @JsonProperty("serviceTypeID")
     private String serviceTypeId;
     @JsonProperty("parentID")
     private String parentId;

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

@@ -57,7 +57,7 @@ public class DimensionServiceImpl extends AbstractService implements DimensionSe
     @Override
     public List<DimensionDto> getDimensionStatics() {
         DimensionExample example = new DimensionExample();
-        example.setOrderByClause("OrderIndex");
+        example.setOrderByClause("ORDER_INDEX");
         List<Dimension> dimensionList = dimensionMapper.selectByExample(example);
 
         DimensionValueExample valueExample = new DimensionValueExample();
@@ -247,7 +247,7 @@ public class DimensionServiceImpl extends AbstractService implements DimensionSe
     private Dimension findByIdAndIsActiveTrue(String id) {
         DimensionExample example = new DimensionExample();
         example.createCriteria().andIdEqualTo(id).andIsActiveEqualTo(true);
-        example.setOrderByClause("OrderIndex asc");
+        example.setOrderByClause("ORDER_INDEX asc");
 
         return dimensionMapper.selectByExample(example).stream().findFirst().orElse(null);
     }
@@ -261,7 +261,7 @@ public class DimensionServiceImpl extends AbstractService implements DimensionSe
 
     private List<Dimension> findDimensionOrderByIsActiveDescAndOrderIndexAsc() {
         DimensionExample example = new DimensionExample();
-        example.setOrderByClause("IsActive desc, OrderIndex asc");
+        example.setOrderByClause("IS_ACTIVE desc, ORDER_INDEX asc");
         return dimensionMapper.selectByExample(example);
     }
 

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

@@ -32,15 +32,7 @@ import pwc.taxtech.atms.dto.organization.OrgRoleDto;
 import pwc.taxtech.atms.dto.organization.OrgRoleDtoList;
 import pwc.taxtech.atms.dto.organization.SimpleRoleDto;
 import pwc.taxtech.atms.dto.role.RoleDto;
-import pwc.taxtech.atms.dto.user.DimensionUser;
-import pwc.taxtech.atms.dto.user.NameDto;
-import pwc.taxtech.atms.dto.user.OrganizationRoleInfo;
-import pwc.taxtech.atms.dto.user.UpdateParam;
-import pwc.taxtech.atms.dto.user.UserAndUserRoleSaveDto;
-import pwc.taxtech.atms.dto.user.UserOrganizationDto;
-import pwc.taxtech.atms.dto.user.UserRoleDimensionValueDto;
-import pwc.taxtech.atms.dto.user.UserRoleDisplayInfo;
-import pwc.taxtech.atms.dto.user.UserRoleQueryDto;
+import pwc.taxtech.atms.dto.user.*;
 import pwc.taxtech.atms.entity.*;
 import pwc.taxtech.atms.entity.UserRoleExample.Criteria;
 import pwc.taxtech.atms.exception.ApplicationException;

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

@@ -14,19 +14,19 @@ import pwc.taxtech.atms.entity.EnterpriseAccount;
 @Mapper
 public interface CustomAccountMapper extends MyMapper {
 
-    @Select("SELECT ea.id,ea.Code,ea.Name,ea.ParentCode,ea.FullName,"
-            + "CASE WHEN am.StandardAccountCode='0000' THEN am.StandardAccountCode ELSE sa.Code END StdCode,"
-            + "sa.Name StdName,sa.ParentCode StdParentCode "
-            + "FROM (SELECT * FROM EnterpriseAccount where parentcode=#{parentCode} and Enterpriseaccountsetid=#{accountSetId}) ea "
-            + "LEFT JOIN (SELECT * FROM AccountMapping WHERE OrganizationID=#{orgId} AND IndustryID=#{industryId} AND EnterpriseAccountSetID=#{accountSetId}) am ON ea.Code=am.EnterpriseAccountCode "
-            + "LEFT JOIN (SELECT * FROM StandardAccount WHERE IndustryID=#{industryId}) sa ON am.StandardAccountCode=sa.Code "
+    @Select("SELECT ea.id,ea.Code,ea.Name,ea.PARENT_CODE,ea.FULL_NAME,"
+            + "CASE WHEN am.STANDARD_ACCOUNT_CODE='0000' THEN am.STANDARD_ACCOUNT_CODE ELSE sa.Code END StdCode,"
+            + "sa.Name StdName,sa.PARENT_CODE StdParentCode "
+            + "FROM (SELECT * FROM ENTERPRISE_ACCOUNT where PARENT_CODE=#{parentCode} and ENTERPRISE_ACCOUNT_SET_ID=#{accountSetId}) ea "
+            + "LEFT JOIN (SELECT * FROM ACCOUNT_MAPPING WHERE ORGANIZATION_ID=#{orgId} AND INDUSTRY_ID=#{industryId} AND ENTERPRISE_ACCOUNT_SET_ID=#{accountSetId}) am ON ea.Code=am.ENTERPRISE_ACCOUNT_CODE "
+            + "LEFT JOIN (SELECT * FROM StandardAccount WHERE IndustryID=#{industryId}) sa ON am.STANDARD_ACCOUNT_CODE=sa.Code "
             + "ORDER BY ea.CODE")
     @Results({
         @Result(id = true, column = "id", property = "id"),
         @Result(column = "Code", property = "code"),
         @Result(column = "Name", property = "name"),
-        @Result(column = "ParentCode", property = "parentCode"),
-        @Result(column = "FullName", property = "fullName"),
+        @Result(column = "PARENT_CODE", property = "parentCode"),
+        @Result(column = "FULL_NAME", property = "fullName"),
         @Result(column = "StdCode", property = "stdCode"),
         @Result(column = "StdName", property = "stdName")
         //@Result(column = "StdParentCode", property = "stdParentCode")
@@ -37,12 +37,12 @@ public interface CustomAccountMapper extends MyMapper {
     
     
     
-    @Select("SELECT COUNT(1) FROM AccountMapping "
-            + "WHERE EnterpriseAccountCode=#{enterpirseAccountCode} "
-            + "AND EnterpriseAccountSetID=#{enterpriseAccountSetId} "
-            + "AND OrganizationID=#{organizationId} "
-            + "AND IndustryID=#{organizationId} "
-            + "AND StandardAccountCode<>'0000'")
+    @Select("SELECT COUNT(1) FROM Account_Mapping "
+            + "WHERE Enterprise_Account_Code=#{enterpirseAccountCode} "
+            + "AND Enterprise_Account_Set_ID=#{enterpriseAccountSetId} "
+            + "AND Organization_ID=#{organizationId} "
+            + "AND Industry_ID=#{organizationId} "
+            + "AND Standard_Account_Code<>'0000'")
     Long countStandardAccounts(@Param(value="enterpriseAccountSetId") String enterpriseAccountSetId,
             @Param(value="enterpirseAccountCode") String enterpirseAccountCode, 
             @Param(value="industryId") String industryId,

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

@@ -43,17 +43,17 @@ public interface FormulaAdminMapper extends MyMapper {
     List<GroupId> getTemplateGroupId(@Param("projectId") String projectId);
 
     @Select("SELECT  " +
-            "    p.DbName " +
+            "    p.ID " +
             "FROM " +
             "    Project p " +
             "        JOIN " +
-            "    ProjectServiceType ps ON p.id = ps.ProjectID " +
+            "    Project_Service_Type ps ON p.id = ps.Project_ID " +
             "WHERE " +
-            "    ps.ServiceTypeID IN ('2' , '3') " +
+            "    ps.Service_Type_ID IN ('2' , '3') " +
             "        AND p.Year = #{year} " +
-            "        AND p.OrganizationID = #{orgId} " +
-            "        AND p.IsActive = 1 " +
-            "ORDER BY ps.ServiceTypeID " +
-            "LIMIT 0 , 1")
+            "        AND p.Organization_ID = #{orgId} " +
+            "        AND p.Is_Active = 1 " +
+            " AND ROWNUM=1"+
+            "ORDER BY ps.Service_Type_ID ")
     String getPastProjectDbName(@Param("year") int year, @Param("orgId") String organizationId);
 }

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

@@ -17,10 +17,10 @@ import pwc.taxtech.atms.entity.UserOrganization;
 @Mapper
 public interface MyUserMapper extends MyMapper {
 
-    @Select("select ur.id as id, ur.IsAccessible as IsAccessible, ur.HasOriginalRole as HasOriginalRole, "
-            + "org.id as OrganizationID, org.Name as OrganizationName from UserOrganization as ur "
-            + "join Organization as org on ur.OrganizationID = org.id "
-            + "where ur.UserID = #{userId} and org.IsActive = 1")
+    @Select("select ur.id as id, ur.Is_Accessible as IsAccessible, ur.Has_Original_Role as HasOriginalRole, "
+            + "org.id as OrganizationID, org.Name as OrganizationName from User_Organization ur "
+            + "join \"Organization\" org on ur.Organization_ID = org.id "
+            + "where ur.User_ID = #{userId} and org.Is_Active = 1")
     @Results({ @Result(id = true, column = "id", property = "id"),
             @Result(column = "IsAccessible", property = "isAccessible", javaType = Boolean.class),
             @Result(column = "HasOriginalRole", property = "hasOriginalRole", javaType = Boolean.class),
@@ -28,37 +28,37 @@ public interface MyUserMapper extends MyMapper {
             @Result(column = "OrganizationName", property = "organizationName", javaType = String.class) })
     List<Map<String, Object>> selectUserOrganizationMapByUserId(@Param(value = "userId") String userId);
 
-    @Select("select urd.id, urd.DimensionValueID, urd.DimensionID, urd.UserID, urd.IsAccessible, urd.HasOriginalRole, u.UserName "
-            + "from UserDimensionValue as urd " + "join User as u on urd.UserID = u.id " + "where u.Status = 1")
+    @Select("select urd.id, urd.Dimension_Value_ID, urd.Dimension_ID, urd.User_ID, urd.Is_Accessible, urd.Has_Original_Role, u.User_Name "
+            + "from User_Dimension_Value urd " + "join \"User\" u on urd.UserID = u.id " + "where u.Status = 1")
     @Results({ @Result(id = true, column = "id", property = "id"),
-            @Result(column = "DimensionValueID", property = "dimensionValueID", javaType = String.class),
-            @Result(column = "DimensionID", property = "dimensionId", javaType = String.class),
-            @Result(column = "UserID", property = "userID", javaType = String.class),
-            @Result(column = "IsAccessible", property = "isAccessible", javaType = Boolean.class),
-            @Result(column = "HasOriginalRole", property = "hasOriginalRole", javaType = Boolean.class),
-            @Result(column = "UserName", property = "userName", javaType = String.class) })
+            @Result(column = "Dimension_Value_ID", property = "dimensionValueID", javaType = String.class),
+            @Result(column = "Dimension_ID", property = "dimensionId", javaType = String.class),
+            @Result(column = "User_ID", property = "userID", javaType = String.class),
+            @Result(column = "Is_Accessible", property = "isAccessible", javaType = Boolean.class),
+            @Result(column = "Has_Original_Role", property = "hasOriginalRole", javaType = Boolean.class),
+            @Result(column = "User_Name", property = "userName", javaType = String.class) })
     List<Map<String, Object>> selectUserDimensionValueMap();
 
-    @Select("select x.RoleID, y.Name as RoleName from UserRole as x " + "join Role as y on x.RoleID = y.id "
-            + "where x.UserID = #{userId} and x.ProjectID is NULL")
-    @Results({ @Result(column = "RoleID", property = "roleID", javaType = String.class),
+    @Select("select x.Role_ID, y.Name as RoleName from User_Role x " + "join Role y on x.Role_ID = y.id "
+            + "where x.User_ID = #{userId} and x.Project_ID is NULL")
+    @Results({ @Result(column = "Role_ID", property = "roleID", javaType = String.class),
             @Result(column = "RoleName", property = "roleName", javaType = String.class) })
     List<Map<String, String>> selectUserRoleListByUserId(@Param(value = "userId") String userId);
 
-    @Select("select q.id, q.OrganizationID, q.UserID, q.IsAccessible, q.HasOriginalRole from UserOrganization as q join User as u on q.UserID = u.id "
+    @Select("select q.id, q.Organization_ID, q.User_ID, q.Is_Accessible, q.Has_Original_Role from User_Organization q join \"User\" u on q.User_ID = u.id "
             + "where u.Status = 1")
     @Results({ @Result(id = true, column = "id", property = "id"),
-            @Result(column = "OrganizationID", property = "organizationID"),
-            @Result(column = "HasOriginalRole", property = "hasOriginalRole"),
-            @Result(column = "UserID", property = "userID"),
-            @Result(column = "IsAccessible", property = "isAccessible") })
+            @Result(column = "Organization_ID", property = "organizationID"),
+            @Result(column = "Has_Original_Role", property = "hasOriginalRole"),
+            @Result(column = "User_ID", property = "userID"),
+            @Result(column = "Is_Accessible", property = "isAccessible") })
     List<UserOrganization> selectUserOrganizationByUserId();
 
-    @Select("select p.DimensionValueID, p.DimensionID, d.Name as DimensionName, p.DimensionValueName as DimensionValue "
-            + "from (select id as DimensionValueID, Name as DimensionValueName, IsActive, #{dimensionId} as DimensionID, "
-            + "CreateTime, UpdateTime from BusinessUnit where IsActive = 1 " + "union "
-            + "select id as DimensionValueID, Name as DimensionValueName, IsActive, DimensionID, CreateTime, UpdateTime "
-            + "from DimensionValue) as p " + "join Dimension as d on p.DimensionID = d.id " + "where d.IsActive = 1")
+    @Select("select p.Dimension_Value_ID, p.Dimension_ID, d.Name as DimensionName, p.Dimension_Value_Name as Dimension_Value "
+            + "from (select id as Dimension_Value_ID, Name as Dimension_Value_Name, Is_Active, #{dimensionId} as Dimension_ID, "
+            + "Create_Time, Update_Time from Business_Unit where Is_Active = 1 " + "union "
+            + "select id as DimensionValueID, Name as DimensionValueName, Is_Active, Dimension_ID, Create_Time, Update_Time "
+            + "from Dimension_Value) p " + "join Dimension d on p.Dimension_ID = d.id " + "where d.Is_Active = 1")
     @Results({ @Result(column = "DimensionValueID", property = "dimensionValueID"),
             @Result(column = "DimensionID", property = "dimensionId"),
             @Result(column = "DimensionName", property = "dimensionName"),
@@ -66,18 +66,18 @@ public interface MyUserMapper extends MyMapper {
     List<DimensionValueOrgDto> selectUserRoleDimensionValueByDimensionId(
             @Param(value = "dimensionId") String dimensionId);
 
-    @Select("select urd.id, urd.OrganizationID as OrgID, urd.UserID, urd.IsAccessible, urd.HasOriginalRole, u.UserName as UserName "
-            + "from UserOrganization as urd join User as u on urd.UserID = u.id where u.Status = 1")
+    @Select("select urd.id, urd.Organization_ID as OrgID, urd.User_ID, urd.Is_Accessible, urd.Has_Original_Role, u.User_Name as UserName "
+            + "from User_Organization urd join \"User\"  u on urd.User_ID = u.id where u.Status = 1")
     @Results({ @Result(id = true, column = "id", property = "id"),
             @Result(column = "OrgID", property = "orgID", javaType = String.class),
-            @Result(column = "UserID", property = "userID", javaType = String.class),
-            @Result(column = "IsAccessible", property = "isAccessible", javaType = Boolean.class),
-            @Result(column = "HasOriginalRole", property = "hasOriginalRole", javaType = Boolean.class),
-            @Result(column = "UserName", property = "userName", javaType = String.class) })
+            @Result(column = "User_ID", property = "userID", javaType = String.class),
+            @Result(column = "Is_Accessible", property = "isAccessible", javaType = Boolean.class),
+            @Result(column = "Has_Original_Role", property = "hasOriginalRole", javaType = Boolean.class),
+            @Result(column = "User_Name", property = "userName", javaType = String.class) })
     List<Map<String, Object>> selectUserOrganizationMap();
 
-    @Select("select ur.UserID, r.id as RoleID, r.Name as RoleName from UserRole as ur join Role as r on ur.RoleID = r.id")
-    @Results({ @Result(column = "UserID", property = "userID"), @Result(column = "RoleID", property = "roleID"),
+    @Select("select ur.User_ID, r.id as RoleID, r.Name as RoleName from USER_ROLE ur join \"ROLE\" r on ur.Role_ID = r.id")
+    @Results({ @Result(column = "User_ID", property = "userID"), @Result(column = "RoleID", property = "roleID"),
             @Result(column = "RoleName", property = "roleName") })
     List<UserOrgRoleDto> selectUserOrgRoleDto();
 }

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

@@ -137,9 +137,9 @@ public interface ProjectMapper extends MyMapper {
             "    p.START_PERIOD AS StartPeriod, " +
             "    p.END_PERIOD AS EndPeriod " +
             "FROM " +
-            "    Project p " +
+            "    \"Project\" p " +
             "        JOIN " +
-            "    Organization org ON p.ORGANIZATION_ID = org.id " +
+            "    \"Organization\" org ON p.ORGANIZATION_ID = org.id " +
             "        JOIN " +
             "    PROJECT_SERVICE_TYPE projectServiceType ON p.id = projectServiceType.PROJECT_ID " +
             "        JOIN " +
@@ -157,7 +157,7 @@ public interface ProjectMapper extends MyMapper {
             "   <where>" +
             "       p.IS_ACTIVE=1 and serviceType.IS_ACTIVE=1 and p.ORGANIZATION_ID = enterOrg.ORGANIZATION_ID" +
             "       <if test=\"orgId != null and orgId !='' \">AND org.id=#{orgId}</if>" +
-            "       <if test=\"serverId != null and serverId !='' \">AND p.serviceType=#{serverId}</if>" +
+//            "       <if test=\"serverId != null and serverId !='' \">AND p.serviceType=#{serverId}</if>" +
             "       <if test=\"projectYear != null\">AND p.Year=#{projectYear}</if>" +
             "   </where>" +
             "</script>")
@@ -169,9 +169,9 @@ public interface ProjectMapper extends MyMapper {
             "FROM " +
             "    PROJECT_STATUS_MANAGE p " +
             "WHERE " +
-            "    p.DB_NAME = #{dbName} " +
+            "    p.DB_NAME = #{projectID} " +
             "ORDER BY PERIOD_ID , Status")
-    List<ProjectStatusManage> getProjectSatusListByDbName(String dbName);
+    List<ProjectStatusManage> getProjectSatusListByDbName(String projectID);
 
     @Select("<script>" +
             "SELECT   " +
@@ -228,9 +228,9 @@ public interface ProjectMapper extends MyMapper {
             "FROM " +
             "    PROJECT_STATUS_MANAGE p " +
             "WHERE " +
-            "    p.DB_NAME = #{dbName} " +
+            "    p.PROJECT_ID = #{projectID} " +
             "ORDER BY PERIOD_ID , STATUS")
-    List<ProjectStatusManage> selectProjectAllStatus(String dbName);
+    List<ProjectStatusManage> selectProjectAllStatus(String projectID);
 
     @Select("SELECT max(DB_NAME) as DbName FROM Project WHERE Year=#{year}")
     String maxDbName(Integer year);
@@ -238,7 +238,7 @@ public interface ProjectMapper extends MyMapper {
     @Select("SELECT " +
             "  TEMPLATE_GROUP_ID " +
             "FROM PROJECT a " +
-            "  JOIN ORGANIZATION_SERVICE_TEMPLATE_GROUP b " +
+            "  JOIN ORG_SERVICE_TEMPLATE_GROUP b " +
             "    ON a.ORGANIZATION_ID = b.ORGANIZATION_ID " +
             "WHERE a.ID = #{projectId} " +
             "    AND b.SERVICE_TYPE_ID = #{serviceType}")

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

@@ -3,7 +3,7 @@ package pwc.taxtech.atms.dpo;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class OrgBasicDto {
-    @JsonProperty("ID")
+    //@JsonProperty("ID")
     private String id;
     private String name;
     private String code;

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

@@ -6,7 +6,7 @@ import java.util.Date;
 import java.util.List;
 
 public class OrganizationDto {
-    @JsonProperty("ID")
+    //@JsonProperty("ID")
     private String id;
     private String clientCode;
     private String name;

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

@@ -16,14 +16,14 @@
         FROM
         (
         SELECT
-        #{organizationStructureID} AS ID,
+        #{organizationStructureId} AS ID,
         STRUCTURE_ID AS DIMENSION_VALUE_ID,
         ID AS ORGANIZATION_ID
         FROM
         ORGANIZATION
         UNION
         SELECT
-        #{businessUnitID} AS ID,
+        #{businessUnitId} AS ID,
         BUSINESS_UNIT_ID AS DIMENSION_VALUE_ID,
         ID AS ORGANIZATION_ID
         FROM
@@ -32,7 +32,7 @@
         UNION
 
         SELECT
-        #{areaID} AS ID,
+        #{areaId} AS ID,
         AREA_ID AS DIMENSION_VALUE_ID,
         ID AS ORGANIZATION_ID
         FROM
@@ -54,7 +54,7 @@
         ID AS DIMENSION_VALUE_ID,
         NAME AS DIMENSION_VALUE_NAME,
         IS_ACTIVE,
-        #{organizationStructureID} AS DIMENSION_ID,
+        #{organizationStructureId} AS DIMENSION_ID,
         CREATE_TIME,
         UPDATE_TIME
         FROM
@@ -68,7 +68,7 @@
         ID AS DIMENSION_VALUE_ID,
         NAME AS DIMENSION_VALUE_NAME,
         IS_ACTIVE,
-        #{businessUnitID} AS DIMENSION_ID,
+        #{businessUnitId} AS DIMENSION_ID,
         CREATE_TIME,
         UPDATE_TIME
         FROM
@@ -82,7 +82,7 @@
         ID AS DIMENSION_VALUE_ID,
         NAME AS DIMENSION_VALUE_NAME,
         IS_ACTIVE,
-        #{areaID} AS DIMENSION_ID,
+        #{areaId} AS DIMENSION_ID,
         SYSDATE
         AS CREATE_TIME,
         SYSDATE

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

@@ -30,7 +30,7 @@
         <result column="ENTERPRISE_ACCOUNT_SET_NAME" jdbcType="VARCHAR" property="enterpriseAccountSetName"/>
     </resultMap>
 
-    <select id="getSingleOrgByOrgIDToEASODto" parameterType="map" resultMap="EnterpriseAccountSetOrgDto">
+    <select id="getSingleOrgByOrgIdToEASODto" resultMap="EnterpriseAccountSetOrgDto">
         SELECT
         M.ID AS ID,
         M.ENTERPRISE_ACCOUNT_SET_ID AS ENTERPRISE_ACCOUNT_SET_ID,
@@ -45,6 +45,6 @@
         ON
         M.ENTERPRISE_ACCOUNT_SET_ID = N.ID
         WHERE
-        M.ORGANIZATION_ID = #{ORGID}
+        M.ORGANIZATION_ID = #{orgId}
     </select>
 </mapper>
\ No newline at end of file

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

@@ -10,7 +10,7 @@
         <result column="TEMPLATE_GROUP_NAME" jdbcType="VARCHAR" property="templateGroupName"/>
     </resultMap>
 
-    <select id="getSingleOrgByOrgIDToOSTGDto" parameterType="map" resultMap="OrganizationServiceTemplateGroupDto">
+    <select id="getSingleOrgByOrgIdToOSTGDto" resultMap="OrganizationServiceTemplateGroupDto">
         SELECT
         M.ID AS ID,
         M.SERVICE_TYPE_ID AS SERVICE_TYPE_ID,

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

@@ -70,7 +70,7 @@
         on
         p.ID = rp.PERMISSION_ID
         where
-        rp.ROLE_ID_= #{roleId,jdbcType=VARCHAR}
+        rp.ROLE_ID= #{roleId,jdbcType=VARCHAR}
         AND R.SERVICE_TYPE_ID= #{serviceTypeId,jdbcType=VARCHAR}
     </select>
 

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="pwc.taxtech.atms.dao.UserRoleMapper">
 
-    <resultMap id="UserRoleQuery" type="pwc.taxtech.atms.dto.user.UserRoleQuery">
+    <resultMap id="UserRoleQuery" type="pwc.taxtech.atms.dpo.UserRoleQuery">
         <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="USER_ID" jdbcType="VARCHAR" property="userId"/>
         <result column="USER_NAME" jdbcType="VARCHAR" property="userName"/>