From bdffee9f964710d016a70c30f44c8c1e92ee12cd Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Mon, 26 Sep 2022 17:57:06 +0900 Subject: [PATCH] =?UTF-8?q?fix:=EC=99=B8=EC=82=AC=EC=9E=A5=EB=B9=84?= =?UTF-8?q?=ED=98=84=ED=99=A9=20=EC=A4=91=EA=B0=84=EC=A0=80=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dbnt/faisp/equip/EquipController.java | 70 ++++++--- .../dbnt/faisp/equip/mapper/EquipMapper.java | 8 +- .../com/dbnt/faisp/equip/model/Equip.java | 5 +- .../com/dbnt/faisp/equip/model/EquipLog.java | 56 +++++++ .../equip/repository/EquipLogRepository.java | 15 ++ .../equip/repository/EquipRepository.java | 1 - .../faisp/equip/service/EquipService.java | 51 ++++++- .../translator/TranslatorController.java | 4 - src/main/java/com/dbnt/faisp/util/Utils.java | 142 ++++++++++++++---- .../resources/mybatisMapper/EquipMapper.xml | 60 +++++++- src/main/resources/static/js/equip/equip.js | 24 +++ .../templates/equip/equipHistory.html | 2 +- .../resources/templates/equip/equipList.html | 28 +--- .../templates/equip/equipLogList.html | 120 +++++++++++++++ .../templates/equip/equipModifyModal.html | 6 +- .../templates/equip/equipStatus.html | 31 +--- 16 files changed, 508 insertions(+), 115 deletions(-) create mode 100644 src/main/java/com/dbnt/faisp/equip/model/EquipLog.java create mode 100644 src/main/java/com/dbnt/faisp/equip/repository/EquipLogRepository.java create mode 100644 src/main/resources/templates/equip/equipLogList.html diff --git a/src/main/java/com/dbnt/faisp/equip/EquipController.java b/src/main/java/com/dbnt/faisp/equip/EquipController.java index fe970767..8d040ba7 100644 --- a/src/main/java/com/dbnt/faisp/equip/EquipController.java +++ b/src/main/java/com/dbnt/faisp/equip/EquipController.java @@ -1,12 +1,10 @@ package com.dbnt.faisp.equip; + import com.dbnt.faisp.authMgt.service.AuthMgtService; import com.dbnt.faisp.equip.model.Equip; +import com.dbnt.faisp.equip.model.EquipLog; import com.dbnt.faisp.equip.service.EquipService; -import com.dbnt.faisp.organMgt.service.OrganConfigService; -import com.dbnt.faisp.translator.model.Translator; -import com.dbnt.faisp.translator.model.TranslatorCrr; -import com.dbnt.faisp.translator.service.TranslatorService; import com.dbnt.faisp.userInfo.model.UserInfo; import com.dbnt.faisp.util.ParamMap; import com.dbnt.faisp.util.Utils; @@ -19,13 +17,12 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.time.LocalDateTime; -import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.servlet.http.HttpServletResponse; import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; @@ -36,17 +33,17 @@ import org.springframework.web.servlet.ModelAndView; @RequestMapping("/equip") public class EquipController { - private final AuthMgtService authMgtService; - private final TranslatorService translatorSevice; - private final OrganConfigService organConfigService; private final EquipService equipService; - + private final AuthMgtService authMgtService; @GetMapping("/equipStatus") - public ModelAndView equipStatus(Equip equip) { + public ModelAndView equipStatus(@AuthenticationPrincipal UserInfo loginUser, Equip equip) { ModelAndView mav = new ModelAndView("equip/equipStatus"); - mav.addObject("equipList", equipService.selectEquipStatus(equip)); + //메뉴권한 확인 + String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/equipStatus").get(0).getAccessAuth(); + mav.addObject("accessAuth", accessAuth); + mav.addObject("equipList", equipService.selectEquipStatus(equip)); return mav; } @@ -60,7 +57,6 @@ public class EquipController { @GetMapping("/equipTypeSelecBox") public ModelAndView equipTypeSelecBox(String equType) { - System.out.println("@@"+equType); ModelAndView mav = new ModelAndView("equip/equipTypeSelecBox"); mav.addObject("equType", equType); return mav; @@ -78,6 +74,10 @@ public class EquipController { @GetMapping("/List") public ModelAndView equipList(@AuthenticationPrincipal UserInfo loginUser,Equip equip) { ModelAndView mav = new ModelAndView("equip/equipList"); + + //메뉴권한 확인 + String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/equipStatus").get(0).getAccessAuth(); + mav.addObject("accessAuth", accessAuth); equip.setDownOrganCdList(loginUser.getDownOrganCdList()); ParamMap equType = equipService.selectEduType(equip); mav.addObject("equType", equType.get("equ_type")); @@ -92,8 +92,12 @@ public class EquipController { } @GetMapping("/updatePage") - public ModelAndView equipUpdatePage(Equip equip) { + public ModelAndView equipUpdatePage(@AuthenticationPrincipal UserInfo loginUser, Equip equip) { ModelAndView mav = new ModelAndView("equip/equipModifyModal"); + //메뉴권한 확인 + String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/equipStatus").get(0).getAccessAuth(); + mav.addObject("accessAuth", accessAuth); + mav.addObject("userId", loginUser.getUserId()); mav.addObject("equInfo", equipService.selectEquipInfo(equip)); return mav; } @@ -101,7 +105,6 @@ public class EquipController { @PostMapping("/updateEquip") @ResponseBody public int updateEquip(@AuthenticationPrincipal UserInfo loginUser,Equip equip, MultipartHttpServletRequest request){ - System.out.println("equip@"+equip); equip.setWrtNm(loginUser.getUserId()); equip.setMgtOrgan(loginUser.getOgCd()); equip.setWrtOrgan(loginUser.getOgCd()); @@ -124,8 +127,8 @@ public class EquipController { } @PostMapping("/epuipDelete") - public void epuipDelete(@RequestBody List equip){ - equipService.equipDelete(equip); + public void epuipDelete(@AuthenticationPrincipal UserInfo loginUser, @RequestBody List equip){ + equipService.equipDelete(equip,loginUser); } @@ -164,6 +167,39 @@ public class EquipController { } } + @GetMapping("/Log") + public ModelAndView equipLog(@AuthenticationPrincipal UserInfo loginUser,EquipLog equipLog) { + ModelAndView mav = new ModelAndView("equip/equipLogList"); + equipLog.setDownOrganCdList(loginUser.getDownOrganCdList()); + equipLog.setQueryInfo(); + mav.addObject("logList", equipService.selectEquipLogList(equipLog)); + equipLog.setContentCnt(equipService.selectEquipLogListCnt(equipLog)); + equipLog.setPaginationInfo(); + mav.addObject("searchParams", equipLog); + + return mav; + } + + @GetMapping("/statusExcelDown") + public void statisticsExcelDown(Model model,HttpServletResponse response, Equip equip) { + String[] headers = { "rownum","equ_type", "item_value", "total", "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"}; + String[] headerNames = { "", "", "", "", "", "중부", "", "","","","서해","","","","","","남해","","","","","","동해","","","","","제주","",""}; + String[] headerNames2 = { "연번", "분류", "세부분류", "총계", "본청", "청", "인천서", "평택서","태안서","보령서","청","목포서","부안서","군산서","여수서","완도서","청","울산서","부산서","창원서","통영서","서천서","청","속초서","동해서","울진서","포항서","청","제주서","서귀포서"}; + String[] columnType = { "int", "String", "String", "int", "int", "int", "int", "int","int","int","int","int","int","int","int","int","int","int","int","int", + "int","int","int","int","int","int","int","int","int","int"}; + String sheetName = "외사장비현황"; + String excelFileName = "외사장비현황"; + List equStatusList = equipService.selectEquipStatus(equip); + + try { + Utils.downEquipStatusExcel(equStatusList, response, headers, headerNames,headerNames2, columnType, sheetName, excelFileName); + } catch (IOException e) { + model.addAttribute("message", "엑셀다운로드 중 오류가 발생했습니다."); + } + } + 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 1890d13d..7e451dce 100644 --- a/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java +++ b/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java @@ -1,9 +1,7 @@ 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; +import com.dbnt.faisp.equip.model.EquipLog; import com.dbnt.faisp.util.ParamMap; import org.apache.ibatis.annotations.Mapper; @@ -25,6 +23,10 @@ public interface EquipMapper { Equip selectHistoryDetail(Equip equip); + List selectEquipLogList(EquipLog equipLog); + + Integer selectEquipLogListCnt(EquipLog equipLog); + } diff --git a/src/main/java/com/dbnt/faisp/equip/model/Equip.java b/src/main/java/com/dbnt/faisp/equip/model/Equip.java index dd9c5f9d..e4365868 100644 --- a/src/main/java/com/dbnt/faisp/equip/model/Equip.java +++ b/src/main/java/com/dbnt/faisp/equip/model/Equip.java @@ -42,8 +42,6 @@ public class Equip extends BaseModel implements Serializable{ private String detailType; @Column(name = "stored_year") private String storedYear; - @Column(name = "mgt_type") - private String mgtType; @Column(name = "item_qty") private Integer itemQty; @Column(name = "item_condition") @@ -73,7 +71,8 @@ public class Equip extends BaseModel implements Serializable{ private Integer deleteFileKey; @Transient private Integer deleteFileVnum; - + @Transient + private String noUpdateImg; @Embeddable @Data diff --git a/src/main/java/com/dbnt/faisp/equip/model/EquipLog.java b/src/main/java/com/dbnt/faisp/equip/model/EquipLog.java new file mode 100644 index 00000000..435c1f24 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/equip/model/EquipLog.java @@ -0,0 +1,56 @@ +package com.dbnt.faisp.equip.model; + + +import com.dbnt.faisp.config.BaseModel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.time.LocalDateTime; + + +@Getter +@Setter +@Entity +@NoArgsConstructor +@DynamicInsert +@DynamicUpdate +@Table(name = "equ_Log") +public class EquipLog extends BaseModel{ + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "el_seq") + private Integer userSeq; + @Column(name = "equ_type") + private String equType; + @Column(name = "detail_type") + private String detailType; + @Column(name = "el_contents") + private String elContents; + @Column(name = "wrt_nm") + private String wrtNm; + @Column(name = "wrt_organ") + private String wrtOrgan; + @Column(name = "wrt_dt") + private LocalDateTime wrtDt; + + @Transient + private String sosok; + @Transient + private String detailSosok; + @Transient + private String detailName; + +@Override +public String toString() { + return "EquipLog [userSeq=" + userSeq + ", equType=" + equType + ", detailType=" + detailType + ", elContents=" + + elContents + ", wrtNm=" + wrtNm + ", wrtOrgan=" + wrtOrgan + ", wrtDt=" + wrtDt + ", sosok=" + sosok + + ", detailSosok=" + detailSosok + ", detailName=" + detailName + "]"; +} + + + +} diff --git a/src/main/java/com/dbnt/faisp/equip/repository/EquipLogRepository.java b/src/main/java/com/dbnt/faisp/equip/repository/EquipLogRepository.java new file mode 100644 index 00000000..b54b44c3 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/equip/repository/EquipLogRepository.java @@ -0,0 +1,15 @@ +package com.dbnt.faisp.equip.repository; + +import com.dbnt.faisp.equip.model.EquipLog; + +import org.springframework.data.jpa.repository.JpaRepository; + + + +public interface EquipLogRepository extends JpaRepository { + + + + + +} diff --git a/src/main/java/com/dbnt/faisp/equip/repository/EquipRepository.java b/src/main/java/com/dbnt/faisp/equip/repository/EquipRepository.java index dbc5ff63..b2e456a3 100644 --- a/src/main/java/com/dbnt/faisp/equip/repository/EquipRepository.java +++ b/src/main/java/com/dbnt/faisp/equip/repository/EquipRepository.java @@ -3,7 +3,6 @@ package com.dbnt.faisp.equip.repository; import com.dbnt.faisp.equip.model.Equip; import java.util.List; -import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; 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 b9a13382..de6610ae 100644 --- a/src/main/java/com/dbnt/faisp/equip/service/EquipService.java +++ b/src/main/java/com/dbnt/faisp/equip/service/EquipService.java @@ -6,10 +6,10 @@ import com.dbnt.faisp.equip.model.Equip; import com.dbnt.faisp.equip.model.Equip.EquipId; import com.dbnt.faisp.equip.model.EquipFile; import com.dbnt.faisp.equip.model.EquipFile.EquipFileId; +import com.dbnt.faisp.equip.model.EquipLog; import com.dbnt.faisp.equip.repository.EquipFileRepository; +import com.dbnt.faisp.equip.repository.EquipLogRepository; import com.dbnt.faisp.equip.repository.EquipRepository; -import com.dbnt.faisp.translator.model.Translator; -import com.dbnt.faisp.translator.model.Translator.TranslatorId; import com.dbnt.faisp.userInfo.model.UserInfo; import com.dbnt.faisp.util.ParamMap; import com.dbnt.faisp.util.Utils; @@ -24,6 +24,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartFile; import java.io.File; +import java.time.LocalDateTime; import java.util.*; @Service @@ -34,6 +35,7 @@ public class EquipService { private final EquipRepository equipRepository; private final EquipFileRepository equipFileRepository; + private final EquipLogRepository equipLogRepository; private final EquipMapper equipMapper; @@ -51,6 +53,14 @@ public class EquipService { equipRepository.save(equip); } saveFile(equip,request); + EquipLog equLog = new EquipLog(); + equLog.setEquType(equip.getEquType()); + equLog.setDetailType(equip.getDetailType()); + equLog.setElContents("입력"); + equLog.setWrtNm(equip.getWrtNm()); + equLog.setWrtOrgan(equip.getWrtOrgan()); + equLog.setWrtDt(equip.getWrtDt()); + equipLogRepository.save(equLog); } catch (Exception e) { e.printStackTrace(); } @@ -147,6 +157,14 @@ public class EquipService { equipTmp.setWrtDt(equip.getWrtDt()); equipRepository.save(equipTmp); updateFile(equip,equipTmp,request); + EquipLog equLog = new EquipLog(); + equLog.setEquType(equip.getEquType()); + equLog.setDetailType(equip.getDetailType()); + equLog.setElContents("수정"); + equLog.setWrtNm(equip.getWrtNm()); + equLog.setWrtOrgan(equip.getWrtOrgan()); + equLog.setWrtDt(equip.getWrtDt()); + equipLogRepository.save(equLog); } catch (Exception e) { e.printStackTrace(); } @@ -200,6 +218,17 @@ public class EquipService { equipFile.setFilePath(path); equipFile.setFileSize(FileSize); + equipFileRepository.save(equipFile); + } else if(equip.getNoUpdateImg() != null) { + EquipFile equipFile = new EquipFile(); + equipFile.setEquKey(equipTmp.getEquKey()); + equipFile.setVersionNo(equipTmp.getVersionNo()); + EquipFile dbEquFile = equipFileRepository.findById(new EquipFileId(equip.getEquKey(), equip.getVersionNo())).orElse(null); + equipFile.setOrigNm(dbEquFile.getOrigNm()); + equipFile.setConvNm(dbEquFile.getConvNm()); + equipFile.setFileExtn(dbEquFile.getFileExtn()); + equipFile.setFilePath(dbEquFile.getFilePath()); + equipFile.setFileSize(dbEquFile.getFileSize()); equipFileRepository.save(equipFile); } else { EquipFile equipFile = new EquipFile(); @@ -226,7 +255,7 @@ public class EquipService { } @Transactional - public void equipDelete(List equip) { + public void equipDelete(List equip,UserInfo loginUser) { for(Equip equ: equip) { //파일삭제 Equip dbEquip = equipMapper.selectEquipInfo(equ); @@ -240,9 +269,25 @@ public class EquipService { } equipRepository.deleteByEquKey(equ.getEquKey()); equipFileRepository.deleteByEquKey(equ.getEquKey()); + EquipLog equLog = new EquipLog(); + equLog.setEquType(dbEquip.getEquType()); + equLog.setDetailType(dbEquip.getDetailType()); + equLog.setElContents("삭제"); + equLog.setWrtNm(loginUser.getUserId()); + equLog.setWrtOrgan(loginUser.getOgCd()); + equLog.setWrtDt(LocalDateTime.now()); + equipLogRepository.save(equLog); } } + + public List selectEquipLogList(EquipLog equipLog) { + return equipMapper.selectEquipLogList(equipLog); + } + + public Integer selectEquipLogListCnt(EquipLog equipLog) { + return equipMapper.selectEquipLogListCnt(equipLog); + } diff --git a/src/main/java/com/dbnt/faisp/translator/TranslatorController.java b/src/main/java/com/dbnt/faisp/translator/TranslatorController.java index 468a8e78..6c660793 100644 --- a/src/main/java/com/dbnt/faisp/translator/TranslatorController.java +++ b/src/main/java/com/dbnt/faisp/translator/TranslatorController.java @@ -1,7 +1,6 @@ package com.dbnt.faisp.translator; import com.dbnt.faisp.authMgt.service.AuthMgtService; -import com.dbnt.faisp.organMgt.service.OrganConfigService; import com.dbnt.faisp.translator.model.Translator; import com.dbnt.faisp.translator.model.TranslatorCrr; import com.dbnt.faisp.translator.service.TranslatorService; @@ -12,9 +11,7 @@ import com.dbnt.faisp.util.Utils; import lombok.RequiredArgsConstructor; import java.io.IOException; -import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.servlet.http.HttpServletResponse; @@ -30,7 +27,6 @@ public class TranslatorController { private final AuthMgtService authMgtService; private final TranslatorService translatorSevice; - private final OrganConfigService organConfigService; @GetMapping("/info") diff --git a/src/main/java/com/dbnt/faisp/util/Utils.java b/src/main/java/com/dbnt/faisp/util/Utils.java index 7daa2faa..7b77386a 100644 --- a/src/main/java/com/dbnt/faisp/util/Utils.java +++ b/src/main/java/com/dbnt/faisp/util/Utils.java @@ -1,35 +1,19 @@ package com.dbnt.faisp.util; -import java.awt.image.BufferedImage; -import java.io.BufferedReader; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileInputStream; + import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStream; + import java.io.PrintWriter; -import java.net.HttpURLConnection; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.net.URL; -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Base64; + import java.util.Date; -import java.util.Enumeration; import java.util.List; import java.util.Map; -import java.util.Random; -import javax.imageio.ImageIO; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; + import javax.servlet.http.HttpServletResponse; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; + +import org.apache.poi.ss.usermodel.BorderStyle; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.FillPatternType; @@ -41,12 +25,6 @@ import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.XSSFDataFormat; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.springframework.ui.Model; -import org.springframework.util.FileCopyUtils; - - - -import com.dbnt.faisp.util.ParamMap; public class Utils { @@ -288,6 +266,114 @@ public class Utils { } + public static void downEquipStatusExcel(List list, HttpServletResponse response, String[] headers, String[] headerNames,String[] headerNames2, String[] columnType, String sheetName, String excelFileName) throws IOException { + if(Utils.isNotEmpty(list)) { + // 메모리에 100개의 행을 유지합니다. 행의 수가 넘으면 디스크에 적습니다. + XSSFWorkbook wb = new XSSFWorkbook(); + Sheet sheet = wb.createSheet(sheetName); + Row headerRow = sheet.createRow(0); + Row headerRow2 = sheet.createRow(1); + CellStyle cellStyle1 = wb.createCellStyle(); //쉼표들어간 숫자 양식 + CellStyle cellStyle2 = wb.createCellStyle(); //숫자양식 + CellStyle headerStyle = wb.createCellStyle(); //숫자양식 + CellStyle headerStyle2 = wb.createCellStyle(); + CellStyle headerStyle3 = wb.createCellStyle(); + + XSSFDataFormat format = wb.createDataFormat(); + cellStyle1.setDataFormat(format.getFormat("#,##0")); + cellStyle2.setDataFormat(format.getFormat("#,##0")); + cellStyle2.setAlignment(HorizontalAlignment.CENTER); + headerStyle2.setBorderTop(BorderStyle.THIN); + headerStyle2.setBorderBottom(BorderStyle.THIN); + headerStyle2.setBorderLeft(BorderStyle.THIN); + headerStyle2.setBorderRight(BorderStyle.THIN); + headerStyle2.setAlignment(HorizontalAlignment.CENTER); + headerStyle2.setFillPattern(FillPatternType.SOLID_FOREGROUND); + headerStyle2.setFillForegroundColor((short)3); + headerStyle2.setFillForegroundColor(IndexedColors.LIME.getIndex()); + headerStyle.setAlignment(HorizontalAlignment.CENTER); + headerStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND); + headerStyle.setFillForegroundColor((short)3); + headerStyle.setFillForegroundColor(IndexedColors.LIME.getIndex()); + headerStyle3.setBorderTop(BorderStyle.THIN); + headerStyle3.setBorderBottom(BorderStyle.THIN); + headerStyle3.setBorderLeft(BorderStyle.THIN); + headerStyle3.setBorderRight(BorderStyle.THIN); + headerStyle3.setAlignment(HorizontalAlignment.CENTER); + headerStyle3.setFillPattern(FillPatternType.SOLID_FOREGROUND); + headerStyle3.setFillForegroundColor((short)3); + headerStyle3.setFillForegroundColor(IndexedColors.LIME.getIndex()); + + + //로우그리기 + for(int i=0; i"); + out.write(""); + out.write(""); + out.write(""); + out.write(""); + out.write(""); + + out.flush(); + out.close(); + } + + } + diff --git a/src/main/resources/mybatisMapper/EquipMapper.xml b/src/main/resources/mybatisMapper/EquipMapper.xml index 48924124..531c17f8 100644 --- a/src/main/resources/mybatisMapper/EquipMapper.xml +++ b/src/main/resources/mybatisMapper/EquipMapper.xml @@ -6,7 +6,8 @@ + + + + \ 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 aed8acf1..66060ab0 100644 --- a/src/main/resources/static/js/equip/equip.js +++ b/src/main/resources/static/js/equip/equip.js @@ -94,6 +94,10 @@ $(document).on('click', '#saveEquip', function (){ }); $(document).on('click', '#equUpdateBtn', function (){ + if($('input:checkbox[name=equChk]:checked').length < 1){ + alert("게시물을 선택해주세요") + return false; + } if($('input:checkbox[name=equChk]:checked').length > 1){ alert("한개만 선택해주세요") return false; @@ -168,6 +172,10 @@ $(document).on('click', '#updateEquip', function (){ }); $(document).on('click', '#historyBtn', function (){ + if($('input:checkbox[name=equChk]:checked').length < 1){ + alert("게시물을 선택해주세요") + return false; + } if($('input:checkbox[name=equChk]:checked').length > 1){ alert("한개만 선택해주세요") return false; @@ -254,3 +262,19 @@ $(document).ready( function() { $('.equInfoCheckBox').prop('checked',this.checked); }); }); + +$(document).on('click', '#statusExcel', function (){ + if(confirm("엑셀로 다운로드 하시겠습니까?")){ + location.href='/equip/statusExcelDown' + } +}) + +$(document).on('click', '#closeModal', function (){ + location.reload(); +}) + +$(document).on('click', '.btn-close', function (){ + location.reload(); +}) + + diff --git a/src/main/resources/templates/equip/equipHistory.html b/src/main/resources/templates/equip/equipHistory.html index 3b64cf6f..2f384aa8 100644 --- a/src/main/resources/templates/equip/equipHistory.html +++ b/src/main/resources/templates/equip/equipHistory.html @@ -94,7 +94,7 @@
- +
diff --git a/src/main/resources/templates/equip/equipList.html b/src/main/resources/templates/equip/equipList.html index 884d5fe4..04acee87 100644 --- a/src/main/resources/templates/equip/equipList.html +++ b/src/main/resources/templates/equip/equipList.html @@ -8,7 +8,6 @@

-
@@ -28,26 +27,7 @@
- -
-
- -
-
- -
-
- +
@@ -94,9 +74,9 @@
- - - + + +
diff --git a/src/main/resources/templates/equip/equipLogList.html b/src/main/resources/templates/equip/equipLogList.html new file mode 100644 index 00000000..0c27d5ae --- /dev/null +++ b/src/main/resources/templates/equip/equipLogList.html @@ -0,0 +1,120 @@ + + + + + +
+
+

외사장비현황

+ + + +
+
+
+
+ + +
+
+ +
+
+
+
+ +
+
+ +
+ +
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
소속세부소속분류세부분류수정자수정내용수정일시
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+ +
+ \ No newline at end of file diff --git a/src/main/resources/templates/equip/equipModifyModal.html b/src/main/resources/templates/equip/equipModifyModal.html index 01d1111f..cd625d07 100644 --- a/src/main/resources/templates/equip/equipModifyModal.html +++ b/src/main/resources/templates/equip/equipModifyModal.html @@ -72,7 +72,7 @@
- + @@ -86,8 +86,8 @@
- - + +
\ No newline at end of file diff --git a/src/main/resources/templates/equip/equipStatus.html b/src/main/resources/templates/equip/equipStatus.html index 0010b82e..9dc0d8be 100644 --- a/src/main/resources/templates/equip/equipStatus.html +++ b/src/main/resources/templates/equip/equipStatus.html @@ -13,7 +13,7 @@ @@ -25,30 +25,8 @@
+
-
- -
-
- -
-
- -
-
- -
-
@@ -60,7 +38,6 @@
- @@ -83,7 +60,7 @@ - + @@ -138,7 +115,7 @@
연번 분류목포서 부안서 군산서여수여수서 완도서 청 울산서
- +