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

Compare commits

base: qcast3:79f3911af63d759a393d245c22316dac52a7e7bd
Branches Tags
qcast3:main
qcast3:prd-deploy
qcast3:dev-deploy
qcast3:dev
qcast3:feature/jp-0331
qcast3:feature/rjy-0430
qcast3:ready_prd
qcast3:feature/rjy-0113
qcast3:feature/dev-jp-001
qcast3:feature/dev_jp
qcast3:feature/batch-config-new
qcast3:feature/dev-yj
qcast3:feature/qcast-886
qcast3:feature/qcast-944
qcast3:feature/qcast-925
..
compare: qcast3:a20f88b07ec62d025ff4f8f8a4545481982eac68
Branches Tags
qcast3:prd-deploy
qcast3:dev-deploy
qcast3:dev
qcast3:feature/jp-0331
qcast3:feature/rjy-0430
qcast3:ready_prd
qcast3:feature/rjy-0113
qcast3:feature/dev-jp-001
qcast3:feature/dev_jp
qcast3:feature/batch-config-new
qcast3:feature/dev-yj
qcast3:feature/qcast-886
qcast3:feature/qcast-944
qcast3:feature/qcast-925
qcast3:main

No commits in common. "79f3911af63d759a393d245c22316dac52a7e7bd" and "a20f88b07ec62d025ff4f8f8a4545481982eac68" have entirely different histories.
79f3911af6 ... a20f88b07e

1 changed files with 4 additions and 12 deletions
Show Stats Expand all files Collapse all files

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

@ -391,10 +391,6 @@
TCI.P_AMT, TCI.P_AMT,
TCI.CIRCUIT_CFG TCI.CIRCUIT_CFG
FROM T_PART_ROOF_ITEM_ESTIMATE TRI FROM T_PART_ROOF_ITEM_ESTIMATE TRI
INNER JOIN T_PART_ROOF_ESTIMATE TR
ON TRI.ROOF_SURFACE_ID = TR.ROOF_SURFACE_ID
AND TRI.OBJECT_NO = TR.OBJECT_NO
AND TRI.PLAN_NO = TR.PLAN_NO
INNER JOIN TCI INNER JOIN TCI
ON TRI.ROOF_ITEM_NO = TCI.CIRCUIT_NO ON TRI.ROOF_ITEM_NO = TCI.CIRCUIT_NO
AND TRI.OBJECT_NO = TCI.OBJECT_NO AND TRI.OBJECT_NO = TCI.OBJECT_NO
@ -430,14 +426,10 @@
TE.SPECIFICATION AS P_SPEC, TE.SPECIFICATION AS P_SPEC,
ZC.P_AMT, ZC.P_AMT,
(SELECT SPECIFICATION (SELECT SPECIFICATION
FROM T_PART_ROOF_ITEM_ESTIMATE TRI FROM T_PART_ROOF_ITEM_ESTIMATE
INNER JOIN T_PART_ROOF_ESTIMATE TR WHERE OBJECT_NO = ZC.OBJECT_NO
ON TRI.ROOF_SURFACE_ID = TR.ROOF_SURFACE_ID AND PLAN_NO = ZC.PLAN_NO
AND TRI.OBJECT_NO = TR.OBJECT_NO AND ROOF_ITEM_NO = (ZC.ROOF_ITEM_NO + 1)) AS M_SPEC2
AND TRI.PLAN_NO = TR.PLAN_NO
WHERE TRI.OBJECT_NO = ZC.OBJECT_NO
AND TRI.PLAN_NO = ZC.PLAN_NO
AND TRI.ROOF_ITEM_NO = (ZC.ROOF_ITEM_NO + 1)) AS M_SPEC2
FROM Z_CFG ZC FROM Z_CFG ZC
INNER JOIN T_PART_ESTIMATE TE INNER JOIN T_PART_ESTIMATE TE
ON ZC.OBJECT_NO = TE.OBJECT_NO ON ZC.OBJECT_NO = TE.OBJECT_NO