%!s(int64=2) %!d(string=hai) anos · 2e32ec0218
--- a/purchase-admin/src/main/resources/template/plan_year.xlsx
+++ b/purchase-admin/src/main/resources/template/plan_year.xlsx
--- a/purchase-system/src/main/resources/mapper/pm/PmDemandMapper.xml
+++ b/purchase-system/src/main/resources/mapper/pm/PmDemandMapper.xml
@@ -245,10 +245,7 @@
 
				         SELECT *
			
 
				         FROM `pm_demand`
			
 
				         <include refid="deptListOrDemandIdAll"/>
			
 
				-        (real_demand_commit_time > plan_demand_sub_time
			
 
				-        or real_purchase_finish_time > plan_purchase_finish_time
			
 
				-        or real_deliver_time > plan_deliver_time)
			
 
				-
			
 
				+        real_purchase_finish_time > plan_purchase_finish_time
			
 
				     </select>
			
 
				 
			
 
				     <sql id="majorProjectByStatus">