Merge branch 'dev' into deploy-dev-front

This commit is contained in:
kangsunlee
2025-06-27 15:41:57 +09:00
15 changed files with 52 additions and 33 deletions

View File

@@ -2,6 +2,7 @@ package app.module.admin.usecase.household.tab.dailyRecord.removeDaily.adapters.
import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.RemoveDailyPortOut; import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.RemoveDailyPortOut;
import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.application.domain.RemoveDailyCmd; import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.application.domain.RemoveDailyCmd;
import app.module.core.config.application.annotation.UpdateCommand;
import app.module.core.config.application.enums.DailySort; import app.module.core.config.application.enums.DailySort;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -13,6 +14,7 @@ import org.springframework.stereotype.Repository;
public class RemoveDailyDao implements RemoveDailyPortOut { public class RemoveDailyDao implements RemoveDailyPortOut {
private final RemoveDailyMapper mapper; private final RemoveDailyMapper mapper;
@UpdateCommand
@Override @Override
public void operate(RemoveDailyCmd command) { public void operate(RemoveDailyCmd command) {
if (command.getCurrentStep() != null) { if (command.getCurrentStep() != null) {

View File

@@ -15,11 +15,9 @@ public class RemoveDailyService implements RemoveDailyPortIn {
@Override @Override
public void operate(RemoveDailyReqVO reqVO) { public void operate(RemoveDailyReqVO reqVO) {
RemoveDailyCmd command = AuditUtil.update( RemoveDailyCmd command = new RemoveDailyCmd(
new RemoveDailyCmd( reqVO.getSelectedIds(),
reqVO.getSelectedIds(), reqVO.getCurrentStep());
reqVO.getCurrentStep())
);
portOut.operate(command); portOut.operate(command);
} }

View File

@@ -2,6 +2,7 @@ package app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.adapt
import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.UpdateDailyNonePortOut; import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.UpdateDailyNonePortOut;
import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.application.domain.UpdateDailyNoneCmd; import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.application.domain.UpdateDailyNoneCmd;
import app.module.core.config.application.annotation.UpdateCommand;
import app.module.core.config.application.enums.DailySort; import app.module.core.config.application.enums.DailySort;
import app.module.core.config.application.enums.DailyTargetStatus; import app.module.core.config.application.enums.DailyTargetStatus;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
@@ -16,6 +17,7 @@ class UpdateDailyNoneDao implements UpdateDailyNonePortOut {
private final UpdateDailyNoneMapper mapper; private final UpdateDailyNoneMapper mapper;
private final DailyRecordPortIn dailyRecordPortIn; private final DailyRecordPortIn dailyRecordPortIn;
@UpdateCommand
@Override @Override
public void create(UpdateDailyNoneCmd command) { public void create(UpdateDailyNoneCmd command) {
command.setDailyRecordSeq(mapper.getDailyRecordSeq(command)); command.setDailyRecordSeq(mapper.getDailyRecordSeq(command));

View File

@@ -18,15 +18,13 @@ public class UpdateDailyNoneService implements UpdateDailyNonePortIn {
public void create(UpdateDailyNoneReqVO formVO) { public void create(UpdateDailyNoneReqVO formVO) {
DailyTargetStatus currentStatus = "Y".equals(formVO.getTodayNone()) ? DailyTargetStatus.TODAY_NONE : DailyTargetStatus.TARGET; DailyTargetStatus currentStatus = "Y".equals(formVO.getTodayNone()) ? DailyTargetStatus.TODAY_NONE : DailyTargetStatus.TARGET;
UpdateDailyNoneCmd command = AuditUtil.update( UpdateDailyNoneCmd command = new UpdateDailyNoneCmd(
new UpdateDailyNoneCmd( formVO.getRecordMonth(),
formVO.getRecordMonth(), formVO.getGroupNo(),
formVO.getGroupNo(), formVO.getHouseholdSeq(),
formVO.getHouseholdSeq(), formVO.getCurrentStep(),
formVO.getCurrentStep(), currentStatus,
currentStatus, null);
null)
);
portOut.create(command); portOut.create(command);
} }

View File

@@ -21,7 +21,7 @@ public class CreateDailyFarmingReqVO extends DailyUIReqVO {
/** /**
* 생산물 * 생산물
*/ */
@NotBlank(message = "생산물을 입력해 주세요.") @NotBlank(message = "생산물을 선택해 주세요.")
private String productCode; private String productCode;
/** /**
* 생산물 직접 입력 * 생산물 직접 입력

View File

@@ -21,9 +21,9 @@ public class CreateDailyFarmingValidator implements Validator {
public void validate(Object target, Errors errors) { public void validate(Object target, Errors errors) {
CreateDailyFarmingReqVO vo = (CreateDailyFarmingReqVO) target; CreateDailyFarmingReqVO vo = (CreateDailyFarmingReqVO) target;
if (CommonConstants.UNIT_CODE_SELF.equals(vo.getProductCode()) && StringUtils.isBlank(vo.getProductSelf())) { if ("code.record.farming.self".equals(vo.getProductCode()) && StringUtils.isBlank(vo.getProductSelf())) {
errors.rejectValue( errors.rejectValue(
"categorySelf", "valid.common.required", "productSelf", "valid.common.required",
"생산물을 입력해 주세요."); "생산물을 입력해 주세요.");
} }

View File

@@ -0,0 +1,3 @@
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12.332 2.5C17.8549 2.5 22.332 6.97715 22.332 12.5C22.332 18.0228 17.8549 22.5 12.332 22.5C6.80918 22.5 2.33203 18.0228 2.33203 12.5C2.33203 6.97715 6.80918 2.5 12.332 2.5ZM12.332 4.5C7.91375 4.5 4.33203 8.08172 4.33203 12.5C4.33203 16.9183 7.91375 20.5 12.332 20.5C16.7503 20.5 20.332 16.9183 20.332 12.5C20.332 8.08172 16.7503 4.5 12.332 4.5ZM12.4346 11.1299C12.9387 11.1812 13.332 11.6073 13.332 12.125V16.0322C13.7632 16.1433 14.082 16.5341 14.082 17C14.082 17.5523 13.6343 18 13.082 18H12.332C11.7797 18 11.332 17.5523 11.332 17V13.0918C10.9009 12.9806 10.582 12.5908 10.582 12.125C10.582 11.5727 11.0297 11.125 11.582 11.125H12.332L12.4346 11.1299ZM12.1445 6.875C12.973 6.875 13.6445 7.54657 13.6445 8.375C13.6445 9.20343 12.973 9.875 12.1445 9.875C11.3161 9.875 10.6445 9.20343 10.6445 8.375C10.6445 7.54657 11.3161 6.875 12.1445 6.875Z" fill="#ADB5BD"/>
</svg>

After

Width:  |  Height:  |  Size: 974 B

View File

@@ -0,0 +1,3 @@
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12.332 2.5C17.8549 2.5 22.332 6.97715 22.332 12.5C22.332 18.0228 17.8549 22.5 12.332 22.5C6.80918 22.5 2.33203 18.0228 2.33203 12.5C2.33203 6.97715 6.80918 2.5 12.332 2.5ZM11.582 11.125C11.0297 11.125 10.582 11.5727 10.582 12.125C10.582 12.5908 10.9009 12.9806 11.332 13.0918V17C11.332 17.5523 11.7797 18 12.332 18H13.082C13.6343 18 14.082 17.5523 14.082 17C14.082 16.5341 13.7632 16.1433 13.332 16.0322V12.125C13.332 11.6073 12.9387 11.1812 12.4346 11.1299L12.332 11.125H11.582ZM12.1445 6.875C11.3161 6.875 10.6445 7.54657 10.6445 8.375C10.6445 9.20343 11.3161 9.875 12.1445 9.875C12.973 9.875 13.6445 9.20343 13.6445 8.375C13.6445 7.54657 12.973 6.875 12.1445 6.875Z" fill="#4BBC43"/>
</svg>

After

Width:  |  Height:  |  Size: 800 B

View File

@@ -0,0 +1,3 @@
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12.332 2.5C17.8549 2.5 22.332 6.97715 22.332 12.5C22.332 18.0228 17.8549 22.5 12.332 22.5C6.80918 22.5 2.33203 18.0228 2.33203 12.5C2.33203 6.97715 6.80918 2.5 12.332 2.5ZM12.332 4.5C7.91375 4.5 4.33203 8.08172 4.33203 12.5C4.33203 16.9183 7.91375 20.5 12.332 20.5C16.7503 20.5 20.332 16.9183 20.332 12.5C20.332 8.08172 16.7503 4.5 12.332 4.5ZM12.4346 11.1299C12.9387 11.1812 13.332 11.6073 13.332 12.125V16.0322C13.7632 16.1433 14.082 16.5341 14.082 17C14.082 17.5523 13.6343 18 13.082 18H12.332C11.7797 18 11.332 17.5523 11.332 17V13.0918C10.9009 12.9806 10.582 12.5908 10.582 12.125C10.582 11.5727 11.0297 11.125 11.582 11.125H12.332L12.4346 11.1299ZM12.1445 6.875C12.973 6.875 13.6445 7.54657 13.6445 8.375C13.6445 9.20343 12.973 9.875 12.1445 9.875C11.3161 9.875 10.6445 9.20343 10.6445 8.375C10.6445 7.54657 11.3161 6.875 12.1445 6.875Z" fill="#DEE2E6"/>
</svg>

After

Width:  |  Height:  |  Size: 974 B

View File

@@ -6265,7 +6265,6 @@ button.swiper-pagination-bullet {
background-color: #ffffff; background-color: #ffffff;
width: 100%; width: 100%;
position: absolute; position: absolute;
background-color: #eeeeee;
border: 1px solid #cccccc; border: 1px solid #cccccc;
} }
@media screen and (max-width: 1023px) { @media screen and (max-width: 1023px) {
@@ -6321,6 +6320,7 @@ button.swiper-pagination-bullet {
.component-select.bottom-sheet .select-options .option.current { .component-select.bottom-sheet .select-options .option.current {
font-weight: 600; font-weight: 600;
color: #4bbc43; color: #4bbc43;
background-color: #F9FDF9;
} }
/* component tab */ /* component tab */
@@ -7731,6 +7731,15 @@ button.swiper-pagination-bullet {
.footer .footer-menu ul li.menu-info.active { .footer .footer-menu ul li.menu-info.active {
background-image: url("../images/common/ico_menu_info_active.svg"); background-image: url("../images/common/ico_menu_info_active.svg");
} }
.footer .footer-menu ul li.menu-use {
background-image: url("../images/common/ico_menu_use.svg");
}
.footer .footer-menu ul li.menu-use.active {
background-image: url("../images/common/ico_menu_use_active.svg");
}
.footer .footer-menu ul li.menu-use.disabled {
background-image: url("../images/common/ico_menu_use_disabled.svg");
}
.footer .footer-menu ul li.active a { .footer .footer-menu ul li.active a {
color: #4bbc43; color: #4bbc43;
} }

View File

@@ -172,7 +172,7 @@ kri.form.errorInit = function (formElement) {
if (formElement.length > 0) { if (formElement.length > 0) {
$(formElement).find('.component-input').removeClass('input-invalid'); $(formElement).find('.component-input').removeClass('input-invalid');
$(formElement).find('.input-flex-group').removeClass('invalid'); $(formElement).find('.input-flex-group').removeClass('invalid');
$(formElement).find('.select-group').removeClass('select-invalid'); $(formElement).find('.select-group').removeClass('input-invalid');
$(formElement).find('.input-info').each(function () { $(formElement).find('.input-info').each(function () {
$(this).remove(); $(this).remove();
}); });
@@ -238,11 +238,12 @@ kri.form.error = function(errorList){
} }
}); });
if(errorList && errorList.length > 0){ // 포커스 이동
const target = $('[name="' + errorList[0].field + '"]'); if ($('.input-invalid').length != 0) {
if (target.length > 0) { $('.input-invalid').eq(0).find('input').focus();
target.focus(); }
} if ($('.select-invalid').length != 0) {
$('.select-invalid').eq(0).find('button').focus();
} }
} }

View File

@@ -167,7 +167,7 @@
</li> </li>
<!--/* TODO : 2차 오픈 s */--> <!--/* TODO : 2차 오픈 s */-->
<li class="menu-regi disabled"><a href="javascript:void(0)">입력현황</a></li> <li class="menu-regi disabled"><a href="javascript:void(0)">입력현황</a></li>
<li class="menu-stat disabled"><a href="javascript:void(0)">통계</a></li> <li class="menu-use disabled"><a href="javascript:void(0)">이용안내</a></li>
<!--/* TODO : 2차 오픈 e */--> <!--/* TODO : 2차 오픈 e */-->
<li class="menu-info" <li class="menu-info"
th:classappend="${#strings.equals(currentURI?.uri, '/info') th:classappend="${#strings.equals(currentURI?.uri, '/info')

View File

@@ -332,6 +332,7 @@
const next = document.getElementById('complateBtn'); const next = document.getElementById('complateBtn');
const header = document.getElementById('listHeader'); const header = document.getElementById('listHeader');
const count = document.getElementById('listCount'); const count = document.getElementById('listCount');
const totalItems = document.getElementById('totalItems');
const total = ENV.data.bankList.length; const total = ENV.data.bankList.length;
@@ -339,6 +340,7 @@
status.style.display = total > 0 ? 'none' : ''; status.style.display = total > 0 ? 'none' : '';
callPastInfoBtn.style.display = total > 0 ? 'none' : ''; callPastInfoBtn.style.display = total > 0 ? 'none' : '';
count.textContent = total; count.textContent = total;
totalItems.textContent = total;
btn.disabled = isChecked; btn.disabled = isChecked;
@@ -474,9 +476,6 @@
ENV.data.bankList = []; ENV.data.bankList = [];
document.getElementById('listBody').innerHTML = ''; document.getElementById('listBody').innerHTML = '';
formControl.updateLayout(); formControl.updateLayout();
// TODO(ks): 선택 삭제 시 전체 count 미반영 중. 일단 전체 초기화에서만 count 갱신.
document.getElementById('totalItems').textContent = ENV.data.bankList.length;
}, },
}); });
}, },
@@ -557,7 +556,9 @@
${buttonGroupHtml} ${buttonGroupHtml}
</div> </div>
<ul class="detail-list"> <ul class="detail-list">
<li><p>재배형태</p><span>${getCrop(product.cropCode)}</span></li> ${product.cropCode != null && product.cropCode != ''
? `<li><p>재배형태</p><span>${getCrop(product.cropCode)}</span></li>`
: ''}
${product.sourcePurpose != null && product.sourcePurpose != '' ${product.sourcePurpose != null && product.sourcePurpose != ''
? `<li><p>수입원</p><span>${product.sourcePurpose}</span></li>` ? `<li><p>수입원</p><span>${product.sourcePurpose}</span></li>`
: ''} : ''}

View File

@@ -323,6 +323,7 @@
const next = document.getElementById('complateBtn'); const next = document.getElementById('complateBtn');
const header = document.getElementById('listHeader'); const header = document.getElementById('listHeader');
const count = document.getElementById('listCount'); const count = document.getElementById('listCount');
const totalItems = document.getElementById('totalItems');
const total = ENV.data.bankList.length; const total = ENV.data.bankList.length;
@@ -330,6 +331,7 @@
status.style.display = total > 0 ? 'none' : ''; status.style.display = total > 0 ? 'none' : '';
callPastInfoBtn.style.display = total > 0 ? 'none' : ''; callPastInfoBtn.style.display = total > 0 ? 'none' : '';
count.textContent = total; count.textContent = total;
totalItems.textContent = total;
btn.disabled = isChecked; btn.disabled = isChecked;
@@ -468,9 +470,6 @@
ENV.data.bankList = []; ENV.data.bankList = [];
document.getElementById('listBody').innerHTML = ''; document.getElementById('listBody').innerHTML = '';
formControl.updateLayout(); formControl.updateLayout();
// TODO(ks): 선택 삭제 시 전체 count 미반영 중. 일단 전체 초기화에서만 count 갱신.
document.getElementById('totalItems').textContent = ENV.data.bankList.length;
}, },
}); });
}, },

View File

@@ -16,7 +16,7 @@
</p> </p>
</div> </div>
<div id="productCode" class="component-select bottom-sheet" data-props-default="생산물을 선택해 주세요" data-props-type="bottomSheet"> <div id="productCode" class="component-select bottom-sheet" data-props-default="생산물을 선택해 주세요" data-props-type="bottomSheet">
<input type="hidden" name="productCode" th:value="${detail.productCode}"> <input type="hidden" name="productCode" data-type="select" th:value="${detail.productCode}">
<button type="button" class="select-box"> <button type="button" class="select-box">
<span class="select-txt"></span> <span class="select-txt"></span>
</button> </button>