[BO] 임가현황 리스트, 상세 작업 중 (2)

This commit is contained in:
kangsunlee
2025-06-13 19:15:58 +09:00
parent 4df2e17ab2
commit 1891ce5541
42 changed files with 644 additions and 86 deletions

View File

@@ -43,6 +43,7 @@ public class AdminDetailsService implements UserDetailsService {
return new AdminUser(
adminUser.getId(),
adminUser.getPassword(),
adminUser.getRoles().stream().map(CoreRole::getId).findFirst().orElse(null),
!accountDisabled,
true,
isCredentialsNonExpired(adminUser.getPasswordUpdatedAt()),

View File

@@ -7,12 +7,13 @@ import org.springframework.security.core.userdetails.User;
@Getter
public class AdminUser extends User {
private String roleId;
private long remainPasswordDays;
public AdminUser(
String username,
String password,
String roleId,
boolean enabled,
boolean accountNonExpired,
boolean credentialsNonExpired,
@@ -27,6 +28,7 @@ public class AdminUser extends User {
credentialsNonExpired,
accountNonLocked,
authorities);
this.roleId = roleId;
this.remainPasswordDays = remainPasswordDays;
}
}

View File

@@ -1,7 +1,11 @@
package app.module.admin.config.application.util;
import app.module.admin.config.application.security.AdminUser;
import app.module.core.config.adapters.web.interceptor.model.URITopTierVO;
import java.util.List;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Component;
@Component
@@ -19,4 +23,14 @@ public class AdminUtil {
}
return result;
}
public static String getLoginUserRole() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication == null || !(authentication.getPrincipal() instanceof AdminUser)) {
return null;
}
AdminUser user = (AdminUser) authentication.getPrincipal();
return user.getRoleId().isEmpty() ? null : user.getRoleId();
}
}

View File

@@ -0,0 +1,19 @@
package app.module.admin.usecase.household.getDailyRecordsCount.adapters.persistence;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount;
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd;
import app.module.admin.usecase.household.getDailyRecordsCount.ports.GetDailyRecordsCountPortOut;
import java.util.Optional;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class GetDailyRecordsCountDao implements GetDailyRecordsCountPortOut {
private final GetDailyRecordsCountMapper mapper;
@Override
public Optional<GetDailyRecordsCount> operate(GetDailyRecordsCountCmd cmd) {
return mapper.getDailyRecordsCount(cmd);
}
}

View File

@@ -0,0 +1,11 @@
package app.module.admin.usecase.household.getDailyRecordsCount.adapters.persistence;
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount;
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd;
import java.util.Optional;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface GetDailyRecordsCountMapper {
Optional<GetDailyRecordsCount> getDailyRecordsCount(GetDailyRecordsCountCmd cmd);
}

View File

@@ -0,0 +1,9 @@
package app.module.admin.usecase.household.getDailyRecordsCount.ports;
import java.util.Optional;
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount;
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd;
public interface GetDailyRecordsCountPortIn {
Optional<GetDailyRecordsCount> operate(GetDailyRecordsCountCmd cmd);
}

View File

@@ -0,0 +1,9 @@
package app.module.admin.usecase.household.getDailyRecordsCount.ports;
import java.util.Optional;
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount;
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd;
public interface GetDailyRecordsCountPortOut {
Optional<GetDailyRecordsCount> operate(GetDailyRecordsCountCmd cmd);
}

View File

@@ -0,0 +1,20 @@
package app.module.admin.usecase.household.getDailyRecordsCount.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount;
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd;
import app.module.admin.usecase.household.getDailyRecordsCount.ports.GetDailyRecordsCountPortIn;
import app.module.admin.usecase.household.getDailyRecordsCount.ports.GetDailyRecordsCountPortOut;
import java.util.Optional;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class GetDailyRecordsCountService implements GetDailyRecordsCountPortIn {
private final GetDailyRecordsCountPortOut portOut;
@Override
public Optional<GetDailyRecordsCount> operate(GetDailyRecordsCountCmd cmd) {
return portOut.operate(cmd);
}
}

View File

@@ -0,0 +1,18 @@
package app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetDailyRecordsCount {
private Integer doneCount;
private Integer emptyCount;
private Integer incompleteCount;
private Integer waitingCount;
private Double progressPercent;
}

View File

@@ -0,0 +1,15 @@
package app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetDailyRecordsCountCmd {
private Long householdSeq;
private String recordMonth;
}

View File

@@ -0,0 +1,19 @@
package app.module.admin.usecase.household.getDailyRecordsStatus.adapters.persistence;
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortOut;
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus;
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class GetDailyRecordsStatusDao implements GetDailyRecordsStatusPortOut {
private final GetDailyRecordsStatusMapper mapper;
@Override
public List<GetDailyRecordsStatus> operate(GetDailyRecordsStatusCmd cmd) {
return mapper.getDailyRecordsStatus(cmd);
}
}

View File

