From e278286ab2dbd70303c2668990f22fa699fe28ea Mon Sep 17 00:00:00 2001
From: "Jonguk. Lim" <minuk926@gmail.com>
Date: Wed, 19 Jun 2024 18:08:05 +0900
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=ED=8F=90=EA=B8=B0=EC=8B=A0=EC=B2=AD?=
 =?UTF-8?q?=20=EB=A7=88=EC=8A=A4=ED=84=B0=20=EC=A0=95=EB=B3=B4=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=20=EC=B2=98=EB=A6=AC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cokr/xit/adds/biz/nims/dao/BizNimsMapper.java    | 12 ++++++++++++
 .../xit/adds/biz/nims/service/BizNimsService.java    |  6 ++++++
 .../biz/nims/service/bean/BizNimsServiceBean.java    |  6 ++++++
 .../xit/adds/biz/nims/web/BizNimsController.java     |  8 ++++++++
 .../resources/sql/mapper/biz/nims-mysql-mapper.xml   |  9 +++++++++
 5 files changed, 41 insertions(+)

diff --git a/src/main/java/cokr/xit/adds/biz/nims/dao/BizNimsMapper.java b/src/main/java/cokr/xit/adds/biz/nims/dao/BizNimsMapper.java
index ebb2f03..0e2d4a3 100644
--- a/src/main/java/cokr/xit/adds/biz/nims/dao/BizNimsMapper.java
+++ b/src/main/java/cokr/xit/adds/biz/nims/dao/BizNimsMapper.java
@@ -48,15 +48,27 @@ public interface BizNimsMapper extends AbstractMapper {
 	// NIMS BIZ
 	//------------------------------------------------------------------------------------------------------
 	Optional<Map<String,String>> selectApiInfInfoByUserId(Map<String,String> map);
+
 	int insertDsuseMgtReceipt(final BizNimsRequest.DsuseMgtReceiptReq dto);
+	int updateDsuseMgtReceipt(final BizNimsRequest.DsuseMgtReceiptReq dto);
 	int updateDsuseMgtRslt(final BizNimsRequest.DsuseMgtRsltReq dto);
+
 	int insertDsuseMgt(final BizNimsDto.DsuseMgt dto);
+
 	int insertDsuseMgtDtl(final BizNimsDto.DsuseMgtDtl dto);
+
 	List<BizNimsResponse.DsuseMgtRes> selectDsuseMgts(final BizNimsRequest.DsuseMgtInqReq dto);
+
 	List<BizNimsResponse.DsuseMgtDtlRes> selectDsuseMgtDtls(final Map<String, String> map);
+
 	int updateMappingDsuseMgt(final BizNimsRequest.DsuseMgtMappingReq mgtDto);
+
 	int updateForceMappingDsuseMgt(final BizNimsResponse.DsuseMgtRes mgtDto);
 
+
+
+
+
 	int insertDsuseRptInfo(final NimsApiDto.DsuseRptInfo dto);
 	int insertDsuseRptInfoDtl(final NimsApiDto.DsuseRptInfoDtl dto);
 	int updateCancelDsuseRptInfo(final NimsApiDto.DsuseRptInfo dto);
diff --git a/src/main/java/cokr/xit/adds/biz/nims/service/BizNimsService.java b/src/main/java/cokr/xit/adds/biz/nims/service/BizNimsService.java
index f5d5a3f..3e873a0 100644
--- a/src/main/java/cokr/xit/adds/biz/nims/service/BizNimsService.java
+++ b/src/main/java/cokr/xit/adds/biz/nims/service/BizNimsService.java
@@ -42,9 +42,15 @@ public interface BizNimsService {
 	// NIMS BIZ
 	//------------------------------------------------------------------------------------------------------
 	BizNimsRequest.DsuseMgtReceiptReq saveDsuseMgtReceipt(final BizNimsRequest.DsuseMgtReceiptReq dto, final List<BizNimsDto.DsuseMgtDtl> dtls, List<MultipartFile> files);
+
+	BizNimsRequest.DsuseMgtReceiptReq modifyDsuseMgtReceiptMstInfo(final BizNimsRequest.DsuseMgtReceiptReq reqDto);
+
 	BizNimsRequest.DsuseMgtRsltReq saveDsuseMgtRslt(final BizNimsRequest.DsuseMgtRsltReq dto, final List<MultipartFile> files, final String fileChangeYn);
+
 	List<BizNimsResponse.DsuseMgtRes> getDsuseMgts(final BizNimsRequest.DsuseMgtInqReq dto, final boolean isForDoc);
+
 	void modifyPrgsSttsOfDsuseMgt(final BizNimsDto.DsuseMgt dto);
+
 	NimsApiDto.ProductInfoKd getPrdMnfSeqInfoOfBarcode(final String barcodeStr);
 
 
diff --git a/src/main/java/cokr/xit/adds/biz/nims/service/bean/BizNimsServiceBean.java b/src/main/java/cokr/xit/adds/biz/nims/service/bean/BizNimsServiceBean.java
index 4a0449f..dec0cf9 100644
--- a/src/main/java/cokr/xit/adds/biz/nims/service/bean/BizNimsServiceBean.java
+++ b/src/main/java/cokr/xit/adds/biz/nims/service/bean/BizNimsServiceBean.java
@@ -298,6 +298,12 @@ public class BizNimsServiceBean extends AbstractServiceBean implements BizNimsSe
 		return reqDto;
 	}
 
+	@Override
+	public BizNimsRequest.DsuseMgtReceiptReq modifyDsuseMgtReceiptMstInfo(BizNimsRequest.DsuseMgtReceiptReq reqDto) {
+		bizNimsMapper.updateDsuseMgtReceipt(reqDto);
+		return reqDto;
+	}
+
 	/**
 	 * <pre>
 	 * 사고마약류폐기 통보[결과]처리
diff --git a/src/main/java/cokr/xit/adds/biz/nims/web/BizNimsController.java b/src/main/java/cokr/xit/adds/biz/nims/web/BizNimsController.java
index 06f2641..b0e8e61 100644
--- a/src/main/java/cokr/xit/adds/biz/nims/web/BizNimsController.java
+++ b/src/main/java/cokr/xit/adds/biz/nims/web/BizNimsController.java
@@ -141,6 +141,14 @@ public class BizNimsController {
         return ApiBaseResponse.of(bizNimsService.saveDsuseMgtReceipt(receiptDto, dsuseMgtDtls, dsusePrdImgFiles));
     }
 
+    @Operation(summary = "사고 마약류 폐기 관리 폐기 신청서 마스터 정보 변경", description = "사고 마약류 폐기 관리 폐기 신청서 접수 마스터 정보 변경", tags = { "BIZ API" })
+    @PostMapping(value = "/modifyDsuseMgtReceiptMstInfo")
+    public ApiBaseResponse<BizNimsRequest.DsuseMgtReceiptReq> modifyDsuseMgtReceiptMstInfo(
+        @RequestBody BizNimsRequest.DsuseMgtReceiptReq reqDto
+    ) {
+        return ApiBaseResponse.of(bizNimsService.modifyDsuseMgtReceiptMstInfo(reqDto));
+    }
+
     /**
      * 사고 마약류 폐기 결과[통보] 처리
      * @param dsuseMgtRsltJsonStr 폐기 결과[통보] JSON String
diff --git a/src/main/resources/sql/mapper/biz/nims-mysql-mapper.xml b/src/main/resources/sql/mapper/biz/nims-mysql-mapper.xml
index 869ca97..8a62bab 100644
--- a/src/main/resources/sql/mapper/biz/nims-mysql-mapper.xml
+++ b/src/main/resources/sql/mapper/biz/nims-mysql-mapper.xml
@@ -279,6 +279,15 @@
         )
     </insert>
 
+    <update id="updateDsuseMgtReceipt" parameterType="cokr.xit.adds.biz.nims.model.BizNimsRequest$DsuseMgtRsltReq">
+        /** nims-mysql-mapper|updateDsuseMgtReceipt-폐기관리 정보 변경|julim  */
+        UPDATE tb_dsuse_mgt
+           SET dsuse_prv_cd = #{dsusePrvCd}
+             , mdfcn_dt = DATE_FORMAT(now(), '%Y%m%d%H%i%s')
+             , mdfr = #{rgtr}
+        WHERE dscdmng_id = #{dscdmngId}
+    </update>
+
     <update id="updateDsuseMgtRslt" parameterType="cokr.xit.adds.biz.nims.model.BizNimsRequest$DsuseMgtRsltReq">
         /** nims-mysql-mapper|updateDsuseMgtRslt-폐기관리 정보 변경|julim  */
         UPDATE tb_dsuse_mgt

From f06a84ee6e5625e137f505f12984b5bae86f2f5f Mon Sep 17 00:00:00 2001
From: "Jonguk. Lim" <minuk926@gmail.com>
Date: Wed, 19 Jun 2024 19:46:59 +0900
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=ED=8F=90=EA=B8=B0=EC=8B=A0=EC=B2=AD?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=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

---
 .../xit/adds/biz/nims/dao/BizNimsMapper.java  |  2 +
 .../nims/service/bean/BizNimsServiceBean.java | 61 +++++++++++++++----
 .../sql/mapper/biz/nims-mysql-mapper.xml      |  8 ++-
 3 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/src/main/java/cokr/xit/adds/biz/nims/dao/BizNimsMapper.java b/src/main/java/cokr/xit/adds/biz/nims/dao/BizNimsMapper.java
index 0e2d4a3..1163285 100644
--- a/src/main/java/cokr/xit/adds/biz/nims/dao/BizNimsMapper.java
+++ b/src/main/java/cokr/xit/adds/biz/nims/dao/BizNimsMapper.java
@@ -86,6 +86,8 @@ public interface BizNimsMapper extends AbstractMapper {
 	// 이미지 업로드시 이전 이미지 삭제를 위한 fileId 조회
 	List<String> selectFileId(Map<String, String> map);
 
+	void deleteDsuseMgtDtl(final String dscdmngId);
+
 	//List<NimsApiDto.DsuseRptInfoDtl> selectDsuseRptInfoDtls(final Map<String, String> map);
 
 
diff --git a/src/main/java/cokr/xit/adds/biz/nims/service/bean/BizNimsServiceBean.java b/src/main/java/cokr/xit/adds/biz/nims/service/bean/BizNimsServiceBean.java
index dec0cf9..8fef3dd 100644
--- a/src/main/java/cokr/xit/adds/biz/nims/service/bean/BizNimsServiceBean.java
+++ b/src/main/java/cokr/xit/adds/biz/nims/service/bean/BizNimsServiceBean.java
@@ -277,23 +277,30 @@ public class BizNimsServiceBean extends AbstractServiceBean implements BizNimsSe
 		// FIXME: 파일 갯수 확인 - 프론트 파일 처리 완료시 까지 comment 처리
 		if(files.size() != dtls.size()) throw ApiCustomException.create("폐기물 파일 갯수 오류[파일 갯수 확인]");
 
-		if(bizNimsMapper.insertDsuseMgtReceipt(reqDto) == 1){
-			int dtlCnt = 0;
+		if(isEmpty(reqDto.getDscdmngId())) {
 
-			for (BizNimsDto.DsuseMgtDtl d : dtls) {
-				String sn = StringUtils.leftPad(dtlCnt + 1 + "", 3, "0");
-				d.setDscdmngId(reqDto.getDscdmngId());
-				d.setDscdmngSn(sn);
-				d.setRgtr(reqDto.getUserId());
-				dtlCnt = dtlCnt + bizNimsMapper.insertDsuseMgtDtl(d);
+			if (bizNimsMapper.insertDsuseMgtReceipt(reqDto) == 1) {
 
-				// FIXME: 파일 갯수 확인 - 프론트 파일 처리 완료시 까지 comment 처리
-				d.setFileId(
-					uploadFileDeleteAndSave(Constants.FILE_INF_TYPE.DSUSE_PRD_IMG.getCode(), reqDto.getDscdmngId(), sn, files.get(dtlCnt-1)));
+				// 폐기관리 상세 등록
+				saveDsuseMgtDtls(reqDto, dtls, files);
+			} else {
+				throw ApiCustomException.create("폐기 관리 마스터 등록 실패");
 			}
-			if(dtls.size() != dtlCnt) throw ApiCustomException.create("폐기 관리 상세 등록 실패");
 		} else {
-			throw ApiCustomException.create("폐기 관리 마스터 등록 실패");
+			bizNimsMapper.updateDsuseMgtReceipt(reqDto);
+
+			// 파일 삭제
+			List<String> fileIds = bizNimsMapper.selectFileId(
+				Map.of("infType", Constants.FILE_INF_TYPE.DSUSE_PRD_IMG.getCode(), "infKey", reqDto.getDscdmngId()));
+			if (!fileIds.isEmpty()) {
+				fileService.delete(fileIds.toArray(new String[0]));
+			}
+
+			// 폐기관리 상세 삭제
+			bizNimsMapper.deleteDsuseMgtDtl(reqDto.getDscdmngId());
+
+			// 폐기관리 상세 등록
+			saveDsuseMgtDtls(reqDto, dtls, files);
 		}
 		return reqDto;
 	}
@@ -899,6 +906,34 @@ public class BizNimsServiceBean extends AbstractServiceBean implements BizNimsSe
 		}
 	}
 
+	/**
+	 * <pre>
+	 * 폐기관리 상세 등록
+	 * @param reqDto
+	 * @param dtls
+	 * @param files
+	 * </pre>
+	 */
+	private void saveDsuseMgtDtls(BizNimsRequest.DsuseMgtReceiptReq reqDto, List<BizNimsDto.DsuseMgtDtl> dtls,
+		List<MultipartFile> files) {
+		int dtlCnt = 0;
+
+		for (BizNimsDto.DsuseMgtDtl d : dtls) {
+			String sn = StringUtils.leftPad(dtlCnt + 1 + "", 3, "0");
+			d.setDscdmngId(reqDto.getDscdmngId());
+			d.setDscdmngSn(sn);
+			d.setRgtr(reqDto.getUserId());
+			dtlCnt = dtlCnt + bizNimsMapper.insertDsuseMgtDtl(d);
+
+			d.setFileId(
+				uploadFileDeleteAndSave(Constants.FILE_INF_TYPE.DSUSE_PRD_IMG.getCode(), reqDto.getDscdmngId(),
+					sn, files.get(dtlCnt - 1)));
+		}
+		if (dtls.size() != dtlCnt)
+			throw ApiCustomException.create("폐기 관리 상세 등록 실패");
+	}
+
+
 	/**
 	 * <pre>
 	 * file 저장 처리
diff --git a/src/main/resources/sql/mapper/biz/nims-mysql-mapper.xml b/src/main/resources/sql/mapper/biz/nims-mysql-mapper.xml
index 8a62bab..060bdcd 100644
--- a/src/main/resources/sql/mapper/biz/nims-mysql-mapper.xml
+++ b/src/main/resources/sql/mapper/biz/nims-mysql-mapper.xml
@@ -279,7 +279,7 @@
         )
     </insert>
 
-    <update id="updateDsuseMgtReceipt" parameterType="cokr.xit.adds.biz.nims.model.BizNimsRequest$DsuseMgtRsltReq">
+    <update id="updateDsuseMgtReceipt" parameterType="cokr.xit.adds.biz.nims.model.BizNimsRequest$DsuseMgtReceiptReq">
         /** nims-mysql-mapper|updateDsuseMgtReceipt-폐기관리 정보 변경|julim  */
         UPDATE tb_dsuse_mgt
            SET dsuse_prv_cd = #{dsusePrvCd}
@@ -344,6 +344,12 @@
         )
     </insert>
 
