|
@@ -2759,11 +2759,14 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
|
|
projectReportData.setConditionType("1003");
|
|
projectReportData.setConditionType("1003");
|
|
}*/
|
|
}*/
|
|
switch (projectRecords.getProjectType()){
|
|
switch (projectRecords.getProjectType()){
|
|
|
|
+ // 1.工程咨询 2.造价审核
|
|
case "1":
|
|
case "1":
|
|
if("1".equals(projectRecords.getCompanyType())){
|
|
if("1".equals(projectRecords.getCompanyType())){
|
|
projectReportData.setConditionType("1008");
|
|
projectReportData.setConditionType("1008");
|
|
}else if("0".equals(projectRecords.getCompanyType())){
|
|
}else if("0".equals(projectRecords.getCompanyType())){
|
|
projectReportData.setConditionType("1010");
|
|
projectReportData.setConditionType("1010");
|
|
|
|
+ }else if("2".equals(projectRecords.getCompanyType())){
|
|
|
|
+ projectReportData.setConditionType("1002");
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
case "2":
|
|
case "2":
|
|
@@ -2771,6 +2774,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
|
|
projectReportData.setConditionType("1008");
|
|
projectReportData.setConditionType("1008");
|
|
}else if("0".equals(projectRecords.getCompanyType())){
|
|
}else if("0".equals(projectRecords.getCompanyType())){
|
|
projectReportData.setConditionType("1009");
|
|
projectReportData.setConditionType("1009");
|
|
|
|
+ }else if("2".equals(projectRecords.getCompanyType())){
|
|
|
|
+ projectReportData.setConditionType("1001");
|
|
}
|
|
}
|
|
/*if("5".equals(projectRecords.getAttachmentProjectSort()) || "6".equals(projectRecords.getAttachmentProjectSort())){
|
|
/*if("5".equals(projectRecords.getAttachmentProjectSort()) || "6".equals(projectRecords.getAttachmentProjectSort())){
|
|
projectReportData.setConditionType("1005");
|
|
projectReportData.setConditionType("1005");
|
|
@@ -2784,11 +2789,14 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
|
|
}
|
|
}
|
|
|
|
|
|
synchronized (SYN_BYTE) {
|
|
synchronized (SYN_BYTE) {
|
|
- String contractNo = contractInfoService.getContractByProjectId(projectRecords.getId());
|
|
|
|
String reportNo = createReportNo(projectReportData.getConditionType());
|
|
String reportNo = createReportNo(projectReportData.getConditionType());
|
|
- reportNo = reportNo.substring(5);
|
|
|
|
- StringBuffer reportNoNew =new StringBuffer("【"+contractNo+"】"+"-"+reportNo);
|
|
|
|
- projectReportData.setNumber(reportNoNew.toString());
|
|
|
|
|
|
+ if("1".equals(projectRecords.getCompanyType())){
|
|
|
|
+ String contractNo = contractInfoService.getContractByProjectId(projectRecords.getId());
|
|
|
|
+ StringBuffer reportNoNew =new StringBuffer("【"+contractNo+"】" + reportNo);
|
|
|
|
+ projectReportData.setNumber(reportNoNew.toString());
|
|
|
|
+ }else{
|
|
|
|
+ projectReportData.setNumber(reportNo.toString());
|
|
|
|
+ }
|
|
ProjectRecords project = new ProjectRecords();
|
|
ProjectRecords project = new ProjectRecords();
|
|
project.setId(projectRecords.getId());
|
|
project.setId(projectRecords.getId());
|
|
projectReportData.setProject(project);
|
|
projectReportData.setProject(project);
|
|
@@ -2811,12 +2819,16 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
|
|
reportData.setConditionType("1008");
|
|
reportData.setConditionType("1008");
|
|
}else if("0".equals(projectRecords.getCompanyType())){
|
|
}else if("0".equals(projectRecords.getCompanyType())){
|
|
reportData.setConditionType("1010");
|
|
reportData.setConditionType("1010");
|
|
|
|
+ }else if("2".equals(projectRecords.getCompanyType())){
|
|
|
|
+ reportData.setConditionType("1002");
|
|
}
|
|
}
|
|
}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("0".equals(projectRecords.getCompanyType())){
|
|
}else if("0".equals(projectRecords.getCompanyType())){
|
|
reportData.setConditionType("1009");
|
|
reportData.setConditionType("1009");
|
|
|
|
+ }else if("2".equals(projectRecords.getCompanyType())){
|
|
|
|
+ reportData.setConditionType("1001");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
synchronized (SYN_BYTE) {
|
|
synchronized (SYN_BYTE) {
|