Merge branch 'dev' into deploy-dev-front

This commit is contained in:
주수현
2025-06-24 16:13:26 +09:00
86 changed files with 3142 additions and 1414 deletions

View File

@@ -17,8 +17,8 @@ public class DailyExpenseDto {
private String unitCode;
private String unitLabel;
private String unitSelf;
private Integer price;
private Integer estimatedValue;
private Long price;
private Long estimatedValue;
/**
* 수정 가능 여부

View File

@@ -52,9 +52,9 @@ public class CreateDailyExpenseReqVO extends DailyUIReqVO {
/**
* 현금
*/
private Integer price;
private Long price;
/**
* 현물평가액
*/
private Integer estimatedValue;
private Long estimatedValue;
}

View File

@@ -13,6 +13,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 lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -23,6 +24,7 @@ import java.util.List;
public class DailyExpenseService implements DailyExpensePortIn {
private final DailyExpensePortOut portOut;
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordService dailyRecordService;
@Override
public List<DailyExpenseDto> list(DailyExpenseUIReqVO reqVO) {
@@ -107,6 +109,8 @@ public class DailyExpenseService implements DailyExpensePortIn {
formVO.getEstimatedValue()));
portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
}
@Override
@@ -127,5 +131,7 @@ public class DailyExpenseService implements DailyExpensePortIn {
formVO.getDailyRecordSeq()));
portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
}
}

View File

@@ -29,6 +29,6 @@ public class CreateDailyExpenseCmd extends FrontAuditCommand {
private Double quantity;
private String unitCode;
private String unitSelf;
private Integer price;
private Integer estimatedValue;
private Long price;
private Long estimatedValue;
}

View File

@@ -16,7 +16,7 @@ public class DailyFarmingDto {
private String unitCode;
private String unitLabel;
private String unitSelf;
private Integer estimatedValue;
private Long estimatedValue;
/**
* 수정 가능 여부

View File

@@ -46,5 +46,5 @@ public class CreateDailyFarmingReqVO extends DailyUIReqVO {
/**
* 현물평가액
*/
private Integer estimatedValue;
private Long estimatedValue;
}

View File

@@ -13,6 +13,7 @@ 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;
@@ -25,6 +26,7 @@ import java.util.List;
public class DailyFarmingService implements DailyFarmingPortIn {
private final DailyFarmingPortOut portOut;
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordService dailyRecordService;
@Override
public List<DailyFarmingDto> list(DailyFarmingUIReqVO reqVO) {
@@ -132,6 +134,8 @@ public class DailyFarmingService implements DailyFarmingPortIn {
formVO.getEstimatedValue()));
portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
}
@Override
@@ -152,5 +156,7 @@ public class DailyFarmingService implements DailyFarmingPortIn {
formVO.getDailyRecordSeq()));
portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
}
}

View File

@@ -21,5 +21,5 @@ public class CreateDailyFarmingCmd extends FrontAuditCommand {
private Double quantity;
private String unitCode;
private String unitSelf;
private Integer estimatedValue;
private Long estimatedValue;
}

View File

@@ -14,7 +14,7 @@ public class DailyForestryDto {
private String unitCode;
private String unitLabel;
private String unitSelf;
private Integer estimatedValue;
private Long estimatedValue;
/**
* 수정 가능 여부

View File

@@ -42,5 +42,5 @@ public class CreateDailyForestryReqVO extends DailyUIReqVO {
/**
* 현물평가액
*/
private Integer estimatedValue;
private Long estimatedValue;
}

View File

@@ -13,6 +13,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 lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -25,6 +26,7 @@ import java.util.List;
public class DailyForestryService implements DailyForestryPortIn {
private final DailyForestryPortOut portOut;
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordService dailyRecordService;
@Override
public List<DailyForestryDto> list(DailyForestryUIReqVO reqVO) {
@@ -105,6 +107,8 @@ public class DailyForestryService implements DailyForestryPortIn {
formVO.getEstimatedValue()));
portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
}
@Override
@@ -125,5 +129,7 @@ public class DailyForestryService implements DailyForestryPortIn {
formVO.getDailyRecordSeq()));
portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
}
}

View File

@@ -19,5 +19,5 @@ public class CreateDailyForestryCmd extends FrontAuditCommand {
private Double quantity;
private String unitCode;
private String unitSelf;
private Integer estimatedValue;
private Long estimatedValue;
}

View File

@@ -19,8 +19,8 @@ public class DailyIncomeDto {
private String unitCode;
private String unitLabel;
private String unitSelf;
private Integer price;
private Integer estimatedValue;
private Long price;
private Long estimatedValue;
/**
* 수정 가능 여부

View File

@@ -55,9 +55,9 @@ public class CreateDailyIncomeReqVO extends DailyUIReqVO {
/**
* 현금
*/
private Integer price;
private Long price;
/**
* 현물평가액
*/
private Integer estimatedValue;
private Long estimatedValue;
}

View File

@@ -13,6 +13,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 lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -23,6 +24,7 @@ import java.util.List;
public class DailyIncomeService implements DailyIncomePortIn {
private final DailyIncomePortOut portOut;
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordService dailyRecordService;
@Override
public List<DailyIncomeDto> list(DailyIncomeUIReqVO reqVO) {
@@ -111,6 +113,8 @@ public class DailyIncomeService implements DailyIncomePortIn {
formVO.getEstimatedValue()));
portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
}
@Override
@@ -131,5 +135,7 @@ public class DailyIncomeService implements DailyIncomePortIn {
formVO.getDailyRecordSeq()));
portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
}
}

View File

@@ -30,6 +30,6 @@ public class CreateDailyIncomeCmd extends FrontAuditCommand {
private Double quantity;
private String unitCode;
private String unitSelf;
private Integer price;
private Integer estimatedValue;
private Long price;
private Long estimatedValue;
}

View File

@@ -16,6 +16,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 lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -25,6 +26,7 @@ import java.util.List;
@RequiredArgsConstructor
public class DailyPowerService implements DailyPowerPortIn {
private final DailyPowerPortOut portOut;
private final DailyRecordService dailyRecordService;
@Override
public List<DailyPowerDto> list(DailyPowerUIReqVO reqVO) {
@@ -71,6 +73,8 @@ public class DailyPowerService implements DailyPowerPortIn {
formVO.getLeasedHours()));
portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
}
@Override
@@ -91,5 +95,7 @@ public class DailyPowerService implements DailyPowerPortIn {
formVO.getDailyRecordSeq()));
portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
}
}

View File

