今年以来累计完成采购

purchase-system/src/main/java/com/ozs/pm/mapper/PmDemandMapper.java

@@ -549,7 +549,7 @@ public interface PmDemandMapper extends BaseMapper<PmDemand> {
     StatisticalChartsResVo selectTBThisYear(@Param("vo") PmDemandReqVo pmDemandReqVo);
 
     /**
-     * 本年度提报
+     * 今年以来累计完成采购
      *
      * @param pmDemandReqVo
      * @return

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -2855,7 +2855,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         } else {
             pmDemandReqVo.setDemandIdAll(isQueryZD(pmDemandReqVo.getPurchaseDeptId()));
         }
-        //累计完成采购任务数量    预算金额(万元)        合同金额(万元)
+        //今年以来累计完成采购任务数量    预算金额(万元)        合同金额(万元)
         StatisticalChartsResVo tThisYear = pmDemandMapper.selectFInishAll(pmDemandReqVo);
         tThisYear.setColumnName("累计完成采购任务数量");
         resVos.add(tThisYear);

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

@@ -826,13 +826,16 @@
             parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo">
         SELECT YEAR(NOW()) columnName, de.num,de.evaluationTotal,ifnull(sum(c.contract_amount), 0)
         evaluationContractTotal
-        FROM pm_demand d, pm_contract_info c,
+        FROM (SELECT c.contract_amount FROM pm_demand d
+        left join pm_contract_info c
+        on d.demand_id = c.demand_id
+        <include refid="dDeptListOrDemandIdAll"/>
+        d.project_status > 18
+        AND YEAR(d.up_acceptance_time) = YEAR(NOW())) c
+        ,
         (SELECT ifnull(COUNT(demand_id), 0) num ,ifnull(sum(evaluation), 0) evaluationTotal FROM pm_demand
         <include refid="deptListOrDemandIdAll"/>
-        project_status &gt; 18 ) de
-        <include refid="dDeptListOrDemandIdAll"/>
-        d.demand_id = c.demand_id AND d.project_status &gt; 18
-        AND YEAR(d.up_acceptance_time) = YEAR(NOW())
+        project_status > 18 AND YEAR(up_acceptance_time) = YEAR(NOW())) de
     </select>
 
     <select id="selectCCThisYear" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo"
@@ -1018,5 +1021,28 @@
         </if>
     </sql>
 
+    <sql id="dDeptListOrDemandIdAllNoAnd">
+        WHERE
+        <if test="vo.deptList != null and vo.deptList.size != 0 ">
+            d.purchase_dept_id
+            in
+            <foreach collection="vo.deptList" item="item" index="index"
+                     separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="(vo.deptList != null and vo.deptList.size != 0) and (vo.demandIdAll != null and vo.demandIdAll.size != 0)">
+            AND
+        </if>
+        <if test="vo.demandIdAll != null and vo.demandIdAll.size != 0 ">
+            d.demand_id
+            in
+            <foreach collection="vo.demandIdAll" item="item" index="index"
+                     separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+    </sql>
+
 
 </mapper>