diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java index 6cee5bf..4589f86 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java @@ -382,4 +382,7 @@ public class DevInfo extends BaseEntity { @ApiModelProperty(value = "检验有效状态") private String verifyStatus; + @ApiModelProperty(value = "类型等级 存入字符串") + private String levelType; + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java index f71b250..87399c3 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java @@ -183,4 +183,5 @@ public class DevInfoVo extends DevInfo { @ApiModelProperty(value = "设备类型级别") private Integer typeLevel; + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java index d00d15b..58c5fd0 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java @@ -356,6 +356,7 @@ public class DevInfoServiceImpl implements DevInfoService { bmFileInfo.setFileType(0L); List mainFileInfoList = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo); if (!CollectionUtils.isEmpty(mainFileInfoList)) { + devInfoVo.setMainFileList(mainFileInfoList); devInfoVo.setPicUrl(mainFileInfoList.get(0).getFileUrl()); } } @@ -408,18 +409,15 @@ public class DevInfoServiceImpl implements DevInfoService { return AjaxResult.error("详情页展示图不能为空"); } } - String code = ""; for (int i = 0; i < devInfo.getTableList().size(); i++) { //获取用户信息 Long userId = SecurityUtils.getLoginUser().getUserid(); //保存用户信息 - devInfo.setCreator(userId) - /*.setMaStatus(ON_HIRE.getCode())*/ - .setOwnId(userId); - if (org.apache.commons.lang3.StringUtils.isBlank(code)) { - code = getString(); - } - devInfo.setCode(code); + devInfo.setCreator(userId).setOwnId(userId); +// if (org.apache.commons.lang3.StringUtils.isBlank(code)) { +// code = getString(); +// } +// devInfo.setCode(code); devInfo.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId().toString()); devInfo.setDeviceCount(devInfo.getDeviceCount()); devInfo.setIdentifyCode(devInfo.getTableList().get(i).getIdentifyCode()); @@ -428,7 +426,6 @@ public class DevInfoServiceImpl implements DevInfoService { return AjaxResult.error("设备信息SQL保存失败，请修改后重试"); } devInfoMapper.updateTypeLeasePrice(devInfo); - code = ""; //保存自定义属性值 if (!CollectionUtils.isEmpty(devInfo.getDevInfoProperties())) { devInfoMapper.insertDevInfoProperties(devInfo.getMaId(), devInfo.getDevInfoProperties()); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index 972fefe..f8a7330 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ma_id, device_name, device_weight, device_count, code, identify_code, type_id, ma_status, lease_scope, location, province_id, city_id, area_id, brand, model_name, production_date, working_hours, serial_number, - pic_url, js_month_price, js_day_price, description, gps_code, own_co, create_time, + pic_url, js_month_price, js_day_price, description, gps_code, own_co, create_time, level_type, creator, update_time, person, person_phone, update_by, specification, deposit, is_operator, is_active, update_time, update_by from ma_dev_info @@ -73,6 +73,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.create_time as createTime, d.update_time as updateTime, d.own_co as companyId, + d.purchaseSource, + d.assetValue, + d.profession, + d.main_process AS mainProcess, + d.sub_process as subProcess, + d.level_type as levelType, sd.dept_name as companyName, c.operate_address as operateAddress, mt3.type_id as thirdId, @@ -266,6 +272,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.profession as profession, d.main_process as mainProcess, d.sub_process as subProcess, + d.level_type as levelType, mt4.level as typeLevel, CASE WHEN check_date IS NULL THEN '未设置检验日期' @@ -319,6 +326,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" own_co, person, person_phone, + level_type assetValue, purchaseSource, create_time, @@ -366,6 +374,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{companyId}, #{person}, #{personPhone}, + #{levelType} #{assetValue}, #{purchaseSource}, now(), diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml index 9493450..7c53c7a 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml @@ -172,7 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND moi.code = #{code} - AND moi.maId = #{maId} + AND moi.ma_id = #{maId} AND ((hh.rent_begin_time BETWEEN #{startTime} AND #{endTime})