# Conflicts:
#	egovframe-template-simple-backend-contribution/simpleHomePage.iml
cks
강석 최 2023-10-12 17:10:52 +09:00
commit 40768fa511
15 changed files with 126 additions and 17165 deletions

8
.idea/.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
# Default ignored files
/shelf/
/workspace.xml
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
# Editor-based HTTP Client requests
/httpRequests/

9
.idea/kcscDev.iml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

8
.idea/modules.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/kcscDev.iml" filepath="$PROJECT_DIR$/.idea/kcscDev.iml" />
</modules>
</component>
</project>

6
.idea/vcs.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

View File

@ -28,6 +28,7 @@ Docs/
# Setting Files #
.idea/
*.iml
.settings/
.project
.classpath

View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="AdditionalModuleElements">
<content url="file://$MODULE_DIR$" dumb="true">
<excludeFolder url="file://$MODULE_DIR$/log" />
</content>
</component>
<component name="FacetManager">
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<setting name="provider-name" value="Hibernate" />
<datasource-mapping />
<naming-strategy-map />
</configuration>
</facet>
</component>
</module>

View File

@ -44,6 +44,8 @@ public class StandardCodeController {
@Resource(name = "EgovFileMngService")
private EgovFileMngService fileMngService;*/
/*///*/
/**
* .

View File

@ -1,6 +1,7 @@
package egovframework.let.cop.bbs.service;
import java.io.Serializable;
import java.math.BigDecimal;
import lombok.Getter;
import lombok.Setter;
@ -69,7 +70,7 @@ public class BoardMaster implements Serializable {
private int posblAtchFileNumber = 0;
@Schema(description = "첨부가능파일사이즈")
private String posblAtchFileSize = "";
private BigDecimal posblAtchFileSize = BigDecimal.ZERO;
@Schema(description = "답장가능여부")
private String replyPosblAt = "";

View File

@ -1,5 +1,6 @@
package egovframework.let.cop.bbs.web;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -220,7 +221,11 @@ public class EgovBBSAttributeManageApiController {
boardMasterVO.setFrstRegisterId(loginVO.getUniqId());
boardMasterVO.setUseAt("Y");
boardMasterVO.setTrgetId("SYSTEMDEFAULT_REGIST");
boardMasterVO.setPosblAtchFileSize(propertyService.getString("posblAtchFileSize"));
System.out.println("@@@ G posblAtchFileSize : " + propertyService.getString("Globals.posblAtchFileSize"));
BigDecimal numericValue = new BigDecimal(propertyService.getString("Globals.posblAtchFileSize"));
boardMasterVO.setPosblAtchFileSize(numericValue);
bbsAttrbService.insertBBSMastetInf(boardMasterVO);
@ -275,7 +280,8 @@ public class EgovBBSAttributeManageApiController {
}
boardMasterVO.setLastUpdusrId(loginVO.getUniqId());
boardMasterVO.setPosblAtchFileSize(propertyService.getString("posblAtchFileSize"));
BigDecimal numericValue = new BigDecimal(propertyService.getString("Globals.posblAtchFileSize"));
boardMasterVO.setPosblAtchFileSize(numericValue);
bbsAttrbService.updateBBSMasterInf(boardMasterVO);
resultVO.setResult(resultMap);

View File

@ -50,7 +50,7 @@
INSERT INTO LETTNFILE
(ATCH_FILE_ID, CREAT_DT, USE_AT)
VALUES
( #{atchFileId}, SYSDATE(), 'Y')
( #{atchFileId}, now(), 'Y')
</insert>
@ -77,7 +77,7 @@
<select id="FileManageDAO.getMaxFileSN" parameterType="FileVO" resultType="java.lang.Integer">
SELECT IFNULL(MAX(FILE_SN),0)+1 AS FILE_SN
SELECT COALESCE(MAX(FILE_SN),0)+1 AS FILE_SN
FROM LETTNFILEDETAIL
WHERE ATCH_FILE_ID = #{atchFileId}

View File

@ -53,7 +53,7 @@
VALUES
( #{bbsId}, #{bbsTyCode}, #{bbsAttrbCode}, #{bbsNm}, #{bbsIntrcn},
#{replyPosblAt}, #{fileAtchPosblAt}, #{posblAtchFileNumber},
#{posblAtchFileSize}, #{tmplatId}, #{useAt}, #{frstRegisterId}, SYSDATE()
#{posblAtchFileSize}, #{tmplatId}, #{useAt}, #{frstRegisterId}, now()
)
</insert>
@ -64,7 +64,7 @@
a.BBS_ID, a.BBS_TY_CODE, b.CODE_NM as BBS_TY_CODE_NM,
a.BBS_ATTRB_CODE, c.CODE_NM as BBS_ATTRB_CODE_NM, a.BBS_NM,
a.TMPLAT_ID, a.USE_AT,
DATE_FORMAT(a.FRST_REGIST_PNTTM, '%Y-%m-%d') as FRST_REGIST_PNTTM
to_char(a.FRST_REGIST_PNTTM, 'YYYY-MM-DD') as FRST_REGIST_PNTTM
FROM
LETTNBBSMASTER a
LEFT OUTER JOIN
@ -126,8 +126,8 @@
a.BBS_ATTRB_CODE, c.CODE_NM as BBS_ATTRB_CODE_NM, a.BBS_NM,
a.TMPLAT_ID, a.FILE_ATCH_POSBL_AT, a.ATCH_POSBL_FILE_NUMBER,
a.ATCH_POSBL_FILE_SIZE, a.REPLY_POSBL_AT, a.FRST_REGISTER_ID, e.USER_NM as FRST_REGISTER_NM,
a.USE_AT, f.USE_AT as BBS_USE_FLAG, DATE_FORMAT(a.FRST_REGIST_PNTTM, '%Y-%m-%d') as FRST_REGIST_PNTTM
,(SELECT IFNULL(USE_AT,'N') FROM LETTNBBSUSE
a.USE_AT, f.USE_AT as BBS_USE_FLAG, to_char(a.FRST_REGIST_PNTTM, 'YYYY-MM-DD') as FRST_REGIST_PNTTM
,(SELECT COALESCE(USE_AT,'N') FROM LETTNBBSUSE
WHERE BBS_ID = #{bbsId}
AND TRGET_ID IN (#{uniqId}, 'SYSTEM_DEFAULT_BOARD')
) as AUTH_FLAG
@ -157,7 +157,7 @@
ATCH_POSBL_FILE_SIZE = #{posblAtchFileSize},
TMPLAT_ID = #{tmplatId},
LAST_UPDUSR_ID = #{lastUpdusrId},
LAST_UPDT_PNTTM = SYSDATE()
LAST_UPDT_PNTTM = now()
WHERE BBS_ID = #{bbsId}
</update>
@ -167,7 +167,7 @@
UPDATE LETTNBBSMASTER SET
USE_AT = 'N',
LAST_UPDUSR_ID = #{lastUpdusrId},
LAST_UPDT_PNTTM = SYSDATE()
LAST_UPDT_PNTTM = now()
WHERE BBS_ID = #{bbsId}
</update>
@ -204,7 +204,7 @@
a.BBS_ID, a.BBS_TY_CODE, b.CODE_NM as BBS_TY_CODE_NM,
a.BBS_ATTRB_CODE, c.CODE_NM as BBS_ATTRB_CODE_NM, a.BBS_NM,
a.TMPLAT_ID, a.USE_AT,
DATE_FORMAT(a.FRST_REGIST_PNTTM, '%Y-%m-%d') as FRST_REGIST_PNTTM
to_char(a.FRST_REGIST_PNTTM, 'YYYY-MM-DD') as FRST_REGIST_PNTTM
FROM
LETTNBBSMASTER a
LEFT OUTER JOIN
@ -267,7 +267,7 @@
a.BBS_ID, a.BBS_TY_CODE, b.CODE_NM as BBS_TY_CODE_NM,
a.BBS_ATTRB_CODE, c.CODE_NM as BBS_ATTRB_CODE_NM, a.BBS_NM,
a.TMPLAT_ID, a.USE_AT,
DATE_FORMAT(a.FRST_REGIST_PNTTM, '%Y-%m-%d') as FRST_REGIST_PNTTM
to_char(a.FRST_REGIST_PNTTM, 'YYYY-MM-DD') as FRST_REGIST_PNTTM
FROM
LETTNBBSMASTER a
LEFT OUTER JOIN

View File

@ -74,13 +74,13 @@
<select id="selectMaxNttId" resultType="java.lang.Long">
SELECT IFNULL(MAX(NTT_ID),0)+1 AS NTT_ID FROM LETTNBBS
SELECT COALESCE(MAX(NTT_ID),0)+1 AS NTT_ID FROM LETTNBBS
</select>
<insert id="insertBoardArticle" parameterType="egovframework.let.cop.bbs.service.Board">
<selectKey keyProperty="nttNo" resultType="java.lang.Long" order="BEFORE">
SELECT IFNULL(MAX(SORT_ORDR),0)+1 AS NTT_NO FROM LETTNBBS
SELECT COALESCE(MAX(SORT_ORDR),0)+1 AS NTT_NO FROM LETTNBBS
WHERE BBS_ID = #{bbsId}
</selectKey>
@ -96,14 +96,14 @@
#{ntcrId}, #{ntcrNm}, #{password}, #{inqireCo},
#{ntceBgnde}, #{ntceEndde}, #{replyAt},
#{parnts}, 1, #{replyLc}, #{atchFileId},
#{frstRegisterId}, SYSDATE(), 'Y'
#{frstRegisterId}, now(), 'Y'
)
</insert>
<insert id="replyBoardArticle" parameterType="egovframework.let.cop.bbs.service.Board">
<selectKey keyProperty="nttNo" resultType="java.lang.Long" order="BEFORE">
SELECT IFNULL(MAX(NTT_NO),0)+1 AS NTT_NO FROM LETTNBBS
SELECT COALESCE(MAX(NTT_NO),0)+1 AS NTT_NO FROM LETTNBBS
WHERE BBS_ID = #{bbsId} AND SORT_ORDR = #{sortOrdr}
</selectKey>
@ -119,7 +119,7 @@
#{ntcrId}, #{ntcrNm}, #{password}, #{inqireCo},
#{ntceBgnde}, #{ntceEndde}, #{replyAt},
#{parnts}, 1, #{replyLc}, #{atchFileId},
#{frstRegisterId}, SYSDATE(), 'Y'
#{frstRegisterId}, now(), 'Y'
)
</insert>
@ -142,8 +142,8 @@
<select id="selectBoardArticleList" parameterType="egovframework.let.cop.bbs.service.BoardVO" resultMap="boardList">
SELECT
a.NTT_ID, a.NTT_SJ, a.FRST_REGISTER_ID, IFNULL(b.USER_NM, a.NTCR_NM) as FRST_REGISTER_NM,
DATE_FORMAT(a.FRST_REGIST_PNTTM, '%Y-%m-%d') as FRST_REGIST_PNTTM,
a.NTT_ID, a.NTT_SJ, a.FRST_REGISTER_ID, COALESCE(b.USER_NM, a.NTCR_NM) as FRST_REGISTER_NM,
to_char(a.FRST_REGIST_PNTTM, 'YYYY-MM-DD') as FRST_REGIST_PNTTM,
a.RDCNT, a.PARNTSCTT_NO, a.ANSWER_AT, a.ANSWER_LC, a.USE_AT, a.ATCH_FILE_ID,
a.BBS_ID, a.NTCE_BGNDE, a.NTCE_ENDDE
FROM
@ -201,7 +201,7 @@
SELECT
a.NTT_SJ, a.NTCR_ID, a.NTCR_NM, a.NTT_NO, a.NTT_CN,
a.PASSWORD, a.FRST_REGISTER_ID, b.USER_NM as FRST_REGISTER_NM,
DATE_FORMAT(a.FRST_REGIST_PNTTM, '%Y-%m-%d') as FRST_REGIST_PNTTM,
to_char(a.FRST_REGIST_PNTTM, 'YYYY-MM-DD') as FRST_REGIST_PNTTM,
a.NTCE_BGNDE, a.NTCE_ENDDE, a.RDCNT,
a.USE_AT, a.ATCH_FILE_ID, a.BBS_ID, a.NTT_ID,
a.PARNTSCTT_NO, a.ANSWER_AT, a.ANSWER_LC, a.SORT_ORDR,
@ -236,7 +236,7 @@
NTCE_ENDDE = #{ntceEndde},
LAST_UPDUSR_ID = #{lastUpdusrId},
ATCH_FILE_ID = #{atchFileId},
LAST_UPDT_PNTTM = SYSDATE()
LAST_UPDT_PNTTM = now()
WHERE BBS_ID = #{bbsId}
AND NTT_ID = #{nttId}
@ -248,7 +248,7 @@
NTT_SJ = #{nttSj},
USE_AT = 'N',
LAST_UPDUSR_ID = #{lastUpdusrId},
LAST_UPDT_PNTTM = SYSDATE()
LAST_UPDT_PNTTM = now()
WHERE BBS_ID = #{bbsId}
AND NTT_ID = #{nttId}
@ -256,7 +256,7 @@
<select id="selectMaxInqireCo" parameterType="egovframework.let.cop.bbs.service.BoardVO" resultType="java.lang.Integer">
SELECT IFNULL(MAX(RDCNT),0)+1 AS RDCNT FROM LETTNBBS
SELECT COALESCE(MAX(RDCNT),0)+1 AS RDCNT FROM LETTNBBS
WHERE BBS_ID = #{bbsId}
AND NTT_ID = #{nttId}
@ -265,7 +265,7 @@
<select id="selectNoticeItemForSort" parameterType="egovframework.let.cop.bbs.service.Board" resultType="java.lang.Long">
SELECT
IFNULL(MAX(NTT_NO),0)+1 AS NTT_NO
COALESCE(MAX(NTT_NO),0)+1 AS NTT_NO
FROM
LETTNBBS
WHERE
@ -282,7 +282,7 @@
UPDATE LETTNBBS SET
RDCNT = #{inqireCo},
LAST_UPDUSR_ID = #{lastUpdusrId},
LAST_UPDT_PNTTM = SYSDATE()
LAST_UPDT_PNTTM = now()
WHERE BBS_ID = #{bbsId}
AND NTT_ID = #{nttId}

View File

@ -41,7 +41,7 @@
UPDATE LETTNBBSUSE SET
USE_AT = 'N',
LAST_UPDUSR_ID = #{lastUpdusrId},
LAST_UPDT_PNTTM = SYSDATE()
LAST_UPDT_PNTTM = now()
WHERE BBS_ID = #{bbsId}
AND TRGET_ID = #{trgetId}
@ -66,7 +66,7 @@
UPDATE LETTNBBSUSE SET
USE_AT = 'N',
LAST_UPDUSR_ID = #{lastUpdusrId},
LAST_UPDT_PNTTM = SYSDATE()
LAST_UPDT_PNTTM = now()
WHERE BBS_ID IN
(SELECT BBS_ID FROM LETTNBBSUSE
WHERE TRGET_ID = #{cmmntyId} )
@ -75,7 +75,7 @@
UPDATE LETTNBBSUSE SET
USE_AT = 'N',
LAST_UPDUSR_ID = #{lastUpdusrId},
LAST_UPDT_PNTTM = SYSDATE()
LAST_UPDT_PNTTM = now()
WHERE TRGET_ID = #{cmmntyId}
</update>
@ -85,7 +85,7 @@
UPDATE LETTNBBSUSE SET
USE_AT = 'N',
LAST_UPDUSR_ID = #{lastUpdusrId},
LAST_UPDT_PNTTM = SYSDATE()
LAST_UPDT_PNTTM = now()
WHERE BBS_ID IN
(SELECT BBS_ID FROM LETTNBBSUSE
WHERE TRGET_ID = #{clbId} )
@ -94,7 +94,7 @@
UPDATE LETTNBBSUSE SET
USE_AT = 'N',
LAST_UPDUSR_ID = #{lastUpdusrId},
LAST_UPDT_PNTTM = SYSDATE()
LAST_UPDT_PNTTM = now()
WHERE TRGET_ID = #{clbId}
</update>
@ -105,7 +105,7 @@
(BBS_ID, TRGET_ID, REGIST_SE_CODE, USE_AT,
FRST_REGISTER_ID, FRST_REGIST_PNTTM )
VALUES
(#{bbsId}, #{trgetId}, #{registSeCode}, #{useAt}, #{frstRegisterId}, SYSDATE())
(#{bbsId}, #{trgetId}, #{registSeCode}, #{useAt}, #{frstRegisterId}, now())
</insert>
@ -181,7 +181,7 @@
UPDATE LETTNBBSUSE SET
USE_AT = #{useAt},
LAST_UPDUSR_ID = #{lastUpdusrId},
LAST_UPDT_PNTTM = SYSDATE()
LAST_UPDT_PNTTM = now()
WHERE BBS_ID = #{bbsId}
</update>
@ -191,7 +191,7 @@
UPDATE LETTNBBSUSE SET
USE_AT = 'N',
LAST_UPDUSR_ID = #{lastUpdusrId},
LAST_UPDT_PNTTM = SYSDATE()
LAST_UPDT_PNTTM = now()
WHERE BBS_ID = #{bbsId}
</update>
@ -344,7 +344,7 @@
UPDATE LETTNBBSUSE SET
USE_AT = #{useAt},
LAST_UPDUSR_ID = #{lastUpdusrId},
LAST_UPDT_PNTTM = SYSDATE()
LAST_UPDT_PNTTM = now()
WHERE BBS_ID = #{bbsId}
AND TRGET_ID = #{trgetId}

View File

@ -31,7 +31,7 @@
<!-- 메인페이지/일정관리조회 -->
<select id="selectIndvdlSchdulManageMainList" parameterType="java.util.Map" resultType="egovMap">
SELECT
DATE_FORMAT(sysdate(),'%Y-%m-%d') TO_DAY,
DATE_FORMAT(now(),'%Y-%m-%d') TO_DAY,
A.SCHDUL_ID,
A.SCHDUL_SE,
A.SCHDUL_DEPT_ID,
@ -56,9 +56,9 @@
AND (
( SUBSTRING(A.SCHDUL_BEGINDE,1,8) &gt; DATE_FORMAT(sysdate(),'%Y%m%d') AND SUBSTRING(A.SCHDUL_BEGINDE,1,8) &lt;= DATE_FORMAT(sysdate(),'%Y%m%d'))
( SUBSTRING(A.SCHDUL_BEGINDE,1,8) &gt; DATE_FORMAT(now(),'%Y%m%d') AND SUBSTRING(A.SCHDUL_BEGINDE,1,8) &lt;= DATE_FORMAT(now(),'%Y%m%d'))
OR
( SUBSTRING(A.SCHDUL_ENDDE,1,8) &gt;DATE_FORMAT(sysdate(),'%Y%m%d') AND SUBSTRING(A.SCHDUL_BEGINDE,1,8) &lt;= DATE_FORMAT(sysdate(),'%Y%m%d'))
( SUBSTRING(A.SCHDUL_ENDDE,1,8) &gt;DATE_FORMAT(now(),'%Y%m%d') AND SUBSTRING(A.SCHDUL_BEGINDE,1,8) &lt;= DATE_FORMAT(now(),'%Y%m%d'))
)
@ -232,7 +232,7 @@
SCHDUL_CHARGER_ID=#{schdulChargerId},
ATCH_FILE_ID=#{atchFileId},
REPTIT_SE_CODE=#{reptitSeCode},
LAST_UPDT_PNTTM = sysdate(),
LAST_UPDT_PNTTM = now(),
LAST_UPDUSR_ID = #{lastUpdusrId}
WHERE SCHDUL_ID = #{schdulId}
</update>
@ -300,9 +300,9 @@
#{schdulChargerId},
#{atchFileId},
#{reptitSeCode},
sysdate(),
now(),
#{frstRegisterId},
sysdate(),
now(),
#{lastUpdusrId}
)

File diff suppressed because it is too large Load Diff