@@ -0,0 +1,11 @@
package app.module.admin.usecase.household.getDailyRecordsStatus.adapters.persistence;
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus;
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface GetDailyRecordsStatusMapper {
List<GetDailyRecordsStatus> getDailyRecordsStatus(GetDailyRecordsStatusCmd cmd);
}

View File

@@ -0,0 +1,9 @@
package app.module.admin.usecase.household.getDailyRecordsStatus.ports;
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus;
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd;
import java.util.List;
public interface GetDailyRecordsStatusPortIn {
List<GetDailyRecordsStatus> operate(GetDailyRecordsStatusCmd cmd);
}

View File

@@ -0,0 +1,9 @@
package app.module.admin.usecase.household.getDailyRecordsStatus.ports;
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus;
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd;
import java.util.List;
public interface GetDailyRecordsStatusPortOut {
List<GetDailyRecordsStatus> operate(GetDailyRecordsStatusCmd cmd);
}

View File

@@ -0,0 +1,20 @@
package app.module.admin.usecase.household.getDailyRecordsStatus.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus;
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd;
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortIn;
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortOut;
import java.util.List;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class GetDailyRecordsStatusService implements GetDailyRecordsStatusPortIn {
private final GetDailyRecordsStatusPortOut portOut;
@Override
public List<GetDailyRecordsStatus> operate(GetDailyRecordsStatusCmd cmd) {
return portOut.operate(cmd);
}
}

View File

@@ -0,0 +1,20 @@
package app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetDailyRecordsStatus {
private String dayGroup;
private RecordStatusType allStatusType;
private String incomeStatus;
private String workStatus;
private String expenseStatus;
private String powerStatus;
private String forestryStatus;
}

View File

@@ -0,0 +1,15 @@
package app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetDailyRecordsStatusCmd {
private Long householdSeq;
private String recordMonth;
}

View File

@@ -0,0 +1,16 @@
package app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@Getter
@RequiredArgsConstructor
public enum RecordStatusType {
WAITING("대기"),
DONE("작성완료"),
INCOMPLETE("미완료"),
NONE("등록없음"),
EMPTY("미작성");
private final String desc;
}

View File

@@ -1,5 +1,6 @@
package app.module.admin.usecase.household.getHouseholdStatus.adapters.persistence;
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus;
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
import app.module.core.usecase.household.getHousehold.adapters.persistence.GetHouseholdMapper;
import java.util.Optional;
@@ -15,7 +16,7 @@ class GetHouseholdStatusDao implements GetHouseholdStatusPortOut {
private final GetHouseholdStatusMapper mapper;
@Override
public Optional<GetHouseholdsStatus> operate(GetHouseholdStatusCmd cmd) {
public Optional<GetHouseholdStatus> operate(GetHouseholdStatusCmd cmd) {
return mapper.getHouseholdStatusById(cmd);
}
}

View File

@@ -1,5 +1,6 @@
package app.module.admin.usecase.household.getHouseholdStatus.adapters.persistence;
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus;
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd;
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
import java.util.Optional;
@@ -7,6 +8,6 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface GetHouseholdStatusMapper {
Optional<GetHouseholdsStatus> getHouseholdStatusById(GetHouseholdStatusCmd cmd);
Optional<GetHouseholdStatus> getHouseholdStatusById(GetHouseholdStatusCmd cmd);
}

View File

@@ -1,9 +1,10 @@
package app.module.admin.usecase.household.getHouseholdStatus.ports;
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus;
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd;
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
import java.util.Optional;
public interface GetHouseholdStatusPortIn {
Optional<GetHouseholdsStatus> operate(GetHouseholdStatusCmd cmd);
Optional<GetHouseholdStatus> operate(GetHouseholdStatusCmd cmd);
}

View File

@@ -1,9 +1,10 @@
package app.module.admin.usecase.household.getHouseholdStatus.ports;
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus;
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd;
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
import java.util.Optional;
public interface GetHouseholdStatusPortOut {
Optional<GetHouseholdsStatus> operate(GetHouseholdStatusCmd cmd);
Optional<GetHouseholdStatus> operate(GetHouseholdStatusCmd cmd);
}

View File

@@ -1,5 +1,6 @@
package app.module.admin.usecase.household.getHouseholdStatus.ports.application;
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus;
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
@@ -14,7 +15,7 @@ class GetHouseholdStatusService implements GetHouseholdStatusPortIn {
private final GetHouseholdStatusPortOut portOut;
@Override
public Optional<GetHouseholdsStatus> operate(GetHouseholdStatusCmd cmd) {
public Optional<GetHouseholdStatus> operate(GetHouseholdStatusCmd cmd) {
return portOut.operate(cmd);
}
}

View File

@@ -10,5 +10,5 @@ import lombok.Setter;
@AllArgsConstructor
@EqualsAndHashCode
public class GetHouseholdStatusCmd {
private Integer seq;
private Long seq;
}

View File

@@ -1,6 +1,10 @@
package app.module.admin.usecase.household.getHouseholdStatusUI;
import app.module.admin.config.application.util.DateUiUtil;
import app.module.admin.usecase.household.getDailyRecordsCount.ports.GetDailyRecordsCountPortIn;
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd;
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortIn;
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd;
import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortIn;
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd;
import lombok.RequiredArgsConstructor;
@@ -14,18 +18,31 @@ import app.module.admin.usecase.household.getHouseholdStatusUI.model.GetHousehol
@Controller
@RequiredArgsConstructor
class GetHouseholdStatusUIController {
private final GetHouseholdStatusPortIn portIn;
private final GetHouseholdStatusPortIn getHouseholdStatusPortIn;
private final GetDailyRecordsStatusPortIn getDailyRecordsStatusPortIn;
private final GetDailyRecordsCountPortIn getDailyRecordsCountPortIn;
@GetMapping(path = "/household/households/{seq}")
String operate(
@PathVariable Integer seq,
@PathVariable Long seq,
Model model,
@ModelAttribute("reqVO") GetHouseholdStatusUIReqVO reqVO) {
model.addAttribute("householdInfo", portIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null));
model.addAttribute("seq", seq);
model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue());
// 임가 상세 정보
model.addAttribute("householdInfo",
getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null));
// TODO : 비동기호출로 변경하기
// model.addAttribute("dailyRecords",
// getDailyRecordsStatusPortIn.operate(new GetDailyRecordsStatusCmd(seq, "202506")));
// model.addAttribute("dailyRecordsCount",
// getDailyRecordsCountPortIn.operate(new GetDailyRecordsCountCmd(seq, "202506"))
// .orElse(null));
return "household/households/{seq}";
}
}

