From b05b633c689c3fe84f2cc44b25e20088379aa290 Mon Sep 17 00:00:00 2001 From: myname Date: Wed, 2 Nov 2022 18:20:47 +0900 Subject: [PATCH] =?UTF-8?q?2022-11-02=2018:20=20=EA=B2=B0=EC=9E=AC=20?= =?UTF-8?q?=EB=B0=8F=20=EB=8C=80=EA=B2=B0=20=EA=B4=80=EB=A6=AC=202,3?= =?UTF-8?q?=EB=B2=88=20=EB=8C=80=EA=B2=B0=EC=9E=90=20=EC=97=86=EB=8A=94=20?= =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AprvlMgrServiceImpl.java | 40 +++++++++++-------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java index 41cf263e..c0e34881 100644 --- a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java +++ b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java @@ -328,14 +328,18 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr adrSbmtLineMgrUsrVO.setWhereQuery(" AND agnt_sbmt_id='ID2' "); adrSbmtMgrHstryService.deleteWithQuery(adrSbmtLineMgrUsrVO); - //step4.이력 정보 남기기 처리를 해야 한다. I - adr_sbmt_mgr_hstry - this._insertAdrSbmtMgrHstry( - adrSbmtLineMgrUsrVO - , aprvlMgrVO - , "ID2" - , adrSbmtLineMgrUsrVO.getSbsttSbmtId2() - , adrSbmtLineMgrUsrVO.getSbmtId2() - ); + if (!"".equals(adrSbmtLineMgrUsrVO.getSbsttSbmtId2())) { + //대결자가 있는 경우만 이력을 남긴다. + //step4.이력 정보 남기기 처리를 해야 한다. I - adr_sbmt_mgr_hstry + this._insertAdrSbmtMgrHstry( + adrSbmtLineMgrUsrVO + , aprvlMgrVO + , "ID2" + , adrSbmtLineMgrUsrVO.getSbsttSbmtId2() + , adrSbmtLineMgrUsrVO.getSbmtId2() + ); + } + } if ("A".equals(adrSbmtLineMgrUsrVO.getSbmtYn3())) { //1단계 결재 전임 @@ -349,14 +353,18 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr adrSbmtLineMgrUsrVO.setWhereQuery(" AND agnt_sbmt_id='ID3' "); adrSbmtMgrHstryService.deleteWithQuery(adrSbmtLineMgrUsrVO); - //step4.이력 정보 남기기 처리를 해야 한다. I - adr_sbmt_mgr_hstry - this._insertAdrSbmtMgrHstry( - adrSbmtLineMgrUsrVO - , aprvlMgrVO - , "ID3" - , adrSbmtLineMgrUsrVO.getSbsttSbmtId3() - , adrSbmtLineMgrUsrVO.getSbmtId3() - ); + if (!"".equals(adrSbmtLineMgrUsrVO.getSbsttSbmtId3())) { + //대결자가 있는 경우만 이력을 남긴다. + //step4.이력 정보 남기기 처리를 해야 한다. I - adr_sbmt_mgr_hstry + this._insertAdrSbmtMgrHstry( + adrSbmtLineMgrUsrVO + , aprvlMgrVO + , "ID3" + , adrSbmtLineMgrUsrVO.getSbsttSbmtId3() + , adrSbmtLineMgrUsrVO.getSbmtId3() + ); + } + } //step2.기존 이력 데이터를 모두 삭제하고 D - adr_sbmt_mgr_hstry