# WARNING: head commit changed in the meantime

Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
g/w 연동 아이디 확인하고 진행하도록 처리함

src/main/java/seed/com/gtm/base/BaseController.java

@@ -29,6 +29,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import egovframework.rte.psl.dataaccess.util.EgovMap;
 import seed.com.gtm.code.CodeService;
+import seed.com.gtm.join.MemberJoinService;
 import seed.com.gtm.seedfile.SeedFileService;
 import seed.com.gtm.service.BaseService;
 import seed.com.gtm.util.Criteria;
@@ -46,6 +47,9 @@ import seed.utils.SeedUtils;
 public class BaseController {
 	protected Log log = LogFactory.getLog(this.getClass());
 
+	@Autowired
+	private MemberJoinService memberService;
+	
 	@Autowired
 	private CodeService service;
 
@@ -119,6 +123,16 @@ public class BaseController {
 		System.out.println("sql=12");
 		//System.out.println(params.get("sql").toString());
 		
+		//기안자 GW ID 받아오기
+		try {
+			//params.put("gwData", JSPUtil.fixNull(service.memberNewOne(params)));
+			Map<String, Object> tmap = (Map<String, Object>) JSPUtil.fixNull(memberService.memberNewOne(params));
+			params.put("gwId", tmap.get("MEMBER_ITEM_F6").toString());
+			
+		}catch(Exception ex) {
+			ex.printStackTrace();
+		}
+		
 		if(pageAction.indexOf("Paging") != -1){
 			//*Paging*.do 가 호출될 경우 페이징 기본값 셋팅
 			params.put("pageStart", cri.getPageStart());

src/main/java/seed/com/gtm/base/GwBaseController.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import egovframework.rte.psl.dataaccess.util.EgovMap;
+import seed.com.gtm.join.MemberJoinService;
 import seed.com.gtm.service.BaseService;
 import seed.com.gtm.util.Criteria;
 import seed.com.gtm.util.JSONView;
@@ -47,11 +48,14 @@ public class GwBaseController {
 	private SeedFileService fileService;*
 	*/
 
+	@Autowired
+	private MemberJoinService memberService;
+	
 	@Autowired
 	private BaseService bservice;
 	
 	///gtm/case/nanum/ajax/SanctnhistoryIns.do
-	@RequestMapping(value = "/gtm/case/{pageName}/{pageAction}.do")
+	@RequestMapping(value = "/gtm/newcase/{pageName}/{pageAction}.do")
 	public ModelAndView getManagerNewPage(HttpServletRequest request,
 			HttpSession session, Map<String, Object> map,
 			Criteria cri,			
@@ -66,6 +70,10 @@ public class GwBaseController {
 			return new ModelAndView("redirect:/gtm/login.do");
 		}
 		
+		System.out.println("memberId");
+		System.out.println(memberId);
+		System.out.println(memberId);
+		
 		EgovMap params;
 		request.setCharacterEncoding("UTF-8");
 		ModelAndView mav = new ModelAndView();
@@ -144,6 +152,17 @@ public class GwBaseController {
 		
 		if ("SanctnhistoryInsNew".equals(pageAction)) {	//gw 보고서 팝업 띄우기
 			
+			//기안자 GW ID 받아오기
+			//params.put("sql", "join.selectNewOne");
+			try {
+				//params.put("gwData", JSPUtil.fixNull(service.memberNewOne(params)));
+				Map<String, Object> tmap = (Map<String, Object>) JSPUtil.fixNull(memberService.memberNewOne(params));
+				params.put("gwId", tmap.get("MEMBER_ITEM_F6").toString());
+				
+			}catch(Exception ex) {
+				ex.printStackTrace();
+			}
+			
 			try {
 				s_jobID	=	params.get("jobID").toString();	
 			}catch(Exception ex) {

src/main/java/seed/com/gtm/dao/MemberJoinDao.java

@@ -12,6 +12,7 @@ public interface MemberJoinDao {
 	public int checkId(@RequestParam Map<String,Object> paramMap);
 	public List<Map<String,Object>> memberList(@RequestParam Map<String,Object> paramMap);
 	public int listCnt(@RequestParam Map<String,Object> paramMap);
+	public Map<String,Object> memberNewOne(@RequestParam Map<String,Object> paramMap);
 	public Map<String,Object> memberOne(@RequestParam Map<String,Object> paramMap);
 	public void memberUpdate(@RequestParam Map<String,Object> paramMap);
 	public void memberDel(@RequestParam Map<String,Object> paramMap);

src/main/java/seed/com/gtm/dao/MemberJoinDaoImpl.java

@@ -44,6 +44,11 @@ public class MemberJoinDaoImpl implements MemberJoinDao {
 		return sqlSession.selectOne("join.selectCnt",paramMap);
 	}
 
+	@Override
+	public Map<String, Object> memberNewOne(Map<String, Object> paramMap) {
+		return sqlSession.selectOne("join.selectNewOne", paramMap);
+	}
+	
 	@Override
 	public Map<String, Object> memberOne(Map<String, Object> paramMap) {
 		return sqlSession.selectOne("join.selectOne", paramMap);

src/main/java/seed/com/gtm/join/MemberJoinController.java

@@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import seed.com.gtm.util.PageMaker;
 import seed.com.gtm.util.Criteria;
+import seed.com.gtm.util.PageMaker;
 import seed.utils.SeedUtils;
 
 @Controller
@@ -243,7 +243,7 @@ public class MemberJoinController {
 		String joinBirth = joinBirthY+joinBirthM+joinBirthD;
 		paramMap.put("joinBirth", joinBirth);
 		
-		//성별은 MEMBER_ITEM_B2, 등급은 MEMBER_ITEM_C3, 비고 MEMBER_ITEM_D4
+		//성별은 MEMBER_ITEM_B2, 등급은 MEMBER_ITEM_C3, 비고 MEMBER_ITEM_D4, G/W 아이디 MEMBER_ITEM_F6(기안문 연동에 필요)
 	
 		service.memberUpdate(paramMap);
 		

src/main/java/seed/com/gtm/join/MemberJoinService.java

@@ -38,6 +38,10 @@ public class MemberJoinService {
 		return dao.listCnt(paramMap);
 	}
 	
+	public Map<String, Object> memberNewOne(@RequestParam Map<String,Object> paramMap){
+		return dao.memberNewOne(paramMap);
+	}
+		
 	public Map<String, Object> memberOne(@RequestParam Map<String,Object> paramMap){
 		return dao.memberOne(paramMap);
 	}

src/main/resources/egovframework/sqlmap/config/mappers/join/join_sql.xml

@@ -222,6 +222,12 @@
 		WHERE MEMBER_IDX = #{memberSeq}		  
 	</select>
 	
+	<select id="selectNewOne" parameterType="java.util.HashMap" resultType="java.util.HashMap">
+		SELECT *
+	    FROM T_MEMBER
+		WHERE MEMBER_ID = #{memberId}		  
+	</select>
+	
 	<update id="update" parameterType="java.util.HashMap">
 		UPDATE T_MEMBER
 		SET MEMBER_ADDRESS1 = #{joinAddr01},
@@ -239,6 +245,9 @@
 			MEMBER_ITEM_B2 = #{joinGender},
 			MEMBER_ITEM_C3 = #{joinClass},
 			MEMBER_ITEM_D4 = #{editorParam_joinCont},
+			
+			MEMBER_ITEM_F6 = #{gwId},
+			
 			MEMBER_MODDATE = SYSDATE,
 			MEMBER_NAME = #{joinName},
 			MEMBER_POST = #{joinZip},

src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/edit.jsp

@@ -64,6 +64,12 @@
 							<input type="text" name="joinName" id="joinName" value="${memberInfo.MEMBER_NAME }" style="width: 30%" maxlength="20"> 
 						</div>
 					</div>
+					<div class="bbs-view-item">
+						<p class="item-title"><span style="color: red">*</span> G/W아이디(기안문연동에 필요)</p>
+						<div class="item-box">
+							<input type="text" name="gwId" id="gwId" value="${memberInfo.MEMBER_ITEM_F6 }" style="width: 30%" maxlength="20"> 
+						</div>
+					</div>
 					<div class="bbs-view-item">
 						<p class="item-title"><span style="color: red">*</span> 생년월일</p>
 						<div class="item-box input_box">

src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp

@@ -2059,6 +2059,9 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
 				
 				XHR(url, param, function(r){
 
+					if (!r.gwId){
+						alert('G/W 연동 기안문 작성을 위해서는 G/W아이디가 필요합니다.\n담당자 관리 개인정보 수정 화면에서 G/W아이디를 넣어주세요! ');
+					}else {
 						$("#nanumViewFrm #compSeqView").val('1000');
 						$("#nanumViewFrm #approKeyView").val(r.data2.docId);
 						//$("#approKeyView").val('H20241120063050');
@@ -2068,8 +2071,9 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
 						$("#nanumViewFrm #modView").val('w');										//작성 고정
 						
 						//$("#approKeyImsi").val(r.data2.docId);	//외부시스템 연동키					외부시스템 연동키
-					$("#nanumViewFrm #loginIdView").val('test04');							//그룹웨어로그인아이디
+						//$("#nanumViewFrm #loginIdView").val('test04');							//그룹웨어로그인아이디
-					$("#nanumViewFrm #loginIdView").val('admin');							//그룹웨어로그인아이디
+						//$("#nanumViewFrm #loginIdView").val('admin');							//그룹웨어로그인아이디
+						$("#nanumViewFrm #loginIdView").val(r.gwId);							//그룹웨어로그인아이디
 
 						$("#nanumViewFrm #subjectStrView").val(r.title);							//그룹웨어로그인아이디
 						$("#nanumViewFrm #contentsStrView").val(r.contents);	
@@ -2081,6 +2085,8 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
 						f.action = $("#nanumViewFrm #gwCallUrlView").val();
 						f.target = "_blank";
 						f.submit();						
+					}
+
 
 					location.reload();
 
@@ -2227,6 +2233,9 @@ function nanumProcessCall(codeNo){
 		//
 		//https://gw.kofair.or.kr/gw/outProcessLogOn.do?compSeq=1000&approKey=H20241120063050&formId=336&loginId=test04&fileKey=&mod=V
 
+		if (!r.gwId){
+			alert('G/W 연동 기안문 작성을 위해서는 G/W아이디가 필요합니다.\n담당자 관리 개인정보 수정 화면에서 G/W아이디를 넣어주세요! ');
+		}else {
 			$("#compSeqView").val('1000');
 			$("#approKeyView").val(r.data.docId);
 			//$("#approKeyView").val('H20241120063050');
@@ -2236,8 +2245,9 @@ function nanumProcessCall(codeNo){
 			$("#modView").val('v');										//작성 고정
 			
 			//$("#approKeyImsi").val(r.data2.docId);	//외부시스템 연동키					외부시스템 연동키
-		$("#loginIdView").val('test04');							//그룹웨어로그인아이디
+			//$("#loginIdView").val('test04');							//그룹웨어로그인아이디
-		$("#loginIdView").val('admin');							//그룹웨어로그인아이디
+			//$("#loginIdView").val('admin');							//그룹웨어로그인아이디
+			$("#loginIdView").val(r.gwId);							//그룹웨어로그인아이디
 			
 			//$("#subjectStrImsi").val(r.title);							//그룹웨어로그인아이디
 			//$("#contentsStrImsi").val(r.contents);													//그룹웨어로그인아이디
@@ -2246,6 +2256,9 @@ function nanumProcessCall(codeNo){
 			f.action = $("#gwCallUrlView").val();
 			f.target = "_blank";
 			f.submit();			
+		}
+				
+		location.reload();
 		
 	});
 

src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp

@@ -2600,6 +2600,38 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
 				
 				XHR(url, param, function(r){
 
+					if (!r.gwId){
+						alert('G/W 연동 기안문 작성을 위해서는 G/W아이디가 필요합니다.\n담당자 관리 개인정보 수정 화면에서 G/W아이디를 넣어주세요! ');
+					}else {
+						$("#nanumViewFrm #compSeqView").val('1000');
+						$("#nanumViewFrm #approKeyView").val(r.data2.docId);
+						//$("#approKeyView").val('H20241120063050');
+						
+						//$("#docIdImsi").val(r.data.docId);
+						$("#nanumViewFrm #formIdView").val('336');
+						$("#nanumViewFrm #modView").val('w');										//작성 고정
+						
+						//$("#approKeyImsi").val(r.data2.docId);	//외부시스템 연동키					외부시스템 연동키
+						//$("#nanumViewFrm #loginIdView").val('test04');							//그룹웨어로그인아이디
+						//$("#nanumViewFrm #loginIdView").val('admin');							//그룹웨어로그인아이디
+						$("#nanumViewFrm #loginIdView").val(r.gwId);							//그룹웨어로그인아이디
+
+						$("#nanumViewFrm #subjectStrView").val(r.title);							//그룹웨어로그인아이디
+						$("#nanumViewFrm #contentsStrView").val(r.contents);		
+						
+						//$("#subjectStrImsi").val(r.title);							//그룹웨어로그인아이디
+						//$("#contentsStrImsi").val(r.contents);													//그룹웨어로그인아이디
+						
+						var f = document.nanumViewFrm;
+						f.action = $("#nanumViewFrm #gwCallUrlView").val();
+						f.target = "_blank";
+						f.submit();
+						
+					}
+
+					location.reload();
+
+					/*					
 					$("#nanumViewFrm #compSeqView").val('1000');
 					$("#nanumViewFrm #approKeyView").val(r.data2.docId);
 					//$("#approKeyView").val('H20241120063050');
@@ -2623,7 +2655,8 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
 					f.target = "_blank";
 					f.submit();
 
-					location.reload();
+					
+					*/
 
 					/*
 					$("#docID").val(r.selectKey.docId);
@@ -2757,6 +2790,9 @@ function nanumProcessCall(codeNo){
 		f.submit();
 		*/
 
+		if (!r.gwId){
+			alert('G/W 연동 기안문 작성을 위해서는 G/W아이디가 필요합니다.\n담당자 관리 개인정보 수정 화면에서 G/W아이디를 넣어주세요! ');
+		}else {
 			$("#compSeqView").val('1000');
 			$("#approKeyView").val(r.data.docId);
 			//$("#approKeyView").val('H20241120063050');
@@ -2766,8 +2802,9 @@ function nanumProcessCall(codeNo){
 			$("#modView").val('v');										//작성 고정
 			
 			//$("#approKeyImsi").val(r.data2.docId);	//외부시스템 연동키					외부시스템 연동키
-		$("#loginIdView").val('test04');							//그룹웨어로그인아이디
+			//$("#loginIdView").val('test04');							//그룹웨어로그인아이디
-		$("#loginIdView").val('admin');							//그룹웨어로그인아이디
+			//$("#loginIdView").val('admin');							//그룹웨어로그인아이디
+			$("#loginIdView").val(r.gwId);							//그룹웨어로그인아이디
 			
 			//$("#subjectStrImsi").val(r.title);							//그룹웨어로그인아이디
 			//$("#contentsStrImsi").val(r.contents);													//그룹웨어로그인아이디
@@ -2776,6 +2813,9 @@ function nanumProcessCall(codeNo){
 			f.action = $("#gwCallUrlView").val();
 			f.target = "_blank";
 			f.submit();
+		}
+
+		location.reload();
 		
 	});
 

src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp

@@ -3444,9 +3444,39 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
 				$("#typeNanum").val("S");
 				$("#nanumCaseGubun").val('${masterData.caseGubun}');
 				var param = jQuery('#nanumFrm').serialize();
-				url = "/gtm/case/ajax/SanctnhistoryInsNew.do";
+				//url = "/gtm/case/ajax/SanctnhistoryInsNew.do";
+				url = "/gtm/newcase/ajax/SanctnhistoryInsNew.do";
 				
 				XHR2(url, param, function(r){	//C_SANCTNHISTORY 에 데이터 생성
+
+					if (!r.gwId){
+						alert('G/W 연동 기안문 작성을 위해서는 G/W아이디가 필요합니다.\n담당자 관리 개인정보 수정 화면에서 G/W아이디를 넣어주세요! ');
+					}else {
+						$("#nanumViewFrm #compSeqView").val('1000');
+						$("#nanumViewFrm #approKeyView").val(r.data2.docId);
+						//$("#approKeyView").val('H20241120063050');
+						
+						//$("#docIdImsi").val(r.data.docId);
+						$("#nanumViewFrm #formIdView").val('336');
+						$("#nanumViewFrm #modView").val('w');										//작성 고정
+						
+						//$("#approKeyImsi").val(r.data2.docId);	//외부시스템 연동키					외부시스템 연동키
+						//$("#nanumViewFrm #loginIdView").val('test04');							//그룹웨어로그인아이디
+						//$("#nanumViewFrm #loginIdView").val('admin');							//그룹웨어로그인아이디
+						$("#nanumViewFrm #loginIdView").val(r.gwId);							//그룹웨어로그인아이디
+
+						$("#nanumViewFrm #subjectStrView").val(r.title);							//그룹웨어로그인아이디
+						$("#nanumViewFrm #contentsStrView").val(r.contents);	
+						
+						//$("#subjectStrImsi").val(r.title);							//그룹웨어로그인아이디
+						//$("#contentsStrImsi").val(r.contents);													//그룹웨어로그인아이디
+						
+						var f = document.nanumViewFrm;
+						f.action = $("#nanumViewFrm #gwCallUrlView").val();
+						f.target = "_blank";
+						f.submit();
+						
+					}
 					//$("#compSeqImsi").val('1000');				//더존 회사번호						X
 					//$("#deptSeqImsi").val('1200');				//더존 부서번호						X
 					//$("#formIdImsi").val('231');				//그룹웨어 양식코드					그룹웨어 양식코드
@@ -3466,28 +3496,7 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
 					f.submit();
 					*/
 
-					$("#nanumViewFrm #compSeqView").val('1000');
-					$("#nanumViewFrm #approKeyView").val(r.data2.docId);
-					//$("#approKeyView").val('H20241120063050');
 
-					//$("#docIdImsi").val(r.data.docId);
-					$("#nanumViewFrm #formIdView").val('336');
-					$("#nanumViewFrm #modView").val('w');										//작성 고정
-					
-					//$("#approKeyImsi").val(r.data2.docId);	//외부시스템 연동키					외부시스템 연동키
-					$("#nanumViewFrm #loginIdView").val('test04');							//그룹웨어로그인아이디
-					$("#nanumViewFrm #loginIdView").val('admin');							//그룹웨어로그인아이디
-
-					$("#nanumViewFrm #subjectStrView").val(r.title);							//그룹웨어로그인아이디
-					$("#nanumViewFrm #contentsStrView").val(r.contents);	
-					
-					//$("#subjectStrImsi").val(r.title);							//그룹웨어로그인아이디
-					//$("#contentsStrImsi").val(r.contents);													//그룹웨어로그인아이디
-					
-					var f = document.nanumViewFrm;
-					f.action = $("#nanumViewFrm #gwCallUrlView").val();
-					f.target = "_blank";
-					f.submit();
 
 					location.reload();
 					
@@ -3709,19 +3718,19 @@ function nanumProcessCall(codeNo){
 		/* $("#doc").val(r.data.docId);
 		$("#docID").val(r.data.docId); */
 
-		//
+		if (!r.gwId){
-		//https://gw.kofair.or.kr/gw/outProcessLogOn.do?compSeq=1000&approKey=H20241120063050&formId=336&loginId=test04&fileKey=&mod=V
+			alert('G/W 연동 기안문 작성을 위해서는 G/W아이디가 필요합니다.\n담당자 관리 개인정보 수정 화면에서 G/W아이디를 넣어주세요! ');
-
+		}else {
 			$("#compSeqView").val('1000');
 			$("#approKeyView").val(r.data.docId);
 			//$("#approKeyView").val('H20241120063050');
 			
 			//$("#docIdImsi").val(r.data.docId);
-		$("#formIdView").val('336');
+			//$("#formIdView").val('336');
 			$("#modView").val('v');										//작성 고정
 			
 			//$("#approKeyImsi").val(r.data2.docId);	//외부시스템 연동키					외부시스템 연동키
-		$("#loginIdView").val('test04');							//그룹웨어로그인아이디
+			$("#loginIdView").val(r.gwId);							//그룹웨어로그인아이디
 			
 			//$("#subjectStrImsi").val(r.title);							//그룹웨어로그인아이디
 			//$("#contentsStrImsi").val(r.contents);													//그룹웨어로그인아이디
@@ -3731,6 +3740,15 @@ function nanumProcessCall(codeNo){
 			f.target = "_blank";
 			f.submit();
 			
+		}
+
+		location.reload();
+		
+		//
+		//https://gw.kofair.or.kr/gw/outProcessLogOn.do?compSeq=1000&approKey=H20241120063050&formId=336&loginId=test04&fileKey=&mod=V
+
+
+		
 /*
 		var f = document.nanumFrm;
 		f.target = "_blank";