Merge remote-tracking branch 'origin/develop' into develop

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

@@ -310,12 +310,13 @@ public class SalesPlanServiceImpl implements SalesPlanService{
 		for (int k = 0; k < jsonArray.length(); k++) {
 			JSONObject jsonObject = jsonArray.getJSONObject(k);
 			BigDecimal distributedVolum = calcDistributedVolum(jsonObject, startTime, endTime);
-			if(jsonObject.getBigDecimal("planAmount").compareTo(BigDecimal.ZERO) != 0 && jsonObject.getBigDecimal("planAmount").compareTo(distributedVolum) > -1) { //大于等于
+			if(jsonObject.getBigDecimal("planAmount").compareTo(BigDecimal.ZERO) != 0 && (jsonObject.getBigDecimal("planAmount").compareTo(distributedVolum) > -1 || jsonObject.getBigDecimal("planAmount").compareTo(jsonObject.getBigDecimal("contractAmount")) > -1)) { //大于等于
 				Map<String, Object> verifyMap = new HashMap<String, Object>();
 				verifyMap.put("contractName", jsonObject.getString("contractName"));
 				verifyMap.put("dinasTypeName", jsonObject.getString("dinasTypeName"));
 				verifyMap.put("projectName", jsonObject.getString("projectName"));
 				verifyMap.put("distributedVolum", distributedVolum);
+				verifyMap.put("planAmount", jsonObject.getBigDecimal("planAmount"));
 				verifyMap.put("contractAmount", jsonObject.getBigDecimal("contractAmount"));
 				verifyList.add(verifyMap);
 			}