Merge branch 'dev' into deploy-dev-admin
This commit is contained in:
@@ -28,7 +28,7 @@
|
|||||||
<foreach collection="householdSeqs" item="householdSeq" separator=",">
|
<foreach collection="householdSeqs" item="householdSeq" separator=",">
|
||||||
(
|
(
|
||||||
nextval('researcher_has_household_seq'),
|
nextval('researcher_has_household_seq'),
|
||||||
#{researcherSeq},
|
#{adminSeq},
|
||||||
#{householdSeq},
|
#{householdSeq},
|
||||||
<include refid="common.fields.CreateUpdateBaseValues"/>
|
<include refid="common.fields.CreateUpdateBaseValues"/>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -44,6 +44,7 @@
|
|||||||
JOIN researcher_has_household rhh ON v.household_seq = rhh.household_seq
|
JOIN researcher_has_household rhh ON v.household_seq = rhh.household_seq
|
||||||
WHERE TO_CHAR(v.visit_date, 'YYYYMM') = #{cmd.recordMonth}
|
WHERE TO_CHAR(v.visit_date, 'YYYYMM') = #{cmd.recordMonth}
|
||||||
AND rhh.is_deleted = false
|
AND rhh.is_deleted = false
|
||||||
|
AND v.is_deleted = false
|
||||||
) sub
|
) sub
|
||||||
WHERE rn <= 2
|
WHERE rn <= 2
|
||||||
GROUP BY household_seq
|
GROUP BY household_seq
|
||||||
|
|||||||
@@ -218,22 +218,21 @@
|
|||||||
document.querySelectorAll('input[name="forestRemoveIds"]:checked')
|
document.querySelectorAll('input[name="forestRemoveIds"]:checked')
|
||||||
).map(el => Number(el.value));
|
).map(el => Number(el.value));
|
||||||
|
|
||||||
const totalRows = document.querySelectorAll('input[name="forestRemoveIds"]').length;
|
|
||||||
|
|
||||||
if(checkedIds.length <= 0) {
|
if(checkedIds.length <= 0) {
|
||||||
alert("임산물을 선택해주세요.");
|
alert("임산물을 선택해주세요.");
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if (checkedIds.length === totalRows) {
|
|
||||||
alert("등록내용은 최소 1건이 남아있어야 합니다.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
etUI.dialog.confirm({
|
etUI.dialog.confirm({
|
||||||
title: '삭제 안내',
|
title: '삭제 안내',
|
||||||
message: '선택하신 내용을 삭제하시겠습니까?<br>삭제한 항목은 복구할 수 없습니다.',
|
message: '선택하신 내용을 삭제하시겠습니까?<br>삭제한 항목은 복구할 수 없습니다.',
|
||||||
positiveCallback: function () {
|
positiveCallback: function () {
|
||||||
|
const totalRows = document.querySelectorAll('.row-class').length;
|
||||||
|
|
||||||
|
if (totalRows - checkedIds.length <= 0) {
|
||||||
|
alert("등록내용은 최소 1건이 남아 있어야 합니다.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
removeForestProduct(checkedIds);
|
removeForestProduct(checkedIds);
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -35,10 +35,15 @@ public class DailyRecordDao implements DailyRecordPortOut {
|
|||||||
if (detail.getStartDate().getMonth() != detail.getEndDate().getMonth()) {
|
if (detail.getStartDate().getMonth() != detail.getEndDate().getMonth()) {
|
||||||
// 종료일의 달이 변경되면 시작일=종료일 처리
|
// 종료일의 달이 변경되면 시작일=종료일 처리
|
||||||
detail.setEndDate(detail.getStartDate());
|
detail.setEndDate(detail.getStartDate());
|
||||||
|
detail.setEndDay(dailyUtil.getLastDay(detail.getStartDate()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
detail.setLastDay(dailyUtil.isLastDay(detail.getEndDate()));
|
detail.setLastDay(dailyUtil.isLastDay(detail.getEndDate()));
|
||||||
|
if (detail.isLastDay()) {
|
||||||
|
detail.setEndDay(dailyUtil.getLastDay(detail.getStartDate()));
|
||||||
|
}
|
||||||
|
|
||||||
detail.setFarmingOpen(dailyUtil.isFarmingOpen(detail.getGroupNo(), detail.getEndDate()));
|
detail.setFarmingOpen(dailyUtil.isFarmingOpen(detail.getGroupNo(), detail.getEndDate()));
|
||||||
detail.setRegistrable(dailyUtil.isRegisterPossible(detail.getStartDate(), detail.getEndDate()));
|
detail.setRegistrable(dailyUtil.isRegisterPossible(detail.getStartDate(), detail.getEndDate()));
|
||||||
detail.setModifiable(dailyUtil.isModifiable(detail.getStartDate(), detail.getEndDate()));
|
detail.setModifiable(dailyUtil.isModifiable(detail.getStartDate(), detail.getEndDate()));
|
||||||
|
|||||||
@@ -91,6 +91,8 @@ DELETE FROM uri WHERE id = 'uri.admin.communication.sms';
|
|||||||
-- 문자발송 메뉴 숨기기
|
-- 문자발송 메뉴 숨기기
|
||||||
-- update uri set show_on_navi = false, updated_at = now(), updated_by = 'INIT_DATA' where id ='uri.admin.communication.sms' ;
|
-- update uri set show_on_navi = false, updated_at = now(), updated_by = 'INIT_DATA' where id ='uri.admin.communication.sms' ;
|
||||||
|
|
||||||
|
-- 은행자동이체 내역 칼럼 타입 크기 변경
|
||||||
|
ALTER TABLE public.bank_auto_transfer ALTER COLUMN source_purpose TYPE varchar(100) USING source_purpose::varchar(100);
|
||||||
|
|
||||||
-- ====================================================================================================================
|
-- ====================================================================================================================
|
||||||
-- 문자 발송
|
-- 문자 발송
|
||||||
|
|||||||
@@ -41,20 +41,18 @@
|
|||||||
최근등록 : <span th:text="${dailyLatest}"></span></dd>
|
최근등록 : <span th:text="${dailyLatest}"></span></dd>
|
||||||
<dd class="date" th:if="${#strings.isEmpty(dailyLatest)}">등록된 일계부가 없습니다.</dd>
|
<dd class="date" th:if="${#strings.isEmpty(dailyLatest)}">등록된 일계부가 없습니다.</dd>
|
||||||
</dl>
|
</dl>
|
||||||
<!--/* TODO : 2차 오픈 */-->
|
|
||||||
<th:block th:if="${@systemProperties['spring.profiles.active'] eq 'local'}">
|
|
||||||
<th:block th:if="${notice != null}">
|
<th:block th:if="${notice != null}">
|
||||||
<a th:href="@{'/info/notice/' + ${notice.id}}" class="notice-box">
|
<a th:href="@{'/info/notice/' + ${notice.id}}" class="notice-box">
|
||||||
<p class="tit">공지사항</p>
|
<p class="tit">공지사항</p>
|
||||||
<p class="txt" th:text="${notice.title}"></p>
|
<p class="txt" th:text="${notice.title}"></p>
|
||||||
</a>
|
</a>
|
||||||
|
<div class="notice-box nodata"
|
||||||
|
th:unless="${notice != null}">
|
||||||
|
<a href="/info/notice" class="tit">공지사항</a>
|
||||||
|
<a href="javascript:void(0)" class="txt">등록된 공지사항이 없습니다</a>
|
||||||
|
</div>
|
||||||
</th:block>
|
</th:block>
|
||||||
<div class="notice-box nodata"
|
|
||||||
th:unless="${notice != null}">
|
|
||||||
<a href="/info/notice" class="tit">공지사항</a>
|
|
||||||
<a href="javascript:void(0)" class="txt">등록된 공지사항이 없습니다</a>
|
|
||||||
</div>
|
|
||||||
</th:block>
|
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|||||||
@@ -8,9 +8,7 @@
|
|||||||
th:if="not ${detail.updated}">
|
th:if="not ${detail.updated}">
|
||||||
<div class="btns-row">
|
<div class="btns-row">
|
||||||
<button type="button" id="btnSelf" class="btn active" onclick="modalControl.changeModal('self')">수기 등록</button>
|
<button type="button" id="btnSelf" class="btn active" onclick="modalControl.changeModal('self')">수기 등록</button>
|
||||||
<th:block th:if="${@systemProperties['spring.profiles.active'] eq 'local'}">
|
|
||||||
<button type="button" id="btnOcr" class="btn" onclick="modalControl.changeModal('ocr')">영수증 등록</button>
|
<button type="button" id="btnOcr" class="btn" onclick="modalControl.changeModal('ocr')">영수증 등록</button>
|
||||||
</th:block>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user