svcm/api
1
0
Fork 0
mirror of https://git.hmsn.ink/kospo/svcm/api.git synced 2026-03-20 00:32:17 +09:00
Code Issues Packages Projects Releases Wiki Activity

배포 테스트

Browse Source
This commit is contained in:
bangae1
2025-06-04 11:10:32 +09:00
parent 41b3ea1bd5
commit c64c2f1b17
7 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/slip/임시전표저장.http
View File

@@ -2,7 +2,7 @@ POST http://localhost:8010/api/slip
Content-Type: application/json Content-Type: application/json
{ {
"contNo": "CONT-0000000005", "contNo": "CONT-20250527037",
"bldat": "20250501", "bldat": "20250501",
"budat": "20250502", "budat": "20250502",
"waers": "KRW", "waers": "KRW",
@@ -36,12 +36,12 @@ Content-Type: application/json
"value": [ "value": [
{ {
"lineclsf": "Q", "lineclsf": "Q",
"bname": "15000037", "bname": "psn14020",
"abscd": "" "abscd": ""
}, },
{ {
"lineclsf": "I", "lineclsf": "I",
"bname": "15000003", "bname": "17131303",
"abscd": "" "abscd": ""
}, },
{ {

2
src/main/java/com/kospo/svcm/repository/ApprReqRepository.java
View File

@@ -538,6 +538,6 @@ public interface ApprReqRepository extends JpaRepository<ApprReq, ApprReqId> {
" select wkfid, wkfsq, lineclsf, bname, btext, posit, wkfst, abscd\n" + " select wkfid, wkfsq, lineclsf, bname, btext, posit, wkfst, abscd\n" +
" from public.zwf0013t\n" + " from public.zwf0013t\n" +
" order by lineclsf desc\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<ZwfApprDto> findByWkfid(@Param("wkfid") String wkfid); List<ZwfApprDto> findByWkfid(@Param("wkfid") String wkfid);
} }

2
src/main/java/com/kospo/svcm/repository/Zwf0012tRepository.java
View File

@@ -9,7 +9,7 @@ import org.springframework.data.repository.query.Param;
import java.util.List; import java.util.List;
public interface Zwf0012tRepository extends JpaRepository<Zwf0012t, Zwf0012tId> { public interface Zwf0012tRepository extends JpaRepository<Zwf0012t, Zwf0012tId> {
List<Zwf0012t> findByIdWkfid(String WkfId); List<Zwf0012t> findByIdWkfidOrderByLineclsfDesc(String WkfId);
Zwf0012t findByIdWkfidAndIdWkfsqAndBname(String wkfid, Integer wkfsq, String bname); Zwf0012t findByIdWkfidAndIdWkfsqAndBname(String wkfid, Integer wkfsq, String bname);
interface SapApprReqDto { interface SapApprReqDto {

2
src/main/java/com/kospo/svcm/repository/Zwf0013tRepository.java
View File

@@ -7,7 +7,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List; import java.util.List;
public interface Zwf0013tRepository extends JpaRepository<Zwf0013t, Zwf0013tId> { public interface Zwf0013tRepository extends JpaRepository<Zwf0013t, Zwf0013tId> {
List<Zwf0013t> findByIdWkfid(String WkfId); List<Zwf0013t> findByIdWkfidOrderByLineclsfDesc(String WkfId);
Zwf0013t findByWkfsqAndIdWkfidAndIdBname(Integer wkfsq, String idWkfid, String idBname); Zwf0013t findByWkfsqAndIdWkfidAndIdBname(Integer wkfsq, String idWkfid, String idBname);
} }

2
src/main/java/com/kospo/svcm/service/impl/ContServiceImpl.java
View File

@@ -270,7 +270,7 @@ public class ContServiceImpl implements ContService {
cont.setContStat(codeRepository.findById(CodeId.builder() cont.setContStat(codeRepository.findById(CodeId.builder()
.id(3) .id(3)
.cd("0600") .cd("0600")
.build()).get().getDesc()); .build()).get().getNm());
return ContSaveResponse.from(contRepository.save(cont)); return ContSaveResponse.from(contRepository.save(cont));
} }

8
src/main/java/com/kospo/svcm/service/impl/SapServiceImpl.java
View File

@@ -73,7 +73,7 @@ public class SapServiceImpl implements SapService {
if (user.getSabun().equals(zwf0011t.getErnam())) { if (user.getSabun().equals(zwf0011t.getErnam())) {
Zwf0011tResponse zwf0011tResponse = Zwf0011tResponse.to(zwf0011t); Zwf0011tResponse zwf0011tResponse = Zwf0011tResponse.to(zwf0011t);
List<ZwfApprGrpResponse> mergeList = new ArrayList<>(); List<ZwfApprGrpResponse> mergeList = new ArrayList<>();
List<Zwf0012t> zwf0012ts = zwf0012tRepository.findByIdWkfid(zwf0011t.getId().getWkfid()); List<Zwf0012t> zwf0012ts = zwf0012tRepository.findByIdWkfidOrderByLineclsfDesc(zwf0011t.getId().getWkfid());
/* 12T 테이블에 있는 입안자 검토자만 주입 */ /* 12T 테이블에 있는 입안자 검토자만 주입 */
mergeList.add(ZwfApprGrpResponse.builder() mergeList.add(ZwfApprGrpResponse.builder()
@@ -82,7 +82,7 @@ public class SapServiceImpl implements SapService {
.build()); .build());
/* 13T 테이블 조회 주입*/ /* 13T 테이블 조회 주입*/
List<Zwf0013t> zwf0013ts = zwf0013tRepository.findByIdWkfid(zwf0011t.getId().getWkfid()); List<Zwf0013t> zwf0013ts = zwf0013tRepository.findByIdWkfidOrderByLineclsfDesc(zwf0011t.getId().getWkfid());
int groupIdx = zwf0013ts.stream().mapToInt(z -> z.getGrpid()).max().orElse(0); int groupIdx = zwf0013ts.stream().mapToInt(z -> z.getGrpid()).max().orElse(0);
for (int i = 1; i < groupIdx + 1; i++) { for (int i = 1; i < groupIdx + 1; i++) {
int finalI = i; int finalI = i;
@@ -327,8 +327,8 @@ public class SapServiceImpl implements SapService {
} }
List<Zwf0012t> zwf0012ts = zwf0012tRepository.findByIdWkfid(zwfApprUpdateRequest.getWkfid()); List<Zwf0012t> zwf0012ts = zwf0012tRepository.findByIdWkfidOrderByLineclsfDesc(zwfApprUpdateRequest.getWkfid());
List<Zwf0013t> zwf0013ts = zwf0013tRepository.findByIdWkfid(zwfApprUpdateRequest.getWkfid()); List<Zwf0013t> zwf0013ts = zwf0013tRepository.findByIdWkfidOrderByLineclsfDesc(zwfApprUpdateRequest.getWkfid());
List<Zwf0012t> zwf0012tsChecker = zwf0012ts.stream().filter(z -> z.getWkfst().equals("Q") || z.getWkfst().equals("A") || z.getWkfst().equals("N")).toList(); List<Zwf0012t> zwf0012tsChecker = zwf0012ts.stream().filter(z -> z.getWkfst().equals("Q") || z.getWkfst().equals("A") || z.getWkfst().equals("N")).toList();
List<Zwf0013t> zwf0013tsChecker = zwf0013ts.stream().filter(z -> z.getWkfst().equals("Q") || z.getWkfst().equals("A") || z.getWkfst().equals("N")).toList(); List<Zwf0013t> zwf0013tsChecker = zwf0013ts.stream().filter(z -> z.getWkfst().equals("Q") || z.getWkfst().equals("A") || z.getWkfst().equals("N")).toList();

17
src/main/java/com/kospo/svcm/service/impl/SlipServiceImpl.java
View File

@@ -31,6 +31,7 @@ import java.util.concurrent.atomic.AtomicReference;
@RequiredArgsConstructor @RequiredArgsConstructor
public class SlipServiceImpl implements SlipService { public class SlipServiceImpl implements SlipService {
private final ApprReqRepository apprReqRepository; private final ApprReqRepository apprReqRepository;
private final CodeRepository codeRepository;
@Value("${server.attach}") @Value("${server.attach}")
private String filePath; private String filePath;
private final UserRepository userRepository; private final UserRepository userRepository;
@@ -77,9 +78,9 @@ public class SlipServiceImpl implements SlipService {
List<ZwfApprGrpResponse> grpResponseList = new ArrayList<>(); List<ZwfApprGrpResponse> grpResponseList = new ArrayList<>();
grpResponseList.add(ZwfApprGrpResponse.builder() grpResponseList.add(ZwfApprGrpResponse.builder()
.label("결재") .label("결재")
.value(Collections.singletonList(zwf0012tRepository.findByIdWkfid((zwf0011t.getId().getWkfid())))) .value(Collections.singletonList(zwf0012tRepository.findByIdWkfidOrderByLineclsfDesc((zwf0011t.getId().getWkfid()))))
.build()); .build());
List<Zwf0013t> zwf0013ts = zwf0013tRepository.findByIdWkfid(zwf0011t.getId().getWkfid()); List<Zwf0013t> zwf0013ts = zwf0013tRepository.findByIdWkfidOrderByLineclsfDesc(zwf0011t.getId().getWkfid());
int groupIdx = zwf0013ts.stream().mapToInt(z -> z.getGrpid()).max().orElse(0); int groupIdx = zwf0013ts.stream().mapToInt(z -> z.getGrpid()).max().orElse(0);
for(int i=1; i<=groupIdx; i++) { for(int i=1; i<=groupIdx; i++) {
int finalI = i; int finalI = i;
@@ -107,6 +108,12 @@ public class SlipServiceImpl implements SlipService {
/*계약진행중인 대상자*/ /*계약진행중인 대상자*/
Cont cont = contRepository.findByContNoAndContStatCd(slipSaveRequest.getContNo(), "0200"); Cont cont = contRepository.findByContNoAndContStatCd(slipSaveRequest.getContNo(), "0200");
if(cont == null) throw new CustomException(ErrorCode.SAVE_ERR); 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() Slip slip = slipRepository.save(Slip.builder()
.contNo(slipSaveRequest.getContNo()) .contNo(slipSaveRequest.getContNo())
.bldat(slipSaveRequest.getBldat()) .bldat(slipSaveRequest.getBldat())
@@ -220,7 +227,7 @@ public class SlipServiceImpl implements SlipService {
.abscd(zwfAppr.getAbscd()) .abscd(zwfAppr.getAbscd())
.btext(userOptional.get().getName()) .btext(userOptional.get().getName())
.posit(userOptional.get().getGradeNm()) .posit(userOptional.get().getGradeNm())
.deptn(userOptional.get().getPtsnNm()) .deptn(userOptional.get().getDept().getDeptNm())
.wkfst(zwfAppr.getLineclsf().equals("Q") ? "Q" : "I") .wkfst(zwfAppr.getLineclsf().equals("Q") ? "Q" : "I")
.wkfsq(eSq.get()) .wkfsq(eSq.get())
.ernam(ernam) .ernam(ernam)
@@ -240,7 +247,7 @@ public class SlipServiceImpl implements SlipService {
.bname(userOptional.get().getSabun()) .bname(userOptional.get().getSabun())
.btext(userOptional.get().getName()) .btext(userOptional.get().getName())
.posit(userOptional.get().getGradeNm()) .posit(userOptional.get().getGradeNm())
.deptn(userOptional.get().getPtsnNm()) .deptn(userOptional.get().getDept().getDeptNm())
.wkfst(zwfAppr.getLineclsf().equals("Q") ? "Q" : "I") .wkfst(zwfAppr.getLineclsf().equals("Q") ? "Q" : "I")
.ernam(ernam) .ernam(ernam)
.erdat(erdat) .erdat(erdat)
@@ -290,7 +297,7 @@ public class SlipServiceImpl implements SlipService {
.abscd(zwfAppr.getAbscd()) .abscd(zwfAppr.getAbscd())
.btext(userOptional.get().getName()) .btext(userOptional.get().getName())
.posit(userOptional.get().getGradeNm()) .posit(userOptional.get().getGradeNm())
.deptn(userOptional.get().getPtsnNm()) .deptn(userOptional.get().getDept().getDeptNm())
.wkfst(zwfAppr.getLineclsf().equals("Q") ? "A" : "I") .wkfst(zwfAppr.getLineclsf().equals("Q") ? "A" : "I")
.wkfsq(eSq.getAndIncrement()) .wkfsq(eSq.getAndIncrement())
.ernam(ernam) .ernam(ernam)