Merge branch 'susu' into dev
This commit is contained in:
@@ -27,6 +27,5 @@ public class GetHouseholdsStatus {
|
|||||||
private Boolean isGiftSent;
|
private Boolean isGiftSent;
|
||||||
private String researcherName;
|
private String researcherName;
|
||||||
private String researcherPhone;
|
private String researcherPhone;
|
||||||
private String view;
|
|
||||||
private Integer total;
|
private Integer total;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ class ResearcherController {
|
|||||||
return ResponseEntity.status(HttpStatus.OK).body(researcherService.searchMappingHousehold(reqVO));
|
return ResponseEntity.status(HttpStatus.OK).body(researcherService.searchMappingHousehold(reqVO));
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/surveyor/register")
|
@PostMapping("/mappingHousehold/")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public String registerSurveyor(@RequestParam("surveyorId") String surveyorId) {
|
public String registerSurveyor(@RequestParam("surveyorId") String surveyorId) {
|
||||||
//surveyorService.registerSurveyor(surveyorId);
|
//surveyorService.registerSurveyor(surveyorId);
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
<div class="d-flex">
|
<div class="d-flex">
|
||||||
<div class="component-select">
|
<div class="component-select">
|
||||||
<select class="select-list" id="ownerField" name="ownerField">
|
<select class="select-list" id="ownerField" name="ownerField">
|
||||||
<option value="all" selected>전체</option>
|
<option value="" selected>전체</option>
|
||||||
<option value="ownerName">이름</option>
|
<option value="ownerName">이름</option>
|
||||||
<option value="phone">전화번호</option>
|
<option value="phone">전화번호</option>
|
||||||
</select>
|
</select>
|
||||||
@@ -94,7 +94,7 @@
|
|||||||
<button type="button" class="btn" onclick="resetSearchForm()">
|
<button type="button" class="btn" onclick="resetSearchForm()">
|
||||||
<span class="btn-txt">초기화</span>
|
<span class="btn-txt">초기화</span>
|
||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn btn-primary" onclick="searchHouseholdList()">
|
<button type="button" class="btn btn-primary" th:onclick="|searchHouseholdList(0,${regionMainCode})|">
|
||||||
<span class="btn-txt">검색</span>
|
<span class="btn-txt">검색</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -157,11 +157,11 @@
|
|||||||
const resetSearchForm = () => {
|
const resetSearchForm = () => {
|
||||||
const form = document.getElementById('reqHouseholdForm');
|
const form = document.getElementById('reqHouseholdForm');
|
||||||
form.reset();
|
form.reset();
|
||||||
$('#ownerField').val('all');
|
$('#ownerField').val('');
|
||||||
$('#regionSubCode').val('all');
|
$('#regionSubCode').val('');
|
||||||
$('#regionDetailCode').val('all');
|
$('#regionDetailCode').val('');
|
||||||
$('#isPanel').val('all');
|
$('#isPanel').val('');
|
||||||
$('#searchMapping').val('all');
|
$('#searchMapping').val('');
|
||||||
$('#ownerValue').val('');
|
$('#ownerValue').val('');
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -190,12 +190,12 @@
|
|||||||
</label>
|
</label>
|
||||||
</td>
|
</td>
|
||||||
<td>${ct.householdNum}</td>
|
<td>${ct.householdNum}</td>
|
||||||
<td>${ct.householdName}</td>
|
<td>${ct.householdName || '-'}</td>
|
||||||
<td>${ct.householdPhone}</td>
|
<td>${ct.householdPhone || '-'}</td>
|
||||||
<td>${ct.regionMainName}</td>
|
<td>${ct.regionMainName || '-'}</td>
|
||||||
<td>${ct.regionSubName}</td>
|
<td>${ct.regionSubName || '-'}</td>
|
||||||
<td>${ct.regionDetailName}</td>
|
<td>${ct.regionDetailName|| '-'}</td>
|
||||||
<td>${ct.researcherName}</td>
|
<td>${ct.researcherName || '-'}</td>
|
||||||
</tr>
|
</tr>
|
||||||
`);
|
`);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -194,14 +194,14 @@
|
|||||||
`
|
`
|
||||||
<tr data-id="${ct.seq}">
|
<tr data-id="${ct.seq}">
|
||||||
<td class="underline"><a href="">${ct.householdNum}</a></td>
|
<td class="underline"><a href="">${ct.householdNum}</a></td>
|
||||||
<td>${ct.ownerName}</td>
|
<td>${ct.ownerName || '-'}</td>
|
||||||
<td>${ct.phone}</td>
|
<td>${ct.phone || '-'}</td>
|
||||||
<td>${ct.regionMainCodeName}</td>
|
<td>${ct.regionMainCodeName || '-'}</td>
|
||||||
<td>${ct.regionSubCodeName}</td>
|
<td>${ct.regionSubCodeName || '-'}</td>
|
||||||
<td>${ct.regionDetailCodeName}</td>
|
<td>${ct.regionDetailCodeName || '-'}</td>
|
||||||
<td>${ct.industryLargeCodeName}</td>
|
<td>${ct.industryLargeCodeName || '-'}</td>
|
||||||
<td>${ct.industryMiddleCodeName}</td>
|
<td>${ct.industryMiddleCodeName || '-'}</td>
|
||||||
<td>${ct.panelFlag}</td>
|
<td>${ct.panelFlag || '-'}</td>
|
||||||
</tr>
|
</tr>
|
||||||
`
|
`
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -126,11 +126,11 @@
|
|||||||
tbody.append(
|
tbody.append(
|
||||||
`
|
`
|
||||||
<tr data-id="${ct.id}">
|
<tr data-id="${ct.id}">
|
||||||
<td class="underline"><a href="javascript:goDetail(${ct.seq})">${ct.name}</a></td>
|
<td class="underline"><a href="javascript:goDetail(${ct.seq})">${ct.name || '-'}</a></td>
|
||||||
<td>${ct.phone}</td>
|
<td>${ct.phone || '-'}</td>
|
||||||
<td>${ct.regionMainCodeName}</td>
|
<td>${ct.regionMainCodeName || '-'}</td>
|
||||||
<td>${ct.householdCount}</td>
|
<td>${ct.householdCount || '-'}</td>
|
||||||
<td>${ct.accountDisabledFlag}</td>
|
<td>${ct.accountDisabledFlag || '-'}</td>
|
||||||
</tr>
|
</tr>
|
||||||
`
|
`
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user