diff --git a/admin/src/main/java/app/module/admin/usecase/admin/checkAdminId/adapters/web/AdminIdDuplicateCheckPostController.java b/admin/src/main/java/app/module/admin/usecase/admin/checkAdminId/adapters/web/AdminIdDuplicateCheckPostController.java index 6a179aed..79ebdd7e 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/checkAdminId/adapters/web/AdminIdDuplicateCheckPostController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/checkAdminId/adapters/web/AdminIdDuplicateCheckPostController.java @@ -1,5 +1,6 @@ package app.module.admin.usecase.admin.checkAdminId.adapters.web; +import app.module.core.config.constants.CommonConstants; import app.module.core.usecase.admin.checkAdminId.ports.CheckAdminIdPortIn; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -15,15 +16,13 @@ import org.springframework.web.bind.annotation.RestController; class AdminIdDuplicateCheckPostController { private final CheckAdminIdPortIn checkAdminIdPortIn; - private final String ID_REGEX = "^[a-zA-Z0-9가-힣_-]{4,15}$"; - private final String INVALID_ID_MSG = "아이디는 4~15자, 영문/숫자/한글/특수문자(_,-)만 가능합니다."; @GetMapping("/api/settings/admin/idCheck") ResponseEntity selectIdCheck(@RequestParam String id ) { - if (!id.matches(ID_REGEX)) { + if (!id.matches(CommonConstants.ADMIN_ID_REGEX)) { return ResponseEntity .status(HttpStatus.UNPROCESSABLE_ENTITY) - .body(INVALID_ID_MSG); + .body(CommonConstants.ADMIN_ID_MSG); } return ResponseEntity.status(HttpStatus.OK).body(checkAdminIdPortIn.connect(id)); diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java index 55266472..f06a393a 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java @@ -2,19 +2,16 @@ package app.module.admin.usecase.admin.saveAdmin.adapters.web.validator; import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminCreateBindingVO; import java.util.Optional; + +import app.module.core.config.constants.CommonConstants; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import org.springframework.validation.Errors; -import org.springframework.validation.ValidationUtils; import org.springframework.validation.Validator; @Component public class AdminCreateValidator implements Validator { - // 아이디: 4~15자, 영문/숫자/한글/특수문자(_,-) 허용 - private final String ID_REGEX = "^[a-zA-Z0-9가-힣_-]{4,15}$"; - // 비밀번호: 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상 - private final String PASSWORD_REGEX = "^(?=.*[0-9])(?=.*[!@#$%_\\-]).{5}$"; - @Override public boolean supports(Class clazz) { return AdminCreateBindingVO.class.equals(clazz); @@ -25,30 +22,30 @@ public class AdminCreateValidator implements Validator { AdminCreateBindingVO vo = (AdminCreateBindingVO) target; // [1] 필수값 누락 체크 - if(vo.getRoleId() == null || vo.getRoleId().isEmpty()) { + if(StringUtils.isBlank(vo.getRoleId())) { errors.rejectValue("roleId", "error.roleId", "필수입력항목을 확인해주세요."); return; } - if(vo.getId() == null || vo.getId().isBlank()) { + if(StringUtils.isBlank(vo.getId())) { errors.rejectValue("id", "error.id", "필수입력항목을 확인해주세요."); return; } - if(vo.getPassword() == null || vo.getPassword().isBlank()) { + if(StringUtils.isBlank(vo.getPassword())) { errors.rejectValue("password", "error.password", "필수입력항목을 확인해주세요."); return; } // 권한 조사원으로 선택했을 경우 - if(vo.getRoleId() != null && "ROLE_RESEARCHER".equals(vo.getRoleId())) { - if(vo.getName() == null || vo.getName().isEmpty()) { + if("ROLE_RESEARCHER".equals(vo.getRoleId())) { + if(StringUtils.isBlank(vo.getName())) { errors.rejectValue("name", "error.name", "필수입력항목을 확인해주세요."); return; } - if(vo.getPhone1() == null || vo.getPhone1().isBlank()) { + if(StringUtils.isBlank(vo.getPhone1())) { errors.rejectValue("phone1", "error.phone1", "필수입력항목을 확인해주세요."); return; } - if(vo.getPhone2() == null || vo.getPhone2().isBlank()) { + if(StringUtils.isBlank(vo.getPhone2())) { errors.rejectValue("phone2", "error.phone2", "필수입력항목을 확인해주세요."); return; } @@ -83,9 +80,9 @@ public class AdminCreateValidator implements Validator { } // [3] 비밀번호 형식 검사 - if (!vo.getPassword().matches(PASSWORD_REGEX)) { + if (!vo.getPassword().matches(CommonConstants.ADMIN_PASSWORD_REGEX)) { errors.rejectValue("password", "valid.common.password.wrong", - "비밀번호는 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상입니다."); + CommonConstants.ADMIN_PASSWORD_MSG); } } } diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminUpdateValidator.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminUpdateValidator.java index a9a06577..2f1f0e60 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminUpdateValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminUpdateValidator.java @@ -10,9 +10,6 @@ import org.springframework.validation.Validator; @Component public class AdminUpdateValidator implements Validator { - // 비밀번호: 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상 - private final String PASSWORD_REGEX = "^(?=.*[0-9])(?=.*[!@#$%_\\-]).{5}$"; - @Override public boolean supports(Class clazz) { return AdminUpdateBindingVO.class.equals(clazz); @@ -66,11 +63,5 @@ public class AdminUpdateValidator implements Validator { errors.rejectValue("regionMainCode", "valid.common.required","필수입력항목을 확인해주세요."); } }); - - // [2] 비밀번호 형식 검사 - if (!vo.getUpdatePassword().matches(PASSWORD_REGEX)) { - errors.rejectValue("updatePassword", "valid.common.password.wrong", - "비밀번호는 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상입니다."); - } } } diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogType.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogType.java index 5e7f5a24..d5bf6ae5 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogType.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogType.java @@ -8,5 +8,5 @@ import lombok.RequiredArgsConstructor; public enum BatchLogType { AUTO_SMS, MONTHLY_STATUS, - CARRYOVER; + CARRYOVER } diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java index 5f975f59..6541cde1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java @@ -46,7 +46,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut Workbook workbook = WorkbookFactory.create(file.getInputStream()); Sheet sheet = workbook.getSheetAt(0); - Integer success = 0; + int success = 0; List RegionMainCodeList = uiCodeListMapper.findByParentId("code.region.main"); List RegionSubCodeList = uiCodeListMapper.findByParentId("code.region.sub"); diff --git a/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml b/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml index d76fd0ce..4aee8c9a 100644 --- a/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml +++ b/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml @@ -24,18 +24,10 @@ region_sub_code, region_detail_code, address, - industry_large_code, - - industry_middle_code, - - industry_sub_middle, - - industry_detail, - is_panel, usage_type, employment_type, diff --git a/admin/src/main/resources/mappers/household/UpdateHouseholdMapper.xml b/admin/src/main/resources/mappers/household/UpdateHouseholdMapper.xml index 5d16fa24..e603a5a7 100644 --- a/admin/src/main/resources/mappers/household/UpdateHouseholdMapper.xml +++ b/admin/src/main/resources/mappers/household/UpdateHouseholdMapper.xml @@ -18,18 +18,10 @@ region_sub_code = #{regionSubCode}, region_detail_code = #{regionDetailCode}, address = #{address}, - industry_large_code = #{industryLargeCode}, - - industry_middle_code = #{industryMiddleCode}, - - industry_sub_middle = #{industrySubMiddle}, - - industry_detail = #{industryDetail}, - is_panel = #{isPanel}, usage_type = #{usageType}, @@ -37,9 +29,7 @@ employment_type = #{employmentType}, - memo = #{memo}, - WHERE seq = #{householdSeq} diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index c5745ffa..18185429 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -342,9 +342,15 @@ ) AS hvr 1=1 - + /* 경영주 검색 */ + + AND ( + hvr.householdName ILIKE '%' || #{cmd.ownerValue} || '%' + OR hvr.householdPhone ILIKE '%' || #{cmd.ownerValue} || '%' + ) + AND hvr.householdName ILIKE '%' || #{cmd.ownerValue} || '%' diff --git a/admin/src/main/resources/static/ui/uiUtil.js b/admin/src/main/resources/static/ui/uiUtil.js index 3d681c70..7359e595 100644 --- a/admin/src/main/resources/static/ui/uiUtil.js +++ b/admin/src/main/resources/static/ui/uiUtil.js @@ -259,10 +259,14 @@ uiUtil.uploadFile = (fileUploadType, input) => { }, statusCode: { // 실패 - validation fail + 400: (res) => { + alert(res.responseJSON.message); + }, 422: (res) => { const resJson = res.responseJSON; $(input).parent().find('.invalid-feedback').text(resJson.message); $(input).addClass('is-invalid'); + alert(resJson.message); } } }); @@ -492,8 +496,9 @@ const setSelectBoxUiCode = ({ codeList, parentSelector, childSelector, + defaultOptionText = '전체', selectedParentCode = '', - selectedChildCode = '' + selectedChildCode = '', }) => { const $parent = $(parentSelector); const $child = $(childSelector); @@ -501,16 +506,20 @@ const setSelectBoxUiCode = ({ if (!codeList?.nodes || !$parent.length || !$child.length) return; const renderOptions = ($el, list, selected) => { - $el.html(''); + $el.html(``); list.forEach(item => { const val = item.id.split('.').pop(); const isSelected = item.id === selected ? 'selected' : ''; $el.append(``); }); + + if (selected) { + $el.val(selected); + } }; const loadChildren = (parentId, selectedChild = '') => { - $child.html(''); + $child.html(``); if (!parentId) return; const parent = codeList.nodes.find(n => n.id === parentId); diff --git a/admin/src/main/resources/templates/common/components.html b/admin/src/main/resources/templates/common/components.html index 39bccce9..fc9b66dd 100644 --- a/admin/src/main/resources/templates/common/components.html +++ b/admin/src/main/resources/templates/common/components.html @@ -168,7 +168,6 @@ 홈 diff --git a/admin/src/main/resources/templates/common/modal-household-mapping.html b/admin/src/main/resources/templates/common/modal-household-mapping.html index 073890fb..4c139999 100644 --- a/admin/src/main/resources/templates/common/modal-household-mapping.html +++ b/admin/src/main/resources/templates/common/modal-household-mapping.html @@ -10,7 +10,7 @@ -
+ @@ -94,7 +95,7 @@ - @@ -161,6 +162,7 @@ codeList: regionList, parentSelector: '#regionSubCode', childSelector: '#regionDetailCode', + defaultOptionText: '전체' }); document.querySelector(".modal01").ui.open(); @@ -178,6 +180,8 @@ $('#isPanel').val(''); $('#searchMapping').val(''); $('#ownerValue').val(''); + + initSearchHousehold(); }; const searchHouseholdList = (pageNo,regionMainCode) => { @@ -214,6 +218,16 @@ `); }); + + // nodata 처리 + if (!$(response.content).length) { + tbody.append(` + + 임가정보가 존재하지 않습니다. + + `); + } + // Pagination 구성하기 const paging = $('.mapping-paging'); paging.empty(); @@ -271,6 +285,11 @@ ); } }; + + const initSearchHousehold = () => { + const regionMainCode = document.querySelector('[name="regionMainCode"]')?.value || ''; + searchHouseholdList(0, regionMainCode); + }; \ No newline at end of file diff --git a/admin/src/main/resources/templates/common/modal-researcher-mapping.html b/admin/src/main/resources/templates/common/modal-researcher-mapping.html index 27312705..306f8fca 100644 --- a/admin/src/main/resources/templates/common/modal-researcher-mapping.html +++ b/admin/src/main/resources/templates/common/modal-researcher-mapping.html @@ -81,9 +81,7 @@ - + @@ -117,8 +115,13 @@ diff --git a/admin/src/main/resources/templates/communication/notice/{id}.html b/admin/src/main/resources/templates/communication/notice/{id}.html index 59487c1a..5fd368e7 100644 --- a/admin/src/main/resources/templates/communication/notice/{id}.html +++ b/admin/src/main/resources/templates/communication/notice/{id}.html @@ -32,7 +32,7 @@ @@ -140,7 +140,7 @@ @@ -160,7 +160,7 @@ @@ -168,7 +168,7 @@ @@ -320,7 +320,8 @@ setSelectBoxUiCode({ codeList: regionList, parentSelector: '#regionSubCode', - childSelector: '#regionDetailCode' + childSelector: '#regionDetailCode', + defaultOptionText: '선택' }); // 업종 대분류, 중분류 셀렉트박스 세팅 @@ -328,6 +329,7 @@ codeList: industryLargeList, parentSelector: '#industryLargeCode', childSelector: '#industryMiddleCode', + defaultOptionText: '선택' }); }); diff --git a/admin/src/main/resources/templates/households/households.html b/admin/src/main/resources/templates/households/households.html index 1d8dd70c..df290145 100644 --- a/admin/src/main/resources/templates/households/households.html +++ b/admin/src/main/resources/templates/households/households.html @@ -281,8 +281,8 @@ onclick="location.href='/households/create'"> 임가 등록 - - @@ -307,22 +307,27 @@ $(document).ready(function () { // 지역, 세부지역 셀렉트박스 세팅 - setSelectBoxUiCode({ + setSelectBoxUiCode({ codeList: regionList, parentSelector: '#regionSubCode', childSelector: '#regionDetailCode', + defaultOptionText: '전체', selectedParentCode: selectedRegionSubCode, selectedChildCode: selectedRegionDetailCode }); - // 업종 대분류, 중분류 셀렉트박스 세팅 - setSelectBoxUiCode({ - codeList: industryLargeList, - parentSelector: '#industryLargeCode', - childSelector: '#industryMiddleCode', - selectedParentCode: selectedIndustryLargeCode, - selectedChildCode: selectedIndustryMiddleCode - }); + // 업종 대분류, 중분류 셀렉트박스 세팅 + setSelectBoxUiCode({ + codeList: industryLargeList, + parentSelector: '#industryLargeCode', + childSelector: '#industryMiddleCode', + defaultOptionText: '전체', + selectedParentCode: selectedIndustryLargeCode, + selectedChildCode: selectedIndustryMiddleCode + }); + + // 최초 리스트 로드 + getHouseholds(document.reqForm.page.value); }); @@ -409,9 +414,6 @@ 'json' ); } - - // 최초 리스트 로드 - getHouseholds(document.reqForm.page.value);
- - 선택 조사원명 전화번호 실사

첨부 가능 파일 형식: 문서(pdf, docx, xlsx, pptx, hwp), 이미지(jpg, jpeg, png, gif), 기타(zip, @@ -231,6 +231,19 @@ } }); } + + // JavaScript 함수 추가 + function validateFileSize(input) { + const maxSize = 5 * 1024 * 1024; // 5MB + const file = input.files[0]; + + if (file && file.size > maxSize) { + alert('파일 크기는 5MB 이하만 업로드 가능합니다.'); + input.value = ''; // 파일 선택 초기화 + return false; + } + return true; + } diff --git a/admin/src/main/resources/templates/households/create.html b/admin/src/main/resources/templates/households/create.html index ae0bbb64..5b985079 100644 --- a/admin/src/main/resources/templates/households/create.html +++ b/admin/src/main/resources/templates/households/create.html @@ -121,7 +121,7 @@