Commit Graph

183 Commits

Author SHA1 Message Date
myname
c61b7bbc5d # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet g/w 기안문 내용 수정
2025-01-07 15:19:29 +09:00
myname
59b48664fa 2025-01-06 17:44 공정위 선보고용 종료통지 일반기안 링크 작업 2025-01-06 17:45:13 +09:00
myname
cfc03e332c 2025-01-06 16:42 종료사실 통지 기안문 내용 수정 2025-01-06 16:52:14 +09:00
myname
42e118b58a 2025-01-03 17:17 회의개최 통지 추가 수정 2025-01-03 17:17:48 +09:00
myname
89195da5c0 2025-01-03 16:52 회의개최 통보 수정 2025-01-03 16:52:30 +09:00
myname
21f6adce22 2025-01-03 11:43 종료보고 기안문 수정 2025-01-03 11:44:04 +09:00
myname
0e9fda7c16 Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2025-01-03 11:22:35 +09:00
myname
37446fbd74 2025-01-03 11:21 기안문 내용 수정 2025-01-03 11:22:20 +09:00
JIWOO
51d8c89a50 Merge branch 'master' of http://dlwldn1024@vcs.iten.co.kr:9999/itnAdmin/fairnet 2025-01-03 11:10:36 +09:00
myname
f114b12693 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet g/w 기안 추가
, 불산입 일자 추가
2025-01-03 11:07:18 +09:00
JIWOO
8ac0749747 이지우 - 법률상담 첨부파일 및 관리자 테스트 완료 2025-01-03 11:06:53 +09:00
myname
3dc4430d3f 2024-12-31 14:34 기안문 내용 수정 2024-12-31 14:35:07 +09:00
myname
68a2831010 Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-12-31 14:05:45 +09:00
myname
0dcd0a5f26 2024-12-31 14:05 g/w 및 오류 게시판 작업 2024-12-31 14:05:25 +09:00
JIWOO
4d555a21eb 이지우 - 관리자 분쟁조정처리 목록 > 동시기안 > 첨부파일 업로드 추가 2024-12-31 13:45:40 +09:00
myname
ed5419197b 2024-12-30 16:55 기안문 수정 및 기타 오류 수정 2024-12-30 16:55:16 +09:00
myname
8fc2ca88b9 2024-12-28 11:50 g/w 기안문 작동 확인 2024-12-28 11:50:45 +09:00
myname
59959efbda # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
오류 수정 사항 반영
2024-12-28 10:48:45 +09:00
myname
89ebe0f392 2024-12-27 20:41 g/w id 일반 변경 2024-12-27 20:42:05 +09:00
JIWOO
449233be9e Merge branch 'JIWOO' 2024-12-27 18:11:45 +09:00
JIWOO
0af9beddbb 이지우 - 그룹웨어 첨부파일 작업 2024-12-27 18:10:30 +09:00
myname
06801bbb57 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-12-27 12:51 기안문 수정 사항 적용
2024-12-27 12:52:05 +09:00
myname
6e588631dd 2024-12-24 18:17 사건 신청 수정 사항 적용 2024-12-24 18:17:49 +09:00
myname
ed5c1b6e69 2024-12-24 16:57 g/w 기안문 수정 2024-12-24 16:57:49 +09:00
myname
524e58feea Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-12-24 10:39:43 +09:00
myname
2d71d94c3e # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
g/w 파일 연계 작업 진행중
2024-12-24 10:39:18 +09:00
079f679e13 Merge branch 'tolag3' 2024-12-24 10:35:35 +09:00
4255424855 Merge branch 'tolag3' 2024-12-24 10:34:03 +09:00
myname
60bab20b09 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
g/w 연동 기안 수정 작업
2024-12-19 15:46:40 +09:00
myname
9334421fe0 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
g/w 기안문 내용 수정
2024-12-18 16:33:22 +09:00
myname
c6e93bdccd 2024-12-17 20:10 g/w 보완요구 3차 수정 2024-12-17 20:11:15 +09:00
myname
e6a7fd5baf 2024-12-17 18:02 기안문 내용 수정(출석1차) 2024-12-17 18:03:06 +09:00
myname
e85a8bfee2 2024-12-17 17:56 g/w 기안문 내용 수정 2024-12-17 17:56:59 +09:00
JIWOO
f19ea32e4e Merge branch 'JIWOO' 2024-12-17 12:11:23 +09:00
JIWOO
0bfee6646b 이지우 - 알림 발송 시점들 정리(주석으로 [민원인] or [조정원] 검색) 2024-12-17 12:08:18 +09:00
myname
84a8db7fe2 2024-12-17 11:56 g/w 기안문 수정 2024-12-17 11:56:37 +09:00
myname
c40e74b804 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

