dev #488

Merged
ysCha merged 2 commits from dev into dev-deploy 2026-05-06 11:03:09 +09:00
8 changed files with 82 additions and 11 deletions
Showing only changes of commit e990b62e16 - Show all commits

View File

@ -3181,6 +3181,10 @@ public class EstimateService {
SimulationEstimateListResponse response = new SimulationEstimateListResponse();
if (!"T01".equals(objectRequest.getSaleStoreId())) {
objectRequest.setSchSelSaleStoreId("");
}
// 견적서 목록 조회
List<ObjectResponse> objectList = estimateMapper.selectSimulationEstimateList(objectRequest);

View File

@ -34,14 +34,22 @@ public class ExcelDownController {
@ResponseStatus(HttpStatus.OK)
public QuotResponse quotExclDownData(@RequestBody QuotRequest quotRequest) throws Exception {
List<QuotPlanResponse> quotPlanExclDownData =
excelDownService.selectQuotPlanExclDownData(quotRequest);
List<QuotItemResponse> quotItemExclDownData =
excelDownService.selectQuotItemExclDownData(quotRequest);
QuotResponse quotRes = new QuotResponse();
quotRes.setQuotPlanList(quotPlanExclDownData);
quotRes.setQuotItemList(quotItemExclDownData);
if ("1".equals(quotRequest.getSch_select_type())) {
List<QuotPlanResponse> quotPlanExclDownData =
excelDownService.selectQuotPlanExclDownData(quotRequest);
List<QuotItemResponse> quotItemExclDownData =
excelDownService.selectQuotItemExclDownData(quotRequest);
quotRes.setQuotPlanList(quotPlanExclDownData);
quotRes.setQuotItemList(quotItemExclDownData);
} else {
List<QuotPlanResponse> quotPlanExclDownData =
excelDownService.selectQuotPlanExclDownData2(quotRequest);
quotRes.setQuotPlanList(quotPlanExclDownData);
}
return quotRes;
}

View File

@ -23,6 +23,15 @@ interface ExcelDownMapper {
*/
List<QuotPlanResponse> selectQuotPlanExclDownData(QuotRequest quotRequest) throws Exception;
/**
* 과거데이터_견적 엑셀다운로드 조회 - 심플모드
*
* @param quotRequest
* @return
* @throws Exception
*/
List<QuotPlanResponse> selectQuotPlanExclDownData2(QuotRequest quotRequest) throws Exception;
/**
* 과거데이터_견적 엑셀다운로드 조회(아이템)
*

View File

@ -38,6 +38,18 @@ public class ExcelDownService {
return excelDownMapper.selectQuotPlanExclDownData(quotRequest);
}
/**
* 과거데이터_견적 엑셀다운로드 조회
*
* @param quotRequest
* @return
* @throws Exception
*/
public List<QuotPlanResponse> selectQuotPlanExclDownData2(QuotRequest quotRequest)
throws Exception {
return excelDownMapper.selectQuotPlanExclDownData2(quotRequest);
}
/**
* 과거데이터_견적 엑셀다운로드 조회(아이템)
*

View File

@ -117,5 +117,8 @@ public class QuotPlanResponse {
private String saleOther;
@Schema(description = "가대판매가격 架台販売価格")
private String saleStand;
@Schema(description = "플랜정보 등록일시 プラン情報登録日時")
private String createDatetime;
@Schema(description = "플랜정보 등록자 プラン情報登録者")
private String createUser;
}

View File

@ -11,6 +11,8 @@ import lombok.Setter;
public class QuotRequest {
@Schema(description = "Language Code")
private String langCd;
@Schema(description = "조회타입")
private String sch_select_type;
@Schema(description = "시작일")
private String sch_startDt;
@Schema(description = "종료일")

View File

@ -1612,9 +1612,6 @@
<if test='schObjectNo != null and schObjectNo != ""'>
AND O.OBJECT_NO LIKE '%' + #{schObjectNo} + '%'
</if>
<if test='schSaleStoreId != null and schSaleStoreId != ""'>
AND O.SALE_STORE_ID = #{schSaleStoreId}
</if>
<if test='schOtherSelSaleStoreId != null and schOtherSelSaleStoreId != ""'>
/* 2차점까지 고름 */
AND O.SALE_STORE_ID = #{schOtherSelSaleStoreId}

View File

@ -192,6 +192,42 @@
</if>
</select>
<select id="selectQuotPlanExclDownData2" parameterType="com.interplug.qcast.biz.excelDown.dto.QuotRequest"
resultType="com.interplug.qcast.biz.excelDown.dto.QuotPlanResponse">
/* sqlid : com.interplug.qcast.api.excelDown.selectQuotPlanExclDownData2 (견적엑셀다운로드 플랜정보 데이터 조회) */
SELECT
O.OBJECT_NO
, P.PLAN_NO
, P.LAST_EDIT_DATETIME
, P.LAST_EDIT_USER
, PI.CREATE_DATETIME
, PI.CREATE_USER
FROM T_OBJECT O WITH (NOLOCK)
LEFT OUTER JOIN T_OBJECT_INFO OI WITH (NOLOCK)
ON O.OBJECT_NO = OI.OBJECT_NO
LEFT OUTER JOIN T_PLAN P WITH (NOLOCK)
ON O.OBJECT_NO = P.OBJECT_NO
LEFT OUTER JOIN T_PLAN_INFO PI WITH (NOLOCK)
ON P.OBJECT_NO = PI.OBJECT_NO
AND P.PLAN_NO = PI.PLAN_NO
LEFT OUTER JOIN M_SALES_STORE SS
ON O.SALE_STORE_ID = SS.SALE_STORE_ID
WHERE P.DEL_FLG = '0'
AND (O.DEL_FLG = '0' OR (OI.SOURCE_ORIGIN = 'QCAST_III' AND OI.ORG_DEL_FLG = '0' AND OI.TEMP_FLG = '0'))
<if test="sch_startDt != null and sch_startDt != '' and sch_endDt != null and sch_endDt != ''"> <!-- 견적일 -->
AND (
(P.LAST_EDIT_DATETIME <![CDATA[>=]]> #{sch_startDt} + ' 00:00:00' AND P.LAST_EDIT_DATETIME <![CDATA[<=]]> #{sch_endDt} + ' 23:59:59') OR
(PI.CREATE_DATETIME <![CDATA[>=]]> #{sch_startDt} + ' 00:00:00' AND PI.CREATE_DATETIME <![CDATA[<=]]> #{sch_endDt} + ' 23:59:59')
)
</if>
<if test="sch_saleStoreId != null and sch_saleStoreId != ''"> <!-- 판매대리점명/ID -->
AND O.SALE_STORE_ID = #{sch_saleStoreId}
</if>
<if test="sch_businessChargerCd != null and sch_businessChargerCd != ''"> <!-- 영업담당자 -->
AND SS.BUSINESS_CHARGER_CD = #{sch_businessChargerCd}
</if>
</select>
<select id="selectQuotItemExclDownData" parameterType="com.interplug.qcast.biz.excelDown.dto.QuotRequest"
resultType="com.interplug.qcast.biz.excelDown.dto.QuotItemResponse">
/* sqlid : com.interplug.qcast.api.excelDown.selectQuotItemExclDownData (견적엑셀다운로드 품목단위 데이터 조회) */