日志级别

purchase-admin/src/main/resources/application-test.yml

@@ -33,7 +33,7 @@ server:
 # 日志配置
 logging:
   level:
-    com.ozs: debug
+    com.ozs: ERROR
 #    com.ozs: ERROR
     org.springframework: warn
 

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

@@ -646,12 +646,13 @@
 
     <select id="purchaseProjectNumberAnalysisYear" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="java.util.Map">
-        select ifnull(COUNT(demand_id), 0) countNum, ifnull(sum(evaluation), 0) evaluationSum, year(create_time) yy
+        select ifnull(COUNT(demand_id), 0) countNum, ifnull(sum(evaluation), 0) evaluationSum, year(task_release_time)
+        yy
         from pm_demand
         <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(task_release_time)
+        group by year(task_release_time!=null)
     </select>
 
     <select id="purchaseProjectNumberAnalysisQuarter" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"