
--- server/main/java/kr/co/takensoft/dataQuality/result/servicee/ExecRuleResultService.java
+++ server/main/java/kr/co/takensoft/dataQuality/result/service/ExecRuleResultService.java
... | ... | @@ -1,4 +1,4 @@ |
1 |
-package kr.co.takensoft.dataQuality.result.servicee; |
|
1 |
+package kr.co.takensoft.dataQuality.result.service; |
|
2 | 2 |
|
3 | 3 |
import kr.co.takensoft.dataQuality.result.dao.ExecRuleResultDAO; |
4 | 4 |
import org.springframework.beans.factory.annotation.Autowired; |
--- server/main/java/kr/co/takensoft/dataQuality/result/servicee/ManageResultService.java
+++ server/main/java/kr/co/takensoft/dataQuality/result/service/ManageResultService.java
... | ... | @@ -1,9 +1,10 @@ |
1 |
-package kr.co.takensoft.dataQuality.result.servicee; |
|
1 |
+package kr.co.takensoft.dataQuality.result.service; |
|
2 | 2 |
|
3 | 3 |
import kr.co.takensoft.dataQuality.result.dao.ManageResultDAO; |
4 | 4 |
import org.springframework.beans.factory.annotation.Autowired; |
5 | 5 |
import org.springframework.stereotype.Service; |
6 | 6 |
|
7 |
+import java.util.Arrays; |
|
7 | 8 |
import java.util.HashMap; |
8 | 9 |
import java.util.List; |
9 | 10 |
|
... | ... | @@ -24,7 +25,18 @@ |
24 | 25 |
int startIndex = (currentPage-1)*perPage; |
25 | 26 |
params.put("startIndex", startIndex); |
26 | 27 |
|
27 |
- return manageResultDAO.selectManageResult(params); |
|
28 |
+ List<HashMap<String, Object>> manageResultList = manageResultDAO.selectManageResult(params); |
|
29 |
+ |
|
30 |
+ for(HashMap<String, Object> manageResult : manageResultList){ |
|
31 |
+ String errorNm = (String) manageResult.get("error_nm"); |
|
32 |
+ if (errorNm != null) { |
|
33 |
+ String[] errorNmArray = errorNm.split(", "); |
|
34 |
+ List<String> errorNmList = Arrays.asList(errorNmArray); |
|
35 |
+ manageResult.put("error_nm", errorNmList); |
|
36 |
+ } |
|
37 |
+ } |
|
38 |
+ |
|
39 |
+ return manageResultList; |
|
28 | 40 |
} |
29 | 41 |
/** |
30 | 42 |
* 진단 상세 결과 count 조회 |
--- server/main/java/kr/co/takensoft/dataQuality/result/servicee/TotalRuleResultService.java
+++ server/main/java/kr/co/takensoft/dataQuality/result/service/TotalRuleResultService.java
... | ... | @@ -1,4 +1,4 @@ |
1 |
-package kr.co.takensoft.dataQuality.result.servicee; |
|
1 |
+package kr.co.takensoft.dataQuality.result.service; |
|
2 | 2 |
|
3 | 3 |
import kr.co.takensoft.dataQuality.result.dao.TotalRuleResultDAO; |
4 | 4 |
import org.springframework.beans.factory.annotation.Autowired; |
--- server/main/java/kr/co/takensoft/dataQuality/result/web/ExecRuleResultController.java
+++ server/main/java/kr/co/takensoft/dataQuality/result/web/ExecRuleResultController.java
... | ... | @@ -1,6 +1,6 @@ |
1 | 1 |
package kr.co.takensoft.dataQuality.result.web; |
2 | 2 |
|
3 |
-import kr.co.takensoft.dataQuality.result.servicee.ExecRuleResultService; |
|
3 |
+import kr.co.takensoft.dataQuality.result.service.ExecRuleResultService; |
|
4 | 4 |
import org.springframework.beans.factory.annotation.Autowired; |
5 | 5 |
import org.springframework.stereotype.Controller; |
6 | 6 |
import org.springframework.web.bind.annotation.RequestBody; |
--- server/main/java/kr/co/takensoft/dataQuality/result/web/ManageResultController.java
+++ server/main/java/kr/co/takensoft/dataQuality/result/web/ManageResultController.java
... | ... | @@ -1,6 +1,6 @@ |
1 | 1 |
package kr.co.takensoft.dataQuality.result.web; |
2 | 2 |
|
3 |
-import kr.co.takensoft.dataQuality.result.servicee.ManageResultService; |
|
3 |
+import kr.co.takensoft.dataQuality.result.service.ManageResultService; |
|
4 | 4 |
import org.springframework.beans.factory.annotation.Autowired; |
5 | 5 |
import org.springframework.stereotype.Controller; |
6 | 6 |
import org.springframework.web.bind.annotation.RequestBody; |
--- server/main/java/kr/co/takensoft/dataQuality/result/web/TotalRuleResultController.java
+++ server/main/java/kr/co/takensoft/dataQuality/result/web/TotalRuleResultController.java
... | ... | @@ -1,8 +1,7 @@ |
1 | 1 |
package kr.co.takensoft.dataQuality.result.web; |
2 | 2 |
|
3 |
-import kr.co.takensoft.dataQuality.result.servicee.TotalRuleResultService; |
|
3 |
+import kr.co.takensoft.dataQuality.result.service.TotalRuleResultService; |
|
4 | 4 |
import org.springframework.beans.factory.annotation.Autowired; |
5 |
-import org.springframework.beans.factory.annotation.Value; |
|
6 | 5 |
import org.springframework.stereotype.Controller; |
7 | 6 |
import org.springframework.web.bind.annotation.RequestBody; |
8 | 7 |
import org.springframework.web.bind.annotation.RequestMapping; |
--- server/main/java/kr/co/takensoft/dataQuality/schedule/service/ManageService.java
+++ server/main/java/kr/co/takensoft/dataQuality/schedule/service/ManageService.java
... | ... | @@ -233,6 +233,8 @@ |
233 | 233 |
Object columnValue = resultSet.getObject(i); |
234 | 234 |
if (columnValue != null) { |
235 | 235 |
rowData.append(columnValue.toString() + ", "); |
236 |
+ } else { |
|
237 |
+ rowData.append("null, "); |
|
236 | 238 |
} |
237 | 239 |
} |
238 | 240 |
} |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?