From a17f39ac5b80cd4bbdb235c891cedba3a35d0597 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 08 12월 2021 20:19:58 +0900
Subject: [PATCH] - api 수정 json에서 타이틀 항목 제외 - 하위 이슈 상태변경 안되는 문제 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 18 +++++++++++++-----
src/main/webapp/scripts/app/api/apiSetting.controller.js | 1 -
src/main/java/kr/wisestone/owl/constant/MsgConstants.java | 1 +
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/constant/MsgConstants.java b/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
index 25d5230..47bd436 100644
--- a/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
+++ b/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
@@ -239,4 +239,5 @@
public static final String API_USER_ERROR = "API_USER_ERROR"; // api �궗�슜�옄 �삤瑜�
public static final String API_OVERLAP_ERROR = "API_OVERLAP_ERROR"; // API 以묐났�맂 �긽�쐞 �씠�뒋媛� �뿬�윭媛쒖씪 寃쎌슦
public static final String API_ISSUE_NOT_EXIST = "API_ISSUE_NOT_EXIST"; // �닔�젙�븷 �씠�뒋瑜� 李얠쓣�닔 �뾾�뒿�땲�떎.
+ public static final String API_COMPLETE_ISSUE_STATUS_NOT_EXIST = "API_COMPLETE_ISSUE_STATUS_NOT_EXIST"; // �옄�룞 醫낅즺 泥섎━�븷 �긽�깭媛� �꽕�젙�릺吏� �븡�븯�뒿�땲�떎.
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 7109bd0..554e8bd 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -1534,15 +1534,23 @@
List<Issue> issue = Lists.newArrayList();
for (IssueVo issueVo : issueVos) {
IssueVo parentIssueVo = issueVo.getParentIssueVo();
- if (parentIssueVo != null) {
- issueForm.setId(parentIssueVo.getId());
- } else {
- issueForm.setId(issueVo.getId());
- }
+ issueForm.setId(issueVo.getId());
+
+ // �옄�룞 醫낅즺 �긽�깭 �꽕�젙�씠 �릺�뼱 �엳吏� �븡�쑝硫� �삤瑜섎컻�깮
Issue modifyIssue = this.modifyIssueForApi(user, issueForm, files);
Issue parentIssue = modifyIssue.getParentIssue();
+ IssueType issueType = modifyIssue.getIssueType();
+ IssueStatus issueStatus = issueType.getIssueStatus();
+ if (issueStatus == null) {
+ throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_COMPLETE_ISSUE_STATUS_NOT_EXIST));
+ }
+
if (parentIssue != null) {
List<Map<String, Object>> results = this.issueMapper.findNotCompleteByParentIssueId(parentIssue.getId());
+ // �븯�쐞 �씪媛먯씠 紐⑤몢 醫낅즺 �긽�깭�씪�븣 �긽�쐞 �씪媛먮룄 醫낅즺 泥섎━
+ if (results == null || results.size() == 0) {
+ parentIssue.setIssueStatus(issueType.getIssueStatus());
+ }
}
issue.add(modifyIssue);
diff --git a/src/main/webapp/scripts/app/api/apiSetting.controller.js b/src/main/webapp/scripts/app/api/apiSetting.controller.js
index db8ba71..70103fc 100644
--- a/src/main/webapp/scripts/app/api/apiSetting.controller.js
+++ b/src/main/webapp/scripts/app/api/apiSetting.controller.js
@@ -501,7 +501,6 @@
var jsonData = {
token: "||諛쒓툒諛쏆� �넗�겙||",
- title: "||�씠�뒋 �젣紐�||",
issueTypeId: $scope.vm.issueTypeId,
apiType: "modify",
issueStatusId: $scope.vm.issueStatusId,
--
Gitblit v1.8.0