Merge branch 'dev' into 'first_open_fetch'

운영 배포 merge

See merge request korea-research/korea-research!159
This commit is contained in:
이강선 매니저/ST
2025-07-31 23:47:13 +00:00
28 changed files with 304 additions and 174 deletions

View File

@@ -28,53 +28,50 @@ public class ChartDao implements ChartPortOut {
private final UICodeListMapper uiCodeListMapper; private final UICodeListMapper uiCodeListMapper;
@Override @Override
public ChartDto selectTotalPercentage(String usageType) { public ChartDto selectTotalPercentage(String usageType, String recordMonth) {
TotalPercentageReqVO reqVO = new TotalPercentageReqVO(); TotalPercentageReqVO reqVO = new TotalPercentageReqVO();
reqVO.setUsageType(usageType); reqVO.setUsageType(usageType);
reqVO.setRecordMonth(recordMonth);
LocalDate today = LocalDate.now(); String year = recordMonth.substring(0, 4);
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM"); String month = recordMonth.substring(4, 6);
String formattedDate = today.format(formatter); String recordMonthText = year + "년 " + month + "월 현황";
reqVO.setRecordMonth(formattedDate);
DateTimeFormatter formatterText = DateTimeFormatter.ofPattern("yyyy년 MM월 현황");
String recordMonthText = today.format(formatterText);
if("ROLE_ADMIN".equals(AdminUtil.getLoginUserRole())) { if ("ROLE_ADMIN".equals(AdminUtil.getLoginUserRole())) {
// 관리자 일경우 // 관리자 일경우
return new ChartDto( return new ChartDto(recordMonthText,
recordMonthText, chartMapper.selectTotalPercentage(reqVO, activeProfiles),
chartMapper.selectTotalPercentage(reqVO,activeProfiles), chartMapper.selectLocalRegionPercentage(reqVO, activeProfiles),
chartMapper.selectLocalRegionPercentage(reqVO,activeProfiles), chartMapper.selectLocalRegionResearcherPercentage(reqVO, activeProfiles),
chartMapper.selectLocalRegionResearcherPercentage(reqVO,activeProfiles), uiCodeListMapper.findByParentId("code.region.main", AdminUtil.getLoginUserRole(),
uiCodeListMapper.findByParentId("code.region.main",AdminUtil.getLoginUserRole(),activeProfiles)); activeProfiles));
} else if("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) { } else if ("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) {
// 지방 실사 일경우 실사 지역으로만 // 지방 실사 일경우 실사 지역으로만
reqVO.setRegionMainCode(AdminUtil.getLoginUserRegionMainCode()); reqVO.setRegionMainCode(AdminUtil.getLoginUserRegionMainCode());
return new ChartDto( return new ChartDto(recordMonthText,
recordMonthText, chartMapper.selectTotalPercentage(reqVO, activeProfiles),
chartMapper.selectTotalPercentage(reqVO,activeProfiles), chartMapper.selectLocalRegionPercentage(reqVO, activeProfiles),
chartMapper.selectLocalRegionPercentage(reqVO,activeProfiles), chartMapper.selectLocalRegionResearcherPercentage(reqVO, activeProfiles), null);
chartMapper.selectLocalRegionResearcherPercentage(reqVO,activeProfiles), } else if ("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) {
null);
} else if("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) {
// 조사원 일경우 // 조사원 일경우
reqVO.setAdminSeq(AdminUtil.getLoginUserSeq()); reqVO.setAdminSeq(AdminUtil.getLoginUserSeq());
return new ChartDto(recordMonthText, chartMapper.selectTotalPercentageResearcher(reqVO,activeProfiles), null,null,null); return new ChartDto(recordMonthText,
chartMapper.selectTotalPercentageResearcher(reqVO, activeProfiles), null, null,
null);
} }
return new ChartDto(null,null,null,null,null); return new ChartDto(null, null, null, null, null);
} }
@Override @Override
public List<LocalRegionResearcherPercentDto> selectRegionMainCodePercentage(String usageType, String regionMainCode) { public List<LocalRegionResearcherPercentDto> selectRegionMainCodePercentage(String usageType, String regionMainCode, String recordMonth) {
LocalDate today = LocalDate.now(); if ("ROLE_ADMIN".equals(AdminUtil.getLoginUserRole())) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM"); return chartMapper.selectLocalRegionResearcherPercentage(
String formattedDate = today.format(formatter); new TotalPercentageReqVO(usageType, regionMainCode, recordMonth), activeProfiles);
if("ROLE_ADMIN".equals(AdminUtil.getLoginUserRole())) { } else {
return chartMapper.selectLocalRegionResearcherPercentage(new TotalPercentageReqVO(usageType,regionMainCode,formattedDate),activeProfiles);
}else{
throw new NoMatchingURIException("잘못된 접근"); throw new NoMatchingURIException("잘못된 접근");
} }
} }

View File

@@ -4,12 +4,10 @@ import lombok.Data;
@Data @Data
public class RegionDetailExcelDto { public class RegionDetailExcelDto {
private String regionMainName;
private String regionDetailName; private String regionDetailName;
private String regionName;
private String householdCount; private String householdCount;
private String avgCompletionRate; private String avgCompletionRate;
private String visitCount; private String visitCount;
private String giftSentCount; private String giftSentCount;
private String regionOrder;
private String regionDetailOrder;
} }

