Merge branch 'daily' into dev
This commit is contained in:
@@ -19,24 +19,27 @@
|
||||
<select id="getDailyRecordStatus"
|
||||
resultType="app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto">
|
||||
select dr.id as daily_id
|
||||
, dr.day_group_no, dr.start_date, dr.end_date
|
||||
, dr.all_status
|
||||
, dr.income_status
|
||||
, dr.work_status
|
||||
, dr.expense_status
|
||||
, dr.power_status
|
||||
, dr.forestry_status
|
||||
, dr.farming_status
|
||||
, (select count(*) from daily_income di where di.daily_record_seq = dr.id and di.is_deleted = false) as income_count
|
||||
, (select count(*) from daily_work dw where dw.daily_record_seq = dr.id and dw.is_deleted = false) as work_count
|
||||
, (select count(*) from daily_expense de where de.daily_record_seq = dr.id and de.is_deleted = false) as expense_count
|
||||
, (select count(*) from daily_power dp where dp.daily_record_seq = dr.id and dp.is_deleted = false) as power_count
|
||||
, (select count(*) from daily_forestry df1 where df1.daily_record_seq = dr.id and df1.is_deleted = false) as forestry_count
|
||||
, (select count(*) from daily_farming df2 where df2.daily_record_seq = dr.id and df2.is_deleted = false) as farming_count
|
||||
from daily_record dr
|
||||
, dr.day_group_no, dr.start_date, dr.end_date
|
||||
, dr.all_status
|
||||
, dr.income_status
|
||||
, dr.work_status
|
||||
, dr.expense_status
|
||||
, dr.power_status
|
||||
, dr.forestry_status
|
||||
, dr.farming_status
|
||||
, (select count(*) from daily_income di where di.daily_record_seq = dr.id and di.is_deleted = false) as income_count
|
||||
, (select count(*) from daily_work dw where dw.daily_record_seq = dr.id and dw.is_deleted = false) as work_count
|
||||
, (select count(*) from daily_expense de where de.daily_record_seq = dr.id and de.is_deleted = false) as expense_count
|
||||
, (select count(*) from daily_power dp where dp.daily_record_seq = dr.id and dp.is_deleted = false) as power_count
|
||||
, (select count(*) from daily_forestry df1 where df1.daily_record_seq = dr.id and df1.is_deleted = false) as forestry_count
|
||||
, (select count(*) from daily_farming df2 where df2.daily_record_seq = dr.id and df2.is_deleted = false) as farming_count
|
||||
from daily_record dr
|
||||
where dr.is_deleted = false
|
||||
and dr.household_seq = #{householdSeq}
|
||||
and dr.record_month = #{searchMonth}
|
||||
and dr.household_seq = #{householdSeq}
|
||||
and dr.record_month = #{searchMonth}
|
||||
<if test="groupNo != null">
|
||||
and dr.day_group_no = #{groupNo}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<select id="getDailyRecordExistCount" resultType="int">
|
||||
|
||||
@@ -163,14 +163,13 @@ var ajaxUtil = {
|
||||
kri.logger.error('statusCode: 403');
|
||||
},
|
||||
422:function(rstData, status) {
|
||||
console.log(rstData)
|
||||
console.log('422', rstData)
|
||||
/**
|
||||
* TODO
|
||||
* 폼이 너무 여러가지 형식이 있는데 서버에러를 가지고 처리하는게 맞는지 검토 필요
|
||||
* 코드 정리는 나중에 하려고 그냥 만듬.... 정리 필요.
|
||||
*/
|
||||
|
||||
|
||||
let isResetDone = false;
|
||||
|
||||
$(rstData.responseJSON.fieldErrors).each((idx, oj) => {
|
||||
@@ -236,6 +235,15 @@ var ajaxUtil = {
|
||||
ajaxUtil._alert(fieldErrors[0].defaultMessage, '유효성 체크');
|
||||
}
|
||||
}
|
||||
|
||||
// 포커스 이동
|
||||
if ($('.input-invalid').length != 0) {
|
||||
$('.input-invalid').eq(0).find('input,select').focus();
|
||||
}
|
||||
|
||||
if (typeof errorCallback !== 'undefined') {
|
||||
errorCallback(rstData.status, rstData);
|
||||
}
|
||||
},
|
||||
500:function(rstData){
|
||||
ajaxUtil._hideWaiting();
|
||||
@@ -263,6 +271,7 @@ var ajaxUtil = {
|
||||
},
|
||||
error : function(rstData) {
|
||||
ajaxUtil._hideWaiting();
|
||||
|
||||
if (!(rstData.status == 500 || rstData.status == 422)) {
|
||||
if (typeof errorCallback !== 'undefined') {
|
||||
errorCallback(rstData.status, rstData);
|
||||
|
||||
@@ -82,8 +82,7 @@
|
||||
</div>
|
||||
<!--/* [정책] 자가농업 생산물 중 자가소비량은 7일차 등록일에만 노출 및 선택, 21일 이후는 마지막 날 */-->
|
||||
<div class="component-input"
|
||||
th:if="${reqVO.groupNo eq 4 or reqVO.groupNo eq 8 or reqVO.groupNo eq 12
|
||||
or reqVO.groupNo eq 16 or reqVO.groupNo eq 17}">
|
||||
th:if="${dailyRecord.farmingOpen}">
|
||||
<label class="switch-inner type-txt">
|
||||
<span class="switch-label">농업생산물 중 자가소비량</span>
|
||||
<input type="checkbox" name="farmingStatus" value="TARGET" data-target="farming"
|
||||
|
||||
@@ -79,7 +79,7 @@
|
||||
</div>
|
||||
<div class="select-scroll">
|
||||
<ul class="">
|
||||
<li class="option" th:each="uiCode : ${recordUnit}"
|
||||
<li class="option" th:each="uiCode : ${recordArea}"
|
||||
th:data-value="${uiCode.id}"
|
||||
th:text="${uiCode.codeText}"
|
||||
th:selected="${uiCode.id eq detail.areaUnitCode ? 'current' : ''}"
|
||||
|
||||
@@ -258,6 +258,12 @@
|
||||
function (rstData, status) {
|
||||
location.reload();
|
||||
},
|
||||
function () {
|
||||
// 노동투입시간 invalid reset
|
||||
$('.segment-label .guide-info li').eq(2).addClass('invalid');
|
||||
$('.type-sub').find('.input-info').remove();
|
||||
$('.input-flex-group').find('.input-info').remove();
|
||||
}
|
||||
);
|
||||
},
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user