feat(dms): 添加巡检和保养工单设备管理功能

- 在巡检工单控制器中添加获取设备列表和更新设备状态的API接口
- 在保养工单控制器中添加获取设备列表和更新设备状态的API接口
- 实现巡检和保养工单的服务层设备管理方法
- 更新数据映射配置将device_id替换为machine_id字段
- 修改巡检项目表名从dms_inspect_instance_detail_project到dms_inspect_inst_det_proj
- 添加巡检和保养工单的设备状态更新逻辑及工单状态同步机制

aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsInspectInstanceController.java

@@ -5,6 +5,7 @@ import com.aucma.common.core.domain.AjaxResult;
 import com.aucma.common.core.page.TableDataInfo;
 import com.aucma.common.utils.poi.ExcelUtil;
 import com.aucma.dms.domain.DmsBillsInspectInstance;
+import com.aucma.dms.domain.DmsInspectInstanceDetail;
 import com.aucma.dms.domain.DmsPlanInspect;
 import com.aucma.dms.service.IDmsBillsInspectInstanceService;
 import com.aucma.dms.service.IDmsPlanInspectService;
@@ -147,5 +148,22 @@ public class DmsBillsInspectInstanceController extends BaseController
         return toAjax(dmsBillsInspectInstanceService.deleteDmsBillsInspectInstanceByInspectInstanceIds(inspectInstanceIds));
     }
 
+    /**
+     * 获取工单设备列表（用于网页版巡检执行）
+     */
+    @GetMapping("/devices/{inspectInstanceId}")
+    public AjaxResult getDeviceList(@PathVariable("inspectInstanceId") Long inspectInstanceId)
+    {
+        return success(dmsBillsInspectInstanceService.getDeviceList(inspectInstanceId));
+    }
+
+    /**
+     * 更新设备检查状态（简化版，只更新合格/不合格）
+     */
+    @PutMapping("/device/status")
+    public AjaxResult updateDeviceStatus(@RequestBody DmsInspectInstanceDetail detail)
+    {
+        return toAjax(dmsBillsInspectInstanceService.updateDeviceStatus(detail));
+    }
 
 }

aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsMaintInstanceController.java

@@ -4,6 +4,7 @@ import com.aucma.common.core.controller.BaseController;
 import com.aucma.common.core.domain.AjaxResult;
 import com.aucma.common.core.page.TableDataInfo;
 import com.aucma.common.utils.poi.ExcelUtil;
+import com.aucma.dms.domain.DmsBillsMaintDetail;
 import com.aucma.dms.domain.DmsBillsMaintInstance;
 import com.aucma.dms.service.IDmsBillsMaintInstanceService;
 import com.aucma.dms.service.IDmsPlanMaintService;
@@ -118,4 +119,22 @@ public class DmsBillsMaintInstanceController extends BaseController
     {
         return toAjax(dmsBillsMaintInstanceService.deleteDmsBillsMaintInstanceByMaintInstanceIds(maintInstanceIds));
     }
+
+    /**
+     * 获取保养工单设备列表（用于网页版保养执行）
+     */
+    @GetMapping("/devices/{maintInstanceId}")
+    public AjaxResult getDeviceList(@PathVariable("maintInstanceId") Long maintInstanceId)
+    {
+        return success(dmsBillsMaintInstanceService.getDeviceList(maintInstanceId));
+    }
+
+    /**
+     * 更新设备保养状态（简化版，只更新合格/不合格）
+     */
+    @PutMapping("/device/status")
+    public AjaxResult updateDeviceStatus(@RequestBody DmsBillsMaintDetail detail)
+    {
+        return toAjax(dmsBillsMaintInstanceService.updateDeviceStatus(detail));
+    }
 }

aucma-dms/src/main/java/com/aucma/dms/service/IDmsBillsInspectInstanceService.java

@@ -90,4 +90,20 @@ public interface IDmsBillsInspectInstanceService
      * @return 结果
      */
     public int updateDmsInspectInstanceDetail(DmsInspectInstanceDetail dmsInspectInstanceDetail);
+
+    /**
+     * 获取工单设备列表（网页版巡检执行）
+     *
+     * @param inspectInstanceId 巡检工单ID
+     * @return 设备明细列表
+     */
+    public List<DmsInspectInstanceDetail> getDeviceList(Long inspectInstanceId);
+
+    /**
+     * 更新设备检查状态（简化版，只更新合格/不合格）
+     *
+     * @param detail 设备明细
+     * @return 结果
+     */
+    public int updateDeviceStatus(DmsInspectInstanceDetail detail);
 }

aucma-dms/src/main/java/com/aucma/dms/service/IDmsBillsMaintInstanceService.java

@@ -89,4 +89,20 @@ public interface IDmsBillsMaintInstanceService
      * @return 结果
      */
     public int completeMaint(DmsBillsMaintDetail dmsBillsMaintDetail);
+
+    /**
+     * 获取保养工单设备列表（网页版保养执行）
+     *
+     * @param maintInstanceId 保养工单ID
+     * @return 设备明细列表
+     */
+    public List<DmsBillsMaintDetail> getDeviceList(Long maintInstanceId);
+
+    /**
+     * 更新设备保养状态（简化版，只更新合格/不合格）
+     *
+     * @param detail 设备明细
+     * @return 结果
+     */
+    public int updateDeviceStatus(DmsBillsMaintDetail detail);
 }

aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java

@@ -402,4 +402,59 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta
 
     }
 
+    /**
+     * 获取工单设备列表（网页版巡检执行）
+     */
+    @Override
+    public List<DmsInspectInstanceDetail> getDeviceList(Long inspectInstanceId) {
+        DmsInspectInstanceDetail query = new DmsInspectInstanceDetail();
+        query.setInspectInstanceId(inspectInstanceId);
+        return dmsInspectInstanceDetailMapper.selectDmsInspectInstanceDetailJoinList(query);
+    }
+
+    /**
+     * 更新设备检查状态（简化版，只更新合格/不合格）
+     */
+    @Override
+    @Transactional
+    public int updateDeviceStatus(DmsInspectInstanceDetail detail) {
+        // 设置时间
+        detail.setUpdateTime(new Date());
+        detail.setUpdateBy(SecurityUtils.getUserId());
+
+        // 更新设备明细状态
+        int result = dmsInspectInstanceDetailMapper.updateDmsInspectInstanceDetail(detail);
+
+        // 检查是否所有设备都已检查完成，更新工单状态
+        DmsInspectInstanceDetail query = new DmsInspectInstanceDetail();
+        query.setInspectInstanceId(detail.getInspectInstanceId());
+        List<DmsInspectInstanceDetail> details = dmsInspectInstanceDetailMapper.selectDmsInspectInstanceDetailList(query);
+
+        int completedCount = 0;
+        for (DmsInspectInstanceDetail d : details) {
+            if (d.getInstanceDetailStatus() != null && d.getInstanceDetailStatus().equals("3")) {
+                completedCount++;
+            }
+        }
+
+        DmsBillsInspectInstance instance = new DmsBillsInspectInstance();
+        instance.setInspectInstanceId(detail.getInspectInstanceId());
+
+        if (completedCount == details.size()) {
+            // 全部完成
+            instance.setInspectStatus("3");
+            instance.setRealEndTime(new Date());
+        } else if (completedCount > 0) {
+            // 巡检中
+            instance.setInspectStatus("2");
+            if (instance.getRealBeginTime() == null) {
+                instance.setRealBeginTime(new Date());
+            }
+        }
+
+        dmsBillsInspectInstanceMapper.updateDmsBillsInspectInstance(instance);
+
+        return result;
+    }
+
 }

aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java

@@ -334,4 +334,69 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
         return 1;
     }
 
