xit-app
/
IBMS_NEW
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
dev
dg_kim 3 months ago
parent a078387a3a 7d2321b2fb
commit 38f9dafe8e
10 changed files with 57 additions and 14 deletions
Show Stats Download Patch File Download Diff File

4
DB-DDL/maria/ddl/ibmsdb/tb_login_log.sql
Unescape Escape View File

@ -1,8 +1,6 @@
-- 로그인 로그 ID 시퀀스 생성
create table tb_login_log
(
LOG_ID varchar(20) comment '로그 ID - 시퀀스 기반'
LOG_ID varchar(20) not null comment '로그 ID - 시퀀스 기반'
primary key,
USER_ID varchar(20) null comment '사용자 ID',
USER_ACNT varchar(20) null comment '사용자 계정',

4
DB-DDL/maria/ddl/ibmsdb/tb_user.sql
Unescape Escape View File

@ -14,12 +14,12 @@ create table tb_user
DADDR varchar(150) null comment '상세주소',
AREA_NO varchar(10) null comment '지역 번호',
EML_ADDR varchar(50) null comment '이메일 주소',
ORG_CD varchar(20) not null comment '조직 CD',
ORG_CD varchar(20) null comment '조직 CD',
USER_GROUP_ID varchar(20) null comment '그룹 ID',
NSTT_CD varchar(8) not null comment '소속기관 코드',
POS_NM varchar(60) null comment '직위 이름',
CRTFC_DN varchar(20) null comment '인증 DN값',
USER_STATUS_CD varchar(20) not null comment '사용자 상태',
USER_STATUS_CD varchar(20) not null comment '사용자 상태',
FXNO varchar(20) null comment '팩스번호',
TELNO varchar(20) null comment '전화번호',
MBL_TELNO varchar(20) null comment '휴대 전화번호',

9
src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/CrdnRegistAndViewVO.java
Unescape Escape View File

@ -148,6 +148,15 @@ public class CrdnRegistAndViewVO extends PagingVO {
/** 단속 처리 상태 코드명 */
private String crdnPrcsSttsCdNm;
/** 소유자명들 (쉼표로 구분) */
private String ownrNams;
/** 지번 전체 주소 */
private String lotnoWholAddr;
/** 우편번호 */
private String zip;
/** 역순 행 번호 (그리드 표시용) */
private Integer rowNum;

11
src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnRegistAndViewMapper_maria.xml
Unescape Escape View File

@ -40,13 +40,22 @@
c.REG_DT,
c.RGTR,
u.USER_ACNT AS RGTR_ACNT,
u.USER_NM AS RGTR_NM
u.USER_NM AS RGTR_NM,
p.LOTNO_WHOL_ADDR,
p.ZIP,
(SELECT GROUP_CONCAT(DISTINCT o2.FLNM SEPARATOR ', ')
FROM tb_ownr_info oi2
LEFT JOIN tb_ownr o2 ON o2.OWNR_ID = oi2.OWNR_ID AND o2.DEL_YN = 'N'
WHERE oi2.CRDN_YR = c.CRDN_YR
AND oi2.CRDN_NO = c.CRDN_NO
AND oi2.DEL_YN = 'N') AS OWNR_NAMS
FROM tb_crdn c
LEFT JOIN tb_cd_detail sgg ON sgg.CD_GROUP_ID = 'ORG_CD' AND sgg.CD_ID = c.SGG_CD
LEFT JOIN tb_cd_detail rgn ON rgn.CD_GROUP_ID = 'RGN_SE_CD' AND rgn.CD_ID = c.RGN_SE_CD
LEFT JOIN tb_cd_detail dscl ON dscl.CD_GROUP_ID = 'DSCL_MTHD_CD' AND dscl.CD_ID = c.DSCL_MTHD_CD
LEFT JOIN tb_cd_detail stts ON stts.CD_GROUP_ID = 'CRDN_PRCS_STTS_CD' AND stts.CD_ID = c.CRDN_PRCS_STTS_CD
LEFT JOIN tb_user u ON u.USER_ID = c.RGTR AND u.USE_YN = 'Y'
LEFT JOIN tb_pstn_info p ON p.CRDN_YR = c.CRDN_YR AND p.CRDN_NO = c.CRDN_NO AND p.DEL_YN = 'N'
WHERE c.DEL_YN = 'N'
<if test='schCrdnYr != null and schCrdnYr != ""'>
AND c.CRDN_YR = #{schCrdnYr}

31
src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/list.jsp
Unescape Escape View File

@ -277,7 +277,7 @@
header: '조사원',
name: 'exmnr',
align: 'left',
width: 120
width: 130
},
{
header: '재부과여부',
@ -303,6 +303,33 @@
align: 'center',
width: 100
},
{
header: '지번주소',
name: 'lotnoWholAddr',
align: 'left',
minwidth: 300,
formatter: function(e) {
return e.value;
}
},
{
header: '우편번호',
name: 'zip',
align: 'center',
width: 80,
formatter: function(e) {
return e.value || '-';
}
},
{
header: '소유자',
name: 'ownrNams',
align: 'left',
width: 130,
formatter: function(e) {
return e.value;
}
},
{
header: '등록일시',
name: 'regDt',
@ -314,7 +341,7 @@
name: 'rgtrNm',
align: 'center',
width: 100
}
},
];
},

