Merge branch 'dev_neo' into 'dev'

[BUGFIX] fixed vat card view second can not go sever

See merge request root/atms!20

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

@@ -171,7 +171,7 @@ public interface ProjectMapper extends MyMapper {
             "WHERE " +
             "    p.DbName = #{dbName} " +
             "ORDER BY PeriodId , Status")
-    Dictionary<Integer,Integer> getProjectSatusListByDbName(String dbName);
+    List<ProjectStatusManage> getProjectSatusListByDbName(String dbName);
 
     @Select("<script>" +
             "SELECT  " +

atms-api/src/main/java/pwc/taxtech/atms/dto/taxadmin/ProjectDisplayDto.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.Dictionary;
 import java.util.List;
+import java.util.Map;
 
 public class ProjectDisplayDto {
     private String clientCode ;
@@ -22,7 +23,7 @@ public class ProjectDisplayDto {
     private String name ;
     private String organizationID ;
     private String organizationName ;
-    private Dictionary<Integer, Integer> projectStatusList ;
+    private Map<Integer, Integer> projectStatusList ;
     private String regionID ;
     private String regionName ;
     private Integer ruleType ;
@@ -164,14 +165,6 @@ public class ProjectDisplayDto {
         this.organizationName = organizationName;
     }
 
-    public Dictionary<Integer, Integer> getProjectStatusList() {
-        return projectStatusList;
-    }
-
-    public void setProjectStatusList(Dictionary<Integer, Integer> projectStatusList) {
-        this.projectStatusList = projectStatusList;
-    }
-
     public String getRegionID() {
         return regionID;
     }
@@ -301,4 +294,11 @@ public class ProjectDisplayDto {
         return this;
     }
 
+    public Map<Integer, Integer> getProjectStatusList() {
+        return projectStatusList;
+    }
+
+    public void setProjectStatusList(Map<Integer, Integer> projectStatusList) {
+        this.projectStatusList = projectStatusList;
+    }
 }

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

@@ -125,7 +125,11 @@ public class ProjectServiceImpl implements ProjectService {
         List<ProjectDisplayDto> data = projectMapper.getProjectList(orgID, serviceID, projectYear);
         //获取每个项目的项目状态
         data.forEach(p -> {
-            p.setProjectStatusList(projectMapper.getProjectSatusListByDbName(p.getDbName()));
+            List<ProjectStatusManage> manageStatus= projectMapper.getProjectSatusListByDbName(p.getDbName());
+            Map<Integer,Integer> dic=new HashMap<>();
+            manageStatus.forEach(m->{dic.put(m.getPeriodId(),m.getStatus());});
+
+            p.setProjectStatusList(dic);
         });
         //添加账套中需要创建的项目
         List<ProjectDisplayDto> orgList = getProjectFromEnterpriseAccountSetOrg(data, orgID, serviceID, projectYear);