anderx hace 3 años
padre
commit
9b8dd5de79

+ 3 - 1
src/main/java/com/goafanti/order/controller/OutsourceOrgApiController.java

@@ -136,7 +136,9 @@ public class OutsourceOrgApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "项目外包信息","项目外包信息"));
 			return res;
 		}
-		if(o.getType()==1&&orderNewService.checkOfficialType(o)){
+		//项目发起并且不是外包。
+		if(o.getType()==1&&o.getStartType()==1&&
+				orderNewService.checkOfficialType(o)){
 			res.getError().add(buildError(ErrorConstants.DATA_EMPTY_ERROR, "后台官费分类","后台官费分类"));
 			return res;
 		}

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

@@ -740,7 +740,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				ot.setCommodityPrice(cd.getCommodityPrice());
 				ot.setCommodityQuantity(cd.getCommodityQuantity());
 				tOrderTaskMapper.updateByPrimaryKeySelective(ot);
-
 			}else if(cd.getType()==3) {
 				tOrderTaskMapper.deleteByPrimaryKey(cd.getTid());
 			}

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

@@ -1528,6 +1528,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	public boolean checkOfficialType(TOrderOutsource o) {
 		TOrderTaskDetailBo t=tOrderTaskMapper.getOrderTaskDetail(o.getTid().toString());
+		//项目类型是专利不是转让就需要获取专利官费
 		if(t.getPatentTransfer()==0){
 			if(t.getBpType()==1) {
 				OfficialFeePrice of=officialFeePriceMapper.selectBytype(o.getPatentNameType(), t.getPatentType());