|
@@ -221,14 +221,14 @@ public class ProExcelInfo {
|
|
if (null==project.getRunUnitInspectionRole()){
|
|
if (null==project.getRunUnitInspectionRole()){
|
|
str+="运行单位运检不能为空";
|
|
str+="运行单位运检不能为空";
|
|
}
|
|
}
|
|
- if (null==project.getThroughResearchRole()||"".equals(project.getThroughResearchRole())){//经研所角色
|
|
|
|
|
|
+/* if (null==project.getThroughResearchRole()||"".equals(project.getThroughResearchRole())){//经研所角色
|
|
str+="经研所角色不能为空;";
|
|
str+="经研所角色不能为空;";
|
|
}else {
|
|
}else {
|
|
judgeLoginName = getJudgeLoginName(users, project.getThroughResearchRole());
|
|
judgeLoginName = getJudgeLoginName(users, project.getThroughResearchRole());
|
|
if (judgeLoginName){
|
|
if (judgeLoginName){
|
|
str+="经研所角色不存在;";
|
|
str+="经研所角色不存在;";
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
if (null==project.getConstructionUnit()||"".equals(project.getConstructionUnit())){//施工单位
|
|
if (null==project.getConstructionUnit()||"".equals(project.getConstructionUnit())){//施工单位
|
|
str+="施工单位不能为空;";
|
|
str+="施工单位不能为空;";
|
|
}
|
|
}
|
|
@@ -269,12 +269,12 @@ public class ProExcelInfo {
|
|
}
|
|
}
|
|
if (null==project.getDesignUnitLeader()||"".equals(project.getDesignUnitLeader())){//设计单位
|
|
if (null==project.getDesignUnitLeader()||"".equals(project.getDesignUnitLeader())){//设计单位
|
|
str+="设计单位领导不能为空;";
|
|
str+="设计单位领导不能为空;";
|
|
- }else {
|
|
|
|
|
|
+ }/*else {
|
|
judgeLoginName = getJudgeLoginName(users, project.getDesignUnitLeader());
|
|
judgeLoginName = getJudgeLoginName(users, project.getDesignUnitLeader());
|
|
if (judgeLoginName){
|
|
if (judgeLoginName){
|
|
str+="设计单位领导不存在;";
|
|
str+="设计单位领导不存在;";
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
if (null!=project.getType()){//类型
|
|
if (null!=project.getType()){//类型
|
|
flag = getJudge(project.getType(), PRO_TYPE);
|
|
flag = getJudge(project.getType(), PRO_TYPE);
|
|
if (flag){
|
|
if (flag){
|