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

Merge branch 'tolag'

Browse Source
This commit is contained in:
leejunho 2023-07-25 17:29:24 +09:00
commit 6f51ee7bb2
9 changed files with 94 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java
View File

@ -45,6 +45,7 @@ import kcc.com.cmm.util.IpUtil;
import kcc.com.cmm.util.MagicDBAPIUtil;
import kcc.com.cmm.util.SequenceUtil;
import kcc.com.cmm.util.StringUtil;
import kcc.com.cmm.util.StringUtil2;
import kcc.com.utl.fcc.service.EgovStringUtil;
import kcc.com.utl.user.service.CheckAdrProcessUtil;
import kcc.com.utl.user.service.CheckFileUtil;
@ -322,14 +323,18 @@ public class ApmController {
}
//담당사건만 보기 여부 - 기본 : 전체 조회 / ROLE_ADR_ADMIN 권한에 조정조사관 or 조정팀장은 기본 : 담당사건만 조회
if(StringUtil2.isEmpty(cmmVO.getSearchLoginId())) {
if("ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) {
cmmVO.setSearchEachAdrAdminYn("Y");
cmmVO.setSearchLoginId(userId);
if("".equals(cmmVO.getSearchEachAdrAdminYn()) && "ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) {
}
}else {
if(!"all".equals(cmmVO.getSearchLoginId())){
cmmVO.setSearchEachAdrAdminYn("Y");
}
//조정조사관 or 조정팀장일 경우 담당사거만 보기 라이도 버튼 여부 Y
if("ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) {
cmmVO.setSearchEachAdrAdminBtnYn("Y");
}
// cmmVO.setSearchEachAdrAdminYn("Y");
/** paging */
PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(cmmVO.getPageIndex());
@ -359,6 +364,8 @@ public class ApmController {
}
}
//조정조사관 리스트
model.addAttribute("adrAdminList", cmmService.selectPgrCmmAdrAdminList());
return "/kccadr/adjPgrMgr/apm/apmList";
}