+    /**
+     * 获取保养工单设备列表（网页版保养执行）
+     */
+    @Override
+    public List<DmsBillsMaintDetail> getDeviceList(Long maintInstanceId) {
+        DmsBillsMaintDetail query = new DmsBillsMaintDetail();
+        query.setMaintInstanceId(maintInstanceId);
+        return dmsBillsMaintDetailMapper.selectDmsBillsMaintDetailJoinList(query);
+    }
+
+    /**
+     * 更新设备保养状态（简化版，只更新合格/不合格）
+     */
+    @Override
+    @Transactional
+    public int updateDeviceStatus(DmsBillsMaintDetail detail) {
+        Date currentDate = new Date();
+
+        // 获取保养工单信息
+        DmsBillsMaintInstance instance = dmsBillsMaintInstanceMapper
+                .selectDmsBillsMaintInstanceByMaintInstanceId(detail.getMaintInstanceId());
+
+        Long maintStatus = instance.getMaintStatus() == null ?
+                DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_TO_MAINT : instance.getMaintStatus();
+
+        // 如果工单状态是"待保养"，更新为"保养中"
+        if (maintStatus.equals(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_TO_MAINT)) {
+            instance.setMaintStatus(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_MAINTING);
+            instance.setRealBeginTime(currentDate);
+            instance.setUpdateTime(currentDate);
+            instance.setUpdateBy(SecurityUtils.getUserId());
+            dmsBillsMaintInstanceMapper.updateDmsBillsMaintInstance(instance);
+        }
+
+        // 更新设备明细状态
+        detail.setUpdateTime(currentDate);
+        detail.setUpdateBy(SecurityUtils.getUserId());
+        detail.setEndTime(currentDate);
+        detail.setMaintStatus(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_COMPLETE);
+        int result = dmsBillsMaintDetailMapper.updateDmsBillsMaintDetail(detail);
+
+        // 检查是否所有设备都已保养完成
+        DmsBillsMaintDetail query = new DmsBillsMaintDetail();
+        query.setMaintInstanceId(detail.getMaintInstanceId());
+        List<DmsBillsMaintDetail> details = dmsBillsMaintDetailMapper.selectDmsBillsMaintDetailList(query);
+
+        int completedCount = 0;
+        for (DmsBillsMaintDetail d : details) {
+            if (d.getMaintStatus() != null && d.getMaintStatus().equals(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_COMPLETE)) {
+                completedCount++;
+            }
+        }
+
+        // 如果所有设备都完成，更新工单状态为"已完成"
+        if (completedCount == details.size()) {
+            instance.setMaintStatus(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_COMPLETE);
+            instance.setRealEndTime(currentDate);
+            instance.setUpdateTime(currentDate);
+            instance.setUpdateBy(SecurityUtils.getUserId());
+            dmsBillsMaintInstanceMapper.updateDmsBillsMaintInstance(instance);
+        }
+
+        return result;
+    }
+
 }

aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanInspectServiceImpl.java

@@ -1,19 +1,5 @@
 package com.aucma.dms.service.impl;
 
-//import com.hw.common.core.constant.SecurityConstants;
-//import com.hw.common.core.domain.R;
-//import com.hw.common.core.utils.DateUtils;
-//import com.hw.common.core.utils.uuid.Seq;
-//import com.hw.common.security.utils.SecurityUtils;
-//import com.aucma.dms.domain.DmsPlanInspect;
-//import com.aucma.dms.mapper.DmsBaseInspectRouteMapper;
-//import com.aucma.dms.mapper.DmsPlanInspectMapper;
-//import com.aucma.dms.service.IDmsPlanInspectService;
-//import com.hw.job.api.RemoteJobService;
-//import com.hw.job.api.domain.SysJob;
-//import com.hw.job.api.util.CronUtils;
-//import com.hw.system.api.model.LoginUser;
-
 import com.aucma.common.core.domain.model.LoginUser;
 import com.aucma.common.utils.DateUtils;
 import com.aucma.common.utils.SecurityUtils;

aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailMapper.xml

@@ -23,7 +23,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         <result property="deviceCode"    column="device_code"    />
         <result property="deviceName"    column="device_name"    />
-        <result property="typeName"    column="type_name"    />
         <result property="maintStationName"    column="maint_station_name"    />
         <result property="maintProtocol"    column="maint_protocol"    />
         <result property="maintOperationDescription"    column="maint_operation_description"    />
@@ -133,26 +132,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
             dbmd.bills_maint_detail_id,
             dbmd.maint_instance_id,
-            dbmd.device_id,
+            dbmd.machine_id,
-            dbmd.station_id,
+            dbmd.maint_station_id,
             dbmd.maint_standard_id,
             dbmd.operation_description,
             dbmd.maint_status,
             dbdl.device_code,
             dbdl.device_name,
-            dbdt.type_name,
             dbms.maint_station_code maint_station_name,
             dbmsd.maint_protocol,
             dbmsd.operation_description as maint_operation_description
         from
             dms_bills_maint_detail dbmd
-                left join base_deviceledger dbdl on
+                left join HAIWEI.base_deviceledger dbdl on
-                dbmd.device_id = dbdl.OBJ_ID
+                dbmd.machine_id = dbdl.OBJ_ID
-                left join dms_base_device_type dbdt on
+                left join HAIWEI.dms_base_maint_station dbms on
-                dbdl.device_type_id = dbdt.device_type_id
+                dbmd.maint_station_id = dbms.maint_station_id
-                left join dms_base_maint_station dbms on
+                left join HAIWEI.dms_base_maint_standard dbmsd on
-                dbmd.station_id = dbms.maint_station_id
-                left join dms_base_maint_standard dbmsd on
                 dbmd.maint_standard_id = dbmsd.maint_standard_id
     </sql>
 
