Merge branch 'dev' into 'first_open_fetch'
운영 배포 merge See merge request korea-research/korea-research!159
This commit is contained in:
@@ -28,53 +28,50 @@ public class ChartDao implements ChartPortOut {
|
||||
private final UICodeListMapper uiCodeListMapper;
|
||||
|
||||
@Override
|
||||
public ChartDto selectTotalPercentage(String usageType) {
|
||||
public ChartDto selectTotalPercentage(String usageType, String recordMonth) {
|
||||
TotalPercentageReqVO reqVO = new TotalPercentageReqVO();
|
||||
|
||||
reqVO.setUsageType(usageType);
|
||||
reqVO.setRecordMonth(recordMonth);
|
||||
|
||||
LocalDate today = LocalDate.now();
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM");
|
||||
String formattedDate = today.format(formatter);
|
||||
reqVO.setRecordMonth(formattedDate);
|
||||
DateTimeFormatter formatterText = DateTimeFormatter.ofPattern("yyyy년 MM월 현황");
|
||||
String recordMonthText = today.format(formatterText);
|
||||
String year = recordMonth.substring(0, 4);
|
||||
String month = recordMonth.substring(4, 6);
|
||||
String recordMonthText = year + "년 " + month + "월 현황";
|
||||
|
||||
if("ROLE_ADMIN".equals(AdminUtil.getLoginUserRole())) {
|
||||
if ("ROLE_ADMIN".equals(AdminUtil.getLoginUserRole())) {
|
||||
// 관리자 일경우
|
||||
return new ChartDto(
|
||||
recordMonthText,
|
||||
chartMapper.selectTotalPercentage(reqVO,activeProfiles),
|
||||
chartMapper.selectLocalRegionPercentage(reqVO,activeProfiles),
|
||||
chartMapper.selectLocalRegionResearcherPercentage(reqVO,activeProfiles),
|
||||
uiCodeListMapper.findByParentId("code.region.main",AdminUtil.getLoginUserRole(),activeProfiles));
|
||||
return new ChartDto(recordMonthText,
|
||||
chartMapper.selectTotalPercentage(reqVO, activeProfiles),
|
||||
chartMapper.selectLocalRegionPercentage(reqVO, activeProfiles),
|
||||
chartMapper.selectLocalRegionResearcherPercentage(reqVO, activeProfiles),
|
||||
uiCodeListMapper.findByParentId("code.region.main", AdminUtil.getLoginUserRole(),
|
||||
activeProfiles));
|
||||
|
||||
} else if("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) {
|
||||
} else if ("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) {
|
||||
// 지방 실사 일경우 실사 지역으로만
|
||||
reqVO.setRegionMainCode(AdminUtil.getLoginUserRegionMainCode());
|
||||
|
||||
return new ChartDto(
|
||||
recordMonthText,
|
||||
chartMapper.selectTotalPercentage(reqVO,activeProfiles),
|
||||
chartMapper.selectLocalRegionPercentage(reqVO,activeProfiles),
|
||||
chartMapper.selectLocalRegionResearcherPercentage(reqVO,activeProfiles),
|
||||
null);
|
||||
} else if("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) {
|
||||
return new ChartDto(recordMonthText,
|
||||
chartMapper.selectTotalPercentage(reqVO, activeProfiles),
|
||||
chartMapper.selectLocalRegionPercentage(reqVO, activeProfiles),
|
||||
chartMapper.selectLocalRegionResearcherPercentage(reqVO, activeProfiles), null);
|
||||
} else if ("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) {
|
||||
// 조사원 일경우
|
||||
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
|
||||
public List<LocalRegionResearcherPercentDto> selectRegionMainCodePercentage(String usageType, String regionMainCode) {
|
||||
LocalDate today = LocalDate.now();
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM");
|
||||
String formattedDate = today.format(formatter);
|
||||
if("ROLE_ADMIN".equals(AdminUtil.getLoginUserRole())) {
|
||||
return chartMapper.selectLocalRegionResearcherPercentage(new TotalPercentageReqVO(usageType,regionMainCode,formattedDate),activeProfiles);
|
||||
}else{
|
||||
public List<LocalRegionResearcherPercentDto> selectRegionMainCodePercentage(String usageType, String regionMainCode, String recordMonth) {
|
||||
if ("ROLE_ADMIN".equals(AdminUtil.getLoginUserRole())) {
|
||||
return chartMapper.selectLocalRegionResearcherPercentage(
|
||||
new TotalPercentageReqVO(usageType, regionMainCode, recordMonth), activeProfiles);
|
||||
} else {
|
||||
throw new NoMatchingURIException("잘못된 접근");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,12 +4,10 @@ import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class RegionDetailExcelDto {
|
||||
private String regionMainName;
|
||||
private String regionDetailName;
|
||||
private String regionName;
|
||||
private String householdCount;
|
||||
private String avgCompletionRate;
|
||||
private String visitCount;
|
||||
private String giftSentCount;
|
||||
private String regionOrder;
|
||||
private String regionDetailOrder;
|
||||
}
|
||||
|
||||
@@ -1,12 +1,18 @@
|
||||
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.model.ExcelSheetDto;
|
||||
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.RegionMainExcelDto;
|
||||
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.extern.slf4j.Slf4j;
|
||||
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.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
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@@ -37,20 +35,24 @@ class ChartApiController {
|
||||
private final ChartPortIn chartPortIn;
|
||||
|
||||
@GetMapping(path = "/total")
|
||||
ResponseEntity<?> selectTotalPercentage(@RequestParam("usageType") String usageType) {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(chartPortIn.selectTotalPercentage(usageType));
|
||||
ResponseEntity<?> selectTotalPercentage(@RequestParam("usageType") String usageType,
|
||||
@RequestParam("recordMonth") String recordMonth) {
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(chartPortIn.selectTotalPercentage(usageType, recordMonth));
|
||||
}
|
||||
|
||||
@GetMapping(path = "/researcher")
|
||||
ResponseEntity<?> selectRegionMainCodePercentage(@RequestParam("usageType") String usageType,@RequestParam("regionMainCode") String regionMainCode) {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(chartPortIn.selectRegionMainCodePercentage(usageType,regionMainCode));
|
||||
ResponseEntity<?> selectRegionMainCodePercentage(@RequestParam("usageType") String usageType,
|
||||
@RequestParam("regionMainCode") String regionMainCode,
|
||||
@RequestParam("recordMonth") String recordMonth) {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(
|
||||
chartPortIn.selectRegionMainCodePercentage(usageType, regionMainCode, recordMonth));
|
||||
}
|
||||
|
||||
@GetMapping(path = "/excel")
|
||||
ResponseEntity<byte[]> exportDashboardExcel() {
|
||||
ResponseEntity<byte[]> exportDashboardExcel(@RequestParam("recordMonth") String recordMonth) {
|
||||
|
||||
DashboardExcelDto dashboardExcel = chartPortIn.selectDashboard(
|
||||
DateUiUtil.getCurrentMonthValue());
|
||||
DashboardExcelDto dashboardExcel = chartPortIn.selectDashboard(recordMonth);
|
||||
|
||||
List<List<String>> rows1 = new ArrayList<>();
|
||||
for (RegionMainExcelDto item : dashboardExcel.getRegionMain()) {
|
||||
@@ -58,7 +60,7 @@ class ChartApiController {
|
||||
StringUtils.defaultString(item.getRegionName()),
|
||||
StringUtils.defaultString(item.getResearcherCount()),
|
||||
StringUtils.defaultString(item.getHouseholdCount()),
|
||||
StringUtils.defaultString(item.getAvgCompletionRate()) + "%",
|
||||
StringUtils.defaultString(item.getAvgCompletionRate()),
|
||||
StringUtils.defaultString(item.getVisitCount()),
|
||||
StringUtils.defaultString(item.getGiftSentCount())
|
||||
));
|
||||
@@ -67,7 +69,7 @@ class ChartApiController {
|
||||
// 시트 1: 실사
|
||||
ExcelSheetDto sheet1 = new ExcelSheetDto(
|
||||
"실사",
|
||||
List.of("실사", "할당 조사원 수", "할당 임가 수", "일계부 진행률", "현장 방문 수", "답례품 전달 임가 수"),
|
||||
List.of("실사", "할당 조사원 수", "할당 임가 수", "당월 일계부 현황(%)", "현장 방문 수", "답례품 전달 임가 수"),
|
||||
rows1,
|
||||
null,
|
||||
Map.of(0, IndexedColors.LIGHT_YELLOW)
|
||||
@@ -76,9 +78,10 @@ class ChartApiController {
|
||||
List<List<String>> rows2 = new ArrayList<>();
|
||||
for (RegionDetailExcelDto item : dashboardExcel.getRegionDetail()) {
|
||||
rows2.add(List.of(
|
||||
StringUtils.defaultString(item.getRegionMainName()),
|
||||
StringUtils.defaultString(item.getRegionDetailName()),
|
||||
StringUtils.defaultString(item.getHouseholdCount()),
|
||||
StringUtils.defaultString(item.getAvgCompletionRate()) + "%",
|
||||
StringUtils.defaultString(item.getAvgCompletionRate()),
|
||||
StringUtils.defaultString(item.getVisitCount()),
|
||||
StringUtils.defaultString(item.getGiftSentCount())
|
||||
));
|
||||
@@ -87,7 +90,7 @@ class ChartApiController {
|
||||
// 시트 2: 세부지역
|
||||
ExcelSheetDto sheet2 = new ExcelSheetDto(
|
||||
"세부지역",
|
||||
List.of("세부지역", "할당 임가 수", "일계부 진행률", "현장 방문 수", "답례품 전달 임가 수"),
|
||||
List.of("실사", "세부지역", "할당 임가 수", "당월 일계부 현황(%)", "현장 방문 수", "답례품 전달 임가 수"),
|
||||
rows2,
|
||||
null,
|
||||
Map.of(0, IndexedColors.LIGHT_YELLOW)
|
||||
|
||||
@@ -8,8 +8,8 @@ import java.util.List;
|
||||
|
||||
public interface ChartPortIn {
|
||||
|
||||
ChartDto selectTotalPercentage(String usageType);
|
||||
List<LocalRegionResearcherPercentDto> selectRegionMainCodePercentage(String usageType,String regionMainCode);
|
||||
ChartDto selectTotalPercentage(String usageType, String recordMonth);
|
||||
List<LocalRegionResearcherPercentDto> selectRegionMainCodePercentage(String usageType,String regionMainCode, String recordMonth);
|
||||
DashboardExcelDto selectDashboard(String recordMonth);
|
||||
|
||||
}
|
||||
@@ -8,7 +8,7 @@ import java.util.List;
|
||||
|
||||
public interface ChartPortOut {
|
||||
|
||||
ChartDto selectTotalPercentage(String usageType);
|
||||
List<LocalRegionResearcherPercentDto> selectRegionMainCodePercentage(String usageType,String regionMainCode);
|
||||
ChartDto selectTotalPercentage(String usageType, String recordMonth);
|
||||
List<LocalRegionResearcherPercentDto> selectRegionMainCodePercentage(String usageType,String regionMainCode, String recordMonth);
|
||||
DashboardExcelDto selectDashboard(String recordMonth);
|
||||
}
|
||||
@@ -16,13 +16,14 @@ class ChartService implements ChartPortIn {
|
||||
private final ChartPortOut portOut;
|
||||
|
||||
@Override
|
||||
public ChartDto selectTotalPercentage(String usageType){
|
||||
return portOut.selectTotalPercentage(usageType);
|
||||
public ChartDto selectTotalPercentage(String usageType, String recordMonth){
|
||||
return portOut.selectTotalPercentage(usageType, recordMonth);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<LocalRegionResearcherPercentDto> selectRegionMainCodePercentage(String usageType,String regionMainCode) {
|
||||
return portOut.selectRegionMainCodePercentage(usageType,regionMainCode);
|
||||
public List<LocalRegionResearcherPercentDto> selectRegionMainCodePercentage(String usageType,
|
||||
String regionMainCode, String recordMonth) {
|
||||
return portOut.selectRegionMainCodePercentage(usageType, regionMainCode, recordMonth);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
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.application.domain.GetSmsAutoStatus;
|
||||
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
|
||||
@@ -32,6 +33,8 @@ public class HomeController {
|
||||
GetSmsAutoStatus smsAutoStatus = getSmsAutoStatusPortIn.operate().orElse(null);
|
||||
|
||||
model.addAttribute("smsActive", smsAutoStatus != null && smsAutoStatus.getActive());
|
||||
model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
|
||||
model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue());
|
||||
|
||||
return "home";
|
||||
}
|
||||
|
||||
@@ -56,6 +56,7 @@ class GetHouseholdsExcelController {
|
||||
getHouseholdsStatusPortIn.operate(pageable,
|
||||
new GetHouseholdsStatusCmd(
|
||||
reqVO.getRecordMonth(),
|
||||
reqVO.getHouseholdNum(),
|
||||
reqVO.getOwnerField(),
|
||||
reqVO.getOwnerValue(),
|
||||
reqVO.getRegionMainCode(),
|
||||
@@ -154,7 +155,7 @@ class GetHouseholdsExcelController {
|
||||
StringUtils.defaultString(item.getIndustryDetail()),
|
||||
StringUtils.defaultString(item.getResearcherName()),
|
||||
StringUtils.defaultString(item.getResearcherPhone()),
|
||||
StringUtils.defaultString(item.getCompletionRate()) + "%",
|
||||
StringUtils.defaultString(item.getCompletionRate()),
|
||||
StringUtils.defaultString(item.getFirstVisitDate()),
|
||||
StringUtils.defaultString(item.getSecondVisitDate()),
|
||||
StringUtils.defaultString(item.getGiftSend()),
|
||||
@@ -180,7 +181,7 @@ class GetHouseholdsExcelController {
|
||||
"규모/세부품목",
|
||||
"조사원",
|
||||
"조사원 연락처",
|
||||
"당월 일계부 현황",
|
||||
"당월 일계부 현황(%)",
|
||||
"당월 1차 임가방문",
|
||||
"당월 2차 임가방문",
|
||||
"답례품 전달",
|
||||
@@ -496,6 +497,7 @@ class GetHouseholdsExcelController {
|
||||
StringUtils.defaultString(item.getWorkName()),
|
||||
StringUtils.defaultString(item.getWorkMark()),
|
||||
StringUtils.defaultString(item.getWorkLandArea()),
|
||||
StringUtils.defaultString(item.getAreaMark()),
|
||||
StringUtils.defaultString(item.getAreaUnitName()),
|
||||
StringUtils.defaultString(item.getHarvestQuantity()),
|
||||
StringUtils.defaultString(item.getHarvestUnitName()),
|
||||
@@ -523,6 +525,7 @@ class GetHouseholdsExcelController {
|
||||
"작업명",
|
||||
"작업 부호",
|
||||
"작업면적",
|
||||
"면적 부호",
|
||||
"단위",
|
||||
"수확량",
|
||||
"단위",
|
||||
|
||||
@@ -14,6 +14,8 @@ import lombok.Setter;
|
||||
public class GetHouseholdsExcelReqVO {
|
||||
// 연월
|
||||
private String recordMonth;
|
||||
// 임가번호
|
||||
private String householdNum;
|
||||
// 경영주 검색 필드 (전체, 경영주명, 전화번호)
|
||||
private String ownerField;
|
||||
// 경영주 검색어
|
||||
|
||||
@@ -19,6 +19,7 @@ public class GetDailyWork {
|
||||
private String workName;
|
||||
private String workMark;
|
||||
private String workLandArea;
|
||||
private String areaMark;
|
||||
private String areaUnitName;
|
||||
private String harvestQuantity;
|
||||
private String harvestUnitName;
|
||||
|
||||
@@ -26,6 +26,7 @@ class GetHouseholdsStatusController {
|
||||
getHouseholdsStatusPortIn.operate(pageable,
|
||||
new GetHouseholdsStatusCmd(
|
||||
reqVO.getRecordMonth(),
|
||||
reqVO.getHouseholdNum(),
|
||||
reqVO.getOwnerField(),
|
||||
reqVO.getOwnerValue(),
|
||||
reqVO.getRegionMainCode(),
|
||||
|
||||
@@ -13,6 +13,8 @@ import lombok.Setter;
|
||||
public class GetHouseholdsStatusReqVO {
|
||||
// 연월
|
||||
private String recordMonth;
|
||||
// 임가번호
|
||||
private String householdNum;
|
||||
// 경영주 검색 필드 (전체, 경영주명, 전화번호)
|
||||
private String ownerField;
|
||||
// 경영주 검색어
|
||||
|
||||
@@ -12,6 +12,8 @@ import lombok.Setter;
|
||||
public class GetHouseholdsStatusCmd {
|
||||
// 연월
|
||||
private String recordMonth;
|
||||
// 임가번호
|
||||
private String householdNum;
|
||||
// 경영주 검색 필드 (전체, 경영주명, 전화번호)
|
||||
private String ownerField;
|
||||
// 경영주 검색어
|
||||
|
||||
@@ -15,6 +15,7 @@ public class GetHouseholdsUIReqVO {
|
||||
private String sort;
|
||||
private Integer size;
|
||||
private String recordMonth;
|
||||
private String householdNum;
|
||||
private String ownerField;
|
||||
private String ownerValue;
|
||||
private String regionMainCode;
|
||||
|
||||
@@ -116,18 +116,29 @@
|
||||
<select id="selectRegionMainExcel"
|
||||
resultType="app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionMainExcelDto">
|
||||
/* 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
|
||||
u.code_text AS region_name,
|
||||
COUNT(DISTINCT a.seq) AS researcher_count,
|
||||
COUNT(DISTINCT rhh.household_seq) AS household_count,
|
||||
'전체' AS region_name,
|
||||
COUNT(DISTINCT ahr.admin_seq) AS researcher_count,
|
||||
COUNT(DISTINCT h.seq) AS household_count,
|
||||
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
|
||||
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
|
||||
FROM uicode u
|
||||
-1 AS sort_order
|
||||
FROM filtered_uicode u
|
||||
LEFT JOIN admin a
|
||||
ON a.region_main_code = u.id
|
||||
AND a.is_deleted = false
|
||||
@@ -139,7 +150,7 @@
|
||||
ON rhh.admin_seq = a.seq
|
||||
AND rhh.is_deleted = false
|
||||
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_panel = true
|
||||
LEFT JOIN household_visit hv
|
||||
@@ -149,22 +160,22 @@
|
||||
LEFT JOIN v_monthly_completion_rate v
|
||||
ON v.household_seq = h.seq
|
||||
AND v.record_month = #{recordMonth}
|
||||
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
|
||||
WHERE u.parent_id = 'code.region.main' AND u.is_deleted = false
|
||||
UNION ALL
|
||||
-- 전체 합계 행
|
||||
-- 지역별 집계
|
||||
SELECT
|
||||
'전체' AS region_name,
|
||||
COUNT(DISTINCT a.seq),
|
||||
COUNT(DISTINCT rhh.household_seq),
|
||||
COALESCE(ROUND(AVG(v.current_completion_rate), 1), 0),
|
||||
COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END),
|
||||
COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END),
|
||||
-1 as order_no
|
||||
FROM uicode u
|
||||
u.code_text AS region_name,
|
||||
COUNT(DISTINCT ahr.admin_seq) AS researcher_count,
|
||||
COUNT(DISTINCT h.seq) AS household_count,
|
||||
CASE
|
||||
WHEN COALESCE(AVG(v.current_completion_rate), 0) > 0
|
||||
THEN ROUND(COALESCE(AVG(v.current_completion_rate), 0), 1)
|
||||
ELSE 0
|
||||
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
|
||||
ON a.region_main_code = u.id
|
||||
AND a.is_deleted = false
|
||||
@@ -176,7 +187,7 @@
|
||||
ON rhh.admin_seq = a.seq
|
||||
AND rhh.is_deleted = false
|
||||
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_panel = true
|
||||
LEFT JOIN household_visit hv
|
||||
@@ -186,86 +197,107 @@
|
||||
LEFT JOIN v_monthly_completion_rate v
|
||||
ON v.household_seq = h.seq
|
||||
AND v.record_month = #{recordMonth}
|
||||
WHERE u.parent_id = 'code.region.main' and u.is_deleted = false
|
||||
<if test="'prod'.equals(activeProfiles)">
|
||||
and u.in_use = true
|
||||
</if>
|
||||
ORDER BY order_no
|
||||
WHERE u.parent_id = 'code.region.main' AND u.is_deleted = false
|
||||
GROUP BY u.id, u.code_text, u.order_no
|
||||
ORDER BY sort_order
|
||||
</select>
|
||||
|
||||
<select id="selectRegionDetailExcel"
|
||||
resultType="app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionDetailExcelDto">
|
||||
/* selectRegionDetailExcel : 대시보드 엑셀다운로드 (세부지역) */
|
||||
-- 세부 지역별 데이터
|
||||
SELECT
|
||||
detail_uicode.code_text AS region_detail_name,
|
||||
parent_uicode.code_text AS region_name,
|
||||
COUNT(DISTINCT rhh.household_seq) AS household_count,
|
||||
WITH detail_region AS (
|
||||
SELECT *
|
||||
FROM uicode
|
||||
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
|
||||
WHEN AVG(v.current_completion_rate) > 0 THEN ROUND(AVG(v.current_completion_rate), 1)
|
||||
ELSE 0
|
||||
END AS avg_completion_rate,
|
||||
COUNT(DISTINCT hv_visit.household_seq) AS visit_count,
|
||||
COUNT(DISTINCT hv_gift.household_seq) AS gift_sent_count,
|
||||
parent_uicode.order_no AS region_order,
|
||||
detail_uicode.order_no AS region_detail_order
|
||||
FROM uicode detail_uicode
|
||||
LEFT JOIN uicode parent_uicode ON parent_uicode.id = detail_uicode.parent_id
|
||||
LEFT JOIN household h
|
||||
ON h.region_detail_code = detail_uicode.id
|
||||
AND h.is_deleted = false
|
||||
AND h.is_panel = true
|
||||
LEFT JOIN researcher_has_household rhh
|
||||
ON rhh.household_seq = h.seq
|
||||
AND rhh.is_deleted = false
|
||||
LEFT JOIN v_monthly_completion_rate v
|
||||
ON v.household_seq = h.seq
|
||||
AND v.record_month = #{recordMonth}
|
||||
LEFT JOIN household_visit hv_visit
|
||||
ON hv_visit.household_seq = h.seq
|
||||
AND hv_visit.is_deleted = false
|
||||
AND TO_CHAR(hv_visit.visit_date, 'YYYYMM') = #{recordMonth}
|
||||
LEFT JOIN household_visit hv_gift
|
||||
ON hv_gift.household_seq = h.seq
|
||||
AND hv_gift.is_deleted = false
|
||||
AND hv_gift.is_gift_sent = true
|
||||
AND TO_CHAR(hv_gift.visit_date, 'YYYYMM') = #{recordMonth}
|
||||
WHERE detail_uicode.id LIKE 'code.region.detail.%'
|
||||
GROUP BY
|
||||
detail_uicode.code_text,
|
||||
parent_uicode.code_text,
|
||||
parent_uicode.order_no,
|
||||
detail_uicode.order_no
|
||||
UNION ALL
|
||||
-- 전체 합계 행
|
||||
SELECT
|
||||
WHEN COALESCE(AVG(v.current_completion_rate), 0) > 0
|
||||
THEN ROUND(COALESCE(AVG(v.current_completion_rate), 0), 1)
|
||||
ELSE 0
|
||||
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,
|
||||
COALESCE(main.order_no, 9999) AS main_order,
|
||||
COALESCE(sub.order_no, 9999) AS sub_order,
|
||||
COALESCE(detail.order_no, 9999) AS detail_order
|
||||
FROM detail_region detail
|
||||
INNER JOIN household h
|
||||
ON h.region_detail_code = detail.id
|
||||
AND h.is_deleted = false
|
||||
AND h.is_panel = true
|
||||
LEFT JOIN main_region main
|
||||
ON main.id = h.region_main_code
|
||||
LEFT JOIN sub_region sub
|
||||
ON sub.id = h.region_sub_code
|
||||
LEFT JOIN household_visit hv
|
||||
ON hv.household_seq = h.seq
|
||||
AND hv.is_deleted = false
|
||||
AND TO_CHAR(hv.visit_date, 'YYYYMM') = #{recordMonth}
|
||||
LEFT JOIN v_monthly_completion_rate v
|
||||
ON v.household_seq = h.seq
|
||||
AND v.record_month = #{recordMonth}
|
||||
<if test="'prod'.equals(activeProfiles)">
|
||||
WHERE main.in_use IS DISTINCT FROM false
|
||||
</if>
|
||||
GROUP BY
|
||||
main.code_text, main.order_no,
|
||||
sub.order_no,
|
||||
detail.code_text, detail.order_no
|
||||
UNION ALL
|
||||
SELECT
|
||||
'전체' AS region_main_name,
|
||||
'전체' AS region_detail_name,
|
||||
'전체' AS region_name,
|
||||
COUNT(DISTINCT rhh.household_seq) AS household_count,
|
||||
COALESCE(ROUND(AVG(v.current_completion_rate), 1), 0),
|
||||
COUNT(DISTINCT hv_visit.household_seq),
|
||||
COUNT(DISTINCT hv_gift.household_seq),
|
||||
-1 AS region_order,
|
||||
-1 AS region_detail_order
|
||||
FROM household h
|
||||
LEFT JOIN researcher_has_household rhh
|
||||
ON rhh.household_seq = h.seq
|
||||
AND rhh.is_deleted = false
|
||||
LEFT JOIN v_monthly_completion_rate v
|
||||
ON v.household_seq = h.seq
|
||||
AND v.record_month = #{recordMonth}
|
||||
LEFT JOIN household_visit hv_visit
|
||||
ON hv_visit.household_seq = h.seq
|
||||
AND hv_visit.is_deleted = false
|
||||
AND TO_CHAR(hv_visit.visit_date, 'YYYYMM') = #{recordMonth}
|
||||
LEFT JOIN household_visit hv_gift
|
||||
ON hv_gift.household_seq = h.seq
|
||||
AND hv_gift.is_deleted = false
|
||||
AND hv_gift.is_gift_sent = true
|
||||
AND TO_CHAR(hv_gift.visit_date, 'YYYYMM') = #{recordMonth}
|
||||
WHERE h.is_deleted = false AND h.is_panel = true
|
||||
order by
|
||||
region_order ASC,
|
||||
region_detail_order ASC
|
||||
COUNT(DISTINCT h.seq),
|
||||
CASE
|
||||
WHEN COALESCE(AVG(v.current_completion_rate), 0) > 0
|
||||
THEN ROUND(COALESCE(AVG(v.current_completion_rate), 0), 1)
|
||||
ELSE 0
|
||||
END,
|
||||
COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END),
|
||||
COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END),
|
||||
-1 AS main_order, -- 전체합계가 맨 위로 오도록
|
||||
-1 AS sub_order,
|
||||
-1 AS detail_order
|
||||
FROM household h
|
||||
LEFT JOIN main_region main
|
||||
ON main.id = h.region_main_code
|
||||
LEFT JOIN sub_region sub
|
||||
ON sub.id = h.region_sub_code
|
||||
LEFT JOIN household_visit hv
|
||||
ON hv.household_seq = h.seq
|
||||
AND hv.is_deleted = false
|
||||
AND TO_CHAR(hv.visit_date, 'YYYYMM') = #{recordMonth}
|
||||
LEFT JOIN v_monthly_completion_rate v
|
||||
ON v.household_seq = h.seq
|
||||
AND v.record_month = #{recordMonth}
|
||||
WHERE h.is_deleted = false
|
||||
AND h.is_panel = true
|
||||
<if test="'prod'.equals(activeProfiles)">
|
||||
AND main.in_use IS DISTINCT FROM false
|
||||
</if>
|
||||
)
|
||||
SELECT *
|
||||
FROM region_stats
|
||||
ORDER BY main_order, sub_order, detail_order
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -90,6 +90,11 @@
|
||||
<where>
|
||||
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 != ''">
|
||||
/* 경영주 검색 */
|
||||
<choose>
|
||||
|
||||
@@ -312,6 +312,7 @@
|
||||
dw.work_name ,
|
||||
dw.work_mark ,
|
||||
dw.work_land_area ,
|
||||
dw.area_mark ,
|
||||
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,
|
||||
dw.harvest_quantity ,
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -19,6 +19,15 @@
|
||||
<option value="PAPER">지류</option>
|
||||
</select>
|
||||
</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>
|
||||
</form>
|
||||
</div>
|
||||
@@ -414,6 +423,10 @@
|
||||
$('#regionMainCode').change(function() {
|
||||
getResearcherArea();
|
||||
});
|
||||
|
||||
$('#recordMonth').change(function() {
|
||||
getTotalPercentage();
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<script>
|
||||
@@ -459,7 +472,9 @@
|
||||
|
||||
// 엑셀 다운로드
|
||||
const goExcel = () => {
|
||||
excelDownload('/api/dashboard/chart/excel', null);
|
||||
const f = document.reqForm;
|
||||
const data = $(f).serializeObject();
|
||||
excelDownload('/api/dashboard/chart/excel', data);
|
||||
}
|
||||
</script>
|
||||
</section>
|
||||
|
||||
@@ -31,6 +31,22 @@
|
||||
</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-label">
|
||||
|
||||
@@ -40,7 +40,7 @@ public final class DailyRecordConstants {
|
||||
* [정책] 해당월 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일까지는 이전달 데이터 수정 가능
|
||||
* 이전 달을 의미하는 상수
|
||||
*/
|
||||
public static final int MODIFY_LIMIT_MONTH = 3;
|
||||
public static final int MODIFY_LIMIT_MONTH = 4;
|
||||
|
||||
/**
|
||||
* 일계부 수정 가능 일
|
||||
|
||||
@@ -347,4 +347,13 @@ kri.form.setSelectBoxUiCode = function({
|
||||
getParentValue: () => parentSelectUI.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();
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -127,8 +127,11 @@ krip.daily.createModal = function(id) {
|
||||
|
||||
const modal01 = document.querySelector(ENV.modal.selector).ui;
|
||||
modal01.open();
|
||||
// URL 해시 추가
|
||||
window.location.hash = 'modal-open';
|
||||
|
||||
modalControl._bindModelUI();
|
||||
|
||||
},
|
||||
function(code, rstData) {
|
||||
kri.logger.error('Do nothing. code: '+ code, rstData);
|
||||
|
||||
@@ -69,39 +69,59 @@
|
||||
</div>
|
||||
</section>
|
||||
</main>
|
||||
|
||||
<!-- 모달 팝업 -->
|
||||
<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-forest-diff:: modalFragment"></div>
|
||||
<div th:replace="guide/modal/modal-usage-type:: modalFragment"></div>
|
||||
<div th:replace="guide/modal/modal-contact:: modalFragment"></div>
|
||||
<!-- //모달 팝업 -->
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<!-- 모달 팝업 -->
|
||||
|
||||
<!-- //모달 팝업 -->
|
||||
<section layout:fragment="script">
|
||||
<script th:inline="javascript">
|
||||
let currentModal = null;
|
||||
|
||||
function goMobileGuide(){
|
||||
const modal = document.querySelector(".mobileGuide");
|
||||
modal.ui.open();
|
||||
openModal(modal, "mobileGuide");
|
||||
}
|
||||
function goIndustryType(){
|
||||
const modal = document.querySelector(".industryType");
|
||||
modal.ui.open();
|
||||
const modal = document.querySelector(".industryType");
|
||||
openModal(modal, "industryType");
|
||||
}
|
||||
function goForestDiff(){
|
||||
const modal = document.querySelector(".forestDiff");
|
||||
modal.ui.open();
|
||||
openModal(modal, "forestDiff");
|
||||
}
|
||||
function goUsageType(){
|
||||
const modal = document.querySelector(".usageType");
|
||||
modal.ui.open();
|
||||
openModal(modal, "usageType");
|
||||
}
|
||||
function goContact(){
|
||||
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>
|
||||
</section>
|
||||
</html>
|
||||
|
||||
@@ -104,6 +104,10 @@
|
||||
module: {
|
||||
modalPopup: null
|
||||
},
|
||||
modal: {
|
||||
// 등록 영역
|
||||
selector: '.addPopup',
|
||||
},
|
||||
data: {
|
||||
transferCategoryCodeList: /*[[${transferCategoryList}]]*/ [],
|
||||
codeRecordCropList: /*[[${codeRecordCropList}]]*/ [],
|
||||
@@ -317,6 +321,7 @@
|
||||
});
|
||||
|
||||
ENV.module.modalPopup.open();
|
||||
window.location.hash = 'modal-open';
|
||||
|
||||
document.querySelector('.modal-content').scrollTop = 0;
|
||||
|
||||
|
||||
@@ -103,6 +103,10 @@
|
||||
module: {
|
||||
modalPopup: null
|
||||
},
|
||||
modal: {
|
||||
// 등록 영역
|
||||
selector: '.addPopup',
|
||||
},
|
||||
data: {
|
||||
transferCategoryCodeList: /*[[${transferCategoryList}]]*/ [],
|
||||
codeRecordCropList: /*[[${codeRecordCropList}]]*/ [],
|
||||
@@ -307,6 +311,7 @@
|
||||
});
|
||||
|
||||
ENV.module.modalPopup.open();
|
||||
window.location.hash = 'modal-open';
|
||||
document.querySelector('.modal-content').scrollTop = 0;
|
||||
|
||||
// 모두 로드된 후 콜백 실행
|
||||
|
||||
@@ -108,7 +108,10 @@
|
||||
module: {
|
||||
modalPopup: null
|
||||
},
|
||||
|
||||
modal: {
|
||||
// 등록 영역
|
||||
selector: '.addPopup',
|
||||
},
|
||||
data: {
|
||||
purposeList: /*[[${purposeList}]]*/ [],
|
||||
unitList: /*[[${unitList}]]*/ [],
|
||||
@@ -341,6 +344,7 @@
|
||||
|
||||
|
||||
ENV.module.modalPopup.open();
|
||||
window.location.hash = 'modal-open';
|
||||
|
||||
document.querySelector('.modal-content').scrollTop = 0;
|
||||
|
||||
|
||||
@@ -152,6 +152,7 @@
|
||||
|
||||
const modal01 = document.querySelector(ENV.modal.selector).ui;
|
||||
modal01.open();
|
||||
window.location.hash = 'modal-open';
|
||||
},
|
||||
function(code, rstData) {
|
||||
kri.logger.error('Do nothing. code: '+ code, rstData);
|
||||
|
||||
Reference in New Issue
Block a user