diff --git a/src/main/java/seed/com/gtm/base/GwBaseController.java b/src/main/java/seed/com/gtm/base/GwBaseController.java index e89b6a0e..61b8c2ed 100644 --- a/src/main/java/seed/com/gtm/base/GwBaseController.java +++ b/src/main/java/seed/com/gtm/base/GwBaseController.java @@ -424,11 +424,164 @@ public class GwBaseController { //최상단 타이틀 생성 //params.put("title", this.gwTitle(s_jobID, (EgovMap)params.get("data1"))); - params.put("title", this.gwNewTitles(s_jobID, (EgovMap)params.get("data1"))); + params.put("title", this.gwNewTitles(s_jobID, (EgovMap)params.get("data1"))); + + + //사전 작성 내용 전달하기 - 오류 방지용 초기화 + //params.put("data1PreAte", (EgovMap)params.get("data1")); + + //출석현황N + if (false //출석요구 + || "1-7".equals(s_jobID) //공정거래 - 0201000000 + || "2-7".equals(s_jobID) //가맹점사업거래 - 0202000000 + || "3-7".equals(s_jobID) //하도급거래 - 0203000000 + || "4-7".equals(s_jobID) //대규모유통거래 - 0204000000 + || "5-7".equals(s_jobID) //약관거래 - 0205000000 + || "6-7".equals(s_jobID) //대리점거래 - 0206000000 + + //출석요구 - 2차 + || "1-8".equals(s_jobID) //공정거래 - 0201000000 + || "2-8".equals(s_jobID) //가맹점사업거래 - 0202000000 + || "3-8".equals(s_jobID) //하도급거래 - 0203000000 + || "4-8".equals(s_jobID) //대규모유통거래 - 0204000000 + || "5-8".equals(s_jobID) //약관거래 - 0205000000 + || "6-8".equals(s_jobID) //대리점거래 - 0206000000) + ) + { + //사건 출석 정보 가져오기 + params.put("sql", "trublprocessmngAtentNewRequestOne"); //조사관 작성 사건 출석 정보 + + EgovMap absnt = (EgovMap) JSPUtil.fixNull(bservice.select(params)); + + System.out.println("absnt.get(seqNo).toString()"); + //System.out.println(absnt.get("seqNo")); + //System.out.println(absnt.get("seqNo").toString()); + //System.out.println(absnt.get("seqNo").toString()); + //System.out.println(absnt.get("seqNo").toString()); + System.out.println(absnt); + + if (absnt != null) + { + params.put("data1PreAte", absnt); + + //문서 번호 연결 + params.put("seqNo", absnt.get("seqNo").toString()); + params.put("sql", "trublprocessmngAtentNewRequestUpDocId"); //사건 정보 + params.put("data", JSPUtil.fixNull(bservice.insert(params))); + } + + } + + + //보완요구N + if (false //1차 + || "1-4".equals(s_jobID) //공정거래 - 0201000000 + || "2-4".equals(s_jobID) //가맹점사업거래 - 0202000000 + || "3-4".equals(s_jobID) //하도급거래 - 0203000000 + || "4-4".equals(s_jobID) //대규모유통거래 - 0204000000 + || "5-4".equals(s_jobID) //약관거래 - 0205000000 + || "6-4".equals(s_jobID) //대리점거래 - 0206000000 + + //보완요구N - 2차 + || "1-9".equals(s_jobID) //공정거래 - 0201000000 + || "2-9".equals(s_jobID) //가맹점사업거래 - 0202000000 + || "3-9".equals(s_jobID) //하도급거래 - 0203000000 + || "4-9".equals(s_jobID) //대규모유통거래 - 0204000000 + || "5-9".equals(s_jobID) //약관거래 - 0205000000 + || "6-9".equals(s_jobID) //대리점거래 - 0206000000) + + //보완요구N - 3차 + || "1-26".equals(s_jobID) //공정거래 - 0201000000 + || "2-26".equals(s_jobID) //가맹점사업거래 - 0202000000 + || "3-26".equals(s_jobID) //하도급거래 - 0203000000 + || "4-26".equals(s_jobID) //대규모유통거래 - 0204000000 + || "5-26".equals(s_jobID) //약관거래 - 0205000000 + || "6-26".equals(s_jobID) //대리점거래 - 0206000000) + ) + { + //보완 요구 정보 가져오기 + params.put("docType", "1"); + params.put("sql", "trublprocessmngDataNewRequestOne"); //조사관 작성 사건 출석 정보 + + EgovMap absnt = (EgovMap) JSPUtil.fixNull(bservice.select(params)); + + System.out.println("absnt.get(seqNo).toString()"); + //System.out.println(absnt.get("seqNo")); + //System.out.println(absnt.get("seqNo").toString()); + //System.out.println(absnt.get("seqNo").toString()); + //System.out.println(absnt.get("seqNo").toString()); + System.out.println(absnt); + + if (absnt != null) + { + params.put("data1PreAte", absnt); + + //문서 번호 연결 + params.put("seqNo", absnt.get("seqNo").toString()); + params.put("sql", "trublprocessmngDataNewRequestUpDocId"); //사건 정보 + params.put("data", JSPUtil.fixNull(bservice.insert(params))); + } + + } + + //자료요구N + if (false //1차 + || "1-5".equals(s_jobID) //공정거래 - 0201000000 + || "2-5".equals(s_jobID) //가맹점사업거래 - 0202000000 + || "3-5".equals(s_jobID) //하도급거래 - 0203000000 + || "4-5".equals(s_jobID) //대규모유통거래 - 0204000000 + || "5-5".equals(s_jobID) //약관거래 - 0205000000 + || "6-5".equals(s_jobID) //대리점거래 - 0206000000 + + //자료요구N - 2차 + || "1-10".equals(s_jobID) //공정거래 - 0201000000 + || "2-10".equals(s_jobID) //가맹점사업거래 - 0202000000 + || "3-10".equals(s_jobID) //하도급거래 - 0203000000 + || "4-10".equals(s_jobID) //대규모유통거래 - 0204000000 + || "5-10".equals(s_jobID) //약관거래 - 0205000000 + || "6-10".equals(s_jobID) //대리점거래 - 0206000000) + + //자료요구N - 3차 + || "1-27".equals(s_jobID) //공정거래 - 0201000000 + || "2-27".equals(s_jobID) //가맹점사업거래 - 0202000000 + || "3-27".equals(s_jobID) //하도급거래 - 0203000000 + || "4-27".equals(s_jobID) //대규모유통거래 - 0204000000 + || "5-27".equals(s_jobID) //약관거래 - 0205000000 + || "6-27".equals(s_jobID) //대리점거래 - 0206000000) + ) + { + //자료 요구 정보 가져오기 + params.put("docType", "2"); + params.put("sql", "trublprocessmngDataNewRequestOne"); //조사관 작성 사건 출석 정보 + + EgovMap absnt = (EgovMap) JSPUtil.fixNull(bservice.select(params)); + + System.out.println("absnt.get(seqNo).toString()"); + //System.out.println(absnt.get("seqNo")); + //System.out.println(absnt.get("seqNo").toString()); + //System.out.println(absnt.get("seqNo").toString()); + //System.out.println(absnt.get("seqNo").toString()); + System.out.println(absnt); + + if (absnt != null) + { + params.put("data1PreAte", absnt); + + //문서 번호 연결 + params.put("seqNo", absnt.get("seqNo").toString()); + params.put("sql", "trublprocessmngDataNewRequestUpDocId"); //사건 정보 + params.put("data", JSPUtil.fixNull(bservice.insert(params))); + } + + } //본문 생성 - params.put("contents", this.gwContents(s_jobID, (EgovMap)params.get("data1"), (List)params.get("caseApplcntData") - , (List)params.get("caseRespondentData"), params.get("title").toString(), s_applcntNoStr, s_respondentNoStr)); + params.put("contents", this.gwContents( + s_jobID, (EgovMap)params.get("data1"), (List)params.get("caseApplcntData") + , (List)params.get("caseRespondentData"), params.get("title").toString(), s_applcntNoStr, s_respondentNoStr + , (EgovMap)params.get("data1PreAte") + ) + ); }else if(false //조정절차 종료사실 통지 @@ -1961,7 +2114,10 @@ public class GwBaseController { List p_caseRespondentData, String p_title, String p_applcntNoStr, //선택한 신청인 - String p_respondentNoStr//선택한 피신청인 + String p_respondentNoStr,//선택한 피신청인 + + EgovMap p_data1PreAte //사전에 조사관이 작성한 팝업 정보 + ) { String v_ret=""; @@ -2057,7 +2213,7 @@ public class GwBaseController { || "5-7".equals(p_jobID) //약관거래 - 0205000000 || "6-7".equals(p_jobID) //대리점거래 - 0206000000 ){ //하도급 출석요구 - v_ret = this.makeXBY7(p_data1, p_caseApplcntData, p_caseRespondentData, p_jobID, 1, p_title); + v_ret = this.makeXBY7(p_data1, p_caseApplcntData, p_caseRespondentData, p_jobID, 1, p_title, p_data1PreAte); }else if (false //출석요구 - 2차 @@ -2068,7 +2224,7 @@ public class GwBaseController { || "5-8".equals(p_jobID) //약관거래 - 0205000000 || "6-8".equals(p_jobID) //대리점거래 - 0206000000 ){ //하도급 출석요구 - v_ret = this.makeXBY7(p_data1, p_caseApplcntData, p_caseRespondentData, p_jobID, 2, p_title); + v_ret = this.makeXBY7(p_data1, p_caseApplcntData, p_caseRespondentData, p_jobID, 2, p_title, p_data1PreAte); }else if (false //보완요구 2차 @@ -4009,10 +4165,23 @@ public class GwBaseController { String p_jobID, int p_cnt, //출석회차 String p_title + ,EgovMap p_data1PreAte ) { String v_ret = ""; + EgovMap absent = null; try { + absent = p_data1PreAte; + + String s_cha = ""; + String s_time = ""; + + if (absent != null) + { + s_cha = p_data1PreAte.get("docCha").toString(); + s_time = p_data1PreAte.get("attendanceDt").toString() + " " + p_data1PreAte.get("attendanceTm").toString(); + } + v_ret = this.receiverHeader(); //수신영역 @@ -4022,7 +4191,12 @@ public class GwBaseController { v_ret = v_ret + "
(경유)"; v_ret = v_ret + "
제목  사실관계 확인을 위한 출석요구("+p_data1.get("caseNo").toString()+")"; if (p_cnt>1) { - v_ret = v_ret +"("+Integer.toString(p_cnt)+"차)"; + if ("".equals(s_cha)) { + v_ret = v_ret +"("+Integer.toString(p_cnt)+"차)"; + }else { + v_ret = v_ret +"("+s_cha+")"; + } + } } @@ -4042,7 +4216,12 @@ public class GwBaseController { v_ret = v_ret +"

"; if (p_jobID.indexOf("2-")>-1) { - v_ret = v_ret +"1. 출석일시: 202o. oo. oo.(수) oo:oo"; + if ("".equals(s_time)) { + v_ret = v_ret +"1. 출석일시: 202o. oo. oo.(수) oo:oo"; + }else { + v_ret = v_ret +"1. 출석일시: " + s_time; + } + v_ret = v_ret +"

2. 출석장소: 한국공정거래조정원"; v_ret = v_ret +"
[서울 중구 세종대로 39, 9층(남대문로4가, 상공회의소회관)]"; v_ret = v_ret +"

3. 출석대상"; @@ -4116,7 +4295,13 @@ public class GwBaseController { } v_ret = v_ret +"다음과 같이 출석하여 주실 것을 요구하오니 반드시 출석대상자가 출석할 수 있도록 협조하여 주시기 바랍니다."; - v_ret = v_ret +"

가. 출석일시: 202o. oo. oo.(수) oo:oo"; + if ("".equals(s_time)) { + v_ret = v_ret +"

가. 출석일시: 202o. oo. oo.(수) oo:oo"; + }else { + v_ret = v_ret +"

가. 출석일시: " + s_time; + } + + //v_ret = v_ret +"

가. 출석일시: 202o. oo. oo.(수) oo:oo"; v_ret = v_ret +"

나. 출석장소: 한국공정거래조정원"; v_ret = v_ret +"
[서울 중구 세종대로 39, 9층(남대문로4가, 상공회의소회관)]"; v_ret = v_ret +"

다. 출석대상"; @@ -4185,7 +4370,13 @@ public class GwBaseController { } v_ret = v_ret +"다음과 같이 출석하여 주실 것을 요구하오니 반드시 출석대상자가 출석할 수 있도록 협조하여 주시기 바랍니다."; - v_ret = v_ret +"

가. 출석일시: 202o. oo. oo.(수) oo:oo"; + if ("".equals(s_time)) { + v_ret = v_ret +"

가. 출석일시: 202o. oo. oo.(수) oo:oo"; + }else { + v_ret = v_ret +"

가. 출석일시: " + s_time; + } + + //v_ret = v_ret +"

가. 출석일시: 202o. oo. oo.(수) oo:oo"; v_ret = v_ret +"

나. 출석장소: 한국공정거래조정원"; v_ret = v_ret +"
[서울 중구 세종대로 39, 9층(남대문로4가, 상공회의소회관)]"; v_ret = v_ret +"

다. 출석대상"; @@ -8920,6 +9111,15 @@ v_ret = this.receiverHeader(); params.put("memberId", "nanumCallBack"); params.put("sql", "trublprocessmngAtentRequest"); bservice.insert(params); + + try{ + //C_ATENTSTTUS_NEW - 결재일 & 변경자 정보 수정 + params.put("sql", "trublprocessmngAtentNewRequestAttendanceReqdt"); + bservice.insert(params); + }catch(Exception ex) { + ex.printStackTrace(); + } + /*[조정원]출석요구공문 그룹웨어 결재 완료시 * 타겟 컬럼은 있지만 미사용*/ //http://pms.iten.co.kr:9999/issues/4894 요청으로 주석 처리 diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml index cd361492..99f731a0 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml @@ -3252,6 +3252,37 @@ ORDER BY SEQ_NO DESC + + + + + + + UPDATE C_FILEREQ_NEW + SET + DOC_ID = #{docId} + WHERE SEQ_NO = #{seqNo} + + + + + UPDATE C_FILEREQ_NEW + SET + DATA_REQDT = TO_CHAR(SYSDATE,'YYYY-MM-DD') + ,MOD_DT = SYSDATE + ,MOD_ID = #{memberId} + WHERE CASE_NO = #{caseNo} + AND DOC_ID = #{docID} + + + + @@ -3516,6 +3625,25 @@ RES_ATTENDANCE_CHECK = #{resAttendanceCheck} WHERE SEQ_NO = #{seqNo} + + + + UPDATE C_ATENTSTTUS_NEW + SET + DOC_ID = #{docId} + WHERE SEQ_NO = #{seqNo} + + + + + UPDATE C_ATENTSTTUS_NEW + SET + ATTENDANCE_REQDT = TO_CHAR(SYSDATE,'YYYY-MM-DD') + ,MOD_DT = SYSDATE + ,MOD_ID = #{memberId} + WHERE CASE_NO = #{caseNo} + AND DOC_ID = #{docID} + diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/atendNewPop.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/atendNewPop.jsp index c912bf01..98b06183 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/atendNewPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/atendNewPop.jsp @@ -67,6 +67,7 @@ + @@ -77,12 +78,13 @@ 출석요구일자 대상 출석여부 + 연결기안 비고 - 등록된 데이터가 없습니다. + 등록된 데이터가 없습니다. @@ -139,6 +141,12 @@ docCha = r.data[i].docCha; } + //연결문서번호 + var docId = ""; + if(r.data[i].docId != undefined){ + docId = r.data[i].docId; + } + //출석요구일자 var attendanceReqdt = ""; if(r.data[i].attendanceReqdt != undefined){ @@ -202,6 +210,7 @@ htmlVal +=''; htmlVal +=''; + htmlVal +=''+docId+''; htmlVal +=''; htmlVal +=''; htmlVal +=''; diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/dtaNewPop.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/dtaNewPop.jsp index 9bc19a9a..904ac6b1 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/dtaNewPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/dtaNewPop.jsp @@ -70,6 +70,7 @@ + @@ -80,12 +81,13 @@ 요구일자 제출일자 제출여부 + 연결기안 비고 - 등록된 데이터가 없습니다. + 등록된 데이터가 없습니다. @@ -140,6 +142,12 @@ docCha = r.data[i].docCha; } + //연결문서번호 + var docId = ""; + if(r.data[i].docId != undefined){ + docId = r.data[i].docId; + } + //요구일자 var dataReqdt = ""; if(r.data[i].dataReqdt != undefined){ @@ -186,6 +194,7 @@ htmlVal +=''; htmlVal +=''+r.data[i].targetName+''; */ + htmlVal +=''+docId+''; htmlVal +=''; htmlVal +=''; htmlVal +='';