|
@@ -106,7 +106,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
PlanYears ofYears = new PlanYears();
|
|
|
List<PlanYears> planYears;
|
|
|
List<PlanYears> planYearsList = new ArrayList<>();
|
|
|
- PageHelper.startPage(vo.getPageNum().intValue(), vo.getPageSize().intValue());
|
|
|
+ PageHelper.startPage(vo.getPageNum().intValue(), vo.getPageSize().intValue(), true);
|
|
|
try {
|
|
|
BeanUtils.copyProperties(vo, ofYears);
|
|
|
planYears = planYearsMapper.selectPlanYearsList(ofYears);
|
|
@@ -269,7 +269,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
if (byId == null) {
|
|
|
return AjaxResult.error("数据查询失败");
|
|
|
}
|
|
|
- SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(byId.getPurchaseDeptId()).get("sysDept");
|
|
|
+ SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(Long.valueOf(byId.getPurchaseDeptId())).get("sysDept");
|
|
|
byId.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("red_id", byId.getPlanYearId());
|
|
@@ -353,7 +353,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
//采购单位
|
|
|
SysDept info = deptMapper.checkDeptNameOnlyOne(ofYear.getPurchaseDeptName());
|
|
|
if (!ObjectUtils.isEmpty(info)) {
|
|
|
- ofYear.setPurchaseDeptId(info.getDeptId());
|
|
|
+ ofYear.setPurchaseDeptId(String.valueOf(info.getDeptId()));
|
|
|
} else {
|
|
|
++failureNum;
|
|
|
failureMsg.append("*" + failureNum + "*采购单位“" + ofYear.getPurchaseDeptName() + "”不存在");
|
|
@@ -826,7 +826,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
HashMap<String, String> purchaseServices = planEnums.get("purchaseServices");
|
|
|
List<PlanYears> list = new ArrayList<PlanYears>();
|
|
|
for (PlanYears planYear : planYears) {
|
|
|
- SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(planYear.getPurchaseDeptId()).get("sysDept");
|
|
|
+ SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(Long.valueOf(planYear.getPurchaseDeptId())).get("sysDept");
|
|
|
planYear.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
|
|
|
|
|
|
for (Map.Entry<String, String> entry : projectTypesMap.entrySet()) {
|