Parcourir la source

合同变更列表修改

anderx il y a 1 an
Parent
commit
0ae3ff02a0

+ 3 - 0
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -276,6 +276,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			if(nb.getType() !=null){
 				if(Objects.equals(nb.getType(), OrderChangeType.JBGGT.getCode())){
 					//
+					if(Objects.equals(nb.getProcessState(), OrderChangeProcess.YXGLY.getCode())){
+						nb.setProcessState(OrderChangeProcess.YYBZ.getCode());
+					}
 					if(Objects.equals(nb.getProcessState(), OrderChangeProcess.YYBZ.getCode())){
 						completeChange(remarks, nb);
 						return 1;

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

@@ -1135,7 +1135,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			params.put("amountStatus", in.getAmountStatus());
 		}
 		if (StringUtils.isNotBlank(in.getOrderNo())) {
-			params.put("orderNo", in.getOrderNo());
+			params.put("orderNo", in.getOrderNo().trim());
 		}
 		if (StringUtils.isNotBlank(in.getStarTime())) {
 			params.put("starTime", in.getStarTime());