Browse Source

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

anderx 2 years ago
parent
commit
600e4078f4

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

@@ -346,7 +346,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				str.append("未做任何修改。");
 			}else {
 				str.append("修改了:");
-				if (t.getPatentType()!=null&& !use.getPatentType().equals(t.getPatentType())) {
+				if (t.getPatentType()!=null&&
+						(use.getPatentType()==null||!use.getPatentType().equals(t.getPatentType()))) {
 					str.append("官费类型");
 				}
 				if (t.getOfficialCost()!=null&& !use.getOfficialCost().equals(t.getOfficialCost())) {
@@ -483,6 +484,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}else {
 			tOrderHighTechMapper.deleteByOrderNo(t.getOrderNo());
 		}
+		//如果修改了部门she审核财务也要切换
+		if(!t.getOrderDep().equals(t2.getOrderDep())) {
+			tOrderExamineMapper.deleteByOrderNo(t.getOrderNo());
+			addOrderExamine(t);
+		}
 		//订单提交
 		if (isSubmit==1) {
 			t2.setApproval(t.getApproval());
@@ -526,11 +532,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				contractNoReplace(t.getOrderNo(), t2.getContractNo(),t2.getOrderDep());
 				createContractNo(t);
 			}
-			//如果修改了部门she审核财务也要切换
-			if(!t.getOrderDep().equals(t2.getOrderDep())) {
-				tOrderExamineMapper.deleteByOrderNo(t.getOrderNo());
-				addOrderExamine(t);
-			}
+
 			// 修改订单中间表信息
 			t.setBuyerId(t2.getBuyerId());
 			updateOrderMid(t);