qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#523) from dev into dev-deploy

Browse Source 
Reviewed-on: #523
This commit is contained in:
ysCha 2026-06-12 13:58:02 +09:00
commit 3ca9af5614
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
View File

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

19
src/main/resources/mappers/estimate/estimateMapper.xml
View File

@ -1549,7 +1549,7 @@
<select id="selectSimulationEstimateList" parameterType="com.interplug.qcast.biz.object.dto.ObjectRequest" resultType="com.interplug.qcast.biz.object.dto.ObjectResponse"> <select id="selectSimulationEstimateList" parameterType="com.interplug.qcast.biz.object.dto.ObjectRequest" resultType="com.interplug.qcast.biz.object.dto.ObjectResponse">
/* sqlid : com.interplug.qcast.biz.estimate.selectSimulationEstimateList */ /* sqlid : com.interplug.qcast.biz.estimate.selectSimulationEstimateList */
<if test='(saleStoreId != null and saleStoreId != "T01") or (schSelSaleStoreId != null and schSelSaleStoreId != "")'> <if test='saleStoreId != null and saleStoreId != "T01"'>
/* 계층형 구조에 맞는 SALE_STORE_ID 축출 - 재귀함수 */ /* 계층형 구조에 맞는 SALE_STORE_ID 축출 - 재귀함수 */
WITH SALES_STORE_CTE AS ( WITH SALES_STORE_CTE AS (
SELECT SELECT
@ -1559,14 +1559,7 @@
FROM M_SALES_STORE WITH(NOLOCK) FROM M_SALES_STORE WITH(NOLOCK)
WHERE APPROVE_FLG = '2' WHERE APPROVE_FLG = '2'
AND DEL_FLG = '0' AND DEL_FLG = '0'
<choose> AND SALE_STORE_ID = #{saleStoreId}
<when test='schSelSaleStoreId != null and schSelSaleStoreId != ""'>
AND SALE_STORE_ID = #{schSelSaleStoreId}
</when>
<otherwise>
AND SALE_STORE_ID = #{saleStoreId}
</otherwise>
</choose>
UNION ALL UNION ALL
SELECT SELECT
@ -1602,7 +1595,7 @@
ON O.SALE_STORE_ID = S.SALE_STORE_ID ON O.SALE_STORE_ID = S.SALE_STORE_ID
INNER JOIN T_PLAN P WITH (NOLOCK) INNER JOIN T_PLAN P WITH (NOLOCK)
ON O.OBJECT_NO = P.OBJECT_NO ON O.OBJECT_NO = P.OBJECT_NO
<if test='(saleStoreId != null and saleStoreId != "T01") or (schSelSaleStoreId != null and schSelSaleStoreId != "")'> <if test='saleStoreId != null and saleStoreId != "T01"'>
INNER JOIN SALES_STORE_CTE T INNER JOIN SALES_STORE_CTE T
ON S.SALE_STORE_ID = T.SALE_STORE_ID ON S.SALE_STORE_ID = T.SALE_STORE_ID
</if> </if>
@ -1614,9 +1607,9 @@
<if test='schObjectNo != null and schObjectNo != ""'> <if test='schObjectNo != null and schObjectNo != ""'>
AND O.OBJECT_NO LIKE '%' + #{schObjectNo} + '%' AND O.OBJECT_NO LIKE '%' + #{schObjectNo} + '%'
</if> </if>
<if test='schOtherSelSaleStoreId != null and schOtherSelSaleStoreId != ""'> <if test='schSelSaleStoreId != null and schSelSaleStoreId != ""'>
/* 2차점까지 고름 */ /* 판매점 아이디 선택 */
AND O.SALE_STORE_ID = #{schOtherSelSaleStoreId} AND O.SALE_STORE_ID = #{schSelSaleStoreId}
</if> </if>
<if test='schObjectName != null and schObjectName != ""'> <if test='schObjectName != null and schObjectName != ""'>
AND O.OBJECT_NAME LIKE '%' + #{schObjectName} + '%' AND O.OBJECT_NAME LIKE '%' + #{schObjectName} + '%'