@@ -160,8 +156,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDmsBillsMaintDetailJoinVo"/>
         <where>
             <if test="maintInstanceId != null "> and dbmd.maint_instance_id = #{maintInstanceId}</if>
-            <if test="deviceId != null "> and dbmd.device_id = #{deviceId}</if>
+            <if test="deviceId != null "> and dbmd.machine_id = #{deviceId}</if>
-            <if test="stationId != null "> and dbmd.station_id = #{stationId}</if>
+            <if test="stationId != null "> and dbmd.maint_station_id = #{stationId}</if>
             <if test="maintStandardId != null "> and dbmd.maint_standard_id = #{maintStandardId}</if>
             <if test="maintStatus != null "> and dbmd.maint_status = #{maintStatus}</if>
         </where>

aucma-dms/src/main/resources/mapper/dms/DmsInspectInstanceDetailMapper.xml

@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="inspectInstanceId"    column="inspect_instance_id"    />
         <result property="lineStep"    column="line_step"    />
         <result property="realLineStep"    column="real_line_step"    />
-        <result property="deviceId"    column="device_id"    />
+        <result property="deviceId"    column="machine_id"    />
         <result property="instanceDetailStatus"    column="instance_detail_status"    />
         <result property="inspectStandard"    column="inspect_standard"    />
         <result property="inspectDesc"    column="inspect_desc"    />
@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDmsInspectInstanceDetailVo">
-        select instance_detail_id, inspect_instance_id, line_step, real_line_step, device_id, instance_detail_status, inspect_standard, inspect_desc, inspect_value, inspect_status, create_by, create_time, update_by, update_time from dms_inspect_instance_detail
+        select instance_detail_id, inspect_instance_id, line_step, real_line_step, machine_id, instance_detail_status, inspect_standard, inspect_desc, inspect_value, inspect_status, create_by, create_time, update_by, update_time from dms_inspect_instance_detail
     </sql>
 
     <select id="selectDmsInspectInstanceDetailList" parameterType="DmsInspectInstanceDetail" resultMap="DmsInspectInstanceDetailResult">
@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inspectInstanceId != null "> and inspect_instance_id = #{inspectInstanceId}</if>
             <if test="lineStep != null "> and line_step = #{lineStep}</if>
             <if test="realLineStep != null "> and real_line_step = #{realLineStep}</if>
-            <if test="deviceId != null "> and device_id = #{deviceId}</if>
+            <if test="deviceId != null "> and machine_id = #{deviceId}</if>
             <if test="instanceDetailStatus != null  and instanceDetailStatus != ''"> and instance_detail_status = #{instanceDetailStatus}</if>
             <if test="inspectStandard != null  and inspectStandard != ''"> and inspect_standard = #{inspectStandard}</if>
             <if test="inspectDesc != null  and inspectDesc != ''"> and inspect_desc = #{inspectDesc}</if>
@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inspectInstanceId != null">inspect_instance_id,</if>
             <if test="lineStep != null">line_step,</if>
             <if test="realLineStep != null">real_line_step,</if>
-            <if test="deviceId != null">device_id,</if>
+            <if test="deviceId != null">machine_id,</if>
             <if test="instanceDetailStatus != null">instance_detail_status,</if>
             <if test="inspectStandard != null">inspect_standard,</if>
             <if test="inspectDesc != null">inspect_desc,</if>
@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inspectInstanceId != null">inspect_instance_id = #{inspectInstanceId},</if>
             <if test="lineStep != null">line_step = #{lineStep},</if>
             <if test="realLineStep != null">real_line_step = #{realLineStep},</if>
-            <if test="deviceId != null">device_id = #{deviceId},</if>
+            <if test="deviceId != null">machine_id = #{deviceId},</if>
             <if test="instanceDetailStatus != null">instance_detail_status = #{instanceDetailStatus},</if>
             <if test="inspectStandard != null">inspect_standard = #{inspectStandard},</if>
             <if test="inspectDesc != null">inspect_desc = #{inspectDesc},</if>
@@ -119,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             diid.inspect_instance_id,
             diid.line_step,
             diid.real_line_step,
-            diid.device_id,
+            diid.machine_id,
             diid.instance_detail_status,
             diid.inspect_standard,
             a.inspect_project_desc inspect_desc,
@@ -128,9 +128,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             dbdl.device_name
         from
             dms_inspect_instance_detail diid
