diff --git a/egovframe-template-simple-react-contribution/src/components/list/ListCreateUpdateDelete.jsx b/egovframe-template-simple-react-contribution/src/components/list/ListCreateUpdateDelete.jsx index 4701648..09eeb11 100644 --- a/egovframe-template-simple-react-contribution/src/components/list/ListCreateUpdateDelete.jsx +++ b/egovframe-template-simple-react-contribution/src/components/list/ListCreateUpdateDelete.jsx @@ -115,13 +115,15 @@ function ListCreateUpdateDelete(props) { - + {generate( props.items, - {alert('수정 클릭')}}> + { + props.setIsPopupOpen(true); + }}> { diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules.jsx index 7e9447b..1d07793 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules.jsx @@ -1,12 +1,50 @@ +/* eslint-disable jsx-a11y/heading-has-content */ import React, { useState, useEffect, useCallback } from 'react'; import { Link, useLocation } from 'react-router-dom'; +import styled from "styled-components"; + + import * as EgovNet from 'api/egovFetch'; import URL from 'constants/url'; import CODE from 'constants/code'; import { default as EgovLeftNav } from 'components/leftmenu/EgovLeftNavAdmin'; +const StyledDiv = styled.div` + .calendar_list table { + thead tr th { + height: auto; + line-height: 35px; + text-align: left; + } + tbody td { + padding: 0px 5px; + text-align: left; + font-size: 12px; + .day { + display: inline-block; + font-size: 14px; + padding-bottom: 7px; + } + .title { + &:link { + color: #647ea3; + } + &:visited { + color: #647ea3; + } + &::hover { + color: #345ef3; + } + &::active { + color: #345ef3; + } + + } + } + } +`; function Schedules(props) { @@ -154,7 +192,7 @@ function Schedules(props) { if (scheduleList.length > 0) {//일정 있는 경우 return ( - {day}
{ scheduleList.map((schedule, scheduleIdx) => { @@ -168,8 +206,9 @@ function Schedules(props) { return ( <> {schedule.schdulNm} + className="title" + state={{schdulId: schedule.schdulId}} + key={keyIdx++}>{schedule.schdulNm}
@@ -241,77 +280,79 @@ function Schedules(props) {

위원회 일정 관리

-

- {/* */} -
-
    - {false && -
  • - +
    • + } + +
  • +
    • - } - -
  • - - {searchCondition.year} - -
    • -
  • - - {(searchCondition.month + 1)} - -
    • -
-
- {/* */} + > + {searchCondition.year} + + +
  • + + {(searchCondition.month + 1)} + +
    • + + + {/* */} -
    - - - - - - - - - - - - - - {true && calendarTag} - -
    일월화수목금토
    -
    +
    + + + + + + + + + + + + + + {true && calendarTag} + +
    일월화수목금토
    +
    + {/* */} diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/config/CommitteeCodeMgt.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/config/CommitteeCodeMgt.jsx index 6761a63..00ff49b 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/config/CommitteeCodeMgt.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/config/CommitteeCodeMgt.jsx @@ -30,6 +30,9 @@ function CommitteeCodeMgt(props) { const [confirm, setConfirm] = React.useState(); + const [editCreateMode, setEditCreateMode] = React.useState(); // 생성 or 수정 여부 + + // 위원회 코드 등록 팝업을 보이거나 닫는다. const [isCommitteeCodeRegistrationPopupOpen, setIsCommitteeCodeRegistrationPopupOpen] = React.useState(false); @@ -324,7 +327,7 @@ function CommitteeCodeMgt(props) { /> - { true && + { false && span:nth-child(3) { + width: 180px; + } + .result .list_item > div:nth-child(3) { + width: 180px; + } + } + + .board-bot { + margin-top: 20px; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: flex-start; + align-items: stretch; + justify-content: center; + + & > *:nth-child(1) { + width: 16%; + justify-content: left; + } + & > *:nth-child(2) { + width: 68%; + justify-content: center; + } + & > *:nth-child(3) { + width: 16%; + justify-content: right; + } } `; @@ -112,14 +141,6 @@ function PopUp(props) {

    팝업 관리

    - - {/* */} -
    -
    - 팝업 추가 -
    -
    - {/* */} {/* */}
    @@ -136,7 +157,7 @@ function PopUp(props) { } {listPopup.map((it)=>(
    -
    {it.seq}
    +
    {it.number}
    {it.popupTitle}
    {it.startDate} ~ {it.endDate}
    {it.useYn === 'Y' ? onChangeActivationSwitch(e, it.seq)} defaultChecked /> : onChangeActivationSwitch(e, it.seq)} {...label} />}
    @@ -146,13 +167,24 @@ function PopUp(props) {
    {/* */} -
    - {/* */} + + + + + {/* */} +
    +
    { getList({ ...searchCondition, pageIndex: passedPage }) }} /> - {/* */} +
    + 등록 +
    +
    + {/* */} + + {/* */}
    diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx index 82d9d9b..7d1a67a 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx @@ -13,8 +13,36 @@ import EgovPagingPaginationInfo from 'components/EgovPagingPaginationInfo'; import styled from "styled-components"; const StyledDiv = styled.div` - .board_btn_area { - margin: 12px 0px; + .BRD008 { + .head > span:nth-child(3) { + width: 200px; + } + .result .list_item > div:nth-child(3) { + width: 200px; + } + } + + .board-bot { + margin-top: 20px; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: flex-start; + align-items: stretch; + justify-content: center; + + & > *:nth-child(1) { + width: 16%; + justify-content: left; + } + & > *:nth-child(2) { + width: 68%; + justify-content: center; + } + & > *:nth-child(3) { + width: 16%; + justify-content: right; + } } `; @@ -110,14 +138,10 @@ function StandardResearch(props) {

    건설기준연구 관리

    -
    - {/* */} -
    -
    - 글 작성 -
    - {/* */} + + + {/* */}
    @@ -134,7 +158,7 @@ function StandardResearch(props) { } {list.map((it)=>(
    -
    {it.id}
    +
    {it.number}
    {it.title}
    {it.researchStartDate} ~ {it.researchEndDate}
    {it.director}
    @@ -144,13 +168,27 @@ function StandardResearch(props) {
    {/* */} -
    - {/* */} + + + + + {/* */} +
    +
    { getList({ ...searchCondition, pageIndex: passedPage }) }} /> - {/* */} +
    + 등록 +
    +
    + {/* */} + + + + + {/* */}
    diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/logs/PrivacyLogs.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/logs/PrivacyLogs.jsx index 0351568..1d633ef 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/logs/PrivacyLogs.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/logs/PrivacyLogs.jsx @@ -8,6 +8,7 @@ import { default as EgovLeftNav } from 'components/leftmenu/EgovLeftNavAdmin'; import EgovPaging from 'components/EgovPaging'; import { itemIdxByPage } from 'utils/calc'; +import {format} from "date-fns"; function PrivacyConnections(props) { // console.group("EgovAdminPrivacyList"); @@ -66,7 +67,7 @@ function PrivacyConnections(props) {
    {item.targetUserId}
    {item.accessType === "PRV_LIST" ? "사용자현황 조회" : item.accessType === "PRV_VIEW" ? "User 상세조회" : "User 수정"}
    {item.ipAddress}
    -
    {item.accessDt}
    +
    {item.accessDt ? format(item.accessDt, "yyyy-MM-dd HH:mm") : ""}
    ); } @@ -122,7 +123,7 @@ function PrivacyConnections(props) { 수정 ID 타입 접속IP - 변경일자 + 일자
    {listTag} diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java index 93bdbbf..c6664cc 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java @@ -24,6 +24,7 @@ import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @Service("popUpApiService") @@ -47,12 +48,14 @@ public class PopUpApiServiceImpl extends EgovAbstractServiceImpl implements PopU ); - Long totalRecordCount = tnPopupMngRepositoryWithoutPopupContents.count(); + Long totalRecordCount = tnPopupMngRepositoryWithoutPopupContents.count(); + AtomicInteger index = new AtomicInteger(); //List> listPopup = tnPopupMngRepositoryWithoutPopupContents.findAll(Sort.by(Sort.Direction.DESC, "popupSeq")) List> listPopup = tnPopupMngRepositoryWithoutPopupContents.findAll(pageable) .stream() .map(item -> { Map codeMap = new HashMap<>(); + codeMap.put("number", totalRecordCount - (long) pageable.getPageNumber() * pageable.getPageSize() - index.getAndIncrement()); codeMap.put("seq", item.getPopupSeq()); codeMap.put("popupTitle", item.getPopupTitle()); codeMap.put("startDate", item.getPopupStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/entity/ThPrivacyLog.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/entity/ThPrivacyLog.java index 62403e0..bea3b4c 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/entity/ThPrivacyLog.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/entity/ThPrivacyLog.java @@ -3,17 +3,14 @@ package com.dbnt.kcscbackend.admin.logs.entity; import java.io.Serializable; import com.dbnt.kcscbackend.config.common.BoardParams; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.Accessors; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.*; -import java.time.LocalDate; import java.time.LocalDateTime; @Getter @@ -45,8 +42,7 @@ public class ThPrivacyLog extends BoardParams implements Serializable { private String ipAddress; @Column(name = "access_dt") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate accessDt; + private LocalDateTime accessDt; @Column(name = "session_id") private String sessionId; diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/service/AdminLogsService.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/service/AdminLogsService.java index e4bb26e..4f1b8d6 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/service/AdminLogsService.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/service/AdminLogsService.java @@ -54,7 +54,7 @@ public class AdminLogsService extends EgovAbstractServiceImpl { public void insertPrivacyLog(String userId, String ipAddress, String accessType, String targetUserId){ ThPrivacyLog log = new ThPrivacyLog(); log.setUserId(userId); - log.setAccessDt(LocalDate.now()); + log.setAccessDt(LocalDateTime.now()); log.setIpAddress(ipAddress); log.setAccessType(accessType); log.setTargetUserId(targetUserId); diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/service/impl/AdminStandardResearchServiceImpl.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/service/impl/AdminStandardResearchServiceImpl.java index 6547cbc..d2095c3 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/service/impl/AdminStandardResearchServiceImpl.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/service/impl/AdminStandardResearchServiceImpl.java @@ -31,6 +31,7 @@ import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @Service("adminStandardResearchService") @@ -55,10 +56,12 @@ public class AdminStandardResearchServiceImpl extends EgovAbstractServiceImpl im long totalRecordCount = tnResearchRepositoryLightweight.countByUseYn("Y"); + AtomicInteger index = new AtomicInteger(); List> list = tnResearchRepositoryLightweight.findByUseYn("Y", pageable) .stream() .map(item -> { Map codeMap = new HashMap<>(); + codeMap.put("number", totalRecordCount - (long) pageable.getPageNumber() * pageable.getPageSize() - index.getAndIncrement()); codeMap.put("id", item.getRsSeq()); codeMap.put("title", item.getRsTitle()); codeMap.put("researchStartDate", item.getRsStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));