xit-app
/
adds-fo
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 폐기결과처리 상세

Browse Source
dev
Jonguk. Lim 5 months ago
parent 41ae41105d
commit 96e11dd1cf
8 changed files with 1037 additions and 1031 deletions
Show Stats Download Patch File Download Diff File

7
src/main/java/cokr/xit/adds/cmm/model/DsuseReceiptInfo.java → src/main/java/cokr/xit/adds/cmm/model/DsuseRsltInfo.java
Unescape Escape View File

@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonAlias;
import lombok.Data;
@Data
public class DsuseReceiptInfo {
public class DsuseRsltInfo {
/**
* 마약류취급자식별번호
*/
@ -71,4 +71,9 @@ public class DsuseReceiptInfo {
private String dsusePrvNm;
private Integer rndDtlRptCnt;
private String hdrDe;
private String dsuseDe;
private String dsuseSeCd;
private String dsuseMthCd;
private String dsuseLoc;
}

2
src/main/java/cokr/xit/adds/nims/dao/DsuseMgtReceiptMapper.java
Unescape Escape View File

@ -17,6 +17,6 @@ public interface DsuseMgtReceiptMapper extends AbstractMapper {
* @param req 폐기관리접수 조회 조건
* @return 폐기관리접수 목록
*/
List<DataObject> selectDsuseMgtReceiptcList(DsuseMgtReceiptQuery req);
List<DataObject> selectDsuseMgtReceiptList(DsuseMgtReceiptQuery req);
}

9
src/main/java/cokr/xit/adds/nims/service/bean/DsuseMgtReceiptServiceBean.java
Unescape Escape View File

@ -1,9 +1,6 @@
package cokr.xit.adds.nims.service.bean;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
@ -12,10 +9,6 @@ import org.springframework.stereotype.Service;
import cokr.xit.adds.nims.DsuseMgtReceiptQuery;
import cokr.xit.adds.nims.dao.DsuseMgtReceiptMapper;
import cokr.xit.adds.nims.service.DsuseMgtReceiptService;
import cokr.xit.base.code.service.bean.CodeBean;
import cokr.xit.base.file.FileInfo;
import cokr.xit.base.file.service.FileQuery;
import cokr.xit.base.file.service.bean.FileBean;
import cokr.xit.foundation.component.AbstractServiceBean;
import cokr.xit.foundation.data.DataObject;
@ -30,7 +23,7 @@ public class DsuseMgtReceiptServiceBean extends AbstractServiceBean implements D
public List<DataObject> getdsuseMgtReceiptList(DsuseMgtReceiptQuery query){
query.setOrderBy("DSCDMNG_ID DESC");
return dsuseMgtReceiptMapper.selectDsuseMgtReceiptcList(query);
return dsuseMgtReceiptMapper.selectDsuseMgtReceiptList(query);
}
}

6
src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java
Unescape Escape View File

@ -7,7 +7,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import cokr.xit.adds.cmm.model.DsuseReceiptInfo;
import cokr.xit.adds.cmm.model.DsuseRsltInfo;
import cokr.xit.adds.nims.DsuseMgtDocQuery;
import cokr.xit.adds.nims.DsuseMgtReceiptQuery;
import cokr.xit.adds.nims.service.DsuseMgtDocService;
@ -64,14 +64,14 @@ public class AddsNimsController extends AbstractController {
}
@RequestMapping(value = "dsuseMgtRslt-info.do", name="결과[통보] 상세")
public ModelAndView getDsuseMgtRsltInfo(DsuseReceiptInfo dsuseReceiptInfo) {
public ModelAndView getDsuseMgtRsltInfo(DsuseRsltInfo dsuseRsltInfo) {
ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtRslt-info");
return mav
.addObject("pageName", "dsuseMgtRsltInfo") // View(jsp)에서 사용할 id 뒤에 붙일 suffix
.addObject("infoPrefix", "dsuseMgtRsltInfo") // prefix
.addObject("infoPrefixUrl", "/adds/nims") // prefixUrl
.addObject("bsshInfo", toJson(dsuseReceiptInfo)) // View(jsp)에서 사용할 id 뒤에 붙일 suffix
.addObject("dsuseRsltInfo", toJson(dsuseRsltInfo)) // View(jsp)에서 사용할 id 뒤에 붙일 suffix
.addObject("apiHost", apiHost);
}
//-------------------------------------------------------------------------------------------------

4
src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml
Unescape Escape View File

@ -45,8 +45,8 @@
LEFT OUTER JOIN TB_BSSH_INFO B ON A.BSSH_CD = B.BSSH_CD
</sql>
<select id="selectDsuseMgtReceiptcList" parameterType="map" resultType="dataobject">
/* 폐기관리접수 목록 조회(dsuseMgtReceiptMapper.selectDsuseMgtReceiptcList) */
<select id="selectDsuseMgtReceiptList" parameterType="map" resultType="dataobject">
/* 폐기관리접수 목록 조회(dsuseMgtReceiptMapper.selectDsuseMgtReceiptList) */
<include refid="utility.paging-prefix" />
<include refid="select" />
WHERE 1=1

26
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp
Unescape Escape View File

@ -85,16 +85,16 @@
<tr id="theadTr--${pageName}"
data-by="by--${pageName}" data-by-output="byOutput--${pageName}" data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
<th class="cmn" style="width: 72px;">No.</th>
<th class="cmn" style="width: 130.141px;">취급일자</th>
<th class="cmn" style="width: 130.141px;">관리번호</th>
<th class="cmn" style="width: 230.469px;">업체명</th>
<th class="cmn" style="width: 100px;">보고건수</th>
<th class="cmn" style="width: 200.469px;">처리상태</th>
<th class="cmn" style="width: 130.141px;">폐기관리번호</th>
<th class="cmn" style="width: 170.469px;">처리상태</th>
<th class="cmn" style="width: 300.469px;">업체명</th>
<th class="cmn" style="width: 90px;">폐기건수</th>
<th class="cmn" style="width: 180.469px;">폐기사유</th>
<th class="cmn" style="width: 120.141px;">취급일자</th>
<th class="cmn" style="width: 120.469px;">폐기일자</th>
<th class="cmn" style="width: 150px;">폐기구분</th>
<th class="cmn" style="width: 230.469px;">폐기사유</th>
<th class="cmn" style="width: 180px;">폐기방법</th>
<th class="cmn" style="width: 150px;">폐기방법</th>
<th class="cmn" style="width: 200.469px;">폐기장소</th>
<th class="cmn" style="width: 130.469px;">폐기일자</th>
</tr>
</thead>
<tbody id="tbody--${pageName}">
@ -102,16 +102,16 @@
<template id="${infoPrefix}Row--${pageName}">
<tr data-key="{DSCDMNG_ID}">
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{ROW_NUM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{HDR_DE}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSCDMNG_ID}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{PRGRS_STTS_NM}</td>
<td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{BSSH_NM}</td>
<td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{RND_DTL_RPT_CNT}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{PRGRS_STTS_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_SE_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_PRV_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{HDR_DE}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_DE}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_SE_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_MTH_NM}</td>
<td class="cmn" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_LOC}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_DE}</td>
</tr>
</template>
<template id="${infoPrefix}NotFound--${pageName}">
@ -155,7 +155,7 @@
<td class="text-center" {onclick}="" {ondblclick}="">{PRD_VALID_DE}</td>
<td class="text-center" {onclick}="" {ondblclick}="">{MIN_DISTB_QY} {MIN_DISTB_UNIT}</td>
<td class="text-center" {onclick}="" {ondblclick}="">{PCE_QY} {PCE_UNIT}</td>
<td class="text-end" {onclick}="" {ondblclick}="">{DSUSE_QY}</td>
<td class="text-end" {onclick}="" {ondblclick}="">{DSUSE_QY} {PCE_UNIT}</td>
</tr>
</template>
<template id="${infoPrefix}NotFound--${pageName}Detail">

