|
@@ -375,7 +375,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
|
|
HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
|
|
HashMap<String, String> planPurchaseModesMap = planEnums.get("planPurchaseModes");
|
|
HashMap<String, String> planPurchaseModesMap = planEnums.get("planPurchaseModes");
|
|
HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
|
|
HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
|
|
- HashMap<String, String> purchaseServices = planEnums.get("purchaseServices");
|
|
|
|
|
|
|
|
int successNum = 0;
|
|
int successNum = 0;
|
|
int failureNum = 0;
|
|
int failureNum = 0;
|
|
@@ -413,7 +412,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
builder.append(projectAttributes.get(ofYear.getProjectAttr()));
|
|
builder.append(projectAttributes.get(ofYear.getProjectAttr()));
|
|
}
|
|
}
|
|
ofYear.setProjectAttr(builder.toString());
|
|
ofYear.setProjectAttr(builder.toString());
|
|
- ofYear.setPurchaseServices(purchaseServices.get(ofYear.getPurchaseServices()));
|
|
|
|
ofYear.setIsExcess(deptService.isExcessOrNo(ofYear.getProjectType(), ofYear.getEvaluation(), Long.valueOf(ofYear.getPurchaseDeptId())));
|
|
ofYear.setIsExcess(deptService.isExcessOrNo(ofYear.getProjectType(), ofYear.getEvaluation(), Long.valueOf(ofYear.getPurchaseDeptId())));
|
|
ofYear.setCreated(String.valueOf(loginUser.getUserId()));
|
|
ofYear.setCreated(String.valueOf(loginUser.getUserId()));
|
|
ofYear.setCreateTime(new Date());
|
|
ofYear.setCreateTime(new Date());
|
|
@@ -1378,7 +1376,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
|
|
HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
|
|
HashMap<String, String> planPurchaseModesMap = planEnums.get("planPurchaseModes");
|
|
HashMap<String, String> planPurchaseModesMap = planEnums.get("planPurchaseModes");
|
|
HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
|
|
HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
|
|
- HashMap<String, String> purchaseServices = planEnums.get("purchaseServices");
|
|
|
|
List<PlanYearsResponseVo> list = new ArrayList<PlanYearsResponseVo>();
|
|
List<PlanYearsResponseVo> list = new ArrayList<PlanYearsResponseVo>();
|
|
for (PlanYears planYear : planYears) {
|
|
for (PlanYears planYear : planYears) {
|
|
PlanYearsResponseVo responseVo = new PlanYearsResponseVo();
|
|
PlanYearsResponseVo responseVo = new PlanYearsResponseVo();
|
|
@@ -1424,12 +1421,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- for (Map.Entry<String, String> entry : purchaseServices.entrySet()) {
|
|
|
|
- if (planYear.getPurchaseServices().equals(entry.getValue())) {
|
|
|
|
- planYear.setPurchaseServicesStr(entry.getKey());
|
|
|
|
- break;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
BeanUtils.copyProperties(planYear, responseVo);
|
|
BeanUtils.copyProperties(planYear, responseVo);
|
|
try {
|
|
try {
|
|
responseVo.setTipsMessage(planYearsGetTips(responseVo, thresholdMap, alertTimeMap));
|
|
responseVo.setTipsMessage(planYearsGetTips(responseVo, thresholdMap, alertTimeMap));
|