Merge remote-tracking branch 'origin/master' into master

+package com.skua.modules.ajh.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.skua.core.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 培训记录补录
+ */
+@Data
+@TableName("ajh_edu_training_record")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ajh_edu_training_record对象", description = "培训记录补录")
+public class AjhEduTrainingRecord {
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /**
+     * 培训时间
+     */
+    @Excel(name = "培训时间", width = 15)
+    @ApiModelProperty(value = "培训时间")
+    private String eduTraDate;
+    /**
+     * 培训类型
+     */
+    @Excel(name = "培训类型", width = 15)
+    @ApiModelProperty(value = "培训类型")
+    @Dict(dicCode = "edu_tra_lx")
+    private String eduTraLx;
+    /**
+     * 培训内容
+     */
+    @Excel(name = "培训内容", width = 15)
+    @ApiModelProperty(value = "培训内容")
+    private String eduTraContent;
+    /**
+     * 参与人数
+     */
+    @Excel(name = "参与人数", width = 15)
+    @ApiModelProperty(value = "参与人数")
+    private String joinCount;
+    /**
+     * 参与人员
+     */
+    @Excel(name = "参与人员", width = 15)
+    @ApiModelProperty(value = "参与人员")
+    private String joinUser;
+    /**
+     * 附件
+     */
+    @Excel(name = "附件", width = 15)
+    @ApiModelProperty(value = "附件")
+    private Object attachments;
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remark;
+    /**
+     * 创建人
+     */
+    @Excel(name = "创建人", width = 15)
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建日期
+     */
+    @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @Excel(name = "更新人", width = 15)
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新日期
+     */
+    @Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+    /**
+     * 排序字段
+     */
+    @Excel(name = "排序字段", width = 15)
+    @ApiModelProperty(value = "排序字段")
+    private Integer orderNum;
+    /**
+     * 删除状态(0正常;1已删除)
+     */
+    @Excel(name = "删除状态(0正常;1已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0正常;1已删除)")
+    private String delFlag;
+}

+package com.skua.modules.ajh.mapper;
+
+import com.skua.modules.ajh.entity.AjhEduTrainingRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 培训记录补录
+ */
+public interface AjhEduTrainingRecordMapper extends BaseMapper<AjhEduTrainingRecord> {
+
+}

+<?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.skua.modules.ajh.mapper.AjhEduTrainingRecordMapper">
+
+</mapper>
\ No newline at end of file

+package com.skua.modules.ajh.service;
+
+import com.skua.modules.ajh.entity.AjhEduTrainingRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 培训记录补录
+ */
+public interface IAjhEduTrainingRecordService extends IService<AjhEduTrainingRecord> {
+
+}

+package com.skua.modules.ajh.service.impl;
+
+import com.skua.modules.ajh.entity.AjhEduTrainingRecord;
+import com.skua.modules.ajh.mapper.AjhEduTrainingRecordMapper;
+import com.skua.modules.ajh.service.IAjhEduTrainingRecordService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 培训记录补录
+ */
+@Service
+public class AjhEduTrainingRecordServiceImpl extends ServiceImpl<AjhEduTrainingRecordMapper, AjhEduTrainingRecord> implements IAjhEduTrainingRecordService {
+
+}

+package com.skua.modules.safe.dto;
+
+import com.skua.modules.safe.entity.SafetyEnvironmentFee;
+import lombok.Data;
+
+/**
+ * @Author：sonin
+ * @Date：2025/4/7 11:12
+ */
+@Data
+public class SafetyEnvironmentFeeDTO extends SafetyEnvironmentFee {
+
+    private Long pageNo = 1L;
+
+    private Long pageSize = 10L;
+
+    private String startTime;
+
+    private String endTime;
+}

+package com.skua.modules.safe.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 安全环保费用
+ */
+@Data
+@TableName("safety_environment_fee")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "safety_environment_fee对象", description = "安全环保费用")
+public class SafetyEnvironmentFee {
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /**
+     * 水厂
+     */
+    @Excel(name = "水厂", width = 15)
+    @ApiModelProperty(value = "水厂")
+    private String departId;
+    /**
+     * 费用字典（安全环保费：1、节能环保费：2）
+     */
+    @Excel(name = "费用字典（安全环保费：1、节能环保费：2）", width = 15)
+    @ApiModelProperty(value = "费用字典（安全环保费：1、节能环保费：2）")
+    private String feeDict;
+    /**
+     * 费用类别属性
+     */
+    @Excel(name = "费用类别属性", width = 15)
+    @ApiModelProperty(value = "费用类别属性")
+    private String feeType;
+    /**
+     * 费用名称
+     */
+    @Excel(name = "费用名称", width = 15)
+    @ApiModelProperty(value = "费用名称")
+    private String feeName;
+    /**
+     * 时间（日）
+     */
+    @Excel(name = "时间（日）", width = 15)
+    @ApiModelProperty(value = "时间（日）")
+    private String feeTime;
+    /**
+     * 费用（元）
+     */
+    @Excel(name = "费用（元）", width = 15)
+    @ApiModelProperty(value = "费用（元）")
+    private String feeValue;
+    /**
+     * 是否预算内（是、否）
+     */
+    @Excel(name = "是否预算内（是、否）", width = 15)
+    @ApiModelProperty(value = "是否预算内（是、否）")
+    private String budgetFlag;
+    /**
+     * 用途
+     */
+    @Excel(name = "用途", width = 15)
+    @ApiModelProperty(value = "用途")
+    private String feeUsage;
+    /**
+     * 使用部门
+     */
+    @Excel(name = "使用部门", width = 15)
+    @ApiModelProperty(value = "使用部门")
+    private String useDepartment;
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remark;
+    /**
+     * 创建人
+     */
+    @Excel(name = "创建人", width = 15)
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建日期
+     */
+    @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @Excel(name = "更新人", width = 15)
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新日期
+     */
+    @Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+    /**
+     * 排序字段
+     */
+    @Excel(name = "排序字段", width = 15)
+    @ApiModelProperty(value = "排序字段")
+    private Integer orderNum;
+    /**
+     * 删除状态(0正常;1已删除)
+     */
+    @Excel(name = "删除状态(0正常;1已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0正常;1已删除)")
+    private String delFlag;
+}

