|
|
@@ -223,9 +223,10 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
for (OutThirdPartyCompany oc : list) {
|
|
|
// start_type 0外包 1供应商
|
|
|
if (oc.getStartType()==1) {
|
|
|
+ //project_tyoe 0 正常 1专利 2软著 3审计
|
|
|
+ if(op==null)op=new outProjectBo();
|
|
|
if(op.getProjectType()==null)op.setProjectType(0);
|
|
|
//patent_type 专利类型 0申请/变更/转让 1买卖
|
|
|
- //project_tyoe 0 正常 1专利 2软著 3审计
|
|
|
if((op.getProjectType()==1&&oc.getPatentType()==0)
|
|
|
|| op.getProjectType()==2 ) {
|
|
|
oc.setUnitPrice("***");
|