From da56efe8eb6e0512ba8f6a52c93998c2adae1349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Mon, 8 May 2023 15:46:21 +0900 Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EB=8C=80=EC=83=81=EB=AA=A9?= =?UTF-8?q?=ED=91=9C=20>=20=EC=99=B8=EC=82=AC=EB=B6=84=EC=8B=A4=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/PartInfoRepository.java | 15 ++++------ .../repository/PartWorkRepository.java | 19 ++++-------- .../fipTarget/service/FipTargetService.java | 30 ++----------------- .../resources/mybatisMapper/FipTarget.xml | 4 +-- .../fipTarget/partInfoModifyModal.html | 2 +- .../fipTarget/partWorkModifyModal.html | 11 ++----- 6 files changed, 17 insertions(+), 64 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartInfoRepository.java b/src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartInfoRepository.java index 47114d68..2a57d8b0 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartInfoRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartInfoRepository.java @@ -5,20 +5,15 @@ import com.dbnt.faisp.main.fipTarget.model.PartInfo; import org.springframework.data.jpa.repository.JpaRepository; - +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; public interface PartInfoRepository extends JpaRepository { PartInfo findFirstByOrderByPiSeqDesc(); - void deleteByPiSeq(Integer piSeq); - - - - - - - - + @Modifying(clearAutomatically = true) + @Query("update PartInfo set piState = :piState where piSeq = :piSeq") + void bulkModifyingByPiSeqToPiState(Integer piSeq, String piState); } diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartWorkRepository.java b/src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartWorkRepository.java index 625ab15d..f02ee8ef 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartWorkRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartWorkRepository.java @@ -4,24 +4,15 @@ package com.dbnt.faisp.main.fipTarget.repository; import com.dbnt.faisp.main.fipTarget.model.PartWork; import org.springframework.data.jpa.repository.JpaRepository; - +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; public interface PartWorkRepository extends JpaRepository { PartWork findTopByPiSeqOrderByPwSeqDesc(Integer piSeq); - void deleteByPwSeqAndPiSeq(Integer pwSeq, Integer piSeq); - - void deleteByPiSeq(Integer piSeq); - - - - - - - - - - + @Modifying(clearAutomatically = true) + @Query("update PartWork set status = :status where pwSeq = :pwSeq and piSeq = :piSeq") + void bulkModifyingByPwSeqAndPiSeqToStatus(Integer pwSeq, Integer piSeq, String status); } diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java b/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java index a960f98a..f9c602fd 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java @@ -195,25 +195,7 @@ public class FipTargetService extends BaseService { @Transactional public void deletePartInfo(PartInfo partInfo) { - //외사실적 파일,데이터삭제 - List partWorkFileList = partWorkFileRepository.findByPiSeq(partInfo.getPiSeq()); - if(partWorkFileList != null) { - for(PartWorkFile file: partWorkFileList){ - deleteStoredFile(new File(file.getFilePath(), file.getConvNm())); - partWorkFileRepository.deleteByPwSeqAndPiSeq(file.getPwSeq(),file.getPiSeq()); - } - } - partWorkRepository.deleteByPiSeq(partInfo.getPiSeq()); - //외사분실운영현황파일삭제 - List partInfoFileList= selectPartInfoFile(partInfo); - for(PartInfoFile file: partInfoFileList){ - if(file.getOrigNm() != null){ - deleteStoredFile(new File(file.getFilePath(), file.getConvNm())); - } - } - partInfoFileRepository.deleteByPiSeq(partInfo.getPiSeq()); - partInfoRepository.deleteByPiSeq(partInfo.getPiSeq()); - + partInfoRepository.bulkModifyingByPiSeqToPiState(partInfo.getPiSeq(), "DST008"); } public PartInfoFile selectPartInfoFileDown(Integer fileSeq, Integer piSeq, Integer versionNo) { @@ -312,15 +294,7 @@ public class FipTargetService extends BaseService { @Transactional public void deletePartWork(PartWork partWork) { - //파일삭제 - List partWorkFileList= partWorkFileRepository.findByPwSeqAndPiSeq(partWork.getPwSeq(),partWork.getPiSeq()); - if(partWorkFileList != null) { - for(PartWorkFile file: partWorkFileList){ - deleteStoredFile(new File(file.getFilePath(), file.getConvNm())); - } - } - partWorkFileRepository.deleteByPwSeqAndPiSeq(partWork.getPwSeq(),partWork.getPiSeq()); - partWorkRepository.deleteByPwSeqAndPiSeq(partWork.getPwSeq(),partWork.getPiSeq()); + partWorkRepository.bulkModifyingByPwSeqAndPiSeqToStatus(partWork.getPwSeq(), partWork.getPiSeq(), "DST008"); } public PartWorkFile selectPartWorkFileDown(Integer fileSeq, Integer pwSeq, Integer piSeq) { diff --git a/src/main/resources/mybatisMapper/FipTarget.xml b/src/main/resources/mybatisMapper/FipTarget.xml index 5a699c0d..c5ddd0b1 100644 --- a/src/main/resources/mybatisMapper/FipTarget.xml +++ b/src/main/resources/mybatisMapper/FipTarget.xml @@ -58,8 +58,8 @@ (select pi_seq,max(version_no) as lastVer from part_info group by pi_seq) b where pi.pi_seq = b.pi_seq - and pi.version_no = b.lastVer - + and pi.version_no = b.lastVer + order by pi_seq desc limit #{rowCnt} offset #{firstIndex} diff --git a/src/main/resources/templates/fipTarget/partInfoModifyModal.html b/src/main/resources/templates/fipTarget/partInfoModifyModal.html index e18cbc5c..d54cf2c9 100644 --- a/src/main/resources/templates/fipTarget/partInfoModifyModal.html +++ b/src/main/resources/templates/fipTarget/partInfoModifyModal.html @@ -158,7 +158,7 @@
- +
diff --git a/src/main/resources/templates/fipTarget/partWorkModifyModal.html b/src/main/resources/templates/fipTarget/partWorkModifyModal.html index f98ed161..9e298a26 100644 --- a/src/main/resources/templates/fipTarget/partWorkModifyModal.html +++ b/src/main/resources/templates/fipTarget/partWorkModifyModal.html @@ -81,15 +81,8 @@
-
- - - - -
- + +