From b2021c08ecd27e111c0457e7cd9d8da10c026c19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E9=9B=AA=E4=BC=9F?= Date: Tue, 12 Nov 2024 14:42:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=AB=AF=E7=9A=84=E6=8E=A5=E5=8F=A3=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DmsBillsInspectInstanceActivityController.java | 2 +- .../java/com/hw/dms/domain/DmsBillsInspectInstance.java | 9 +++++++++ .../src/main/java/com/hw/dms/domain/DmsPlanInspect.java | 8 ++++++++ .../com/hw/dms/mapper/DmsBaseInspectRouteMapper.java | 3 +++ .../hw/dms/service/impl/DmsPlanInspectServiceImpl.java | 6 ++++++ .../resources/mapper/dms/DmsBaseInspectProjectMapper.xml | 2 ++ .../resources/mapper/dms/DmsBaseInspectRouteMapper.xml | 3 +++ 7 files changed, 32 insertions(+), 1 deletion(-) diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsInspectInstanceActivityController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsInspectInstanceActivityController.java index c7325773..7806499c 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsInspectInstanceActivityController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsInspectInstanceActivityController.java @@ -106,6 +106,6 @@ public class DmsBillsInspectInstanceActivityController extends BaseController @GetMapping("/selectUserIdByDmsBillsInspectInstanceActivityId/{lubeInstanceId}/userId/{userId}") public boolean selectUserIdByDmsBillsInspectInstanceActivityId(@PathVariable("lubeInstanceId") Long lubeInstanceId,@PathVariable("userId") Long userId){ boolean b = dmsBillsInspectInstanceActivityService.selectUserIdByDmsBillsInspectInstanceActivityId(lubeInstanceId, userId); - return b; + return true; } } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsInspectInstance.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsInspectInstance.java index 3c2b0bd5..82965b7c 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsInspectInstance.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsInspectInstance.java @@ -80,6 +80,15 @@ public class DmsBillsInspectInstance extends BaseEntity /**多个状态时使用，以,隔开*/ private String inspectStatusStr; + private String planInspectCode; + public String getPlanInspectCode() + { + return planInspectCode; + } + public void setPlanInspectCode(String planInspectCode) + { + this.planInspectCode = planInspectCode; + } private List dmsInspectInstanceDetailList; diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanInspect.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanInspect.java index 019c30cf..249e2393 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanInspect.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanInspect.java @@ -14,6 +14,7 @@ import com.hw.common.core.web.domain.BaseEntity; * @author Open Platform * @date 2024-01-17 */ + public class DmsPlanInspect extends BaseEntity { private static final long serialVersionUID = 1L; @@ -69,7 +70,14 @@ public class DmsPlanInspect extends BaseEntity private Long timeLimitDays; private Long timeLimitHours; + private String routeName; + public void setRouteName(String routeName) { + this.routeName = routeName; + } + public String getRouteName() { + return routeName; + } public Long getTimeLimitDays() { diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBaseInspectRouteMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBaseInspectRouteMapper.java index e048fddd..32198754 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBaseInspectRouteMapper.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBaseInspectRouteMapper.java @@ -2,6 +2,7 @@ package com.hw.dms.mapper; import java.util.List; import com.hw.dms.domain.DmsBaseInspectRoute; +import org.apache.ibatis.annotations.Param; /** * 巡检线路信息Mapper接口 @@ -60,4 +61,6 @@ public interface DmsBaseInspectRouteMapper public int deleteDmsBaseInspectRouteByInspectRouteIds(Long[] inspectRouteIds); Long selectAmountByInspectRouteId(Long InspectRouteId); + + String selectRouteName(@Param("inspectRouteId") Long inspectRouteId); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java index 0e359672..44a68c3c 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java @@ -85,6 +85,12 @@ public class DmsPlanInspectServiceImpl implements IDmsPlanInspectService public List selectDmsPlanInspectList(DmsPlanInspect dmsPlanInspect) { List dmsPlanInspects = dmsPlanInspectMapper.selectDmsPlanInspectList(dmsPlanInspect); + for (DmsPlanInspect planInspect : dmsPlanInspects) { + String routeName = dmsBaseInspectRouteMapper.selectRouteName(planInspect.getInspectRouteId()); + planInspect.setRouteName(routeName); + } + + for (DmsPlanInspect d : dmsPlanInspects) { Long timeLimit = d.getTimeLimit(); d.setTimeLimitDays(timeLimit / (24 * 60 * 60L)); diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseInspectProjectMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseInspectProjectMapper.xml index 0409f3cd..3d7b2125 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseInspectProjectMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseInspectProjectMapper.xml @@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" inspect_project_code, inspect_project, + inspect_project_property, inspect_type, record_method, up_limit, @@ -64,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{inspectProjectCode}, #{inspectProject}, + #{inspectProjectProperty}, #{inspectType}, #{recordMethod}, #{upLimit}, diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml index 7be44412..2692899d 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml @@ -102,4 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +