|
@@ -2741,14 +2741,14 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
|
|
case "1":
|
|
case "1":
|
|
if("1".equals(projectRecords.getCompanyType())){
|
|
if("1".equals(projectRecords.getCompanyType())){
|
|
projectReportData.setConditionType("1008");
|
|
projectReportData.setConditionType("1008");
|
|
- }else if("2".equals(projectRecords.getCompanyType())){
|
|
|
|
|
|
+ }else if("0".equals(projectRecords.getCompanyType())){
|
|
projectReportData.setConditionType("1010");
|
|
projectReportData.setConditionType("1010");
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
case "2":
|
|
case "2":
|
|
if("1".equals(projectRecords.getCompanyType())){
|
|
if("1".equals(projectRecords.getCompanyType())){
|
|
projectReportData.setConditionType("1008");
|
|
projectReportData.setConditionType("1008");
|
|
- }else if("2".equals(projectRecords.getCompanyType())){
|
|
|
|
|
|
+ }else if("0".equals(projectRecords.getCompanyType())){
|
|
projectReportData.setConditionType("1009");
|
|
projectReportData.setConditionType("1009");
|
|
}
|
|
}
|
|
/*if("5".equals(projectRecords.getAttachmentProjectSort()) || "6".equals(projectRecords.getAttachmentProjectSort())){
|
|
/*if("5".equals(projectRecords.getAttachmentProjectSort()) || "6".equals(projectRecords.getAttachmentProjectSort())){
|
|
@@ -2785,13 +2785,13 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
|
|
if("1".equals(projectRecords.getProjectType())){
|
|
if("1".equals(projectRecords.getProjectType())){
|
|
if("1".equals(projectRecords.getCompanyType())){
|
|
if("1".equals(projectRecords.getCompanyType())){
|
|
reportData.setConditionType("1008");
|
|
reportData.setConditionType("1008");
|
|
- }else if("2".equals(projectRecords.getCompanyType())){
|
|
|
|
|
|
+ }else if("0".equals(projectRecords.getCompanyType())){
|
|
reportData.setConditionType("1010");
|
|
reportData.setConditionType("1010");
|
|
}
|
|
}
|
|
}else if("2".equals(projectRecords.getProjectType())){
|
|
}else if("2".equals(projectRecords.getProjectType())){
|
|
if("1".equals(projectRecords.getCompanyType())){
|
|
if("1".equals(projectRecords.getCompanyType())){
|
|
reportData.setConditionType("1008");
|
|
reportData.setConditionType("1008");
|
|
- }else if("2".equals(projectRecords.getCompanyType())){
|
|
|
|
|
|
+ }else if("0".equals(projectRecords.getCompanyType())){
|
|
reportData.setConditionType("1009");
|
|
reportData.setConditionType("1009");
|
|
}
|
|
}
|
|
}
|
|
}
|