|
|
@@ -205,7 +205,7 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
outProjectBo op =null;
|
|
|
if(!list.isEmpty()) op=tOrderOutsourceMapper.selectByTid(tid);
|
|
|
//外包type
|
|
|
- if (op!=null) {
|
|
|
+ if (op!=null && op.getStartType()!=null&&op.getStartType()==1) {
|
|
|
for (OutThirdPartyCompany oc : list) {
|
|
|
if(op.getProjectType()==null)op.setProjectType(0);
|
|
|
if((op.getProjectType()==1&&oc.getType()==1)||(op.getProjectType()==2)) {
|
|
|
@@ -305,7 +305,7 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
}
|
|
|
if (!TokenManager.hasRole(AFTConstants.FINANCE)&&!TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)) {
|
|
|
outProjectBo ob=tOrderOutsourceMapper.selectByTid(tp.getTid());
|
|
|
- if (ob!=null) {
|
|
|
+ if (ob!=null &&ob.getStartType()!=null&& ob.getStartType()==1) {
|
|
|
if((ob.getProjectType()==1&&ob.getPatentType()==0)||(ob.getProjectType()==2)) {
|
|
|
op.setInitialUnitPrice("***");
|
|
|
op.setInitialTotalAmount("***");
|
|
|
@@ -407,7 +407,7 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
if (!TokenManager.hasRole(AFTConstants.FINANCE)&&!TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)) {
|
|
|
outProjectBo op =null;
|
|
|
if(!list.isEmpty()) op=tOrderOutsourceMapper.selectByTid(id);
|
|
|
- if (op!=null) {
|
|
|
+ if (op!=null &&op.getStartType()!=null&&op.getStartType()==1) {
|
|
|
if((op.getProjectType()==1&&op.getPatentType()==0)||(op.getProjectType()==2)) {
|
|
|
for (outOrderPayment oc : list) {
|
|
|
if (oc.getChooseType()!=2) {
|