|
@@ -214,7 +214,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
ofYears.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
|
|
|
ofYears.setCreateTime(new Date());
|
|
|
planYearsMapper.insertPlanYears(ofYears);
|
|
|
- log.info("id:{}", ofYears.getPlanYearId());
|
|
|
+ log.info("id:{}" , ofYears.getPlanYearId());
|
|
|
List<SysFileRef> sysFileRefs = yearsStandardVo.getSysFileRefs();
|
|
|
if (!ObjectUtils.isEmpty(sysFileRefs)) {
|
|
|
for (SysFileRef ref : sysFileRefs) {
|
|
@@ -397,7 +397,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
}
|
|
|
String zs = zBuilder.toString();
|
|
|
if (zs.endsWith(",")) {
|
|
|
- zBuilder = null;
|
|
|
+ zBuilder.replace(0, zBuilder.length(), "");
|
|
|
zBuilder.append(zs.substring(0, zs.length() - 1));
|
|
|
}
|
|
|
} else {
|
|
@@ -1050,13 +1050,13 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
Map<String, Object> params = vo.getParams();
|
|
|
if (!ObjectUtils.isEmpty(vo.getParams())) {
|
|
|
if (!ObjectUtils.isEmpty(vo.getParams().get("beginTime"))) {
|
|
|
- params.put("beginTime", vo.getParams().get("beginTime").toString() + "-01");
|
|
|
+ params.put("beginTime" , vo.getParams().get("beginTime").toString() + "-01");
|
|
|
}
|
|
|
if (!ObjectUtils.isEmpty(vo.getParams().get("endTime"))) {
|
|
|
SimpleDateFormat dateFormaH = new SimpleDateFormat("yyyy-MM");
|
|
|
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
Date ofMonth = DateUtils.getLastDayOfMonth(dateFormaH.parse(vo.getParams().get("endTime").toString()));
|
|
|
- params.put("endTime", dateFormat.format(ofMonth) + " 23:59:59:999");
|
|
|
+ params.put("endTime" , dateFormat.format(ofMonth) + " 23:59:59:999");
|
|
|
}
|
|
|
}
|
|
|
vo.setParams(params);
|
|
@@ -1114,8 +1114,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
|
|
|
private List<SysFileInfo> getSysFileInfoList(Long redId, Integer type) {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
- map.put("red_id", redId);
|
|
|
- map.put("type", type);
|
|
|
+ map.put("red_id" , redId);
|
|
|
+ map.put("type" , type);
|
|
|
List<SysFileRef> fileRefs = sysFileRefService.listByMap(map);
|
|
|
if (!ObjectUtils.isEmpty(fileRefs)) {
|
|
|
List<SysFileInfo> fileInfos = new ArrayList<>();
|