[BO] 일계부 미작성건 금일데이터없음으로 등록
This commit is contained in:
@@ -0,0 +1,45 @@
|
|||||||
|
package app.module.admin.usecase.household.tab.dailyRecord.createDailyRecord.adapters.web;
|
||||||
|
|
||||||
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||||
|
import app.module.core.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO;
|
||||||
|
import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||||
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@RestController
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class CreateDailyRecordController {
|
||||||
|
private final DailyRecordPortIn dailyRecordPortIn;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 일계부 항목 등록 처리
|
||||||
|
*
|
||||||
|
* @param formVO 입력 데이터
|
||||||
|
*/
|
||||||
|
@PostMapping(path = "/api/household/daily/create")
|
||||||
|
ResponseEntity<?> create(@RequestBody CreateDailyRecordReqVO formVO) {
|
||||||
|
|
||||||
|
formVO.setTodayNone("Y");
|
||||||
|
|
||||||
|
DailyUIReqVO reqVO = new DailyUIReqVO(formVO.getRecordMonth(), formVO.getDayGroupNo(), formVO.getHouseholdSeq());
|
||||||
|
log.debug("reqVO: {}", reqVO);
|
||||||
|
|
||||||
|
DailyRecordDto detail = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
|
||||||
|
formVO.setRecordMonth(reqVO.getSearchMonth());
|
||||||
|
formVO.setDayGroupNo(reqVO.getGroupNo());
|
||||||
|
formVO.setStartDate(detail.getStartDate());
|
||||||
|
formVO.setEndDate(detail.getEndDate());
|
||||||
|
formVO.setFarming(detail.isFarmingOpen());
|
||||||
|
formVO.setHouseholdSeq(reqVO.getHouseholdSeq());
|
||||||
|
log.debug("formVO: {}", formVO);
|
||||||
|
|
||||||
|
dailyRecordPortIn.create(formVO);
|
||||||
|
|
||||||
|
return ResponseEntity.status(HttpStatus.OK).body(reqVO);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -45,8 +45,8 @@
|
|||||||
di.updated_by, /* 최종수정자 */
|
di.updated_by, /* 최종수정자 */
|
||||||
TO_CHAR(di.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */
|
TO_CHAR(di.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */
|
||||||
<if test="searchMonth == true">
|
<if test="searchMonth == true">
|
||||||
, ddg.start_day
|
, EXTRACT(DAY FROM CAST(dr.start_date as date)) as start_day
|
||||||
, ddg.end_day
|
, EXTRACT(DAY FROM CAST(dr.end_date as date)) as end_day
|
||||||
</if>
|
</if>
|
||||||
FROM daily_income di
|
FROM daily_income di
|
||||||
LEFT JOIN uicode ui_crop
|
LEFT JOIN uicode ui_crop
|
||||||
@@ -59,8 +59,6 @@
|
|||||||
INNER JOIN daily_record dr
|
INNER JOIN daily_record dr
|
||||||
ON dr.id = di.daily_record_seq
|
ON dr.id = di.daily_record_seq
|
||||||
AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth}
|
AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth}
|
||||||
LEFT JOIN daily_day_group ddg
|
|
||||||
ON ddg.group_no = dr.day_group_no
|
|
||||||
</if>
|
</if>
|
||||||
WHERE di.is_deleted = false
|
WHERE di.is_deleted = false
|
||||||
<if test="searchMonth == false">
|
<if test="searchMonth == false">
|
||||||
@@ -68,7 +66,7 @@
|
|||||||
ORDER BY di.created_at
|
ORDER BY di.created_at
|
||||||
</if>
|
</if>
|
||||||
<if test="searchMonth == true">
|
<if test="searchMonth == true">
|
||||||
ORDER BY ddg.start_day asc, di.created_at asc
|
ORDER BY dr.start_date asc, di.created_at asc
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
@@ -105,8 +103,8 @@
|
|||||||
dw.updated_by, /* 최종수정자 */
|
dw.updated_by, /* 최종수정자 */
|
||||||
dw.updated_at /* 최종수정날짜 */
|
dw.updated_at /* 최종수정날짜 */
|
||||||
<if test="searchMonth == true">
|
<if test="searchMonth == true">
|
||||||
, ddg.start_day
|
, EXTRACT(DAY FROM CAST(dr.start_date as date)) as start_day
|
||||||
, ddg.end_day
|
, EXTRACT(DAY FROM CAST(dr.end_date as date)) as end_day
|
||||||
</if>
|
</if>
|
||||||
FROM daily_work dw
|
FROM daily_work dw
|
||||||
LEFT JOIN uicode ui_area
|
LEFT JOIN uicode ui_area
|
||||||
@@ -119,8 +117,6 @@
|
|||||||
INNER JOIN daily_record dr
|
INNER JOIN daily_record dr
|
||||||
ON dr.id = dw.daily_record_seq
|
ON dr.id = dw.daily_record_seq
|
||||||
AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth}
|
AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth}
|
||||||
LEFT JOIN daily_day_group ddg
|
|
||||||
ON ddg.group_no = dr.day_group_no
|
|
||||||
</if>
|
</if>
|
||||||
WHERE dw.is_deleted = false
|
WHERE dw.is_deleted = false
|
||||||
<if test="searchMonth == false">
|
<if test="searchMonth == false">
|
||||||
@@ -128,7 +124,7 @@
|
|||||||
ORDER BY dw.created_at
|
ORDER BY dw.created_at
|
||||||
</if>
|
</if>
|
||||||
<if test="searchMonth == true">
|
<if test="searchMonth == true">
|
||||||
ORDER BY ddg.start_day asc, dw.created_at asc
|
ORDER BY dr.start_date asc, dw.created_at asc
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
@@ -156,8 +152,8 @@
|
|||||||
de.updated_by, /* 최종수정자 */
|
de.updated_by, /* 최종수정자 */
|
||||||
TO_CHAR(de.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */
|
TO_CHAR(de.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */
|
||||||
<if test="searchMonth == true">
|
<if test="searchMonth == true">
|
||||||
, ddg.start_day
|
, EXTRACT(DAY FROM CAST(dr.start_date as date)) as start_day
|
||||||
, ddg.end_day
|
, EXTRACT(DAY FROM CAST(dr.end_date as date)) as end_day
|
||||||
</if>
|
</if>
|
||||||
FROM daily_expense de
|
FROM daily_expense de
|
||||||
LEFT JOIN uicode ui_unit
|
LEFT JOIN uicode ui_unit
|
||||||
@@ -167,8 +163,6 @@
|
|||||||
INNER JOIN daily_record dr
|
INNER JOIN daily_record dr
|
||||||
ON dr.id = de.daily_record_seq
|
ON dr.id = de.daily_record_seq
|
||||||
AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth}
|
AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth}
|
||||||
LEFT JOIN daily_day_group ddg
|
|
||||||
ON ddg.group_no = dr.day_group_no
|
|
||||||
</if>
|
</if>
|
||||||
WHERE de.is_deleted = false
|
WHERE de.is_deleted = false
|
||||||
<if test="searchMonth == false">
|
<if test="searchMonth == false">
|
||||||
@@ -176,7 +170,7 @@
|
|||||||
ORDER BY de.created_at
|
ORDER BY de.created_at
|
||||||
</if>
|
</if>
|
||||||
<if test="searchMonth == true">
|
<if test="searchMonth == true">
|
||||||
ORDER BY ddg.start_day asc, de.created_at asc
|
ORDER BY dr.start_date, de.created_at asc
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
@@ -191,16 +185,14 @@
|
|||||||
dp.updated_by, /* 최종수정자 */
|
dp.updated_by, /* 최종수정자 */
|
||||||
TO_CHAR(dp.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */
|
TO_CHAR(dp.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */
|
||||||
<if test="searchMonth == true">
|
<if test="searchMonth == true">
|
||||||
, ddg.start_day
|
, EXTRACT(DAY FROM CAST(dr.start_date as date)) as start_day
|
||||||
, ddg.end_day
|
, EXTRACT(DAY FROM CAST(dr.end_date as date)) as end_day
|
||||||
</if>
|
</if>
|
||||||
FROM daily_power dp
|
FROM daily_power dp
|
||||||
<if test="searchMonth == true">
|
<if test="searchMonth == true">
|
||||||
INNER JOIN daily_record dr
|
INNER JOIN daily_record dr
|
||||||
ON dr.id = dp.daily_record_seq
|
ON dr.id = dp.daily_record_seq
|
||||||
AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth}
|
AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth}
|
||||||
LEFT JOIN daily_day_group ddg
|
|
||||||
ON ddg.group_no = dr.day_group_no
|
|
||||||
</if>
|
</if>
|
||||||
WHERE dp.is_deleted = false
|
WHERE dp.is_deleted = false
|
||||||
<if test="searchMonth == false">
|
<if test="searchMonth == false">
|
||||||
@@ -208,7 +200,7 @@
|
|||||||
ORDER BY dp.created_at
|
ORDER BY dp.created_at
|
||||||
</if>
|
</if>
|
||||||
<if test="searchMonth == true">
|
<if test="searchMonth == true">
|
||||||
ORDER BY ddg.start_day asc, dp.created_at asc
|
ORDER BY dr.start_date asc, dp.created_at asc
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
@@ -231,8 +223,8 @@
|
|||||||
df.updated_by, /* 최종수정자 */
|
df.updated_by, /* 최종수정자 */
|
||||||
TO_CHAR(df.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */
|
TO_CHAR(df.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */
|
||||||
<if test="searchMonth == true">
|
<if test="searchMonth == true">
|
||||||
, ddg.start_day
|
, EXTRACT(DAY FROM CAST(dr.start_date as date)) as start_day
|
||||||
, ddg.end_day
|
, EXTRACT(DAY FROM CAST(dr.end_date as date)) as end_day
|
||||||
</if>
|
</if>
|
||||||
FROM daily_forestry df
|
FROM daily_forestry df
|
||||||
LEFT JOIN uicode ui_unit
|
LEFT JOIN uicode ui_unit
|
||||||
@@ -242,8 +234,6 @@
|
|||||||
INNER JOIN daily_record dr
|
INNER JOIN daily_record dr
|
||||||
ON dr.id = df.daily_record_seq
|
ON dr.id = df.daily_record_seq
|
||||||
AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth}
|
AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth}
|
||||||
LEFT JOIN daily_day_group ddg
|
|
||||||
ON ddg.group_no = dr.day_group_no
|
|
||||||
</if>
|
</if>
|
||||||
WHERE df.is_deleted = false
|
WHERE df.is_deleted = false
|
||||||
<if test="searchMonth == false">
|
<if test="searchMonth == false">
|
||||||
@@ -251,7 +241,7 @@
|
|||||||
ORDER BY df.created_at
|
ORDER BY df.created_at
|
||||||
</if>
|
</if>
|
||||||
<if test="searchMonth == true">
|
<if test="searchMonth == true">
|
||||||
ORDER BY ddg.start_day asc, df.created_at asc
|
ORDER BY dr.start_date asc, df.created_at asc
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
@@ -277,8 +267,8 @@
|
|||||||
df.updated_by, /* 최종수정자 */
|
df.updated_by, /* 최종수정자 */
|
||||||
TO_CHAR(df.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */
|
TO_CHAR(df.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */
|
||||||
<if test="searchMonth == true">
|
<if test="searchMonth == true">
|
||||||
, ddg.start_day
|
, EXTRACT(DAY FROM CAST(dr.start_date as date)) as start_day
|
||||||
, ddg.end_day
|
, EXTRACT(DAY FROM CAST(dr.end_date as date)) as end_day
|
||||||
</if>
|
</if>
|
||||||
FROM daily_farming df
|
FROM daily_farming df
|
||||||
LEFT JOIN uicode ui_product
|
LEFT JOIN uicode ui_product
|
||||||
@@ -291,8 +281,6 @@
|
|||||||
INNER JOIN daily_record dr
|
INNER JOIN daily_record dr
|
||||||
ON dr.id = df.daily_record_seq
|
ON dr.id = df.daily_record_seq
|
||||||
AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth}
|
AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth}
|
||||||
LEFT JOIN daily_day_group ddg
|
|
||||||
ON ddg.group_no = dr.day_group_no
|
|
||||||
</if>
|
</if>
|
||||||
WHERE df.is_deleted = false
|
WHERE df.is_deleted = false
|
||||||
<if test="searchMonth == false">
|
<if test="searchMonth == false">
|
||||||
@@ -300,7 +288,7 @@
|
|||||||
ORDER BY df.created_at
|
ORDER BY df.created_at
|
||||||
</if>
|
</if>
|
||||||
<if test="searchMonth == true">
|
<if test="searchMonth == true">
|
||||||
ORDER BY ddg.start_day asc, df.created_at asc
|
ORDER BY dr.start_date asc, df.created_at asc
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|||||||
@@ -418,8 +418,8 @@
|
|||||||
|
|
||||||
// 일계부 등록 현황 상세
|
// 일계부 등록 현황 상세
|
||||||
const getDailyRecordsView = (id, groupNo, dayGroupText) => {
|
const getDailyRecordsView = (id, groupNo, dayGroupText) => {
|
||||||
if(id == null) {
|
if (id == null) {
|
||||||
alert('등록 내역이 없습니다.');
|
showDailyCreateConfirm(groupNo);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -754,6 +754,28 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 데이터 등록 Confirm
|
||||||
|
const showDailyCreateConfirm = (groupNo) => {
|
||||||
|
etUI.dialog.confirm({
|
||||||
|
title: '등록 안내',
|
||||||
|
message: '등록된 내역이 없습니다.<br>등록하시겠습니까?',
|
||||||
|
positiveCallback: function () {
|
||||||
|
let obj = $(document.reqForm).serializeObject();
|
||||||
|
obj.dayGroupNo = groupNo;
|
||||||
|
|
||||||
|
ajaxUtil._ajaxAsyncNoWaiting(
|
||||||
|
'/api/household/daily/create',
|
||||||
|
obj,
|
||||||
|
function () {
|
||||||
|
alert('등록 상태가 변경되었습니다.');
|
||||||
|
|
||||||
|
getDailyRecordsList();
|
||||||
|
},
|
||||||
|
);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// 데이터 초기화 Confirm
|
// 데이터 초기화 Confirm
|
||||||
const showDailyNoneConfirm = (el) => {
|
const showDailyNoneConfirm = (el) => {
|
||||||
const currentStep = $(el).data('step');
|
const currentStep = $(el).data('step');
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ VALUES
|
|||||||
('code.record.farming', 'code.record', '자가농업 생산물 중 자가소비량', NULL, NULL, true, 3, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
('code.record.farming', 'code.record', '자가농업 생산물 중 자가소비량', NULL, NULL, true, 3, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
||||||
('code.record.farming.11', 'code.record.farming', '쌀', '12111,81012', NULL, true, 0, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
('code.record.farming.11', 'code.record.farming', '쌀', '12111,81012', NULL, true, 0, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
||||||
('code.record.farming.12', 'code.record.farming', '찹쌀', '12111,81012', NULL, true, 1, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
('code.record.farming.12', 'code.record.farming', '찹쌀', '12111,81012', NULL, true, 1, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
||||||
('code.record.farming.13', 'code.record.farming', '보리', '12111,81012', NULL, true, 2, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
('code.record.farming.13', 'code.record.farming', '보리', '12112,81012', NULL, true, 2, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
||||||
('code.record.farming.14', 'code.record.farming', '콩', '12114,81012', NULL, true, 3, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
('code.record.farming.14', 'code.record.farming', '콩', '12114,81012', NULL, true, 3, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
||||||
('code.record.farming.15', 'code.record.farming', '팥', '12114,81012', NULL, true, 4, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
('code.record.farming.15', 'code.record.farming', '팥', '12114,81012', NULL, true, 4, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
||||||
('code.record.farming.16', 'code.record.farming', '고구마', '12114,81012', NULL, true, 5, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
('code.record.farming.16', 'code.record.farming', '고구마', '12114,81012', NULL, true, 5, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
||||||
|
|||||||
Reference in New Issue
Block a user