Merge branch 'dev' into 0623_fetch

This commit is contained in:
주수현
2025-06-25 16:05:05 +09:00
115 changed files with 1660 additions and 950 deletions

View File

@@ -58,7 +58,7 @@ public class RoleUpdateAspect {
if (beforeAdmin.isPresent()) {
List<String> beforeRoles =
beforeAdmin.get().getRoles().stream().map(CoreRole::getId).toList();
beforeAdmin.stream().map(r -> r.getRole().getId()).toList();
if (beforeRoles.size() != currentRoles.size()
|| currentRoles.stream().anyMatch(item -> !beforeRoles.contains(item))) {
createLog = true;

View File

@@ -44,14 +44,14 @@ public class AdminDetailsService implements UserDetailsService {
adminUser.getSeq(),
adminUser.getId(),
adminUser.getPassword(),
adminUser.getRoles().stream().map(CoreRole::getId).findFirst().orElse(null),
adminUser.getRole().getId(),
adminUser.getRegionMainCode(),
adminUser.getLastLoginIp(),
!accountDisabled,
true,
isCredentialsNonExpired(adminUser.getPasswordUpdatedAt()),
!accountLocked,
getAuthorities(adminUser.getRoles()),
getAuthorities(Stream.of(adminUser.getRole()).toList()),
passwordValidPeriodDays - getDaysPassedFrom(adminUser.getPasswordUpdatedAt()));
}

View File

@@ -41,9 +41,9 @@ public class AdminCreatePostController {
savePortIn.apiConnect(bindingVO.getSeq(),
bindingVO.getId(),
bindingVO.getPassword(),
bindingVO.getName(),
"010-"+bindingVO.getPhone1()+"-"+bindingVO.getPhone2(),
bindingVO.getRegionMainCode(),
"ROLE_RESEARCHER".equals(bindingVO.getRoleId())?bindingVO.getName():null,
"ROLE_RESEARCHER".equals(bindingVO.getRoleId())?"010-"+bindingVO.getPhone1()+"-"+bindingVO.getPhone2():null,
!"ROLE_ADMIN".equals(bindingVO.getRoleId())?bindingVO.getRegionMainCode():null,
bindingVO.getAccountDisabled(),
bindingVO.getRoleId()));
}

View File

@@ -46,19 +46,16 @@ class AdminUpdateGetController {
AdminUpdateBindingVO bindingVO =
new AdminUpdateBindingVO(
output.getCreatedBy(),
output.getCreatedAt(),
output.getUpdatedBy(),
output.getUpdatedAt(),
output.getSeq(),
output.getId(),
null,
output.getName(),
output.getPhone(),
output.getPhone() != null&& output.getPhone().matches("\\d{3}-\\d{4}-\\d{4}")?output.getPhone().split("-")[1] : "",
output.getPhone() != null&& output.getPhone().matches("\\d{3}-\\d{4}-\\d{4}")?output.getPhone().split("-")[2] : "",
output.getRegionMainCode(),
output.getPasswordUpdatedAt(),
output.getAccountDisabled(),
output.getRoles().stream().map(CoreRole::getId).collect(Collectors.toList()));
output.getRole().getId());
model.addAttribute("bindingVO", bindingVO);
model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN));

View File

@@ -9,16 +9,20 @@ import app.module.core.usecase.role.list.ports.RoleListPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import java.util.stream.Collectors;
@Controller
@RestController
@RequiredArgsConstructor
class AdminUpdatePostController {
@@ -28,34 +32,24 @@ class AdminUpdatePostController {
private final SaveAdminPortIn saveAdminPortIn;
private final MessageUtil messageUtil;
@PostMapping(path = "/settings/admins/update/{id}")
String operate(
Model model,
RedirectAttributes redirectAttributes,
@Valid @ModelAttribute("bindingVO") AdminUpdateBindingVO bindingVO,
BindingResult bindingResult) {
@PostMapping(path = "/api/settings/admin/update")
ResponseEntity<?> operate( @RequestBody AdminUpdateBindingVO bindingVO, BindingResult bindingResult) {
adminUpdateValidator.validate(bindingVO, bindingResult);
if (bindingResult.hasErrors()) {
model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN));
model.addAttribute("regionMainCode", uiCodeListPortIn.connect("code.region.main"));
return "admin/adminUpdateForm";
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY.value())
.body(bindingResult.getAllErrors().get(0).getDefaultMessage());
}
saveAdminPortIn.apiConnect(
bindingVO.getSeq(),
bindingVO.getId(),
bindingVO.getUpdatePassword(),
bindingVO.getName(),
bindingVO.getPhone(),
bindingVO.getRegionMainCode(),
bindingVO.getAccountDisabled(),
bindingVO.getRoleIds().stream().collect(Collectors.joining()));
redirectAttributes.addFlashAttribute(
"operationMessage",
messageUtil.getMessage("operation.settings.admin.updated", bindingVO.getId()));
return "redirect:/settings/admins";
return ResponseEntity.status(HttpStatus.OK).body(
saveAdminPortIn.apiConnect(
bindingVO.getSeq(),
bindingVO.getId(),
bindingVO.getUpdatePassword(),
"ROLE_RESEARCHER".equals(bindingVO.getRoleId())?bindingVO.getName():null,
"ROLE_RESEARCHER".equals(bindingVO.getRoleId())?"010-"+bindingVO.getPhone1()+"-"+bindingVO.getPhone2():null,
!"ROLE_ADMIN".equals(bindingVO.getRoleId())? bindingVO.getRegionMainCode():null,
bindingVO.getAccountDisabled(),
bindingVO.getRoleId()));
}
}

View File