2
src/main/webapp/WEB-INF/views/layouts/base/default.jsp
Unescape Escape View File

@ -23,7 +23,7 @@
%>
<title>불법건축물관리</title>
<link rel="shortcut icon" type="image/x-icon" href="<c:url value='/img/common/favicon.ico' />">
<%--<link rel="shortcut icon" type="image/x-icon" href="<c:url value='/img/common/favicon.ico' />">--%>
<%--================== Main Css ======================--%>
<!-- Font & Icon -->

2
src/main/webapp/WEB-INF/views/layouts/login/default.jsp
Unescape Escape View File

@ -7,7 +7,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, user-scalable=no">
<title>불법건축물관리</title>
<link rel="shortcut icon" type="image/x-icon" href="<c:url value='/img/common/favicon.ico' />">
<%--<link rel="shortcut icon" type="image/x-icon" href="<c:url value='/img/common/favicon.ico' />">--%>
<%--================== Main Css ======================--%>
<!-- Font & Icon -->

2
src/main/webapp/WEB-INF/views/layouts/popup/default.jsp
Unescape Escape View File

@ -21,7 +21,7 @@
%>
<title>불법건축물관리</title>
<link rel="shortcut icon" type="image/x-icon" href="<c:url value='/img/common/favicon.ico' />">
<%--<link rel="shortcut icon" type="image/x-icon" href="<c:url value='/img/common/favicon.ico' />">--%>
<%--================== Main Css ======================--%>
<!-- Font & Icon -->

2
src/main/webapp/WEB-INF/views/login/login.jsp
Unescape Escape View File

@ -6,7 +6,7 @@
<div class="login">
<div class="login_head">
<ul>
<li><img src="<c:url value="/img/xit-logo/img_icon.png"/>"><span>고양시<br>일산 서구</span></li>
<li><%--<img src="<c:url value="/img/xit-logo/goyang_logo.png"/>">--%><span>고양시 특례시<br>일산 서구</span></li>
<%--<li>로고 이미지</li>--%>
<li class="tit">불법건축물관리</li>
</ul>

4
src/main/webapp/resources/xit/common_util.js
Unescape Escape View File

@ -39,8 +39,8 @@ $(document).ready(function () {
// 중요로직: 소수점을 허용하는 숫자 마스크 (지적 등에 사용)
$("body").on("focus", ".decimalMask", function () {
$(this).inputmask("numeric", {
autoGroup: true, // 그룹화 사용 안함
groupSeparator: ",", // 그룹 구분자 없음
autoGroup: true, // 그룹화 사용
groupSeparator: ",", // 그룹 구분자
digits: 2, // 소수점 2자리까지 허용
allowMinus: false, // 음수 사용 안함
repeat: 15, // 최대 15자리

Write Preview
Loading…
Cancel
Save