|
|
@@ -50,6 +50,7 @@ import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.order.bo.OrderOutsourceDtails;
|
|
|
import com.goafanti.order.bo.TOrderTaskDetailBo;
|
|
|
import com.goafanti.order.enums.NewOrderDunType;
|
|
|
+import com.goafanti.order.enums.NewProjectStatus;
|
|
|
import com.goafanti.organization.bo.InputNodeList;
|
|
|
import com.goafanti.organization.bo.InputPaymentList;
|
|
|
import com.goafanti.organization.bo.InputPaymentNode;
|
|
|
@@ -526,38 +527,48 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
if (pn.getDunType()==0&&pn.getPartyTime().getTime()<new Date().getTime()) {//如果自定义则看触发时间
|
|
|
return false;
|
|
|
}else if (NewOrderDunType.CGZH_WC.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
|
|
|
- &&(tt.getProjectStatus()>7&&tt.getProjectStatus()<10)) {
|
|
|
+ &&(tt.getProjectStatus()==NewProjectStatus.YWCXZ.getCode())) {
|
|
|
return false;
|
|
|
}else if (NewOrderDunType.COMMON_NGS.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
|
|
|
- &&(tt.getProjectStatus()>3&&tt.getProjectStatus()<10)) {
|
|
|
+ &&(tt.getProjectStatus()>=NewProjectStatus.YTJ.getCode()&&tt.getProjectStatus()<=NewProjectStatus.YWCXZ.getCode()
|
|
|
+ ||tt.getProjectStatus()>=NewProjectStatus.YBH.getCode())) {
|
|
|
return false;
|
|
|
}else if (NewOrderDunType.COMMON_XZ.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
|
|
|
- &&(tt.getProjectStatus()>6&&tt.getProjectStatus()<10)) {
|
|
|
+ &&(tt.getProjectStatus()==NewProjectStatus.YWCXZ.getCode())) {
|
|
|
return false;
|
|
|
} else if (NewOrderDunType.KJXM_LX.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
|
|
|
- &&(tt.getProjectStatus()>2&&tt.getProjectStatus()<10)) {
|
|
|
+ &&(tt.getProjectStatus()>=NewProjectStatus.YLX.getCode()&&tt.getProjectStatus()<=NewProjectStatus.LXYBK.getCode())) {
|
|
|
return false;
|
|
|
} else if (NewOrderDunType.KJXM_BK.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
|
|
|
- &&(tt.getProjectStatus()>8&&tt.getProjectStatus()<10)) {
|
|
|
+ &&(tt.getProjectStatus()<=NewProjectStatus.LXYBK.getCode())) {
|
|
|
return false;
|
|
|
} else if (NewOrderDunType.KJJR_BK.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
|
|
|
- &&(tt.getProjectStatus()>8&&tt.getProjectStatus()<10)) {
|
|
|
+ &&(tt.getProjectStatus()==NewProjectStatus.YWCXZ.getCode())) {
|
|
|
return false;
|
|
|
} else if (NewOrderDunType.RJKF_LX.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
|
|
|
- &&(tt.getProjectStatus()>2&&tt.getProjectStatus()<10)) {
|
|
|
+ &&((tt.getProjectStatus()>=NewProjectStatus.YTJ.getCode()&&tt.getProjectStatus()<=NewProjectStatus.YWCXZ.getCode())
|
|
|
+ ||tt.getProjectStatus()>=NewProjectStatus.YBH.getCode())) {
|
|
|
return false;
|
|
|
} else if (NewOrderDunType.RJKF_WZ.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
|
|
|
- &&(tt.getProjectStatus()>7&&tt.getProjectStatus()<10)) {
|
|
|
+ &&(tt.getProjectStatus()==NewProjectStatus.YWCXZ.getCode())) {
|
|
|
return false;
|
|
|
} else if (NewOrderDunType.ZSCQ_GS_SL_XZ.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())) {
|
|
|
// 0 正常 1专利 2软著 3审计 4双软 5高新 6商标
|
|
|
- if (tt.getBpType()==1&&(tt.getProjectStatus()>7&&tt.getProjectStatus()<10)) {
|
|
|
+ if (tt.getBpType()==1
|
|
|
+ &&(tt.getProjectStatus()==NewProjectStatus.YTJ.getCode()&&tt.getProjectStatus()==NewProjectStatus.YWCXZ.getCode()
|
|
|
+ ||tt.getProjectStatus()==NewProjectStatus.YBH.getCode())) {
|
|
|
return false;
|
|
|
- }else if (tt.getBpType()!=1&&(tt.getProjectStatus()>3&&tt.getProjectStatus()<10)){
|
|
|
+ }else if (tt.getBpType()!=1&&(tt.getProjectStatus()==NewProjectStatus.YWCXZ.getCode())){
|
|
|
return false;
|
|
|
}
|
|
|
} else if (NewOrderDunType.ZSCQ_XZ.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
|
|
|
- &&(tt.getProjectStatus()>6&&tt.getProjectStatus()<10)) {
|
|
|
+ &&(tt.getProjectStatus()==NewProjectStatus.YWCXZ.getCode())) {
|
|
|
+ return false;
|
|
|
+ } else if (NewOrderDunType.GX_YGS.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
|
|
|
+ &&(tt.getProjectStatus()>=NewProjectStatus.YNGS.getCode()&&tt.getProjectStatus()<=NewProjectStatus.YXZ.getCode())) {
|
|
|
+ return false;
|
|
|
+ } else if (NewOrderDunType.GX_YXZ.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
|
|
|
+ &&(tt.getProjectStatus()==NewProjectStatus.YXZ.getCode())) {
|
|
|
return false;
|
|
|
}
|
|
|
|