[dev] change get project from count sql erro

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

@@ -174,51 +174,51 @@ public interface ProjectMapper extends MyMapper {
     List<ProjectStatusManage> getProjectSatusListByDbName(String dbName);
 
     @Select("<script>" +
-            "SELECT  " +
-            "    now() AS CreateTime, " +
-            "    TRUE AS IsActive, " +
-            "    org.id AS OrganizationID, " +
-            "    org.Name AS Name, " +
-            "    org.Code AS Code, " +
-            "    UUID() AS id, " +
-            "    org.IndustryID AS IndustryID, " +
-            "    0 AS Year, " +
-            "    org.REGION_ID AS RegionID, " +
-            "    0 AS RuleType, " +
-            "    st.id AS ServiceTypeID, " +
-            "    reg.ShortName AS RegionName, " +
-            "    now() AS UpdateTime, " +
-            "    st.Name AS ServiceTypeName, " +
-            "    org.Name AS OrganizationName, " +
-            "    ind.Name AS IndustryName, " +
-            "    ostg.TEMPLATE_GROUP_ID AS TemplateGroupID, " +
-            "    '' AS TemplateGroupName, " +
-            "    org.ClientCode AS ClientCode, " +
-            "    '' AS DbName, " +
-            "    FALSE AS HaveCreateProject, " +
-            "    ea.EnterpriseAccountSetID AS EnterpriseAccountSetID, " +
-            "    1 AS StartPeriod, " +
-            "    12 AS EndPeriod, " +
-            "    ea.EFFECTIVE_DATE AS EffectiveDate, " +
-            "    ea.EXPIRED_DATE AS ExpiredDate " +
-            "FROM " +
-            "    ORGANIZATION org " +
-            "        JOIN " +
-            "    ENTERPRISE_ACCOUNT_SET_ORG ea ON org.id = ea.OrganizationID " +
-            "        JOIN " +
-            "    ORGANIZATION_SERVICE_TEMPLATE_GROUP ostg ON org.id = ostg.ORGANIZATION_ID " +
-            "        JOIN " +
-            "    SERVICE_TYPE st ON ostg.SERVICE_TYPE_ID = st.id " +
-            "        JOIN " +
-            "    INDUSTRY ind ON org.IndustryID = ind.id " +
-            "        JOIN " +
-            "    REGION reg ON org.RegionID = reg.id " +
+            "SELECT   " +
+            "    SYSDATE AS CreateTime,  " +
+            "    1 AS IsActive,  " +
+            "    org.id AS OrganizationID,  " +
+            "    org.Name AS Name,  " +
+            "    org.Code AS Code,  " +
+            "    SYS_GUID() AS id,  " +
+            "    org.Industry_ID AS IndustryID,  " +
+            "    0 AS Year,  " +
+            "    org.REGION_ID AS RegionID,  " +
+            "    0 AS RuleType,  " +
+            "    st.id AS ServiceTypeID,  " +
+            "    reg.Short_Name AS RegionName,  " +
+            "    SYSDATE AS UpdateTime,  " +
+            "    st.Name AS ServiceTypeName,  " +
+            "    org.Name AS OrganizationName,  " +
+            "    ind.Name AS IndustryName,  " +
+            "    ostg.TEMPLATE_GROUP_ID AS TemplateGroupID,  " +
+            "    '' AS TemplateGroupName,  " +
+            "    org.Client_Code AS ClientCode,  " +
+            "    '' AS DbName,  " +
+            "    0 AS HaveCreateProject,  " +
+            "    ea.Enterprise_Account_Set_ID AS EnterpriseAccountSetID,  " +
+            "    1 AS StartPeriod,  " +
+            "    12 AS EndPeriod,  " +
+            "    ea.EFFECTIVE_DATE AS EffectiveDate,  " +
+            "    ea.EXPIRED_DATE AS ExpiredDate  " +
+            "FROM  " +
+            "    ORGANIZATION org  " +
+            "        JOIN  " +
+            "    ENTERPRISE_ACCOUNT_SET_ORG ea ON org.id = ea.Organization_ID  " +
+            "        JOIN  " +
+            "    ORG_SERVICE_TEMPLATE_GROUP ostg ON org.id = ostg.ORGANIZATION_ID  " +
+            "        JOIN  " +
+            "    SERVICE_TYPE st ON ostg.SERVICE_TYPE_ID = st.id  " +
+            "        JOIN  " +
+            "    INDUSTRY ind ON org.Industry_ID = ind.id  " +
+            "        JOIN  " +
+            "    REGION reg ON org.Region_ID = reg.id" +
             "WHERE " +
             "  1=1" +
-            "       <if test=\"orgID != null and orgID !='' \">AND org.id=#{orgId}</if>" +
+            "       <if test=\"orgId != null and orgId !='' \">AND org.id=#{orgId}</if>" +
             "        AND org.IsActive = 1 " +
             "        AND st.IsActive = 1 " +
-            "       <if test=\"serviceID != null and serviceID !='' \">AND ostg.ServiceTypeID=#{serviceId}</if>" +
+            "       <if test=\"serviceId != null and serviceId !='' \">AND ostg.Service_Type_ID=#{serviceId}</if>" +
             "ORDER BY ea.EFFECTIVE_DATE,org.Code" +
             "</script>")
     List<ProjectDisplayDto> getProjectFromEnterpriseAccountSetOrg(@Param("orgId") String orgId, @Param("serviceId") String serviceId);