|
|
@@ -637,7 +637,7 @@
|
|
|
<if test="(vo.deptList != null and vo.deptList.size != 0) or (vo.demandIdAll != null and vo.demandIdAll.size != 0)">
|
|
|
<include refid="deptListOrDemandIdAllNoAnd"/>
|
|
|
</if>
|
|
|
- group by year(create_time)
|
|
|
+ group by year(task_release_time)
|
|
|
</select>
|
|
|
|
|
|
<select id="purchaseProjectNumberAnalysisQuarter" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
|
|
|
@@ -645,8 +645,8 @@
|
|
|
select ifnull(COUNT(demand_id), 0) countNum, ifnull(sum(evaluation), 0) evaluationSum, quarter(create_time) yy
|
|
|
from pm_demand
|
|
|
<include refid="deptListOrDemandIdAll"/>
|
|
|
- year(create_time) = year(NOW())
|
|
|
- group by concat(Year(create_time), quarter(create_time))
|
|
|
+ year(task_release_time) = year(NOW())
|
|
|
+ group by concat(Year(task_release_time), quarter(task_release_time))
|
|
|
</select>
|
|
|
|
|
|
<select id="purchaseProjectNumberAnalysisOldYearQuarter" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
|
|
|
@@ -654,8 +654,8 @@
|
|
|
select ifnull(COUNT(demand_id), 0) countNum, ifnull(sum(evaluation), 0) evaluationSum, quarter(create_time) yy
|
|
|
from pm_demand
|
|
|
<include refid="deptListOrDemandIdAll"/>
|
|
|
- year(create_time) = year(NOW() - 1)
|
|
|
- group by concat(Year(create_time), quarter(create_time))
|
|
|
+ year(task_release_time) = year(NOW() - 1)
|
|
|
+ group by concat(Year(task_release_time), quarter(task_release_time))
|
|
|
</select>
|
|
|
|
|
|
<select id="purchaseProjectNumberAnalysisMonth" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
|
|
|
@@ -665,8 +665,8 @@
|
|
|
date_format(create_time, '%m') yy
|
|
|
from pm_demand
|
|
|
<include refid="deptListOrDemandIdAll"/>
|
|
|
- year(create_time) = year(NOW())
|
|
|
- group by date_format(create_time, '%y%m')
|
|
|
+ year(task_release_time) = year(NOW())
|
|
|
+ group by date_format(task_release_time, '%y%m')
|
|
|
</select>
|
|
|
|
|
|
<select id="purchaseProjectNumberAnalysisOldYearMonth" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
|
|
|
@@ -676,8 +676,8 @@
|
|
|
date_format(create_time, '%m') yy
|
|
|
from pm_demand
|
|
|
where purchase_dept_id = #{purchaseDeptId}
|
|
|
- AND year(create_time) = YEAR(NOW()) - 1
|
|
|
- group by date_format(create_time, '%y%m')
|
|
|
+ AND year(task_release_time) = YEAR(NOW()) - 1
|
|
|
+ group by date_format(task_release_time, '%y%m')
|
|
|
</select>
|
|
|
|
|
|
<select id="selectSTSLastYear" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
|
buzhanyi