Merge branch 'feature/form_statistics_05' into 'develop'

杨清松修改临时销售计划内容判断

See merge request kunlun/xyst_dinas/xyst_dinas_backend!77

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/SalesPlanServiceImpl.java

@@ -465,7 +465,7 @@ public class SalesPlanServiceImpl implements SalesPlanService{
 				}
 				//可分配量 <=合同可用余量+实际销售量 - 临时销售计划分配量之和 - 日常销售计划分配量
 				BigDecimal distributedVolum = contractAvailableAmount.add(actualSaleTotalAmount).subtract(totalTempSalesPlanAmount).subtract(totalSalesPlanAmount);
-				if(salesPlanAmount.compareTo(BigDecimal.ZERO) != 0 && (salesPlanAmount.compareTo(distributedVolum) > -1 || salesPlanAmount.compareTo(contractAvailableAmount) > -1)) { //大于等于
+				if(salesPlanAmount.compareTo(BigDecimal.ZERO) != 0 && (salesPlanAmount.compareTo(distributedVolum) ==1 || salesPlanAmount.compareTo(contractAvailableAmount) ==1)) { //大于
 					Map<String, Object> map = new HashMap<>();
 					map.put("dinasTypeName", salesPlanTempDetail.getString("dinasTypeName"));
 					map.put("distributedVolum", distributedVolum);