Browse Source

变更详情修改

anderx 1 month ago
parent
commit
bf21ef3443

+ 2 - 2
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -611,7 +611,7 @@
             a.contact_mobile contactMobile,
             a.manager_contacts managerContacts,
             a.manager_contact_mobile managerContactMobile,
-            a.nda nda, a.nda_url ndaUrl, a.breach_clause breach_clause, a.breach_clause_url breach_clause_url
+            a.nda nda, a.nda_url ndaUrl, a.breach_clause breachClause, a.breach_clause_url breachClauseUrl
         from new_order_change a where 1 = 1 and a.id= #{id}
     </select>
     <select id="checkOderNo" resultType="java.lang.Integer">
@@ -628,7 +628,7 @@
         noc.contact_mobile contactMobile,
         noc.manager_contacts managerContacts,
         noc.manager_contact_mobile managerContactMobile,
-        a.nda nda, a.nda_url ndaUrl, a.breach_clause breach_clause, a.breach_clause_url breach_clause_url
+        a.nda nda, a.nda_url ndaUrl, a.breach_clause breachClause, a.breach_clause_url breachClauseUrl
         from new_order_change  noc left join  new_order_change a on noc.id=a.id
         left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id left join admin d on b.salesman_id=d.id
         left join department e on b.order_dep=e.id

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

@@ -1092,6 +1092,19 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		}else if (nob.getType()==OrderChangeType.CB.getCode()){
 			o.setTotalAmount(nob.getTotalAmount());
 			if (nob.getFirstAmount()!=null)o.setFirstAmount(nob.getFirstAmount());
+		}else if (nob.getType()==OrderChangeType.JBGGT.getCode()) {
+			if(nob.getNda()!=null){
+				o.setNda(nob.getNda());
+			}
+			if(nob.getBreachClause()!=null){
+				o.setBreachClause(nob.getBreachClause());
+			}
+			if (nob.getNdaUrl()!= null){
+				o.setNdaUrl(nob.getNdaUrl());
+			}
+			if (nob.getBreachClauseUrl()!= null){
+				o.setBreachClauseUrl(nob.getBreachClauseUrl());
+			}
 		}
 		//处理变更项目与催款新增在订单中
 		pushTaskAndDun(nob.getId(),o);