bug

purchase-system/src/main/resources/mapper/pm/PmDemandMapper.xml

@@ -149,7 +149,7 @@
         FROM `pm_demand`
         <include refid="deptListOrDemandIdAll"/>
         ( real_purchase_finish_time > plan_purchase_finish_time )
-        and YEAR(create_time) = YEAR(NOW())
+        and YEAR(plan_demand_sub_time) = YEAR(NOW())
     </select>
 
     <select id="countProjectExceedThisQua" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
@@ -158,7 +158,7 @@
         FROM `pm_demand`
         <include refid="deptListOrDemandIdAll"/>
         ( real_purchase_finish_time > plan_purchase_finish_time )
-        and quarter(create_time) = quarter(NOW())
+        and quarter(plan_demand_sub_time) = quarter(NOW())
     </select>
 
     <select id="countProjectExceedThisMonth" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
@@ -167,7 +167,7 @@
         FROM `pm_demand`
         <include refid="deptListOrDemandIdAll"/>
         ( real_purchase_finish_time > plan_purchase_finish_time )
-        and MONTH(create_time) = MONTH(NOW())
+        and MONTH(plan_demand_sub_time) = MONTH(NOW())
     </select>
 
     <select id="countProjectExceedAllNum" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
@@ -271,61 +271,61 @@
     <select id="majorProjectByStatusThisMonthNew" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
         <include refid="majorProjectByStatus"/>
-        AND MONTH(create_time ) = MONTH(now())
+        AND MONTH(task_release_time ) = MONTH(now())
         AND project_status &gt; #{vo.projectStatus}
     </select>
     <select id="majorProjectByStatusThisQuaNew" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
         <include refid="majorProjectByStatus"/>
-        AND QUARTER(create_time ) = QUARTER(now())
+        AND QUARTER(task_release_time ) = QUARTER(now())
         AND project_status &gt; #{vo.projectStatus}
     </select>
     <select id="majorProjectByStatusThisYearNew" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
         <include refid="majorProjectByStatus"/>
-        AND YEAR(create_time ) = YEAR(now())
+        AND YEAR(task_release_time ) = YEAR(now())
         AND project_status &gt; #{vo.projectStatus}
     </select>
     <select id="majorProjectByStatusThisMonthFi" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
         <include refid="majorProjectByStatus"/>
-        AND MONTH(create_time ) = MONTH(now())
+        AND MONTH(plan_purchase_finish_time ) = MONTH(now())
         AND project_status &gt;= #{vo.projectStatus}
     </select>
     <select id="majorProjectByStatusThisQuaFi" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
         <include refid="majorProjectByStatus"/>
-        AND QUARTER(create_time ) = QUARTER(now())
+        AND QUARTER(plan_purchase_finish_time ) = QUARTER(now())
         AND project_status &gt;= #{vo.projectStatus}
     </select>
     <select id="majorProjectByStatusThisYearFi" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
         <include refid="majorProjectByStatus"/>
-        AND YEAR(create_time ) = YEAR(now())
+        AND YEAR(plan_purchase_finish_time ) = YEAR(now())
         AND project_status &gt;= #{vo.projectStatus}
     </select>
     <select id="majorProjectByStatusThisMonthFiCGB" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
         <include refid="majorProjectByStatus"/>
-        AND MONTH(create_time ) = MONTH(now())
+        AND MONTH(plan_demand_sub_time ) = MONTH(now())
         AND project_status &gt; #{vo.projectStatus}
     </select>
     <select id="majorProjectByStatusThisQuaFiCGB" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
         <include refid="majorProjectByStatus"/>
-        AND QUARTER(create_time ) = QUARTER(now())
+        AND QUARTER(plan_demand_sub_time ) = QUARTER(now())
         AND project_status &gt; #{vo.projectStatus}
     </select>
     <select id="majorProjectByStatusThisYearFiCGB" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
         <include refid="majorProjectByStatus"/>
-        AND YEAR(create_time ) = YEAR(now())
+        AND YEAR(plan_demand_sub_time ) = YEAR(now())
         AND project_status &gt; #{vo.projectStatus}
     </select>
     <select id="majorProjectByStatusLastYear" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
         <include refid="majorProjectByStatus"/>
-        AND YEAR(create_time ) = YEAR(now())-1
+        AND YEAR(plan_demand_sub_time ) = YEAR(now())-1
         <if test="vo.projectStatusList!=null and vo.projectStatusList.size != 0">
             AND project_status in
             <foreach collection="vo.projectStatusList" item="item" index="index"
@@ -338,6 +338,7 @@
             resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
         <include refid="majorProjectByStatus"/>
         AND project_status &gt;= #{vo.projectStatus}
+        AND YEAR(plan_demand_sub_time ) = YEAR(now())
     </select>
     <select id="majorProjectByStatusWei" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
