egovframe-template-simple-react-contribution/src/components/alert/FormDialog.jsx

@@ -7,7 +7,7 @@ import DialogContent from '@mui/material/DialogContent';
 import DialogContentText from '@mui/material/DialogContentText';
 import DialogTitle from '@mui/material/DialogTitle';
 
-export default function FormDialog( {open, setOpen, title, contentText, children, handleOk} ) {  
+export default function FormDialog( {open, setOpen, title, contentText, children} ) {  
 
   const handleClickOpen = () => {
     setOpen(true);
@@ -43,7 +43,7 @@ export default function FormDialog( {open, setOpen, title, contentText, children
         </DialogContent>
         <DialogActions>
           <Button onClick={handleClose}>취소</Button>
-          <Button type="button" onClick={handleOk}>저장</Button>
+          <Button type="submit">저장</Button>
         </DialogActions>
       </Dialog>
     </React.Fragment>

egovframe-template-simple-react-contribution/src/components/list/ListCreateUpdateDelete.jsx

@@ -12,6 +12,9 @@ import Grid from '@mui/material/Grid';
 import Typography from '@mui/material/Typography';
 import DeleteIcon from '@mui/icons-material/Delete';
 import AddIcon from '@mui/icons-material/Add';
+import TextField from '@mui/material/TextField';
+
+import FormDialog from '../../components/alert/FormDialog';
 
 import styledComponent from "styled-components";
 
@@ -23,27 +26,19 @@ const StyledDiv = styledComponent.div`
 
 function generate(items, element, onClickListner,nameKey,
     idKey) {
-
+    return items.map((value, index) => 
-    let returnValue = [];
+        React.cloneElement(element, {
-    let nIndex = 0;
+            key: value[nameKey],
-    Object.keys(items).forEach(function(key) {
+        },
-        returnValue = [
+        <Card  className="text-item" sx={{ '&': { boxShadow: 'none' } }} data-index={index} onClick={(e) => {onClickListner(e, index);}}>
-            ...returnValue,
+            <CardActionArea sx={{ px: 1 }}>
-            React.cloneElement(element, {
+                <ListItemText
-                key,
+                    primary={value[nameKey]}
-            },
+                    key={index}                    
-            <Card  className="text-item" sx={{ '&': { boxShadow: 'none' } }} key={key} data-index={nIndex} onClick={(e) => {onClickListner(e, key);}}>
+                />
-                <CardActionArea sx={{ px: 1 }}>
+            </CardActionArea>
-                    <ListItemText
+      </Card>),
-                        primary={items[key][nameKey]}
+    );
-                        key={key}
-                    />
-                </CardActionArea>
-            </Card>),
-        ];
-        nIndex++;
-    });
-    return returnValue;
 }
 
 const Demo = styled('div')(({ theme }) => ({
@@ -60,32 +55,32 @@ const Item = styled(Paper)(({ theme }) => ({
 
 function ListCreateUpdateDelete(props) {
 
+    const [dense, setDense] = React.useState(false);
+
+    const [open, setOpen] = React.useState(false);
+
     const handleClickOpen = () => {
-        if( props.itemIndex[props.depthSelectedArrayIndex-1] === undefined ) {
+        setOpen(true);
-            alert('상위 코드를 선택해주세요.');
+    };
-            props.setIsPopupOpen(false);
+
-            return false;
+    const handleClose = () => {
-        }
+        setOpen(false);
-        props.setCreateCondition({...props.createCondition, paramCodeLevel : props.paramCodeLevel, paramOrgId : props.itemIndex[props.depthSelectedArrayIndex-1]});        
-        props.setIsPopupOpen(true);
     };
 
     const onClickItem = (e, index) => {
-        index = Number(index);
+
         // 기존 active를 모두 해제 한다.
         let siblingEle = e.currentTarget.parentNode.parentNode.firstChild;
         do {
             siblingEle.firstChild.classList.remove('active');
-        // eslint-disable-next-line no-cond-assign
         } while (siblingEle = siblingEle.nextSibling);
 
-        e.currentTarget.classList.add('active');
+        // 선택된 것만 active로 지정한다.
-        const myKey = Number(index);
+        if( Number(e.currentTarget.getAttribute('data-index')) === index ) {
-        props.itemIndex[props.depthSelectedArrayIndex] = myKey;
+            e.currentTarget.classList.add('active');
-        let forChangeObject = [...props.itemIndex];
+        }
-        props.setItemIndex(forChangeObject);
+        props.setItemIndex(index);
     };
-
     return (
         <StyledDiv>
             <Paper>
@@ -104,7 +99,7 @@ function ListCreateUpdateDelete(props) {
                 </Grid>
                 </Typography>
                 <Demo>
-                    <List dense={false} sx={{ px: 0, '&': { height: '253px', overflowY: 'auto'}}}>
+                    <List dense={dense} sx={{ px: 0, '&': { height: '253px', overflowY: 'auto'}}}>
                     {generate(
                         props.items,                    
                         <ListItem
@@ -126,6 +121,29 @@ function ListCreateUpdateDelete(props) {
                     )}
                     </List>
                 </Demo>
+                <FormDialog open={open} setOpen={setOpen} title="위원회 코드 등록" contentText="위원회 코드 항목을 입력해주세요." >
+                    <TextField
+                        autoFocus
+                        required
+                        margin="dense"
+                        id="insert-org-nm"
+                        name="insert-org-nm"
+                        label="명칭"
+                        type="text"
+                        fullWidth
+                        variant="standard"
+                    />
+                    <TextField
+                        required
+                        margin="dense"
+                        id="insert-org-desc"
+                        name="insert-org-desc"
+                        label="위원회 설명"
+                        type="text"
+                        fullWidth
+                        variant="standard"
+                    />
+                </FormDialog>
             </Paper>
         </StyledDiv>
         

egovframe-template-simple-react-contribution/src/pages/admin/config/CommitteeCodeMgt.jsx

@@ -7,8 +7,6 @@ import * as EgovNet from 'api/egovFetch';
 
 
 
-import CommitteeCodeRegistrationPopup from './CommitteeCodeMgt/CommitteeCodeRegistrationPopup';
-
 import ListCreateUpdateDelete from '../../../components/list/ListCreateUpdateDelete'
 import ListLabelInputs from '../../../components/list/ListLabelInputs'
 
@@ -21,63 +19,49 @@ import { default as EgovLeftNav } from 'components/leftmenu/EgovLeftNavAdmin';
 function CommitteeCodeMgt(props) {
 
     const [searchCondition, setSearchCondition] = useState({ paramCodeGroup: null, paramCodeLevel: 'LV_01' });
-    const [createCondition, setCreateCondition] = useState();
-
-    const [depth01List, setDepth01List] = useState({});
-    const [depth02List, setDepth02List] = useState({});
-    const [depth03List, setDepth03List] = useState({});
-    const [depth04List, setDepth04List] = useState({});
 
+    const [depth01List, setDepth01List] = useState([]);
+    const [depth02List, setDepth02List] = useState([]);
+    const [depth03List, setDepth03List] = useState([]);
+    const [depth04List, setDepth04List] = useState([]);
     const [summaryArray, setSummaryArray] = useState({});
-    const [depthSelectedIndex, setDepthSelectedIndex] = useState([]);
 
-    // 위원회 코드 등록 팝업을 보이거나 닫는다.
+    const [depth01SelectedIndex, setDepth01SelectedIndex] = React.useState(undefined);
-    const [isCommitteeCodeRegistrationPopupOpen, setIsCommitteeCodeRegistrationPopupOpen] = React.useState(false);
+    const [depth02SelectedIndex, setDepth02SelectedIndex] = React.useState(undefined);
+    const [depth03SelectedIndex, setDepth03SelectedIndex] = React.useState(undefined);
+    const [depth04SelectedIndex, setDepth04SelectedIndex] = React.useState(undefined);
 
 
     // '중앙건설기술심의'에서 특정 item선택 시, 하위 '총괄위원회'목록을 불러온다.
     useEffect(function () {
-        if( typeof depthSelectedIndex[0] !== "undefined" && depth01List[depthSelectedIndex[0]].orgId !== undefined) {
+        if( typeof depth01SelectedIndex !== 'undefined' ) {
-            setSearchCondition({ paramCodeGroup: depth01List[depthSelectedIndex[0]].orgId, paramCodeLevel: 'LV_02' });
+            setSearchCondition({ paramCodeGroup: depth01List[depth01SelectedIndex].orgId, paramCodeLevel: 'LV_02' });
-            setDepth02List({});
+            setDepth02SelectedIndex(undefined);
-            setDepth03List({});
+            setDepth03SelectedIndex(undefined);
-            setDepth04List({});
+            setDepth04SelectedIndex(undefined);
-            depthSelectedIndex[1] = undefined;
-            depthSelectedIndex[2] = undefined;
-            depthSelectedIndex[3] = undefined;            
-            let forChangeObject = [...depthSelectedIndex];
-            setDepthSelectedIndex(forChangeObject);
         } 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [depthSelectedIndex[0]]);
+    }, [depth01SelectedIndex]);
 
 
     // '총괄위원회'에서 특정 item선택 시, 하위 '건설기준위원회'목록을 불러온다.
     useEffect(function () {
-        if( typeof depthSelectedIndex[1] !== 'undefined' ) {
+        if( typeof depth02SelectedIndex !== 'undefined' ) {
-            setSearchCondition({ paramCodeGroup: depth02List[depthSelectedIndex[1]].orgId, paramCodeLevel: 'LV_03' });
+            setSearchCondition({ paramCodeGroup: depth02List[depth02SelectedIndex].orgId, paramCodeLevel: 'LV_03' });
-            setDepth03List({});
+            setDepth03SelectedIndex(undefined);
-            setDepth04List({});
+            setDepth04SelectedIndex(undefined);
-            depthSelectedIndex[2] = undefined;
-            depthSelectedIndex[3] = undefined;
-            let forChangeObject = [...depthSelectedIndex];
-            setDepthSelectedIndex(forChangeObject);
         } 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [depthSelectedIndex[1]]);
+    }, [depth02SelectedIndex]);
 
     // '건설기준위원회'에서 특정 item선택 시, 하위 '실무위원회'목록을 불러온다.
     useEffect(function () {
-        if( typeof depthSelectedIndex[2] !== 'undefined' ) {
+        if( typeof depth03SelectedIndex !== 'undefined' ) {
-            setSearchCondition({ paramCodeGroup: depth03List[depthSelectedIndex[2]].orgId, paramCodeLevel: 'LV_04' });
+            setSearchCondition({ paramCodeGroup: depth03List[depth03SelectedIndex].orgId, paramCodeLevel: 'LV_04' });
-            setDepth04List({});
+            setDepth04SelectedIndex(undefined);
-            depthSelectedIndex[3] = undefined;
-            let forChangeObject = [...depthSelectedIndex];
-            setDepthSelectedIndex(forChangeObject);
         }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [depthSelectedIndex[2]]);
+    }, [depth03SelectedIndex]);
-
 
     // 검색 조건이 변경되면 데이터를 불러온다.
     useEffect(function () {
@@ -89,13 +73,6 @@ function CommitteeCodeMgt(props) {
     
 
     
-    useEffect(function () {
-        if( typeof createCondition !== 'undefined' ) {
-            console.log('%o', createCondition);
-        }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [createCondition]);
-    
 
     const requestOptions = {
         method: "GET",
@@ -104,53 +81,45 @@ function CommitteeCodeMgt(props) {
         }
     }
 
-    const arrayToJson = (myArray, key) => {
-        let tempObj = {};
-
-        // eslint-disable-next-line array-callback-return
-        myArray.map((value, index) => {
-            tempObj = {...tempObj, [value[key]] : value};
-        });
-
-        return tempObj;
-    };
-
     const getList = (searchCondition) => {  
         
         EgovNet.requestFetch(`/admin/config/committee-code-management?paramCodeGroup=${searchCondition.paramCodeGroup}&paramCodeLevel=${searchCondition.paramCodeLevel}`,
             requestOptions,
             function (resp) {
                 if( searchCondition.paramCodeLevel === 'LV_01' ) {
-                    setDepth01List(arrayToJson(resp.result.list, "orgId"));
+                    setDepth01List(resp.result.list);
                 } else if( searchCondition.paramCodeLevel === 'LV_02' ) {
-                    setDepth02List(arrayToJson(resp.result.list, "orgId"));
+                    setDepth02List(resp.result.list);
                 } else if( searchCondition.paramCodeLevel === 'LV_03' ) {
-                    setDepth03List(arrayToJson(resp.result.list, "orgId"));
+                    setDepth03List(resp.result.list);
                 } else if( searchCondition.paramCodeLevel === 'LV_04' ) {   
-                    setDepth04List(arrayToJson(resp.result.list, "orgId"));
+                    setDepth04List(resp.result.list);
                 }
             }
         );
-    }
         
+    }
 
     useEffect(function () {
         setSummaryArray(
             {
-                "중앙건설기술심의" : depth01List[depthSelectedIndex[0]] && depth01List[depthSelectedIndex[0]].orgNm ? depth01List[depthSelectedIndex[0]].orgNm : "", 
+                "중앙건설기술심의" : depth01List[depth01SelectedIndex] && depth01List[depth01SelectedIndex].orgNm ? depth01List[depth01SelectedIndex].orgNm : "", 
-                "총괄위원회" : depth02List[depthSelectedIndex[1]] && depth02List[depthSelectedIndex[1]].orgNm ? depth02List[depthSelectedIndex[1]].orgNm : "", 
+                "총괄위원회" : depth02List[depth02SelectedIndex] && depth02List[depth02SelectedIndex].orgNm ? depth02List[depth02SelectedIndex].orgNm : "", 
-                "건설기준위원회" : depth03List[depthSelectedIndex[2]] && depth03List[depthSelectedIndex[2]].orgNm ? depth03List[depthSelectedIndex[2]].orgNm : "", 
+                "건설기준위원회" : depth03List[depth03SelectedIndex] && depth03List[depth03SelectedIndex].orgNm ? depth03List[depth03SelectedIndex].orgNm : "", 
-                "실무위원회" : depth04List[depthSelectedIndex[3]] && depth04List[depthSelectedIndex[3]].orgNm ? depth04List[depthSelectedIndex[3]].orgNm : "", 
+                "실무위원회" : depth04List[depth04SelectedIndex] && depth04List[depth04SelectedIndex].orgNm ? depth04List[depth04SelectedIndex].orgNm : "", 
             }
         );
+        console.log(`${depth01List[depth01SelectedIndex]}[${depth01SelectedIndex}]`);
     // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
         depth01List, 
         depth02List,
         depth03List, 
         depth04List, 
-        depthSelectedIndex
+        depth01SelectedIndex, 
-    ]);
+        depth02SelectedIndex, 
+        depth03SelectedIndex, 
+        depth04SelectedIndex]);        
         
 
     const Location = React.memo(function Location() {
@@ -196,64 +165,10 @@ function CommitteeCodeMgt(props) {
                                 },
                             }}
                         >
-
+                            <ListCreateUpdateDelete title="중앙건설기술심의" items={depth01List} itemIndex={depth01SelectedIndex} setItemIndex={setDepth01SelectedIndex} nameKey="orgNm" idKey="orgId" />
-                            <ListCreateUpdateDelete
+                            <ListCreateUpdateDelete title="총괄위원회" items={depth02List} itemIndex={depth02SelectedIndex} setItemIndex={setDepth02SelectedIndex} nameKey="orgNm" idKey="orgId" />
-                                title="중앙건설기술심의"
+                            <ListCreateUpdateDelete title="건설기준위원회" items={depth03List} itemIndex={depth03SelectedIndex} setItemIndex={setDepth03SelectedIndex} nameKey="orgNm" idKey="orgId" />
-                                items={depth01List}
+                            <ListCreateUpdateDelete title="실무위원회" items={depth04List} itemIndex={depth04SelectedIndex} setItemIndex={setDepth04SelectedIndex} nameKey="orgNm" idKey="orgId" />
-                                itemIndex={depthSelectedIndex}
-                                setItemIndex={setDepthSelectedIndex}
-                                depthSelectedArrayIndex={0}
-                                createCondition={createCondition}
-                                setCreateCondition={setCreateCondition}
-                                paramCodeLevel="LV_01"
-                                upParamOrgId="00"
-                                nameKey="orgNm"
-                                idKey="orgId"
-                                isPopupOpen = {isCommitteeCodeRegistrationPopupOpen}
-                                setIsPopupOpen = {setIsCommitteeCodeRegistrationPopupOpen}
-                            />
-                            <ListCreateUpdateDelete
-                                title="총괄위원회"
-                                items={depth02List}
-                                itemIndex={depthSelectedIndex}
-                                setItemIndex={setDepthSelectedIndex}
-                                depthSelectedArrayIndex={1}
-                                createCondition={createCondition}
-                                setCreateCondition={setCreateCondition}
-                                paramCodeLevel="LV_02"
-                                nameKey="orgNm"
-                                idKey="orgId"
-                                isPopupOpen = {isCommitteeCodeRegistrationPopupOpen}
-                                setIsPopupOpen = {setIsCommitteeCodeRegistrationPopupOpen}
-                            />
-                            <ListCreateUpdateDelete
-                                title="건설기준위원회"
-                                items={depth03List}
-                                itemIndex={depthSelectedIndex}
-                                setItemIndex={setDepthSelectedIndex}
-                                depthSelectedArrayIndex={2}
-                                createCondition={createCondition}
-                                setCreateCondition={setCreateCondition}
-                                paramCodeLevel="LV_03"
-                                nameKey="orgNm"
-                                idKey="orgId"
-                                isPopupOpen = {isCommitteeCodeRegistrationPopupOpen}
-                                setIsPopupOpen = {setIsCommitteeCodeRegistrationPopupOpen}
-                            />
-                            <ListCreateUpdateDelete
-                                title="실무위원회"
-                                items={depth04List}
-                                itemIndex={depthSelectedIndex}
-                                setItemIndex={setDepthSelectedIndex}
-                                depthSelectedArrayIndex={3}
-                                createCondition={createCondition}
-                                setCreateCondition={setCreateCondition}
-                                paramCodeLevel="LV_04"
-                                nameKey="orgNm"
-                                idKey="orgId"
-                                isPopupOpen = {isCommitteeCodeRegistrationPopupOpen}
-                                setIsPopupOpen = {setIsCommitteeCodeRegistrationPopupOpen}
-                            />
                             
                         </Box>
                         { true &&
@@ -271,14 +186,7 @@ function CommitteeCodeMgt(props) {
                             </Box>
                         }
                       
-                        <CommitteeCodeRegistrationPopup
+                        
-                            open={isCommitteeCodeRegistrationPopupOpen}
-                            setOpen={setIsCommitteeCodeRegistrationPopupOpen}
-                            createCondition={createCondition}
-                            setCreateCondition={setCreateCondition}
-                            searchCondition={searchCondition}
-                            setSearchCondition={setSearchCondition}
-                        />
                         {/* <!--// 본문 --> */}
                     </div>
                 </div>

egovframe-template-simple-react-contribution/src/pages/admin/config/CommitteeCodeMgt/CommitteeCodeRegistrationPopup.jsx

@@ -1,75 +0,0 @@
-import React from 'react';
-import TextField from '@mui/material/TextField';
-
-import * as EgovNet from 'api/egovFetch';
-import FormDialog from '../../../../components/alert/FormDialog';
-
-function CommitteeCodeRegistrationPopup(props) {
-
-
-    const handleClickCreateCommitteeCodeManagement = (createCondition) => {  
-        
-        if( createCondition.paramOrgId === undefined ) {
-            alert('상위 코드를 선택해주세요.');
-            props.setOpen(false);
-            return false;
-        }
-        const formData = new FormData();
-        
-        for (let key in createCondition) {
-            formData.append(key, createCondition[key]);
-        }
-
-        const requestOptions = {
-            method: "POST",
-            body: formData,
-        };
-
-        EgovNet.requestFetch(`/admin/config/committee-code-management`,
-            requestOptions,
-            function (resp) {
-                //window.location.reload();
-                //방금 추가한 것만 새로 읽어 드린다.
-                props.setSearchCondition({...props.searchCondition, paramCodeLevel : props.createCondition.paramCodeLevel});
-
-                props.setOpen(false);
-            }
-        );
-    }
-
-    const handleTextFieldChange = (event) => {
-        const elName    = event.target.getAttribute('name');
-        const elValue   = event.target.value;        
-        props.setCreateCondition({...props.createCondition,  [elName]:elValue});
-    };
-
-    return (
-        <FormDialog open={props.open} setOpen={props.setOpen} title="위원회 코드 등록" contentText="위원회 코드 항목을 입력해주세요." handleOk={(e) => {handleClickCreateCommitteeCodeManagement(props.createCondition);}} >
-            <TextField
-                autoFocus
-                required
-                margin="dense"
-                id="insert-org-nm"
-                name="paramOrgNm"
-                label="명칭"
-                type="text"
-                fullWidth
-                variant="standard"
-                onChange={handleTextFieldChange}
-            />
-            <TextField
-                required
-                margin="dense"
-                id="insert-org-desc"
-                name="paramOrgDesc"
-                label="위원회 설명"
-                type="text"
-                fullWidth
-                variant="standard"
-                onChange={handleTextFieldChange}
-            />
-        </FormDialog>
-    );
-}
-
-export default CommitteeCodeRegistrationPopup;

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/AdminConfigController.java

@@ -1,7 +1,6 @@
 package com.dbnt.kcscbackend.admin.config;
 
 import com.dbnt.kcscbackend.admin.config.entity.TcMenu;
-import com.dbnt.kcscbackend.admin.config.model.CreateCommitteeCodeManagementVO;
 import com.dbnt.kcscbackend.admin.config.service.AdminCommitteeCodeManagementService;
 import com.dbnt.kcscbackend.admin.standardResearch.service.AdminStandardResearchService;
 import com.dbnt.kcscbackend.commonCode.entity.TcCodeGrp;
@@ -403,46 +402,4 @@ public class AdminConfigController extends BaseController {
     return resultVO;
   }
 
-
-  @Operation(
-          summary = "'위원회 코드 관리' 페이지에서 위원회 코드 추가하는 API",
-          description = "관리자 단에서 '환경설정' > '위원회코드 관리' 페이지에서 +(추가) 버튼으로 항목 추가하는 API",
-          tags = {"AdminConfigController"}
-  )
-  @ApiResponses(value = {
-          @ApiResponse(responseCode = "200", description = "조회 성공"),
-          @ApiResponse(responseCode = "303", description = "만료된 토큰"),
-          @ApiResponse(responseCode = "403", description = "인가된 사용자가 아님")
-  })
-  @PostMapping(value = "/committee-code-management")
-  public ResultVO createCommitteeCodeManagement(
-          @AuthenticationPrincipal LoginVO user,
-          HttpServletRequest request,
-          CreateCommitteeCodeManagementVO createCommitteeCodeManagementVO
-  ) throws Exception {
-
-    ResultVO resultVO = new ResultVO();
-    if(user == null) {
-      resultVO.setResultCode(ResponseCode.TOKEN_EXPIRED.getCode());
-    } else {
-      try {
-        resultVO = adminCommitteeCodeManagementService.createCommitteeCodeManagement(resultVO, request, user,  createCommitteeCodeManagementVO);
-      } catch (Exception e) {
-        resultVO.setResultCode(ResponseCode.FAILED.getCode());
-        resultVO.setResultMessage(e.getMessage());
-      }
-    }
-
-    System.out.println(
-      "\n--------------------------------------------------------------\n" +
-      request.getRequestURI() + " OUT:" +
-      "\n--------------------------------------------------------------\n" +
-      "resultVO.toString():" + "\n" +
-      resultVO.toString() + "\n" +
-      "\n--------------------------------------------------------------\n"
-    );
-
-    return resultVO;
-  }
-
 }

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/model/CreateCommitteeCodeManagementVO.java

@@ -1,34 +0,0 @@
-package com.dbnt.kcscbackend.admin.config.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.io.Serializable;
-
-@ApiModel(value = "CreateCommitteeCodeManagementVO", description =
-        "관리자 단에서 '환경설정' > '위원회코드 관리' 페이지에서 +(추가) 버튼으로 항목 추가하는 API에 사용된다." + ""
-)
-@RequiredArgsConstructor
-@Getter
-@Setter
-@ToString
-public class CreateCommitteeCodeManagementVO implements Serializable {
-    private static final long serialVersionUID = -603047540959527181L;
-
-    @ApiModelProperty(value = "현재 등록하고 있는 항목의 level이 들어간다. '중앙건설기술심의'인 경우, LV_01이다. '총괄위원회'인 경우, LV_02이다. 이런 식으로 값이 들어간다.")
-    private String	paramCodeLevel;
-
-    @ApiModelProperty(value = "현재 등록하고 있는 항목의 상위 코드 값이 들어간다. '중앙건설기술심의'인 경우, 값이 00이다. 하지만 tn_cmt_org table에 cmt_seq 값이 00인 레코드는 존재하지 않는다.")
-    private String	paramOrgId;
-
-    @ApiModelProperty(value = "명칭")
-    private String	paramOrgNm;
-
-    @ApiModelProperty(value = "위원회 설명")
-    private String	paramOrgDesc;
-
-}

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/service/AdminCommitteeCodeManagementService.java

@@ -1,6 +1,5 @@
 package com.dbnt.kcscbackend.admin.config.service;
 
-import com.dbnt.kcscbackend.admin.config.model.CreateCommitteeCodeManagementVO;
 import com.dbnt.kcscbackend.admin.standardResearch.model.CreateStandardResearchVO;
 import com.dbnt.kcscbackend.admin.standardResearch.model.UpdateStandardResearchVO;
 import com.dbnt.kcscbackend.auth.entity.LoginVO;
@@ -13,7 +12,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 
 public interface AdminCommitteeCodeManagementService {
-	public ResultVO createCommitteeCodeManagement(ResultVO resultVO, HttpServletRequest request, LoginVO user, CreateCommitteeCodeManagementVO createCommitteeCodeManagementVO) throws Exception;
+	public ResultVO createCommitteeCodeManagement(ResultVO resultVO, HttpServletRequest request, LoginVO user, final MultipartHttpServletRequest multiRequest, CreateStandardResearchVO createStandardResearchVO) throws Exception;
 	public ResultVO getCommitteeCodeManagement(ResultVO resultVO, HttpServletRequest request, LoginVO user, Long upCmtSeq, String cmtType) throws Exception;
 	public ResultVO setCommitteeCodeManagement(ResultVO resultVO, HttpServletRequest request, LoginVO user, UpdateStandardResearchVO updateStandardResearchVO, Long popupId) throws Exception;
 	public ResultVO deleteCommitteeCodeManagement(ResultVO resultVO, HttpServletRequest request, LoginVO user, Long popupId) throws Exception;

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/service/impl/AdminCommitteeCodeManagementServiceImpl.java

@@ -1,6 +1,5 @@
 package com.dbnt.kcscbackend.admin.config.service.impl;
 
-import com.dbnt.kcscbackend.admin.config.model.CreateCommitteeCodeManagementVO;
 import com.dbnt.kcscbackend.admin.config.service.AdminCommitteeCodeManagementService;
 import com.dbnt.kcscbackend.admin.standardResearch.model.CreateStandardResearchVO;
 import com.dbnt.kcscbackend.admin.standardResearch.model.UpdateStandardResearchVO;
@@ -29,68 +28,28 @@ public class AdminCommitteeCodeManagementServiceImpl extends EgovAbstractService
     private final TnCmtOrgRepository tnCmtOrgRepository;
 
     @Override
-    public ResultVO createCommitteeCodeManagement(ResultVO resultVO, HttpServletRequest request, LoginVO user, CreateCommitteeCodeManagementVO createCommitteeCodeManagementVO) throws Exception {
+    public ResultVO createCommitteeCodeManagement(ResultVO resultVO, HttpServletRequest request, LoginVO user, MultipartHttpServletRequest multiRequest, CreateStandardResearchVO createStandardResearchVO) throws Exception {
-        System.out.println(
+        return null;
-            "\n--------------------------------------------------------------\n" +
-            request.getRequestURI() + " IN:" +
-            "\n--------------------------------------------------------------\n" +
-            "user.getEmail():" + "\n" +
-            user.getEmail() + "\n" +
-            "\n--------------------------------------------------------------\n"
-        );
-
-        // 아래 null로 전달 되는 부분 확인하기.
-        // 유효성 검사 실시
-        if(createCommitteeCodeManagementVO.getParamCodeLevel().trim().isEmpty()) {
-            throw new Exception("오류가 발생했습니다. 시스템 담당자에게 문의 바랍니다. paramCodeLevel is empty.");
-        }
-        Integer upCmtSeq = null;
-        if( createCommitteeCodeManagementVO.getParamOrgId().trim().equals("00") == false ) {  // 00은 '중앙건설기술심의' 항목의 부모 sequnce이다. 그러나 DB에 실제 00이란 sequence는 존재하지 않는다.
-            upCmtSeq = Integer.parseInt(createCommitteeCodeManagementVO.getParamOrgId());
-        }
-
-        Map<String, Object> response = tnCmtOrgRepository.spAddTnCmtOrg(
-                createCommitteeCodeManagementVO.getParamOrgNm(),			            // 위원회 이름
-                createCommitteeCodeManagementVO.getParamCodeLevel(),		            // 위원회 등급
-                createCommitteeCodeManagementVO.getParamOrgDesc(),	                    // 위원회 설명
-                upCmtSeq,		                                                        // 상위 위원회 sequence
-                1,			                                                            // 정렬 순서
-                user.getId(),
-                null,
-                null,
-                null,
-                null
-        );
-
-        Map<String, Object> dto = new HashMap<String, Object>();
-        dto.put("id", response.get("_cmt_seq") );
-
-        resultVO.setResult(dto);
-        resultVO.setResultCode(ResponseCode.SUCCESS.getCode());
-        resultVO.setResultMessage(ResponseCode.SUCCESS.getMessage());
-
-        return resultVO;
     }
 
     @Override
     public ResultVO getCommitteeCodeManagement(ResultVO resultVO, HttpServletRequest request, LoginVO user, Long upCmtSeq, String cmtType) throws Exception {
 
         System.out.println(
-            "\n--------------------------------------------------------------\n" +
+                "\n--------------------------------------------------------------\n" +
-            request.getRequestURI() + " IN:" +
+                        request.getRequestURI() + " IN:" +
-            "\n--------------------------------------------------------------\n" +
+                        "\n--------------------------------------------------------------\n" +
-            "user.getEmail():" + "\n" +
+                        "user.getEmail():" + "\n" +
-            user.getEmail() + "\n" +
+                        user.getEmail() + "\n" +
-            "\n--------------------------------------------------------------\n"
+                        "\n--------------------------------------------------------------\n"
         );
 
         List<Map<String, Object>> list = tnCmtOrgRepository.findByUseYnAndUpCmtSeqAndCmtTypeOrderByCmtOrder("Y", upCmtSeq, cmtType).stream()
                 .map(item -> {
                     Map<String, Object> returnMap = new HashMap<>();
-                    returnMap.put("orgId",          item.getCmtSeq());
+                    returnMap.put("orgId",      item.getCmtSeq());
-                    returnMap.put("orgNm",          item.getCmtNm());
+                    returnMap.put("orgNm",      item.getCmtNm());
-                    returnMap.put("orgDesc",        item.getCmtDesc());
+                    returnMap.put("orgDesc",    item.getCmtDesc());
-                    returnMap.put("omtOrder",       item.getCmtOrder());
                     return returnMap;
                 })
                 .collect(Collectors.toList());

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/commonCode/repository/TnCmtOrgRepository.java

@@ -2,42 +2,12 @@ package com.dbnt.kcscbackend.commonCode.repository;
 
 import com.dbnt.kcscbackend.commonCode.entity.TnCmtOrg;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 
 import java.util.List;
-import java.util.Map;
 
 public interface TnCmtOrgRepository extends JpaRepository<TnCmtOrg, TnCmtOrg.TnCmtOrgId> {
   List<TnCmtOrg> findByUseYnAndUpCmtSeqOrderByCmtOrder(String useYn, Long upCmtSeq);
   TnCmtOrg findByUseYnAndCmtSeq(String useYn, Long cmtSeq);
   List<TnCmtOrg> findByUseYnAndUpCmtSeqAndCmtTypeOrderByCmtOrder(String useYn, Long upCmtSeq, String cmtType);
 
-
-  @Query(value = "CALL sp_add_tn_cmt_org (" +
-          ":_cmt_nm, " +
-          ":_cmt_type, " +
-          ":_cmt_desc, " +
-          ":_up_cmt_seq, " +
-          ":_cmt_order, " +
-          ":_modi_id, " +
-          ":_cmt_seq, " +
-          ":_result_count, " +
-          ":_result_code, " +
-          ":_error_message)",
-          nativeQuery = true)
-  Map<String, Object> spAddTnCmtOrg(
-          @Param("_cmt_nm")         String          cmtNm,
-          @Param("_cmt_type")       String          cmtType,
-          @Param("_cmt_desc")       String          cmtDesc,
-          @Param("_up_cmt_seq")     Integer         upCmtSeq,
-          @Param("_cmt_order")      Integer         cmtOrder,
-          @Param("_modi_id")        String          modiId,
-          @Param("_cmt_seq")        Integer         evtSeq,
-          @Param("_result_count")   Integer         resultCount,
-          @Param("_result_code")    String          resultCode,
-          @Param("_error_message")  String          errorMessage
-  );
-
-
 }