View File

@@ -41,7 +41,9 @@ class GetHouseholdsStatusController {
reqVO.getIsGiftSent(),
reqVO.getResearcherField(),
reqVO.getResearcherValue(),
reqVO.getIsPanel()
reqVO.getIsPanel(),
reqVO.getUserRole(),
reqVO.getUserRegionMainCode()
))
);
}

View File

@@ -41,4 +41,8 @@ public class GetHouseholdsStatusReqVO {
private String researcherValue;
// 패널 유지 여부
private Boolean isPanel;
// 로그인한 유저 역할
private String userRole;
// 로그인한 유저 실사 지역
private String userRegionMainCode;
}

View File

@@ -40,4 +40,9 @@ public class GetHouseholdsStatusCmd {
private String researcherValue;
// 패널 유지 여부
private Boolean isPanel;
// 로그인한 유저 역할
private String userRole;
// 로그인한 유저 실사 지역
private String userRegionMainCode;
}

View File

@@ -1,8 +1,12 @@
package app.module.admin.usecase.household.getHouseholdsStatusUI;
import app.module.admin.config.application.util.AdminUtil;
import app.module.admin.config.application.util.DateUiUtil;
import app.module.admin.usecase.household.getHouseholdsStatusUI.model.GetHouseholdsUIReqVO;
import app.module.core.config.adapters.persistence.entity.Admin;
import app.module.core.config.application.util.CommonUtil;
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
import app.module.core.usecase.admin.view.ports.application.domain.AdminView;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
@@ -14,16 +18,32 @@ import org.springframework.web.bind.annotation.ModelAttribute;
@RequiredArgsConstructor
class GetHouseholdsStatusUIController {
private final UICodeListPortIn uiCodeListPortIn;
private final AdminViewPortIn adminViewPortIn;
@GetMapping(path = "/household/households")
String operate(
Model model,
@ModelAttribute("reqVO") GetHouseholdsUIReqVO reqVO) {
AdminView admin =
adminViewPortIn.connect(CommonUtil.getLoginUsername()).orElse(null);
// 로그인한 관리자 역할
model.addAttribute("userRole", CommonUtil.getLoginUserRole());
// 실사
model.addAttribute("regionMainList", uiCodeListPortIn.connect("code.region.main"));
model.addAttribute("userRole", AdminUtil.getLoginUserRole());
model.addAttribute("userRegionMainCode", admin.getRegionMainCode());
// 실사 코드 목록
// 지방실사와 조사원은 담당실사 지역만 조회
if (!"ROLE_ADMIN".equals(AdminUtil.getLoginUserRole()) && admin.getRegionMainCode() != null) {
model.addAttribute("regionMainList",
uiCodeListPortIn.connect("code.region.main").stream()
.filter(code -> admin.getRegionMainCode().equals(code.getId()))
.toList());
} else {
// 관리자면 전체
model.addAttribute("regionMainList", uiCodeListPortIn.connect("code.region.main"));
}
// 지역
model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub"));
// 세부지역

View File

@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper
namespace="app.module.admin.usecase.household.getDailyRecordsCount.adapters.persistence.GetDailyRecordsCountMapper">
<select id="getDailyRecordsCount"
resultType="app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount">
/* getDailyRecordsCount : 일계부 상태 요약 및 진행률 조회 */
WITH data_counts AS (
SELECT
dr.id,
COUNT(DISTINCT di.id) AS income_cnt,
COUNT(DISTINCT dw.id) AS work_cnt,
COUNT(DISTINCT de.id) AS expense_cnt,
COUNT(DISTINCT dfs.id) AS forestry_cnt
FROM daily_record dr
LEFT JOIN daily_income di ON di.daily_record_seq = dr.id AND di.is_deleted = false
LEFT JOIN daily_work dw ON dw.daily_record_seq = dr.id AND dw.is_deleted = false
LEFT JOIN daily_expense de ON de.daily_record_seq = dr.id AND de.is_deleted = false
LEFT JOIN daily_forestry dfs ON dfs.daily_record_seq = dr.id AND dfs.is_deleted = false
WHERE dr.household_seq = #{householdSeq}
AND dr.record_month = #{recordMonth}
AND dr.is_deleted = false
GROUP BY dr.id
),
record_status AS (
SELECT
CASE
WHEN ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE) THEN 'WAITING' /* 대기 */
WHEN dr.all_status = 'DONE' THEN 'DONE' /* 작성완료 */
WHEN dr.all_status = 'WAITING' THEN 'INCOMPLETE' /* 미완료 */
WHEN dr.all_status = 'TODAY_NONE' THEN 'NONE' /* 등록없음 */
ELSE 'EMPTY' /* 미작성 */
END AS all_status
FROM daily_day_group ddg
LEFT JOIN daily_record dr ON ddg.group_no = dr.day_group_no
AND dr.household_seq = #{householdSeq}
AND dr.record_month = #{recordMonth}
AND dr.is_deleted = false
)
SELECT
COUNT(*) FILTER (WHERE all_status = 'DONE') AS done_count,
COUNT(*) FILTER (WHERE all_status = 'EMPTY') AS empty_count,
COUNT(*) FILTER (WHERE all_status = 'INCOMPLETE') AS incomplete_count,
COUNT(*) FILTER (WHERE all_status = 'WAITING') AS waiting_count,
ROUND(
100.0 *
COUNT(*) FILTER (WHERE all_status = 'DONE')
/ NULLIF(
(SELECT COUNT(*)
FROM daily_day_group
WHERE end_day &lt;= EXTRACT(DAY FROM CURRENT_DATE)), 0
),
2
) AS progress_percent
FROM record_status
</select>
</mapper>

View File

@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper
namespace="app.module.admin.usecase.household.getDailyRecordsStatus.adapters.persistence.GetDailyRecordsStatusMapper">
<select id="getDailyRecordsStatus"
resultType="app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus">
/* getDailyRecordsStatus : 일계부 등록 현황 리스트 조회 */
WITH data_counts AS (
SELECT
dr.id,
COUNT(DISTINCT di.id) AS income_cnt,
COUNT(DISTINCT dw.id) AS work_cnt,
COUNT(DISTINCT de.id) AS expense_cnt,
COUNT(DISTINCT dr.id) AS power_cnt,
COUNT(DISTINCT dfs.id) AS forestry_cnt
FROM daily_record dr
LEFT JOIN daily_income di ON di.daily_record_seq = dr.id AND di.is_deleted = false
LEFT JOIN daily_work dw ON dw.daily_record_seq = dr.id AND dw.is_deleted = false
LEFT JOIN daily_expense de ON de.daily_record_seq = dr.id AND de.is_deleted = false
LEFT JOIN daily_power dp ON dp.daily_record_seq = dr.id AND dp.is_deleted = false
LEFT JOIN daily_forestry dfs ON dfs.daily_record_seq = dr.id AND dfs.is_deleted = false
-- TODO : 농업 자가소비량 테이블 수정 후 추가
WHERE dr.household_seq = #{householdSeq}
AND dr.record_month = #{recordMonth}
AND dr.is_deleted = false
GROUP BY dr.id
)
SELECT
ddg.start_day || CASE WHEN ddg.start_day = ddg.end_day THEN '' ELSE '-' || ddg.end_day END AS day_group,
CASE
WHEN ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE) THEN 'WAITING' /* 대기 */
WHEN dr.all_status = 'DONE' THEN 'DONE' /* 작성완료 */
WHEN dr.all_status = 'WAITING' THEN 'INCOMPLETE' /* 미완료 */
WHEN dr.all_status = 'TODAY_NONE' THEN 'NONE' /* 등록없음 */
ELSE 'EMPTY' /* 미작성 */
END AS all_status,
get_status(ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.income_status, dc.income_cnt) AS income_status,
get_status(ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.work_status, dc.work_cnt) AS work_status,
get_status(ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.expense_status, dc.expense_cnt) AS expense_status,
get_status(ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.power_status, dc.power_cnt) AS power_status,
get_status(ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.forestry_status, dc.forestry_cnt) AS forestry_status
-- TODO : 농업 자가소비량 테이블 수정 후 추가
FROM daily_day_group ddg
LEFT JOIN daily_record dr ON ddg.group_no = dr.day_group_no
AND dr.household_seq = #{householdSeq}
AND dr.record_month = #{recordMonth}
AND dr.is_deleted = false
LEFT JOIN data_counts dc ON dc.id = dr.id
ORDER BY ddg.start_day
</select>
</mapper>

