[CORE] daily.record core package 로 이동.
This commit is contained in:
@@ -1,15 +1,15 @@
|
|||||||
package app.module.front.usecase.daily.record.adapters.persistence;
|
package app.module.core.usecase.daily.record.adapters.persistence;
|
||||||
|
|
||||||
import app.module.front.config.application.util.AuditUtil;
|
|
||||||
import app.module.core.config.application.util.DailyUtil;
|
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
|
|
||||||
import app.module.core.config.application.enums.DailyStatus;
|
import app.module.core.config.application.enums.DailyStatus;
|
||||||
import app.module.core.config.application.enums.DailyTargetStatus;
|
import app.module.core.config.application.enums.DailyTargetStatus;
|
||||||
import app.module.front.usecase.daily.record.ports.DailyRecordPortOut;
|
import app.module.core.config.application.util.AuditUtil;
|
||||||
import app.module.front.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd;
|
import app.module.core.config.application.util.DailyUtil;
|
||||||
import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||||
import app.module.front.usecase.daily.record.ports.application.domain.UpdateDailyRecordStatusCmd;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
|
||||||
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortOut;
|
||||||
|
import app.module.core.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd;
|
||||||
|
import app.module.core.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
|
||||||
|
import app.module.core.usecase.daily.record.ports.application.domain.UpdateDailyRecordStatusCmd;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
@@ -64,11 +64,12 @@ public class DailyRecordDao implements DailyRecordPortOut {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateByStatus(String recordMonth, Integer dayGroupNo, String targetType, String targetStatus) {
|
public void updateByStatus(String recordMonth, Integer dayGroupNo, Long householdSeq, String targetType, String targetStatus) {
|
||||||
UpdateDailyRecordStatusCmd command = AuditUtil.update(
|
UpdateDailyRecordStatusCmd command = AuditUtil.update(
|
||||||
new UpdateDailyRecordStatusCmd(
|
new UpdateDailyRecordStatusCmd(
|
||||||
recordMonth,
|
recordMonth,
|
||||||
dayGroupNo,
|
dayGroupNo,
|
||||||
|
householdSeq,
|
||||||
"ALL".equals(targetType) ? targetStatus : null,
|
"ALL".equals(targetType) ? targetStatus : null,
|
||||||
!"ALL".equals(targetType) ? targetType : null,
|
!"ALL".equals(targetType) ? targetType : null,
|
||||||
!"ALL".equals(targetType) ? targetStatus : null
|
!"ALL".equals(targetType) ? targetStatus : null
|
||||||
@@ -76,7 +77,7 @@ public class DailyRecordDao implements DailyRecordPortOut {
|
|||||||
);
|
);
|
||||||
|
|
||||||
if ("ALL".equals(targetType)) {
|
if ("ALL".equals(targetType)) {
|
||||||
String allStatus = this.getUpdateAllStatus(recordMonth, dayGroupNo, command.getHouseholdSeq());
|
String allStatus = this.getUpdateAllStatus(recordMonth, dayGroupNo, householdSeq);
|
||||||
if (allStatus != null) {
|
if (allStatus != null) {
|
||||||
command.setAllStatus(allStatus);
|
command.setAllStatus(allStatus);
|
||||||
|
|
||||||
@@ -105,6 +106,7 @@ public class DailyRecordDao implements DailyRecordPortOut {
|
|||||||
new UpdateDailyRecordStatusCmd(
|
new UpdateDailyRecordStatusCmd(
|
||||||
searchMonth,
|
searchMonth,
|
||||||
dayGroupNo,
|
dayGroupNo,
|
||||||
|
householdSeq,
|
||||||
allStatus,
|
allStatus,
|
||||||
null,
|
null,
|
||||||
null
|
null
|
||||||
@@ -1,11 +1,10 @@
|
|||||||
package app.module.front.usecase.daily.record.adapters.persistence;
|
package app.module.core.usecase.daily.record.adapters.persistence;
|
||||||
|
|
||||||
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
|
import app.module.core.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd;
|
||||||
import app.module.front.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd;
|
import app.module.core.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
|
||||||
import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
|
import app.module.core.usecase.daily.record.ports.application.domain.UpdateDailyRecordStatusCmd;
|
||||||
import app.module.front.usecase.daily.record.ports.application.domain.UpdateDailyRecordStatusCmd;
|
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package app.module.front.usecase.daily.record.adapters.persistence.model;
|
package app.module.core.usecase.daily.record.adapters.persistence.model;
|
||||||
|
|
||||||
import app.module.core.config.application.enums.DailySort;
|
import app.module.core.config.application.enums.DailySort;
|
||||||
import app.module.core.config.application.enums.DailyStatus;
|
import app.module.core.config.application.enums.DailyStatus;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package app.module.front.usecase.daily.record.adapters.persistence.model;
|
package app.module.core.usecase.daily.record.adapters.persistence.model;
|
||||||
|
|
||||||
import app.module.core.config.application.enums.DailyStatus;
|
import app.module.core.config.application.enums.DailyStatus;
|
||||||
import app.module.core.config.application.enums.DailyTargetStatus;
|
import app.module.core.config.application.enums.DailyTargetStatus;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package app.module.front.usecase.daily.record.adapters.persistence.model;
|
package app.module.core.usecase.daily.record.adapters.persistence.model;
|
||||||
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package app.module.front.usecase.daily.record.adapters.web.model;
|
package app.module.core.usecase.daily.record.adapters.web.model;
|
||||||
|
|
||||||
import app.module.core.config.application.enums.DailyStatus;
|
import app.module.core.config.application.enums.DailyStatus;
|
||||||
import app.module.core.config.application.enums.DailyTargetStatus;
|
import app.module.core.config.application.enums.DailyTargetStatus;
|
||||||
@@ -13,6 +13,8 @@ public class CreateDailyRecordReqVO {
|
|||||||
private Long id;
|
private Long id;
|
||||||
private String recordMonth;
|
private String recordMonth;
|
||||||
private int dayGroupNo;
|
private int dayGroupNo;
|
||||||
|
private Long householdSeq;
|
||||||
|
|
||||||
private LocalDate startDate;
|
private LocalDate startDate;
|
||||||
private LocalDate endDate;
|
private LocalDate endDate;
|
||||||
private String todayNone;
|
private String todayNone;
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
package app.module.core.usecase.daily.record.adapters.web.model;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.ToString;
|
||||||
|
import org.apache.tika.utils.StringUtils;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@ToString
|
||||||
|
public class DailyUIReqVO {
|
||||||
|
public DailyUIReqVO() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public DailyUIReqVO(String searchMonth, Integer groupNo, Long householdSeq) {
|
||||||
|
this.householdSeq = householdSeq;
|
||||||
|
this.searchMonth = searchMonth;
|
||||||
|
this.groupNo = groupNo;
|
||||||
|
}
|
||||||
|
|
||||||
|
public DailyUIReqVO(String searchMonth, String groupNo, Long householdSeq) {
|
||||||
|
this.householdSeq = householdSeq;
|
||||||
|
this.searchMonth = searchMonth;
|
||||||
|
if (!StringUtils.isBlank(groupNo)) {
|
||||||
|
this.groupNo = Integer.parseInt(groupNo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 검색 월(yyyyMM)
|
||||||
|
*/
|
||||||
|
private String searchMonth;
|
||||||
|
/**
|
||||||
|
* 검색 그룸번호
|
||||||
|
*/
|
||||||
|
private Integer groupNo;
|
||||||
|
/**
|
||||||
|
* 임가 일련번호
|
||||||
|
*/
|
||||||
|
private Long householdSeq;
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package app.module.core.usecase.daily.record.ports;
|
||||||
|
|
||||||
|
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;
|
||||||
|
|
||||||
|
public interface DailyRecordPortIn {
|
||||||
|
/**
|
||||||
|
* 일계부 항목 조회
|
||||||
|
*
|
||||||
|
* @param reqVO 검색 조건
|
||||||
|
* @return 항목 상세
|
||||||
|
*/
|
||||||
|
DailyRecordDto detail(String recordMonth, Integer dayGroupNo, Long householdSeq);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 일계부 항목 등록
|
||||||
|
*
|
||||||
|
* @param formVO 입력 데이터
|
||||||
|
*/
|
||||||
|
void create(CreateDailyRecordReqVO formVO);
|
||||||
|
|
||||||
|
void updateByStatus(String recordMonth, Integer dayGroupNo, Long householdSeq, String targetType, String targetStatus);
|
||||||
|
|
||||||
|
void updateByAllStatus(String recordMonth, Integer dayGroupNo, Long householdSeq);
|
||||||
|
}
|
||||||
@@ -1,8 +1,9 @@
|
|||||||
package app.module.front.usecase.daily.record.ports;
|
package app.module.core.usecase.daily.record.ports;
|
||||||
|
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
|
||||||
import app.module.front.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||||
import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
|
import app.module.core.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd;
|
||||||
|
import app.module.core.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
|
||||||
|
|
||||||
public interface DailyRecordPortOut {
|
public interface DailyRecordPortOut {
|
||||||
/**
|
/**
|
||||||
@@ -20,5 +21,5 @@ public interface DailyRecordPortOut {
|
|||||||
*/
|
*/
|
||||||
void create(GetDailyRecordCmd findCmd, CreateDailyRecordCmd command);
|
void create(GetDailyRecordCmd findCmd, CreateDailyRecordCmd command);
|
||||||
|
|
||||||
void updateByStatus(String recordMonth, Integer dayGroupNo, String targetType, String targetStatus);
|
void updateByStatus(String recordMonth, Integer dayGroupNo, Long householdSeq, String targetType, String targetStatus);
|
||||||
}
|
}
|
||||||
@@ -1,16 +1,15 @@
|
|||||||
package app.module.front.usecase.daily.record.ports.application;
|
package app.module.core.usecase.daily.record.ports.application;
|
||||||
|
|
||||||
import app.module.front.config.application.util.AuditUtil;
|
|
||||||
import app.module.front.config.application.util.AuthUtil;
|
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO;
|
|
||||||
import app.module.core.config.application.enums.DailySort;
|
import app.module.core.config.application.enums.DailySort;
|
||||||
import app.module.core.config.application.enums.DailyTargetStatus;
|
import app.module.core.config.application.enums.DailyTargetStatus;
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
import app.module.core.config.application.util.AuditUtil;
|
||||||
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||||
import app.module.front.usecase.daily.record.ports.DailyRecordPortOut;
|
import app.module.core.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO;
|
||||||
import app.module.front.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd;
|
import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||||
import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortOut;
|
||||||
|
import app.module.core.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd;
|
||||||
|
import app.module.core.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -25,10 +24,8 @@ public class DailyRecordService implements DailyRecordPortIn {
|
|||||||
private final DailyRecordPortOut portOut;
|
private final DailyRecordPortOut portOut;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public DailyRecordDto detail(DailyUIReqVO reqVO) {
|
public DailyRecordDto detail(String recordMonth, Integer dayGroupNo, Long householdSeq) {
|
||||||
DailyRecordDto dailyRecord = portOut.detail(new GetDailyRecordCmd(reqVO.getSearchMonth(),
|
DailyRecordDto dailyRecord = portOut.detail(new GetDailyRecordCmd(recordMonth, dayGroupNo, householdSeq));
|
||||||
reqVO.getGroupNo(),
|
|
||||||
reqVO.getHouseholdSeq()));
|
|
||||||
|
|
||||||
if (dailyRecord != null) {
|
if (dailyRecord != null) {
|
||||||
List<DailySort> targetList = new ArrayList<>();
|
List<DailySort> targetList = new ArrayList<>();
|
||||||
@@ -71,13 +68,14 @@ public class DailyRecordService implements DailyRecordPortIn {
|
|||||||
GetDailyRecordCmd findCmd = new GetDailyRecordCmd(
|
GetDailyRecordCmd findCmd = new GetDailyRecordCmd(
|
||||||
formVO.getRecordMonth(),
|
formVO.getRecordMonth(),
|
||||||
formVO.getDayGroupNo(),
|
formVO.getDayGroupNo(),
|
||||||
AuthUtil.getUserSeq());
|
formVO.getHouseholdSeq());
|
||||||
|
|
||||||
CreateDailyRecordCmd command = AuditUtil.create(
|
CreateDailyRecordCmd command = AuditUtil.create(
|
||||||
new CreateDailyRecordCmd(
|
new CreateDailyRecordCmd(
|
||||||
null,
|
null,
|
||||||
formVO.getRecordMonth(),
|
formVO.getRecordMonth(),
|
||||||
formVO.getDayGroupNo(),
|
formVO.getDayGroupNo(),
|
||||||
|
formVO.getHouseholdSeq(),
|
||||||
formVO.getStartDate(),
|
formVO.getStartDate(),
|
||||||
formVO.getEndDate(),
|
formVO.getEndDate(),
|
||||||
formVO.getAllStatus(),
|
formVO.getAllStatus(),
|
||||||
@@ -92,13 +90,13 @@ public class DailyRecordService implements DailyRecordPortIn {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateByStatus(String recordMonth, Integer dayGroupNo, String targetType, String targetStatus) {
|
public void updateByStatus(String recordMonth, Integer dayGroupNo, Long householdSeq, String targetType, String targetStatus) {
|
||||||
portOut.updateByStatus(recordMonth, dayGroupNo, targetType, targetStatus);
|
portOut.updateByStatus(recordMonth, dayGroupNo, householdSeq, targetType, targetStatus);
|
||||||
portOut.updateByStatus(recordMonth, dayGroupNo, "ALL", null);
|
portOut.updateByStatus(recordMonth, dayGroupNo, householdSeq, "ALL", null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateByAllStatus(String recordMonth, Integer dayGroupNo) {
|
public void updateByAllStatus(String recordMonth, Integer dayGroupNo, Long householdSeq) {
|
||||||
portOut.updateByStatus(recordMonth, dayGroupNo, "ALL", null);
|
portOut.updateByStatus(recordMonth, dayGroupNo, householdSeq, "ALL", null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
package app.module.front.usecase.daily.record.ports.application.domain;
|
package app.module.core.usecase.daily.record.ports.application.domain;
|
||||||
|
|
||||||
import app.module.front.config.adapters.persistence.component.FrontAuditCommand;
|
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||||
import app.module.core.config.application.enums.DailyStatus;
|
import app.module.core.config.application.enums.DailyStatus;
|
||||||
import app.module.core.config.application.enums.DailyTargetStatus;
|
import app.module.core.config.application.enums.DailyTargetStatus;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
@@ -14,10 +14,11 @@ import java.time.LocalDate;
|
|||||||
@Setter
|
@Setter
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@ToString
|
@ToString
|
||||||
public class CreateDailyRecordCmd extends FrontAuditCommand {
|
public class CreateDailyRecordCmd extends AuditCommand {
|
||||||
private Long id;
|
private Long id;
|
||||||
private String recordMonth;
|
private String recordMonth;
|
||||||
private int dayGroupNo;
|
private int dayGroupNo;
|
||||||
|
private Long householdSeq;
|
||||||
private LocalDate startDate;
|
private LocalDate startDate;
|
||||||
private LocalDate endDate;
|
private LocalDate endDate;
|
||||||
private DailyStatus allStatus;
|
private DailyStatus allStatus;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package app.module.front.usecase.daily.record.ports.application.domain;
|
package app.module.core.usecase.daily.record.ports.application.domain;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
package app.module.front.usecase.daily.record.ports.application.domain;
|
package app.module.core.usecase.daily.record.ports.application.domain;
|
||||||
|
|
||||||
import app.module.front.config.adapters.persistence.component.FrontAuditCommand;
|
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
@@ -10,9 +10,10 @@ import lombok.ToString;
|
|||||||
@Setter
|
@Setter
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@ToString
|
@ToString
|
||||||
public class UpdateDailyRecordStatusCmd extends FrontAuditCommand {
|
public class UpdateDailyRecordStatusCmd extends AuditCommand {
|
||||||
private String recordMonth;
|
private String recordMonth;
|
||||||
private Integer dayGroupNo;
|
private Integer dayGroupNo;
|
||||||
|
private Long householdSeq;
|
||||||
private String allStatus;
|
private String allStatus;
|
||||||
private String targetType;
|
private String targetType;
|
||||||
private String targetStatus;
|
private String targetStatus;
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?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" >
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||||
<mapper namespace="app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper">
|
<mapper namespace="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper">
|
||||||
|
|
||||||
<select id="getDailyRecord"
|
<select id="getDailyRecord"
|
||||||
resultType="app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto">
|
resultType="app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto">
|
||||||
select ddg.group_no, ddg.start_day, ddg.end_day
|
select ddg.group_no, ddg.start_day, ddg.end_day
|
||||||
, dr.id, dr.record_month, dr.day_group_no, dr.start_date, dr.end_date
|
, dr.id, dr.record_month, 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
|
, dr.all_status, dr.income_status, dr.work_status, dr.expense_status, dr.power_status, dr.forestry_status, dr.farming_status
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getDailyRecordStatus"
|
<select id="getDailyRecordStatus"
|
||||||
resultType="app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto">
|
resultType="app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto">
|
||||||
select dr.id as daily_id
|
select dr.id as daily_id
|
||||||
, dr.day_group_no, dr.start_date, dr.end_date
|
, dr.day_group_no, dr.start_date, dr.end_date
|
||||||
, dr.all_status
|
, dr.all_status
|
||||||
@@ -10,9 +10,9 @@ import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut;
|
|||||||
import app.module.front.usecase.daily.calendar.ports.application.domain.CalendarChildren;
|
import app.module.front.usecase.daily.calendar.ports.application.domain.CalendarChildren;
|
||||||
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar;
|
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar;
|
||||||
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
|
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper;
|
import app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper;
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
|
||||||
import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
|
import app.module.core.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package app.module.front.usecase.daily.calendar.adapters.persistence;
|
package app.module.front.usecase.daily.calendar.adapters.persistence;
|
||||||
|
|
||||||
import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto;
|
import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto;
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
|
||||||
import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto;
|
import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto;
|
||||||
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
|
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package app.module.front.usecase.daily.calendar.adapters.web.model;
|
package app.module.front.usecase.daily.calendar.adapters.web.model;
|
||||||
|
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||||
import lombok.Data;
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
import lombok.ToString;
|
import lombok.ToString;
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ package app.module.front.usecase.daily.calendar.ports;
|
|||||||
|
|
||||||
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar;
|
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar;
|
||||||
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
|
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,11 @@
|
|||||||
package app.module.front.usecase.daily.calendar.ports.application;
|
package app.module.front.usecase.daily.calendar.ports.application;
|
||||||
|
|
||||||
import app.module.front.config.application.util.AuthUtil;
|
import app.module.front.config.application.util.AuthUtil;
|
||||||
import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO;
|
|
||||||
import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortIn;
|
import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortIn;
|
||||||
import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut;
|
import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut;
|
||||||
import app.module.front.usecase.daily.calendar.ports.application.domain.CalendarChildren;
|
|
||||||
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar;
|
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar;
|
||||||
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
|
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
|||||||
@@ -6,9 +6,9 @@ import app.module.front.usecase.daily.expense.adapters.web.model.CreateDailyExpe
|
|||||||
import app.module.front.usecase.daily.expense.adapters.web.model.RemoveDailyExpenseReqVO;
|
import app.module.front.usecase.daily.expense.adapters.web.model.RemoveDailyExpenseReqVO;
|
||||||
import app.module.front.usecase.daily.expense.adapters.web.validator.CreateDailyExpenseValidator;
|
import app.module.front.usecase.daily.expense.adapters.web.validator.CreateDailyExpenseValidator;
|
||||||
import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn;
|
import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn;
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||||
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import jakarta.validation.Valid;
|
import jakarta.validation.Valid;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
|
|||||||
@RequestMapping(path = "/api/record/expense")
|
@RequestMapping(path = "/api/record/expense")
|
||||||
public class DailyExpenseController {
|
public class DailyExpenseController {
|
||||||
private final CoreUtil coreUtil;
|
private final CoreUtil coreUtil;
|
||||||
private final DailyRecordPortIn dailyRecordService;
|
private final DailyRecordPortIn dailyRecordPortIn;
|
||||||
private final DailyExpensePortIn dailyExpensePortIn;
|
private final DailyExpensePortIn dailyExpensePortIn;
|
||||||
private final CreateDailyExpenseValidator createValidator;
|
private final CreateDailyExpenseValidator createValidator;
|
||||||
|
|
||||||
@@ -121,7 +121,7 @@ public class DailyExpenseController {
|
|||||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||||
log.debug("getRecordUIReq: {}", reqVO);
|
log.debug("getRecordUIReq: {}", reqVO);
|
||||||
|
|
||||||
DailyRecordDto dailyRecord = dailyRecordService.detail(reqVO);
|
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
|
||||||
if (dailyRecord == null || dailyRecord.getId() == null) {
|
if (dailyRecord == null || dailyRecord.getId() == null) {
|
||||||
throw new NoRecordDataException();
|
throw new NoRecordDataException();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
|||||||
import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto;
|
import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto;
|
||||||
import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO;
|
import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO;
|
||||||
import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn;
|
import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn;
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||||
import app.module.core.config.application.enums.DailySort;
|
import app.module.core.config.application.enums.DailySort;
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||||
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
@@ -28,7 +28,7 @@ import java.util.List;
|
|||||||
@RequestMapping(path = "/record/expense")
|
@RequestMapping(path = "/record/expense")
|
||||||
public class DailyExpenseUIController {
|
public class DailyExpenseUIController {
|
||||||
private final UICodeListPortIn uiCodeListPortIn;
|
private final UICodeListPortIn uiCodeListPortIn;
|
||||||
private final DailyRecordPortIn dailyRecordService;
|
private final DailyRecordPortIn dailyRecordPortIn;
|
||||||
private final DailyExpensePortIn dailyExpensePortIn;
|
private final DailyExpensePortIn dailyExpensePortIn;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -108,7 +108,7 @@ public class DailyExpenseUIController {
|
|||||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||||
log.debug("getRecordUIReq: {}", reqVO);
|
log.debug("getRecordUIReq: {}", reqVO);
|
||||||
|
|
||||||
DailyRecordDto dailyRecord = dailyRecordService.detail(reqVO);
|
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
|
||||||
if (dailyRecord == null || dailyRecord.getId() == null) {
|
if (dailyRecord == null || dailyRecord.getId() == null) {
|
||||||
throw new NoRecordDataException();
|
throw new NoRecordDataException();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package app.module.front.usecase.daily.expense.ports.application;
|
package app.module.front.usecase.daily.expense.ports.application;
|
||||||
|
|
||||||
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
||||||
import app.module.front.config.application.util.AuditUtil;
|
import app.module.front.config.application.util.AuditUtil;
|
||||||
@@ -13,7 +14,7 @@ import app.module.front.usecase.daily.expense.ports.DailyExpensePortOut;
|
|||||||
import app.module.front.usecase.daily.expense.ports.application.domain.CreateDailyExpenseCmd;
|
import app.module.front.usecase.daily.expense.ports.application.domain.CreateDailyExpenseCmd;
|
||||||
import app.module.front.usecase.daily.expense.ports.application.domain.GetDailyExpenseCmd;
|
import app.module.front.usecase.daily.expense.ports.application.domain.GetDailyExpenseCmd;
|
||||||
import app.module.front.usecase.daily.expense.ports.application.domain.RemoveDailyExpenseCmd;
|
import app.module.front.usecase.daily.expense.ports.application.domain.RemoveDailyExpenseCmd;
|
||||||
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
|
import app.module.core.usecase.daily.record.ports.application.DailyRecordService;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
@@ -24,7 +25,7 @@ import java.util.List;
|
|||||||
public class DailyExpenseService implements DailyExpensePortIn {
|
public class DailyExpenseService implements DailyExpensePortIn {
|
||||||
private final DailyExpensePortOut portOut;
|
private final DailyExpensePortOut portOut;
|
||||||
private final UICodeListPortIn uiCodeListPortIn;
|
private final UICodeListPortIn uiCodeListPortIn;
|
||||||
private final DailyRecordService dailyRecordService;
|
private final DailyRecordPortIn dailyRecordPortIn;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<DailyExpenseDto> list(DailyExpenseUIReqVO reqVO) {
|
public List<DailyExpenseDto> list(DailyExpenseUIReqVO reqVO) {
|
||||||
@@ -110,7 +111,7 @@ public class DailyExpenseService implements DailyExpensePortIn {
|
|||||||
|
|
||||||
portOut.create(findCmd, command);
|
portOut.create(findCmd, command);
|
||||||
|
|
||||||
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
|
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -132,6 +133,6 @@ public class DailyExpenseService implements DailyExpensePortIn {
|
|||||||
|
|
||||||
portOut.remove(findCmd, command);
|
portOut.remove(findCmd, command);
|
||||||
|
|
||||||
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
|
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,9 +6,9 @@ import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarm
|
|||||||
import app.module.front.usecase.daily.farming.adapters.web.model.RemoveDailyFarmingReqVO;
|
import app.module.front.usecase.daily.farming.adapters.web.model.RemoveDailyFarmingReqVO;
|
||||||
import app.module.front.usecase.daily.farming.adapters.web.validator.CreateDailyFarmingValidator;
|
import app.module.front.usecase.daily.farming.adapters.web.validator.CreateDailyFarmingValidator;
|
||||||
import app.module.front.usecase.daily.farming.ports.application.DailyFarmingService;
|
import app.module.front.usecase.daily.farming.ports.application.DailyFarmingService;
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||||
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import jakarta.validation.Valid;
|
import jakarta.validation.Valid;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
|
|||||||
@RequestMapping(path = "/api/record/farming")
|
@RequestMapping(path = "/api/record/farming")
|
||||||
public class DailyFarmingController {
|
public class DailyFarmingController {
|
||||||
private final CoreUtil coreUtil;
|
private final CoreUtil coreUtil;
|
||||||
private final DailyRecordPortIn dailyRecordService;
|
private final DailyRecordPortIn dailyRecordPortIn;
|
||||||
private final DailyFarmingService dailyFarmingPortIn;
|
private final DailyFarmingService dailyFarmingPortIn;
|
||||||
private final CreateDailyFarmingValidator createValidator;
|
private final CreateDailyFarmingValidator createValidator;
|
||||||
|
|
||||||
@@ -121,7 +121,7 @@ public class DailyFarmingController {
|
|||||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||||
log.debug("getRecordUIReq: {}", reqVO);
|
log.debug("getRecordUIReq: {}", reqVO);
|
||||||
|
|
||||||
DailyRecordDto dailyRecord = dailyRecordService.detail(reqVO);
|
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
|
||||||
if (dailyRecord == null || dailyRecord.getId() == null) {
|
if (dailyRecord == null || dailyRecord.getId() == null) {
|
||||||
throw new NoRecordDataException();
|
throw new NoRecordDataException();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
|||||||
import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingDto;
|
import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingDto;
|
||||||
import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIReqVO;
|
import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIReqVO;
|
||||||
import app.module.front.usecase.daily.farming.ports.application.DailyFarmingService;
|
import app.module.front.usecase.daily.farming.ports.application.DailyFarmingService;
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||||
import app.module.core.config.application.enums.DailySort;
|
import app.module.core.config.application.enums.DailySort;
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||||
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
@@ -108,7 +108,7 @@ public class DailyFarmingUIController {
|
|||||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||||
log.debug("getRecordUIReq: {}", reqVO);
|
log.debug("getRecordUIReq: {}", reqVO);
|
||||||
|
|
||||||
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
|
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
|
||||||
if (dailyRecord == null || dailyRecord.getId() == null) {
|
if (dailyRecord == null || dailyRecord.getId() == null) {
|
||||||
throw new NoRecordDataException();
|
throw new NoRecordDataException();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package app.module.front.usecase.daily.farming.ports.application;
|
package app.module.front.usecase.daily.farming.ports.application;
|
||||||
|
|
||||||
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
||||||
import app.module.front.config.application.util.AuditUtil;
|
import app.module.front.config.application.util.AuditUtil;
|
||||||
@@ -13,7 +14,6 @@ import app.module.front.usecase.daily.farming.ports.DailyFarmingPortOut;
|
|||||||
import app.module.front.usecase.daily.farming.ports.application.domain.CreateDailyFarmingCmd;
|
import app.module.front.usecase.daily.farming.ports.application.domain.CreateDailyFarmingCmd;
|
||||||
import app.module.front.usecase.daily.farming.ports.application.domain.GetDailyFarmingCmd;
|
import app.module.front.usecase.daily.farming.ports.application.domain.GetDailyFarmingCmd;
|
||||||
import app.module.front.usecase.daily.farming.ports.application.domain.RemoveDailyFarmingCmd;
|
import app.module.front.usecase.daily.farming.ports.application.domain.RemoveDailyFarmingCmd;
|
||||||
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -26,7 +26,7 @@ import java.util.List;
|
|||||||
public class DailyFarmingService implements DailyFarmingPortIn {
|
public class DailyFarmingService implements DailyFarmingPortIn {
|
||||||
private final DailyFarmingPortOut portOut;
|
private final DailyFarmingPortOut portOut;
|
||||||
private final UICodeListPortIn uiCodeListPortIn;
|
private final UICodeListPortIn uiCodeListPortIn;
|
||||||
private final DailyRecordService dailyRecordService;
|
private final DailyRecordPortIn dailyRecordPortIn;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<DailyFarmingDto> list(DailyFarmingUIReqVO reqVO) {
|
public List<DailyFarmingDto> list(DailyFarmingUIReqVO reqVO) {
|
||||||
@@ -135,7 +135,7 @@ public class DailyFarmingService implements DailyFarmingPortIn {
|
|||||||
|
|
||||||
portOut.create(findCmd, command);
|
portOut.create(findCmd, command);
|
||||||
|
|
||||||
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
|
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -157,6 +157,6 @@ public class DailyFarmingService implements DailyFarmingPortIn {
|
|||||||
|
|
||||||
portOut.remove(findCmd, command);
|
portOut.remove(findCmd, command);
|
||||||
|
|
||||||
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
|
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,9 +6,9 @@ import app.module.front.usecase.daily.forestry.adapters.web.model.CreateDailyFor
|
|||||||
import app.module.front.usecase.daily.forestry.adapters.web.model.RemoveDailyForestryReqVO;
|
import app.module.front.usecase.daily.forestry.adapters.web.model.RemoveDailyForestryReqVO;
|
||||||
import app.module.front.usecase.daily.forestry.adapters.web.validator.CreateDailyForestryValidator;
|
import app.module.front.usecase.daily.forestry.adapters.web.validator.CreateDailyForestryValidator;
|
||||||
import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn;
|
import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn;
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||||
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import jakarta.validation.Valid;
|
import jakarta.validation.Valid;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -121,7 +121,7 @@ public class DailyForestryController {
|
|||||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||||
log.debug("getRecordUIReq: {}", reqVO);
|
log.debug("getRecordUIReq: {}", reqVO);
|
||||||
|
|
||||||
DailyRecordDto dailyRecord = dailyRecordService.detail(reqVO);
|
DailyRecordDto dailyRecord = dailyRecordService.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
|
||||||
if (dailyRecord == null || dailyRecord.getId() == null) {
|
if (dailyRecord == null || dailyRecord.getId() == null) {
|
||||||
throw new NoRecordDataException();
|
throw new NoRecordDataException();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
|||||||
import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyForestryDto;
|
import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyForestryDto;
|
||||||
import app.module.front.usecase.daily.forestry.adapters.web.model.DailyForestryUIReqVO;
|
import app.module.front.usecase.daily.forestry.adapters.web.model.DailyForestryUIReqVO;
|
||||||
import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn;
|
import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn;
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||||
import app.module.core.config.application.enums.DailySort;
|
import app.module.core.config.application.enums.DailySort;
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||||
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
@@ -108,7 +108,7 @@ public class DailyForestryUIController {
|
|||||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||||
log.debug("getRecordUIReq: {}", reqVO);
|
log.debug("getRecordUIReq: {}", reqVO);
|
||||||
|
|
||||||
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
|
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
|
||||||
if (dailyRecord == null || dailyRecord.getId() == null) {
|
if (dailyRecord == null || dailyRecord.getId() == null) {
|
||||||
throw new NoRecordDataException();
|
throw new NoRecordDataException();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package app.module.front.usecase.daily.forestry.ports.application;
|
package app.module.front.usecase.daily.forestry.ports.application;
|
||||||
|
|
||||||
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
||||||
import app.module.front.config.application.util.AuditUtil;
|
import app.module.front.config.application.util.AuditUtil;
|
||||||
@@ -13,7 +14,7 @@ import app.module.front.usecase.daily.forestry.ports.DailyForestryPortOut;
|
|||||||
import app.module.front.usecase.daily.forestry.ports.application.domain.CreateDailyForestryCmd;
|
import app.module.front.usecase.daily.forestry.ports.application.domain.CreateDailyForestryCmd;
|
||||||
import app.module.front.usecase.daily.forestry.ports.application.domain.GetDailyForestryCmd;
|
import app.module.front.usecase.daily.forestry.ports.application.domain.GetDailyForestryCmd;
|
||||||
import app.module.front.usecase.daily.forestry.ports.application.domain.RemoveDailyForestryCmd;
|
import app.module.front.usecase.daily.forestry.ports.application.domain.RemoveDailyForestryCmd;
|
||||||
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
|
import app.module.core.usecase.daily.record.ports.application.DailyRecordService;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -26,7 +27,7 @@ import java.util.List;
|
|||||||
public class DailyForestryService implements DailyForestryPortIn {
|
public class DailyForestryService implements DailyForestryPortIn {
|
||||||
private final DailyForestryPortOut portOut;
|
private final DailyForestryPortOut portOut;
|
||||||
private final UICodeListPortIn uiCodeListPortIn;
|
private final UICodeListPortIn uiCodeListPortIn;
|
||||||
private final DailyRecordService dailyRecordService;
|
private final DailyRecordPortIn dailyRecordPortIn;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<DailyForestryDto> list(DailyForestryUIReqVO reqVO) {
|
public List<DailyForestryDto> list(DailyForestryUIReqVO reqVO) {
|
||||||
@@ -108,7 +109,7 @@ public class DailyForestryService implements DailyForestryPortIn {
|
|||||||
|
|
||||||
portOut.create(findCmd, command);
|
portOut.create(findCmd, command);
|
||||||
|
|
||||||
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
|
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -130,6 +131,6 @@ public class DailyForestryService implements DailyForestryPortIn {
|
|||||||
|
|
||||||
portOut.remove(findCmd, command);
|
portOut.remove(findCmd, command);
|
||||||
|
|
||||||
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
|
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,9 +6,9 @@ import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncom
|
|||||||
import app.module.front.usecase.daily.income.adapters.web.model.RemoveDailyIncomeReqVO;
|
import app.module.front.usecase.daily.income.adapters.web.model.RemoveDailyIncomeReqVO;
|
||||||
import app.module.front.usecase.daily.income.adapters.web.validator.CreateDailyIncomeValidator;
|
import app.module.front.usecase.daily.income.adapters.web.validator.CreateDailyIncomeValidator;
|
||||||
import app.module.front.usecase.daily.income.ports.DailyIncomePortIn;
|
import app.module.front.usecase.daily.income.ports.DailyIncomePortIn;
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||||
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import jakarta.validation.Valid;
|
import jakarta.validation.Valid;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -121,7 +121,7 @@ public class DailyIncomeController {
|
|||||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||||
log.debug("getRecordUIReq: {}", reqVO);
|
log.debug("getRecordUIReq: {}", reqVO);
|
||||||
|
|
||||||
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
|
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
|
||||||
if (dailyRecord == null || dailyRecord.getId() == null) {
|
if (dailyRecord == null || dailyRecord.getId() == null) {
|
||||||
throw new NoRecordDataException();
|
throw new NoRecordDataException();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
|||||||
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
|
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
|
||||||
import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO;
|
import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO;
|
||||||
import app.module.front.usecase.daily.income.ports.DailyIncomePortIn;
|
import app.module.front.usecase.daily.income.ports.DailyIncomePortIn;
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||||
import app.module.core.config.application.enums.DailySort;
|
import app.module.core.config.application.enums.DailySort;
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||||
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
@@ -109,7 +109,7 @@ public class DailyIncomeUIController {
|
|||||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||||
log.debug("getRecordUIReq: {}", reqVO);
|
log.debug("getRecordUIReq: {}", reqVO);
|
||||||
|
|
||||||
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
|
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
|
||||||
if (dailyRecord == null || dailyRecord.getId() == null) {
|
if (dailyRecord == null || dailyRecord.getId() == null) {
|
||||||
throw new NoRecordDataException();
|
throw new NoRecordDataException();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package app.module.front.usecase.daily.income.ports.application;
|
package app.module.front.usecase.daily.income.ports.application;
|
||||||
|
|
||||||
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
||||||
import app.module.front.config.application.util.AuditUtil;
|
import app.module.front.config.application.util.AuditUtil;
|
||||||
@@ -13,7 +14,7 @@ import app.module.front.usecase.daily.income.ports.DailyIncomePortOut;
|
|||||||
import app.module.front.usecase.daily.income.ports.application.domain.CreateDailyIncomeCmd;
|
import app.module.front.usecase.daily.income.ports.application.domain.CreateDailyIncomeCmd;
|
||||||
import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd;
|
import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd;
|
||||||
import app.module.front.usecase.daily.income.ports.application.domain.RemoveDailyIncomeCmd;
|
import app.module.front.usecase.daily.income.ports.application.domain.RemoveDailyIncomeCmd;
|
||||||
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
|
import app.module.core.usecase.daily.record.ports.application.DailyRecordService;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
@@ -24,7 +25,7 @@ import java.util.List;
|
|||||||
public class DailyIncomeService implements DailyIncomePortIn {
|
public class DailyIncomeService implements DailyIncomePortIn {
|
||||||
private final DailyIncomePortOut portOut;
|
private final DailyIncomePortOut portOut;
|
||||||
private final UICodeListPortIn uiCodeListPortIn;
|
private final UICodeListPortIn uiCodeListPortIn;
|
||||||
private final DailyRecordService dailyRecordService;
|
private final DailyRecordPortIn dailyRecordPortIn;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<DailyIncomeDto> list(DailyIncomeUIReqVO reqVO) {
|
public List<DailyIncomeDto> list(DailyIncomeUIReqVO reqVO) {
|
||||||
@@ -114,7 +115,7 @@ public class DailyIncomeService implements DailyIncomePortIn {
|
|||||||
|
|
||||||
portOut.create(findCmd, command);
|
portOut.create(findCmd, command);
|
||||||
|
|
||||||
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
|
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -136,6 +137,6 @@ public class DailyIncomeService implements DailyIncomePortIn {
|
|||||||
|
|
||||||
portOut.remove(findCmd, command);
|
portOut.remove(findCmd, command);
|
||||||
|
|
||||||
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
|
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,9 +6,9 @@ import app.module.front.usecase.daily.power.adapters.web.model.CreateDailyPowerR
|
|||||||
import app.module.front.usecase.daily.power.adapters.web.model.RemoveDailyPowerReqVO;
|
import app.module.front.usecase.daily.power.adapters.web.model.RemoveDailyPowerReqVO;
|
||||||
import app.module.front.usecase.daily.power.adapters.web.validator.CreateDailyPowerValidator;
|
import app.module.front.usecase.daily.power.adapters.web.validator.CreateDailyPowerValidator;
|
||||||
import app.module.front.usecase.daily.power.ports.DailyPowerPortIn;
|
import app.module.front.usecase.daily.power.ports.DailyPowerPortIn;
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||||
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import jakarta.validation.Valid;
|
import jakarta.validation.Valid;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -121,7 +121,7 @@ public class DailyPowerController {
|
|||||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||||
log.debug("getRecordUIReq: {}", reqVO);
|
log.debug("getRecordUIReq: {}", reqVO);
|
||||||
|
|
||||||
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
|
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
|
||||||
if (dailyRecord == null || dailyRecord.getId() == null) {
|
if (dailyRecord == null || dailyRecord.getId() == null) {
|
||||||
throw new NoRecordDataException();
|
throw new NoRecordDataException();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ import app.module.core.config.application.exception.NoRecordDataException;
|
|||||||
import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto;
|
import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto;
|
||||||
import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO;
|
import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO;
|
||||||
import app.module.front.usecase.daily.power.ports.DailyPowerPortIn;
|
import app.module.front.usecase.daily.power.ports.DailyPowerPortIn;
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||||
import app.module.core.config.application.enums.DailySort;
|
import app.module.core.config.application.enums.DailySort;
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||||
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
@@ -103,7 +103,7 @@ public class DailyPowerUIController {
|
|||||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||||
log.debug("getRecordUIReq: {}", reqVO);
|
log.debug("getRecordUIReq: {}", reqVO);
|
||||||
|
|
||||||
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
|
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
|
||||||
if (dailyRecord == null || dailyRecord.getId() == null) {
|
if (dailyRecord == null || dailyRecord.getId() == null) {
|
||||||
throw new NoRecordDataException();
|
throw new NoRecordDataException();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,7 @@
|
|||||||
package app.module.front.usecase.daily.power.ports.application;
|
package app.module.front.usecase.daily.power.ports.application;
|
||||||
|
|
||||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
|
||||||
import app.module.front.config.application.util.AuditUtil;
|
import app.module.front.config.application.util.AuditUtil;
|
||||||
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
|
|
||||||
import app.module.front.usecase.daily.income.ports.application.domain.CreateDailyIncomeCmd;
|
|
||||||
import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd;
|
|
||||||
import app.module.front.usecase.daily.income.ports.application.domain.RemoveDailyIncomeCmd;
|
|
||||||
import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto;
|
import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto;
|
||||||
import app.module.front.usecase.daily.power.adapters.web.model.CreateDailyPowerReqVO;
|
import app.module.front.usecase.daily.power.adapters.web.model.CreateDailyPowerReqVO;
|
||||||
import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO;
|
import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO;
|
||||||
@@ -16,7 +11,7 @@ import app.module.front.usecase.daily.power.ports.DailyPowerPortOut;
|
|||||||
import app.module.front.usecase.daily.power.ports.application.domain.CreateDailyPowerCmd;
|
import app.module.front.usecase.daily.power.ports.application.domain.CreateDailyPowerCmd;
|
||||||
import app.module.front.usecase.daily.power.ports.application.domain.GetDailyPowerCmd;
|
import app.module.front.usecase.daily.power.ports.application.domain.GetDailyPowerCmd;
|
||||||
import app.module.front.usecase.daily.power.ports.application.domain.RemoveDailyPowerCmd;
|
import app.module.front.usecase.daily.power.ports.application.domain.RemoveDailyPowerCmd;
|
||||||
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
|
import app.module.core.usecase.daily.record.ports.application.DailyRecordService;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
@@ -26,7 +21,7 @@ import java.util.List;
|
|||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class DailyPowerService implements DailyPowerPortIn {
|
public class DailyPowerService implements DailyPowerPortIn {
|
||||||
private final DailyPowerPortOut portOut;
|
private final DailyPowerPortOut portOut;
|
||||||
private final DailyRecordService dailyRecordService;
|
private final DailyRecordPortIn dailyRecordPortIn;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<DailyPowerDto> list(DailyPowerUIReqVO reqVO) {
|
public List<DailyPowerDto> list(DailyPowerUIReqVO reqVO) {
|
||||||
@@ -74,7 +69,7 @@ public class DailyPowerService implements DailyPowerPortIn {
|
|||||||
|
|
||||||
portOut.create(findCmd, command);
|
portOut.create(findCmd, command);
|
||||||
|
|
||||||
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
|
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -96,6 +91,6 @@ public class DailyPowerService implements DailyPowerPortIn {
|
|||||||
|
|
||||||
portOut.remove(findCmd, command);
|
portOut.remove(findCmd, command);
|
||||||
|
|
||||||
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
|
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
package app.module.front.usecase.daily.record.adapters.web;
|
package app.module.front.usecase.daily.record.adapters.web;
|
||||||
|
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO;
|
|
||||||
import app.module.core.config.application.enums.DailyTargetStatus;
|
import app.module.core.config.application.enums.DailyTargetStatus;
|
||||||
|
import app.module.core.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO;
|
||||||
|
import app.module.front.config.application.util.AuditUtil;
|
||||||
|
import app.module.front.config.application.util.AuthUtil;
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||||
import app.module.front.usecase.daily.record.adapters.web.validator.CreateDailyRecordValidator;
|
import app.module.front.usecase.daily.record.adapters.web.validator.CreateDailyRecordValidator;
|
||||||
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import jakarta.validation.Valid;
|
import jakarta.validation.Valid;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -43,12 +45,13 @@ public class DailyRecordController {
|
|||||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||||
log.debug("reqVO: {}", reqVO);
|
log.debug("reqVO: {}", reqVO);
|
||||||
|
|
||||||
DailyRecordDto detail = dailyRecordPortIn.detail(reqVO);
|
DailyRecordDto detail = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
|
||||||
formVO.setRecordMonth(reqVO.getSearchMonth());
|
formVO.setRecordMonth(reqVO.getSearchMonth());
|
||||||
formVO.setDayGroupNo(reqVO.getGroupNo());
|
formVO.setDayGroupNo(reqVO.getGroupNo());
|
||||||
formVO.setStartDate(detail.getStartDate());
|
formVO.setStartDate(detail.getStartDate());
|
||||||
formVO.setEndDate(detail.getEndDate());
|
formVO.setEndDate(detail.getEndDate());
|
||||||
formVO.setFarming(detail.isFarmingOpen());
|
formVO.setFarming(detail.isFarmingOpen());
|
||||||
|
formVO.setHouseholdSeq(reqVO.getHouseholdSeq());
|
||||||
log.debug("formVO: {}", formVO);
|
log.debug("formVO: {}", formVO);
|
||||||
|
|
||||||
dailyRecordPortIn.create(formVO);
|
dailyRecordPortIn.create(formVO);
|
||||||
@@ -72,10 +75,10 @@ public class DailyRecordController {
|
|||||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||||
log.debug("reqVO: {}, target: {}, status: {}", reqVO, targetType, targetStatus);
|
log.debug("reqVO: {}, target: {}, status: {}", reqVO, targetType, targetStatus);
|
||||||
|
|
||||||
DailyRecordDto detail = dailyRecordPortIn.detail(reqVO);
|
DailyRecordDto detail = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
|
||||||
|
|
||||||
// TODO : true / false 를 업데이트하는 것은 대상 타켓이 되는 것이라 판단하여 그냥 강제 업데이트할 것인가? valid 체크
|
// TODO : true / false 를 업데이트하는 것은 대상 타켓이 되는 것이라 판단하여 그냥 강제 업데이트할 것인가? valid 체크
|
||||||
dailyRecordPortIn.updateByStatus(detail.getRecordMonth(), detail.getGroupNo(), targetType, "Y".equals(targetStatus) ? DailyTargetStatus.TODAY_NONE.name() : DailyTargetStatus.TARGET.name());
|
dailyRecordPortIn.updateByStatus(detail.getRecordMonth(), detail.getGroupNo(), reqVO.getHouseholdSeq(), targetType, "Y".equals(targetStatus) ? DailyTargetStatus.TODAY_NONE.name() : DailyTargetStatus.TARGET.name());
|
||||||
|
|
||||||
return ResponseEntity.status(HttpStatus.OK).body(reqVO);
|
return ResponseEntity.status(HttpStatus.OK).body(reqVO);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,10 +11,10 @@ import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReq
|
|||||||
import app.module.front.usecase.daily.income.ports.DailyIncomePortIn;
|
import app.module.front.usecase.daily.income.ports.DailyIncomePortIn;
|
||||||
import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO;
|
import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO;
|
||||||
import app.module.front.usecase.daily.power.ports.DailyPowerPortIn;
|
import app.module.front.usecase.daily.power.ports.DailyPowerPortIn;
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||||
import app.module.core.config.application.enums.DailyStatus;
|
import app.module.core.config.application.enums.DailyStatus;
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||||
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO;
|
import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO;
|
||||||
import app.module.front.usecase.daily.work.ports.DailyWorkPortIn;
|
import app.module.front.usecase.daily.work.ports.DailyWorkPortIn;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
@@ -52,7 +52,7 @@ public class DailyRecordUIController {
|
|||||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||||
log.debug("reqVO: {}", reqVO);
|
log.debug("reqVO: {}", reqVO);
|
||||||
|
|
||||||
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
|
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
|
||||||
if (dailyRecord == null) {
|
if (dailyRecord == null) {
|
||||||
throw new NoMatchingURIException("[Record] 잘못된 접근");
|
throw new NoMatchingURIException("[Record] 잘못된 접근");
|
||||||
}
|
}
|
||||||
@@ -77,7 +77,7 @@ public class DailyRecordUIController {
|
|||||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||||
log.debug("reqVO: {}", reqVO);
|
log.debug("reqVO: {}", reqVO);
|
||||||
|
|
||||||
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
|
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
|
||||||
if (dailyRecord == null) {
|
if (dailyRecord == null) {
|
||||||
throw new NoMatchingURIException("[Record] 잘못된 접근");
|
throw new NoMatchingURIException("[Record] 잘못된 접근");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package app.module.front.usecase.daily.record.adapters.web.validator;
|
package app.module.front.usecase.daily.record.adapters.web.validator;
|
||||||
|
|
||||||
import app.module.core.config.application.util.MessageUtil;
|
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO;
|
|
||||||
import app.module.core.config.application.enums.DailyStatus;
|
import app.module.core.config.application.enums.DailyStatus;
|
||||||
|
import app.module.core.config.application.util.MessageUtil;
|
||||||
|
import app.module.core.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import org.springframework.validation.Errors;
|
import org.springframework.validation.Errors;
|
||||||
|
|||||||
@@ -1,26 +0,0 @@
|
|||||||
package app.module.front.usecase.daily.record.ports;
|
|
||||||
|
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO;
|
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
|
||||||
|
|
||||||
public interface DailyRecordPortIn {
|
|
||||||
/**
|
|
||||||
* 일계부 항목 조회
|
|
||||||
*
|
|
||||||
* @param reqVO 검색 조건
|
|
||||||
* @return 항목 상세
|
|
||||||
*/
|
|
||||||
DailyRecordDto detail(DailyUIReqVO reqVO);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 일계부 항목 등록
|
|
||||||
*
|
|
||||||
* @param formVO 입력 데이터
|
|
||||||
*/
|
|
||||||
void create(CreateDailyRecordReqVO formVO);
|
|
||||||
|
|
||||||
void updateByStatus(String recordMonth, Integer dayGroupNo, String targetType, String targetStatus);
|
|
||||||
|
|
||||||
void updateByAllStatus(String recordMonth, Integer dayGroupNo);
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,5 @@
|
|||||||
package app.module.front.usecase.daily.work.adapters.persistence;
|
package app.module.front.usecase.daily.work.adapters.persistence;
|
||||||
|
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.DailyRecordDao;
|
|
||||||
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
|
|
||||||
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto;
|
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto;
|
||||||
import app.module.front.usecase.daily.work.ports.DailyWorkPortOut;
|
import app.module.front.usecase.daily.work.ports.DailyWorkPortOut;
|
||||||
import app.module.front.usecase.daily.work.ports.application.domain.CreateDailyWorkCmd;
|
import app.module.front.usecase.daily.work.ports.application.domain.CreateDailyWorkCmd;
|
||||||
|
|||||||
@@ -2,9 +2,9 @@ package app.module.front.usecase.daily.work.adapters.web;
|
|||||||
|
|
||||||
import app.module.core.config.application.exception.NoRecordDataException;
|
import app.module.core.config.application.exception.NoRecordDataException;
|
||||||
import app.module.core.config.application.util.CoreUtil;
|
import app.module.core.config.application.util.CoreUtil;
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||||
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO;
|
import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO;
|
||||||
import app.module.front.usecase.daily.work.adapters.web.model.RemoveDailyWorkReqVO;
|
import app.module.front.usecase.daily.work.adapters.web.model.RemoveDailyWorkReqVO;
|
||||||
import app.module.front.usecase.daily.work.adapters.web.validator.CreateDailyWorkValidator;
|
import app.module.front.usecase.daily.work.adapters.web.validator.CreateDailyWorkValidator;
|
||||||
@@ -125,7 +125,7 @@ public class DailyWorkController {
|
|||||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||||
log.debug("getRecordUIReq: {}", reqVO);
|
log.debug("getRecordUIReq: {}", reqVO);
|
||||||
|
|
||||||
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
|
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
|
||||||
if (dailyRecord == null || dailyRecord.getId() == null) {
|
if (dailyRecord == null || dailyRecord.getId() == null) {
|
||||||
throw new NoRecordDataException();
|
throw new NoRecordDataException();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,10 +2,10 @@ package app.module.front.usecase.daily.work.adapters.web;
|
|||||||
|
|
||||||
import app.module.core.config.application.exception.NoRecordDataException;
|
import app.module.core.config.application.exception.NoRecordDataException;
|
||||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||||
import app.module.core.config.application.enums.DailySort;
|
import app.module.core.config.application.enums.DailySort;
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||||
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto;
|
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto;
|
||||||
import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO;
|
import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO;
|
||||||
import app.module.front.usecase.daily.work.ports.DailyWorkPortIn;
|
import app.module.front.usecase.daily.work.ports.DailyWorkPortIn;
|
||||||
@@ -109,7 +109,7 @@ public class DailyWorkUIController {
|
|||||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||||
log.debug("getRecordUIReq: {}", reqVO);
|
log.debug("getRecordUIReq: {}", reqVO);
|
||||||
|
|
||||||
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
|
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
|
||||||
if (dailyRecord == null || dailyRecord.getId() == null) {
|
if (dailyRecord == null || dailyRecord.getId() == null) {
|
||||||
throw new NoRecordDataException();
|
throw new NoRecordDataException();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
package app.module.front.usecase.daily.work.ports.application;
|
package app.module.front.usecase.daily.work.ports.application;
|
||||||
|
|
||||||
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
||||||
import app.module.front.config.application.util.AuditUtil;
|
import app.module.front.config.application.util.AuditUtil;
|
||||||
import app.module.front.config.constants.CommonConstants;
|
import app.module.front.config.constants.CommonConstants;
|
||||||
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
|
import app.module.core.usecase.daily.record.ports.application.DailyRecordService;
|
||||||
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto;
|
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto;
|
||||||
import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO;
|
import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO;
|
||||||
import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO;
|
import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO;
|
||||||
@@ -24,7 +25,7 @@ import java.util.List;
|
|||||||
public class DailyWorkService implements DailyWorkPortIn {
|
public class DailyWorkService implements DailyWorkPortIn {
|
||||||
private final DailyWorkPortOut portOut;
|
private final DailyWorkPortOut portOut;
|
||||||
private final UICodeListPortIn uiCodeListPortIn;
|
private final UICodeListPortIn uiCodeListPortIn;
|
||||||
private final DailyRecordService dailyRecordService;
|
private final DailyRecordPortIn dailyRecordPortIn;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<DailyWorkDto> list(DailyWorkUIReqVO reqVO) {
|
public List<DailyWorkDto> list(DailyWorkUIReqVO reqVO) {
|
||||||
@@ -124,7 +125,7 @@ public class DailyWorkService implements DailyWorkPortIn {
|
|||||||
|
|
||||||
portOut.create(findCmd, command);
|
portOut.create(findCmd, command);
|
||||||
|
|
||||||
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
|
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -146,6 +147,6 @@ public class DailyWorkService implements DailyWorkPortIn {
|
|||||||
|
|
||||||
portOut.remove(findCmd, command);
|
portOut.remove(findCmd, command);
|
||||||
|
|
||||||
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
|
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
, ds.expense_kind, ds.source_purpose
|
, ds.expense_kind, ds.source_purpose
|
||||||
, ds.quantity, ds.unit_code, ds.unit_self, ds.price, ds.estimated_value
|
, ds.quantity, ds.unit_code, ds.unit_self, ds.price, ds.estimated_value
|
||||||
from daily_expense ds
|
from daily_expense ds
|
||||||
<include refid="app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
||||||
where ds.is_deleted = false
|
where ds.is_deleted = false
|
||||||
<if test="id != null and id != '0'">
|
<if test="id != null and id != '0'">
|
||||||
and ds.id = ${id}
|
and ds.id = ${id}
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
<select id="getRecordExistCount" resultType="int">
|
<select id="getRecordExistCount" resultType="int">
|
||||||
select count(1)
|
select count(1)
|
||||||
from daily_expense ds
|
from daily_expense ds
|
||||||
<include refid="app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
||||||
where ds.is_deleted = false
|
where ds.is_deleted = false
|
||||||
<if test="id != null and id != '0'">
|
<if test="id != null and id != '0'">
|
||||||
and ds.id = ${id}
|
and ds.id = ${id}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
, ds.product_code, ds.product_self, ds.usage
|
, ds.product_code, ds.product_self, ds.usage
|
||||||
, ds.quantity, ds.unit_code, ds.unit_self, ds.estimated_value
|
, ds.quantity, ds.unit_code, ds.unit_self, ds.estimated_value
|
||||||
from daily_farming ds
|
from daily_farming ds
|
||||||
<include refid="app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
||||||
where ds.is_deleted = false
|
where ds.is_deleted = false
|
||||||
<if test="id != null and id != '0'">
|
<if test="id != null and id != '0'">
|
||||||
and ds.id = ${id}
|
and ds.id = ${id}
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
<select id="getRecordExistCount" resultType="int">
|
<select id="getRecordExistCount" resultType="int">
|
||||||
select count(1)
|
select count(1)
|
||||||
from daily_farming ds
|
from daily_farming ds
|
||||||
<include refid="app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
||||||
where ds.is_deleted = false
|
where ds.is_deleted = false
|
||||||
<if test="id != null and id != '0'">
|
<if test="id != null and id != '0'">
|
||||||
and ds.id = ${id}
|
and ds.id = ${id}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
, ds.product_name, ds.usage
|
, ds.product_name, ds.usage
|
||||||
, ds.quantity, ds.unit_code, ds.unit_self, ds.estimated_value
|
, ds.quantity, ds.unit_code, ds.unit_self, ds.estimated_value
|
||||||
from daily_forestry ds
|
from daily_forestry ds
|
||||||
<include refid="app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
||||||
where ds.is_deleted = false
|
where ds.is_deleted = false
|
||||||
<if test="id != null and id != '0'">
|
<if test="id != null and id != '0'">
|
||||||
and ds.id = ${id}
|
and ds.id = ${id}
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
<select id="getRecordExistCount" resultType="int">
|
<select id="getRecordExistCount" resultType="int">
|
||||||
select count(1)
|
select count(1)
|
||||||
from daily_forestry ds
|
from daily_forestry ds
|
||||||
<include refid="app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
||||||
where ds.is_deleted = false
|
where ds.is_deleted = false
|
||||||
<if test="id != null and id != '0'">
|
<if test="id != null and id != '0'">
|
||||||
and ds.id = ${id}
|
and ds.id = ${id}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
, ds.crop_code, ds.income_kind, ds.source_purpose
|
, ds.crop_code, ds.income_kind, ds.source_purpose
|
||||||
, ds.quantity, ds.unit_code, ds.unit_self, ds.price, ds.estimated_value
|
, ds.quantity, ds.unit_code, ds.unit_self, ds.price, ds.estimated_value
|
||||||
from daily_income ds
|
from daily_income ds
|
||||||
<include refid="app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
||||||
where ds.is_deleted = false
|
where ds.is_deleted = false
|
||||||
<if test="id != null and id != '0'">
|
<if test="id != null and id != '0'">
|
||||||
and ds.id = ${id}
|
and ds.id = ${id}
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
<select id="getRecordExistCount" resultType="int">
|
<select id="getRecordExistCount" resultType="int">
|
||||||
select count(1)
|
select count(1)
|
||||||
from daily_income ds
|
from daily_income ds
|
||||||
<include refid="app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
||||||
where ds.is_deleted = false
|
where ds.is_deleted = false
|
||||||
<if test="id != null and id != '0'">
|
<if test="id != null and id != '0'">
|
||||||
and ds.id = ${id}
|
and ds.id = ${id}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
select ds.id, ds.daily_record_seq
|
select ds.id, ds.daily_record_seq
|
||||||
, ds.equipment_name, ds.owned_hours, ds.leased_hours
|
, ds.equipment_name, ds.owned_hours, ds.leased_hours
|
||||||
from daily_power ds
|
from daily_power ds
|
||||||
<include refid="app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
||||||
where ds.is_deleted = false
|
where ds.is_deleted = false
|
||||||
<if test="id != null and id != '0'">
|
<if test="id != null and id != '0'">
|
||||||
and ds.id = ${id}
|
and ds.id = ${id}
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
<select id="getRecordExistCount" resultType="int">
|
<select id="getRecordExistCount" resultType="int">
|
||||||
select count(1)
|
select count(1)
|
||||||
from daily_power ds
|
from daily_power ds
|
||||||
<include refid="app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
||||||
where ds.is_deleted = false
|
where ds.is_deleted = false
|
||||||
<if test="id != null and id != '0'">
|
<if test="id != null and id != '0'">
|
||||||
and ds.id = ${id}
|
and ds.id = ${id}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
, ds.hired_f_hours, ds.shared_m_hours, ds.shared_f_hours, ds.volunteer_m_hours, ds.volunteer_f_hours
|
, ds.hired_f_hours, ds.shared_m_hours, ds.shared_f_hours, ds.volunteer_m_hours, ds.volunteer_f_hours
|
||||||
, ds.is_deleted
|
, ds.is_deleted
|
||||||
from daily_work ds
|
from daily_work ds
|
||||||
<include refid="app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
||||||
where ds.is_deleted = false
|
where ds.is_deleted = false
|
||||||
<if test="id != null and id != '0'">
|
<if test="id != null and id != '0'">
|
||||||
and ds.id = ${id}
|
and ds.id = ${id}
|
||||||
@@ -23,7 +23,7 @@
|
|||||||
<select id="getRecordExistCount" resultType="int">
|
<select id="getRecordExistCount" resultType="int">
|
||||||
select count(1)
|
select count(1)
|
||||||
from daily_work ds
|
from daily_work ds
|
||||||
<include refid="app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
||||||
where ds.is_deleted = false
|
where ds.is_deleted = false
|
||||||
<if test="id != null and id != '0'">
|
<if test="id != null and id != '0'">
|
||||||
and ds.id = ${id}
|
and ds.id = ${id}
|
||||||
|
|||||||
@@ -85,7 +85,7 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getLatestDate"
|
<select id="getLatestDate"
|
||||||
resultType="app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto">
|
resultType="app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto">
|
||||||
select dr.id as daily_id
|
select dr.id as daily_id
|
||||||
, dr.day_group_no, dr.start_date, dr.end_date
|
, dr.day_group_no, dr.start_date, dr.end_date
|
||||||
from daily_record dr
|
from daily_record dr
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<main id="content" role="main"
|
<main id="content" role="main"
|
||||||
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
|
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
|
||||||
, btnDisabled=${(not btnActive)
|
, btnDisabled=${(not btnActive)
|
||||||
|| #strings.equals(dailyRecord.expenseStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}
|
|| #strings.equals(dailyRecord.expenseStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}
|
||||||
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
|
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
|
||||||
<div class="inner">
|
<div class="inner">
|
||||||
<hgroup class="tit-group">
|
<hgroup class="tit-group">
|
||||||
@@ -36,7 +36,7 @@
|
|||||||
<input type="checkbox" name="todayNone"
|
<input type="checkbox" name="todayNone"
|
||||||
data-type="EXPENSE"
|
data-type="EXPENSE"
|
||||||
th:disabled="${not btnActive}"
|
th:disabled="${not btnActive}"
|
||||||
th:checked="${#strings.equals(dailyRecord.expenseStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
th:checked="${#strings.equals(dailyRecord.expenseStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}">
|
||||||
<span class="checkbox-item">
|
<span class="checkbox-item">
|
||||||
<span class="checkbox-txt">금일 등록내용 없음</span>
|
<span class="checkbox-txt">금일 등록내용 없음</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -107,7 +107,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn btn-l btn-primary _nextStep"
|
<button type="button" class="btn btn-l btn-primary _nextStep"
|
||||||
th:data-last="${dailyRecord.lastDay}"
|
th:data-last="${dailyRecord.lastDay}"
|
||||||
th:disabled="${not #strings.equals(dailyRecord.expenseStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(expenseList)}"
|
th:disabled="${not #strings.equals(dailyRecord.expenseStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(expenseList)}"
|
||||||
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
|
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
|
||||||
<span class="btn-txt">다음 단계로 이동</span>
|
<span class="btn-txt">다음 단계로 이동</span>
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
<main id="content" role="main"
|
<main id="content" role="main"
|
||||||
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
|
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
|
||||||
, btnDisabled=${(not btnActive)
|
, btnDisabled=${(not btnActive)
|
||||||
|| #strings.equals(dailyRecord.farmingStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}
|
|| #strings.equals(dailyRecord.farmingStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}
|
||||||
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
|
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
|
||||||
|
|
||||||
[[${btnActive}]], [[${btnDisabled}]], [[${btnIcoClass}]]
|
[[${btnActive}]], [[${btnDisabled}]], [[${btnIcoClass}]]
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
<input type="checkbox" name="todayNone"
|
<input type="checkbox" name="todayNone"
|
||||||
data-type="FARMING"
|
data-type="FARMING"
|
||||||
th:disabled="${not btnActive}"
|
th:disabled="${not btnActive}"
|
||||||
th:checked="${#strings.equals(dailyRecord.farmingStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
th:checked="${#strings.equals(dailyRecord.farmingStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}">
|
||||||
<span class="checkbox-item">
|
<span class="checkbox-item">
|
||||||
<span class="checkbox-txt">금일 등록내용 없음</span>
|
<span class="checkbox-txt">금일 등록내용 없음</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -118,7 +118,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn btn-l btn-primary _nextStep"
|
<button type="button" class="btn btn-l btn-primary _nextStep"
|
||||||
th:data-last="${dailyRecord.lastDay}"
|
th:data-last="${dailyRecord.lastDay}"
|
||||||
th:disabled="${not #strings.equals(dailyRecord.farmingStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(farmingList)}"
|
th:disabled="${not #strings.equals(dailyRecord.farmingStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(farmingList)}"
|
||||||
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
|
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
|
||||||
<span class="btn-txt">다음 단계로 이동</span>
|
<span class="btn-txt">다음 단계로 이동</span>
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<main id="content" role="main"
|
<main id="content" role="main"
|
||||||
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
|
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
|
||||||
, btnDisabled=${(not btnActive)
|
, btnDisabled=${(not btnActive)
|
||||||
|| #strings.equals(dailyRecord.forestryStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}
|
|| #strings.equals(dailyRecord.forestryStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}
|
||||||
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
|
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
|
||||||
<div class="inner">
|
<div class="inner">
|
||||||
<hgroup class="tit-group">
|
<hgroup class="tit-group">
|
||||||
@@ -36,7 +36,7 @@
|
|||||||
<input type="checkbox" name="todayNone"
|
<input type="checkbox" name="todayNone"
|
||||||
data-type="FORESTRY"
|
data-type="FORESTRY"
|
||||||
th:disabled="${not btnActive}"
|
th:disabled="${not btnActive}"
|
||||||
th:checked="${#strings.equals(dailyRecord.forestryStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
th:checked="${#strings.equals(dailyRecord.forestryStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}">
|
||||||
<span class="checkbox-item">
|
<span class="checkbox-item">
|
||||||
<span class="checkbox-txt">금일 등록내용 없음</span>
|
<span class="checkbox-txt">금일 등록내용 없음</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -110,7 +110,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn btn-l btn-primary _nextStep"
|
<button type="button" class="btn btn-l btn-primary _nextStep"
|
||||||
th:data-last="${dailyRecord.lastDay}"
|
th:data-last="${dailyRecord.lastDay}"
|
||||||
th:disabled="${not #strings.equals(dailyRecord.forestryStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(forestryList)}"
|
th:disabled="${not #strings.equals(dailyRecord.forestryStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(forestryList)}"
|
||||||
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
|
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
|
||||||
<span class="btn-txt">다음 단계로 이동</span>
|
<span class="btn-txt">다음 단계로 이동</span>
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
<main id="content" role="main"
|
<main id="content" role="main"
|
||||||
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
|
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
|
||||||
, btnDisabled=${(not btnActive)
|
, btnDisabled=${(not btnActive)
|
||||||
|| #strings.equals(dailyRecord.incomeStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}
|
|| #strings.equals(dailyRecord.incomeStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}
|
||||||
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
|
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
|
||||||
<div class="inner">
|
<div class="inner">
|
||||||
<hgroup class="tit-group">
|
<hgroup class="tit-group">
|
||||||
@@ -52,7 +52,7 @@
|
|||||||
<input type="checkbox" name="todayNone"
|
<input type="checkbox" name="todayNone"
|
||||||
data-type="INCOME"
|
data-type="INCOME"
|
||||||
th:disabled="${not btnActive}"
|
th:disabled="${not btnActive}"
|
||||||
th:checked="${#strings.equals(dailyRecord.incomeStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
th:checked="${#strings.equals(dailyRecord.incomeStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}">
|
||||||
<span class="checkbox-item">
|
<span class="checkbox-item">
|
||||||
<span class="checkbox-txt">금일 등록내용 없음</span>
|
<span class="checkbox-txt">금일 등록내용 없음</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -129,7 +129,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn btn-l btn-primary _nextStep"
|
<button type="button" class="btn btn-l btn-primary _nextStep"
|
||||||
th:data-last="${dailyRecord.lastDay}"
|
th:data-last="${dailyRecord.lastDay}"
|
||||||
th:disabled="${not #strings.equals(dailyRecord.incomeStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(incomeList)}"
|
th:disabled="${not #strings.equals(dailyRecord.incomeStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(incomeList)}"
|
||||||
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
|
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
|
||||||
<span class="btn-txt">다음 단계로 이동</span>
|
<span class="btn-txt">다음 단계로 이동</span>
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<main id="content" role="main"
|
<main id="content" role="main"
|
||||||
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
|
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
|
||||||
, btnDisabled=${(not btnActive)
|
, btnDisabled=${(not btnActive)
|
||||||
|| #strings.equals(dailyRecord.powerStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}
|
|| #strings.equals(dailyRecord.powerStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}
|
||||||
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
|
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
|
||||||
<div class="inner">
|
<div class="inner">
|
||||||
<hgroup class="tit-group">
|
<hgroup class="tit-group">
|
||||||
@@ -36,7 +36,7 @@
|
|||||||
<input type="checkbox" name="todayNone"
|
<input type="checkbox" name="todayNone"
|
||||||
data-type="POWER"
|
data-type="POWER"
|
||||||
th:disabled="${not btnActive}"
|
th:disabled="${not btnActive}"
|
||||||
th:checked="${#strings.equals(dailyRecord.powerStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
th:checked="${#strings.equals(dailyRecord.powerStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}">
|
||||||
<span class="checkbox-item">
|
<span class="checkbox-item">
|
||||||
<span class="checkbox-txt">금일 등록내용 없음</span>
|
<span class="checkbox-txt">금일 등록내용 없음</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -95,7 +95,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn btn-l btn-primary _nextStep"
|
<button type="button" class="btn btn-l btn-primary _nextStep"
|
||||||
th:data-last="${dailyRecord.lastDay}"
|
th:data-last="${dailyRecord.lastDay}"
|
||||||
th:disabled="${not #strings.equals(dailyRecord.powerStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(powerList)}"
|
th:disabled="${not #strings.equals(dailyRecord.powerStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(powerList)}"
|
||||||
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
|
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
|
||||||
<span class="btn-txt">다음 단계로 이동</span>
|
<span class="btn-txt">다음 단계로 이동</span>
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<main id="content" role="main"
|
<main id="content" role="main"
|
||||||
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
|
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
|
||||||
, btnDisabled=${(not btnActive)
|
, btnDisabled=${(not btnActive)
|
||||||
|| #strings.equals(dailyRecord.workStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}
|
|| #strings.equals(dailyRecord.workStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}
|
||||||
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
|
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
|
||||||
<div class="inner">
|
<div class="inner">
|
||||||
<hgroup class="tit-group">
|
<hgroup class="tit-group">
|
||||||
@@ -36,7 +36,7 @@
|
|||||||
<input type="checkbox" name="todayNone"
|
<input type="checkbox" name="todayNone"
|
||||||
data-type="WORK"
|
data-type="WORK"
|
||||||
th:disabled="${not btnActive}"
|
th:disabled="${not btnActive}"
|
||||||
th:checked="${#strings.equals(dailyRecord.workStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
th:checked="${#strings.equals(dailyRecord.workStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}">
|
||||||
<span class="checkbox-item">
|
<span class="checkbox-item">
|
||||||
<span class="checkbox-txt">금일 등록내용 없음</span>
|
<span class="checkbox-txt">금일 등록내용 없음</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -156,7 +156,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn btn-l btn-primary _nextStep"
|
<button type="button" class="btn btn-l btn-primary _nextStep"
|
||||||
th:data-last="${dailyRecord.lastDay}"
|
th:data-last="${dailyRecord.lastDay}"
|
||||||
th:disabled="${not #strings.equals(dailyRecord.workStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(workList)}"
|
th:disabled="${not #strings.equals(dailyRecord.workStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(workList)}"
|
||||||
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
|
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
|
||||||
<span class="btn-txt">다음 단계로 이동</span>
|
<span class="btn-txt">다음 단계로 이동</span>
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
Reference in New Issue
Block a user