@@ -1,26 +1,16 @@
package app.module.admin.usecase.admin.saveAdmin.adapters.web.model;
import app.module.core.config.application.component.AuditOutput;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import java.time.LocalDateTime;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
public class AdminUpdateBindingVO implements AuditOutput {
private final String createdBy;
private final LocalDateTime createdAt;
private final String updatedBy;
private final LocalDateTime updatedAt;
@NoArgsConstructor
public class AdminUpdateBindingVO{
private Long seq;
private String id;
@@ -33,12 +23,13 @@ public class AdminUpdateBindingVO implements AuditOutput {
message = "{valid.common.email.wrong}")
private String email;*/
private String name;
private String phone;
private String phone1;
private String phone2;
private String regionMainCode;
private LocalDateTime passwordUpdatedAt;
private Boolean accountDisabled;
/* private Integer loginFailCnt;
private Boolean accountLocked;*/
private List<String> roleIds;
private String roleId;
}

View File

@@ -4,12 +4,14 @@ import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminUpdateBi
import java.util.Optional;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.ValidationUtils;
import org.springframework.validation.Validator;
@Component
public class AdminUpdateValidator implements Validator {
private final String PASSWORD_REGEX = "^((?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%_\\-])\\S{6,15})$";
// 비밀번호: 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상
private final String PASSWORD_REGEX = "^(?=.*[0-9])(?=.*[!@#$%_\\-]).{5}$";
@Override
public boolean supports(Class<?> clazz) {
@@ -20,23 +22,38 @@ public class AdminUpdateValidator implements Validator {
public void validate(Object target, Errors errors) {
AdminUpdateBindingVO vo = (AdminUpdateBindingVO) target;
Optional.ofNullable(vo.getRoleIds())
.filter(ids -> ids.size() < 1)
.ifPresent(
ids ->
errors.rejectValue(
"roleIds", "valid.common.required.size.min", new Object[]{1}, ""));
if (vo.getRoleId() == null || vo.getRoleId().isEmpty()) {
errors.rejectValue("roleId", "error.roleId", "권한을 선택해주세요.");
}
Optional.ofNullable(vo.getUpdatePassword())
.filter(s -> !s.trim().isEmpty() && !s.matches(PASSWORD_REGEX))
.ifPresent(s -> errors.rejectValue("updatePassword", "valid.common.password.wrong"));
.filter(password -> !password.trim().isEmpty() && !password.matches(PASSWORD_REGEX))
.ifPresent(password -> errors.rejectValue("updatePassword", "valid.common.password.wrong","비밀번호는 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상입니다."));
if (vo.getRoleId() != null && "ROLE_RESEARCHER".equals(vo.getRoleId())) {
if (vo.getName() == null || vo.getName().isBlank()) {
errors.rejectValue("name", "error.name", "이름을 입력해주세요.");
}
if (vo.getName().length() > 4) {
errors.rejectValue("name", "error.name", "이름은 4자리까지 입력가능합니다.");
}
if (vo.getPhone1() == null || vo.getPhone1().isBlank()) {
errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리를 입력해주세요.");
} else if (!vo.getPhone1().matches("^\\d{4}$")) {
errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리는 4자리 숫자여야 합니다.");
}
if (vo.getPhone2() == null || vo.getPhone2().isBlank()) {
errors.rejectValue("phone2", "error.phone2", "전화번호 뒷자리를 입력해주세요.");
} else if (!vo.getPhone2().matches("^\\d{4}$")) {
errors.rejectValue("phone2", "error.phone2", "전화번호 뒷자리는 4자리 숫자여야 합니다.");
}
}
// ROLE_ADMIN이 아닌 경우 regionMainCode null체크
Optional.ofNullable(vo.getRoleIds())
.filter(ids -> ids.stream().noneMatch(role -> role.equals("ROLE_ADMIN")))
Optional.ofNullable(vo.getRoleId())
.filter(id -> !id.equals("ROLE_ADMIN"))
.ifPresent(nonAdmins -> {
if (vo.getRegionMainCode() == null || vo.getRegionMainCode().isBlank()) {
errors.rejectValue("regionMainCode", "valid.common.required");
errors.rejectValue("regionMainCode", "valid.common.required","실사지역을 선택해주세요.");
}
});
}

View File

@@ -22,7 +22,7 @@ public class HomeController {
.ifPresent(
loginUser -> {
model.addAttribute("loginUser", loginUser);
model.addAttribute("loginUserRoles", loginUser.getRoles());
model.addAttribute("loginUserRoles", loginUser.getRole());
});
return "home";

View File

@@ -4,6 +4,7 @@ import app.module.admin.config.application.util.AdminUtil;
import app.module.admin.config.application.util.DateUiUtil;
import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortIn;
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam;
@RequiredArgsConstructor
class GetHouseholdStatusUIController {
private final GetHouseholdStatusPortIn getHouseholdStatusPortIn;
private final UICodeListPortIn uiCodeListPortIn;
@GetMapping(path = "/households/{seq}")
String operate(
@@ -30,6 +32,8 @@ class GetHouseholdStatusUIController {
model.addAttribute("recordMonth", recordMonth);
model.addAttribute("userRole", AdminUtil.getLoginUserRole());
model.addAttribute("unitCodes", uiCodeListPortIn.connect("code.record.unit"));
// 임가 상세 정보
model.addAttribute("householdInfo",
getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null));

View File

@@ -0,0 +1,19 @@
package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.adapters.persistence;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatus;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatusCmd;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.GetForestProductStatusPortOut;
import java.util.Optional;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class GetForestProductStatusDao implements GetForestProductStatusPortOut {
private final GetForestProductStatusMapper mapper;
@Override
public Optional<GetForestProductStatus> operate(GetForestProductStatusCmd cmd) {
return mapper.getForestProductStatus(cmd);
}
}

View File

@@ -0,0 +1,11 @@
package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.adapters.persistence;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatus;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatusCmd;
import java.util.Optional;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface GetForestProductStatusMapper {
Optional<GetForestProductStatus> getForestProductStatus(GetForestProductStatusCmd cmd);
}

View File

@@ -0,0 +1,22 @@
package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.adapters.web;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.GetForestProductStatusPortIn;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatusCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequiredArgsConstructor
class GetForestProductStatusController {
private final GetForestProductStatusPortIn portIn;
@GetMapping(path = "/api/forestProduct/{id}")
ResponseEntity<?> operate(@PathVariable Long id) {
return ResponseEntity.status(HttpStatus.OK)
.body(portIn.operate(new GetForestProductStatusCmd(id)).orElse(null));
}
}

View File

@@ -0,0 +1,13 @@
package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetForestProductStatusReqVO {
}

View File

@@ -0,0 +1,13 @@
package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetForestProductStatusResVO {
}

View File

@@ -0,0 +1,9 @@
package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports;
import java.util.Optional;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatus;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatusCmd;
public interface GetForestProductStatusPortIn {
Optional<GetForestProductStatus> operate(GetForestProductStatusCmd cmd);
}

View File

@@ -0,0 +1,9 @@
package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports;
import java.util.Optional;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatus;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatusCmd;
public interface GetForestProductStatusPortOut {
Optional<GetForestProductStatus> operate(GetForestProductStatusCmd cmd);
}

View File

@@ -0,0 +1,20 @@
package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatus;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatusCmd;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.GetForestProductStatusPortIn;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.GetForestProductStatusPortOut;
import java.util.Optional;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class GetForestProductStatusService implements GetForestProductStatusPortIn {
private final GetForestProductStatusPortOut portOut;
@Override
public Optional<GetForestProductStatus> operate(GetForestProductStatusCmd cmd) {
return portOut.operate(cmd);
}
}

View File

@@ -0,0 +1,31 @@
package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetForestProductStatus {
private Long id;
private String streetNum;
private String landType;
private String town;
private String cropName;
private String landArea;
private String mainYield;
private String mainYieldUnitCode;
private String mainYieldUnit;
private String mainSaleAmount;
private String mainSaleUnitCode;
private String mainSaleUnit;
private String subYield;
private String subYieldUnitCode;
private String subYieldUnit;
private String subSaleAmount;
private String subSaleUnitCode;
private String subSaleUnit;
}

View File

@@ -0,0 +1,14 @@
package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetForestProductStatusCmd {
private Long id;
}

View File

@@ -30,7 +30,7 @@ class RemoveHouseholdVisitInfosController {
}
portIn.operate(
new RemoveHouseholdVisitInfosCmd(reqVO.getHouseholdSeq(), reqVO.getRemoveIds()));
new RemoveHouseholdVisitInfosCmd(reqVO.getHouseholdSeq(), reqVO.getVisitRemoveIds()));
return ResponseEntity.status(HttpStatus.OK).body(new RemoveHouseholdVisitInfosResVO(
messageUtil.getMessage("operation.common.remove.done")));

View File

@@ -13,5 +13,5 @@ import lombok.Setter;
@EqualsAndHashCode
public class RemoveHouseholdVisitInfosReqVO {
private Long householdSeq;
private List<Long> removeIds;
private List<Long> visitRemoveIds;
}

View File

@@ -0,0 +1,31 @@
<?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" >
<mapper
namespace="app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.adapters.persistence.GetForestProductStatusMapper">
<select id="getForestProductStatus"
resultType="app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatus">
/* getForestProductStatus : 임산물 현황 상세 조회 */
SELECT id,
street_num,
land_type,
town,
crop_name,
land_area,
main_yield,
main_yield_unit_code,
main_yield_unit,
main_sale_amount,
main_sale_unit_code,
main_sale_unit,
sub_yield,
sub_yield_unit_code,
sub_yield_unit,
sub_sale_amount,
sub_sale_unit_code,
sub_sale_unit
FROM forest_product
WHERE id = #{id}
AND is_deleted = false
</select>
</mapper>

View File

@@ -13,12 +13,12 @@
max(u.code_text) AS region_main_code_name,
case a.account_disabled when false then '사용' when true then '미사용' end account_disabled_flag
from admin a
join admin_has_role ahr ON a.seq = ahr.admin_seq
join admin_has_role ahr ON a.seq = ahr.admin_seq and ahr.is_deleted = false
left join uicode u ON u.parent_id = 'code.region.main' AND u.id = a.region_main_code
left join researcher_has_household rhh ON rhh.admin_seq = a.seq
left join household h ON h.seq = rhh.household_seq AND h.is_panel IS true
left join researcher_has_household rhh ON rhh.admin_seq = a.seq and rhh.is_deleted = false
left join household h ON h.seq = rhh.household_seq AND h.is_panel IS true and h.is_deleted = false
where
ahr.role_id = 'ROLE_RESEARCHER' and ahr.is_deleted = false
ahr.role_id = 'ROLE_RESEARCHER'
<if test="searchField == 'name' and searchValue != null and searchValue != ''">
and a.name LIKE CONCAT('%', #{searchValue}, '%')
</if>

View File

@@ -1356,6 +1356,11 @@ template {
border: 0;
}
@media (max-width: 1620px) {
.component-modal .modal-container .modal-content {
max-height: 520px !important;
}
}
@media (max-width: 1024px) {
a .hide-txt {
font-size: 0;
@@ -6841,7 +6846,7 @@ table:not(.type-form) tr:hover {
}
table.type-form {
border: 1px solid #dee2e6;
table-layout: fixed;
table-layout: auto;
}
table.type-form tbody tr {
height: 100%;
@@ -6889,6 +6894,9 @@ table.type-form tbody th {
color: #212529;
font-weight: 600;
}
table.type-form tbody th[colspan="6"] {
padding: 20px 24px;
}
table.type-form .component-input {
width: 100%;
}
@@ -6945,7 +6953,8 @@ table tbody td:last-of-type {
border-right: none;
}
table tbody th {
width: 16rem;
min-width: 14rem;
max-width: 16rem;
}
.summary-area ul {

File diff suppressed because one or more lines are too long

View File

@@ -465,4 +465,8 @@ const formatNumberWithComma = (value) => {
return Number(value).toLocaleString();
}
const limitMaxLength = (el) => {
const maxLength = parseInt(el.getAttribute('maxlength'), 10);
el.value = el.value.replace(/\D/g, '').slice(0, maxLength);
}

View File

@@ -235,19 +235,18 @@
ajaxUtil._ajaxMethod(
'/api/settings/admin/create',
JSON.stringify(dataOj),
function(response) { // 성공
alert("등록이 완료되었습니다.");
location.href = '/settings/admins';
function(response) {
},
function (code, rstData) {
if(code == 422) alert(rstData.responseText);
if(code == 200 ){
if(code === 422) alert(rstData.responseText);
if(code === 200 ){
alert("등록이 완료되었습니다.");
location.href = '/settings/admins';
}
},
'post',
'json'
'json',
{ handle422Type: 'alert' }
);
}
</script>

View File

@@ -96,13 +96,12 @@
<label><input class="form-check-input" onchange="toggleCheckbox(this);"
type="checkbox"/></label>
</th>
<th scope="col"><a class="order-able" data-sort-field="id" href="#">아이디</a></th>
<th scope="col"><a class="order-able" data-sort-field="id" href="#">이름</a></th>
<th class="text-secondary" scope="col">권한</th></th>
<th scope="col"><a class="order-able" data-sort-field="id" href="#">실사</a></th>
<th scope="col"><a class="order-able" data-sort-field="accountDisabled" href="#">계정사용여부</a></th>
<th scope="col"><a class="order-able" data-sort-field="createdAt" href="#">생성일</a>
</th>
<th scope="col">아이디</th>
<th scope="col">이름</th>
<th scope="col">권한</th>
<th scope="col">실사</th>
<th scope="col">계정사용여부</th>
<th scope="col">생성일</th>
</tr>
</thead>
<tbody>
@@ -166,12 +165,9 @@
f.searchDisabled.value = '';
}
// 수정페이지 이동
function goUpdate(adminId) {
const f = document.adminParamForm;
f.action = '/settings/admins/update/' + adminId;
f.method = 'get';
f.submit();
location.href = '/settings/admins/update/' + adminId; // 쿼리 파라미터 없이 이동
}
// 체크박스 선택/해제

View File

@@ -6,28 +6,34 @@
<form
method="post"
th:action="${'/settings/admins/update/' + bindingVO.id}"
th:object="${bindingVO}">
th:object="${bindingVO}"
name="adminUpdateForm"
onsubmit="event.preventDefault(); updateAdmin(); return false;">
<div class="content-inner">
<input type="hidden" name="seq" th:field="*{seq}"/>
<table class="type-form">
<tbody>
<tr>
<th> <label for="roleIds">권한<i class="ico-required-mark" role="img" aria-label="필수">*</i></label></th>
<th> <label for="roleId">권한<i class="ico-required-mark" role="img" aria-label="필수">*</i></label></th>
<td>
<div class="component-select">
<select class="select-list" id="roleIds"
th:classappend="${#fields.hasErrors('roleIds')} ? 'is-invalid'"
th:field="*{roleIds}"
onchange="onRoleChange(this);">
<option value="">선택</option>
<option th:each="role : ${roles}" th:text="${role.description}"
th:value="${role.id}"></option>
</select>
</div>
<div class="invalid-feedback fw-bold" th:errors="*{roleIds}"
th:if="${#fields.hasErrors('roleIds')}">
에러 메세지
<div class="d-flex">
<div class="component-input">
<div class="component-select">
<select class="select-list" id="roleId"
th:classappend="${#fields.hasErrors('roleId')} ? 'is-invalid'"
th:field="*{roleId}"
onchange="onRoleChange(this);">
<option value="">선택</option>
<option th:each="role : ${roles}" th:text="${role.description}"
th:value="${role.id}"></option>
</select>
</div>
<div class="invalid-feedback fw-bold" th:errors="*{roleId}"
th:if="${#fields.hasErrors('roleId')}">
에러 메세지
</div>
</div>
</div>
</td>
</tr>
@@ -40,24 +46,25 @@
</div>
</div>
</td>
<th><label for="password">비밀번호<i class="ico-required-mark" role="img" aria-label="필수">*</i></label></th>
<th><label for="updatePassword">비밀번호<i class="ico-required-mark" role="img" aria-label="필수">*</i></label></th>
<td>
<div class="component-input">
<div class="input-field">
<input id="password" placeholder="암호를 변경하고 싶다면 입력하세요"
<input id="updatePassword" placeholder="암호를 변경하고 싶다면 입력하세요"
th:classappend="${#fields.hasErrors('updatePassword')} ? 'is-invalid'"
th:field="*{updatePassword}"
type="password"/>
<div class="invalid-feedback fw-bold" th:errors="*{updatePassword}"
th:if="${#fields.hasErrors('updatePassword')}">
에러 메세지
</div>
</div>
<div class="invalid-feedback fw-bold" th:errors="*{updatePassword}"
th:if="${#fields.hasErrors('updatePassword')}">
에러 메세지
</div>
<span>총 5자 / 숫자 + 특수문자 1개 이상 (!,@,#,$,%,_,-)</span>
</div>
</td>
</tr>
<tr class="researcherArea"
th:classappend="${#lists.isEmpty(bindingVO.roleIds) or #lists.contains(bindingVO.roleIds, 'ROLE_LOCAL_INSPECTOR')} ? 'd-none'">
th:classappend="${#lists.isEmpty(bindingVO.roleId) or #lists.contains(bindingVO.roleId, 'ROLE_LOCAL_INSPECTOR')} ? 'd-none'">
<th><label for="name">이름<i class="ico-required-mark" role="img" aria-label="필수">*</i></label></th>
<td>
<div class="component-input">
@@ -83,25 +90,28 @@
<div class="component-input">
<div class="input-field">
<input type="number" id="phone1" name="phone1" placeholder=""
th:value="${bindingVO.phone != null ? bindingVO.phone.substring(4, 8) : ''}">
th:value="${bindingVO.phone1 != null ? bindingVO.phone1 : ''}">
</div>
</div>
<div class="invalid-feedback fw-bold"
th:if="${#fields.hasErrors('phone1')}">
에러 메세지
</div>
<div class="component-input">
<div class="input-field">
<input type="number" id="phone2" name="phone2" placeholder=""
th:value="${bindingVO.phone != null ? bindingVO.phone.substring(9, 13) : ''}">
th:value="${bindingVO.phone2 != null ? bindingVO.phone2 : ''}">
</div>
</div>
<div class="invalid-feedback fw-bold"
th:if="${#fields.hasErrors('phone2')}">
에러 메세지
</div>
</div>
<div class="invalid-feedback fw-bold"
th:if="${#fields.hasErrors('phone')}">
에러 메세지
</div>
<input type="hidden" name="phone" id="phone" th:field="*{phone}"/>
</td>
</tr>
<tr class="regionMainCodeArea"
th:classappend="${#lists.isEmpty(bindingVO.roleIds) or #lists.contains(bindingVO.roleIds, 'ROLE_ADMIN')} ? 'd-none'">
th:classappend="${#lists.isEmpty(bindingVO.roleId) or #lists.contains(bindingVO.roleId, 'ROLE_ADMIN')} ? 'd-none'">
<th><label for="regionMainCode">실사<i class="ico-required-mark" role="img" aria-label="필수">*</i></label></th>
<td>
<div class="component-select">
@@ -128,16 +138,16 @@
<label for="inlineRadio1" class="radio-inner">
<input id="inlineRadio1" th:field="*{accountDisabled}" type="radio" value="true">
<span class="radio-item">
<span class="radio-txt">미사용</span>
</span>
<span class="radio-txt">미사용</span>
</span>
</label>
</div>
<div class="component-input">
<label for="inlineRadio2" class="radio-inner">
<input id="inlineRadio2" th:field="*{accountDisabled}" type="radio" value="false">
<span class="radio-item">
<span class="radio-txt">사용</span>
</span>
<span class="radio-txt">사용</span>
</span>
</label>
</div>
<div class="invalid-feedback fw-bold" th:errors="*{accountDisabled}"
@@ -148,6 +158,7 @@
</tr>
</tbody>
</table>
<!-- <div th:replace="common/components :: auditArea"></div>-->
<div class="component-btns bottom-btn-group">
@@ -155,12 +166,13 @@
<button type="button" class="btn btn-secondary" onclick="gotoList();return false;">
<span class="btn-txt">목록</span>
</button>
<button type="submit" class="btn btn-primary">
<button type="button" class="btn btn-primary" onclick="updateAdmin();">
<span class="btn-txt">저장</span>
</button>
</div>
</div>
</div>
</form>
<!-- 이전 목록페이지의 검색 및 정렬조건 폼 -->
@@ -185,18 +197,14 @@
}
$(document).ready(() => {
showAudit([[${bindingVO.id}]], [[${bindingVO.createdBy}]],
[[${#temporals.format(bindingVO.createdAt, "yyyy-MM-dd'T'HH:mm:ss")}]],
[[${bindingVO.updatedBy}]],
[[${#temporals.format(bindingVO.updatedAt, "yyyy-MM-dd'T'HH:mm:ss")}]]);
// 초기 로드 시 roleIds에 따라 regionMainCodeArea 표시/숨김
const roleSelect = document.getElementById('roleIds');
// 초기 로드 시 roleId에 따라 regionMainCodeArea 표시/숨김
const roleSelect = document.getElementById('roleId');
if (roleSelect) {
onRoleChange(roleSelect);
}
$('form').on('submit', function() {
/* $('form').on('submit', function() {
const phone1 = $('#phone1').val();
const phone2 = $('#phone2').val();
if (phone1 && phone2) {
@@ -204,7 +212,7 @@
} else {
$('#phone').val('');
}
});
});*/
});
@@ -215,6 +223,29 @@
$('.researcherArea').toggle(idResearcher);
};
const updateAdmin = () => {
const f = document.adminUpdateForm;
let dataOj = $(f).serializeObject();
ajaxUtil._ajaxMethod(
'/api/settings/admin/update',
JSON.stringify(dataOj),
function(response) {
},
function (code, rstData) {
if(code === 422) alert(rstData.responseText);
if(code === 200 ){
alert("수정이 완료되었습니다.");
location.href = '/settings/admins';
}
},
'post',
'json',
{ handle422Type: 'alert' }
);
}
</script>
</th:block>

View File

@@ -7,6 +7,14 @@
<div class="content-inner">
<!-- 테이블 영역 -->
<table class="type-form">
<colgroup>
<col width="8%" />
<col width="25.3%" />
<col width="8%" />
<col width="25.3%" />
<col width="8%" />
<col width="25.3%" />
</colgroup>
<tbody>
<tr>
<th>임가번호<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>

View File

@@ -0,0 +1,353 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
layout:decorate="~{layout/layout}">
<div class="layer-wrap" th:fragment="modalFragment">
<!-- 임산물 현황 등록 모달 폼 -->
<form autocomplete="off" method="get" name="reqForestProductForm">
<input type="hidden" name="forestProductId">
<input type="hidden" name="householdSeq" th:value="${seq}">
<input type="hidden" name="recordMonth">
<div class="component-modal mypage-wrap modal01 modal-forest-product" data-props-dimm-click="true" data-state="close">
<div class="modal-dimm"></div>
<div class="modal-frame">
<div class="modal-container">
<div class="modal-header">
<h3 class="modal-tit">
임산물 현황 등록
</h3>
</div>
<div class="modal-content">
<div class="modal-content-inner">
<!-- <i class="ico-required-mark" role="img" aria-label="필수">*</i><p>필수입력</p>-->
<table class="type-form confirm">
<colgroup>
<col width="8%" />
<col width="25.3%" />
<col width="8%" />
<col width="25.3%" />
<col width="8%" />
<col width="25.3%" />
</colgroup>
<tbody>
<tr>
<th>지번</th>
<td>
<div class="component-input">
<div class="input-field">
<input type="text" id="streetNum" name="streetNum">
</div>
</div>
</td>
<th>지목</th>
<td>
<div class="component-input">
<div class="input-field">
<input type="text" id="landType" name="landType">
</div>
</div>
</td>
<th>읍면동</th>
<td>
<div class="component-input">
<div class="input-field">
<input type="text" id="town" name="town">
</div>
</div>
</td>
</tr>
<tr>
<th>재배 작물명<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td>
<div class="component-input">
<div class="input-field">
<input type="text" id="cropName" name="cropName">
</div>
</div>
</td>
<th>면적(평)</th>
<td>
<div class="component-input">
<div class="input-field">
<input type="number" id="landArea" name="landArea"
maxlength="30" inputmode="numeric" oninput="limitMaxLength(this);">
</div>
</div>
</td>
<th>가능면적(평)</th>
<td>
<div class="component-input">
<div class="input-field">
<input type="number" id="availableArea" name="availableArea"
maxlength="30" inputmode="numeric" oninput="limitMaxLength(this);">
</div>
</div>
</td>
</tr>
<tr>
<th colspan="6">주생산물</th>
</tr>
<tr>
<th>수확량</th>
<td>
<div class="component-input">
<div class="input-field">
<input type="number" id="mainYield" name="mainYield"
maxlength="10" inputmode="numeric" oninput="limitMaxLength(this);">
</div>
</div>
</td>
<th>단위</th>
<td colspan="2">
<div class="d-flex">
<div class="component-select">
<select class="select-list" name="mainYieldUnitCode" onchange="selectedUnit(this);" required>
<option value="">선택</option>
<option th:each="item : ${unitCodes}"
th:value="${item.id}"
th:text="${item.codeText}">
</select>
</div>
<div class="component-input unit-self-input">
<div class="input-field">
<input type="text" id="mainYieldUnit" name="mainYieldUnit" disabled>
</div>
</div>
</div>
</td>
</tr>
<tr>
<th>판매량</th>
<td>
<div class="component-input">
<div class="input-field">
<input type="number" id="mainSaleAmount" name="mainSaleAmount"
maxlength="10" inputmode="numeric" oninput="limitMaxLength(this);">
</div>
</div>
</td>
<th>단위</th>
<td colspan="2">
<div class="d-flex">
<div class="component-select">
<select class="select-list" name="mainSaleUnitCode" onchange="selectedUnit(this);" required>
<option value="">선택</option>
<option th:each="item : ${unitCodes}"
th:value="${item.id}"
th:text="${item.codeText}">
</select>
</div>
<div class="component-input unit-self-input">
<div class="input-field">
<input type="text" id="mainSaleUnit" name="mainSaleUnit" disabled>
</div>
</div>
</div>
</td>
</tr>
<tr>
<th colspan="6">부생산물</th>
</tr>
<tr>
<th>수확량</th>
<td>
<div class="component-input">
<div class="input-field">
<input type="number" id="subYield" name="subYield"
maxlength="10" inputmode="numeric" oninput="limitMaxLength(this);">
</div>
</div>
</td>
<th>단위</th>
<td colspan="2">
<div class="d-flex">
<div class="component-select">
<select class="select-list" name="subYieldUnitCode" onchange="selectedUnit(this);" required>
<option value="">선택</option>
<option th:each="item : ${unitCodes}"
th:value="${item.id}"
th:text="${item.codeText}">
</select>
</div>
<div class="component-input unit-self-input">
<div class="input-field">
<input type="text" id="subYieldUnit" name="subYieldUnit" disabled>
</div>
</div>
</div>
</td>
</tr>
<tr>
<th>판매량</th>
<td>
<div class="component-input">
<div class="input-field">
<input type="number" id="subSaleAmount" name="subSaleAmount"
maxlength="10" inputmode="numeric" oninput="limitMaxLength(this);">
</div>
</div>
</td>
<th>단위</th>
<td colspan="2">
<div class="d-flex">
<div class="component-select">
<select class="select-list" name="subSaleUnitCode" onchange="selectedUnit(this);" required>
<option value="">선택</option>
<option th:each="item : ${unitCodes}"
th:value="${item.id}"
th:text="${item.codeText}">
</select>
</div>
<div class="component-input unit-self-input">
<div class="input-field">
<input type="text" id="subSaleUnit" name="subSaleUnit" disabled>
</div>
</div>
</div>
</td>
</tr>
</tbody>
</table>
<div class="component-btns bottom-btn-group">
<div class="btns-row align-right">
<button type="button" class="btn btn-primary">
<span class="btn-txt">등록</span>
</button>
</div>
</div>
</div>
</div>
<button type="button" class="modal-close"></button>
</div>
</div>
</div>
</form>
<script>
// 임산물현황등록 모달창 띄우기
const showForestProductModal = (id) => {
const f = document.reqForestProductForm;
f.recordMonth.value = document.reqForm.recordMonth.value;
resetForestProductForm();
if(id != null) {
f.forestProductId.value = id;
ajaxUtil._ajaxMethod(
`/api/forestProduct/${id}`,
{},
(response) => {
console.log("임산물현황 상세 응답값 : ", response);
setForestProductFormData(response);
},
function (code, rstData) {
console.log("error : ", code);
},
'get',
'json'
);
}
document.querySelector(".modal-forest-product").ui.open();
}
// 임산물현황등록 상세 값 set
const setForestProductFormData = (data) => {
const form = document.reqForestProductForm;
if (!form) return;
form.forestProductId.value = data.id || '';
form.streetNum.value = data.streetNum || '';
form.landType.value = data.landType || '';
form.town.value = data.town || '';
form.cropName.value = data.cropName || '';
form.landArea.value = data.landArea ?? '';
form.availableArea.value = data.availableArea ?? '';
form.mainYield.value = data.mainYield ?? '';
form.mainSaleAmount.value = data.mainSaleAmount ?? '';
form.subYield.value = data.subYield ?? '';
form.subSaleAmount.value = data.subSaleAmount ?? '';
form.mainYieldUnit.value = data.mainYieldUnit || '';
form.mainSaleUnit.value = data.mainSaleUnit || '';
form.subYieldUnit.value = data.subYieldUnit || '';
form.subSaleUnit.value = data.subSaleUnit || '';
const unitSelectNames = [
'mainYieldUnitCode',
'mainSaleUnitCode',
'subYieldUnitCode',
'subSaleUnitCode'
];
unitSelectNames.forEach((name) => {
const select = form.querySelector(`select[name=${name}]`);
const value = data[name] || '';
if (select) {
select.value = value;
// unit-self-input 처리
const tr = select.closest('tr');
const unitArea = tr?.querySelector('.unit-self-input');
const unitInput = unitArea?.querySelector('input');
if (!unitArea || !unitInput) return;
if (value === 'code.record.unit.self') {
unitInput.disabled = false;
unitArea.classList.remove('input-disabled');
} else {
unitInput.disabled = true;
unitInput.value = '';
unitArea.classList.add('input-disabled');
}
}
});
}
</script>
<script>
// form 초기화
const resetForestProductForm = () => {
const form = document.reqForestProductForm;
if (!form) return;
// 모든 input 초기화
form.querySelectorAll('input').forEach((input) => {
input.value = '';
// 단위 직접입력는 다시 비활성화하고 클래스 추가
if (input.closest('.unit-self-input')) {
input.disabled = true;
input.closest('.unit-self-input').classList.add('input-disabled');
}
});
// 모든 select 초기화
form.querySelectorAll('select').forEach((select) => {
select.selectedIndex = 0;
});
}
</script>
</div>
</html>

View File

@@ -5,7 +5,7 @@
<div class="layer-wrap" th:fragment="modalFragment">
<form autocomplete="off" method="get" name="reqVisitForm">
<input type="hidden" name="visitInfoId">
<input type="hidden" name="householdSeq">
<input type="hidden" name="householdSeq" th:value="${seq}">
<div class="component-modal mypage-wrap modal01 modal-visit-info" data-props-dimm-click="true" data-state="close">
<div class="modal-dimm"></div>
@@ -19,6 +19,14 @@
<div class="modal-content">
<div class="modal-content-inner">
<table class="type-form confirm">
<colgroup>
<col width="8%" />
<col width="25.3%" />
<col width="8%" />
<col width="25.3%" />
<col width="8%" />
<col width="25.3%" />
</colgroup>
<tbody>
<tr>
@@ -107,7 +115,7 @@
<script th:inline="javascript">
// form 초기화
const resetForm = () => {
const resetVisitForm = () => {
const form = document.reqVisitForm;
if (!form) return;
@@ -125,9 +133,8 @@
// 임가방문정보 모달창 띄우기
const showVisitInfoModal = (id) => {
const f = document.reqVisitForm;
f.householdSeq.value = householdSeq;
resetForm();
resetVisitForm();
if(id != null) {
f.visitInfoId.value = id;
@@ -137,7 +144,7 @@
{},
(response) => {
console.log("임가방문정보 상세 응답값 : ", response);
setFormData(response);
setVisitFormData(response);
},
function (code, rstData) {
console.log("error : ", code);
@@ -151,7 +158,7 @@
}
// 임가방문정보 상세 값 set
const setFormData = (data) => {
const setVisitFormData = (data) => {
const form = document.reqVisitForm;
if (!form) return;
@@ -184,7 +191,7 @@
(response) => { // 성공
alert("등록이 완료되었습니다.");
document.querySelector(".modal-visit-info").ui.close();
getVisitInfo(0);
getVisitInfo();
},
function (code, rstData) {
if(code == 422) alert(rstData.responseText);

View File

@@ -451,7 +451,7 @@
<td>
<div class="component-input">
<label class="checkbox-inner">
<input type="checkbox" id="temp_checkbox_000${item.id}" name="temp_checkbox_000${item.id}" value="${item.id}">
<input type="checkbox" id="checkbox_work_${item.id}" name="checkbox_work" value="${item.id}">
</label>
</div>
</td>
@@ -501,7 +501,7 @@
<td>
<div class="component-input">
<label class="checkbox-inner">
<input type="checkbox" id="temp_checkbox_000${item.id}" name="temp_checkbox_000${item.id}" value="${item.id}">
<input type="checkbox" id="checkbox_expense_${item.id}" name="checkbox_expense" value="${item.id}">
</label>
</div>
</td>
@@ -542,7 +542,7 @@
<td>
<div class="component-input">
<label class="checkbox-inner">
<input type="checkbox" id="temp_checkbox_000${item.id}" name="temp_checkbox_000${item.id}" value="${item.id}">
<input type="checkbox" id="checkbox_power_${item.id}" name="checkbox_power" value="${item.id}">
</label>
</div>
</td>
@@ -579,7 +579,7 @@
<td>
<div class="component-input">
<label class="checkbox-inner">
<input type="checkbox" id="temp_checkbox_000${item.id}" name="temp_checkbox_000${item.id}" value="${item.id}">
<input type="checkbox" id="checkbox_forestry_${item.id}" name="checkbox_forestry" value="${item.id}">
</label>
</div>
</td>
@@ -618,7 +618,7 @@
<td>
<div class="component-input">
<label class="checkbox-inner">
<input type="checkbox" id="temp_checkbox_000${item.id}" name="temp_checkbox_000${item.id}" value="${item.id}">
<input type="checkbox" id="checkbox_farming_${item.id}" name="checkbox_farming" value="${item.id}">
</label>
</div>
</td>

View File

@@ -16,7 +16,7 @@
<button type="button" class="btn small btn-secondary">
<span class=" btn-txt">삭제</span>
</button>
<button type="button" class="btn small btn-primary">
<button type="button" class="btn small btn-primary" onclick="showForestProductModal();">
<span class="btn-txt">추가</span>
</button>
</div>
@@ -93,7 +93,9 @@
<td>${ifNullHyphen(item.landType)}</td><!-- 지목 -->
<td>${ifNullHyphen(item.town)}</td><!-- 읍면동 -->
<td>${ifNullHyphen(item.availableArea)}</td><!-- 가능면적(평) -->
<td>${ifNullHyphen(item.cropName)}</td><!-- 재배작물명 -->
<td class="underline">
<a href="javascript:void(0);" onclick="showForestProductModal(${item.id});">${ifNullHyphen(item.cropName)}</a>
</td><!-- 재배작물명 -->
<td>${ifNullHyphen(item.landArea)}</td><!-- 면적(평) -->
<td class="align-right">${ifNullHyphen(item.mainYield)}</td><!-- 주생산물 수확량 -->
<td>${ifNullHyphen(item.mainYieldUnitText)}</td><!-- 주생산물 수확량 단위 -->

View File

@@ -68,7 +68,7 @@
<td>
<div class="component-input">
<label class="checkbox-inner">
<input type="checkbox" id="removeIds_${item.id}" name="removeIds" value="${item.id}">
<input type="checkbox" id="visitRemoveIds_${item.id}" name="visitRemoveIds" value="${item.id}">
</label>
</div>
</td>
@@ -96,24 +96,27 @@
// 임가방문정보 삭제
const goDeleteVisitInfo = () => {
const infoIds = $('input[name=removeIds]:checked');
if(infoIds.length <= 0) {
const checkedIds = Array.from(
document.querySelectorAll('input[name="visitRemoveIds"]:checked')
).map(el => Number(el.value));
if(checkedIds.length <= 0) {
alert("임가방문정보를 선택해주세요.");
return
}
if(confirm("선택하신 내용을 삭제하시겠습니까? 삭제한 항목은 복구할 수 없습니다.")) {
const f = document.reqForm;
let dataOj = $(f).serializeObject();
console.log("dataOj", dataOj);
ajaxUtil._ajaxMethod(
'/api/visitInfo/remove',
JSON.stringify(dataOj),
JSON.stringify({
householdSeq: f.householdSeq.value,
visitRemoveIds: checkedIds
}),
(response) => { // 성공
alert("방문정보가 삭제되었습니다.");
getVisitInfo(0);
getVisitInfo();
},
function (code, rstData) {
if(code == 422) alert(rstData.responseText);

View File

@@ -9,6 +9,14 @@
<div class="content-inner">
<!-- 테이블 영역 -->
<table class="type-form">
<colgroup>
<col width="8%" />
<col width="25.3%" />
<col width="8%" />
<col width="25.3%" />
<col width="8%" />
<col width="25.3%" />
</colgroup>
<tbody>
<tr>
<th>임가번호<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>

View File

@@ -9,6 +9,14 @@
<div class="content-inner">
<section>
<table class="type-form confirm">
<colgroup>
<col width="8%" />
<col width="25.3%" />
<col width="8%" />
<col width="25.3%" />
<col width="8%" />
<col width="25.3%" />
</colgroup>
<tbody>
<tr>
<th>임가번호</th>
@@ -175,13 +183,12 @@
<!-- 임가방문정보 모달 -->
<th:block th:replace="households/modal/modal-visit-info :: modalFragment"/>
<!-- 임산물현황등록 모달 -->
<th:block th:replace="households/modal/modal-forest-product :: modalFragment"/>
</section>
<section layout:fragment="script">
<script th:inline="javascript">
const householdSeq = document.reqForm.householdSeq.value;
</script>
<script>
// 일계부 완료상태
const statusInfoMap = {
@@ -301,6 +308,22 @@
$(target).append(`<tr><td colspan="${length}" style="text-align: center;">${noDataText}</td></tr>`);
}
// 단위 선택 (직접입력 선택시 input 활성화)
const selectedUnit = (el) => {
const tr = el.closest('tr');
const unitArea = tr.querySelector('.unit-self-input');
const unitInput = tr.querySelector('.unit-self-input input');
if (el.value === 'code.record.unit.self') {
unitInput.disabled = false;
unitArea.classList.remove('input-disabled');
} else {
unitInput.disabled = true;
unitInput.value = '';
unitArea.classList.add('input-disabled');
}
}
</script>
</section>

View File

@@ -93,6 +93,7 @@
</tbody>
</table>
</section>
<div class="row paging"></div>
</div>
</div>
<div class="tab-content" data-tab-value="tab2" th:unless="${activeProfile != 'local'}">
@@ -144,6 +145,7 @@
</tbody>
</table>
</section>
<div class="row paging"></div>
</div>
</div>
</div>

View File

@@ -16,6 +16,14 @@
<form autocomplete="off" method="get" name="householdVisitReqForm" >
<input type="hidden" name="id" id="id" />
<table class="type-form confirm" >
<colgroup>
<col width="8%" />
<col width="25.3%" />
<col width="8%" />
<col width="25.3%" />
<col width="8%" />
<col width="25.3%" />
</colgroup>
<tbody id="household-visit-detail">
<tr>
<th>방문일</th>

View File

@@ -14,8 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
@SpringBootTest
@TestPropertySource("classpath:application-override.properties")
@Slf4j
class AdminCreateUpdateDaoTest {
@@ -23,12 +23,12 @@ class AdminCreateUpdateDaoTest {
System.setProperty("com.amazonaws.sdk.disableEc2Metadata", "true");
}
@Autowired
/* @Autowired
SaveAdminPortOut adminCreateUpdateDao;
@Autowired
AdminViewPortIn adminViewPortIn;
@Autowired
SaveAdminPortIn saveAdminPortIn;
SaveAdminPortIn saveAdminPortIn;*/
@Test
@DisplayName("operate - AdminCreateDao")

View File

@@ -1,4 +1,4 @@
package app.module.front.usecase.daily.record.adapters.web.model;
package app.module.core.config.application.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

View File

@@ -1,4 +1,4 @@
package app.module.front.usecase.daily.record.adapters.web.model;
package app.module.core.config.application.enums;
public enum DailyStatus {
/**

View File

@@ -1,4 +1,4 @@
package app.module.front.usecase.daily.record.adapters.web.model;
package app.module.core.config.application.enums;
public enum DailyTargetStatus {
/**

View File

@@ -1,9 +1,8 @@
package app.module.front.config.application.util;
package app.module.core.config.application.util;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.Date;
@@ -51,24 +50,29 @@ public class DailyUtil {
}
/**
* 검색 일의 마지막 일 조회
* @param searchDate 검색
* 마지막 일 조회
*
* @param searchDate 검색일
* @return 마지막 일
*/
public int getLastDay(LocalDate searchDate) {
return searchDate.withDayOfMonth(searchDate.lengthOfMonth()).getDayOfMonth();
if (searchDate != null) {
return searchDate.withDayOfMonth(searchDate.lengthOfMonth()).getDayOfMonth();
}
return 0;
}
/**
* 자가농업 항목 오픈 여부
* [정책] 자가농업 생산물 중 자가소비량은 7일차 등록일에만 노출 및 선택, 21일 이후는 마지막 날
*
* @param groupNo
* @param searchDate 종료일
* @param groupNo 그룹번호
* @param endDate 종료일
* @return true=대상, false=대상 아님
*/
public boolean isFarmingOpen(int groupNo, LocalDate searchDate) {
return groupNo == 4 || groupNo == 8 || groupNo == 12 || isLastDay(searchDate);
public boolean isFarmingOpen(int groupNo, LocalDate endDate) {
return groupNo == 4 || groupNo == 8 || groupNo == 12 || isLastDay(endDate);
}
/**

View File

@@ -17,7 +17,7 @@ class AdminViewDao implements AdminViewPortOut {
@Transactional
public Optional<AdminView> connect(String id) {
return mapper.findById(id).map(admin -> {
admin.setRoles(mapper.findRoleHasPrivilegesByAdminId(admin.getSeq()));
admin.setRole(mapper.findRoleHasPrivilegesByAdminId(admin.getSeq()));
return admin;
});
}

View File

@@ -9,5 +9,5 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface AdminViewMapper {
Optional<AdminView> findById(String id);
List<CoreRole> findRoleHasPrivilegesByAdminId(Long id);
CoreRole findRoleHasPrivilegesByAdminId(Long id);
}

View File

@@ -29,5 +29,5 @@ public class AdminView implements Serializable {
private String createdBy;
private LocalDateTime updatedAt;
private String updatedBy;
private List<CoreRole> roles;
private CoreRole role;
}

View File

@@ -1,24 +1,20 @@
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.front.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.front.usecase.daily.record.adapters.web.model.DailyStatus;
import app.module.front.usecase.daily.record.adapters.web.model.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.enums.DailyStatus;
import app.module.core.config.application.enums.DailyTargetStatus;
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;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
import java.util.Locale;
@Slf4j
@Repository
@@ -68,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
@@ -80,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);
@@ -98,9 +95,9 @@ public class DailyRecordDao implements DailyRecordPortOut {
/**
* 일계부 전체 입력상태 변경
*
* @param searchMonth
* @param dayGroupNo
* @param householdSeq
* @param searchMonth 검색 월(yyyyMM)
* @param dayGroupNo 검색 그룸번호
* @param householdSeq 임가 일련번호
*/
private void updateByAllStatus(String searchMonth, Integer dayGroupNo, Long householdSeq) {
String allStatus = this.getUpdateAllStatus(searchMonth, dayGroupNo, householdSeq);
@@ -109,6 +106,7 @@ public class DailyRecordDao implements DailyRecordPortOut {
new UpdateDailyRecordStatusCmd(
searchMonth,
dayGroupNo,
householdSeq,
allStatus,
null,
null
@@ -123,11 +121,11 @@ public class DailyRecordDao implements DailyRecordPortOut {
}
/**
* TODO 변경할 전체 입력상태 조회
* 변경할 전체 입력상태 조회
*
* @param searchMonth
* @param dayGroupNo
* @param householdSeq
* @param searchMonth 검색 월(yyyyMM)
* @param dayGroupNo 검색 그룸번호
* @param householdSeq 임가 일련번호
* @return 변경할 전체 입력상태
*/
private String getUpdateAllStatus(String searchMonth, Integer dayGroupNo, Long householdSeq) {
@@ -201,6 +199,6 @@ public class DailyRecordDao implements DailyRecordPortOut {
* @return true=입력대상인데 데이터가 없는 경우, false=입력대상 아니거나, 데이터가 있는 경우
*/
private boolean checkTargetDataNone(DailyTargetStatus status, Integer count) {
return DailyTargetStatus.TARGET.equals(status) && count == 0;
return this.checkTarget(status) && count == 0;
}
}

View File

@@ -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;

View File

@@ -1,8 +1,8 @@
package app.module.front.usecase.daily.record.adapters.persistence.model;
package app.module.core.usecase.daily.record.adapters.persistence.model;
import app.module.front.usecase.daily.record.adapters.web.model.DailySort;
import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus;
import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus;
import app.module.core.config.application.enums.DailySort;
import app.module.core.config.application.enums.DailyStatus;
import app.module.core.config.application.enums.DailyTargetStatus;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -59,7 +59,6 @@ public class DailyRecordDto {
private List<DailySort> stepList;
/**
* 다음 단계로 이동될 단계 조회
*
* @return 다음 단계명
*/
public String getNextStep() {

View File

@@ -1,7 +1,7 @@
package app.module.front.usecase.daily.record.adapters.persistence.model;
package app.module.core.usecase.daily.record.adapters.persistence.model;
import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus;
import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus;
import app.module.core.config.application.enums.DailyStatus;
import app.module.core.config.application.enums.DailyTargetStatus;
import lombok.Data;
import lombok.ToString;

View File

@@ -1,5 +1,7 @@
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;
import lombok.Data;
import lombok.ToString;
@@ -11,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;

View File

@@ -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.searchMonth = searchMonth;
this.groupNo = groupNo;
this.householdSeq = householdSeq;
}
public DailyUIReqVO(String searchMonth, String groupNo, Long householdSeq) {
this.searchMonth = searchMonth;
if (!StringUtils.isBlank(groupNo)) {
this.groupNo = Integer.parseInt(groupNo);
}
this.householdSeq = householdSeq;
}
/**
* 검색 월(yyyyMM)
*/
private String searchMonth;
/**
* 검색 그룸번호
*/
private Integer groupNo;
/**
* 임가 일련번호
*/
private Long householdSeq;
}

View File

@@ -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);
}

View File

@@ -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);
}

View File

@@ -1,21 +1,19 @@
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.front.usecase.daily.record.adapters.web.model.DailySort;
import app.module.front.usecase.daily.record.adapters.web.model.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.enums.DailySort;
import app.module.core.config.application.enums.DailyTargetStatus;
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;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
@@ -26,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<DailySort> targetList = new ArrayList<>();
@@ -72,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(),
@@ -93,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);
}
}

View File

@@ -1,8 +1,8 @@
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.front.usecase.daily.record.adapters.web.model.DailyStatus;
import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus;
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;
import lombok.Getter;
import lombok.Setter;
@@ -14,10 +14,12 @@ 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;

View File

@@ -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;

View File

@@ -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,11 @@ 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;

View File

@@ -1,9 +1,9 @@
<?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" >
<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"
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
, 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
@@ -17,7 +17,7 @@
</select>
<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
, dr.day_group_no, dr.start_date, dr.end_date
, dr.all_status

View File

@@ -24,19 +24,19 @@ CREATE TABLE privilege (
))
);
COMMENT ON TABLE public.privilege IS '권한 정의 테이블';
COMMENT ON TABLE privilege IS '권한 정의 테이블';
COMMENT ON COLUMN public.privilege.id IS '권한 ID';
COMMENT ON COLUMN public.privilege.description IS '권한 설명';
COMMENT ON COLUMN public.privilege.app_type IS '앱 구분';
COMMENT ON COLUMN public.privilege.order_no IS '정렬 순서';
COMMENT ON COLUMN public.privilege.created_at IS '생성일';
COMMENT ON COLUMN public.privilege.created_by IS '생성자';
COMMENT ON COLUMN public.privilege.updated_at IS '수정일';
COMMENT ON COLUMN public.privilege.updated_by IS '수정자';
COMMENT ON COLUMN public.privilege.deleted_at IS '삭제일';
COMMENT ON COLUMN public.privilege.deleted_by IS '삭제자';
COMMENT ON COLUMN public.privilege.is_deleted IS '삭제 여부';
COMMENT ON COLUMN privilege.id IS '권한 ID';
COMMENT ON COLUMN privilege.description IS '권한 설명';
COMMENT ON COLUMN privilege.app_type IS '앱 구분';
COMMENT ON COLUMN privilege.order_no IS '정렬 순서';
COMMENT ON COLUMN privilege.created_at IS '생성일';
COMMENT ON COLUMN privilege.created_by IS '생성자';
COMMENT ON COLUMN privilege.updated_at IS '수정일';
COMMENT ON COLUMN privilege.updated_by IS '수정자';
COMMENT ON COLUMN privilege.deleted_at IS '삭제일';
COMMENT ON COLUMN privilege.deleted_by IS '삭제자';
COMMENT ON COLUMN privilege.is_deleted IS '삭제 여부';
-- ============================================
@@ -1201,62 +1201,54 @@ COMMENT ON COLUMN daily_input_status.is_deleted IS '삭제여부';
CREATE SEQUENCE forest_product_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE forest_product (
id bigint DEFAULT nextval('forest_product_seq') NOT NULL, -- 현황 ID
household_seq bigint NOT NULL, -- 임가정보 일련번호 (FK)
street_num varchar(255), -- 지번
land_type varchar(255), -- 지목
town varchar(255), -- 읍면동
available_area integer, -- 가능면적
crop_name varchar(255), -- 재배작물명
crop_code varchar(255), -- 작물부호 (매핑코드)
land_area integer, -- 면적
month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm)
main_yield NUMERIC(10, 2), -- 수확량
main_yield_unit_code varchar(255), -- 수확 단위 (매핑코드)
main_sale_amount NUMERIC(10, 2), -- 판매량
main_sale_unit_code varchar(255), -- 판매 단위 (매핑코드)
id int8 DEFAULT nextval('forest_product_seq'::regclass) NOT NULL, -- 현황 ID
household_seq int8 NOT NULL, -- 임가 일련번호 (FK)
street_num varchar(255), -- 지번
land_type varchar(255), -- 지목
town varchar(255), -- 읍면동
available_area varchar(10), -- 가능면적
crop_name varchar(255), -- 재배작물명
crop_code varchar(255), -- 작물부호 (매핑코드)
land_area varchar(10), -- 면적
"month" varchar(7) NOT NULL, -- 조사 월 (yyyy-mm)
main_yield varchar(10), -- 주 수확량
main_yield_unit_code varchar(255), -- 주 수확량 단위(코드)
main_sale_amount varchar(10), -- 주 판매량
main_sale_unit_code varchar(255), -- 주 판매 단위(코드)
sub_yield varchar(10), -- 부 수확량
sub_yield_unit_code varchar(255), -- 부 수확량 단위(코드)
sub_sale_amount varchar(10), -- 부 판매량
sub_sale_unit_code varchar(255), -- 부 판매 단위(코드)
monthly_input_status_id int8, -- 월별 입력 상태 ID (FK)
main_yield_unit varchar(255), -- 주 수확량 단위(직접입력)
main_sale_unit varchar(255), -- 주 판매 단위(직접입력)
sub_yield_unit varchar(255), -- 부 수확량 단위(직접입력)
sub_sale_unit varchar(255), -- 부 판매 단위(직접입력)
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
updated_by varchar(255), -- 수정자
deleted_at timestamp(6), -- 삭제일
deleted_by varchar(255), -- 삭제자
is_deleted bool DEFAULT false, -- 삭제여부
sub_yield NUMERIC(10, 2), -- 수확량
sub_yield_unit_code varchar(255), -- 수확 단위 (매핑코드)
sub_sale_amount NUMERIC(10, 2), -- 판매량
sub_sale_unit_code varchar(255), -- 판매 단위 (매핑코드)
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
updated_by varchar(255), -- 수정자
deleted_at timestamp(6), -- 삭제일
deleted_by varchar(255), -- 삭제자
is_deleted boolean DEFAULT false, -- 삭제여부
CONSTRAINT forest_product_pkey PRIMARY KEY (id),
CONSTRAINT fk_forest_product__household FOREIGN KEY (household_seq) REFERENCES household(seq)
CONSTRAINT forest_product_pkey PRIMARY KEY (id),
CONSTRAINT fk_forest_product__household FOREIGN KEY (household_seq) REFERENCES household(seq),
CONSTRAINT fk_forest_product_monthly_input_status FOREIGN KEY (monthly_input_status_id) REFERENCES monthly_input_status(id)
);
COMMENT ON TABLE forest_product IS '임산물 현황';
COMMENT ON TABLE forest_product IS '임업 생산물 정보';
COMMENT ON COLUMN forest_product.id IS '현황 ID';
COMMENT ON COLUMN forest_product.household_seq IS '임가정보 일련번호';
COMMENT ON COLUMN forest_product.id IS '임업 생산물 ID';
COMMENT ON COLUMN forest_product.household_seq IS '임가 일련번호';
COMMENT ON COLUMN forest_product.street_num IS '지번';
COMMENT ON COLUMN forest_product.land_type IS '지목';
COMMENT ON COLUMN forest_product.town IS '읍면동';
COMMENT ON COLUMN forest_product.available_area IS '가능면적';
COMMENT ON COLUMN forest_product.crop_name IS '재배작물명';
COMMENT ON COLUMN forest_product.crop_code IS '작물부호 (매핑코드)';
COMMENT ON COLUMN forest_product.land_area IS '면적';
COMMENT ON COLUMN forest_product.month IS '조사시행 월 (yyyy-mm)';
COMMENT ON COLUMN forest_product.main_yield IS '주 생산물 수확량';
COMMENT ON COLUMN forest_product.main_yield_unit_code IS '주 생산물 수확 단위 (매핑코드)';
COMMENT ON COLUMN forest_product.main_sale_amount IS '주 생산물 판매량';
COMMENT ON COLUMN forest_product.main_sale_unit_code IS '주 생산물 판매 단위 (매핑코드)';
COMMENT ON COLUMN forest_product.sub_yield IS '주 생산물 수확량';
COMMENT ON COLUMN forest_product.sub_yield_unit_code IS '주 생산물 수확 단위 (매핑코드)';
COMMENT ON COLUMN forest_product.sub_sale_amount IS '주 생산물 판매량';
COMMENT ON COLUMN forest_product.sub_sale_unit_code IS '주 생산물 판매 단위 (매핑코드)';
COMMENT ON COLUMN forest_product.land_type IS '토지 유형';
COMMENT ON COLUMN forest_product.town IS '마을';
COMMENT ON COLUMN forest_product.available_area IS '가용 면적';
COMMENT ON COLUMN forest_product.crop_name IS '작물명';
COMMENT ON COLUMN forest_product.crop_code IS '작물 코드';
COMMENT ON COLUMN forest_product.land_area IS '토지 면적';
COMMENT ON COLUMN forest_product.month IS '조사 월 (yyyy-mm)';
COMMENT ON COLUMN forest_product.created_at IS '생성일';
COMMENT ON COLUMN forest_product.created_by IS '생성자';
COMMENT ON COLUMN forest_product.updated_at IS '수정일';
@@ -1264,6 +1256,19 @@ COMMENT ON COLUMN forest_product.updated_by IS '수정자';
COMMENT ON COLUMN forest_product.deleted_at IS '삭제일';
COMMENT ON COLUMN forest_product.deleted_by IS '삭제자';
COMMENT ON COLUMN forest_product.is_deleted IS '삭제여부';
COMMENT ON COLUMN forest_product.main_yield IS '주 수확량';
COMMENT ON COLUMN forest_product.main_yield_unit_code IS '주 수확량 단위(코드)';
COMMENT ON COLUMN forest_product.main_sale_amount IS '주 판매량';
COMMENT ON COLUMN forest_product.main_sale_unit_code IS '주 판매 단위(코드)';
COMMENT ON COLUMN forest_product.sub_yield IS '부 수확량';
COMMENT ON COLUMN forest_product.sub_yield_unit_code IS '부 수확량 단위(코드)';
COMMENT ON COLUMN forest_product.sub_sale_amount IS '부 판매량';
COMMENT ON COLUMN forest_product.sub_sale_unit_code IS '부 판매 단위(코드)';
COMMENT ON COLUMN forest_product.monthly_input_status_id IS '월별 입력 상태 ID';
COMMENT ON COLUMN forest_product.main_yield_unit IS '주 수확량 단위(직접입력)';
COMMENT ON COLUMN forest_product.main_sale_unit IS '주 판매 단위(직접입력)';
COMMENT ON COLUMN forest_product.sub_yield_unit IS '부 수확량 단위(직접입력)';
COMMENT ON COLUMN forest_product.sub_sale_unit IS '부 판매 단위(직접입력)';
-- ============================================
@@ -1318,44 +1323,49 @@ COMMENT ON COLUMN forest_product_yield.is_deleted IS '삭제여부';
CREATE SEQUENCE bank_auto_transfer_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE bank_auto_transfer (
id bigint DEFAULT nextval('bank_auto_transfer_seq') NOT NULL, -- 자동이체 ID
household_seq bigint NOT NULL, -- 임가정보 일련번호 (FK)
transfer_type varchar(7) NOT NULL, -- 수입/지출 유형 (enum : INCOME / EXPENSE)
income_code varchar(255), -- 수입 코드 (매핑코드)
expense_code varchar(255), -- 지출 코드 (매핑코드)
crop_code integer, -- 재배형태 코드 (매핑코드)
transfer_category varchar(30), -- 수입/지출 종류
source_purpose varchar(10), -- 수입원(용도)
count integer, -- 수량
unit_code varchar(255), -- 단위 (매핑코드)
price integer, -- 현금(원)
month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm)
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
updated_by varchar(255), -- 수정자
deleted_at timestamp(6), -- 삭제일
deleted_by varchar(255), -- 삭제자
is_deleted boolean DEFAULT false, -- 삭제여부
id int8 DEFAULT nextval('bank_auto_transfer_seq'::regclass) NOT NULL, -- 자동 이체 ID
household_seq int8 NOT NULL, -- 임가 일련번호 (FK)
transfer_type varchar(255) NOT NULL, -- 수입/지출 유형 (enum : INCOME / EXPENSE)
income_code varchar(255), -- 수입 코드 (매핑코드)
expense_code varchar(255), -- 지출 코드 (매핑코드)
crop_code varchar(255), -- 재배형태 코드 (매핑코드)
transfer_category varchar(30), -- 수입/지출 종류
source_purpose varchar(10), -- 수입원(용도)
count varchar(10), -- 수량
unit_code varchar(255), -- 단위 (매핑코드)
price int8, -- 현금(원)
"month" varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm)
monthly_input_status_id int8, -- 월별 입력 상태 ID (FK)
transfer_category_code varchar(255), -- 이체 카테고리 코드
unit varchar(255), -- 단위(직접입력)
category varchar(10), -- 카테고리
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
updated_by varchar(255), -- 수정자
deleted_at timestamp(6), -- 삭제일
deleted_by varchar(255), -- 삭제자
is_deleted bool DEFAULT false, -- 삭제여부
CONSTRAINT bank_auto_transfer_pkey PRIMARY KEY (id),
CONSTRAINT fk_bank_auto_transfer__household FOREIGN KEY (household_seq) REFERENCES household(seq)
CONSTRAINT bank_auto_transfer_pkey PRIMARY KEY (id),
CONSTRAINT fk_bank_auto_transfer__household FOREIGN KEY (household_seq) REFERENCES household(seq),
CONSTRAINT fk_bank_auto_transfer_monthly_input_status FOREIGN KEY (monthly_input_status_id) REFERENCES monthly_input_status(id)
);
COMMENT ON TABLE bank_auto_transfer IS '은행 자동이체 항목';
COMMENT ON TABLE bank_auto_transfer IS '은행 자동 이체 내역';
COMMENT ON COLUMN bank_auto_transfer.id IS '자동이체 ID';
COMMENT ON COLUMN bank_auto_transfer.household_seq IS '임가정보 일련번호';
COMMENT ON COLUMN bank_auto_transfer.transfer_type IS '수입/지출 유형 (enum)';
COMMENT ON COLUMN bank_auto_transfer.income_code IS '수입 코드 (매핑코드)';
COMMENT ON COLUMN bank_auto_transfer.expense_code IS '지출 코드 (매핑코드)';
COMMENT ON COLUMN bank_auto_transfer.crop_code IS '재배형태 코드 (매핑코드)';
COMMENT ON COLUMN bank_auto_transfer.transfer_category IS '수입/지출 종류';
COMMENT ON COLUMN bank_auto_transfer.source_purpose IS '수입원(용도)';
COMMENT ON COLUMN bank_auto_transfer.id IS '자동 이체 ID';
COMMENT ON COLUMN bank_auto_transfer.household_seq IS '임가 일련번호';
COMMENT ON COLUMN bank_auto_transfer.transfer_type IS '이체 유형';
COMMENT ON COLUMN bank_auto_transfer.income_code IS '수입 코드';
COMMENT ON COLUMN bank_auto_transfer.expense_code IS '지출 코드';
COMMENT ON COLUMN bank_auto_transfer.crop_code IS '작물 코드';
COMMENT ON COLUMN bank_auto_transfer.transfer_category IS '이체 카테고리';
COMMENT ON COLUMN bank_auto_transfer.source_purpose IS '원천/용도';
COMMENT ON COLUMN bank_auto_transfer.count IS '수량';
COMMENT ON COLUMN bank_auto_transfer.unit_code IS '단위 (매핑코드)';
COMMENT ON COLUMN bank_auto_transfer.price IS '현금(원)';
COMMENT ON COLUMN bank_auto_transfer.month IS '조사시행 월 (yyyy-mm)';
COMMENT ON COLUMN bank_auto_transfer.unit_code IS '단위(코드)';
COMMENT ON COLUMN bank_auto_transfer.price IS '금액';
COMMENT ON COLUMN bank_auto_transfer.month IS '조사 월 (yyyy-mm)';
COMMENT ON COLUMN bank_auto_transfer.created_at IS '생성일';
COMMENT ON COLUMN bank_auto_transfer.created_by IS '생성자';
COMMENT ON COLUMN bank_auto_transfer.updated_at IS '수정일';
@@ -1363,7 +1373,10 @@ COMMENT ON COLUMN bank_auto_transfer.updated_by IS '수정자';
COMMENT ON COLUMN bank_auto_transfer.deleted_at IS '삭제일';
COMMENT ON COLUMN bank_auto_transfer.deleted_by IS '삭제자';
COMMENT ON COLUMN bank_auto_transfer.is_deleted IS '삭제여부';
COMMENT ON COLUMN bank_auto_transfer.monthly_input_status_id IS '월별 입력 상태 ID';
COMMENT ON COLUMN bank_auto_transfer.transfer_category_code IS '이체 카테고리 코드';
COMMENT ON COLUMN bank_auto_transfer.unit IS '단위(직접입력)';
COMMENT ON COLUMN bank_auto_transfer.category IS '카테고리';
-- 6. monthly_carryover
-- ============================================

View File

@@ -22,23 +22,25 @@ DROP SEQUENCE IF EXISTS daily_record_seq;
*/
-- ============================================
-- TABLE : daily_day_group
-- DESC : 일계부 작성일자 그룹 테이블
-- ============================================
CREATE TABLE daily_day_group (
group_no smallint NOT NULL, -- 그룹번호
start_day smallint, -- 시작일자
end_day smallint, -- 종료일자
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
updated_by varchar(255), -- 수정자
deleted_at timestamp(6), -- 삭제일
deleted_by varchar(255), -- 삭제자
is_deleted boolean DEFAULT false, -- 삭제여부
group_no smallint NOT NULL, -- 그룹번호
start_day smallint, -- 시작일자
end_day smallint, -- 종료일자
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
updated_by varchar(255), -- 수정자
deleted_at timestamp(6), -- 삭제일
deleted_by varchar(255), -- 삭제자
is_deleted boolean DEFAULT false, -- 삭제여부
CONSTRAINT daily_day_group_pkey PRIMARY KEY (group_no)
CONSTRAINT daily_day_group_pkey PRIMARY KEY (group_no)
);
COMMENT ON TABLE daily_day_group IS '일계부 작성일자 그룹 테이블';
@@ -56,56 +58,58 @@ COMMENT ON COLUMN daily_day_group.is_deleted IS '삭제여부';
INSERT INTO daily_day_group (group_no, start_day, end_day, created_at, created_by, is_deleted)
VALUES
(1, 1, 2, now(), '_system', false)
,(2, 3, 4, now(), '_system', false)
,(3, 5, 6, now(), '_system', false)
,(4, 7, 7, now(), '_system', false)
,(5, 8, 9, now(), '_system', false)
,(6, 10, 11, now(), '_system', false)
,(7, 12, 13, now(), '_system', false)
,(8, 14, 14, now(), '_system', false)
,(9, 15, 16, now(), '_system', false)
,(10, 17, 18, now(), '_system', false)
,(11, 19, 20, now(), '_system', false)
,(12, 21, 21, now(), '_system', false)
,(13, 22, 23, now(), '_system', false)
,(14, 24, 25, now(), '_system', false)
,(15, 26, 27, now(), '_system', false)
,(16, 28, 29, now(), '_system', false)
,(17, 30, 31, now(), '_system', false)
(1, 1, 2, now(), '_system', false)
,(2, 3, 4, now(), '_system', false)
,(3, 5, 6, now(), '_system', false)
,(4, 7, 7, now(), '_system', false)
,(5, 8, 9, now(), '_system', false)
,(6, 10, 11, now(), '_system', false)
,(7, 12, 13, now(), '_system', false)
,(8, 14, 14, now(), '_system', false)
,(9, 15, 16, now(), '_system', false)
,(10, 17, 18, now(), '_system', false)
,(11, 19, 20, now(), '_system', false)
,(12, 21, 21, now(), '_system', false)
,(13, 22, 23, now(), '_system', false)
,(14, 24, 25, now(), '_system', false)
,(15, 26, 27, now(), '_system', false)
,(16, 28, 29, now(), '_system', false)
,(17, 30, 31, now(), '_system', false)
;
-- ============================================
-- TABLE : daily_record
-- DESC : 일계부 일별 작성상태
-- ============================================
CREATE SEQUENCE daily_record_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE SEQUENCE IF NOT EXISTS daily_record_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE daily_record (
id bigint DEFAULT nextval('daily_record_seq') NOT NULL, -- 일계부 작성상태 ID
household_seq bigint NOT NULL, -- 임가 일련번호 (FK)
record_month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm)
day_group_no smallint, -- 일계부 작성일자 그룹 번호
start_date date, -- 작성시작일(yyyy-mm-dd)
end_date date, -- 작성종료일(yyyy-mm-dd)
all_status varchar(15), -- 전체 입력상태
income_status varchar(15), -- 수입 입력상태
work_status varchar(15), -- 임업노동 투입내역 입력상태
expense_status varchar(15), -- 지출 입력상태
power_status varchar(15), -- 동력사용시간 입력상태
forestry_status varchar(15), -- 자가임업 생산물 중 자가소비량 입력상태
farming_status varchar(15), -- 자가농업 생산물 중 자가소비량 입력상태
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
updated_by varchar(255), -- 수정자
deleted_at timestamp(6), -- 삭제일
deleted_by varchar(255), -- 삭제자
is_deleted boolean DEFAULT false, -- 삭제여부
CONSTRAINT daily_record_pkey PRIMARY KEY (id),
CONSTRAINT fk_daily_record__household FOREIGN KEY (household_seq) REFERENCES household(seq)
id int8 DEFAULT nextval('daily_record_seq'::regclass) NOT NULL, -- 일계부 작성상태 ID
household_seq int8 NOT NULL, -- 임가 일련번호 (FK)
record_month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm)
day_group_no int2, -- 일계부 작성일자 그룹 번호
start_date date, -- 작성시작일(yyyy-mm-dd)
end_date date, -- 작성종료일(yyyy-mm-dd)
all_status varchar(15), -- 전체 입력상태
income_status varchar(15), -- 수입 입력상태
work_status varchar(15), -- 임업노동 투입내역 입력상태
expense_status varchar(15), -- 지출 입력상태
power_status varchar(15), -- 동력사용시간 입력상태
forestry_status varchar(15), -- 자가임업 생산물 중 자가소비량 입력상태
farming_status varchar(15), -- 자가농업 생산물 중 자가소비량 입력상태
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
updated_by varchar(255), -- 수정자
deleted_at timestamp(6), -- 삭제일
deleted_by varchar(255), -- 삭제자
is_deleted bool DEFAULT false, -- 삭제여부
CONSTRAINT daily_record_pkey PRIMARY KEY (id),
CONSTRAINT fk_daily_record__household FOREIGN KEY (household_seq) REFERENCES household(seq)
);
COMMENT ON TABLE daily_record IS '일계부 일별 작성상태';
@@ -113,9 +117,9 @@ COMMENT ON TABLE daily_record IS '일계부 일별 작성상태';
COMMENT ON COLUMN daily_record.id IS '일계부 작성상태 ID';
COMMENT ON COLUMN daily_record.household_seq IS '임가 일련번호';
COMMENT ON COLUMN daily_record.record_month IS '조사시행 월 (yyyy-mm)';
COMMENT ON COLUMN daily_record.day_group_no IS '일계부 작성일자 그룹 번호';
COMMENT ON COLUMN daily_record.start_date IS '작성시작일(yyyy-mm-dd)';
COMMENT ON COLUMN daily_record.end_date IS '작성종료일(yyyy-mm-dd)';
COMMENT ON COLUMN daily_record.day_group_no IS '일계부 작성일자 그룹 번호';
COMMENT ON COLUMN daily_record.all_status IS '전체 입력상태';
COMMENT ON COLUMN daily_record.income_status IS '수입 입력상태';
COMMENT ON COLUMN daily_record.work_status IS '임업노동 투입내역 입력상태';
@@ -131,7 +135,6 @@ COMMENT ON COLUMN daily_record.deleted_at IS '삭제일';
COMMENT ON COLUMN daily_record.deleted_by IS '삭제자';
COMMENT ON COLUMN daily_record.is_deleted IS '삭제여부';
-- ============================================
-- TABLE : daily_income
-- DESC : 수입내역 - 일계부
@@ -139,32 +142,32 @@ COMMENT ON COLUMN daily_record.is_deleted IS '삭제여부';
CREATE SEQUENCE daily_income_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE daily_income (
id bigint DEFAULT nextval('daily_income_seq') NOT NULL, -- 일계부 수입 ID
daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK)
input_type varchar(5), -- 입력 구분(SELF, OCR)
category varchar(10), -- 유형
income_mark varchar(10), -- 수입 부호
expense_mark varchar(10), -- 지출 부호
is_credit boolean, -- 외상판매 여부
crop_code varchar(255), -- 재배형태(매핑코드)
income_kind varchar(100), -- 수입의 종류
income_kind_mark varchar(10), -- 종류 부호
source_purpose varchar(100), -- 수입원(용도)
quantity varchar(10), -- 수량
unit_code varchar(255), -- 단위(매핑코드)
unit_self varchar(100), -- 단위(직접입력)
price bigint, -- 현금(원)
estimated_value bigint, -- 현물(평가액)
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
updated_by varchar(255), -- 수정자
deleted_at timestamp(6), -- 삭제일
deleted_by varchar(255), -- 삭제자
is_deleted boolean DEFAULT false, -- 삭제여부
CONSTRAINT daily_income_pkey PRIMARY KEY (id),
CONSTRAINT fk_daily_income__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
id int8 DEFAULT nextval('daily_income_seq'::regclass) NOT NULL, -- 일계부 수입 ID
daily_record_seq int8 NOT NULL, -- 일계부 작성상태 일련번호 (FK)
input_type varchar(5), -- 입력 구분(SELF, OCR)
category varchar(10), -- 유형
income_mark varchar(10), -- 수입 부호
expense_mark varchar(10), -- 지출 부호
is_credit bool, -- 외상판매 여부
crop_code varchar(255), -- 재배형태(매핑코드)
income_kind varchar(100), -- 수입의 종류
income_kind_mark varchar(10), -- 종류 부호
source_purpose varchar(100), -- 수입원(용도)
quantity varchar(10), -- 수량
unit_code varchar(255), -- 단위(매핑코드)
unit_self varchar(100), -- 단위(직접입력)
price int8, -- 현금(원)
estimated_value int8, -- 현물(평가액)
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
updated_by varchar(255), -- 수정자
deleted_at timestamp(6), -- 삭제일
deleted_by varchar(255), -- 삭제자
is_deleted bool DEFAULT false, -- 삭제여부
CONSTRAINT daily_income_pkey PRIMARY KEY (id),
CONSTRAINT fk_daily_income__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
);
COMMENT ON TABLE daily_income IS '수입내역 - 일계부';
@@ -193,7 +196,6 @@ COMMENT ON COLUMN daily_income.deleted_at IS '삭제일';
COMMENT ON COLUMN daily_income.deleted_by IS '삭제자';
COMMENT ON COLUMN daily_income.is_deleted IS '삭제여부';
-- ============================================
-- TABLE : daily_expense
-- DESC : 지출내역 - 일계부
@@ -201,31 +203,31 @@ COMMENT ON COLUMN daily_income.is_deleted IS '삭제여부';
CREATE SEQUENCE daily_expense_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE daily_expense (
id bigint DEFAULT nextval('daily_expense_seq') NOT NULL, -- 일계부 지출 ID
daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK)
input_type varchar(5), -- 입력 구분(SELF, OCR)
category varchar(10), -- 유형
income_mark varchar(10), -- 수입부호
expense_mark varchar(10), -- 지출부호
is_credit boolean, -- 외상판매 여부
expense_kind varchar(100), -- 지출의 종류
expense_kind_mark varchar(10), -- 종류 부호
source_purpose varchar(10), -- 지출원(용도)
quantity varchar(10), -- 수량
unit_code varchar(255), -- 단위(매핑코드)
unit_self varchar(100), -- 단위(직접입력)
price bigint, -- 현금(원)
estimated_value bigint, -- 현물(평가액)
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
updated_by varchar(255), -- 수정자
deleted_at timestamp(6), -- 삭제일
deleted_by varchar(255), -- 삭제자
is_deleted boolean DEFAULT false, -- 삭제여부
id int8 DEFAULT nextval('daily_expense_seq'::regclass) NOT NULL, -- 일계부 지출 ID
daily_record_seq int8 NOT NULL, -- 일계부 작성상태 일련번호 (FK)
input_type varchar(5), -- 입력 구분(SELF, OCR)
category varchar(10), -- 유형
income_mark varchar(10), -- 수입부호
expense_mark varchar(10), -- 지출부호
is_credit bool, -- 외상판매 여부
expense_kind varchar(100), -- 지출의 종류
expense_kind_mark varchar(10), -- 종류 부호
source_purpose varchar(10), -- 지출원(용도)
quantity varchar(10), -- 수량
unit_code varchar(255), -- 단위(매핑코드)
unit_self varchar(100), -- 단위(직접입력)
price int8, -- 현금(원)
estimated_value int8, -- 현물(평가액)
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
updated_by varchar(255), -- 수정자
deleted_at timestamp(6), -- 삭제일
deleted_by varchar(255), -- 삭제자
is_deleted bool DEFAULT false, -- 삭제여부
CONSTRAINT daily_expense_pkey PRIMARY KEY (id),
CONSTRAINT fk_daily_expense__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
CONSTRAINT daily_expense_pkey PRIMARY KEY (id),
CONSTRAINT fk_daily_expense__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
);
COMMENT ON TABLE daily_expense IS '지출내역 - 일계부';
@@ -253,7 +255,6 @@ COMMENT ON COLUMN daily_expense.deleted_at IS '삭제일';
COMMENT ON COLUMN daily_expense.deleted_by IS '삭제자';
COMMENT ON COLUMN daily_expense.is_deleted IS '삭제여부';
-- ============================================
-- TABLE : daily_work
-- DESC : 임업노동 투입내역 - 일계부
@@ -261,38 +262,38 @@ COMMENT ON COLUMN daily_expense.is_deleted IS '삭제여부';
CREATE SEQUENCE daily_work_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE daily_work (
id bigint DEFAULT nextval('daily_work_seq') NOT NULL,
daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK)
item_name varchar(100),
item_mark varchar(10),
work_name varchar(100),
work_mark varchar(10),
work_land_area varchar(10),
area_unit_code varchar(255),
area_unit_self varchar(100),
harvest_quantity varchar(10),
harvest_unit_code varchar(255),
harvest_unit_self varchar(100),
owner_time varchar(10), -- 경영주 노동시간
spouse_time varchar(10), -- 배우자 노동시간
family_m_hours varchar(10), -- 가족 남 노동시간
family_f_hours varchar(10), -- 가족 여 노동시간
hired_m_hours varchar(10), -- 고용 남
hired_f_hours varchar(10), -- 고용 여
shared_m_hours varchar(10), -- 품앗이 남
shared_f_hours varchar(10), -- 품앗이 여
volunteer_m_hours varchar(10), -- 일손돕기 남
volunteer_f_hours varchar(10), -- 일손돕기 여
created_at timestamp(6),
created_by varchar(255),
updated_at timestamp(6),
updated_by varchar(255),
deleted_at timestamp(6),
deleted_by varchar(255),
is_deleted boolean NOT NULL DEFAULT false,
id int8 DEFAULT nextval('daily_work_seq'::regclass) NOT NULL, -- 투입내역 내부키
daily_record_seq int8 NOT NULL, -- 일계부 작성상태 일련번호 (FK)
item_name varchar(100), -- 품목명
item_mark varchar(10), -- 품목 부호
work_name varchar(100), -- 작업명
work_mark varchar(10), -- 작업 부호
work_land_area varchar(10), -- 작업 면적
area_unit_code varchar(255), -- 작업 면적 단위(코드매핑)
area_unit_self varchar(100), -- 작업 면적 단위(직접입력)
harvest_quantity varchar(10), -- 수확량
harvest_unit_code varchar(255), -- 수확량 단위(코드매핑)
harvest_unit_self varchar(100), -- 수확량 단위(직접입력)
owner_time varchar(10), -- 경영주 노동시간
spouse_time varchar(10), -- 배우자 노동시간
family_m_hours varchar(10), -- 가족 남 노동시간
family_f_hours varchar(10), -- 가족 여 노동시간
hired_m_hours varchar(10), -- 고용 남
hired_f_hours varchar(10), -- 고용 여
shared_m_hours varchar(10), -- 품앗이 남
shared_f_hours varchar(10), -- 품앗이 여
volunteer_m_hours varchar(10), -- 일손돕기 남
volunteer_f_hours varchar(10), -- 일손돕기 여
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
updated_by varchar(255), -- 수정자
deleted_at timestamp(6), -- 삭제일
deleted_by varchar(255), -- 삭제자
is_deleted bool DEFAULT false, -- 삭제여부
CONSTRAINT daily_work_pkey PRIMARY KEY (id),
CONSTRAINT fk_daily_work__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
CONSTRAINT daily_work_pkey PRIMARY KEY (id),
CONSTRAINT fk_daily_work__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
);
COMMENT ON TABLE daily_work IS '임업노동 투입내역 - 일계부';
@@ -327,7 +328,6 @@ COMMENT ON COLUMN daily_work.deleted_at IS '삭제일';
COMMENT ON COLUMN daily_work.deleted_by IS '삭제자';
COMMENT ON COLUMN daily_work.is_deleted IS '삭제여부';
-- ============================================
-- TABLE : daily_power
-- DESC : 동력 사용시간 - 일계부
@@ -335,19 +335,19 @@ COMMENT ON COLUMN daily_work.is_deleted IS '삭제여부';
CREATE SEQUENCE daily_power_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE daily_power (
id bigint DEFAULT nextval('daily_power_seq') NOT NULL, -- 동력사용시간 ID
daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK)
equipment_name varchar(100), -- 명칭
equipment_mark varchar(10), -- 명칭 부호
owned_hours varchar(10), -- 자가 시간
leased_hours varchar(10), -- 임차 시간
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
updated_by varchar(255), -- 수정자
deleted_at timestamp(6), -- 삭제일
deleted_by varchar(255), -- 삭제자
is_deleted boolean DEFAULT false, -- 삭제여부
id int8 DEFAULT nextval('daily_power_seq'::regclass) NOT NULL, -- 동력사용시간 ID
daily_record_seq int8 NOT NULL, -- 일계부 작성상태 일련번호 (FK)
equipment_name varchar(100), -- 명칭
equipment_mark varchar(10), -- 명칭 부호
owned_hours varchar(10), -- 자가 시간
leased_hours varchar(10), -- 임차 시간
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
updated_by varchar(255), -- 수정자
deleted_at timestamp(6), -- 삭제일
deleted_by varchar(255), -- 삭제자
is_deleted bool DEFAULT false, -- 삭제여부
CONSTRAINT daily_power_pkey PRIMARY KEY (id),
CONSTRAINT fk_daily_power__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
@@ -369,7 +369,6 @@ COMMENT ON COLUMN daily_power.deleted_at IS '삭제일';
COMMENT ON COLUMN daily_power.deleted_by IS '삭제자';
COMMENT ON COLUMN daily_power.is_deleted IS '삭제여부';
-- ============================================
-- TABLE : daily_forestry
-- DESC : 자가임업 생산물 중 자가소비량
@@ -377,31 +376,31 @@ COMMENT ON COLUMN daily_power.is_deleted IS '삭제여부';
CREATE SEQUENCE daily_forestry_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE daily_forestry (
id bigint DEFAULT nextval('daily_forestry_seq') NOT NULL, -- 임업 자가소비량 일련번호
daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK)
income_mark varchar(10), -- 수입부호
expense_mark varchar(10), -- 지출부호
product_name varchar(100), -- 생산물
usage varchar(100), -- 용도
quantity varchar(10), -- 수량
unit_code varchar(255), -- 단위(매핑코드)
unit_self varchar(100), -- 단위(직접입력)
estimated_value bigint, -- 현물평가
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
updated_by varchar(255), -- 수정자
deleted_at timestamp(6), -- 삭제일
deleted_by varchar(255), -- 삭제자
is_deleted boolean DEFAULT false NOT NULL, -- 삭제여부
id int8 DEFAULT nextval('daily_forestry_seq'::regclass) NOT NULL, -- 임업 자가소비량 일련번호
daily_record_seq int8 NOT NULL, -- 일계부 작성상태 일련번호 (FK)
income_mark varchar(10), -- 수입 부호
expense_mark varchar(10), -- 지출 부호
product_name varchar(100), -- 생산물
"usage" varchar(100), -- 용도
quantity varchar(10), -- 수량
unit_code varchar(255), -- 단위(매핑코드)
unit_self varchar(100), -- 단위(직접입력)
estimated_value int8, -- 현물평가
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
updated_by varchar(255), -- 수정자
deleted_at timestamp(6), -- 삭제일
deleted_by varchar(255), -- 삭제자
is_deleted bool DEFAULT false, -- 삭제여부
CONSTRAINT daily_forestry_pkey PRIMARY KEY (id),
CONSTRAINT fk_daily_forestry__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
CONSTRAINT daily_forestry_pkey PRIMARY KEY (id),
CONSTRAINT fk_daily_forestry__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
);
COMMENT ON TABLE daily_forestry IS '자가임업 생산물 중 자가소비량';
COMMENT ON COLUMN daily_forestry.id IS '임가 일련번호';
COMMENT ON COLUMN daily_forestry.id IS '임업 자가소비량 일련번호';
COMMENT ON COLUMN daily_forestry.daily_record_seq IS '일계부 작성상태 일련번호';
COMMENT ON COLUMN daily_forestry.income_mark IS '수입 부호';
COMMENT ON COLUMN daily_forestry.expense_mark IS '지출 부호';
@@ -419,7 +418,6 @@ COMMENT ON COLUMN daily_forestry.deleted_at IS '삭제일';
COMMENT ON COLUMN daily_forestry.deleted_by IS '삭제자';
COMMENT ON COLUMN daily_forestry.is_deleted IS '삭제여부';
-- ============================================
-- TABLE : daily_farming
-- DESC : 자가농업 생산물 중 자가소비량
@@ -427,35 +425,36 @@ COMMENT ON COLUMN daily_forestry.is_deleted IS '삭제여부';
CREATE SEQUENCE daily_farming_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE daily_farming (
id bigint DEFAULT nextval('daily_farming_seq') NOT NULL, -- 농업 자가소비량 내부키
daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK)
income_mark varchar(10), -- 수입 부호
expense_mark varchar(10), -- 지출 부호
product_code varchar(255), -- 생산물(매핑코드)
product_self varchar(100), -- 생산물(직접입력)
usage varchar(100), -- 용도
quantity varchar(10), -- 수량
unit_code varchar(255), -- 단위(매핑코드)
unit_self varchar(100), -- 단위(직접입력)
estimated_value bigint, -- 현물평가액
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
updated_by varchar(255), -- 수정자
deleted_at timestamp(6), -- 삭제일
deleted_by varchar(255), -- 삭제자
is_deleted boolean DEFAULT false NOT NULL, -- 삭제여부
id int8 DEFAULT nextval('daily_farming_seq'::regclass) NOT NULL, -- 농업 자가소비량 내부키
daily_record_seq int8 NOT NULL, -- 일계부 작성상태 일련번호 (FK)
income_mark varchar(10), -- 수입 부호
expense_mark varchar(10), -- 지출 부호
product_code varchar(255), -- 생산물(매핑코드)
product_self varchar(100), -- 생산물(직접입력)
"usage" varchar(100), -- 용도
quantity varchar(10), -- 수량
unit_code varchar(255), -- 단위(매핑코드)
unit_self varchar(100), -- 단위(직접입력)
estimated_value int8, -- 현물평가액
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
updated_by varchar(255), -- 수정자
deleted_at timestamp(6), -- 삭제일
deleted_by varchar(255), -- 삭제자
is_deleted bool DEFAULT false, -- 삭제여부
CONSTRAINT daily_farming_pkey PRIMARY KEY (id),
CONSTRAINT fk_daily_farming__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
CONSTRAINT daily_farming_pkey PRIMARY KEY (id),
CONSTRAINT fk_daily_farming__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
);
COMMENT ON TABLE daily_farming IS '자가농업 생산물 중 자가소비량';
COMMENT ON COLUMN daily_farming.id IS '농업 자가소비량 내부키';
COMMENT ON COLUMN daily_farming.daily_record_seq IS '일계부 작성상태 일련번호';
COMMENT ON COLUMN daily_farming.income_mark IS '수입부호';
COMMENT ON COLUMN daily_farming.expense_mark IS '지출부호';
COMMENT ON COLUMN daily_farming.product_code IS '생산물(매핌코드)';
COMMENT ON COLUMN daily_farming.product_code IS '생산물(매핑코드)';
COMMENT ON COLUMN daily_farming.product_self IS '생산물(직접입력)';
COMMENT ON COLUMN daily_farming.usage IS '용도';
COMMENT ON COLUMN daily_farming.quantity IS '수량';
@@ -470,6 +469,3 @@ COMMENT ON COLUMN daily_farming.deleted_at IS '삭제일';
COMMENT ON COLUMN daily_farming.deleted_by IS '삭제자';
COMMENT ON COLUMN daily_farming.is_deleted IS '삭제여부';
-- ============================================
-- 임가 일계부 입력 관련 테이블 E
-- ============================================

View File

@@ -1,19 +1,18 @@
package app.module.front.usecase.daily.calendar.adapters.persistence;
import app.module.core.config.application.enums.DailySort;
import app.module.core.config.application.enums.DailyTargetStatus;
import app.module.core.config.application.enums.MonthStatus;
import app.module.front.config.application.util.DailyUtil;
import app.module.core.config.application.util.DailyUtil;
import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto;
import app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper;
import app.module.front.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.ports.RecordCalendarPortOut;
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar;
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.RecordCalendarCmd;
import app.module.front.usecase.daily.record.adapters.web.model.DailySort;
import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus;
import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
import com.fasterxml.jackson.annotation.JsonIgnore;
import app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
import app.module.core.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
@@ -43,14 +42,14 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
monthlyList.add(new CalendarChildren(
"MONTHLY",
"임산물 현황 등록",
null, // TODO
null,
monthlyStatus.isForestNone() ? 0 : 1,
monthlyStatus.isForestNone() ? "/info/monthly" : String.format("/info/monthly/month/%s", command.getSearchMonth())));
monthlyList.add(new CalendarChildren(
"BANK",
"은행 자동이체 내역 등록",
null, // TODO
null,
monthlyStatus.isBankNone() ? 0 : 1,
(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM")).equals(command.getSearchMonth())) ? "/info/bank" : null));
@@ -60,9 +59,9 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
refine.setNo(calendar.getGroupNo());
refine.setStart(calendar.getStartDay());
refine.setEnd(calendar.getEndDay());
refine.setStartDate(dailyUtil.getDayToLocalDate(command.getSearchMonth(), calendar.getStartDay()));
refine.setEndDate(dailyUtil.getDayToLocalDate(command.getSearchMonth(), calendar.getEndDay()));
refine.setRegistrable(dailyUtil.isRegisterPossible(refine.getStartDate(), refine.getEndDate()));
refine.setModifiable(dailyUtil.isModifiable(refine.getStartDate(), refine.getEndDate()));
@@ -72,64 +71,59 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
List<CalendarChildren> childList = new ArrayList<>();
if (findStatus == null) {
// 등록이 가능하지 않을 경우 미작성 데이터 반환
if (!dailyUtil.isRegisterPossible(refine.getStartDate(), refine.getEndDate())) {
childList.addAll(this.getNoneChildList(dailyUtil.isFarmingOpen(refine.getNo(), refine.getEndDate())));
childList.addAll(this.getNoneChildrenList(dailyUtil.isFarmingOpen(refine.getNo(), refine.getEndDate())));
}
} else {
if (DailyTargetStatus.TARGET.equals(findStatus.getIncomeStatus())
|| DailyTargetStatus.TODAY_NONE.equals(findStatus.getIncomeStatus())) {
if (!DailyTargetStatus.NONE.equals(findStatus.getIncomeStatus())) {
childList.add(new CalendarChildren(
DailySort.INCOME.name(),
DailySort.INCOME.getDesc(),
findStatus.getIncomeStatus(),
findStatus.getIncomeCount(),
String.format(pathFormat, "income", command.getSearchMonth(), findStatus.getDayGroupNo())));
String.format(pathFormat, DailySort.INCOME.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo())));
}
if (DailyTargetStatus.TARGET.equals(findStatus.getWorkStatus())
|| DailyTargetStatus.TODAY_NONE.equals(findStatus.getWorkStatus())) {
if (!DailyTargetStatus.NONE.equals(findStatus.getWorkStatus())) {
childList.add(new CalendarChildren(
DailySort.WORK.name(),
DailySort.WORK.getDesc(),
findStatus.getWorkStatus(),
findStatus.getWorkCount(),
String.format(pathFormat, "work", command.getSearchMonth(), findStatus.getDayGroupNo())));
String.format(pathFormat, DailySort.WORK.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo())));
}
if (DailyTargetStatus.TARGET.equals(findStatus.getExpenseStatus())
|| DailyTargetStatus.TODAY_NONE.equals(findStatus.getExpenseStatus())) {
if (!DailyTargetStatus.NONE.equals(findStatus.getExpenseStatus())) {
childList.add(new CalendarChildren(
DailySort.EXPENSE.name(),
DailySort.EXPENSE.getDesc(),
findStatus.getExpenseStatus(),
findStatus.getExpenseCount(),
String.format(pathFormat, "expense", command.getSearchMonth(), findStatus.getDayGroupNo())));
String.format(pathFormat, DailySort.EXPENSE.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo())));
}
if (DailyTargetStatus.TARGET.equals(findStatus.getPowerStatus())
|| DailyTargetStatus.TODAY_NONE.equals(findStatus.getPowerStatus())) {
if (!DailyTargetStatus.NONE.equals(findStatus.getPowerStatus())) {
childList.add(new CalendarChildren(
DailySort.POWER.name(),
DailySort.POWER.getDesc(),
findStatus.getPowerStatus(),
findStatus.getPowerCount(),
String.format(pathFormat, "power", command.getSearchMonth(), findStatus.getDayGroupNo())));
String.format(pathFormat, DailySort.POWER.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo())));
}
if (DailyTargetStatus.TARGET.equals(findStatus.getForestryStatus())
|| DailyTargetStatus.TODAY_NONE.equals(findStatus.getForestryStatus())) {
if (!DailyTargetStatus.NONE.equals(findStatus.getForestryStatus())) {
childList.add(new CalendarChildren(
DailySort.FORESTRY.name(),
DailySort.FORESTRY.getDesc(),
findStatus.getForestryStatus(),
findStatus.getForestryCount(),
String.format(pathFormat, "forestry", command.getSearchMonth(), findStatus.getDayGroupNo())));
String.format(pathFormat, DailySort.FORESTRY.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo())));
}
if (DailyTargetStatus.TARGET.equals(findStatus.getFarmingStatus())
|| DailyTargetStatus.TODAY_NONE.equals(findStatus.getFarmingStatus())) {
if (!DailyTargetStatus.NONE.equals(findStatus.getFarmingStatus())) {
childList.add(new CalendarChildren(
DailySort.FARMING.name(),
DailySort.FARMING.getDesc(),
findStatus.getFarmingStatus(),
findStatus.getFarmingCount(),
String.format(pathFormat, "farming", command.getSearchMonth(), findStatus.getDayGroupNo())));
String.format(pathFormat, DailySort.FARMING.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo())));
}
}
@@ -141,55 +135,23 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
return refineList;
}
/**
* 미작성 목록 조회
*
* @param farmingOpen
* @return 미작성 목록
*/
private List<CalendarChildren> getNoneChildList(boolean farmingOpen) {
List<CalendarChildren> childList = new ArrayList<>();
for (DailySort type : DailySort.values()) {
if (!DailySort.FARMING.equals(type) || (DailySort.FARMING.equals(type) && farmingOpen)) {
childList.add(new CalendarChildren(type.name(),type.getDesc()));
}
}
@Override
public int getDataNoneCountBySomeDayAfter(Long householdSeq) {
return childList;
return recordCalendarMapper.getDataNoneCountBySomeDayAfter(householdSeq);
}
@Override
public boolean getDataNoneCountBySomeDayAfter(RecordCalendarCmd command) {
int dataNoneCount = recordCalendarMapper.getDataNoneCountBySomeDayAfter(command);
public DailyRecordStatusDto getLatestDate(Long householdSeq) {
return dataNoneCount != 0;
}
@Override
public String getLatestDate(RecordCalendarCmd command) {
String returnValue = null;
DailyRecordStatusDto detail = recordCalendarMapper.getLatestDate(command);
if (detail != null && detail.getStartDate() != null && detail.getEndDate() != null) {
if (detail.getStartDate().getMonth() != detail.getEndDate().getMonth()) {
// 종료일의 달이 변경되면 시작일=종료일 처리
detail.setEndDate(detail.getStartDate());
}
if (detail.getStartDate().equals(detail.getEndDate())) {
returnValue = detail.getStartDate().format(DateTimeFormatter.ofPattern("yyyy년 M월 d일"));
} else {
returnValue = detail.getStartDate().format(DateTimeFormatter.ofPattern("yyyy년 M월 d")) + "~" + detail.getEndDate().format(DateTimeFormatter.ofPattern("d일"));
}
}
return returnValue;
return recordCalendarMapper.getLatestDate(householdSeq);
}
/**
* 특정월의 일 그룹 조회
*
* @param command
* @return
* @param command 검색 조건
* @return 일 그룹 목록
*/
private List<DailyRecordCalendarDto> getCalendarList(RecordCalendarCmd command) {
List<DailyRecordCalendarDto> calendarList = recordCalendarMapper.getCalendarByDailyRecord(command);
@@ -197,8 +159,8 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
List<DailyRecordCalendarDto> refineList = new ArrayList<>();
for (DailyRecordCalendarDto calendar : calendarList) {
LocalDate startDate = dailyUtil.getDayToLocalDate(command.getSearchMonth(), calendar.getStartDay());
LocalDate endDate = dailyUtil.getDayToLocalDate(command.getSearchMonth(), calendar.getEndDay());
int lastDay = dailyUtil.getLastDay(startDate);
calendar.setStartDate(startDate.toString());
if ((lastDay == 28 || lastDay == 30) && calendar.getStartDay() == lastDay) {
@@ -215,8 +177,8 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
/**
* 특정월의 일계부 등록 상태 조회
*
* @param command
* @return
* @param command 검색 조건
* @return 일계부 목록
*/
private List<DailyRecordStatusDto> getDailyRecordStatus(RecordCalendarCmd command) {
List<DailyRecordStatusDto> statusList = dailyRecordMapper.getDailyRecordStatus(new GetDailyRecordCmd(command.getSearchMonth(), null, command.getHouseholdSeq()));
@@ -238,4 +200,21 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
return detail == null ? new MonthlyStatusDto(MonthStatus.NONE, MonthStatus.NONE, MonthStatus.NONE) : detail;
}
/**
* 미작성 목록 조회
*
* @param farmingOpen 자가농업 항목 오픈 여부
* @return 미작성 목록
*/
private List<CalendarChildren> getNoneChildrenList(boolean farmingOpen) {
List<CalendarChildren> childList = new ArrayList<>();
for (DailySort type : DailySort.values()) {
if (!DailySort.FARMING.equals(type) || (DailySort.FARMING.equals(type) && farmingOpen)) {
childList.add(new CalendarChildren(type.name(),type.getDesc()));
}
}
return childList;
}
}

View File

@@ -1,7 +1,7 @@
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.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.ports.application.domain.RecordCalendarCmd;
import org.apache.ibatis.annotations.Mapper;
@@ -29,16 +29,16 @@ public interface RecordCalendarMapper {
/**
* 3일전 ~ 15일전 미등록된 데이터 개수 조회
*
* @param command 검색 조건
* @param householdSeq 임가회원 일련번호
* @return 미등록 건 수
*/
Integer getDataNoneCountBySomeDayAfter(RecordCalendarCmd command);
Integer getDataNoneCountBySomeDayAfter(Long householdSeq);
/**
* 최신 등록일 데이터 조회
*
* @param command 검색 조건
* @param householdSeq 임가회원 일련번호
* @return 최신 등록 데이터
*/
DailyRecordStatusDto getLatestDate(RecordCalendarCmd command);
DailyRecordStatusDto getLatestDate(Long householdSeq);
}

View File

@@ -22,6 +22,11 @@ import java.util.List;
public class RecordCalendarController {
private final RecordCalendarPortIn recordCalendarPortIn;
/**
* 일계부 월별 목록
*
* @param searchMonth 검색 월(yyyyMM)
*/
@GetMapping(path = "/{searchMonth}")
public ResponseEntity<?> list(@PathVariable("searchMonth") String searchMonth) {
RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO(searchMonth);

View File

@@ -16,6 +16,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
public class RecordCalendarUIController {
private final RecordCalendarPortIn recordCalendarPortIn;
/**
* 일계부 월별 현황 화면
*
* @param model Model
*/
@GetMapping(path = "")
public String index(Model model) {
RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO();

View File

@@ -1,7 +1,6 @@
package app.module.front.usecase.daily.calendar.adapters.web.model;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@@ -27,7 +26,7 @@ public class RecordCalendarUIReqVO extends DailyUIReqVO {
}
/**
* 검색 일(yyyy-MM-dd)
* 검색일(yyyy-MM-dd)
*/
private LocalDate searchDate;

View File

@@ -22,7 +22,7 @@ public interface RecordCalendarPortIn {
boolean getDataNoneCountBySomeDayAfter();
/**
* 일계부 최신 데이터 조회
* 일계부 최신 데이터 등록일 조회
*
* @return 최신 등록 기간
*/

View File

@@ -2,13 +2,14 @@ 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.RecordCalendarCmd;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
import java.util.List;
public interface RecordCalendarPortOut {
List<RecordCalendar> operate(RecordCalendarCmd command);
boolean getDataNoneCountBySomeDayAfter(RecordCalendarCmd command);
int getDataNoneCountBySomeDayAfter(Long householdSeq);
String getLatestDate(RecordCalendarCmd command);
DailyRecordStatusDto getLatestDate(Long householdSeq);
}

View File

@@ -1,14 +1,15 @@
package app.module.front.usecase.daily.calendar.ports.application;
import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO;
import app.module.front.config.application.util.AuthUtil;
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.application.domain.CalendarChildren;
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.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.time.format.DateTimeFormatter;
import java.util.List;
@Service
@@ -25,15 +26,28 @@ public class RecordCalendarService implements RecordCalendarPortIn {
@Override
public boolean getDataNoneCountBySomeDayAfter() {
RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO();
int dataNoneCount = portOut.getDataNoneCountBySomeDayAfter(AuthUtil.getUserSeq());
return portOut.getDataNoneCountBySomeDayAfter(new RecordCalendarCmd(reqVO.getSearchMonth(), reqVO.getHouseholdSeq()));
return dataNoneCount != 0;
}
@Override
public String getLatestDate() {
RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO();
String returnValue = null;
DailyRecordStatusDto detail = portOut.getLatestDate(AuthUtil.getUserSeq());
if (detail != null && detail.getStartDate() != null && detail.getEndDate() != null) {
if (detail.getStartDate().getMonth() != detail.getEndDate().getMonth()) {
// 종료일의 달이 변경되면 시작일=종료일 처리
detail.setEndDate(detail.getStartDate());
}
return portOut.getLatestDate(new RecordCalendarCmd(reqVO.getSearchMonth(), reqVO.getHouseholdSeq()));
if (detail.getStartDate().equals(detail.getEndDate())) {
returnValue = detail.getStartDate().format(DateTimeFormatter.ofPattern("yyyy년 M월 d일"));
} else {
returnValue = detail.getStartDate().format(DateTimeFormatter.ofPattern("yyyy년 M월 d")) + "~" + detail.getEndDate().format(DateTimeFormatter.ofPattern("d일"));
}
}
return returnValue;
}
}

View File

@@ -1,7 +1,6 @@
package app.module.front.usecase.daily.calendar.ports.application.domain;
import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus;
import lombok.AllArgsConstructor;
import app.module.core.config.application.enums.DailyTargetStatus;
import lombok.Data;
@Data

View File

@@ -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.validator.CreateDailyExpenseValidator;
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.ports.DailyRecordPortIn;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping(path = "/api/record/expense")
public class DailyExpenseController {
private final CoreUtil coreUtil;
private final DailyRecordPortIn dailyRecordService;
private final DailyRecordPortIn dailyRecordPortIn;
private final DailyExpensePortIn dailyExpensePortIn;
private final CreateDailyExpenseValidator createValidator;
@@ -121,7 +121,7 @@ public class DailyExpenseController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
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) {
throw new NoRecordDataException();
}

View File

@@ -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.web.model.DailyExpenseUIReqVO;
import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailySort;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
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.ports.DailyRecordPortIn;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
@@ -28,7 +28,7 @@ import java.util.List;
@RequestMapping(path = "/record/expense")
public class DailyExpenseUIController {
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordPortIn dailyRecordService;
private final DailyRecordPortIn dailyRecordPortIn;
private final DailyExpensePortIn dailyExpensePortIn;
/**
@@ -108,7 +108,7 @@ public class DailyExpenseUIController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
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) {
throw new NoRecordDataException();
}

View File

@@ -1,5 +1,6 @@
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.application.domain.UICodeElement;
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.GetDailyExpenseCmd;
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 org.springframework.stereotype.Service;
@@ -24,7 +25,7 @@ import java.util.List;
public class DailyExpenseService implements DailyExpensePortIn {
private final DailyExpensePortOut portOut;
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordService dailyRecordService;
private final DailyRecordPortIn dailyRecordPortIn;
@Override
public List<DailyExpenseDto> list(DailyExpenseUIReqVO reqVO) {
@@ -110,7 +111,7 @@ public class DailyExpenseService implements DailyExpensePortIn {
portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
@Override
@@ -132,6 +133,6 @@ public class DailyExpenseService implements DailyExpensePortIn {
portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
}

View File

@@ -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.validator.CreateDailyFarmingValidator;
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.ports.DailyRecordPortIn;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping(path = "/api/record/farming")
public class DailyFarmingController {
private final CoreUtil coreUtil;
private final DailyRecordPortIn dailyRecordService;
private final DailyRecordPortIn dailyRecordPortIn;
private final DailyFarmingService dailyFarmingPortIn;
private final CreateDailyFarmingValidator createValidator;
@@ -121,7 +121,7 @@ public class DailyFarmingController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
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) {
throw new NoRecordDataException();
}

View File

@@ -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.web.model.DailyFarmingUIReqVO;
import app.module.front.usecase.daily.farming.ports.application.DailyFarmingService;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailySort;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
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.ports.DailyRecordPortIn;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
@@ -108,7 +108,7 @@ public class DailyFarmingUIController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
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) {
throw new NoRecordDataException();
}

View File

@@ -1,5 +1,6 @@
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.application.domain.UICodeElement;
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.GetDailyFarmingCmd;
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.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -26,7 +26,7 @@ import java.util.List;
public class DailyFarmingService implements DailyFarmingPortIn {
private final DailyFarmingPortOut portOut;
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordService dailyRecordService;
private final DailyRecordPortIn dailyRecordPortIn;
@Override
public List<DailyFarmingDto> list(DailyFarmingUIReqVO reqVO) {
@@ -135,7 +135,7 @@ public class DailyFarmingService implements DailyFarmingPortIn {
portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
@Override
@@ -157,6 +157,6 @@ public class DailyFarmingService implements DailyFarmingPortIn {
portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
}

View File

@@ -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.validator.CreateDailyForestryValidator;
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.ports.DailyRecordPortIn;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -121,7 +121,7 @@ public class DailyForestryController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
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) {
throw new NoRecordDataException();
}

View File

@@ -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.web.model.DailyForestryUIReqVO;
import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailySort;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
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.ports.DailyRecordPortIn;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
@@ -108,7 +108,7 @@ public class DailyForestryUIController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
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) {
throw new NoRecordDataException();
}

View File

@@ -1,5 +1,6 @@
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.application.domain.UICodeElement;
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.GetDailyForestryCmd;
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.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -26,7 +27,7 @@ import java.util.List;
public class DailyForestryService implements DailyForestryPortIn {
private final DailyForestryPortOut portOut;
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordService dailyRecordService;
private final DailyRecordPortIn dailyRecordPortIn;
@Override
public List<DailyForestryDto> list(DailyForestryUIReqVO reqVO) {
@@ -108,7 +109,7 @@ public class DailyForestryService implements DailyForestryPortIn {
portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
@Override
@@ -130,6 +131,6 @@ public class DailyForestryService implements DailyForestryPortIn {
portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
}

View File

@@ -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.validator.CreateDailyIncomeValidator;
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.ports.DailyRecordPortIn;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -121,7 +121,7 @@ public class DailyIncomeController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
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) {
throw new NoRecordDataException();
}

View File

@@ -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.web.model.DailyIncomeUIReqVO;
import app.module.front.usecase.daily.income.ports.DailyIncomePortIn;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailySort;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
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.ports.DailyRecordPortIn;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -109,7 +109,7 @@ public class DailyIncomeUIController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
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) {
throw new NoRecordDataException();
}

View File

@@ -1,5 +1,6 @@
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.application.domain.UICodeElement;
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.GetDailyIncomeCmd;
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 org.springframework.stereotype.Service;
@@ -24,7 +25,7 @@ import java.util.List;
public class DailyIncomeService implements DailyIncomePortIn {
private final DailyIncomePortOut portOut;
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordService dailyRecordService;
private final DailyRecordPortIn dailyRecordPortIn;
@Override
public List<DailyIncomeDto> list(DailyIncomeUIReqVO reqVO) {
@@ -114,7 +115,7 @@ public class DailyIncomeService implements DailyIncomePortIn {
portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
@Override
@@ -136,6 +137,6 @@ public class DailyIncomeService implements DailyIncomePortIn {
portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
}

View File

@@ -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.validator.CreateDailyPowerValidator;
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.ports.DailyRecordPortIn;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -121,7 +121,7 @@ public class DailyPowerController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
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) {
throw new NoRecordDataException();
}

View File

@@ -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.web.model.DailyPowerUIReqVO;
import app.module.front.usecase.daily.power.ports.DailyPowerPortIn;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailySort;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
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.ports.DailyRecordPortIn;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
@@ -103,7 +103,7 @@ public class DailyPowerUIController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
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) {
throw new NoRecordDataException();
}

View File

@@ -1,12 +1,7 @@
package app.module.front.usecase.daily.power.ports.application;
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.daily.record.ports.DailyRecordPortIn;
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.web.model.CreateDailyPowerReqVO;
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.GetDailyPowerCmd;
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 org.springframework.stereotype.Service;
@@ -26,7 +21,7 @@ import java.util.List;
@RequiredArgsConstructor
public class DailyPowerService implements DailyPowerPortIn {
private final DailyPowerPortOut portOut;
private final DailyRecordService dailyRecordService;
private final DailyRecordPortIn dailyRecordPortIn;
@Override
public List<DailyPowerDto> list(DailyPowerUIReqVO reqVO) {
@@ -74,7 +69,7 @@ public class DailyPowerService implements DailyPowerPortIn {
portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
@Override
@@ -96,6 +91,6 @@ public class DailyPowerService implements DailyPowerPortIn {
portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
}

View File

@@ -1,14 +0,0 @@
package app.module.front.usecase.daily.record.adapters.persistence.model;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class UpdateDailyRecordDto {
private String monthly;
private String updatedBy;
private String statusType;
private String statusCode;
}

View File

@@ -1,11 +1,13 @@
package app.module.front.usecase.daily.record.adapters.web;
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.DailyTargetStatus;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
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.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 lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -43,12 +45,13 @@ public class DailyRecordController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("reqVO: {}", reqVO);
DailyRecordDto detail = dailyRecordPortIn.detail(reqVO);
DailyRecordDto detail = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
formVO.setRecordMonth(reqVO.getSearchMonth());
formVO.setDayGroupNo(reqVO.getGroupNo());
formVO.setStartDate(detail.getStartDate());
formVO.setEndDate(detail.getEndDate());
formVO.setFarming(detail.isFarmingOpen());
formVO.setHouseholdSeq(reqVO.getHouseholdSeq());
log.debug("formVO: {}", formVO);
dailyRecordPortIn.create(formVO);
@@ -72,10 +75,10 @@ public class DailyRecordController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
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 체크
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);
}

View File

@@ -7,16 +7,14 @@ import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIR
import app.module.front.usecase.daily.farming.ports.DailyFarmingPortIn;
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.income.adapters.persistence.model.DailyIncomeDto;
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.power.adapters.web.model.DailyPowerUIReqVO;
import app.module.front.usecase.daily.power.ports.DailyPowerPortIn;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
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.validator.CreateDailyRecordValidator;
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.ports.DailyWorkPortIn;
import lombok.RequiredArgsConstructor;
@@ -27,8 +25,6 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import java.util.List;
@Slf4j
@Controller
@RequiredArgsConstructor
@@ -56,7 +52,7 @@ public class DailyRecordUIController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("reqVO: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null) {
throw new NoMatchingURIException("[Record] 잘못된 접근");
}
@@ -81,7 +77,7 @@ public class DailyRecordUIController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("reqVO: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null) {
throw new NoMatchingURIException("[Record] 잘못된 접근");
}

View File

@@ -1,8 +1,8 @@
package app.module.front.usecase.daily.record.adapters.web.validator;
import app.module.core.config.application.enums.DailyStatus;
import app.module.core.config.application.util.MessageUtil;
import app.module.front.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO;
import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus;
import app.module.core.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;

View File

@@ -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);
}

View File

@@ -1,7 +1,5 @@
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.ports.DailyWorkPortOut;
import app.module.front.usecase.daily.work.ports.application.domain.CreateDailyWorkCmd;

View File

@@ -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.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.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.RemoveDailyWorkReqVO;
import app.module.front.usecase.daily.work.adapters.web.validator.CreateDailyWorkValidator;
@@ -125,7 +125,7 @@ public class DailyWorkController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
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) {
throw new NoRecordDataException();
}

View File

@@ -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.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailySort;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
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.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.web.model.DailyWorkUIReqVO;
import app.module.front.usecase.daily.work.ports.DailyWorkPortIn;
@@ -109,7 +109,7 @@ public class DailyWorkUIController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
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) {
throw new NoRecordDataException();
}

View File

@@ -1,10 +1,11 @@
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.application.domain.UICodeElement;
import app.module.front.config.application.util.AuditUtil;
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.web.model.CreateDailyWorkReqVO;
import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO;
@@ -24,7 +25,7 @@ import java.util.List;
public class DailyWorkService implements DailyWorkPortIn {
private final DailyWorkPortOut portOut;
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordService dailyRecordService;
private final DailyRecordPortIn dailyRecordPortIn;
@Override
public List<DailyWorkDto> list(DailyWorkUIReqVO reqVO) {
@@ -124,7 +125,7 @@ public class DailyWorkService implements DailyWorkPortIn {
portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
@Override
@@ -146,6 +147,6 @@ public class DailyWorkService implements DailyWorkPortIn {
portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
}

View File

@@ -8,7 +8,7 @@
, ds.expense_kind, ds.source_purpose
, ds.quantity, ds.unit_code, ds.unit_self, ds.price, ds.estimated_value
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
<if test="id != null and id != '0'">
and ds.id = ${id}
@@ -20,7 +20,7 @@
<select id="getRecordExistCount" resultType="int">
select count(1)
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
<if test="id != null and id != '0'">
and ds.id = ${id}

View File

@@ -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
<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
<if test="id != null and id != '0'">
and ds.id = ${id}
@@ -20,7 +20,7 @@
<select id="getRecordExistCount" resultType="int">
select count(1)
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
<if test="id != null and id != '0'">
and ds.id = ${id}

View File

@@ -8,7 +8,7 @@
, ds.product_name, ds.usage
, ds.quantity, ds.unit_code, ds.unit_self, ds.estimated_value
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
<if test="id != null and id != '0'">
and ds.id = ${id}
@@ -20,7 +20,7 @@
<select id="getRecordExistCount" resultType="int">
select count(1)
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
<if test="id != null and id != '0'">
and ds.id = ${id}

View File

@@ -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
<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
<if test="id != null and id != '0'">
and ds.id = ${id}
@@ -20,7 +20,7 @@
<select id="getRecordExistCount" resultType="int">
select count(1)
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
<if test="id != null and id != '0'">
and ds.id = ${id}

View File

@@ -7,7 +7,7 @@
select ds.id, ds.daily_record_seq
, ds.equipment_name, ds.owned_hours, ds.leased_hours
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
<if test="id != null and id != '0'">
and ds.id = ${id}
@@ -19,7 +19,7 @@
<select id="getRecordExistCount" resultType="int">
select count(1)
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
<if test="id != null and id != '0'">
and ds.id = ${id}

Some files were not shown because too many files have changed in this diff Show More