Merge branch 'master' of http://dudgusw@vcs.iten.co.kr:9999/hylee/mjon_git
This commit is contained in:
commit
21da18aa0b
@ -8,6 +8,7 @@ import javax.annotation.Resource;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
|
||||
import egovframework.rte.fdl.idgnr.EgovIdGnrService;
|
||||
import itn.let.mjo.msgagent.service.MjonMsgAgentStsService;
|
||||
import itn.let.mjo.msgagent.service.MjonMsgAgentStsVO;
|
||||
import itn.let.uat.uia.service.impl.MberManageDAO;
|
||||
@ -26,6 +27,10 @@ public class MjonMsgAgentStsServiceImpl extends EgovAbstractServiceImpl implemen
|
||||
@Resource(name = "mjonMsgAgentStsService")
|
||||
private MjonMsgAgentStsService mjonMsgAgentStsService;
|
||||
|
||||
/** 메모 idgen */
|
||||
@Resource(name="egovGnrlUserSelectMemoIdGnrService")
|
||||
private EgovIdGnrService memoidgenService;
|
||||
|
||||
@Override
|
||||
public List<MjonMsgAgentStsVO> selectMjonMsgAgentStsList() throws Exception{
|
||||
return mjonMsgAgentStsDAO.selectMjonMsgAgentStsList();
|
||||
@ -174,6 +179,14 @@ public class MjonMsgAgentStsServiceImpl extends EgovAbstractServiceImpl implemen
|
||||
// B선라인 일경우 회원테이블 업데이트
|
||||
int uCnt = mberManageDAO.updateUserBlineCodeByAdm(mberManageVO);
|
||||
|
||||
//보내는 아이디 회원 메모 insert
|
||||
String memo = "";
|
||||
memo = "전용전송사 변경 : " + mberManageVO.getHotlineAgentName() + "(" + mberManageVO.getHotlineAgentCode() + ")";
|
||||
mberManageVO.setMemoId(memoidgenService.getNextStringId());
|
||||
mberManageVO.setMberId(mberManageVO.getMberId());
|
||||
mberManageVO.setMemoCn(memo);
|
||||
mberManageVO.setFrstRegisterId(mberManageVO.getAdmUserId());
|
||||
mberManageDAO.insertMberMemo(mberManageVO);
|
||||
} catch (Exception e) {
|
||||
System.out.println("+++++++++++ updateMberHotlineAgentCodeInfo Service Imple Error!!! " + e);
|
||||
}
|
||||
|
||||
@ -490,7 +490,21 @@ public class MberManageVO extends UserDefaultVO{
|
||||
private String exceptSpamYn; //스팸 필터링 예외 처리 여부
|
||||
|
||||
private String hotlineAgentCode; //회원 전용 전송사 코드 정보
|
||||
private String hotlineAgentName; //회원 전용 전송사 명
|
||||
private String admUserId; //관리자아이디
|
||||
|
||||
public String getAdmUserId() {
|
||||
return admUserId;
|
||||
}
|
||||
public void setAdmUserId(String admUserId) {
|
||||
this.admUserId = admUserId;
|
||||
}
|
||||
public String getHotlineAgentName() {
|
||||
return hotlineAgentName;
|
||||
}
|
||||
public void setHotlineAgentName(String hotlineAgentName) {
|
||||
this.hotlineAgentName = hotlineAgentName;
|
||||
}
|
||||
private String blineCode; // B라인코드
|
||||
private String recommendId; // 추천아이디
|
||||
|
||||
|
||||
@ -2467,6 +2467,9 @@ public class EgovUserManageController {
|
||||
msg = "로그인이 필요합니다.";
|
||||
}
|
||||
else {
|
||||
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
|
||||
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
|
||||
mberManageVO.setAdmUserId(userId);
|
||||
int result = mjonMsgAgentStsService.updateMberHotlineAgentCodeInfo(mberManageVO);
|
||||
|
||||
if(result > 0) {
|
||||
|
||||
@ -1230,7 +1230,7 @@ function fnMberHotlineAgentYn(){
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: "/uss/umt/user/EgovGnrlUpdateUserHotlineAgentCodeAjax.do",
|
||||
data: {"hotlineAgentCode" : hotlineAgentCode, "mberId" : "${mberManageVO.mberId}"},
|
||||
data: {"hotlineAgentCode" : hotlineAgentCode, "mberId" : "${mberManageVO.mberId}", "hotlineAgentName" : $("select[name=hotlineAgentCode] option:selected").text()},
|
||||
dataType:'json',
|
||||
async: false,
|
||||
success: function (data, status) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user