|
|
@@ -221,9 +221,13 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
if(!list.isEmpty()) op=tOrderOutsourceMapper.selectByTid(tid);
|
|
|
//外包type
|
|
|
for (OutThirdPartyCompany oc : list) {
|
|
|
+ // start_type 0外包 1供应商
|
|
|
if (oc.getStartType()==1) {
|
|
|
if(op.getProjectType()==null)op.setProjectType(0);
|
|
|
- if((op.getProjectType()==1&&oc.getType()==1)||(op.getProjectType()==2)||oc.getPatentType()==0) {
|
|
|
+ //patent_type 专利类型 0申请/变更/转让 1买卖
|
|
|
+ //project_tyoe 0 正常 1专利 2软著 3审计
|
|
|
+ if((op.getProjectType()==1&&oc.getPatentType()==0)
|
|
|
+ || op.getProjectType()==2 ) {
|
|
|
oc.setUnitPrice("***");
|
|
|
oc.setTotalAmount("***");
|
|
|
}
|
|
|
@@ -323,7 +327,8 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
!TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)) {
|
|
|
outProjectBo ob=tOrderOutsourceMapper.selectByTid(tp.getTid());
|
|
|
if (ob!=null &&ob.getStartType()!=null&& ob.getStartType()==1) {
|
|
|
- if((ob.getProjectType()==1&&ob.getPatentType()==0)||(ob.getProjectType()==2)) {
|
|
|
+ if((ob.getProjectType()==1&&ob.getPatentType()==0)
|
|
|
+ ||(ob.getProjectType()==2)) {
|
|
|
op.setInitialUnitPrice("***");
|
|
|
op.setInitialTotalAmount("***");
|
|
|
}
|