whycxzp
2021-04-06 664bbbfb5d115219ff53084f86bed8069c3f8bd0
更新 设备资源申请接口
2个文件已修改
16 ■■■■ 已修改文件
src/main/java/com/whyc/service/DeviceResourceApplyService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/DeviceResourceApplyMapper.xml 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/DeviceResourceApplyService.java
@@ -43,8 +43,9 @@
        DeviceResourceApply apply = new DeviceResourceApply();
        apply.setId(id);
        apply.setStatus(status);
        apply.setApproveTime(new Date());
        mapper.updateById(apply);
        return new Response().setMsg(1,"审批成功");
        return new Response().setMsg(1,"审批完成");
    }
    public Response getApplyInfo(Integer id) {
src/main/resources/mapper/DeviceResourceApplyMapper.xml
@@ -40,10 +40,20 @@
        <association property="deviceManage" resultMap="DeviceManageResultMap"/>
        <association property="deviceState" resultMap="ElectricStateResultMap2"/>
    </resultMap>
    <resultMap id="DeviceResourceApplyResultMap2" type="DeviceResourceApply">
        <id property="id" column="id"/>
        <result property="assignedVol" column="assigned_vol"/>
        <result property="applyOwner" column="apply_owner"/>
        <result property="applyTime" column="apply_time"/>
        <result property="approveTime" column="approve_time"/>
        <result property="status" column="status"/>
        <association property="deviceManage" resultMap="DeviceManageResultMap"/>
        <association property="deviceState" resultMap="ElectricStateResultMap2"/>
    </resultMap>
    <resultMap id="DeviceManageResultMap" type="DeviceManage">
        <result property="deviceId" column="device_id"/>
        <result property="deviceName" column="deviceName"/>
        <result property="deviceName" column="device_name"/>
        <result property="site" column="site"/>
        <result property="deviceBrand" column="device_brand"/>
        <result property="deviceVersion" column="device_version"/>
@@ -108,7 +118,6 @@
            s.load_status=#{loadStatus}
        </if>
    </select>
    <!--TODO-->
    <select id="getApplyInfo" resultMap="DeviceResourceApplyResultMap2">
        SELECT
            m.device_id,