设备管理页面端的接口逻辑修改

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;
     }
 }

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<DmsInspectInstanceDetail> dmsInspectInstanceDetailList;
 

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() {

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);
 }

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<DmsPlanInspect> selectDmsPlanInspectList(DmsPlanInspect dmsPlanInspect)
     {
         List<DmsPlanInspect> 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));

hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseInspectProjectMapper.xml

@@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="inspectProjectCode != null">inspect_project_code,</if>
             <if test="inspectProject != null and inspectProject != ''">inspect_project,</if>
+            <if test="inspectProjectProperty != null and inspectProjectProperty != ''">inspect_project_property,</if>
             <if test="inspectType != null and inspectType != ''">inspect_type,</if>
             <if test="recordMethod != null">record_method,</if>
             <if test="upLimit != null">up_limit,</if>
@@ -64,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="inspectProjectCode != null">#{inspectProjectCode},</if>
             <if test="inspectProject != null and inspectProject != ''">#{inspectProject},</if>
+            <if test="inspectProjectProperty != null">#{inspectProjectProperty},</if>
             <if test="inspectType != null and inspectType != ''">#{inspectType},</if>
             <if test="recordMethod != null">#{recordMethod},</if>
             <if test="upLimit != null">#{upLimit},</if>

hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml

@@ -102,4 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectAmountByInspectRouteId" parameterType="Long" resultType="Long">
         select count(*) from dms_inspect_route_detail where inspect_route_id = #{inspectRouteId}
     </select>
+    <select id="selectRouteName" resultType="java.lang.String" parameterType="java.lang.Long">
+        SELECT route_name routeName FROM `hwjy-cloud`.dms_base_inspect_route  where inspect_route_id = #{inspectRouteId}
+    </select>
 </mapper>