Merge branch 'dev' into 0623_fetch
This commit is contained in:
13
README.md
13
README.md
@@ -154,12 +154,13 @@ InitAdminData, InitUriFrontData 등 *ApplicationRunner* 구현체에서 내용
|
||||
- #### 📡 Ajax 호출 방식 (REST API, JSON 응답)
|
||||
다음 기능은 Ajax를 통해 REST API(JSON)를 호출합니다
|
||||
|
||||
| 기능 | 메서드 | URI | 예시 |
|
||||
|------------|------------|------------------------------------|------------------------|
|
||||
| 목록 조회 | GET | `/api/{resource-name}/list` | `/api/articles/list` |
|
||||
| 등록 | POST | `/api/{resource-name}/create` | `/api/articles/create` |
|
||||
| 수정 | PUT/PATCH | `/api/{resource-name}/update` | `/api/articles/update` |
|
||||
| 삭제 | DELETE | `/api/{resource-name}/remove` | `/api/articles/remove` |
|
||||
| 기능 | 메서드 | URI | 예시 |
|
||||
|----------|----------|------------------------------------|------------------------|
|
||||
| 목록 조회 | GET | `/api/{resource-name}/list` | `/api/articles/list` |
|
||||
| 등록 | POST | `/api/{resource-name}/create` | `/api/articles/create` |
|
||||
| 수정 | PUT/PATCH | `/api/{resource-name}/update` | `/api/articles/update` |
|
||||
| 삭제 | DELETE | `/api/{resource-name}/remove` | `/api/articles/remove` |
|
||||
| 등록 & 수정 |POST | `/api/{resource-name}/save` | `/api/articles/save` |
|
||||
|
||||
|
||||
- #### 🖥️ 서버 렌더링 방식 (SSR)
|
||||
|
||||
@@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
@@ -42,6 +43,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
|
||||
@Transactional
|
||||
public ExcelUploadResultVO operate(MultipartFile file) throws IOException {
|
||||
// 엑셀 파일 읽기
|
||||
|
||||
Workbook workbook = WorkbookFactory.create(file.getInputStream());
|
||||
Sheet sheet = workbook.getSheetAt(0);
|
||||
Integer success = 0;
|
||||
@@ -52,6 +54,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
|
||||
List<UICodeElement> IndustryLargeCodeList = uiCodeListMapper.findByParentId("code.industry.large");
|
||||
List<UICodeElement> IndustryMiddleCodeList = uiCodeListMapper.findByParentId("code.industry.middle");
|
||||
|
||||
List<String> errorList = new ArrayList<>();
|
||||
// 첫 번째 행은 헤더로 간주하고 스킵
|
||||
for (int i = 1; i <= sheet.getLastRowNum(); i++) {
|
||||
Row row = sheet.getRow(i);
|
||||
@@ -60,9 +63,9 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
|
||||
CheckHouseholdNum checkHouseholdNum = checkHouseholdNumMapper.checkHouseholdNum(new CheckHouseholdNumCmd(getCellValue(row.getCell(0)))).orElse(null);
|
||||
ExcelUploadContactVO contactVO = getDivisionContact(row.getCell(3));
|
||||
|
||||
|
||||
// 데이터 누락 warn
|
||||
if(!checkHouseholdNum.getIsDuplicated() && contactVO != null) {
|
||||
|
||||
int flag = 0;
|
||||
ExcelCreateHouseholdVO household = new ExcelCreateHouseholdVO();
|
||||
household.setHouseholdNum(getCellValue(row.getCell(0))); // 임가번호
|
||||
household.setOwnerName(getCellValue(row.getCell(1))); // 경영주명
|
||||
@@ -80,7 +83,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
|
||||
household.setIndustryDetail(getCellValue(row.getCell(11))); // 규모 / 세부품목
|
||||
household.setResearcherSeq(getResearcherSeq(row.getCell(12))); // 조사원
|
||||
household.setIsPanel(getIsPanel(row.getCell(13))); // 유지여부
|
||||
|
||||
household.setMemo(getCellValue(row.getCell(14))); // 비고
|
||||
|
||||
CreateHouseholdOutCmd cmd = new CreateHouseholdOutCmd(
|
||||
null,
|
||||
@@ -100,11 +103,17 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
|
||||
household.getIndustryDetail(),
|
||||
household.getResearcherSeq(),
|
||||
household.getIsPanel(),
|
||||
null,
|
||||
household.getMemo(),
|
||||
List.of("ROLE_GENERAL")
|
||||
);
|
||||
|
||||
success += createHouseholdMapper.createHousehold(AuditUtil.create(cmd));
|
||||
flag = createHouseholdMapper.createHousehold(AuditUtil.create(cmd));
|
||||
|
||||
success += flag;
|
||||
|
||||
if(flag == 0){
|
||||
errorList.add(household.getHouseholdNum());
|
||||
}
|
||||
|
||||
if(cmd.getRoleIds() != null && !cmd.getRoleIds().isEmpty()) {
|
||||
createHouseholdMapper.createHouseholdHasRole(AuditUtil.create(new CreateHouseholdHasRoleCmd(cmd.getSeq(), cmd.getRoleIds())));
|
||||
@@ -116,7 +125,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
|
||||
}
|
||||
}
|
||||
workbook.close();
|
||||
return new ExcelUploadResultVO(sheet.getLastRowNum()-1 , success);
|
||||
return new ExcelUploadResultVO(sheet.getLastRowNum()-1 , success, errorList);
|
||||
}
|
||||
|
||||
// 셀 값을 문자열로 변환
|
||||
|
||||
@@ -24,4 +24,5 @@ public class ExcelCreateHouseholdVO {
|
||||
private String industryDetail;
|
||||
private Long researcherSeq;
|
||||
private Boolean isPanel;
|
||||
private String memo;
|
||||
}
|
||||
|
||||
@@ -4,10 +4,13 @@ import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
public class ExcelUploadResultVO {
|
||||
private Integer total;
|
||||
private Integer success;
|
||||
private List<String> errorList;
|
||||
}
|
||||
|
||||
@@ -17,27 +17,31 @@ import org.springframework.web.bind.annotation.RequestParam;
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
class GetHouseholdStatusUIController {
|
||||
private final GetHouseholdStatusPortIn getHouseholdStatusPortIn;
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
private final GetHouseholdStatusPortIn getHouseholdStatusPortIn;
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
|
||||
@GetMapping(path = "/households/{seq}")
|
||||
String operate(
|
||||
@PathVariable Long seq,
|
||||
@RequestParam(required = false) String recordMonth,
|
||||
Model model,
|
||||
@ModelAttribute("reqVO") GetHouseholdStatusUIReqVO reqVO) {
|
||||
@GetMapping(path = "/households/{seq}")
|
||||
String operate(
|
||||
@PathVariable Long seq,
|
||||
@RequestParam(required = false) String recordMonth,
|
||||
Model model,
|
||||
@ModelAttribute("reqVO") GetHouseholdStatusUIReqVO reqVO) {
|
||||
|
||||
model.addAttribute("seq", seq);
|
||||
model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
|
||||
model.addAttribute("recordMonth", recordMonth);
|
||||
model.addAttribute("userRole", AdminUtil.getLoginUserRole());
|
||||
model.addAttribute("seq", seq);
|
||||
model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
|
||||
model.addAttribute("recordMonth", recordMonth);
|
||||
model.addAttribute("userRole", AdminUtil.getLoginUserRole());
|
||||
|
||||
model.addAttribute("unitCodes", uiCodeListPortIn.connect("code.record.unit"));
|
||||
model.addAttribute("unitCodes", uiCodeListPortIn.connect("code.record.unit"));
|
||||
model.addAttribute("recordCrop", uiCodeListPortIn.connect("code.record.crop"));
|
||||
model.addAttribute("recordUnit", uiCodeListPortIn.connect("code.record.unit"));
|
||||
model.addAttribute("recordArea", uiCodeListPortIn.connect("code.record.area"));
|
||||
model.addAttribute("recordFarming", uiCodeListPortIn.connect("code.record.farming"));
|
||||
|
||||
// 임가 상세 정보
|
||||
model.addAttribute("householdInfo",
|
||||
getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null));
|
||||
// 임가 상세 정보
|
||||
model.addAttribute("householdInfo",
|
||||
getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null));
|
||||
|
||||
return "households/{seq}";
|
||||
}
|
||||
return "households/{seq}";
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,7 @@ public class GetBankAutoTransferExpenseRecords {
|
||||
private Long id;
|
||||
private String categoryText;
|
||||
private String sourcePurpose;
|
||||
private Integer count;
|
||||
private String count;
|
||||
private String unitText;
|
||||
private Integer price;
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ public class GetBankAutoTransferIncomeRecords {
|
||||
private String categoryText;
|
||||
private String target;
|
||||
private String sourcePurpose;
|
||||
private Integer count;
|
||||
private String count;
|
||||
private String unitText;
|
||||
private Integer price;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.SaveDailyIncomePortOut;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.SaveDailyIncomeCmd;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.GetDailyIncomeCmd;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class SaveDailyIncomeDao implements SaveDailyIncomePortOut {
|
||||
private final SaveDailyIncomeMapper dailyIncomeMapper;
|
||||
|
||||
@Override
|
||||
public GetDailyIncomeDto detail(GetDailyIncomeCmd command) {
|
||||
|
||||
return dailyIncomeMapper.getDailyIncome(command);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void create(GetDailyIncomeCmd findCmd, SaveDailyIncomeCmd command) {
|
||||
Integer existCount = dailyIncomeMapper.getRecordExistCount(findCmd);
|
||||
if (existCount == 0) {
|
||||
dailyIncomeMapper.createDailyIncome(command);
|
||||
|
||||
log.debug("[CreateDailyIncome] command={}", command);
|
||||
} else {
|
||||
dailyIncomeMapper.updateDailyIncome(command);
|
||||
|
||||
log.debug("[UpdateDailyIncome] command={}", command);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.SaveDailyIncomeCmd;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.GetDailyIncomeCmd;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface SaveDailyIncomeMapper {
|
||||
/**
|
||||
* 일계부 수입 데이터 조회
|
||||
*
|
||||
* @param command 검색 조건
|
||||
* @return 수입 데이터
|
||||
*/
|
||||
GetDailyIncomeDto getDailyIncome(GetDailyIncomeCmd command);
|
||||
|
||||
/**
|
||||
* 일계부 수입 데이터 존재 여부
|
||||
*
|
||||
* @param command 검색 조건
|
||||
* @return 중복 개수
|
||||
*/
|
||||
Integer getRecordExistCount(GetDailyIncomeCmd command);
|
||||
|
||||
/**
|
||||
* 일계부 수입 등록
|
||||
*
|
||||
* @param command 등록 데이터
|
||||
*/
|
||||
void createDailyIncome(SaveDailyIncomeCmd command);
|
||||
|
||||
/**
|
||||
* 일계부 수입 수정
|
||||
*
|
||||
* @param command 수정 데이터
|
||||
*/
|
||||
void updateDailyIncome(SaveDailyIncomeCmd command);
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal;
|
||||
|
||||
import app.module.core.config.application.enums.DailyInputType;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class GetDailyIncomeDto {
|
||||
private Long id;
|
||||
private Long dailyRecordSeq;
|
||||
private DailyInputType inputType;
|
||||
private Boolean credit;
|
||||
private String cropCode;
|
||||
private String cropLabel;
|
||||
private String incomeKind;
|
||||
private String sourcePurpose;
|
||||
private String quantity;
|
||||
private String unitCode;
|
||||
private String unitLabel;
|
||||
private String unitSelf;
|
||||
private Long price;
|
||||
private Long estimatedValue;
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web;
|
||||
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.DailyIncomeUIReqVO;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.validator.SaveDailyIncomeValidator;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.SaveDailyIncomePortIn;
|
||||
import app.module.core.config.application.exception.NoRecordDataException;
|
||||
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping(path = "/api/household/daily/income")
|
||||
public class SaveDailyIncomeController {
|
||||
private final DailyRecordPortIn dailyRecordPortIn;
|
||||
private final SaveDailyIncomePortIn dailyIncomePortIn;
|
||||
private final SaveDailyIncomeValidator sailyIncomeValidator;
|
||||
|
||||
/**
|
||||
* 일계부 수입 조회
|
||||
*
|
||||
* @param id 수입 일련번호
|
||||
* @param reqVO 검색 조건
|
||||
*/
|
||||
@GetMapping(path = "/{id}")
|
||||
ResponseEntity<?> detail(@PathVariable("id") String id, @ModelAttribute DailyIncomeUIReqVO reqVO) {
|
||||
|
||||
reqVO.setId(Long.parseLong(id));
|
||||
|
||||
GetDailyIncomeDto detail = dailyIncomePortIn.detail(reqVO);
|
||||
if (detail == null) {
|
||||
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
|
||||
}
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(detail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 일계부 수입 등록 처리
|
||||
*
|
||||
* @param formVO 입력 데이터
|
||||
* @param bindingResult BindingResult
|
||||
*/
|
||||
@PostMapping(path = "/save")
|
||||
ResponseEntity<?> create(@Valid @RequestBody SaveDailyIncomeReqVO formVO, BindingResult bindingResult) {
|
||||
|
||||
sailyIncomeValidator.validate(formVO, bindingResult);
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
|
||||
.body(bindingResult.getFieldErrors());
|
||||
}
|
||||
|
||||
DailyRecordDto dailyRecord = this.vaildGetDailyRecord(formVO.getDailyId());
|
||||
|
||||
formVO.setSearchMonth(dailyRecord.getRecordMonth());
|
||||
formVO.setGroupNo(dailyRecord.getGroupNo());
|
||||
formVO.setDailyId(dailyRecord.getId());
|
||||
log.debug("formVO: {}", formVO);
|
||||
|
||||
dailyIncomePortIn.create(formVO);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(formVO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 일계부 유효성 체크 및 데이터 조회
|
||||
*
|
||||
* @param dailyRecordSeq 항목 일련번호
|
||||
*/
|
||||
private DailyRecordDto vaildGetDailyRecord(Long dailyRecordSeq) {
|
||||
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(dailyRecordSeq);
|
||||
if (dailyRecord == null || dailyRecord.getId() == null) {
|
||||
throw new NoRecordDataException();
|
||||
}
|
||||
|
||||
return dailyRecord;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class DailyIncomeUIReqVO {
|
||||
/**
|
||||
* 검색 월(yyyyMM)
|
||||
*/
|
||||
private String searchMonth;
|
||||
/**
|
||||
* 검색 그룸번호
|
||||
*/
|
||||
private Integer groupNo;
|
||||
/**
|
||||
* 임가 일련번호
|
||||
*/
|
||||
private Long householdSeq;
|
||||
|
||||
/**
|
||||
* 일계부 항목 일련번호
|
||||
*/
|
||||
private Long dailyId;
|
||||
/**
|
||||
* 수입 일련번호
|
||||
*/
|
||||
private Long id;
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model;
|
||||
|
||||
import app.module.core.config.application.enums.DailyInputType;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString(callSuper = true)
|
||||
public class SaveDailyIncomeReqVO extends DailyIncomeUIReqVO {
|
||||
/**
|
||||
* 등록 유형
|
||||
*/
|
||||
private DailyInputType inputType;
|
||||
/**
|
||||
* 외상판매 여부
|
||||
*/
|
||||
private Boolean credit;
|
||||
/**
|
||||
* 재배형태 코드
|
||||
*/
|
||||
private String cropCode;
|
||||
/**
|
||||
* 수입의 종류 직접입력
|
||||
*/
|
||||
@NotBlank(message = "수입 종류를 입력해 주세요.")
|
||||
private String incomeKind;
|
||||
/**
|
||||
* 수입원
|
||||
*/
|
||||
@NotBlank(message = "수입원을 입력해 주세요.")
|
||||
private String sourcePurpose;
|
||||
/**
|
||||
* 수량
|
||||
*/
|
||||
private Double quantity;
|
||||
/**
|
||||
* 단위 코드
|
||||
*/
|
||||
private String unitCode;
|
||||
/**
|
||||
* 단위 직접 입력
|
||||
*/
|
||||
private String unitSelf;
|
||||
/**
|
||||
* 현금
|
||||
*/
|
||||
private Long price;
|
||||
/**
|
||||
* 현물평가액
|
||||
*/
|
||||
private Long estimatedValue;
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.validator;
|
||||
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.apache.tika.utils.StringUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.validation.Errors;
|
||||
import org.springframework.validation.Validator;
|
||||
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class SaveDailyIncomeValidator implements Validator {
|
||||
|
||||
@Override
|
||||
public boolean supports(Class<?> clazz) {
|
||||
return SaveDailyIncomeReqVO.class.equals(clazz);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void validate(Object target, Errors errors) {
|
||||
SaveDailyIncomeReqVO vo = (SaveDailyIncomeReqVO) target;
|
||||
|
||||
if (vo.getQuantity() == null && !StringUtils.isBlank(vo.getUnitCode())) {
|
||||
errors.rejectValue(
|
||||
"quantity", "valid.common.required",
|
||||
"수량을 입력해 주세요.");
|
||||
}
|
||||
|
||||
if (vo.getQuantity() != null && StringUtils.isBlank(vo.getUnitCode())) {
|
||||
errors.rejectValue(
|
||||
"unitCode", "valid.common.required",
|
||||
"단위를 선택해 주세요.");
|
||||
}
|
||||
|
||||
if ("code.record.unit.self".equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) {
|
||||
errors.rejectValue(
|
||||
"unitSelf", "valid.common.required",
|
||||
"단위를 입력해 주세요.");
|
||||
}
|
||||
|
||||
if (vo.getPrice() == null && vo.getEstimatedValue() == null) {
|
||||
errors.rejectValue(
|
||||
"price", "valid.common.required",
|
||||
"현금 또는 현물평가액을 입력해 주세요.");
|
||||
errors.rejectValue(
|
||||
"estimatedValue", "valid.common.required",
|
||||
"현금 또는 현물평가액을 입력해 주세요.");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports;
|
||||
|
||||
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.DailyIncomeUIReqVO;
|
||||
|
||||
public interface SaveDailyIncomePortIn {
|
||||
/**
|
||||
* 일계부 수입 조회
|
||||
*
|
||||
* @param reqVO 검색 조건
|
||||
* @return 수입 상세
|
||||
*/
|
||||
GetDailyIncomeDto detail(DailyIncomeUIReqVO reqVO);
|
||||
|
||||
/**
|
||||
* 일계부 수입 등록
|
||||
*
|
||||
* @param formVO 입력 데이터
|
||||
*/
|
||||
void create(SaveDailyIncomeReqVO formVO);
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports;
|
||||
|
||||
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.SaveDailyIncomeCmd;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.GetDailyIncomeCmd;
|
||||
|
||||
public interface SaveDailyIncomePortOut {
|
||||
/**
|
||||
* 일계부 수입 조회
|
||||
*
|
||||
* @param command 검색 조건
|
||||
* @return 수입 상세
|
||||
*/
|
||||
GetDailyIncomeDto detail(GetDailyIncomeCmd command);
|
||||
|
||||
/**
|
||||
* 일계부 수입 등록
|
||||
*
|
||||
* @param findCmd 검색 조건
|
||||
* @param command 입력 데이터
|
||||
*/
|
||||
void create(GetDailyIncomeCmd findCmd, SaveDailyIncomeCmd command);
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application;
|
||||
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.DailyIncomeUIReqVO;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.SaveDailyIncomePortIn;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.SaveDailyIncomePortOut;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.SaveDailyIncomeCmd;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.GetDailyIncomeCmd;
|
||||
import app.module.core.config.application.util.AuditUtil;
|
||||
import app.module.core.config.constants.DailyRecordConstants;
|
||||
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class SaveDailyIncomeService implements SaveDailyIncomePortIn {
|
||||
private final SaveDailyIncomePortOut portOut;
|
||||
private final DailyRecordPortIn dailyRecordPortIn;
|
||||
|
||||
@Override
|
||||
public GetDailyIncomeDto detail(DailyIncomeUIReqVO reqVO) {
|
||||
GetDailyIncomeCmd findCmd = new GetDailyIncomeCmd(
|
||||
reqVO.getSearchMonth(),
|
||||
reqVO.getGroupNo(),
|
||||
reqVO.getHouseholdSeq(),
|
||||
reqVO.getId());
|
||||
|
||||
return portOut.detail(findCmd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void create(SaveDailyIncomeReqVO formVO) {
|
||||
GetDailyIncomeCmd findCmd = new GetDailyIncomeCmd(
|
||||
formVO.getSearchMonth(),
|
||||
formVO.getGroupNo(),
|
||||
formVO.getHouseholdSeq(),
|
||||
formVO.getId());
|
||||
|
||||
SaveDailyIncomeCmd command = AuditUtil.create(
|
||||
new SaveDailyIncomeCmd(
|
||||
formVO.getId(),
|
||||
formVO.getDailyId(),
|
||||
formVO.getInputType(),
|
||||
DailyRecordConstants.INCOME_CATEGORY,
|
||||
(formVO.getCredit() ? DailyRecordConstants.INCOME_EXPENSE_MARK : null),
|
||||
formVO.getCredit(),
|
||||
formVO.getCropCode(),
|
||||
formVO.getIncomeKind(),
|
||||
formVO.getSourcePurpose(),
|
||||
formVO.getQuantity(),
|
||||
formVO.getUnitCode(),
|
||||
formVO.getUnitSelf(),
|
||||
formVO.getPrice(),
|
||||
formVO.getEstimatedValue()));
|
||||
|
||||
portOut.create(findCmd, command);
|
||||
|
||||
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
public class GetDailyIncomeCmd {
|
||||
/**
|
||||
* 검색 월(yyyyMM)
|
||||
*/
|
||||
private String searchMonth;
|
||||
/**
|
||||
* 검색 그룸번호
|
||||
*/
|
||||
private Integer groupNo;
|
||||
/**
|
||||
* 임가 일련번호
|
||||
*/
|
||||
private Long householdSeq;
|
||||
/**
|
||||
* 수입 일련번호
|
||||
*/
|
||||
private Long id;
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain;
|
||||
|
||||
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||
import app.module.core.config.application.enums.DailyInputType;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@ToString
|
||||
public class SaveDailyIncomeCmd extends AuditCommand {
|
||||
private Long id;
|
||||
private Long dailyRecordSeq;
|
||||
private DailyInputType inputType;
|
||||
/**
|
||||
* 유형
|
||||
*/
|
||||
private String category;
|
||||
/**
|
||||
* 지출 부호
|
||||
*/
|
||||
private String expenseMark;
|
||||
private Boolean credit;
|
||||
private String cropCode;
|
||||
private String incomeKind;
|
||||
private String sourcePurpose;
|
||||
private Double quantity;
|
||||
private String unitCode;
|
||||
private String unitSelf;
|
||||
private Long price;
|
||||
private Long estimatedValue;
|
||||
}
|
||||
@@ -42,6 +42,10 @@ server:
|
||||
mime-types: text/html,text/xml,text/plain,text/css,text/javascript,application/javascript
|
||||
# 압축 적용 최소 응답 크기(바이트)
|
||||
min-response-size: 2048
|
||||
servlet:
|
||||
session:
|
||||
cookie:
|
||||
name: ADMIN_SESSION
|
||||
|
||||
# ==============================================
|
||||
# 관리자 관련 설정
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
<?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.dailyRecord.saveDailyIncome.adapters.persistence.SaveDailyIncomeMapper">
|
||||
|
||||
<select id="getDailyIncome"
|
||||
resultType="app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto">
|
||||
select ds.id, ds.daily_record_seq, ds.input_type, ds.is_credit as credit
|
||||
, 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.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
||||
where ds.is_deleted = false
|
||||
and ds.id = #{id}
|
||||
</select>
|
||||
|
||||
<select id="getRecordExistCount" resultType="int">
|
||||
select count(1)
|
||||
from daily_income ds
|
||||
<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}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<insert id="createDailyIncome" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into daily_income (
|
||||
daily_record_seq, input_type, category, expense_mark
|
||||
, is_credit, crop_code, income_kind, source_purpose
|
||||
, quantity, unit_code, unit_self, price, estimated_value
|
||||
, is_deleted
|
||||
, <include refid="common.fields.CreateUpdateBaseColumns"/>
|
||||
) values (
|
||||
#{dailyRecordSeq}, #{inputType}, #{category}, #{expenseMark}
|
||||
, #{credit}, #{cropCode}, #{incomeKind}, #{sourcePurpose}
|
||||
, #{quantity}, #{unitCode}, #{unitSelf}, #{price}, #{estimatedValue}
|
||||
, false
|
||||
, <include refid="common.fields.CreateUpdateBaseValues"/>
|
||||
)
|
||||
</insert>
|
||||
|
||||
<update id="updateDailyIncome">
|
||||
update daily_income set <include refid="common.fields.UpdateBaseSet"/>
|
||||
, is_credit = #{credit}
|
||||
, expense_mark = #{expenseMark}
|
||||
, crop_code = #{cropCode}
|
||||
, income_kind = #{incomeKind}
|
||||
, source_purpose = #{sourcePurpose}
|
||||
, quantity = #{quantity}
|
||||
, unit_code = #{unitCode}
|
||||
, unit_self = #{unitSelf}
|
||||
, price = #{price}
|
||||
, estimated_value = #{estimatedValue}
|
||||
where is_deleted = false
|
||||
and daily_record_seq = #{dailyRecordSeq}
|
||||
and id = #{id}
|
||||
</update>
|
||||
|
||||
</mapper>
|
||||
@@ -39,17 +39,25 @@
|
||||
</select>
|
||||
|
||||
<select id="countAll" parameterType="app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO" resultType="long">
|
||||
select COUNT(a.seq)
|
||||
from admin a
|
||||
join admin_has_role ahr ON a.seq = ahr.admin_seq
|
||||
where
|
||||
ahr.role_id = 'ROLE_RESEARCHER' and ahr.is_deleted = false
|
||||
select COUNT(DISTINCT a.seq)
|
||||
from admin a
|
||||
join admin_has_role ahr ON a.seq = ahr.admin_seq AND ahr.is_deleted = false
|
||||
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'
|
||||
|
||||
<if test="searchField == '' and searchValue != null and searchValue != ''">
|
||||
and (a.name LIKE CONCAT('%', #{searchValue}, '%') OR a.phone LIKE CONCAT('%', #{searchValue}, '%'))
|
||||
</if>
|
||||
<if test="searchField == 'name' and searchValue != null and searchValue != ''">
|
||||
and a.name LIKE CONCAT('%', #{searchValue}, '%')
|
||||
</if>
|
||||
<if test="searchField == 'phone' and searchValue != null and searchValue != ''">
|
||||
and a.phone LIKE CONCAT('%', #{searchValue}, '%')
|
||||
</if>
|
||||
<if test="searchArea != null and searchArea != ''">
|
||||
and a.region_main_code = #{searchArea}
|
||||
</if>
|
||||
<if test="searchAccountDisabled != null and searchAccountDisabled != ''">
|
||||
and a.account_disabled = #{searchAccountDisabled}
|
||||
</if>
|
||||
|
||||
@@ -25,47 +25,17 @@ var ajaxUtil = {
|
||||
},
|
||||
|
||||
_alertError : function (code) {
|
||||
var message = ajaxUtil._msg500;
|
||||
if (code == '400') {
|
||||
let message = ajaxUtil._msg500;
|
||||
if (code === '400') {
|
||||
message = ajaxUtil._msg400;
|
||||
}
|
||||
|
||||
ajaxUtil._alert(message, '오류 안내');
|
||||
},
|
||||
_alert : function (alertMessage, alertTitle, afterEvent) {
|
||||
etUI.dialog.alert({
|
||||
title: alertTitle,
|
||||
message: alertMessage,
|
||||
type: "alert",
|
||||
callback: function() {
|
||||
console.log("alert callback");
|
||||
},
|
||||
});
|
||||
},
|
||||
_alertId : function (alertId, afterEvent) {
|
||||
ajaxUtil._alertMethod({
|
||||
id: alertId,
|
||||
title: null,
|
||||
message: null,
|
||||
after: afterEvent !== undefined ? (afterEvent ? 'Y' : 'N') : 'N',
|
||||
});
|
||||
},
|
||||
_alertMethod : function (jsonObj) {
|
||||
ajaxUtil._ajaxSyncNoWaiting(
|
||||
'/m/common/alert',
|
||||
jsonObj,
|
||||
function(rstData) {
|
||||
var $wrap = $('#bindWrap');
|
||||
if ($wrap.find('.ui-popup-common-alert').length != 0) {
|
||||
$wrap.find('.ui-popup-common-alert').remove();
|
||||
}
|
||||
_alert : function (alertMessage, alertTitle) {
|
||||
console.warn(alertTitle)
|
||||
|
||||
$wrap.append(rstData);
|
||||
uxgFn.popup.bind('.ui-popup-common-alert').open();
|
||||
},
|
||||
function(code, rstData) {
|
||||
kri.logger.error('Do nothing. code: '+ code, rstData);
|
||||
},
|
||||
'html');
|
||||
alert(alertMessage);
|
||||
},
|
||||
|
||||
|
||||
@@ -130,22 +100,22 @@ var ajaxUtil = {
|
||||
contentType : 'application/json; charset=UTF-8',
|
||||
async: async,
|
||||
statusCode : {
|
||||
400:function(){
|
||||
ajaxUtil._alertError(ajaxUtil.$400);
|
||||
},
|
||||
404:function(rstData){
|
||||
ajaxUtil._hideWaiting();
|
||||
if (typeof errorCallback !== 'undefined') {
|
||||
errorCallback(ajaxUtil.$404, rstData);
|
||||
} else {
|
||||
// kri.menu.main();
|
||||
kri.logger.error('statusCode: 404');
|
||||
console.error('statusCode: 404');
|
||||
}
|
||||
},
|
||||
401:function(){
|
||||
// kri.menu.main();
|
||||
kri.logger.error('statusCode: 401');
|
||||
console.error('statusCode: 401');
|
||||
},
|
||||
403:function(rstData){
|
||||
// kri.menu.main();
|
||||
kri.logger.error('statusCode: 403');
|
||||
console.error('statusCode: 403');
|
||||
},
|
||||
422:function(rstData, status) {
|
||||
console.log(rstData);
|
||||
@@ -195,13 +165,15 @@ var ajaxUtil = {
|
||||
},
|
||||
success : function(rstData, status) {
|
||||
ajaxUtil._hideWaiting();
|
||||
console.log('succ', rstData)
|
||||
if (typeof successCallback !== 'undefined') {
|
||||
successCallback(rstData, status);
|
||||
}
|
||||
},
|
||||
error : function(rstData) {
|
||||
ajaxUtil._hideWaiting();
|
||||
if (!(rstData.status == 500 || rstData.status == 422)) {
|
||||
console.log('error')
|
||||
if (!(rstData.status == 500 || rstData.status == 422 || rstData.status == 400)) {
|
||||
if (typeof errorCallback !== 'undefined') {
|
||||
errorCallback(rstData.status, rstData);
|
||||
} else {
|
||||
|
||||
@@ -0,0 +1,265 @@
|
||||
<!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="reqIncomeForm" data-modal-id=".modal-daily-income">
|
||||
<input type="hidden" name="householdSeq" th:value="${seq}">
|
||||
<input type="hidden" name="searchMonth">
|
||||
<input type="hidden" name="groupNo">
|
||||
<input type="hidden" name="id">
|
||||
<input type="hidden" name="dailyId">
|
||||
|
||||
<div class="component-modal mypage-wrap modal01 modal-daily-income" 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">
|
||||
<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 class="radio-group">
|
||||
<div class="component-input">
|
||||
<label class="radio-inner">
|
||||
<input type="radio" id="isCredit_N" name="credit" value="false" checked>
|
||||
<span class="radio-item">
|
||||
<span class="radio-txt">N</span>
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="component-input">
|
||||
<label class="radio-inner">
|
||||
<input type="radio" id="isCredit_Y" name="credit" value="true">
|
||||
<span class="radio-item">
|
||||
<span class="radio-txt">Y</span>
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
<th>재배형태</th>
|
||||
<td>
|
||||
<div class="component-select">
|
||||
<select class="select-list" name="cropCode" required>
|
||||
<option value="">선택</option>
|
||||
<option th:each="item : ${recordCrop}"
|
||||
th:value="${item.id}"
|
||||
th:text="${item.codeText}">
|
||||
</select>
|
||||
</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="incomeKind" name="incomeKind" maxlength="30">
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<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="sourcePurpose" name="sourcePurpose" maxlength="30">
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th>수량</th>
|
||||
<td>
|
||||
<div class="component-input">
|
||||
<div class="input-field">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity" min="1" max="9999999999"
|
||||
maxlength="10" oninput="limitMaxLength(this);">
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
<th>단위</th>
|
||||
<td colspan="2">
|
||||
<div class="d-flex">
|
||||
<div class="component-select">
|
||||
<select class="select-list" name="unitCode" onchange="selectedUnit(this);" required>
|
||||
<option value="">선택</option>
|
||||
<option th:each="item : ${recordUnit}"
|
||||
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="unitSelf" name="unitSelf" maxlength="30" disabled>
|
||||
</div>
|
||||
</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="number" inputmode="numeric" pattern="[0-9]*" id="price" name="price" step="0" min="1" max="9999999999"
|
||||
maxlength="10" oninput="limitMaxLength(this); priceDisabled(this, this.form.estimatedValue)">
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<th>현물평가액(원)<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
|
||||
<td>
|
||||
<div class="component-input">
|
||||
<div class="input-field">
|
||||
<input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue" step="0" min="1" max="9999999999"
|
||||
maxlength="10" oninput="limitMaxLength(this); priceDisabled(this, this.form.price)">
|
||||
</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" onclick="saveDailyIncome();">
|
||||
<span class="btn-txt">등록</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button type="button" class="modal-close"></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<script th:inline="javascript">
|
||||
// form 초기화
|
||||
const resetIncomeForm = () => {
|
||||
const form = document.reqIncomeForm;
|
||||
if (!form) return;
|
||||
|
||||
form.cropCode.value = '';
|
||||
form.incomeKind.value = '';
|
||||
form.sourcePurpose.value = '';
|
||||
form.quantity.value = '';
|
||||
form.unitCode.value = '';
|
||||
form.unitSelf.value = '';
|
||||
form.price.value = '';
|
||||
form.estimatedValue.value = '';
|
||||
|
||||
document.getElementById('isCredit_N').checked = true;
|
||||
}
|
||||
|
||||
// 일계부 상세 값 set
|
||||
const setIncomeFormData = (data) => {
|
||||
const form = document.reqIncomeForm;
|
||||
if (!form) return;
|
||||
|
||||
// 폼에 값 세팅
|
||||
form.cropCode.value = data.cropCode || '';
|
||||
form.incomeKind.value = data.incomeKind || '';
|
||||
form.sourcePurpose.value = data.sourcePurpose || '';
|
||||
form.quantity.value = data.quantity || '';
|
||||
form.unitCode.value = data.unitCode || '';
|
||||
form.unitSelf.value = data.unitSelf || '';
|
||||
form.price.value = data.price || '';
|
||||
form.estimatedValue.value = data.estimatedValue || '';
|
||||
|
||||
// 기타 UI 처리
|
||||
selectedUnit(form.unitCode);
|
||||
if (form.price.value !== '') {
|
||||
priceDisabled(form.price, form.estimatedValue)
|
||||
} else {
|
||||
priceDisabled(form.estimatedValue, form.price)
|
||||
}
|
||||
|
||||
// 라디오 버튼 처리
|
||||
document.getElementById('isCredit_Y').checked = data.credit === true;
|
||||
document.getElementById('isCredit_N').checked = data.credit === false;
|
||||
}
|
||||
</script>
|
||||
|
||||
<script th:inline="javascript">
|
||||
// 일계부 등록 모달창 띄우기
|
||||
const showDailyIncomeModal = (id) => {
|
||||
const mf = document.reqIncomeForm;
|
||||
mf.searchMonth.value = document.reqForm.recordMonth.value;
|
||||
mf.groupNo.value = document.reqForm.groupNo.value;
|
||||
mf.dailyId.value = document.reqForm.dailyId.value;
|
||||
mf.id.value = (id === undefined) ? '' : id;
|
||||
|
||||
resetIncomeForm();
|
||||
|
||||
if (id !== null && id !== undefined) {
|
||||
const obj = $(f).serializeObject();
|
||||
obj.id = mf.id.value;
|
||||
obj.searchMonth = obj.recordMonth;
|
||||
|
||||
ajaxUtil._ajaxAsyncMethod(
|
||||
`/api/household/daily/income/${id}`,
|
||||
obj,
|
||||
function (rstData, status) {
|
||||
setIncomeFormData(rstData);
|
||||
|
||||
document.querySelector($(mf).data('modalId')).ui.open();
|
||||
},
|
||||
function () {
|
||||
console.error('Do nothing error.')
|
||||
},
|
||||
'get'
|
||||
);
|
||||
|
||||
} else {
|
||||
document.querySelector($(mf).data('modalId')).ui.open();
|
||||
}
|
||||
}
|
||||
|
||||
const saveDailyIncome = () => {
|
||||
const mf = document.reqIncomeForm;
|
||||
let obj = $(mf).serializeObject();
|
||||
obj.inputType = 'SELF';
|
||||
obj.id = (obj.id === '' ? '0' : obj.id);
|
||||
|
||||
ajaxUtil._ajaxAsyncNoWaiting(
|
||||
'/api/household/daily/income/save',
|
||||
obj,
|
||||
function () {
|
||||
alert('등록이 완료되었습니다.');
|
||||
|
||||
document.querySelector($(mf).data('modalId')).ui.close();
|
||||
|
||||
getDailyRecordsView(f.dailyId.value, f.groupNo.value, f.dayGroupText.value);
|
||||
},
|
||||
function (code, rstData) {
|
||||
console.error('Do nothing. code: '+ code, rstData);
|
||||
},
|
||||
);
|
||||
}
|
||||
</script>
|
||||
</div>
|
||||
</html>
|
||||
@@ -508,7 +508,7 @@
|
||||
</td>
|
||||
<td>${item.isCredit ? "Y" : "N"}</td> <!-- 외상판매 -->
|
||||
<td>${ifNullHyphen(item.cropText)}</td><!-- 재배형태 -->
|
||||
<td class="underline">${ifNullHyphen(item.incomeKind)}</td><!-- 수입의 종류 -->
|
||||
<td class="underline"><a href="javascript:void(0);" onclick="showDailyIncomeModal(${item.id});">${ifNullHyphen(item.incomeKind)}</a></td> <!-- 수입의 종류 -->
|
||||
<td>${ifNullHyphen(item.sourcePurpose)}</td><!-- 수입원 -->
|
||||
<td class="align-right">${formatNumberWithComma(item.quantity)}</td><!-- 수량 -->
|
||||
<td>${ifNullHyphen(item.unitText)}</td><!-- 단위 -->
|
||||
@@ -806,9 +806,13 @@
|
||||
const saveDaily = (el) => {
|
||||
const currentStep = $(el).data('step');
|
||||
const currentModalId = $(el).data('modalId');
|
||||
console.log('removeDaily', currentStep, currentModalId);
|
||||
console.log('saveDaily', currentStep, currentModalId);
|
||||
|
||||
alert('TODO : 추가')
|
||||
if (currentStep === 'INCOME') {
|
||||
showDailyIncomeModal();
|
||||
} else {
|
||||
alert('TODO : 추가');
|
||||
}
|
||||
}
|
||||
|
||||
// 일계부 삭제 처리
|
||||
|
||||
@@ -175,6 +175,9 @@
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<!-- 일계부 모달 -->
|
||||
<th:block th:replace="households/modal/modal-daily-income :: modalFragment"/>
|
||||
|
||||
<!-- 조사원 매핑 모달 -->
|
||||
<th:block th:replace="common/modal-researcher-mapping :: modalFragment"/>
|
||||
|
||||
@@ -321,6 +324,22 @@
|
||||
unitArea.classList.add('input-disabled');
|
||||
}
|
||||
}
|
||||
|
||||
// 금액 1개 입력시 다른 금액 input disable
|
||||
const priceDisabled = (el, disableEl) => {
|
||||
const wrap = disableEl.closest('td');
|
||||
const disableArea = wrap.querySelector('.component-input');
|
||||
const disableInput = wrap.querySelector('input');
|
||||
|
||||
if (el.value === '') {
|
||||
disableInput.disabled = false;
|
||||
disableArea.classList.remove('input-disabled');
|
||||
} else {
|
||||
disableInput.disabled = true;
|
||||
disableInput.value = '';
|
||||
disableArea.classList.add('input-disabled');
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</section>
|
||||
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
package app.module.core.config.application.enums;
|
||||
|
||||
public enum DailyInputType {
|
||||
/**
|
||||
* 직접 입력
|
||||
*/
|
||||
SELF,
|
||||
/**
|
||||
* 영수증 입력
|
||||
*/
|
||||
OCR,
|
||||
;
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package app.module.core.config.constants;
|
||||
|
||||
public class CommonConstants {
|
||||
private CommonConstants() {
|
||||
throw new IllegalAccessError("어플리케이션에서 공통으로 사용되는 상수 클래스로 생성자를 사용할 수 없습니다.");
|
||||
}
|
||||
|
||||
/**
|
||||
* 단위의 직접입력 코드
|
||||
*/
|
||||
public static final String UNIT_CODE_SELF = "code.record.unit.self";
|
||||
|
||||
/**
|
||||
* 작업 면적의 직접입력 코드
|
||||
*/
|
||||
public static final String AREA_CODE_OTHER = "code.record.area.self";
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package app.module.core.config.constants;
|
||||
|
||||
public class DailyRecordConstants {
|
||||
private DailyRecordConstants() {
|
||||
throw new IllegalAccessError("어플리케이션에서 일계부에서 사용되는 상수 클래스로 생성자를 사용할 수 없습니다.");
|
||||
}
|
||||
|
||||
/**
|
||||
* 수입의 유형
|
||||
* [정책] 1 고정
|
||||
*/
|
||||
public static final String INCOME_CATEGORY = "1";
|
||||
|
||||
/**
|
||||
* 수입의 지출부호
|
||||
* [정책] 외상판매 Y 일 경우 지출부호 91206 적재
|
||||
*/
|
||||
public static final String INCOME_EXPENSE_MARK = "91206";
|
||||
}
|
||||
@@ -76,6 +76,8 @@ public class DailyRecordDao implements DailyRecordPortOut {
|
||||
)
|
||||
);
|
||||
|
||||
log.debug("[updateByStatus] command: {}", command);
|
||||
|
||||
if ("ALL".equals(targetType)) {
|
||||
// 전체 입력상태 변경
|
||||
String allStatus = this.getUpdateAllStatus(recordMonth, dayGroupNo, householdSeq);
|
||||
@@ -119,10 +121,9 @@ public class DailyRecordDao implements DailyRecordPortOut {
|
||||
);
|
||||
|
||||
dailyRecordMapper.updateDailyRecordStatus(command);
|
||||
|
||||
} else {
|
||||
log.debug("[updateByAllStatus] do nothing. findCmd: {}");
|
||||
}
|
||||
|
||||
log.debug("[updateByAllStatus] allStatus: {}", allStatus);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -134,7 +135,7 @@ public class DailyRecordDao implements DailyRecordPortOut {
|
||||
* @return 변경할 전체 입력상태
|
||||
*/
|
||||
private String getUpdateAllStatus(String searchMonth, Integer dayGroupNo, Long householdSeq) {
|
||||
GetDailyRecordCmd findCmd = new GetDailyRecordCmd(searchMonth, dayGroupNo, householdSeq);
|
||||
GetDailyRecordCmd findCmd = new GetDailyRecordCmd(searchMonth, dayGroupNo, householdSeq, null);
|
||||
|
||||
DailyRecordStatusDto statusDetail = null;
|
||||
List<DailyRecordStatusDto> statusList = dailyRecordMapper.getDailyRecordStatus(findCmd);
|
||||
|
||||
@@ -24,6 +24,11 @@ public class DailyUIReqVO {
|
||||
this.householdSeq = householdSeq;
|
||||
}
|
||||
|
||||
public DailyUIReqVO(String searchMonth, Integer groupNo) {
|
||||
this.searchMonth = searchMonth;
|
||||
this.groupNo = groupNo;
|
||||
}
|
||||
|
||||
/**
|
||||
* 검색 월(yyyyMM)
|
||||
*/
|
||||
|
||||
@@ -15,6 +15,13 @@ public interface DailyRecordPortIn {
|
||||
*/
|
||||
DailyRecordDto detail(String recordMonth, Integer dayGroupNo, Long householdSeq);
|
||||
|
||||
/**
|
||||
* 일계부 항목 조회
|
||||
*
|
||||
* @param dailyRecordSeq
|
||||
*/
|
||||
DailyRecordDto detail(Long dailyRecordSeq);
|
||||
|
||||
/**
|
||||
* 일계부 항목 등록
|
||||
*
|
||||
|
||||
@@ -53,6 +53,36 @@ public class DailyRecordService implements DailyRecordPortIn {
|
||||
return dailyRecord;
|
||||
}
|
||||
|
||||
@Override
|
||||
public DailyRecordDto detail(Long dailyRecordSeq) {
|
||||
DailyRecordDto dailyRecord = portOut.detail(new GetDailyRecordCmd(dailyRecordSeq));
|
||||
|
||||
if (dailyRecord != null) {
|
||||
List<DailySort> targetList = new ArrayList<>();
|
||||
if (this.isTarget(dailyRecord.getIncomeStatus())) {
|
||||
targetList.add(DailySort.INCOME);
|
||||
}
|
||||
if (this.isTarget(dailyRecord.getWorkStatus())) {
|
||||
targetList.add(DailySort.WORK);
|
||||
}
|
||||
if (this.isTarget(dailyRecord.getExpenseStatus())) {
|
||||
targetList.add(DailySort.EXPENSE);
|
||||
}
|
||||
if (this.isTarget(dailyRecord.getPowerStatus())) {
|
||||
targetList.add(DailySort.POWER);
|
||||
}
|
||||
if (this.isTarget(dailyRecord.getForestryStatus())) {
|
||||
targetList.add(DailySort.FORESTRY);
|
||||
}
|
||||
if (this.isTarget(dailyRecord.getFarmingStatus())) {
|
||||
targetList.add(DailySort.FARMING);
|
||||
}
|
||||
dailyRecord.setTargetList(targetList);
|
||||
}
|
||||
|
||||
return dailyRecord;
|
||||
}
|
||||
|
||||
/**
|
||||
* 데이터 등록 대상 여부
|
||||
*
|
||||
@@ -68,7 +98,8 @@ public class DailyRecordService implements DailyRecordPortIn {
|
||||
GetDailyRecordCmd findCmd = new GetDailyRecordCmd(
|
||||
formVO.getRecordMonth(),
|
||||
formVO.getDayGroupNo(),
|
||||
formVO.getHouseholdSeq());
|
||||
formVO.getHouseholdSeq(),
|
||||
null);
|
||||
|
||||
CreateDailyRecordCmd command = AuditUtil.create(
|
||||
new CreateDailyRecordCmd(
|
||||
|
||||
@@ -8,6 +8,16 @@ import lombok.Setter;
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
public class GetDailyRecordCmd {
|
||||
public GetDailyRecordCmd(String searchMonth, Integer groupNo, Long householdSeq) {
|
||||
this.searchMonth = searchMonth;
|
||||
this.groupNo = groupNo;
|
||||
this.householdSeq = householdSeq;
|
||||
}
|
||||
|
||||
public GetDailyRecordCmd(Long dailyRecordSeq) {
|
||||
this.dailyRecordSeq = dailyRecordSeq;
|
||||
}
|
||||
|
||||
/**
|
||||
* 검색 월(yyyyMM)
|
||||
*/
|
||||
@@ -20,4 +30,8 @@ public class GetDailyRecordCmd {
|
||||
* 임가 일련번호
|
||||
*/
|
||||
private Long householdSeq;
|
||||
/**
|
||||
* 일계부 항목 일련번호
|
||||
*/
|
||||
private Long dailyRecordSeq;
|
||||
}
|
||||
|
||||
@@ -8,12 +8,20 @@
|
||||
, 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
|
||||
from daily_day_group ddg
|
||||
<if test="dailyRecordSeq == null">
|
||||
left join
|
||||
daily_record dr on dr.day_group_no = ddg.group_no and dr.is_deleted = false
|
||||
and dr.record_month = #{searchMonth}
|
||||
and dr.household_seq = #{householdSeq}
|
||||
where ddg.is_deleted = false
|
||||
and ddg.group_no = #{groupNo}
|
||||
</if>
|
||||
<if test="dailyRecordSeq != null">
|
||||
inner join
|
||||
daily_record dr on dr.day_group_no = ddg.group_no and dr.is_deleted = false
|
||||
and dr.id = #{dailyRecordSeq}
|
||||
where ddg.is_deleted = false
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<select id="getDailyRecordStatus"
|
||||
|
||||
@@ -277,7 +277,7 @@ CREATE TABLE household (
|
||||
owner_name varchar(255) NOT NULL, -- 경영주 이름
|
||||
owner_age integer NOT NULL, -- 경영주 나이
|
||||
tel varchar(20), -- 유선 전화번호
|
||||
phone varchar(255) NOT NULL, -- 휴대폰 번호
|
||||
phone varchar(255), -- 휴대폰 번호
|
||||
password varchar(255) NOT NULL, -- 비밀번호
|
||||
region_main_code varchar(255), -- 실사(공통코드)
|
||||
region_sub_code varchar(255), -- 지역(공통코드)
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package app.module.front.usecase.daily.income.ports.application;
|
||||
|
||||
import app.module.core.config.constants.DailyRecordConstants;
|
||||
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;
|
||||
@@ -101,8 +102,8 @@ public class DailyIncomeService implements DailyIncomePortIn {
|
||||
formVO.getId(),
|
||||
formVO.getDailyRecordSeq(),
|
||||
formVO.getInputType(),
|
||||
"1", // [정책] 1 고정
|
||||
(formVO.getCredit() ? "91206" : null), // [정책] 외상판매 Y 일 경우 지출부호 91206 적재
|
||||
DailyRecordConstants.INCOME_CATEGORY,
|
||||
(formVO.getCredit() ? DailyRecordConstants.INCOME_EXPENSE_MARK : null),
|
||||
formVO.getCredit(),
|
||||
formVO.getCropCode(),
|
||||
formVO.getIncomeKind(),
|
||||
|
||||
@@ -14,7 +14,7 @@ public class UpdateUserFrontCmd extends AuditCommand {
|
||||
private Integer ownerAge;
|
||||
private String tel;
|
||||
private String phone;
|
||||
private String regionMainCode;
|
||||
private String regionSubCode;
|
||||
private String regionDetailCode;
|
||||
private String address;
|
||||
}
|
||||
|
||||
@@ -42,8 +42,8 @@ class UpdateUserController {
|
||||
reqVO.getOwnerAge(),
|
||||
reqVO.getTel1() + '-'+ reqVO.getTel2() + '-' + reqVO.getTel3(),
|
||||
reqVO.getPhone1() + '-'+ reqVO.getPhone2() + '-' + reqVO.getPhone3(),
|
||||
reqVO.getRegionMainCode(),
|
||||
reqVO.getRegionSubCode(),
|
||||
reqVO.getRegionDetailCode(),
|
||||
reqVO.getAddress()
|
||||
));
|
||||
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
package app.module.front.usecase.info.userUI.updateUserUI.adapters.web;
|
||||
|
||||
import app.module.core.config.application.enums.UiCodeType;
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||
import app.module.core.usecase.uicode.toptier.ports.UICodeTopTierPortIn;
|
||||
import app.module.front.usecase.info.userFront.getUserFront.ports.GetUserFrontPortIn;
|
||||
import app.module.front.usecase.info.userFront.getUserFront.ports.application.domain.GetUserFrontCmd;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
@@ -14,12 +13,9 @@ import org.springframework.web.bind.annotation.GetMapping;
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
class UpdateUserUIController {
|
||||
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
|
||||
private final UICodeTopTierPortIn uiCodeTopTierPortIn;
|
||||
private final GetUserFrontPortIn getUserPortIn;
|
||||
|
||||
|
||||
@GetMapping(path = "/info/user")
|
||||
String operate(Model model, HttpServletRequest request) {
|
||||
|
||||
@@ -28,9 +24,8 @@ class UpdateUserUIController {
|
||||
return "redirect:/"; // 요청 처리 중단
|
||||
}
|
||||
|
||||
|
||||
model.addAttribute("regionMainList",uiCodeListPortIn.connect(UiCodeType.REGION_MAIN.getCode()));
|
||||
model.addAttribute("regionSubList",uiCodeListPortIn.connect(UiCodeType.REGION_SUB.getCode()));
|
||||
// 지역 + 세부지역 공통코드
|
||||
model.addAttribute("regionSubList", uiCodeTopTierPortIn.connect("code.region.sub"));
|
||||
model.addAttribute("userInfo",
|
||||
getUserPortIn.operate(new GetUserFrontCmd(CommonUtil.getLoginUsername())).orElseThrow());
|
||||
|
||||
|
||||
@@ -38,12 +38,12 @@ public class UpdateUserReqVO {
|
||||
private String phone3;
|
||||
|
||||
@NotBlank(message = "지역을 선택해주세요.")//"시/도는 필수 항목입니다.")
|
||||
@Pattern(regexp = "^code\\.region\\.main\\.\\d+$", message = "지역을 선택해주세요.")//"시/도 형식이 올바르지 않습니다.")
|
||||
private String regionMainCode;
|
||||
@Pattern(regexp = "^code\\.region\\.sub\\.\\d+$", message = "지역을 선택해주세요.")//"시/도 형식이 올바르지 않습니다.")
|
||||
private String regionSubCode;
|
||||
|
||||
@NotBlank(message = "세부 지역을 선택해주세요.")//"시/군/구는 필수 항목입니다.")
|
||||
@Pattern(regexp = "^code\\.region\\.sub\\.\\d+$", message = "세부 지역을 선택해주세요.")//"시/군/구 형식이 올바르지 않습니다.")
|
||||
private String regionSubCode;
|
||||
@Pattern(regexp = "^code\\.region\\.detail\\.\\d+$", message = "세부 지역을 선택해주세요.")//"시/군/구 형식이 올바르지 않습니다.")
|
||||
private String regionDetailCode;
|
||||
|
||||
@NotBlank(message = "전체 주소를 입력해주세요.")//"주소는 필수 항목입니다.")
|
||||
@Size(max = 255, message = "전체 주소를 입력해주세요.")//"주소는 255자 이하여야 합니다.")
|
||||
|
||||
@@ -91,4 +91,12 @@ logging:
|
||||
hibernate:
|
||||
orm:
|
||||
jdbc:
|
||||
bind: trace # Hibernate SQL 파라미터 바인딩 로깅
|
||||
bind: trace # Hibernate SQL 파라미터 바인딩 로깅
|
||||
# ==============================================
|
||||
# 서버 압축 설정
|
||||
# ==============================================
|
||||
server:
|
||||
servlet:
|
||||
session:
|
||||
cookie:
|
||||
name: FRONT_SESSION
|
||||
@@ -11,7 +11,7 @@
|
||||
<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}
|
||||
and ds.id = #{id}
|
||||
</if>
|
||||
order by
|
||||
ds.id desc
|
||||
@@ -23,7 +23,7 @@
|
||||
<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}
|
||||
and ds.id = #{id}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<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}
|
||||
and ds.id = #{id}
|
||||
</if>
|
||||
order by
|
||||
ds.id desc
|
||||
@@ -23,7 +23,7 @@
|
||||
<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}
|
||||
and ds.id = #{id}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<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}
|
||||
and ds.id = #{id}
|
||||
</if>
|
||||
order by
|
||||
ds.id desc
|
||||
@@ -23,7 +23,7 @@
|
||||
<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}
|
||||
and ds.id = #{id}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<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}
|
||||
and ds.id = #{id}
|
||||
</if>
|
||||
order by
|
||||
ds.id desc
|
||||
@@ -23,7 +23,7 @@
|
||||
<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}
|
||||
and ds.id = #{id}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<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}
|
||||
and ds.id = #{id}
|
||||
</if>
|
||||
order by
|
||||
ds.id desc
|
||||
@@ -22,7 +22,7 @@
|
||||
<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}
|
||||
and ds.id = #{id}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
<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}
|
||||
and ds.id = #{id}
|
||||
</if>
|
||||
order by
|
||||
ds.id desc
|
||||
@@ -26,7 +26,7 @@
|
||||
<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}
|
||||
and ds.id = #{id}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
owner_age = #{ownerAge},
|
||||
tel = #{tel},
|
||||
phone = #{phone},
|
||||
region_main_code = #{regionMainCode},
|
||||
region_sub_code = #{regionSubCode},
|
||||
region_detail_code = #{regionDetailCode},
|
||||
address = #{address},
|
||||
<include refid="common.fields.UpdateBaseSet" />
|
||||
WHERE seq = ${seq}
|
||||
|
||||
@@ -258,4 +258,93 @@ $(function() {
|
||||
$el.val($el.val().replace('.', ''));
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
/**
|
||||
* 공통코드 기반의 2단계 셀렉트박스(부모/자식) UI를 구성하는 함수
|
||||
*
|
||||
* @param {Object} codeList - 공통코드 리스트 객체
|
||||
* @param {string} parentSelector - 부모 셀렉트박스 셀렉터 (ex. '#regionSubCode')
|
||||
* @param {string} childSelector - 자식 셀렉트박스 셀렉터 (ex. '#regionDetailCode')
|
||||
* @param {string} selectedParentCode - 초기 선택할 부모 코드값 (ex. 'code.region.sub.31')
|
||||
* @param {string} selectedChildCode - 초기 선택할 자식 코드값 (ex. 'code.region.detail.9')
|
||||
*/
|
||||
kri.form.setSelectBoxUiCode = function({
|
||||
codeList,
|
||||
parentSelector,
|
||||
childSelector,
|
||||
selectedParentCode = '',
|
||||
selectedChildCode = ''
|
||||
}) {
|
||||
const $parent = $(parentSelector);
|
||||
const $child = $(childSelector);
|
||||
|
||||
if (!codeList?.nodes || !$parent.length || !$child.length) return;
|
||||
|
||||
const renderOptions = ($el, list, selected, inputSelector) => {
|
||||
let html = '';
|
||||
list.forEach(item => {
|
||||
const isCurrent = item.id === selected ? 'current' : '';
|
||||
html += `<li class="option ${isCurrent}" data-value="${item.id}">${item.codeText}</li>`;
|
||||
});
|
||||
$el.html(html);
|
||||
|
||||
// 항목 클릭 시 hidden input에 값 반영
|
||||
$el.find('li.option').off('click').on('click', function () {
|
||||
const value = $(this).data('value');
|
||||
const text = $(this).text();
|
||||
|
||||
// 표시 텍스트 업데이트
|
||||
$el.closest('.component-select').find('.select-txt').text(text);
|
||||
|
||||
// 선택 클래스 처리
|
||||
$el.find('li.option').removeClass('current');
|
||||
$(this).addClass('current');
|
||||
|
||||
// hidden input 값 반영
|
||||
$el.closest('.component-select').find('input[data-type="select"]').val(value).trigger('change');
|
||||
});
|
||||
};
|
||||
|
||||
let childSelectUI = null;
|
||||
const loadChildren = (parentId, selectedChild = '') => {
|
||||
if (!parentId) return;
|
||||
|
||||
const $childEl = document.querySelector(childSelector);
|
||||
if($childEl.ui){
|
||||
$childEl.ui.core.destroy();
|
||||
}
|
||||
|
||||
const parent = codeList.nodes.find(n => n.id === parentId);
|
||||
if (!parent?.nodes) return;
|
||||
|
||||
const $childList = $child.find('ul');
|
||||
renderOptions($childList, parent.nodes, selectedChild);
|
||||
|
||||
childSelectUI = etUI.components.SelectBox();
|
||||
childSelectUI.core.init($childEl, {})
|
||||
};
|
||||
|
||||
// 초기 렌더링
|
||||
const $parentList = $parent.find('ul');
|
||||
renderOptions($parentList, codeList.nodes, selectedParentCode);
|
||||
|
||||
const $parentEl = document.querySelector(parentSelector);
|
||||
const parentSelectUI = new etUI.components.SelectBox();
|
||||
parentSelectUI.core.init($parentEl, {});
|
||||
|
||||
if (selectedParentCode) {
|
||||
loadChildren(selectedParentCode, selectedChildCode);
|
||||
}
|
||||
|
||||
// 부모 셀렉션 변경 시 자식 재로드
|
||||
$parent.find('ul').on('click', 'li.option', function () {
|
||||
const newParentCode = $(this).data('value');
|
||||
loadChildren(newParentCode);
|
||||
});
|
||||
|
||||
return {
|
||||
getParentValue: () => parentSelectUI.getValue(),
|
||||
getChildValue: () => childSelectUI?.getValue() ?? ''
|
||||
};
|
||||
}
|
||||
@@ -48,7 +48,7 @@
|
||||
|
||||
<div id="tel1Id" class="component-select bottom-sheet"
|
||||
th:data-props-default="${userInfo.tel1}" data-props-type="bottomSheet">
|
||||
<input type="hidden" th:field="*{tel1}" data-type="select">
|
||||
<input type="hidden" name="tel1" th:field="*{tel1}" data-type="select">
|
||||
<button type="button" class="select-box">
|
||||
<span class="select-txt"></span>
|
||||
</button>
|
||||
@@ -130,15 +130,15 @@
|
||||
<div class="select-group">
|
||||
<div class="select-label">
|
||||
<p class="label-txt">
|
||||
도로명 주소
|
||||
주소
|
||||
<i class="ico-required-mark" role="img" aria-label="필수">*</i>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div id="regionMainCodeId" class="component-select bottom-sheet" data-props-default="지역 선택"
|
||||
<div id="regionSubCodeId" class="component-select bottom-sheet" data-props-default="지역 선택"
|
||||
data-props-type="bottomSheet">
|
||||
<input type="hidden" name="regionMainCode" data-type="select" th:value="${userInfo.regionMainCode}">
|
||||
<input type="hidden" name="regionSubCode" data-type="select" th:value="${userInfo.regionSubCode}">
|
||||
<button type="button" class="select-box">
|
||||
<span class="select-txt">선택</span>
|
||||
</button>
|
||||
@@ -152,12 +152,12 @@
|
||||
<div class="select-scroll">
|
||||
|
||||
<ul class="">
|
||||
<th:block th:each="item : ${regionMainList}">
|
||||
<li class="option" th:data-value="${item.id}"
|
||||
th:text="${item.codeText}"
|
||||
th:classappend="${item.id eq userInfo.regionMainCode ? 'current' : ''}">option1
|
||||
</li>
|
||||
</th:block>
|
||||
<!-- <th:block th:each="item : ${regionMainList}">-->
|
||||
<!-- <li class="option" th:data-value="${item.id}"-->
|
||||
<!-- th:text="${item.codeText}"-->
|
||||
<!-- th:classappend="${item.id eq userInfo.regionMainCode ? 'current' : ''}">option1-->
|
||||
<!-- </li>-->
|
||||
<!-- </th:block>-->
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@@ -167,29 +167,29 @@
|
||||
|
||||
|
||||
<div class="select-group">
|
||||
<div id="regionSubCodeId" class="component-select bottom-sheet"
|
||||
data-props-default="세부지역 선택" data-props-type="bottomSheet">
|
||||
<input type="hidden" th:field="*{regionSubCode}" data-type="select">
|
||||
<div id="regionDetailCodeId" class="component-select bottom-sheet"
|
||||
data-props-default="세부 지역 선택" data-props-type="bottomSheet" data-init="false">
|
||||
<!-- <input type="hidden" name="regionDetailCode" data-type="select">-->
|
||||
<input type="hidden" name="regionDetailCode" th:field="*{regionDetailCode}" 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>
|
||||
<p>세부 지역 선택</p>
|
||||
<button type="button" class="select-close">
|
||||
<span class="hide-txt">닫기</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="select-scroll">
|
||||
<ul class="">
|
||||
<th:block th:each="item : ${regionSubList}">
|
||||
<li class="option" th:data-value="${item.id}"
|
||||
th:text="${item.codeText}"
|
||||
th:classappend="${item.id eq userInfo.regionSubCode ? 'current' : ''}"
|
||||
>option1
|
||||
</li>
|
||||
</th:block>
|
||||
|
||||
<!-- <th:block th:each="item : ${regionSubList}">-->
|
||||
<!-- <li class="option" th:data-value="${item.id}"-->
|
||||
<!-- th:text="${item.codeText}"-->
|
||||
<!-- th:classappend="${item.id eq userInfo.regionSubCode ? 'current' : ''}"-->
|
||||
<!-- >option1-->
|
||||
<!-- </li>-->
|
||||
<!-- </th:block>-->
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@@ -262,6 +262,21 @@
|
||||
|
||||
<section layout:fragment="script">
|
||||
<script th:inline="javascript">
|
||||
const regionList = [[${regionSubList}]];
|
||||
const selectedRegionSubCode = /*[[${userInfo.regionSubCode}]]*/ '';
|
||||
const selectedRegionDetailCode = /*[[${userInfo.regionDetailCode}]]*/ '';
|
||||
|
||||
$(document).ready(function () {
|
||||
// 지역, 세부지역 셀렉트박스 세팅
|
||||
ENV.select.regionSelect = kri.form.setSelectBoxUiCode({
|
||||
codeList: regionList,
|
||||
parentSelector: '#regionSubCodeId',
|
||||
childSelector: '#regionDetailCodeId',
|
||||
selectedParentCode: selectedRegionSubCode,
|
||||
selectedChildCode: selectedRegionDetailCode
|
||||
});
|
||||
});
|
||||
|
||||
let ENV = {
|
||||
httpUrl: {
|
||||
root: /*[[#{uri.front.info.user.path}]]*/'rootUrl',
|
||||
@@ -272,10 +287,9 @@
|
||||
confirmPopup: null
|
||||
},
|
||||
select:{
|
||||
select1:null,
|
||||
select2:null,
|
||||
select3:null,
|
||||
select4:null
|
||||
selectRegion: null,
|
||||
selectTel:null,
|
||||
selectPhone:null
|
||||
},
|
||||
submitted: false,
|
||||
};
|
||||
@@ -291,45 +305,25 @@
|
||||
ENV.initialOwnerName = document.querySelector('input[name="ownerName"]').value;
|
||||
},
|
||||
_bindUI() {
|
||||
|
||||
console.log("bind")
|
||||
ENV.module.confirmPopup = document.querySelector(".confirmPopup").ui;
|
||||
|
||||
const $select1 = document.querySelector('#regionMainCodeId');
|
||||
ENV.select.select1 = new etUI.components.SelectBox();
|
||||
ENV.select.select1.core.init($select1, {
|
||||
selectItemCallback({selectValue, dataValue}){
|
||||
|
||||
document.querySelector('#regionMainCode').value = dataValue;
|
||||
}
|
||||
});
|
||||
|
||||
const $select2 = document.querySelector('#regionSubCodeId');
|
||||
ENV.select.select2 = new etUI.components.SelectBox();
|
||||
ENV.select.select2.core.init($select2, {
|
||||
selectItemCallback({selectValue, dataValue}){
|
||||
document.querySelector('#regionSubCode').value = dataValue;
|
||||
}
|
||||
});
|
||||
|
||||
const $select3 = document.querySelector('#tel1Id');
|
||||
ENV.select.select3 = new etUI.components.SelectBox();
|
||||
ENV.select.select3.core.init($select3, {
|
||||
const $selectTel = document.querySelector('#tel1Id');
|
||||
ENV.select.selectTel = new etUI.components.SelectBox();
|
||||
ENV.select.selectTel.core.init($selectTel, {
|
||||
selectItemCallback({selectValue, dataValue}){
|
||||
document.querySelector('#tel1').value = dataValue;
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
const $select4 = document.querySelector('#phone1Id');
|
||||
ENV.select.select4 = new etUI.components.SelectBox();
|
||||
ENV.select.select4.core.init($select4, {
|
||||
const $selectPhone = document.querySelector('#phone1Id');
|
||||
ENV.select.selectPhone = new etUI.components.SelectBox();
|
||||
ENV.select.selectPhone.core.init($selectPhone, {
|
||||
selectItemCallback({selectValue, dataValue}){
|
||||
document.querySelector('#phone1').value = dataValue;
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
// selectboxInstance1.setValue($('input[name=regionMainCode]').val());
|
||||
},
|
||||
confirmPopup() {
|
||||
@@ -369,10 +363,10 @@
|
||||
// f.regionSubCode.value = regionSubCodeIdElement.value;
|
||||
// }
|
||||
|
||||
f.regionMainCode.value = ENV.select.select1.getValue();
|
||||
f.regionSubCode.value = ENV.select.select2.getValue();
|
||||
f.tel1.value = ENV.select.select3.getValue();
|
||||
f.phone1.value = ENV.select.select4.getValue();
|
||||
f.regionSubCode.value = ENV.select.regionSelect.getParentValue();
|
||||
f.regionDetailCode.value = ENV.select.regionSelect.getChildValue();
|
||||
f.tel1.value = ENV.select.selectTel.getValue();
|
||||
f.phone1.value = ENV.select.selectPhone.getValue();
|
||||
|
||||
|
||||
|
||||
@@ -389,7 +383,9 @@
|
||||
// 이름이 바뀐 경우만 팝업
|
||||
ENV.module.confirmPopup.open();
|
||||
} else {
|
||||
location.href = '/info';
|
||||
ajaxUtil._alert('개인정보 변경이 완료되었습니다.', null, () => {
|
||||
location.href = '/info';
|
||||
});
|
||||
}
|
||||
} else if (rstData.code === 'ERROR') {
|
||||
ajaxUtil._alert('잠시 뒤에 다시 시도해 주세요.', null);
|
||||
|
||||
Reference in New Issue
Block a user