-                left join base_deviceledger dbdl on
+                left join HAIWEI.base_deviceledger dbdl on
-                diid.device_id = dbdl.OBJ_ID
+                diid.machine_id = dbdl.OBJ_ID
-                left join dms_inspect_instance_detail_project a on diid.instance_detail_id = a.instance_detail_id
+                left join dms_inspect_inst_det_proj a on diid.instance_detail_id = a.instance_detail_id
     </sql>
 
     <select id="selectDmsInspectInstanceDetailJoinList" parameterType="DmsInspectInstanceDetail" resultMap="DmsInspectInstanceDetailResult">
@@ -140,7 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inspectInstanceId != null "> and diid.inspect_instance_id = #{inspectInstanceId}</if>
             <if test="lineStep != null "> and diid.line_step = #{lineStep}</if>
             <if test="realLineStep != null "> and diid.real_line_step = #{realLineStep}</if>
-            <if test="deviceId != null "> and diid.device_id = #{deviceId}</if>
+            <if test="deviceId != null "> and diid.machine_id = #{deviceId}</if>
             <if test="instanceDetailStatus != null  and instanceDetailStatus != ''"> and diid.instance_detail_status = #{instanceDetailStatus}</if>
             <if test="inspectStandard != null  and inspectStandard != ''"> and diid.inspect_standard = #{inspectStandard}</if>
             <if test="inspectStatus != null  and inspectStatus != ''"> and diid.inspect_status = #{inspectStatus}</if>

aucma-dms/src/main/resources/mapper/dms/DmsInspectInstanceDetailProjectMapper.xml

@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDmsInspectInstanceDetailProjectVo">
-        select instance_detail_project_id, instance_detail_id, inspect_project_id, inspect_project_status, inspect_project_result, project_step_order, def_value, inspect_project_name, inspect_project_property, up_limit, low_limit, create_by, create_time, update_by, update_time from dms_inspect_instance_detail_project
+        select instance_detail_project_id, instance_detail_id, inspect_project_id, inspect_project_status, inspect_project_result, project_step_order, def_value, inspect_project_name, inspect_project_property, up_limit, low_limit, create_by, create_time, update_by, update_time from dms_inspect_inst_det_proj
     </sql>
 
     <select id="selectDmsInspectInstanceDetailProjectList" parameterType="DmsInspectInstanceDetailProject" resultMap="DmsInspectInstanceDetailProjectResult">
@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <insert id="insertDmsInspectInstanceDetailProject" parameterType="DmsInspectInstanceDetailProject" useGeneratedKeys="true" keyProperty="instanceDetailProjectId">
-        insert into dms_inspect_instance_detail_project
+        insert into dms_inspect_inst_det_proj
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="instanceDetailId != null">instance_detail_id,</if>
             <if test="inspectProjectId != null">inspect_project_id,</if>
@@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateDmsInspectInstanceDetailProject" parameterType="DmsInspectInstanceDetailProject">
-        update dms_inspect_instance_detail_project
+        update dms_inspect_inst_det_proj
         <trim prefix="SET" suffixOverrides=",">
             <if test="instanceDetailId != null">instance_detail_id = #{instanceDetailId},</if>
             <if test="inspectProjectId != null">inspect_project_id = #{inspectProjectId},</if>
@@ -109,11 +109,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectId" parameterType="Long">
-        delete from dms_inspect_instance_detail_project where instance_detail_project_id = #{instanceDetailProjectId}
+        delete from dms_inspect_inst_det_proj where instance_detail_project_id = #{instanceDetailProjectId}
     </delete>
 
     <delete id="deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectIds" parameterType="String">
-        delete from dms_inspect_instance_detail_project where instance_detail_project_id in
+        delete from dms_inspect_inst_det_proj where instance_detail_project_id in
         <foreach item="instanceDetailProjectId" collection="array" open="(" separator="," close=")">
             #{instanceDetailProjectId}
         </foreach>
@@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select diidp.instance_detail_project_id, diidp.instance_detail_id, diidp.inspect_project_id, diidp.inspect_project_status,
                diidp.inspect_project_result, diidp.inspect_project_desc,
                dbip.inspect_project as inspect_project_name,dbip.inspect_project_property, dbip.up_limit, dbip.low_limit,dbip.def_value
-        from  dms_inspect_instance_detail_project diidp right join dms_base_inspect_project dbip  on dbip.inspect_project_id=diidp.inspect_project_id
+        from  dms_inspect_inst_det_proj diidp right join dms_base_inspect_project dbip  on dbip.inspect_project_id=diidp.inspect_project_id
     </sql>
 
     <select id="selectDmsInspectInstanceDetailProjectJoinList" parameterType="DmsInspectInstanceDetailProject" resultMap="DmsInspectInstanceDetailProjectResult">