From f74ded8425c60448f523fedf53bdb5eff280de3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Fri, 10 Mar 2023 12:43:25 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=86=8D=ED=98=84=ED=99=A9=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=EC=A1=B0=EA=B1=B4=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EB=B0=A9=EC=97=AD=EC=A1=B0=EC=82=AC=EC=8B=A4,=20=EC=98=81?= =?UTF-8?q?=EC=83=81=EB=85=B9=ED=99=94=EC=9E=A5=EB=B9=84=20=EA=B4=80?= =?UTF-8?q?=EC=84=9C=EC=84=A0=ED=83=9D=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95.=20=EA=B6=8C=ED=95=9C=EC=84=A4=EC=A0=95=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EA=B3=84=EA=B8=89=20=ED=91=9C=ED=98=84=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatisMapper/EquipMapper.xml | 1269 ++++++++--------- .../templates/adminPage/authMgt/authMgt.html | 14 +- .../templates/equip/useEditModal.html | 3 +- .../crackdownStatus/crackdownStatus.html | 12 +- .../fishingBoat/fishingBoatMgt.html | 3 +- .../processResult/processResult.html | 7 +- 6 files changed, 655 insertions(+), 653 deletions(-) diff --git a/src/main/resources/mybatisMapper/EquipMapper.xml b/src/main/resources/mybatisMapper/EquipMapper.xml index e442ca50..299436f6 100644 --- a/src/main/resources/mybatisMapper/EquipMapper.xml +++ b/src/main/resources/mybatisMapper/EquipMapper.xml @@ -4,665 +4,664 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + select (ROW_NUMBER() OVER()) AS rownum, + category_cd, + equ_type, + item_value, + item_cd, + sum( cnt_bon+ + cnt_center+ + cnt_incheon+ + cnt_pyeongtaek+ + cnt_taean+ + cnt_boryeong+ + cnt_west+ + cnt_mokpo+ + cnt_buan+ + cnt_gunsan+ + cnt_yusu+ + cnt_wando+ + cnt_south+ + cnt_ulsan+ + cnt_busan+ + cnt_changwon+ + cnt_tongyong+ + cnt_sacheon+ + cnt_east+ + cnt_sokcho+ + cnt_donghe+ + cnt_ulgin+ + cnt_pohang+ + cnt_jeju+ + cnt_jejuseo+ + cnt_seoguipo) as total, + sum(cnt_bon) as cnt_bon, + sum(cnt_center) as cnt_center, + sum(cnt_incheon) as cnt_incheon, + sum(cnt_pyeongtaek) as cnt_pyeongtaek, + sum(cnt_taean) as cnt_taean, + sum(cnt_boryeong) as cnt_boryeong, + sum(cnt_west) as cnt_west, + sum(cnt_mokpo) as cnt_mokpo, + sum(cnt_buan) as cnt_buan, + sum(cnt_gunsan) as cnt_gunsan, + sum(cnt_yusu) as cnt_yusu, + sum(cnt_wando) as cnt_wando, + sum(cnt_south) as cnt_south, + sum(cnt_ulsan) as cnt_ulsan, + sum(cnt_busan) as cnt_busan, + sum(cnt_changwon) as cnt_changwon, + sum(cnt_tongyong) as cnt_tongyong, + sum(cnt_sacheon) as cnt_sacheon, + sum(cnt_east) as cnt_east, + sum(cnt_sokcho) as cnt_sokcho, + sum(cnt_donghe) as cnt_donghe, + sum(cnt_ulgin) as cnt_ulgin, + sum(cnt_pohang) as cnt_pohang, + sum(cnt_jeju) as cnt_jeju, + sum(cnt_jejuseo) as cnt_jejuseo, + sum(cnt_seoguipo) as cnt_seoguipo + from( + select a.category_cd, + a.item_cd, + (select item_value from code_mgt cmt where a.category_cd = cmt.item_cd) as equ_type, + a.item_value, + case + when b.mgt_organ = 'OG001' then b.item_qty + else 0 + end as cnt_bon, + case + when b.mgt_organ = 'OG002' then b.item_qty + else 0 + end as cnt_center, + case + when b.mgt_organ = 'OG007' then b.item_qty + else 0 + end as cnt_incheon, + case + when b.mgt_organ = 'OG008' then b.item_qty + else 0 + end as cnt_pyeongtaek, + case + when b.mgt_organ = 'OG009' then b.item_qty + else 0 + end as cnt_taean, + case + when b.mgt_organ = 'OG010' then b.item_qty + else 0 + end as cnt_boryeong, + case + when b.mgt_organ = 'OG003' then b.item_qty + else 0 + end as cnt_west, + case + when b.mgt_organ = 'OG011' then b.item_qty + else 0 + end as cnt_mokpo, + case + when b.mgt_organ = 'OG012' then b.item_qty + else 0 + end as cnt_buan, + case + when b.mgt_organ = 'OG013' then b.item_qty + else 0 + end as cnt_gunsan, + case + when b.mgt_organ = 'OG014' then b.item_qty + else 0 + end as cnt_yusu, + case + when b.mgt_organ = 'OG015' then b.item_qty + else 0 + end as cnt_wando, + case + when b.mgt_organ = 'OG004' then b.item_qty + else 0 + end as cnt_south, + case + when b.mgt_organ = 'OG016' then b.item_qty + else 0 + end as cnt_ulsan, + case + when b.mgt_organ = 'OG017' then b.item_qty + else 0 + end as cnt_busan, + case + when b.mgt_organ = 'OG018' then b.item_qty + else 0 + end as cnt_changwon, + case + when b.mgt_organ = 'OG019' then b.item_qty + else 0 + end as cnt_tongyong, + case + when b.mgt_organ = 'OG020' then b.item_qty + else 0 + end as cnt_sacheon, + case + when b.mgt_organ = 'OG005' then b.item_qty + else 0 + end as cnt_east, + case + when b.mgt_organ = 'OG021' then b.item_qty + else 0 + end as cnt_sokcho, + case + when b.mgt_organ = 'OG022' then b.item_qty + else 0 + end as cnt_donghe, + case + when b.mgt_organ = 'OG023' then b.item_qty + else 0 + end as cnt_ulgin, + case + when b.mgt_organ = 'OG024' then b.item_qty + else 0 + end as cnt_pohang, + case + when b.mgt_organ = 'OG006' then b.item_qty + else 0 + end as cnt_jeju, + case + when b.mgt_organ = 'OG025' then b.item_qty + else 0 + end as cnt_jejuseo, + case + when b.mgt_organ = 'OG026' then b.item_qty + else 0 + end as cnt_seoguipo + from (select category_cd, + item_cd, + item_value + from code_mgt + where category_cd in('IT1','IT2','IT3','IT4') + order by category_cd,item_cd asc) a left outer join + (select a.equ_key, + a.version_no, + mgt_organ, + equ_type, + detail_type, + item_qty + from equ_mgt a, + (select equ_key,max(version_no) as lastVer + from equ_mgt group by equ_key) b, + code_mgt cm + where a.equ_key = b.equ_key + and a.version_no = b.lastVer + group by a.equ_key,a.version_no) b on a.item_cd = b.detail_type + order by a.category_cd,a.item_cd asc + ) c + group by c.category_cd,c.equ_type,c.item_value,item_cd + order by category_cd,item_cd asc - + - + - + - + - + - + - + - - + select count(*) + from( + select (select item_value from code_mgt cm where cm.item_cd = equ_type) as equ_type, + (select item_value from code_mgt cm where cm.item_cd = detail_type) as detail_name, + detail_type, + (select item_value from code_mgt where item_cd = wrt_organ) as sosok, + (select item_value from code_mgt where item_cd = wrt_part) as detail_sosok, + el_contents, + wrt_part, + wrt_title, + wrt_nm, + wrt_dt + from equ_log + where wrt_organ in + + #{item} + + order by wrt_dt desc + ) a - + where cm.mgt_organ = oc.organ_cd - and cm.p_user_seq = ui.user_seq - and cm.mgt_organ in - - #{item} - - - and cm.mgt_organ = #{mgtOrgan} - - - and cm.tel_no like '%'||#{telNo}||'%' - - - and ui.user_nm like '%'||#{userNm}||'%' - - - and cm.ext_mail like '%'||#{extMail}||'%' - - - and cm.webex_no like '%'||#{webexNo}||'%' - - - and cm.katalk_id like '%'||#{katalkId}||'%' - + and cm.p_user_seq = ui.user_seq + and cm.mgt_organ in + + #{item} + + + and cm.mgt_organ = #{mgtOrgan} + + + and cm.tel_no like '%'||#{telNo}||'%' + + + and ui.user_nm like '%'||#{userNm}||'%' + + + and cm.ext_mail like '%'||#{extMail}||'%' + + + and cm.webex_no like '%'||#{webexNo}||'%' + + + and cm.katalk_id like '%'||#{katalkId}||'%' + - - - - - - - - - - and ul.mgt_organ = #{mgtOrgan} - - - and ul.use_no like '%'||#{useNo}||'%' - - - and ul.detail_type = #{detailType} - - - - and ul.use_dt >= #{startDate}::date - - - and ul.use_dt <= #{endDate}::date+1 - - - - - and ul.wrt_dt >= #{startDate}::date - - - and ul.wrt_dt <= #{endDate}::date+1 - - - - - - - - - - - - + + + + + + + + + and ul.mgt_organ = #{mgtOrgan} + + + and ul.use_no like '%'||#{useNo}||'%' + + + and ul.detail_type = #{detailType} + + + + and ul.use_dt >= #{startDate}::date + + + and ul.use_dt <= #{endDate}::date+1 + + + + + and ul.wrt_dt >= #{startDate}::date + + + and ul.wrt_dt <= #{endDate}::date+1 + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/adminPage/authMgt/authMgt.html b/src/main/resources/templates/adminPage/authMgt/authMgt.html index 884de9d6..790d3494 100644 --- a/src/main/resources/templates/adminPage/authMgt/authMgt.html +++ b/src/main/resources/templates/adminPage/authMgt/authMgt.html @@ -83,16 +83,20 @@ - - + + - - + + + + + + + - diff --git a/src/main/resources/templates/equip/useEditModal.html b/src/main/resources/templates/equip/useEditModal.html index 0a50ff46..afc390f0 100644 --- a/src/main/resources/templates/equip/useEditModal.html +++ b/src/main/resources/templates/equip/useEditModal.html @@ -13,8 +13,7 @@
- diff --git a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html index d6a39068..f4e88917 100644 --- a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html +++ b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html @@ -88,9 +88,9 @@
@@ -99,9 +99,9 @@
diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html index 7a4aecc3..8bd1c06b 100644 --- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html +++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html @@ -56,7 +56,8 @@
diff --git a/src/main/resources/templates/faStatistics/processResult/processResult.html b/src/main/resources/templates/faStatistics/processResult/processResult.html index b90222f5..81fac972 100644 --- a/src/main/resources/templates/faStatistics/processResult/processResult.html +++ b/src/main/resources/templates/faStatistics/processResult/processResult.html @@ -45,11 +45,10 @@