新增设备作业记录表

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceLogController.java

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcDeviceLog;
+import com.ruoyi.oa.service.ICmcDeviceLogService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc仪器记录Controller
+ * 
+ * @author cmc
+ * @date 2025-06-10
+ */
+@RestController
+@RequestMapping("/oa/deviceLog")
+public class CmcDeviceLogController extends BaseController
+{
+    @Autowired
+    private ICmcDeviceLogService cmcDeviceLogService;
+
+    /**
+     * 查询cmc仪器记录列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcDeviceLog cmcDeviceLog)
+    {
+        startPage();
+        List<CmcDeviceLog> list = cmcDeviceLogService.selectCmcDeviceLogList(cmcDeviceLog);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc仪器记录列表
+     */
+    @Log(title = "cmc仪器记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcDeviceLog cmcDeviceLog)
+    {
+        List<CmcDeviceLog> list = cmcDeviceLogService.selectCmcDeviceLogList(cmcDeviceLog);
+        ExcelUtil<CmcDeviceLog> util = new ExcelUtil<CmcDeviceLog>(CmcDeviceLog.class);
+        util.exportExcel(response, list, "cmc仪器记录数据");
+    }
+
+    /**
+     * 获取cmc仪器记录详细信息
+     */
+    @GetMapping(value = "/{logId}")
+    public AjaxResult getInfo(@PathVariable("logId") Integer logId)
+    {
+        return success(cmcDeviceLogService.selectCmcDeviceLogByLogId(logId));
+    }
+
+    /**
+     * 新增cmc仪器记录
+     */
+    @Log(title = "cmc仪器记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcDeviceLog cmcDeviceLog)
+    {
+        return toAjax(cmcDeviceLogService.insertCmcDeviceLog(cmcDeviceLog));
+    }
+
+    /**
+     * 修改cmc仪器记录
+     */
+    @Log(title = "cmc仪器记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcDeviceLog cmcDeviceLog)
+    {
+        return toAjax(cmcDeviceLogService.updateCmcDeviceLog(cmcDeviceLog));
+    }
+
+    /**
+     * 删除cmc仪器记录
+     */
+    @Log(title = "cmc仪器记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{logIds}")
+    public AjaxResult remove(@PathVariable Integer[] logIds)
+    {
+        return success(cmcDeviceLogService.deleteCmcDeviceLogByLogIds(logIds));
+    }
+}

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

@@ -35,7 +35,6 @@ public class CmcDeviceApproval extends BaseEntity
     private Long useDept;
 
     /** 项目id */
-    @Excel(name = "项目id")
     private String projectId;
     @Excel(name = "项目编号")
     private String projectNumber;

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

@@ -0,0 +1,281 @@
+package com.ruoyi.oa.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cmc仪器记录对象 cmc_device_log
+ * 
+ * @author cmc
+ * @date 2025-06-10
+ */
+public class CmcDeviceLog extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 使用记录id */
+    private Integer logId;
+
+    /** 设备id */
+    @Excel(name = "设备编码")
+    private String deviceNumber;
+    @Excel(name = "设备名称")
+    private String name;
+    @Excel(name = "出厂编号")
+    private String code;
+    @Excel(name = "品牌")
+    private String brand;
+    @Excel(name = "系列")
+    private String series;
+    private Integer deviceId;
+
+    /** 项目id */
+    @Excel(name = "项目编号")
+    private String projectNumber;
+    @Excel(name = "项目名称")
+    private String projectName;
+    private String projectId;
+
+    /** 用途类型 */
+    @Excel(name = "用途类型")
+    private String usageType;
+
+    /** 使用日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "使用日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date useDate;
+
+    /** 天气 */
+    @Excel(name = "天气")
+    private String weather;
+
+    /** 点号 */
+    @Excel(name = "点号")
+    private String position;
+
+    /** 高值类型 */
+    @Excel(name = "高值类型")
+    private String heightType;
+
+    /** 干温 */
+    @Excel(name = "干温")
+    private String dryTemperature;
+
+    /** 湿温 */
+    @Excel(name = "湿温")
+    private String wetTemperature;
+
+    /** 气压 */
+    @Excel(name = "气压")
+    private String airPressure;
+
+    /** 开机时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开机时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date powerOn;
+
+    /** 关机时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "关机时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date powerOff;
+
+    /** 记录员 */
+    @Excel(name = "记录员")
+    private String nickName;
+    private Long userId;
+
+    private SysUser user;
+
+    private CmcProject project;
+
+    private CmcDevice device;
+
+    public void setLogId(Integer logId) 
+    {
+        this.logId = logId;
+    }
+
+    public Integer getLogId() 
+    {
+        return logId;
+    }
+    public void setDeviceId(Integer deviceId) 
+    {
+        this.deviceId = deviceId;
+    }
+
+    public Integer getDeviceId() 
+    {
+        return deviceId;
+    }
+    public void setDevice(CmcDevice device)
+    {
+        this.device = device;
+        if (device != null) {
+            this.deviceNumber = device.getDeviceNumber();
+            this.brand = device.getBrand();
+            this.series = device.getSeries();
+            this.name = device.getName();
+            this.code = device.getCode();
+        }
+    }
+
+    public CmcDevice getDevice()
+    {
+        return device;
+    }
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+    public void setProject(CmcProject project)
+    {
+        this.project = project;
+        this.projectNumber = project == null ? "" : project.getProjectNumber();
+        this.projectName = project == null ? "" : project.getProjectName();
+    }
+
+    public CmcProject getProject()
+    {
+        return project;
+    }
+    public void setUsageType(String usageType) 
+    {
+        this.usageType = usageType;
+    }
+
+    public String getUsageType() 
+    {
+        return usageType;
+    }
+    public void setUseDate(Date useDate) 
+    {
+        this.useDate = useDate;
+    }
+
+    public Date getUseDate() 
+    {
+        return useDate;
+    }
+    public void setWeather(String weather) 
+    {
+        this.weather = weather;
+    }
+
+    public String getWeather() 
+    {
+        return weather;
+    }
+    public void setPosition(String position) 
+    {
+        this.position = position;
+    }
+
+    public String getPosition() 
+    {
+        return position;
+    }
+    public void setHeightType(String heightType) 
+    {
+        this.heightType = heightType;
+    }
+
+    public String getHeightType() 
+    {
+        return heightType;
+    }
+    public void setDryTemperature(String dryTemperature) 
+    {
+        this.dryTemperature = dryTemperature;
+    }
+
+    public String getDryTemperature() 
+    {
+        return dryTemperature;
+    }
+    public void setWetTemperature(String wetTemperature) 
+    {
+        this.wetTemperature = wetTemperature;
+    }
+
+    public String getWetTemperature() 
+    {
+        return wetTemperature;
+    }
+    public void setAirPressure(String airPressure) 
+    {
+        this.airPressure = airPressure;
+    }
+
+    public String getAirPressure() 
+    {
+        return airPressure;
+    }
+    public void setPowerOn(Date powerOn) 
+    {
+        this.powerOn = powerOn;
+    }
+
+    public Date getPowerOn() 
+    {
+        return powerOn;
+    }
+    public void setPowerOff(Date powerOff) 
+    {
+        this.powerOff = powerOff;
+    }
+
+    public Date getPowerOff() 
+    {
+        return powerOff;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setUser(SysUser user)
+    {
+        this.user = user;
+        this.nickName = user != null ? user.getNickName() : "";
+    }
+
+    public SysUser getUser()
+    {
+        return user;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("logId", getLogId())
+            .append("deviceId", getDeviceId())
+            .append("projectId", getProjectId())
+            .append("usageType", getUsageType())
+            .append("useDate", getUseDate())
+            .append("weather", getWeather())
+            .append("position", getPosition())
+            .append("heightType", getHeightType())
+            .append("dryTemperature", getDryTemperature())
+            .append("wetTemperature", getWetTemperature())
+            .append("airPressure", getAirPressure())
+            .append("powerOn", getPowerOn())
+            .append("powerOff", getPowerOff())
+            .append("userId", getUserId())
+            .toString();
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcDeviceLogMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcDeviceLog;
+
+/**
+ * cmc仪器记录Mapper接口
+ * 
+ * @author cmc
+ * @date 2025-06-10
+ */
+public interface CmcDeviceLogMapper 
+{
+    /**
+     * 查询cmc仪器记录
+     * 
+     * @param logId cmc仪器记录主键
+     * @return cmc仪器记录
+     */
+    public CmcDeviceLog selectCmcDeviceLogByLogId(Integer logId);
+
+    /**
+     * 查询cmc仪器记录列表
+     * 
+     * @param cmcDeviceLog cmc仪器记录
+     * @return cmc仪器记录集合
+     */
+    public List<CmcDeviceLog> selectCmcDeviceLogList(CmcDeviceLog cmcDeviceLog);
+
+    /**
+     * 新增cmc仪器记录
+     * 
+     * @param cmcDeviceLog cmc仪器记录
+     * @return 结果
+     */
+    public int insertCmcDeviceLog(CmcDeviceLog cmcDeviceLog);
+
+    /**
+     * 修改cmc仪器记录
+     * 
+     * @param cmcDeviceLog cmc仪器记录
+     * @return 结果
+     */
+    public int updateCmcDeviceLog(CmcDeviceLog cmcDeviceLog);
+
+    /**
+     * 删除cmc仪器记录
+     * 
+     * @param logId cmc仪器记录主键
+     * @return 结果
+     */
+    public int deleteCmcDeviceLogByLogId(Integer logId);
+
+    /**
+     * 批量删除cmc仪器记录
+     * 
+     * @param logIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcDeviceLogByLogIds(Integer[] logIds);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcDeviceLogService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcDeviceLog;
+
+/**
+ * cmc仪器记录Service接口
+ * 
+ * @author cmc
+ * @date 2025-06-10
+ */
+public interface ICmcDeviceLogService 
+{
+    /**
+     * 查询cmc仪器记录
+     * 
+     * @param logId cmc仪器记录主键
+     * @return cmc仪器记录
+     */
+    public CmcDeviceLog selectCmcDeviceLogByLogId(Integer logId);
+
+    /**
+     * 查询cmc仪器记录列表
+     * 
+     * @param cmcDeviceLog cmc仪器记录
+     * @return cmc仪器记录集合
+     */
+    public List<CmcDeviceLog> selectCmcDeviceLogList(CmcDeviceLog cmcDeviceLog);
+
+    /**
+     * 新增cmc仪器记录
+     * 
+     * @param cmcDeviceLog cmc仪器记录
+     * @return 结果
+     */
+    public int insertCmcDeviceLog(CmcDeviceLog cmcDeviceLog);
+
+    /**
+     * 修改cmc仪器记录
+     * 
+     * @param cmcDeviceLog cmc仪器记录
+     * @return 结果
+     */
+    public int updateCmcDeviceLog(CmcDeviceLog cmcDeviceLog);
+
+    /**
+     * 批量删除cmc仪器记录
+     * 
+     * @param logIds 需要删除的cmc仪器记录主键集合
+     * @return 结果
+     */
+    public int deleteCmcDeviceLogByLogIds(Integer[] logIds);
+
+    /**
+     * 删除cmc仪器记录信息
+     * 
+     * @param logId cmc仪器记录主键
+     * @return 结果
+     */
+    public int deleteCmcDeviceLogByLogId(Integer logId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcDeviceLogServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcDeviceLogMapper;
+import com.ruoyi.oa.domain.CmcDeviceLog;
+import com.ruoyi.oa.service.ICmcDeviceLogService;
+
+/**
+ * cmc仪器记录Service业务层处理
+ * 
+ * @author cmc
+ * @date 2025-06-10
+ */
+@Service
+public class CmcDeviceLogServiceImpl implements ICmcDeviceLogService 
+{
+    @Autowired
+    private CmcDeviceLogMapper cmcDeviceLogMapper;
+
+    /**
+     * 查询cmc仪器记录
+     * 
+     * @param logId cmc仪器记录主键
+     * @return cmc仪器记录
+     */
+    @Override
+    public CmcDeviceLog selectCmcDeviceLogByLogId(Integer logId)
+    {
+        return cmcDeviceLogMapper.selectCmcDeviceLogByLogId(logId);
+    }
+
+    /**
+     * 查询cmc仪器记录列表
+     * 
+     * @param cmcDeviceLog cmc仪器记录
+     * @return cmc仪器记录
+     */
+    @Override
+    public List<CmcDeviceLog> selectCmcDeviceLogList(CmcDeviceLog cmcDeviceLog)
+    {
+        return cmcDeviceLogMapper.selectCmcDeviceLogList(cmcDeviceLog);
+    }
+
+    /**
+     * 新增cmc仪器记录
+     * 
+     * @param cmcDeviceLog cmc仪器记录
+     * @return 结果
+     */
+    @Override
+    public int insertCmcDeviceLog(CmcDeviceLog cmcDeviceLog)
+    {
+        return cmcDeviceLogMapper.insertCmcDeviceLog(cmcDeviceLog);
+    }
+
+    /**
+     * 修改cmc仪器记录
+     * 
+     * @param cmcDeviceLog cmc仪器记录
+     * @return 结果
+     */
+    @Override
+    public int updateCmcDeviceLog(CmcDeviceLog cmcDeviceLog)
+    {
+        return cmcDeviceLogMapper.updateCmcDeviceLog(cmcDeviceLog);
+    }
+
+    /**
+     * 批量删除cmc仪器记录
+     * 
+     * @param logIds 需要删除的cmc仪器记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcDeviceLogByLogIds(Integer[] logIds)
+    {
+        return cmcDeviceLogMapper.deleteCmcDeviceLogByLogIds(logIds);
+    }
+
+    /**
+     * 删除cmc仪器记录信息
+     * 
+     * @param logId cmc仪器记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcDeviceLogByLogId(Integer logId)
+    {
+        return cmcDeviceLogMapper.deleteCmcDeviceLogByLogId(logId);
+    }
+}

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

@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.oa.mapper.CmcDeviceLogMapper">
+    
+    <resultMap type="CmcDeviceLog" id="CmcDeviceLogResult">
+        <result property="logId"    column="log_id"    />
+        <result property="deviceId"    column="device_id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="usageType"    column="usage_type"    />
+        <result property="useDate"    column="use_date"    />
+        <result property="weather"    column="weather"    />
+        <result property="position"    column="position"    />
+        <result property="heightType"    column="height_type"    />
+        <result property="dryTemperature"    column="dry_temperature"    />
+        <result property="wetTemperature"    column="wet_temperature"    />
+        <result property="airPressure"    column="air_pressure"    />
+        <result property="powerOn"    column="power_on"    />
+        <result property="powerOff"    column="power_off"    />
+        <result property="userId"    column="user_id"    />
+        <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
+        <association property="device"    javaType="CmcDevice"         resultMap="CmcDeviceResult" />
+        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="SysUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="nick_name"    />
+    </resultMap>
+
+    <resultMap type="CmcDevice" id="CmcDeviceResult">
+        <result property="deviceId"    column="device_id"    />
+        <result property="deviceNumber"    column="device_number"    />
+        <result property="code"    column="code"    />
+        <result property="name"    column="name"    />
+        <result property="series"    column="series"    />
+        <result property="brand"    column="brand"    />
+    </resultMap>
+
+    <resultMap type="CmcProject" id="CmcProjectResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
+    </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
+        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
+    </sql>
+
+    <select id="selectCmcDeviceLogList" parameterType="CmcDeviceLog" resultMap="CmcDeviceLogResult">
+        <include refid="selectCmcDeviceLogVo"/>
+        <where>  
+            <if test="deviceId != null "> and dl.device_id = #{deviceId}</if>
+            <if test="projectId != null  and projectId != ''"> and dl.project_id = #{projectId}</if>
+            <if test="usageType != null  and usageType != ''"> and dl.usage_type = #{usageType}</if>
+            <if test="useDate != null "> and dl.use_date = #{useDate}</if>
+            <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="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>
+            <if test="powerOn != null "> and dl.power_on = #{powerOn}</if>
+            <if test="powerOff != null "> and dl.power_off = #{powerOff}</if>
+            <if test="userId != null "> and dl.user_id = #{userId}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcDeviceLogByLogId" parameterType="Integer" resultMap="CmcDeviceLogResult">
+        <include refid="selectCmcDeviceLogVo"/>
+        where log_id = #{logId}
+    </select>
+        
+    <insert id="insertCmcDeviceLog" parameterType="CmcDeviceLog" useGeneratedKeys="true" keyProperty="logId">
+        insert into cmc_device_log
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deviceId != null">device_id,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="usageType != null">usage_type,</if>
+            <if test="useDate != null">use_date,</if>
+            <if test="weather != null">weather,</if>
+            <if test="position != null">position,</if>
+            <if test="heightType != null">height_type,</if>
+            <if test="dryTemperature != null">dry_temperature,</if>
+            <if test="wetTemperature != null">wet_temperature,</if>
+            <if test="airPressure != null">air_pressure,</if>
+            <if test="powerOn != null">power_on,</if>
+            <if test="powerOff != null">power_off,</if>
+            <if test="userId != null">user_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deviceId != null">#{deviceId},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="usageType != null">#{usageType},</if>
+            <if test="useDate != null">#{useDate},</if>
+            <if test="weather != null">#{weather},</if>
+            <if test="position != null">#{position},</if>
+            <if test="heightType != null">#{heightType},</if>
+            <if test="dryTemperature != null">#{dryTemperature},</if>
+            <if test="wetTemperature != null">#{wetTemperature},</if>
+            <if test="airPressure != null">#{airPressure},</if>
+            <if test="powerOn != null">#{powerOn},</if>
+            <if test="powerOff != null">#{powerOff},</if>
+            <if test="userId != null">#{userId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcDeviceLog" parameterType="CmcDeviceLog">
+        update cmc_device_log
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceId != null">device_id = #{deviceId},</if>
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="usageType != null">usage_type = #{usageType},</if>
+            <if test="useDate != null">use_date = #{useDate},</if>
+            <if test="weather != null">weather = #{weather},</if>
+            <if test="position != null">position = #{position},</if>
+            <if test="heightType != null">height_type = #{heightType},</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>
+            <if test="powerOn != null">power_on = #{powerOn},</if>
+            <if test="powerOff != null">power_off = #{powerOff},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+        </trim>
+        where log_id = #{logId}
+    </update>
+
+    <delete id="deleteCmcDeviceLogByLogId" parameterType="Integer">
+        delete from cmc_device_log where log_id = #{logId}
+    </delete>
+
+    <delete id="deleteCmcDeviceLogByLogIds" parameterType="String">
+        delete from cmc_device_log where log_id in 
+        <foreach item="logId" collection="array" open="(" separator="," close=")">
+            #{logId}
+        </foreach>
+    </delete>
+</mapper>

oa-back/sql/sq.sql

@@ -1,19 +1,21 @@
-DROP TABLE IF EXISTS `cmc_performance_staff`;
-CREATE TABLE `cmc_performance_staff`  (
-  `performance_staff_id` int NOT NULL AUTO_INCREMENT COMMENT '员工绩效id',
-  `performance_id` char(19)DEFAULT NULL COMMENT '绩效审批id',
-  `project_id` char(19)DEFAULT NULL COMMENT '项目id',
-  `user_id` bigint NULL COMMENT '员工id',
-  `work_type` char(2)DEFAULT NULL COMMENT '作业类别',
-  `content` varchar(255)DEFAULT NULL COMMENT '工作内容',
-  `scale_grade` varchar(20)DEFAULT NULL COMMENT '比例尺',
-  `workload` double NULL COMMENT '工作量',
-  `unit` varchar(10)DEFAULT NULL COMMENT '单位',
-  `price` decimal(10, 2)NULL COMMENT '单价',
-  `coefficient` double NULL COMMENT '系数',
-  `manage_performance` decimal(10, 2)NULL COMMENT '管理绩效',
-  `produce_performance` decimal(10, 2)NULL COMMENT '生产绩效',
-  `performance_month` date NULL COMMENT '月份',
-  `remark` varchar(255)DEFAULT NULL COMMENT '备注',
-  PRIMARY KEY (`performance_staff_id`) USING BTREE
-) ENGINE = InnoDB comment 'cmc员工绩效表'; 
+DROP TABLE IF EXISTS `cmc_device_log`;
+CREATE TABLE `cmc_device_log`  (
+  `log_id` int NOT NULL AUTO_INCREMENT COMMENT '使用记录id',
+  `device_id` int DEFAULT NULL COMMENT '设备id',
+  `project_id` char(19) DEFAULT NULL COMMENT '项目id',
+  `usage_type` varchar(10) DEFAULT NULL COMMENT '用途类型',
+  `use_date` datetime DEFAULT NULL COMMENT '使用日期',
+  `weather` varchar(5) DEFAULT NULL COMMENT '天气',
+  `position` varchar(30) DEFAULT NULL COMMENT '点号',
+  `height_type` varchar(10) DEFAULT NULL COMMENT '高值类型',
+  `dry_temperature` varchar(5) DEFAULT NULL COMMENT '干温',
+  `wet_temperature` varchar(5) DEFAULT NULL COMMENT '湿温',
+  `air_pressure` varchar(10) DEFAULT NULL COMMENT '气压',
+  `power_on` datetime DEFAULT NULL COMMENT '开机时间',
+  `power_off` datetime DEFAULT NULL COMMENT '关机时间',
+  `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_role_menu` values (2,176);
+INSERT INTO `cmc_oa`.`sys_role_menu` values (2,8);

oa-ui/src/api/oa/device/deviceLog.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc仪器记录列表
+export function listDeviceLog(query) {
+  return request({
+    url: '/oa/deviceLog/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc仪器记录详细
+export function getDeviceLog(logId) {
+  return request({
+    url: '/oa/deviceLog/' + logId,
+    method: 'get'
+  })
+}
+
+// 新增cmc仪器记录
+export function addDeviceLog(data) {
+  return request({
+    url: '/oa/deviceLog',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc仪器记录
+export function updateDeviceLog(data) {
+  return request({
+    url: '/oa/deviceLog',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc仪器记录
+export function delDeviceLog(logId) {
+  return request({
+    url: '/oa/deviceLog/' + logId,
+    method: 'delete'
+  })
+}

oa-ui/src/views/flowable/form/performance/performanceForm.vue

@@ -569,7 +569,7 @@ export default {
     },
     /* 下载模板 */
     importTemplate() {
-      const path = '/profile/upload/template/绩效模版.xlsx'
+      const path = '/profile/upload/template/performance.xlsx'
       downloadTemplate(path).then(res => {
         const blob = new Blob([res])
         saveAs(blob, '绩效模版.xlsx');

oa-ui/src/views/oa/device/log.vue

@@ -0,0 +1,418 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="设备id" prop="deviceId">
+        <el-input
+          v-model="queryParams.deviceId"
+          placeholder="请输入设备id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目id" prop="projectId">
+        <el-input
+          v-model="queryParams.projectId"
+          placeholder="请输入项目id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="使用日期" prop="useDate">
+        <el-date-picker clearable
+          v-model="queryParams.useDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择使用日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="天气" prop="weather">
+        <el-input
+          v-model="queryParams.weather"
+          placeholder="请输入天气"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="点号" prop="position">
+        <el-input
+          v-model="queryParams.position"
+          placeholder="请输入点号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="干温" prop="dryTemperature">
+        <el-input
+          v-model="queryParams.dryTemperature"
+          placeholder="请输入干温"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="湿温" prop="wetTemperature">
+        <el-input
+          v-model="queryParams.wetTemperature"
+          placeholder="请输入湿温"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="气压" prop="airPressure">
+        <el-input
+          v-model="queryParams.airPressure"
+          placeholder="请输入气压"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="开机时间" prop="powerOn">
+        <el-date-picker clearable
+          v-model="queryParams.powerOn"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择开机时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="关机时间" prop="powerOff">
+        <el-date-picker clearable
+          v-model="queryParams.powerOff"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择关机时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="记录员" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入记录员"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oa:deviceLog:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['oa:deviceLog:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['oa:deviceLog:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['oa:deviceLog:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="deviceLogList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="使用记录id" align="center" prop="logId" />
+      <el-table-column label="设备id" align="center" prop="deviceId" />
+      <el-table-column label="项目id" align="center" prop="projectId" />
+      <el-table-column label="用途类型" align="center" prop="usageType" />
+      <el-table-column label="使用日期" align="center" prop="useDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.useDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="天气" align="center" prop="weather" />
+      <el-table-column label="点号" align="center" prop="position" />
+      <el-table-column label="高值类型" align="center" prop="heightType" />
+      <el-table-column label="干温" align="center" prop="dryTemperature" />
+      <el-table-column label="湿温" align="center" prop="wetTemperature" />
+      <el-table-column label="气压" align="center" prop="airPressure" />
+      <el-table-column label="开机时间" align="center" prop="powerOn" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.powerOn, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="关机时间" align="center" prop="powerOff" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.powerOff, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="记录员" align="center" prop="userId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:deviceLog:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:deviceLog:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改cmc仪器记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="设备id" prop="deviceId">
+          <el-input v-model="form.deviceId" placeholder="请输入设备id" />
+        </el-form-item>
+        <el-form-item label="项目id" prop="projectId">
+          <el-input v-model="form.projectId" placeholder="请输入项目id" />
+        </el-form-item>
+        <el-form-item label="使用日期" prop="useDate">
+          <el-date-picker clearable
+            v-model="form.useDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择使用日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="天气" prop="weather">
+          <el-input v-model="form.weather" placeholder="请输入天气" />
+        </el-form-item>
+        <el-form-item label="点号" prop="position">
+          <el-input v-model="form.position" placeholder="请输入点号" />
+        </el-form-item>
+        <el-form-item label="干温" prop="dryTemperature">
+          <el-input v-model="form.dryTemperature" placeholder="请输入干温" />
+        </el-form-item>
+        <el-form-item label="湿温" prop="wetTemperature">
+          <el-input v-model="form.wetTemperature" placeholder="请输入湿温" />
+        </el-form-item>
+        <el-form-item label="气压" prop="airPressure">
+          <el-input v-model="form.airPressure" placeholder="请输入气压" />
+        </el-form-item>
+        <el-form-item label="开机时间" prop="powerOn">
+          <el-date-picker clearable
+            v-model="form.powerOn"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择开机时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="关机时间" prop="powerOff">
+          <el-date-picker clearable
+            v-model="form.powerOff"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择关机时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="记录员" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入记录员" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDeviceLog, getDeviceLog, delDeviceLog, addDeviceLog, updateDeviceLog } from "@/api/oa/device/deviceLog";
+
+export default {
+  name: "DeviceLog",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc仪器记录表格数据
+      deviceLogList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deviceId: null,
+        projectId: null,
+        usageType: null,
+        useDate: null,
+        weather: null,
+        position: null,
+        heightType: null,
+        dryTemperature: null,
+        wetTemperature: null,
+        airPressure: null,
+        powerOn: null,
+        powerOff: null,
+        userId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc仪器记录列表 */
+    getList() {
+      this.loading = true;
+      listDeviceLog(this.queryParams).then(response => {
+        this.deviceLogList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        logId: null,
+        deviceId: null,
+        projectId: null,
+        usageType: null,
+        useDate: null,
+        weather: null,
+        position: null,
+        heightType: null,
+        dryTemperature: null,
+        wetTemperature: null,
+        airPressure: null,
+        powerOn: null,
+        powerOff: null,
+        userId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.logId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc仪器记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const logId = row.logId || this.ids
+      getDeviceLog(logId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc仪器记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.logId != null) {
+            updateDeviceLog(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDeviceLog(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const logIds = row.logId || this.ids;
+      this.$modal.confirm('是否确认删除cmc仪器记录编号为"' + logIds + '"的数据项？').then(function() {
+        return delDeviceLog(logIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/deviceLog/export', {
+        ...this.queryParams
+      }, `deviceLog_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>