From 909db3e5ddf1defcd5a9dcda16847013dec691cc Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 18 1월 2022 09:47:45 +0900
Subject: [PATCH] - 헤더 일반메일 아이콘 색상 변경 - 등록일자 내림차순 정렬 - 기본 프로젝트의 기간이 null로 표시되는 거 수정
---
src/main/resources/mybatis/query-template/customField-template.xml | 2 +-
src/main/resources/mybatis/query-template/companyField-template.xml | 2 +-
src/main/resources/mybatis/query-template/workflow-template.xml | 2 +-
src/main/resources/mybatis/query-template/issueType-template.xml | 2 +-
src/main/resources/mybatis/query-template/faq-template.xml | 4 ++--
src/main/resources/mybatis/query-template/issueStatus-template.xml | 2 +-
src/main/resources/mybatis/query-template/issue-template.xml | 2 +-
src/main/resources/mybatis/query-template/companyFieldCategory-template.xml | 2 +-
src/main/resources/mybatis/query-template/event-template.xml | 2 +-
src/main/resources/mybatis/query-template/IspField-template.xml | 2 +-
src/main/resources/mybatis/query-template/project-template.xml | 6 +++---
src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java | 2 ++
src/main/resources/mybatis/query-template/qna-template.xml | 2 +-
src/main/resources/mybatis/query-template/HostingField-template.xml | 2 +-
src/main/resources/mybatis/query-template/notice-template.xml | 2 +-
src/main/resources/mybatis/query-template/guide-template.xml | 4 ++--
src/main/webapp/views/common/header.html | 5 ++---
17 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
index 35baccf..d628a37 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
@@ -123,6 +123,8 @@
project.setDescription(this.messageAccessor.message("common.intoTheSystemIssueManagementProject")); // �떆�뒪�뀥�뿉�꽌 湲곕낯�쑝濡� �젣怨듬릺�뒗 �씠�뒋 愿�由� �봽濡쒖젥�듃�엯�땲�떎.
//project.setStartDate(DateUtil.convertDateToYYYYMMDD(new Date()));
//project.setEndDate(DateUtil.convertDateToYYYYMMDD(DateUtil.addDays(new Date(), 3650)));
+ project.setStartDate("");//null�몴�떆 諛⑹�
+ project.setEndDate("");
// 湲곕낯�쑝濡� �깮�꽦�릺�뒗 �봽濡쒖젥�듃�쓽 �쑀�삎�� BTS
project.setProjectType(ProjectType.BTS_PROJECT);
project.setWorkspace(workspace);
diff --git a/src/main/resources/mybatis/query-template/HostingField-template.xml b/src/main/resources/mybatis/query-template/HostingField-template.xml
index f010c45..84229b8 100644
--- a/src/main/resources/mybatis/query-template/HostingField-template.xml
+++ b/src/main/resources/mybatis/query-template/HostingField-template.xml
@@ -22,7 +22,7 @@
<if test="id != '' and id != null">
AND h.id like CONCAT('%',#{id},'%')
</if>
- ORDER BY h.id DESC
+ ORDER BY h.register_date DESC
<if test="pageSize != '' and pageSize != null">
limit #{pageSize} offset #{page};
</if>
diff --git a/src/main/resources/mybatis/query-template/IspField-template.xml b/src/main/resources/mybatis/query-template/IspField-template.xml
index f3732fa..b846cc6 100644
--- a/src/main/resources/mybatis/query-template/IspField-template.xml
+++ b/src/main/resources/mybatis/query-template/IspField-template.xml
@@ -22,7 +22,7 @@
<if test="id != '' and id != null">
AND i.id like CONCAT('%',#{id},'%')
</if>
- ORDER BY i.id DESC
+ ORDER BY i.register_date DESC
<if test="pageSize != '' and pageSize != null">
limit #{pageSize} offset #{page};
</if>
diff --git a/src/main/resources/mybatis/query-template/companyField-template.xml b/src/main/resources/mybatis/query-template/companyField-template.xml
index 24b24a9..466d7e2 100644
--- a/src/main/resources/mybatis/query-template/companyField-template.xml
+++ b/src/main/resources/mybatis/query-template/companyField-template.xml
@@ -32,7 +32,7 @@
<if test="url != '' and id != url">
AND cf.url like CONCAT('%',#{url},'%')
</if>
- ORDER BY cf.id DESC
+ ORDER BY cf.register_date DESC
<if test="pageSize != '' and pageSize != null">
limit #{pageSize} offset #{page};
</if>
diff --git a/src/main/resources/mybatis/query-template/companyFieldCategory-template.xml b/src/main/resources/mybatis/query-template/companyFieldCategory-template.xml
index d99f49e..5960135 100644
--- a/src/main/resources/mybatis/query-template/companyFieldCategory-template.xml
+++ b/src/main/resources/mybatis/query-template/companyFieldCategory-template.xml
@@ -20,7 +20,7 @@
<if test="useValue != '' and useValue != null">
AND cfc.use_value like CONCAT('%',#{useValue},'%')
</if>
- ORDER BY cfc.id DESC
+ ORDER BY cfc.register_date DESC
<if test="pageSize != '' and pageSize != null">
limit #{pageSize} offset #{page};
</if>
diff --git a/src/main/resources/mybatis/query-template/customField-template.xml b/src/main/resources/mybatis/query-template/customField-template.xml
index 9359d01..6ef25bd 100644
--- a/src/main/resources/mybatis/query-template/customField-template.xml
+++ b/src/main/resources/mybatis/query-template/customField-template.xml
@@ -25,7 +25,7 @@
</when>
</choose>
AND ws.id = #{workspaceId}
- ORDER BY cf.id DESC
+ ORDER BY cf.register_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
diff --git a/src/main/resources/mybatis/query-template/event-template.xml b/src/main/resources/mybatis/query-template/event-template.xml
index d221116..b38bcb4 100644
--- a/src/main/resources/mybatis/query-template/event-template.xml
+++ b/src/main/resources/mybatis/query-template/event-template.xml
@@ -20,7 +20,7 @@
<if test="title != '' and title != null">
AND n.title like CONCAT('%',#{title},'%')
</if>
- ORDER BY ID DESC
+ ORDER BY n.register_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
diff --git a/src/main/resources/mybatis/query-template/faq-template.xml b/src/main/resources/mybatis/query-template/faq-template.xml
index 66edd4b..9305d29 100644
--- a/src/main/resources/mybatis/query-template/faq-template.xml
+++ b/src/main/resources/mybatis/query-template/faq-template.xml
@@ -18,7 +18,7 @@
<if test="title != '' and title != null">
AND n.title like CONCAT('%',#{title},'%')
</if>
- ORDER BY ID DESC
+ ORDER BY n.register_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
@@ -50,7 +50,7 @@
<if test="title != '' and title != null">
AND n.title like CONCAT('%',#{title},'%')
</if>
- ORDER BY ID DESC
+ ORDER BY n.register_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
diff --git a/src/main/resources/mybatis/query-template/guide-template.xml b/src/main/resources/mybatis/query-template/guide-template.xml
index 6b93775..f2f69f1 100644
--- a/src/main/resources/mybatis/query-template/guide-template.xml
+++ b/src/main/resources/mybatis/query-template/guide-template.xml
@@ -18,7 +18,7 @@
<if test="title != '' and title != null">
AND n.title like CONCAT('%',#{title},'%')
</if>
- ORDER BY ID DESC
+ ORDER BY n.register_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
@@ -50,7 +50,7 @@
<if test="title != '' and title != null">
AND n.title like CONCAT('%',#{title},'%')
</if>
- ORDER BY ID DESC
+ ORDER BY n.register_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index 325646f..cf64f38 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -242,7 +242,7 @@
AND issue.reverse_index <![CDATA[ < ]]> 0
AND workspace.id = #{workspaceId}
GROUP BY issue.id
- ORDER BY issue.modify_date DESC
+ ORDER BY issue.register_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
diff --git a/src/main/resources/mybatis/query-template/issueStatus-template.xml b/src/main/resources/mybatis/query-template/issueStatus-template.xml
index 2f9ea73..44f121f 100644
--- a/src/main/resources/mybatis/query-template/issueStatus-template.xml
+++ b/src/main/resources/mybatis/query-template/issueStatus-template.xml
@@ -54,7 +54,7 @@
</when>
</choose>
AND ws.id = #{workspaceId}
- ORDER BY i.name DESC
+ ORDER BY i.register_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
diff --git a/src/main/resources/mybatis/query-template/issueType-template.xml b/src/main/resources/mybatis/query-template/issueType-template.xml
index e2646b2..38bf993 100644
--- a/src/main/resources/mybatis/query-template/issueType-template.xml
+++ b/src/main/resources/mybatis/query-template/issueType-template.xml
@@ -40,7 +40,7 @@
AND it.project_id IS NOT NULL
</if>
AND ws.id = #{workspaceId}
- ORDER BY it.id DESC
+ ORDER BY it.register_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
diff --git a/src/main/resources/mybatis/query-template/notice-template.xml b/src/main/resources/mybatis/query-template/notice-template.xml
index ddc5c00..9ddd9ae 100644
--- a/src/main/resources/mybatis/query-template/notice-template.xml
+++ b/src/main/resources/mybatis/query-template/notice-template.xml
@@ -17,7 +17,7 @@
<if test="title != '' and title != null">
AND n.title like CONCAT('%',#{title},'%')
</if>
- ORDER BY ID DESC
+ ORDER BY n.register_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
diff --git a/src/main/resources/mybatis/query-template/project-template.xml b/src/main/resources/mybatis/query-template/project-template.xml
index cd7a94e..d3f596b 100644
--- a/src/main/resources/mybatis/query-template/project-template.xml
+++ b/src/main/resources/mybatis/query-template/project-template.xml
@@ -53,7 +53,7 @@
</when>
</choose>
AND ws.id = #{workspaceId}
- ORDER BY p.id desc
+ ORDER BY p.register_date desc
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
@@ -120,7 +120,7 @@
</when>
</choose>
AND ws.id = #{workspaceId}
- ORDER BY p.id desc
+ ORDER BY p.register_date desc
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
@@ -264,7 +264,7 @@
</choose>
AND p.workspace_id = #{workspaceId}
<if test="page != null and !page.equals('')">
- ORDER BY p.id desc
+ ORDER BY p.register_date desc
limit #{pageSize} offset #{page};
</if>
</select>
diff --git a/src/main/resources/mybatis/query-template/qna-template.xml b/src/main/resources/mybatis/query-template/qna-template.xml
index 0535b81..5b08936 100644
--- a/src/main/resources/mybatis/query-template/qna-template.xml
+++ b/src/main/resources/mybatis/query-template/qna-template.xml
@@ -17,7 +17,7 @@
<if test="title != '' and title != null">
AND n.title like CONCAT('%',#{title},'%')
</if>
- ORDER BY ID DESC
+ ORDER BY n.register_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
diff --git a/src/main/resources/mybatis/query-template/workflow-template.xml b/src/main/resources/mybatis/query-template/workflow-template.xml
index 0cff641..9521401 100644
--- a/src/main/resources/mybatis/query-template/workflow-template.xml
+++ b/src/main/resources/mybatis/query-template/workflow-template.xml
@@ -16,7 +16,7 @@
AND w.name like CONCAT('%',#{name},'%')
</if>
AND ws.id = #{workspaceId}
- ORDER BY w.id DESC
+ ORDER BY w.register_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
diff --git a/src/main/webapp/views/common/header.html b/src/main/webapp/views/common/header.html
index c87fcce..7658d3b 100644
--- a/src/main/webapp/views/common/header.html
+++ b/src/main/webapp/views/common/header.html
@@ -62,10 +62,9 @@
<!-- <span class="new-messages-push"></span>-->
<i class="dripicons-broadcast"></i>
</div>
- <a class="messages-notifications os-dropdown-trigger os-dropdown-position-left"
- style="padding-top:5px;">
+ <div class="messages-notifications os-dropdown-trigger os-dropdown-position-left">
<i class="os-icon os-icon-email-2-at2 mr-20" ng-click="fn.sendCommonMail()" data-toggle="tooltip" data-placement="right" title="吏곸젒 �옉�꽦�븳 硫붿씪 蹂대궡湲�"></i>
- </a>
+ </div>
<!--
<select name="currentWorkspace"
--
Gitblit v1.8.0