+package com.skua.modules.safe.mapper;
+
+import com.skua.modules.safe.entity.SafetyEnvironmentFee;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 安全环保费用
+ */
+public interface SafetyEnvironmentFeeMapper extends BaseMapper<SafetyEnvironmentFee> {
+
+}

+<?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.skua.modules.safe.mapper.SafetyEnvironmentFeeMapper">
+
+</mapper>
\ No newline at end of file

+package com.skua.modules.safe.service;
+
+import com.skua.modules.safe.entity.SafetyEnvironmentFee;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 安全环保费用
+ */
+public interface ISafetyEnvironmentFeeService extends IService<SafetyEnvironmentFee> {
+
+}

+package com.skua.modules.safe.service.impl;
+
+import com.skua.modules.safe.entity.SafetyEnvironmentFee;
+import com.skua.modules.safe.mapper.SafetyEnvironmentFeeMapper;
+import com.skua.modules.safe.service.ISafetyEnvironmentFeeService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 安全环保费用
+ */
+@Service
+public class SafetyEnvironmentFeeServiceImpl extends ServiceImpl<SafetyEnvironmentFeeMapper, SafetyEnvironmentFee> implements ISafetyEnvironmentFeeService {
+
+}

@@ -571,6 +571,7 @@ public class EquipmentController {
         Map<String, String> maintenanceCycleUnitVal2KeyMap = key2ValueService.dictKey2Val("loop_unit", false);
         Map<String, String> installVal2KeyMap = key2ValueService.dictKey2Val("equipment-installWay", false);
         Map<String, String> healthVal2KeyMap = key2ValueService.dictKey2Val("equipment_health_status", false);
+        Map<String, String> sysStructDictMap = key2ValueService.dictKey2Val("sysStructDict", false);
         // 封装结果
         Page<Map<String, Map<String, Object>>> resPage = new Page<>(equipmentDTO.getPageNo(), equipmentDTO.getPageSize());
         resPage.setTotal(mapPage.getTotal());
@@ -604,6 +605,8 @@ public class EquipmentController {
                     resMap.get(keys[0]).put(keys[1] + "_dictText", installVal2KeyMap.get(ConvertUtils.getString(value)));
                 } else if ("equipmentHealthStatus".equals(keys[1])) {
                     resMap.get(keys[0]).put(keys[1] + "_dictText", healthVal2KeyMap.get(ConvertUtils.getString(value)));
+                } else if ("structures".equals(keys[1])) {
+                    resMap.get(keys[0]).put(keys[1] + "_dictText", sysStructDictMap.get(ConvertUtils.getString(value)));
                 }
             }
             resPage.getRecords().add(resMap);

@@ -22,7 +22,7 @@
             emt.real_start_time AS realStartTime,
             emt.real_end_time AS realEndTime,
             emt.working_hours AS workingHours,
-            case when (emt.real_end_time <= emt.end_time and emt.working_hours <= emp.limit_duration) then 1 else 2 end AS complete_tag,
+            case when (emt.real_end_time <= emt.end_time and CAST(emt.working_hours AS DECIMAL(10, 2)) <= CAST(emp.limit_duration AS DECIMAL(10, 2))) then 1 else 2 end AS complete_tag,
             emt.picture_url AS pictureUrl,
             emt.equipment_id AS equipmentId,
             emt.results_enforcement AS resultsEnforcement,

@@ -170,6 +170,7 @@ public class MybatisInterceptor implements Interceptor {
                     || "com.skua.modules.safe.mapper.DangerLevelManageShareMapper.selectPage".equals(sqlId)
                     || "com.skua.modules.edu.mapper.QuestionMapper.selectQuestionList".equals(sqlId)//试题列表
                     || "com.skua.modules.edu.mapper.QuestionMapper.queryPageList".equals(sqlId)//试题分页
+                    || "com.skua.modules.safe.mapper.SafetyEnvironmentFeeMapper.selectPage".equals(sqlId)//安全环保费
             ) {
                 log.debug("************************------sqlId------**************************" + sqlId);
                 return invocation.proceed();