update-维修计划状态更新、新增定时器修改状态

xiebin

2026-01-19 4e48664942bbefe70699ca43d25cbbd56ecc8daa

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml

@@ -18,10 +18,11 @@
        <result column="manufacturer" property="manufacturer"/>
        <result column="source" property="source"/>
        <result column="purpose" property="purpose"/>
        <result column="charger" property="charger"/>
        <result column="device_create_time" property="createTime"/>
    </resultMap>

    <select id="getFwDeviceScrapById" resultMap="fwDeviceScrapResultMap">
        select
    <sql id="deviceFields">
        b.device_name,
        b.device_type,
        b.device_att,
@@ -31,7 +32,13 @@
        b.manufacturer,
        b.source,
        b.purpose,
        a.*
        b.charger,
        b.create_time as device_create_time
    </sql>

    <select id="getFwDeviceScrapById" resultMap="fwDeviceScrapResultMap">
        select
            <include refid="deviceFields"/>,a.*
        from
        ja_fw_device_scrap a
        left join ja_fw_device b on (a.device_id = b.id)
@@ -46,16 +53,7 @@

    <select id="selectFwDeviceScrapPage" resultMap="fwDeviceScrapResultMap">
        select
        b.device_name,
        b.device_type,
        b.device_att,
        b.device_model,
        b.belong_dept,
        b.device_specification,
        b.manufacturer,
        b.source,
        b.purpose,
        a.*
            <include refid="deviceFields"/>,a.*
        from
        ja_fw_device_scrap a
        left join ja_fw_device b on (a.device_id = b.id)