g/w 기안문 내용 수정
2024-12-17 11:40:26 +09:00
9c312e3f2d Merge branch 'tolag3' 2024-12-16 22:42:37 +09:00
f6fdba6869 Merge branch 'tolag3' 2024-12-16 22:40:32 +09:00
myname
85186ae6e8 2024-12-16 20:45 관인 기안 2024-12-16 20:46:02 +09:00
myname
3150ead21a # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-12-16 11:00:48 +09:00
myname
9bfc02620a 2024-12-12 18:20 일반기안문 내용 수정 2024-12-12 18:21:19 +09:00
myname
485eb1a522 2024-12-12 16:35 중지시 일반 기안 연동 2024-12-12 16:36:07 +09:00
91fe8a3ac2 Merge branch 'tolag3' 2024-12-12 15:50:13 +09:00
53a984a740 Merge branch 'tolag3' 2024-12-12 15:49:49 +09:00
myname
54bb40402f 신청서 출력 2024-12-12 14:25:54 +09:00
myname
95ac1e0b43 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
신청서 출력
2024-12-12 12:52:05 +09:00
JIWOO
a4862dc20e Merge branch 'JIWOO' 2024-12-10 18:33:43 +09:00
JIWOO
ea364504fe 이지우 - 종료사건 상세조회 오류 수정 2024-12-10 18:32:01 +09:00
bca435a379 Merge branch 'tolag3' 2024-12-10 16:04:39 +09:00
6e446510cc Merge branch 'tolag3'
권한 및 메뉴관리 수정
2024-12-10 16:04:19 +09:00
myname
7bf4113dc7 Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-12-10 12:30:09 +09:00
myname
30b4efca9e # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
g/w 동시기안문
2024-12-10 12:29:26 +09:00
bd7a0cef97 Merge branch 'tolag3' 2024-12-10 09:36:35 +09:00
27a558f7ce 애니사인, 나이스 기업조회 2024-12-10 09:36:07 +09:00
myname
252e52f1dd Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-12-09 19:08:54 +09:00
myname
313d6020c0 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
g/w 동시기안
2024-12-09 19:08:30 +09:00
JIWOO
8ea2c24dd3 이지우 - 분쟁조정 사건 프로세스 진행 중 2024-12-09 12:09:13 +09:00
myname
dee3e7a0c5 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
g/w 연동 아이디 확인하고 진행하도록 처리함
2024-12-06 14:55:52 +09:00
myname
9afbd48870 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

gw 연동작업
2024-12-05 14:08:43 +09:00
myname
b5993e9942 Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-12-04 17:47:26 +09:00
myname
fcf1e7aee2 2024-12-04 17:46 협의회 이관 종료 2024-12-04 17:47:05 +09:00
JIWOO
35c1444d60 Merge branch 'JIWOO' 2024-12-04 16:04:48 +09:00
JIWOO
e30577738b 이지우 - 사용자 마이페이지 / 관리자 배정 처리상세에 사건권한 승인요청 기능 개발 완료 2024-12-04 16:03:46 +09:00
myname
a120d26340 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

2024-12-04 14:01 g/w 작업
2024-12-04 14:02:04 +09:00
myname
50cf97f254 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

