邱宇豪
2023-11-01 21db563b4f218e04cdf07ee442af76d929e8da3a
20231101_qiuyh_调整设备信息管理
已修改3个文件
27 ■■■■■ 文件已修改
hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/device/entity/TBigDevice.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/device/service/impl/TBigDeviceServiceImpl.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/engineeringManage/src/main/resources/mapping/TBigDeviceMapper.xml 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/device/entity/TBigDevice.java
@@ -96,7 +96,9 @@
    /**
     * 责任人电话
     */
    @Excel(sort = 22,title = "责任人电话")
    private String zrrPhone;
    @Excel(sort = 21,title = "责任人")
    private String realName;
@@ -260,6 +262,7 @@
    /**
     * 管理员电话
     */
    @Excel(sort = 23,title = "管理员电话")
    private String adminPhone;
}
hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/device/service/impl/TBigDeviceServiceImpl.java
@@ -176,6 +176,23 @@
        String companyId = sysUserInfo.getCompanyId();
        values.put("companyId",companyId);
        List<TBigDevice> tBigDevices = bigDeviceMapper.bigDeviceList(values);
        tBigDevices.forEach(t->{
            if ("1".equals(t.getBigType())){
                t.setBigTypeName("特种设备");
            }else if ("2".equals(t.getBigType())){
                t.setBigTypeName("一般设备");
            }
            if (t.getUseStatus() == 1){
                t.setUseStatusName("良好");
            }else if (t.getUseStatus() == 2){
                t.setUseStatusName("老化");
            }
            if (t.getIsNeed() == 1){
                t.setIsNeedName("是");
            }else if (t.getIsNeed() == 2){
                t.setIsNeedName("否");
            }
        });
        ExcelUtils.downExcel(tBigDevices,TBigDevice.class,response,"设备信息管理");
    }
}
hd/pipe/engineeringManage/src/main/resources/mapping/TBigDeviceMapper.xml
@@ -333,12 +333,17 @@
    tbd.is_need AS isNeed,
    tbd.device_source AS deviceSource,
    tbd.device_nexus AS deviceNexus,
    tbd.fixed_person AS fixedPerson
    spu.real_name AS realName,
    spu.phone AS zrrPhone,
    tbd.fixed_person AS fixedPerson,
    su.real_name AS adminRealName,
    tbd.admin_phone AS adminPhone
    FROM
    t_big_device tbd
    LEFT JOIN sys_dict sd ON tbd.big_type = sd.dict_id
    LEFT JOIN sys_plat_user spu ON tbd.user_id = spu.user_id
    LEFT JOIN sys_supplier ss ON tbd.supplier_id = ss.id
    LEFT JOIN sys_users su ON su.user_id = tbd.create_user
    where tbd.is_use=1
    <if test="bigDeviceName!=null and bigDeviceName!='' ">
        and tbd.big_device_Name like concat('%',#{bigDeviceName},'%')