add-反无大屏-基础管理-设备相关入库时间

xiebin

2026-01-09 aa6d6b26f700de4b96df4673c77a5999fd295f52

add-反无大屏-基础管理-设备相关入库时间

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

@@ -19,6 +19,7 @@
        <result column="source" property="source"/>
        <result column="purpose" property="purpose"/>
        <result column="charger" property="charger"/>
        <result column="create_time" property="createTime"/>
    </resultMap>

    <select id="getFwDeviceMaintainPlanById" resultMap="fwDeviceMaintainPlanResultMap">
@@ -33,6 +34,7 @@
        b.source,
        b.purpose,
        b.charger,
        b.create_time,
        a.*
        from
        ja_fw_device_maintain_plan a
@@ -58,6 +60,7 @@
            b.source,
            b.purpose,
            b.charger,
            b.create_time,
            a.*
        from
            ja_fw_device_maintain_plan a

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

@@ -19,6 +19,7 @@
        <result column="source" property="source"/>
        <result column="purpose" property="purpose"/>
        <result column="charger" property="charger"/>
        <result column="create_time" property="createTime"/>
    </resultMap>

    <select id="getFwDeviceScrapById" resultMap="fwDeviceScrapResultMap">
@@ -33,6 +34,7 @@
        b.source,
        b.purpose,
        b.charger,
        b.create_time,
        a.*
        from
        ja_fw_device_scrap a
@@ -58,6 +60,7 @@
        b.source,
        b.purpose,
        b.charger,
        b.create_time,
        a.*
        from
        ja_fw_device_scrap a

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java

@@ -21,6 +21,7 @@
import org.sxkj.system.cache.SysCache;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

/**
@@ -114,6 +115,9 @@
    @ApiModelProperty(value = "负责人")
    private String charger;

    @ApiModelProperty("入库时间")
    private Date createTime;

    @ApiModelProperty(value = "所属部门名称")
    public String getBelongDeptName() {
        if (belongDept == null) {
@@ -121,6 +125,5 @@
        }
        return SysCache.getDeptName(belongDept);
    }


}

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceScrapVO.java

@@ -122,6 +122,9 @@
    @ApiModelProperty(value = "负责人")
    private String charger;

    @ApiModelProperty("入库时间")
    private Date createTime;

    @ApiModelProperty(value = "所属部门名称")
    public String getBelongDeptName() {
        if (belongDept == null) {