|
@@ -595,7 +595,7 @@
|
|
select contract_amount, demand_id
|
|
select contract_amount, demand_id
|
|
from pm_contract_info
|
|
from pm_contract_info
|
|
) b on a.demand_id = b.demand_id
|
|
) b on a.demand_id = b.demand_id
|
|
- group by year(a.create_time)
|
|
|
|
|
|
+ group by year(a.up_acceptance_time)
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="selectPurchaseTaskFinishQuarter" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
|
|
<select id="selectPurchaseTaskFinishQuarter" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
|
|
@@ -608,13 +608,13 @@
|
|
from pm_demand
|
|
from pm_demand
|
|
<include refid="deptListOrDemandIdAll"/>
|
|
<include refid="deptListOrDemandIdAll"/>
|
|
project_status in (15, 16, 17)
|
|
project_status in (15, 16, 17)
|
|
- and year(create_time) = year(NOW())
|
|
|
|
|
|
+ and year(up_acceptance_time) = year(NOW())
|
|
) a
|
|
) a
|
|
left join (
|
|
left join (
|
|
select contract_amount, demand_id
|
|
select contract_amount, demand_id
|
|
from pm_contract_info
|
|
from pm_contract_info
|
|
) b on a.demand_id = b.demand_id
|
|
) b on a.demand_id = b.demand_id
|
|
- group by concat(Year(a.create_time), quarter(a.create_time))
|
|
|
|
|
|
+ group by concat(Year(a.up_acceptance_time), quarter(a.up_acceptance_time))
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="selectPurchaseTaskFinishMonth" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
|
|
<select id="selectPurchaseTaskFinishMonth" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
|
|
@@ -627,13 +627,13 @@
|
|
from pm_demand
|
|
from pm_demand
|
|
<include refid="deptListOrDemandIdAll"/>
|
|
<include refid="deptListOrDemandIdAll"/>
|
|
project_status in (15, 16, 17)
|
|
project_status in (15, 16, 17)
|
|
- and year(create_time) = year(NOW())
|
|
|
|
|
|
+ and year(up_acceptance_time) = year(NOW())
|
|
) a
|
|
) a
|
|
left join (
|
|
left join (
|
|
select contract_amount, demand_id
|
|
select contract_amount, demand_id
|
|
from pm_contract_info
|
|
from pm_contract_info
|
|
) b on a.demand_id = b.demand_id
|
|
) b on a.demand_id = b.demand_id
|
|
- group by date_format(a.create_time, '%y%m')
|
|
|
|
|
|
+ group by date_format(a.up_acceptance_time, '%y%m')
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="countProjectExceedAndMajor" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
|
|
<select id="countProjectExceedAndMajor" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
|