diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatus.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatus.java
index 41edf2dd..005e1729 100644
--- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatus.java
+++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatus.java
@@ -27,6 +27,5 @@ public class GetHouseholdsStatus {
private Boolean isGiftSent;
private String researcherName;
private String researcherPhone;
- private String view;
private Integer total;
}
diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java b/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java
index 324061a8..8ceea34f 100644
--- a/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java
+++ b/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java
@@ -69,7 +69,7 @@ class ResearcherController {
return ResponseEntity.status(HttpStatus.OK).body(researcherService.searchMappingHousehold(reqVO));
}
- @PostMapping("/surveyor/register")
+ @PostMapping("/mappingHousehold/")
@ResponseBody
public String registerSurveyor(@RequestParam("surveyorId") String surveyorId) {
//surveyorService.registerSurveyor(surveyorId);
diff --git a/admin/src/main/resources/templates/common/modal-household-mapping.html b/admin/src/main/resources/templates/common/modal-household-mapping.html
index bad9f9cb..6825feff 100644
--- a/admin/src/main/resources/templates/common/modal-household-mapping.html
+++ b/admin/src/main/resources/templates/common/modal-household-mapping.html
@@ -25,7 +25,7 @@
@@ -94,7 +94,7 @@
-
@@ -157,11 +157,11 @@
const resetSearchForm = () => {
const form = document.getElementById('reqHouseholdForm');
form.reset();
- $('#ownerField').val('all');
- $('#regionSubCode').val('all');
- $('#regionDetailCode').val('all');
- $('#isPanel').val('all');
- $('#searchMapping').val('all');
+ $('#ownerField').val('');
+ $('#regionSubCode').val('');
+ $('#regionDetailCode').val('');
+ $('#isPanel').val('');
+ $('#searchMapping').val('');
$('#ownerValue').val('');
};
@@ -190,12 +190,12 @@
${ct.householdNum} |
-
${ct.householdName} |
-
${ct.householdPhone} |
-
${ct.regionMainName} |
-
${ct.regionSubName} |
-
${ct.regionDetailName} |
-
${ct.researcherName} |
+
${ct.householdName || '-'} |
+
${ct.householdPhone || '-'} |
+
${ct.regionMainName || '-'} |
+
${ct.regionSubName || '-'} |
+
${ct.regionDetailName|| '-'} |
+
${ct.researcherName || '-'} |
`);
});
diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html
index 30af1164..8f8ca82c 100644
--- a/admin/src/main/resources/templates/researcher/detail.html
+++ b/admin/src/main/resources/templates/researcher/detail.html
@@ -194,14 +194,14 @@
`
| ${ct.householdNum} |
- ${ct.ownerName} |
- ${ct.phone} |
- ${ct.regionMainCodeName} |
- ${ct.regionSubCodeName} |
- ${ct.regionDetailCodeName} |
- ${ct.industryLargeCodeName} |
- ${ct.industryMiddleCodeName} |
- ${ct.panelFlag} |
+ ${ct.ownerName || '-'} |
+ ${ct.phone || '-'} |
+ ${ct.regionMainCodeName || '-'} |
+ ${ct.regionSubCodeName || '-'} |
+ ${ct.regionDetailCodeName || '-'} |
+ ${ct.industryLargeCodeName || '-'} |
+ ${ct.industryMiddleCodeName || '-'} |
+ ${ct.panelFlag || '-'} |
`
);
diff --git a/admin/src/main/resources/templates/researcher/researchers.html b/admin/src/main/resources/templates/researcher/researchers.html
index f0815145..16967ea2 100644
--- a/admin/src/main/resources/templates/researcher/researchers.html
+++ b/admin/src/main/resources/templates/researcher/researchers.html
@@ -126,11 +126,11 @@
tbody.append(
`
- | ${ct.name} |
- ${ct.phone} |
- ${ct.regionMainCodeName} |
- ${ct.householdCount} |
- ${ct.accountDisabledFlag} |
+ ${ct.name || '-'} |
+ ${ct.phone || '-'} |
+ ${ct.regionMainCodeName || '-'} |
+ ${ct.householdCount || '-'} |
+ ${ct.accountDisabledFlag || '-'} |
`
);