From 32da841facb275ee6619ea200deb5651e3a72895 Mon Sep 17 00:00:00 2001
From: changkyu choi <okoookoo@naver.com>
Date: Thu, 22 Aug 2024 10:12:33 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=EB=93=B1=EB=A1=9DAP?=
 =?UTF-8?q?I=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/canvasStatus/CanvasStatusMapper.java     |  4 ++--
 .../biz/canvasStatus/CanvasStatusService.java    | 16 ++++++++--------
 .../mappers/canvasStatus/canvasStatusMapper.xml  |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusMapper.java b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusMapper.java
index c00dc9ca..9550b89a 100644
--- a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusMapper.java
+++ b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusMapper.java
@@ -11,10 +11,10 @@ import org.apache.ibatis.annotations.Mapper;
 public interface CanvasStatusMapper {
 
 	// objectNo 생성
-	public String getCanvasStatusNewObjectNo(String userId);
+	public CanvasStatus getCanvasStatusNewObjectNo(String userId);
 	
 	// imageName 생성
-	public String getCanvasStatusImageAdd(String objectNo);
+	public CanvasStatus getCanvasStatusImageAdd(String objectNo);
 	
 	// 전체 견적서 조회
 	public List<CanvasStatusResponse> selectAllCanvasStatus(String userId);
diff --git a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java
index 0cedab71..44834e6d 100644
--- a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java
+++ b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java
@@ -27,22 +27,22 @@ public class CanvasStatusService {
 
 	// 견적서 등록
 	public String insertCanvasStatus(CanvasStatus cs) {
-		
+
 		try {	    
 			// objectNo 없음(신규)
-			if (cs.getObjectNo() == null) {
+			if (cs.getObjectNo() == null || cs.getObjectNo() == "") {
 				// objectNo 생성
-				String objectNo = canvasStatusMapper.getCanvasStatusNewObjectNo(cs.getUserId());
-				
-				cs.setObjectNo(objectNo);
+				CanvasStatus newTemp = canvasStatusMapper.getCanvasStatusNewObjectNo(cs.getUserId());
+
+				cs.setObjectNo(newTemp.getObjectNo());
 				cs.setImageName("image01");
 				
 			// 이미지(템플릿) 등록(추가)
 			} else {
 				// imageName 생성
-				String imageName = canvasStatusMapper.getCanvasStatusImageAdd(cs.getObjectNo());
-				
-				cs.setImageName(imageName);
+				CanvasStatus addTemp = canvasStatusMapper.getCanvasStatusImageAdd(cs.getObjectNo());
+
+				cs.setImageName(addTemp.getImageName());
 			}
 			
 			canvasStatusMapper.insertCanvasStatus(cs);
diff --git a/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml b/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml
index 2c10b9bd..eb7e313f 100644
--- a/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml
+++ b/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml
@@ -6,7 +6,7 @@
 	<select id="getCanvasStatusNewObjectNo" parameterType="string"
             resultType="com.interplug.qcast.biz.canvasStatus.dto.CanvasStatus">
         /* sqlid : com.interplug.qcast.canvasStatus.getCanvasStatusNewObjectNo */
-        SELECT #{userId} + FORMAT(GETDATE(), 'yyMMdd') + RIGHT('000' + CAST(ISNULL(MAX(CAST(RIGHT(object_no, 3) AS INT)), 0) + 1 AS VARCHAR(3)), 3)
+        SELECT #{userId} + FORMAT(GETDATE(), 'yyMMdd') + RIGHT('000' + CAST(ISNULL(MAX(CAST(RIGHT(object_no, 3) AS INT)), 0) + 1 AS VARCHAR(3)), 3) AS objectNo
 		  FROM TB_CANVAS_STATUS
 		 WHERE object_no LIKE #{userId} + FORMAT(GETDATE(), 'yyMMdd') + '%'
     </select>
@@ -14,7 +14,7 @@
     <select id="getCanvasStatusImageAdd" parameterType="string"
             resultType="com.interplug.qcast.biz.canvasStatus.dto.CanvasStatus">
         /* sqlid : com.interplug.qcast.canvasStatus.getCanvasStatusImageAdd */
-        SELECT 'image' + RIGHT('00' + CAST(ISNULL(MAX(CAST(RIGHT(image_name, 2) AS INT)), 0) + 1 AS VARCHAR(2)), 2)
+        SELECT 'image' + RIGHT('00' + CAST(ISNULL(MAX(CAST(RIGHT(image_name, 2) AS INT)), 0) + 1 AS VARCHAR(2)), 2) AS imageName
 		  FROM TB_CANVAS_STATUS
 		 WHERE object_no = #{objectNo}
     </select>