统计分析六个指标

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmPurchaseExecutionController.java

@@ -117,7 +117,7 @@ public class PmPurchaseExecutionController extends BaseController {
             return error("参数错误");
         }
         LambdaQueryWrapper<BaseAgency> lw = new LambdaQueryWrapper<>();
-        lw.eq(BaseAgency::getCompanyType, pmDemand.getProjectType());
+        lw.like(BaseAgency::getCompanyType, pmDemand.getProjectType());
         lw.eq(BaseAgency::getStatus, NameListType.WHITE.getCode());//白名单
         List<BaseAgency> agencyList = baseAgencyService.list(lw);
         return success(agencyList);

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

@@ -1009,7 +1009,7 @@
         select ifnull(count(demand_id), 0) countNumber
         from pm_demand
         <include refid="deptListOrDemandIdAll"/>
-        real_demand_commit_time is not null
+        YEAR(plan_demand_sub_time ) = YEAR(now())
     </select>
 
     <select id="purchaseProjectDistributionBND" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"