View File

@@ -4,10 +4,11 @@
<mapper
namespace="app.module.admin.usecase.household.getHouseholdStatus.adapters.persistence.GetHouseholdStatusMapper">
<select id="getHouseholdStatusById"
resultType="app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus">
resultType="app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus">
SELECT
h.seq AS householdSeq,
h.household_num AS householdNum,
h.owner_name AS householdName,
h.owner_age AS householdAge,
h.tel AS householdTel,
h.phone AS householdPhone,

View File

@@ -18,7 +18,7 @@
FROM daily_day_group
WHERE end_day &lt;= EXTRACT(DAY FROM CURRENT_DATE)), 0
),
1
2
) AS progress_percent
) /* 일계부 입력 진행 완료 퍼센테이지 (이번달 작성 완료일 수 / 현재날짜 기준 전체 입력 가능 날짜 수) */
@@ -81,14 +81,23 @@
</choose>
</if>
<if test="cmd.regionMainCode != null and cmd.regionMainCode != ''">
/* 실사 검색 */
AND hvr.regionMainCode = #{cmd.regionMainCode}
</if>
<choose>
<when test="cmd.userRole != null and cmd.userRole != 'ROLE_ADMIN'">
/* 지역 검색 : 지방실사 또는 조사원 */
AND hvr.regionMainCode = #{cmd.userRegionMainCode}
</when>
<when test="cmd.regionSubCode != null and cmd.regionSubCode != ''">
/* 지역 검색 : 관리자 */
AND hvr.regionMainCode = #{cmd.regionSubCode}
</when>
</choose>
<if test="cmd.regionSubCode != null and cmd.regionSubCode != ''">
/* 지역 검색 */
AND hvr.regionSubCode = #{cmd.regionSubCode}
</if>
<if test="cmd.regionDetailCode != null and cmd.regionDetailCode != ''">
/* 세부지역 검색 */
AND hvr.regionDetailCode = #{cmd.regionDetailCode}

