Merge branch 'dev_oracle_neo' into 'dev_oracle'

Dev oracle neo

See merge request root/atms!117

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

@@ -136,7 +136,7 @@ public class ProjectServiceImpl implements ProjectService {
         List<ProjectDisplayDto> data = projectMapper.getProjectList(orgId, serviceId, projectYear);
         //获取每个项目的项目状态
         data.forEach(p -> {
-            List<ProjectStatusManage> manageStatus = projectMapper.getProjectSatusListByDbName(p.getDbName());
+            List<ProjectStatusManage> manageStatus = projectMapper.getProjectSatusListByDbName(p.getId());
             Map<Integer, Integer> dic = new HashMap<>();
             manageStatus.forEach(m -> {
                 dic.put(m.getPeriodId(), m.getStatus());

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

@@ -224,11 +224,11 @@ public interface ProjectMapper extends MyMapper {
     List<ProjectDisplayDto> getProjectFromEnterpriseAccountSetOrg(@Param("orgId") String orgId, @Param("serviceId") String serviceId);
 
     @Select("SELECT  " +
-            "    PERIOD_ID,Status " +
+            "    PERIOD_ID AS periodId, STATUS AS status " +
             "FROM " +
             "    PROJECT_STATUS_MANAGE p " +
             "WHERE " +
-            "    p.PROJECT_ID = #{projectID} " +
+            "    p.PROJECT_ID = #{projectId} " +
             "ORDER BY PERIOD_ID , STATUS")
     List<ProjectStatusManage> selectProjectAllStatus(String projectId);