fix: 폐기결과처리 상세

dev
Jonguk. Lim 5 months ago
parent 41ae41105d
commit 96e11dd1cf

@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonAlias;
import lombok.Data; import lombok.Data;
@Data @Data
public class DsuseReceiptInfo { public class DsuseRsltInfo {
/** /**
* *
*/ */
@ -71,4 +71,9 @@ public class DsuseReceiptInfo {
private String dsusePrvNm; private String dsusePrvNm;
private Integer rndDtlRptCnt; private Integer rndDtlRptCnt;
private String hdrDe;
private String dsuseDe;
private String dsuseSeCd;
private String dsuseMthCd;
private String dsuseLoc;
} }

@ -17,6 +17,6 @@ public interface DsuseMgtReceiptMapper extends AbstractMapper {
* @param req * @param req
* @return * @return
*/ */
List<DataObject> selectDsuseMgtReceiptcList(DsuseMgtReceiptQuery req); List<DataObject> selectDsuseMgtReceiptList(DsuseMgtReceiptQuery req);
} }

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

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

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

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

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save