View File

@@ -9,6 +9,9 @@
<input name="page" th:field="*{page}" type="hidden"/>
<input name="size" th:field="*{size}" type="hidden"/>
<input name="userRole" th:value="${userRole}" type="hidden"/>
<input name="userRegionMainCode" th:value="${userRegionMainCode}" type="hidden"/>
<div>
<label>입력월</label>
<select name="recordMonth" th:field="*{recordMonth}">
@@ -98,13 +101,15 @@
<option value="false">미전달</option>
</select>
<label>조사원</label>
<select name="researcherField" th:field="*{researcherField}">
<option value="">전체</option>
<option value="name">이름</option>
<option value="phone">전화번호</option>
</select>
<input type="text" name="researcherValue" placeholder="" th:field="*{researcherValue}">
<span class="hide-role-researcher">
<label>조사원</label>
<select name="researcherField" th:field="*{researcherField}">
<option value="">전체</option>
<option value="name">이름</option>
<option value="phone">전화번호</option>
</select>
<input type="text" name="researcherValue" placeholder="" th:field="*{researcherValue}">
</span>
<label>패널 유지 여부</label>
<select name="isPanel" th:field="*{isPanel}">
@@ -137,8 +142,8 @@
<th style="width: 100px;">1차 방문일</th>
<th style="width: 100px;">2차 방문일</th>
<th style="width: 100px;">답례품 전달</th>
<th style="width: 80px;">조사원</th>
<th style="width: 120px;">조사원 휴대전화</th>
<th style="width: 80px;" class="hide-role-researcher">조사원</th>
<th style="width: 120px;" class="hide-role-researcher">조사원 휴대전화</th>
</tr>
</thead>
<tbody id="listTBody">
@@ -195,8 +200,8 @@
<td>${isEmpty(ct.firstVisitDate)}</td> <!-- 1차방문날짜 -->
<td>${isEmpty(ct.secondVisitDate)}</td> <!-- 2차방문날짜 -->
<td>${ct.isGiftSent ? "전달" : "미전달"}</td> <!-- 답례품 -->
<td>${isEmpty(ct.researcherName)}</td> <!-- 조사원이름 -->
<td>${isEmpty(ct.researcherPhone)}</td> <!-- 조사원번호 -->
<td class="hide-role-researcher">${isEmpty(ct.researcherName)}</td> <!-- 조사원이름 -->
<td class="hide-role-researcher">${isEmpty(ct.researcherPhone)}</td> <!-- 조사원번호 -->
</tr>
`
);
@@ -210,6 +215,13 @@
`);
}
// 조사원일 경우 조사원이름, 번호 hide
if (f.userRole.value === 'ROLE_RESEARCHER') {
$('.hide-role-researcher').hide();
} else {
$('.hide-role-researcher').show();
}
// Pagination 구성하기
const paging = $('.paging');
paging.empty();
@@ -237,6 +249,7 @@
</script>
<script>
// TODO : 이거 공통으로 뺄지 ?
function isEmpty(value, fallback = '-') {
return value !== null && value !== undefined && value !== '' ? value : fallback;
}

View File