24
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp
Unescape Escape View File

@ -17,14 +17,14 @@
<%-- <label for="bssh--${pageName}">업체 정보</label>--%>
<div class="row my-1 mx-4 g-1 border-card rounded-3">
<input type="hidden" id="dscdmngId--${pageName}" name="dscdmngId" data-map="dscdmngId">
<input type="hidden" id="usrRptIdNo--${pageName}" name="usrRptIdNo" data-map="usrRptIdNo">
<div class="col-md-4">
<label for="bsshNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">업체명</label>
<input type="text" class="form-control w-60" id="bsshNm--${pageName}" name="bsshNm" data-map="bsshNm" readonly>
<label for="dscdmngId--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">폐기관리번호</label>
<input type="text" class="form-control w-60" id="dscdmngId--${pageName}" name="dscdmngId" data-map="dscdmngId" readonly>
</div>
<div class="col-md-4">
<label for="bsshCd--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">사용자보고 식별번호</label>
<input type="text" class="form-control w-60" id="bsshCd--${pageName}" name="bsshCd" data-map="bsshCd" readonly>
<label for="bsshNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">업체명</label>
<input type="text" class="form-control w-60" id="bsshNm--${pageName}" name="bsshNm" data-map="bsshNm" readonly>
</div>
<div class="col-md-4">
<label for="indutyNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">업종명</label>
@ -44,12 +44,12 @@
<div class="row my-1 mx-4 g-1 border-card rounded-3">
<div class="col-md-4">
<label for="hdrDe--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">취급일자</label>
<input type="text" class="form-control w-45 form-date" id="hdrDe--${pageName}" name="hdrDe" data-fmt-type="day" data-map="HDR_DE" autocomplete="off" title="종료 날짜 선택" />
<input type="text" class="form-control w-45 form-date" id="hdrDe--${pageName}" name="hdrDe" data-fmt-type="day" data-map="hdrDe" autocomplete="off" title="종료 날짜 선택" />
<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
</div>
<div class="col-md-4">
<label for="dsuseDe--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">폐기일자</label>
<input type="text" class="form-control w-45 form-date" id="dsuseDe--${pageName}" name="dsuseDe" data-fmt-type="day" data-map="DSUSE_DE" autocomplete="off" title="종료 날짜 선택" />
<input type="text" class="form-control w-45 form-date" id="dsuseDe--${pageName}" name="dsuseDe" data-fmt-type="day" data-map="dsuseDe" autocomplete="off" title="종료 날짜 선택" />
<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
</div>
<div class="col-md-6">
@ -76,7 +76,7 @@
</div>
<div class="col-md-10">
<label for="dsuseLoc--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">폐기장소</label>
<input type="text" class="form-control w-80" id="dsuseLoc--${pageName}" name="dsuseLoc" data-map="DSUSE_LOC">
<input type="text" class="form-control w-80" id="dsuseLoc--${pageName}" name="dsuseLoc" data-map="dsuseLoc">
</div>
<div class="col-md-12">
<span class="d-inline-flex">
@ -159,9 +159,9 @@
, appendData: true
, infoSize: "xl"
, formats: {
RPT_DE: dateFormat
, HDR_DE: dateFormat
, DSUSE_DE: dateFormat
rptDe: dateFormat
, hdrDe: dateFormat
, dsuseDe: dateFormat
}
});
// $P.control 설정
@ -474,7 +474,7 @@
$P.initForm();
// 3. Dataset 설정
$P.control.setData([${bsshInfo}]);
$P.control.setData([${dsuseRsltInfo}]);
});
</script>

