From d8f83981b473ff7ee231a135c4c4e1fee7e162e9 Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Wed, 12 Oct 2022 11:42:00 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=EC=99=B8=EC=82=AC=EB=8C=80=EC=83=81?= =?UTF-8?q?=EB=AA=A9=ED=91=9C=20->=20=EC=97=85=EB=AC=B4=EC=9A=A9=ED=9C=B4?= =?UTF-8?q?=EB=8C=80=EC=A0=84=ED=99=94=EC=9E=91=EC=97=85=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dbnt/faisp/equip/EquipController.java | 39 ++++++ .../com/dbnt/faisp/equip/model/CellPhone.java | 78 ++++++++++++ .../faisp/fipTarget/FipTargetController.java | 6 +- .../fipTarget/service/FipTargetService.java | 11 -- .../faisp/userInfo/mapper/UserInfoMapper.java | 4 + .../userInfo/service/UserInfoService.java | 5 + .../resources/mybatisMapper/FipTarget.xml | 12 -- .../mybatisMapper/UserInfoMapper.xml | 12 ++ .../resources/static/js/equip/cellPhone.js | 46 +++++++ .../templates/equip/cellPhoneEditModal.html | 81 ++++++++++++ .../templates/equip/cellPhoneList.html | 117 ++++++++++++++++++ 11 files changed, 386 insertions(+), 25 deletions(-) create mode 100644 src/main/java/com/dbnt/faisp/equip/model/CellPhone.java create mode 100644 src/main/resources/static/js/equip/cellPhone.js create mode 100644 src/main/resources/templates/equip/cellPhoneEditModal.html create mode 100644 src/main/resources/templates/equip/cellPhoneList.html diff --git a/src/main/java/com/dbnt/faisp/equip/EquipController.java b/src/main/java/com/dbnt/faisp/equip/EquipController.java index ea5d8d9f..3616c3fa 100644 --- a/src/main/java/com/dbnt/faisp/equip/EquipController.java +++ b/src/main/java/com/dbnt/faisp/equip/EquipController.java @@ -2,10 +2,13 @@ package com.dbnt.faisp.equip; import com.dbnt.faisp.authMgt.service.AuthMgtService; +import com.dbnt.faisp.equip.model.CellPhone; 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.userInfo.model.UserInfo; +import com.dbnt.faisp.userInfo.service.UserInfoService; import com.dbnt.faisp.util.ParamMap; import com.dbnt.faisp.util.Utils; @@ -35,6 +38,8 @@ public class EquipController { private final EquipService equipService; private final AuthMgtService authMgtService; + private final OrganConfigService organConfigService; + private final UserInfoService userInfoService; @GetMapping("/equipStatus") public ModelAndView equipStatus(@AuthenticationPrincipal UserInfo loginUser, Equip equip) { @@ -204,6 +209,40 @@ public class EquipController { } } + @GetMapping("/cellPhoneList") + public ModelAndView cellPhoneList(@AuthenticationPrincipal UserInfo loginUser,CellPhone cellPhone) { + ModelAndView mav = new ModelAndView("equip/cellPhoneList"); + + //메뉴권한 확인 + String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/cellPhoneList").get(0).getAccessAuth(); + mav.addObject("accessAuth", accessAuth); + cellPhone.setDownOrganCdList(loginUser.getDownOrganCdList()); + cellPhone.setQueryInfo(); + + + cellPhone.setPaginationInfo(); + mav.addObject("searchParams", cellPhone); + + return mav; + } + + @GetMapping("/cellPhoneEditModal") + public ModelAndView cellPhoneEditModal(@AuthenticationPrincipal UserInfo loginUser,CellPhone cellPhone,String ogCd) { + ModelAndView mav = new ModelAndView("equip/cellPhoneEditModal"); + //메뉴권한 확인 + String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/equipStatus").get(0).getAccessAuth(); + mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); + mav.addObject("userOrgan", loginUser.getOgCd()); + mav.addObject("accessAuth", accessAuth); + + //사용자 리스트 + ParamMap param = new ParamMap(); + param.put("downOrganCdList", organConfigService.selectDownOrganListWhereUserOgCd(ogCd)); + mav.addObject("managerList", userInfoService.selectManagerList(param)); + + return mav; + } + diff --git a/src/main/java/com/dbnt/faisp/equip/model/CellPhone.java b/src/main/java/com/dbnt/faisp/equip/model/CellPhone.java new file mode 100644 index 00000000..8e37e416 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/equip/model/CellPhone.java @@ -0,0 +1,78 @@ +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 = "cellphone_mgt") +public class CellPhone extends BaseModel{ + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "phone_key") + private Integer phoneKey; + @Column(name = "mgt_organ") + private String mgtOrgan; + @Column(name = "tel_no") + private String telNo; + @Column(name = "p_user_seq") + private Integer pUserSeq; + @Column(name = "ext_mail") + private String extMail; + @Column(name = "webex_no") + private Integer webexNo; + @Column(name = "wrt_organ") + private String wrtOrgan; + @Column(name = "wrt_part") + private String wrtPart; + @Column(name = "wrt_user_seq") + private String wrtUserSeq; + @Column(name = "wrt_nm") + private String wrtNm; + @Column(name = "wrt_dt") + private LocalDateTime wrtDt; + + + + + + + + + + + + + + + + + + + + + + + + + + +} diff --git a/src/main/java/com/dbnt/faisp/fipTarget/FipTargetController.java b/src/main/java/com/dbnt/faisp/fipTarget/FipTargetController.java index ed39d559..76d73dc3 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/FipTargetController.java +++ b/src/main/java/com/dbnt/faisp/fipTarget/FipTargetController.java @@ -9,6 +9,7 @@ import com.dbnt.faisp.fipTarget.model.PartWorkFile; import com.dbnt.faisp.fipTarget.service.FipTargetService; import com.dbnt.faisp.organMgt.service.OrganConfigService; import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.userInfo.service.UserInfoService; import com.dbnt.faisp.util.ParamMap; import com.dbnt.faisp.util.Utils; @@ -41,6 +42,7 @@ public class FipTargetController { private final OrganConfigService organConfigService; private final AuthMgtService authMgtService; private final FipTargetService fipTargetService; + private final UserInfoService userInfoService; // 외사분실운영현황 시작 @GetMapping("/partInfoList") @@ -107,7 +109,7 @@ public class FipTargetController { ModelAndView mav = new ModelAndView("fipTarget/partInfoSelecBox"); ParamMap param = new ParamMap(); param.put("downOrganCdList", organConfigService.selectDownOrganListWhereUserOgCd(ogCd)); - mav.addObject("managerList", fipTargetService.selectPartInfoManagerList(param)); + mav.addObject("managerList", userInfoService.selectManagerList(param)); return mav; } @@ -129,7 +131,7 @@ public class FipTargetController { PartInfo partInfoView = fipTargetService.selectPartInfo(partInfo); ParamMap param = new ParamMap(); param.put("downOrganCdList", organConfigService.selectDownOrganListWhereUserOgCd(partInfoView.getMgtOrgan())); - mav.addObject("managerList", fipTargetService.selectPartInfoManagerList(param)); + mav.addObject("managerList", userInfoService.selectManagerList(param)); partInfoView.setFileList(fipTargetService.selectPartInfoFile(partInfo)); mav.addObject("partInfo", partInfoView); //메뉴권한 확인 diff --git a/src/main/java/com/dbnt/faisp/fipTarget/service/FipTargetService.java b/src/main/java/com/dbnt/faisp/fipTarget/service/FipTargetService.java index 354b05c3..292d17e2 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/service/FipTargetService.java +++ b/src/main/java/com/dbnt/faisp/fipTarget/service/FipTargetService.java @@ -3,9 +3,6 @@ package com.dbnt.faisp.fipTarget.service; import com.dbnt.faisp.config.BaseService; -import com.dbnt.faisp.config.FileInfo; -import com.dbnt.faisp.equip.model.Equip; -import com.dbnt.faisp.equip.model.Equip.EquipId; import com.dbnt.faisp.fipTarget.mapper.FipTargetMapper; import com.dbnt.faisp.fipTarget.model.PartInfo; import com.dbnt.faisp.fipTarget.model.PartInfo.PartInfoId; @@ -19,7 +16,6 @@ import com.dbnt.faisp.fipTarget.repository.PartInfoFileRepository; import com.dbnt.faisp.fipTarget.repository.PartInfoRepository; import com.dbnt.faisp.fipTarget.repository.PartWorkFileRepository; import com.dbnt.faisp.fipTarget.repository.PartWorkRepository; -import com.dbnt.faisp.publicBoard.model.PublicFile; import com.dbnt.faisp.util.ParamMap; import lombok.RequiredArgsConstructor; @@ -27,12 +23,9 @@ import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.FileCopyUtils; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartFile; import java.io.File; -import java.time.LocalDateTime; import java.util.*; @Service @@ -47,10 +40,6 @@ public class FipTargetService extends BaseService { private final PartWorkFileRepository partWorkFileRepository; private final FipTargetMapper fipTargetMapper; - public List selectPartInfoManagerList(ParamMap param) { - return fipTargetMapper.selectPartInfoManagerList(param); - } - @Transactional public void savePartInfo(PartInfo partInfo) { PartInfo dbPart = partInfoRepository.findFirstByOrderByPiSeqDesc(); diff --git a/src/main/java/com/dbnt/faisp/userInfo/mapper/UserInfoMapper.java b/src/main/java/com/dbnt/faisp/userInfo/mapper/UserInfoMapper.java index bb17b3c3..f5596f24 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/mapper/UserInfoMapper.java +++ b/src/main/java/com/dbnt/faisp/userInfo/mapper/UserInfoMapper.java @@ -1,6 +1,8 @@ package com.dbnt.faisp.userInfo.mapper; import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.util.ParamMap; + import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,4 +12,6 @@ public interface UserInfoMapper { List selectUserInfoList(UserInfo userInfo); Integer selectUserInfoListCnt(UserInfo userInfo); + + List selectManagerList(ParamMap param); } diff --git a/src/main/java/com/dbnt/faisp/userInfo/service/UserInfoService.java b/src/main/java/com/dbnt/faisp/userInfo/service/UserInfoService.java index 286b80b4..dbfbd4f5 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/service/UserInfoService.java +++ b/src/main/java/com/dbnt/faisp/userInfo/service/UserInfoService.java @@ -4,6 +4,8 @@ import com.dbnt.faisp.config.Role; import com.dbnt.faisp.userInfo.mapper.UserInfoMapper; import com.dbnt.faisp.userInfo.model.UserInfo; import com.dbnt.faisp.userInfo.repository.UserInfoRepository; +import com.dbnt.faisp.util.ParamMap; + import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; @@ -107,4 +109,7 @@ public class UserInfoService implements UserDetailsService { public void userDelete(List userInfo) { userInfoRepository.deleteAll(userInfo); } + public List selectManagerList(ParamMap param) { + return userInfoMapper.selectManagerList(param); + } } diff --git a/src/main/resources/mybatisMapper/FipTarget.xml b/src/main/resources/mybatisMapper/FipTarget.xml index 723f18d8..c4c048ea 100644 --- a/src/main/resources/mybatisMapper/FipTarget.xml +++ b/src/main/resources/mybatisMapper/FipTarget.xml @@ -5,18 +5,6 @@ - - + + \ No newline at end of file diff --git a/src/main/resources/static/js/equip/cellPhone.js b/src/main/resources/static/js/equip/cellPhone.js new file mode 100644 index 00000000..7bd51b00 --- /dev/null +++ b/src/main/resources/static/js/equip/cellPhone.js @@ -0,0 +1,46 @@ +$(document).on('click', '#addEquip', function (){ + $.ajax({ + url: '/equip/cellPhoneEditModal', + type: 'GET', + dataType:"html", + success: function(html){ + $("#cellPhoneEditModalContent").empty().append(html); + $("#cellPhoneEditModal").modal('show'); + }, + error:function(){ + + } + }); +}) + +$(document).on('change', '#mgtOrgan', function (){ + const ogCd = $(this).val(); + if(ogCd != ''){ + changeManager(ogCd); + }else{ + $("#pUserSeq").prop('disabled',true); + $("#pUserSeq").val(''); + } +}); + + +function changeManager(ogCd){ + $.ajax({ + url: '/target/partInfoSelecBox', + data: { + ogCd, + }, + type: 'GET', + dataType:"html", + success: function(html){ + $("#pUserSeq").empty().append(html); + $("#pUserSeq").prop('disabled',false); + }, + error:function(){ + } + }); +} + + + + diff --git a/src/main/resources/templates/equip/cellPhoneEditModal.html b/src/main/resources/templates/equip/cellPhoneEditModal.html new file mode 100644 index 00000000..f95432af --- /dev/null +++ b/src/main/resources/templates/equip/cellPhoneEditModal.html @@ -0,0 +1,81 @@ + + + +
+ + +
+
+
+ + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+ + +
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/equip/cellPhoneList.html b/src/main/resources/templates/equip/cellPhoneList.html new file mode 100644 index 00000000..0d493a57 --- /dev/null +++ b/src/main/resources/templates/equip/cellPhoneList.html @@ -0,0 +1,117 @@ + + + + + +
+
+

업무용 휴대전화 현황

+ + +
+
+
+
+ +
+
+ +
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + +
연번소속전화번호사용자(관리자)등록 외부메일웹엑스 미팅번호카카오톡 ID
+ +
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+
+
+
+ + + +
+ \ No newline at end of file From 87901fa66ed3c79a241cc492e9856d879e2308dc Mon Sep 17 00:00:00 2001 From: jiHyung Date: Wed, 12 Oct 2022 11:43:03 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EA=B2=80=EA=B1=B0=EB=B3=B4=EA=B3=A0?= =?UTF-8?q?=EC=84=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/ivsgt/ivsgt.js | 2 +- src/main/resources/templates/ivsgt/ivsgtViewModal.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/static/js/ivsgt/ivsgt.js b/src/main/resources/static/js/ivsgt/ivsgt.js index 16bfd37a..f6951bbf 100644 --- a/src/main/resources/static/js/ivsgt/ivsgt.js +++ b/src/main/resources/static/js/ivsgt/ivsgt.js @@ -191,7 +191,7 @@ function contentCheck(){ alert("검거유형2를 선택해주세요.") flag = false; } - else if(!$("#relatedReport").is(':checked')) { + else if(!$("#relatedReport").is(':checked') && $("input[name='ivsgtType']").val() != "arrest") { if ($('input[name="relatedReportsText"]').length < 1) { alert("연관보고서를 확인해 주세요.") flag = false; diff --git a/src/main/resources/templates/ivsgt/ivsgtViewModal.html b/src/main/resources/templates/ivsgt/ivsgtViewModal.html index b88ad83f..987cd3a4 100644 --- a/src/main/resources/templates/ivsgt/ivsgtViewModal.html +++ b/src/main/resources/templates/ivsgt/ivsgtViewModal.html @@ -58,13 +58,13 @@
- +
- +