diff --git a/src/main/resources/mybatisMapper/EquipMapper.xml b/src/main/resources/mybatisMapper/EquipMapper.xml index 02080c29..50881d1f 100644 --- a/src/main/resources/mybatisMapper/EquipMapper.xml +++ b/src/main/resources/mybatisMapper/EquipMapper.xml @@ -17,7 +17,6 @@ cnt_pyeongtaek+ cnt_taean+ cnt_boryeong+ - cnt_seotd+ cnt_west+ cnt_mokpo+ cnt_buan+ @@ -30,7 +29,6 @@ cnt_changwon+ cnt_tongyong+ cnt_sacheon+ - cnt_jungtd+ cnt_east+ cnt_sokcho+ cnt_donghe+ @@ -45,7 +43,6 @@ sum(cnt_pyeongtaek) as cnt_pyeongtaek, sum(cnt_taean) as cnt_taean, sum(cnt_boryeong) as cnt_boryeong, - sum(cnt_seotd) as cnt_seotd, sum(cnt_west) as cnt_west, sum(cnt_mokpo) as cnt_mokpo, sum(cnt_buan) as cnt_buan, @@ -58,7 +55,6 @@ sum(cnt_changwon) as cnt_changwon, sum(cnt_tongyong) as cnt_tongyong, sum(cnt_sacheon) as cnt_sacheon, - sum(cnt_jungtd) as cnt_jungtd, sum(cnt_east) as cnt_east, sum(cnt_sokcho) as cnt_sokcho, sum(cnt_donghe) as cnt_donghe, @@ -175,15 +171,7 @@ case when b.mgt_organ = 'OG026' then b.item_qty else 0 - end as cnt_seoguipo, - case - when b.mgt_organ = 'OG027' then b.item_qty - else 0 - end as cnt_seotd, - case - when b.mgt_organ = 'OG028' then b.item_qty - else 0 - end as cnt_jungtd + end as cnt_seoguipo from (select category_cd, item_cd, item_value diff --git a/src/main/resources/templates/equip/equipEditModal.html b/src/main/resources/templates/equip/equipEditModal.html index 178c4ad4..a94cf33c 100644 --- a/src/main/resources/templates/equip/equipEditModal.html +++ b/src/main/resources/templates/equip/equipEditModal.html @@ -14,9 +14,11 @@ diff --git a/src/main/resources/templates/equip/equipModifyModal.html b/src/main/resources/templates/equip/equipModifyModal.html index 1e1b874c..8dbf497a 100644 --- a/src/main/resources/templates/equip/equipModifyModal.html +++ b/src/main/resources/templates/equip/equipModifyModal.html @@ -16,8 +16,10 @@ diff --git a/src/main/resources/templates/equip/equipStatus.html b/src/main/resources/templates/equip/equipStatus.html index ea4e9860..0ec4f697 100644 --- a/src/main/resources/templates/equip/equipStatus.html +++ b/src/main/resources/templates/equip/equipStatus.html @@ -48,9 +48,9 @@