경북대 사용자단위 연계 취합

main
jskim 2 years ago
parent ca50943d00
commit ff830d38b9
  1. 3
      src/kr/co/kihyun/beans/entity/LimitByDeadlineStrategy.java
  2. 173
      src/kr/co/kihyun/beans/totsys/doc/HttpUserSetMerge.java
  3. 116
      src/kr/co/kihyun/beans/totsys/report/ReportList.java
  4. 2
      src/kr/co/kihyun/beans/user/HttpUserDocList.java
  5. 2
      src/moumi_messages.properties
  6. 2
      src/moumi_messages_ko_KR.properties
  7. 22
      webapps/totsys/common/inc/documents/tot_doc/base_info_modify.jsp
  8. 582
      webapps/totsys/common/web/report_dept/edit_user_list2.jsp
  9. 115
      webapps/totsys/common/web/report_dept/iframe/newTreeUser.jsp
  10. 105
      webapps/totsys/common/web/report_dept/new_user_list2.jsp
  11. 14
      webapps/totsys/repoper/mydocbox/tempbox/report_list.jsp
  12. 2
      webapps/totsys/repoper/mydocbox/tempbox/report_regist.jsp
  13. 1469
      webapps/totsys/totper/mydocbox/regbox/sub_doc_regist.jsp
  14. 1469
      webapps/totsys/totper/mydocbox/regbox/sub_doc_regist_org.jsp

@ -30,7 +30,8 @@ public class LimitByDeadlineStrategy extends AcceptanceLimitStrategy {
private static final String filter =
"isDeleted == 'N' && type == TYPE_REPORT && " +
"(process == PROCESS_COMP || process == PROCESS_END || process == PROCESS_NOT) && " +
"submitDate <= tot_doc.endDate && totDoc == tot_doc";
//"submitDate <= tot_doc.endDate && totDoc == tot_doc";
"totDoc == tot_doc";
public LimitByDeadlineStrategy() {
}

@ -0,0 +1,173 @@
package kr.co.kihyun.beans.totsys.doc;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.List;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import kr.co.kihyun.beans.user.HttpSSOLogin;
import kr.co.kihyun.lang.Encoder;
import kr.co.kihyun.lang.MLong;
import kr.co.kihyun.lang.MString;
import kr.co.kihyun.text.html.ServletUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import kr.co.kihyun.db.*;
@WebServlet("/servlet/kr.co.kihyun.beans.totsys.doc.HttpUserSetMerge")
public class HttpUserSetMerge extends HttpServlet {
private static final Logger LOG = LoggerFactory.getLogger(HttpUserSetMerge.class);
@Override
public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
doPost(req, res);
}
@Override
public void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
res.setContentType("text/html;charset=UTF-8");
PrintWriter out = res.getWriter();
CommonDBManager db = new CommonDBManager();
ResultSet rs = null;
Long docID = MLong.parseLong(req.getParameter("docID"));
Long reportID = MLong.parseLong(req.getParameter("reportID"));
String usedType = MString.checkNull(req.getParameter("usedType"));
String deptIDs = Encoder.toJava(req.getParameter("deptIDs"));
String userIdsplit = deptIDs.replace(",", "','");
String types = Encoder.toJava(req.getParameter("types"));
String return_msg = "";
try {
StringBuilder sql = new StringBuilder();
sql.append(" UPDATE MOUMI_TOT_REPORT SET DEL_TYPE = 'Y' WHERE DOC_ID = '"+docID+"' \n");
System.out.println(sql.toString());
db.execUpdate(sql.toString());
// db.commit();
sql.delete(0,sql.length());
sql.append(" MERGE INTO MOUMI_TOT_REPORT AA \n")
.append(" USING \n")
.append(" ( \n")
.append(" SELECT NVL(A.ID,B.ID) AS ID, \n")
.append(" A.USER_ID, \n")
.append(" A.DEL_TYPE, A.DEPT_ID, A.NAME \n")
.append(" FROM \n")
.append(" ( \n")
.append(" SELECT A.ID, B.ID AS USER_ID, A.DEL_TYPE \n")
.append(" , B.DEPT_ID AS DEPT_ID, B.NAME AS NAME \n")
.append(" FROM MOUMI_MUSER B LEFT OUTER JOIN MOUMI_TOT_REPORT A \n")
.append(" ON A.USER_ID = B.ID \n")
.append(" AND A.DOC_ID = '"+ docID +"' \n")
.append(" WHERE 1=1 \n")
.append(" AND B.ID IN ('"+ userIdsplit +"') \n")
.append(" ) A FULL OUTER JOIN \n")
.append(" ( \n")
.append(" SELECT A.ID, A.DEPT_ID, A.DEL_TYPE \n")
.append(" FROM MOUMI_TOT_REPORT A \n")
.append(" WHERE 1=1 \n")
.append(" AND A.DOC_ID = '"+ docID +"' \n")
.append(" ) B \n")
.append(" ON A.ID = B.ID \n")
.append(" ) BB \n")
.append(" ON (AA.ID = BB.ID) \n")
.append(" WHEN NOT MATCHED THEN \n")
.append(" INSERT ( \n")
.append(" AA.ID, \n")
.append(" AA.ACPT_CODE, \n")
.append(" AA.APPRO, \n")
.append(" AA.DOC_TYPE, \n")
.append(" AA.ATTACHMENTS, \n")
.append(" AA.CURRENT_REPOADM_ID, \n")
.append(" AA.DATA, \n")
.append(" AA.DEL_TYPE, \n")
.append(" AA.DEPT_ID, \n")
.append(" AA.USER_ID, \n")
.append(" AA.NOTE, \n")
.append(" AA.NUM, \n")
.append(" AA.PRSS, \n")
.append(" AA.RECOG, \n")
.append(" AA.REG_DATE, \n")
.append(" AA.REP_DOC_ID, \n")
.append(" AA.DOWN_DOC_ID, \n")
.append(" AA.SUBMIT_DATE, \n")
.append(" AA.TABLE_NUM, \n")
.append(" AA.TOT_DATA, \n")
.append(" AA.DOC_ID, \n")
.append(" AA.TYPE, \n")
.append(" AA.MNG_CODE, \n")
.append(" AA.OWNER_EMAIL, \n")
.append(" AA.OWNER_NAME, \n")
.append(" AA.OWNER_PHONE, \n")
.append(" AA.ACPT_DOC_CODE, \n")
.append(" AA.SECU_YN, \n")
.append(" AA.ATTACHMENTS_PATH, \n")
.append(" AA.FILE_CHECK \n")
.append(" ) \n")
.append(" VALUES( \n")
.append(" SQ_MOUMI.NEXTVAL , \n")
.append(" '', \n")
.append(" 0, \n")
.append(" 0, \n")
.append(" NULL, \n")
.append(" '', \n")
.append(" null, \n")
.append(" 'N', \n")
.append(" BB.DEPT_ID, \n")
.append(" BB.USER_ID, \n")
.append(" null, \n")
.append(" '', \n")
.append(" 0, \n")
.append(" 0, \n")
.append(" SYSDATE , \n")
.append(" '', \n")
.append(" '', \n")
.append(" '', \n")
.append(" 1, \n")
.append(" null, \n")
.append(" '"+ docID +"', \n")
.append(" 0, \n")
.append(" '', \n")
.append(" '', \n")
.append(" BB.NAME, \n")
.append(" '', \n")
.append(" '', \n")
.append(" 'N', \n")
.append(" '', \n")
.append(" 'N' \n")
.append(" ) \n")
.append(" WHEN MATCHED THEN \n")
.append(" UPDATE SET AA.DEL_TYPE = 'N' WHERE BB.DEPT_ID IS NOT NULL \n");
System.out.println(sql.toString());
db.execUpdate(sql.toString());
db.commit();
return_msg = "사용자지정 변경이 완료되었습니다.";
} catch (SQLException e) {
db.rollback();
return_msg = "사용자지정 변경중 오류가 발생하였습니다.";
e.printStackTrace();
}catch(Exception e){
e.printStackTrace();
return_msg = "사용자지정 변경중 오류가 발생하였습니다.";
} finally {
db.execClose();
out.println(ServletUtil.alert(return_msg));
out.println(ServletUtil.getJavaScript("window.close();"));
}
}
}