@@ -3,7 +3,7 @@ package app.module.front.usecase.daily.record.adapters.persistence;
import app.module.front.config.application.util.AuditUtil;
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.CreateDailyRecordReqVO;
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;
@@ -15,7 +15,6 @@ import org.springframework.stereotype.Repository;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Locale;
@@ -64,7 +63,7 @@ public class DailyRecordDao implements DailyRecordPortOut {
log.warn("[DailyRecordCreate] existCount={}, recordMonth={}, dayGroupNo={}", existCount, findCmd.getSearchMonth(), findCmd.getGroupNo());
}
this.updateByAllStatus(findCmd);
this.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
@Override
@@ -79,24 +78,128 @@ public class DailyRecordDao implements DailyRecordPortOut {
)
);
dailyRecordMapper.updateDailyRecordStatus(command);
if ("ALL".equals(targetType)) {
String allStatus = this.getUpdateAllStatus(recordMonth, dayGroupNo, command.getHouseholdSeq());
if (allStatus != null) {
command.setAllStatus(allStatus);
this.updateByAllStatus(new GetDailyRecordCmd(recordMonth, dayGroupNo, command.getHouseholdSeq()));
dailyRecordMapper.updateDailyRecordStatus(command);
} else {
log.debug("[updateByAllStatus] do nothing. findCmd: {}", command);
}
} else {
dailyRecordMapper.updateDailyRecordStatus(command);
}
}
/**
* TODO : target 업데이트 후 데이터 등록이 완료된 건은 allStatus 값 변경해주기
* @param findCmd
* 일계부 전체 입력상태 변경
*
* @param searchMonth
* @param dayGroupNo
* @param householdSeq
*/
private void updateByAllStatus(GetDailyRecordCmd findCmd) {
private void updateByAllStatus(String searchMonth, Integer dayGroupNo, Long householdSeq) {
String allStatus = this.getUpdateAllStatus(searchMonth, dayGroupNo, householdSeq);
if (allStatus != null) {
UpdateDailyRecordStatusCmd command = AuditUtil.update(
new UpdateDailyRecordStatusCmd(
searchMonth,
dayGroupNo,
allStatus,
null,
null
)
);
dailyRecordMapper.updateDailyRecordStatus(command);
} else {
log.debug("[updateByAllStatus] do nothing. findCmd: {}");
}
}
/**
* TODO 변경할 전체 입력상태 조회
*
* @param searchMonth
* @param dayGroupNo
* @param householdSeq
* @return 변경할 전체 입력상태
*/
private String getUpdateAllStatus(String searchMonth, Integer dayGroupNo, Long householdSeq) {
GetDailyRecordCmd findCmd = new GetDailyRecordCmd(searchMonth, dayGroupNo, householdSeq);
DailyRecordStatusDto statusDetail = null;
List<DailyRecordStatusDto> statusList = dailyRecordMapper.getDailyRecordStatus(findCmd);
if (statusList != null && !statusList.isEmpty()) {
DailyRecordStatusDto statusDetail = statusList.get(0);
statusDetail = statusList.get(0);
}
if (DailyTargetStatus.TARGET.equals(statusDetail.getIncomeStatus()) && statusDetail.getIncomeCount() != 0) {
String allStatus = null;
if (statusDetail != null) {
if (DailyStatus.TODAY_NONE.equals(statusDetail.getAllStatus())) {
// 전체상태=금일없음, 항목=입력대상이 있는지 여부
if (this.checkTarget(statusDetail.getIncomeStatus()) || this.checkTarget(statusDetail.getExpenseStatus())
|| this.checkTarget(statusDetail.getWorkStatus()) || this.checkTarget(statusDetail.getPowerStatus())
|| this.checkTarget(statusDetail.getForestryStatus()) || this.checkTarget(statusDetail.getFarmingStatus())) {
allStatus = DailyStatus.WAITING.name();
}
} else if (DailyStatus.WAITING.equals(statusDetail.getAllStatus())) {
// 전체상태=입력중, 항목 COUNT!=0 이 있는지 여부
int noneCheck = 0;
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getIncomeStatus(), statusDetail.getIncomeCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getExpenseStatus(), statusDetail.getExpenseCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getWorkStatus(), statusDetail.getWorkCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getPowerStatus(), statusDetail.getPowerCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getForestryStatus(), statusDetail.getForestryCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getFarmingStatus(), statusDetail.getFarmingCount()) ? 1 : 0);
if (noneCheck == 0) {
allStatus = DailyStatus.DONE.name();
}
} else if (DailyStatus.DONE.equals(statusDetail.getAllStatus())) {
// 전체상태=완료, 항목 COUNT=0 체크
int noneCheck = 0;
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getIncomeStatus(), statusDetail.getIncomeCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getExpenseStatus(), statusDetail.getExpenseCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getWorkStatus(), statusDetail.getWorkCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getPowerStatus(), statusDetail.getPowerCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getForestryStatus(), statusDetail.getForestryCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getFarmingStatus(), statusDetail.getFarmingCount()) ? 1 : 0);
if (noneCheck != 0) {
allStatus = DailyStatus.WAITING.name();
}
}
}
return allStatus;
}
/**
* 입력 대상 상태 조회
*
* @param status 조회 상태
* @return true=입력 대상, false=금일 데이터 없음 또는 대상 아님
*/
private boolean checkTarget(DailyTargetStatus status) {
// NONE 은 대상이 아니기 때문에 체크에서 제외
return DailyTargetStatus.TARGET.equals(status);
}
/**
* 등록 대상인데 데이터가 없는 경우 조회
*
* @param status 조회 상태
* @param count 조회 건수
* @return true=입력대상인데 데이터가 없는 경우, false=입력대상 아니거나, 데이터가 있는 경우
*/
private boolean checkTargetDataNone(DailyTargetStatus status, Integer count) {
return DailyTargetStatus.TARGET.equals(status) && count == 0;
}
}

View File

@@ -48,6 +48,7 @@ public class DailyRecordController {
formVO.setDayGroupNo(reqVO.getGroupNo());
formVO.setStartDate(detail.getStartDate());
formVO.setEndDate(detail.getEndDate());
formVO.setFarmingStatus(detail.isFarmingOpen());
log.debug("formVO: {}", formVO);
dailyRecordPortIn.create(formVO);

View File

@@ -23,6 +23,7 @@ public class CreateDailyRecordReqVO {
private DailyTargetStatus farmingStatus;
public void setTodayNone(String todayNone) {
this.todayNone = todayNone;
if ("Y".equals(todayNone)) {
this.allStatus = DailyStatus.TODAY_NONE;
this.incomeStatus = DailyTargetStatus.TODAY_NONE;
@@ -30,13 +31,6 @@ public class CreateDailyRecordReqVO {
this.expenseStatus = DailyTargetStatus.TODAY_NONE;
this.powerStatus = DailyTargetStatus.TODAY_NONE;
this.forestryStatus = DailyTargetStatus.TODAY_NONE;
// TODO : 7의 배수와 마지막날의 기준
if (dayGroupNo == 4 || dayGroupNo == 8 || dayGroupNo == 12 || dayGroupNo == 16 || dayGroupNo == 17) {
this.farmingStatus = DailyTargetStatus.TODAY_NONE;
} else {
this.farmingStatus = DailyTargetStatus.NONE;
}
} else {
this.allStatus = DailyStatus.WAITING;
@@ -55,9 +49,18 @@ public class CreateDailyRecordReqVO {
if (forestryStatus == null) {
this.forestryStatus = DailyTargetStatus.NONE;
}
if (farmingStatus == null) {
}
}
public void setFarmingStatus(boolean isOpen) {
if ("Y".equals(todayNone)) {
if (isOpen) {
this.farmingStatus = DailyTargetStatus.TODAY_NONE;
} else {
this.farmingStatus = DailyTargetStatus.NONE;
}
} else if (farmingStatus == null) {
this.farmingStatus = DailyTargetStatus.NONE;
}
}
}

View File

@@ -21,4 +21,6 @@ public interface DailyRecordPortIn {
void create(CreateDailyRecordReqVO formVO);
void updateByStatus(String recordMonth, Integer dayGroupNo, String targetType, String targetStatus);
void updateByAllStatus(String recordMonth, Integer dayGroupNo);
}

View File

@@ -95,5 +95,11 @@ 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);
}
@Override
public void updateByAllStatus(String recordMonth, Integer dayGroupNo) {
portOut.updateByStatus(recordMonth, dayGroupNo, "ALL", null);
}
}

View File

@@ -1,5 +1,7 @@
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

@@ -85,6 +85,8 @@ public class DailyWorkUIController {
}
}
model.addAttribute("recordArea", uiCodeListPortIn.connect("code.record.area"));
model.addAttribute("recordUnit", uiCodeListPortIn.connect("code.record.unit"));
model.addAttribute("reqVO", reqVO);

View File