View File

@@ -1,12 +1,18 @@
package app.module.admin.usecase.dashboard.chart.adapters.web; package app.module.admin.usecase.dashboard.chart.adapters.web;
import app.module.admin.config.application.util.DateUiUtil;
import app.module.admin.config.application.util.ExcelWriterUtil; import app.module.admin.config.application.util.ExcelWriterUtil;
import app.module.admin.config.application.util.model.ExcelSheetDto; import app.module.admin.config.application.util.model.ExcelSheetDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionDetailExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionDetailExcelDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionMainExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionMainExcelDto;
import app.module.admin.usecase.dashboard.chart.ports.ChartPortIn; import app.module.admin.usecase.dashboard.chart.ports.ChartPortIn;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -20,14 +26,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@Slf4j @Slf4j
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor
@@ -37,20 +35,24 @@ class ChartApiController {
private final ChartPortIn chartPortIn; private final ChartPortIn chartPortIn;
@GetMapping(path = "/total") @GetMapping(path = "/total")
ResponseEntity<?> selectTotalPercentage(@RequestParam("usageType") String usageType) { ResponseEntity<?> selectTotalPercentage(@RequestParam("usageType") String usageType,
return ResponseEntity.status(HttpStatus.OK).body(chartPortIn.selectTotalPercentage(usageType)); @RequestParam("recordMonth") String recordMonth) {
return ResponseEntity.status(HttpStatus.OK)
.body(chartPortIn.selectTotalPercentage(usageType, recordMonth));
} }
@GetMapping(path = "/researcher") @GetMapping(path = "/researcher")
ResponseEntity<?> selectRegionMainCodePercentage(@RequestParam("usageType") String usageType,@RequestParam("regionMainCode") String regionMainCode) { ResponseEntity<?> selectRegionMainCodePercentage(@RequestParam("usageType") String usageType,
return ResponseEntity.status(HttpStatus.OK).body(chartPortIn.selectRegionMainCodePercentage(usageType,regionMainCode)); @RequestParam("regionMainCode") String regionMainCode,
@RequestParam("recordMonth") String recordMonth) {
return ResponseEntity.status(HttpStatus.OK).body(
chartPortIn.selectRegionMainCodePercentage(usageType, regionMainCode, recordMonth));
} }
@GetMapping(path = "/excel") @GetMapping(path = "/excel")
ResponseEntity<byte[]> exportDashboardExcel() { ResponseEntity<byte[]> exportDashboardExcel(@RequestParam("recordMonth") String recordMonth) {
DashboardExcelDto dashboardExcel = chartPortIn.selectDashboard( DashboardExcelDto dashboardExcel = chartPortIn.selectDashboard(recordMonth);
DateUiUtil.getCurrentMonthValue());
List<List<String>> rows1 = new ArrayList<>(); List<List<String>> rows1 = new ArrayList<>();
for (RegionMainExcelDto item : dashboardExcel.getRegionMain()) { for (RegionMainExcelDto item : dashboardExcel.getRegionMain()) {
@@ -58,7 +60,7 @@ class ChartApiController {
StringUtils.defaultString(item.getRegionName()), StringUtils.defaultString(item.getRegionName()),
StringUtils.defaultString(item.getResearcherCount()), StringUtils.defaultString(item.getResearcherCount()),
StringUtils.defaultString(item.getHouseholdCount()), StringUtils.defaultString(item.getHouseholdCount()),
StringUtils.defaultString(item.getAvgCompletionRate()) + "%", StringUtils.defaultString(item.getAvgCompletionRate()),
StringUtils.defaultString(item.getVisitCount()), StringUtils.defaultString(item.getVisitCount()),
StringUtils.defaultString(item.getGiftSentCount()) StringUtils.defaultString(item.getGiftSentCount())
)); ));
@@ -67,7 +69,7 @@ class ChartApiController {
// 시트 1: 실사 // 시트 1: 실사
ExcelSheetDto sheet1 = new ExcelSheetDto( ExcelSheetDto sheet1 = new ExcelSheetDto(
"실사", "실사",
List.of("실사", "할당 조사원 수", "할당 임가 수", "일계부 진행률", "현장 방문 수", "답례품 전달 임가 수"), List.of("실사", "할당 조사원 수", "할당 임가 수", "당월 일계부 현황(%)", "현장 방문 수", "답례품 전달 임가 수"),
rows1, rows1,
null, null,
Map.of(0, IndexedColors.LIGHT_YELLOW) Map.of(0, IndexedColors.LIGHT_YELLOW)
@@ -76,9 +78,10 @@ class ChartApiController {
List<List<String>> rows2 = new ArrayList<>(); List<List<String>> rows2 = new ArrayList<>();
for (RegionDetailExcelDto item : dashboardExcel.getRegionDetail()) { for (RegionDetailExcelDto item : dashboardExcel.getRegionDetail()) {
rows2.add(List.of( rows2.add(List.of(
StringUtils.defaultString(item.getRegionMainName()),
StringUtils.defaultString(item.getRegionDetailName()), StringUtils.defaultString(item.getRegionDetailName()),
StringUtils.defaultString(item.getHouseholdCount()), StringUtils.defaultString(item.getHouseholdCount()),
StringUtils.defaultString(item.getAvgCompletionRate()) + "%", StringUtils.defaultString(item.getAvgCompletionRate()),
StringUtils.defaultString(item.getVisitCount()), StringUtils.defaultString(item.getVisitCount()),
StringUtils.defaultString(item.getGiftSentCount()) StringUtils.defaultString(item.getGiftSentCount())
)); ));
@@ -87,7 +90,7 @@ class ChartApiController {
// 시트 2: 세부지역 // 시트 2: 세부지역
ExcelSheetDto sheet2 = new ExcelSheetDto( ExcelSheetDto sheet2 = new ExcelSheetDto(
"세부지역", "세부지역",
List.of("세부지역", "할당 임가 수", "일계부 진행률", "현장 방문 수", "답례품 전달 임가 수"), List.of("실사", "세부지역", "할당 임가 수", "당월 일계부 현황(%)", "현장 방문 수", "답례품 전달 임가 수"),
rows2, rows2,
null, null,
Map.of(0, IndexedColors.LIGHT_YELLOW) Map.of(0, IndexedColors.LIGHT_YELLOW)

View File

@@ -8,8 +8,8 @@ import java.util.List;
public interface ChartPortIn { public interface ChartPortIn {
ChartDto selectTotalPercentage(String usageType); ChartDto selectTotalPercentage(String usageType, String recordMonth);
List<LocalRegionResearcherPercentDto> selectRegionMainCodePercentage(String usageType,String regionMainCode); List<LocalRegionResearcherPercentDto> selectRegionMainCodePercentage(String usageType,String regionMainCode, String recordMonth);
DashboardExcelDto selectDashboard(String recordMonth); DashboardExcelDto selectDashboard(String recordMonth);
} }

View File

@@ -8,7 +8,7 @@ import java.util.List;
public interface ChartPortOut { public interface ChartPortOut {
ChartDto selectTotalPercentage(String usageType); ChartDto selectTotalPercentage(String usageType, String recordMonth);
List<LocalRegionResearcherPercentDto> selectRegionMainCodePercentage(String usageType,String regionMainCode); List<LocalRegionResearcherPercentDto> selectRegionMainCodePercentage(String usageType,String regionMainCode, String recordMonth);
DashboardExcelDto selectDashboard(String recordMonth); DashboardExcelDto selectDashboard(String recordMonth);
} }

View File

@@ -16,13 +16,14 @@ class ChartService implements ChartPortIn {
private final ChartPortOut portOut; private final ChartPortOut portOut;
@Override @Override
public ChartDto selectTotalPercentage(String usageType){ public ChartDto selectTotalPercentage(String usageType, String recordMonth){
return portOut.selectTotalPercentage(usageType); return portOut.selectTotalPercentage(usageType, recordMonth);
} }
@Override @Override
public List<LocalRegionResearcherPercentDto> selectRegionMainCodePercentage(String usageType,String regionMainCode) { public List<LocalRegionResearcherPercentDto> selectRegionMainCodePercentage(String usageType,
return portOut.selectRegionMainCodePercentage(usageType,regionMainCode); String regionMainCode, String recordMonth) {
return portOut.selectRegionMainCodePercentage(usageType, regionMainCode, recordMonth);
} }
@Override @Override

View File

@@ -1,5 +1,6 @@
package app.module.admin.usecase.home.adapters.web; package app.module.admin.usecase.home.adapters.web;
import app.module.admin.config.application.util.DateUiUtil;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortIn; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortIn;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus;
import app.module.core.usecase.admin.view.ports.AdminViewPortIn; import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
@@ -32,6 +33,8 @@ public class HomeController {
GetSmsAutoStatus smsAutoStatus = getSmsAutoStatusPortIn.operate().orElse(null); GetSmsAutoStatus smsAutoStatus = getSmsAutoStatusPortIn.operate().orElse(null);
model.addAttribute("smsActive", smsAutoStatus != null && smsAutoStatus.getActive()); model.addAttribute("smsActive", smsAutoStatus != null && smsAutoStatus.getActive());
model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue());
return "home"; return "home";
} }

View File

@@ -56,6 +56,7 @@ class GetHouseholdsExcelController {
getHouseholdsStatusPortIn.operate(pageable, getHouseholdsStatusPortIn.operate(pageable,
new GetHouseholdsStatusCmd( new GetHouseholdsStatusCmd(
reqVO.getRecordMonth(), reqVO.getRecordMonth(),
reqVO.getHouseholdNum(),
reqVO.getOwnerField(), reqVO.getOwnerField(),
reqVO.getOwnerValue(), reqVO.getOwnerValue(),
reqVO.getRegionMainCode(), reqVO.getRegionMainCode(),
@@ -154,7 +155,7 @@ class GetHouseholdsExcelController {
StringUtils.defaultString(item.getIndustryDetail()), StringUtils.defaultString(item.getIndustryDetail()),
StringUtils.defaultString(item.getResearcherName()), StringUtils.defaultString(item.getResearcherName()),
StringUtils.defaultString(item.getResearcherPhone()), StringUtils.defaultString(item.getResearcherPhone()),
StringUtils.defaultString(item.getCompletionRate()) + "%", StringUtils.defaultString(item.getCompletionRate()),
StringUtils.defaultString(item.getFirstVisitDate()), StringUtils.defaultString(item.getFirstVisitDate()),
StringUtils.defaultString(item.getSecondVisitDate()), StringUtils.defaultString(item.getSecondVisitDate()),
StringUtils.defaultString(item.getGiftSend()), StringUtils.defaultString(item.getGiftSend()),
@@ -180,7 +181,7 @@ class GetHouseholdsExcelController {
"규모/세부품목", "규모/세부품목",
"조사원", "조사원",
"조사원 연락처", "조사원 연락처",
"당월 일계부 현황", "당월 일계부 현황(%)",
"당월 1차 임가방문", "당월 1차 임가방문",
"당월 2차 임가방문", "당월 2차 임가방문",
"답례품 전달", "답례품 전달",
@@ -496,6 +497,7 @@ class GetHouseholdsExcelController {
StringUtils.defaultString(item.getWorkName()), StringUtils.defaultString(item.getWorkName()),
StringUtils.defaultString(item.getWorkMark()), StringUtils.defaultString(item.getWorkMark()),
StringUtils.defaultString(item.getWorkLandArea()), StringUtils.defaultString(item.getWorkLandArea()),
StringUtils.defaultString(item.getAreaMark()),
StringUtils.defaultString(item.getAreaUnitName()), StringUtils.defaultString(item.getAreaUnitName()),
StringUtils.defaultString(item.getHarvestQuantity()), StringUtils.defaultString(item.getHarvestQuantity()),
StringUtils.defaultString(item.getHarvestUnitName()), StringUtils.defaultString(item.getHarvestUnitName()),
@@ -523,6 +525,7 @@ class GetHouseholdsExcelController {
"작업명", "작업명",
"작업 부호", "작업 부호",
"작업면적", "작업면적",
"면적 부호",
"단위", "단위",
"수확량", "수확량",
"단위", "단위",

View File

@@ -14,6 +14,8 @@ import lombok.Setter;
public class GetHouseholdsExcelReqVO { public class GetHouseholdsExcelReqVO {
// 연월 // 연월
private String recordMonth; private String recordMonth;
// 임가번호
private String householdNum;
// 경영주 검색 필드 (전체, 경영주명, 전화번호) // 경영주 검색 필드 (전체, 경영주명, 전화번호)
private String ownerField; private String ownerField;
// 경영주 검색어 // 경영주 검색어

View File

@@ -19,6 +19,7 @@ public class GetDailyWork {
private String workName; private String workName;
private String workMark; private String workMark;
private String workLandArea; private String workLandArea;
private String areaMark;
private String areaUnitName; private String areaUnitName;
private String harvestQuantity; private String harvestQuantity;
private String harvestUnitName; private String harvestUnitName;

View File

@@ -26,6 +26,7 @@ class GetHouseholdsStatusController {
getHouseholdsStatusPortIn.operate(pageable, getHouseholdsStatusPortIn.operate(pageable,
new GetHouseholdsStatusCmd( new GetHouseholdsStatusCmd(
reqVO.getRecordMonth(), reqVO.getRecordMonth(),
reqVO.getHouseholdNum(),
reqVO.getOwnerField(), reqVO.getOwnerField(),
reqVO.getOwnerValue(), reqVO.getOwnerValue(),
reqVO.getRegionMainCode(), reqVO.getRegionMainCode(),

View File

@@ -13,6 +13,8 @@ import lombok.Setter;
public class GetHouseholdsStatusReqVO { public class GetHouseholdsStatusReqVO {
// 연월 // 연월
private String recordMonth; private String recordMonth;
// 임가번호
private String householdNum;
// 경영주 검색 필드 (전체, 경영주명, 전화번호) // 경영주 검색 필드 (전체, 경영주명, 전화번호)
private String ownerField; private String ownerField;
// 경영주 검색어 // 경영주 검색어

View File

@@ -12,6 +12,8 @@ import lombok.Setter;
public class GetHouseholdsStatusCmd { public class GetHouseholdsStatusCmd {
// 연월 // 연월
private String recordMonth; private String recordMonth;
// 임가번호
private String householdNum;
// 경영주 검색 필드 (전체, 경영주명, 전화번호) // 경영주 검색 필드 (전체, 경영주명, 전화번호)
private String ownerField; private String ownerField;
// 경영주 검색어 // 경영주 검색어

View File

@@ -15,6 +15,7 @@ public class GetHouseholdsUIReqVO {
private String sort; private String sort;
private Integer size; private Integer size;
private String recordMonth; private String recordMonth;
private String householdNum;
private String ownerField; private String ownerField;
private String ownerValue; private String ownerValue;
private String regionMainCode; private String regionMainCode;

View File

@@ -116,18 +116,29 @@
<select id="selectRegionMainExcel" <select id="selectRegionMainExcel"
resultType="app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionMainExcelDto"> resultType="app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionMainExcelDto">
/* selectRegionMainExcel : 대시보드 엑셀다운로드 (실사) */ /* selectRegionMainExcel : 대시보드 엑셀다운로드 (실사) */
WITH filtered_uicode AS (
SELECT *
FROM uicode
WHERE parent_id = 'code.region.main'
AND is_deleted = false
<if test="'prod'.equals(activeProfiles)">
AND u.in_use = true
</if>
)
-- 전체 합계
SELECT SELECT
u.code_text AS region_name, '전체' AS region_name,
COUNT(DISTINCT a.seq) AS researcher_count, COUNT(DISTINCT ahr.admin_seq) AS researcher_count,
COUNT(DISTINCT rhh.household_seq) AS household_count, COUNT(DISTINCT h.seq) AS household_count,
CASE CASE
WHEN COALESCE(AVG(v.current_completion_rate), 0) > 0 THEN ROUND(COALESCE(AVG(v.current_completion_rate), 0), 1) WHEN COALESCE(AVG(v.current_completion_rate), 0) > 0
THEN ROUND(COALESCE(AVG(v.current_completion_rate), 0), 1)
ELSE 0 ELSE 0
END AS avg_completion_rate, END AS avg_completion_rate,
COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END) AS visit_count, COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END) AS visit_count,
COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS gift_sent_count, COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS gift_sent_count,
u.order_no -1 AS sort_order
FROM uicode u FROM filtered_uicode u
LEFT JOIN admin a LEFT JOIN admin a
ON a.region_main_code = u.id ON a.region_main_code = u.id
AND a.is_deleted = false AND a.is_deleted = false
@@ -139,7 +150,7 @@
ON rhh.admin_seq = a.seq ON rhh.admin_seq = a.seq
AND rhh.is_deleted = false AND rhh.is_deleted = false
LEFT JOIN household h LEFT JOIN household h
ON h.seq = rhh.household_seq ON u.id = h.region_main_code
AND h.is_deleted = false AND h.is_deleted = false
AND h.is_panel = true AND h.is_panel = true
LEFT JOIN household_visit hv LEFT JOIN household_visit hv
@@ -149,22 +160,22 @@
LEFT JOIN v_monthly_completion_rate v LEFT JOIN v_monthly_completion_rate v
ON v.household_seq = h.seq ON v.household_seq = h.seq
AND v.record_month = #{recordMonth} AND v.record_month = #{recordMonth}
WHERE u.parent_id = 'code.region.main' and u.is_deleted = false WHERE u.parent_id = 'code.region.main' AND u.is_deleted = false
<if test="'prod'.equals(activeProfiles)">
and u.in_use = true
</if>
GROUP BY u.code_text, u.order_no
UNION ALL UNION ALL
-- 전체 합계 행 -- 지역별 집계
SELECT SELECT
'전체' AS region_name, u.code_text AS region_name,
COUNT(DISTINCT a.seq), COUNT(DISTINCT ahr.admin_seq) AS researcher_count,
COUNT(DISTINCT rhh.household_seq), COUNT(DISTINCT h.seq) AS household_count,
COALESCE(ROUND(AVG(v.current_completion_rate), 1), 0), CASE
COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END), WHEN COALESCE(AVG(v.current_completion_rate), 0) > 0
COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END), THEN ROUND(COALESCE(AVG(v.current_completion_rate), 0), 1)
-1 as order_no ELSE 0
FROM uicode u END AS avg_completion_rate,
COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END) AS visit_count,
COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS gift_sent_count,
u.order_no AS sort_order
FROM filtered_uicode u
LEFT JOIN admin a LEFT JOIN admin a
ON a.region_main_code = u.id ON a.region_main_code = u.id
AND a.is_deleted = false AND a.is_deleted = false
@@ -176,7 +187,7 @@
ON rhh.admin_seq = a.seq ON rhh.admin_seq = a.seq
AND rhh.is_deleted = false AND rhh.is_deleted = false
LEFT JOIN household h LEFT JOIN household h
ON h.seq = rhh.household_seq ON u.id = h.region_main_code
AND h.is_deleted = false AND h.is_deleted = false
AND h.is_panel = true AND h.is_panel = true
LEFT JOIN household_visit hv LEFT JOIN household_visit hv
@@ -186,86 +197,107 @@
LEFT JOIN v_monthly_completion_rate v LEFT JOIN v_monthly_completion_rate v
ON v.household_seq = h.seq ON v.household_seq = h.seq
AND v.record_month = #{recordMonth} AND v.record_month = #{recordMonth}
WHERE u.parent_id = 'code.region.main' and u.is_deleted = false WHERE u.parent_id = 'code.region.main' AND u.is_deleted = false
<if test="'prod'.equals(activeProfiles)"> GROUP BY u.id, u.code_text, u.order_no
and u.in_use = true ORDER BY sort_order
</if>
ORDER BY order_no
</select> </select>
<select id="selectRegionDetailExcel" <select id="selectRegionDetailExcel"
resultType="app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionDetailExcelDto"> resultType="app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionDetailExcelDto">
/* selectRegionDetailExcel : 대시보드 엑셀다운로드 (세부지역) */ /* selectRegionDetailExcel : 대시보드 엑셀다운로드 (세부지역) */
-- 세부 지역별 데이터 -- 세부 지역별 데이터
SELECT WITH detail_region AS (
detail_uicode.code_text AS region_detail_name, SELECT *
parent_uicode.code_text AS region_name, FROM uicode
COUNT(DISTINCT rhh.household_seq) AS household_count, WHERE id LIKE 'code.region.detail.%'
AND is_deleted = false
),
sub_region AS (
SELECT *
FROM uicode
WHERE parent_id = 'code.region.sub'
AND is_deleted = false
),
main_region AS (
SELECT *
FROM uicode
WHERE parent_id = 'code.region.main'
AND is_deleted = false
),
-- 지역별 통계 + 전체합계
region_stats AS (
SELECT
COALESCE(main.code_text, '-') AS region_main_name,
COALESCE(detail.code_text, '-') AS region_detail_name,
COUNT(DISTINCT h.seq) AS household_count,
CASE CASE
WHEN AVG(v.current_completion_rate) > 0 THEN ROUND(AVG(v.current_completion_rate), 1) WHEN COALESCE(AVG(v.current_completion_rate), 0) > 0
ELSE 0 THEN ROUND(COALESCE(AVG(v.current_completion_rate), 0), 1)
END AS avg_completion_rate, ELSE 0
COUNT(DISTINCT hv_visit.household_seq) AS visit_count, END AS avg_completion_rate,
COUNT(DISTINCT hv_gift.household_seq) AS gift_sent_count, COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END) AS visit_count,
parent_uicode.order_no AS region_order, COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS gift_sent_count,
detail_uicode.order_no AS region_detail_order COALESCE(main.order_no, 9999) AS main_order,
FROM uicode detail_uicode COALESCE(sub.order_no, 9999) AS sub_order,
LEFT JOIN uicode parent_uicode ON parent_uicode.id = detail_uicode.parent_id COALESCE(detail.order_no, 9999) AS detail_order
LEFT JOIN household h FROM detail_region detail
ON h.region_detail_code = detail_uicode.id INNER JOIN household h
AND h.is_deleted = false ON h.region_detail_code = detail.id
AND h.is_panel = true AND h.is_deleted = false
LEFT JOIN researcher_has_household rhh AND h.is_panel = true
ON rhh.household_seq = h.seq LEFT JOIN main_region main
AND rhh.is_deleted = false ON main.id = h.region_main_code
LEFT JOIN v_monthly_completion_rate v LEFT JOIN sub_region sub
ON v.household_seq = h.seq ON sub.id = h.region_sub_code
AND v.record_month = #{recordMonth} LEFT JOIN household_visit hv
LEFT JOIN household_visit hv_visit ON hv.household_seq = h.seq
ON hv_visit.household_seq = h.seq AND hv.is_deleted = false
AND hv_visit.is_deleted = false AND TO_CHAR(hv.visit_date, 'YYYYMM') = #{recordMonth}
AND TO_CHAR(hv_visit.visit_date, 'YYYYMM') = #{recordMonth} LEFT JOIN v_monthly_completion_rate v
LEFT JOIN household_visit hv_gift ON v.household_seq = h.seq
ON hv_gift.household_seq = h.seq AND v.record_month = #{recordMonth}
AND hv_gift.is_deleted = false <if test="'prod'.equals(activeProfiles)">
AND hv_gift.is_gift_sent = true WHERE main.in_use IS DISTINCT FROM false
AND TO_CHAR(hv_gift.visit_date, 'YYYYMM') = #{recordMonth} </if>
WHERE detail_uicode.id LIKE 'code.region.detail.%' GROUP BY
GROUP BY main.code_text, main.order_no,
detail_uicode.code_text, sub.order_no,
parent_uicode.code_text, detail.code_text, detail.order_no
parent_uicode.order_no, UNION ALL
detail_uicode.order_no SELECT
UNION ALL '전체' AS region_main_name,
-- 전체 합계 행
SELECT
'전체' AS region_detail_name, '전체' AS region_detail_name,
'전체' AS region_name, COUNT(DISTINCT h.seq),
COUNT(DISTINCT rhh.household_seq) AS household_count, CASE
COALESCE(ROUND(AVG(v.current_completion_rate), 1), 0), WHEN COALESCE(AVG(v.current_completion_rate), 0) > 0
COUNT(DISTINCT hv_visit.household_seq), THEN ROUND(COALESCE(AVG(v.current_completion_rate), 0), 1)
COUNT(DISTINCT hv_gift.household_seq), ELSE 0
-1 AS region_order, END,
-1 AS region_detail_order COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END),
FROM household h COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END),
LEFT JOIN researcher_has_household rhh -1 AS main_order, -- 전체합계가 맨 위로 오도록
ON rhh.household_seq = h.seq -1 AS sub_order,
AND rhh.is_deleted = false -1 AS detail_order
LEFT JOIN v_monthly_completion_rate v FROM household h
ON v.household_seq = h.seq LEFT JOIN main_region main
AND v.record_month = #{recordMonth} ON main.id = h.region_main_code
LEFT JOIN household_visit hv_visit LEFT JOIN sub_region sub
ON hv_visit.household_seq = h.seq ON sub.id = h.region_sub_code
AND hv_visit.is_deleted = false LEFT JOIN household_visit hv
AND TO_CHAR(hv_visit.visit_date, 'YYYYMM') = #{recordMonth} ON hv.household_seq = h.seq
LEFT JOIN household_visit hv_gift AND hv.is_deleted = false
ON hv_gift.household_seq = h.seq AND TO_CHAR(hv.visit_date, 'YYYYMM') = #{recordMonth}
AND hv_gift.is_deleted = false LEFT JOIN v_monthly_completion_rate v
AND hv_gift.is_gift_sent = true ON v.household_seq = h.seq
AND TO_CHAR(hv_gift.visit_date, 'YYYYMM') = #{recordMonth} AND v.record_month = #{recordMonth}
WHERE h.is_deleted = false AND h.is_panel = true WHERE h.is_deleted = false
order by AND h.is_panel = true
region_order ASC, <if test="'prod'.equals(activeProfiles)">
region_detail_order ASC AND main.in_use IS DISTINCT FROM false
</if>
)
SELECT *
FROM region_stats
ORDER BY main_order, sub_order, detail_order
</select> </select>
</mapper> </mapper>

View File

@@ -90,6 +90,11 @@
<where> <where>
1=1 1=1
<if test="cmd.householdNum != null and cmd.householdNum != ''">
/* 임가번호 검색 */
AND hvr.householdNum ILIKE '%' || #{cmd.householdNum} || '%'
</if>
<if test="cmd.ownerValue != null and cmd.ownerValue != ''"> <if test="cmd.ownerValue != null and cmd.ownerValue != ''">
/* 경영주 검색 */ /* 경영주 검색 */
<choose> <choose>

View File

@@ -312,6 +312,7 @@
dw.work_name , dw.work_name ,
dw.work_mark , dw.work_mark ,
dw.work_land_area , dw.work_land_area ,
dw.area_mark ,
case when dw.area_unit_code = 'code.record.area.self' then dw.area_unit_self case when dw.area_unit_code = 'code.record.area.self' then dw.area_unit_self
else unit_code.code_value end as area_unit_name, else unit_code.code_value end as area_unit_name,
dw.harvest_quantity , dw.harvest_quantity ,

File diff suppressed because one or more lines are too long

View File

@@ -19,6 +19,15 @@
<option value="PAPER">지류</option> <option value="PAPER">지류</option>
</select> </select>
</div> </div>
<div class="component-select">
<select class="select-list" id="recordMonth" name="recordMonth" required>
<option th:each="month : ${monthList}"
th:value="${month.value}"
th:text="${month.label}"
th:selected="${month.value == currentMonth}">
</option>
</select>
</div>
</div> </div>
</form> </form>
</div> </div>
@@ -414,6 +423,10 @@
$('#regionMainCode').change(function() { $('#regionMainCode').change(function() {
getResearcherArea(); getResearcherArea();
}); });
$('#recordMonth').change(function() {
getTotalPercentage();
});
}); });
</script> </script>
<script> <script>
@@ -459,7 +472,9 @@
// 엑셀 다운로드 // 엑셀 다운로드
const goExcel = () => { const goExcel = () => {
excelDownload('/api/dashboard/chart/excel', null); const f = document.reqForm;
const data = $(f).serializeObject();
excelDownload('/api/dashboard/chart/excel', data);
} }
</script> </script>
</section> </section>

View File

@@ -31,6 +31,22 @@
</div> </div>
</div> </div>
<!-- 임가번호 -->
<div class="input-group">
<div class="input-label">
<p class="label-txt">
임가번호
</p>
</div>
<div class="d-flex">
<div class="component-input">
<div class="input-field">
<input type="text" id="householdNum" name="householdNum" th:field="*{householdNum}" placeholder="임가번호 입력">
</div>
</div>
</div>
</div>
<!-- 경영주 --> <!-- 경영주 -->
<div class="input-group"> <div class="input-group">
<div class="input-label"> <div class="input-label">

View File

@@ -40,7 +40,7 @@ public final class DailyRecordConstants {
* [정책] 해당월 15일까지는 이전달 데이터 등록 가능 * [정책] 해당월 15일까지는 이전달 데이터 등록 가능
* 이전 달을 의미하는 상수 * 이전 달을 의미하는 상수
*/ */
public static final int REGISTER_LIMIT_MONTH = 3; public static final int REGISTER_LIMIT_MONTH = 4;
/** /**
* 일계부 등록 가능 일 * 일계부 등록 가능 일
@@ -54,7 +54,7 @@ public final class DailyRecordConstants {
* [정책] 해당월 15일까지는 이전달 데이터 수정 가능 * [정책] 해당월 15일까지는 이전달 데이터 수정 가능
* 이전 달을 의미하는 상수 * 이전 달을 의미하는 상수
*/ */
public static final int MODIFY_LIMIT_MONTH = 3; public static final int MODIFY_LIMIT_MONTH = 4;
/** /**
* 일계부 수정 가능 일 * 일계부 수정 가능 일

View File

@@ -348,3 +348,12 @@ kri.form.setSelectBoxUiCode = function({
getChildValue: () => childSelectUI?.getValue() ?? '' getChildValue: () => childSelectUI?.getValue() ?? ''
}; };
} }
$(window).off('hashchange.modalClose').on('hashchange.modalClose', function() {
if (window.location.hash !== '#modal-open') {
const modal01 = document.querySelector(ENV.modal.selector)?.ui;
if (modal01) {
modal01.close();
}
}
});

View File

@@ -127,8 +127,11 @@ krip.daily.createModal = function(id) {
const modal01 = document.querySelector(ENV.modal.selector).ui; const modal01 = document.querySelector(ENV.modal.selector).ui;
modal01.open(); modal01.open();
// URL 해시 추가
window.location.hash = 'modal-open';
modalControl._bindModelUI(); modalControl._bindModelUI();
}, },
function(code, rstData) { function(code, rstData) {
kri.logger.error('Do nothing. code: '+ code, rstData); kri.logger.error('Do nothing. code: '+ code, rstData);

View File

@@ -69,39 +69,59 @@
</div> </div>
</section> </section>
</main> </main>
<!-- 모달 팝업 -->
<div th:replace="guide/modal/modal-mobile-guide:: modalFragment"></div> <div th:replace="guide/modal/modal-mobile-guide:: modalFragment"></div>
<div th:replace="guide/modal/modal-industry-type:: modalFragment"></div> <div th:replace="guide/modal/modal-industry-type:: modalFragment"></div>
<div th:replace="guide/modal/modal-forest-diff:: modalFragment"></div> <div th:replace="guide/modal/modal-forest-diff:: modalFragment"></div>
<div th:replace="guide/modal/modal-usage-type:: modalFragment"></div> <div th:replace="guide/modal/modal-usage-type:: modalFragment"></div>
<div th:replace="guide/modal/modal-contact:: modalFragment"></div> <div th:replace="guide/modal/modal-contact:: modalFragment"></div>
<!-- //모달 팝업 -->
</div> </div>
<!-- 모달 팝업 -->
<!-- //모달 팝업 -->
<section layout:fragment="script"> <section layout:fragment="script">
<script th:inline="javascript"> <script th:inline="javascript">
let currentModal = null;
function goMobileGuide(){ function goMobileGuide(){
const modal = document.querySelector(".mobileGuide"); const modal = document.querySelector(".mobileGuide");
modal.ui.open(); openModal(modal, "mobileGuide");
} }
function goIndustryType(){ function goIndustryType(){
const modal = document.querySelector(".industryType"); const modal = document.querySelector(".industryType");
modal.ui.open(); openModal(modal, "industryType");
} }
function goForestDiff(){ function goForestDiff(){
const modal = document.querySelector(".forestDiff"); const modal = document.querySelector(".forestDiff");
modal.ui.open(); openModal(modal, "forestDiff");
} }
function goUsageType(){ function goUsageType(){
const modal = document.querySelector(".usageType"); const modal = document.querySelector(".usageType");
modal.ui.open(); openModal(modal, "usageType");
} }
function goContact(){ function goContact(){
const modal = document.querySelector(".contact"); const modal = document.querySelector(".contact");
modal.ui.open(); openModal(modal, "contact");
} }
function openModal(modal, modalId) {
if (currentModal && currentModal !== modal) {
currentModal.ui.close(); // 기존 모달 닫기
}
modal.ui.open();
modal.dataset.state = "open";
currentModal = modal;
window.history.pushState({ modal: modalId }, null, "");
}
// 뒤로 가기 이벤트 처리
window.addEventListener("popstate", function () {
if (currentModal && currentModal.dataset.state === "open") {
currentModal.ui.close();
currentModal.dataset.state = "close";
currentModal = null;
}
});
</script> </script>
</section> </section>
</html> </html>

View File

@@ -104,6 +104,10 @@
module: { module: {
modalPopup: null modalPopup: null
}, },
modal: {
// 등록 영역
selector: '.addPopup',
},
data: { data: {
transferCategoryCodeList: /*[[${transferCategoryList}]]*/ [], transferCategoryCodeList: /*[[${transferCategoryList}]]*/ [],
codeRecordCropList: /*[[${codeRecordCropList}]]*/ [], codeRecordCropList: /*[[${codeRecordCropList}]]*/ [],
@@ -317,6 +321,7 @@
}); });
ENV.module.modalPopup.open(); ENV.module.modalPopup.open();
window.location.hash = 'modal-open';
document.querySelector('.modal-content').scrollTop = 0; document.querySelector('.modal-content').scrollTop = 0;

View File

@@ -103,6 +103,10 @@
module: { module: {
modalPopup: null modalPopup: null
}, },
modal: {
// 등록 영역
selector: '.addPopup',
},
data: { data: {
transferCategoryCodeList: /*[[${transferCategoryList}]]*/ [], transferCategoryCodeList: /*[[${transferCategoryList}]]*/ [],
codeRecordCropList: /*[[${codeRecordCropList}]]*/ [], codeRecordCropList: /*[[${codeRecordCropList}]]*/ [],
@@ -307,6 +311,7 @@
}); });
ENV.module.modalPopup.open(); ENV.module.modalPopup.open();
window.location.hash = 'modal-open';
document.querySelector('.modal-content').scrollTop = 0; document.querySelector('.modal-content').scrollTop = 0;
// 모두 로드된 후 콜백 실행 // 모두 로드된 후 콜백 실행

View File

@@ -108,7 +108,10 @@
module: { module: {
modalPopup: null modalPopup: null
}, },
modal: {
// 등록 영역
selector: '.addPopup',
},
data: { data: {
purposeList: /*[[${purposeList}]]*/ [], purposeList: /*[[${purposeList}]]*/ [],
unitList: /*[[${unitList}]]*/ [], unitList: /*[[${unitList}]]*/ [],
@@ -341,6 +344,7 @@
ENV.module.modalPopup.open(); ENV.module.modalPopup.open();
window.location.hash = 'modal-open';
document.querySelector('.modal-content').scrollTop = 0; document.querySelector('.modal-content').scrollTop = 0;

View File

@@ -152,6 +152,7 @@
const modal01 = document.querySelector(ENV.modal.selector).ui; const modal01 = document.querySelector(ENV.modal.selector).ui;
modal01.open(); modal01.open();
window.location.hash = 'modal-open';
}, },
function(code, rstData) { function(code, rstData) {
kri.logger.error('Do nothing. code: '+ code, rstData); kri.logger.error('Do nothing. code: '+ code, rstData);