@ -33,6 +33,7 @@ public class ReportList extends DBManager {
private List<String> deptIDList;
private List<String> deptNameList;
private List<String> userIDList;
private List<String> userNameList;
private List<Date> regDateList;
private List<String> upperNameList;
private List<String> prssList;
@ -87,6 +88,8 @@ public class ReportList extends DBManager {
listByPrss(docID, findOption, findWord, new int[] { prss }, type, recog);
} else if (prss == TotReportProcess.NOT.ordinal()) { // 재입력(재보고)상태 문서만 검색
listByPrss(docID, findOption, findWord, new int[] { prss }, type, recog);
} else if (prss == 00) { // 재입력(재보고)상태 문서만 검색
listUserByPrss(docID, findOption, findWord, new int[] { prss }, type, recog);
} else { // 보고기관 전체
listByPrss(docID, findOption, findWord, null, type, recog);
}
@ -206,6 +209,119 @@ public class ReportList extends DBManager {
execClose();
}
}
public void listUserByPrss(Long docID, String findOption, String findWord, int[] prss, int type, int recog) {
LOG.debug("prss - {}", Arrays.toString(prss).replace('[', ' ').replace(']', ' '));
StringBuilder sql = new StringBuilder(500);
ArrayList<Object> paramList = new ArrayList<Object>();
try {
sql.append(" SELECT \n");
sql.append(" GR.ID \n");
sql.append(" ,GR.NAME \n");
sql.append(" ,(SELECT NAME FROM MOUMI_DEPT WHERE ID = DT.UPPER_DEPT) \n");
sql.append(" ,DT.ID \n");
sql.append(" ,DT.NAME \n");
sql.append(" ,US.ID \n");
sql.append(" ,US.NAME \n");
sql.append(" ,RT.PRSS \n");
sql.append(" FROM \n");
sql.append(" MOUMI_TOT_DOC DC \n");
sql.append(" ,MOUMI_TOT_REPORT RT \n");
sql.append(" ,MOUMI_DEPT DT \n");
sql.append(" ,MOUMI_DEPT GR \n");
sql.append(" ,MOUMI_MUSER US \n");
sql.append(" WHERE \n");
sql.append(" DC.ID = ? AND RT.DOC_ID = DC.ID"
+ " AND RT.DEPT_ID = DT.ID"
+ " AND RT.USER_ID = US.ID"
+ " AND US.DEPT_ID = DT.ID "
+ " AND DT.ORGAN = GR.ID "
+ " AND RT.DEL_TYPE = 'N' \n");
sql.append(" ORDER BY "
+ " dt.priority, dt.upper_dept, dt.name \n");
//
// sql.append("select dt.organ, (select name from ").append(MoumiEntity.getTableName(MDept.class))
// .append(" where organ is not null and id=dt.organ and id=dt.id) partName, dt.id, dt.name, ")
// .append("(select name from ").append(MoumiEntity.getTableName(MDept.class))
// .append(" where organ is not null and id=dt.upper_dept) upper_name, ")
// .append("rt.user_id, rt.reg_date, rt.prss, rt.down_doc_id, ")
// .append("rt.type, rt.doc_type, rt.note, rt.recog \n")
// .append("from ").append(MoumiEntity.getTableName(TotReport.class)).append(" rt")
// .append(", ").append(MoumiEntity.getTableName(TotDoc.class)).append(" dc")
// .append(", ").append(MoumiEntity.getTableName(MDept.class)).append(" dt")
// .append(", ").append(MoumiEntity.getTableName(MUser.class)).append(" us");
//
// sql.append(" where dt.ORGAN is not null and rt.dept_id=dt.id and rt.doc_id=dc.id and rt.doc_id=? and (rt.del_type='0' or rt.del_type='N') ");
paramList.add(docID);
// if (recog != -1) {
// sql.append(" and rt.recog=?");
// paramList.add(recog);
// }
//
// if (prss != null && prss.length > 0) {
// sql.append(" and rt.prss in (").append(Arrays.toString(prss).replace('[', ' ').replace(']', ' ')).append(")");
// }
//
// if ("userName".equals(findOption)) {
// sql.append(" and rt.user_id=us.id");
// }
// if ("deptID".equals(findOption)) {
// sql.append(" and rt.dept_id=?");
// paramList.add(findWord);
// } else if ("deptName".equals(findOption)) {
// sql.append(" and dt.name like '%?%'");
// paramList.add(findWord);
// } else if ("partName".equals(findOption)) {
// sql.append(" and pt.name like '%?%'");
// paramList.add(findWord);
// } else if ("regDate".equals(findOption)) {
// sql.append(" and rt.reg_date='?'");
// paramList.add(findWord);
// } else if ("userName".equals(findOption)) {
// sql.append(" and us.name = sp_cm_enc_fu(?) ");
// paramList.add(findWord);
// }
// sql.append(" order by dt.priority, dt.upper_dept, dt.name");
rs = execQuery(sql.toString(), paramList.toArray());
partIDList = new ArrayList<String>();
partNameList = new ArrayList<String>();
upperNameList = new ArrayList<String>();
deptIDList = new ArrayList<String>();
deptNameList = new ArrayList<String>();
userIDList = new ArrayList<String>();
userNameList = new ArrayList<String>();
prssList = new ArrayList<String>();
while(rs.next()){
partIDList.add(rs.getString(1));
partNameList.add(rs.getString(2));
upperNameList.add(rs.getString(3));
deptIDList.add(rs.getString(4));
deptNameList.add(rs.getString(5));
userIDList.add(rs.getString(6));
userNameList.add(rs.getString(7));
prssList.add(rs.getString(8));
}
count = partIDList.size();
} catch (SQLException sqlEx) {
LOG.error("\nSQLState - {}\nMySQL Error Code - {}\nmessage - {}\nsql - {}",
new Object[] { sqlEx.getSQLState(), sqlEx.getErrorCode(), sqlEx.getMessage(), sql.toString() });
throw new RuntimeException(sqlEx);
} catch (Exception ex) {
throw new RuntimeException(ex);
} finally {
close(rs);
execClose();
}
}
public int getCount() {
return count;

@ -72,7 +72,7 @@ public class HttpUserDocList extends HttpServlet {
String[] arrayId = idList.split(",");
String[] arrayType = typeList.split(",");
String[] arrayName = nameList.split(",");
String[] arrayDeptName = nameList.split(",");
String[] arrayDeptName = deptNameList.split(",");
count = arrayId.length;

@ -848,7 +848,7 @@ moumi.message.totsys.totper.mydocbox.prssbox.tot_reports.total_reports_jsp
moumi.message.totsys.totper.mydocbox.regbox.doc_form_config_jsp = \ubb38\uc11c\uc0dd\uc131
moumi.message.totsys.totper.mydocbox.regbox.doc_list_jsp = \ubbf8\uc9c4\ud589\uc790\ub8cc
moumi.message.totsys.totper.mydocbox.regbox.doc_regist_jsp = \ubb38\uc11c\uc0dd\uc131
moumi.message.totsys.totper.mydocbox.regbox.sub_doc_regist_jsp = \uc5f0\uacc4\ub4f1\ub85d
moumi.message.totsys.totper.mydocbox.regbox.sub_doc_regist_jsp = \uc0ac\uc6a9\uc790\uc5f0\uacc4 \ub4f1\ub85d
moumi.message.tot_doc.dataInputDevision = \uc790\ub8cc\uc785\ub825\uae30\uad00
moumi.message.popup.confirmTocdocStartTrue = \uc5f0\uacc4\ub4f1\ub85d \ud6c4 \uc5d0\ub294 \uc790\ub8cc\uc218\uc815\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \uc5f0\uacc4\ub4f1\ub85d \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?
moumi.message.totsys.repoper.mydocbox.compbox.report_list_jsp = \ub0b4\uc81c\ucd9c\uc790\ub8cc

@ -848,7 +848,7 @@ moumi.message.totsys.totper.mydocbox.prssbox.tot_reports.total_reports_jsp
moumi.message.totsys.totper.mydocbox.regbox.doc_form_config_jsp = \ubb38\uc11c\uc0dd\uc131
moumi.message.totsys.totper.mydocbox.regbox.doc_list_jsp = \ubbf8\uc9c4\ud589\uc790\ub8cc
moumi.message.totsys.totper.mydocbox.regbox.doc_regist_jsp = \ubb38\uc11c\uc0dd\uc131
moumi.message.totsys.totper.mydocbox.regbox.sub_doc_regist_jsp = \uc5f0\uacc4\ub4f1\ub85d
moumi.message.totsys.totper.mydocbox.regbox.sub_doc_regist_jsp = \uc0ac\uc6a9\uc790\uc5f0\uacc4 \ub4f1\ub85d
moumi.message.tot_doc.dataInputDevision = \uc790\ub8cc\uc785\ub825\uae30\uad00
moumi.message.popup.confirmTocdocStartTrue = \uc5f0\uacc4\ub4f1\ub85d \ud6c4 \uc5d0\ub294 \uc790\ub8cc\uc218\uc815\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \uc5f0\uacc4\ub4f1\ub85d \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?
moumi.message.totsys.repoper.mydocbox.compbox.report_list_jsp = \ub0b4\uc81c\ucd9c\uc790\ub8cc

@ -692,14 +692,21 @@
<td class="kecttep_tdmenu" style="padding-left: 20px; width: 120px;">
<%=MoumiConfig.getMessageBundle().getString("moumi.message.tot_doc.dataInputDevision")%></td>
<td colspan="3" class="kecttep_list_graytd" style="padding-left: 15px;">
<%if (repID == null) {%>
<a href="javascript:void(0);" onClick="javascript:deptSelect();">
<img src="/totsys/common/images/bt_dept_select2.gif" alt="<%=MoumiConfig.getMessageBundle().getString("moumi.message.button_large.submitDept")%>" valign="absmiddle" />
</a>
<%}else{ %>
<a href="javascript:void(0);" onClick="javascript:userSelect();">
<img src="/totsys/common/images/bt_dept_select2.gif" alt="<%=MoumiConfig.getMessageBundle().getString("moumi.message.button_large.submitDept")%>" valign="absmiddle" />
</a>
<%} %>
<input name="deptCountText" type="text" style="width: 230px; border: 0; color: black; padding-top: 3px"
value='<%=allReportCount%><%=MoumiConfig.getMessageBundle().getString("moumi.message.tot_doc.devisionSelect")%>'
align="absmiddle">
<!--개의 기관을 선택하였습니다. -->
</td>
</tr>
<tr>
@ -852,6 +859,21 @@
post = window.open(urlname, "post", "width=900, height=600, toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=no,left=" + leftpos + ",top=" + toppos);
post.focus();
}
function userSelect() {
var height = screen.height;
var width = screen.width;
var leftpos = width / 2 - 350;
var toppos = height / 2 - 350;
//totCount = 기관/내부에서 선택 변경이 일어났을때 edit_dept_list 에 onload를 제어하기 위한 변수 (기존 부서 정보 호출여부)
if (totCount == 0) {
var urlname = "/totsys/common/web/report_dept/edit_user_list2.jsp?section=1&docID=<%=docID%>";
} else {
var urlname = "/totsys/common/web/report_dept/edit_user_list2.jsp?section=1&docID=<%=docID%>&totCount=1";
}
post = window.open(urlname, "post", "width=900, height=600, toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=no,left=" + leftpos + ",top=" + toppos);
post.focus();
}
function inputText() {
window.open('/totsys/totper/mydocbox/regbox/popup_input_form.jsp?docID=<%= docID%>', 'makepoll', 'width=870,height=550,scrollbars=yes,resizable=yes');

@ -0,0 +1,582 @@
<%
/*
* ***********************************************************
* @@ Program Name : edit_user_list2.jsp
* @@ Description : 제출기관지정 -> 사용자 지정
* @@ Author :
* @@ Create Date :
* @@ History : 2014.09.18 Update by KWON,HAN, 2022.12.15 jskim
* **********************************************************
*/
%>
<%@ page contentType="text/html; charset=UTF-8"
import="kr.co.kihyun.lang.MString"
import="java.net.URLDecoder"
import="kr.co.kihyun.lang.Encoder"
import="kr.co.kihyun.lang.MLong"
import="kr.co.kihyun.moumi.Moumi"
import="kr.co.kihyun.beans.totsys.report.ReportList"
import="kr.co.kihyun.beans.user.Dept"
import="kr.co.kihyun.beans.user.User"
import="kr.co.kihyun.moumi.report.MReport"%>
<%@page import="kr.co.kihyun.beans.entity.Repoadm"%>
<%@page import="javax.jdo.PersistenceManager"%>
<%@page import="javax.jdo.Transaction"%>
<%@page import="kr.co.kihyun.beans.entity.util.*"%>
<%@page import="kr.co.kihyun.beans.entity.TotReport"%>
<%@ include file="/totsys/common/inc/sec/secure.inc.jsp"%>
<% Long docID = MLong.parseLong(request.getParameter("docID"), null);
Long reportID = MLong.parseLong(request.getParameter("reportID"), null);
String usedType = MString.checkNull(request.getParameter("usedType"));
String totCount = clearXSS(Encoder.toJava(MString.checkNull(request.getParameter("totCount"))), "");
int deptCount = 0;
String deptIDs = "";
String deptNames = "";
String deptNameLists = "";
String deptTypes = "";
String[] organNameList = null;
String[] upperNameList = null;
String[] deptIDList = null;
String[] deptNameList = null;
String[] userIDList = null;
String[] userNameList = null;
String sAutoExpanded = "N";
if (!"RECOG".equals(usedType)) {
ReportList reportList = new ReportList();
//v2. 13.SQL 삽입 : JDO형식이므로 해결책에 따른 prepare SQL 문으로 변경할 수 없음
reportList.executeQuery(docID, MReport.ALL);
//=================
deptCount = reportList.getCount();
User user = new User();
if (deptCount > 0) {
deptIDList = new String[deptCount];
deptNameList = new String[deptCount];
organNameList = new String[deptCount];
upperNameList = new String[deptCount];
deptIDList = reportList.getDeptIDList();
userIDList = reportList.getUserIDList();
deptNameList = reportList.getDeptNameList();
organNameList = reportList.getOrganNameOfUpperDept();
upperNameList = reportList.getUpperNameList();
deptIDs = userIDList[0] ;
deptNames = user.getName(userIDList[0]);
deptTypes = "user";
deptNameLists = deptNameList[0] ;
// } else {
// deptIDs = deptIDList[0];
// //deptNames = deptNameList[0];
// // Dept dept = new Dept();
// // deptNames = dept.getOrganNameOfUpperDept(deptIDList[0]) + "|" + dept.getUpperDeptName(deptIDList[0]) + "|" + dept.getName(deptIDList[0]);
// deptNames = organNameList[0] + "|" + MString.checkNull(upperNameList[0]) + "|" + deptNameList[0];
// deptTypes = "dept";
// }
for (int d = 1; d < deptCount; d++) {
// if (docTypeList[d] == 1) {
deptIDs = deptIDs + "," + userIDList[d] ;
deptTypes = deptTypes + "," + "user";
deptNames = deptNames + "," + user.getName(userIDList[d]) ;
deptNameLists = deptNameLists + "," + deptNameList[d] ;
}
}
} else{
out.println("수신처를 추가 할 수 없습니다.");
}
%>
<!DOCTYPE html>
<html lang="ko">
<head>
<meta charset="UTF-8">
<title>제출부서 선택</title>
<script type="text/javascript" src="/totsys/common/js/jquery-1.12.4.min.js"></script>
<script type="text/javascript" src="/totsys/common/js/jquery.cookie.js"></script>
<script type="text/javascript" src="/totsys/common/js/jquery.hotkeys.js"></script>
<script type="text/javascript" src="/totsys/common/js/jquery.jstree.js"></script>
<script type="text/javascript" src="/totsys/common/js/jquery.custom.indicator.js"></script>
<link rel="stylesheet" href="/totsys/common/css/kecttep.css" type="text/css">
<link rel="stylesheet" href="/totsys/common/css/popup.css" type="text/css">
<link rel="stylesheet" href="/totsys/common/css/basic.css" type="text/css">
<script src="/totsys/common/js/org_search.js"></script>
<script>
var delstate = false;
var userGroup = false; // 사용자정의 그룹인지 여부지정 변수
var selid = ''; // 지금 선택한 부서
var selname = '';
var seltype = '';
var idList = ''; // 선택되어진 부서 리스트
var nameList = '';
var typeList = '';
var deptNameList = '';
// 부서 추가
function setDepts() {
document.list.idList.value = idList = "<%=deptIDs%>";
document.list.typeList.value = typeList = "<%=deptTypes%>";
document.list.nameList.value = nameList = "<%=deptNames%>";
document.list.deptNameList.value = deptNameList = "<%=deptNameLists%>";
idList = idList + "";
typeList = typeList + "";
nameList = nameList + "";
deptNameList = deptNameList + "";
if (idList != "")
document.list.submit();
}
//추가 버튼
function getDeptId() {
var $ff = $("#leftFrame");
$ff[0].contentWindow.$("#checkbtn").click();
}
function putSelId(sid, sName, sDeptName) {
selid = sid;
seltype = "user";
selname = sName;
seldeptname = sDeptName;
var id = selid;
var type = seltype;
var name = selname;
var deptname = seldeptname;
if (idList == '') {
document.list.idList.value = idList = id;
document.list.typeList.value = typeList = type;
document.list.nameList.value = nameList = name;
document.list.deptNameList.value = deptNameList = deptname;
idList = idList + "";
typeList = typeList + "";
nameList = nameList + "";
deptNameList = deptNameList + "";
} else {
var isAdd = listAdd(idList, id, typeList, type, nameList, deptNameList);
document.list.idList.value = idList;
document.list.typeList.value = typeList;
if (isAdd) {
listAddn(nameList, name);
listAddDept(deptNameList, deptname);
}
document.list.nameList.value = nameList;
document.list.deptNameList.value = deptNameList;
}
}
function putSelId2(sId, sDeptName, sOrganDeptName, sUpperDeptName) {
selid = sId;
selname = selname + "|" + sDeptName;
deptConfirm2();
}
function deptConfirm() {
if (selid == '') {
alert('<%=Moumi.getMessageBundle().getString("moumi.message.popup.deptConfirm")%>');
} else if (seltype == "group") {
modSelect();
} else {
id = selid;
name = selname;
type = seltype;
if (idList == '') {
document.list.idList.value = idList = id;
document.list.typeList.value = typeList = type;
idList = idList + "";
typeList = typeList + "";
} else {
var isAdd = listAdd(idList, id, typeList, type);
document.list.idList.value = idList;
document.list.typeList.value = typeList;
}
document.list.submit();
}
}
// 부서 추가
function deptConfirm2() {
if (selid == '') {
alert('<%=Moumi.getMessageBundle().getString("moumi.message.popup.deptConfirm")%>');
} else if (seltype == "group") {
modSelect();
} else {
var id = selid;
var type = 'user';
var name = selname;
if (idList == '') {
document.list.idList.value = idList = id;
document.list.typeList.value = typeList = type;
document.list.nameList.value = nameList = name;
idList = idList + "";
typeList = typeList + "";
nameList = nameList + "";
} else {
var isAdd = listAdd(idList, id, typeList, type);
document.list.idList.value = idList;
document.list.typeList.value = typeList;
if (isAdd) {
listAddn(nameList, name);
}
document.list.nameList.value = nameList;
}
//document.list.submit();
}
}
function openerdeptConfirm() { //구성원으로 추가
var gid = document.list.openeridList.value;
var gname = document.list.openernameList.value;
var gtype = document.list.openertypeList.value;
var arrayID = gid.split(",");
var arrayName = gname.split(",");
var arrayType = gtype.split(",");
var isChange = false;
for (var i = 0; i < arrayID.length; i++) {
selid = arrayID[i];
selname = arrayName[i];
seltype = arrayType[i];
if (selid == '') {
alert('<%=Moumi.getMessageBundle().getString("moumi.message.popup.deptConfirm")%>');
} else {
id = selid;
name = selname;
type = seltype;
if (idList == '') {
document.list.idList.value = idList = id;
document.list.nameList.value = nameList = name;
document.list.typeList.value = typeList = type;
idList = idList + "";
nameList = nameList + "";
typeList = typeList + "";
} else {
var isAdd = listAdd(idList, id, typeList, type);
document.list.idList.value = idList;
document.list.typeList.value = typeList;
if (isAdd) {
listAddn(nameList, name);
}
document.list.nameList.value = nameList;
}
isChange = true;
}
}
if (isChange) {
document.list.submit();
}
}
function modSelect() {
var height = screen.height;
var width = screen.width;
var leftpos = width / 2 - 235;
var toppos = height / 2 - 235;
if (seltype != "group") {
alert('<%=Moumi.getMessageBundle().getString("moumi.message.popup.groupSelect")%>');
return;
}
var urlname = "/totsys/common/web/report_dept/modifier.jsp?groupID=" + selid;
post2 = window.open(urlname, "post2", "width=450, height=435, toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=no,left=" + leftpos + ",top=" + toppos);
post2.focus();
}
function listAdd(idList1, idList2, tList, tItem) {
var arrayID1 = idList1.split(",");
var arrayType = tList.split(",");
var isEquals = true;
if (idList1 == '') {
idList = idList1;
typeList = tList;
return false;
}
for (var i = 0; i < arrayID1.length; i++) {
if (idList2 == arrayID1[i] && tItem == arrayType[i]) {
isEquals = false;
break;
}
}
if (isEquals) {
idList1 += "," + idList2;
tList += "," + tItem;
}
idList = idList1;
typeList = tList;
return isEquals;
}
//사용자명을 더한다.
function listAddn(nameList1, nameList2) {
//var arrayName1 = nameList1.split(",");
if (nameList1 == '') {
nameList = nameList1;
return;
}
nameList1 += "," + nameList2;
nameList = nameList1;
return;
}
//부서명을 더한다.
function listAddDept(deptNameList1, dpetNameList2) {
//var arrayName1 = deptNameList1.split(",");
if (deptNameList1 == '') {
deptNameList = deptNameList1;
return;
}
deptNameList1 += "," + dpetNameList2;
deptNameList = deptNameList1;
return;
}
// 삭제 버튼
function deptDelete() {
if (idList != '') {
deptFrame.movelist();
document.list.submit();
}
}
function leftFrameDel(name, id, type) {
name = lastStrDel(name, ",");
id = lastStrDel(id, ",");
type = lastStrDel(type, ",");
if (nameList == '' && idList == '') {
document.list.idList.value = idList = id;
document.list.typeList.value = typeList = type;
document.list.nameList.value = nameList = name;
} else {
delList(id, type, name);
document.list.idList.value = idList;
document.list.typeList.value = typeList;
document.list.nameList.value = nameList;
}
document.list.submit();
return;
}
function lastStrDel(str, delStr) {
var lastStr = str.lastIndexOf(delStr);
return str.substring(0, lastStr);
}
function delList(idList1, tyList1, naList1) {
idList = idList1;
typeList = tyList1;
nameList = naList1;
return;
}
// 부서 선택 시 유저 뽑아내기.
function userList(id, name, type) {
if (type != '') {
idAll = id;
selid = id;
selname = name;
} else {
idAll = '';
selid = '';
selname = '';
}
seltype = type;
idUpper = false;
userGroup = false;
/*
document.userlist.id.value = id;
document.userlist.target="rightFrame";
document.userlist.selectType.value="right";
document.userlist.didList.value = idList;
document.userlist.submit();
*/
}
function groupList(id, name, type) {
idAll = id;
selid = id;
selname = name;
seltype = type;
idUpper = false;
userGroup = false;
/*
document.userlist.id.value = id;
document.userlist.target="rightFrame";
document.userlist.selectType.value="right";
document.userlist.didList.value = idList;
document.userlist.submit();
*/
}
function searchWord() {
var word = $('#search').val();
word = $.trim(word);
$('#search').val(word);
if (word.length < 2) {
alert("검색어는 2글자 이상이어야 합니다.");
return;
}
var $ff = $("#leftFrame");
$ff[0].contentWindow.$("#searchWord").text(word);
$ff[0].contentWindow.$("#search").click();
}
//조직도에서 검색된 노드로 포커스를 이동시킨다. strType : down, up
function focusMove(strType) {
//alert("strType = " + strType);
var $ff = $("#leftFrame");
$ff[0].contentWindow.$("#moveType").text(strType); //포커스이동타입
$ff[0].contentWindow.$("#focusMove").click();
}
//확인 버튼
function deptComp() {
if (document.list.idList.value == "") {
<%if ("RECOG".equals(usedType)) {%>
alert('<%=Moumi.getMessageBundle().getString("moumi.message.popup.approvalSelect")%>'); //승인자를 선택 해주세요. 승인받지 않고 제출하시려면 제출완료를 눌러주세요
<%} else {%>
alert('<%=Moumi.getMessageBundle().getString("moumi.message.popup.deptComp")%>'); //제출요청 부서를 추가 해 주세요
<%}%>
return;
} else {
$.customIndicator.show(window.self); /* indicator 추가 */
document.deptSet.deptIDs.value = document.list.idList.value;
//document.deptSet.types.value = document.list.typeList.value;
//document.deptSet.deptNames.value = document.list.nameList.value;
//document.deptSet.deptNameLists.value = document.list.deptNameList.value;
var deptTemp = document.list.idList.value.split(",");
var deptCounter = deptTemp.length;
if(deptCounter <= 0) {
opener.dform.deptCountText.value = '<%=Moumi.getMessageBundle().getString("moumi.message.tot_doc.submitDevision")%>'; //제출기관을 선택해주세요.
} else {
opener.dform.deptCountText.value = deptCounter + '<%=Moumi.getMessageBundle().getString("moumi.message.popup.deptCounter")%>'; //개의 부서를 선택하였습니다.
}
opener.dform.deptChange.value = "1";
deptSet.submit();
}
}
//취소 버튼
function deptCancel() {
window.close();
}
</script>
</HEAD>
<BODY <%if (totCount == null || totCount.equals("")) {%> onload="setDepts();" <%}%>>
<form name="deptSet" method="post" action="/servlet/kr.co.kihyun.beans.totsys.doc.HttpUserSetMerge" target="_self">
<input type="hidden" name="docID" value="<%=docID%>">
<input type="hidden" name="reportID" value="<%=reportID%>">
<input type="hidden" name="usedType" value="<%=usedType%>">
<input type="hidden" name="deptIDs">
<input type="hidden" name="types">
</form>
<form name="list" method="post" action="/servlet/kr.co.kihyun.beans.user.HttpUserDocList" target="deptFrame">
<input type="hidden" name="idList">
<input type="hidden" name="nameList">
<input type="hidden" name="typeList">
<input type="hidden" name="deptNameList">
<input type="hidden" name="openeridList">
<input type="hidden" name="openernameList">
<input type="hidden" name="openertypeList">
</form>
<!--타이틀 //-->
<div class="title">
<div>제출기관지정</div>
</div>
<!--타이틀 //-->
<div class="disFlex lv1">
<div class="deptListSide">
<img alt="말머리" src="/totsys/common/images/ico_3.gif">
<b><%=Moumi.getMessageBundle().getString("moumi.message.tot_doc.deptMap")%></b>
</div>
<div class="deptListCenter"></div>
<div class="deptListSide"><img alt="말머리" src="/totsys/common/images/ico_3.gif"><b>제출기관(부서)<!--%=Moumi.getMessageBundle().getString("moumi.message.tot_doc.submitDept")%--></b></div>
</div>
<%if (!"RECOG".equals(usedType)) {%>
<div class="disFlex ml_5">
<!-- 분류 선택 아이프레임 -->
<iframe src="iframe/new_section_list4.html" width="300" height="21"></iframe>
</div>
<%}%>
<div class="disFlex">
<div class="deptListSide">
<!-- 부서 선택 아이프레임 -->
<iframe id="leftFrame" name="leftFrame" src="./iframe/newTreeUser.jsp" width="300" height="360" frameborder="0"></iframe>
</div>
<div class="deptListCenter center deptPt">
<div>
<!--추가-->
<a href="javascript:getDeptId();"><img alt="추가" src="./images/new_dept_add.gif"/></a>
</div>
<div class="mt_5">
<!--삭제-->
<a href="javascript:deptDelete();"><img alt="삭제" src="./images/new_dept_del.gif"/></a>
</div>
<!--구성원-->
<%if (!"RECOG".equals(usedType)) {%>
<div>
</div>
<%}%>
</div>
<div class="deptListSide">
<!-- 선택된 부서 리스트 아이프레임 -->
<iframe name="deptFrame" src="./iframe/selected_list.jsp"></iframe>
</div>
</div>
<table>
<tr>
<td> 검 색 &nbsp;&nbsp;</td>
<td><input id="search" name="search" type="text" class="inputtxt" value="" size="35" onkeyDown="if(event.keyCode === 13) { searchWord(); }" style="ime-mode:active;">&nbsp;</td>
<td><a href="#" onclick="searchWord();"><img alt="찾기" src="/totsys/common/images/bt_search_inquiry2.gif"></a>&nbsp;</td>
<td><a href="#" onclick="focusMove('down');"><img alt="다음" src="/totsys/common/images/bt_down.jpg"></a>&nbsp;</td>
<td><a href="#" onclick="focusMove('up');"><img alt="이전" src="/totsys/common/images/bt_up.jpg"></a></td>
<td></td>
</tr>
</table>
<!-- 확인, 취소 버튼 -->
<div class="center mt_10" style="border-top: 1px solid #8ea6d6">
<div class="mt_10">
<a href="#" onclick="deptComp()"><img alt="확인" src="/totsys/common/images/bt_ok.gif"></a>
<a href="#" onClick="deptCancel()"><img alt="취소" src="/totsys/common/images/bt_cancle.gif"></a>
</div>
</div>
</body>
</HTML>

@ -10,6 +10,9 @@ page contentType="text/html; charset=UTF-8"
<%
String rootId = request.getParameter("rootID");
String usID = HttpSSOLogin.getLoginID(request);
String deptID = HttpSSOLogin.getDeptID(request);
System.out.println("rootId = " + rootId);
String userYN = "Y";
%>
@ -38,7 +41,7 @@ page contentType="text/html; charset=UTF-8"
<div id="newTree" class="newTree"></div>
<script class="source">
var gSearchGubun = "DEPT"; //default=DEPT
var gSearchGubun = "USER"; //default=DEPT
var gblSearched = false;
$(function() {
@ -55,7 +58,7 @@ page contentType="text/html; charset=UTF-8"
{
"data": "조직도",
"state": "closed",
"attr": {"id": "ROOT", "rel": "ROOT", "rootid": '<%=rootId%>'}
"attr": {"id": "ROOT", "rel": "ROOT", "rootid": '<%=deptID%>'}
}
],
"ajax": {
@ -93,6 +96,7 @@ page contentType="text/html; charset=UTF-8"
var data = {};
data.keyWord = str;
data.startId = encodeURIComponent('<%=rootId%>');
data.gubun = gSearchGubun;
return data;
},
//"async": false,
@ -124,6 +128,7 @@ page contentType="text/html; charset=UTF-8"
$("#search").click(function() {
gblSearched = false;
gSearchGubun = "USER";
$("#newTree").jstree("search", $('#searchWord').text());
});
@ -163,53 +168,41 @@ page contentType="text/html; charset=UTF-8"
data.inst.open_node(data.rslt.obj, false, true);
});
//체크된것이 추가버튼을 클릭하면 부서 리스트로 추가된다.
//체크된것이 추가버튼을 클릭하면 사용자 리스트로 추가된다.
$("#checkbtn").click(function() {
iChkCnt = 0
$("#newTree").jstree("get_checked", null, true).each(function() {
//alert(" this.id = " + this.id);
//alert(" this.rel = " + this.rel);
//alert(" this.SYSAUTH = " + this.SYSAUTH);
//alert(" this.name = " + this.name);
//alert(" this.deptid = " + this.deptid);
//alert(" this.deptname = " + this.deptname);
//alert(" this.organdeptname = " + this.organdeptname);
//alert(" this.upperdeptname = " + this.upperdeptname);
var testID = this.id;
testID = testID.substring(1, 2);
testID = testID.replace(" ", "");
if (testID == "9") {
//alert("추가할 수 없습니다.");
} else {
iChkCnt = iChkCnt + 1;
//parent.putSelId(this.id);
//ie10,11 에서 undefined 문제 해결
var upperdeptname=$(this).attr('upperdeptname');
if(!upperdeptname)upperdeptname='';
parent.putSelId2(this.id,
$(this).attr('deptname'),
$(this).attr('organdeptname'),
upperdeptname);
if (this.id == "ROOT" || this.rel == "ROOT" || this.rel == "DEPT") {
return;
}
//parent.putSelId(this.id);
iChkCnt = iChkCnt + 1;
//parent.putSelId(this.id, this.name, this.deptname);
//ie10,11 호환성 수정 undefined 수정, 부서추가 막음
var name=$(this).attr('name');
if(!name||name==''){
//name=$(this).attr('deptname');
return;
}else{
}
parent.putSelId(this.id,name,$(this).attr('deptname'));
});
if (iChkCnt == 0) {
alert('<%=Moumi.getMessageBundle().getString("moumi.message.doc.SubmitDevision")%>'); //제출부서를 선택해주세요.
alert('<%=Moumi.getMessageBundle().getString("moumi.message.popup.selectUser")%>'); //사용자를 선택하세요!
} else {
try {
$.customIndicator.show(window.parent); // 2014.10.08 by youngjun cho. (loading indicator 추가)
} catch(e) {
alert(e);
}
//오른쪽의 부서 리스트에 표시된다.
//오른쪽의 사용자 리스트에 표시된다.
parent.document.list.submit();
try {
$.customIndicator.hide(window.parent); // 2014.10.08 by youngjun cho. (loading indicator 추가)
} catch(e) {
alert(e);
}
}
});
//조직도에서 검색된 노드로 포커스를 이동시킨다. strType : down, up
$("#focusMove").click(function() {
var moveType = $("#moveType").text(); //down,up
@ -264,48 +257,34 @@ page contentType="text/html; charset=UTF-8"
}
});
//더블클릭 시에 ...
//더블클릭 : 사용자 리스트로 추가된다.
$("#newTree").bind("dblclick.jstree", function(e, data) {
iChkCnt = 0
var NODE = $.jstree._focused().get_selected();
var nodeId = $(NODE).attr("id");
var deptname = $(NODE).attr("deptname");
var organdeptname = $(NODE).attr("organdeptname");
var upperdeptname = $(NODE).attr("upperdeptname");
if (deptname == undefined) { deptname = ""; }
if (organdeptname == undefined) { organdeptname = ""; }
if (upperdeptname == undefined) { upperdeptname = ""; }
nodeId = $(NODE).attr("id");
nodeRel = $(NODE).attr("rel");
nodeName = $(NODE).attr("name");
nodeDeptId = $(NODE).attr("deptid");
nodeDeptName = $(NODE).attr("deptname");
//alert(" nodeId = " + nodeId);
//alert(" deptname = " + deptname);
//alert(" organdeptname = " + organdeptname);
//alert(" upperdeptname = " + upperdeptname);
//alert(" nodeRel = " + nodeRel);
//alert(" nodeName = " + nodeName);
//alert(" nodeDeptId = " + nodeDeptId);
//alert(" nodeDeptName = " + nodeDeptName);
if (nodeId == undefined) {
return;
}
if (nodeId.length > 10 || nodeId == 'ROOT') { // this.id == 'ROOT')
if (nodeId == "ROOT" || nodeRel == "ROOT" || nodeRel == "DEPT") {
alert('<%=Moumi.getMessageBundle().getString("moumi.message.popup.selectUser")%>'); //사용자를 선택하세요!
return;
}
var testID = nodeId;
testID = testID.substring(1, 2);
testID = testID.replace(" ", "");
if (testID == "9") {
} else {
iChkCnt = iChkCnt + 1;
//parent.putSelId(nodeId);
parent.putSelId2(nodeId, deptname, organdeptname, upperdeptname);
}
//parent.putSelId(nodeId);
if (iChkCnt == 0) {
alert('<%=Moumi.getMessageBundle().getString("moumi.message.doc.SubmitDevision")%>'); //제출부서를 선택해주세요.
} else {
//오른쪽의 부서 리스트에 표시된다.
parent.document.list.submit();
}
parent.putSelId(nodeId, nodeName, nodeDeptName);
//오른쪽의 사용자 리스트에 표시된다.
parent.document.list.submit();
});
});

