Merge branch 'dev' into deploy-dev-admin

This commit is contained in:
kangsunlee
2025-06-27 21:46:12 +09:00
64 changed files with 1236 additions and 239 deletions

View File

@@ -17,7 +17,7 @@ class AdminIdDuplicateCheckPostController {
private final CheckAdminIdPortIn checkAdminIdPortIn;
@GetMapping("/api/settings/admin/idCheck")
ResponseEntity<?> updateMappingHousehold(@RequestParam String id ) {
ResponseEntity<?> selectIdCheck(@RequestParam String id ) {
return ResponseEntity.status(HttpStatus.OK).body(checkAdminIdPortIn.connect(id));
}
}

View File

@@ -0,0 +1,26 @@
package app.module.admin.usecase.admin.excelSaveAdmin.adapters.web;
import app.module.core.usecase.admin.excelSaveAdmin.ports.ExcelSaveAdminPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
@Slf4j
@RestController
@RequiredArgsConstructor
class ExcelSaveAdminController {
private final ExcelSaveAdminPortIn excelSaveAdminPortIn;
@PostMapping("/api/settings/admin/excelUpload")
ResponseEntity<?> excelUploadSaveAdmin(@RequestParam("file") MultipartFile file ) throws IOException {
return ResponseEntity.status(HttpStatus.OK).body(excelSaveAdminPortIn.operate(file));
}
}

View File

@@ -0,0 +1,19 @@
package app.module.admin.usecase.admin.excelSaveAdmin.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
public class ExcelAdminCreateVO {
private String id;
private String password;
private String name;
private String phone;
private String regionMainCode;
private String roleId;
}

View File

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface CreateHouseholdMapper {
void createHousehold(CreateHouseholdOutCmd outCmd);
Integer createHousehold(CreateHouseholdOutCmd outCmd);
void createHouseholdHasRole(CreateHouseholdHasRoleCmd cmd);
void createResearcherHasHousehold(CreateResearcherHasHouseholdCmd cmd);
}

View File

@@ -2,6 +2,7 @@ package app.module.admin.usecase.household.createHouseholdUI.adapters.web;
import app.module.admin.config.application.util.AdminUtil;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.toptier.ports.UICodeTopTierPortIn;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -15,6 +16,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
class CreateHouseholdUIController {
private final UICodeListPortIn uiCodeListPortIn;
private final UICodeTopTierPortIn uiCodeTopTierPortIn;
@GetMapping(path = "/households/create")
String operate(Model model, @ModelAttribute("reqVO") CreateHouseholdUIReqVO reqVO,
@@ -28,14 +30,10 @@ class CreateHouseholdUIController {
// 실사
model.addAttribute("regionMainList", uiCodeListPortIn.connect("code.region.main"));
// 지역
model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub"));
// 세부지역
model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail"));
// 업종 대분류
model.addAttribute("industryLargeList", uiCodeListPortIn.connect("code.industry.large"));
// 업종 중분류1
model.addAttribute("industryMiddleList", uiCodeListPortIn.connect("code.industry.middle"));
// 지역 + 세부지역
model.addAttribute("regionSubList", uiCodeTopTierPortIn.connect("code.region.sub"));
// 업종 대분류 + 업종 중분류1
model.addAttribute("industryLargeList", uiCodeTopTierPortIn.connect("code.industry.large"));
return "households/create";
}

View File

@@ -0,0 +1,182 @@
package app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.persistence;
import app.module.admin.usecase.household.checkHouseholdNum.adapters.persistence.CheckHouseholdNumMapper;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
import app.module.admin.usecase.household.createHousehold.adapters.persistence.CreateHouseholdMapper;
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd;
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd;
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateResearcherHasHouseholdCmd;
import app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model.ExcelCreateHouseholdVO;
import app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model.ExcelUploadContactVO;
import app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model.ExcelUploadResultVO;
import app.module.admin.usecase.household.excelUploadCreateHousehold.ports.ExcelUploadCreateHouseholdPortOut;
import app.module.admin.usecase.researcher.adpaters.persistence.ResearcherMapper;
import app.module.core.config.application.util.AuditUtil;
import app.module.core.usecase.uicode.list.adapters.persistence.UICodeListMapper;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.*;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
@Slf4j
@Repository
@RequiredArgsConstructor
class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut {
private final CreateHouseholdMapper createHouseholdMapper;
private final CheckHouseholdNumMapper checkHouseholdNumMapper;
private final UICodeListMapper uiCodeListMapper;
private final BCryptPasswordEncoder passwordEncoder;
private final ResearcherMapper researcherMapper;
@Override
@Transactional
public ExcelUploadResultVO operate(MultipartFile file) throws IOException {
// 엑셀 파일 읽기
Workbook workbook = WorkbookFactory.create(file.getInputStream());
Sheet sheet = workbook.getSheetAt(0);
Integer success = 0;
List<UICodeElement> RegionMainCodeList = uiCodeListMapper.findByParentId("code.region.main");
List<UICodeElement> RegionSubCodeList = uiCodeListMapper.findByParentId("code.region.sub");
List<UICodeElement> RegionDetailCodeList = uiCodeListMapper.findByLikeId("code.region.detail");
List<UICodeElement> IndustryLargeCodeList = uiCodeListMapper.findByParentId("code.industry.large");
List<UICodeElement> IndustryMiddleCodeList = uiCodeListMapper.findByParentId("code.industry.middle");
// 첫 번째 행은 헤더로 간주하고 스킵
for (int i = 1; i <= sheet.getLastRowNum(); i++) {
Row row = sheet.getRow(i);
if (row == null) continue;
CheckHouseholdNum checkHouseholdNum = checkHouseholdNumMapper.checkHouseholdNum(new CheckHouseholdNumCmd(getCellValue(row.getCell(0)))).orElse(null);
ExcelUploadContactVO contactVO = getDivisionContact(row.getCell(3));
if(!checkHouseholdNum.getIsDuplicated() && contactVO != null) {
ExcelCreateHouseholdVO household = new ExcelCreateHouseholdVO();
household.setHouseholdNum(getCellValue(row.getCell(0))); // 임가번호
household.setOwnerName(getCellValue(row.getCell(1))); // 경영주명
household.setOwnerAge(getCellNumberValue(row.getCell(2))); // 연령
household.setTel(contactVO.getTel()); // 가구 연락처
household.setPhone(contactVO.getPhone()); // 연락처
household.setEncodedPassword(passwordEncoder.encode(contactVO.getPhoneLast())); // 비밀번호
household.setRegionMainCode(getUiCode(row.getCell(4),RegionMainCodeList,"code.region.main")); // 실사
household.setRegionSubCode(getUiCode(row.getCell(5),RegionSubCodeList,"code.region.sub")); // 지역
household.setRegionDetailCode(getUiCode(row.getCell(6),RegionDetailCodeList,"code.region.detail")); // 세부지역
household.setAddress(getCellValue(row.getCell(7))); // 전체주소
household.setIndustryLargeCode(getUiCode(row.getCell(8),IndustryLargeCodeList,"code.industry.large")); // 업종 대분류
household.setIndustryMiddleCode(getUiCode(row.getCell(9),IndustryMiddleCodeList,"code.industry.middle")); // 업종 중분류
household.setIndustrySubMiddle(getCellValue(row.getCell(10))); // 업종 중분류2
household.setIndustryDetail(getCellValue(row.getCell(11))); // 규모 / 세부품목
household.setResearcherSeq(getResearcherSeq(row.getCell(12))); // 조사원
household.setIsPanel(getIsPanel(row.getCell(13))); // 유지여부
CreateHouseholdOutCmd cmd = new CreateHouseholdOutCmd(
null,
household.getHouseholdNum(),
household.getOwnerName(),
household.getOwnerAge(),
household.getTel(),
household.getPhone(),
household.getEncodedPassword(),
household.getRegionMainCode(),
household.getRegionSubCode(),
household.getRegionDetailCode(),
household.getAddress(),
household.getIndustryLargeCode(),
household.getIndustryMiddleCode(),
household.getIndustrySubMiddle(),
household.getIndustryDetail(),
household.getResearcherSeq(),
household.getIsPanel(),
null,
List.of("ROLE_GENERAL")
);
success += createHouseholdMapper.createHousehold(AuditUtil.create(cmd));
if(cmd.getRoleIds() != null && !cmd.getRoleIds().isEmpty()) {
createHouseholdMapper.createHouseholdHasRole(AuditUtil.create(new CreateHouseholdHasRoleCmd(cmd.getSeq(), cmd.getRoleIds())));
}
if(cmd.getResearcherSeq() != null) {
createHouseholdMapper.createResearcherHasHousehold(AuditUtil.create(new CreateResearcherHasHouseholdCmd(cmd.getSeq(), cmd.getResearcherSeq())));
}
}
}
workbook.close();
return new ExcelUploadResultVO(sheet.getLastRowNum()-1 , success);
}
// 셀 값을 문자열로 변환
private String getCellValue(Cell cell) {
if (cell == null) return "";
return switch (cell.getCellType()) {
case STRING -> cell.getStringCellValue();
case NUMERIC -> String.valueOf((long) cell.getNumericCellValue());
default -> "";
};
}
// 셀 값을 문자열로 변환
private Integer getCellNumberValue(Cell cell) {
if (cell == null) return null;
return switch (cell.getCellType()) {
case NUMERIC -> (int) cell.getNumericCellValue();
default -> null;
};
}
private String getUiCode(Cell cell,List<UICodeElement> uiCodeElementList,String codeId){
if (cell == null) return "";
return uiCodeElementList.stream().filter(code -> {
String[] cellValue = cell.getStringCellValue().trim().split("\\.");
return code.getId().equals(codeId+"."+cellValue[0]) || code.getCodeText().equals(cellValue[1]) ;
} )
.findFirst()
.map(UICodeElement::getId).orElse("");
}
private ExcelUploadContactVO getDivisionContact(Cell cell){
if (cell == null) return null;
String[] contact = cell.getStringCellValue().trim().split("-");
ExcelUploadContactVO contactVO = new ExcelUploadContactVO();
if(contact[2].length() == 4) {
if (contact[0].equals("010") || contact[0].equals("011")) {
contactVO.setPhone(getCellValue(cell));
contactVO.setPhoneLast(contact[2]);
} else {
contactVO.setTel(getCellValue(cell));
contactVO.setPhoneLast(contact[2]);
}
return contactVO;
}
return null;
}
private Boolean getIsPanel(Cell cell){
if (cell == null) return null;
String[] isPanel = cell.getStringCellValue().trim().split("\\.");
return "1".equals(isPanel[0]) || "유지".equals(isPanel[1]);
}
private Long getResearcherSeq(Cell cell){
if (cell == null) return null;
return researcherMapper.selectResearcherId(cell.getStringCellValue());
}
}

View File

@@ -0,0 +1,25 @@
package app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web;
import app.module.admin.usecase.household.excelUploadCreateHousehold.ports.ExcelUploadCreateHouseholdPortIn;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
@RestController
@RequiredArgsConstructor
class ExcelUploadCreateHouseholdController {
private final ExcelUploadCreateHouseholdPortIn excelUploadCreateHouseholdPortIn;
@PostMapping(path = "/api/household/excelUpload")
ResponseEntity<?> operate(@RequestParam("file") MultipartFile file ) throws IOException {
return ResponseEntity.status(HttpStatus.OK).body(excelUploadCreateHouseholdPortIn.operate(file));
}
}

View File

@@ -0,0 +1,27 @@
package app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model;
import lombok.*;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode
public class ExcelCreateHouseholdVO {
private String householdNum;
private String ownerName;
private Integer ownerAge;
private String tel;
private String phone;
private String encodedPassword;
private String regionMainCode;
private String regionSubCode;
private String regionDetailCode;
private String address;
private String industryLargeCode;
private String industryMiddleCode;
private String industrySubMiddle;
private String industryDetail;
private Long researcherSeq;
private Boolean isPanel;
}

View File

@@ -0,0 +1,15 @@
package app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
public class ExcelUploadContactVO {
private String phone;
private String tel;
private String phoneLast;
}

View File

@@ -0,0 +1,13 @@
package app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
public class ExcelUploadResultVO {
private Integer total;
private Integer success;
}

View File

@@ -0,0 +1,10 @@
package app.module.admin.usecase.household.excelUploadCreateHousehold.ports;
import app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model.ExcelUploadResultVO;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
public interface ExcelUploadCreateHouseholdPortIn {
ExcelUploadResultVO operate(MultipartFile file) throws IOException;
}

View File

@@ -0,0 +1,10 @@
package app.module.admin.usecase.household.excelUploadCreateHousehold.ports;
import app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model.ExcelUploadResultVO;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
public interface ExcelUploadCreateHouseholdPortOut {
ExcelUploadResultVO operate(MultipartFile file) throws IOException;
}

View File

@@ -0,0 +1,21 @@
package app.module.admin.usecase.household.excelUploadCreateHousehold.ports.application;
import app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model.ExcelUploadResultVO;
import app.module.admin.usecase.household.excelUploadCreateHousehold.ports.ExcelUploadCreateHouseholdPortIn;
import app.module.admin.usecase.household.excelUploadCreateHousehold.ports.ExcelUploadCreateHouseholdPortOut;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
@Service
@RequiredArgsConstructor
class ExcelUploadCreateHouseholdService implements ExcelUploadCreateHouseholdPortIn {
private final ExcelUploadCreateHouseholdPortOut portOut;
@Override
public ExcelUploadResultVO operate(MultipartFile file) throws IOException {
return portOut.operate(file);
}
}

View File

@@ -7,6 +7,7 @@ import app.module.core.config.application.util.CommonUtil;
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
import app.module.core.usecase.admin.view.ports.application.domain.AdminView;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.toptier.ports.UICodeTopTierPortIn;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.ModelAttribute;
@RequiredArgsConstructor
class GetHouseholdsStatusUIController {
private final UICodeListPortIn uiCodeListPortIn;
private final UICodeTopTierPortIn uiCodeTopTierPortIn;
private final AdminViewPortIn adminViewPortIn;
@GetMapping(path = "/households")
@@ -43,14 +45,10 @@ class GetHouseholdsStatusUIController {
model.addAttribute("regionMainList", uiCodeListPortIn.connect("code.region.main"));
}
// 지역
model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub"));
// 세부지역
model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail"));
// 업종 대분류
model.addAttribute("industryLargeList", uiCodeListPortIn.connect("code.industry.large"));
// 업종 중분류1
model.addAttribute("industryMiddleList", uiCodeListPortIn.connect("code.industry.middle"));
// 지역 + 세부지역
model.addAttribute("regionSubList", uiCodeTopTierPortIn.connect("code.region.sub"));
// 업종 대분류 + 업종 중분류1
model.addAttribute("industryLargeList", uiCodeTopTierPortIn.connect("code.industry.large"));
model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue());

View File

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

View File

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

View File

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

View File

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

View File

@@ -7,9 +7,11 @@ import app.module.admin.usecase.household.getHouseholdStatus.ports.application.d
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd;
import app.module.admin.usecase.household.updateHouseholdStatusUI.adapters.web.model.UpdateHouseholdStatusUIResVO;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.toptier.ports.UICodeTopTierPortIn;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable;
@@ -22,6 +24,7 @@ class UpdateHouseholdStatusUIController {
private final GetHouseholdStatusPortIn getHouseholdStatusPortIn;
private final UICodeListPortIn uiCodeListPortIn;
private final UICodeTopTierPortIn uiCodeTopTierPortIn;
@GetMapping(path = "/households/update/{seq}")
String operate(@PathVariable Long seq, Model model,
@@ -39,14 +42,10 @@ class UpdateHouseholdStatusUIController {
// 실사
model.addAttribute("regionMainList", uiCodeListPortIn.connect("code.region.main"));
// 지역
model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub"));
// 세부지역
model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail"));
// 업종 대분류
model.addAttribute("industryLargeList", uiCodeListPortIn.connect("code.industry.large"));
// 업종 중분류1
model.addAttribute("industryMiddleList", uiCodeListPortIn.connect("code.industry.middle"));
// 지역 + 세부지역
model.addAttribute("regionSubList", uiCodeTopTierPortIn.connect("code.region.sub"));
// 업종 대분류 + 업종 중분류1
model.addAttribute("industryLargeList", uiCodeTopTierPortIn.connect("code.industry.large"));
// 임가 상세 정보
@@ -59,12 +58,12 @@ class UpdateHouseholdStatusUIController {
result.getHouseholdNum(),
result.getHouseholdName(),
result.getHouseholdAge(),
result.getHouseholdTel() != null ? result.getHouseholdTel().split("-")[0] : "",
result.getHouseholdTel() != null ? result.getHouseholdTel().split("-")[1] : "",
result.getHouseholdTel() != null ? result.getHouseholdTel().split("-")[2] : "",
result.getHouseholdPhone() != null ? result.getHouseholdPhone().split("-")[0] : "",
result.getHouseholdPhone() != null ? result.getHouseholdPhone().split("-")[1] : "",
result.getHouseholdPhone() != null ? result.getHouseholdPhone().split("-")[2] : "",
StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[0] : "",
StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[1] : "",
StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[2] : "",
StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[0] : "",
StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[1] : "",
StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[2] : "",
result.getRegionMainCode(),
result.getRegionSubCode(),
result.getRegionDetailCode(),

View File

@@ -27,5 +27,5 @@ public interface ResearcherMapper {
void deleteHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("deletedBy") String deletedBy);
Integer insertHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("createdBy") String createdBy);
List<GetPopupHouseholds> getPopupHouseholds(@Param("pageable") Pageable pageable, @Param("cmd") GetPopupHouseholdsCmd cmd);
Long selectResearcherId(@Param("id")String id);
}

View File

@@ -6,6 +6,7 @@ import app.module.admin.usecase.researcher.adpaters.web.model.GetResearchersUIRe
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailUIReqVO;
import app.module.admin.usecase.researcher.ports.ResearcherPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.toptier.ports.UICodeTopTierPortIn;
import app.module.core.usecase.uicode.view.ports.UICodeViewPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -22,6 +23,7 @@ import java.util.Objects;
@RequestMapping(path = "/researcher")
class ResearcherController {
private final UICodeListPortIn uiCodeListPortIn;
private final UICodeTopTierPortIn uiCodeTopTierPortIn;
private final ResearcherPortIn researcherPortIn;
@GetMapping(path = "/researchers")
@@ -45,10 +47,8 @@ class ResearcherController {
model.addAttribute("researcherDto", researcherPortIn.detail(adminSeq));
model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue());
// 모달용 지역
model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub"));
// 모달용 세부지역
model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail"));
// 모달용 지역 + 세부지역
model.addAttribute("regionSubList", uiCodeTopTierPortIn.connect("code.region.sub"));
return "researcher/detail";
}

View File

@@ -4,7 +4,7 @@
<mapper
namespace="app.module.admin.usecase.household.createHousehold.adapters.persistence.CreateHouseholdMapper">
<insert id="createHousehold">
<update id="createHousehold">
/* createHousehold : 임가 등록 */
<selectKey keyProperty="seq" resultType="long" order="BEFORE">
SELECT nextval('household_seq')
@@ -79,7 +79,7 @@
</if>
<include refid="common.fields.CreateUpdateBaseValues"/>
)
</insert>
</update>
<insert id="createHouseholdHasRole">
/* createHouseholdHasRole : 임가 역할 등록 */

View File

@@ -31,6 +31,7 @@
<when test="cmd.searchField eq 'name'">
AND a.name ILIKE '%' || #{cmd.searchValue} || '%'
</when>
<when test="cmd.searchField eq 'phone'">
AND a.phone ILIKE '%' || #{cmd.searchValue} || '%'
</when>

View File

@@ -89,7 +89,7 @@
join researcher_has_household rhh ON h.seq = rhh.household_seq and rhh.is_deleted = false
left join uicode rm ON rm.parent_id = 'code.region.main' AND rm.id = h.region_main_code
left join uicode rs ON rs.parent_id = 'code.region.sub' AND rs.id = h.region_sub_code
left join uicode rd ON rd.parent_id = 'code.region.detail' AND rd.id = h.region_detail_code
left join uicode rd ON rd.id = h.region_detail_code
left join uicode il ON il.parent_id = 'code.industry.large' AND il.id = h.industry_large_code
left join uicode im ON im.parent_id = 'code.industry.middle' AND im.id = h.industry_middle_code
where 1=1
@@ -357,4 +357,12 @@
ORDER BY hvr.householdNum ASC
OFFSET #{pageable.offset} ROWS FETCH NEXT #{pageable.pageSize} ROWS ONLY
</select>
<select id="selectResearcherId">
select seq
from admin a
join admin_has_role ahr on ahr.admin_seq = a.seq and ahr.role_id = 'ROLE_RESEARCHER' and ahr.is_deleted = false
where a.id = #{id} and a.is_deleted = false
</select>
</mapper>

View File

@@ -470,3 +470,50 @@ const limitMaxLength = (el) => {
el.value = el.value.replace(/\D/g, '').slice(0, maxLength);
}
/**
* 공통코드 기반의 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')
*/
const setSelectBoxUiCode = ({
codeList,
parentSelector,
childSelector,
selectedParentCode = '',
selectedChildCode = ''
}) => {
const $parent = $(parentSelector);
const $child = $(childSelector);
if (!codeList?.nodes || !$parent.length || !$child.length) return;
const renderOptions = ($el, list, selected) => {
$el.html('<option value="">전체</option>');
list.forEach(item => {
const val = item.id.split('.').pop();
const isSelected = item.id === selected ? 'selected' : '';
$el.append(`<option value="${item.id}" ${isSelected}>${val}. ${item.codeText}</option>`);
});
};
const loadChildren = (parentId, selectedChild = '') => {
$child.html('<option value="">전체</option>');
if (!parentId) return;
const parent = codeList.nodes.find(n => n.id === parentId);
if (!parent?.nodes) return;
renderOptions($child, parent.nodes, selectedChild);
};
renderOptions($parent, codeList.nodes, selectedParentCode);
if (selectedParentCode) loadChildren(selectedParentCode, selectedChildCode);
$parent.on('change', function () {
loadChildren($(this).val());
});
};

View File

@@ -7,7 +7,7 @@
<form method="post" name="adminParamForm" onsubmit="goSearch();"
th:action="@{/settings/admins}"
th:object="${listStatus}">
<div th:replace="admin/modal/modal-admin-excel:: modalFragment"></div>
<!-- hidden parameters -->
<input name="page" th:value="${listOutput.pageable.pageNumber}" type="hidden"/>
<input name="sort" th:value="${listOutput.pageable.sort}" type="hidden"/>
@@ -128,6 +128,9 @@
<div class="component-btns bottom-btn-group">
<div class="btns-row align-right">
<button class="btn" onclick="showAdminExcelUploadModal();" type="button">
<span class="btn-txt">엑셀 업로드</span>
</button>
<button class="btn" onclick="goExcel();" type="button"><span class="btn-txt">엑셀 다운로드</span></button>
<button class="btn" onclick="location.href='/settings/admins/create';" type="button"><span class="btn-txt">등록</span></button>
<button class="btn" onclick="goRemove();" type="button"><span class="btn-txt">삭제</span></button>
@@ -135,15 +138,10 @@
</div>
</section>
</form>
</section>
<section layout:fragment="script">
<!-- <script th:inline="javascript">
// 목록 정렬 표기 및 갱신 기능 적용
uiUtil.applyListSortNotation([[${listOutput.pageable.pageSize}]],
[[${listOutput.pageable.sort.toString()}]]);
</script>-->
<script th:inline="javascript">
// 검색
function goSearch() {
@@ -211,6 +209,54 @@
f.method = 'post';
f.submit();
}
function showAdminExcelUploadModal() {
const modal = document.querySelector(".modal02");
modal.ui.open();
}
const uploadAdminExcel = () => {
event.preventDefault();
const fileInput = document.getElementById('file');
if (fileInput.files.length === 0) {
alert('업로드할 엑셀 파일을 선택해주세요.');
return;
}
let formData = new FormData();
formData.append('file', fileInput.files[0]);
$.ajax({
method: 'POST',
url: '/api/settings/admin/excelUpload',
data: formData,
contentType: false, // * 중요 *
processData: false, // * 중요 *
enctype: 'multipart/form-data', // * 중요 *
beforeSend: function (xhr) {
xhr.setRequestHeader(
$("meta[name='_csrf_header']").attr("content"),
$("meta[name='_csrf']").attr("content"));
},
success(res) {
alert("총 "+res.total+"건 중에 "+res.success+"건 등록되었습니다.");
},
statusCode: {
422: (res) => {
const resJson = res.responseJSON;
$(input).parent().find('.invalid-feedback').text(resJson.message);
$(input).addClass('is-invalid');
}
}
});
};
const closeModal = () => {
document.querySelector(".modal02").ui.close();
};
</script>
</section>

View File

@@ -0,0 +1,42 @@
<!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">
<div class="component-modal modal02" id="test" 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">
<section>
<form autocomplete="off" method="post" name="AdminExcelReqForm" id ="AdminExcelReqForm" enctype="multipart/form-data" action="/api/settings/admin/excelUpload">
<label for="file" class="input-file-btn">
<input type="file" name="file" id="file" accept=".xlsx, .xls">
</label>
<div class="component-btns bottom-btn-group" th:fragment="modalButtons">
<div class="btns-row align-right">
<button type="button" class="btn btn-primary" onclick="uploadAdminExcel()">
<span class="btn-txt">등록</span>
</button>
</div>
</div>
</form>
</section>
</div>
<button class="modal-close" onclick="closeModal()"></button>
</div>
</div>
</div>
</div>
<section layout:fragment="script">
<script th:inline="javascript">
</script>
</section>
</div>
</html>

View File

@@ -49,7 +49,6 @@
</div>
<select class="select-list" id="regionSubCode" name="regionSubCode">
<option value="" selected>전체</option>
<option th:each="region : ${regionSubList}" th:value="${region.id}" th:text="${region.codeText}"></option>
</select>
</div>
<div class="component-select">
@@ -58,7 +57,6 @@
</div>
<select class="select-list" id="regionDetailCode" name="regionDetailCode">
<option value="" selected>전체</option>
<option th:each="subRegion : ${regionDetailList}" th:value="${subRegion.id}" th:text="${subRegion.codeText}"></option>
</select>
</div>
</div>
@@ -142,6 +140,10 @@
</div>
</div>
<script th:inline="javascript">
const regionList = [[${regionSubList}]];
</script>
<script th:inline="javascript">
const showHouseholdModal = (button) => {
const regionMainCode = button.getAttribute('data-region-main-code') || '';
@@ -154,6 +156,13 @@
existingModal.remove();
}
// 지역, 세부지역 셀렉트박스 세팅
setSelectBoxUiCode({
codeList: regionList,
parentSelector: '#regionSubCode',
childSelector: '#regionDetailCode',
});
document.querySelector(".modal01").ui.open();
// 초기 데이터 조회

View File

@@ -131,22 +131,16 @@
<th>지역<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td>
<div class="component-select">
<select class="select-list" name="regionSubCode" required>
<select class="select-list" name="regionSubCode" id="regionSubCode" required>
<option value="">전체</option>
<option th:each="item : ${regionSubList}"
th:value="${item.id}"
th:text="${item.codeValue + '. ' + item.codeText}">
</select>
</div>
</td>
<th>세부 지역<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td>
<div class="component-select">
<select class="select-list" name="regionDetailCode" required>
<select class="select-list" name="regionDetailCode" id="regionDetailCode" required>
<option value="">전체</option>
<option th:each="item : ${regionDetailList}"
th:value="${item.id}"
th:text="${item.codeValue + '. ' + item.codeText}">
</select>
</div>
</td>
@@ -165,22 +159,16 @@
<th>업종 대분류</th>
<td>
<div class="component-select">
<select class="select-list" name="industryLargeCode">
<select class="select-list" name="industryLargeCode" id="industryLargeCode">
<option value="">전체</option>
<option th:each="item : ${industryLargeList}"
th:value="${item.id}"
th:text="${item.codeValue + '. ' + item.codeText}">
</select>
</div>
</td>
<th>업종 중분류1</th>
<td>
<div class="component-select">
<select class="select-list" name="industryMiddleCode">
<option value="">전체</option>
<option th:each="item : ${industryMiddleList}"
th:value="${item.id}"
th:text="${item.codeValue + '. ' + item.codeText}">
<select class="select-list" name="industryMiddleCode" id="industryMiddleCode">
<option value="">전체</option>>
</select>
</div>
</td>
@@ -269,6 +257,27 @@
</section>
<section layout:fragment="script">
<script th:inline="javascript">
const regionList = [[${regionSubList}]];
const industryLargeList = [[${industryLargeList}]];
$(document).ready(function () {
// 지역, 세부지역 셀렉트박스 세팅
setSelectBoxUiCode({
codeList: regionList,
parentSelector: '#regionSubCode',
childSelector: '#regionDetailCode'
});
// 업종 대분류, 중분류 셀렉트박스 세팅
setSelectBoxUiCode({
codeList: industryLargeList,
parentSelector: '#industryLargeCode',
childSelector: '#industryMiddleCode',
});
});
</script>
<script th:inline="javascript">
// 임가번호 중복확인 변수
let checkDuplicate = false;

View File

@@ -78,11 +78,8 @@
지역
</p>
</div>
<select class="select-list" name="regionSubCode" th:field="*{regionSubCode}">
<select class="select-list" name="regionSubCode" id="regionSubCode" th:field="*{regionSubCode}">
<option value="">전체</option>
<option th:each="item : ${regionSubList}"
th:value="${item.id}"
th:text="${item.codeValue + '. ' + item.codeText}">
</select>
</div>
<div class="component-select">
@@ -91,11 +88,8 @@
세부지역
</p>
</div>
<select class="select-list" name="regionDetailCode" th:field="*{regionDetailCode}">
<select class="select-list" name="regionDetailCode" id="regionDetailCode" th:field="*{regionDetailCode}">
<option value="">전체</option>
<option th:each="item : ${regionDetailList}"
th:value="${item.id}"
th:text="${item.codeValue + '. ' + item.codeText}">
</select>
</div>
</div>
@@ -109,11 +103,8 @@
업종 대분류
</p>
</div>
<select class="select-list" name="industryLargeCode" th:field="*{industryLargeCode}">
<select class="select-list" name="industryLargeCode" id="industryLargeCode" th:field="*{industryLargeCode}">
<option value="">전체</option>
<option th:each="item : ${industryLargeList}"
th:value="${item.id}"
th:text="${item.codeValue + '. ' + item.codeText}">
</select>
</div>
<div class="component-select">
@@ -122,11 +113,8 @@
업종 중분류
</p>
</div>
<select class="select-list" name="industryMiddleCode" th:field="*{industryMiddleCode}">
<select class="select-list" name="industryMiddleCode" id="industryMiddleCode" th:field="*{industryMiddleCode}">
<option value="">전체</option>
<option th:each="item : ${industryMiddleList}"
th:value="${item.id}"
th:text="${item.codeValue + '. ' + item.codeText}">
</select>
</div>
</div>
@@ -284,6 +272,9 @@
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
<div class="btns-row align-right">
<button type="button" class="btn" onclick="showExcelHouseholdModal();">
<span class="btn-txt">엑셀 업로드 <i class="ico-download ico-small" aria-hidden="true"></i></span>
</button>
<button type="button" class="btn">
<span class="btn-txt">엑셀 다운로드 <i class="ico-download ico-small" aria-hidden="true"></i></span>
</button>
@@ -302,9 +293,40 @@
</form>
<div th:replace="common/modal-researcher-mapping :: modalFragment"></div>
<div th:replace="households/modal/modal-excel-household :: modalFragment"></div>
</section>
<section layout:fragment="script">
<script th:inline="javascript">
const regionList = [[${regionSubList}]];
const selectedRegionSubCode = /*[[${reqVO.regionSubCode}]]*/ '';
const selectedRegionDetailCode = /*[[${reqVO.regionDetailCode}]]*/ '';
const industryLargeList = [[${industryLargeList}]];
const selectedIndustryLargeCode = /*[[${reqVO.industryLargeCode}]]*/ '';
const selectedIndustryMiddleCode= /*[[${reqVO.industryMiddleCode}]]*/ '';
$(document).ready(function () {
// 지역, 세부지역 셀렉트박스 세팅
setSelectBoxUiCode({
codeList: regionList,
parentSelector: '#regionSubCode',
childSelector: '#regionDetailCode',
selectedParentCode: selectedRegionSubCode,
selectedChildCode: selectedRegionDetailCode
});
// 업종 대분류, 중분류 셀렉트박스 세팅
setSelectBoxUiCode({
codeList: industryLargeList,
parentSelector: '#industryLargeCode',
childSelector: '#industryMiddleCode',
selectedParentCode: selectedIndustryLargeCode,
selectedChildCode: selectedIndustryMiddleCode
});
});
</script>
<script th:inline="javascript">
// 임가 목록 조회
const getHouseholds = (pageNo) => {

View File

@@ -0,0 +1,85 @@
<!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="reqHouseholdExcelForm">
<div class="component-modal mypage-wrap modal01 modal-excel-household" 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">
<label for="householdFile" class="input-file-btn">
<input type="file" name="file" id="householdFile" accept=".xlsx, .xls">
</label>
<div class="component-btns bottom-btn-group">
<div class="btns-row align-right">
<button type="button" class="btn btn-primary" onclick="ExcelUploadHousehold();">
<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">
// 임가방문정보 모달창 띄우기
const showExcelHouseholdModal = () => {
document.querySelector(".modal-excel-household").ui.open();
}
// 임가방문정보 등록
const ExcelUploadHousehold = () => {
event.preventDefault();
const fileInput = document.getElementById('householdFile');
if (fileInput.files.length === 0) {
alert('업로드할 엑셀 파일을 선택해주세요.');
return;
}
let formData = new FormData();
formData.append('file', fileInput.files[0]);
$.ajax({
method: 'POST',
url: '/api/household/excelUpload',
data: formData,
contentType: false, // * 중요 *
processData: false, // * 중요 *
enctype: 'multipart/form-data', // * 중요 *
beforeSend: function (xhr) {
xhr.setRequestHeader(
$("meta[name='_csrf_header']").attr("content"),
$("meta[name='_csrf']").attr("content"));
},
success(res) {
alert("총 "+res.total+"건 중에 "+res.success+"건 등록되었습니다.");
},
statusCode: {
422: (res) => {
const resJson = res.responseJSON;
$(input).parent().find('.invalid-feedback').text(resJson.message);
$(input).addClass('is-invalid');
}
}
});
}
</script>
</div>
</html>

View File

@@ -141,24 +141,16 @@
<th>지역<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td>
<div class="component-select">
<select class="select-list" name="regionSubCode" required>
<select class="select-list" name="regionSubCode" id="regionSubCode" required>
<option value="">전체</option>
<option th:each="item : ${regionSubList}"
th:value="${item.id}"
th:text="${item.codeValue + '. ' + item.codeText}"
th:selected="${item.id == householdInfo.regionSubCode}">
</select>
</div>
</td>
<th>세부 지역<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td>
<div class="component-select">
<select class="select-list" name="regionDetailCode" required>
<select class="select-list" name="regionDetailCode" id="regionDetailCode" required>
<option value="">전체</option>
<option th:each="item : ${regionDetailList}"
th:value="${item.id}"
th:text="${item.codeValue + '. ' + item.codeText}"
th:selected="${item.id == householdInfo.regionDetailCode}">
</select>
</div>
</td>
@@ -178,24 +170,16 @@
<th>업종 대분류</th>
<td>
<div class="component-select">
<select class="select-list" name="industryLargeCode">
<option value="">전체</option>
<option th:each="item : ${industryLargeList}"
th:value="${item.id}"
th:text="${item.codeValue + '. ' + item.codeText}"
th:selected="${item.id == householdInfo.industryLargeCode}">
<select class="select-list" name="industryLargeCode" id="industryLargeCode">
<option value="">전체</option>>
</select>
</div>
</td>
<th>업종 중분류1</th>
<td>
<div class="component-select">
<select class="select-list" name="industryMiddleCode">
<select class="select-list" name="industryMiddleCode" id="industryMiddleCode">
<option value="">전체</option>
<option th:each="item : ${industryMiddleList}"
th:value="${item.id}"
th:text="${item.codeValue + '. ' + item.codeText}"
th:selected="${item.id == householdInfo.industryMiddleCode}">
</select>
</div>
</td>
@@ -296,6 +280,36 @@
</section>
<section layout:fragment="script">
<script th:inline="javascript">
const regionList = [[${regionSubList}]];
const selectedRegionSubCode = /*[[${householdInfo.regionSubCode}]]*/ '';
const selectedRegionDetailCode = /*[[${householdInfo.regionDetailCode}]]*/ '';
const industryLargeList = [[${industryLargeList}]];
const selectedIndustryLargeCode = /*[[${householdInfo.industryLargeCode}]]*/ '';
const selectedIndustryMiddleCode= /*[[${householdInfo.industryMiddleCode}]]*/ '';
$(document).ready(function () {
// 지역, 세부지역 셀렉트박스 세팅
setSelectBoxUiCode({
codeList: regionList,
parentSelector: '#regionSubCode',
childSelector: '#regionDetailCode',
selectedParentCode: selectedRegionSubCode,
selectedChildCode: selectedRegionDetailCode
});
// 업종 대분류, 중분류 셀렉트박스 세팅
setSelectBoxUiCode({
codeList: industryLargeList,
parentSelector: '#industryLargeCode',
childSelector: '#industryMiddleCode',
selectedParentCode: selectedIndustryLargeCode,
selectedChildCode: selectedIndustryMiddleCode
});
});
</script>
<script th:inline="javascript">
// 임가 수정
const updateHousehold= () => {

View File

@@ -0,0 +1,110 @@
package app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence;
import app.module.core.config.application.util.AuditUtil;
import app.module.core.usecase.admin.checkAdminId.persistence.CheckAdminIdMapper;
import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelAdminCreateVO;
import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelResultVO;
import app.module.core.usecase.admin.excelSaveAdmin.ports.ExcelSaveAdminPortOut;
import app.module.core.usecase.admin.saveAdmin.adapters.persistence.SaveAdminMapper;
import app.module.core.usecase.admin.saveAdmin.adapters.persistence.model.SaveAdminHasRoleParam;
import app.module.core.usecase.admin.saveAdmin.ports.application.domain.SaveAdminCmd;
import app.module.core.usecase.uicode.list.adapters.persistence.UICodeListMapper;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import lombok.RequiredArgsConstructor;
import org.apache.poi.ss.usermodel.*;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.List;
@Component
@RequiredArgsConstructor
class ExcelSaveAdminIdDao implements ExcelSaveAdminPortOut {
private final CheckAdminIdMapper checkAdminIdMapper;
private final SaveAdminMapper saveAdminMapper;
private final BCryptPasswordEncoder passwordEncoder;
private final UICodeListMapper uiCodeListMapper;
@Override
@Transactional
public ExcelResultVO operate(MultipartFile file) throws IOException {
// 엑셀 파일 읽기
Workbook workbook = WorkbookFactory.create(file.getInputStream());
Sheet sheet = workbook.getSheetAt(0);
Integer success = 0;
List<UICodeElement> uiCodeElementList = uiCodeListMapper.findByParentId("code.region.main");
// 첫 번째 행은 헤더로 간주하고 스킵
for (int i = 1; i <= sheet.getLastRowNum(); i++) {
Row row = sheet.getRow(i);
if (row == null) continue;
ExcelAdminCreateVO admin = new ExcelAdminCreateVO();
admin.setRoleId(getRoleId(row.getCell(0))); // 권한
admin.setRegionMainCode(getRegionMainCode(row.getCell(1),uiCodeElementList)); // 실사
admin.setId(getCellValue(row.getCell(2))); // ID
admin.setPassword(getCellValue(row.getCell(3))); // 비밀번호
admin.setName(getCellValue(row.getCell(4))); // 이름
admin.setPhone(getCellValue(row.getCell(5))); // 전화번호
Integer duplicate = checkAdminIdMapper.checkAdminId(admin.getId());
if(duplicate == 0) {
SaveAdminCmd cmd = new SaveAdminCmd(
null,
admin.getId(),
passwordEncoder.encode(admin.getPassword()),
LocalDateTime.now(),
admin.getName(),
admin.getPhone(),
admin.getRegionMainCode(),
false,
0,
admin.getRoleId()
);
success += saveAdminMapper.insertAdmin(AuditUtil.create(cmd));
if (!admin.getRoleId().isEmpty()) {
saveAdminMapper.insertAdminHasRoles(
AuditUtil.create(new SaveAdminHasRoleParam(cmd.getSeq(), admin.getRoleId())));
}
}
}
workbook.close();
return new ExcelResultVO(sheet.getLastRowNum()-1 , success);
}
// 셀 값을 문자열로 변환
private String getCellValue(Cell cell) {
if (cell == null) return "";
return switch (cell.getCellType()) {
case STRING -> cell.getStringCellValue();
case NUMERIC -> String.valueOf((long) cell.getNumericCellValue());
default -> "";
};
}
private String getRoleId(Cell cell){
if (cell == null) return "";
return switch (cell.getStringCellValue().trim()) {
case "관리자" -> "ROLE_ADMIN";
case "지방실사" -> "ROLE_LOCAL_INSPECTOR";
case "조사원" -> "ROLE_RESEARCHER";
default -> "";
};
}
private String getRegionMainCode(Cell cell,List<UICodeElement> uiCodeElementList){
if (cell == null) return "";
return uiCodeElementList.stream().filter(code -> code.getCodeText().equals(cell.getStringCellValue().trim()))
.findFirst()
.map(UICodeElement::getId).orElse("");
}
}

View File

@@ -0,0 +1,20 @@
package app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
public class ExcelAdminCreateVO {
private Long seq;
private String id;
private String password;
private String name;
private String phone;
private String regionMainCode;
private String roleId;
}

View File

@@ -0,0 +1,15 @@
package app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
public class ExcelResultVO {
private Integer total;
private Integer success;
}

View File

@@ -0,0 +1,9 @@
package app.module.core.usecase.admin.excelSaveAdmin.ports;
import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelResultVO;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
public interface ExcelSaveAdminPortIn {
ExcelResultVO operate(MultipartFile file) throws IOException;
}

View File

@@ -0,0 +1,11 @@
package app.module.core.usecase.admin.excelSaveAdmin.ports;
import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelResultVO;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
public interface ExcelSaveAdminPortOut {
ExcelResultVO operate(MultipartFile file) throws IOException;
}

View File

@@ -0,0 +1,26 @@
package app.module.core.usecase.admin.excelSaveAdmin.ports.application;
import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelResultVO;
import app.module.core.usecase.admin.excelSaveAdmin.ports.ExcelSaveAdminPortIn;
import app.module.core.usecase.admin.excelSaveAdmin.ports.ExcelSaveAdminPortOut;
import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortOut;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
@Service
@RequiredArgsConstructor
public class ExcelSaveAdminService implements ExcelSaveAdminPortIn {
private final ExcelSaveAdminPortOut excelSaveAdminPortOut;
@Override
public ExcelResultVO operate(MultipartFile file) throws IOException {
return excelSaveAdminPortOut.operate(file);
}
}

View File

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface SaveAdminMapper {
void insertAdmin(SaveAdminCmd cmd);
Integer insertAdmin(SaveAdminCmd cmd);
void updateAdmin(SaveAdminCmd cmd);
void insertAdminHasRoles(SaveAdminHasRoleParam param);
void deleteAdminRolesByAdminId(DeleteAdminHasRoleParam param);

View File

@@ -4,6 +4,7 @@ import app.module.core.config.adapters.persistence.entity.UploadFile;
import app.module.core.config.application.annotation.DeleteCommand;
import app.module.core.config.application.annotation.UpdateCommand;
import app.module.core.config.application.enums.FileUploadType;
import app.module.core.config.application.util.AuditUtil;
import app.module.core.config.application.util.CommonUtil;
import app.module.core.config.application.util.SftpFileDeleteUtil;
import app.module.core.usecase.file.createFile.ports.CreateFilePortOut;
@@ -34,11 +35,11 @@ class UpdateFileDao implements UpdateFilePortOut {
@DeleteCommand
public void operate(UpdateFileCmd command) {
List<UploadFileDto> deletedFileList = mapper.findDeleteFileList(new UpdateUploadFileParam(
List<UploadFileDto> deletedFileList = mapper.findDeleteFileList(AuditUtil.update(new UpdateUploadFileParam(
command.getId(),
command.getFileMappingIds(),
command.getType().getName()
));
)));
for (UploadFileDto file : deletedFileList) {
try {
@@ -54,13 +55,13 @@ class UpdateFileDao implements UpdateFilePortOut {
if (!deletedFileList.isEmpty()) {
mapper.deleteFile(
new UpdateUploadFileParam(
AuditUtil.delete(new UpdateUploadFileParam(
command.getId(),
deletedFileList.stream().map(UploadFileDto::getId).toList(),
command.getType().getName()));
command.getType().getName())));
}
command.getFileMappingIds().forEach(fileId -> mapper.updateFile(new UploadFileDto(fileId, command.getId(),command.getType().getName())));
command.getFileMappingIds().forEach(fileId -> mapper.updateFile(AuditUtil.update(new UploadFileDto(fileId, command.getId(),command.getType().getName()))));
}
}

View File

@@ -8,4 +8,5 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface UICodeListMapper {
List<UICodeElement> findByParentId(@Param("parentId") String parentId);
List<UICodeElement> findByLikeId(@Param("id") String id);
}

View File

@@ -23,6 +23,13 @@ class UICodeTopTierDao implements UICodeTopTierPortOut {
return recursiveMapping(topTier);
}
@Override
@Transactional
public UICodeTopTier connect(String id) {
UICode topTier = mapper.findTopTierId(id);
return recursiveMapping(topTier);
}
private UICodeTopTier recursiveMapping(UICode topTier) {
List<UICode> children = mapper.findChildren(topTier.getId());

View File

@@ -7,5 +7,6 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface UICodeTopTierMapper {
UICode findTopTier(); // parent_id IS NULL 인 UICode 조회
UICode findTopTierId(String id); // UICode id 조회
List<UICode> findChildren(String parentId); // 재귀 하위 코드
}

View File

@@ -5,4 +5,5 @@ import app.module.core.usecase.uicode.toptier.ports.application.domain.UICodeTop
public interface UICodeTopTierPortIn {
UICodeTopTier connect();
UICodeTopTier connect(String id);
}

View File

@@ -5,4 +5,5 @@ import app.module.core.usecase.uicode.toptier.ports.application.domain.UICodeTop
public interface UICodeTopTierPortOut {
UICodeTopTier connect();
UICodeTopTier connect(String id);
}

View File

@@ -16,4 +16,10 @@ public class UICodeTopTierService implements UICodeTopTierPortIn {
public UICodeTopTier connect() {
return portOut.connect();
}
@Override
public UICodeTopTier connect(String parentId) {
return portOut.connect(parentId);
}
}

View File

@@ -3,7 +3,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="app.module.core.usecase.admin.saveAdmin.adapters.persistence.SaveAdminMapper">
<insert id="insertAdmin">
<update id="insertAdmin">
<selectKey keyProperty="seq" resultType="long" order="BEFORE">
SELECT nextval('admin_seq')
</selectKey>
@@ -29,7 +29,7 @@
#{accountDisabled},
#{loginFailCnt},
<include refid="common.fields.CreateUpdateBaseValues"/>)
</insert>
</update>
<update id="updateAdmin">
/* updateAdmin : 관리자 정보 수정 */

View File

@@ -19,4 +19,20 @@
ORDER BY order_no ASC
</select>
<select id="findByLikeId" resultType="app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement">
SELECT
id,
parent_id,
order_no,
code_text,
code_value,
code_type,
msg_code,
in_use
FROM uicode
WHERE id LIKE '%' || #{id} || '%'
AND is_deleted = false
ORDER BY order_no ASC
</select>
</mapper>

View File

@@ -19,4 +19,12 @@
AND is_deleted = false
ORDER BY order_no ASC
</select>
<select id="findTopTierId"
resultType="app.module.core.config.adapters.persistence.entity.UICode">
SELECT id, code_text, order_no, parent_id
FROM uicode
WHERE id = #{id}
AND is_deleted = false
</select>
</mapper>

View File

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

View File

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

View File

@@ -61,7 +61,8 @@ class CreateBankInputController {
//TODO 트렌젝션 고려
removeBanksPortIn.operate(new RemoveBanksCmd(currentMonthlyInfo.getId(), AuthUtil.getUserSeq(), reqVO.getTransferType()));
if (!reqVO.getStatus() && reqVO.getBankList() != null && !reqVO.getBankList().isEmpty()) { // 등록없음 처리가 아님.
// if (!reqVO.getStatus() && reqVO.getBankList() != null && !reqVO.getBankList().isEmpty()) { // 등록없음 처리가 아님.
if (reqVO.getBankList() != null && !reqVO.getBankList().isEmpty()) { // 등록없음 처리가 아님.
for (CreateBankInputProductReqVO item : reqVO.getBankList()) {
UICodeView code = uiCodeViewPortIn.connect(item.getTransferCategoryCode()).orElse(null);
@@ -99,16 +100,17 @@ class CreateBankInputController {
reqVO.getTransferType().equals("code.bank.input") ? MonthStatus.REGISTERED : currentMonthlyInfo.getBankAutoTransferInputStatus(),
reqVO.getTransferType().equals("code.bank.output") ? MonthStatus.REGISTERED : currentMonthlyInfo.getBankAutoTransferOutputStatus()
));
} else {
updateMonthlyInputStatusPortIn.operate(new UpdateMonthlyInputStatusCmd(
currentMonthlyInfo.getId(),
AuthUtil.getUserSeq(),
currentMonthlyInfo.getMonth(),
currentMonthlyInfo.getBankAutoTransferInputStatus(),
reqVO.getTransferType().equals("code.bank.input") ? MonthStatus.NOTHING : currentMonthlyInfo.getBankAutoTransferInputStatus(),
reqVO.getTransferType().equals("code.bank.output") ? MonthStatus.NOTHING : currentMonthlyInfo.getBankAutoTransferOutputStatus()
));
}
// else {
// updateMonthlyInputStatusPortIn.operate(new UpdateMonthlyInputStatusCmd(
// currentMonthlyInfo.getId(),
// AuthUtil.getUserSeq(),
// currentMonthlyInfo.getMonth(),
// currentMonthlyInfo.getBankAutoTransferInputStatus(),
// reqVO.getTransferType().equals("code.bank.input") ? MonthStatus.NOTHING : currentMonthlyInfo.getBankAutoTransferInputStatus(),
// reqVO.getTransferType().equals("code.bank.output") ? MonthStatus.NOTHING : currentMonthlyInfo.getBankAutoTransferOutputStatus()
// ));
// }
return ResponseEntity.ok(ApiResponse.success(null));
} else {
return ResponseEntity.ok(ApiResponse.failure(null));

View File

@@ -13,7 +13,7 @@ import java.util.List;
public class CreateBankInputReqVO {
private Boolean status;
// private Boolean status;
private Long id;
private String transferType;
private List<CreateBankInputProductReqVO> bankList;

View File

@@ -23,7 +23,7 @@
AND a.forest_product_status != 'NONE'
AND a.household_seq = #{householdSeq}
AND a.month = (
SELECT TO_CHAR(TO_DATE(month, 'YYYY-MM') - INTERVAL '1 month', 'YYYY-MM')
SELECT TO_CHAR(TO_DATE(month, 'YYYYMM') - INTERVAL '1 month', 'YYYYMM')
FROM monthly_input_status
WHERE is_deleted = false AND id = #{id}
);

View File

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

After

Width:  |  Height:  |  Size: 974 B

View File

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

After

Width:  |  Height:  |  Size: 800 B

View File

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

After

Width:  |  Height:  |  Size: 974 B

File diff suppressed because one or more lines are too long

View File

@@ -6198,7 +6198,7 @@ button.swiper-pagination-bullet {
position: absolute;
display: none;
width: 100%;
background-color: #eeeeee;
background-color: #ffffff;
border: 0.1rem solid #cccccc;
}
.component-select.type-custom .option {
@@ -6262,9 +6262,9 @@ button.swiper-pagination-bullet {
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
background-color: #ffffff;
width: 100%;
position: absolute;
background-color: #eeeeee;
border: 1px solid #cccccc;
}
@media screen and (max-width: 1023px) {
@@ -6320,6 +6320,7 @@ button.swiper-pagination-bullet {
.component-select.bottom-sheet .select-options .option.current {
font-weight: 600;
color: #4bbc43;
background-color: #F9FDF9;
}
/* component tab */
@@ -7730,6 +7731,15 @@ button.swiper-pagination-bullet {
.footer .footer-menu ul li.menu-info.active {
background-image: url("../images/common/ico_menu_info_active.svg");
}
.footer .footer-menu ul li.menu-use {
background-image: url("../images/common/ico_menu_use.svg");
}
.footer .footer-menu ul li.menu-use.active {
background-image: url("../images/common/ico_menu_use_active.svg");
}
.footer .footer-menu ul li.menu-use.disabled {
background-image: url("../images/common/ico_menu_use_disabled.svg");
}
.footer .footer-menu ul li.active a {
color: #4bbc43;
}
@@ -8512,6 +8522,7 @@ button.swiper-pagination-bullet {
line-height: 140%;
color: #868e96;
word-break: break-all;
white-space: nowrap;
}
.regist-item-area .item-list .list-item .detail-list li p::before {
position: absolute;
@@ -9045,4 +9056,105 @@ button.swiper-pagination-bullet {
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
}
.regi-wrap .month-detail {
border-image-outset: 0rem 0rem 6.4rem 0rem;
}
.regi-wrap .month-detail .tit {
padding-top: 3.2rem;
margin-bottom: 2rem;
font-size: 2rem;
line-height: 140%;
font-weight: 700;
}
.regi-wrap .month-detail .btn-column-list a {
padding: 0;
}
.regi-wrap .month-detail .btn-column-list .value li {
padding: 0;
box-shadow: none;
border: 0;
}
.regi-wrap .component-select.bottom-sheet {
width: -webkit-fit-content;
width: -moz-fit-content;
width: fit-content;
}
.regi-wrap .component-select.bottom-sheet::after {
display: none;
}
.regi-wrap .component-select.bottom-sheet .select-box {
position: relative;
padding: 0;
border: none;
border-radius: 0;
}
.regi-wrap .component-select.bottom-sheet .select-box::after {
position: absolute;
content: "";
display: block;
width: 3.2rem;
height: 3.2rem;
right: -4rem;
top: 50%;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
background: url("../images/common/ico_cal_arrow_next.svg") center/contain no-repeat;
rotate: 90deg;
-webkit-transform-origin: top;
transform-origin: top;
}
.regi-wrap .component-select.bottom-sheet .select-box .select-txt {
font-size: 2.8rem;
line-height: 140%;
font-weight: 700;
}
.regi-wrap .month-filter {
padding: 3.2rem 0rem;
}
.regi-wrap .month-filter .summary {
display: -webkit-box;
display: -webkit-flex;
display: flex;
gap: 0.4rem;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
justify-content: space-between;
border-radius: 0.8rem;
overflow: hidden;
}
.regi-wrap .month-filter .summary li {
-webkit-box-flex: 1;
-webkit-flex: 1;
flex: 1;
padding: 1.6rem;
background-color: #f1faf0;
}
.regi-wrap .month-filter .summary li span {
color: #212529;
font-size: 1.6rem;
line-height: 140%;
}
.regi-wrap .month-filter .summary li p {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
-webkit-box-pack: end;
-webkit-justify-content: end;
justify-content: end;
margin-top: 1.2rem;
font-size: 1.6rem;
line-height: 140%;
color: #4bbc43;
text-align: right;
}
.regi-wrap .month-filter .summary li p strong {
margin-right: 0.2rem;
font-size: 2.8rem;
line-height: 140%;
font-weight: 700;
}
/*# sourceMappingURL=style.css.map */

View File

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

View File

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

View File

@@ -31,18 +31,18 @@
<span class="btn-txt">추가 등록</span>
</button>
<button type="button" class="btn btn-m btn-link btn-full" id="callPastInfoBtn">
<button type="button" class="btn btn-m btn-link btn-full" id="callPastInfoBtn" onclick="formControl.checkUsePastData()">
<span class="btn-txt">이전 정보 불러오기</span>
</button>
<div class="component-input align-center" id="forestProductStatusDiv">
<label class="checkbox-inner">
<input type="checkbox" id="forestProductStatus" name="forestProductStatus"
th:value="${MonthStatus.NOTHING}" onchange="formControl.handleNoDataToggle()">
<span class="checkbox-item"><span class="checkbox-txt">이번달 등록내용 없음</span></span>
</label>
</div>
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
<!-- <div class="component-input align-center" id="forestProductStatusDiv">-->
<!-- <label class="checkbox-inner">-->
<!-- <input type="checkbox" id="forestProductStatus" name="forestProductStatus"-->
<!-- th:value="${MonthStatus.NOTHING}" onchange="formControl.handleNoDataToggle()">-->
<!-- <span class="checkbox-item"><span class="checkbox-txt">이번달 등록내용 없음</span></span>-->
<!-- </label>-->
<!-- </div>-->
</section>
@@ -97,7 +97,7 @@
</div>"/api/front/info/bank/create"
</div>
<section layout:fragment="script">
<script th:inline="javascript">
@@ -122,7 +122,7 @@
editable: /*[[${editable}]]*/,
},
elementRefs: {
noDataCheckbox: document.getElementById("forestProductStatus"),
// noDataCheckbox: document.getElementById("forestProductStatus"),
select:{
cropCodeSelect : null,
transferCategoryCodeSelect : null,
@@ -190,7 +190,8 @@
const callPastInfoBtn = document.getElementById("callPastInfoBtn");
//데이터 없음 버튼
const forestProductStatus = document.getElementById("forestProductStatus");
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
// const forestProductStatus = document.getElementById("forestProductStatus");
//등록 완료 버튼
const next = document.getElementById('complateBtn');
@@ -206,15 +207,17 @@
if (ENV.data.pastStatus && ENV.data.pastStatus == "REGISTERED" && ENV.data.pastBankList.length > 0) {
this.checkUsePastData();
}
} else if (ENV.data.currentStatus == "NOTHING") {
addItemBtn.disabled = true;
icon.classList.toggle("ico-add", false);
icon.classList.toggle("ico-add-disabled", true);
callPastInfoBtn.disabled = true;
forestProductStatus.checked = true;
next.disabled = true;
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
// }
// else if (ENV.data.currentStatus == "NOTHING") {
//
//
// addItemBtn.disabled = true;
// icon.classList.toggle("ico-add", false);
// icon.classList.toggle("ico-add-disabled", true);
// callPastInfoBtn.disabled = true;
// forestProductStatus.checked = true;
// next.disabled = true;
} else if (ENV.data.currentStatus == "REGISTERED") {
if (ENV.data.bankList.length > 0) {
@@ -240,7 +243,7 @@
icon.classList.toggle("ico-add", false);
icon.classList.toggle("ico-add-disabled", true);
callPastInfoBtn.disabled = true;
forestProductStatus.disabled = true;
// forestProductStatus.disabled = true;
next.disabled = true;
next.style.display = "none";
clearAllItems.style.display = "none";
@@ -321,31 +324,33 @@
},
updateLayout() {
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
// const btn = document.getElementById("addItemBtn");
// const isChecked = ENV.elementRefs.noDataCheckbox.checked;
// const icon = btn.querySelector("i");
// const status = document.getElementById('forestProductStatusDiv');
const isChecked = ENV.elementRefs.noDataCheckbox.checked;
const btn = document.getElementById("addItemBtn");
const icon = btn.querySelector("i");
const status = document.getElementById('forestProductStatusDiv');
const callPastInfoBtn = document.getElementById("callPastInfoBtn");
const next = document.getElementById('complateBtn');
const header = document.getElementById('listHeader');
const count = document.getElementById('listCount');
const totalItems = document.getElementById('totalItems');
const total = ENV.data.bankList.length;
const isData = total > 0;
header.style.display = total > 0 ? '' : 'none';
status.style.display = total > 0 ? 'none' : '';
callPastInfoBtn.style.display = total > 0 ? 'none' : '';
header.style.display = isData ? '' : 'none';
// status.style.display = total > 0 ? 'none' : '';
callPastInfoBtn.style.display = isData? 'none' : '';
count.textContent = total;
totalItems.textContent = total;
btn.disabled = isChecked;
icon.classList.toggle("ico-add", !isChecked);
icon.classList.toggle("ico-add-disabled", isChecked);
if (isChecked) {
next.disabled = !isChecked;
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
// btn.disabled = isData;
// icon.classList.toggle("ico-add", !isData);
// icon.classList.toggle("ico-add-disabled", isData);
if (isData) {
next.disabled = !isData;
} else {
next.disabled = total <= 0;
}
@@ -474,9 +479,6 @@
ENV.data.bankList = [];
document.getElementById('listBody').innerHTML = '';
formControl.updateLayout();
// TODO(ks): 선택 삭제 시 전체 count 미반영 중. 일단 전체 초기화에서만 count 갱신.
document.getElementById('totalItems').textContent = ENV.data.bankList.length;
},
});
},
@@ -487,7 +489,7 @@
ajaxUtil._ajaxAsync(
ENV.httpUrl.save,
{
status: ENV.elementRefs.noDataCheckbox.checked,
// status: ENV.elementRefs.noDataCheckbox.checked,
id: ENV.data.id,
transferType:"code.bank.input",
bankList: ENV.data.bankList
@@ -532,10 +534,14 @@
: `${getCategory(categoryCode)}`;
let tagCount = '';
if(product.count && product.unitCode != "code.record.unit.self"){
tagCount = `<li><p>수량</p><span>${format(product.count)}${getUnit(product.unitCode)}</span></li>`;
if (product.count > 0) {
const unitText = product.unitCode !== 'code.record.unit.self'
? getUnit(product.unitCode)
: product.unit;
tagCount = `<li><p>수량</p><span>${format(product.count)}${unitText}</span></li>`;
} else {
tagCount = `<li><p>수량</p><span>${format(product.count)}${product.unit}</span></li>`
tagCount = '';
}
const buttonGroupHtml = isEdit
@@ -557,7 +563,9 @@
${buttonGroupHtml}
</div>
<ul class="detail-list">
<li><p>재배형태</p><span>${getCrop(product.cropCode)}</span></li>
${product.cropCode != null && product.cropCode != ''
? `<li><p>재배형태</p><span>${getCrop(product.cropCode)}</span></li>`
: ''}
${product.sourcePurpose != null && product.sourcePurpose != ''
? `<li><p>수입원</p><span>${product.sourcePurpose}</span></li>`
: ''}

View File

@@ -31,18 +31,18 @@
<span class="btn-txt">추가 등록</span>
</button>
<button type="button" class="btn btn-m btn-link btn-full" id="callPastInfoBtn">
<button type="button" class="btn btn-m btn-link btn-full" id="callPastInfoBtn" onclick="formControl.checkUsePastData()">
<span class="btn-txt">이전 정보 불러오기</span>
</button>
<div class="component-input align-center" id="forestProductStatusDiv">
<label class="checkbox-inner">
<input type="checkbox" id="forestProductStatus" name="forestProductStatus"
th:value="${MonthStatus.NOTHING}" onchange="formControl.handleNoDataToggle()">
<span class="checkbox-item"><span class="checkbox-txt">이번달 등록내용 없음</span></span>
</label>
</div>
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
<!-- <div class="component-input align-center" id="forestProductStatusDiv">-->
<!-- <label class="checkbox-inner">-->
<!-- <input type="checkbox" id="forestProductStatus" name="forestProductStatus"-->
<!-- th:value="${MonthStatus.NOTHING}" onchange="formControl.handleNoDataToggle()">-->
<!-- <span class="checkbox-item"><span class="checkbox-txt">이번달 등록내용 없음</span></span>-->
<!-- </label>-->
<!-- </div>-->
</section>
@@ -122,7 +122,7 @@
editable: /*[[${editable}]]*/,
},
elementRefs: {
noDataCheckbox: document.getElementById("forestProductStatus"),
// noDataCheckbox: document.getElementById("forestProductStatus"),
select:{
transferCategoryCodeSelect : null,
unitCodeSelect : null,
@@ -189,7 +189,8 @@
const callPastInfoBtn = document.getElementById("callPastInfoBtn");
//데이터 없음 버튼
const forestProductStatus = document.getElementById("forestProductStatus");
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
// const forestProductStatus = document.getElementById("forestProductStatus");
//등록 완료 버튼
const next = document.getElementById('complateBtn');
@@ -205,15 +206,16 @@
if (ENV.data.pastStatus && ENV.data.pastStatus == "REGISTERED" && ENV.data.pastBankList.length > 0) {
this.checkUsePastData();
}
} else if (ENV.data.currentStatus == "NOTHING") {
addItemBtn.disabled = true;
icon.classList.toggle("ico-add", false);
icon.classList.toggle("ico-add-disabled", true);
callPastInfoBtn.disabled = true;
forestProductStatus.checked = true;
next.disabled = true;
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
// } else if (ENV.data.currentStatus == "NOTHING") {
//
//
// addItemBtn.disabled = true;
// icon.classList.toggle("ico-add", false);
// icon.classList.toggle("ico-add-disabled", true);
// callPastInfoBtn.disabled = true;
// forestProductStatus.checked = true;
// next.disabled = true;
} else if (ENV.data.currentStatus == "REGISTERED") {
if (ENV.data.bankList.length > 0) {
@@ -239,7 +241,7 @@
icon.classList.toggle("ico-add", false);
icon.classList.toggle("ico-add-disabled", true);
callPastInfoBtn.disabled = true;
forestProductStatus.disabled = true;
// forestProductStatus.disabled = true;
next.disabled = true;
next.style.display = "none";
clearAllItems.style.display = "none";
@@ -313,30 +315,33 @@
updateLayout() {
const isChecked = ENV.elementRefs.noDataCheckbox.checked;
const btn = document.getElementById("addItemBtn");
const icon = btn.querySelector("i");
const status = document.getElementById('forestProductStatusDiv');
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
// const isChecked = ENV.elementRefs.noDataCheckbox.checked;
// const btn = document.getElementById("addItemBtn");
// const icon = btn.querySelector("i");
// const status = document.getElementById('forestProductStatusDiv');
const callPastInfoBtn = document.getElementById("callPastInfoBtn");
const next = document.getElementById('complateBtn');
const header = document.getElementById('listHeader');
const count = document.getElementById('listCount');
const totalItems = document.getElementById('totalItems');
const total = ENV.data.bankList.length;
const isData = total > 0;
header.style.display = total > 0 ? '' : 'none';
status.style.display = total > 0 ? 'none' : '';
callPastInfoBtn.style.display = total > 0 ? 'none' : '';
header.style.display = isData ? '' : 'none';
// status.style.display = total > 0 ? 'none' : '';
callPastInfoBtn.style.display = isData ? 'none' : '';
count.textContent = total;
totalItems.textContent = total;
btn.disabled = isChecked;
icon.classList.toggle("ico-add", !isChecked);
icon.classList.toggle("ico-add-disabled", isChecked);
if (isChecked) {
next.disabled = !isChecked;
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
// btn.disabled = isData;
// icon.classList.toggle("ico-add", !isData);
// icon.classList.toggle("ico-add-disabled", isData);
if (isData) {
next.disabled = !isData;
} else {
next.disabled = total <= 0;
}
@@ -468,9 +473,6 @@
ENV.data.bankList = [];
document.getElementById('listBody').innerHTML = '';
formControl.updateLayout();
// TODO(ks): 선택 삭제 시 전체 count 미반영 중. 일단 전체 초기화에서만 count 갱신.
document.getElementById('totalItems').textContent = ENV.data.bankList.length;
},
});
},
@@ -481,7 +483,7 @@
ajaxUtil._ajaxAsync(
ENV.httpUrl.save,
{
status: ENV.elementRefs.noDataCheckbox.checked,
// status: ENV.elementRefs.noDataCheckbox.checked,
id: ENV.data.id,
transferType:"code.bank.output",
bankList: ENV.data.bankList
@@ -525,10 +527,14 @@
: `${getCategory(categoryCode)}`;
let tagCount = '';
if(product.count && product.unitCode != "code.record.unit.self"){
tagCount = `<li><p>수량</p><span>${format(product.count)}${getUnit(product.unitCode)}</span></li>`;
if (product.count > 0) {
const unitText = product.unitCode !== 'code.record.unit.self'
? getUnit(product.unitCode)
: product.unit;
tagCount = `<li><p>수량</p><span>${format(product.count)}${unitText}</span></li>`;
} else {
tagCount = `<li><p>수량</p><span>${format(product.count)}${product.unit}</span></li>`
tagCount = '';
}
const buttonGroupHtml = isEdit

View File

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