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

feat: 폐기결과 처리시 기등록 체크에 폐기구분 추가

Browse Source
main
Jonguk. Lim 4 weeks ago
parent 9359896fc2
commit b2f1087cb4
5 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File

16
src/main/java/cokr/xit/adds/nims/DsuseMgtRsltQuery.java
Unescape Escape View File

@ -1,6 +1,6 @@
package cokr.xit.adds.nims; package cokr.xit.adds.nims;
import cokr.xit.foundation.component.QueryRequest; import cokr.xit.foundation.component.*;
/**폐기관리접수 정보 조회 요청 /**폐기관리접수 정보 조회 요청
* *
@ -14,6 +14,7 @@ public class DsuseMgtRsltQuery extends QueryRequest{
private String deptCd; // 부서 코드 private String deptCd; // 부서 코드
private String userId; // 사용자 ID private String userId; // 사용자 ID
private String dsuseMthCd; // 폐기 방법 코드 private String dsuseMthCd; // 폐기 방법 코드
private String dsuseSeCd; // 폐기 구분 코드
private String dsuseDe; // 폐기 일자 private String dsuseDe; // 폐기 일자
public String getDscdmngId() { public String getDscdmngId() {
@ -42,7 +43,7 @@ public class DsuseMgtRsltQuery extends QueryRequest{
this.userId = userId; this.userId = userId;
return self(); return self();
} }
public String getDsuseMthCd() { public String getDsuseMthCd() {
return ifEmpty(dsuseMthCd, () -> null); return ifEmpty(dsuseMthCd, () -> null);
} }
@ -51,7 +52,16 @@ public class DsuseMgtRsltQuery extends QueryRequest{
this.dsuseMthCd = dsuseMthCd; this.dsuseMthCd = dsuseMthCd;
return self(); return self();
} }
public String getDsuseSeCd() {
return ifEmpty(dsuseSeCd, () -> null);
}
public <T extends DsuseMgtRsltQuery> T setDsuseSeCd(String dsuseSeCd) {
this.dsuseSeCd = dsuseSeCd;
return self();
}
public String getDsuseDe() { public String getDsuseDe() {
return ifEmpty(dsuseDe, () -> null); return ifEmpty(dsuseDe, () -> null);
} }

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

@ -207,7 +207,8 @@ public class AddsNimsController extends ApplicationController {
.setDscdmngId(dsuseRsltInfo.getDscdmngId()) .setDscdmngId(dsuseRsltInfo.getDscdmngId())
.setDeptCd(dsuseRsltInfo.getDeptCd()) .setDeptCd(dsuseRsltInfo.getDeptCd())
.setDsuseDe(dsuseRsltInfo.getDsuseDe().replaceAll("-", "")) .setDsuseDe(dsuseRsltInfo.getDsuseDe().replaceAll("-", ""))
.setDsuseMthCd(dsuseRsltInfo.getDsuseMthCd() .setDsuseMthCd(dsuseRsltInfo.getDsuseMthCd())
.setDsuseSeCd(dsuseRsltInfo.getDsuseSeCd()
) )
) )
) )

2
src/main/resources/sql/mapper/adds/nims/dsuseMgtRslt-mapper.xml
Unescape Escape View File

@ -10,6 +10,7 @@
, tdm.DSUSE_MTH_CD , tdm.DSUSE_MTH_CD
, tcc.CODE_VAL AS DSUSE_MTH_NM , tcc.CODE_VAL AS DSUSE_MTH_NM
, tdm.DSUSE_DE , tdm.DSUSE_DE
, tdm.DSUSE_LOC
, IF(#{dscdmngId} = tdm.DSCDMNG_ID, 'Y', 'N') AS SELF_YN , IF(#{dscdmngId} = tdm.DSCDMNG_ID, 'Y', 'N') AS SELF_YN
, (SELECT GROUP_CONCAT(dscdmng_id SEPARATOR ',') , (SELECT GROUP_CONCAT(dscdmng_id SEPARATOR ',')
FROM tb_dsuse_mgt FROM tb_dsuse_mgt
@ -30,6 +31,7 @@
AND tdm.use_yn = 'Y' AND tdm.use_yn = 'Y'
AND tdm.dept_cd = #{deptCd} AND tdm.dept_cd = #{deptCd}
AND tdm.dsuse_mth_cd = #{dsuseMthCd} AND tdm.dsuse_mth_cd = #{dsuseMthCd}
AND tdm.dsuse_se_cd = #{dsuseSeCd}
AND tdm.dsuse_de = #{dsuseDe} AND tdm.dsuse_de = #{dsuseDe}
</select> </select>
</mapper> </mapper>

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

@ -94,7 +94,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row my-1 mx-1 g-1 border-card rounded"></div> <div class="row my-1 mx-1 g-1 border-card rounded"></div>
</form> <!-- /입력 영역 --> </form> <!-- /입력 영역 -->
<input type="file" accept="image/*" id="inputUploadSet--${pageName}" hidden multiple /> <input type="file" accept="image/*" id="inputUploadSet--${pageName}" hidden multiple />
@ -161,6 +161,7 @@
let param = { let param = {
dscdmngId: $("#dscdmngId--${pageName}").val(), dscdmngId: $("#dscdmngId--${pageName}").val(),
dsuseDe: $("#dsuseDe--${pageName}").val().replace(/-/g, ""), dsuseDe: $("#dsuseDe--${pageName}").val().replace(/-/g, ""),
dsuseSeCd: $("#dsuseSeCd--${pageName}").val(),
dsuseMthCd: $("#dsuseMthCd--${pageName}").val(), dsuseMthCd: $("#dsuseMthCd--${pageName}").val(),
deptCd: "${currentUser.deptCode}" deptCd: "${currentUser.deptCode}"
}; };
@ -197,7 +198,6 @@
$('#spnDsuseDe').show(); $('#spnDsuseDe').show();
$('#spnDsuseMthCd').show(); $('#spnDsuseMthCd').show();
document.getElementById("rsltImgList").innerHTML = '총 ' + dscnmngIds.length + '건 에서 폐기사진 공유<br>폐기사진 공유 폐기관리번호 : [' + dscnmngIds.filter(item => item != $("#dscdmngId--${pageName}").val()).join(', ') + ']'; document.getElementById("rsltImgList").innerHTML = '총 ' + dscnmngIds.length + '건 에서 폐기사진 공유<br>폐기사진 공유 폐기관리번호 : [' + dscnmngIds.filter(item => item != $("#dscdmngId--${pageName}").val()).join(', ') + ']';
} }
return; return;
@ -217,7 +217,7 @@
} }
// pageObject // pageObject
let $P = pageObject["${pageName}"]; let $P = pageObject["${pageName}"];
$P.fileInfos = ${fileInfos}; $P.fileInfos = ${fileInfos};
$P.fileArr = []; $P.fileArr = [];
@ -252,7 +252,7 @@
* DatasetControl 이벤트 * DatasetControl 이벤트
**************************************************************************/ **************************************************************************/
// Dataset 변경 이벤트 // Dataset 변경 이벤트
// 현재 선택 자료 변경 이벤트 // 현재 선택 자료 변경 이벤트
$P.control.onCurrentChange = item => { $P.control.onCurrentChange = item => {
if (!item) return; if (!item) return;
@ -306,7 +306,7 @@
} }
}); });
} }
// 저장 // 저장
$P.control.save = (info, fileArr) => { $P.control.save = (info, fileArr) => {
let saveData = { let saveData = {
@ -376,11 +376,11 @@
$P.fileArr.push(files[i]); $P.fileArr.push(files[i]);
} }
} }
$P.fnDisplay(); $P.fnDisplay();
}; };
/************************************************************************** /**************************************************************************
* DataTables 이벤트 * DataTables 이벤트
**************************************************************************/ **************************************************************************/
@ -415,10 +415,10 @@
/************************************************************************** /**************************************************************************
* 사용자 함수(function) * 사용자 함수(function)
**************************************************************************/ **************************************************************************/
// 이미지 표시 // 이미지 표시
$P.fnDisplay = () => { $P.fnDisplay = () => {
if($P.fileArr.length > 0){ if($P.fileArr.length > 0){
let tagsText = $P.fnMakeImgTags($P.fileArr); let tagsText = $P.fnMakeImgTags($P.fileArr);
document.querySelector("#dragAndDrop--${pageName}").innerHTML = tagsText; document.querySelector("#dragAndDrop--${pageName}").innerHTML = tagsText;
@ -427,9 +427,9 @@
document.querySelector("#dragAndDrop--${pageName}").innerHTML = ""; document.querySelector("#dragAndDrop--${pageName}").innerHTML = "";
$("#btnImgDel--${pageName}").attr("hidden","hidden"); $("#btnImgDel--${pageName}").attr("hidden","hidden");
} }
} }
// HTML 태그(img,checkbox) 문자열 생성 // HTML 태그(img,checkbox) 문자열 생성
$P.fnMakeImgTags = (fileArr) => { $P.fnMakeImgTags = (fileArr) => {
let tagsTextArr = []; let tagsTextArr = [];
@ -438,7 +438,7 @@
let item = fileArr[index]; let item = fileArr[index];
let template = document.getElementById("imgCheckboxTemplate--${pageName}").innerHTML; let template = document.getElementById("imgCheckboxTemplate--${pageName}").innerHTML;
template = template.replace(/{name}/gi, "dsuseDsuseImgFilesSelector"); template = template.replace(/{name}/gi, "dsuseDsuseImgFilesSelector");
template = template.replace(/{value}/gi, item.id); template = template.replace(/{value}/gi, item.id);
template = template.replace(/{src}/gi, item.url); template = template.replace(/{src}/gi, item.url);
@ -447,7 +447,7 @@
return tagsTextArr.join(""); return tagsTextArr.join("");
} }
// 전자우편 안내문 등록 버튼 이벤트 // 전자우편 안내문 등록 버튼 이벤트
$P.fnSearchBssh = (title) => { $P.fnSearchBssh = (title) => {
$P.control.getBsshInfo(); $P.control.getBsshInfo();
@ -509,7 +509,7 @@
$("#btnBsshSearch--${pageName}").on("click", function() { $("#btnBsshSearch--${pageName}").on("click", function() {
$P.fnSearchBssh($(this).attr("title")); $P.fnSearchBssh($(this).attr("title"));
}); });
//이미지 삭제 버튼 //이미지 삭제 버튼
$("#btnImgDel--${pageName}").on("click", function() { $("#btnImgDel--${pageName}").on("click", function() {
let checkeds = $("#dragAndDrop--${pageName}").find(":checkbox[name='dsuseDsuseImgFilesSelector']:checked"); let checkeds = $("#dragAndDrop--${pageName}").find(":checkbox[name='dsuseDsuseImgFilesSelector']:checked");
@ -518,16 +518,16 @@
checkeds.each(function(){ checkeds.each(function(){
keys.push(this.value); keys.push(this.value);
}); });
$P.fileArr = $P.fileArr.filter((element) => keys.indexOf(element.id) === -1); $P.fileArr = $P.fileArr.filter((element) => keys.indexOf(element.id) === -1);
$P.fnDisplay(); $P.fnDisplay();
} }
}); });
// 버튼 이벤트 // 버튼 이벤트
$("#btnSave--${pageName}").on("click", () => $P.fnSave()); // 저장 $("#btnSave--${pageName}").on("click", () => $P.fnSave()); // 저장
$("#dsuseDe--${pageName}, #dsuseMthCd--${pageName}").on("change", () => { $("#dsuseDe--${pageName}, #dsuseMthCd--${pageName}, #dsuseSeCd--${pageName}").on("change", () => {
isImgSaved = true; isImgSaved = true;
isRsltImgRemove = false; isRsltImgRemove = false;
if(initDataset) searchRsltImgList(); if(initDataset) searchRsltImgList();
@ -545,7 +545,7 @@
let tmp = $P.fileArr[evt.oldIndex]; let tmp = $P.fileArr[evt.oldIndex];
$P.fileArr[evt.oldIndex] = $P.fileArr[evt.newIndex]; $P.fileArr[evt.oldIndex] = $P.fileArr[evt.newIndex];
$P.fileArr[evt.newIndex] = tmp; $P.fileArr[evt.newIndex] = tmp;
$P.fnDisplay(); $P.fnDisplay();
} }
} }
@ -593,24 +593,24 @@
$("#hdrDe--${pageName}").datepicker("setDate", new Date()); // 취급 일자 $("#hdrDe--${pageName}").datepicker("setDate", new Date()); // 취급 일자
$("#dsuseDe--${pageName}").datepicker("setDate", new Date()); // 폐기 일자 $("#dsuseDe--${pageName}").datepicker("setDate", new Date()); // 폐기 일자
} }
if($P.fileInfos.length > 0){ if($P.fileInfos.length > 0){
let promiseArr = []; let promiseArr = [];
$P.fileInfos.forEach(f => { $P.fileInfos.forEach(f => {
// URL에 c: d: 제거 // URL에 c: d: 제거
if(/^[a-zA-Z][\:]/.test(f.URL)){ if(/^[a-zA-Z][\:]/.test(f.URL)){
f.URL = f.URL.substring(2); f.URL = f.URL.substring(2);
} }
try{ try{
promiseArr.push(AddsSupport.fnCreateFileFromFileInfo(f)); promiseArr.push(AddsSupport.fnCreateFileFromFileInfo(f));
}catch(e){ }catch(e){
console.log(e); console.log(e);
} }
}); });
Promise.all(promiseArr).then((values) => { Promise.all(promiseArr).then((values) => {
$P.fileArr = $P.fileArr.concat(values); $P.fileArr = $P.fileArr.concat(values);
$P.fnDisplay(); $P.fnDisplay();
@ -621,6 +621,6 @@
}); });
</script> </script>

8
src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp
Unescape Escape View File

@ -63,10 +63,12 @@
<label id="${infoPrefix}Paging--${pageName}PagingInfo" class="dataTables_info" role="status" aria-live="polite"></label> <label id="${infoPrefix}Paging--${pageName}PagingInfo" class="dataTables_info" role="status" aria-live="polite"></label>
<ul id="${infoPrefix}Paging--${pageName}" class="pagination pagination-primary" style="display: none;"> <ul id="${infoPrefix}Paging--${pageName}" class="pagination pagination-primary" style="display: none;">
</ul> </ul>
<span class="container-window-btn-right">
<!-- FIXME:: NIMS API 개발 완료후 적용 --> <!-- FIXME:: NIMS API 개발 완료후 적용 -->
<%-- <input type="checkbox" id="chkBsshCd--${pageName}" name="chkBsshCd" title="업체코드적용" style="align-items: baseline"/>&nbsp;<strong>신규API 업체코드 적용</strong>--%> <%--
<span class="container-window-btn-right">
<input type="checkbox" id="chkBsshCd--${pageName}" name="chkBsshCd" title="업체코드적용" style="align-items: baseline"/>&nbsp;<strong>신규API 업체코드 적용</strong>
</span> </span>
--%>
</div> </div>
</div> </div>
<div class="card col-6"> <div class="card col-6">
@ -349,7 +351,7 @@
} }
// FIXME:: NIMS API 개발 완료후 적용 // FIXME:: NIMS API 개발 완료후 적용
<%--let bsshCd = '${bsshCd}';--%> let bsshCd = '${bsshCd}';
<%--if(!$('#chkBsshCd--${pageName}').is(":checked")){--%> <%--if(!$('#chkBsshCd--${pageName}').is(":checked")){--%>
<%-- bsshCd = '';--%> <%-- bsshCd = '';--%>
<%--}--%> <%--}--%>

Write Preview
Loading…
Cancel
Save