@@ -3,7 +3,121 @@
layout:decorate="~{layout/layout}">
<section layout:fragment="content">
<h1>/household/households/{seq}</h1>
<!-- 1. 상단 정보 -->
<form autocomplete="off" method="get" name="reqForm">
<div>
<table>
<tr>
<th>임가번호</th>
<td th:text="${householdInfo.householdNum}">16750</td>
<th>경영주</th>
<td th:text="${householdInfo.householdName}">홍길동</td>
<th>연령</th>
<td th:text="${householdInfo.householdAge}">75</td>
</tr>
<tr>
<th>가구 연락처</th>
<td th:text="${householdInfo.householdTel}">031-0000-0000</td>
<th>휴대전화</th>
<td th:text="${householdInfo.householdPhone}">010-0000-0000</td>
<th>실사</th>
<td th:text="${householdInfo.regionMainName}">서울</td>
</tr>
<tr>
<th>지역</th>
<td th:text="${householdInfo.regionSubName}">31. 경기도</td>
<th>세부지역</th>
<td th:text="${householdInfo.regionDetailName}">9. 경기</td>
<th>주소</th>
<td th:text="${householdInfo.address}">경기 성남시 분당구 삼평대로...</td>
</tr>
<tr>
<th>업종 대분류</th>
<td th:text="${householdInfo.industryLargeName}">40. 수실류재배업</td>
<th>업종 중분류1</th>
<td th:text="${householdInfo.industryMiddleName}">42. 대추재배업</td>
<th>업종 중분류2</th>
<td th:text="${householdInfo.industrySubMiddleName != null ? householdInfo.industrySubMiddleName : ''}">42. 대추재배업</td>
<th>규모/세부품목</th>
<td th:text="${householdInfo.industryDetailName != null ? householdInfo.industryDetailName : ''}">52_1. 조경수</td>
</tr>
<tr>
<th>조사원</th>
<td th:text="${householdInfo.researcherName}">김조사</td>
<th>조사원 연락처</th>
<td th:text="${householdInfo.researcherPhone}">010-1111-1111</td>
<th>유지여부</th>
<td th:text="${householdInfo.isPanel ? '1. 유지' : '2. 탈락'}">1. 유지</td>
</tr>
<tr>
<th>비고</th>
<td colspan="5" th:text="${householdInfo.memo}">비고 텍스트</td>
</tr>
</table>
</div>
</form>
<!-- 2. 버튼 -->
<div style="">
<button>수정</button>
<button>조사원 매핑</button>
</div>
<!-- 3. 탭 -->
<div style="margin-top: 50px;">
<button class="tab daily-record">일계부 등록 현황</button>
<button class="tab forest-product">임산물 현황</button>
<button class="tab bank-auto-transfer">은행자동이체 내역</button>
<button class="tab household-visit">임가방문정보</button>
<select name="recordMonth">
<option
th:each="m : ${monthList}" th:value="${m.value}" th:text="${m.label}">2025년 5월</option>
</select>
</div>
<!-- 4. 테이블 -->
<div class="table daily-record">
<span>
<span>작성완료: <span>0</span></span>
<span>미작성: <span>0</span></span>
<span>미완료: <span>0</span></span>
<span>대기: <span>0</span></span>
<span> 현황: <span>0</span>%</span>
</span>
<table border="1" style="margin-top: 50px;">
<thead>
<tr>
<th>입력날짜</th>
<th>완료상태</th>
<th>수입</th>
<th>노동투입</th>
<th>지출</th>
<th>동력사용시간</th>
<th>입업자가소비량</th>
<!-- <th>농업자가소비량</th>-->
</tr>
</thead>
<tbody>
<tr>
<td>1-2</td>
<td>작성완료</td>
<td>4건</td>
<td>등록없음</td>
<td>등록없음</td>
<td>2건</td>
<td>2건</td>
<!-- <td>대상아님</td>-->
</tr>
</tbody>
</table>
</div>
</section>
<section layout:fragment="script">
<script th:inline="javascript">
</script>
</section>
</html>

View File

