Commit @ca71e1bcf130232166d930d321a346d0b7804965

105519e

ca71e1b

.idea/jarRepositories.xml

--- .idea/jarRepositories.xml

+++ .idea/jarRepositories.xml


       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
     <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
+      <option name="id" value="egovframe" />
+      <option name="name" value="egovframe" />
+      <option name="url" value="https://maven.egovframe.go.kr/maven/" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="mvn2s" />

       <option name="url" value="https://repo1.maven.org/maven2/" />
     </remote-repository>
     <remote-repository>
-      <option name="id" value="egovframe" />
-      <option name="name" value="egovframe" />
-      <option name="url" value="https://maven.egovframe.go.kr/maven/" />
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="jboss.community" />

105519e

ca71e1b

src/main/java/com/takensoft/cms/mber/dao/MberDAO.java

--- src/main/java/com/takensoft/cms/mber/dao/MberDAO.java

+++ src/main/java/com/takensoft/cms/mber/dao/MberDAO.java


      * @since 2024.04.23
      * 회원정보 목록 조회 (관리자)
      */
-    List<MberVO> findByMng(Pagination pagination) throws Exception;
+    List<MberVO> findAllMng(Pagination pagination) throws Exception;
+
+    /**
+     * @author 박정하
+     * @since 2024.04.23
+     * 회원정보 목록 조회 (사용자)
+     */
+    List<MberVO> findAllMbr(Pagination pagination) throws Exception;
 
     /**
      * @author 박정하
      * @since 2024.04.23
      * 회원정보 목록 조회 (관리자) 개수
      */
-    int findByMngCnt(Pagination pagination) throws Exception;
+    int findAllMngCnt(Pagination pagination) throws Exception;
+
+    /**
+     * @author 박정하
+     * @since 2024.04.23
+     * 회원정보 목록 조회 (관리자) 개수
+     */
+    int findAllMbrCnt(Pagination pagination) throws Exception;
 
     /**
      * @author 박정하

105519e

ca71e1b

src/main/java/com/takensoft/cms/mber/service/Impl/MberServiceImpl.java

--- src/main/java/com/takensoft/cms/mber/service/Impl/MberServiceImpl.java

+++ src/main/java/com/takensoft/cms/mber/service/Impl/MberServiceImpl.java


 import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

     /**
      * @author 박정하
      * @since 2024.04.23
-     * 회원정보 목록 조회 (관리자)
+     * 회원정보 목록 조회
      */
     @Override
