Merge branch 'kangsun' into 'dev'
[BO] 임가현황 작업 중 - url 변경 See merge request korea-research/korea-research!26
This commit is contained in:
@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
class CheckHouseholdNumController {
|
||||
private final CheckHouseholdNumPortIn portIn;
|
||||
|
||||
@GetMapping(path = "/api/household/households/check")
|
||||
@GetMapping(path = "/api/households/check")
|
||||
ResponseEntity<CheckHouseholdNum> operate(
|
||||
@Valid CheckHouseholdNumReqVO reqVO) {
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ class CreateHouseholdController {
|
||||
private final CreateHouseholdValidator validator;
|
||||
private final CreateHouseholdPortIn createHouseholdPortIn;
|
||||
|
||||
@PostMapping(path = "/api/household/households/create")
|
||||
@PostMapping(path = "/api/households/create")
|
||||
ResponseEntity<?> operate(
|
||||
@Valid @RequestBody CreateHouseholdReqVO reqVO, BindingResult bindingResult) {
|
||||
validator.validate(reqVO, bindingResult);
|
||||
|
||||
@@ -16,14 +16,14 @@ class CreateHouseholdUIController {
|
||||
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
|
||||
@GetMapping(path = "/household/households/create")
|
||||
@GetMapping(path = "/households/create")
|
||||
String operate(Model model, @ModelAttribute("reqVO") CreateHouseholdUIReqVO reqVO,
|
||||
RedirectAttributes redirectAttributes) {
|
||||
|
||||
// 임가 등록 페이지는 관리자만 접근 가능
|
||||
if (!AdminUtil.getLoginUserRole().equals("ROLE_ADMIN")) {
|
||||
redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다.");
|
||||
return "redirect:/household/households";
|
||||
return "redirect:/households";
|
||||
}
|
||||
|
||||
// 실사
|
||||
@@ -37,6 +37,6 @@ class CreateHouseholdUIController {
|
||||
// 업종 중분류1
|
||||
model.addAttribute("industryMiddleList", uiCodeListPortIn.connect("code.industry.middle"));
|
||||
|
||||
return "household/households/create";
|
||||
return "households/create";
|
||||
}
|
||||
}
|
||||
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam;
|
||||
class GetHouseholdStatusUIController {
|
||||
private final GetHouseholdStatusPortIn getHouseholdStatusPortIn;
|
||||
|
||||
@GetMapping(path = "/household/households/{seq}")
|
||||
@GetMapping(path = "/households/{seq}")
|
||||
String operate(
|
||||
@PathVariable Long seq,
|
||||
@RequestParam(required = false) String recordMonth,
|
||||
@@ -34,6 +34,6 @@ class GetHouseholdStatusUIController {
|
||||
model.addAttribute("householdInfo",
|
||||
getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null));
|
||||
|
||||
return "household/households/{seq}";
|
||||
return "households/{seq}";
|
||||
}
|
||||
}
|
||||
@@ -20,7 +20,7 @@ import app.module.admin.usecase.household.getHouseholdsStatus.adapters.web.model
|
||||
class GetHouseholdsStatusController {
|
||||
private final GetHouseholdsStatusPortIn portIn;
|
||||
|
||||
@GetMapping(path = "/api/household/households")
|
||||
@GetMapping(path = "/api/households")
|
||||
ResponseEntity<Page<GetHouseholdsStatus>> operate(
|
||||
@PageableDefault(size = 10) Pageable pageable,
|
||||
GetHouseholdsStatusReqVO reqVO) {
|
||||
|
||||
@@ -3,7 +3,6 @@ package app.module.admin.usecase.household.getHouseholdsStatusUI;
|
||||
import app.module.admin.config.application.util.AdminUtil;
|
||||
import app.module.admin.config.application.util.DateUiUtil;
|
||||
import app.module.admin.usecase.household.getHouseholdsStatusUI.model.GetHouseholdsUIReqVO;
|
||||
import app.module.core.config.adapters.persistence.entity.Admin;
|
||||
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;
|
||||
@@ -20,7 +19,7 @@ class GetHouseholdsStatusUIController {
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
private final AdminViewPortIn adminViewPortIn;
|
||||
|
||||
@GetMapping(path = "/household/households")
|
||||
@GetMapping(path = "/households")
|
||||
String operate(
|
||||
Model model,
|
||||
@ModelAttribute("reqVO") GetHouseholdsUIReqVO reqVO) {
|
||||
@@ -56,6 +55,6 @@ class GetHouseholdsStatusUIController {
|
||||
model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
|
||||
model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue());
|
||||
|
||||
return "household/households";
|
||||
return "households/households";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.persistence;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortOut;
|
||||
import java.util.Optional;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class GetHouseholdVisitInfoDao implements GetHouseholdVisitInfoPortOut {
|
||||
private final GetHouseholdVisitInfoMapper mapper;
|
||||
|
||||
@Override
|
||||
public Optional<GetHouseholdVisitInfo> operate(GetHouseholdVisitInfoCmd cmd) {
|
||||
return mapper.getHouseholdVisitInfo(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd;
|
||||
import java.util.Optional;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface GetHouseholdVisitInfoMapper {
|
||||
Optional<GetHouseholdVisitInfo> getHouseholdVisitInfo(GetHouseholdVisitInfoCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web;
|
||||
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortIn;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web.model.GetHouseholdVisitInfoReqVO;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web.model.GetHouseholdVisitInfoResVO;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
class GetHouseholdVisitInfoController {
|
||||
private final GetHouseholdVisitInfoPortIn portIn;
|
||||
|
||||
@GetMapping(path = "/api/visitInfo/{id}")
|
||||
ResponseEntity<?> operate(
|
||||
@PathVariable Long id,
|
||||
GetHouseholdVisitInfoReqVO reqVO) {
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(portIn.operate(new GetHouseholdVisitInfoCmd(id)).orElse(null));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdVisitInfoReqVO {
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdVisitInfoResVO {
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports;
|
||||
|
||||
import java.util.Optional;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd;
|
||||
|
||||
public interface GetHouseholdVisitInfoPortIn {
|
||||
Optional<GetHouseholdVisitInfo> operate(GetHouseholdVisitInfoCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports;
|
||||
|
||||
import java.util.Optional;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd;
|
||||
|
||||
public interface GetHouseholdVisitInfoPortOut {
|
||||
Optional<GetHouseholdVisitInfo> operate(GetHouseholdVisitInfoCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortIn;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortOut;
|
||||
import java.util.Optional;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class GetHouseholdVisitInfoService implements GetHouseholdVisitInfoPortIn {
|
||||
private final GetHouseholdVisitInfoPortOut portOut;
|
||||
|
||||
@Override
|
||||
public Optional<GetHouseholdVisitInfo> operate(GetHouseholdVisitInfoCmd cmd) {
|
||||
return portOut.operate(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain;
|
||||
|
||||
import app.module.admin.config.application.enums.ManagementType;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdVisitInfo {
|
||||
private Long id;
|
||||
private Long householdSeq;
|
||||
private Date visitDate;
|
||||
private ManagementType managementType;
|
||||
private String content;
|
||||
private Boolean isGiftSent;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdVisitInfoCmd {
|
||||
private Long id;
|
||||
}
|
||||
@@ -20,7 +20,7 @@ class UpdateHouseholdController {
|
||||
private final UpdateHouseholdValidator validator;
|
||||
private final UpdateHouseholdPortIn updateHouseholdPortIn;
|
||||
|
||||
@PutMapping(path = "/api/household/households/update")
|
||||
@PutMapping(path = "/api/households/update")
|
||||
ResponseEntity<?> operate(
|
||||
@Valid @RequestBody UpdateHouseholdReqVO reqVO, BindingResult bindingResult) {
|
||||
validator.validate(reqVO, bindingResult);
|
||||
|
||||
@@ -23,7 +23,7 @@ class UpdateHouseholdStatusUIController {
|
||||
private final GetHouseholdStatusPortIn getHouseholdStatusPortIn;
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
|
||||
@GetMapping(path = "/household/households/update/{seq}")
|
||||
@GetMapping(path = "/households/update/{seq}")
|
||||
String operate(@PathVariable Long seq, Model model,
|
||||
@ModelAttribute("reqVO") UpdateHouseholdStatusUIReqVO reqVO,
|
||||
RedirectAttributes redirectAttributes) {
|
||||
@@ -31,7 +31,7 @@ class UpdateHouseholdStatusUIController {
|
||||
// 임가 수정 페이지는 관리자만 접근 가능
|
||||
if (!AdminUtil.getLoginUserRole().equals("ROLE_ADMIN")) {
|
||||
redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다.");
|
||||
return "redirect:/household/households";
|
||||
return "redirect:/households";
|
||||
}
|
||||
|
||||
model.addAttribute("seq", seq);
|
||||
@@ -80,6 +80,6 @@ class UpdateHouseholdStatusUIController {
|
||||
result.getResearcherPhone()
|
||||
));
|
||||
|
||||
return "household/households/update/{seq}";
|
||||
return "households/update/{seq}";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper
|
||||
namespace="app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.persistence.GetHouseholdVisitInfoMapper">
|
||||
<select id="getHouseholdVisitInfo"
|
||||
resultType="app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo">
|
||||
/* getHouseholdVisitInfo : 임가방문정보 상세 조회 */
|
||||
SELECT id,
|
||||
household_seq,
|
||||
visit_date,
|
||||
management_type,
|
||||
content,
|
||||
is_gift_sent
|
||||
FROM household_visit
|
||||
WHERE id = #{id}
|
||||
AND is_deleted = false
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -81,7 +81,7 @@
|
||||
|
||||
<div class="component-btns bottom-btn-group">
|
||||
<div class="btns-row align-right">
|
||||
<button type="button" class="btn btn-secondary" onclick="location.href='/household/households'">
|
||||
<button type="button" class="btn btn-secondary" onclick="location.href='/households'">
|
||||
<span class="btn-txt">취소</span>
|
||||
</button>
|
||||
<button type="button" class="btn btn-primary" onclick="goSave();">
|
||||
|
||||
@@ -246,7 +246,7 @@
|
||||
|
||||
<div class="component-btns bottom-btn-group">
|
||||
<div class="btns-row align-right">
|
||||
<button type="button" class="btn btn-secondary" onclick="location.href='/household/households'">
|
||||
<button type="button" class="btn btn-secondary" onclick="location.href='/households'">
|
||||
<span class="btn-txt">취소</span>
|
||||
</button>
|
||||
<button type="button" class="btn btn-primary" onclick="createHousehold();">
|
||||
@@ -270,7 +270,7 @@
|
||||
const f = document.reqForm;
|
||||
|
||||
ajaxUtil._ajaxMethod(
|
||||
'/api/household/households/check',
|
||||
'/api/households/check',
|
||||
{ householdNum : f.householdNum.value },
|
||||
function(response) { // 성공
|
||||
const message = response.isDuplicated
|
||||
@@ -303,11 +303,11 @@
|
||||
let dataOj = $(f).serializeObject();
|
||||
|
||||
ajaxUtil._ajaxMethod(
|
||||
'/api/household/households/create',
|
||||
'/api/households/create',
|
||||
JSON.stringify(dataOj),
|
||||
function(response) { // 성공
|
||||
alert("등록이 완료되었습니다.");
|
||||
location.href = '/household/households';
|
||||
location.href = '/households';
|
||||
},
|
||||
function (code, rstData) {
|
||||
if(code == 422) alert(rstData.responseText);
|
||||
@@ -3,7 +3,7 @@
|
||||
layout:decorate="~{layout/layout}">
|
||||
|
||||
<section layout:fragment="content">
|
||||
<form autocomplete="off" method="get" name="reqForm" th:action="@{/household/households}"
|
||||
<form autocomplete="off" method="get" name="reqForm" th:action="@{/households}"
|
||||
th:object="${reqVO}">
|
||||
|
||||
<input name="page" th:field="*{page}" type="hidden"/>
|
||||
@@ -289,7 +289,7 @@
|
||||
</button>
|
||||
<!-- 관리자만 노출 -->
|
||||
<button type="button" class="btn" th:if="${userRole == 'ROLE_ADMIN'}"
|
||||
onclick="location.href='/household/households/create'">
|
||||
onclick="location.href='/households/create'">
|
||||
<span class="btn-txt">임가 등록</span>
|
||||
</button>
|
||||
<!-- 관리자, 지방실사만 노출 -->
|
||||
@@ -314,7 +314,7 @@
|
||||
let dataOj = $(f).serializeObject();
|
||||
|
||||
ajaxUtil._ajaxMethod(
|
||||
'/api/household/households',
|
||||
'/api/households',
|
||||
dataOj,
|
||||
function(response) { // 성공
|
||||
console.log("response", response);
|
||||
@@ -335,8 +335,8 @@
|
||||
</label>
|
||||
</div>
|
||||
</td>
|
||||
<td class="underline"><a href="/household/households/${ct.householdSeq}?recordMonth=${f.recordMonth.value}">${ct.householdNum}</a></td><!-- 임가번호 -->
|
||||
<td class="underline"><a href="/household/households/${ct.householdSeq}?recordMonth=${f.recordMonth.value}">${ct.householdName}</a></td><!-- 경영주 이름 -->
|
||||
<td class="underline"><a href="/households/${ct.householdSeq}?recordMonth=${f.recordMonth.value}">${ct.householdNum}</a></td><!-- 임가번호 -->
|
||||
<td class="underline"><a href="/households/${ct.householdSeq}?recordMonth=${f.recordMonth.value}">${ct.householdName}</a></td><!-- 경영주 이름 -->
|
||||
<td>${ct.householdPhone}</td><!-- 경영주 번호 -->
|
||||
<td>${ct.regionMainName}</td><!-- 실사 -->
|
||||
<td>${ct.regionSubName}</td><!-- 지역 -->
|
||||
@@ -351,6 +351,7 @@
|
||||
);
|
||||
});
|
||||
|
||||
<!-- TODO : 2차 오픈 -->
|
||||
// `
|
||||
// <tr>
|
||||
// <td>
|
||||
@@ -360,8 +361,8 @@
|
||||
// </label>
|
||||
// </div>
|
||||
// </td>
|
||||
// <td class="underline"><a href="/household/households/${ct.householdSeq}?recordMonth=${f.recordMonth.value}">${ct.householdNum}</a></td><!-- 임가번호 -->
|
||||
// <td class="underline"><a href="/household/households/${ct.householdSeq}?recordMonth=${f.recordMonth.value}">${ct.householdName}</a></td><!-- 경영주 이름 -->
|
||||
// <td class="underline"><a href="/households/${ct.householdSeq}?recordMonth=${f.recordMonth.value}">${ct.householdNum}</a></td><!-- 임가번호 -->
|
||||
// <td class="underline"><a href="/households/${ct.householdSeq}?recordMonth=${f.recordMonth.value}">${ct.householdName}</a></td><!-- 경영주 이름 -->
|
||||
// <td>${ct.householdPhone}</td><!-- 경영주 번호 -->
|
||||
// <td>${ct.regionMainName}</td><!-- 실사 -->
|
||||
// <td>${ct.regionSubName}</td><!-- 지역 -->
|
||||
@@ -0,0 +1,159 @@
|
||||
<!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="reqVisitForm">
|
||||
<input name="page" value="0" type="hidden"/>
|
||||
<input name="size" value="10" type="hidden">
|
||||
|
||||
<div class="component-modal mypage-wrap modal01 modal-visit-info" data-props-dimm-click="true" data-state="close">
|
||||
<div class="modal-dimm"></div>
|
||||
<div class="modal-frame">
|
||||
<div class="modal-container">
|
||||
<div class="modal-header">
|
||||
<h3 class="modal-tit">
|
||||
임가방문정보
|
||||
</h3>
|
||||
</div>
|
||||
<div class="modal-content">
|
||||
<div class="modal-content-inner">
|
||||
<table class="type-form">
|
||||
<tbody>
|
||||
|
||||
<tr>
|
||||
<th>방문일</th>
|
||||
<td>
|
||||
<div class="component-datepicker">
|
||||
<div class="component-input">
|
||||
<div class="input-field">
|
||||
<input type="text" class="datepicker-btn-trigger" name="visitDate" id="visitDate" aria-label="시작일"
|
||||
placeholder="시작일을 입력해주세요" />
|
||||
<span class="input-field-btn datepicker-state">
|
||||
<span class="hide-txt">달력</span>
|
||||
<i class="ico-calendar ico-normal" aria-hidden="true"></i>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
<th>관리분야<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
|
||||
<td>
|
||||
<div class="component-select">
|
||||
<select class="select-list" name="managementType" required>
|
||||
<option value="" disabled hidden selected>선택</option>
|
||||
<option value="">선택</option>
|
||||
<option value="VISIT">방문조사</option>
|
||||
<option value="CALL">전화상담</option>
|
||||
<option value="ETC">기타</option>
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th>내용<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
|
||||
<td colspan="5">
|
||||
<div class="component-input">
|
||||
<div class="input-textarea-field">
|
||||
<textarea id="textarea_note" class="textarea" name="content" placeholder=""></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th>답례품 전달</th>
|
||||
<td class="radio-group">
|
||||
<div class="component-input">
|
||||
<label class="radio-inner">
|
||||
<input type="radio" id="isGiftSent_Y" name="isGiftSent" value="true">
|
||||
<span class="radio-item">
|
||||
<span class="radio-txt">전달</span>
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="component-input">
|
||||
<label class="radio-inner">
|
||||
<input type="radio" id="isGiftSent_N" name="isGiftSent" value="false" checked>
|
||||
<span class="radio-item">
|
||||
<span class="radio-txt">미전달</span>
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="component-btns bottom-btn-group">
|
||||
<div class="btns-row align-right">
|
||||
<button type="button" class="btn btn-primary" onclick="">
|
||||
<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 resetForm = () => {
|
||||
const form = document.forms['reqVisitForm'];
|
||||
if (!form) return;
|
||||
|
||||
const today = new Date().toISOString().slice(0, 10);
|
||||
form.visitDate.value = today;
|
||||
form.managementType.value = '';
|
||||
form.content.value = '';
|
||||
document.getElementById('isGiftSent_N').checked = true;
|
||||
}
|
||||
</script>
|
||||
|
||||
<script th:inline="javascript">
|
||||
const showVisitInfoModal = (id) => {
|
||||
document.querySelector(".modal-visit-info").ui.open();
|
||||
|
||||
resetForm();
|
||||
|
||||
if(id != null) {
|
||||
ajaxUtil._ajaxMethod(
|
||||
'/api/visitInfo/' + id,
|
||||
{},
|
||||
(response) => {
|
||||
console.log("임가방문정보 상세 응답값 : ", response);
|
||||
setFormData(response);
|
||||
},
|
||||
function (code, rstData) {
|
||||
console.log("error : ", code);
|
||||
},
|
||||
'get',
|
||||
'json'
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
const setFormData = (data) => {
|
||||
const form = document.forms['reqVisitForm'];
|
||||
if (!form) return;
|
||||
|
||||
// 폼에 값 세팅
|
||||
form.visitDate.value = data.visitDate || '';
|
||||
form.managementType.value = data.managementType || '';
|
||||
form.content.value = data.content || '';
|
||||
|
||||
// 라디오 버튼 처리
|
||||
document.getElementById('isGiftSent_Y').checked = data.isGiftSent === true;
|
||||
document.getElementById('isGiftSent_N').checked = data.isGiftSent === false;
|
||||
}
|
||||
</script>
|
||||
</div>
|
||||
</html>
|
||||
@@ -273,7 +273,7 @@
|
||||
|
||||
<div class="component-btns bottom-btn-group">
|
||||
<div class="btns-row align-right">
|
||||
<button type="button" class="btn btn-secondary" onclick="location.href='/household/households'">
|
||||
<button type="button" class="btn btn-secondary" onclick="location.href='/households'">
|
||||
<span class="btn-txt">취소</span>
|
||||
</button>
|
||||
<button type="button" class="btn btn-primary" onclick="updateHousehold();">
|
||||
@@ -295,11 +295,11 @@
|
||||
let dataOj = $(f).serializeObject();
|
||||
|
||||
ajaxUtil._ajaxMethod(
|
||||
'/api/household/households/update',
|
||||
'/api/households/update',
|
||||
JSON.stringify(dataOj),
|
||||
function(response) { // 성공
|
||||
alert("등록이 완료되었습니다.");
|
||||
location.href = '/household/households';
|
||||
location.href = '/households';
|
||||
},
|
||||
function (code, rstData) {
|
||||
if(code == 422) alert(rstData.responseText);
|
||||
@@ -565,7 +565,7 @@
|
||||
<button type="button" class="btn small btn-secondary">
|
||||
<span class=" btn-txt">삭제</span>
|
||||
</button>
|
||||
<button type="button" class="btn small btn-primary">
|
||||
<button type="button" class="btn small btn-primary" onclick="showVisitInfoModal();">
|
||||
<span class="btn-txt">추가</span>
|
||||
</button>
|
||||
</div>
|
||||
@@ -595,7 +595,7 @@
|
||||
<div class="component-btns bottom-btn-group">
|
||||
<div class="btns-row two-col">
|
||||
<div class="btns-col-1">
|
||||
<button type="button" class="btn" onclick="location.href='/household/households'">
|
||||
<button type="button" class="btn" onclick="location.href='/households'">
|
||||
<span class="btn-txt">목록</span>
|
||||
</button>
|
||||
</div>
|
||||
@@ -613,7 +613,12 @@
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<!-- 조사원 매핑 모달 -->
|
||||
<div th:replace="common/modal-researcher-mapping :: modalFragment"></div>
|
||||
|
||||
<!-- 임가방문정보 모달 -->
|
||||
<div th:replace="households/modal/modal-visit-info :: modalFragment"></div>
|
||||
|
||||
</section>
|
||||
|
||||
<section layout:fragment="script">
|
||||
@@ -667,19 +672,15 @@
|
||||
const getTabData = (tabType) => {
|
||||
switch (tabType) {
|
||||
case 'daily-record': // 일계부 등록 현황
|
||||
console.log("일계부 등록 현황");
|
||||
getDailyRecords();
|
||||
break;
|
||||
case 'forest-product': // 임산물 현황
|
||||
console.log("임산물 현황");
|
||||
getForestProductsStatus();
|
||||
break;
|
||||
case 'bank-auto-transfer': // 은행자동이체내역
|
||||
console.log("은행자동이체내역");
|
||||
getBankAutoTransfer();
|
||||
break;
|
||||
case 'household-visit': // 임가방문정보
|
||||
console.log("임가방문정보");
|
||||
getVisitInfo();
|
||||
break;
|
||||
}
|
||||
@@ -1090,7 +1091,7 @@
|
||||
</script>
|
||||
|
||||
<script>
|
||||
// 임가 방문정보 조회
|
||||
// 임가방문정보 조회
|
||||
const getVisitInfo = () => {
|
||||
const f = document.reqForm;
|
||||
|
||||
@@ -1125,7 +1126,7 @@
|
||||
</td>
|
||||
<td>${ifNullHyphen(item.visitDate)}</td> <!-- 방문일 -->
|
||||
<td>${ifNullHyphen(managementType[item.managementType])}</td> <!-- 관리분야 -->
|
||||
<td>${ifNullHyphen(item.content)}</td> <!-- 내용 -->
|
||||
<td class="underline"><a href="javascript:void(0);" onclick="showVisitInfoModal(${item.id});">${ifNullHyphen(item.content)}</a></td> <!-- 내용 -->
|
||||
<td>
|
||||
${item.updatedBy}<br>
|
||||
(${item.updatedAt})
|
||||
@@ -1279,7 +1280,7 @@
|
||||
const goUpdateForm = () => {
|
||||
const f = document.reqForm;
|
||||
|
||||
location.href = '/household/households/update/' + f.householdSeq.value;
|
||||
location.href = '/households/update/' + f.householdSeq.value;
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -190,7 +190,7 @@ public class InitUriAdminData implements ApplicationRunner {
|
||||
ADMIN_HOUSEHOLD,
|
||||
ADMIN_HOUSEHOLD_STATUS,
|
||||
"임가 현황",
|
||||
"/household/households",
|
||||
"/households",
|
||||
true,
|
||||
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
|
||||
|
||||
@@ -199,7 +199,7 @@ public class InitUriAdminData implements ApplicationRunner {
|
||||
ADMIN_HOUSEHOLD,
|
||||
ADMIN_HOUSEHOLD_STATUS_CREATE,
|
||||
"임가 등록",
|
||||
"/household/households/create",
|
||||
"/households/create",
|
||||
false,
|
||||
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
|
||||
|
||||
@@ -208,7 +208,7 @@ public class InitUriAdminData implements ApplicationRunner {
|
||||
ADMIN_HOUSEHOLD,
|
||||
ADMIN_HOUSEHOLD_STATUS_VIEW,
|
||||
"임가 상세",
|
||||
"/household/households/{{pathVar}}",
|
||||
"/households/{{pathVar}}",
|
||||
false,
|
||||
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user