| src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
| src/main/resources/mybatis/query-template/issue-template.xml | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
| src/main/webapp/i18n/ko/global.json | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
| src/main/webapp/scripts/app/issue/issueList.controller.js | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
| src/main/webapp/views/issue/issueListNormal.html | ●●●●● 패치 | 보기 | raw | blame | 히스토리 |
src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
@@ -6,6 +6,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.util.StringUtils; import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.Map; @@ -27,6 +28,8 @@ private String endStartDate; private String beginCompleteDate; private String endCompleteDate; private String beginDateRange; private String endDateRange; private Integer page; private Integer pageSize; private Long loginUserId; @@ -158,6 +161,18 @@ if (StringUtils.hasText(MapUtil.getString(conditions, "endCompleteDate"))) { Date endCompleteDate = DateUtil.convertStrToDate(MapUtil.getString(conditions, "endCompleteDate"), "yy-MM-dd"); condition.setEndCompleteDate(DateUtil.convertDateToStr(endCompleteDate, "yyyy-MM-dd")); } if (StringUtils.hasText(MapUtil.getString(conditions, "dateRange"))) { String dateRange = MapUtil.getString(conditions, "dateRange"); if (!StringUtils.isEmpty(dateRange)) { List<String> date = Arrays.asList(dateRange.split("~")); Date beginDateRange = DateUtil.convertStrToDate(date.get(0).trim(), "yy-MM-dd"); condition.setBeginDateRange(DateUtil.convertDateToStr(beginDateRange, "yyyy-MM-dd")); Date endDateRange = DateUtil.convertStrToDate(date.get(1).trim(), "yy-MM-dd"); condition.setEndDateRange(DateUtil.convertDateToStr(endDateRange, "yyyy-MM-dd")); } } if (MapUtil.getLongs(conditions, "projectIds") != null) { @@ -317,6 +332,22 @@ this.endCompleteDate = endCompleteDate; } public String getBeginDateRange() { return beginDateRange; } public void setBeginDateRange(String beginDateRange) { this.beginDateRange = beginDateRange; } public String getEndDateRange() { return endDateRange; } public void setEndDateRange(String endDateRange) { this.endDateRange = endDateRange; } public Integer getPage() { return page; } src/main/resources/mybatis/query-template/issue-template.xml
@@ -132,6 +132,10 @@ ANd issue.complete_date <![CDATA[ <= ]]> #{endCompleteDate} </if> <if test="beginDateRange != null and !beginDateRange.equals('') and endDateRange != null and !endDateRange.equals('')"> AND (issue.start_date BETWEEN #{beginDateRange} AND #{endDateRange} OR issue.complete_date BETWEEN #{beginDateRange} AND #{endDateRange}) </if> <if test="combinationIssueNumber == null or combinationIssueNumber.equals('')"> <if test="hideDownIssue != null and hideDownIssue == true"> AND issue.parent_issue_id IS NULL @@ -349,6 +353,10 @@ ANd issue.complete_date <![CDATA[ <= ]]> #{endCompleteDate} </if> <if test="beginDateRange != null and !beginDateRange.equals('') and endDateRange != null and !endDateRange.equals('')"> AND (issue.start_date BETWEEN #{beginDateRange} AND #{endDateRange} OR issue.complete_date BETWEEN #{beginDateRange} AND #{endDateRange}) </if> <if test="combinationIssueNumber == null or combinationIssueNumber.equals('')"> <if test="hideDownIssue != null and hideDownIssue == true"> AND issue.parent_issue_id IS NULL src/main/webapp/i18n/ko/global.json
@@ -740,6 +740,7 @@ "register": "등록자", "startDate": "시작일", "endDate": "종료일", "dateRange": "기간", "company": "업체", "isp": "ISP", "hosting": "호스팅", src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -61,6 +61,7 @@ registerDateRange : "", // 등록일 기간 검색 startDateRange : "", // 시작일 기간 검색 completeDateRange : "", // 완료일 기간 검색 dateRange : "", // 기간 검색 severityIds : [], // 중요도 검색 priorityIds : [], // 우선순위 검색 issueStatusIds : [], // 이슈 상태 검색 @@ -495,6 +496,7 @@ endStartDate : "", beginCompleteDate : "", endCompleteDate : "", dateRange: "", hideCompleteIssue: $scope.vm.hideCompleteIssue, hideDownIssue : $scope.vm.hideDownIssue, isTree : $scope.vm.listMode === 1, @@ -618,6 +620,10 @@ conditions.beginCompleteDate = completeDateRange[0].trim(); conditions.endCompleteDate = completeDateRange[1].trim(); } // 기간 if ($rootScope.isDefined($scope.vm.search.dateRange)) { conditions.dateRange = $scope.vm.search.dateRange.trim(); } return conditions;
@@ -87,6 +87,12 @@ <span ng-click="vm.search.completeDateRange = ''">×</span> </p> <!-- 기간 --> <p ng-if="$root.isDefined(vm.search.dateRange)"> {{vm.search.dateRange}} <span ng-click="vm.search.dateRange = ''">×</span> </p> <!-- 등록일 --> <p ng-if="$root.isDefined(vm.search.registerDateRange)"> {{vm.search.registerDateRange}} @@ -264,6 +270,19 @@ </div> </div> <div class="col-lg-3"> <div class="form-group"> <label> <span translate="common.dateRange">기간</span></label> <input type="text" readonly class="form-control input-sm input-readonly" ng-model="vm.search.dateRange" modal-form-auto-scroll date-format="YY-MM-DD" parent-el="'#createdWidget'" date-range-picker> </div> </div> <div class="col-lg-3" ng-repeat="customField in vm.customFields">