@@ -38,16 +38,16 @@ public class InitAdminData implements ApplicationRunner {
false,
List.of("ROLE_ADMIN"));
// 연구원
// 지방실사
saveAdminPortIn.connect(
null,
"test-analyst",
"analyst1@#$",
"analyst@framework.org",
"test-local-inspection",
"local1@#$",
"local@framework.org",
"code.region.main.1",
false,
false,
List.of("ROLE_ANALYST"));
List.of("ROLE_LOCAL_INSPECTION"));
// 조사원
saveAdminPortIn.connect(

View File

@@ -43,8 +43,8 @@ public class InitRoleData implements ApplicationRunner {
roleSavePortIn.connect(
AppType.ADMIN,
"ROLE_ANALYST",
"연구원",
"ROLE_LOCAL_INSPECTION",
"지방실사",
orderNo++,
List.of("ADMIN_API", "ADMIN_ACCESS"));

View File

@@ -106,7 +106,7 @@ public class InitUriAdminData implements ApplicationRunner {
"메인",
"/",
true,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
// `1` depth URI 정의 - 시작
@@ -117,7 +117,7 @@ public class InitUriAdminData implements ApplicationRunner {
"임가 현황",
"/household",
true,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
@@ -126,7 +126,7 @@ public class InitUriAdminData implements ApplicationRunner {
"조사원 현황",
"/researcher",
true,
Set.of("ROLE_ADMIN", "ROLE_ANALYST"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION"));
appendURI(
AppType.ADMIN,
@@ -135,7 +135,7 @@ public class InitUriAdminData implements ApplicationRunner {
"대시보드",
"/dashboard",
true,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
@@ -153,7 +153,7 @@ public class InitUriAdminData implements ApplicationRunner {
"게시판",
"/board",
true,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
@@ -192,7 +192,7 @@ public class InitUriAdminData implements ApplicationRunner {
"임가 현황",
"/household/households",
true,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
@@ -201,7 +201,7 @@ public class InitUriAdminData implements ApplicationRunner {
"임가 등록",
"/household/households/create",
false,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
@@ -210,7 +210,7 @@ public class InitUriAdminData implements ApplicationRunner {
"임가 상세",
"/household/households/{{pathVar}}",
false,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
// 조사원 현황 메뉴 시작
appendURI(
@@ -220,7 +220,7 @@ public class InitUriAdminData implements ApplicationRunner {
"조사원 현황",
"/researcher/researchers",
true,
Set.of("ROLE_ADMIN", "ROLE_ANALYST"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION"));
appendURI(
AppType.ADMIN,
@@ -229,7 +229,7 @@ public class InitUriAdminData implements ApplicationRunner {
"조사원 등록",
"/researcher/researchers/create",
false,
Set.of("ROLE_ADMIN", "ROLE_ANALYST"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION"));
appendURI(
AppType.ADMIN,
@@ -238,7 +238,7 @@ public class InitUriAdminData implements ApplicationRunner {
"조사원 상세",
"/researcher/researchers/view/{{pathVar}}",
false,
Set.of("ROLE_ADMIN", "ROLE_ANALYST"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION"));
// 대시보드
appendURI(
@@ -248,7 +248,7 @@ public class InitUriAdminData implements ApplicationRunner {
"대시보드",
"/dashboard",
true,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
// 커뮤니케이션 메뉴 시작
appendURI(
@@ -313,7 +313,7 @@ public class InitUriAdminData implements ApplicationRunner {
"예제 게시판",
"/board/articles",
true,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
@@ -322,7 +322,7 @@ public class InitUriAdminData implements ApplicationRunner {
"예제 게시판 등록",
"/board/articles/create",
false,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
@@ -331,7 +331,7 @@ public class InitUriAdminData implements ApplicationRunner {
"예제 게시판 수정",
"/board/articles/{{pathVar}}",
false,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
@@ -340,7 +340,7 @@ public class InitUriAdminData implements ApplicationRunner {
"예제 게시판 삭제",
"/board/articles/delete",
false,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
@@ -349,7 +349,7 @@ public class InitUriAdminData implements ApplicationRunner {
"예제 게시판 엑셀 다운로드",
"/board/articles/excel",
false,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
// 예제 게시판 - 끝
// 분석 메뉴 시작

View File

@@ -88,17 +88,6 @@ public class CommonUtil {
return username;
}
public static String getLoginUserRole() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication == null) return null;
return authentication.getAuthorities().stream()
.map(GrantedAuthority::getAuthority)
.filter(authStr -> authStr.startsWith("ROLE_"))
.findFirst()
.orElse(null);
}
public static HttpServletRequest getRequest() {
HttpServletRequest request = null;
if (RequestContextHolder.getRequestAttributes() != null) {

View File

@@ -4,41 +4,41 @@
INSERT INTO privilege
(id, description, app_type, order_no, created_at, created_by, updated_at, updated_by, is_deleted)
VALUES
('ADMIN_API', 'ADMIN API 이용 권한', 'ADMIN', 0, CURRENT_TIMESTAMP, 'INIT_DATA',CURRENT_TIMESTAMP, 'INIT_DATA',false),
('ADMIN_ACCESS', 'ADMIN 사이트 접근 권한', 'ADMIN', 1, CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA', false),
('FRONT_API', 'Front API 사용권한', 'FRONT', 0, CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA', false),
('FRONT_ACCESS', 'Front 사이트 접근 권한', 'FRONT', 1, CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA', false);
('ADMIN_API', 'ADMIN API 이용 권한', 'ADMIN', 0, NOW(), 'INIT_DATA',NOW(), 'INIT_DATA',false),
('ADMIN_ACCESS', 'ADMIN 사이트 접근 권한', 'ADMIN', 1, NOW(), 'INIT_DATA', NOW(), 'INIT_DATA', false),
('FRONT_API', 'Front API 사용권한', 'FRONT', 0, NOW(), 'INIT_DATA', NOW(), 'INIT_DATA', false),
('FRONT_ACCESS', 'Front 사이트 접근 권한', 'FRONT', 1, NOW(), 'INIT_DATA', NOW(), 'INIT_DATA', false);
-- 역할
INSERT INTO role
(id, description, app_type, order_no, created_at, created_by, updated_at, updated_by, is_deleted)
VALUES
('ROLE_ADMIN', '관리자', 'ADMIN', 0, CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA', false),
('ROLE_ANALYST', '연구원', 'ADMIN', 1, CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA', false),
('ROLE_RESEARCHER', '조사원', 'ADMIN', 2, CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA', false),
('ROLE_GENERAL', '일반 사용자', 'FRONT', 0, CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA', false);
('ROLE_ADMIN', '관리자', 'ADMIN', 0, NOW(), 'INIT_DATA', NOW(), 'INIT_DATA', false),
('ROLE_LOCAL_INSPECTION', '지방실사', 'ADMIN', 1, NOW(), 'INIT_DATA', NOW(), 'INIT_DATA', false),
('ROLE_RESEARCHER', '조사원', 'ADMIN', 2, NOW(), 'INIT_DATA', NOW(), 'INIT_DATA', false),
('ROLE_GENERAL', '일반 사용자', 'FRONT', 0, NOW(), 'INIT_DATA', NOW(), 'INIT_DATA', false);
-- 역할 권한 매핑
INSERT INTO role_has_privilege
(role_id, privilege_id, created_at, created_by, updated_at, updated_by, is_deleted)
VALUES
-- ROLE_ADMIN
('ROLE_ADMIN', 'ADMIN_API', CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA',
('ROLE_ADMIN', 'ADMIN_API', NOW(), 'INIT_DATA', NOW(), 'INIT_DATA',
false),
('ROLE_ADMIN', 'ADMIN_ACCESS', CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA',
('ROLE_ADMIN', 'ADMIN_ACCESS', NOW(), 'INIT_DATA', NOW(), 'INIT_DATA',
false),
-- ROLE_ANALYST
('ROLE_ANALYST', 'ADMIN_API', CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA',
-- ROLE_LOCAL_INSPECTION
('ROLE_LOCAL_INSPECTION', 'ADMIN_API', NOW(), 'INIT_DATA', NOW(), 'INIT_DATA',
false),
('ROLE_ANALYST', 'ADMIN_ACCESS', CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA',
('ROLE_LOCAL_INSPECTION', 'ADMIN_ACCESS', NOW(), 'INIT_DATA', NOW(), 'INIT_DATA',
false),
-- ROLE_RESEARCHER
('ROLE_RESEARCHER', 'ADMIN_API', CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA',
('ROLE_RESEARCHER', 'ADMIN_API', NOW(), 'INIT_DATA', NOW(), 'INIT_DATA',
false),
('ROLE_RESEARCHER', 'ADMIN_ACCESS', CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA',
('ROLE_RESEARCHER', 'ADMIN_ACCESS', NOW(), 'INIT_DATA', NOW(), 'INIT_DATA',
false),
-- ROLE_GENERAL
('ROLE_GENERAL', 'FRONT_API', CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA',
('ROLE_GENERAL', 'FRONT_API', NOW(), 'INIT_DATA', NOW(), 'INIT_DATA',
false),
('ROLE_GENERAL', 'FRONT_ACCESS', CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA',
('ROLE_GENERAL', 'FRONT_ACCESS', NOW(), 'INIT_DATA', NOW(), 'INIT_DATA',
false);

View File

@@ -34,9 +34,9 @@ values
INSERT INTO admin_has_role (admin_seq, role_id, created_at, created_by, is_deleted)
VALUES (1, 'ROLE_ADMIN', NOW(), 'INIT_DATA', false);
-- 연구원
-- 지방실사
INSERT INTO admin_has_role (admin_seq, role_id, created_at, created_by, is_deleted)
VALUES (2, 'ROLE_ANALYST', NOW(), 'INIT_DATA', false);
VALUES (2, 'ROLE_LOCAL_INSPECTION', NOW(), 'INIT_DATA', false);
-- 조사원
INSERT INTO admin_has_role (admin_seq, role_id, created_at, created_by, is_deleted)

View File

@@ -0,0 +1,32 @@
-- drop function
DROP FUNCTION IF EXISTS get_status(boolean, varchar, bigint);
-- ============================================
-- FUNCTION : get_status
-- DESC : 일계부 항목별 상태값 리턴용 공통 함수
-- PARAMS :
-- - is_future_day : 미래 날짜 여부
-- - status : 상태 문자열 (TARGET, TODAY_NONE 등)
-- - cnt : 등록 건수
-- RETURN : 텍스트 ('3건', '등록없음', '미작성', '-')
-- ============================================
CREATE OR REPLACE FUNCTION get_status(
is_future_day boolean,
status varchar,
cnt bigint
)
RETURNS text AS $$
BEGIN
IF is_future_day THEN
RETURN '-';
ELSIF status = 'TARGET' AND cnt > 0 THEN
RETURN cnt || '건';
ELSIF status = 'TARGET' AND cnt = 0 THEN
RETURN '등록없음';
ELSIF status IN ('TODAY_NONE', 'NONE') THEN
RETURN '등록없음';
ELSE
RETURN '미작성';
END IF;
END;
$$ LANGUAGE plpgsql;