From ecf2dd8dbe9f4b54a16506f505a41a360b458289 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Wed, 18 Jun 2025 21:21:06 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EC=9E=84=EA=B0=80=ED=98=84=ED=99=A9=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=20=EC=A4=91=20(10)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/CreateHouseholdDao.java | 13 +- .../persistence/CreateHouseholdMapper.java | 2 + .../web/CreateHouseholdController.java | 5 +- .../web/model/CreateHouseholdReqVO.java | 2 +- .../web/model/CreateHouseholdResVO.java | 1 + .../domain/CreateHouseholdOutCmd.java | 2 +- .../CreateResearcherHasHouseholdCmd.java | 17 +++ .../CreateResearcherMappingDao.java | 27 ++++ .../CreateResearcherMappingMapper.java | 11 ++ .../CreateResearcherMappingController.java | 38 ++++++ .../model/CreateResearcherMappingReqVO.java | 17 +++ .../model/CreateResearcherMappingResVO.java | 16 +++ .../ports/CreateResearcherMappingPortIn.java | 7 + .../ports/CreateResearcherMappingPortOut.java | 7 + .../CreateResearcherMappingService.java | 18 +++ .../domain/CreateResearcherMappingCmd.java | 17 +++ .../domain/DeleteResearcherMappingCmd.java | 16 +++ .../GetBankAutoTransferExpenseRecords.java | 1 - .../GetBankAutoTransferIncomeRecords.java | 2 +- .../domain/GetForestProductsStatus.java | 8 +- .../persistence/GetPopupResearchersDao.java | 24 ++++ .../GetPopupResearchersMapper.java | 14 ++ .../web/GetPopupResearchersController.java | 29 ++++ .../web/model/GetPopupResearchersReqVO.java | 16 +++ .../web/model/GetPopupResearchersResVO.java | 13 ++ .../ports/GetPopupResearchersPortIn.java | 10 ++ .../ports/GetPopupResearchersPortOut.java | 10 ++ .../GetPopupResearchersService.java | 21 +++ .../domain/GetPopupResearchers.java | 19 +++ .../domain/GetPopupResearchersCmd.java | 16 +++ .../household/CreateHouseholdMapper.xml | 20 +++ .../CreateResearcherMappingMapper.xml | 37 +++++ .../GetBankAutoTransferRecordsMapper.xml | 79 ++++++++--- .../GetForestProductsStatusMapper.xml | 66 ++++++--- .../household/GetHouseholdsStatusMapper.xml | 100 ++++++++------ .../household/GetPopupResearchersMapper.xml | 50 +++++++ admin/src/main/resources/static/ui/uiUtil.js | 2 +- .../common/modal-researcher-mapping.html | 129 +++++++++--------- .../templates/household/households.html | 73 ++++++++-- .../household/households/create.html | 27 +++- .../templates/household/households/{seq}.html | 128 +++++++++-------- .../resources/sql/schema/04_create-view.sql | 3 +- 42 files changed, 878 insertions(+), 235 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateResearcherHasHouseholdCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/persistence/CreateResearcherMappingDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/persistence/CreateResearcherMappingMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/CreateResearcherMappingController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingResVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/CreateResearcherMappingPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/CreateResearcherMappingPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/CreateResearcherMappingService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/CreateResearcherMappingCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/DeleteResearcherMappingCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/GetPopupResearchersController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/model/GetPopupResearchersReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/model/GetPopupResearchersResVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/GetPopupResearchersPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/GetPopupResearchersPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/GetPopupResearchersService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/domain/GetPopupResearchers.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/domain/GetPopupResearchersCmd.java create mode 100644 admin/src/main/resources/mappers/household/CreateResearcherMappingMapper.xml create mode 100644 admin/src/main/resources/mappers/household/GetPopupResearchersMapper.xml diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java index 2f69a273..a2a2d49b 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java @@ -1,5 +1,6 @@ package app.module.admin.usecase.household.createHousehold.adapters.persistence; +import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateResearcherHasHouseholdCmd; import app.module.core.config.application.annotation.CreateCommand; import app.module.core.config.application.util.AuditUtil; import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd; @@ -7,6 +8,7 @@ import app.module.admin.usecase.household.createHousehold.ports.application.doma import lombok.RequiredArgsConstructor; import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortOut; import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; @Repository @RequiredArgsConstructor @@ -14,13 +16,22 @@ class CreateHouseholdDao implements CreateHouseholdPortOut { private final CreateHouseholdMapper mapper; @Override + @Transactional @CreateCommand public void operate(CreateHouseholdOutCmd outCmd) { + // 임가 등록 mapper.createHousehold(outCmd); - if(outCmd.getResearcherSeq() != null) { + // 임가 역할 등록 + if(outCmd.getRoleIds() != null && !outCmd.getRoleIds().isEmpty()) { mapper.createHouseholdHasRole( AuditUtil.create(new CreateHouseholdHasRoleCmd(outCmd.getSeq(), outCmd.getRoleIds()))); } + + // 임가 담당 조사원 등록 + if(outCmd.getAdminSeq() != null) { + mapper.createResearcherHasHousehold( + AuditUtil.create(new CreateResearcherHasHouseholdCmd(outCmd.getSeq(), outCmd.getAdminSeq()))); + } } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java index 5171007b..f6da0d55 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java @@ -2,10 +2,12 @@ package app.module.admin.usecase.household.createHousehold.adapters.persistence; 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 org.apache.ibatis.annotations.Mapper; @Mapper public interface CreateHouseholdMapper { void createHousehold(CreateHouseholdOutCmd outCmd); void createHouseholdHasRole(CreateHouseholdHasRoleCmd cmd); + void createResearcherHasHousehold(CreateResearcherHasHouseholdCmd cmd); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java index bde6492e..35af7336 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java @@ -1,5 +1,6 @@ package app.module.admin.usecase.household.createHousehold.adapters.web; +import app.module.admin.usecase.household.createHousehold.adapters.web.model.CreateHouseholdResVO; import app.module.core.config.application.util.MessageUtil; import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortIn; import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd; @@ -50,13 +51,13 @@ class CreateHouseholdController { reqVO.getIndustryMiddleCode(), reqVO.getIndustrySubMiddle(), reqVO.getIndustryDetail(), - reqVO.getResearcherSeq(), + reqVO.getAdminSeq(), reqVO.getIsPanel(), reqVO.getMemo() ) ); return ResponseEntity.status(HttpStatus.OK) - .body(messageUtil.getMessage("operation.common.save.done")); + .body(new CreateHouseholdResVO(reqVO.getHouseholdNum())); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdReqVO.java index 8c0399d6..540efb54 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdReqVO.java @@ -31,7 +31,7 @@ public class CreateHouseholdReqVO { private String industryMiddleCode; private String industrySubMiddle; private String industryDetail; - private Long researcherSeq; + private Long adminSeq; private Boolean isPanel; private String memo; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdResVO.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdResVO.java index 435ae49c..122ddb47 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdResVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdResVO.java @@ -10,4 +10,5 @@ import lombok.Setter; @AllArgsConstructor @EqualsAndHashCode public class CreateHouseholdResVO { + private String householdNum; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java index fbf52db5..749e3137 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java @@ -27,7 +27,7 @@ public class CreateHouseholdOutCmd extends AuditCommand { private String industryMiddleCode; private String industrySubMiddle; private String industryDetail; - private Long researcherSeq; + private Long adminSeq; private Boolean isPanel; private String memo; private List roleIds; diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateResearcherHasHouseholdCmd.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateResearcherHasHouseholdCmd.java new file mode 100644 index 00000000..c332f0d3 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateResearcherHasHouseholdCmd.java @@ -0,0 +1,17 @@ +package app.module.admin.usecase.household.createHousehold.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CreateResearcherHasHouseholdCmd extends AuditCommand { + private Long householdSeq; + private Long adminSeq; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/persistence/CreateResearcherMappingDao.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/persistence/CreateResearcherMappingDao.java new file mode 100644 index 00000000..0388b660 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/persistence/CreateResearcherMappingDao.java @@ -0,0 +1,27 @@ +package app.module.admin.usecase.household.createResearcherMapping.adapters.persistence; + +import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.DeleteResearcherMappingCmd; +import app.module.core.config.application.util.AuditUtil; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd; +import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortOut; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +@Repository +@RequiredArgsConstructor +class CreateResearcherMappingDao implements CreateResearcherMappingPortOut { + private final CreateResearcherMappingMapper mapper; + + @Override + @Transactional + public void operate(CreateResearcherMappingCmd cmd) { + // 조사원 임가 매핑 되어있던 것 delete + mapper.deleteResearcherMapping( + AuditUtil.delete(new DeleteResearcherMappingCmd(cmd.getHouseholdSeqs()))); + + // 조사원 임가 매핑 새로 insert + mapper.createResearcherMapping( + AuditUtil.create(new CreateResearcherMappingCmd(cmd.getAdminSeq(), cmd.getHouseholdSeqs()))); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/persistence/CreateResearcherMappingMapper.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/persistence/CreateResearcherMappingMapper.java new file mode 100644 index 00000000..bbde9536 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/persistence/CreateResearcherMappingMapper.java @@ -0,0 +1,11 @@ +package app.module.admin.usecase.household.createResearcherMapping.adapters.persistence; + +import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd; +import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.DeleteResearcherMappingCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CreateResearcherMappingMapper { + void deleteResearcherMapping(DeleteResearcherMappingCmd cmd); + void createResearcherMapping(CreateResearcherMappingCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/CreateResearcherMappingController.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/CreateResearcherMappingController.java new file mode 100644 index 00000000..b6c8f36d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/CreateResearcherMappingController.java @@ -0,0 +1,38 @@ +package app.module.admin.usecase.household.createResearcherMapping.adapters.web; + +import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortIn; +import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd; +import app.module.core.config.application.util.MessageUtil; +import jakarta.validation.Valid; +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.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.BindingResult; +import app.module.admin.usecase.household.createResearcherMapping.adapters.web.model.CreateResearcherMappingReqVO; +import app.module.admin.usecase.household.createResearcherMapping.adapters.web.model.CreateResearcherMappingResVO; + +@RestController +@RequiredArgsConstructor +class CreateResearcherMappingController { + + private final CreateResearcherMappingPortIn portIn; + private final MessageUtil messageUtil; + + @PostMapping(path = "/api/household/researcherMapping/create") + ResponseEntity operate(@Valid @RequestBody CreateResearcherMappingReqVO reqVO, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(bindingResult); + } + + // 등록 + portIn.operate( + new CreateResearcherMappingCmd(reqVO.getAdminSeq(), reqVO.getHouseholdSeqs())); + + return ResponseEntity.status(HttpStatus.OK) + .body(new CreateResearcherMappingResVO(reqVO.getAdminSeq(), reqVO.getHouseholdSeqs())); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingReqVO.java new file mode 100644 index 00000000..bf981835 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingReqVO.java @@ -0,0 +1,17 @@ +package app.module.admin.usecase.household.createResearcherMapping.adapters.web.model; + +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@EqualsAndHashCode +public class CreateResearcherMappingReqVO { + private Long adminSeq; + private List householdSeqs; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingResVO.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingResVO.java new file mode 100644 index 00000000..725f7033 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingResVO.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.household.createResearcherMapping.adapters.web.model; + +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CreateResearcherMappingResVO { + private Long adminSeq; + private List householdSeqs; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/CreateResearcherMappingPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/CreateResearcherMappingPortIn.java new file mode 100644 index 00000000..5fadf5d1 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/CreateResearcherMappingPortIn.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.createResearcherMapping.ports; + +import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd; + +public interface CreateResearcherMappingPortIn { + void operate(CreateResearcherMappingCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/CreateResearcherMappingPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/CreateResearcherMappingPortOut.java new file mode 100644 index 00000000..3ba8703d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/CreateResearcherMappingPortOut.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.createResearcherMapping.ports; + +import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd; + +public interface CreateResearcherMappingPortOut { + void operate(CreateResearcherMappingCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/CreateResearcherMappingService.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/CreateResearcherMappingService.java new file mode 100644 index 00000000..984e37a0 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/CreateResearcherMappingService.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.household.createResearcherMapping.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd; +import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortIn; +import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortOut; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class CreateResearcherMappingService implements CreateResearcherMappingPortIn { + private final CreateResearcherMappingPortOut portOut; + + @Override + public void operate(CreateResearcherMappingCmd cmd) { + portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/CreateResearcherMappingCmd.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/CreateResearcherMappingCmd.java new file mode 100644 index 00000000..b3277670 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/CreateResearcherMappingCmd.java @@ -0,0 +1,17 @@ +package app.module.admin.usecase.household.createResearcherMapping.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CreateResearcherMappingCmd extends AuditCommand { + private Long adminSeq; + private List householdSeqs; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/DeleteResearcherMappingCmd.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/DeleteResearcherMappingCmd.java new file mode 100644 index 00000000..036c3731 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/DeleteResearcherMappingCmd.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.household.createResearcherMapping.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class DeleteResearcherMappingCmd extends AuditCommand { + private List householdSeqs; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java index 2299a127..47ac71e4 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java @@ -12,7 +12,6 @@ import lombok.Setter; public class GetBankAutoTransferExpenseRecords { private Long id; private String categoryText; - private String categorySelf; private String sourcePurpose; private Integer count; private String unitText; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java index 36103540..e049e6fa 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java @@ -13,7 +13,7 @@ public class GetBankAutoTransferIncomeRecords { private Long id; private String cropText; private String categoryText; - private String categorySelf; + private String target; private String sourcePurpose; private Integer count; private String unitText; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatus.java b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatus.java index 520230a1..c23d71f7 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatus.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatus.java @@ -18,11 +18,11 @@ public class GetForestProductsStatus { private String cropName; private String landArea; private String mainYield; - private String mainYieldText; + private String mainYieldUnitText; private String mainSaleAmount; - private String mainSaleAmountText; + private String mainSaleAmountUnitText; private String subYield; - private String subYieldText; + private String subYieldUnitText; private String subSaleAmount; - private String subSaleAmountText; + private String subSaleAmountUnitText; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersDao.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersDao.java new file mode 100644 index 00000000..5b3b269e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersDao.java @@ -0,0 +1,24 @@ +package app.module.admin.usecase.household.getPopupResearchers.adapters.persistence; + +import java.util.List; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchers; +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd; +import app.module.admin.usecase.household.getPopupResearchers.ports.GetPopupResearchersPortOut; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.PageImpl; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class GetPopupResearchersDao implements GetPopupResearchersPortOut { + private final GetPopupResearchersMapper mapper; + + @Override + public Page operate(Pageable pageable, GetPopupResearchersCmd cmd) { + List result = mapper.getPopupResearchers(pageable, cmd); + + return new PageImpl<>(result, pageable, result.isEmpty() ? 0 : result.get(0).getTotal()); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersMapper.java new file mode 100644 index 00000000..5f4b6210 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersMapper.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.household.getPopupResearchers.adapters.persistence; + +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchers; +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; + +@Mapper +public interface GetPopupResearchersMapper { + List getPopupResearchers(@Param("pageable") Pageable pageable, + @Param("cmd") GetPopupResearchersCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/GetPopupResearchersController.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/GetPopupResearchersController.java new file mode 100644 index 00000000..ae68c3a5 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/GetPopupResearchersController.java @@ -0,0 +1,29 @@ +package app.module.admin.usecase.household.getPopupResearchers.adapters.web; + +import app.module.admin.usecase.household.getPopupResearchers.ports.GetPopupResearchersPortIn; +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.context.properties.bind.DefaultValue; +import org.springframework.data.domain.Pageable; +import org.springframework.data.web.PageableDefault; +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 app.module.admin.usecase.household.getPopupResearchers.adapters.web.model.GetPopupResearchersReqVO; +import app.module.admin.usecase.household.getPopupResearchers.adapters.web.model.GetPopupResearchersResVO; + +@RestController +@RequiredArgsConstructor +class GetPopupResearchersController { + + private final GetPopupResearchersPortIn portIn; + + @GetMapping(path = "/api/popupResearchers") + ResponseEntity operate( + @PageableDefault(size = 10) Pageable pageable, GetPopupResearchersReqVO reqVO) { + return ResponseEntity.status(HttpStatus.OK).body(portIn.operate(pageable, + new GetPopupResearchersCmd(reqVO.getSearchField(), reqVO.getSearchValue(), + reqVO.getRegionMainCode()))); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/model/GetPopupResearchersReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/model/GetPopupResearchersReqVO.java new file mode 100644 index 00000000..d6ae3632 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/model/GetPopupResearchersReqVO.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.household.getPopupResearchers.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetPopupResearchersReqVO { + private String searchField; + private String searchValue; + private String regionMainCode; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/model/GetPopupResearchersResVO.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/model/GetPopupResearchersResVO.java new file mode 100644 index 00000000..2e65e5b1 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/model/GetPopupResearchersResVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.getPopupResearchers.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetPopupResearchersResVO { +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/GetPopupResearchersPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/GetPopupResearchersPortIn.java new file mode 100644 index 00000000..b097bbfb --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/GetPopupResearchersPortIn.java @@ -0,0 +1,10 @@ +package app.module.admin.usecase.household.getPopupResearchers.ports; + +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchers; +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +public interface GetPopupResearchersPortIn { + Page operate(Pageable pageable, GetPopupResearchersCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/GetPopupResearchersPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/GetPopupResearchersPortOut.java new file mode 100644 index 00000000..3c266993 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/GetPopupResearchersPortOut.java @@ -0,0 +1,10 @@ +package app.module.admin.usecase.household.getPopupResearchers.ports; + +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchers; +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +public interface GetPopupResearchersPortOut { + Page operate(Pageable pageable, GetPopupResearchersCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/GetPopupResearchersService.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/GetPopupResearchersService.java new file mode 100644 index 00000000..95989c83 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/GetPopupResearchersService.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.household.getPopupResearchers.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchers; +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd; +import app.module.admin.usecase.household.getPopupResearchers.ports.GetPopupResearchersPortIn; +import app.module.admin.usecase.household.getPopupResearchers.ports.GetPopupResearchersPortOut; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetPopupResearchersService implements GetPopupResearchersPortIn { + private final GetPopupResearchersPortOut portOut; + + @Override + public Page operate(Pageable pageable, GetPopupResearchersCmd cmd) { + return portOut.operate(pageable, cmd); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/domain/GetPopupResearchers.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/domain/GetPopupResearchers.java new file mode 100644 index 00000000..3906fcba --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/domain/GetPopupResearchers.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.getPopupResearchers.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetPopupResearchers { + private Long adminSeq; + private String name; + private String phone; + private String regionMainName; + private Integer householdCount; + private Integer total; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/domain/GetPopupResearchersCmd.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/domain/GetPopupResearchersCmd.java new file mode 100644 index 00000000..d8447cf1 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/domain/GetPopupResearchersCmd.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.household.getPopupResearchers.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetPopupResearchersCmd { + private String searchField; + private String searchValue; + private String regionMainCode; +} diff --git a/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml b/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml index 3296b40e..d0444e2c 100644 --- a/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml +++ b/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml @@ -5,6 +5,7 @@ namespace="app.module.admin.usecase.household.createHousehold.adapters.persistence.CreateHouseholdMapper"> + /* createHousehold : 임가 등록 */ SELECT nextval('household_seq') @@ -81,6 +82,7 @@ + /* createHouseholdHasRole : 임가 역할 등록 */ INSERT INTO household_has_role (id, household_seq, role_id, @@ -95,4 +97,22 @@ ) + + + /* createResearcherHasHousehold : 임가 등록 시 담당 조사원 매핑 */ + INSERT INTO researcher_has_household + ( + id, + household_seq, + admin_seq, + + ) + VALUES + ( + nextval('researcher_has_household_seq'), + #{householdSeq}, + #{adminSeq}, + + ) + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/CreateResearcherMappingMapper.xml b/admin/src/main/resources/mappers/household/CreateResearcherMappingMapper.xml new file mode 100644 index 00000000..07dc5eb9 --- /dev/null +++ b/admin/src/main/resources/mappers/household/CreateResearcherMappingMapper.xml @@ -0,0 +1,37 @@ + + + + + + /* deleteResearcherMapping : 조사원 임가 매핑 삭제 */ + UPDATE researcher_has_household + SET + WHERE is_deleted = false + AND household_seq IN + + #{householdSeq} + + + + + /* createResearcherMapping : 조사원 임가 매핑 등록 */ + INSERT INTO researcher_has_household + ( + id, + admin_seq, + household_seq, + + ) + VALUES + + ( + nextval('researcher_has_household_seq'), + #{adminSeq}, + #{householdSeq}, + + ) + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml b/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml index d3d2e4d0..7111192a 100644 --- a/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml +++ b/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml @@ -6,38 +6,77 @@ \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml index f9e95670..58c22ef0 100644 --- a/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml @@ -16,27 +16,55 @@ /* getHouseholdsStatus : 임가현황 리스트 조회 */ - WITH record_progress AS ( - SELECT ROUND( - 100.0 * - (SELECT COUNT(*) - FROM daily_record - WHERE record_month = #{cmd.recordMonth} AND all_status = 'DONE') - / NULLIF( - (SELECT COUNT(*) - FROM daily_day_group - WHERE end_day <= EXTRACT(DAY FROM CURRENT_DATE)), 0 - ), - 2 - ) AS progress_percent - ) /* 일계부 입력 진행 완료 퍼센테이지 (이번달 작성 완료일 수 / 현재날짜 기준 전체 입력 가능 날짜 수) */ + WITH daily_progress AS ( + /* 임가별 이번달 완료된 일 수 계산 */ + SELECT + household_seq, + COUNT(*) as completed_days + FROM daily_record + WHERE record_month = #{cmd.recordMonth} + AND all_status IN ('DONE', 'TODAY_NONE') + GROUP BY household_seq + ), + total_days AS ( + /* 오늘 날짜 기준 전체 입력 가능 날짜 수 */ + SELECT COUNT(*) as total_possible_days + FROM daily_day_group + WHERE end_day <= EXTRACT(DAY FROM CURRENT_DATE) + ), + visit_summary AS ( + /* 임가별 1차임가방문, 2차임가방문, 답례품전달여부 */ + SELECT + rhh.household_seq, + MIN(v.visit_date) AS first_visit_date, + MAX(v.visit_date) AS second_visit_date, + BOOL_OR(v.is_gift_sent) AS is_gift_sent + FROM household_visit v + JOIN researcher_has_household rhh ON v.household_seq = rhh.household_seq + WHERE rhh.is_deleted = false + AND TO_CHAR(v.visit_date, 'YYYYMM') = #{cmd.recordMonth} + GROUP BY rhh.household_seq + ) SELECT hvr.*, COUNT(*) OVER () AS total FROM ( SELECT - r.admin_seq AS adminSeq, - h.seq AS householdSeq, - h.household_num AS householdNum, - h.owner_name AS householdName, - h.phone AS householdPhone, - h.region_main_code AS regionMainCode, - h.region_main_name AS regionMainName, - h.region_sub_code AS regionSubCode, - h.region_sub_name AS regionSubName, - h.region_detail_code AS regionDetailCode, - h.region_detail_name AS regionDetailName, - h.industry_large_code as industryLargeCode, - h.industry_large_name AS industryLargeName, - h.industry_middle_code as industryMiddleCode, - h.industry_middle_name AS industryMiddleName, - h.is_panel AS isPanel, - ps.progress_percent AS progressPercent, - v.first_visit_date AS firstVisitDate, - v.second_visit_date AS secondVisitDate, - COALESCE(v.is_gift_sent, false) AS isGiftSent, - r.researcher_name AS researcherName, - r.researcher_phone AS researcherPhone + r.admin_seq AS adminSeq, + h.seq AS householdSeq, + h.household_num AS householdNum, + h.owner_name AS householdName, + h.phone AS householdPhone, + h.region_main_code AS regionMainCode, + h.region_main_name AS regionMainName, + h.region_sub_code AS regionSubCode, + h.region_sub_name AS regionSubName, + h.region_detail_code AS regionDetailCode, + h.region_detail_name AS regionDetailName, + h.industry_large_code AS industryLargeCode, + h.industry_large_name AS industryLargeName, + h.industry_middle_code AS industryMiddleCode, + h.industry_middle_name AS industryMiddleName, + h.is_panel AS isPanel, + /* 일계부 입력 진행 완료 퍼센테이지 (이번달 작성 완료일 수 / 현재날짜 기준 전체 입력 가능 날짜 수) */ + ROUND( + 100.0 * COALESCE(dp.completed_days, 0) / NULLIF(td.total_possible_days, 0), + 2 + ) AS progressPercent, + vs.first_visit_date AS firstVisitDate, + vs.second_visit_date AS secondVisitDate, + COALESCE(vs.is_gift_sent, false) AS isGiftSent, + r.researcher_name AS researcherName, + r.researcher_phone AS researcherPhone FROM v_household_with_code h - LEFT JOIN v_household_visit v ON h.seq = v.household_seq + CROSS JOIN total_days td + LEFT JOIN daily_progress dp ON h.seq = dp.household_seq + LEFT JOIN visit_summary vs ON h.seq = vs.household_seq LEFT JOIN v_household_researcher r ON h.seq = r.household_seq - CROSS JOIN record_progress ps ) AS hvr 1=1 - + /* 경영주 검색 */ @@ -69,7 +89,7 @@ - + /* 조사원 검색 */ diff --git a/admin/src/main/resources/mappers/household/GetPopupResearchersMapper.xml b/admin/src/main/resources/mappers/household/GetPopupResearchersMapper.xml new file mode 100644 index 00000000..082fdc48 --- /dev/null +++ b/admin/src/main/resources/mappers/household/GetPopupResearchersMapper.xml @@ -0,0 +1,50 @@ + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/static/ui/uiUtil.js b/admin/src/main/resources/static/ui/uiUtil.js index 06803740..1a38f2ed 100644 --- a/admin/src/main/resources/static/ui/uiUtil.js +++ b/admin/src/main/resources/static/ui/uiUtil.js @@ -453,7 +453,7 @@ const showAudit = (auditItem, createdBy, createdAt, updatedBy, updatedAt) => { }) })(); -const ifNullDash = (value, fallback = '-') => { +const ifNullHyphen = (value, fallback = '-') => { return value !== null && value !== undefined && value !== '' ? value : fallback; } diff --git a/admin/src/main/resources/templates/common/modal-researcher-mapping.html b/admin/src/main/resources/templates/common/modal-researcher-mapping.html index 1fb87610..833d6dfb 100644 --- a/admin/src/main/resources/templates/common/modal-researcher-mapping.html +++ b/admin/src/main/resources/templates/common/modal-researcher-mapping.html @@ -5,6 +5,7 @@
+
@@ -51,9 +52,7 @@ 실사

-
@@ -64,10 +63,10 @@
- -
@@ -75,6 +74,7 @@
+

총 0건

@@ -88,46 +88,8 @@ - - - - - - - - - - - - - - - - - - - - - - + +
담당임가 수
-
- -
-
홍길동010-0000-0000서울40
-
- -
-
홍길동010-0000-0000서울40
-
- -
-
홍길동010-0000-0000서울40
@@ -136,7 +98,7 @@
-
@@ -151,6 +113,8 @@ + + + +
\ No newline at end of file diff --git a/admin/src/main/resources/templates/household/households.html b/admin/src/main/resources/templates/household/households.html index ea0af4c0..48e606d0 100644 --- a/admin/src/main/resources/templates/household/households.html +++ b/admin/src/main/resources/templates/household/households.html @@ -252,7 +252,7 @@
@@ -265,8 +265,8 @@ 업종(대분류) 업종(중분류) 당월 일계부 현황 - 당월 1차 일가방문 - 당월 2차 일가방문 + 당월 1차 임가방문 + 당월 2차 임가방문 답례품 전달 조사원 조사원 휴대전화 @@ -292,7 +292,7 @@ 임가 등록 -
@@ -300,7 +300,7 @@ - +
@@ -330,7 +330,7 @@
@@ -340,14 +340,14 @@ ${ct.regionMainName} ${ct.regionSubName} ${ct.regionDetailName} - ${ifNullDash(ct.industryLargeName)} - ${ifNullDash(ct.industryMiddleName)} + ${ifNullHyphen(ct.industryLargeName)} + ${ifNullHyphen(ct.industryMiddleName)} ${ct.progressPercent}% - ${ifNullDash(ct.firstVisitDate)} - ${ifNullDash(ct.secondVisitDate)} + ${ifNullHyphen(ct.firstVisitDate)} + ${ifNullHyphen(ct.secondVisitDate)} ${ct.isGiftSent ? "전달" : "미전달"} - ${ifNullDash(ct.researcherName)} - ${ifNullDash(ct.researcherPhone)} + ${ifNullHyphen(ct.researcherName)} + ${ifNullHyphen(ct.researcherPhone)} ` ); @@ -398,6 +398,55 @@ f.submit(); } + + + +
\ No newline at end of file diff --git a/admin/src/main/resources/templates/household/households/create.html b/admin/src/main/resources/templates/household/households/create.html index d04c5d50..6dcbfe9f 100644 --- a/admin/src/main/resources/templates/household/households/create.html +++ b/admin/src/main/resources/templates/household/households/create.html @@ -201,7 +201,7 @@
- +