@@ -699,7 +700,7 @@
         <include refid="deptListOrDemandIdAll"/>
         `project_status` IN (6,7,8,9,10,11,12,13,14,15, 16,
         17)
-        and YEAR(create_time) = YEAR(NOW())-1
+        and YEAR(plan_demand_sub_time) = YEAR(NOW())-1
     </select>
 
     <select id="selectSTSThisYear" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
@@ -707,7 +708,7 @@
         FROM `pm_demand`
         <include refid="deptListOrDemandIdAll"/>
         `project_status` &gt; 4
-        and YEAR(create_time) = YEAR(NOW())
+        and YEAR(plan_demand_sub_time) = YEAR(NOW())
     </select>
 
     <select id="selectmeiJiDu" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo"
@@ -732,7 +733,7 @@
         FROM `pm_demand`
         <include refid="deptListOrDemandIdAll"/>
         `project_status` &gt; 4
-        and YEAR(create_time) = YEAR(NOW())
+        and YEAR(plan_demand_sub_time) = YEAR(NOW())
     </select>
 
     <select id="selectCGThisMonth" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo"
@@ -742,11 +743,11 @@
         FROM pm_demand d,pm_contract_info c,
         (SELECT ifnull(COUNT(demand_id), 0) num ,ifnull(sum(evaluation), 0) evaluationTotal FROM pm_demand
         <include refid="deptListOrDemandIdAll"/>
-        project_status &gt; 16 AND MONTH(create_time) =MONTH(NOW()) ) de
+        project_status &gt; 16 AND MONTH(plan_demand_sub_time) =MONTH(NOW()) ) de
         <include refid="dDeptListOrDemandIdAll"/>
         d.demand_id = c.demand_id
         AND d.project_status &gt; 16
-        AND MONTH(d.create_time) = MONTH(NOW())
+        AND MONTH(d.plan_demand_sub_time) = MONTH(NOW())
     </select>
 
     <select id="selectCGThisQua" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo"
@@ -756,11 +757,11 @@
         FROM pm_demand d,pm_contract_info c,
         (SELECT ifnull(COUNT(demand_id), 0) num ,ifnull(sum(evaluation), 0) evaluationTotal FROM pm_demand
         <include refid="deptListOrDemandIdAll"/>
-        project_status &gt; 17 AND QUARTER(create_time) =QUARTER(NOW()) ) de
+        project_status &gt; 17 AND QUARTER(plan_demand_sub_time) =QUARTER(NOW()) ) de
         <include refid="dDeptListOrDemandIdAll"/>
         d.demand_id = c.demand_id
         AND d.project_status &gt; 17
-        AND QUARTER(d.create_time) = QUARTER(NOW())
+        AND QUARTER(d.plan_demand_sub_time) = QUARTER(NOW())
     </select>
 
     <select id="selectZJLastYear" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo"
@@ -770,11 +771,11 @@
         FROM pm_demand d, pm_contract_info c,
         (SELECT ifnull(COUNT(demand_id), 0) num ,ifnull(sum(evaluation), 0) evaluationTotal FROM pm_demand
         <include refid="deptListOrDemandIdAll"/>
-        project_status IN (17,18) AND YEAR(create_time) = YEAR(NOW())-1 ) de
+        project_status IN (17,18) AND YEAR(plan_demand_sub_time) = YEAR(NOW())-1 ) de
         <include refid="dDeptListOrDemandIdAll"/>
         d.demand_id = c.demand_id
         AND d.project_status IN (17,18)
-        AND YEAR(d.create_time) = YEAR(NOW())-1
+        AND YEAR(d.plan_demand_sub_time) = YEAR(NOW())-1
     </select>
 
     <select id="selectTBThisYear" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo"
@@ -784,11 +785,11 @@
         FROM pm_demand d, pm_contract_info c,
         (SELECT ifnull(COUNT(demand_id), 0) num ,ifnull(sum(evaluation), 0) evaluationTotal FROM pm_demand
         <include refid="deptListOrDemandIdAll"/>
-        project_status &gt; 17 AND YEAR(create_time) = YEAR(NOW()) ) de
+        project_status &gt; 17 AND YEAR(plan_demand_sub_time) = YEAR(NOW()) ) de
         <include refid="dDeptListOrDemandIdAll"/>
         d.demand_id = c.demand_id
         AND d.project_status &gt; 17
-        AND YEAR(d.create_time) = YEAR(NOW())
+        AND YEAR(d.plan_demand_sub_time) = YEAR(NOW())
     </select>
 
     <select id="selectFInishAll" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo"
@@ -809,7 +810,7 @@
         FROM pm_demand
         <include refid="deptListOrDemandIdAll"/>
         real_purchase_finish_time &lt;=plan_purchase_finish_time
-        AND YEAR(create_time) = YEAR(NOW())
+        AND YEAR(plan_demand_sub_time) = YEAR(NOW())
     </select>
 
     <sql id="countProjectExceedAndStatus">