@@ -43,9 +43,16 @@ public class CreateDailyWorkValidator implements Validator {
&& vo.getHiredMHours() == null && vo.getHiredFHours() == null
&& vo.getSharedMHours() == null && vo.getSharedFHours() == null
&& vo.getVolunteerMHours() == null && vo.getVolunteerFHours() == null) {
errors.rejectValue(
"ownerTime", "valid.common.required",
"최소 1개의 항목을 입력해주세요.");
errors.rejectValue("ownerTime", "valid.common.required");
errors.rejectValue("spouseTime", "valid.common.required");
errors.rejectValue("familyMHours", "valid.common.required");
errors.rejectValue("familyFHours", "valid.common.required");
errors.rejectValue("hiredMHours", "valid.common.required");
errors.rejectValue("hiredFHours", "valid.common.required");
errors.rejectValue("sharedMHours", "valid.common.required");
errors.rejectValue("sharedFHours", "valid.common.required");
errors.rejectValue("volunteerMHours", "valid.common.required");
errors.rejectValue("volunteerFHours", "valid.common.required");
}
}
}

View File

@@ -4,6 +4,7 @@ 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.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;
@@ -23,6 +24,7 @@ import java.util.List;
public class DailyWorkService implements DailyWorkPortIn {
private final DailyWorkPortOut portOut;
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordService dailyRecordService;
@Override
public List<DailyWorkDto> list(DailyWorkUIReqVO reqVO) {
@@ -51,13 +53,14 @@ public class DailyWorkService implements DailyWorkPortIn {
reqVO.getHouseholdSeq(),
reqVO.getId()));
List<UICodeElement> recordArea = uiCodeListPortIn.connect("code.record.area");
List<UICodeElement> recordUnit = uiCodeListPortIn.connect("code.record.unit");
for (DailyWorkDto dto : list) {
if (CommonConstants.UNIT_CODE_SELF.equals(dto.getAreaUnitCode())) {
dto.setAreaUnitLabel(dto.getAreaUnitSelf());
} else {
dto.setAreaUnitLabel(this.getCodeLabel(dto.getAreaUnitCode(), recordUnit));
dto.setAreaUnitLabel(this.getCodeLabel(dto.getAreaUnitCode(), recordArea));
}
if (CommonConstants.UNIT_CODE_SELF.equals(dto.getHarvestUnitCode())) {
@@ -120,6 +123,8 @@ public class DailyWorkService implements DailyWorkPortIn {
formVO.getVolunteerFHours()));
portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
}
@Override
@@ -140,5 +145,7 @@ public class DailyWorkService implements DailyWorkPortIn {
formVO.getDailyRecordSeq()));
portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
}
}

View File

