Merge branch 'susu' into dev

# Conflicts:
#	admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java
This commit is contained in:
주수현
2025-07-21 12:26:22 +09:00
4 changed files with 13 additions and 4 deletions

View File

@@ -10,4 +10,5 @@ public interface CreateHouseholdMapper {
Integer createHousehold(CreateHouseholdOutCmd outCmd);
void createHouseholdHasRole(CreateHouseholdHasRoleCmd cmd);
void createResearcherHasHousehold(CreateResearcherHasHouseholdCmd cmd);
void createHouseholdMonthlyInputStatus();
}

View File

@@ -131,7 +131,9 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
}
}
workbook.close();
return new ExcelUploadResultVO(sheet.getLastRowNum() , success, errorList);
createHouseholdMapper.createHouseholdMonthlyInputStatus();
return new ExcelUploadResultVO(sheet.getLastRowNum()-1 , success, errorList);
}
// 셀 값을 문자열로 변환
@@ -147,7 +149,6 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
// 셀 값을 문자열로 변환
private Integer getCellNumberValue(Cell cell) {
if (cell == null) return null;
return switch (cell.getCellType()) {
case NUMERIC -> (int) cell.getNumericCellValue();
case STRING -> {
@@ -210,7 +211,9 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
private Boolean getIsPanel(Cell cell){
if (cell == null) return null;
String[] isPanel = cell.getStringCellValue().trim().split("\\.");
return "1".equals(isPanel[0]) || "유지".equals(isPanel[1]);
if(isPanel.length == 1 ) return "1".equals(isPanel[0]) || "유지".equals(isPanel[0]);
if(isPanel.length == 2 ) return "1".equals(isPanel[0]) || "유지".equals(isPanel[1]);
return false;
}
private Long getResearcherSeq(Cell cell){

View File

@@ -93,4 +93,8 @@
<include refid="common.fields.CreateUpdateBaseValues"/>
)
</insert>
<select id="createHouseholdMonthlyInputStatus">
select fn_monthly_input_status()
</select>
</mapper>

View File

@@ -13,7 +13,8 @@
<ul class="product-col-list">
<li th:each="item : ${list.content}"
th:classappend="${item.forestProductStatus != MonthStatus.NONE} ? ' complete'">
th:class="|${item?.forestProductStatus == MonthStatus.REGISTERED ? 'complete' :
item?.forestProductStatus == MonthStatus.NOTHING ? 'complete-nodata' : ''}|">
<a th:href="@{/info/monthly/create/{id}(id=${item.id})}">
<p class="list-tit" th:text="${item.koreanMonth}"></p>
<span class="tag" th:text="${item.forestProductStatus.desc}"></span>