Browse Source

订单最大公出值开发

anderx 1 year ago
parent
commit
78e36a28bc

+ 4 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -755,6 +755,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			if (maxDuration.compareTo(new BigDecimal(-1))==0){
 				orderYearMaxDuration.setMaxDuration(BigDecimal.ZERO);
 				orderYearMaxDuration.setStatus(1);
+				out.setMaxProcess(0);
 				out.setMaxDuration(BigDecimal.ZERO.doubleValue());
 				out.setMaxType(2);
 			}else if (maxDuration.compareTo(new BigDecimal(0))==0){
@@ -793,6 +794,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 					if (maxDuration.compareTo(new BigDecimal(-1))==0){
 						orderYearMaxDuration.setMaxDuration(BigDecimal.ZERO);
 						orderYearMaxDuration.setStatus(1);
+						out.setMaxProcess(0);
 						out.setMaxDuration(BigDecimal.ZERO.doubleValue());
 						out.setMaxType(2);
 					}else if (maxDuration.compareTo(new BigDecimal(0))==0){
@@ -826,6 +828,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 					orderYearMaxDuration.setMaxDuration(BigDecimal.ZERO);
 					orderYearMaxDuration.setStatus(1);
 					out.setMaxDuration(BigDecimal.ZERO.doubleValue());
+					out.setMaxProcess(0);
 					out.setMaxType(2);
 				}else if (maxDuration.compareTo(new BigDecimal(0))==0){
 					orderYearMaxDuration.setMaxDuration(BigDecimal.ZERO);
@@ -846,7 +849,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				}
 			}
 		}
-		out.setMaxProcess(4);
+		if(out.getMaxProcess()==null)out.setMaxProcess(4);
 	}
 
 	private  Integer extractYear(String yearStr) {