From 12ee5aa5fb734a14a283d816dd8581f285d8742f Mon Sep 17 00:00:00 2001 From: wangqian <1406304305@qq.com> Date: Thu, 15 Jan 2026 22:14:29 +0800 Subject: [PATCH] 任务趋势图返回时间格式修改 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/homepage/vo/CommitTaskStatisticsRespVo.java | 2 ++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/material/vo/MaterialSaveReqVO.java | 1 - urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/MaintainSummaryServiceImpl.java | 14 ++++++++++---- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/material/MaterialServiceImpl.java | 11 +++++++++++ 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/homepage/vo/CommitTaskStatisticsRespVo.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/homepage/vo/CommitTaskStatisticsRespVo.java index 3500d39..06392eb 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/homepage/vo/CommitTaskStatisticsRespVo.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/homepage/vo/CommitTaskStatisticsRespVo.java @@ -13,6 +13,8 @@ public class CommitTaskStatisticsRespVo { private String dateValue; + private String currentDate; + private String busiLine; private String busiLineName; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/material/vo/MaterialSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/material/vo/MaterialSaveReqVO.java index 65222b1..c644824 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/material/vo/MaterialSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/material/vo/MaterialSaveReqVO.java @@ -69,7 +69,6 @@ public class MaterialSaveReqVO { private String unitName; @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "随便") - @NotEmpty(message = "备注不能为空") private String remark; @Schema(description = "是否关联工单：0-否，1-是") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/MaintainSummaryServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/MaintainSummaryServiceImpl.java index 102c44c..27490b5 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/MaintainSummaryServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/MaintainSummaryServiceImpl.java @@ -138,7 +138,7 @@ public class MaintainSummaryServiceImpl implements MaintainSummaryService { // 遍历默认数据列表，匹配并赋值巡检计划数据 for (CommitTaskStatisticsRespVo defaultVo : defaultVoList) { // 构建默认VO的唯一标识（与巡检计划的标识保持一致） - String matchKey = defaultVo.getDateValue() + "_" + defaultVo.getBusiLine(); + String matchKey = defaultVo.getCurrentDate() + "_" + defaultVo.getBusiLine(); if (inspectionMap.containsKey(matchKey)) { CommitTaskStatisticsRespVo inspectVo = inspectionMap.get(matchKey); defaultVo.setInspectionPlanNum(inspectVo.getInspectionPlanNum()); @@ -164,7 +164,7 @@ public class MaintainSummaryServiceImpl implements MaintainSummaryService { // 遍历默认数据列表，匹配并赋值养护计划数据 for (CommitTaskStatisticsRespVo defaultVo : defaultVoList) { - String matchKey = defaultVo.getDateValue() + "_" + defaultVo.getBusiLine(); + String matchKey = defaultVo.getCurrentDate() + "_" + defaultVo.getBusiLine(); if (maintainMap.containsKey(matchKey)) { CommitTaskStatisticsRespVo maintainVo = maintainMap.get(matchKey); // 赋值： @@ -185,7 +185,12 @@ public class MaintainSummaryServiceImpl implements MaintainSummaryService { chartData.put("data", defaultData); //日期集合 - chartData.put("timeData",days); + List monthDays = days.stream() + .map(dateStr -> dateStr.substring(5, 7) + "." + dateStr.substring(8)) + .collect(Collectors.toList()); + chartData.put("timeData",monthDays); + + return chartData; } /** @@ -562,7 +567,8 @@ public class MaintainSummaryServiceImpl implements MaintainSummaryService { //1、日期赋值 days.forEach(dayy->{ CommitTaskStatisticsRespVo vo = new CommitTaskStatisticsRespVo(); - vo.setDateValue(dayy); + vo.setDateValue(dayy.substring(5).replace("-",".")); + vo.setCurrentDate(dayy); vo.setPlanNum(0); // 默认总数为0 vo.setPlanFinishNum(0); vo.setInspectionPlanNum(0); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/material/MaterialServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/material/MaterialServiceImpl.java index 828c937..baf8409 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/material/MaterialServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/material/MaterialServiceImpl.java @@ -1,6 +1,8 @@ package com.zteits.urbanops.module.garden.service.material; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.zteits.urbanops.module.system.api.dept.DeptApi; +import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -17,6 +19,7 @@ import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCo import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception0; import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertList; +import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getCompanyId; import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*; /** @@ -31,6 +34,9 @@ public class MaterialServiceImpl implements MaterialService { @Resource private MaterialMapper materialMapper; + @Resource + private DeptApi deptApi; + @Override public Long createMaterial(MaterialSaveReqVO createReqVO) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -46,6 +52,11 @@ public class MaterialServiceImpl implements MaterialService { createReqVO.setFullCode(createReqVO.getTypeDetailId()+createReqVO.getMaterialCode()+createReqVO.getSpecCode()); // 插入 MaterialDO material = BeanUtils.toBean(createReqVO, MaterialDO.class); + material.setBelongCompanyId(getCompanyId()); + DeptRespDTO deptRespDTO = deptApi.getDept(getCompanyId()); + if (deptRespDTO != null) { + material.setBelongCompanyName(deptRespDTO.getName()); + } materialMapper.insert(material); // 返回 -- libgit2 0.21.4