From 696973d43e5c70946bd1dd74ce3d71e1cc4e1a26 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Tue, 9 Apr 2024 10:18:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E8=83=BD=E8=B4=A8=E9=87=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E7=9B=91=E6=B5=8B=E7=82=B9=E8=B6=85=E6=A0=87=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/SurveyPlanQuestionQueryParm.java | 4 +- .../RGeneralSurveyPlanDetailOnQuestionVO.java | 3 ++ .../RGeneralSurveyPlanDetailMapper.java | 39 +++++++++---------- .../RGeneralSurveyPlanDetailMapper.xml | 33 ++++++++++++++++ .../impl/RGeneralSurveyPlanPOServiceImpl.java | 22 ++++++++--- 5 files changed, 74 insertions(+), 27 deletions(-) diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SurveyPlanQuestionQueryParm.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SurveyPlanQuestionQueryParm.java index 760e7432b..7ca1bf78d 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SurveyPlanQuestionQueryParm.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SurveyPlanQuestionQueryParm.java @@ -24,9 +24,9 @@ public class SurveyPlanQuestionQueryParm { @NotNull(message="单位ID不能为空！") private String orgNo; - @ApiModelProperty(value="计划开始时间") + @ApiModelProperty(value="普测结果上传时间") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - @NotNull(message="计划开始时间不能为空！") + @NotNull(message="普测结果上传时间不能为空！") private Date planStartTime; @ApiModelProperty(value="计划名称") diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanDetailOnQuestionVO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanDetailOnQuestionVO.java index fe5ac18bf..ed3d2b325 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanDetailOnQuestionVO.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanDetailOnQuestionVO.java @@ -29,6 +29,9 @@ public class RGeneralSurveyPlanDetailOnQuestionVO { */ @ApiModelProperty(value="变电站电压等级") private String voltageLevel; + + @ApiModelProperty(value="变电站电压等级") + private String voltageLevelName; /** * 变电站ID */ diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java index 6d5e9a0c4..c65d921b4 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java @@ -5,7 +5,6 @@ import com.njcn.process.pojo.param.SurveyPlanQuestionQueryParm; import com.njcn.process.pojo.po.RGeneralSurveyPlanDetail; import com.njcn.process.pojo.vo.RGeneralSurveyPlanDetailOnQuestionVO; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import java.util.List; @@ -19,23 +18,23 @@ import java.util.List; * @version V1.0.0 */ public interface RGeneralSurveyPlanDetailMapper extends MppBaseMapper { - @Select ({""}) - List querySurveyPlanOnQuestion(@Param("questionQueryParm") SurveyPlanQuestionQueryParm questionQueryParm); +// @Select ({""}) + List querySurveyPlanOnQuestion(@Param("questionQueryParm") SurveyPlanQuestionQueryParm questionQueryParm,@Param("deptIdList") List deptIdList); } \ No newline at end of file diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/RGeneralSurveyPlanDetailMapper.xml b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/RGeneralSurveyPlanDetailMapper.xml index ed402a7ab..726058399 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/RGeneralSurveyPlanDetailMapper.xml +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/RGeneralSurveyPlanDetailMapper.xml @@ -23,4 +23,37 @@ general_survey_leader, sub_id, sub_name, voltage_level, busbar_id, busbar_name, measurement_point_id, is_problem + + \ No newline at end of file diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java index 3f98a13b2..17110ca79 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java @@ -1,5 +1,6 @@ package com.njcn.process.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -18,7 +19,6 @@ import com.njcn.oss.constant.OssPath; import com.njcn.oss.enums.OssResponseEnum; import com.njcn.oss.utils.FileStorageUtil; import com.njcn.process.enums.AuditProcessEnum; -import com.njcn.process.enums.FlowComment; import com.njcn.process.mapper.*; import com.njcn.process.pojo.param.*; import com.njcn.process.pojo.po.*; @@ -29,16 +29,15 @@ import com.njcn.process.service.RGeneralSurveyPlanPOService; import com.njcn.process.service.flowable.IFlowDefinitionService; import com.njcn.process.service.flowable.IFlowInstanceService; import com.njcn.process.service.flowable.IFlowTaskService; -import com.njcn.process.service.impl.flowable.FlowDefinitionServiceImpl; - +import com.njcn.system.api.DicDataFeignClient; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.api.UserFeignClient; +import com.njcn.user.pojo.dto.DeptDTO; import com.njcn.user.pojo.po.Dept; import com.njcn.user.pojo.po.User; import com.njcn.user.pojo.vo.PvTerminalTreeVO; import com.njcn.user.pojo.vo.UserVO; import com.njcn.web.utils.RequestUtil; -import liquibase.pro.packaged.S; import lombok.RequiredArgsConstructor; import org.flowable.task.api.Task; import org.springframework.beans.BeanUtils; @@ -87,6 +86,8 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl querySurveyPlanOnQuestion(SurveyPlanQuestionQueryParm questionQueryParm) { - return rGeneralSurveyPlanDetailMapper.querySurveyPlanOnQuestion(questionQueryParm); + + /*获取直接下属子单位*/ + List deptDTOList = deptFeignClient.getDepSonDetailByDeptId (questionQueryParm.getOrgNo()).getData ( ); + if (CollUtil.isEmpty(deptDTOList)) { + return Collections.emptyList(); + } + List deptIdList = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + List rGeneralSurveyPlanDetailOnQuestionVOS = rGeneralSurveyPlanDetailMapper.querySurveyPlanOnQuestion(questionQueryParm, deptIdList); + rGeneralSurveyPlanDetailOnQuestionVOS.forEach(temp->{ + temp.setVoltageLevelName(dicDataFeignClient.getDicDataById(temp.getVoltageLevel()).getData().getName()); + }); + return rGeneralSurveyPlanDetailOnQuestionVOS; } /**