fix: 폐기보고 통계 상세 목록 추가 완료

dev
Jonguk. Lim 4 months ago
parent 07de5eef52
commit 355603c9f5

@ -951,7 +951,7 @@ public class AddsNimsController extends ApplicationController {
private ModelAndView excelDownloadDsuseMgtNcrdAndPrtmStatistics(DsuseMgtStatisticsQuery query) {
List<CellDef> cellDefs = fromJson(query.getCellDefs(), CellDef.listType());
XLSWriter xlsx = new XLSWriter().worksheet(0);
XLSWriter xlsx = new XLSWriter().worksheet("마약류 제품 구분별 현황");
Format format = new Format(xlsx);
CellStyle center = format.cellStyle(Style.CENTER);
CellStyle right = format.cellStyle(Style.RIGHT);
@ -970,7 +970,7 @@ public class AddsNimsController extends ApplicationController {
valueMap.put("비마약류", a_slash_b(format, "비마약류", "비마약류Qy").style(right));
valueMap.put("일반관리대상", a_slash_b(format, "일반관리대상", "일반관리대상Qy").style(right));
valueMap.put("중점관리대상", a_slash_b(format, "중점관리대상", "중점관리대상Qy").style(right));
valueMap.put("폐기건수", format.of("dsuseCnt").style(numeric));
valueMap.put("신청건수", format.of("dsuseCnt").style(numeric));
valueMap.put("폐기수량", format.of("dsuseQy").style(numeric));
CellDef.setValues(cellDefs, valueMap);
@ -990,9 +990,9 @@ public class AddsNimsController extends ApplicationController {
xlsx.cell(0, 1).value("마약류 제품 구분별 현황").value(center).merge(1, cellDefs.size()-1);
// 관할관청 - rowspan
xlsx.cell(2, 0).value("관할관청").value(headerStyle).merge(2, 3, 0, 0);
xlsx.cell(2, 1).value("마약/향정 구분(폐기건수 / 폐기수량)").value(headerStyle2).merge(1, 6);
xlsx.cell(2, 7).value("중점/일반 구분(폐기건수 / 폐기수량)").value(headerStyle2).merge(7, 9);
xlsx.cell(2, 10).value("폐기건수").value(headerStyle).merge(2, 3, 10, 10);
xlsx.cell(2, 1).value("마약/향정 구분(신청건수 / 폐기수량)").value(headerStyle2).merge(1, 6);
xlsx.cell(2, 7).value("중점/일반 구분(신청건수 / 폐기수량)").value(headerStyle2).merge(7, 9);
xlsx.cell(2, 10).value("신청건수").value(headerStyle).merge(2, 3, 10, 10);
xlsx.cell(2, 11).value("폐기수량").value(headerStyle).merge(2, 3, 11, 11);
List<CellDef> cellDefs2 = cellDefs.subList(1, cellDefs.size()-2);
@ -1009,7 +1009,7 @@ public class AddsNimsController extends ApplicationController {
private ModelAndView excelDownloadDsuseMgtDsuseQyByPrdStatistics(DsuseMgtStatisticsQuery query) {
List<CellDef> cellDefs = fromJson(query.getCellDefs(), CellDef.listType());
XLSWriter xlsx = new XLSWriter().worksheet(0);
XLSWriter xlsx = new XLSWriter().worksheet("마약류 제품별 폐기 현황");
Format format = new Format(xlsx);
CellStyle center = format.cellStyle(Style.CENTER);
CellStyle right = format.cellStyle(Style.RIGHT);
@ -1027,7 +1027,7 @@ public class AddsNimsController extends ApplicationController {
valueMap.put("결과[통보]처리", a_slash_b(format, "rsltCnt", "rsltQy").style(right));
valueMap.put("폐기보고확인", a_slash_b(format, "mappingCnt", "mappingQy").style(right));
valueMap.put("보고완료", a_slash_b(format, "cpltCnt", "cpltQy").style(right));
valueMap.put("폐기건수", format.of("dsuseCnt").style(numeric));
valueMap.put("신청건수", format.of("dsuseCnt").style(numeric));
valueMap.put("폐기수량", format.of("dsuseQy").style(numeric));
CellDef.setValues(cellDefs, valueMap);
@ -1047,13 +1047,14 @@ public class AddsNimsController extends ApplicationController {
});
xlsx.cell(0, 0).value("마약류 제품별 폐기 현황").value(center).merge(0, cellDefs.size()-1);
// rowspan
xlsx.cell(2, 0).value("NO.").value(headerStyle).merge(2, 3, 0, 0);
xlsx.cell(2, 1).value("관할관청").value(headerStyle).merge(2, 3, 1, 1);
xlsx.cell(2, 2).value("제품코드").value(headerStyle).merge(2, 3, 2, 2);
xlsx.cell(2, 3).value("제품명").value(headerStyle).merge(2, 3, 3, 3);
xlsx.cell(2, 4).value("처리상태 별 (폐기건수 / 폐기수량)").value(headerStyle2).merge(4, 7);
xlsx.cell(2, 8).value("폐기건수").value(headerStyle).merge(2, 3, 8, 8);
xlsx.cell(2, 4).value("처리상태 별 (신청건수 / 폐기수량)").value(headerStyle2).merge(4, 7);
xlsx.cell(2, 8).value("신청건수").value(headerStyle).merge(2, 3, 8, 8);
xlsx.cell(2, 9).value("폐기수량").value(headerStyle).merge(2, 3, 9, 9);
List<CellDef> cellDefs2 = cellDefs.subList(5, cellDefs.size()-2);
@ -1071,7 +1072,7 @@ public class AddsNimsController extends ApplicationController {
private ModelAndView excelDownloadDsuseMgtDsuseQyByIndutyStatistics(DsuseMgtStatisticsQuery query) {
List<CellDef> cellDefs = fromJson(query.getCellDefs(), CellDef.listType());
XLSWriter xlsx = new XLSWriter().worksheet(0);
XLSWriter xlsx = new XLSWriter().worksheet("마약류 취급 업종별 폐기 현황");
Format format = new Format(xlsx);
CellStyle center = format.cellStyle(Style.CENTER);
CellStyle right = format.cellStyle(Style.RIGHT);
@ -1088,7 +1089,7 @@ public class AddsNimsController extends ApplicationController {
valueMap.put("마약류수출입업", a_slash_b(format, "마약류수출입업", "마약류수출입업Qy").style(right));
valueMap.put("마약류원료사용", a_slash_b(format, "마약류원료사용", "마약류원료사용Qy").style(right));
valueMap.put("마약류취급학술연구", a_slash_b(format, "마약류취급학술연구", "마약류취급학술연구Qy").style(right));
valueMap.put("폐기건수", format.of("dsuseCnt").style(numeric));
valueMap.put("신청건수", format.of("dsuseCnt").style(numeric));
valueMap.put("폐기수량", format.of("dsuseQy").style(numeric));
CellDef.setValues(cellDefs, valueMap);
@ -1108,8 +1109,8 @@ public class AddsNimsController extends ApplicationController {
xlsx.cell(0, 0).value("마약류 취급 업종별 폐기 현황").value(center).merge(0, cellDefs.size()-1);
xlsx.cell(2, 0).value("관할관청").value(headerStyle).merge(2, 3, 0, 0);
xlsx.cell(2, 1).value("업종별 구분 (폐기건수 / 폐시수량)").value(headerStyle2).merge(1, 7);
xlsx.cell(2, 8).value("폐기건수").value(headerStyle).merge(2, 3, 8, 8);
xlsx.cell(2, 1).value("업종별 구분 (신청건수 / 폐시수량)").value(headerStyle2).merge(1, 7);
xlsx.cell(2, 8).value("신청건수").value(headerStyle).merge(2, 3, 8, 8);
xlsx.cell(2, 9).value("폐기수량").value(headerStyle).merge(2, 3, 9, 9);
List<CellDef> cellDefs2 = cellDefs.subList(1, cellDefs.size()-2);
@ -1126,7 +1127,7 @@ public class AddsNimsController extends ApplicationController {
private ModelAndView excelDownloadDsuseMgtDsuseQyByBsshStatistics(DsuseMgtStatisticsQuery query) {
List<CellDef> cellDefs = fromJson(query.getCellDefs(), CellDef.listType());
XLSWriter xlsx = new XLSWriter().worksheet(0);
XLSWriter xlsx = new XLSWriter().worksheet("마약류 취급자별 폐기 현황");
Format format = new Format(xlsx);
CellStyle center = format.cellStyle(Style.CENTER);
CellStyle right = format.cellStyle(Style.RIGHT);
@ -1142,10 +1143,10 @@ public class AddsNimsController extends ApplicationController {
valueMap.put("취급업체명", format.of("bssh_nm").style(left));
valueMap.put("대표자", format.of("rprsntv_nm").style(center));
valueMap.put("신청서접수", a_slash_b(format, "receiptCnt", "receiptQy").style(right));
valueMap.put("폐기결과[통보]처리", a_slash_b(format, "rsltCnt", "rsltQy").style(right));
valueMap.put("결과[통보]처리", a_slash_b(format, "rsltCnt", "rsltQy").style(right));
valueMap.put("폐기보고확인", a_slash_b(format, "mappingCnt", "mappingQy").style(right));
valueMap.put("보고완료", a_slash_b(format, "cpltCnt", "cpltQy").style(right));
valueMap.put("폐기건수", format.of("dsuseCnt").style(numeric));
valueMap.put("신청건수", format.of("dsuseCnt").style(numeric));
valueMap.put("폐기수량", format.of("dsuseQy").style(numeric));
CellDef.setValues(cellDefs, valueMap);
@ -1168,8 +1169,8 @@ public class AddsNimsController extends ApplicationController {
xlsx.cell(2, 2).value("취급자번호").value(headerStyle).merge(2, 3, 2, 2);
xlsx.cell(2, 3).value("취급업체명").value(headerStyle).merge(2, 3, 3, 3);
xlsx.cell(2, 4).value("대표자").value(headerStyle).merge(2, 3, 4, 4);
xlsx.cell(2, 5).value("처리상태 별 (폐기건수 / 폐기수량)").value(headerStyle2).merge(5, 8);
xlsx.cell(2, 9).value("폐기건수").value(headerStyle).merge(2, 3, 9, 9);
xlsx.cell(2, 5).value("처리상태 별 (신청건수 / 폐기수량)").value(headerStyle2).merge(5, 8);
xlsx.cell(2, 9).value("신청건수").value(headerStyle).merge(2, 3, 9, 9);
xlsx.cell(2, 10).value("폐기수량").value(headerStyle).merge(2, 3, 10, 10);
List<CellDef> cellDefs2 = cellDefs.subList(5, cellDefs.size()-2);

@ -17,7 +17,7 @@
<th class="cmn" style="width: 90px;">대표자</th>
<th class="cmn" style="width: 150.469px;">제품코드</th>
<th class="cmn" style="width: 300px;">제품명</th>
<%-- <th class="cmn" style="width: 90px;">폐기건수</th>--%>
<%-- <th class="cmn" style="width: 90px;">신청건수</th>--%>
<th class="cmn" style="width: 90px;">폐기수량</th>
<th class="cmn" style="width: 160px;">처리상태</th>
</tr>

@ -33,25 +33,6 @@
<input type="checkbox" id="chkDsuseDe--${pageName}" name="chkDsuseDe" title="폐기일자 적용" style="align-items: baseline"/>&nbsp;<strong>폐기일자 적용</strong>
</div>
<!-- 업체명 -->
<%-- <div class="col-5">--%>
<%-- <label class="form-label fw-bold form-search-title text-end" for="schBsshNm--${pageName}">업체명</label>--%>
<%-- <input type="text" class="form-control w-px-160" id="schBsshNM--${pageName}" name="schBsshNm" data-map="bsshNm" autocomplete="off" readonly/>--%>
<%-- <input type="hidden" id="schBsshCd--${pageName}" name="schBsshCd" data-map="bsshCd" autocomplete="off" />--%>
<%-- <button type="button" class="btn btn-search w-px-120" id="btnBsshSearch--${pageName}" title="업체 검색">--%>
<%-- 업체 검색--%>
<%-- </button>--%>
<%-- </div>--%>
<!-- 처리상태 -->
<%-- <div class="col-6">--%>
<%-- <label class="form-label fw-bold form-search-title text-end" for="schSttsCd--${pageName}">처리상태</label>--%>
<%-- <select class="form-select" id="schSttsCd--${pageName}" name="schSttsCd">--%>
<%-- <option value="">전체</option>--%>
<%-- <c:forEach items="${ADDS11}" var="item">--%>
<%-- <option value="${item.code}">${item.value}</option>--%>
<%-- </c:forEach>--%>
<%-- </select>--%>
<%-- </div>--%>
<div class="col-1">
<button type="button" class="btn btn-search w-px-120" id="btnSearch--${pageName}" title="검색">
검색
@ -88,8 +69,8 @@
<th class="cmn align-content-center p-1" style="width: 140px;" rowspan="2">취급자번호</th>
<th class="cmn align-content-center p-1" style="width: 280px;" rowspan="2">취급업체명</th>
<th class="cmn align-content-center p-1" style="width: 100px;" rowspan="2">대표자</th>
<th class="cmn fw-bold" colspan="4">처리상태 별 (폐기건수 / 폐기수량)</th>
<th class="cmn align-content-center p-1" style="width: 100px;" rowspan="2">폐기건수</th>
<th class="cmn fw-bold" colspan="4">처리상태 별 (신청건수 / 폐기수량)</th>
<th class="cmn align-content-center p-1" style="width: 100px;" rowspan="2">신청건수</th>
<th class="cmn align-content-center p-1" style="width: 100px;" rowspan="2">폐기수량</th>
</tr>
<tr id="theadTr--${pageName}"
@ -387,7 +368,7 @@
// input, select 초기화
let searchForm = $("#frmSearch--${pageName}");
searchForm.find("input[type='checkbox']").prop("checked", false);
searchForm.find("input[type='checkbox']").prop("checked", true);
searchForm.find("input[type='text']").val("");
searchForm.find("input[type='hidden']").val("");
searchForm.find("select").each(function() { $(this).find("option:eq(0)").prop("selected", true); });

@ -17,7 +17,7 @@
<th class="cmn" style="width: 100px;">대표자</th>
<th class="cmn" style="width: 150.469px;">제품코드</th>
<th class="cmn" style="width: 300px;">제품명</th>
<%-- <th class="cmn" style="width: 90px;">폐기건수</th>--%>
<%-- <th class="cmn" style="width: 90px;">신청건수</th>--%>
<th class="cmn" style="width: 90px;">폐기수량</th>
<th class="cmn" style="width: 130px;">업종명</th>
</tr>

@ -32,31 +32,18 @@
</span>
<input type="checkbox" id="chkDsuseDe--${pageName}" name="chkDsuseDe" title="폐기일자 적용" style="align-items: baseline" />&nbsp;<strong>폐기일자 적용</strong>
</div>
<!-- 업체명 -->
<%-- <div class="col-5">--%>
<%-- <label class="form-label fw-bold form-search-title text-end" for="schBsshNm--${pageName}">업체명</label>--%>
<%-- <input type="text" class="form-control w-px-160" id="schBsshNM--${pageName}" name="schBsshNm" data-map="bsshNm" autocomplete="off" readonly/>--%>
<%-- <input type="hidden" id="schBsshCd--${pageName}" name="schBsshCd" data-map="bsshCd" autocomplete="off" />--%>
<%-- <button type="button" class="btn btn-search w-px-120" id="btnBsshSearch--${pageName}" title="업체 검색">--%>
<%-- 업체 검색--%>
<%-- </button>--%>
<%-- </div>--%>
<!-- 처리상태 -->
<%-- <div class="col-6">--%>
<%-- <label class="form-label fw-bold form-search-title text-end" for="schSttsCd--${pageName}">처리상태</label>--%>
<%-- <select class="form-select" id="schSttsCd--${pageName}" name="schSttsCd">--%>
<%-- <option value="">전체</option>--%>
<%-- <c:forEach items="${ADDS11}" var="item">--%>
<%-- <option value="${item.code}">${item.value}</option>--%>
<%-- </c:forEach>--%>
<%-- </select>--%>
<%-- </div>--%>
<div class="col-1">
<div class="col-4">
<label class="form-label fw-bold form-search-title text-end" for="schSttsCd--${pageName}">처리상태</label>
<select class="form-select" id="schSttsCd--${pageName}" name="schSttsCd">
<option value="">전체</option>
<c:forEach items="${ADDS11}" var="item">
<option value="${item.code}">${item.value}</option>
</c:forEach>
</select>
<button type="button" class="btn btn-search w-px-120" id="btnSearch--${pageName}" title="검색">
검색
</button>
</div>
</div>
</div>
@ -84,8 +71,8 @@
<thead class="sticky-thead">
<tr id="theadTr0--${pageName}">
<th class="cmn align-content-center p-1" style="width: 170px;" rowspan="2">관할관청</th>
<th class="cmn fw-bold" colspan="7">업종별 구분 (폐기건수 / 폐기수량)</th>
<th class="cmn align-content-center p-1" style="width: 100px;" rowspan="2">폐기건수</th>
<th class="cmn fw-bold" colspan="7">업종별 구분 (신청건수 / 폐기수량)</th>
<th class="cmn align-content-center p-1" style="width: 100px;" rowspan="2">신청건수</th>
<th class="cmn align-content-center p-1" style="width: 100px;" rowspan="2">폐기수량</th>
</tr>
<tr id="theadTr--${pageName}"

@ -17,7 +17,7 @@
<th class="cmn" style="width: 100px;">대표자</th>
<th class="cmn" style="width: 150.469px;">제품코드</th>
<th class="cmn" style="width: 300px;">제품명</th>
<%-- <th class="cmn" style="width: 90px;">폐기건수</th>--%>
<%-- <th class="cmn" style="width: 90px;">신청건수</th>--%>
<th class="cmn" style="width: 90px;">폐기수량</th>
<th class="cmn" style="width: 160px;">처리상태</th>
</tr>

@ -32,26 +32,6 @@
</span>
<input type="checkbox" id="chkDsuseDe--${pageName}" name="chkDsuseDe" title="폐기일자 적용" style="align-items: baseline"/>&nbsp;<strong>폐기일자 적용</strong>
</div>
<!-- 업체명 -->
<%-- <div class="col-5">--%>
<%-- <label class="form-label fw-bold form-search-title text-end" for="schBsshNm--${pageName}">업체명</label>--%>
<%-- <input type="text" class="form-control w-px-160" id="schBsshNM--${pageName}" name="schBsshNm" data-map="bsshNm" autocomplete="off" readonly/>--%>
<%-- <input type="hidden" id="schBsshCd--${pageName}" name="schBsshCd" data-map="bsshCd" autocomplete="off" />--%>
<%-- <button type="button" class="btn btn-search w-px-120" id="btnBsshSearch--${pageName}" title="업체 검색">--%>
<%-- 업체 검색--%>
<%-- </button>--%>
<%-- </div>--%>
<!-- 처리상태 -->
<%-- <div class="col-6">--%>
<%-- <label class="form-label fw-bold form-search-title text-end" for="schSttsCd--${pageName}">처리상태</label>--%>
<%-- <select class="form-select" id="schSttsCd--${pageName}" name="schSttsCd">--%>
<%-- <option value="">전체</option>--%>
<%-- <c:forEach items="${ADDS11}" var="item">--%>
<%-- <option value="${item.code}">${item.value}</option>--%>
<%-- </c:forEach>--%>
<%-- </select>--%>
<%-- </div>--%>
<div class="col-1">
<button type="button" class="btn btn-search w-px-120" id="btnSearch--${pageName}" title="검색">
검색
@ -87,8 +67,8 @@
<th class="cmn align-content-center p-1" style="width: 170px;" rowspan="2">관할관청</th>
<th class="cmn align-content-center p-1" style="width: 146px;" rowspan="2">제품코드</th>
<th class="cmn align-content-center p-1" style="width: 350px;" rowspan="2">제품명</th>
<th class="cmn fw-bold" colspan="4">처리상태 별 (폐기건수 / 폐기수량)</th>
<th class="cmn align-content-center p-1" style="width: 100px;" rowspan="2">폐기건수</th>
<th class="cmn fw-bold" colspan="4">처리상태 별 (신청건수 / 폐기수량)</th>
<th class="cmn align-content-center p-1" style="width: 100px;" rowspan="2">신청건수</th>
<th class="cmn align-content-center p-1" style="width: 100px;" rowspan="2">폐기수량</th>
</tr>
<tr id="theadTr--${pageName}"
@ -390,7 +370,7 @@
// input, select 초기화
let searchForm = $("#frmSearch--${pageName}");
searchForm.find("input[type='checkbox']").prop("checked", false);
searchForm.find("input[type='checkbox']").prop("checked", true);
searchForm.find("input[type='text']").val("");
searchForm.find("input[type='hidden']").val("");
searchForm.find("select").each(function() { $(this).find("option:eq(0)").prop("selected", true); });

@ -17,7 +17,7 @@
<th class="cmn" style="width: 100px;">대표자</th>
<th class="cmn" style="width: 150.469px;">제품코드</th>
<th class="cmn" style="width: 300px;">제품명</th>
<%-- <th class="cmn" style="width: 90px;">폐기건수</th>--%>
<%-- <th class="cmn" style="width: 90px;">신청건수</th>--%>
<th class="cmn" style="width: 90px;">폐기수량</th>
<th class="cmn" style="width: 130px;">마약/향정구분</th>
<th class="cmn" style="width: 130px;">중점일반구분</th>

@ -32,16 +32,6 @@
</span>
<input type="checkbox" id="chkDsuseDe--${pageName}" name="chkDsuseDe" title="폐기일자 적용" style="align-items: baseline"/>&nbsp;<strong>폐기일자 적용</strong>
</div>
<!-- 업체명 -->
<%-- <div class="col-5">--%>
<%-- <label class="form-label fw-bold form-search-title text-end" for="schBsshNm--${pageName}">업체명</label>--%>
<%-- <input type="text" class="form-control w-px-160" id="schBsshNM--${pageName}" name="schBsshNm" data-map="bsshNm" autocomplete="off" readonly/>--%>
<%-- <input type="hidden" id="schBsshCd--${pageName}" name="schBsshCd" data-map="bsshCd" autocomplete="off" />--%>
<%-- <button type="button" class="btn btn-search w-px-120" id="btnBsshSearch--${pageName}" title="업체 검색">--%>
<%-- 업체 검색--%>
<%-- </button>--%>
<%-- </div>--%>
<!-- 처리상태 -->
<div class="col-4">
<label class="form-label fw-bold form-search-title text-end" for="schSttsCd--${pageName}">처리상태</label>
@ -55,12 +45,6 @@
검색
</button>
</div>
<%-- <div class="col-1">--%>
<%-- <button type="button" class="btn btn-search w-px-120" id="btnSearch--${pageName}" title="검색">--%>
<%-- 검색--%>
<%-- </button>--%>
<%-- --%>
<%-- </div>--%>
</div>
</div>
</form>
@ -87,9 +71,9 @@
<thead class="sticky-thead">
<tr id="theadTr0--${pageName}">
<th class="cmn align-content-center p-1" style="width: 170px;" rowspan="2">관할관청</th>
<th class="cmn fw-bold" colspan="6">마약 / 향정 구분 (폐기건수 / 폐기수량)</th>
<th class="cmn fw-bold" colspan="3">중점 / 일반 구분 (폐기건수 / 폐기수량)</th>
<th class="cmn align-content-center p-1" style="width: 100px;" rowspan="2">폐기건수</th>
<th class="cmn fw-bold" colspan="6">마약 / 향정 구분 (신청건수 / 폐기수량)</th>
<th class="cmn fw-bold" colspan="3">중점 / 일반 구분 (신청건수 / 폐기수량)</th>
<th class="cmn align-content-center p-1" style="width: 100px;" rowspan="2">신청건수</th>
<th class="cmn align-content-center p-1" style="width: 100px;" rowspan="2">폐기수량</th>
</tr>
<tr id="theadTr--${pageName}"

Loading…
Cancel
Save