Browse Source

Merge remote-tracking branch 'origin/test'

anderx 7 years ago
parent
commit
e06e4b500b

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

@@ -1384,6 +1384,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		contract.setUid(tOrder.getBuyerId());
 		contract.setCreater(TokenManager.getAdminId());
 		contract.setPrincipal(tOrder.getTechnicianId()); //暂不确定
+		contract.setSignComment(signComment);
 		contractMapper.insert(contract);
 		for(TOrderDetail orderDetail: detailList){
 			for(int i=0; i<orderDetail.getCommodityQuantity();i++){

+ 1 - 0
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -311,6 +311,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		if(bo.getDeleteSign() != null) params.put("deleteSign", bo.getDeleteSign());
 		if(bo.getOrderNo() != null) params.put("orderNo", bo.getOrderNo());
 		if(bo.getSalesmanName() != null) params.put("salesmanName", bo.getSalesmanName());
+		if(StringUtils.isNotBlank(depId)) params.put("depId", depId);
 		try {
 			if(StringUtils.isNotBlank(setUpStartDate))
 				params.put("setUpStartDate", DateUtils.parseDate(setUpStartDate, AFTConstants.YYYYMMDD));