견적서 API 수정

src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java

@@ -538,14 +538,16 @@ public class EstimateService {
                 StringUtils.isEmpty(itemRequest.getPnowW()) ? "0" : itemRequest.getPnowW());
 
         // 모듈/PC 체크
-        if ("MODULE_".equals(itemRequest.getItemGroup())) {
+        if (!"1".equals(itemRequest.getDelFlg())) {
-          moduleModel += !StringUtils.isEmpty(moduleModel) ? splitStr : "";
+          if ("MODULE_".equals(itemRequest.getItemGroup())) {
-          moduleModel += itemRequest.getItemNo();
+            moduleModel += !StringUtils.isEmpty(moduleModel) ? splitStr : "";
+            moduleModel += itemRequest.getItemNo();
 
-          capacity = capacity.add(amount.multiply(pnowW));
+            capacity = capacity.add(amount.multiply(pnowW));
-        } else if ("PC_".equals(itemRequest.getItemGroup())) {
+          } else if ("PC_".equals(itemRequest.getItemGroup())) {
-          pcTypeNo += !StringUtils.isEmpty(pcTypeNo) ? splitStr : "";
+            pcTypeNo += !StringUtils.isEmpty(pcTypeNo) ? splitStr : "";
-          pcTypeNo += itemRequest.getItemNo();
+            pcTypeNo += itemRequest.getItemNo();
+          }
         }
       }
       estimateRequest.setCapacity(String.valueOf(capacity));
@@ -554,6 +556,7 @@ public class EstimateService {
 
       // 물건정보 수정
       if (!StringUtils.isEmpty(estimateRequest.getObjectName())
+          || !StringUtils.isEmpty(estimateRequest.getObjectNameOmit())
           || !StringUtils.isEmpty(estimateRequest.getSurfaceType())
           || !StringUtils.isEmpty(estimateRequest.getSetupHeight())
           || !StringUtils.isEmpty(estimateRequest.getStandardWindSpeedId())

src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateRequest.java

@@ -21,6 +21,9 @@ public class EstimateRequest {
   @Schema(description = "안건명")
   private String objectName;
 
+  @Schema(description = "경칭")
+  private String objectNameOmit;
+
   @Schema(description = "시공방법")
   private String constructSpecification;
 

src/main/java/com/interplug/qcast/biz/object/dto/PlanResponse.java

@@ -92,13 +92,16 @@ public class PlanResponse {
   @Schema(description = "북면설치여부")
   private String northArrangement;
 
-  @Schema(description = "지붕재")
+  @Schema(description = "시공방법명")
+  private String constructSpecificationMulti;
+
+  @Schema(description = "지붕재명")
   private String roofMaterialIdMulti;
 
-  @Schema(description = "가대")
+  @Schema(description = "가대명")
   private String supportMethodIdMulti;
 
-  @Schema(description = "가대 메이커")
+  @Schema(description = "가대 메이커명")
   private String supportMeakerMulti;
 
   @Schema(description = "다른 지붕재여부")

src/main/resources/mappers/estimate/estimateMapper.xml

@@ -559,8 +559,11 @@
         SET
               LAST_EDIT_DATETIME = GETDATE()
             , LAST_EDIT_USER = #{userId}
-            <if test='objectName != null and objectName != ""'>
+            <if test='objectName != null and objectName != "" and objectNameOmit != null and objectNameOmit != ""'>
             , OBJECT_NAME = #{objectName}
+            , OBJECT_NAME_OMIT = #{objectNameOmit}
+            , ADDRESSEE_COMPANY_NAME = #{objectName} + ' ' + #{objectNameOmit}
+            , ADDRESSEE_COMPANY_NAME_OMIT = #{objectNameOmit}
             </if>
             <if test='standardWindSpeedId != null and standardWindSpeedId != ""'>
             , STANDARD_WIND_SPEED_ID = #{standardWindSpeedId}

src/main/resources/mappers/object/objectMapper.xml

@@ -376,6 +376,7 @@
             , T.DIFF_ROOF_ENABLED
             , T.ORDER_FLG
             , T.ESTIMATE_DATE
+            , T.CONSTRUCT_SPECIFICATION_MULTI
         FROM T_PLAN T WITH (NOLOCK)
         WHERE T.OBJECT_NO = #{objectNo}
             AND T.DEL_FLG = '0'