50
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp
Unescape Escape View File

@ -83,16 +83,16 @@
<tr id="theadTr--${pageName}"
data-by="by--${pageName}" data-by-output="byOutput--${pageName}" data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
<th class="cmn" style="width: 72px;">No.</th>
<th class="cmn" style="width: 130.141px;">취급일자</th>
<th class="cmn" style="width: 130.141px;">관리번호</th>
<th class="cmn" style="width: 230.469px;">업체명</th>
<th class="cmn" style="width: 100px;">보고건수</th>
<th class="cmn" style="width: 200.469px;">처리상태</th>
<th class="cmn" style="width: 130.141px;">폐기관리번호</th>
<th class="cmn" style="width: 170.469px;">처리상태</th>
<th class="cmn" style="width: 250.469px;">업체명</th>
<th class="cmn" style="width: 120.141px;">취급일자</th>
<th class="cmn" style="width: 120.469px;">폐기일자</th>
<th class="cmn" style="width: 90px;">폐기건수</th>
<th class="cmn" style="width: 180.469px;">폐기사유</th>
<th class="cmn" style="width: 150px;">폐기구분</th>
<th class="cmn" style="width: 200.469px;">폐기사유</th>
<th class="cmn" style="width: 150px;">폐기방법</th>
<th class="cmn" style="width: 200.469px;">폐기장소</th>
<th class="cmn" style="width: 130.469px;">폐기일자</th>
</tr>
</thead>
<tbody id="tbody--${pageName}">
@ -100,16 +100,16 @@
<template id="${infoPrefix}Row--${pageName}">
<tr data-key="{DSCDMNG_ID}">
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{ROW_NUM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{HDR_DE}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSCDMNG_ID}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{PRGRS_STTS_NM}</td>
<td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{BSSH_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{HDR_DE}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_DE}</td>
<td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{RND_DTL_RPT_CNT}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{PRGRS_STTS_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_SE_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_PRV_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_SE_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_MTH_NM}</td>
<td class="cmn" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_LOC}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_DE}</td>
</tr>
</template>
<template id="${infoPrefix}NotFound--${pageName}">
@ -141,9 +141,8 @@
<th class="sorting" style="width: 146.156px;">제품코드</th>
<th class="sorting" style="width: 130.141px;">폐기수량</th>
<th class="sorting" style="width: 130.469px;">유효기간</th>
<th class="sorting" style="width: 200.469px;">최소 유통단위 수량</th>
<th class="sorting" style="width: 230.469px;">낱개단위 수량</th>
<th class="sorting" style="width: 130.469px;">폐기수량</th>
<th class="sorting" style="width: 180.469px;">유통단위 수량</th>
<th class="sorting" style="width: 180.469px;">낱개단위 수량</th>
</tr>
</thead>
<tbody id="tbody--${pageName}Detail">
@ -152,12 +151,11 @@
<tr data-key="DSCDMNG_SN">
<td {onclick}="" {ondblclick}="">{ROW_NUM}</td>
<td {onclick}="" {ondblclick}="">{PRDUCT_NM}</td>
<td {onclick}="" {ondblclick}="">{PRDUCT_CD}</td>
<td class="text-end" {onclick}="" {ondblclick}="">{DSUSE_QY}</td>
<td class="text-center" {onclick}="" {ondblclick}="">{PRDUCT_CD}</td>
<td class="text-end" {onclick}="" {ondblclick}="">{DSUSE_QY} {PCE_UNIT}</td>
<td class="text-center" {onclick}="" {ondblclick}="">{PRD_VALID_DE}</td>
<td class="text-center" {onclick}="" {ondblclick}="">{MIN_DISTB_QY} {MIN_DISTB_UNIT}</td>
<td class="text-center" {onclick}="" {ondblclick}="">{PCE_QY} {PCE_UNIT}</td>
<td class="text-end" {onclick}="" {ondblclick}="">{DSUSE_QY}</td>
</tr>
</template>
<template id="${infoPrefix}NotFound--${pageName}Detail">
@ -282,8 +280,7 @@
};
// 신청서 정보 dialog
$P.control.getInfo = () => {
debugger
$P.control.getInfo = (isDtl) => {
let dialogTitle = "폐기 결과[통보] 등록";
let row = $P.control.dataset.getCurrent();
if (typeof row == "undefined" || row == null || row == "") return;
@ -294,9 +291,20 @@
usrRptIdNo: row.USR_RPT_ID_NO,
indutyNm: row.INDUTY_NM,
dsusePrvNm: row.DSUSE_PRV_NM,
rndDtlRptCnt: row.RND_DTL_RPT_CNT
rndDtlRptCnt: row.RND_DTL_RPT_CNT,
};
if (isDtl) {
params = {
...params,
hdrDe: row.HDR_DE,
dsuseDe: row.DSUSE_DE,
dsuseSeCd: row.DSUSE_SE_CD,
dsuseMthCd: row.DSUSE_MTH_CD,
dsuseLoc: row.DSUSE_LOC
}
}
ajax.get({
url : wctx.url("/adds/nims/dsuseMgtRslt-info.do")
, data : params
@ -333,7 +341,7 @@
//
let replacer = (str, dataItem) => str
.replace(/{onclick}/gi, "pageObject['${pageName}'].control.setCurrent('" + dataItem.getValue("DSCDMNG_ID") + "');")
.replace(/{ondblclick}/gi, "pageObject['${pageName}'].control.getInfo()");
.replace(/{ondblclick}/gi, "pageObject['${pageName}'].control.getInfo(" + true +")");
let trs = empty ? [document.getElementById("${infoPrefix}NotFound--${pageName}").content.outerHTML]
: ${infoPrefix}List.inStrings(foundTr.outerHTML, replacer);

Write Preview
Loading…
Cancel
Save