-    public Map<String, Object> findByMng(Map<String, String> params) throws Exception {
+    public Map<String, Object> findAll(Map<String, String> params) throws Exception {
         Map<String, Object> result = new HashMap<>();
         Pagination search = new Pagination(0, params);
-        int cnt = mberDAO.findByMngCnt(search);
+        int cnt = 0;
+        if (params.get("authrtCd").equals("ROLE_ADMIN")) {
+            cnt = mberDAO.findAllMngCnt(search);
+        } else if (params.get("authrtCd").equals("ROLE_USER")) {
+            cnt = mberDAO.findAllMbrCnt(search);
+        }
         Pagination pagination = new Pagination(cnt, params);
-        List<MberVO> list = mberDAO.findByMng(pagination);
+        List<MberVO> list = new ArrayList<>();
+        if (params.get("authrtCd").equals("ROLE_ADMIN")) {
+            list = mberDAO.findAllMng(pagination);
+        } else if (params.get("authrtCd").equals("ROLE_USER")) {
+            list = mberDAO.findAllMbr(pagination);
+        }
         // 휴대폰번호 복호화
         for (MberVO mberVO : list) {
             if (mberVO.getMblTelno() != null && !mberVO.getMblTelno().equals("")) {

105519e

ca71e1b

src/main/java/com/takensoft/cms/mber/service/MberService.java

--- src/main/java/com/takensoft/cms/mber/service/MberService.java

+++ src/main/java/com/takensoft/cms/mber/service/MberService.java


     /**
      * @author 박정하
      * @since 2024.04.23
-     * 회원정보 목록 조회 (관리자)
+     * 회원정보 목록 조회
      */
-    public Map<String, Object> findByMng(Map<String, String> params) throws Exception;
+    public Map<String, Object> findAll(Map<String, String> params) throws Exception;
 
     /**
      * @author 박정하

105519e

ca71e1b

src/main/java/com/takensoft/cms/mber/web/AdmMberController.java

--- src/main/java/com/takensoft/cms/mber/web/AdmMberController.java

+++ src/main/java/com/takensoft/cms/mber/web/AdmMberController.java


      * @return
      * @throws Exception
      *
-     * 회원정보 목록 조회 (관리자)
+     * 회원정보 목록 조회
      */
-    @PostMapping(value = "/findByMng.json")
-    public ResponseEntity<?> findByMng(@RequestBody Map<String, String> params) throws Exception {
+    @PostMapping(value = "/findAll.json")
+    public ResponseEntity<?> findAll(@RequestBody Map<String, String> params) throws Exception {
         // 회원정보 관련 정보 조회
-        Map<String, Object> result = mberService.findByMng(params);
+        Map<String, Object> result = mberService.findAll(params);
         // 응답 처리
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(new MediaType("application", "json", Charset.forName("UTF-8")));

105519e

ca71e1b

src/main/java/com/takensoft/cms/mber/web/MberController.java

--- src/main/java/com/takensoft/cms/mber/web/MberController.java

+++ src/main/java/com/takensoft/cms/mber/web/MberController.java


             return new ResponseEntity<>(responseData, headers, HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
-
-    /**
-     * @author 박정하
-     * @since 2024.04.23
-     * @param params
-     * @return
-     * @throws Exception
-     *
-     * 회원정보 목록 조회 (관리자)
-     */
-    @PostMapping(value = "/findByMng.json")
-    public ResponseEntity<?> findByMng(@RequestBody Map<String, String> params) throws Exception {
-        // 회원정보 관련 정보 조회
-        Map<String, Object> result = mberService.findByMng(params);
-        // 응답 처리
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(new MediaType("application", "json", Charset.forName("UTF-8")));
-        ResponseData responseData = new ResponseData();
-        responseData.setStatus(HttpStatus.OK);
-        responseData.setMessage("정상적으로 회원정보(관리자) 목록 조회가 처리되었습니다.");
-        responseData.setData(result);
-        return new ResponseEntity<>(responseData, headers, HttpStatus.OK);
-    }
 }

105519e

ca71e1b

src/main/java/com/takensoft/common/excel/ExcelHeader.java

--- src/main/java/com/takensoft/common/excel/ExcelHeader.java

+++ src/main/java/com/takensoft/common/excel/ExcelHeader.java


     // 가업정보
     private LinkedHashMap<String, String> entInfoDefaultHeader = new LinkedHashMap<>();
     private LinkedHashMap<String, String> entInfoDetailHeader = new LinkedHashMap<>();
-    private LinkedHashMap<String, String> entInfoFnlttHeader = new LinkedHashMap<>();
+    private LinkedHashMap<String, String> entInfoFnstmHeader = new LinkedHashMap<>();
 
     // 투자상담
-    private LinkedHashMap<String, String> invtDscsnHeader = new LinkedHashMap<>();
+    private LinkedHashMap<String, String> ivstDscsnHeader = new LinkedHashMap<>();
 
     // 검토사항
     private LinkedHashMap<String, String> rvwMttrHeader = new LinkedHashMap<>();

 
         // 기업정보 - 세부정보
         this.entInfoDetailHeader.put("mvnInten", "입주의향");
-        this.entInfoDetailHeader.put("invtInten", "투자의향");
+        this.entInfoDetailHeader.put("ivstInten", "투자의향");
         this.entInfoDetailHeader.put("mouInten", "MOU의향");
-        this.entInfoDetailHeader.put("invtDscsnInten", "투자상담의향");
+        this.entInfoDetailHeader.put("ivstDscsnInten", "투자상담의향");
 
         // 기업정보 - 재무제표
-        this.entInfoFnlttHeader.put("yr", "연도");
-        this.entInfoFnlttHeader.put("slsAmt", "매출액");
-        this.entInfoFnlttHeader.put("bsnPrfts", "영업이익");
-        this.entInfoFnlttHeader.put("netIncome", "당기순이익");
+        this.entInfoFnstmHeader.put("yr", "연도");
+        this.entInfoFnstmHeader.put("slsAmt", "매출액");
+        this.entInfoFnstmHeader.put("salsPrf", "영업이익");
+        this.entInfoFnstmHeader.put("thtmNetpf", "당기순이익");
 
         // 투자상담 - 세부정보
-        this.invtDscsnHeader.put("ttl", "제목");
-        this.invtDscsnHeader.put("dt", "일시");
-        this.invtDscsnHeader.put("plc", "장소");
-        this.invtDscsnHeader.put("prtpnt", "참석자");
-        this.invtDscsnHeader.put("dscsnPbsvnt", "상담공무원");
-        this.invtDscsnHeader.put("mainCn", "주요내용");
-        this.invtDscsnHeader.put("mvnInten", "입주의향");
-        this.invtDscsnHeader.put("invtInten", "투자의향");
-        this.invtDscsnHeader.put("mouInten", "MOU의향");
-        this.invtDscsnHeader.put("invtDscsnInten", "투자상담의향");
+        this.ivstDscsnHeader.put("ttl", "제목");
+        this.ivstDscsnHeader.put("dt", "일시");
+        this.ivstDscsnHeader.put("plc", "장소");
+        this.ivstDscsnHeader.put("prtpnt", "참석자");
+        this.ivstDscsnHeader.put("dscsnPbofc", "상담공무원");
+        this.ivstDscsnHeader.put("mainCn", "주요내용");
+        this.ivstDscsnHeader.put("mvnInten", "입주의향");
+        this.ivstDscsnHeader.put("ivstInten", "투자의향");
+        this.ivstDscsnHeader.put("mouInten", "MOU의향");
+        this.ivstDscsnHeader.put("ivstDscsnInten", "투자상담의향");
 
         // 검토사항 - 기본정보
         this.rvwMttrHeader.put("entNm", "기업명");

105519e

ca71e1b

src/main/java/com/takensoft/common/excel/ExcelUtils.java

--- src/main/java/com/takensoft/common/excel/ExcelUtils.java

+++ src/main/java/com/takensoft/common/excel/ExcelUtils.java


                     } else if (data.get(i).get(key).toString().equals("P")) {
                         cell.setCellValue("애로사항");
                     }
-                } else if (key.equals("mvnInten") || key.equals("invtInten") || key.equals("mouInten") || key.equals("invtDscsnInten")){
+                } else if (key.equals("mvnInten") || key.equals("ivstInten") || key.equals("mouInten") || key.equals("ivstDscsnInten")){
                     if (data.get(i).get(key).toString().equals("0")) {
                         cell.setCellValue("의향없음");
                     } else if (data.get(i).get(key).toString().equals("1")) {

      *
      * 기업정보 엑셀 설정
      */
-    public void entInfoDraw(List<HashMap<String, Object>> entInfoList, List<HashMap<String, Object>> invtDscsnList, List<HashMap<String, Object>> FnlttList, String imageData) throws IllegalAccessException, IOException {
+    public void entInfoDraw(List<HashMap<String, Object>> entInfoList, List<HashMap<String, Object>> ivstDscsnList, List<HashMap<String, Object>> FnstmList, String imageData) throws IllegalAccessException, IOException {
         try {
             Sheet sheet = this.workbook.createSheet("Sheet");
 

             // 헤더 정보
             ExcelHeader excelHeader = new ExcelHeader();
             LinkedHashMap<String, String> entInfoHeader = excelHeader.getEntInfoDefaultHeader();
-            LinkedHashMap<String, String> invtDscsnHeader = excelHeader.getEntInfoDetailHeader();
-            LinkedHashMap<String, String> fnlttHeader = excelHeader.getEntInfoFnlttHeader();
+            LinkedHashMap<String, String> ivstDscsnHeader = excelHeader.getEntInfoDetailHeader();
+            LinkedHashMap<String, String> fnstmHeader = excelHeader.getEntInfoFnstmHeader();
 
             // 기업정보
             rowNum = vertical(sheet, rowNum, entInfoHeader, entInfoList);

 
             cell = row.createCell(1);
 
-            if (invtDscsnHeader.get(0) != null) {
+            if (ivstDscsnHeader.get(0) != null) {
                 cell.setCellValue("Y");
                 rowNum++;
 
-                rowNum = vertical(sheet, rowNum, invtDscsnHeader, invtDscsnList);
+                rowNum = vertical(sheet, rowNum, ivstDscsnHeader, ivstDscsnList);
             } else {
                 cell.setCellValue("N");
                 rowNum++;

             }
 
             // 재무제표
-            rowNum = vertical(sheet, rowNum, fnlttHeader, FnlttList);
+            rowNum = vertical(sheet, rowNum, fnstmHeader, FnstmList);
 
             // 재무제표 차트
             chartDraw(sheet, imageData, rowNum);

             ((SXSSFSheet) sheet).flushRows(MAX_ROW);
 
             entInfoList.clear();
-            invtDscsnList.clear();
-            FnlttList.clear();
+            ivstDscsnList.clear();
+            FnstmList.clear();
         } catch (IOException | IllegalAccessException e) {
             throw new RuntimeException(e);
         }

105519e

ca71e1b

src/main/java/com/takensoft/common/file/service/Impl/FileServiceImpl.java

--- src/main/java/com/takensoft/common/file/service/Impl/FileServiceImpl.java

+++ src/main/java/com/takensoft/common/file/service/Impl/FileServiceImpl.java


             String extsn = StringUtils.getFilenameExtension(fileName); // 확장자
             String mg = Long.toString(file.getSize()); // 크기
             String absltPath = makeDirectories(uploadPath) + File.separator + maskNm + "." + extsn; // 절대경로
-            String prttnPath = File.separator + maskNm + "." + extsn; // 일부경로
+            String partPath = File.separator + maskNm + "." + extsn; // 일부경로
 
             // FileVO 생성
             FileVO fileVO = new FileVO();

             fileVO.setMaskNm(maskNm); // 마스크명
             // 파일타입 추후에 추가
             fileVO.setAbsltPath(absltPath); // 절대경로
-            fileVO.setPrttnPath(prttnPath); // 일부경로
+            fileVO.setPartPath(partPath); // 일부경로
             fileVO.setExtnNm(extsn); // 확장자
             fileVO.setFileSz(mg); // 크기
             // 등록자 생성

105519e

ca71e1b

src/main/java/com/takensoft/common/file/vo/FileVO.java

--- src/main/java/com/takensoft/common/file/vo/FileVO.java

+++ src/main/java/com/takensoft/common/file/vo/FileVO.java


     private String maskNm; // 마스크명
     private String fileType; // 파일타입
     private String absltPath; // 절대경로
-    private String prttnPath; // 일부경로
+    private String partPath; // 일부경로
     private String extnNm; // 확장자
     private String fileSz; // 크기
     private String rgtr; // 등록자

105519e

ca71e1b

src/main/java/com/takensoft/common/idgen/context/ContextIdgen.java

--- src/main/java/com/takensoft/common/idgen/context/ContextIdgen.java

+++ src/main/java/com/takensoft/common/idgen/context/ContextIdgen.java


     }
 
     // 투자상담
-    @Bean(name = "invtDscsnIdgn")
-    public IdgenService invtDscsn() {
+    @Bean(name = "ivstDscsnIdgn")
+    public IdgenService ivstDscsn() {
         IdgenService idgenServiceImpl = new IdgenService();
         idgenServiceImpl.setCipers(15);
         idgenServiceImpl.setFillChar('0');
-        idgenServiceImpl.setPrefix("INVT_DSCSN_");
-        idgenServiceImpl.setTblNm("INVT_DSCSN_ID");
+        idgenServiceImpl.setPrefix("IVST_DSCSN_");
+        idgenServiceImpl.setTblNm("IVST_DSCSN_ID");
         return idgenServiceImpl;
     }
 

105519e

ca71e1b

src/main/java/com/takensoft/portal/entDscsnAply/dao/EntDscsnAplyDAO.java

--- src/main/java/com/takensoft/portal/entDscsnAply/dao/EntDscsnAplyDAO.java

+++ src/main/java/com/takensoft/portal/entDscsnAply/dao/EntDscsnAplyDAO.java


      *
      * 기업상담신청 1시간 이내 동일 아이피 등록 개수
      */
-    public HashMap<String, Object> entDscsnAplyCountByOneHourWriteSameIp(EntDscsnAplyVO entDscsnAplyVO) throws Exception;
+    public HashMap<String, Object> entDscsnAplyCountByOneHourWriteSameIp(String params) throws Exception;
 }

105519e

ca71e1b

src/main/java/com/takensoft/portal/entDscsnAply/service/EntDscsnAplyService.java

--- src/main/java/com/takensoft/portal/entDscsnAply/service/EntDscsnAplyService.java

+++ src/main/java/com/takensoft/portal/entDscsnAply/service/EntDscsnAplyService.java


      * 기업상담신청 수정
      */
     public int entDscsnAplyUpdate(EntDscsnAplyVO entDscsnAplyVO) throws Exception;
-
-    /**
-     * @author 박정하
-     * @since 2024.04.04
-     *
-     * 기업상담신청 1시간 이내 동일 아이피 등록 개수
-     */
-    public HashMap<String, Object> entDscsnAplyCountByOneHourWriteSameIp(EntDscsnAplyVO entDscsnAplyVO) throws Exception;
 }

105519e

ca71e1b

src/main/java/com/takensoft/portal/entDscsnAply/service/Impl/EntDscsnAplyServiceImpl.java

--- src/main/java/com/takensoft/portal/entDscsnAply/service/Impl/EntDscsnAplyServiceImpl.java

+++ src/main/java/com/takensoft/portal/entDscsnAply/service/Impl/EntDscsnAplyServiceImpl.java


         entDscsnAplyVO.setAplcntIp(ipAddress);
 
         // 아이피 검사
-        HashMap<String, Object> entDscsnAplyCount = entDscsnAplyCountByOneHourWriteSameIp(entDscsnAplyVO);
-        if (Integer.parseInt((String.valueOf(entDscsnAplyCount.get("writeCount")))) > 2) {
-            result.put("writeCount", entDscsnAplyCount.get("writeCount"));
-            result.put("lastDatetime", entDscsnAplyCount.get("lastDatetime"));
+        HashMap<String, Object> entDscsnAplyCount = entDscsnAplyDAO.entDscsnAplyCountByOneHourWriteSameIp(ipAddress);
+        if (Integer.parseInt((String.valueOf(entDscsnAplyCount.get("writecount")))) > 2) {
+            result.put("writeCount", entDscsnAplyCount.get("writecount"));
+            result.put("lastDatetime", entDscsnAplyCount.get("lastdatetime"));
             return result;
         }
 

     @Override
     public int entDscsnAplyUpdate(EntDscsnAplyVO entDscsnAplyVO) throws Exception {
         return entDscsnAplyDAO.entDscsnAplyUpdate(entDscsnAplyVO);
-    }
-
-    /**
-     * @author 박정하
-     * @since 2024.04.04
-     *
-     * 기업상담신청 1시간 이내 동일 아이피 등록 개수
-     */
-    public HashMap<String, Object> entDscsnAplyCountByOneHourWriteSameIp(EntDscsnAplyVO entDscsnAplyVO) throws Exception {
-        return entDscsnAplyDAO.entDscsnAplyCountByOneHourWriteSameIp(entDscsnAplyVO);
     }
 }

105519e

ca71e1b

src/main/java/com/takensoft/portal/entDscsnAply/web/EntDscsnAplyController.java

--- src/main/java/com/takensoft/portal/entDscsnAply/web/EntDscsnAplyController.java

+++ src/main/java/com/takensoft/portal/entDscsnAply/web/EntDscsnAplyController.java


      * 기업상담신청 등록
      */
     @PostMapping(path = "/company/entDscsnAplyInsert.file")
-    public ResponseEntity<?> invtDscsnInsert(@RequestPart EntDscsnAplyVO entDscsnAplyVO, List<MultipartFile> multipartFile, HttpServletRequest req) throws Exception {
+    public ResponseEntity<?> ivstDscsnInsert(@RequestPart EntDscsnAplyVO entDscsnAplyVO, List<MultipartFile> multipartFile, HttpServletRequest req) throws Exception {
         // 기업상담신청 등록
         HashMap<String, Object> result = entDscsnAplyService.entDscsnAplyInsert(entDscsnAplyVO, multipartFile, req);
 

         } else {
             if (result.containsKey("writeCount") && result.containsKey("lastDatetime")) {
                 responseData.setStatus(HttpStatus.TOO_MANY_REQUESTS);
-                responseData.setMessage("주어진 시간 동안 너무 많은 문의를 등록했습니다. " + result.get("writeCount") + "분 후에 재시도하세요.");
+                responseData.setMessage("주어진 시간 동안 너무 많은 문의를 등록했습니다. " + result.get("lastDatetime") + " 후에 재시도하세요.");
                 return new ResponseEntity<>(responseData, headers, HttpStatus.TOO_MANY_REQUESTS);
             } else {
                 responseData.setStatus(HttpStatus.INTERNAL_SERVER_ERROR);

105519e

src/main/java/com/takensoft/portal/entInfo/dao/FnlttDAO.java (deleted)

--- src/main/java/com/takensoft/portal/entInfo/dao/FnlttDAO.java

...	...	@@ -1,38 +0,0 @@
	1	-package com.takensoft.portal.entInfo.dao;
	2	-
	3	-import org.egovframe.rte.psl.dataaccess.mapper.Mapper;
	4	-
	5	-import java.util.*;
	6	-
	7	-/**
	8	- * @author : 박정하
	9	- * @since : 2024.03.20
	10	- *
	11	- * 재무제표 관련 Mapper
	12	- */
	13	-@Mapper("fnlttDAO")
	14	-public interface FnlttDAO {
	15	- /**
	16	- * @author 박정하
	17	- * @since 2024.04.12
	18	- *
	19	- * 재무제표 업설트
	20	- */
	21	- public int fnlttUpsert(HashMap<String, Object> params) throws Exception;
	22	-
	23	- /**
	24	- * @author 박정하
	25	- * @since 2024.03.21
	26	- *
	27	- * 재무제표 목록 조회
	28	- */
	29	- public List<HashMap<String, Object>> fnlttSelectList(HashMap<String, Object> params) throws Exception;
	30	-
	31	- /**
	32	- * @author 박정하
	33	- * @since 2024.03.22
	34	- *
	35	- * 재무제표 삭제
	36	- */
	37	- public int fnlttDelete(HashMap<String, Object> params) throws Exception;
	38	-}(파일 끝에 줄바꿈 문자 없음)

ca71e1b

src/main/java/com/takensoft/portal/entInfo/dao/FnstmDAO.java (added)

+++ src/main/java/com/takensoft/portal/entInfo/dao/FnstmDAO.java

...	...	@@ -0,0 +1,46 @@
	1	+package com.takensoft.portal.entInfo.dao;
	2	+
	3	+import org.egovframe.rte.psl.dataaccess.mapper.Mapper;
	4	+
	5	+import java.util.*;
	6	+
	7	+/**
	8	+ * @author : 박정하
	9	+ * @since : 2024.03.20
	10	+ *
	11	+ * 재무제표 관련 Mapper
	12	+ */
	13	+@Mapper("fnstmDAO")
	14	+public interface FnstmDAO {
	15	+ /**
	16	+ * @author 박정하
	17	+ * @since 2024.04.25
	18	+ *
	19	+ * 재무제표 등록
	20	+ */
	21	+ public int fnstmInsert(HashMap<String, Object> params) throws Exception;
	22	+
	23	+ /**
	24	+ * @author 박정하
	25	+ * @since 2024.04.25
	26	+ *
	27	+ * 재무제표 수정
	28	+ */
	29	+ public int fnstmUpdate(HashMap<String, Object> params) throws Exception;
	30	+
	31	+ /**
	32	+ * @author 박정하
	33	+ * @since 2024.03.21
	34	+ *
	35	+ * 재무제표 목록 조회
	36	+ */
	37	+ public List<HashMap<String, Object>> fnstmSelectList(HashMap<String, Object> params) throws Exception;
	38	+
	39	+ /**
	40	+ * @author 박정하
	41	+ * @since 2024.03.22
	42	+ *
	43	+ * 재무제표 삭제
	44	+ */
	45	+ public int fnstmDelete(HashMap<String, Object> params) throws Exception;
	46	+}(파일 끝에 줄바꿈 문자 없음)

105519e

src/main/java/com/takensoft/portal/entInfo/service/FnlttService.java (deleted)

--- src/main/java/com/takensoft/portal/entInfo/service/FnlttService.java

...	...	@@ -1,35 +0,0 @@
	1	-package com.takensoft.portal.entInfo.service;
	2	-
	3	-import java.util.*;
	4	-
	5	-/**
	6	- * @author : 박정하
	7	- * @since : 2024.03.20
	8	- *
	9	- * 재무제표 관련 인터페이스
	10	- */
	11	-public interface FnlttService {
	12	- /**
	13	- * @author 박정하
	14	- * @since 2024.04.12
	15	- *
	16	- * 재무제표 업설트
	17	- */
	18	- public int fnlttUpsert(HashMap<String, Object> params) throws Exception;
	19	-
	20	- /**
	21	- * @author 박정하
	22	- * @since 2024.03.21
	23	- *
	24	- * 재무제표 목록 조회
	25	- */
	26	- public List<HashMap<String, Object>> fnlttSelectList(HashMap<String, Object> params) throws Exception;
	27	-
	28	- /**
	29	- * @author 박정하
	30	- * @since 2024.03.22
	31	- *
	32	- * 재무제표 삭제
	33	- */
	34	- public int fnlttDelete(HashMap<String, Object> params) throws Exception;
	35	-}(파일 끝에 줄바꿈 문자 없음)

ca71e1b

src/main/java/com/takensoft/portal/entInfo/service/FnstmService.java (added)

+++ src/main/java/com/takensoft/portal/entInfo/service/FnstmService.java

...	...	@@ -0,0 +1,43 @@
	1	+package com.takensoft.portal.entInfo.service;
	2	+
	3	+import java.util.*;
	4	+
	5	+/**
	6	+ * @author : 박정하
	7	+ * @since : 2024.03.20
	8	+ *
	9	+ * 재무제표 관련 인터페이스
	10	+ */
	11	+public interface FnstmService {
	12	+ /**
	13	+ * @author 박정하
	14	+ * @since 2024.04.25
	15	+ *
	16	+ * 재무제표 등록
	17	+ */
	18	+ public int fnstmInsert(HashMap<String, Object> params) throws Exception;
	19	+
	20	+ /**
	21	+ * @author 박정하
	22	+ * @since 2024.04.25
	23	+ *
	24	+ * 재무제표 수정
	25	+ */
	26	+ public int fnstmUpdate(List<HashMap<String, Object>> params) throws Exception;
	27	+
	28	+ /**
	29	+ * @author 박정하
	30	+ * @since 2024.03.21
	31	+ *
	32	+ * 재무제표 목록 조회
	33	+ */
	34	+ public List<HashMap<String, Object>> fnstmSelectList(HashMap<String, Object> params) throws Exception;
	35	+
	36	+ /**
	37	+ * @author 박정하
	38	+ * @since 2024.03.22
	39	+ *
	40	+ * 재무제표 삭제
	41	+ */
	42	+ public int fnstmDelete(HashMap<String, Object> params) throws Exception;
	43	+}(파일 끝에 줄바꿈 문자 없음)

105519e

ca71e1b

src/main/java/com/takensoft/portal/entInfo/service/Impl/EntInfoServiceImpl.java

--- src/main/java/com/takensoft/portal/entInfo/service/Impl/EntInfoServiceImpl.java

+++ src/main/java/com/takensoft/portal/entInfo/service/Impl/EntInfoServiceImpl.java


 import com.takensoft.common.util.JWTUtil;
 import com.takensoft.portal.entInfo.dao.EntInfoDAO;
 import com.takensoft.portal.entInfo.service.EntInfoService;
-import com.takensoft.portal.entInfo.service.FnlttService;
-import com.takensoft.portal.invtDscsn.service.InvtDscsnService;
+import com.takensoft.portal.entInfo.service.FnstmService;
+import com.takensoft.portal.ivstDscsn.service.IvstDscsnService;
 import lombok.RequiredArgsConstructor;
 import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl;
 import org.springframework.stereotype.Service;

 public class EntInfoServiceImpl extends EgovAbstractServiceImpl implements EntInfoService {
     private final EntInfoDAO entInfoDAO;
     private final IdgenService entInfoIdgn;
-    private final FnlttService fnlttService;
-    private final InvtDscsnService invtDscsnService;
+    private final FnstmService fnstmService;
+    private final IvstDscsnService ivstDscsnService;
     private final JWTUtil jwtUtil;
 
     /**

         HashMap<String, Object> result = new HashMap<>();
 
         // 재무제표 등록
-        int fnlttResult = 0;
-        List<HashMap<String, Object>> fnlttList = (List<HashMap<String, Object>>) params.get("fnlttList");
-        if (fnlttList.size() > 0 && fnlttList.get(0).get("yr") != null) {
-            for (HashMap<String, Object> fnltt : fnlttList) {
+        int fnstmResult = 0;
+        List<HashMap<String, Object>> fnstmList = (List<HashMap<String, Object>>) params.get("fnstmList");
+        if (fnstmList.size() > 0 && fnstmList.get(0).get("yr") != null) {
+            for (HashMap<String, Object> fnstm : fnstmList) {
                 try {
                     // 기업 아이디 추가
-                    fnltt.put("entId", entId);
+                    fnstm.put("entId", entId);
 
                     // 작성자 생성
-                    fnltt.put("rgtr", writer);
+                    fnstm.put("rgtr", writer);
 
-                    fnltt.compute("slsAmt", (k, slsAmt) -> Integer.parseInt(slsAmt.toString()));
-                    fnltt.compute("bsnPrfts", (k, bsnPrfts) -> Integer.parseInt(bsnPrfts.toString()));
-                    fnltt.compute("netIncome", (k, netIncome) -> Integer.parseInt(netIncome.toString()));
+                    fnstm.compute("slsAmt", (k, slsAmt) -> Integer.parseInt(slsAmt.toString()));
+                    fnstm.compute("salsPrf", (k, salsPrf) -> Integer.parseInt(salsPrf.toString()));
+                    fnstm.compute("thtmNetpf", (k, thtmNetpf) -> Integer.parseInt(thtmNetpf.toString()));
 
                     // DB 등록
-                    fnlttResult += fnlttService.fnlttUpsert(fnltt);
+                    fnstmResult += fnstmService.fnstmInsert(fnstm);
                 } catch (Exception e) {
                     e.printStackTrace();
                     return result;

         // 기업정보 등록
         int entInfoResult = entInfoDAO.entInfoInsert(params);
         result.put("entId", entId);
-        result.put("result", fnlttResult + entInfoResult);
+        result.put("result", fnstmResult + entInfoResult);
 
         return result;
     }

         String writer = jwtUtil.getWriter();
         params.put("mdfr", writer);
 
-        // 재무제표 등록
-        List<HashMap<String, Object>> fnlttList = (List<HashMap<String, Object>>) params.get("fnlttList");
-        if (fnlttList.size() > 0 && fnlttList.get(0).get("yr") != null) {
-            for (HashMap<String, Object> fnltt : fnlttList) {
-                try {
-                    // 작성자 생성
-                    if (fnltt.get("rgtr") == null) {
-                        fnltt.put("rgtr", writer);
-                    }
-
-                    // 수정자 생성
-                    fnltt.put("mdfr", writer);
-
-                    fnltt.compute("slsAmt", (k, slsAmt) -> Integer.parseInt(slsAmt.toString()));
-                    fnltt.compute("bsnPrfts", (k, bsnPrfts) -> Integer.parseInt(bsnPrfts.toString()));
-                    fnltt.compute("netIncome", (k, netIncome) -> Integer.parseInt(netIncome.toString()));
-
-                    // DB 등록
-                    result += fnlttService.fnlttUpsert(fnltt);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    return result;
-                }
-            }
+        // 재무제표 수정
+        List<HashMap<String, Object>> fnstmList = (List<HashMap<String, Object>>) params.get("fnstmList");
+        try {
+            // DB 등록
+            result += fnstmService.fnstmUpdate(fnstmList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return result;
         }
 
         // 기업정보 수정

         params.put("mdfr", writer);
 
         // 재무제표 삭제
-        List<HashMap<String, Object>> fnlttList = fnlttService.fnlttSelectList(params);
-        if (!fnlttList.isEmpty()) {
-            for (HashMap<String, Object> fnltt : fnlttList) {
+        List<HashMap<String, Object>> fnstmList = fnstmService.fnstmSelectList(params);
+        if (!fnstmList.isEmpty()) {
+            for (HashMap<String, Object> fnstm : fnstmList) {
                 try {
-                    fnltt.put("mdfr", writer);
+                    fnstm.put("mdfr", writer);
 
                     // DB 등록
-                    result += fnlttService.fnlttDelete(fnltt);
+                    result += fnstmService.fnstmDelete(fnstm);
                 } catch (Exception e) {
                     e.printStackTrace();
                     return result;

             newParams.put("isAllList", "yes");
             newParams.put("searchType", "ent_id");
             newParams.put("searchText", params.get("entId").toString());
-            Map<String, Object> invtDscsnSelectList = invtDscsnService.invtDscsnSelectList(newParams);
-            List<HashMap<String, Object>> invtDscsnList = (List<HashMap<String, Object>>) invtDscsnSelectList.get("list");
-            if (!invtDscsnList.isEmpty()) {
-                for (HashMap<String, Object> invtDscsn : invtDscsnList) {
-                    result += invtDscsnService.invtDscsnDelete(invtDscsn);
+            Map<String, Object> ivstDscsnSelectList = ivstDscsnService.ivstDscsnSelectList(newParams);
+            List<HashMap<String, Object>> ivstDscsnList = (List<HashMap<String, Object>>) ivstDscsnSelectList.get("list");
+            if (!ivstDscsnList.isEmpty()) {
+                for (HashMap<String, Object> ivstDscsn : ivstDscsnList) {
+                    result += ivstDscsnService.ivstDscsnDelete(ivstDscsn);
                 }
             }
         } catch (IOException e) {

105519e

src/main/java/com/takensoft/portal/entInfo/service/Impl/FnlttServiceImpl.java (deleted)

--- src/main/java/com/takensoft/portal/entInfo/service/Impl/FnlttServiceImpl.java

...	...	@@ -1,56 +0,0 @@
	1	-package com.takensoft.portal.entInfo.service.Impl;
	2	-
	3	-import com.takensoft.portal.entInfo.dao.FnlttDAO;
	4	-import com.takensoft.portal.entInfo.service.FnlttService;
	5	-import lombok.RequiredArgsConstructor;
	6	-import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl;
	7	-import org.springframework.stereotype.Service;
	8	-
	9	-import java.util.*;
	10	-
	11	-/**
	12	- * @author : 박정하
	13	- * @since : 2024.03.20
	14	- *
	15	- * 재무제표 관련 구현체
	16	- * EgovAbstractServiceImpl : 전자정부 상속
	17	- * FnlttService : 재무제표 인터페이스 상속
	18	- */
	19	-@Service("FnlttService")
	20	-@RequiredArgsConstructor
	21	-public class FnlttServiceImpl extends EgovAbstractServiceImpl implements FnlttService {
	22	- private final FnlttDAO fnlttDAO;
	23	-
	24	- /**
	25	- * @author 박정하
	26	- * @since 2024.04.12
	27	- *
	28	- * 재무제표 업설트
	29	- */
	30	- @Override
	31	- public int fnlttUpsert(HashMap<String, Object> params) throws Exception {
	32	- return fnlttDAO.fnlttUpsert(params);
	33	- }
	34	-
	35	- /**
	36	- * @author 박정하
	37	- * @since 2024.03.21
	38	- *
	39	- * 재무제표 목록 조회
	40	- */
	41	- @Override
	42	- public List<HashMap<String, Object>> fnlttSelectList(HashMap<String, Object> params) throws Exception {
	43	- return fnlttDAO.fnlttSelectList(params);
	44	- }
	45	-
	46	- /**
	47	- * @author 박정하
	48	- * @since 2024.03.22
	49	- *
	50	- * 재무제표 삭제
	51	- */
	52	- @Override
	53	- public int fnlttDelete(HashMap<String, Object> params) throws Exception {
	54	- return fnlttDAO.fnlttDelete(params);
	55	- }
	56	-}(파일 끝에 줄바꿈 문자 없음)

ca71e1b

src/main/java/com/takensoft/portal/entInfo/service/Impl/FnstmServiceImpl.java (added)

+++ src/main/java/com/takensoft/portal/entInfo/service/Impl/FnstmServiceImpl.java

...	...	@@ -0,0 +1,86 @@
	1	+package com.takensoft.portal.entInfo.service.Impl;
	2	+
	3	+import com.takensoft.common.util.JWTUtil;
	4	+import com.takensoft.portal.entInfo.dao.FnstmDAO;
	5	+import com.takensoft.portal.entInfo.service.FnstmService;
	6	+import lombok.RequiredArgsConstructor;
	7	+import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl;
	8	+import org.springframework.stereotype.Service;
	9	+
	10	+import java.util.*;
	11	+
	12	+/**
	13	+ * @author : 박정하
	14	+ * @since : 2024.03.20
	15	+ *
	16	+ * 재무제표 관련 구현체
	17	+ * EgovAbstractServiceImpl : 전자정부 상속
	18	+ * FnstmService : 재무제표 인터페이스 상속
	19	+ */
	20	+@Service("fnstmService")
	21	+@RequiredArgsConstructor
	22	+public class FnstmServiceImpl extends EgovAbstractServiceImpl implements FnstmService {
	23	+ private final FnstmDAO fnstmDAO;
	24	+ private final JWTUtil jwtUtil;
	25	+
	26	+ /**
	27	+ * @author 박정하
	28	+ * @since 2024.04.25
	29	+ *
	30	+ * 재무제표 등록
	31	+ */
	32	+ public int fnstmInsert(HashMap<String, Object> params) throws Exception {
	33	+ return fnstmDAO.fnstmInsert(params);
	34	+ }
	35	+
	36	+ /**
	37	+ * @author 박정하
	38	+ * @since 2024.04.25
	39	+ *
	40	+ * 재무제표 수정
	41	+ */
	42	+ public int fnstmUpdate(List<HashMap<String, Object>> params) throws Exception {
	43	+ int result = 0;
	44	+
	45	+ for (HashMap<String, Object> param : params) {
	46	+ String yr = param.get("yr").toString();
	47	+ if (yr != null) { // 연도가 있을 때만 진행
	48	+ String writer = jwtUtil.getWriter();
	49	+ param.compute("slsAmt", (k, slsAmt) -> Integer.parseInt(slsAmt.toString()));
	50	+ param.compute("salsPrf", (k, salsPrf) -> Integer.parseInt(salsPrf.toString()));
	51	+ param.compute("thtmNetpf", (k, thtmNetpf) -> Integer.parseInt(thtmNetpf.toString()));
	52	+ if (param.get("fnstmId") != null) { // 재무제표 아이디가 있는 경우 (수정)
	53	+ param.put("mdfr", writer);
	54	+ result += fnstmDAO.fnstmUpdate(param);
	55	+ } else { // 재무제표 아이디가 없는 경우 (추가)
	56	+ param.put("rgtr", writer);
	57	+ result += fnstmDAO.fnstmInsert(param);
	58	+ }
	59	+ }
	60	+ }
	61	+
	62	+ return result;
	63	+ }
	64	+
	65	+ /**
	66	+ * @author 박정하
	67	+ * @since 2024.03.21
	68	+ *
	69	+ * 재무제표 목록 조회
	70	+ */
	71	+ @Override
	72	+ public List<HashMap<String, Object>> fnstmSelectList(HashMap<String, Object> params) throws Exception {
	73	+ return fnstmDAO.fnstmSelectList(params);
	74	+ }
	75	+
	76	+ /**
	77	+ * @author 박정하
	78	+ * @since 2024.03.22
	79	+ *
	80	+ * 재무제표 삭제
	81	+ */
	82	+ @Override
	83	+ public int fnstmDelete(HashMap<String, Object> params) throws Exception {
	84	+ return fnstmDAO.fnstmDelete(params);
	85	+ }
	86	+}(파일 끝에 줄바꿈 문자 없음)

105519e

ca71e1b

src/main/java/com/takensoft/portal/entInfo/vo/FnstmVO.java (Renamed from src/main/java/com/takensoft/portal/entInfo/vo/FnlttVO.java)

--- src/main/java/com/takensoft/portal/entInfo/vo/FnlttVO.java

+++ src/main/java/com/takensoft/portal/entInfo/vo/FnstmVO.java


  * 재무제표 관련 VO
  */
 @Data
-public class FnlttVO {
-    private int fnlttId;    // 재무제표 아이디
+public class FnstmVO {
+    private int fnstmId;    // 재무제표 아이디
     private String entId;   // 기업 아이디
     private String yr;      // 연도
     private int slsAmt;     // 매출액
-    private int bsnPrfts;   // 영업이익
-    private int netIncome;  // 당기순이익
+    private int salsPrf;   // 영업이익
+    private int thtmNetpf;  // 당기순이익
     private String useYn;   // 사용여부
     private String rgtr;    // 등록자
     private String regDt;   // 등록일

105519e

ca71e1b

src/main/java/com/takensoft/portal/entInfo/web/EntInfoController.java

--- src/main/java/com/takensoft/portal/entInfo/web/EntInfoController.java

+++ src/main/java/com/takensoft/portal/entInfo/web/EntInfoController.java


 package com.takensoft.portal.entInfo.web;
 
 import com.takensoft.common.excel.ExcelUtils;
-import com.takensoft.common.Pagination;
 import com.takensoft.common.util.ResponseData;
 import com.takensoft.portal.entInfo.service.EntInfoService;
-import com.takensoft.portal.entInfo.service.FnlttService;
-import com.takensoft.portal.invtDscsn.service.InvtDscsnService;
+import com.takensoft.portal.entInfo.service.FnstmService;
+import com.takensoft.portal.ivstDscsn.service.IvstDscsnService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;

 @RequiredArgsConstructor
 public class EntInfoController {
     private final EntInfoService entInfoService;
-    private final FnlttService fnlttService;
-    private final InvtDscsnService invtDscsnService;
+    private final FnstmService fnstmService;
+    private final IvstDscsnService ivstDscsnService;
 
     /**
      * @author 박정하

         // 상세 조회
         HashMap<String, Object> result = new HashMap<>();
         result.put("entInfo", entInfoService.entInfoSelectOne(params));
-        result.put("invtDscsn", invtDscsnService.invtDscsnSelectOneByNew(params));
-        result.put("fnlttList", fnlttService.fnlttSelectList(params));
+        result.put("ivstDscsn", ivstDscsnService.ivstDscsnSelectOneByNew(params));
+        result.put("fnstmList", fnstmService.fnstmSelectList(params));
         
         // 응답 처리
         HttpHeaders headers = new HttpHeaders();

         entInfoList.add(entInfoService.entInfoSelectOne(params));
 
         // 세부정보
-        List<HashMap<String, Object>> invtDscsnList = new ArrayList<>();
-        invtDscsnList.add(invtDscsnService.invtDscsnSelectOneByNew(params));
+        List<HashMap<String, Object>> ivstDscsnList = new ArrayList<>();
+        ivstDscsnList.add(ivstDscsnService.ivstDscsnSelectOneByNew(params));
 
         // 재무제표
-        List<HashMap<String, Object>> FnlttList = fnlttService.fnlttSelectList(params);
+        List<HashMap<String, Object>> FnstmList = fnstmService.fnstmSelectList(params);
 
         // 엑셀 import
-        excelUtils.entInfoDraw(entInfoList, invtDscsnList, FnlttList, params.get("imageData").toString());
+        excelUtils.entInfoDraw(entInfoList, ivstDscsnList, FnstmList, params.get("imageData").toString());
         
         // 엑셀 다운로드
         excelUtils.download("download");

105519e

ca71e1b

src/main/java/com/takensoft/portal/ivstDscsn/dao/IvstDscsnDAO.java (Renamed from src/main/java/com/takensoft/portal/invtDscsn/dao/InvtDscsnDAO.java)

--- src/main/java/com/takensoft/portal/invtDscsn/dao/InvtDscsnDAO.java

+++ src/main/java/com/takensoft/portal/ivstDscsn/dao/IvstDscsnDAO.java


-package com.takensoft.portal.invtDscsn.dao;
+package com.takensoft.portal.ivstDscsn.dao;
 
 import com.takensoft.common.Pagination;
 import org.egovframe.rte.psl.dataaccess.mapper.Mapper;

  *
  * 투자상담 관련 Mapper
  */
-@Mapper("invtDscsnDAO")
-public interface InvtDscsnDAO {
+@Mapper("ivstDscsnDAO")
+public interface IvstDscsnDAO {
     /**
      * @author 박정하
      * @since 2024.03.26
      *
      * 투자상담 등록
      */
-    public int invtDscsnInsert(HashMap<String, Object> params) throws Exception;
+    public int ivstDscsnInsert(HashMap<String, Object> params) throws Exception;
 
     /**
      * @author 박정하

      *
      * 투자상담 목록 조회
      */
-    public List<HashMap<String, Object>> invtDscsnSelectList(Pagination pagination) throws Exception;
+    public List<HashMap<String, Object>> ivstDscsnSelectList(Pagination pagination) throws Exception;
 
     /**
      * @author 박정하

      *
      * 투자상담 목록 총 개수 조회
      */
-    public int invtDscsnSelectListCount(Pagination pagination) throws Exception;
+    public int ivstDscsnSelectListCount(Pagination pagination) throws Exception;
 
     /**
      * @author 박정하

      *
      * 투자상담 상세 조회
      */
-    public HashMap<String, Object> invtDscsnSelectOne(HashMap<String, Object> params) throws Exception;
+    public HashMap<String, Object> ivstDscsnSelectOne(HashMap<String, Object> params) throws Exception;
 
     /**
      * @author 박정하

      *
      * 투자상담 수정
      */
-    public int invtDscsnUpdate(HashMap<String, Object> params) throws Exception;
+    public int ivstDscsnUpdate(HashMap<String, Object> params) throws Exception;
 
     /**
      * @author 박정하

      *
      * 투자상담 삭제
      */
-    public int invtDscsnDelete(HashMap<String, Object> params) throws Exception;
+    public int ivstDscsnDelete(HashMap<String, Object> params) throws Exception;
 
     /**
      * @author 박정하

      *
      * 투자상담 최근 1건 조회
      */
-    public HashMap<String, Object> invtDscsnSelectOneByNew(HashMap<String, Object> params) throws Exception;
+    public HashMap<String, Object> ivstDscsnSelectOneByNew(HashMap<String, Object> params) throws Exception;
 }

105519e

ca71e1b

src/main/java/com/takensoft/portal/ivstDscsn/service/Impl/IvstDscsnServiceImpl.java (Renamed from src/main/java/com/takensoft/portal/invtDscsn/service/Impl/invtDscsnServiceImpl.java)

--- src/main/java/com/takensoft/portal/invtDscsn/service/Impl/invtDscsnServiceImpl.java

+++ src/main/java/com/takensoft/portal/ivstDscsn/service/Impl/IvstDscsnServiceImpl.java


-package com.takensoft.portal.invtDscsn.service.Impl;
+package com.takensoft.portal.ivstDscsn.service.Impl;
 
 import com.takensoft.common.Pagination;
 import com.takensoft.common.file.service.FileMngService;
 import com.takensoft.common.file.vo.FileMngVO;
 import com.takensoft.common.idgen.service.IdgenService;
 import com.takensoft.common.util.JWTUtil;
-import com.takensoft.portal.invtDscsn.dao.InvtDscsnDAO;
-import com.takensoft.portal.invtDscsn.service.InvtDscsnService;
+import com.takensoft.portal.ivstDscsn.dao.IvstDscsnDAO;
+import com.takensoft.portal.ivstDscsn.service.IvstDscsnService;
 import com.takensoft.portal.rvwMttr.service.RvwMttrService;
 import lombok.RequiredArgsConstructor;
 import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl;

  *
  * 투자상담 관련 구현체
  * EgovAbstractServiceImpl : 전자정부 상속
- * InvtDscsnService : 투자상담 인터페이스 상속
+ * IvstDscsnService : 투자상담 인터페이스 상속
  */
-@Service("invtDscsnService")
+@Service("ivstDscsnService")
 @RequiredArgsConstructor
-public class invtDscsnServiceImpl extends EgovAbstractServiceImpl implements InvtDscsnService {
-    private final InvtDscsnDAO invtDscsnDAO;
-    private final IdgenService invtDscsnIdgn;
+public class IvstDscsnServiceImpl extends EgovAbstractServiceImpl implements IvstDscsnService {
+    private final IvstDscsnDAO ivstDscsnDAO;
+    private final IdgenService ivstDscsnIdgn;
     private final FileMngService fileMngService;
     private final RvwMttrService rvwMttrService;
     private final JWTUtil jwtUtil;

      */
     @Override
     @Transactional
-    public HashMap<String, Object> invtDscsnInsert(HashMap<String, Object> params, List<MultipartFile> multipartFileList) throws Exception {
+    public HashMap<String, Object> ivstDscsnInsert(HashMap<String, Object> params, List<MultipartFile> multipartFileList) throws Exception {
         // 투자상담 아이디 생성
-        String invtDscsnId = invtDscsnIdgn.getNextStringId();
-        params.put("invtDscsnId", invtDscsnId);
+        String ivstDscsnId = ivstDscsnIdgn.getNextStringId();
+        params.put("ivstDscsnId", ivstDscsnId);
 
         // 작성자 생성
         String writer = jwtUtil.getWriter();

         }
 
         // 기본정보 DB 등록
-        int invtDscsnResult = invtDscsnDAO.invtDscsnInsert(params);
-        result.put("invtDscsnId", invtDscsnId);
-        result.put("result", invtDscsnResult);
+        int ivstDscsnResult = ivstDscsnDAO.ivstDscsnInsert(params);
+        result.put("ivstDscsnId", ivstDscsnId);
+        result.put("result", ivstDscsnResult);
 
         return result;
     }

      * 투자상담 목록 조회
      */
     @Override
-    public Map<String, Object> invtDscsnSelectList(Map<String, String> params) throws Exception {
+    public Map<String, Object> ivstDscsnSelectList(Map<String, String> params) throws Exception {
         Map<String, Object> result = new HashMap<>();
         Pagination search = new Pagination(0, params);
-        int cnt = invtDscsnDAO.invtDscsnSelectListCount(search);
+        int cnt = ivstDscsnDAO.ivstDscsnSelectListCount(search);
         Pagination pagination = new Pagination(cnt, params);
-        List<HashMap<String, Object>> list = invtDscsnDAO.invtDscsnSelectList(pagination);
+        List<HashMap<String, Object>> list = ivstDscsnDAO.ivstDscsnSelectList(pagination);
 
         result.put("list", list);
         result.put("pagination", pagination);

      * 투자상담 상세 조회
      */
     @Override
-    public HashMap<String, Object> invtDscsnSelectOne(HashMap<String, Object> params) throws Exception {
-        return invtDscsnDAO.invtDscsnSelectOne(params);
+    public HashMap<String, Object> ivstDscsnSelectOne(HashMap<String, Object> params) throws Exception {
+        return ivstDscsnDAO.ivstDscsnSelectOne(params);
     }
 
     /**

      */
     @Override
     @Transactional
-    public int invtDscsnUpdate(HashMap<String, Object> params, List<HashMap<String, Object>> deleteFileList, List<MultipartFile> multipartFileList) throws Exception {
+    public int ivstDscsnUpdate(HashMap<String, Object> params, List<HashMap<String, Object>> deleteFileList, List<MultipartFile> multipartFileList) throws Exception {
         int result = 0;
 
         // 수정자 생성

             try {
                 HashMap<String, Object> fileMng = fileMngService.fileMngInsert(fileMngVO, multipartFileList);
                 result += (int)fileMng.get("fileMngResult");
+                params.put("fileMngId", fileMng.get("fileMngId").toString());
             } catch (IOException e) {
                 e.printStackTrace();
                 return result;

         }
 
         // 투자상담 수정
-        result += invtDscsnDAO.invtDscsnUpdate(params);
+        result += ivstDscsnDAO.ivstDscsnUpdate(params);
 
         return result;
     }

      */
     @Override
     @Transactional
-    public int invtDscsnDelete(HashMap<String, Object> params) throws Exception {
+    public int ivstDscsnDelete(HashMap<String, Object> params) throws Exception {
         int result = 0;
 
         // 수정자 생성

         try {
             Map<String, String> newParams = new HashMap<>();
             newParams.put("isAllList", "yes");
-            newParams.put("searchType", "invt_dscsn_id");
-            newParams.put("searchText", params.get("invtDscsnId").toString());
+            newParams.put("searchType", "ivst_dscsn_id");
+            newParams.put("searchText", params.get("ivstDscsnId").toString());
             Map<String, Object> rvwMttrSelectList = rvwMttrService.rvwMttrSelectList(newParams);
             List<HashMap<String, Object>> rvwMttrList = (List<HashMap<String, Object>>) rvwMttrSelectList.get("list");
             if (!rvwMttrList.isEmpty()) {

         }
 
         // 투자상담 삭제
-        result += invtDscsnDAO.invtDscsnDelete(params);
+        result += ivstDscsnDAO.ivstDscsnDelete(params);
 
         return result;
     }

      *
      * 투자상담 최근 1건 조회
      */
-    public HashMap<String, Object> invtDscsnSelectOneByNew(HashMap<String, Object> params) throws Exception {
-        return invtDscsnDAO.invtDscsnSelectOneByNew(params);
+    public HashMap<String, Object> ivstDscsnSelectOneByNew(HashMap<String, Object> params) throws Exception {
+        return ivstDscsnDAO.ivstDscsnSelectOneByNew(params);
     }
 }

105519e

ca71e1b

src/main/java/com/takensoft/portal/ivstDscsn/service/IvstDscsnService.java (Renamed from src/main/java/com/takensoft/portal/invtDscsn/service/InvtDscsnService.java)

--- src/main/java/com/takensoft/portal/invtDscsn/service/InvtDscsnService.java

+++ src/main/java/com/takensoft/portal/ivstDscsn/service/IvstDscsnService.java


-package com.takensoft.portal.invtDscsn.service;
+package com.takensoft.portal.ivstDscsn.service;
 
 import org.springframework.web.multipart.MultipartFile;
 

  *
  * 투자상담 관련 인터페이스
  */
-public interface InvtDscsnService {
+public interface IvstDscsnService {
     /**
      * @author 박정하
      * @since 2024.03.26
      *
      * 투자상담 등록
      */
-    public HashMap<String, Object> invtDscsnInsert(HashMap<String, Object> params, List<MultipartFile> multipartFileList) throws Exception;
+    public HashMap<String, Object> ivstDscsnInsert(HashMap<String, Object> params, List<MultipartFile> multipartFileList) throws Exception;
 
     /**
      * @author 박정하

      *
      * 투자상담 목록 조회
      */
-    public Map<String, Object> invtDscsnSelectList(Map<String, String> params) throws Exception;
+    public Map<String, Object> ivstDscsnSelectList(Map<String, String> params) throws Exception;
 
     /**
      * @author 박정하

      *
      * 투자상담 상세 조회
      */
-    public HashMap<String, Object> invtDscsnSelectOne(HashMap<String, Object> params) throws Exception;
+    public HashMap<String, Object> ivstDscsnSelectOne(HashMap<String, Object> params) throws Exception;
 
     /**
      * @author 박정하

      *
      * 투자상담 수정
      */
-    public int invtDscsnUpdate(HashMap<String, Object> params, List<HashMap<String, Object>> deleteFileList, List<MultipartFile> multipartFileList) throws Exception;
+    public int ivstDscsnUpdate(HashMap<String, Object> params, List<HashMap<String, Object>> deleteFileList, List<MultipartFile> multipartFileList) throws Exception;
 
     /**
      * @author 박정하

      *
      * 투자상담 삭제
      */
-    public int invtDscsnDelete(HashMap<String, Object> params) throws Exception;
+    public int ivstDscsnDelete(HashMap<String, Object> params) throws Exception;
 
     /**
      * @author 박정하

      *
      * 투자상담 최근 1건 조회
      */
-    public HashMap<String, Object> invtDscsnSelectOneByNew(HashMap<String, Object> params) throws Exception;
+    public HashMap<String, Object> ivstDscsnSelectOneByNew(HashMap<String, Object> params) throws Exception;
 }

105519e

ca71e1b

src/main/java/com/takensoft/portal/ivstDscsn/vo/IvstDscsnVO.java (Renamed from src/main/java/com/takensoft/portal/invtDscsn/vo/InvtDscsnVO.java)

--- src/main/java/com/takensoft/portal/invtDscsn/vo/InvtDscsnVO.java

+++ src/main/java/com/takensoft/portal/ivstDscsn/vo/IvstDscsnVO.java


-package com.takensoft.portal.invtDscsn.vo;
+package com.takensoft.portal.ivstDscsn.vo;
 
 import lombok.Data;
 

  * 투자상담 관련 VO
  */
 @Data
-public class InvtDscsnVO {
-    private String invtDscsnId;     // 투자상담 아이디
+public class IvstDscsnVO {
+    private String ivstDscsnId;     // 투자상담 아이디
     private String entId;           // 기업 아이디
     private String ttl;             // 제목
     private String dt;              // 일시
     private String plc;             // 장소
     private String prtpnt;          // 참석자
-    private String dscsnPbsvnt;     // 상담공무원
+    private String dscsnPbofc;     // 상담공무원
     private String mainCn;          // 주요내용
     private String fileMngId;       // 파일관리아이디
     private String mvnInten;        // 입주의향
-    private String invtInten;       // 투자의향
+    private String ivstInten;       // 투자의향
     private String mouInten;        // MOU의향
-    private String invtDscsnInten;  // 투자상담의향
+    private String ivstDscsnInten;  // 투자상담의향
     private String useYn;           // 사용여부
     private String rgtr;            // 등록자
     private String regDt;           // 등록일

105519e

ca71e1b

src/main/java/com/takensoft/portal/ivstDscsn/web/IvstDscsnController.java (Renamed from src/main/java/com/takensoft/portal/invtDscsn/web/InvtDscsnController.java)

--- src/main/java/com/takensoft/portal/invtDscsn/web/InvtDscsnController.java

+++ src/main/java/com/takensoft/portal/ivstDscsn/web/IvstDscsnController.java


-package com.takensoft.portal.invtDscsn.web;
+package com.takensoft.portal.ivstDscsn.web;
 
 import com.takensoft.common.excel.ExcelHeader;
 import com.takensoft.common.excel.ExcelUtils;
-import com.takensoft.common.Pagination;
 import com.takensoft.common.file.service.FileService;
 import com.takensoft.common.util.ResponseData;
-import com.takensoft.portal.invtDscsn.service.InvtDscsnService;
+import com.takensoft.portal.ivstDscsn.service.IvstDscsnService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;

  */
 @RestController
 @RequiredArgsConstructor
-public class InvtDscsnController {
-    private final InvtDscsnService invtDscsnService;
+public class IvstDscsnController {
+    private final IvstDscsnService ivstDscsnService;
     private final FileService fileService;
 
     /**

      *
      * 투자상담 등록
      */
-    @PostMapping(path = "/government/invtDscsnInsert.file")
-    public ResponseEntity<?> invtDscsnInsert(@RequestPart HashMap<String, Object> params, List<MultipartFile> multipartFileList) throws Exception {
-        HashMap<String, Object> result = invtDscsnService.invtDscsnInsert(params, multipartFileList);
+    @PostMapping(path = "/government/ivstDscsnInsert.file")
+    public ResponseEntity<?> ivstDscsnInsert(@RequestPart HashMap<String, Object> params, List<MultipartFile> multipartFileList) throws Exception {
+        HashMap<String, Object> result = ivstDscsnService.ivstDscsnInsert(params, multipartFileList);
         int insertResult = (int)result.get("result");
 
         // 응답 처리

      *
      * 투자상담 목록 조회
      */
-    @PostMapping(path = "/government/invtDscsnSelectList.json")
-    public ResponseEntity<?> invtDscsnSelectList(@RequestBody Map<String, String> params) throws Exception {
+    @PostMapping(path = "/government/ivstDscsnSelectList.json")
+    public ResponseEntity<?> ivstDscsnSelectList(@RequestBody Map<String, String> params) throws Exception {
         // 기업상담신청 목록 관련 정보 조회
-        Map<String, Object> result = invtDscsnService.invtDscsnSelectList(params);
+        Map<String, Object> result = ivstDscsnService.ivstDscsnSelectList(params);
         // 응답 처리
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(new MediaType("application", "json", Charset.forName("UTF-8")));

      *
      * 투자상담 상세 조회
      */
-    @PostMapping(path = "/government/invtDscsnSelectOne.json")
-    public ResponseEntity<?> invtDscsnSelectOne(@RequestBody HashMap<String, Object> params) throws Exception {
+    @PostMapping(path = "/government/ivstDscsnSelectOne.json")
+    public ResponseEntity<?> ivstDscsnSelectOne(@RequestBody HashMap<String, Object> params) throws Exception {
         // 상세 조회
         HashMap<String, Object> result = new HashMap<>();
-        HashMap<String, Object> invtDscsn = invtDscsnService.invtDscsnSelectOne(params);
-        result.put("invtDscsn", invtDscsn);
-        result.put("fileList", fileService.fileSelectList(invtDscsn));
+        HashMap<String, Object> ivstDscsn = ivstDscsnService.ivstDscsnSelectOne(params);
+        result.put("ivstDscsn", ivstDscsn);
+        result.put("fileList", fileService.fileSelectList(ivstDscsn));
 
         // 응답 처리
         HttpHeaders headers = new HttpHeaders();

      *
      * 투자상담 수정
      */
-    @PostMapping(path = "/government/invtDscsnUpdate.file")
-    public ResponseEntity<?> invtDscsnUpdate(@RequestPart HashMap<String, Object> params, @RequestPart List<HashMap<String, Object>> deleteFileList, List<MultipartFile> multipartFileList) throws Exception {
+    @PostMapping(path = "/government/ivstDscsnUpdate.file")
+    public ResponseEntity<?> ivstDscsnUpdate(@RequestPart HashMap<String, Object> params, @RequestPart List<HashMap<String, Object>> deleteFileList, List<MultipartFile> multipartFileList) throws Exception {
         // 투자상담 수정
-        int result = invtDscsnService.invtDscsnUpdate(params, deleteFileList, multipartFileList);
+        int result = ivstDscsnService.ivstDscsnUpdate(params, deleteFileList, multipartFileList);
 
         // 응답 처리
         HttpHeaders headers = new HttpHeaders();

      *
      * 투자상담 삭제
      */
-    @PostMapping(path = "/government/invtDscsnDelete.json")
-    public ResponseEntity<?> invtDscsnDelete(@RequestBody HashMap<String, Object> params) throws Exception {
+    @PostMapping(path = "/government/ivstDscsnDelete.json")
+    public ResponseEntity<?> ivstDscsnDelete(@RequestBody HashMap<String, Object> params) throws Exception {
         // 투자상담 삭제
-        int result = invtDscsnService.invtDscsnDelete(params);
+        int result = ivstDscsnService.ivstDscsnDelete(params);
 
         // 응답처리
         HttpHeaders headers = new HttpHeaders();

      *
      * 투자상담 엑셀 다운로드
      */
-    @RequestMapping(path = "/government/invtDscsnExcelDownload.json")
-    public void invtDscsnExcelDownload(@RequestBody HashMap<String, Object> params, HttpServletResponse response) throws Exception {
+    @RequestMapping(path = "/government/ivstDscsnExcelDownload.json")
+    public void ivstDscsnExcelDownload(@RequestBody HashMap<String, Object> params, HttpServletResponse response) throws Exception {
         ExcelUtils excelUtils = new ExcelUtils();
         excelUtils.connect(response);
 
         ExcelHeader excelHeader = new ExcelHeader();
-        LinkedHashMap<String, String> invtDscsnHeader = excelHeader.getInvtDscsnHeader();
+        LinkedHashMap<String, String> ivstDscsnHeader = excelHeader.getIvstDscsnHeader();
 
-        List<HashMap<String, Object>> invtDscsnList = new ArrayList<>();
-        invtDscsnList.add(invtDscsnService.invtDscsnSelectOne(params));
+        List<HashMap<String, Object>> ivstDscsnList = new ArrayList<>();
+        ivstDscsnList.add(ivstDscsnService.ivstDscsnSelectOne(params));
 
-        excelUtils.defaultDraw("vertical", invtDscsnHeader, invtDscsnList);
+        excelUtils.defaultDraw("vertical", ivstDscsnHeader, ivstDscsnList);
 
         // 다운로드
         excelUtils.download("download");

105519e

ca71e1b

src/main/java/com/takensoft/portal/rvwMttr/dao/RvwMttrPrgrsDAO.java

--- src/main/java/com/takensoft/portal/rvwMttr/dao/RvwMttrPrgrsDAO.java

+++ src/main/java/com/takensoft/portal/rvwMttr/dao/RvwMttrPrgrsDAO.java


 public interface RvwMttrPrgrsDAO {
     /**
      * @author 박정하
-     * @since 2024.04.01
+     * @since 2024.04.25
      *
      * 검토사항진행 등록
      */
-    public int rvwMttrPrgrsUpsert(HashMap<String, Object> params) throws Exception;
+    public int rvwMttrPrgrsInsert(HashMap<String, Object> params) throws Exception;
+
+    /**
+     * @author 박정하
+     * @since 2024.04.25
+     *
+     * 검토사항진행 수정
+     */
+    public int rvwMttrPrgrsUpdate(HashMap<String, Object> params) throws Exception;
 
     /**
      * @author 박정하

105519e

ca71e1b

src/main/java/com/takensoft/portal/rvwMttr/service/Impl/RvwMttrPrgrsServiceImpl.java

--- src/main/java/com/takensoft/portal/rvwMttr/service/Impl/RvwMttrPrgrsServiceImpl.java

+++ src/main/java/com/takensoft/portal/rvwMttr/service/Impl/RvwMttrPrgrsServiceImpl.java


 package com.takensoft.portal.rvwMttr.service.Impl;
 
+import com.takensoft.common.util.JWTUtil;
 import com.takensoft.portal.rvwMttr.dao.RvwMttrPrgrsDAO;
 import com.takensoft.portal.rvwMttr.service.RvwMttrPrgrsService;
 import lombok.RequiredArgsConstructor;

 @RequiredArgsConstructor
 public class RvwMttrPrgrsServiceImpl extends EgovAbstractServiceImpl implements RvwMttrPrgrsService {
     private final RvwMttrPrgrsDAO rvwMttrPrgrsDAO;
+    private final JWTUtil jwtUtil;
 
     /**
      * @author 박정하
-     * @since 2024.03.29
+     * @since 2024.04.25
      *
-     * 검토사항진행 업설트
+     * 검토사항진행 등록
      */
     @Override
-    public int rvwMttrPrgrsUpsert(HashMap<String, Object> params) throws Exception {
-        return rvwMttrPrgrsDAO.rvwMttrPrgrsUpsert(params);
+    public int rvwMttrPrgrsInsert(HashMap<String, Object> params) throws Exception {
+        return rvwMttrPrgrsDAO.rvwMttrPrgrsInsert(params);
+    }
+
+    /**
+     * @author 박정하
+     * @since 2024.04.25
+     *
+     * 검토사항진행 수정
+     */
+    @Override
+    public int rvwMttrPrgrsUpdate(List<HashMap<String, Object>> params) throws Exception {
+        int result = 0;
+
+        for (HashMap<String, Object> param : params) {
+            String writer = jwtUtil.getWriter();
+            if (param.get("rvwMttrPrgrsId") != null) { // 검토사항 진행 아이디가 있는 경우 (수정)
+                param.put("mdfr", writer);
+                result += rvwMttrPrgrsDAO.rvwMttrPrgrsUpdate(param);
+            }  else { // 검토사항진행 아이디가 없는 경우 (추가)
+                param.put("rgtr", writer);
+                result +=  rvwMttrPrgrsDAO.rvwMttrPrgrsInsert(param);
+            }
+        }
+
+        return result;
     }
 
     /**

105519e

ca71e1b

src/main/java/com/takensoft/portal/rvwMttr/service/Impl/RvwMttrServiceImpl.java

--- src/main/java/com/takensoft/portal/rvwMttr/service/Impl/RvwMttrServiceImpl.java

+++ src/main/java/com/takensoft/portal/rvwMttr/service/Impl/RvwMttrServiceImpl.java


         if (prgrsList != null && !prgrsList.isEmpty()) {
             for (HashMap<String, Object> prgrs : prgrsList) {
                 try {
-                    // 검토사항 아이디 추가]
                     prgrs.put("rvwMttrId", rvwMttrId);
-
-                    // 작성자 생성
                     prgrs.put("rgtr", writer);
-
-                    // DB 등록
-                    prgrsResult += rvwMttrPrgrsService.rvwMttrPrgrsUpsert(prgrs);
+                    prgrsResult += rvwMttrPrgrsService.rvwMttrPrgrsInsert(prgrs);
                 } catch (Exception e) {
                     e.printStackTrace();
                     return result;

         String writer = jwtUtil.getWriter();
         params.put("mdfr", writer);
 
-        // 검토사항진행 추가, 수정
+        // 검토사항진행 수정
         List<HashMap<String, Object>> prgrsList = (List<HashMap<String, Object>>) params.get("prgrsList");
         if (!prgrsList.isEmpty()) {
-            for (HashMap<String, Object> prgrs : prgrsList) {
-                try {
-                    // 검토사항 아이디 추가
-                    if (prgrs.get("rgtr") == null) {
-                        prgrs.put("rgtr", writer);
-                    }
-
-                    // 수정자 아이디 추가
-                    prgrs.put("mdfr", writer);
-
-                    // DB 등록
-                    result += rvwMttrPrgrsService.rvwMttrPrgrsUpsert(prgrs);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    return result;
-                }
+            try {
+                result += rvwMttrPrgrsService.rvwMttrPrgrsUpdate(prgrsList);
+            } catch (Exception e) {
+                e.printStackTrace();
+                return result;
             }
         }
 

105519e

ca71e1b

src/main/java/com/takensoft/portal/rvwMttr/service/RvwMttrPrgrsService.java

--- src/main/java/com/takensoft/portal/rvwMttr/service/RvwMttrPrgrsService.java

+++ src/main/java/com/takensoft/portal/rvwMttr/service/RvwMttrPrgrsService.java


 public interface RvwMttrPrgrsService {
     /**
      * @author 박정하
-     * @since 2024.03.29
+     * @since 2024.04.25
      *
      * 검토사항진행 등록
      */
-    public int rvwMttrPrgrsUpsert(HashMap<String, Object> params) throws Exception;
+    public int rvwMttrPrgrsInsert(HashMap<String, Object> params) throws Exception;
+
+    /**
+     * @author 박정하
+     * @since 2024.04.25
+     *
+     * 검토사항진행 수정
+     */
+    public int rvwMttrPrgrsUpdate(List<HashMap<String, Object>> params) throws Exception;
 
     /**
      * @author 박정하

105519e

ca71e1b

src/main/java/com/takensoft/portal/rvwMttr/vo/RvwMttrVO.java

--- src/main/java/com/takensoft/portal/rvwMttr/vo/RvwMttrVO.java

+++ src/main/java/com/takensoft/portal/rvwMttr/vo/RvwMttrVO.java


 @Data
 public class RvwMttrVO {
     private String RvwMttrId;   // 검토사항 아이디
-    private String invtDscsnId; // 투자상담 아이디
-    private String ttl;         // 투자상담 명
+    private String ivstDscsnId; // 투자상담 아이디
     private String type;        // 유형
     private String clr;         // 접수자
     private String rcptDt;      // 접수일

105519e

ca71e1b

src/main/resources/mybatis/mapper/common/file-SQL.xml

--- src/main/resources/mybatis/mapper/common/file-SQL.xml

+++ src/main/resources/mybatis/mapper/common/file-SQL.xml


         <result property="maskNm" column="mask_nm" />
         <result property="fileType" column="file_type" />
         <result property="absltPath" column="abslt_path" />
-        <result property="prttnPath" column="prttn_path" />
+        <result property="partPath" column="part_path" />
         <result property="extnNm" column="extn_nm" />
         <result property="fileSz" column="file_sz" />
         <result property="rgtr" column="rgtr" />

     -->
     <insert id="fileInsert" parameterType="HashMap">
         INSERT INTO cmmn_file (
-            file_id
-            , file_mng_id
+            file_mng_id
             , file_nm
             , mask_nm
             , file_type
             , abslt_path
-            , prttn_path
+            , part_path
             , extn_nm
             , file_sz
             , rgtr
             , reg_dt
-        ) VALUE (
-            #{fileId}
-            , #{fileMngId}
+        ) VALUES (
+            #{fileMngId}
             , #{fileNm}
             , #{maskNm}
             , #{fileType}
             , #{absltPath}
-            , #{prttnPath}
+            , #{partPath}
             , #{extnNm}
             , #{fileSz}
             , #{rgtr}

              , mask_nm
              , file_type
              , abslt_path
-             , prttn_path
+             , part_path
              , extn_nm
              , file_sz
              , rgtr

105519e

ca71e1b

src/main/resources/mybatis/mapper/common/fileManage-SQL.xml

--- src/main/resources/mybatis/mapper/common/fileManage-SQL.xml

+++ src/main/resources/mybatis/mapper/common/fileManage-SQL.xml


             file_mng_id
             , rgtr
             , reg_dt
-        ) VALUE (
+        ) VALUES (
             #{fileMngId}
             , #{rgtr}
             , now()

105519e

ca71e1b

src/main/resources/mybatis/mapper/contsType/contsType-SQL.xml

--- src/main/resources/mybatis/mapper/contsType/contsType-SQL.xml

+++ src/main/resources/mybatis/mapper/contsType/contsType-SQL.xml


              , expsr_yn
              , use_yn
              , rgtr
-             , DATE_FORMAT(reg_dt, '%Y-%m-%d %H:%i') AS reg_dt
+             , to_char(reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
              , mdfr
-             , DATE_FORMAT(mdfcn_dt, '%Y-%m-%d %H:%i') AS mdfcn_dt
+             , to_char(mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
           FROM conts_type_mng
    </sql>
 

         WHERE use_yn = 'Y'
         <include refid="selectRequirement" />
         ORDER BY conts_id DESC
-        LIMIT #{limitStart}, #{recordSize}
+        OFFSET #{limitStart} LIMIT #{recordSize}
     </select>
 
     <!--

105519e

ca71e1b

src/main/resources/mybatis/mapper/entDscsnAply/entDscsnAply-SQL.xml

--- src/main/resources/mybatis/mapper/entDscsnAply/entDscsnAply-SQL.xml

+++ src/main/resources/mybatis/mapper/entDscsnAply/entDscsnAply-SQL.xml


             , use_yn
             , aplcnt_ip
             , reg_dt
-        ) VALUE (
+        ) VALUES (
             #{entDscsnAplyId}
             , #{entNm}
             , #{aplcntNm}

             , #{aplyCn}
             , #{fileMngId}
             , #{actnPic}
-            , #{actnDt}
+            , #{actnDt}::timestamp
             , #{rmrk}
             , 'N'
             , 'Y'

              , aply_cn
              , file_mng_id
              , actn_pic
-             , DATE_FORMAT(actn_dt, '%Y-%m-%d') AS actn_dt
+             , to_char(actn_dt, 'YYYY-MM-DD HH24:MI') AS actn_dt
              , rmrk
              , prcs_stts
              , use_yn
              , aplcnt_ip
-             , DATE_FORMAT(reg_dt, '%Y-%m-%d %H:%i') AS reg_dt
+             , to_char(reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
         FROM ent_dscsn_aply
         WHERE use_yn = 'Y'
         <include refid="selectRequirement" />
         ORDER BY reg_dt DESC
-        LIMIT #{limitStart}, #{recordSize}
+        OFFSET #{limitStart} LIMIT #{recordSize}
     </select>
 
     <!--

              , aply_cn
              , file_mng_id
              , actn_pic
-             , DATE_FORMAT(actn_dt, '%Y-%m-%d %H:%i') AS actn_dt
+             , to_char(actn_dt, 'YYYY-MM-DD HH24:MI') AS actn_dt
              , rmrk
              , prcs_stts
              , use_yn
              , aplcnt_ip
-             , DATE_FORMAT(reg_dt, '%Y-%m-%d %H:%i') AS reg_dt
+             , to_char(reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
           FROM ent_dscsn_aply
          WHERE use_yn = 'Y'
            AND ent_dscsn_aply_id = #{entDscsnAplyId}

     <update id="entDscsnAplyUpdate" parameterType="HashMap">
         UPDATE ent_dscsn_aply
         SET actn_pic = #{actnPic},
-            actn_dt = #{actnDt},
+            actn_dt = now(),
             rmrk = #{rmrk},
             prcs_stts = #{prcsStts}
-        WHERE
-            ent_dscsn_aply_id = #{entDscsnAplyId}
+        WHERE ent_dscsn_aply_id = #{entDscsnAplyId}
     </update>
 
     <!--

     작　성　일 : 2024.04.04
     내　　　용 : 기업상담신청 1시간 이내 동일 아이피 등록 개수
     -->
-    <select id="entDscsnAplyCountByOneHourWriteSameIp" parameterType="HashMap" resultType="HashMap">
-        SELECT IFNULL(count(0), 0) AS writeCount,
-               IFNULL(MAX(reg_dt), 0) AS lastDatetime
-          FROM ent_dscsn_aply
-         WHERE aplcnt_ip = #{aplcntIp}
-           AND reg_dt > DATE_ADD(now(), INTERVAL - 1 HOUR)
-      ORDER BY reg_dt DESC
+    <select id="entDscsnAplyCountByOneHourWriteSameIp" parameterType="string" resultType="HashMap">
+        SELECT COALESCE(count(0), 0) AS writecount,
+               '1 HOUR'::interval - (now() - MIN(reg_dt)) AS lastdatetime
+        FROM ent_dscsn_aply
+        WHERE aplcnt_ip = #{aplcntIp}
+          AND reg_dt > now() - '1 HOUR'::interval
     </select>
 </mapper>

105519e

ca71e1b

src/main/resources/mybatis/mapper/entInfo/entInfo-SQL.xml

--- src/main/resources/mybatis/mapper/entInfo/entInfo-SQL.xml

+++ src/main/resources/mybatis/mapper/entInfo/entInfo-SQL.xml


             , clsbiz_yn
             , use_yn
             , rgtr
-            ,  reg_dt
-        ) VALUE (
+            , reg_dt
+        ) VALUES (
             #{entId}
             , #{entNm}
             , #{brno}

             , #{clsbizYn}
             , 'Y'
             , #{rgtr}
-            , now()
+            , now()::timestamp
         )
     </insert>
 

              , mdfr
              , mdfcn_dt
              , (SELECT mvn_inten
-                  FROM invt_dscsn
+                  FROM ivst_dscsn
                  WHERE use_yn = 'Y'
-                   AND ent_info.ent_id = invt_dscsn.ent_id
+                   AND ent_info.ent_id = ivst_dscsn.ent_id
                  ORDER BY reg_dt DESC
                  LIMIT 1 ) AS mvn_inten
           FROM ent_info
          WHERE use_yn = 'Y'
         <include refid="selectRequirement" />
       ORDER BY ent_id DESC
-        LIMIT #{limitStart}, #{recordSize}
+      OFFSET #{limitStart} LIMIT #{recordSize}
     </select>
 
     <!--

     내용 : 기업정보 목록 총 개수 조회
     -->
     <select id="entInfoSelectListCount" resultType="int">
-        SELECT
-            count(*)
-        FROM
-            ent_info
-        WHERE
-            use_yn = 'Y'
+        SELECT count(*)
+        FROM ent_info
+        WHERE use_yn = 'Y'
         <include refid="selectRequirement" />
     </select>
 

              , ei.clsbiz_yn
              , ei.use_yn
              , ei.rgtr
-             , DATE_FORMAT(ei.reg_dt, '%Y-%m-%d %H:%i') AS reg_dt
+             , to_char(ei.reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
              , ei.mdfr
-             , DATE_FORMAT(ei.mdfcn_dt, '%Y-%m-%d %H:%i') AS mdfcn_dt
+             , to_char(ei.mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
           FROM ent_info AS ei
          WHERE ei.use_yn = 'Y'
            AND ei.ent_id = #{entId}

105519e

ca71e1b

src/main/resources/mybatis/mapper/entInfo/fnltt-SQL.xml

--- src/main/resources/mybatis/mapper/entInfo/fnltt-SQL.xml

+++ src/main/resources/mybatis/mapper/entInfo/fnltt-SQL.xml


 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.takensoft.portal.entInfo.dao.FnlttDAO">
+<mapper namespace="com.takensoft.portal.entInfo.dao.FnstmDAO">
     <!-- 재무제표 resultMap -->
-    <resultMap id="fnlttMap" type="HashMap">
-        <result property="fnlttId" column="fnltt_id" />
+    <resultMap id="fnstmMap" type="HashMap">
+        <result property="fnstmId" column="fnstm_id" />
         <result property="entId" column="ent_id" />
         <result property="yr" column="yr" />
         <result property="slsAmt" column="sls_amt" />
-        <result property="bsnPrfts" column="bsn_prfts" />
-        <result property="netIncome" column="net_income" />
+        <result property="salsPrf" column="sals_prf" />
+        <result property="thtmNetpf" column="thtm_netpf" />
         <result property="useYn" column="use_yn" />
         <result property="rgtr" column="rgtr" />
         <result property="regDt" column="reg_dt" />

 
     <!--
     작　성　자 : 박정하
-    작　성　일 : 2024.04.12
-    내　　　용 : 재무제표 업설트
+    작　성　일 : 2024.04.25
+    내　　　용 : 재무제표 등록
     -->
-    <update id="fnlttUpsert" parameterType="fnlttVO">
-        INSERT INTO fnltt (
-            fnltt_id
-            , ent_id
+    <insert id="fnstmInsert" parameterType="FnstmVO">
+        INSERT INTO fnstm (
+            ent_id
             , yr
             , sls_amt
-            , bsn_prfts
-            , net_income
+            , sals_prf
+            , thtm_netpf
             , use_yn
             , rgtr
             , reg_dt
-            , mdfr
-            , mdfcn_dt
         ) VALUES (
-            #{fnlttId}
-            , #{entId}
+            #{entId}
             , #{yr}
             , #{slsAmt}
-            , #{bsnPrfts}
-            , #{netIncome}
-            , #{useYn}
+            , #{salsPrf}
+            , #{thtmNetpf}
+            , 'Y'
             , #{rgtr}
             , now()
-            , null
-            , null
-        ) ON DUPLICATE KEY UPDATE
-            ent_id = #{entId}
-            , yr = #{yr}
-            , sls_amt = #{slsAmt}
-            , bsn_prfts = #{bsnPrfts}
-            , net_income = #{netIncome}
-            , use_yn = #{useYn}
-            , rgtr = #{rgtr}
-            , reg_dt = #{regDt}
-            , mdfr = #{mdfr}
-            , mdfcn_dt = now()
+        )
+    </insert>
+
+    <!--
+    작　성　자 : 박정하
+    작　성　일 : 2024.04.25
+    내　　　용 : 재무제표 수정
+    -->
+    <update id="fnstmUpdate" parameterType="FnstmVO">
+        UPDATE fnstm
+        SET yr = #{yr}
+        , sls_amt = #{slsAmt}
+        , sals_prf = #{salsPrf}
+        , thtm_netpf = #{thtmNetpf}
+        , use_yn = #{useYn}
+        , mdfr = #{mdfr}
+        , mdfcn_dt = now()
+        WHERE fnstm_id = #{fnstmId}
     </update>
 
     <!--

     작　성　일 : 2024.03.21
     내　　　용 : 재무제표 목록 조회
     -->
-    <select id="fnlttSelectList" resultMap="fnlttMap">
-        SELECT f.fnltt_id
+    <select id="fnstmSelectList" resultMap="fnstmMap">
+        SELECT f.fnstm_id
              , f.ent_id
              , f.yr
              , f.sls_amt
-             , f.bsn_prfts
-             , f.net_income
+             , f.sals_prf
+             , f.thtm_netpf
              , f.use_yn
              , f.rgtr
              , f.reg_dt
              , f.mdfr
              , f.mdfcn_dt
-          FROM fnltt AS f
+          FROM fnstm AS f
          WHERE f.use_yn = 'Y'
            AND f.ent_id = #{entId}
-      ORDER BY f.yr DESC
+      ORDER BY f.reg_dt DESC
     </select>
 
     <!--

     작　성　일 : 2024.03.22
     내　　　용 : 재무제표 삭제
     -->
-    <update id="fnlttDelete" parameterType="fnlttVO">
-        UPDATE fnltt
+    <update id="fnstmDelete" parameterType="fnstmVO">
+        UPDATE fnstm
            SET use_yn = 'N',
                mdfr = #{mdfr},
                mdfcn_dt = now()
-         WHERE fnltt_id = #{fnlttId}
+         WHERE fnstm_id = #{fnstmId}
     </update>
 </mapper>

105519e

ca71e1b

src/main/resources/mybatis/mapper/invtDscsn/invtDscsn-SQL.xml

--- src/main/resources/mybatis/mapper/invtDscsn/invtDscsn-SQL.xml

+++ src/main/resources/mybatis/mapper/invtDscsn/invtDscsn-SQL.xml


 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.takensoft.portal.invtDscsn.dao.InvtDscsnDAO">
+<mapper namespace="com.takensoft.portal.ivstDscsn.dao.IvstDscsnDAO">
     <!-- 재무제표 resultMap -->
-    <resultMap id="invtDscsnMap" type="HashMap">
-        <result property="invtDscsnId" column="invt_dscsn_id" />
+    <resultMap id="ivstDscsnMap" type="HashMap">
+        <result property="ivstDscsnId" column="ivst_dscsn_id" />
         <result property="entId" column="ent_id" />
         <result property="entNm" column="ent_nm" />
         <result property="ttl" column="ttl" />
         <result property="dt" column="dt" />
         <result property="plc" column="plc" />
         <result property="prtpnt" column="prtpnt" />
-        <result property="dscsnPbsvnt" column="dscsn_pbsvnt" />
+        <result property="dscsnPbofc" column="dscsn_pbofc" />
         <result property="mainCn" column="main_cn" />
         <result property="fileMngId" column="file_mng_id" />
         <result property="mvnInten" column="mvn_inten" />
-        <result property="invtInten" column="invt_inten" />
+        <result property="ivstInten" column="ivst_inten" />
         <result property="mouInten" column="mou_inten" />
-        <result property="invtDscsnInten" column="invt_dscsn_inten" />
+        <result property="ivstDscsnInten" column="ivst_dscsn_inten" />
         <result property="useYn" column="use_yn" />
         <result property="rgtr" column="rgtr" />
         <result property="regDt" column="reg_dt" />

     작성일자 : 2024-03-20
     내용 : 재무제표 등록
     -->
-    <insert id="invtDscsnInsert" parameterType="HashMap">
-        INSERT INTO invt_dscsn (
-            invt_dscsn_id
+    <insert id="ivstDscsnInsert" parameterType="HashMap">
+        INSERT INTO ivst_dscsn (
+            ivst_dscsn_id
             , ent_id
             , ttl
             , dt
             , plc
             , prtpnt
-            , dscsn_pbsvnt
+            , dscsn_pbofc
             , main_cn
             , file_mng_id
             , mvn_inten
-            , invt_inten
+            , ivst_inten
             , mou_inten
-            , invt_dscsn_inten
+            , ivst_dscsn_inten
             , use_yn
             , rgtr
             , reg_dt
-        ) VALUE (
-            #{invtDscsnId}
+        ) VALUES (
+            #{ivstDscsnId}
             , #{entId}
             , #{ttl}
-            , #{dt}
+            , #{dt}::timestamp
             , #{plc}
             , #{prtpnt}
-            , #{dscsnPbsvnt}
+            , #{dscsnPbofc}
             , #{mainCn}
             , #{fileMngId}
             , #{mvnInten}
-            , #{invtInten}
+            , #{ivstInten}
             , #{mouInten}
-            , #{invtDscsnInten}
+            , #{ivstDscsnInten}
             , 'Y'
             , #{rgtr}
             , now()

         <if test="searchText != null and searchText != ''">
             <choose>
                 <when test="searchType != null and searchType != ''">
+                    <if test="searchType == 'entId'">
+                        AND ei.ent_id = #{searchText}
+                    </if>
                     <if test="searchType == 'ent_id'">
                         AND ei.ent_id = #{searchText}
                     </if>

     작성일자 : 2024-03-26
     내용 : 투자상담 조회
     -->
-    <select id="invtDscsnSelectList" resultMap="invtDscsnMap">
-        SELECT id.invt_dscsn_id
+    <select id="ivstDscsnSelectList" resultMap="ivstDscsnMap">
+        SELECT id.ivst_dscsn_id
              , ei.ent_nm
              , id.ent_id
              , id.ttl
              , id.dt
              , id.plc
              , id.prtpnt
-             , id.dscsn_pbsvnt
+             , id.dscsn_pbofc
              , id.main_cn
              , id.file_mng_id
              , id.mvn_inten
-             , id.invt_inten
+             , id.ivst_inten
              , id.mou_inten
-             , id.invt_dscsn_inten
+             , id.ivst_dscsn_inten
              , id.use_yn
              , id.rgtr
-             , DATE_FORMAT(id.reg_dt, '%Y-%m-%d %H:%i') AS reg_dt
+             , to_char(id.reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
              , id.mdfr
-             , DATE_FORMAT(id.mdfcn_dt, '%Y-%m-%d %H:%i') AS mdfcn_dt
-          FROM invt_dscsn AS id
+             , to_char(id.mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
+          FROM ivst_dscsn AS id
      LEFT JOIN ent_info AS ei
             ON id.ent_id = ei.ent_id
          WHERE id.use_yn = 'Y'
         <include refid="selectRequirement" />
      ORDER BY id.reg_dt DESC
         <if test="searchType != 'ent_id'">
-            LIMIT #{limitStart}, #{recordSize}
+        OFFSET #{limitStart} LIMIT #{recordSize}
         </if>
     </select>
 

     작성일자 : 2024-03-26
     내용 : 투자상담 목록 총 개수 조회
     -->
-    <select id="invtDscsnSelectListCount" resultType="int">
+    <select id="ivstDscsnSelectListCount" resultType="int">
         SELECT count(*)
-        FROM invt_dscsn AS id
+        FROM ivst_dscsn AS id
         LEFT JOIN ent_info AS ei
         ON id.ent_id = ei.ent_id
         WHERE id.use_yn = 'Y'

     작　성　일 : 2024.03.26
     내　　　용 : 투자상담 상세 조회
     -->
-    <select id="invtDscsnSelectOne" parameterType="HashMap" resultMap="invtDscsnMap">
-        SELECT id.invt_dscsn_id
+    <select id="ivstDscsnSelectOne" parameterType="HashMap" resultMap="ivstDscsnMap">
+        SELECT id.ivst_dscsn_id
              , id.ent_id
              , ei.ent_nm
              , id.ttl
-             , DATE_FORMAT(id.dt, '%Y-%m-%d') AS dt
+             , to_char(id.dt, 'YYYY-MM-DD HH24:MI') AS dt
              , id.plc
              , id.prtpnt
-             , id.dscsn_pbsvnt
+             , id.dscsn_pbofc
              , id.main_cn
              , id.file_mng_id
              , id.mvn_inten
-             , id.invt_inten
+             , id.ivst_inten
              , id.mou_inten
-             , id.invt_dscsn_inten
+             , id.ivst_dscsn_inten
              , id.use_yn
              , id.rgtr
-             , DATE_FORMAT(id.reg_dt, '%Y-%m-%d %H:%i') AS reg_dt
+             , to_char(id.reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
              , id.mdfr
-             , DATE_FORMAT(id.mdfcn_dt, '%Y-%m-%d %H:%i') AS mdfcn_dt
-          FROM invt_dscsn AS id
+             , to_char(id.mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
+          FROM ivst_dscsn AS id
      LEFT JOIN ent_info AS ei
             ON id.ent_id = ei.ent_id
          WHERE id.use_yn = 'Y'
-           AND id.invt_dscsn_id = #{invtDscsnId}
+           AND id.ivst_dscsn_id = #{ivstDscsnId}
     </select>
 
     <!--

     작성일자 : 2024-03-27
     내용 : 투자상담 수정
     -->
-    <update id="invtDscsnUpdate" parameterType="HashMap">
-        UPDATE invt_dscsn
-        SET ent_id = #{entId}
-            , ttl = #{ttl}
-            , dt = #{dt}
+    <update id="ivstDscsnUpdate" parameterType="HashMap">
+        UPDATE ivst_dscsn
+        SET ttl = #{ttl}
+            , dt = #{dt}::timestamp
             , plc = #{plc}
             , prtpnt = #{prtpnt}
-            , dscsn_pbsvnt = #{dscsnPbsvnt}
+            , dscsn_pbofc = #{dscsnPbofc}
             , main_cn = #{mainCn}
             , file_mng_id = #{fileMngId}
             , mvn_inten = #{mvnInten}
-            , invt_inten = #{invtInten}
+            , ivst_inten = #{ivstInten}
             , mou_inten = #{mouInten}
-            , invt_dscsn_inten = #{invtDscsnInten}
+            , ivst_dscsn_inten = #{ivstDscsnInten}
             , use_yn = #{useYn}
-            , rgtr = #{rgtr}
-            , reg_dt = #{regDt}
             , mdfr = #{mdfr}
             , mdfcn_dt = now()
-        WHERE invt_dscsn_id = #{invtDscsnId}
+        WHERE ivst_dscsn_id = #{ivstDscsnId}
     </update>
 
     <!--

     작성일자 : 2024-03-27
     내용 : 투자상담 삭제
     -->
-    <update id="invtDscsnDelete" parameterType="HashMap">
-        UPDATE invt_dscsn
+    <update id="ivstDscsnDelete" parameterType="HashMap">
+        UPDATE ivst_dscsn
         SET use_yn = 'N'
             , file_mng_id = null
-        WHERE invt_dscsn_id = #{invtDscsnId}
+        WHERE ivst_dscsn_id = #{ivstDscsnId}
     </update>
 
     <!--

     작성일자 : 2024-03-28
     내용 : 투자상담 최근 1건 조회
     -->
-    <select id="invtDscsnSelectOneByNew" parameterType="HashMap" resultMap="invtDscsnMap">
-        SELECT id.invt_dscsn_id
+    <select id="ivstDscsnSelectOneByNew" parameterType="HashMap" resultMap="ivstDscsnMap">
+        SELECT id.ivst_dscsn_id
              , id.ent_id
              , id.ttl
              , id.dt
              , id.plc
              , id.prtpnt
-             , id.dscsn_pbsvnt
+             , id.dscsn_pbofc
              , id.main_cn
              , id.file_mng_id
              , id.mvn_inten
-             , id.invt_inten
+             , id.ivst_inten
              , id.mou_inten
-             , id.invt_dscsn_inten
+             , id.ivst_dscsn_inten
              , id.use_yn
              , id.rgtr
              , id.reg_dt
              , id.mdfr
              , id.mdfcn_dt
-         from invt_dscsn AS id
+         from ivst_dscsn AS id
         where id.use_yn = 'Y'
           AND id.ent_id = #{entId}
      order by id.reg_dt DESC

105519e

ca71e1b

src/main/resources/mybatis/mapper/mber/mber-SQL.xml

--- src/main/resources/mybatis/mapper/mber/mber-SQL.xml

+++ src/main/resources/mybatis/mapper/mber/mber-SQL.xml


         AND mi.use_yn = 'Y'
     </select>
 
-
-
     <!--
         작성자 : takensoft
         작성일 : 2024.04.03

          WHERE mbr_id = #{mbrId}
     </update>
 
-    <!--
-        작성자 : 박정하
-        작성일 : 2024.04.23
-        내 용 : 회원정보 목록 조회 (관리자)
-    -->
-    <select id="findByMng" resultMap="mberMap">
+    <!-- 목록 조회 -->
+    <sql id="findAll">
         SELECT mi.mbr_id
              , mi.lgn_id
              , mi.mbr_nm

         FROM mbr_info AS mi
         LEFT JOIN mbr_authrt_info AS mai
         ON mi.mbr_id = mai.mbr_id
-        WHERE mi.use_yn = 'Y'
-        AND mai.authrt_cd = 'ROLE_ADMIN'
-        <include refid="selectRequirement" />
-        ORDER BY mi.reg_dt DESC
-        LIMIT #{limitStart}, #{recordSize}
-    </select>
+    </sql>
 
     <!-- 검색 조건 -->
     <sql id="selectRequirement">

                 </when>
                 <otherwise>
                     AND (
-                        mi.lgn_id LIKE CONCAT('%', #{searchText}, '%')
+                    mi.lgn_id LIKE CONCAT('%', #{searchText}, '%')
                     OR
-                        mi.mbr_nm LIKE CONCAT('%', #{searchText}, '%')
+                    mi.mbr_nm LIKE CONCAT('%', #{searchText}, '%')
                     )
                 </otherwise>
             </choose>

     <!--
         작성자 : 박정하
         작성일 : 2024.04.23
+        내 용 : 회원정보 목록 조회 (관리자)
+    -->
+    <select id="findAllMng" resultMap="mberMap">
+        <include refid="findAll"></include>
+        WHERE mi.use_yn = 'Y'
+        AND mai.authrt_cd = 'ROLE_ADMIN'
+        <include refid="selectRequirement" />
+        ORDER BY mi.reg_dt DESC
+        LIMIT #{limitStart}, #{recordSize}
+    </select>
+
+    <!--
+        작성자 : 박정하
+        작성일 : 2024.04.23
+        내 용 : 회원정보 목록 조회 (사용자)
+    -->
+    <select id="findAllMbr" resultMap="mberMap">
+        <include refid="findAll"></include>
+        WHERE mi.use_yn = 'Y'
+        AND mai.authrt_cd = 'ROLE_USER'
+        <include refid="selectRequirement" />
+        ORDER BY mi.reg_dt DESC
+        LIMIT #{limitStart}, #{recordSize}
+    </select>
+
+    <!--
+        작성자 : 박정하
+        작성일 : 2024.04.23
         내 용 : 회원정보 목록 조회 (관리자) 개수
     -->
-    <select id="findByMngCnt" resultType="int">
+    <select id="findAllMngCnt" resultType="int">
         SELECT count(mi.mbr_id)
         FROM mbr_info AS mi
         LEFT JOIN mbr_authrt_info AS mai

 
     <!--
         작성자 : 박정하
+        작성일 : 2024.04.23
+        내 용 : 회원정보 목록 조회 (사용자) 개수
+    -->
+    <select id="findAllMbrCnt" resultType="int">
+        SELECT count(mi.mbr_id)
+        FROM mbr_info AS mi
+        LEFT JOIN mbr_authrt_info AS mai
+        ON mi.mbr_id = mai.mbr_id
+        WHERE mi.use_yn = 'Y'
+        AND mai.authrt_cd = 'ROLE_USER'
+        <include refid="selectRequirement" />
+    </select>
+
+    <!--
+        작성자 : 박정하
         작성일 : 2024.04.24
         내 용 : 회원정보 수정
     -->

105519e

ca71e1b

src/main/resources/mybatis/mapper/rvwMttr/rvwMttr-SQL.xml

--- src/main/resources/mybatis/mapper/rvwMttr/rvwMttr-SQL.xml

+++ src/main/resources/mybatis/mapper/rvwMttr/rvwMttr-SQL.xml


     <!-- 검토사항 resultMap -->
     <resultMap id="rvwMttrMap" type="HashMap">
         <result property="rvwMttrId" column="rvw_mttr_id" />
-        <result property="invtDscsnId" column="invt_dscsn_id" />
+        <result property="ivstDscsnId" column="ivst_dscsn_id" />
         <result property="ttl" column="ttl" />
         <result property="type" column="type" />
         <result property="clr" column="clr" />

     <insert id="rvwMttrInsert" parameterType="HashMap" useGeneratedKeys="true" keyProperty="rvwMttrId">
         INSERT INTO rvw_mttr (
             rvw_mttr_id
-            , invt_dscsn_id
+            , ivst_dscsn_id
             , type
             , clr
             , rcpt_dt

             , reg_dt
             , mdfr
             , mdfcn_dt
-        ) VALUE (
+        ) VALUES (
             #{rvwMttrId}
-            , #{invtDscsnId}
+            , #{ivstDscsnId}
             , #{type}
             , #{clr}
-            , #{rcptDt}
+            , #{rcptDt}::timestamp
             , #{rcptCn}
             , 'Y'
             , #{rgtr}

         <if test="searchText != null and searchText != ''">
             <choose>
                 <when test="searchType != null and searchType != ''">
-                    <if test="searchType == 'invt_dscsn_id'">
-                        AND rm.invt_dscsn_id = #{searchText}
+                    <if test="searchType == 'ivstDscsnId'">
+                        AND rm.ivst_dscsn_id = #{searchText}
+                    </if>
+                    <if test="searchType == 'ivst_dscsn_id'">
+                        AND rm.ivst_dscsn_id = #{searchText}
                     </if>
                     <if test="searchType == 'ent_nm'">
                         AND ei.ent_nm LIKE CONCAT('%', #{searchText}, '%')

     -->
     <select id="rvwMttrSelectList" resultMap="rvwMttrMap">
         SELECT rm.rvw_mttr_id
-             , rm.invt_dscsn_id
+             , rm.ivst_dscsn_id
              , rm.type
              , rm.clr
-             , DATE_FORMAT(rm.rcpt_dt, '%Y-%m-%d') AS mdfcn_dt
+             , to_char(rm.rcpt_dt, 'YYYY-MM-DD HH24:MI') AS rcpt_dt
              , rm.rcpt_cn
              , rm.use_yn
              , rm.rgtr
-             , DATE_FORMAT(rm.reg_dt, '%Y-%m-%d %H:%i') AS reg_dt
+             , to_char(rm.reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
              , rm.mdfr
-             , DATE_FORMAT(rm.mdfcn_dt, '%Y-%m-%d %H:%i') AS mdfcn_dt
+             , to_char(rm.mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
              , id.ttl
              , ei.ent_nm
              , (select prgrs_crs

              order by rmp.reg_dt DESC
              limit 1 ) AS prgrs_crs
         FROM rvw_mttr AS rm
-        LEFT JOIN invt_dscsn AS id
-        ON rm.invt_dscsn_id = id.invt_dscsn_id
+        LEFT JOIN ivst_dscsn AS id
+        ON rm.ivst_dscsn_id = id.ivst_dscsn_id
         LEFT JOIN ent_info AS ei
         ON id.ent_id = ei.ent_id
         WHERE rm.use_yn = 'Y'
         <include refid="selectRequirement" />
         ORDER BY rm.rvw_mttr_id DESC
-        <if test="searchType != 'invt_dscsn_id'">
-            LIMIT #{limitStart}, #{recordSize}
+        <if test="searchType != 'ivst_dscsn_id'">
+        OFFSET #{limitStart} LIMIT #{recordSize}
         </if>
     </select>
 

     <select id="rvwMttrSelectListCount" resultType="int">
         SELECT count(*)
           FROM rvw_mttr AS rm
-     LEFT JOIN invt_dscsn AS id
-            ON rm.invt_dscsn_id = id.invt_dscsn_id
+     LEFT JOIN ivst_dscsn AS id
+            ON rm.ivst_dscsn_id = id.ivst_dscsn_id
      LEFT JOIN ent_info AS ei
             ON id.ent_id = ei.ent_id
          WHERE rm.use_yn = 'Y'

     -->
     <select id="rvwMttrSelectOne" parameterType="HashMap" resultMap="rvwMttrMap">
         SELECT  rm.rvw_mttr_id
-              , rm.invt_dscsn_id
+              , rm.ivst_dscsn_id
               , id.ttl
               , rm.type
               , rm.clr
-              , DATE_FORMAT(rm.rcpt_dt, '%Y-%m-%d') AS rcpt_dt
+              , to_char(rm.rcpt_dt, 'YYYY-MM-DD') AS rcpt_dt
               , rm.rcpt_cn
               , rm.use_yn
               , rm.rgtr
-              , DATE_FORMAT(rm.reg_dt, '%Y-%m-%d %H:%i') AS reg_dt
+              , to_char(rm.reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
               , rm.mdfr
-              , DATE_FORMAT(rm.mdfcn_dt, '%Y-%m-%d %H:%i') AS mdfcn_dt
+              , to_char(rm.mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
         FROM rvw_mttr AS rm
-        LEFT JOIN invt_dscsn AS id
-        ON rm.invt_dscsn_id = id.invt_dscsn_id
+        LEFT JOIN ivst_dscsn AS id
+        ON rm.ivst_dscsn_id = id.ivst_dscsn_id
         LEFT JOIN ent_info AS ei
         ON id.ent_id = ei.ent_id
         WHERE rm.use_yn = 'Y'

     -->
     <update id="rvwMttrUpdate" parameterType="HashMap">
         UPDATE rvw_mttr
-        SET invt_dscsn_id = #{invtDscsnId}
+        SET ivst_dscsn_id = #{ivstDscsnId}
             , type = #{type}
             , clr = #{clr}
-            , rcpt_dt = #{rcptDt}
+            , rcpt_dt = #{rcptDt}::timestamp
             , rcpt_cn = #{rcptCn}
             , use_yn = #{useYn}
-            , rgtr = #{rgtr}
-            , reg_dt = #{regDt}
             , mdfr = #{mdfr}
             , mdfcn_dt = now()
         WHERE rvw_mttr_id = #{rvwMttrId}

105519e

ca71e1b

src/main/resources/mybatis/mapper/rvwMttr/rvwMttrPrgrs-SQL.xml

--- src/main/resources/mybatis/mapper/rvwMttr/rvwMttrPrgrs-SQL.xml

+++ src/main/resources/mybatis/mapper/rvwMttr/rvwMttrPrgrs-SQL.xml


 
     <!--
     작　성　자 : 박정하
-    작　성　일 : 2024.04.01
-    내　　　용 : 검토사항진행 업설트
+    작　성　일 : 2024.04.25
+    내　　　용 : 검토사항진행 등록
     -->
-    <update id="rvwMttrPrgrsUpsert" parameterType="RvwMttrPrgrsVO">
+    <insert id="rvwMttrPrgrsInsert" parameterType="RvwMttrPrgrsVO">
         INSERT INTO rvw_mttr_prgrs (
-            rvw_mttr_prgrs_id
-            , rvw_mttr_id
+            rvw_mttr_id
             , pic_id
             , prgrs_crs
             , prgrs_dt
             , sprt_mthd
             , rgtr
             , reg_dt
-            , mdfr
-            , mdfcn_dt
-        ) VALUE (
-            #{rvwMttrPrgrsId}
-            , #{rvwMttrId}
+        ) VALUES (
+            #{rvwMttrId}
             , #{picId}
             , #{prgrsCrs}
-            , #{prgrsDt}
+            , #{prgrsDt}::timestamp
             , #{sprtMthd}
             , #{rgtr}
             , now()
-            , null
-            , null
-        ) ON DUPLICATE KEY UPDATE
-            rvw_mttr_id = #{rvwMttrId}
-            , pic_id = #{picId}
+        )
+    </insert>
+
+    <!--
+    작　성　자 : 박정하
+    작　성　일 : 2024.04.25
+    내　　　용 : 검토사항진행 수정
+    -->
+    <update id="rvwMttrPrgrsUpdate" parameterType="RvwMttrPrgrsVO">
+        UPDATE rvw_mttr_prgrs
+        SET pic_id = #{picId}
             , prgrs_crs = #{prgrsCrs}
-            , prgrs_dt = #{prgrsDt}
+            , prgrs_dt = #{prgrsDt}::timestamp
             , sprt_mthd = #{sprtMthd}
-            , rgtr = #{rgtr}
-            , reg_dt = #{regDt}
             , mdfr = #{mdfr}
             , mdfcn_dt = now()
+        WHERE rvw_mttr_prgrs_id = #{rvwMttrPrgrsId}
     </update>
 
     <!--

              , rvw_mttr_id
              , pic_id
              , prgrs_crs
-             , DATE_FORMAT(prgrs_dt, '%Y-%m-%d') AS prgrs_dt
+             , to_char(prgrs_dt, 'YYYY-MM-DD') AS prgrs_dt
              , sprt_mthd
              , rgtr
-             , DATE_FORMAT(reg_dt, '%Y-%m-%d %H:%i') AS reg_dt
+             , to_char(reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
              , mdfr
-             , DATE_FORMAT(mdfcn_dt, '%Y-%m-%d %H:%i') AS mdfcn_dt
+             , to_char(mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
         FROM rvw_mttr_prgrs
         WHERE rvw_mttr_id = #{rvwMttrId}
         ORDER BY rvw_mttr_prgrs_id DESC

...	...	@@ -152,27 +152,4 @@
152	152	return new ResponseEntity<>(responseData, headers, HttpStatus.INTERNAL_SERVER_ERROR);
153	153	}
154	154	}
155		-
156		- /**
157		- * @author 박정하
158		- * @since 2024.04.23
159		- * @param params
160		- * @return
161		- * @throws Exception
162		- *
163		- * 회원정보 목록 조회 (관리자)
164		- */
165		- @PostMapping(value = "/findByMng.json")
166		- public ResponseEntity<?> findByMng(@RequestBody Map<String, String> params) throws Exception {
167		- // 회원정보 관련 정보 조회
168		- Map<String, Object> result = mberService.findByMng(params);
169		- // 응답 처리
170		- HttpHeaders headers = new HttpHeaders();
171		- headers.setContentType(new MediaType("application", "json", Charset.forName("UTF-8")));
172		- ResponseData responseData = new ResponseData();
173		- responseData.setStatus(HttpStatus.OK);
174		- responseData.setMessage("정상적으로 회원정보(관리자) 목록 조회가 처리되었습니다.");
175		- responseData.setData(result);
176		- return new ResponseEntity<>(responseData, headers, HttpStatus.OK);
177		- }
178	155	}

...	...	@@ -183,7 +183,7 @@
183	183	} else if (data.get(i).get(key).toString().equals("P")) {
184	184	cell.setCellValue("애로사항");
185	185	}
186		- } else if (key.equals("mvnInten") \|\| key.equals("invtInten") \|\| key.equals("mouInten") \|\| key.equals("invtDscsnInten")){
	186	+ } else if (key.equals("mvnInten") \|\| key.equals("ivstInten") \|\| key.equals("mouInten") \|\| key.equals("ivstDscsnInten")){
187	187	if (data.get(i).get(key).toString().equals("0")) {
188	188	cell.setCellValue("의향없음");
189	189	} else if (data.get(i).get(key).toString().equals("1")) {
...	...	@@ -268,7 +268,7 @@
268	268	*
269	269	* 기업정보 엑셀 설정
270	270	*/
271		- public void entInfoDraw(List<HashMap<String, Object>> entInfoList, List<HashMap<String, Object>> invtDscsnList, List<HashMap<String, Object>> FnlttList, String imageData) throws IllegalAccessException, IOException {
	271	+ public void entInfoDraw(List<HashMap<String, Object>> entInfoList, List<HashMap<String, Object>> ivstDscsnList, List<HashMap<String, Object>> FnstmList, String imageData) throws IllegalAccessException, IOException {
272	272	try {
273	273	Sheet sheet = this.workbook.createSheet("Sheet");
274	274
...	...	@@ -278,8 +278,8 @@
278	278	// 헤더 정보
279	279	ExcelHeader excelHeader = new ExcelHeader();
280	280	LinkedHashMap<String, String> entInfoHeader = excelHeader.getEntInfoDefaultHeader();
281		- LinkedHashMap<String, String> invtDscsnHeader = excelHeader.getEntInfoDetailHeader();
282		- LinkedHashMap<String, String> fnlttHeader = excelHeader.getEntInfoFnlttHeader();
	281	+ LinkedHashMap<String, String> ivstDscsnHeader = excelHeader.getEntInfoDetailHeader();
	282	+ LinkedHashMap<String, String> fnstmHeader = excelHeader.getEntInfoFnstmHeader();
283	283
284	284	// 기업정보
285	285	rowNum = vertical(sheet, rowNum, entInfoHeader, entInfoList);
...	...	@@ -292,11 +292,11 @@
292	292
293	293	cell = row.createCell(1);
294	294
295		- if (invtDscsnHeader.get(0) != null) {
	295	+ if (ivstDscsnHeader.get(0) != null) {
296	296	cell.setCellValue("Y");
297	297	rowNum++;
298	298
299		- rowNum = vertical(sheet, rowNum, invtDscsnHeader, invtDscsnList);
	299	+ rowNum = vertical(sheet, rowNum, ivstDscsnHeader, ivstDscsnList);
300	300	} else {
301	301	cell.setCellValue("N");
302	302	rowNum++;
...	...	@@ -307,7 +307,7 @@
307	307	}
308	308
309	309	// 재무제표
310		- rowNum = vertical(sheet, rowNum, fnlttHeader, FnlttList);
	310	+ rowNum = vertical(sheet, rowNum, fnstmHeader, FnstmList);
311	311
312	312	// 재무제표 차트
313	313	chartDraw(sheet, imageData, rowNum);
...	...	@@ -316,8 +316,8 @@
316	316	((SXSSFSheet) sheet).flushRows(MAX_ROW);
317	317
318	318	entInfoList.clear();
319		- invtDscsnList.clear();
320		- FnlttList.clear();
	319	+ ivstDscsnList.clear();
	320	+ FnstmList.clear();
321	321	} catch (IOException \| IllegalAccessException e) {
322	322	throw new RuntimeException(e);
323	323	}

...	...	@@ -183,8 +183,6 @@
183	183	AND mi.use_yn = 'Y'
184	184	</select>
185	185
186		-
187		-
188	186	<!--
189	187	작성자 : takensoft
190	188	작성일 : 2024.04.03
...	...	@@ -210,12 +208,8 @@
210	208	WHERE mbr_id = #{mbrId}
211	209	</update>
212	210
213		- <!--
214		- 작성자 : 박정하
215		- 작성일 : 2024.04.23
216		- 내 용 : 회원정보 목록 조회 (관리자)
217		- -->
218		- <select id="findByMng" resultMap="mberMap">
	211	+ <!-- 목록 조회 -->
	212	+ <sql id="findAll">
219	213	SELECT mi.mbr_id
220	214	, mi.lgn_id
221	215	, mi.mbr_nm
...	...	@@ -246,12 +240,7 @@
246	240	FROM mbr_info AS mi
247	241	LEFT JOIN mbr_authrt_info AS mai
248	242	ON mi.mbr_id = mai.mbr_id
249		- WHERE mi.use_yn = 'Y'
250		- AND mai.authrt_cd = 'ROLE_ADMIN'
251		- <include refid="selectRequirement" />
252		- ORDER BY mi.reg_dt DESC
253		- LIMIT #{limitStart}, #{recordSize}
254		- </select>
	243	+ </sql>
255	244
256	245	<!-- 검색 조건 -->
257	246	<sql id="selectRequirement">
...	...	@@ -267,9 +256,9 @@
267	256	</when>
268	257	<otherwise>
269	258	AND (
270		- mi.lgn_id LIKE CONCAT('%', #{searchText}, '%')
	259	+ mi.lgn_id LIKE CONCAT('%', #{searchText}, '%')
271	260	OR
272		- mi.mbr_nm LIKE CONCAT('%', #{searchText}, '%')
	261	+ mi.mbr_nm LIKE CONCAT('%', #{searchText}, '%')
273	262	)
274	263	</otherwise>
275	264	</choose>
...	...	@@ -279,9 +268,37 @@
279	268	<!--
280	269	작성자 : 박정하
281	270	작성일 : 2024.04.23
	271	+ 내 용 : 회원정보 목록 조회 (관리자)
	272	+ -->
	273	+ <select id="findAllMng" resultMap="mberMap">
	274	+ <include refid="findAll"></include>
	275	+ WHERE mi.use_yn = 'Y'
	276	+ AND mai.authrt_cd = 'ROLE_ADMIN'
	277	+ <include refid="selectRequirement" />
	278	+ ORDER BY mi.reg_dt DESC
	279	+ LIMIT #{limitStart}, #{recordSize}
	280	+ </select>
	281	+
	282	+ <!--
	283	+ 작성자 : 박정하
	284	+ 작성일 : 2024.04.23
	285	+ 내 용 : 회원정보 목록 조회 (사용자)
	286	+ -->
	287	+ <select id="findAllMbr" resultMap="mberMap">
	288	+ <include refid="findAll"></include>
	289	+ WHERE mi.use_yn = 'Y'
	290	+ AND mai.authrt_cd = 'ROLE_USER'
	291	+ <include refid="selectRequirement" />
	292	+ ORDER BY mi.reg_dt DESC
	293	+ LIMIT #{limitStart}, #{recordSize}
	294	+ </select>
	295	+
	296	+ <!--
	297	+ 작성자 : 박정하
	298	+ 작성일 : 2024.04.23
282	299	내 용 : 회원정보 목록 조회 (관리자) 개수
283	300	-->
284		- <select id="findByMngCnt" resultType="int">
	301	+ <select id="findAllMngCnt" resultType="int">
285	302	SELECT count(mi.mbr_id)
286	303	FROM mbr_info AS mi
287	304	LEFT JOIN mbr_authrt_info AS mai
...	...	@@ -293,6 +310,21 @@
293	310
294	311	<!--
295	312	작성자 : 박정하
	313	+ 작성일 : 2024.04.23
	314	+ 내 용 : 회원정보 목록 조회 (사용자) 개수
	315	+ -->
	316	+ <select id="findAllMbrCnt" resultType="int">
	317	+ SELECT count(mi.mbr_id)
	318	+ FROM mbr_info AS mi
	319	+ LEFT JOIN mbr_authrt_info AS mai
	320	+ ON mi.mbr_id = mai.mbr_id
	321	+ WHERE mi.use_yn = 'Y'
	322	+ AND mai.authrt_cd = 'ROLE_USER'
	323	+ <include refid="selectRequirement" />
	324	+ </select>
	325	+
	326	+ <!--
	327	+ 작성자 : 박정하
296	328	작성일 : 2024.04.24
297	329	내 용 : 회원정보 수정
298	330	-->

...	...	@@ -7,9 +7,9 @@
7	7	<option name="url" value="https://repo.maven.apache.org/maven2" />
8	8	</remote-repository>
9	9	<remote-repository>
10		- <option name="id" value="central" />
11		- <option name="name" value="Maven Central repository" />
12		- <option name="url" value="https://repo1.maven.org/maven2" />
	10	+ <option name="id" value="egovframe" />
	11	+ <option name="name" value="egovframe" />
	12	+ <option name="url" value="https://maven.egovframe.go.kr/maven/" />
13	13	</remote-repository>
14	14	<remote-repository>
15	15	<option name="id" value="mvn2s" />
...	...	@@ -17,9 +17,9 @@
17	17	<option name="url" value="https://repo1.maven.org/maven2/" />
18	18	</remote-repository>
19	19	<remote-repository>
20		- <option name="id" value="egovframe" />
21		- <option name="name" value="egovframe" />
22		- <option name="url" value="https://maven.egovframe.go.kr/maven/" />
	20	+ <option name="id" value="central" />
	21	+ <option name="name" value="Maven Central repository" />
	22	+ <option name="url" value="https://repo1.maven.org/maven2" />
23	23	</remote-repository>
24	24	<remote-repository>
25	25	<option name="id" value="jboss.community" />

...	...	@@ -64,14 +64,28 @@
64	64	* @since 2024.04.23
65	65	* 회원정보 목록 조회 (관리자)
66	66	*/
67		- List<MberVO> findByMng(Pagination pagination) throws Exception;
	67	+ List<MberVO> findAllMng(Pagination pagination) throws Exception;
	68	+
	69	+ /**
	70	+ * @author 박정하
	71	+ * @since 2024.04.23
	72	+ * 회원정보 목록 조회 (사용자)
	73	+ */
	74	+ List<MberVO> findAllMbr(Pagination pagination) throws Exception;
68	75
69	76	/**
70	77	* @author 박정하
71	78	* @since 2024.04.23
72	79	* 회원정보 목록 조회 (관리자) 개수
73	80	*/
74		- int findByMngCnt(Pagination pagination) throws Exception;
	81	+ int findAllMngCnt(Pagination pagination) throws Exception;
	82	+
	83	+ /**
	84	+ * @author 박정하
	85	+ * @since 2024.04.23
	86	+ * 회원정보 목록 조회 (관리자) 개수
	87	+ */
	88	+ int findAllMbrCnt(Pagination pagination) throws Exception;
75	89
76	90	/**
77	91	* @author 박정하

...	...	@@ -23,6 +23,7 @@
23	23	import org.springframework.transaction.annotation.Transactional;
24	24
25	25	import javax.servlet.http.HttpServletRequest;
	26	+import java.util.ArrayList;
26	27	import java.util.HashMap;
27	28	import java.util.List;
28	29	import java.util.Map;
...	...	@@ -146,15 +147,25 @@
146	147	/**
147	148	* @author 박정하
148	149	* @since 2024.04.23
149		- * 회원정보 목록 조회 (관리자)
	150	+ * 회원정보 목록 조회
150	151	*/
151	152	@Override
152		- public Map<String, Object> findByMng(Map<String, String> params) throws Exception {
	153	+ public Map<String, Object> findAll(Map<String, String> params) throws Exception {
153	154	Map<String, Object> result = new HashMap<>();
154	155	Pagination search = new Pagination(0, params);
155		- int cnt = mberDAO.findByMngCnt(search);
	156	+ int cnt = 0;
	157	+ if (params.get("authrtCd").equals("ROLE_ADMIN")) {
	158	+ cnt = mberDAO.findAllMngCnt(search);
	159	+ } else if (params.get("authrtCd").equals("ROLE_USER")) {
	160	+ cnt = mberDAO.findAllMbrCnt(search);
	161	+ }
156	162	Pagination pagination = new Pagination(cnt, params);
157		- List<MberVO> list = mberDAO.findByMng(pagination);
	163	+ List<MberVO> list = new ArrayList<>();
	164	+ if (params.get("authrtCd").equals("ROLE_ADMIN")) {
	165	+ list = mberDAO.findAllMng(pagination);
	166	+ } else if (params.get("authrtCd").equals("ROLE_USER")) {
	167	+ list = mberDAO.findAllMbr(pagination);
	168	+ }
158	169	// 휴대폰번호 복호화
159	170	for (MberVO mberVO : list) {
160	171	if (mberVO.getMblTelno() != null && !mberVO.getMblTelno().equals("")) {

...	...	@@ -39,9 +39,9 @@
39	39	/**
40	40	* @author 박정하
41	41	* @since 2024.04.23
42		- * 회원정보 목록 조회 (관리자)
	42	+ * 회원정보 목록 조회
43	43	*/
44		- public Map<String, Object> findByMng(Map<String, String> params) throws Exception;
	44	+ public Map<String, Object> findAll(Map<String, String> params) throws Exception;
45	45
46	46	/**
47	47	* @author 박정하

...	...	@@ -42,12 +42,12 @@
42	42	* @return
43	43	* @throws Exception
44	44	*
45		- * 회원정보 목록 조회 (관리자)
	45	+ * 회원정보 목록 조회
46	46	*/
47		- @PostMapping(value = "/findByMng.json")
48		- public ResponseEntity<?> findByMng(@RequestBody Map<String, String> params) throws Exception {
	47	+ @PostMapping(value = "/findAll.json")
	48	+ public ResponseEntity<?> findAll(@RequestBody Map<String, String> params) throws Exception {
49	49	// 회원정보 관련 정보 조회
50		- Map<String, Object> result = mberService.findByMng(params);
	50	+ Map<String, Object> result = mberService.findAll(params);
51	51	// 응답 처리
52	52	HttpHeaders headers = new HttpHeaders();
53	53	headers.setContentType(new MediaType("application", "json", Charset.forName("UTF-8")));

...	...	@@ -9,10 +9,10 @@
9	9	// 가업정보
10	10	private LinkedHashMap<String, String> entInfoDefaultHeader = new LinkedHashMap<>();
11	11	private LinkedHashMap<String, String> entInfoDetailHeader = new LinkedHashMap<>();
12		- private LinkedHashMap<String, String> entInfoFnlttHeader = new LinkedHashMap<>();
	12	+ private LinkedHashMap<String, String> entInfoFnstmHeader = new LinkedHashMap<>();
13	13
14	14	// 투자상담
15		- private LinkedHashMap<String, String> invtDscsnHeader = new LinkedHashMap<>();
	15	+ private LinkedHashMap<String, String> ivstDscsnHeader = new LinkedHashMap<>();
16	16
17	17	// 검토사항
18	18	private LinkedHashMap<String, String> rvwMttrHeader = new LinkedHashMap<>();
...	...	@@ -30,27 +30,27 @@
30	30
31	31	// 기업정보 - 세부정보
32	32	this.entInfoDetailHeader.put("mvnInten", "입주의향");
33		- this.entInfoDetailHeader.put("invtInten", "투자의향");
	33	+ this.entInfoDetailHeader.put("ivstInten", "투자의향");
34	34	this.entInfoDetailHeader.put("mouInten", "MOU의향");
35		- this.entInfoDetailHeader.put("invtDscsnInten", "투자상담의향");
	35	+ this.entInfoDetailHeader.put("ivstDscsnInten", "투자상담의향");
36	36
37	37	// 기업정보 - 재무제표
38		- this.entInfoFnlttHeader.put("yr", "연도");
39		- this.entInfoFnlttHeader.put("slsAmt", "매출액");
40		- this.entInfoFnlttHeader.put("bsnPrfts", "영업이익");
41		- this.entInfoFnlttHeader.put("netIncome", "당기순이익");
	38	+ this.entInfoFnstmHeader.put("yr", "연도");
	39	+ this.entInfoFnstmHeader.put("slsAmt", "매출액");
	40	+ this.entInfoFnstmHeader.put("salsPrf", "영업이익");
	41	+ this.entInfoFnstmHeader.put("thtmNetpf", "당기순이익");
42	42
43	43	// 투자상담 - 세부정보
44		- this.invtDscsnHeader.put("ttl", "제목");
45		- this.invtDscsnHeader.put("dt", "일시");
46		- this.invtDscsnHeader.put("plc", "장소");
47		- this.invtDscsnHeader.put("prtpnt", "참석자");
48		- this.invtDscsnHeader.put("dscsnPbsvnt", "상담공무원");
49		- this.invtDscsnHeader.put("mainCn", "주요내용");
50		- this.invtDscsnHeader.put("mvnInten", "입주의향");
51		- this.invtDscsnHeader.put("invtInten", "투자의향");
52		- this.invtDscsnHeader.put("mouInten", "MOU의향");
53		- this.invtDscsnHeader.put("invtDscsnInten", "투자상담의향");
	44	+ this.ivstDscsnHeader.put("ttl", "제목");
	45	+ this.ivstDscsnHeader.put("dt", "일시");
	46	+ this.ivstDscsnHeader.put("plc", "장소");
	47	+ this.ivstDscsnHeader.put("prtpnt", "참석자");
	48	+ this.ivstDscsnHeader.put("dscsnPbofc", "상담공무원");
	49	+ this.ivstDscsnHeader.put("mainCn", "주요내용");
	50	+ this.ivstDscsnHeader.put("mvnInten", "입주의향");
	51	+ this.ivstDscsnHeader.put("ivstInten", "투자의향");
	52	+ this.ivstDscsnHeader.put("mouInten", "MOU의향");
	53	+ this.ivstDscsnHeader.put("ivstDscsnInten", "투자상담의향");
54	54
55	55	// 검토사항 - 기본정보
56	56	this.rvwMttrHeader.put("entNm", "기업명");

...	...	@@ -47,7 +47,7 @@
47	47	String extsn = StringUtils.getFilenameExtension(fileName); // 확장자
48	48	String mg = Long.toString(file.getSize()); // 크기
49	49	String absltPath = makeDirectories(uploadPath) + File.separator + maskNm + "." + extsn; // 절대경로
50		- String prttnPath = File.separator + maskNm + "." + extsn; // 일부경로
	50	+ String partPath = File.separator + maskNm + "." + extsn; // 일부경로
51	51
52	52	// FileVO 생성
53	53	FileVO fileVO = new FileVO();
...	...	@@ -56,7 +56,7 @@
56	56	fileVO.setMaskNm(maskNm); // 마스크명
57	57	// 파일타입 추후에 추가
58	58	fileVO.setAbsltPath(absltPath); // 절대경로
59		- fileVO.setPrttnPath(prttnPath); // 일부경로
	59	+ fileVO.setPartPath(partPath); // 일부경로
60	60	fileVO.setExtnNm(extsn); // 확장자
61	61	fileVO.setFileSz(mg); // 크기
62	62	// 등록자 생성

...	...	@@ -10,7 +10,7 @@
10	10	private String maskNm; // 마스크명
11	11	private String fileType; // 파일타입
12	12	private String absltPath; // 절대경로
13		- private String prttnPath; // 일부경로
	13	+ private String partPath; // 일부경로
14	14	private String extnNm; // 확장자
15	15	private String fileSz; // 크기
16	16	private String rgtr; // 등록자

...	...	@@ -29,13 +29,13 @@
29	29	}
30	30
31	31	// 투자상담
32		- @Bean(name = "invtDscsnIdgn")
33		- public IdgenService invtDscsn() {
	32	+ @Bean(name = "ivstDscsnIdgn")
	33	+ public IdgenService ivstDscsn() {
34	34	IdgenService idgenServiceImpl = new IdgenService();
35	35	idgenServiceImpl.setCipers(15);
36	36	idgenServiceImpl.setFillChar('0');
37		- idgenServiceImpl.setPrefix("INVT_DSCSN_");
38		- idgenServiceImpl.setTblNm("INVT_DSCSN_ID");
	37	+ idgenServiceImpl.setPrefix("IVST_DSCSN_");
	38	+ idgenServiceImpl.setTblNm("IVST_DSCSN_ID");
39	39	return idgenServiceImpl;
40	40	}
41	41

...	...	@@ -60,5 +60,5 @@
60	60	*
61	61	* 기업상담신청 1시간 이내 동일 아이피 등록 개수
62	62	*/
63		- public HashMap<String, Object> entDscsnAplyCountByOneHourWriteSameIp(EntDscsnAplyVO entDscsnAplyVO) throws Exception;
	63	+ public HashMap<String, Object> entDscsnAplyCountByOneHourWriteSameIp(String params) throws Exception;
64	64	} (파일 끝에 줄바꿈 문자 없음)

...	...	@@ -45,12 +45,4 @@
45	45	* 기업상담신청 수정
46	46	*/
47	47	public int entDscsnAplyUpdate(EntDscsnAplyVO entDscsnAplyVO) throws Exception;
48		-
49		- /**
50		- * @author 박정하
51		- * @since 2024.04.04
52		- *
53		- * 기업상담신청 1시간 이내 동일 아이피 등록 개수
54		- */
55		- public HashMap<String, Object> entDscsnAplyCountByOneHourWriteSameIp(EntDscsnAplyVO entDscsnAplyVO) throws Exception;
56	48	} (파일 끝에 줄바꿈 문자 없음)

...	...	@@ -53,10 +53,10 @@
53	53	entDscsnAplyVO.setAplcntIp(ipAddress);
54	54
55	55	// 아이피 검사
56		- HashMap<String, Object> entDscsnAplyCount = entDscsnAplyCountByOneHourWriteSameIp(entDscsnAplyVO);
57		- if (Integer.parseInt((String.valueOf(entDscsnAplyCount.get("writeCount")))) > 2) {
58		- result.put("writeCount", entDscsnAplyCount.get("writeCount"));
59		- result.put("lastDatetime", entDscsnAplyCount.get("lastDatetime"));
	56	+ HashMap<String, Object> entDscsnAplyCount = entDscsnAplyDAO.entDscsnAplyCountByOneHourWriteSameIp(ipAddress);
	57	+ if (Integer.parseInt((String.valueOf(entDscsnAplyCount.get("writecount")))) > 2) {
	58	+ result.put("writeCount", entDscsnAplyCount.get("writecount"));
	59	+ result.put("lastDatetime", entDscsnAplyCount.get("lastdatetime"));
60	60	return result;
61	61	}
62	62
...	...	@@ -122,15 +122,5 @@
122	122	@Override
123	123	public int entDscsnAplyUpdate(EntDscsnAplyVO entDscsnAplyVO) throws Exception {
124	124	return entDscsnAplyDAO.entDscsnAplyUpdate(entDscsnAplyVO);
125		- }
126		-
127		- /**
128		- * @author 박정하
129		- * @since 2024.04.04
130		- *
131		- * 기업상담신청 1시간 이내 동일 아이피 등록 개수
132		- */
133		- public HashMap<String, Object> entDscsnAplyCountByOneHourWriteSameIp(EntDscsnAplyVO entDscsnAplyVO) throws Exception {
134		- return entDscsnAplyDAO.entDscsnAplyCountByOneHourWriteSameIp(entDscsnAplyVO);
135	125	}
136	126	} (파일 끝에 줄바꿈 문자 없음)

...	...	@@ -39,7 +39,7 @@
39	39	* 기업상담신청 등록
40	40	*/
41	41	@PostMapping(path = "/company/entDscsnAplyInsert.file")
42		- public ResponseEntity<?> invtDscsnInsert(@RequestPart EntDscsnAplyVO entDscsnAplyVO, List<MultipartFile> multipartFile, HttpServletRequest req) throws Exception {
	42	+ public ResponseEntity<?> ivstDscsnInsert(@RequestPart EntDscsnAplyVO entDscsnAplyVO, List<MultipartFile> multipartFile, HttpServletRequest req) throws Exception {
43	43	// 기업상담신청 등록
44	44	HashMap<String, Object> result = entDscsnAplyService.entDscsnAplyInsert(entDscsnAplyVO, multipartFile, req);
45	45
...	...	@@ -54,7 +54,7 @@
54	54	} else {
55	55	if (result.containsKey("writeCount") && result.containsKey("lastDatetime")) {
56	56	responseData.setStatus(HttpStatus.TOO_MANY_REQUESTS);
57		- responseData.setMessage("주어진 시간 동안 너무 많은 문의를 등록했습니다. " + result.get("writeCount") + "분 후에 재시도하세요.");
	57	+ responseData.setMessage("주어진 시간 동안 너무 많은 문의를 등록했습니다. " + result.get("lastDatetime") + " 후에 재시도하세요.");
58	58	return new ResponseEntity<>(responseData, headers, HttpStatus.TOO_MANY_REQUESTS);
59	59	} else {
60	60	responseData.setStatus(HttpStatus.INTERNAL_SERVER_ERROR);

...	...	@@ -5,8 +5,8 @@
5	5	import com.takensoft.common.util.JWTUtil;
6	6	import com.takensoft.portal.entInfo.dao.EntInfoDAO;
7	7	import com.takensoft.portal.entInfo.service.EntInfoService;
8		-import com.takensoft.portal.entInfo.service.FnlttService;
9		-import com.takensoft.portal.invtDscsn.service.InvtDscsnService;
	8	+import com.takensoft.portal.entInfo.service.FnstmService;
	9	+import com.takensoft.portal.ivstDscsn.service.IvstDscsnService;
10	10	import lombok.RequiredArgsConstructor;
11	11	import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl;
12	12	import org.springframework.stereotype.Service;
...	...	@@ -29,8 +29,8 @@
29	29	public class EntInfoServiceImpl extends EgovAbstractServiceImpl implements EntInfoService {
30	30	private final EntInfoDAO entInfoDAO;
31	31	private final IdgenService entInfoIdgn;
32		- private final FnlttService fnlttService;
33		- private final InvtDscsnService invtDscsnService;
	32	+ private final FnstmService fnstmService;
	33	+ private final IvstDscsnService ivstDscsnService;
34	34	private final JWTUtil jwtUtil;
35	35
36	36	/**
...	...	@@ -53,23 +53,23 @@
53	53	HashMap<String, Object> result = new HashMap<>();
54	54
55	55	// 재무제표 등록
56		- int fnlttResult = 0;
57		- List<HashMap<String, Object>> fnlttList = (List<HashMap<String, Object>>) params.get("fnlttList");
58		- if (fnlttList.size() > 0 && fnlttList.get(0).get("yr") != null) {
59		- for (HashMap<String, Object> fnltt : fnlttList) {
	56	+ int fnstmResult = 0;
	57	+ List<HashMap<String, Object>> fnstmList = (List<HashMap<String, Object>>) params.get("fnstmList");
	58	+ if (fnstmList.size() > 0 && fnstmList.get(0).get("yr") != null) {
	59	+ for (HashMap<String, Object> fnstm : fnstmList) {
60	60	try {
61	61	// 기업 아이디 추가
62		- fnltt.put("entId", entId);
	62	+ fnstm.put("entId", entId);
63	63
64	64	// 작성자 생성
65		- fnltt.put("rgtr", writer);
	65	+ fnstm.put("rgtr", writer);
66	66
67		- fnltt.compute("slsAmt", (k, slsAmt) -> Integer.parseInt(slsAmt.toString()));
68		- fnltt.compute("bsnPrfts", (k, bsnPrfts) -> Integer.parseInt(bsnPrfts.toString()));
69		- fnltt.compute("netIncome", (k, netIncome) -> Integer.parseInt(netIncome.toString()));
	67	+ fnstm.compute("slsAmt", (k, slsAmt) -> Integer.parseInt(slsAmt.toString()));
	68	+ fnstm.compute("salsPrf", (k, salsPrf) -> Integer.parseInt(salsPrf.toString()));
	69	+ fnstm.compute("thtmNetpf", (k, thtmNetpf) -> Integer.parseInt(thtmNetpf.toString()));
70	70
71	71	// DB 등록
72		- fnlttResult += fnlttService.fnlttUpsert(fnltt);
	72	+ fnstmResult += fnstmService.fnstmInsert(fnstm);
73	73	} catch (Exception e) {
74	74	e.printStackTrace();
75	75	return result;
...	...	@@ -80,7 +80,7 @@
80	80	// 기업정보 등록
81	81	int entInfoResult = entInfoDAO.entInfoInsert(params);
82	82	result.put("entId", entId);
83		- result.put("result", fnlttResult + entInfoResult);
	83	+ result.put("result", fnstmResult + entInfoResult);
84	84
85	85	return result;
86	86	}
...	...	@@ -152,30 +152,14 @@
152	152	String writer = jwtUtil.getWriter();
153	153	params.put("mdfr", writer);
154	154
155		- // 재무제표 등록
156		- List<HashMap<String, Object>> fnlttList = (List<HashMap<String, Object>>) params.get("fnlttList");
157		- if (fnlttList.size() > 0 && fnlttList.get(0).get("yr") != null) {
158		- for (HashMap<String, Object> fnltt : fnlttList) {
159		- try {
160		- // 작성자 생성
161		- if (fnltt.get("rgtr") == null) {
162		- fnltt.put("rgtr", writer);
163		- }
164		-
165		- // 수정자 생성
166		- fnltt.put("mdfr", writer);
167		-
168		- fnltt.compute("slsAmt", (k, slsAmt) -> Integer.parseInt(slsAmt.toString()));
169		- fnltt.compute("bsnPrfts", (k, bsnPrfts) -> Integer.parseInt(bsnPrfts.toString()));
170		- fnltt.compute("netIncome", (k, netIncome) -> Integer.parseInt(netIncome.toString()));
171		-
172		- // DB 등록
173		- result += fnlttService.fnlttUpsert(fnltt);
174		- } catch (Exception e) {
175		- e.printStackTrace();
176		- return result;
177		- }
178		- }
	155	+ // 재무제표 수정
	156	+ List<HashMap<String, Object>> fnstmList = (List<HashMap<String, Object>>) params.get("fnstmList");
	157	+ try {
	158	+ // DB 등록
	159	+ result += fnstmService.fnstmUpdate(fnstmList);
	160	+ } catch (Exception e) {
	161	+ e.printStackTrace();
	162	+ return result;
179	163	}
180	164
181	165	// 기업정보 수정
...	...	@@ -200,14 +184,14 @@
200	184	params.put("mdfr", writer);
201	185
202	186	// 재무제표 삭제
203		- List<HashMap<String, Object>> fnlttList = fnlttService.fnlttSelectList(params);
204		- if (!fnlttList.isEmpty()) {
205		- for (HashMap<String, Object> fnltt : fnlttList) {
	187	+ List<HashMap<String, Object>> fnstmList = fnstmService.fnstmSelectList(params);
	188	+ if (!fnstmList.isEmpty()) {
	189	+ for (HashMap<String, Object> fnstm : fnstmList) {
206	190	try {
207		- fnltt.put("mdfr", writer);
	191	+ fnstm.put("mdfr", writer);
208	192
209	193	// DB 등록
210		- result += fnlttService.fnlttDelete(fnltt);
	194	+ result += fnstmService.fnstmDelete(fnstm);
211	195	} catch (Exception e) {
212	196	e.printStackTrace();
213	197	return result;
...	...	@@ -221,11 +205,11 @@
221	205	newParams.put("isAllList", "yes");
222	206	newParams.put("searchType", "ent_id");
223	207	newParams.put("searchText", params.get("entId").toString());
224		- Map<String, Object> invtDscsnSelectList = invtDscsnService.invtDscsnSelectList(newParams);
225		- List<HashMap<String, Object>> invtDscsnList = (List<HashMap<String, Object>>) invtDscsnSelectList.get("list");
226		- if (!invtDscsnList.isEmpty()) {
227		- for (HashMap<String, Object> invtDscsn : invtDscsnList) {
228		- result += invtDscsnService.invtDscsnDelete(invtDscsn);
	208	+ Map<String, Object> ivstDscsnSelectList = ivstDscsnService.ivstDscsnSelectList(newParams);
	209	+ List<HashMap<String, Object>> ivstDscsnList = (List<HashMap<String, Object>>) ivstDscsnSelectList.get("list");
	210	+ if (!ivstDscsnList.isEmpty()) {
	211	+ for (HashMap<String, Object> ivstDscsn : ivstDscsnList) {
	212	+ result += ivstDscsnService.ivstDscsnDelete(ivstDscsn);
229	213	}
230	214	}
231	215	} catch (IOException e) {

...	...	@@ -9,13 +9,13 @@
9	9	* 재무제표 관련 VO
10	10	*/
11	11	@Data
12		-public class FnlttVO {
13		- private int fnlttId; // 재무제표 아이디
	12	+public class FnstmVO {
	13	+ private int fnstmId; // 재무제표 아이디
14	14	private String entId; // 기업 아이디
15	15	private String yr; // 연도
16	16	private int slsAmt; // 매출액
17		- private int bsnPrfts; // 영업이익
18		- private int netIncome; // 당기순이익
	17	+ private int salsPrf; // 영업이익
	18	+ private int thtmNetpf; // 당기순이익
19	19	private String useYn; // 사용여부
20	20	private String rgtr; // 등록자
21	21	private String regDt; // 등록일

...	...	@@ -1,11 +1,10 @@
1	1	package com.takensoft.portal.entInfo.web;
2	2
3	3	import com.takensoft.common.excel.ExcelUtils;
4		-import com.takensoft.common.Pagination;
5	4	import com.takensoft.common.util.ResponseData;
6	5	import com.takensoft.portal.entInfo.service.EntInfoService;
7		-import com.takensoft.portal.entInfo.service.FnlttService;
8		-import com.takensoft.portal.invtDscsn.service.InvtDscsnService;
	6	+import com.takensoft.portal.entInfo.service.FnstmService;
	7	+import com.takensoft.portal.ivstDscsn.service.IvstDscsnService;
9	8	import lombok.RequiredArgsConstructor;
10	9	import org.springframework.http.HttpHeaders;
11	10	import org.springframework.http.HttpStatus;
...	...	@@ -28,8 +27,8 @@
28	27	@RequiredArgsConstructor
29	28	public class EntInfoController {
30	29	private final EntInfoService entInfoService;
31		- private final FnlttService fnlttService;
32		- private final InvtDscsnService invtDscsnService;
	30	+ private final FnstmService fnstmService;
	31	+ private final IvstDscsnService ivstDscsnService;
33	32
34	33	/**
35	34	* @author 박정하
...	...	@@ -109,8 +108,8 @@
109	108	// 상세 조회
110	109	HashMap<String, Object> result = new HashMap<>();
111	110	result.put("entInfo", entInfoService.entInfoSelectOne(params));
112		- result.put("invtDscsn", invtDscsnService.invtDscsnSelectOneByNew(params));
113		- result.put("fnlttList", fnlttService.fnlttSelectList(params));
	111	+ result.put("ivstDscsn", ivstDscsnService.ivstDscsnSelectOneByNew(params));
	112	+ result.put("fnstmList", fnstmService.fnstmSelectList(params));
114	113
115	114	// 응답 처리
116	115	HttpHeaders headers = new HttpHeaders();
...	...	@@ -206,14 +205,14 @@
206	205	entInfoList.add(entInfoService.entInfoSelectOne(params));
207	206
208	207	// 세부정보
209		- List<HashMap<String, Object>> invtDscsnList = new ArrayList<>();
210		- invtDscsnList.add(invtDscsnService.invtDscsnSelectOneByNew(params));
	208	+ List<HashMap<String, Object>> ivstDscsnList = new ArrayList<>();
	209	+ ivstDscsnList.add(ivstDscsnService.ivstDscsnSelectOneByNew(params));
211	210
212	211	// 재무제표
213		- List<HashMap<String, Object>> FnlttList = fnlttService.fnlttSelectList(params);
	212	+ List<HashMap<String, Object>> FnstmList = fnstmService.fnstmSelectList(params);
214	213
215	214	// 엑셀 import
216		- excelUtils.entInfoDraw(entInfoList, invtDscsnList, FnlttList, params.get("imageData").toString());
	215	+ excelUtils.entInfoDraw(entInfoList, ivstDscsnList, FnstmList, params.get("imageData").toString());
217	216
218	217	// 엑셀 다운로드
219	218	excelUtils.download("download");

...	...	@@ -1,4 +1,4 @@
1		-package com.takensoft.portal.invtDscsn.dao;
	1	+package com.takensoft.portal.ivstDscsn.dao;
2	2
3	3	import com.takensoft.common.Pagination;
4	4	import org.egovframe.rte.psl.dataaccess.mapper.Mapper;
...	...	@@ -11,15 +11,15 @@
11	11	*
12	12	* 투자상담 관련 Mapper
13	13	*/
14		-@Mapper("invtDscsnDAO")
15		-public interface InvtDscsnDAO {
	14	+@Mapper("ivstDscsnDAO")
	15	+public interface IvstDscsnDAO {
16	16	/**
17	17	* @author 박정하
18	18	* @since 2024.03.26
19	19	*
20	20	* 투자상담 등록
21	21	*/
22		- public int invtDscsnInsert(HashMap<String, Object> params) throws Exception;
	22	+ public int ivstDscsnInsert(HashMap<String, Object> params) throws Exception;
23	23
24	24	/**
25	25	* @author 박정하
...	...	@@ -27,7 +27,7 @@
27	27	*
28	28	* 투자상담 목록 조회
29	29	*/
30		- public List<HashMap<String, Object>> invtDscsnSelectList(Pagination pagination) throws Exception;
	30	+ public List<HashMap<String, Object>> ivstDscsnSelectList(Pagination pagination) throws Exception;
31	31
32	32	/**
33	33	* @author 박정하
...	...	@@ -35,7 +35,7 @@
35	35	*
36	36	* 투자상담 목록 총 개수 조회
37	37	*/
38		- public int invtDscsnSelectListCount(Pagination pagination) throws Exception;
	38	+ public int ivstDscsnSelectListCount(Pagination pagination) throws Exception;
39	39
40	40	/**
41	41	* @author 박정하
...	...	@@ -43,7 +43,7 @@
43	43	*
44	44	* 투자상담 상세 조회
45	45	*/
46		- public HashMap<String, Object> invtDscsnSelectOne(HashMap<String, Object> params) throws Exception;
	46	+ public HashMap<String, Object> ivstDscsnSelectOne(HashMap<String, Object> params) throws Exception;
47	47
48	48	/**
49	49	* @author 박정하
...	...	@@ -51,7 +51,7 @@
51	51	*
52	52	* 투자상담 수정
53	53	*/
54		- public int invtDscsnUpdate(HashMap<String, Object> params) throws Exception;
	54	+ public int ivstDscsnUpdate(HashMap<String, Object> params) throws Exception;
55	55
56	56	/**
57	57	* @author 박정하
...	...	@@ -59,7 +59,7 @@
59	59	*
60	60	* 투자상담 삭제
61	61	*/
62		- public int invtDscsnDelete(HashMap<String, Object> params) throws Exception;
	62	+ public int ivstDscsnDelete(HashMap<String, Object> params) throws Exception;
63	63
64	64	/**
65	65	* @author 박정하
...	...	@@ -67,5 +67,5 @@
67	67	*
68	68	* 투자상담 최근 1건 조회
69	69	*/
70		- public HashMap<String, Object> invtDscsnSelectOneByNew(HashMap<String, Object> params) throws Exception;
	70	+ public HashMap<String, Object> ivstDscsnSelectOneByNew(HashMap<String, Object> params) throws Exception;
71	71	} (파일 끝에 줄바꿈 문자 없음)

...	...	@@ -1,12 +1,12 @@
1		-package com.takensoft.portal.invtDscsn.service.Impl;
	1	+package com.takensoft.portal.ivstDscsn.service.Impl;
2	2
3	3	import com.takensoft.common.Pagination;
4	4	import com.takensoft.common.file.service.FileMngService;
5	5	import com.takensoft.common.file.vo.FileMngVO;
6	6	import com.takensoft.common.idgen.service.IdgenService;
7	7	import com.takensoft.common.util.JWTUtil;
8		-import com.takensoft.portal.invtDscsn.dao.InvtDscsnDAO;
9		-import com.takensoft.portal.invtDscsn.service.InvtDscsnService;
	8	+import com.takensoft.portal.ivstDscsn.dao.IvstDscsnDAO;
	9	+import com.takensoft.portal.ivstDscsn.service.IvstDscsnService;
10	10	import com.takensoft.portal.rvwMttr.service.RvwMttrService;
11	11	import lombok.RequiredArgsConstructor;
12	12	import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl;
...	...	@@ -23,13 +23,13 @@
23	23	*
24	24	* 투자상담 관련 구현체
25	25	* EgovAbstractServiceImpl : 전자정부 상속
26		- * InvtDscsnService : 투자상담 인터페이스 상속
	26	+ * IvstDscsnService : 투자상담 인터페이스 상속
27	27	*/
28		-@Service("invtDscsnService")
	28	+@Service("ivstDscsnService")
29	29	@RequiredArgsConstructor
30		-public class invtDscsnServiceImpl extends EgovAbstractServiceImpl implements InvtDscsnService {
31		- private final InvtDscsnDAO invtDscsnDAO;
32		- private final IdgenService invtDscsnIdgn;
	30	+public class IvstDscsnServiceImpl extends EgovAbstractServiceImpl implements IvstDscsnService {
	31	+ private final IvstDscsnDAO ivstDscsnDAO;
	32	+ private final IdgenService ivstDscsnIdgn;
33	33	private final FileMngService fileMngService;
34	34	private final RvwMttrService rvwMttrService;
35	35	private final JWTUtil jwtUtil;
...	...	@@ -42,10 +42,10 @@
42	42	*/
43	43	@Override
44	44	@Transactional
45		- public HashMap<String, Object> invtDscsnInsert(HashMap<String, Object> params, List<MultipartFile> multipartFileList) throws Exception {
	45	+ public HashMap<String, Object> ivstDscsnInsert(HashMap<String, Object> params, List<MultipartFile> multipartFileList) throws Exception {
46	46	// 투자상담 아이디 생성
47		- String invtDscsnId = invtDscsnIdgn.getNextStringId();
48		- params.put("invtDscsnId", invtDscsnId);
	47	+ String ivstDscsnId = ivstDscsnIdgn.getNextStringId();
	48	+ params.put("ivstDscsnId", ivstDscsnId);
49	49
50	50	// 작성자 생성
51	51	String writer = jwtUtil.getWriter();
...	...	@@ -71,9 +71,9 @@
71	71	}
72	72
73	73	// 기본정보 DB 등록
74		- int invtDscsnResult = invtDscsnDAO.invtDscsnInsert(params);
75		- result.put("invtDscsnId", invtDscsnId);
76		- result.put("result", invtDscsnResult);
	74	+ int ivstDscsnResult = ivstDscsnDAO.ivstDscsnInsert(params);
	75	+ result.put("ivstDscsnId", ivstDscsnId);
	76	+ result.put("result", ivstDscsnResult);
77	77
78	78	return result;
79	79	}
...	...	@@ -85,12 +85,12 @@
85	85	* 투자상담 목록 조회
86	86	*/
87	87	@Override
88		- public Map<String, Object> invtDscsnSelectList(Map<String, String> params) throws Exception {
	88	+ public Map<String, Object> ivstDscsnSelectList(Map<String, String> params) throws Exception {
89	89	Map<String, Object> result = new HashMap<>();
90	90	Pagination search = new Pagination(0, params);
91		- int cnt = invtDscsnDAO.invtDscsnSelectListCount(search);
	91	+ int cnt = ivstDscsnDAO.ivstDscsnSelectListCount(search);
92	92	Pagination pagination = new Pagination(cnt, params);
93		- List<HashMap<String, Object>> list = invtDscsnDAO.invtDscsnSelectList(pagination);
	93	+ List<HashMap<String, Object>> list = ivstDscsnDAO.ivstDscsnSelectList(pagination);
94	94
95	95	result.put("list", list);
96	96	result.put("pagination", pagination);
...	...	@@ -104,8 +104,8 @@
104	104	* 투자상담 상세 조회
105	105	*/
106	106	@Override
107		- public HashMap<String, Object> invtDscsnSelectOne(HashMap<String, Object> params) throws Exception {
108		- return invtDscsnDAO.invtDscsnSelectOne(params);
	107	+ public HashMap<String, Object> ivstDscsnSelectOne(HashMap<String, Object> params) throws Exception {
	108	+ return ivstDscsnDAO.ivstDscsnSelectOne(params);
109	109	}
110	110
111	111	/**
...	...	@@ -116,7 +116,7 @@
116	116	*/
117	117	@Override
118	118	@Transactional
119		- public int invtDscsnUpdate(HashMap<String, Object> params, List<HashMap<String, Object>> deleteFileList, List<MultipartFile> multipartFileList) throws Exception {
	119	+ public int ivstDscsnUpdate(HashMap<String, Object> params, List<HashMap<String, Object>> deleteFileList, List<MultipartFile> multipartFileList) throws Exception {
120	120	int result = 0;
121	121
122	122	// 수정자 생성
...	...	@@ -138,6 +138,7 @@
138	138	try {
139	139	HashMap<String, Object> fileMng = fileMngService.fileMngInsert(fileMngVO, multipartFileList);
140	140	result += (int)fileMng.get("fileMngResult");
	141	+ params.put("fileMngId", fileMng.get("fileMngId").toString());
141	142	} catch (IOException e) {
142	143	e.printStackTrace();
143	144	return result;
...	...	@@ -145,7 +146,7 @@
145	146	}
146	147
147	148	// 투자상담 수정
148		- result += invtDscsnDAO.invtDscsnUpdate(params);
	149	+ result += ivstDscsnDAO.ivstDscsnUpdate(params);
149	150
150	151	return result;
151	152	}
...	...	@@ -158,7 +159,7 @@
158	159	*/
159	160	@Override
160	161	@Transactional
161		- public int invtDscsnDelete(HashMap<String, Object> params) throws Exception {
	162	+ public int ivstDscsnDelete(HashMap<String, Object> params) throws Exception {
162	163	int result = 0;
163	164
164	165	// 수정자 생성
...	...	@@ -177,8 +178,8 @@
177	178	try {
178	179	Map<String, String> newParams = new HashMap<>();
179	180	newParams.put("isAllList", "yes");
180		- newParams.put("searchType", "invt_dscsn_id");
181		- newParams.put("searchText", params.get("invtDscsnId").toString());
	181	+ newParams.put("searchType", "ivst_dscsn_id");
	182	+ newParams.put("searchText", params.get("ivstDscsnId").toString());
182	183	Map<String, Object> rvwMttrSelectList = rvwMttrService.rvwMttrSelectList(newParams);
183	184	List<HashMap<String, Object>> rvwMttrList = (List<HashMap<String, Object>>) rvwMttrSelectList.get("list");
184	185	if (!rvwMttrList.isEmpty()) {
...	...	@@ -192,7 +193,7 @@
192	193	}
193	194
194	195	// 투자상담 삭제
195		- result += invtDscsnDAO.invtDscsnDelete(params);
	196	+ result += ivstDscsnDAO.ivstDscsnDelete(params);
196	197
197	198	return result;
198	199	}
...	...	@@ -203,7 +204,7 @@
203	204	*
204	205	* 투자상담 최근 1건 조회
205	206	*/
206		- public HashMap<String, Object> invtDscsnSelectOneByNew(HashMap<String, Object> params) throws Exception {
207		- return invtDscsnDAO.invtDscsnSelectOneByNew(params);
	207	+ public HashMap<String, Object> ivstDscsnSelectOneByNew(HashMap<String, Object> params) throws Exception {
	208	+ return ivstDscsnDAO.ivstDscsnSelectOneByNew(params);
208	209	}
209	210	} (파일 끝에 줄바꿈 문자 없음)

...	...	@@ -14,11 +14,19 @@
14	14	public interface RvwMttrPrgrsDAO {
15	15	/**
16	16	* @author 박정하
17		- * @since 2024.04.01
	17	+ * @since 2024.04.25
18	18	*
19	19	* 검토사항진행 등록
20	20	*/
21		- public int rvwMttrPrgrsUpsert(HashMap<String, Object> params) throws Exception;
	21	+ public int rvwMttrPrgrsInsert(HashMap<String, Object> params) throws Exception;
	22	+
	23	+ /**
	24	+ * @author 박정하
	25	+ * @since 2024.04.25
	26	+ *
	27	+ * 검토사항진행 수정
	28	+ */
	29	+ public int rvwMttrPrgrsUpdate(HashMap<String, Object> params) throws Exception;
22	30
23	31	/**
24	32	* @author 박정하

...	...	@@ -1,5 +1,6 @@
1	1	package com.takensoft.portal.rvwMttr.service.Impl;
2	2
	3	+import com.takensoft.common.util.JWTUtil;
3	4	import com.takensoft.portal.rvwMttr.dao.RvwMttrPrgrsDAO;
4	5	import com.takensoft.portal.rvwMttr.service.RvwMttrPrgrsService;
5	6	import lombok.RequiredArgsConstructor;
...	...	@@ -20,16 +21,41 @@
20	21	@RequiredArgsConstructor
21	22	public class RvwMttrPrgrsServiceImpl extends EgovAbstractServiceImpl implements RvwMttrPrgrsService {
22	23	private final RvwMttrPrgrsDAO rvwMttrPrgrsDAO;
	24	+ private final JWTUtil jwtUtil;
23	25
24	26	/**
25	27	* @author 박정하
26		- * @since 2024.03.29
	28	+ * @since 2024.04.25
27	29	*
28		- * 검토사항진행 업설트
	30	+ * 검토사항진행 등록
29	31	*/
30	32	@Override
31		- public int rvwMttrPrgrsUpsert(HashMap<String, Object> params) throws Exception {
32		- return rvwMttrPrgrsDAO.rvwMttrPrgrsUpsert(params);
	33	+ public int rvwMttrPrgrsInsert(HashMap<String, Object> params) throws Exception {
	34	+ return rvwMttrPrgrsDAO.rvwMttrPrgrsInsert(params);
	35	+ }
	36	+
	37	+ /**
	38	+ * @author 박정하
	39	+ * @since 2024.04.25
	40	+ *
	41	+ * 검토사항진행 수정
	42	+ */
	43	+ @Override
	44	+ public int rvwMttrPrgrsUpdate(List<HashMap<String, Object>> params) throws Exception {
	45	+ int result = 0;
	46	+
	47	+ for (HashMap<String, Object> param : params) {
	48	+ String writer = jwtUtil.getWriter();
	49	+ if (param.get("rvwMttrPrgrsId") != null) { // 검토사항 진행 아이디가 있는 경우 (수정)
	50	+ param.put("mdfr", writer);
	51	+ result += rvwMttrPrgrsDAO.rvwMttrPrgrsUpdate(param);
	52	+ } else { // 검토사항진행 아이디가 없는 경우 (추가)
	53	+ param.put("rgtr", writer);
	54	+ result += rvwMttrPrgrsDAO.rvwMttrPrgrsInsert(param);
	55	+ }
	56	+ }
	57	+
	58	+ return result;
33	59	}
34	60
35	61	/**

Delete comment

...	...	@@ -54,14 +54,9 @@
54	54	if (prgrsList != null && !prgrsList.isEmpty()) {
55	55	for (HashMap<String, Object> prgrs : prgrsList) {
56	56	try {
57		- // 검토사항 아이디 추가]
58	57	prgrs.put("rvwMttrId", rvwMttrId);
59		-
60		- // 작성자 생성
61	58	prgrs.put("rgtr", writer);
62		-
63		- // DB 등록
64		- prgrsResult += rvwMttrPrgrsService.rvwMttrPrgrsUpsert(prgrs);
	59	+ prgrsResult += rvwMttrPrgrsService.rvwMttrPrgrsInsert(prgrs);
65	60	} catch (Exception e) {
66	61	e.printStackTrace();
67	62	return result;
...	...	@@ -122,25 +117,14 @@
122	117	String writer = jwtUtil.getWriter();
123	118	params.put("mdfr", writer);
124	119
125		- // 검토사항진행 추가, 수정
	120	+ // 검토사항진행 수정
126	121	List<HashMap<String, Object>> prgrsList = (List<HashMap<String, Object>>) params.get("prgrsList");
127	122	if (!prgrsList.isEmpty()) {
128		- for (HashMap<String, Object> prgrs : prgrsList) {
129		- try {
130		- // 검토사항 아이디 추가
131		- if (prgrs.get("rgtr") == null) {
132		- prgrs.put("rgtr", writer);
133		- }
134		-
135		- // 수정자 아이디 추가
136		- prgrs.put("mdfr", writer);
137		-
138		- // DB 등록
139		- result += rvwMttrPrgrsService.rvwMttrPrgrsUpsert(prgrs);
140		- } catch (Exception e) {
141		- e.printStackTrace();
142		- return result;
143		- }
	123	+ try {
	124	+ result += rvwMttrPrgrsService.rvwMttrPrgrsUpdate(prgrsList);
	125	+ } catch (Exception e) {
	126	+ e.printStackTrace();
	127	+ return result;
144	128	}
145	129	}
146	130

...	...	@@ -11,11 +11,19 @@
11	11	public interface RvwMttrPrgrsService {
12	12	/**
13	13	* @author 박정하
14		- * @since 2024.03.29
	14	+ * @since 2024.04.25
15	15	*
16	16	* 검토사항진행 등록
17	17	*/
18		- public int rvwMttrPrgrsUpsert(HashMap<String, Object> params) throws Exception;
	18	+ public int rvwMttrPrgrsInsert(HashMap<String, Object> params) throws Exception;
	19	+
	20	+ /**
	21	+ * @author 박정하
	22	+ * @since 2024.04.25
	23	+ *
	24	+ * 검토사항진행 수정
	25	+ */
	26	+ public int rvwMttrPrgrsUpdate(List<HashMap<String, Object>> params) throws Exception;
19	27
20	28	/**
21	29	* @author 박정하

...	...	@@ -11,8 +11,7 @@
11	11	@Data
12	12	public class RvwMttrVO {
13	13	private String RvwMttrId; // 검토사항 아이디
14		- private String invtDscsnId; // 투자상담 아이디
15		- private String ttl; // 투자상담 명
	14	+ private String ivstDscsnId; // 투자상담 아이디
16	15	private String type; // 유형
17	16	private String clr; // 접수자
18	17	private String rcptDt; // 접수일

...	...	@@ -9,7 +9,7 @@
9	9	<result property="maskNm" column="mask_nm" />
10	10	<result property="fileType" column="file_type" />
11	11	<result property="absltPath" column="abslt_path" />
12		- <result property="prttnPath" column="prttn_path" />
	12	+ <result property="partPath" column="part_path" />
13	13	<result property="extnNm" column="extn_nm" />
14	14	<result property="fileSz" column="file_sz" />
15	15	<result property="rgtr" column="rgtr" />
...	...	@@ -23,25 +23,23 @@
23	23	-->
24	24	<insert id="fileInsert" parameterType="HashMap">
25	25	INSERT INTO cmmn_file (
26		- file_id
27		- , file_mng_id
	26	+ file_mng_id
28	27	, file_nm
29	28	, mask_nm
30	29	, file_type
31	30	, abslt_path
32		- , prttn_path
	31	+ , part_path
33	32	, extn_nm
34	33	, file_sz
35	34	, rgtr
36	35	, reg_dt
37		- ) VALUE (
38		- #{fileId}
39		- , #{fileMngId}
	36	+ ) VALUES (
	37	+ #{fileMngId}
40	38	, #{fileNm}
41	39	, #{maskNm}
42	40	, #{fileType}
43	41	, #{absltPath}
44		- , #{prttnPath}
	42	+ , #{partPath}
45	43	, #{extnNm}
46	44	, #{fileSz}
47	45	, #{rgtr}
...	...	@@ -61,7 +59,7 @@
61	59	, mask_nm
62	60	, file_type
63	61	, abslt_path
64		- , prttn_path
	62	+ , part_path
65	63	, extn_nm
66	64	, file_sz
67	65	, rgtr

...	...	@@ -11,7 +11,7 @@
11	11	file_mng_id
12	12	, rgtr
13	13	, reg_dt
14		- ) VALUE (
	14	+ ) VALUES (
15	15	#{fileMngId}
16	16	, #{rgtr}
17	17	, now()

...	...	@@ -59,9 +59,9 @@
59	59	, expsr_yn
60	60	, use_yn
61	61	, rgtr
62		- , DATE_FORMAT(reg_dt, '%Y-%m-%d %H:%i') AS reg_dt
	62	+ , to_char(reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
63	63	, mdfr
64		- , DATE_FORMAT(mdfcn_dt, '%Y-%m-%d %H:%i') AS mdfcn_dt
	64	+ , to_char(mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
65	65	FROM conts_type_mng
66	66	</sql>
67	67
...	...	@@ -93,7 +93,7 @@
93	93	WHERE use_yn = 'Y'
94	94	<include refid="selectRequirement" />
95	95	ORDER BY conts_id DESC
96		- LIMIT #{limitStart}, #{recordSize}
	96	+ OFFSET #{limitStart} LIMIT #{recordSize}
97	97	</select>
98	98
99	99	<!--

...	...	@@ -40,7 +40,7 @@
40	40	, use_yn
41	41	, aplcnt_ip
42	42	, reg_dt
43		- ) VALUE (
	43	+ ) VALUES (
44	44	#{entDscsnAplyId}
45	45	, #{entNm}
46	46	, #{aplcntNm}
...	...	@@ -49,7 +49,7 @@
49	49	, #{aplyCn}
50	50	, #{fileMngId}
51	51	, #{actnPic}
52		- , #{actnDt}
	52	+ , #{actnDt}::timestamp
53	53	, #{rmrk}
54	54	, 'N'
55	55	, 'Y'
...	...	@@ -79,17 +79,17 @@
79	79	, aply_cn
80	80	, file_mng_id
81	81	, actn_pic
82		- , DATE_FORMAT(actn_dt, '%Y-%m-%d') AS actn_dt
	82	+ , to_char(actn_dt, 'YYYY-MM-DD HH24:MI') AS actn_dt
83	83	, rmrk
84	84	, prcs_stts
85	85	, use_yn
86	86	, aplcnt_ip
87		- , DATE_FORMAT(reg_dt, '%Y-%m-%d %H:%i') AS reg_dt
	87	+ , to_char(reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
88	88	FROM ent_dscsn_aply
89	89	WHERE use_yn = 'Y'
90	90	<include refid="selectRequirement" />
91	91	ORDER BY reg_dt DESC
92		- LIMIT #{limitStart}, #{recordSize}
	92	+ OFFSET #{limitStart} LIMIT #{recordSize}
93	93	</select>
94	94
95	95	<!--
...	...	@@ -118,12 +118,12 @@
118	118	, aply_cn
119	119	, file_mng_id
120	120	, actn_pic
121		- , DATE_FORMAT(actn_dt, '%Y-%m-%d %H:%i') AS actn_dt
	121	+ , to_char(actn_dt, 'YYYY-MM-DD HH24:MI') AS actn_dt
122	122	, rmrk
123	123	, prcs_stts
124	124	, use_yn
125	125	, aplcnt_ip
126		- , DATE_FORMAT(reg_dt, '%Y-%m-%d %H:%i') AS reg_dt
	126	+ , to_char(reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
127	127	FROM ent_dscsn_aply
128	128	WHERE use_yn = 'Y'
129	129	AND ent_dscsn_aply_id = #{entDscsnAplyId}
...	...	@@ -137,11 +137,10 @@
137	137	<update id="entDscsnAplyUpdate" parameterType="HashMap">
138	138	UPDATE ent_dscsn_aply
139	139	SET actn_pic = #{actnPic},
140		- actn_dt = #{actnDt},
	140	+ actn_dt = now(),
141	141	rmrk = #{rmrk},
142	142	prcs_stts = #{prcsStts}
143		- WHERE
144		- ent_dscsn_aply_id = #{entDscsnAplyId}
	143	+ WHERE ent_dscsn_aply_id = #{entDscsnAplyId}
145	144	</update>
146	145
147	146	<!--
...	...	@@ -149,12 +148,11 @@
149	148	작　성　일 : 2024.04.04
150	149	내　　　용 : 기업상담신청 1시간 이내 동일 아이피 등록 개수
151	150	-->
152		- <select id="entDscsnAplyCountByOneHourWriteSameIp" parameterType="HashMap" resultType="HashMap">
153		- SELECT IFNULL(count(0), 0) AS writeCount,
154		- IFNULL(MAX(reg_dt), 0) AS lastDatetime
155		- FROM ent_dscsn_aply
156		- WHERE aplcnt_ip = #{aplcntIp}
157		- AND reg_dt > DATE_ADD(now(), INTERVAL - 1 HOUR)
158		- ORDER BY reg_dt DESC
	151	+ <select id="entDscsnAplyCountByOneHourWriteSameIp" parameterType="string" resultType="HashMap">
	152	+ SELECT COALESCE(count(0), 0) AS writecount,
	153	+ '1 HOUR'::interval - (now() - MIN(reg_dt)) AS lastdatetime
	154	+ FROM ent_dscsn_aply
	155	+ WHERE aplcnt_ip = #{aplcntIp}
	156	+ AND reg_dt > now() - '1 HOUR'::interval
159	157	</select>
160	158	</mapper> (파일 끝에 줄바꿈 문자 없음)

...	...	@@ -36,8 +36,8 @@
36	36	, clsbiz_yn
37	37	, use_yn
38	38	, rgtr
39		- , reg_dt
40		- ) VALUE (
	39	+ , reg_dt
	40	+ ) VALUES (
41	41	#{entId}
42	42	, #{entNm}
43	43	, #{brno}
...	...	@@ -48,7 +48,7 @@
48	48	, #{clsbizYn}
49	49	, 'Y'
50	50	, #{rgtr}
51		- , now()
	51	+ , now()::timestamp
52	52	)
53	53	</insert>
54	54
...	...	@@ -108,16 +108,16 @@
108	108	, mdfr
109	109	, mdfcn_dt
110	110	, (SELECT mvn_inten
111		- FROM invt_dscsn
	111	+ FROM ivst_dscsn
112	112	WHERE use_yn = 'Y'
113		- AND ent_info.ent_id = invt_dscsn.ent_id
	113	+ AND ent_info.ent_id = ivst_dscsn.ent_id
114	114	ORDER BY reg_dt DESC
115	115	LIMIT 1 ) AS mvn_inten
116	116	FROM ent_info
117	117	WHERE use_yn = 'Y'
118	118	<include refid="selectRequirement" />
119	119	ORDER BY ent_id DESC
120		- LIMIT #{limitStart}, #{recordSize}
	120	+ OFFSET #{limitStart} LIMIT #{recordSize}
121	121	</select>
122	122
123	123	<!--
...	...	@@ -126,12 +126,9 @@
126	126	내용 : 기업정보 목록 총 개수 조회
127	127	-->
128	128	<select id="entInfoSelectListCount" resultType="int">
129		- SELECT
130		- count(*)
131		- FROM
132		- ent_info
133		- WHERE
134		- use_yn = 'Y'
	129	+ SELECT count(*)
	130	+ FROM ent_info
	131	+ WHERE use_yn = 'Y'
135	132	<include refid="selectRequirement" />
136	133	</select>
137	134
...	...	@@ -151,9 +148,9 @@
151	148	, ei.clsbiz_yn
152	149	, ei.use_yn
153	150	, ei.rgtr
154		- , DATE_FORMAT(ei.reg_dt, '%Y-%m-%d %H:%i') AS reg_dt
	151	+ , to_char(ei.reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
155	152	, ei.mdfr
156		- , DATE_FORMAT(ei.mdfcn_dt, '%Y-%m-%d %H:%i') AS mdfcn_dt
	153	+ , to_char(ei.mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
157	154	FROM ent_info AS ei
158	155	WHERE ei.use_yn = 'Y'
159	156	AND ei.ent_id = #{entId}

...	...	@@ -1,14 +1,14 @@
1	1	<?xml version="1.0" encoding="UTF-8"?>
2	2	<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3		-<mapper namespace="com.takensoft.portal.entInfo.dao.FnlttDAO">
	3	+<mapper namespace="com.takensoft.portal.entInfo.dao.FnstmDAO">
4	4	<!-- 재무제표 resultMap -->
5		- <resultMap id="fnlttMap" type="HashMap">
6		- <result property="fnlttId" column="fnltt_id" />
	5	+ <resultMap id="fnstmMap" type="HashMap">
	6	+ <result property="fnstmId" column="fnstm_id" />
7	7	<result property="entId" column="ent_id" />
8	8	<result property="yr" column="yr" />
9	9	<result property="slsAmt" column="sls_amt" />
10		- <result property="bsnPrfts" column="bsn_prfts" />
11		- <result property="netIncome" column="net_income" />
	10	+ <result property="salsPrf" column="sals_prf" />
	11	+ <result property="thtmNetpf" column="thtm_netpf" />
12	12	<result property="useYn" column="use_yn" />
13	13	<result property="rgtr" column="rgtr" />
14	14	<result property="regDt" column="reg_dt" />
...	...	@@ -18,45 +18,46 @@
18	18
19	19	<!--
20	20	작　성　자 : 박정하
21		- 작　성　일 : 2024.04.12
22		- 내　　　용 : 재무제표 업설트
	21	+ 작　성　일 : 2024.04.25
	22	+ 내　　　용 : 재무제표 등록
23	23	-->
24		- <update id="fnlttUpsert" parameterType="fnlttVO">
25		- INSERT INTO fnltt (
26		- fnltt_id
27		- , ent_id
	24	+ <insert id="fnstmInsert" parameterType="FnstmVO">
	25	+ INSERT INTO fnstm (
	26	+ ent_id
28	27	, yr
29	28	, sls_amt
30		- , bsn_prfts
31		- , net_income
	29	+ , sals_prf
	30	+ , thtm_netpf
32	31	, use_yn
33	32	, rgtr
34	33	, reg_dt
35		- , mdfr
36		- , mdfcn_dt
37	34	) VALUES (
38		- #{fnlttId}
39		- , #{entId}
	35	+ #{entId}
40	36	, #{yr}
41	37	, #{slsAmt}
42		- , #{bsnPrfts}
43		- , #{netIncome}
44		- , #{useYn}
	38	+ , #{salsPrf}
	39	+ , #{thtmNetpf}
	40	+ , 'Y'
45	41	, #{rgtr}
46	42	, now()
47		- , null
48		- , null
49		- ) ON DUPLICATE KEY UPDATE
50		- ent_id = #{entId}
51		- , yr = #{yr}
52		- , sls_amt = #{slsAmt}
53		- , bsn_prfts = #{bsnPrfts}
54		- , net_income = #{netIncome}
55		- , use_yn = #{useYn}
56		- , rgtr = #{rgtr}
57		- , reg_dt = #{regDt}
58		- , mdfr = #{mdfr}
59		- , mdfcn_dt = now()
	43	+ )
	44	+ </insert>
	45	+
	46	+ <!--
	47	+ 작　성　자 : 박정하
	48	+ 작　성　일 : 2024.04.25
	49	+ 내　　　용 : 재무제표 수정
	50	+ -->
	51	+ <update id="fnstmUpdate" parameterType="FnstmVO">
	52	+ UPDATE fnstm
	53	+ SET yr = #{yr}
	54	+ , sls_amt = #{slsAmt}
	55	+ , sals_prf = #{salsPrf}
	56	+ , thtm_netpf = #{thtmNetpf}
	57	+ , use_yn = #{useYn}
	58	+ , mdfr = #{mdfr}
	59	+ , mdfcn_dt = now()
	60	+ WHERE fnstm_id = #{fnstmId}
60	61	</update>
61	62
62	63	<!--
...	...	@@ -64,22 +65,22 @@
64	65	작　성　일 : 2024.03.21
65	66	내　　　용 : 재무제표 목록 조회
66	67	-->
67		- <select id="fnlttSelectList" resultMap="fnlttMap">
68		- SELECT f.fnltt_id
	68	+ <select id="fnstmSelectList" resultMap="fnstmMap">
	69	+ SELECT f.fnstm_id
69	70	, f.ent_id
70	71	, f.yr
71	72	, f.sls_amt
72		- , f.bsn_prfts
73		- , f.net_income
	73	+ , f.sals_prf
	74	+ , f.thtm_netpf
74	75	, f.use_yn
75	76	, f.rgtr
76	77	, f.reg_dt
77	78	, f.mdfr
78	79	, f.mdfcn_dt
79		- FROM fnltt AS f
	80	+ FROM fnstm AS f
80	81	WHERE f.use_yn = 'Y'
81	82	AND f.ent_id = #{entId}
82		- ORDER BY f.yr DESC
	83	+ ORDER BY f.reg_dt DESC
83	84	</select>
84	85
85	86	<!--
...	...	@@ -87,11 +88,11 @@
87	88	작　성　일 : 2024.03.22
88	89	내　　　용 : 재무제표 삭제
89	90	-->
90		- <update id="fnlttDelete" parameterType="fnlttVO">
91		- UPDATE fnltt
	91	+ <update id="fnstmDelete" parameterType="fnstmVO">
	92	+ UPDATE fnstm
92	93	SET use_yn = 'N',
93	94	mdfr = #{mdfr},
94	95	mdfcn_dt = now()
95		- WHERE fnltt_id = #{fnlttId}
	96	+ WHERE fnstm_id = #{fnstmId}
96	97	</update>
97	98	</mapper> (파일 끝에 줄바꿈 문자 없음)

...	...	@@ -1,22 +1,22 @@
1	1	<?xml version="1.0" encoding="UTF-8"?>
2	2	<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3		-<mapper namespace="com.takensoft.portal.invtDscsn.dao.InvtDscsnDAO">
	3	+<mapper namespace="com.takensoft.portal.ivstDscsn.dao.IvstDscsnDAO">
4	4	<!-- 재무제표 resultMap -->
5		- <resultMap id="invtDscsnMap" type="HashMap">
6		- <result property="invtDscsnId" column="invt_dscsn_id" />
	5	+ <resultMap id="ivstDscsnMap" type="HashMap">
	6	+ <result property="ivstDscsnId" column="ivst_dscsn_id" />
7	7	<result property="entId" column="ent_id" />
8	8	<result property="entNm" column="ent_nm" />
9	9	<result property="ttl" column="ttl" />
10	10	<result property="dt" column="dt" />
11	11	<result property="plc" column="plc" />
12	12	<result property="prtpnt" column="prtpnt" />
13		- <result property="dscsnPbsvnt" column="dscsn_pbsvnt" />
	13	+ <result property="dscsnPbofc" column="dscsn_pbofc" />
14	14	<result property="mainCn" column="main_cn" />
15	15	<result property="fileMngId" column="file_mng_id" />
16	16	<result property="mvnInten" column="mvn_inten" />
17		- <result property="invtInten" column="invt_inten" />
	17	+ <result property="ivstInten" column="ivst_inten" />
18	18	<result property="mouInten" column="mou_inten" />
19		- <result property="invtDscsnInten" column="invt_dscsn_inten" />
	19	+ <result property="ivstDscsnInten" column="ivst_dscsn_inten" />
20	20	<result property="useYn" column="use_yn" />
21	21	<result property="rgtr" column="rgtr" />
22	22	<result property="regDt" column="reg_dt" />
...	...	@@ -29,38 +29,38 @@
29	29	작성일자 : 2024-03-20
30	30	내용 : 재무제표 등록
31	31	-->
32		- <insert id="invtDscsnInsert" parameterType="HashMap">
33		- INSERT INTO invt_dscsn (
34		- invt_dscsn_id
	32	+ <insert id="ivstDscsnInsert" parameterType="HashMap">
	33	+ INSERT INTO ivst_dscsn (
	34	+ ivst_dscsn_id
35	35	, ent_id
36	36	, ttl
37	37	, dt
38	38	, plc
39	39	, prtpnt
40		- , dscsn_pbsvnt
	40	+ , dscsn_pbofc
41	41	, main_cn
42	42	, file_mng_id
43	43	, mvn_inten
44		- , invt_inten
	44	+ , ivst_inten
45	45	, mou_inten
46		- , invt_dscsn_inten
	46	+ , ivst_dscsn_inten
47	47	, use_yn
48	48	, rgtr
49	49	, reg_dt
50		- ) VALUE (
51		- #{invtDscsnId}
	50	+ ) VALUES (
	51	+ #{ivstDscsnId}
52	52	, #{entId}
53	53	, #{ttl}
54		- , #{dt}
	54	+ , #{dt}::timestamp
55	55	, #{plc}
56	56	, #{prtpnt}
57		- , #{dscsnPbsvnt}
	57	+ , #{dscsnPbofc}
58	58	, #{mainCn}
59	59	, #{fileMngId}
60	60	, #{mvnInten}
61		- , #{invtInten}
	61	+ , #{ivstInten}
62	62	, #{mouInten}
63		- , #{invtDscsnInten}
	63	+ , #{ivstDscsnInten}
64	64	, 'Y'
65	65	, #{rgtr}
66	66	, now()
...	...	@@ -72,6 +72,9 @@
72	72	<if test="searchText != null and searchText != ''">
73	73	<choose>
74	74	<when test="searchType != null and searchType != ''">
	75	+ <if test="searchType == 'entId'">
	76	+ AND ei.ent_id = #{searchText}
	77	+ </if>
75	78	<if test="searchType == 'ent_id'">
76	79	AND ei.ent_id = #{searchText}
77	80	</if>
...	...	@@ -98,34 +101,34 @@
98	101	작성일자 : 2024-03-26
99	102	내용 : 투자상담 조회
100	103	-->
101		- <select id="invtDscsnSelectList" resultMap="invtDscsnMap">
102		- SELECT id.invt_dscsn_id
	104	+ <select id="ivstDscsnSelectList" resultMap="ivstDscsnMap">
	105	+ SELECT id.ivst_dscsn_id
103	106	, ei.ent_nm
104	107	, id.ent_id
105	108	, id.ttl
106	109	, id.dt
107	110	, id.plc
108	111	, id.prtpnt
109		- , id.dscsn_pbsvnt
	112	+ , id.dscsn_pbofc
110	113	, id.main_cn
111	114	, id.file_mng_id
112	115	, id.mvn_inten
113		- , id.invt_inten
	116	+ , id.ivst_inten
114	117	, id.mou_inten
115		- , id.invt_dscsn_inten
	118	+ , id.ivst_dscsn_inten
116	119	, id.use_yn
117	120	, id.rgtr
118		- , DATE_FORMAT(id.reg_dt, '%Y-%m-%d %H:%i') AS reg_dt
	121	+ , to_char(id.reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
119	122	, id.mdfr
120		- , DATE_FORMAT(id.mdfcn_dt, '%Y-%m-%d %H:%i') AS mdfcn_dt
121		- FROM invt_dscsn AS id
	123	+ , to_char(id.mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
	124	+ FROM ivst_dscsn AS id
122	125	LEFT JOIN ent_info AS ei
123	126	ON id.ent_id = ei.ent_id
124	127	WHERE id.use_yn = 'Y'
125	128	<include refid="selectRequirement" />
126	129	ORDER BY id.reg_dt DESC
127	130	<if test="searchType != 'ent_id'">
128		- LIMIT #{limitStart}, #{recordSize}
	131	+ OFFSET #{limitStart} LIMIT #{recordSize}
129	132	</if>
130	133	</select>
131	134
...	...	@@ -134,9 +137,9 @@
134	137	작성일자 : 2024-03-26
135	138	내용 : 투자상담 목록 총 개수 조회
136	139	-->
137		- <select id="invtDscsnSelectListCount" resultType="int">
	140	+ <select id="ivstDscsnSelectListCount" resultType="int">
138	141	SELECT count(*)
139		- FROM invt_dscsn AS id
	142	+ FROM ivst_dscsn AS id
140	143	LEFT JOIN ent_info AS ei
141	144	ON id.ent_id = ei.ent_id
142	145	WHERE id.use_yn = 'Y'
...	...	@@ -148,31 +151,31 @@
148	151	작　성　일 : 2024.03.26
149	152	내　　　용 : 투자상담 상세 조회
150	153	-->
151		- <select id="invtDscsnSelectOne" parameterType="HashMap" resultMap="invtDscsnMap">
152		- SELECT id.invt_dscsn_id
	154	+ <select id="ivstDscsnSelectOne" parameterType="HashMap" resultMap="ivstDscsnMap">
	155	+ SELECT id.ivst_dscsn_id
153	156	, id.ent_id
154	157	, ei.ent_nm
155	158	, id.ttl
156		- , DATE_FORMAT(id.dt, '%Y-%m-%d') AS dt
	159	+ , to_char(id.dt, 'YYYY-MM-DD HH24:MI') AS dt
157	160	, id.plc
158	161	, id.prtpnt
159		- , id.dscsn_pbsvnt
	162	+ , id.dscsn_pbofc
160	163	, id.main_cn
161	164	, id.file_mng_id
162	165	, id.mvn_inten
163		- , id.invt_inten
	166	+ , id.ivst_inten
164	167	, id.mou_inten
165		- , id.invt_dscsn_inten
	168	+ , id.ivst_dscsn_inten
166	169	, id.use_yn
167	170	, id.rgtr
168		- , DATE_FORMAT(id.reg_dt, '%Y-%m-%d %H:%i') AS reg_dt
	171	+ , to_char(id.reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
169	172	, id.mdfr
170		- , DATE_FORMAT(id.mdfcn_dt, '%Y-%m-%d %H:%i') AS mdfcn_dt
171		- FROM invt_dscsn AS id
	173	+ , to_char(id.mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
	174	+ FROM ivst_dscsn AS id
172	175	LEFT JOIN ent_info AS ei
173	176	ON id.ent_id = ei.ent_id
174	177	WHERE id.use_yn = 'Y'
175		- AND id.invt_dscsn_id = #{invtDscsnId}
	178	+ AND id.ivst_dscsn_id = #{ivstDscsnId}
176	179	</select>
177	180
178	181	<!--
...	...	@@ -180,26 +183,23 @@
180	183	작성일자 : 2024-03-27
181	184	내용 : 투자상담 수정
182	185	-->
183		- <update id="invtDscsnUpdate" parameterType="HashMap">
184		- UPDATE invt_dscsn
185		- SET ent_id = #{entId}
186		- , ttl = #{ttl}
187		- , dt = #{dt}
	186	+ <update id="ivstDscsnUpdate" parameterType="HashMap">
	187	+ UPDATE ivst_dscsn
	188	+ SET ttl = #{ttl}
	189	+ , dt = #{dt}::timestamp
188	190	, plc = #{plc}
189	191	, prtpnt = #{prtpnt}
190		- , dscsn_pbsvnt = #{dscsnPbsvnt}
	192	+ , dscsn_pbofc = #{dscsnPbofc}
191	193	, main_cn = #{mainCn}
192	194	, file_mng_id = #{fileMngId}
193	195	, mvn_inten = #{mvnInten}
194		- , invt_inten = #{invtInten}
	196	+ , ivst_inten = #{ivstInten}
195	197	, mou_inten = #{mouInten}
196		- , invt_dscsn_inten = #{invtDscsnInten}
	198	+ , ivst_dscsn_inten = #{ivstDscsnInten}
197	199	, use_yn = #{useYn}
198		- , rgtr = #{rgtr}
199		- , reg_dt = #{regDt}
200	200	, mdfr = #{mdfr}
201	201	, mdfcn_dt = now()
202		- WHERE invt_dscsn_id = #{invtDscsnId}
	202	+ WHERE ivst_dscsn_id = #{ivstDscsnId}
203	203	</update>
204	204
205	205	<!--
...	...	@@ -207,11 +207,11 @@
207	207	작성일자 : 2024-03-27
208	208	내용 : 투자상담 삭제
209	209	-->
210		- <update id="invtDscsnDelete" parameterType="HashMap">
211		- UPDATE invt_dscsn
	210	+ <update id="ivstDscsnDelete" parameterType="HashMap">
	211	+ UPDATE ivst_dscsn
212	212	SET use_yn = 'N'
213	213	, file_mng_id = null
214		- WHERE invt_dscsn_id = #{invtDscsnId}
	214	+ WHERE ivst_dscsn_id = #{ivstDscsnId}
215	215	</update>
216	216
217	217	<!--
...	...	@@ -219,26 +219,26 @@
219	219	작성일자 : 2024-03-28
220	220	내용 : 투자상담 최근 1건 조회
221	221	-->
222		- <select id="invtDscsnSelectOneByNew" parameterType="HashMap" resultMap="invtDscsnMap">
223		- SELECT id.invt_dscsn_id
	222	+ <select id="ivstDscsnSelectOneByNew" parameterType="HashMap" resultMap="ivstDscsnMap">
	223	+ SELECT id.ivst_dscsn_id
224	224	, id.ent_id
225	225	, id.ttl
226	226	, id.dt
227	227	, id.plc
228	228	, id.prtpnt
229		- , id.dscsn_pbsvnt
	229	+ , id.dscsn_pbofc
230	230	, id.main_cn
231	231	, id.file_mng_id
232	232	, id.mvn_inten
233		- , id.invt_inten
	233	+ , id.ivst_inten
234	234	, id.mou_inten
235		- , id.invt_dscsn_inten
	235	+ , id.ivst_dscsn_inten
236	236	, id.use_yn
237	237	, id.rgtr
238	238	, id.reg_dt
239	239	, id.mdfr
240	240	, id.mdfcn_dt
241		- from invt_dscsn AS id
	241	+ from ivst_dscsn AS id
242	242	where id.use_yn = 'Y'
243	243	AND id.ent_id = #{entId}
244	244	order by id.reg_dt DESC