diff --git a/src/main/java/com/dbnt/faisp/equip/EquipController.java b/src/main/java/com/dbnt/faisp/equip/EquipController.java index cd8ecd9e..e1657f29 100644 --- a/src/main/java/com/dbnt/faisp/equip/EquipController.java +++ b/src/main/java/com/dbnt/faisp/equip/EquipController.java @@ -39,8 +39,9 @@ public class EquipController { @GetMapping("/equipStatus") - public ModelAndView equipStatus() { + public ModelAndView equipStatus(Equip equip) { ModelAndView mav = new ModelAndView("equip/equipStatus"); + mav.addObject("equipList", equipService.selectEquipStatus(equip)); return mav; } diff --git a/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java b/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java index e99ec857..ba0c8d1c 100644 --- a/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java +++ b/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java @@ -1,5 +1,6 @@ package com.dbnt.faisp.equip.mapper; +import com.dbnt.faisp.equip.model.Equip; import com.dbnt.faisp.translator.model.Translator; import com.dbnt.faisp.translator.model.TranslatorCrr; import com.dbnt.faisp.userInfo.model.UserInfo; @@ -12,6 +13,8 @@ import java.util.List; @Mapper public interface EquipMapper { + List selectEquipStatus(Equip equip); + } diff --git a/src/main/java/com/dbnt/faisp/equip/service/EquipService.java b/src/main/java/com/dbnt/faisp/equip/service/EquipService.java index 4642ace5..1ec11383 100644 --- a/src/main/java/com/dbnt/faisp/equip/service/EquipService.java +++ b/src/main/java/com/dbnt/faisp/equip/service/EquipService.java @@ -6,12 +6,6 @@ import com.dbnt.faisp.equip.model.Equip; import com.dbnt.faisp.equip.model.EquipFile; import com.dbnt.faisp.equip.repository.EquipFileRepository; import com.dbnt.faisp.equip.repository.EquipRepository; -import com.dbnt.faisp.translator.mapper.TranslatorMapper; -import com.dbnt.faisp.translator.model.Translator; -import com.dbnt.faisp.translator.model.Translator.TranslatorId; -import com.dbnt.faisp.translator.model.TranslatorCrr; -import com.dbnt.faisp.translator.repository.TranslatorCareerRepository; -import com.dbnt.faisp.translator.repository.TranslatorRepository; import com.dbnt.faisp.util.ParamMap; import com.dbnt.faisp.util.Utils; @@ -23,10 +17,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.FileCopyUtils; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartFile; -import org.springframework.core.env.Environment; import java.io.File; -import java.time.LocalDateTime; import java.util.*; @Service @@ -114,5 +106,9 @@ public class EquipService { } } + public List selectEquipStatus(Equip equip) { + return equipMapper.selectEquipStatus(equip); + } + } diff --git a/src/main/resources/mybatisMapper/EquipMapper.xml b/src/main/resources/mybatisMapper/EquipMapper.xml index 93692bce..2f1c3710 100644 --- a/src/main/resources/mybatisMapper/EquipMapper.xml +++ b/src/main/resources/mybatisMapper/EquipMapper.xml @@ -4,6 +4,197 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + + \ No newline at end of file diff --git a/src/main/resources/static/js/equip/equip.js b/src/main/resources/static/js/equip/equip.js index b3567372..1579112c 100644 --- a/src/main/resources/static/js/equip/equip.js +++ b/src/main/resources/static/js/equip/equip.js @@ -1,3 +1,17 @@ +$(document).ready(function(){ + $(".table_id").each(function(){ + var rows = $(".table_id:contains('"+$(this).text()+"')"); + + if(rows.length > 1){ + rows.eq(0).attr("rowspan", rows.length); + rows.not(":eq(0)").remove(); + } + }) + +}); + + + $(document).on('click', '#addEquip', function (){ $.ajax({ url: '/equip/equipEditModal', diff --git a/src/main/resources/templates/equip/equipStatus.html b/src/main/resources/templates/equip/equipStatus.html index ab484ea5..73042d44 100644 --- a/src/main/resources/templates/equip/equipStatus.html +++ b/src/main/resources/templates/equip/equipStatus.html @@ -61,7 +61,12 @@ - + + + + + + @@ -69,15 +74,6 @@ - - - - - - - - - @@ -106,7 +102,37 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
연번분류세부분류총계본청 중부 서해 남해제주
연번분류세부분류총계본청
인천서 평택서