tolag3/fairnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2025-04-18 09:30 자료기안, 출석기안 수정 내용

Browse Source
This commit is contained in:
myname 2025-04-18 09:30:42 +09:00
parent a7a7b5e023
commit a79b35fafa
4 changed files with 358 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

210
src/main/java/seed/com/gtm/base/GwBaseController.java
View File

@ -426,9 +426,162 @@ 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("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 + "<br/>(경유)";
v_ret = v_ret + "<br/>제목　　<b>사실관계 확인을 위한 출석요구("+p_data1.get("caseNo").toString()+")</b>";
if (p_cnt>1) {
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 +"<br/><br/>";
if (p_jobID.indexOf("2-")>-1) {
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 +"<br/><br/>2. 출석장소: 한국공정거래조정원";
v_ret = v_ret +"<br/>[서울 중구 세종대로 39, 9층(남대문로4가, 상공회의소회관)]";
v_ret = v_ret +"<br/><br/>3. 출석대상";
@ -4116,7 +4295,13 @@ public class GwBaseController {
}
v_ret = v_ret +"다음과 같이 출석하여 주실 것을 요구하오니 반드시 출석대상자가 출석할 수 있도록 협조하여 주시기 바랍니다.";
if ("".equals(s_time)) {
v_ret = v_ret +"<br/><br/>가. 출석일시: 202o. oo. oo.(수) oo:oo";
}else {
v_ret = v_ret +"<br/><br/>가. 출석일시: " + s_time;
}
//v_ret = v_ret +"<br/><br/>가. 출석일시: 202o. oo. oo.(수) oo:oo";
v_ret = v_ret +"<br/><br/>나. 출석장소: 한국공정거래조정원";
v_ret = v_ret +"<br/>[서울 중구 세종대로 39, 9층(남대문로4가, 상공회의소회관)]";
v_ret = v_ret +"<br/><br/>다. 출석대상";
@ -4185,7 +4370,13 @@ public class GwBaseController {
}
v_ret = v_ret +"다음과 같이 출석하여 주실 것을 요구하오니 반드시 출석대상자가 출석할 수 있도록 협조하여 주시기 바랍니다.";
if ("".equals(s_time)) {
v_ret = v_ret +"<br/><br/>가. 출석일시: 202o. oo. oo.(수) oo:oo";
}else {
v_ret = v_ret +"<br/><br/>가. 출석일시: " + s_time;
}
//v_ret = v_ret +"<br/><br/>가. 출석일시: 202o. oo. oo.(수) oo:oo";
v_ret = v_ret +"<br/><br/>나. 출석장소: 한국공정거래조정원";
v_ret = v_ret +"<br/>[서울 중구 세종대로 39, 9층(남대문로4가, 상공회의소회관)]";
v_ret = v_ret +"<br/><br/>다. 출석대상";
@ -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 요청으로 주석 처리

128
src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml
View File

@ -3252,6 +3252,37 @@
ORDER BY SEQ_NO DESC
</select>
<!--자료요구 리스트 -->
<select id="trublprocessmngDataNewRequestOne" parameterType="egovMap" resultType="egovMap">
SELECT * FROM
(
SELECT ROW_.*, ROWNUM AS RNUM
FROM (
SELECT CASE_NO,
SEQ_NO,
DOC_TYPE,
DOC_CHA,
DATA_REQDT,
DATA_DT,
REG_DT,
REG_ID,
MOD_DT,
MOD_ID,
DATA_ENDDT,
DOC_ID
FROM C_FILEREQ_NEW
WHERE CASE_NO = #{caseNo}
AND DATA_REQDT IS NULL
AND DOC_TYPE = #{docType}
ORDER BY SEQ_NO DESC
)ROW_
) AA
WHERE 1 >= RNUM
</select>
<!--자료요구 수정 -->
<select id="trublprocessmngDataNewRequestUp" parameterType="egovMap" resultType="egovMap">
UPDATE C_FILEREQ_NEW
@ -3267,6 +3298,25 @@
WHERE SEQ_NO = #{seqNo}
</select>
<!--자료요구 수정 -->
<update id="trublprocessmngDataNewRequestUpDocId" parameterType="egovMap">
UPDATE C_FILEREQ_NEW
SET
DOC_ID = #{docId}
WHERE SEQ_NO = #{seqNo}
</update>
<!--자료요구 수정 (요구일자 결재일자로 자동 업데이트 함)-->
<update id="trublprocessmngDataNewRequestAttendanceReqdt" parameterType="egovMap">
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}
</update>
<!--자료요구 삭제 -->
<select id="trublprocessmngDataNewRequestDel" parameterType="egovMap" resultType="egovMap">
DELETE FROM C_FILEREQ_NEW
@ -3502,6 +3552,65 @@
ORDER BY A.SEQ_NO DESC
</select>
<!--최종 출석요구 항목 -->
<select id="trublprocessmngAtentNewRequestOne" parameterType="egovMap" resultType="egovMap">
SELECT * FROM
(
SELECT ROW_.*, ROWNUM AS RNUM
FROM (
SELECT A.CASE_NO,
A.SEQ_NO,
A.DOC_CHA,
A.DOC_ID,
A.ATTENDANCE_REQDT,
A.ATTENDANCE_DT,
A.ATTENDANCE_TM,
A.APP_SEQ_NO,
A.RES_SEQ_NO,
A.APP_ATTENDANCE_CHECK,
A.RES_ATTENDANCE_CHECK,
/*
A.REG_DT,
A.REG_ID,
A.MOD_DT,
A.MOD_ID,
*/
CASE
WHEN B.COMPANY_GUBUN='1301000000' THEN B.COMPANY_CEO||' 대표'
WHEN B.COMPANY_GUBUN='1302000000' THEN '대표이사 '||B.COMPANY_CEO
ELSE B.COMPANY_CEO
END
AS APP_COMPANY_CEO,
CASE
WHEN c.RESPONDENT_GUBUN='1301000000' THEN C.RESPONDENT_CEO||' 대표'
WHEN c.RESPONDENT_GUBUN='1302000000' THEN '대표이사 '||C.RESPONDENT_CEO
ELSE C.RESPONDENT_CEO
END
AS RES_COMPANY_CEO
FROM C_ATENTSTTUS_NEW A
LEFT OUTER JOIN C_CASEAPPLCNT B
on(a.CASE_NO=b.CASE_NO AND a.APP_SEQ_NO = b.SEQ_NO)
LEFT OUTER JOIN C_CASERESPONDENT C
on(a.CASE_NO=b.CASE_NO AND a.RES_SEQ_NO = c.SEQ_NO)
WHERE A.CASE_NO = #{caseNo}
AND A.ATTENDANCE_REQDT IS NULL
ORDER BY A.SEQ_NO DESC
)ROW_
) AA
WHERE 1 >= RNUM
</select>
<!--출석요구 수정 -->
<update id="trublprocessmngAtentNewRequestUp" parameterType="egovMap">
UPDATE C_ATENTSTTUS_NEW
@ -3517,6 +3626,25 @@
WHERE SEQ_NO = #{seqNo}
</update>
<!--출석요구 수정 -->
<update id="trublprocessmngAtentNewRequestUpDocId" parameterType="egovMap">
UPDATE C_ATENTSTTUS_NEW
SET
DOC_ID = #{docId}
WHERE SEQ_NO = #{seqNo}
</update>
<!--출석요구 수정(출석요구일자 결재일자로 자동 업데이트 함) -->
<update id="trublprocessmngAtentNewRequestAttendanceReqdt" parameterType="egovMap">
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}
</update>
<!--출석요구 삭제 -->
<delete id="trublprocessmngAtentNewRequestDel" parameterType="egovMap">
DELETE FROM C_ATENTSTTUS_NEW

11
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/atendNewPop.jsp
View File

@ -67,6 +67,7 @@
<col style="width:10%">
<col style="width:10%">
<col style="width:10%">
<col style="width:10%">
<col style="width:15%">
</colgroup>
<thead>
@ -77,12 +78,13 @@
<th scope="col">출석요구일자</th>
<th scope="col">대상</th>
<th scope="col">출석여부</th>
<th scope="col">연결기안</th>
<th scope="col">비고</th>
</tr>
</thead>
<tbody id="innertBox">
<tr>
<td colspan="7">등록된 데이터가 없습니다.</td>
<td colspan="8">등록된 데이터가 없습니다.</td>
</tr>
</tbody>
</table>
@ -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 +='</select>';
htmlVal +='</td>';
htmlVal +='<td>'+docId+'</td>';
htmlVal +='<td>';
htmlVal +='<button type="button" class="btn-default" onclick="dataUp('+up_key+');">수정</button>';
htmlVal +='<input type="hidden" name="seqNo_'+up_key+'" id="seqNo_'+up_key+'" value="'+up_key+'">';

11
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/dtaNewPop.jsp
View File

@ -70,6 +70,7 @@
<col style="width:10%">
<col style="width:10%">
<col style="width:10%">
<col style="width:10%">
<col style="width:15%">
</colgroup>
<thead>
@ -80,12 +81,13 @@
<th scope="col">요구일자</th>
<th scope="col">제출일자</th>
<th scope="col">제출여부</th>
<th scope="col">연결기안</th>
<th scope="col">비고</th>
</tr>
</thead>
<tbody id="innertBox">
<tr>
<td colspan="7">등록된 데이터가 없습니다.</td>
<td colspan="8">등록된 데이터가 없습니다.</td>
</tr>
</tbody>
</table>
@ -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 +='</td>';
htmlVal +='<td>'+r.data[i].targetName+'</td>';
*/
htmlVal +='<td>'+docId+'</td>';
htmlVal +='<td>';
htmlVal +='<button type="button" class="btn btn_text btn_30 red_border btn-default" onclick="dataUp('+up_key+');">수정</button>';
htmlVal +='<input type="hidden" name="seqNo_'+up_key+'" id="seqNo_'+up_key+'" value="'+up_key+'">';