g/w 기안연동작업
2024-12-03 11:16:44 +09:00
myname
14ec097e3a 2024-11-26 19:14 묶음 기안 2024-11-26 19:14:58 +09:00
myname
c962dbcd20 2024-11-26 13:56 gw 연동 작업 2024-11-26 13:59:11 +09:00
myname
db55521099 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

g/w 연동 수정
2024-11-25 09:56:58 +09:00
myname
6120143e26 2024-11-20 18:19 gw 수동 연동 처리 2024-11-20 18:20:03 +09:00
myname
25bf900b69 Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-11-20 10:03:27 +09:00
myname
97ce174b4a # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

gw 콜백수동 처리
2024-11-20 10:03:11 +09:00
fb87ee35fe Merge branch 'tolag3' 2024-11-19 16:50:59 +09:00
b5fc6dfb48 Merge branch 'tolag3'
사용자 검색
2024-11-18 17:32:04 +09:00
myname
c97688d0f0 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

착수 보고 상신 작업
2024-11-15 16:43:13 +09:00
myname
0169a7caa3 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

alert 제거
2024-11-14 10:39:04 +09:00
myname
0c6d441a15 Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-11-13 18:26:25 +09:00
myname
e3a8d94f11 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-11-13 18:26:09 +09:00
JIWOO
4bc494792d 이지우 - 관리자 분쟁조정 사례 관리, 분쟁조정안내, 뉴스레터에 이노릭스 도입 2024-11-11 17:46:07 +09:00
JIWOO
aa3506f868 이지우 - 관리자 분쟁조정서식 수정에도 이노릭스 적용 2024-11-08 18:51:16 +09:00
JIWOO
f1c88cbbf5 이지우 - 관리자 > 분쟁조정관련서식 등록 시 이노릭스 적용 완료. 수정화면 작업 중 2024-11-08 15:35:11 +09:00
myname
314b8b0dd1 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

2024-11-06 g/w 수정
2024-11-06 16:22:45 +09:00
JIWOO
743ef5de60 Merge branch 'JIWOO' 2024-11-06 10:02:22 +09:00
JIWOO
a61a82d316 이지우 > 대용량 업로드 솔루션 작업 중 2024-11-06 09:59:35 +09:00
myname
94e43760c9 2024-11-05 14:41 통계정보 수정 2024-11-05 14:41:53 +09:00
myname
1132b5acf9 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

기관경과 사건현황
2024-11-05 09:51:29 +09:00
JIWOO
9dabe697fa Merge branch 'JIWOO' 2024-11-01 10:24:17 +09:00
JIWOO
32d19a0011 이지우 - 이노릭스 업로드 작업 중 2024-11-01 10:22:46 +09:00
myname
378a192e4d 2024-10-31 19:38 통계 쿼리 추가 2024-10-31 19:38:42 +09:00
JIWOO
510c2e1c17 이지우 > 관리자 > 분쟁조정관련서식 > 기존 다운로드 구현 완료 및 2024-10-29 18:34:05 +09:00
JIWOO
784d13d3fd 이지우 - 이노릭스 작업 중 2024-10-29 10:16:32 +09:00
JIWOO
2e22fabb73 Merge branch 'JIWOO'
Conflicts:
	src/main/resources/egovframework/egovProps/globals_local.properties
2024-10-23 16:18:30 +09:00
JIWOO
365c594e84 이지우 - 그룹웨어 경로 구분 추가 2024-10-23 16:14:08 +09:00
myname
bbc21324bc # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-10-23 09:50:53 +09:00
myname
97690f6015 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-10-15 11:07:23 +09:00
9bf98ca135 메인화면 개발 2024-10-10 16:59:47 +09:00
JIWOO
db55f294f9 이지우 - 관리자 분쟁조정 처리 작업 중 2024-10-07 12:21:43 +09:00
JIWOO
2dfbcd1fee Merge branch 'JIWOO' 2024-09-30 16:27:51 +09:00
JIWOO
19840ab38b 이지우 - 그룹웨어 테스트 중 2024-09-30 16:17:56 +09:00
myname
610264e10a 2024-09-27 17:39 분쟁조정 사례 작업 2024-09-27 17:39:50 +09:00