设备作业记录增加字段

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDeviceLog.java

@@ -62,6 +62,10 @@ public class CmcDeviceLog extends BaseEntity
     @Excel(name = "高值类型")
     private String heightType;
 
+    /** 高值 */
+    @Excel(name = "高值")
+    private Double height;
+
     /** 干温 */
     @Excel(name = "干温")
     private String dryTemperature;
@@ -194,6 +198,15 @@ public class CmcDeviceLog extends BaseEntity
     {
         return heightType;
     }
+    public void setHeight(Double height)
+    {
+        this.height = height;
+    }
+
+    public Double getHeight()
+    {
+        return height;
+    }
     public void setDryTemperature(String dryTemperature) 
     {
         this.dryTemperature = dryTemperature;

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceLogMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="weather"    column="weather"    />
         <result property="position"    column="position"    />
         <result property="heightType"    column="height_type"    />
+        <result property="height"    column="height"    />
         <result property="dryTemperature"    column="dry_temperature"    />
         <result property="wetTemperature"    column="wet_temperature"    />
         <result property="airPressure"    column="air_pressure"    />
@@ -45,7 +46,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcDeviceLogVo">
-        select dl.log_id, dl.device_id, dl.project_id, dl.usage_type, dl.use_date, dl.weather, dl.position, dl.height_type, dl.dry_temperature, dl.wet_temperature, dl.air_pressure, dl.power_on, dl.power_off, dl.user_id from cmc_device_log as dl
+        select dl.log_id, dl.device_id, d.device_number, d.code, d.name, d.series, d.brand, dl.project_id, p.project_name, p.project_number, dl.usage_type, dl.use_date,
+               dl.weather, dl.position, dl.height_type, dl.height, dl.dry_temperature, dl.wet_temperature, dl.air_pressure, dl.power_on, dl.power_off, dl.user_id, u.nick_name from cmc_device_log as dl
         left join sys_user as u on u.user_id = dl.user_id
         left join cmc_device as d on d.device_id = dl.device_id
         left join cmc_project as p on p.project_id = dl.project_id
@@ -61,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="weather != null  and weather != ''"> and dl.weather = #{weather}</if>
             <if test="position != null  and position != ''"> and dl.position = #{position}</if>
             <if test="heightType != null  and heightType != ''"> and dl.height_type = #{heightType}</if>
+            <if test="height != null "> and dl.height = #{height}</if>
             <if test="dryTemperature != null  and dryTemperature != ''"> and dl.dry_temperature = #{dryTemperature}</if>
             <if test="wetTemperature != null  and wetTemperature != ''"> and dl.wet_temperature = #{wetTemperature}</if>
             <if test="airPressure != null  and airPressure != ''"> and dl.air_pressure = #{airPressure}</if>
@@ -85,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="weather != null">weather,</if>
             <if test="position != null">position,</if>
             <if test="heightType != null">height_type,</if>
+            <if test="height != null">height,</if>
             <if test="dryTemperature != null">dry_temperature,</if>
             <if test="wetTemperature != null">wet_temperature,</if>
             <if test="airPressure != null">air_pressure,</if>
@@ -100,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="weather != null">#{weather},</if>
             <if test="position != null">#{position},</if>
             <if test="heightType != null">#{heightType},</if>
+            <if test="height != null">#{height},</if>
             <if test="dryTemperature != null">#{dryTemperature},</if>
             <if test="wetTemperature != null">#{wetTemperature},</if>
             <if test="airPressure != null">#{airPressure},</if>
@@ -119,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="weather != null">weather = #{weather},</if>
             <if test="position != null">position = #{position},</if>
             <if test="heightType != null">height_type = #{heightType},</if>
+            <if test="height != null">height = #{height},</if>
             <if test="dryTemperature != null">dry_temperature = #{dryTemperature},</if>
             <if test="wetTemperature != null">wet_temperature = #{wetTemperature},</if>
             <if test="airPressure != null">air_pressure = #{airPressure},</if>

oa-back/sql/sq.sql

@@ -8,6 +8,7 @@ CREATE TABLE `cmc_device_log`  (
   `weather` varchar(5) DEFAULT NULL COMMENT '天气',
   `position` varchar(30) DEFAULT NULL COMMENT '点号',
   `height_type` varchar(10) DEFAULT NULL COMMENT '高值类型',
+  `height` double DEFAULT NULL COMMENT '高值',
   `dry_temperature` varchar(5) DEFAULT NULL COMMENT '干温',
   `wet_temperature` varchar(5) DEFAULT NULL COMMENT '湿温',
   `air_pressure` varchar(10) DEFAULT NULL COMMENT '气压',
@@ -16,6 +17,6 @@ CREATE TABLE `cmc_device_log`  (
   `user_id` bigint DEFAULT NULL COMMENT '记录员',
   PRIMARY KEY (`log_id`)
 ) ENGINE = InnoDB comment 'cmc仪器记录表';
-INSERT INTO `cmc_oa`.`sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (176, '作业记录', 8, 7, 'deviceLog', 'oa/device/log', NULL, 1, 0, 'C', '0', '0', 'oa:deviceLog:list', 'form', 'admin', '2025-06-10 10:30:41', '', NULL, '作业记录菜单');
+INSERT INTO `cmc_oa`.`sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (176, '作业记录', 19, 2, 'deviceLog', 'oa/device/log', NULL, 1, 0, 'C', '0', '0', 'oa:deviceLog:list', 'form', 'admin', '2025-06-10 10:30:41', '', NULL, '作业记录菜单');
 INSERT INTO `cmc_oa`.`sys_role_menu` values (2,176);
-INSERT INTO `cmc_oa`.`sys_role_menu` values (2,8);
+INSERT INTO `cmc_oa`.`sys_role_menu` values (2,19);