+    <delete id="deleteDsuseMgtDtl" parameterType="string">
+        /** nims-mysql-mapper|deleteDsuseMgtDtl-폐기관리 상세 삭제|julim  */
+        DELETE FROM tb_dsuse_mgt_dtl
+         WHERE dscdmng_id = #{dscdmngId}
+    </delete>
+
     <insert id="insertDsuseMgtDtl" parameterType="cokr.xit.adds.biz.nims.model.BizNimsDto$DsuseMgtDtl">
         /** nims-mysql-mapper|insertDsuseMgtDtl-폐기관리 상세 생성|julim  */
         INSERT INTO tb_dsuse_mgt_dtl (

From ec59289e47a5b28bc263d96c7091f2f43b2fcd14 Mon Sep 17 00:00:00 2001
From: "Jonguk. Lim" <minuk926@gmail.com>
Date: Wed, 19 Jun 2024 19:49:04 +0900
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=ED=8F=90=EA=B8=B0=EC=8B=A0=EC=B2=AD?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=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

---
 src/main/java/cokr/xit/adds/biz/nims/web/BizNimsController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/cokr/xit/adds/biz/nims/web/BizNimsController.java b/src/main/java/cokr/xit/adds/biz/nims/web/BizNimsController.java
index b0e8e61..4cbae27 100644
--- a/src/main/java/cokr/xit/adds/biz/nims/web/BizNimsController.java
+++ b/src/main/java/cokr/xit/adds/biz/nims/web/BizNimsController.java
@@ -128,7 +128,7 @@ public class BizNimsController {
      * @param dsusePrdImgFiles 폐기신청 제품 이미지 파일
      * @return 폐기관리 신청서 접수 데이타 생성후 생성 정보 return
      */
-    @Operation(summary = "사고 마약류 폐기 관리 폐기 신청서 접수", description = "사고 마약류 폐기 관리 폐기 신청서 접수<br><br>폐기관리 신청서 접수 데이타 생성후 생성 정보 return", tags = { "BIZ API" })
+    @Operation(summary = "사고 마약류 폐기 관리 폐기 신청서 접수/변경", description = "사고 마약류 폐기 관리 폐기 신청서 접수/변경<br><br>폐기관리 신청서 접수 데이타 생성후 생성 정보 return<br>폐기관리 신청서 변경후 변경 정보 return", tags = { "BIZ API" })
     @PostMapping(value = "/saveDsuseMgtReceipt")
     public ApiBaseResponse<BizNimsRequest.DsuseMgtReceiptReq> saveDsuseMgtReceipt(
         @RequestParam("dsuseMgtJsonStr") String dsuseMgtJsonStr,