diff --git a/frontend/src/modules/homeMgt/components/NoticePop.vue b/frontend/src/modules/homeMgt/components/NoticePop.vue
index a3774a7..2997607 100644
--- a/frontend/src/modules/homeMgt/components/NoticePop.vue
+++ b/frontend/src/modules/homeMgt/components/NoticePop.vue
@@ -33,7 +33,7 @@
| 제목 |
@@ -118,22 +147,31 @@
diff --git a/frontend/src/modules/homeMgt/views/notice.vue b/frontend/src/modules/homeMgt/views/notice.vue
index 119c456..96fd916 100644
--- a/frontend/src/modules/homeMgt/views/notice.vue
+++ b/frontend/src/modules/homeMgt/views/notice.vue
@@ -15,6 +15,7 @@
+
@@ -173,21 +174,10 @@ export default {
};
},
mounted() {
- // this.fnSelectNoticeList();
- //let page = 1;
// 페이지 정보 및 검색 조건
const getCondition = this.$store.getters['searchcondition/getSearchCondition'];
-
// store에 저장된 페이지 정보 및 검색 조건을 불러오기
let isKeep = false;
- /*
- if (getCondition) {
- this.grid.pagePerRows = getCondition.perPage;
- this.grid.params = getCondition.params;
- // page = getCondition.page;
- //isKeep = true;
- }
- */
this.grid.pagePerRows = 50;
this.search(isKeep);
},
@@ -214,7 +204,6 @@ export default {
this.$refs.NoticePop.ModalOpen();
},
noticeDetail(props) {
- //console.log(props);
this.$refs.NoticeUpdatePop.ModalOpen(props);
},
search: function (isKeep) {
@@ -230,8 +219,6 @@ export default {
perPage: this.perPageCnt,
params: this.grid.params,
});
-
- //const getCondition = this.$store.getters['searchcondition/getSearchCondition'];
},
changePerPage: function () {
// 페이지당 조회할 개수
@@ -246,16 +233,12 @@ export default {
this.$refs.commmonModal.alertModalOpen(this.row);
return false;
}
- //const param = chkList.map((row)=>({regReqNo:row.regReqNo} ));
const param = chkList.map((row) => ({ ntNo: row.ntNo }));
this.row.list = param;
this.row.title = '공지사항 관리';
this.row.msg1 = '삭제 하시겠습니까?';
this.$refs.commmonModal.confirmModalOpen2(this.row);
-
- console.log(typeof this.row.list[0].ntNo);
- //this.$refs.commmonModal.confirmModalOpen2(this.row);
},
confirmCalbackFnc(props) {
if (props.result) {
diff --git a/src/main/java/kr/co/uplus/ez/api/homeMgt/HomeMgtService.java b/src/main/java/kr/co/uplus/ez/api/homeMgt/HomeMgtService.java
index 0f800f3..6a4d5fa 100644
--- a/src/main/java/kr/co/uplus/ez/api/homeMgt/HomeMgtService.java
+++ b/src/main/java/kr/co/uplus/ez/api/homeMgt/HomeMgtService.java
@@ -101,6 +101,7 @@ public class HomeMgtService {
homeMgtMapper.insertNotice(insertNoticeReqDto);
NT_NO = homeMgtMapper.insertNoticeNtNo();
}catch(Exception e){
+ e.printStackTrace();
return new InsertNoticeResDto(ApiResponseCode.CM_DB_QUERY_ERR);
}
diff --git a/src/main/java/kr/co/uplus/ez/api/homeMgt/dto/InsertNoticeReqDto.java b/src/main/java/kr/co/uplus/ez/api/homeMgt/dto/InsertNoticeReqDto.java
index cd81c2b..93b52c8 100644
--- a/src/main/java/kr/co/uplus/ez/api/homeMgt/dto/InsertNoticeReqDto.java
+++ b/src/main/java/kr/co/uplus/ez/api/homeMgt/dto/InsertNoticeReqDto.java
@@ -27,6 +27,12 @@ public class InsertNoticeReqDto implements Serializable {
@ApiModelProperty(example = "사용 여부", name = "사용 여부", dataType = "String")
private String useYn;
+ @ApiModelProperty(example = "시작일자", name = "시작일자", dataType = "Int")
+ private String ntStrtDt;
+
+ @ApiModelProperty(example = "종료일자", name = "종료일자", dataType = "Int")
+ private String ntEndDt;
+
@ApiModelProperty(example = "등록 ID", name = "등록 ID", dataType = "String")
private String regId;
diff --git a/src/main/java/kr/co/uplus/ez/api/homeMgt/dto/NoticeDto.java b/src/main/java/kr/co/uplus/ez/api/homeMgt/dto/NoticeDto.java
index c3ffe2a..756dcc5 100644
--- a/src/main/java/kr/co/uplus/ez/api/homeMgt/dto/NoticeDto.java
+++ b/src/main/java/kr/co/uplus/ez/api/homeMgt/dto/NoticeDto.java
@@ -41,6 +41,12 @@ public class NoticeDto implements Serializable {
@ApiModelProperty(example = "조회수", name = "조회수", dataType = "Int")
private String retvCnt;
+ @ApiModelProperty(example = "시작일자", name = "시작일자", dataType = "Int")
+ private String ntStrtDt;
+
+ @ApiModelProperty(example = "종료일자", name = "종료일자", dataType = "Int")
+ private String ntEndDt;
+
@ApiModelProperty(example = "등록 ID", name = "등록 ID", dataType = "String")
private String regId;
diff --git a/src/main/java/kr/co/uplus/ez/api/homeMgt/dto/NoticeListReqDto.java b/src/main/java/kr/co/uplus/ez/api/homeMgt/dto/NoticeListReqDto.java
index 363f54b..fb8cf55 100644
--- a/src/main/java/kr/co/uplus/ez/api/homeMgt/dto/NoticeListReqDto.java
+++ b/src/main/java/kr/co/uplus/ez/api/homeMgt/dto/NoticeListReqDto.java
@@ -32,6 +32,12 @@ public class NoticeListReqDto implements Serializable {
@ApiModelProperty(example = "사용 여부", name = "사용 여부", dataType = "String")
private String useYn;
+ @ApiModelProperty(example = "시작일자", name = "시작일자", dataType = "Int")
+ private String ntStrtDt;
+
+ @ApiModelProperty(example = "종료일자", name = "종료일자", dataType = "Int")
+ private String ntEndDt;
+
@NotNull
@ApiModelProperty(example = "페이지당 조회할 목록 수",notes = "페이지당 조회할 목록 수", name = "페이지당 조회할 목록 수", dataType = "int")
private int pagePerRows;
diff --git a/src/main/java/kr/co/uplus/ez/api/homeMgt/dto/UpdateNoticeReqDto.java b/src/main/java/kr/co/uplus/ez/api/homeMgt/dto/UpdateNoticeReqDto.java
index 73ac27d..57f3007 100644
--- a/src/main/java/kr/co/uplus/ez/api/homeMgt/dto/UpdateNoticeReqDto.java
+++ b/src/main/java/kr/co/uplus/ez/api/homeMgt/dto/UpdateNoticeReqDto.java
@@ -33,6 +33,12 @@ public class UpdateNoticeReqDto implements Serializable {
@ApiModelProperty(example = "변경 ID", name = "변경 ID", dataType = "String")
private String chgId;
+ @ApiModelProperty(example = "시작일자", name = "시작일자", dataType = "Int")
+ private String ntStrtDt;
+
+ @ApiModelProperty(example = "종료일자", name = "종료일자", dataType = "Int")
+ private String ntEndDt;
+
@ApiModelProperty(example = "업로드된 파일", name = "업로드된 파일", dataType = "String")
private String legacyFiles;
diff --git a/src/main/resources/mapper/mysql/homeMgt/homeMgt-mapper.xml b/src/main/resources/mapper/mysql/homeMgt/homeMgt-mapper.xml
index ea27c32..acbadc8 100644
--- a/src/main/resources/mapper/mysql/homeMgt/homeMgt-mapper.xml
+++ b/src/main/resources/mapper/mysql/homeMgt/homeMgt-mapper.xml
@@ -25,18 +25,23 @@
@ROWNUM := @ROWNUM + 1 AS NO,
NT_NO,
CTG_CD,
- (
- SELECT DTL_CD_NM
- FROM hubez_common.EZ_CD_DTL
- WHERE DTL_CD = N1.CTG_CD
- AND GRP_CD = 'NTBBS_CTG_CD' AND USE_YN = 'Y'
- ) AS CTG_CD_NM,
+ CASE WHEN CTG_CD = '06' THEN '팝업공지'
+ ELSE
+ (
+ SELECT DTL_CD_NM
+ FROM hubez_common.EZ_CD_DTL
+ WHERE DTL_CD = N1.CTG_CD
+ AND GRP_CD = 'NTBBS_CTG_CD' AND USE_YN = 'Y'
+ )
+ END AS CTG_CD_NM,
TITLE,
EMG_YN,
NT_SBST,
REGR,
USE_YN,
RETV_CNT,
+ DATE_FORMAT(NT_STRT_DT, '%Y-%m-%d') AS ntStrtDt,
+ DATE_FORMAT(NT_END_DT, '%Y-%m-%d') AS ntEndDt,
REG_ID,
DATE_FORMAT(REG_DT, '%Y-%m-%d') AS regDt,
CHG_ID,
@@ -110,7 +115,11 @@
NT_SBST,
REGR,
USE_YN,
- RETV_CNT,
+ RETV_CNT,
+
+ NT_STRT_DT,
+ NT_END_DT,
+
REG_ID,
REG_DT,
CHG_ID,
@@ -123,6 +132,10 @@
#{regr},
#{useYn},
0,
+
+ #{ntStrtDt},
+ #{ntEndDt},
+
#{regId},
NOW(),
#{chgId},
@@ -181,6 +194,10 @@
,USE_YN = #{useYn}
,TITLE = #{title}
,NT_SBST = #{ntSbst}
+
+ ,NT_STRT_DT = #{ntStrtDt}
+ ,NT_END_DT = #{ntEndDt}
+
,CHG_DT = NOW()
,CHG_ID = #{chgId}
WHERE
|