@ -1,9 +1,3 @@
<!--
페이지 설명 : 연계등록에서 제출기관지정시 사용자 단위로 보여지는 팝업 메뉴
수정작업 : 2013년 6월 25일. 2022.12.14
수정자 : jskim
-->
<%@ page contentType="text/html; charset=UTF-8"
import="java.net.URLDecoder"
import="kr.co.kihyun.lang.MString"
@ -17,10 +11,10 @@
String deptTypes = clearXSS(Encoder.toJava(MString.checkNull(request.getParameter("deptTypes"))), "");
//String deptNames = clearXSS(Encoder.toJava(MString.checkNull(request.getParameter("deptNames"))), "");
String deptNames = clearXSS(URLDecoder.decode(MString.checkNull(request.getParameter("deptNames")), "UTF-8"),"");
String formName = clearXSS(Encoder.toJava(MString.checkNull(request.getParameter("formName"))), "");
String deptNameLists = clearXSS(URLDecoder.decode(MString.checkNull(request.getParameter("deptNameLists")), "UTF-8"),"");
String formName = clearXSS(Encoder.toJava(MString.checkNull(request.getParameter("formName"))), "");
int totCount = 0;
String[] deptIDsList = deptIDs.split(",");
if(deptIDs == null || deptIDs == "") {
totCount = 0;
@ -32,8 +26,7 @@
int deptCount = MInteger.parseInt(request.getParameter("deptCount"), 0);
if(deptCount > 0) {
totCount = deptCount;
}
//++++++++++++++++++++++++++++
}
%>
<!DOCTYPE html>
@ -61,6 +54,7 @@
var idList = ''; // 선택되어진 부서 리스트
var typeList = '';
var nameList = '';
var deptNameList = '';
var orgSearch = new OrgSearch(onNodeCallback);
var focusedButton = null;
$(document).ready(function() {
@ -70,21 +64,19 @@
// 부서 추가
function setDepts() {
//2014.11.07 : Update by KWON,HAN
//document.list.idList.value = idList = "<%=deptIDs%>";
//document.list.typeList.value = typeList = "<%=deptTypes%>";
//document.list.nameList.value = nameList = "<%=deptNames%>";
document.list.idList.value = idList = opener.<%= formName%>.deptIDs.value;
document.list.typeList.value = typeList = opener.<%= formName%>.deptTypes.value ;
document.list.nameList.value = nameList = opener.<%= formName%>.deptNames.value;
//===============================
document.list.idList.value = idList = opener.dform.deptIDs.value;
document.list.typeList.value = typeList = opener.dform.deptTypes.value ;
document.list.nameList.value = nameList = opener.dform.deptNames.value;
document.list.deptNameList.value = deptNameList = opener.dform.deptNameLists.value;
idList = idList + "";
typeList = typeList + "";
nameList = nameList + "";
deptNameList = deptNameList + "";
if (idList != "")
if (idList != "") {
document.list.submit();
}
/* @@@ test
document.getElementById('search').value = "강원도교육청";
@ -98,22 +90,42 @@
//top.document.leftFrame.location.reload(); //부서가 추가된후 체크박스들을 초기화 시켜준다.2012.09.28
}
function putSelId(id) {
selid = id;
deptConfirm2();
function putSelId(sid, sName, sDeptName) {
selid = sid;
seltype = "user";
selname = sName;
seldeptname = sDeptName;
var id = selid;
var type = seltype;
var name = selname;
var deptname = seldeptname;
if (idList == '') {
document.list.idList.value = idList = id;
document.list.typeList.value = typeList = type;
document.list.nameList.value = nameList = name;
document.list.deptNameList.value = deptNameList = deptname;
idList = idList + "";
typeList = typeList + "";
nameList = nameList + "";
deptNameList = deptNameList + "";
} else {
var isAdd = listAdd(idList, id, typeList, type, nameList, deptNameList);
document.list.idList.value = idList;
document.list.typeList.value = typeList;
if (isAdd) {
listAddn(nameList, name);
listAddDept(deptNameList, deptname);
}
document.list.nameList.value = nameList;
document.list.deptNameList.value = deptNameList;
}
}
function putSelId2(sId, sDeptName, sOrganDeptName, sUpperDeptName) {
//alert("id = " + sId + ", deptName = " + sDeptName + ", OrganDeptName = " + sOrganDeptName + ", UpperDeptName = " + sUpperDeptName)
selid = sId;
//selname = sOrganDeptName;
//if(!sOrganDeptName.equals(sUpperDeptName)) {
// selname = selname + "-" + sUpperDeptName;
//}
selid = sId;
selname = sDeptName + "|" + selid;
//selname = sOrganDeptName + "|" + sUpperDeptName + "|" + sDeptName;
deptConfirm2();
}
@ -158,14 +170,14 @@
document.list.nameList.value = nameList = name;
idList = idList + "";
typeList = typeList + "";
nameList = nameList + "";
nameList = nameList + "";
} else {
var isAdd = listAdd(idList, id, typeList, type);
document.list.idList.value = idList;
document.list.typeList.value = typeList;
document.list.typeList.value = typeList;
if (isAdd) {
listAddn(nameList, name);
}
}
document.list.nameList.value = nameList;
}
//document.list.submit();
@ -257,7 +269,7 @@
return isEquals;
}
//부서명을 더한다.
//사용자명을 더한다.
function listAddn(nameList1, nameList2) {
//var arrayName1 = nameList1.split(",");
@ -271,6 +283,20 @@
return;
}
//부서명을 더한다.
function listAddDept(deptNameList1, dpetNameList2) {
//var arrayName1 = deptNameList1.split(",");
if (deptNameList1 == '') {
deptNameList = deptNameList1;
return;
}
deptNameList1 += "," + dpetNameList2;
deptNameList = deptNameList1;
return;
}
// 삭제 버튼
function deptDelete() {
@ -417,11 +443,8 @@
opener.<%= formName%>.deptIDs.value = document.list.idList.value;
opener.<%= formName%>.deptTypes.value = document.list.typeList.value;
opener.<%= formName%>.deptNames.value = document.list.nameList.value;
// var deptTemp = document.list.idList.value.split(",");
// deptCounter = deptTemp.length;
//
// opener.<%= formName%>.deptCountText.value = deptCounter + "<%=Moumi.getMessageBundle().getString("moumi.message.popup.deptCounter")%>";
//
opener.<%= formName%>.deptNameLists.value = document.list.deptNameList.value;
var deptTemp = '';
var deptCounter = 0;

@ -113,11 +113,7 @@
SysAuth sysAuth = mUser.getSysAuth();
//상위기관인 경우 자료 조회 가능하도록 적용
MDept mDept = pm.getObjectById(MDept.class, dtID);
System.out.println("dtID ===>>>>>>> " + dtID);
String upperId = mDept.getUpperDept(pm) == null ? "" : mDept.getUpperDept(pm).getId();
System.out.println("upperId ===>>>>>>> " + upperId);
//organId와 dtID를 비교해서 다르면 상위부서의 전체제출서류를 가져오게 수정함. by wonseok Lee 20171010
String organId = mDept.getOrgan();
//======================================================================
@ -223,7 +219,7 @@
function goEndPage(ttmp1, ttmp2)
{
var str = "/totsys/totper/mydocbox/prssbox/reports/report_list.jsp?docType=" + ttmp1 + "&docID=" + ttmp2 + "&deptID=<%= dtID%>";
parent.topx.menuSelect(1);
//parent.top.menuSelect(1);
location.href = str;
}
@ -406,18 +402,14 @@
tstr = ""; //집계진행중
}
tmpStrMagam = tmp2;
String tempYymmddhh = tmp2;
//System.out.println(" tempYymmddhh:::::"+tempYymmddhh);
String tempYymmddhh = tmp2;
%>
<tr style="padding-top: 3px; vertical-align: middle; background-color: #ffffff;"
onmouseover="this.style.backgroundColor = 'F9F9F9'"
onmouseout="this.style.backgroundColor = 'white'">
<!-- 종료일때 체크박스 -->
<td class="kecttep_graytd center">
<%=((reportVO.getEndDate().getTime() < nowDate.getTime()) && (reportVO.getDocPrss() == 2 || reportVO.getDocPrss() != 2 )|| reportVO.getPrss() == 4)?"<input type='checkbox' class='delids' value='"+reportVO.getId()+"'/>":""%>
<%System.out.println("prss" + reportVO.getPrss());
%>
<%=((reportVO.getEndDate().getTime() < nowDate.getTime()) && (reportVO.getDocPrss() == 2 || reportVO.getDocPrss() != 2 )|| reportVO.getPrss() == 4)?"<input type='checkbox' class='delids' value='"+reportVO.getId()+"'/>":""%>
</td>
<td class="kecttep_graytd center" style="height: 25px; width: 60px;">
<%

@ -809,7 +809,7 @@
<form name="NotDoc" method="post" action="/servlet/kr.co.kihyun.beans.totsys.repoper.HttpNotUpdate">
<input type="hidden" name="reportID" value="<%= reportID%>">
</form>
<form name="subReg" action="/totsys/totper/mydocbox/regbox/sub_doc_user_regist.jsp" method="post">
<form name="subReg" action="/totsys/totper/mydocbox/regbox/sub_doc_regist.jsp" method="post">
<input type="hidden" name="strPage" value="<%= strPage%>">
<input type="hidden" name="findOption" value="<%=MString.checkNull(findOption)%>">
<input type="hidden" name="findWord" value="<%=MString.checkNull(findWord)%>">

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save