|
|
@@ -246,10 +246,10 @@
|
|
|
SELECT
|
|
|
COALESCE(SUM(CASE WHEN T.LXSJ >= #{start,jdbcType=DATE} THEN 1 ELSE 0 END),0) as xl,
|
|
|
COALESCE(SUM(CASE WHEN T.LXSJ <= #{end,jdbcType=DATE} AND XMZT = 1 THEN 1 ELSE 0 END),0) as jz,
|
|
|
- COALESCE(SUM(CASE WHEN T1.ID IS NULL THEN 1 ELSE 0 END),0) as haveContract,
|
|
|
- COALESCE(SUM(CASE WHEN T1.ID IS NOT NULL THEN 1 ELSE 0 END),0) as noContract,
|
|
|
+ COALESCE(SUM(CASE WHEN T.XMZT != 3 AND T.IS_SIGN = 1 AND T1.ID IS NOT NULL THEN 1 ELSE 0 END),0) as haveContract,
|
|
|
+ COALESCE(SUM(CASE WHEN T.XMZT != 3 AND T.IS_SIGN = 1 AND T1.ID IS NULL THEN 1 ELSE 0 END),0) as noContract,
|
|
|
COALESCE(SUM(CASE WHEN T.XMZT = 4 THEN 1 ELSE 0 END),0) as accepted,
|
|
|
- COALESCE(SUM(CASE WHEN T.XMZT = 1 THEN 1 ELSE 0 END),0) as unaccepted
|
|
|
+ COALESCE(SUM(CASE WHEN T.XMZT = 1 and T1.ID IS NOT NULL THEN 1 ELSE 0 END),0) as unaccepted
|
|
|
FROM PROJECT T
|
|
|
LEFT JOIN (SELECT PROJECT_ID,MAX(ID) as ID FROM CONTRACT WHERE FLOW_STATUS = 90 AND ISVALID = 1 GROUP BY PROJECT_ID ) T1 ON T1.PROJECT_ID = T.ID
|
|
|
WHERE T.ISVALID = 1 AND T.FLOW_STATUS = 90
|
ljy121