3
src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmService.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import java.util.Map;
import kcc.kccadr.adjPgrMgr.arm.service.CmntVO;
import kcc.let.uss.umt.service.UserManageVO;
public interface PgrCmmService {
@ -74,4 +75,6 @@ public interface PgrCmmService {
int updateEntBeforeDtbAdrAdminReg(PgrCmmVO pgrCmmVO) throws Exception;
public List<PgrCmmVO> selectPgrCmmListForExcel(PgrCmmVO pgrCmmVO) throws Exception;
List<UserManageVO> selectPgrCmmAdrAdminList() throws Exception;
}

11
src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java
View File

@ -269,9 +269,6 @@ public class PgrCmmVO implements Serializable {
private String searchLoginId ; // 본인 ID
private String searchEachAdrAdminBtnYn = ""; // 담당사건민 보기 버튼 노출 여부
public String getAdrAdmId() {
return adrAdmId;
}
@ -1657,14 +1654,6 @@ public class PgrCmmVO implements Serializable {
this.searchEachAdrAdminYn = searchEachAdrAdminYn;
}
public String getSearchEachAdrAdminBtnYn() {
return searchEachAdrAdminBtnYn;
}
public void setSearchEachAdrAdminBtnYn(String searchEachAdrAdminBtnYn) {
this.searchEachAdrAdminBtnYn = searchEachAdrAdminBtnYn;
}
public String getSearchLoginId() {
return searchLoginId;
}

5
src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmDAO.java
View File

@ -9,6 +9,7 @@ import egovframework.rte.psl.dataaccess.EgovAbstractDAO;
import kcc.kccadr.adjPgrMgr.arm.service.CmntVO;
import kcc.kccadr.adjPgrMgr.cmm.service.CloseVO;
import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO;
import kcc.let.uss.umt.service.UserManageVO;
@Repository("PgrCmmDAO")
public class PgrCmmDAO extends EgovAbstractDAO {
@ -117,4 +118,8 @@ public class PgrCmmDAO extends EgovAbstractDAO {
return (Integer) update("Cmm.updateEntBeforeDtbAdrAdminReg",pgrCmmVO);
}
public List<UserManageVO> selectPgrCmmAdrAdminList() throws Exception {
return (List<UserManageVO>) list("Cmm.selectPgrCmmAdrAdminList");
}
}

5
src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java
View File

@ -22,6 +22,7 @@ import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO;
import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO;
import kcc.kccadr.cmm.KccadrConstants;
import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService;
import kcc.let.uss.umt.service.UserManageVO;
import kcc.let.utl.fcc.service.EgovCryptoUtil;
@Repository("pgrCmmService")
@ -572,5 +573,9 @@ public class PgrCmmServiceImpl implements PgrCmmService {
return (Integer) pgrCmmDAO.updateEntBeforeDtbAdrAdminReg(pgrCmmVO);
}
@Override
public List<UserManageVO> selectPgrCmmAdrAdminList() throws Exception {
return pgrCmmDAO.selectPgrCmmAdrAdminList();
}
}

25
src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java
View File

@ -34,6 +34,7 @@ import egovframework.rte.fdl.string.EgovStringUtil;
import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
import kcc.com.cmm.LoginVO;
import kcc.com.cmm.util.StringUtil;
import kcc.com.cmm.util.StringUtil2;
import kcc.kccadr.accdnt.ars.service.AdjstReqStatusService;
import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO;
import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService;
@ -131,14 +132,26 @@ public class AdjClsMgrController {
//조정조사관, 조정팀장일 시 조정조사관 조회 구분 추가
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null;
String userId = loginVO == null ? "" : loginVO.getUniqId().toString().trim();
commandMap.put("searchLoginId", userId);
// commandMap.put("searchLoginId", userId);
//
// if(("".equals(commandMap.get("searchEachAdrAdminYn")) || commandMap.get("searchEachAdrAdminYn") == null)&& "ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) {
// commandMap.put("searchEachAdrAdminYn", "Y");
// }
//
// if("ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) {
// commandMap.put("searchEachAdrAdminBtnYn", "Y");
// }
if(("".equals(commandMap.get("searchEachAdrAdminYn")) || commandMap.get("searchEachAdrAdminYn") == null)&& "ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) {
//담당사건만 보기 여부 - 기본 : 전체 조회 / ROLE_ADR_ADMIN 권한에 조정조사관 or 조정팀장은 기본 : 담당사건만 조회
if(StringUtil2.isEmpty((String)commandMap.get("searchLoginId"))) {
if("ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) {
commandMap.put("searchEachAdrAdminYn", "Y");
commandMap.put("searchLoginId", userId);
}
}else {
if(!"all".equals((String)commandMap.get("searchLoginId"))){
commandMap.put("searchEachAdrAdminYn", "Y");
}
if("ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) {
commandMap.put("searchEachAdrAdminBtnYn", "Y");
}
@ -205,6 +218,8 @@ public class AdjClsMgrController {
model.addAttribute("commandMap", commandMap);
model.addAttribute("totalRecordCount", totalRecordCount);
//조정조사관 리스트
model.addAttribute("adrAdminList", cmmService.selectPgrCmmAdrAdminList());
}catch(Exception ex) {
ex.printStackTrace();
}

18
src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml
View File

@ -69,6 +69,9 @@
<isEqual property="searchCondition" compareValue="40" prepend="AND">
DM.MEM_DEPT_NM LIKE '%'||TRIM(#searchKeyword#)||'%'
</isEqual>
<isEqual property="searchCondition" compareValue="50" prepend="AND">
AU.USER_NM LIKE '%'||TRIM(#searchKeyword#)||'%'
</isEqual>
</isNotEmpty>
</isNotEmpty>
@ -1644,5 +1647,20 @@
</isEqual>
</select>
<select id="Cmm.selectPgrCmmAdrAdminList" resultClass="kcc.let.uss.umt.service.UserManageVO">
SELECT t1.esntl_id AS esntlId,
t1.user_nm AS userNm,
t1.emplyr_id AS emplyrId,
t2.author_code AS authorCode
FROM lettnemplyrinfo t1
LEFT JOIN lettnemplyrscrtyestbs t2
ON t1.esntl_id = t2.scrty_dtrmn_trget_id
WHERE t2.author_code = 'ROLE_ADR_ADMIN'
AND t1.ofcps_nm IN ('10',
'20')
</select>
</sqlMap>

16
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmList.jsp
View File

@ -167,6 +167,7 @@
<option value='20' <c:if test="${cmmVO.searchCondition == '20'}">selected</c:if>>신청인</option>
<option value='30' <c:if test="${cmmVO.searchCondition == '30'}">selected</c:if>>신청내용</option>
<option value='40' <c:if test="${cmmVO.searchCondition == '40'}">selected</c:if>>조정부</option>
<option value='50' <c:if test="${cmmVO.searchCondition == '50'}">selected</c:if>>조정조사관</option>
</select>
<%-- <kc:select codeId="CC005" name="srcDlvSts" id="srcDlvSts" defaultText="전체" defaultValue="" /> --%>
<input type="text" class="search_input" id="searchKeyword" name="searchKeyword" value="<c:out value='${cmmVO.searchKeyword}'/>" placeholder="검색어를 입력하세요.">
@ -212,9 +213,10 @@
</span>
</div>
</li>
<li <c:if test="${cmmVO.searchEachAdrAdminBtnYn ne 'Y' }">style="display:none;"</c:if>>
<p class="tit_text">조정조사관 조회 구분</p>
<div class="radio_wrap">
<%-- <li <c:if test="${cmmVO.searchEachAdrAdminBtnYn ne 'Y' }">style="display:none;"</c:if>> --%>
<li>
<p class="tit_text">조정조사관 조회</p>
<%-- <div class="radio_wrap">
<span>
<input ${cmmVO.searchEachAdrAdminYn eq 'Y' ? 'checked=\"checked\"' : ''} value="Y" type="radio" name="searchEachAdrAdminYn" id="searchEachAdrAdminYn1">
<label for="searchEachAdrAdminYn1">담당사건만 보기</label>
@ -223,7 +225,13 @@
<input ${cmmVO.searchEachAdrAdminYn eq 'N' ? 'checked=\"checked\"' : ''} value="N" type="radio" name="searchEachAdrAdminYn" id="searchEachAdrAdminYn2">
<label for="searchEachAdrAdminYn2">전체 보기</label>
</span>
</div>
</div> --%>
<select name="searchLoginId" id="searchLoginId" title="선택" style="width: 250px;">
<option value='all' <c:if test="${cmmVO.searchLoginId == 'all'}">selected</c:if>>전체</option>
<c:forEach var="list" items="${adrAdminList}" varStatus="status">
<option value='${list.esntlId}' <c:if test="${cmmVO.searchLoginId == list.esntlId}">selected</c:if>><c:out value="${list.userNm}"/></option>
</c:forEach>
</select>
</li>
<li>
<p class="tit_text">신청일자</p>

20
src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp
View File

@ -41,7 +41,7 @@
listForm.q.value = q1 ;
listForm.searchCondition.value = form.searchCondition.value;
listForm.searchCondition2.value = getCheckboxValue();
listForm.searchEachAdrAdminYn.value = form.searchEachAdrAdminYn.value;
listForm.searchLoginId.value = form.searchLoginId.value;
listForm.action = "<c:url value='/kccadr/adjclsmgr/adjCloseMangeList.do'/>";
listForm.submit();
}
@ -95,7 +95,7 @@
<%-- <input type="hidden" name="searchStatus" value="<c:out value="${adjClsMgrVO.searchStatus}" />" /> --%>
<input type="hidden" name="adrSeq" value="" />
<input type="hidden" name="adrSn" value="" />
<input type="hidden" name="searchEachAdrAdminYn" value="<c:out value="${commandMap.searchEachAdrAdminYn}" />" />
<input type="hidden" name="searchLoginId" value="<c:out value="${commandMap.searchLoginId}" />" />
</form>
<form:form id="form" name="form" commandName="adjClsMgrVO" onsubmit="return false;" method="post">
<!-- cont -->
@ -130,6 +130,7 @@
<option value="" <c:if test="${empty commandMap.searchCondition}">selected="selected"</c:if>>전체</option>
<option value="adrNo" <c:if test="${commandMap.searchCondition eq 'adrNo'}">selected="selected"</c:if>>조정번호</option>
<option value="appliCantNm" <c:if test="${commandMap.searchCondition eq 'appliCantNm'}">selected="selected"</c:if>>신청인</option>
<option value="adrAdmNm" <c:if test="${commandMap.searchCondition eq 'adrAdmNm'}">selected="selected"</c:if>>조정조사관</option>
</select>
<input type="text" id="q1" name="q1" value="<c:out value="${commandMap.q }" />" onkeyup="if(window.event.keyCode==13){fncGoList()}"/>
<button class="btn_search" onclick="fncGoList(); return false;">검색</button>
@ -161,9 +162,10 @@
</div>
</li>
<li <c:if test="${commandMap.searchEachAdrAdminBtnYn ne 'Y' }">style="display:none;"</c:if>>
<p class="tit_text">조정조사관 조회 구분</p>
<div class="radio_wrap">
<%-- <li <c:if test="${commandMap.searchEachAdrAdminBtnYn ne 'Y' }">style="display:none;"</c:if>> --%>
<li>
<p class="tit_text">조정조사관 조회</p>
<%-- <div class="radio_wrap">
<span>
<input ${commandMap.searchEachAdrAdminYn eq 'Y' ? 'checked=\"checked\"' : ''} value="Y" type="radio" name="searchEachAdrAdminYn" id="searchEachAdrAdminYn1">
<label for="searchEachAdrAdminYn1">담당사건만 보기</label>
@ -172,7 +174,13 @@
<input ${commandMap.searchEachAdrAdminYn eq 'N' ? 'checked=\"checked\"' : ''} value="N" type="radio" name="searchEachAdrAdminYn" id="searchEachAdrAdminYn2">
<label for="searchEachAdrAdminYn2">전체 보기</label>
</span>
</div>
</div> --%>
<select name="searchLoginId" id="searchLoginId" title="선택" style="width: 250px;">
<option value='all' <c:if test="${commandMap.searchLoginId == 'all'}">selected</c:if>>전체</option>
<c:forEach var="list" items="${adrAdminList}" varStatus="status">
<option value='${list.esntlId}' <c:if test="${commandMap.searchLoginId == list.esntlId}">selected</c:if>><c:out value="${list.userNm}"/></option>
</c:forEach>
</select>
</li>
</ul>