test 지움

pengm2ng · Jun 2, 2021 · bc7a936 · bc7a936
1 parent 9fc48b3
commit bc7a936
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/jmt_webapp/src/main/webapp/restful/get/category/GetCategory.jsp b/jmt_webapp/src/main/webapp/restful/get/category/GetCategory.jsp
@@ -73,7 +73,7 @@ try{
 
  if (deptDiv.equals("")) {
 
- list = OrganizationTestDAO.getInstance()
+ list = OrganizationDAO.getInstance()
  .getAllOrganization((Class<Organization>) organizationDeptDiv.getClass());
 
  for (int i = 0; i < list.size(); i++) {
@@ -88,7 +88,7 @@ try{
 
  if (govofcDiv == "") {
 
- list = OrganizationTestDAO.getInstance().getChildrenOf(organizationDeptDiv,organizationGovofcDiv,organizationHgdeptDiv,organizationDept);
+ list = OrganizationDAO.getInstance().getChildrenOf(organizationDeptDiv,organizationGovofcDiv,organizationHgdeptDiv,organizationDept);
  for (int i = 0; i < list.size(); i++) {
  jsonArray.add((list.get(i)).getOrganizationName());
  }
@@ -101,7 +101,7 @@ try{
 
  if (hgdeptDiv == "") {
 
- list = OrganizationTestDAO.getInstance().getChildrenOf(organizationDeptDiv,organizationGovofcDiv,organizationHgdeptDiv,organizationDept);
+ list = OrganizationDAO.getInstance().getChildrenOf(organizationDeptDiv,organizationGovofcDiv,organizationHgdeptDiv,organizationDept);
  for (int i = 0; i < list.size(); i++) {
  jsonArray.add((list.get(i)).getOrganizationName());
  }
@@ -111,7 +111,7 @@ try{
  System.out.println(jsonObject.toJSONString());
  } else if (hgdeptDiv != "") {
 
- list = OrganizationTestDAO.getInstance().getChildrenOf(organizationDeptDiv,organizationGovofcDiv,organizationHgdeptDiv,organizationDept);
+ list = OrganizationDAO.getInstance().getChildrenOf(organizationDeptDiv,organizationGovofcDiv,organizationHgdeptDiv,organizationDept);
  for (int i = 0; i < list.size(); i++) {
  jsonArray.add((list.get(i)).getOrganizationName());
  }

diff --git a/jmt_webapp/src/main/webapp/restful/get/top10/GetTop10.jsp b/jmt_webapp/src/main/webapp/restful/get/top10/GetTop10.jsp
@@ -44,22 +44,22 @@ try{
  if (startDate !="" && endDate != "") {
  Date date1 = Date.valueOf(startDate);
  Date date2 = Date.valueOf(endDate);
- list = ExpendtrExcutTestDAO.getInstance().getPlaceTopTen(organizationDeptDiv,
+ list = ExpendtrExcutDAO.getInstance().getPlaceTopTen(organizationDeptDiv,
  organizationGovofcDiv, organizationHgdeptDiv, organizationDept, date1, date2);
  // json으로 변환
  } else if(startDate == "" && endDate == ""){
- list = ExpendtrExcutTestDAO.getInstance().getPlaceTopTen(organizationDeptDiv,
+ list = ExpendtrExcutDAO.getInstance().getPlaceTopTen(organizationDeptDiv,
  organizationGovofcDiv, organizationHgdeptDiv, organizationDept);
 
  }else if(startDate != "" && endDate == ""){
  Date date1 = Date.valueOf(startDate);
 
- list = ExpendtrExcutTestDAO.getInstance().getPlaceTopTen(organizationDeptDiv,
+ list = ExpendtrExcutDAO.getInstance().getPlaceTopTen(organizationDeptDiv,
  organizationGovofcDiv, organizationHgdeptDiv, organizationDept,date1,null);
  }else if(startDate == "" && endDate != ""){
  Date date2 = Date.valueOf(endDate);
-  // TODO Test코드
- list = ExpendtrExcutTestDAO.getInstance().getPlaceTopTen(organizationDeptDiv,
+ 
+ list = ExpendtrExcutDAO.getInstance().getPlaceTopTen(organizationDeptDiv,
  organizationGovofcDiv, organizationHgdeptDiv, organizationDept,null,date2);
  }
  JSONArray jsonArray = new JSONArray();