임산물 현황 class추가 및 fn_monthly_input_status 추가
This commit is contained in:
@@ -10,4 +10,5 @@ public interface CreateHouseholdMapper {
|
|||||||
Integer createHousehold(CreateHouseholdOutCmd outCmd);
|
Integer createHousehold(CreateHouseholdOutCmd outCmd);
|
||||||
void createHouseholdHasRole(CreateHouseholdHasRoleCmd cmd);
|
void createHouseholdHasRole(CreateHouseholdHasRoleCmd cmd);
|
||||||
void createResearcherHasHousehold(CreateResearcherHasHouseholdCmd cmd);
|
void createResearcherHasHousehold(CreateResearcherHasHouseholdCmd cmd);
|
||||||
|
void createHouseholdMonthlyInputStatus();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -131,6 +131,8 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
workbook.close();
|
workbook.close();
|
||||||
|
|
||||||
|
createHouseholdMapper.createHouseholdMonthlyInputStatus();
|
||||||
return new ExcelUploadResultVO(sheet.getLastRowNum()-1 , success, errorList);
|
return new ExcelUploadResultVO(sheet.getLastRowNum()-1 , success, errorList);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -195,7 +197,9 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
|
|||||||
private Boolean getIsPanel(Cell cell){
|
private Boolean getIsPanel(Cell cell){
|
||||||
if (cell == null) return null;
|
if (cell == null) return null;
|
||||||
String[] isPanel = cell.getStringCellValue().trim().split("\\.");
|
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){
|
private Long getResearcherSeq(Cell cell){
|
||||||
|
|||||||
@@ -93,4 +93,8 @@
|
|||||||
<include refid="common.fields.CreateUpdateBaseValues"/>
|
<include refid="common.fields.CreateUpdateBaseValues"/>
|
||||||
)
|
)
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
|
<select id="createHouseholdMonthlyInputStatus">
|
||||||
|
select fn_monthly_input_status()
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
@@ -13,7 +13,8 @@
|
|||||||
<ul class="product-col-list">
|
<ul class="product-col-list">
|
||||||
|
|
||||||
<li th:each="item : ${list.content}"
|
<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})}">
|
<a th:href="@{/info/monthly/create/{id}(id=${item.id})}">
|
||||||
<p class="list-tit" th:text="${item.koreanMonth}"></p>
|
<p class="list-tit" th:text="${item.koreanMonth}"></p>
|
||||||
<span class="tag" th:text="${item.forestProductStatus.desc}"></span>
|
<span class="tag" th:text="${item.forestProductStatus.desc}"></span>
|
||||||
|
|||||||
Reference in New Issue
Block a user