From c64c2f1b17646b001a17bfcf79e049222ec22e7b Mon Sep 17 00:00:00 2001 From: bangae1 Date: Wed, 4 Jun 2025 11:10:32 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=ED=8F=AC=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/slip/임시전표저장.http | 6 +++--- .../svcm/repository/ApprReqRepository.java | 2 +- .../svcm/repository/Zwf0012tRepository.java | 2 +- .../svcm/repository/Zwf0013tRepository.java | 2 +- .../svcm/service/impl/ContServiceImpl.java | 2 +- .../kospo/svcm/service/impl/SapServiceImpl.java | 8 ++++---- .../svcm/service/impl/SlipServiceImpl.java | 17 ++++++++++++----- 7 files changed, 23 insertions(+), 16 deletions(-) diff --git a/api/slip/임시전표저장.http b/api/slip/임시전표저장.http index d34d7d2..d87509a 100644 --- a/api/slip/임시전표저장.http +++ b/api/slip/임시전표저장.http @@ -2,7 +2,7 @@ POST http://localhost:8010/api/slip Content-Type: application/json { - "contNo": "CONT-0000000005", + "contNo": "CONT-20250527037", "bldat": "20250501", "budat": "20250502", "waers": "KRW", @@ -36,12 +36,12 @@ Content-Type: application/json "value": [ { "lineclsf": "Q", - "bname": "15000037", + "bname": "psn14020", "abscd": "" }, { "lineclsf": "I", - "bname": "15000003", + "bname": "17131303", "abscd": "" }, { diff --git a/src/main/java/com/kospo/svcm/repository/ApprReqRepository.java b/src/main/java/com/kospo/svcm/repository/ApprReqRepository.java index 0d7458f..a169c1e 100644 --- a/src/main/java/com/kospo/svcm/repository/ApprReqRepository.java +++ b/src/main/java/com/kospo/svcm/repository/ApprReqRepository.java @@ -538,6 +538,6 @@ public interface ApprReqRepository extends JpaRepository { " select wkfid, wkfsq, lineclsf, bname, btext, posit, wkfst, abscd\n" + " from public.zwf0013t\n" + " order by lineclsf desc\n" + - ") select * from cte where wkfid = :wkfid", nativeQuery = true) + ") select * from cte where wkfid = :wkfid order by lineclsf desc ", nativeQuery = true) List findByWkfid(@Param("wkfid") String wkfid); } \ No newline at end of file diff --git a/src/main/java/com/kospo/svcm/repository/Zwf0012tRepository.java b/src/main/java/com/kospo/svcm/repository/Zwf0012tRepository.java index aa1f0d6..8083a09 100644 --- a/src/main/java/com/kospo/svcm/repository/Zwf0012tRepository.java +++ b/src/main/java/com/kospo/svcm/repository/Zwf0012tRepository.java @@ -9,7 +9,7 @@ import org.springframework.data.repository.query.Param; import java.util.List; public interface Zwf0012tRepository extends JpaRepository { - List findByIdWkfid(String WkfId); + List findByIdWkfidOrderByLineclsfDesc(String WkfId); Zwf0012t findByIdWkfidAndIdWkfsqAndBname(String wkfid, Integer wkfsq, String bname); interface SapApprReqDto { diff --git a/src/main/java/com/kospo/svcm/repository/Zwf0013tRepository.java b/src/main/java/com/kospo/svcm/repository/Zwf0013tRepository.java index e059e6c..94b9728 100644 --- a/src/main/java/com/kospo/svcm/repository/Zwf0013tRepository.java +++ b/src/main/java/com/kospo/svcm/repository/Zwf0013tRepository.java @@ -7,7 +7,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; public interface Zwf0013tRepository extends JpaRepository { - List findByIdWkfid(String WkfId); + List findByIdWkfidOrderByLineclsfDesc(String WkfId); Zwf0013t findByWkfsqAndIdWkfidAndIdBname(Integer wkfsq, String idWkfid, String idBname); } \ No newline at end of file diff --git a/src/main/java/com/kospo/svcm/service/impl/ContServiceImpl.java b/src/main/java/com/kospo/svcm/service/impl/ContServiceImpl.java index d76035d..226fa20 100644 --- a/src/main/java/com/kospo/svcm/service/impl/ContServiceImpl.java +++ b/src/main/java/com/kospo/svcm/service/impl/ContServiceImpl.java @@ -270,7 +270,7 @@ public class ContServiceImpl implements ContService { cont.setContStat(codeRepository.findById(CodeId.builder() .id(3) .cd("0600") - .build()).get().getDesc()); + .build()).get().getNm()); return ContSaveResponse.from(contRepository.save(cont)); } diff --git a/src/main/java/com/kospo/svcm/service/impl/SapServiceImpl.java b/src/main/java/com/kospo/svcm/service/impl/SapServiceImpl.java index 744f315..ebb22ed 100644 --- a/src/main/java/com/kospo/svcm/service/impl/SapServiceImpl.java +++ b/src/main/java/com/kospo/svcm/service/impl/SapServiceImpl.java @@ -73,7 +73,7 @@ public class SapServiceImpl implements SapService { if (user.getSabun().equals(zwf0011t.getErnam())) { Zwf0011tResponse zwf0011tResponse = Zwf0011tResponse.to(zwf0011t); List mergeList = new ArrayList<>(); - List zwf0012ts = zwf0012tRepository.findByIdWkfid(zwf0011t.getId().getWkfid()); + List zwf0012ts = zwf0012tRepository.findByIdWkfidOrderByLineclsfDesc(zwf0011t.getId().getWkfid()); /* 12T 테이블에 있는 입안자 검토자만 주입 */ mergeList.add(ZwfApprGrpResponse.builder() @@ -82,7 +82,7 @@ public class SapServiceImpl implements SapService { .build()); /* 13T 테이블 조회 주입*/ - List zwf0013ts = zwf0013tRepository.findByIdWkfid(zwf0011t.getId().getWkfid()); + List zwf0013ts = zwf0013tRepository.findByIdWkfidOrderByLineclsfDesc(zwf0011t.getId().getWkfid()); int groupIdx = zwf0013ts.stream().mapToInt(z -> z.getGrpid()).max().orElse(0); for (int i = 1; i < groupIdx + 1; i++) { int finalI = i; @@ -327,8 +327,8 @@ public class SapServiceImpl implements SapService { } - List zwf0012ts = zwf0012tRepository.findByIdWkfid(zwfApprUpdateRequest.getWkfid()); - List zwf0013ts = zwf0013tRepository.findByIdWkfid(zwfApprUpdateRequest.getWkfid()); + List zwf0012ts = zwf0012tRepository.findByIdWkfidOrderByLineclsfDesc(zwfApprUpdateRequest.getWkfid()); + List zwf0013ts = zwf0013tRepository.findByIdWkfidOrderByLineclsfDesc(zwfApprUpdateRequest.getWkfid()); List zwf0012tsChecker = zwf0012ts.stream().filter(z -> z.getWkfst().equals("Q") || z.getWkfst().equals("A") || z.getWkfst().equals("N")).toList(); List zwf0013tsChecker = zwf0013ts.stream().filter(z -> z.getWkfst().equals("Q") || z.getWkfst().equals("A") || z.getWkfst().equals("N")).toList(); diff --git a/src/main/java/com/kospo/svcm/service/impl/SlipServiceImpl.java b/src/main/java/com/kospo/svcm/service/impl/SlipServiceImpl.java index 9e38010..ac44e37 100644 --- a/src/main/java/com/kospo/svcm/service/impl/SlipServiceImpl.java +++ b/src/main/java/com/kospo/svcm/service/impl/SlipServiceImpl.java @@ -31,6 +31,7 @@ import java.util.concurrent.atomic.AtomicReference; @RequiredArgsConstructor public class SlipServiceImpl implements SlipService { private final ApprReqRepository apprReqRepository; + private final CodeRepository codeRepository; @Value("${server.attach}") private String filePath; private final UserRepository userRepository; @@ -77,9 +78,9 @@ public class SlipServiceImpl implements SlipService { List grpResponseList = new ArrayList<>(); grpResponseList.add(ZwfApprGrpResponse.builder() .label("결재") - .value(Collections.singletonList(zwf0012tRepository.findByIdWkfid((zwf0011t.getId().getWkfid())))) + .value(Collections.singletonList(zwf0012tRepository.findByIdWkfidOrderByLineclsfDesc((zwf0011t.getId().getWkfid())))) .build()); - List zwf0013ts = zwf0013tRepository.findByIdWkfid(zwf0011t.getId().getWkfid()); + List zwf0013ts = zwf0013tRepository.findByIdWkfidOrderByLineclsfDesc(zwf0011t.getId().getWkfid()); int groupIdx = zwf0013ts.stream().mapToInt(z -> z.getGrpid()).max().orElse(0); for(int i=1; i<=groupIdx; i++) { int finalI = i; @@ -107,6 +108,12 @@ public class SlipServiceImpl implements SlipService { /*계약진행중인 대상자*/ Cont cont = contRepository.findByContNoAndContStatCd(slipSaveRequest.getContNo(), "0200"); if(cont == null) throw new CustomException(ErrorCode.SAVE_ERR); + cont.setContStatCd("0300"); + cont.setContStat(codeRepository.findById(CodeId.builder() + .id(3) + .cd("0300") + .build()).get().getNm()); + contRepository.save(cont); Slip slip = slipRepository.save(Slip.builder() .contNo(slipSaveRequest.getContNo()) .bldat(slipSaveRequest.getBldat()) @@ -220,7 +227,7 @@ public class SlipServiceImpl implements SlipService { .abscd(zwfAppr.getAbscd()) .btext(userOptional.get().getName()) .posit(userOptional.get().getGradeNm()) - .deptn(userOptional.get().getPtsnNm()) + .deptn(userOptional.get().getDept().getDeptNm()) .wkfst(zwfAppr.getLineclsf().equals("Q") ? "Q" : "I") .wkfsq(eSq.get()) .ernam(ernam) @@ -240,7 +247,7 @@ public class SlipServiceImpl implements SlipService { .bname(userOptional.get().getSabun()) .btext(userOptional.get().getName()) .posit(userOptional.get().getGradeNm()) - .deptn(userOptional.get().getPtsnNm()) + .deptn(userOptional.get().getDept().getDeptNm()) .wkfst(zwfAppr.getLineclsf().equals("Q") ? "Q" : "I") .ernam(ernam) .erdat(erdat) @@ -290,7 +297,7 @@ public class SlipServiceImpl implements SlipService { .abscd(zwfAppr.getAbscd()) .btext(userOptional.get().getName()) .posit(userOptional.get().getGradeNm()) - .deptn(userOptional.get().getPtsnNm()) + .deptn(userOptional.get().getDept().getDeptNm()) .wkfst(zwfAppr.getLineclsf().equals("Q") ? "A" : "I") .wkfsq(eSq.getAndIncrement()) .ernam(ernam)