월별, 임산물 sql에러 수정
This commit is contained in:
@@ -17,7 +17,7 @@
|
|||||||
a.created_at AS createdAt,
|
a.created_at AS createdAt,
|
||||||
a.created_by AS createdBy,
|
a.created_by AS createdBy,
|
||||||
a.updated_at AS updatedAt,
|
a.updated_at AS updatedAt,
|
||||||
a.updated_by AS updatedBy
|
a.updated_by AS updatedBy,
|
||||||
COUNT(*) OVER () AS total
|
COUNT(*) OVER () AS total
|
||||||
FROM monthly_input_status a
|
FROM monthly_input_status a
|
||||||
WHERE a.is_deleted = false
|
WHERE a.is_deleted = false
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
a.created_at AS createdAt,
|
a.created_at AS createdAt,
|
||||||
a.created_by AS createdBy,
|
a.created_by AS createdBy,
|
||||||
a.updated_at AS updatedAt,
|
a.updated_at AS updatedAt,
|
||||||
a.updated_by AS updatedBy
|
a.updated_by AS updatedBy,
|
||||||
COUNT(*) OVER () AS total
|
COUNT(*) OVER () AS total
|
||||||
FROM forest_product a
|
FROM forest_product a
|
||||||
WHERE a.is_deleted = false
|
WHERE a.is_deleted = false
|
||||||
|
|||||||
@@ -3,7 +3,18 @@ package app.module.front.usecase.info.monthly.getMonthlysUI.adapters.web;
|
|||||||
import app.module.core.config.application.util.CommonUtil;
|
import app.module.core.config.application.util.CommonUtil;
|
||||||
import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn;
|
import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn;
|
||||||
import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd;
|
import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd;
|
||||||
|
import app.module.core.usecase.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus;
|
||||||
|
import app.module.core.usecase.monthly.getMonthlyInputStatuss.ports.GetMonthlyInputStatussPortIn;
|
||||||
|
import app.module.core.usecase.monthly.getMonthlyInputStatuss.ports.application.domain.GetMonthlyInputStatuss;
|
||||||
|
import app.module.core.usecase.monthly.getMonthlyInputStatuss.ports.application.domain.GetMonthlyInputStatussCmd;
|
||||||
|
import app.module.core.usecase.notice.getNotices.ports.application.domain.GetNotices;
|
||||||
|
import app.module.core.usecase.notice.getNotices.ports.application.domain.GetNoticesCmd;
|
||||||
|
import app.module.front.usecase.info.monthly.getMonthlysUI.adapters.web.model.GetMontylyssReqVO;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
|
import org.springframework.data.domain.Sort;
|
||||||
|
import org.springframework.data.web.PageableDefault;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.ui.Model;
|
import org.springframework.ui.Model;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
@@ -12,14 +23,23 @@ import org.springframework.web.bind.annotation.GetMapping;
|
|||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
class GetMontylysUIController {
|
class GetMontylysUIController {
|
||||||
|
|
||||||
private final GetHouseholdPortIn getHouseholdPortIn;
|
|
||||||
|
private final GetMonthlyInputStatussPortIn portIn;
|
||||||
|
|
||||||
|
|
||||||
@GetMapping(path = "/info/monthly")
|
@GetMapping(path = "/info/monthly")
|
||||||
String operate(Model model) {
|
String operate(Model model,
|
||||||
|
@PageableDefault(sort = "month", direction = Sort.Direction.DESC, page = 0, size = 13) Pageable pageable,
|
||||||
|
GetMontylyssReqVO reqVO) {
|
||||||
|
|
||||||
model.addAttribute("userInfo",
|
Page<GetMonthlyInputStatuss> notices =
|
||||||
getHouseholdPortIn.operate(new GetHouseholdCmd(CommonUtil.getLoginUsername())).orElseThrow());
|
portIn.operate(
|
||||||
|
pageable,
|
||||||
|
new GetMonthlyInputStatussCmd(
|
||||||
|
reqVO.getSearchField(), reqVO.getSearchValue()));
|
||||||
|
|
||||||
|
model.addAttribute("reqVO", reqVO);
|
||||||
|
model.addAttribute("list", notices);
|
||||||
return "info/monthly/monthlys";
|
return "info/monthly/monthlys";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package app.module.front.usecase.info.monthly.getMonthlysUI.adapters.web.model;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@AllArgsConstructor
|
||||||
|
@EqualsAndHashCode
|
||||||
|
public class GetMontylyssReqVO {
|
||||||
|
|
||||||
|
private String searchField;
|
||||||
|
private String searchValue;
|
||||||
|
}
|
||||||
@@ -2,126 +2,54 @@
|
|||||||
<html layout:decorate="~{layout/layout}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
|
<html layout:decorate="~{layout/layout}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
|
||||||
xmlns:th="http://www.thymeleaf.org">
|
xmlns:th="http://www.thymeleaf.org">
|
||||||
|
|
||||||
<div layout:fragment="content">
|
<div layout:fragment="content" th:classappend="'mypage-wrap'">
|
||||||
<main id="content" role="main">
|
<main id="content" role="main">
|
||||||
|
<div class="inner">
|
||||||
<style>
|
<hgroup class="tit-group">
|
||||||
label {
|
<h3>
|
||||||
display: inline-block;
|
월별 등록된 <strong>임산물 현황</strong>을 <br> 확인하세요.
|
||||||
width: 150px;
|
</h3>
|
||||||
}
|
</hgroup>
|
||||||
|
<ul class="product-col-list">
|
||||||
div {
|
<li>
|
||||||
margin-bottom: 15px;
|
<a href="">
|
||||||
}
|
<p class="list-tit">2025년 5월</p>
|
||||||
|
<span class="tag">미등록</span>
|
||||||
.invalid-feedback {
|
</a>
|
||||||
display: none;
|
</li>
|
||||||
font-size: 12px;
|
<li class="complete">
|
||||||
font-weight: bold;
|
<a href="">
|
||||||
}
|
<p class="list-tit">2025년 5월</p>
|
||||||
|
<span class="tag">등록완료</span>
|
||||||
.is-invalid + .invalid-feedback {
|
</a>
|
||||||
display: block;
|
</li>
|
||||||
}
|
<li class="complete">
|
||||||
|
<a href="">
|
||||||
input[readonly] {
|
<p class="list-tit">2025년 5월</p>
|
||||||
background-color: #e9ecef;
|
<span class="tag">등록완료</span>
|
||||||
color: #6c757d;
|
</a>
|
||||||
cursor: not-allowed;
|
</li>
|
||||||
}
|
</ul>
|
||||||
</style>
|
</div>
|
||||||
|
</main>
|
||||||
<div>
|
|
||||||
<form
|
|
||||||
method="get"
|
|
||||||
name="reqForm"
|
|
||||||
th:action="@{/user/info}" th:object="${userInfo}">
|
|
||||||
|
|
||||||
<input type="hidden" name="id" th:value="*{seq}">
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<label for="householdNum">임가번호</label>
|
|
||||||
<input id="householdNum" name="householdNum" placeholder="아이디" readonly="readonly" th:field="*{householdNum}"
|
|
||||||
type="text">
|
|
||||||
<div class="invalid-feedback field-id"></div>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label for="ownerName">경영주</label>
|
|
||||||
<input id="ownerName" name="ownerName" placeholder="경영주 이름" th:field="*{ownerName}" type="text">
|
|
||||||
<div class="invalid-feedback field-id"></div>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label for="ownerAge">만나이</label>
|
|
||||||
<input id="ownerAge" name="ownerAge" placeholder="나이" th:field="*{ownerAge}" type="text">
|
|
||||||
<div class="invalid-feedback field-id"></div>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label for="tel">가구연락처</label>
|
|
||||||
<input id="tel" name="tel" placeholder="가구연락처" th:field="*{tel}" type="text">
|
|
||||||
<div class="invalid-feedback field-id"></div>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label for="phone">핸드폰번호</label>
|
|
||||||
<input id="phone" name="phone" placeholder="핸드폰번호" th:field="*{phone}" type="text">
|
|
||||||
<div class="invalid-feedback field-id"></div>
|
|
||||||
</div>
|
|
||||||
<!-- <div>-->
|
|
||||||
<!-- <label for="region">시.도</label>-->
|
|
||||||
<!-- <input id="region" name="region" placeholder="시.도" th:field="*{region}" type="text">-->
|
|
||||||
<!-- <div class="invalid-feedback field-id"></div>-->
|
|
||||||
<!-- </div>-->
|
|
||||||
<!-- <div>-->
|
|
||||||
<!-- <label for="city">시.군.도</label>-->
|
|
||||||
<!-- <input id="city" name="city" placeholder="시.군.도" th:field="*{city}" type="text">-->
|
|
||||||
<!-- <div class="invalid-feedback field-id"></div>-->
|
|
||||||
<!-- </div>-->
|
|
||||||
<div>
|
|
||||||
<label for="addressDetail">전체 주소</label>
|
|
||||||
<input id="addressDetail" name="addressDetail" placeholder="세부 주소" th:field="*{address}" type="text">
|
|
||||||
<div class="invalid-feedback field-id"></div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
<button onclick="updateUser();">수정하기</button>
|
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<section layout:fragment="script">
|
<section layout:fragment="script">
|
||||||
<script>
|
<script th:inline="javascript">
|
||||||
const updateUser = () => {
|
let ENV = {
|
||||||
const f = document.reqForm;
|
httpUrl: {
|
||||||
const obj = $(f).serializeObject();
|
root: /*[[#{uri.front.info.notice.path}]]*/'detailUrl',
|
||||||
|
notice: /*[[#{uri.front.info.notice.path}]]*/'noticeUrl'
|
||||||
|
},
|
||||||
|
module:{
|
||||||
|
confirmPopup : null
|
||||||
|
},
|
||||||
|
submitted: false,
|
||||||
|
};
|
||||||
|
let formControl = {
|
||||||
|
init(){
|
||||||
|
|
||||||
// 기존 에러 메세지 초기화
|
}
|
||||||
$('.is-invalid').removeClass('is-invalid');
|
|
||||||
|
|
||||||
$.ajax({
|
|
||||||
method: 'PATCH',
|
|
||||||
url: '/api/front/household/update',
|
|
||||||
data: obj,
|
|
||||||
beforeSend: function (xhr) {
|
|
||||||
xhr.setRequestHeader(
|
|
||||||
$("meta[name='_csrf_header']").attr("content"),
|
|
||||||
$("meta[name='_csrf']").attr("content"));
|
|
||||||
},
|
|
||||||
success(res) {
|
|
||||||
if (confirm(`'${res.ownerName} 님의' 정보가 수정되었습니다.`)) {
|
|
||||||
location.reload();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
statusCode: {
|
|
||||||
'422': (res) => {
|
|
||||||
const fieldErrors = res.responseJSON.fieldErrors;
|
|
||||||
$(fieldErrors).each(function (idx, error) {
|
|
||||||
let target = $(f).find('[name=' + error.field + ']');
|
|
||||||
target.addClass('is-invalid');
|
|
||||||
|
|
||||||
target.parent().find('.invalid-feedback').text(error.message);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user