@@ -29,10 +29,10 @@ public class CreateForestProductDto {
private String sourcePurpose;
private Integer count;
private String count;
private String unitCode;
private String unit;
private Integer price;
private Long price;
private String month;
private Long monthlyInputStatusId;

View File

@@ -23,10 +23,10 @@ public class CreateBankCmd extends AuditCommand {
private String sourcePurpose;
private Integer count;
private String count;
private String unitCode;
private String unit;
private Integer price;
private Long price;
private String month;
private Long monthlyInputStatusId;

View File

@@ -25,10 +25,10 @@ public class GetBanksDto {
private String sourcePurpose;
private Integer count;
private String count;
private String unitCode;
private String unit;
private Integer price;
private Long price;
private String month;
private Long monthlyInputStatusId;

View File

@@ -27,10 +27,10 @@ public class GetBanks {
private String sourcePurpose;
private Integer count;
private String count;
private String unitCode;
private String unit;
private Integer price;
private Long price;
private String month;
private Long monthlyInputStatusId;

View File

@@ -23,10 +23,10 @@ public class CreateBankInputProductReqVO {
private String sourcePurpose;
private Integer count;
private String count;
private String unitCode;
private String unit;
private Integer price;
private Long price;
}

View File

@@ -21,24 +21,24 @@ public class CreateForestProductDto {
private String landType; // code -> 직접
private String town;
private Integer availableArea;
private String availableArea;
private String cropName;
private String cropCode;
private Integer landArea;
private String landArea;
private String month;
private BigDecimal mainYield;
private String mainYield;
private String mainYieldUnitCode;
private String mainYieldUnit;
private BigDecimal mainSaleAmount;
private String mainSaleAmount;
private String mainSaleUnitCode;
private String mainSaleUnit;
private BigDecimal subYield;
private String subYield;
private String subYieldUnitCode;
private String subYieldUnit;
private BigDecimal subSaleAmount;
private String subSaleAmount;
private String subSaleUnitCode;
private String subSaleUnit;
private Long monthlyInputStatusId;

View File

@@ -19,24 +19,24 @@ public class CreateForestProductCmd extends AuditCommand {
private String landType;
private String town;
private Integer availableArea;
private String availableArea;
private String cropName;
private String cropCode;
private Integer landArea;
private String landArea;
private String month;
private BigDecimal mainYield;
private String mainYield;
private String mainYieldUnitCode;
private String mainYieldUnit;
private BigDecimal mainSaleAmount;
private String mainSaleAmount;
private String mainSaleUnitCode;
private String mainSaleUnit;
private BigDecimal subYield;
private String subYield;
private String subYieldUnitCode;
private String subYieldUnit;
private BigDecimal subSaleAmount;
private String subSaleAmount;
private String subSaleUnitCode;
private String subSaleUnit;

View File

@@ -20,24 +20,24 @@ public class GetForestProduct {
private String landType;
private String town;
private Integer availableArea;
private String availableArea;
private String cropName;
private String cropCode;
private Integer landArea;
private String landArea;
private String month;
private BigDecimal mainYield;
private String mainYield;
private String mainYieldUnitCode;
private String mainYieldUnit;
private BigDecimal mainSaleAmount;
private String mainSaleAmount;
private String mainSaleUnitCode;
private String mainSaleUnit;
private BigDecimal subYield;
private String subYield;
private String subYieldUnitCode;
private String subYieldUnit;
private BigDecimal subSaleAmount;
private String subSaleAmount;
private String subSaleUnitCode;
private String subSaleUnit;

View File

@@ -19,24 +19,24 @@ public class GetForestProductsDto {
private String landType;
private String town;
private Integer availableArea;
private String availableArea;
private String cropName;
private String cropCode;
private Integer landArea;
private String landArea;
private String month;
private BigDecimal mainYield;
private String mainYield;
private String mainYieldUnitCode;
private String mainYieldUnit;
private BigDecimal mainSaleAmount;
private String mainSaleAmount;
private String mainSaleUnitCode;
private String mainSaleUnit;
private BigDecimal subYield;
private String subYield;
private String subYieldUnitCode;
private String subYieldUnit;
private BigDecimal subSaleAmount;
private String subSaleAmount;
private String subSaleUnitCode;
private String subSaleUnit;

View File

@@ -21,24 +21,24 @@ public class GetForestProducts {
private String landType;
private String town;
private Integer availableArea;
private String availableArea;
private String cropName;
private String cropCode;
private Integer landArea;
private String landArea;
private String month;
private BigDecimal mainYield;
private String mainYield;
private String mainYieldUnitCode;
private String mainYieldUnit;
private BigDecimal mainSaleAmount;
private String mainSaleAmount;
private String mainSaleUnitCode;
private String mainSaleUnit;
private BigDecimal subYield;
private String subYield;
private String subYieldUnitCode;
private String subYieldUnit;
private BigDecimal subSaleAmount;
private String subSaleAmount;
private String subSaleUnitCode;
private String subSaleUnit;

View File

@@ -19,24 +19,24 @@ public class GetMonthlyForestProductsDto {
private String landType;
private String town;
private Integer availableArea;
private String availableArea;
private String cropName;
private String cropCode;
private Integer landArea;
private String landArea;
private String month;
private BigDecimal mainYield;
private String mainYield;
private String mainYieldUnitCode;
private String mainYieldUnit;
private BigDecimal mainSaleAmount;
private String mainSaleAmount;
private String mainSaleUnitCode;
private String mainSaleUnit;
private BigDecimal subYield;
private String subYield;
private String subYieldUnitCode;
private String subYieldUnit;
private BigDecimal subSaleAmount;
private String subSaleAmount;
private String subSaleUnitCode;
private String subSaleUnit;

View File

@@ -21,24 +21,24 @@ public class GetMonthlyForestProducts {
private String landType;
private String town;
private Integer availableArea;
private String availableArea;
private String cropName;
private String cropCode;
private Integer landArea;
private String landArea;
private String month;
private BigDecimal mainYield;
private String mainYield;
private String mainYieldUnitCode;
private String mainYieldUnit;
private BigDecimal mainSaleAmount;
private String mainSaleAmount;
private String mainSaleUnitCode;
private String mainSaleUnit;
private BigDecimal subYield;
private String subYield;
private String subYieldUnitCode;
private String subYieldUnit;
private BigDecimal subSaleAmount;
private String subSaleAmount;
private String subSaleUnitCode;
private String subSaleUnit;

View File

@@ -21,24 +21,24 @@ public class UpdateForestProductDto {
private String landType;
private String town;
private Integer availableArea;
private String availableArea;
private String cropName;
private String cropCode;
private Integer landArea;
private String landArea;
private String month;
private BigDecimal mainYield;
private String mainYield;
private String mainYieldUnitCode;
private String mainYieldUnit;
private BigDecimal mainSaleAmount;
private String mainSaleAmount;
private String mainSaleUnitCode;
private String mainSaleUnit;
private BigDecimal subYield;
private String subYield;
private String subYieldUnitCode;
private String subYieldUnit;
private BigDecimal subSaleAmount;
private String subSaleAmount;
private String subSaleUnitCode;
private String subSaleUnit;

View File

@@ -20,24 +20,24 @@ public class UpdateForestProductCmd {
private String landType;
private String town;
private Integer availableArea;
private String availableArea;
private String cropName;
private String cropCode;
private Integer landArea;
private String landArea;
private String month;
private BigDecimal mainYield;
private String mainYield;
private String mainYieldUnitCode;
private String mainYieldUnit;
private BigDecimal mainSaleAmount;
private String mainSaleAmount;
private String mainSaleUnitCode;
private String mainSaleUnit;
private BigDecimal subYield;
private String subYield;
private String subYieldUnitCode;
private String subYieldUnit;
private BigDecimal subSaleAmount;
private String subSaleAmount;
private String subSaleUnitCode;
private String subSaleUnit;

View File

@@ -16,21 +16,21 @@ public class CreateMonthlyProductReqVO {
private String landType;//
private String town;//
private Integer availableArea;//
private String availableArea;//
private String cropName;//
private Integer landArea;//
private String landArea;//
private BigDecimal mainYield;//
private String mainYield;//
private String mainYieldUnitCode;//
private String mainYieldUnit;//
private BigDecimal mainSaleAmount;//
private String mainSaleAmount;//
private String mainSaleUnitCode;//
private String mainSaleUnit;//
private BigDecimal subYield;//
private String subYield;//
private String subYieldUnitCode;//
private String subYieldUnit;//
private BigDecimal subSaleAmount;//
private String subSaleAmount;//
private String subSaleUnitCode;//
private String subSaleUnit;//

View File

@@ -19,24 +19,27 @@
<select id="getDailyRecordStatus"
resultType="app.module.front.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
, dr.income_status
, dr.work_status
, dr.expense_status
, dr.power_status
, dr.forestry_status
, dr.farming_status
, (select count(*) from daily_income di where di.daily_record_seq = dr.id and di.is_deleted = false) as income_count
, (select count(*) from daily_work dw where dw.daily_record_seq = dr.id and dw.is_deleted = false) as work_count
, (select count(*) from daily_expense de where de.daily_record_seq = dr.id and de.is_deleted = false) as expense_count
, (select count(*) from daily_power dp where dp.daily_record_seq = dr.id and dp.is_deleted = false) as power_count
, (select count(*) from daily_forestry df1 where df1.daily_record_seq = dr.id and df1.is_deleted = false) as forestry_count
, (select count(*) from daily_farming df2 where df2.daily_record_seq = dr.id and df2.is_deleted = false) as farming_count
from daily_record dr
, 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
, (select count(*) from daily_income di where di.daily_record_seq = dr.id and di.is_deleted = false) as income_count
, (select count(*) from daily_work dw where dw.daily_record_seq = dr.id and dw.is_deleted = false) as work_count
, (select count(*) from daily_expense de where de.daily_record_seq = dr.id and de.is_deleted = false) as expense_count
, (select count(*) from daily_power dp where dp.daily_record_seq = dr.id and dp.is_deleted = false) as power_count
, (select count(*) from daily_forestry df1 where df1.daily_record_seq = dr.id and df1.is_deleted = false) as forestry_count
, (select count(*) from daily_farming df2 where df2.daily_record_seq = dr.id and df2.is_deleted = false) as farming_count
from daily_record dr
where dr.is_deleted = false
and dr.household_seq = #{householdSeq}
and dr.record_month = #{searchMonth}
and dr.household_seq = #{householdSeq}
and dr.record_month = #{searchMonth}
<if test="groupNo != null">
and dr.day_group_no = #{groupNo}
</if>
</select>
<select id="getDailyRecordExistCount" resultType="int">

View File

@@ -14,7 +14,7 @@ uri.front.statistics=\uD1B5\uACC4
uri.front.info=\uB0B4 \uC815\uBCF4
uri.front.info.path=/info
uri.front.info.user=\uAC1C\uC778\uC815\uBCF4
uri.front.info.user=\uAC1C\uC778\uC815\uBCF4 \uBCC0\uACBD
uri.front.info.user.path=/info/user
uri.front.info.user.password=\uAC1C\uC778\uC815\uBCF4 \uBCC0\uACBD
uri.front.info.notice=\uACF5\uC9C0\uC0AC\uD56D

View File

@@ -1159,11 +1159,20 @@ button,
[type=button],
[type=reset],
[type=submit] {
outline: none;
-webkit-appearance: button;
-moz-appearance: button;
appearance: button;
}
button:focus-visible {
outline: 1px solid #007bff;
}
button:focus:not(:focus-visible) {
outline: none;
}
/*
* Remove the inner border and padding in Firefox.
*/
@@ -4292,6 +4301,7 @@ button.swiper-pagination-bullet {
.btn.btn-tertiary {
border-color: #f1f3f5;
background: #e9ecef;
color: #343a40;
}
.btn.btn-tertiary .btn-txt {
color: #343a40;
@@ -5096,6 +5106,12 @@ button.swiper-pagination-bullet {
flex-wrap: wrap;
}
.component-input .input-label .label-txt {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
position: relative;
font-size: 1.8rem;
line-height: 140%;
@@ -5103,6 +5119,7 @@ button.swiper-pagination-bullet {
color: #343a40;
}
.component-input .input-label .label-txt span {
display: inline-block;
font-size: 1.7rem;
line-height: 140%;
font-weight: 400;
@@ -6061,6 +6078,9 @@ button.swiper-pagination-bullet {
flex-wrap: wrap;
}
.select-group .select-label .label-txt {
display: -webkit-inline-box;
display: -webkit-inline-flex;
display: inline-flex;
position: relative;
font-size: 1.8rem;
line-height: 140%;
@@ -7496,6 +7516,7 @@ button.swiper-pagination-bullet {
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
padding: 0rem;
}
.header .header-wrap.sub .inner .btn-back {
width: 2.4rem;
@@ -8078,6 +8099,19 @@ button.swiper-pagination-bullet {
padding-bottom: 0rem;
}
.allmenu-wrap.component-modal .modal-content-inner {
height: 100%;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
justify-content: space-between;
}
.allmenu-wrap.component-modal .modal-header {
padding: 3.2rem 2.4rem 2.4rem;
display: block;
@@ -8433,6 +8467,7 @@ button.swiper-pagination-bullet {
justify-content: space-between;
}
.regist-item-area .item-list .list-item .item-tit-group .item-name {
max-width: 70%;
font-size: 2rem;
line-height: 140%;
font-weight: 700;
@@ -8488,6 +8523,7 @@ button.swiper-pagination-bullet {
line-height: 140%;
}
.regist-item-area .item-list .list-item .detail-list li span {
max-width: 80%;
color: #212529;
}
@@ -8752,6 +8788,9 @@ button.swiper-pagination-bullet {
flex: 1;
}
.form-group .input-flex-group.type-num .label-txt {
display: -webkit-inline-box;
display: -webkit-inline-flex;
display: inline-flex;
font-size: 1.8rem;
line-height: 140%;
font-weight: 700;

View File

@@ -163,14 +163,13 @@ var ajaxUtil = {
kri.logger.error('statusCode: 403');
},
422:function(rstData, status) {
console.log(rstData)
console.log('422', rstData)
/**
* TODO
* 폼이 너무 여러가지 형식이 있는데 서버에러를 가지고 처리하는게 맞는지 검토 필요
* 코드 정리는 나중에 하려고 그냥 만듬.... 정리 필요.
*/
let isResetDone = false;
$(rstData.responseJSON.fieldErrors).each((idx, oj) => {
@@ -236,6 +235,15 @@ var ajaxUtil = {
ajaxUtil._alert(fieldErrors[0].defaultMessage, '유효성 체크');
}
}
// 포커스 이동
if ($('.input-invalid').length != 0) {
$('.input-invalid').eq(0).find('input,select').focus();
}
if (typeof errorCallback !== 'undefined') {
errorCallback(rstData.status, rstData);
}
},
500:function(rstData){
ajaxUtil._hideWaiting();
@@ -263,6 +271,7 @@ var ajaxUtil = {
},
error : function(rstData) {
ajaxUtil._hideWaiting();
if (!(rstData.status == 500 || rstData.status == 422)) {
if (typeof errorCallback !== 'undefined') {
errorCallback(rstData.status, rstData);

View File

@@ -246,4 +246,10 @@ kri.form.error = function(errorList){
}
}
kri.form.maxlength = function(object){
if (object.value.length > object.maxLength) {
object.value = object.value.slice(0, object.maxLength);
}
}

View File

@@ -497,7 +497,7 @@
if (rstData.code === 'SUCCESS') {
ajaxUtil._alert('등록이 완료되었습니다.', null, function () {
history.back()
location.href = '/info/bank';
});
} else if (rstData.code === 'ERROR') {
ajaxUtil._alert('잠시 뒤에 다시 시도해 주세요.', null);

View File

@@ -120,7 +120,8 @@
</label>
</div>
<div class="input-field">
<input type="number" id="count" placeholder="수량을 입력해 주세요" name="count" class="limitDecimalLength">
<input type="number" id="count" placeholder="수량을 입력해 주세요" name="count" class="limitDecimalLength"
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
</div>
<ul class="guide-info">
<li>예 : 2, 2.5</li>
@@ -179,7 +180,9 @@
</label>
</div>
<div class="input-field type-price">
<input type="number" id="price" placeholder="금액을 입력해 주세요" name="price" class="limitAmountLength">
<input type="number" id="price" name="price" placeholder="금액을 입력해 주세요"
class="limitAmountLength"
maxlength="10" inputmode="numeric" pattern="[0-9]*" oninput="kri.form.maxlength(this)">
<span class="input-field-txt">원</span>
</div>
<ul class="input-info" style="display:none">

View File

@@ -117,8 +117,8 @@
bankList : /*[[${bankList.content}]]*/ [],
pastBankList : /*[[${pastBankList.content}]]*/ [],
id: /*[[${currentMonthlyInfo.id}]]*/'',
currentStatus: /*[[${currentMonthlyInfo.bankAutoTransferInputStatus}]]*/'',
pastStatus: /*[[${pastMonthlyInfo?.bankAutoTransferInputStatus}]]*/'',
currentStatus: /*[[${currentMonthlyInfo.bankAutoTransferOutputStatus}]]*/'',
pastStatus: /*[[${pastMonthlyInfo?.bankAutoTransferOutputStatus}]]*/'',
editable: /*[[${editable}]]*/,
},
elementRefs: {
@@ -491,7 +491,7 @@
if (rstData.code === 'SUCCESS') {
ajaxUtil._alert('등록이 완료되었습니다.', null, function () {
history.back()
location.href = '/info/bank';
});
} else if (rstData.code === 'ERROR') {
ajaxUtil._alert('잠시 뒤에 다시 시도해 주세요.', null);

View File

@@ -83,7 +83,8 @@
</label>
</div>
<div class="input-field">
<input type="number" id="count" placeholder="수량을 입력해 주세요" name="count" class="limitDecimalLength">
<input type="number" id="count" placeholder="수량을 입력해 주세요" name="count" class="limitDecimalLength"
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
</div>
<ul class="guide-info">
<li>예 : 2, 2.5</li>
@@ -144,7 +145,9 @@
</label>
</div>
<div class="input-field type-price">
<input type="number" id="price" placeholder="금액을 입력해 주세요" name="price" class="limitAmountLength">
<input type="number" id="price" placeholder="금액을 입력해 주세요" name="price"
class="limitAmountLength"
maxlength="10" inputmode="numeric" pattern="[0-9]*" oninput="kri.form.maxlength(this)">
<span class="input-field-txt">원</span>
</div>
<ul class="input-info" style="display:none">

View File

@@ -62,7 +62,8 @@
</div>
<div class="input-field">
<input type="number" id="availableArea" placeholder="가능 면적을 입력해 주세요"
name="availableArea" class="limitDecimalLength">
name="availableArea" class="limitDecimalLength"
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
</div>
</div>
</section>
@@ -95,7 +96,8 @@
</div>
<div class="input-field">
<input type="number" id="landArea" placeholder="작업 면적을 입력해 주세요"
name="landArea" class="limitDecimalLength">
name="landArea" class="limitDecimalLength"
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
</div>
<ul class="guide-info">
<li>예 : 180, 6</li>
@@ -115,7 +117,8 @@
</div>
<div class="input-field">
<input type="number" id="mainYield" placeholder="수확량을 입력해 주세요"
name="mainYield" class="limitDecimalLength">
name="mainYield" class="limitDecimalLength"
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
</div>
</div>
@@ -173,7 +176,8 @@
</div>
<div class="input-field">
<input type="number" id="mainSaleAmount" placeholder="판매량을 입력해 주세요"
name="mainSaleAmount" class="limitDecimalLength">
name="mainSaleAmount" class="limitDecimalLength"
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
</div>
</div>
@@ -231,7 +235,8 @@
</div>
<div class="input-field">
<input type="number" id="subYield" placeholder="수확량을 입력해 주세요"
name="subYield" class="limitDecimalLength">
name="subYield" class="limitDecimalLength"
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
</div>
</div>
@@ -289,7 +294,8 @@
</div>
<div class="input-field">
<input type="number" id="subSaleAmount" placeholder="판매량을 입력해 주세요"
name="subSaleAmount" class="limitDecimalLength">
name="subSaleAmount" class="limitDecimalLength"
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
</div>
</div>

View File

@@ -564,7 +564,8 @@
* TODO
* 내정보에서만 들어온다는 가정하에서 back을 하게함 SB에는 내정보로 이동하게 되어 있음.
*/
history.back()
// history.back()
location.href = '/info/monthly';
});
} else if (rstData.code === 'ERROR') {
ajaxUtil._alert('잠시 뒤에 다시 시도해 주세요.', null);

View File

@@ -105,31 +105,12 @@
</label>
</div>
<div class="d-flex">
<div class="select-group">
<div id="phone1Id" class="component-select bottom-sheet"
th:data-props-default="${userInfo.phone1}" data-props-type="bottomSheet">
<input type="hidden" th:field="*{phone1}" data-type="select">
<button type="button" class="select-box">
<span class="select-txt"></span>
</button>
<div class="select-options">
<div class="select-header">
<p>휴대폰 번호</p>
<button type="button" class="select-close">
<span class="hide-txt">닫기</span>
</button>
</div>
<div class="select-scroll">
<ul class="">
<li class="option" data-value="010" th:classappend="${userInfo.phone1 == '010'?' current':'' }">010</li>
<li class="option" data-value="011" th:classappend="${userInfo.phone1 == '011'?' current':'' }">011</li>
</ul>
</div>
</div>
<div class="component-input">
<div class="input-field">
<input type="number" id="phone1Id" th:value="${userInfo.phone1}" readonly>
</div>
</div>
<div class="component-input">
<div class="input-field">
<input type="text" id="temp_input_0006" th:field="*{phone2}"

View File

@@ -2,7 +2,7 @@
<div class="modal-content-inner">
<h2 class="terms-heading-h1">개인정보처리방침</h2>
<div class="terms-group">
<h3 class="terms-heading-h3">제1조 목적</h3>
<h3 class="terms-heading-h2">제1조 목적</h3>
<ul class="terms-list bullet-type">
<li class="terms-list-item">
본 약관은 ㈜코리아리서치인터내셔널(이하 '회사')가 제공하는 임가경제조사 일계부 (이하 “서비스”)는 이용약관에 동의 후 회원가입한 이용자(이하 “회원”)의 개인정보를 중요시하며,
@@ -11,7 +11,7 @@
</ul>
</div>
<div class="terms-group">
<h3 class="terms-heading-h3">제2조 개인정보 수집 항목</h3>
<h3 class="terms-heading-h2">제2조 개인정보 수집 항목</h3>
<ul class="terms-list bullet-type">
<li class="terms-list-item">
“회사”는 회원정보변경, 1:1 문의, 일계부 응답 등을 위해 다음과 같은 개인정보를 수집하고 있습니다. “회원”은 개인정보 수집을 거부할 수 있으나, 거부 시 “서비스” 이용이

View File

@@ -1,8 +1,8 @@
<!--/* 공통으로 사용하는 모달 팝업의 bind wrap 영역 */-->
<div class="modal-content-inner">
<h2 class="terms-heading-h1">이용약관</h2>
<!-- <h2 class="terms-heading-h1">이용약관</h2> -->
<div class="terms-group">
<h3 class="terms-heading-h3">제1조 목적</h3>
<h3 class="terms-heading-h2">제1조 목적</h3>
<ul class="terms-list bullet-type">
<li class="terms-list-item">
본 약관은 ㈜코리아리서치인터내셔널(이하 "회사")이 제공하는 임가경제조사 일계부(이하 “서비스”)의 이용약관에 동의를 완료한 이용자(이하 “회원”)간의 서비스 이용 및 권리, 의무 및 책임사항 규정을 목적으로 합니다.
@@ -10,7 +10,7 @@
</ul>
</div>
<div class="terms-group">
<h3 class="terms-heading-h3">제2조 약관의 명시와 개정</h3>
<h3 class="terms-heading-h2">제2조 약관의 명시와 개정</h3>
<ul class="terms-list bullet-type">
<li class="terms-list-item">
"회사"는 본 약관의 내용을 상시로 확인할 수 있도록 서비스 화면 하단에 게시합니다.
@@ -27,7 +27,7 @@
</ul>
</div>
<div class="terms-group">
<h3 class="terms-heading-h3">제3조 회원정보의 변경</h3>
<h3 class="terms-heading-h2">제3조 회원정보의 변경</h3>
<ul class="terms-list bullet-type">
<li class="terms-list-item">
"회원"은 회원정보 수정 화면을 통해 수시로 본인의 개인정보를 열람하고 변경할 수 있습니다. "서비스" 운영 및 관리를 위해 필요한 이름, 나이, 휴대폰 번호는 추가 약관동의를 통해 최신의 정보로 갱신이 가능합니다.
@@ -38,7 +38,7 @@
</ul>
</div>
<div class="terms-group">
<h3 class="terms-heading-h3">제4조 “회사”의 개인정보보호 의무</h3>
<h3 class="terms-heading-h2">제4조 “회사”의 개인정보보호 의무</h3>
<ul class="terms-list bullet-type">
<li class="terms-list-item">
"회사"는 "정보통신망법" 등 관계법령이 정하는 바에 따라 "회원"의 개인정보를 보호하기 위해 노력합니다. 개인정보의 보호 및 사용에 대해서는 관련법 및 "회사"의 개인정보처리방침이 적용됩니다. 다만, "회사"의 “서비스”에 링크된 공식 사이트와 “서비스 소개 사이트” 이외의 사이트에서는 "회사"의 개인정보처리방침이 적용되지 않습니다.
@@ -52,7 +52,7 @@
</ul>
</div>
<div class="terms-group">
<h3 class="terms-heading-h3">제5조 "회원"의 "계정" 관리에 대한 의무</h3>
<h3 class="terms-heading-h2">제5조 "회원"의 "계정" 관리에 대한 의무</h3>
<ul class="terms-list bullet-type">
<li class="terms-list-item">
"회원"은 “계정”에 관한 관리책임은 “회원” 본인에게 있으며, 이를 제3자가 이용하도록 하여서는 안 됩니다.
@@ -60,7 +60,7 @@
</ul>
</div>
<div class="terms-group">
<h3 class="terms-heading-h3">제6조 "회원"의 의무</h3>
<h3 class="terms-heading-h2">제6조 "회원"의 의무</h3>
<ul class="terms-list bullet-type">
<li class="terms-list-item">
"회원"은 다음 행위를 하여서는 안 됩니다.
@@ -85,11 +85,10 @@
<li class="terms-list-item">
"회원"은 관계법령, 이 약관의 규정, 이용안내 및 "서비스"와 관련하여 고지한 주의사항, "회사"가 통지하는 사항 등을 준수하여야 하며, 기타 "회사"의 업무에 방해되는 행위를 하여서는 안 됩니다. 만약 이를 위반할 경우 “회사”가 “회원”자격을 박탈할 수 있습니다
</li>
<li class="terms-list-item"></li>
</ul>
</div>
<div class="terms-group">
<h3 class="terms-heading-h3">제7조 "서비스"의 이용 및 변경</h3>
<h3 class="terms-heading-h2">제7조 "서비스"의 이용 및 변경</h3>
<ul class="terms-list bullet-type">
<li class="terms-list-item">
"회사"는 컴퓨터 등 정보통신설비의 보수점검, 교체 및 고장, 통신두절 또는 운영상 상당한 이유가 있는 경우 "서비스"의 제공을 일시적으로 중단할 수 있습니다. 다만, "회사"가 사전에 통지할 수 없는 부득이한 사유가 있는 경우 사후에 통지할 수 있습니다.
@@ -106,7 +105,7 @@
</ul>
</div>
<div class="terms-group">
<h3 class="terms-heading-h3">제8조 정보의 제공 및 광고의 게재</h3>
<h3 class="terms-heading-h2">제8조 정보의 제공 및 광고의 게재</h3>
<ul class="terms-list bullet-type">
<li class="terms-list-item">
"회사"는 "회원"이 "서비스" 이용 중 필요하다고 인정되는 다양한 정보를 공지사항, 이메일, 문자메시지, 카카오톡 채널 메시지 등의 방법으로 "회원"에게 제공할 수 있습니다.
@@ -125,7 +124,7 @@
</ul>
</div>
<div class="terms-group">
<h3 class="terms-heading-h3">제9조 책임제한</h3>
<h3 class="terms-heading-h2">제9조 책임제한</h3>
<ul class="terms-list bullet-type">
<li class="terms-list-item">
"회사"는 무료로 제공되는 “서비스” 이용과 관련하여 관련법 규정이 없는 한 책임 지지 않습니다. 또한 천재지변 또는 이에 준하는 불가항력으로 인하여 "서비스"를 제공할 수 없는 경우에는 "서비스" 제공에 관한 책임이 면책됩니다.
@@ -136,7 +135,7 @@
</ul>
</div>
<div class="terms-group">
<h3 class="terms-heading-h3">제10조 준거법 및 재판관할</h3>
<h3 class="terms-heading-h2">제10조 준거법 및 재판관할</h3>
<ul class="terms-list bullet-type">
<li class="terms-list-item">
"회사"와 "회원" 간 제기된 소송은 대한민국법을 준거법으로 합니다.
@@ -147,7 +146,7 @@
</ul>
</div>
<div class="terms-group">
<h3 class="terms-heading-h3">제11조 사업자 정보</h3>
<h3 class="terms-heading-h2">제11조 사업자 정보</h3>
<ul class="terms-list bullet-type">
<li class="terms-list-item">
회사명 : ㈜코리아리서치인터내셔널

View File

@@ -42,7 +42,7 @@
</div>
<div class="component-input">
<label class="switch-inner type-txt">
<span class="switch-label">임업노동 투입 내역</span>
<span class="switch-label">임업노동 투입</span>
<input type="checkbox" name="workStatus" value="TARGET" data-target="work"
th:checked="${#strings.equals(dailyRecord.workStatus, 'TARGET') or #strings.equals(dailyRecord.workStatus, 'DONE')}">
<span class="switch-item">
@@ -72,7 +72,7 @@
</div>
<div class="component-input">
<label class="switch-inner type-txt">
<span class="switch-label">자가임업 생산물 중 자가소비량</span>
<span class="switch-label">임업생산물 중 자가소비량</span>
<input type="checkbox" name="forestryStatus" value="TARGET" data-target="forestry"
th:checked="${#strings.equals(dailyRecord.forestryStatus, 'TARGET') or #strings.equals(dailyRecord.forestryStatus, 'DONE')}">
<span class="switch-item">
@@ -82,10 +82,9 @@
</div>
<!--/* [정책] 자가농업 생산물 중 자가소비량은 7일차 등록일에만 노출 및 선택, 21일 이후는 마지막 날 */-->
<div class="component-input"
th:if="${reqVO.groupNo eq 4 or reqVO.groupNo eq 8 or reqVO.groupNo eq 12
or reqVO.groupNo eq 16 or reqVO.groupNo eq 17}">
th:if="${dailyRecord.farmingOpen}">
<label class="switch-inner type-txt">
<span class="switch-label">자가농업 생산물 중 자가소비량</span>
<span class="switch-label">농업생산물 중 자가소비량</span>
<input type="checkbox" name="farmingStatus" value="TARGET" data-target="farming"
th:checked="${#strings.equals(dailyRecord.farmingStatus, 'TARGET') or #strings.equals(dailyRecord.farmingStatus, 'DONE')}">
<span class="switch-item">

View File

@@ -79,7 +79,8 @@
</label>
</div>
<div class="input-field">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity" th:value="${detail.quantity}" maxlength="10" placeholder="수량을 입력해 주세요">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity"
th:value="${detail.quantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수량을 입력해 주세요">
</div>
<ul class="guide-info">
<li>예 : 2, 2.5</li>
@@ -133,7 +134,8 @@
</label>
</div>
<div class="input-field type-price">
<input type="number" inputmode="numeric" pattern="[0-9]*" id="price" name="price" th:value="${detail.price}" maxlength="10" placeholder="금액을 입력해 주세요">
<input type="number" inputmode="numeric" pattern="[0-9]*" id="price" name="price"
th:value="${detail.price}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요">
<span class="input-field-txt">원</span>
</div>
<ul class="guide-info">
@@ -149,7 +151,8 @@
</label>
</div>
<div class="input-field type-price">
<input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue" th:value="${detail.estimatedValue}" maxlength="10" placeholder="금액을 입력해 주세요">
<input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue"
th:value="${detail.estimatedValue}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요">
<span class="input-field-txt">원</span>
</div>
<ul class="guide-info">

View File

@@ -67,7 +67,7 @@
</div>
<div class="input-field">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity"
th:value="${detail.quantity}" maxlength="10" placeholder="수량을 입력해 주세요">
th:value="${detail.quantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수량을 입력해 주세요">
</div>
<ul class="guide-info">
<li>예 : 2, 2.5</li>
@@ -122,7 +122,7 @@
</div>
<div class="input-field type-price">
<input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue"
th:value="${detail.estimatedValue}" maxlength="10" placeholder="금액을 입력해 주세요">
th:value="${detail.estimatedValue}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요">
<span class="input-field-txt">원</span>
</div>
<ul class="guide-info">

View File

@@ -42,7 +42,7 @@
</div>
<div class="input-field">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity"
th:value="${detail.quantity}" maxlength="10" placeholder="수량을 입력해 주세요">
th:value="${detail.quantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수량을 입력해 주세요">
</div>
<ul class="guide-info">
<li>예 : 2, 2.5</li>
@@ -97,7 +97,7 @@
</div>
<div class="input-field type-price">
<input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue"
th:value="${detail.estimatedValue}" maxlength="10" placeholder="금액을 입력해 주세요">
th:value="${detail.estimatedValue}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요">
<span class="input-field-txt">원</span>
</div>
<ul class="guide-info">

View File

@@ -15,7 +15,7 @@
<th:block th:if="not ${dailyRecord.startDay eq dailyRecord.endDay}">
[[${#temporals.format(dailyRecord.startDate, 'M월 d일')}]]~[[${#temporals.format(dailyRecord.endDate, 'd일')}]], <br>
</th:block>
<strong>임업생산물 중 자가소비량 [[${#lists.isEmpty(forestryList) ? 0 : #lists.size(forestryList)}]]건 등록</strong>
<strong>임업생산물 중 자가소비량 내역 [[${#lists.isEmpty(forestryList) ? 0 : #lists.size(forestryList)}]]건 등록</strong>
되었습니다.
</h3>
<p th:if="${#lists.isEmpty(forestryList)}">자가임업생산물 중 자가소비량 내역을 등록해 주세요.</p>

View File

@@ -110,7 +110,7 @@
</div>
<div class="input-field">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity"
th:value="${detail.quantity}" maxlength="10" placeholder="수량을 입력해 주세요">
th:value="${detail.quantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수량을 입력해 주세요">
</div>
<ul class="guide-info">
<li>예 : 2, 2.5</li>
@@ -165,7 +165,7 @@
</div>
<div class="input-field type-price">
<input type="number" inputmode="numeric" pattern="[0-9]*" id="price" name="price"
th:value="${detail.price}" maxlength="10" placeholder="금액을 입력해 주세요">
th:value="${detail.price}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요">
<span class="input-field-txt">원</span>
</div>
<ul class="guide-info">
@@ -182,7 +182,7 @@
</div>
<div class="input-field type-price">
<input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue"
th:value="${detail.estimatedValue}" maxlength="10" placeholder="금액을 입력해 주세요">
th:value="${detail.estimatedValue}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요">
<span class="input-field-txt">원</span>
</div>
<ul class="guide-info">

View File

@@ -45,7 +45,8 @@
</label>
</div>
<div class="input-field type-hour">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="ownedHours" name="ownedHours" th:value="${detail.ownedHours}" maxlength="10" placeholder="00">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="ownedHours" name="ownedHours"
th:value="${detail.ownedHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span>
</div>
</div>
@@ -57,7 +58,8 @@
</label>
</div>
<div class="input-field type-hour">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="leasedHours" name="leasedHours" th:value="${detail.leasedHours}" maxlength="10" placeholder="00">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="leasedHours" name="leasedHours"
th:value="${detail.leasedHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span>
</div>
</div>

View File

@@ -52,7 +52,7 @@
</div>
<div class="input-field">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="workLandArea" name="workLandArea"
th:value="${detail.workLandArea}" maxlength="10" placeholder="작업 면적을 입력해 주세요">
th:value="${detail.workLandArea}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="작업 면적을 입력해 주세요">
</div>
<ul class="guide-info">
<li>예 : 180, 6</li>
@@ -79,7 +79,7 @@
</div>
<div class="select-scroll">
<ul class="">
<li class="option" th:each="uiCode : ${recordUnit}"
<li class="option" th:each="uiCode : ${recordArea}"
th:data-value="${uiCode.id}"
th:text="${uiCode.codeText}"
th:selected="${uiCode.id eq detail.areaUnitCode ? 'current' : ''}"
@@ -109,7 +109,7 @@
</div>
<div class="input-field">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="harvestQuantity" name="harvestQuantity"
th:value="${detail.harvestQuantity}" maxlength="10" placeholder="수확량을 입력해 주세요">
th:value="${detail.harvestQuantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수확량을 입력해 주세요">
</div>
</div>
<div class="select-group">
@@ -174,7 +174,7 @@
</div>
<div class="input-field type-hour">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="ownerTime" name="ownerTime"
th:value="${detail.ownerTime}" maxlength="10" placeholder="00">
th:value="${detail.ownerTime}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span>
</div>
</div>
@@ -187,7 +187,7 @@
</div>
<div class="input-field type-hour">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="spouseTime" name="spouseTime"
th:value="${detail.spouseTime}" maxlength="10" placeholder="00">
th:value="${detail.spouseTime}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span>
</div>
</div>
@@ -202,7 +202,7 @@
<div class="input-field type-hour">
<span class="input-front-txt">남</span>
<input type="number" inputmode="decimal" pattern="[0-9]*" id="familyMHours" name="familyMHours"
th:value="${detail.familyMHours}" maxlength="10" placeholder="00">
th:value="${detail.familyMHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span>
</div>
</div>
@@ -210,7 +210,7 @@
<div class="input-field type-hour">
<span class="input-front-txt">여</span>
<input type="number" inputmode="decimal" pattern="[0-9]*" id="familyFHours" name="familyFHours"
th:value="${detail.familyFHours}" maxlength="10" placeholder="00">
th:value="${detail.familyFHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span>
</div>
</div>
@@ -227,7 +227,7 @@
<div class="input-field type-hour">
<span class="input-front-txt">남</span>
<input type="number" inputmode="decimal" pattern="[0-9]*" id="hiredMHours" name="hiredMHours"
th:value="${detail.hiredMHours}" maxlength="10" placeholder="00">
th:value="${detail.hiredMHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span>
</div>
</div>
@@ -235,7 +235,7 @@
<div class="input-field type-hour">
<span class="input-front-txt">여</span>
<input type="number" inputmode="decimal" pattern="[0-9]*" id="hiredFHours" name="hiredFHours"
th:value="${detail.hiredFHours}" maxlength="10" placeholder="00">
th:value="${detail.hiredFHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span>
</div>
</div>
@@ -252,7 +252,7 @@
<div class="input-field type-hour">
<span class="input-front-txt">남</span>
<input type="number" inputmode="decimal" pattern="[0-9]*" id="sharedMHours" name="sharedMHours"
th:value="${detail.sharedMHours}" maxlength="10" placeholder="00">
th:value="${detail.sharedMHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span>
</div>
</div>
@@ -260,7 +260,7 @@
<div class="input-field type-hour">
<span class="input-front-txt">여</span>
<input type="number" inputmode="decimal" pattern="[0-9]*" id="sharedFHours" name="sharedFHours"
th:value="${detail.sharedFHours}" maxlength="10" placeholder="00">
th:value="${detail.sharedFHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span>
</div>
</div>
@@ -277,7 +277,7 @@
<div class="input-field type-hour">
<span class="input-front-txt">남</span>
<input type="number" inputmode="decimal" pattern="[0-9]*" id="volunteerMHours" name="volunteerMHours"
th:value="${detail.volunteerMHours}" maxlength="10" placeholder="00">
th:value="${detail.volunteerMHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span>
</div>
</div>
@@ -285,7 +285,7 @@
<div class="input-field type-hour">
<span class="input-front-txt">여</span>
<input type="number" inputmode="decimal" pattern="[0-9]*" id="volunteerFHours" name="volunteerFHours"
th:value="${detail.volunteerFHours}" maxlength="10" placeholder="00">
th:value="${detail.volunteerFHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span>
</div>
</div>

View File

@@ -258,6 +258,12 @@
function (rstData, status) {
location.reload();
},
function () {
// 노동투입시간 invalid reset
$('.segment-label .guide-info li').eq(2).addClass('invalid');
$('.type-sub').find('.input-info').remove();
$('.input-flex-group').find('.input-info').remove();
}
);
},
};

View File

@@ -21,8 +21,8 @@
</label>
</div>
<div class="input-field">
<input autofocus class="" id="floatingInput" name="username" placeholder="임가번호를 입력해 주세요" value="11111"
type="number" maxlength="5">
<input autofocus maxlength="5" id="floatingInput" pattern="[0-9]*" name="username" placeholder="임가번호를 입력해 주세요"
type="text" inputmode="numeric">
</div>
<ul class="input-info" id="username-error" style="display: none;">
<li>임가번호를 입력해주세요</li>
@@ -35,7 +35,7 @@
</label>
</div>
<div class="input-field">
<input type="password" name="password" id="floatingPassword" placeholder="비밀번호 4자리를 입력해 주세요" value="1111" maxlength="4">
<input type="password" name="password" id="floatingPassword" placeholder="비밀번호 4자리를 입력해 주세요" maxlength="4">
</div>
<ul class="input-info" id="password-error" style="display: none;">
<li>비밀번호를 입력해주세요</li>
@@ -43,7 +43,7 @@
</div>
<div class="component-input" roleDto="group" aria-label="Basic checkbox toggle button group">
<label for="btn_ck1" class="checkbox-inner">
<input autocomplete="off" type="checkbox" id="btn_ck1" name="remember-me">
<input autocomplete="off" type="checkbox" id="btn_ck1" name="remember-me" checked>
<span class="checkbox-item">
<span class="checkbox-txt">로그인 상태 유지</span>
</span>
@@ -95,7 +95,8 @@
const userNameValue = floatingInput.value;
const errorContainer = document.getElementById('username-error');
const parentComponent = floatingInput.closest('.component-input');
if (userNameValue.length < 5) {
const isNumeric = /^[0-9]+$/.test(userNameValue);
if (userNameValue.length < 5 || !isNumeric) {
parentComponent.classList.add('input-invalid');
errorContainer.style.display = 'block';
} else {