From 0b291c4ea2c0b51798db13e77a226ae5f5d8ef16 Mon Sep 17 00:00:00 2001 From: leeheejin Date: Tue, 11 Nov 2025 14:48:22 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=A4=EB=A5=98=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/pms/salesmgmt/mapper/contractMgmt.xml | 10 ++ .../view/contractMgmt/supplyRegistPopUp.jsp | 57 +++++--- src/com/pms/controller/CommonController.java | 22 ++++ .../controller/SampleController.java | 124 ------------------ src/com/pms/salesmgmt/mapper/contractMgmt.xml | 10 ++ 5 files changed, 84 insertions(+), 139 deletions(-) delete mode 100644 src/com/pms/salesmgmt/controller/SampleController.java diff --git a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/contractMgmt.xml b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/contractMgmt.xml index 7779bd8..d512aad 100644 --- a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/contractMgmt.xml +++ b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/contractMgmt.xml @@ -2356,6 +2356,16 @@ SELECT ,BUS_REG_NO ,OFFICE_NO ,EMAIL + ,MANAGER1_NAME + ,MANAGER1_EMAIL + ,MANAGER2_NAME + ,MANAGER2_EMAIL + ,MANAGER3_NAME + ,MANAGER3_EMAIL + ,MANAGER4_NAME + ,MANAGER4_EMAIL + ,MANAGER5_NAME + ,MANAGER5_EMAIL FROM SUPPLY_MNG WHERE OBJID = #{objid}::numeric diff --git a/WebContent/WEB-INF/view/contractMgmt/supplyRegistPopUp.jsp b/WebContent/WEB-INF/view/contractMgmt/supplyRegistPopUp.jsp index 778a025..0aa1710 100644 --- a/WebContent/WEB-INF/view/contractMgmt/supplyRegistPopUp.jsp +++ b/WebContent/WEB-INF/view/contractMgmt/supplyRegistPopUp.jsp @@ -257,21 +257,48 @@ // 사업자등록증 파일 삭제 function deleteBusRegFile(fileObjId){ - if(!confirm("파일을 삭제하시겠습니까?")){ - return; - } - - $.ajax({ - url: "/common/deleteFile.do", - type: "POST", - data: {objId: fileObjId}, - dataType: "json", - success: function(data){ - Swal.fire("삭제되었습니다."); - loadBusRegFile(); - }, - error: function(){ - Swal.fire("삭제 중 오류가 발생했습니다."); + Swal.fire({ + title: '파일을 삭제하시겠습니까?', + text: '삭제된 파일은 복구할 수 없습니다.', + icon: 'warning', + showCancelButton: true, + confirmButtonColor: '#d33', + cancelButtonColor: '#3085d6', + confirmButtonText: '삭제', + cancelButtonText: '취소' + }).then((result) => { + if (result.isConfirmed) { + $.ajax({ + url: "/common/deleteFile.do", + type: "POST", + data: {objId: fileObjId}, + dataType: "json", + success: function(data){ + if(data.success){ + Swal.fire({ + icon: 'success', + title: '삭제되었습니다.', + showConfirmButton: false, + timer: 1500 + }); + loadBusRegFile(); + }else{ + Swal.fire({ + icon: 'error', + title: '삭제 실패', + text: data.message || '파일 삭제 중 오류가 발생했습니다.' + }); + } + }, + error: function(xhr, status, error){ + console.error("삭제 오류:", error); + Swal.fire({ + icon: 'error', + title: '삭제 실패', + text: '파일 삭제 중 오류가 발생했습니다.' + }); + } + }); } }); } diff --git a/src/com/pms/controller/CommonController.java b/src/com/pms/controller/CommonController.java index 47862f7..8b213c0 100644 --- a/src/com/pms/controller/CommonController.java +++ b/src/com/pms/controller/CommonController.java @@ -168,6 +168,28 @@ public class CommonController { return "/ajax/ajaxResult"; } + /** + * 파일을 삭제한다. (논리적삭제, status : Deleted) - JSON 응답 + * @param request + * @param paramMap + * @return + */ + @RequestMapping("/common/deleteFile.do") + @ResponseBody + public Map deleteFile(HttpServletRequest request, @RequestParam Map paramMap){ + Map result = new HashMap(); + try { + String msg = commonService.deleteFileInfoLogical(paramMap); + result.put("success", true); + result.put("message", msg); + } catch (Exception e) { + e.printStackTrace(); + result.put("success", false); + result.put("message", "파일 삭제 중 오류가 발생했습니다."); + } + return result; + } + /** * 파일 다운로드 * @param request diff --git a/src/com/pms/salesmgmt/controller/SampleController.java b/src/com/pms/salesmgmt/controller/SampleController.java deleted file mode 100644 index 29dbf3b..0000000 --- a/src/com/pms/salesmgmt/controller/SampleController.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * ContractMgmtController - * - * 1.0 - * - * 2021.10.01 - * - * Copyright ions - */ -package com.pms.salesmgmt.controller; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import com.pms.common.utils.CommonUtils; -import com.pms.salesmgmt.service.AccountService; -import com.pms.salesmgmt.service.ContractMgmtService; -import com.pms.salesmgmt.service.DeliveryService; -import com.pms.salesmgmt.service.SalesMgmtCommonService; - -/** - * 
- * 계약관리 Controller
- *
- * @since 2021.10.01 - * @author kim - * @version 1.0 - * - * 
- * << 개정 이력 >>
- * 
- * 수정일 					수정자							 수정내용
- * ----------------		---------------------			--------------------------------------------------------
- * 2021.10.01			김효일							최초작성
- * 
- *
- * - */ -@Controller -public class SampleController { - - /** 계약관리 Service */ - @Autowired - private DeliveryService deliveryService; - - - /** 결제예정 Service */ - @Autowired - private AccountService accountService; - - /** - * 
-	 * 납기예정 목록 조회
-	 *
- * @param request - * @param paramMap - 계약관리 검색 정보 - * @return String - * - * 
-	 * << 개정 이력 >>
-	 * 
-	 * 수정일					수정자							수정내용
-	 * ----------------		---------------------			----------------------------------------------------------
-	 * 2021.10.01			김효일							최초작성
-	 * 
-	 *
- */ - @RequestMapping(value = " /contractMgmt/tabSample1.do", method = RequestMethod.GET) - public String tabSample1(HttpServletRequest request - , @RequestParam Map paramMap) { - try { - List> list = deliveryService.getDeliveryAllByOrderNo(request, paramMap); - System.out.println("paramMap>>>>>>>>>>>>> " + paramMap); - request.setAttribute("LIST", list); - } catch(Exception e) { - e.printStackTrace(); - } - - return "/salesmgmt/sample/tabContractMgmtListSample1"; - } - - /** - * 
-	 * 결제예정 목록 조회
-	 *
- * @param request - * @param paramMap - 계약관리 검색 정보 - * @return String - * - * 
-	 * << 개정 이력 >>
-	 * 
-	 * 수정일					수정자							수정내용
-	 * ----------------		---------------------			----------------------------------------------------------
-	 * 2021.10.01			김효일							최초작성
-	 * 
-	 *
- */ - @RequestMapping(value = " /contractMgmt/tabSample2.do", method = RequestMethod.GET) - public String tabSample2(HttpServletRequest request - , @RequestParam Map paramMap) { - try { - List> list = accountService.getAccountAllByOrderNo(request, paramMap); - - request.setAttribute("LIST", list); - } catch(Exception e) { - e.printStackTrace(); - } - - return "/salesmgmt/sample/tabContractMgmtListSample2"; - } -} diff --git a/src/com/pms/salesmgmt/mapper/contractMgmt.xml b/src/com/pms/salesmgmt/mapper/contractMgmt.xml index 7779bd8..d512aad 100644 --- a/src/com/pms/salesmgmt/mapper/contractMgmt.xml +++ b/src/com/pms/salesmgmt/mapper/contractMgmt.xml @@ -2356,6 +2356,16 @@ SELECT ,BUS_REG_NO ,OFFICE_NO ,EMAIL + ,MANAGER1_NAME + ,MANAGER1_EMAIL + ,MANAGER2_NAME + ,MANAGER2_EMAIL + ,MANAGER3_NAME + ,MANAGER3_EMAIL + ,MANAGER4_NAME + ,MANAGER4_EMAIL + ,MANAGER5_NAME + ,MANAGER5_EMAIL FROM SUPPLY_MNG WHERE OBJID = #{objid}::numeric