Преглед изворни кода

Merge branch 'test3' of jishutao/kede-server into prod

anderx пре 1 година
родитељ
комит
a1795d25d1

+ 1 - 1
src/main/java/com/goafanti/common/dao/OrderYearMaxDurationMapper.java

@@ -81,7 +81,7 @@ public interface OrderYearMaxDurationMapper {
      */
     int deleteById(Integer id);
 
-    void updateByOrderNoAndYear(OrderYearMaxDuration orderYearMaxDuration);
+    int updateByOrderNoAndYear(OrderYearMaxDuration orderYearMaxDuration);
 
     List<OrderYearMaxDuration> selectByOrderNo(String orderNo);
 }

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

@@ -755,7 +755,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				orderYearMaxDuration.setStatus(0);
 			}
 			orderYearMaxDuration.setOrderNo(orderNew.getOrderNo());
-			orderYearMaxDurationMapper.insert(orderYearMaxDuration);
+			int x = orderYearMaxDurationMapper.queryAllByCount(new OrderYearMaxDuration(orderNew.getOrderNo(), 0));
+			if (x>0){
+				orderYearMaxDurationMapper.updateByOrderNoAndYear(orderYearMaxDuration);
+			}else {
+				orderYearMaxDurationMapper.insert(orderYearMaxDuration);
+			}
 		}else {
 			for (TTaskMember e : tTaskMembers) {
 				if (e.getYearSum()!=null&&e.getYearSum()>yearSum){