Merge remote-tracking branch 'origin/master'

박지현

2022-02-09 6a8cacfc31f8ac932844a122940fdfd127c117ac

Merge remote-tracking branch 'origin/master'

 pom.xml

@@ -6,7 +6,7 @@

    <groupId>kr.wisestone.owl</groupId>
    <artifactId>kr.wisestone.owl.its</artifactId>
    <version>1.0.0.RELEASE</version>
    <version>1.0.1.RELEASE</version>
    <packaging>war</packaging>

    <properties>

 src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java

@@ -89,7 +89,7 @@
     * @return IssueHosting
     */
    private IssueHosting CreateIssueHosting(HostingFieldForm hostingFieldForm, Issue issue) {
        IssueHosting issueHosting = ConvertUtil.copyProperties(hostingFieldForm, IssueHosting.class);
        IssueHosting issueHosting = ConvertUtil.copyProperties(hostingFieldForm, IssueHosting.class, "id");
        issueHosting.setIssue(issue);
        if (hostingFieldForm.getId() != null && hostingFieldForm.getId() != -1) {
            HostingField hostingField = this.hostingFieldService.getHosting(hostingFieldForm.getId());
@@ -121,8 +121,8 @@
            if (issueHostingFields != null && issueHostingFields.size() > 0) {
                Map<String, Object> param = issueHostingFields.get(0);

                if (issueHosting != null) { //수정 시
                    // 변경 이력 남기고 issueHosting에 set 해주기
                // 변경 이력 남기고 issueHosting에 se
                if (issueHosting != null) { //수정 시t 해주기
                    issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);

                    issueHosting.setName(MapUtil.getString(param, "name"));

 src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java

@@ -86,7 +86,7 @@
     * @return IssueIsp
     */
    private IssueIsp CreateIssueIsp(IspFieldForm ispFieldForm, Issue issue) {
        IssueIsp issueIsp = ConvertUtil.copyProperties(ispFieldForm, IssueIsp.class);
        IssueIsp issueIsp = ConvertUtil.copyProperties(ispFieldForm, IssueIsp.class, "id");
        issueIsp.setIssue(issue);
        if (ispFieldForm.getId() != null && ispFieldForm.getId() != -1) {
            IspField ispField = this.ispFieldService.getIsp(ispFieldForm.getId());

 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;


 src/main/webapp/scripts/main.js

@@ -4,7 +4,7 @@
'use strict';

require.config({
    urlArgs : "bust=v1.0.0",
    urlArgs : "bust=v1.0.1",
    paths : {
        'jquery' : '../bower_components/jquery/dist/jquery',
        'jquery-ui' : '../bower_components/jquery-ui/jquery-ui',

 src/main/webapp/views/issue/issueListNormal.html

@@ -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">