Merge branch 'susu' into dev
This commit is contained in:
@@ -1,35 +0,0 @@
|
||||
<?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="app.module.admin.usecase.loggedinuser.save.adapter.persistence.LoggedInUserSaveMapper">
|
||||
|
||||
<insert id="insert" parameterType="app.module.core.config.adapters.persistence.entity.LoggedInUser">
|
||||
INSERT INTO logged_in_user
|
||||
(
|
||||
id,
|
||||
app_type,
|
||||
login_id,
|
||||
clientip,
|
||||
last_logged_in_at
|
||||
)
|
||||
VALUES
|
||||
(
|
||||
nextval('logged_in_user_seq'),
|
||||
#{appType},
|
||||
#{id},
|
||||
#{clientIP},
|
||||
#{lastLoggedInAt}
|
||||
)
|
||||
</insert>
|
||||
|
||||
<update id="update" parameterType="app.module.core.config.adapters.persistence.entity.LoggedInUser">
|
||||
UPDATE logged_in_user
|
||||
SET
|
||||
clientip = #{clientIP},
|
||||
last_logged_in_at = #{lastLoggedInAt}
|
||||
WHERE app_type = #{appType}
|
||||
AND login_id = #{id}
|
||||
</update>
|
||||
|
||||
</mapper>
|
||||
@@ -37,23 +37,16 @@
|
||||
)
|
||||
</insert>
|
||||
|
||||
<insert id="createNoticeHasUploadFile">
|
||||
<!-- createNoticeHasUploadFile 게시글 등록 시, 첨부파일 join 데이터 등록 -->
|
||||
INSERT INTO notice_has_upload_file
|
||||
(
|
||||
notice_id,
|
||||
upload_files_id,
|
||||
<include refid="common.fields.CreateUpdateBaseColumns"/>
|
||||
)
|
||||
VALUES
|
||||
<update id="createNoticeUploadFile">
|
||||
update upload_file
|
||||
set mapping_id = #{id},
|
||||
<include refid="common.fields.UpdateBaseSet"/>
|
||||
where id IN (
|
||||
<foreach collection="fileMappingIds" item="fileId" separator=",">
|
||||
(
|
||||
#{id},
|
||||
#{fileId},
|
||||
<include refid="common.fields.CreateUpdateBaseValues"/>
|
||||
)
|
||||
#{fileId}
|
||||
</foreach>
|
||||
</insert>
|
||||
)
|
||||
</update>
|
||||
|
||||
|
||||
</mapper>
|
||||
@@ -29,8 +29,7 @@
|
||||
resultType="app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeUploadFile">
|
||||
/* getUploadFiles 상세 게시글 조회 시, 첨부파일 조회 */
|
||||
SELECT
|
||||
awuf.notice_id AS noticeId,
|
||||
awuf.upload_files_id AS uploadfileId,
|
||||
uf.mapping_id,
|
||||
uf.id AS id,
|
||||
uf.created_at AS createdAt,
|
||||
uf.created_by AS createdBy,
|
||||
@@ -41,9 +40,7 @@
|
||||
uf.origin_name AS originName,
|
||||
uf.path AS path,
|
||||
uf.type AS type
|
||||
FROM notice_has_upload_file awuf
|
||||
INNER JOIN upload_file uf
|
||||
ON awuf.upload_files_id = uf.id
|
||||
WHERE awuf.notice_id = #{id} AND awuf.is_deleted = false
|
||||
FROM upload_file uf
|
||||
WHERE uf.mapping_id = #{id} AND uf.is_deleted = false AND uf.type ='NOTICE'
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -78,16 +78,15 @@
|
||||
resultType="app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticeFiles">
|
||||
/* getUploadFiles : 게시물 리스트의 대표 이미지 */
|
||||
SELECT
|
||||
awuf.notice_id,
|
||||
uf.mapping_id as notice_id,
|
||||
uf.id,
|
||||
uf.type,
|
||||
uf.path,
|
||||
uf.name,
|
||||
uf.origin_name,
|
||||
uf.file_length
|
||||
FROM notice_has_upload_file awuf
|
||||
INNER JOIN upload_file uf ON awuf.upload_files_id = uf.id
|
||||
WHERE awuf.notice_id IN
|
||||
FROM upload_file uf
|
||||
WHERE uf.mapping_id IN
|
||||
<foreach collection="ids" item="id" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
</foreach>
|
||||
</update>
|
||||
|
||||
<update id="deleteNoticeHasFiles">
|
||||
/* deleteNoticeHasFiles : 게시물-파일 매핑 논리 삭제 */
|
||||
UPDATE notice_has_upload_file
|
||||
<update id="deleteNoticeUploadFiles">
|
||||
/* deleteNoticeUploadFiles : 게시물-파일 매핑 논리 삭제 */
|
||||
UPDATE upload_file
|
||||
SET <include refid="common.fields.DeleteBaseSet" />
|
||||
WHERE notice_id IN
|
||||
WHERE type='NOTICE' and mapping_id IN
|
||||
<foreach collection="removeIds" item="id" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
|
||||
@@ -4,32 +4,6 @@
|
||||
<mapper
|
||||
namespace="app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence.UpdateNoticeMapper">
|
||||
|
||||
<update id="deleteFileUploads">
|
||||
/* deleteFileUploads 게시글 수정 시, 첨부파일 join 데이터 삭제 */
|
||||
UPDATE notice_has_upload_file
|
||||
SET
|
||||
<include refid="common.fields.DeleteBaseSet"/>
|
||||
WHERE notice_id = #{noticeId}
|
||||
</update>
|
||||
|
||||
<insert id="createFileUploads">
|
||||
/* createFileUploads 게시글 수정 시, 첨부파일 join 데이터 등록 */
|
||||
INSERT INTO notice_has_upload_file
|
||||
(
|
||||
notice_id,
|
||||
upload_files_id,
|
||||
<include refid="common.fields.CreateUpdateBaseColumns"/>
|
||||
)
|
||||
VALUES
|
||||
<foreach collection="fileMappingId" item="fileId" separator=",">
|
||||
(
|
||||
#{id},
|
||||
#{fileId},
|
||||
<include refid="common.fields.CreateUpdateBaseValues"/>
|
||||
)
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<update id="updateNotice">
|
||||
/* updateNotice 게시글 수정 */
|
||||
UPDATE notice
|
||||
@@ -42,4 +16,5 @@
|
||||
<include refid="common.fields.UpdateBaseSet"/>
|
||||
WHERE id = #{id}
|
||||
</update>
|
||||
|
||||
</mapper>
|
||||
@@ -225,8 +225,15 @@
|
||||
set visit_date = #{visitDate},
|
||||
content = #{content},
|
||||
management_type = #{managementType},
|
||||
is_gift_sent = #{isGiftSent},
|
||||
<include refid="common.fields.UpdateBaseSet" />
|
||||
<choose>
|
||||
<when test="isGiftSent">
|
||||
is_gift_sent = true,
|
||||
</when>
|
||||
<when test="!isGiftSent">
|
||||
is_gift_sent = false,
|
||||
</when>
|
||||
</choose>
|
||||
<include refid="common.fields.UpdateBaseSet" />
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
|
||||
@@ -5,6 +5,14 @@
|
||||
<th layout:fragment="content">
|
||||
<section>
|
||||
<table class="type-form confirm" th:object="${researcherDto}" >
|
||||
<colgroup>
|
||||
<col width="8%" />
|
||||
<col width="25.3%" />
|
||||
<col width="8%" />
|
||||
<col width="25.3%" />
|
||||
<col width="8%" />
|
||||
<col width="25.3%" />
|
||||
</colgroup>
|
||||
<tbody>
|
||||
<tr>
|
||||
<th>아이디</th>
|
||||
|
||||
@@ -40,9 +40,6 @@
|
||||
<span class="btn-txt">로그인</span>
|
||||
</button>
|
||||
</div>
|
||||
<ul class="info-bullet-list">
|
||||
<li><a href="">공식가입센터 관리자 바로가기</a></li>
|
||||
</ul>
|
||||
</form>
|
||||
</section>
|
||||
<ul class="logo-list">
|
||||
|
||||
Reference in New Issue
Block a user