diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordDao.java b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordDao.java similarity index 91% rename from front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordDao.java rename to core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordDao.java index d5f00567..4c5dc7a9 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordDao.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordDao.java @@ -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.DailyTargetStatus; -import app.module.front.usecase.daily.record.ports.DailyRecordPortOut; -import app.module.front.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd; -import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd; -import app.module.front.usecase.daily.record.ports.application.domain.UpdateDailyRecordStatusCmd; +import app.module.core.config.application.util.AuditUtil; +import app.module.core.config.application.util.DailyUtil; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +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.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; @@ -64,11 +64,12 @@ public class DailyRecordDao implements DailyRecordPortOut { } @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( new UpdateDailyRecordStatusCmd( recordMonth, dayGroupNo, + householdSeq, "ALL".equals(targetType) ? targetStatus : null, !"ALL".equals(targetType) ? targetType : null, !"ALL".equals(targetType) ? targetStatus : null @@ -76,7 +77,7 @@ public class DailyRecordDao implements DailyRecordPortOut { ); if ("ALL".equals(targetType)) { - String allStatus = this.getUpdateAllStatus(recordMonth, dayGroupNo, command.getHouseholdSeq()); + String allStatus = this.getUpdateAllStatus(recordMonth, dayGroupNo, householdSeq); if (allStatus != null) { command.setAllStatus(allStatus); @@ -105,6 +106,7 @@ public class DailyRecordDao implements DailyRecordPortOut { new UpdateDailyRecordStatusCmd( searchMonth, dayGroupNo, + householdSeq, allStatus, null, null diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordMapper.java b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordMapper.java similarity index 66% rename from front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordMapper.java rename to core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordMapper.java index a68178c8..4e072858 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordMapper.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordMapper.java @@ -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.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto; -import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; -import app.module.front.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd; -import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd; -import app.module.front.usecase.daily.record.ports.application.domain.UpdateDailyRecordStatusCmd; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; +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 org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java similarity index 96% rename from front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java rename to core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java index cf592fe8..d255be8e 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java @@ -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.DailyStatus; diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordStatusDto.java b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/DailyRecordStatusDto.java similarity index 95% rename from front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordStatusDto.java rename to core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/DailyRecordStatusDto.java index 07b53374..ace78a4a 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordStatusDto.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/DailyRecordStatusDto.java @@ -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.DailyTargetStatus; diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/UpdateDailyRecordDto.java b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/UpdateDailyRecordDto.java similarity index 74% rename from front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/UpdateDailyRecordDto.java rename to core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/UpdateDailyRecordDto.java index 76cd56fd..4e7758e4 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/UpdateDailyRecordDto.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/UpdateDailyRecordDto.java @@ -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.Setter; diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/CreateDailyRecordReqVO.java b/core/src/main/java/app/module/core/usecase/daily/record/adapters/web/model/CreateDailyRecordReqVO.java similarity index 96% rename from front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/CreateDailyRecordReqVO.java rename to core/src/main/java/app/module/core/usecase/daily/record/adapters/web/model/CreateDailyRecordReqVO.java index c7425f68..41e158a4 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/CreateDailyRecordReqVO.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/adapters/web/model/CreateDailyRecordReqVO.java @@ -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.DailyTargetStatus; @@ -13,6 +13,8 @@ public class CreateDailyRecordReqVO { private Long id; private String recordMonth; private int dayGroupNo; + private Long householdSeq; + private LocalDate startDate; private LocalDate endDate; private String todayNone; diff --git a/core/src/main/java/app/module/core/usecase/daily/record/adapters/web/model/DailyUIReqVO.java b/core/src/main/java/app/module/core/usecase/daily/record/adapters/web/model/DailyUIReqVO.java new file mode 100644 index 00000000..acf5a621 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/daily/record/adapters/web/model/DailyUIReqVO.java @@ -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; +} diff --git a/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortIn.java b/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortIn.java new file mode 100644 index 00000000..d6e19fb4 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortIn.java @@ -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); +} diff --git a/front/src/main/java/app/module/front/usecase/daily/record/ports/DailyRecordPortOut.java b/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortOut.java similarity index 55% rename from front/src/main/java/app/module/front/usecase/daily/record/ports/DailyRecordPortOut.java rename to core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortOut.java index a0881476..72b9e5b6 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/ports/DailyRecordPortOut.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortOut.java @@ -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.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd; + +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +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 { /** @@ -20,5 +21,5 @@ public interface DailyRecordPortOut { */ 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); } diff --git a/front/src/main/java/app/module/front/usecase/daily/record/ports/application/DailyRecordService.java b/core/src/main/java/app/module/core/usecase/daily/record/ports/application/DailyRecordService.java similarity index 68% rename from front/src/main/java/app/module/front/usecase/daily/record/ports/application/DailyRecordService.java rename to core/src/main/java/app/module/core/usecase/daily/record/ports/application/DailyRecordService.java index 62f18210..917610d3 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/ports/application/DailyRecordService.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/ports/application/DailyRecordService.java @@ -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.DailyTargetStatus; -import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; -import app.module.front.usecase.daily.record.ports.DailyRecordPortIn; -import app.module.front.usecase.daily.record.ports.DailyRecordPortOut; -import app.module.front.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd; -import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd; +import app.module.core.config.application.util.AuditUtil; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO; +import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; +import 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.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -25,10 +24,8 @@ public class DailyRecordService implements DailyRecordPortIn { private final DailyRecordPortOut portOut; @Override - public DailyRecordDto detail(DailyUIReqVO reqVO) { - DailyRecordDto dailyRecord = portOut.detail(new GetDailyRecordCmd(reqVO.getSearchMonth(), - reqVO.getGroupNo(), - reqVO.getHouseholdSeq())); + public DailyRecordDto detail(String recordMonth, Integer dayGroupNo, Long householdSeq) { + DailyRecordDto dailyRecord = portOut.detail(new GetDailyRecordCmd(recordMonth, dayGroupNo, householdSeq)); if (dailyRecord != null) { List targetList = new ArrayList<>(); @@ -71,13 +68,14 @@ public class DailyRecordService implements DailyRecordPortIn { GetDailyRecordCmd findCmd = new GetDailyRecordCmd( formVO.getRecordMonth(), formVO.getDayGroupNo(), - AuthUtil.getUserSeq()); + formVO.getHouseholdSeq()); CreateDailyRecordCmd command = AuditUtil.create( new CreateDailyRecordCmd( null, formVO.getRecordMonth(), formVO.getDayGroupNo(), + formVO.getHouseholdSeq(), formVO.getStartDate(), formVO.getEndDate(), formVO.getAllStatus(), @@ -92,13 +90,13 @@ public class DailyRecordService implements DailyRecordPortIn { } @Override - public void updateByStatus(String recordMonth, Integer dayGroupNo, String targetType, String targetStatus) { - portOut.updateByStatus(recordMonth, dayGroupNo, targetType, targetStatus); - portOut.updateByStatus(recordMonth, dayGroupNo, "ALL", null); + public void updateByStatus(String recordMonth, Integer dayGroupNo, Long householdSeq, String targetType, String targetStatus) { + portOut.updateByStatus(recordMonth, dayGroupNo, householdSeq, targetType, targetStatus); + portOut.updateByStatus(recordMonth, dayGroupNo, householdSeq, "ALL", null); } @Override - public void updateByAllStatus(String recordMonth, Integer dayGroupNo) { - portOut.updateByStatus(recordMonth, dayGroupNo, "ALL", null); + public void updateByAllStatus(String recordMonth, Integer dayGroupNo, Long householdSeq) { + portOut.updateByStatus(recordMonth, dayGroupNo, householdSeq, "ALL", null); } } diff --git a/front/src/main/java/app/module/front/usecase/daily/record/ports/application/domain/CreateDailyRecordCmd.java b/core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/CreateDailyRecordCmd.java similarity index 76% rename from front/src/main/java/app/module/front/usecase/daily/record/ports/application/domain/CreateDailyRecordCmd.java rename to core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/CreateDailyRecordCmd.java index fd5e627a..f6f30ea2 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/ports/application/domain/CreateDailyRecordCmd.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/CreateDailyRecordCmd.java @@ -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.DailyTargetStatus; import lombok.AllArgsConstructor; @@ -14,10 +14,11 @@ import java.time.LocalDate; @Setter @AllArgsConstructor @ToString -public class CreateDailyRecordCmd extends FrontAuditCommand { +public class CreateDailyRecordCmd extends AuditCommand { private Long id; private String recordMonth; private int dayGroupNo; + private Long householdSeq; private LocalDate startDate; private LocalDate endDate; private DailyStatus allStatus; diff --git a/front/src/main/java/app/module/front/usecase/daily/record/ports/application/domain/GetDailyRecordCmd.java b/core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/GetDailyRecordCmd.java similarity index 83% rename from front/src/main/java/app/module/front/usecase/daily/record/ports/application/domain/GetDailyRecordCmd.java rename to core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/GetDailyRecordCmd.java index 7f27bce0..53d58980 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/ports/application/domain/GetDailyRecordCmd.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/GetDailyRecordCmd.java @@ -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.Getter; diff --git a/front/src/main/java/app/module/front/usecase/daily/record/ports/application/domain/UpdateDailyRecordStatusCmd.java b/core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/UpdateDailyRecordStatusCmd.java similarity index 56% rename from front/src/main/java/app/module/front/usecase/daily/record/ports/application/domain/UpdateDailyRecordStatusCmd.java rename to core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/UpdateDailyRecordStatusCmd.java index 2fd3b8dc..e06cd76f 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/ports/application/domain/UpdateDailyRecordStatusCmd.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/UpdateDailyRecordStatusCmd.java @@ -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.Getter; import lombok.Setter; @@ -10,9 +10,10 @@ import lombok.ToString; @Setter @AllArgsConstructor @ToString -public class UpdateDailyRecordStatusCmd extends FrontAuditCommand { +public class UpdateDailyRecordStatusCmd extends AuditCommand { private String recordMonth; private Integer dayGroupNo; + private Long householdSeq; private String allStatus; private String targetType; private String targetStatus; diff --git a/front/src/main/resources/mappers/daily/DailyRecordMapper.xml b/core/src/main/resources/mappers/daily/DailyRecordMapper.xml similarity index 94% rename from front/src/main/resources/mappers/daily/DailyRecordMapper.xml rename to core/src/main/resources/mappers/daily/DailyRecordMapper.xml index 8334d421..1c120db1 100644 --- a/front/src/main/resources/mappers/daily/DailyRecordMapper.xml +++ b/core/src/main/resources/mappers/daily/DailyRecordMapper.xml @@ -1,9 +1,9 @@ - + select count(1) from daily_expense ds - + where ds.is_deleted = false and ds.id = ${id} diff --git a/front/src/main/resources/mappers/daily/DailyFarmingMapper.xml b/front/src/main/resources/mappers/daily/DailyFarmingMapper.xml index e3dc95b0..1b64984c 100644 --- a/front/src/main/resources/mappers/daily/DailyFarmingMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyFarmingMapper.xml @@ -8,7 +8,7 @@ , ds.product_code, ds.product_self, ds.usage , ds.quantity, ds.unit_code, ds.unit_self, ds.estimated_value from daily_farming ds - + where ds.is_deleted = false and ds.id = ${id} @@ -20,7 +20,7 @@ select count(1) from daily_forestry ds - + where ds.is_deleted = false and ds.id = ${id} diff --git a/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml b/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml index f7cd6c1a..3dca633c 100644 --- a/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml @@ -8,7 +8,7 @@ , ds.crop_code, ds.income_kind, ds.source_purpose , ds.quantity, ds.unit_code, ds.unit_self, ds.price, ds.estimated_value from daily_income ds - + where ds.is_deleted = false and ds.id = ${id} @@ -20,7 +20,7 @@ select count(1) from daily_power ds - + where ds.is_deleted = false and ds.id = ${id} diff --git a/front/src/main/resources/mappers/daily/DailyWorkMapper.xml b/front/src/main/resources/mappers/daily/DailyWorkMapper.xml index b80effce..19a46e6b 100644 --- a/front/src/main/resources/mappers/daily/DailyWorkMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyWorkMapper.xml @@ -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.is_deleted from daily_work ds - + where ds.is_deleted = false and ds.id = ${id} @@ -23,7 +23,7 @@ + th:checked="${#strings.equals(dailyRecord.expenseStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}"> 금일 등록내용 없음 @@ -107,7 +107,7 @@ diff --git a/front/src/main/resources/templates/record/farming/index.html b/front/src/main/resources/templates/record/farming/index.html index 624d52d6..3fc11289 100644 --- a/front/src/main/resources/templates/record/farming/index.html +++ b/front/src/main/resources/templates/record/farming/index.html @@ -12,7 +12,7 @@
[[${btnActive}]], [[${btnDisabled}]], [[${btnIcoClass}]] @@ -44,7 +44,7 @@ + th:checked="${#strings.equals(dailyRecord.farmingStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}"> 금일 등록내용 없음 @@ -118,7 +118,7 @@ diff --git a/front/src/main/resources/templates/record/forestry/index.html b/front/src/main/resources/templates/record/forestry/index.html index 1311ddb6..bcbfca63 100644 --- a/front/src/main/resources/templates/record/forestry/index.html +++ b/front/src/main/resources/templates/record/forestry/index.html @@ -6,7 +6,7 @@
@@ -36,7 +36,7 @@ + th:checked="${#strings.equals(dailyRecord.forestryStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}"> 금일 등록내용 없음 @@ -110,7 +110,7 @@ diff --git a/front/src/main/resources/templates/record/income/index.html b/front/src/main/resources/templates/record/income/index.html index 1b9679c6..6eb848bd 100644 --- a/front/src/main/resources/templates/record/income/index.html +++ b/front/src/main/resources/templates/record/income/index.html @@ -21,7 +21,7 @@
@@ -52,7 +52,7 @@ + th:checked="${#strings.equals(dailyRecord.incomeStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}"> 금일 등록내용 없음 @@ -129,7 +129,7 @@ diff --git a/front/src/main/resources/templates/record/power/index.html b/front/src/main/resources/templates/record/power/index.html index cabd0118..ad89449b 100644 --- a/front/src/main/resources/templates/record/power/index.html +++ b/front/src/main/resources/templates/record/power/index.html @@ -6,7 +6,7 @@
@@ -36,7 +36,7 @@ + th:checked="${#strings.equals(dailyRecord.powerStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}"> 금일 등록내용 없음 @@ -95,7 +95,7 @@ diff --git a/front/src/main/resources/templates/record/work/index.html b/front/src/main/resources/templates/record/work/index.html index b254445b..5ac0e88b 100644 --- a/front/src/main/resources/templates/record/work/index.html +++ b/front/src/main/resources/templates/record/work/index.html @@ -6,7 +6,7 @@
@@ -36,7 +36,7 @@ + th:checked="${#strings.equals(dailyRecord.workStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}"> 금일 등록내용 없음 @@ -156,7 +156,7 @@