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

+package com.skua.modules.ajh.controller;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.skua.core.api.vo.Result;
+import com.skua.core.aspect.annotation.AutoLog;
+import com.skua.core.query.QueryGenerator;
+import com.skua.core.util.ConvertUtils;
+import com.skua.modules.ajh.entity.AjhEduTrainingRecord;
+import com.skua.modules.ajh.service.IAjhEduTrainingRecordService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.skua.modules.biz.IBusinessService;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * <pre>
+ * 培训记录补录
+ * </pre>
+ *
+ * @author 开发者姓名
+ * @version V0.1, 开发时间
+ */
+@Slf4j
+@Api(tags = "培训记录补录")
+@RestController
+@RequestMapping("/ajh/ajhEduTrainingRecord")
+public class AjhEduTrainingRecordController {
+    @Autowired
+    private IAjhEduTrainingRecordService ajhEduTrainingRecordService;
+    @Autowired
+    private IBusinessService businessService;
+
+    /**
+     * <pre>
+     * 	分页列表查询
+     * </pre>
+     *
+     * @param ajhEduTrainingRecord
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+
+    @AutoLog(value = "培训记录补录-分页列表查询")
+    @ApiOperation(value = "培训记录补录-分页列表查询", notes = "培训记录补录-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<Object> queryPageList(AjhEduTrainingRecord ajhEduTrainingRecord,
+                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                        HttpServletRequest req) {
+        Result<Object> result = new Result<>();
+        QueryWrapper<AjhEduTrainingRecord> queryWrapper = QueryGenerator.initQueryWrapper(ajhEduTrainingRecord, req.getParameterMap());
+        Page<AjhEduTrainingRecord> page = new Page<>(pageNo, pageSize);
+        IPage<AjhEduTrainingRecord> pageList = ajhEduTrainingRecordService.page(page, queryWrapper);
+        // 翻译
+        Map<String, String> sysUserDictMap = businessService.dictMap("sys_user", null);
+        Map<String, String> eduTraLxDictMap = businessService.dictMap("edu_tra_lx", null);
+        // 封装结果
+        IPage<Map<String, Object>> mapIPage = new Page<>(pageNo, pageSize);
+        mapIPage.setTotal(pageList.getTotal());
+        mapIPage.setRecords(pageList.getRecords().stream().map(item -> {
+            Map<String, Object> map = BeanUtil.beanToMap(item);
+            List<String> joinUserNameList = new ArrayList<>();
+            if (item.getJoinUser() != null) {
+                String[] joinUserIds = item.getJoinUser().split(",");
+                for (String userId : joinUserIds) {
+                    String userName = sysUserDictMap.get(userId);
+                    if (userName != null) {
+                        joinUserNameList.add(userName);
+                    }
+                }
+            }
+            map.put("joinUser_dictText", String.join(",", joinUserNameList));
+            map.put("eduTraLx_dictText", eduTraLxDictMap.get(item.getEduTraLx()));
+            return map;
+        }).collect(Collectors.toList()));
+        result.setSuccess(true);
+        result.setResult(mapIPage);
+        return result;
+    }
+
+    /**
+     * <pre>
+     * 	添加
+     * </pre>
+     *
+     * @param ajhEduTrainingRecord
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @AutoLog(value = "培训记录补录-添加")
+    @ApiOperation(value = "培训记录补录-添加", notes = "培训记录补录-添加")
+    @PostMapping(value = "/add")
+    public Result<AjhEduTrainingRecord> add(@RequestBody AjhEduTrainingRecord ajhEduTrainingRecord) {
+        Result<AjhEduTrainingRecord> result = new Result<AjhEduTrainingRecord>();
+        try {
+            ajhEduTrainingRecordService.save(ajhEduTrainingRecord);
+            result.success("添加成功！");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * <pre>
+     * 	 编辑
+     * </pre>
+     *
+     * @param ajhEduTrainingRecord
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @AutoLog(value = "培训记录补录-编辑")
+    @ApiOperation(value = "培训记录补录-编辑", notes = "培训记录补录-编辑")
+    @PutMapping(value = "/edit")
+    public Result<AjhEduTrainingRecord> edit(@RequestBody AjhEduTrainingRecord ajhEduTrainingRecord) {
+        Result<AjhEduTrainingRecord> result = new Result<AjhEduTrainingRecord>();
+        AjhEduTrainingRecord ajhEduTrainingRecordEntity = ajhEduTrainingRecordService.getById(ajhEduTrainingRecord.getId());
+        if (ajhEduTrainingRecordEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = ajhEduTrainingRecordService.updateById(ajhEduTrainingRecord);
+            //TODO 返回false说明什么？
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * <pre>
+     * 	 通过id删除
+     * </pre>
+     *
+     * @param id
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @AutoLog(value = "培训记录补录-通过id删除")
+    @ApiOperation(value = "培训记录补录-通过id删除", notes = "培训记录补录-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            ajhEduTrainingRecordService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * <pre>
+     * 	  批量删除
+     * </pre>
+     *
+     * @param ids
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @AutoLog(value = "培训记录补录-批量删除")
+    @ApiOperation(value = "培训记录补录-批量删除", notes = "培训记录补录-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<AjhEduTrainingRecord> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<AjhEduTrainingRecord> result = new Result<AjhEduTrainingRecord>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别！");
+        } else {
+            this.ajhEduTrainingRecordService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * <pre>
+     * 	 通过id查询
+     * </pre>
+     *
+     * @param id
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @AutoLog(value = "培训记录补录-通过id查询")
+    @ApiOperation(value = "培训记录补录-通过id查询", notes = "培训记录补录-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<AjhEduTrainingRecord> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<AjhEduTrainingRecord> result = new Result<AjhEduTrainingRecord>();
+        AjhEduTrainingRecord ajhEduTrainingRecord = ajhEduTrainingRecordService.getById(id);
+        if (ajhEduTrainingRecord == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(ajhEduTrainingRecord);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * <pre>
+     * 	 导出excel
+     * </pre>
+     *
+     * @param request
+     * @param response
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<AjhEduTrainingRecord> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (ConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                AjhEduTrainingRecord ajhEduTrainingRecord = JSON.parseObject(deString, AjhEduTrainingRecord.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(ajhEduTrainingRecord, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<AjhEduTrainingRecord> pageList = ajhEduTrainingRecordService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "培训记录补录列表");
+        mv.addObject(NormalExcelConstants.CLASS, AjhEduTrainingRecord.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("培训记录补录列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * <pre>
+     * 	 通过excel导入数据
+     * </pre>
+     *
+     * @param request
+     * @param response
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();// 获取上传文件对象
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<AjhEduTrainingRecord> listAjhEduTrainingRecords = ExcelImportUtil.importExcel(file.getInputStream(), AjhEduTrainingRecord.class, params);
+                ajhEduTrainingRecordService.saveBatch(listAjhEduTrainingRecords);
+                return Result.ok("文件导入成功！数据行数:" + listAjhEduTrainingRecords.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败！");
+    }
+
+}

+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.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.skua.core.api.vo.Result;
+import com.skua.core.aspect.annotation.AutoLog;
+import com.skua.core.context.BaseContextHandler;
+import com.skua.core.query.QueryGenerator;
+import com.skua.core.service.ISequenceService;
+import com.skua.core.util.ConvertUtils;
+import com.skua.modules.biz.IBusinessService;
+import com.skua.modules.safe.dto.SafetyEnvironmentFeeDTO;
+import com.skua.modules.safe.entity.SafetyEnvironmentFee;
+import com.skua.modules.safe.service.ISafetyEnvironmentFeeService;
+
+import java.util.Date;
+import java.util.stream.Collectors;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.lang3.StringUtils;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * <pre>
+ * 安全环保费用
+ * </pre>
+ *
+ * @author 开发者姓名
+ * @version V0.1, 开发时间
+ */
+@Slf4j
+@Api(tags = "安全环保费用")
+@RestController
+@RequestMapping("/safe/safetyEnvironmentFee")
+public class SafetyEnvironmentFeeController {
+    @Autowired
+    private ISafetyEnvironmentFeeService safetyEnvironmentFeeService;
+    @Autowired
+    private IBusinessService businessService;
+
+    /**
+     * <pre>
+     * 	分页列表查询
+     * </pre>
+     *
+     * @param safetyEnvironmentFee
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+
+    @AutoLog(value = "安全环保费用-分页列表查询")
+    @ApiOperation(value = "安全环保费用-分页列表查询", notes = "安全环保费用-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<SafetyEnvironmentFee>> queryPageList(SafetyEnvironmentFee safetyEnvironmentFee,
+                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                             HttpServletRequest req) {
+        Result<IPage<SafetyEnvironmentFee>> result = new Result<IPage<SafetyEnvironmentFee>>();
+        QueryWrapper<SafetyEnvironmentFee> queryWrapper = QueryGenerator.initQueryWrapper(safetyEnvironmentFee, req.getParameterMap());
+        Page<SafetyEnvironmentFee> page = new Page<SafetyEnvironmentFee>(pageNo, pageSize);
+        IPage<SafetyEnvironmentFee> pageList = safetyEnvironmentFeeService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    @GetMapping(value = "/query/{type}")
+    public Result<Object> queryTypeCtrl(@PathVariable String type, SafetyEnvironmentFeeDTO safetyEnvironmentFeeDTO) {
+        Result<Object> result = new Result<>();
+        // 请求参数
+        String departId = safetyEnvironmentFeeDTO.getDepartId();
+        String feeDict = safetyEnvironmentFeeDTO.getFeeDict();
+        String feeType = safetyEnvironmentFeeDTO.getFeeType();
+        String startTime = safetyEnvironmentFeeDTO.getStartTime();
+        String endTime = safetyEnvironmentFeeDTO.getEndTime();
+        Long pageNo = safetyEnvironmentFeeDTO.getPageNo();
+        Long pageSize = safetyEnvironmentFeeDTO.getPageSize();
+        if (StringUtils.isEmpty(feeDict)) {
+            return Result.error("费用字典不能为空");
+        }
+        // 查询条件
+        QueryWrapper<SafetyEnvironmentFee> queryWrapper0 = new QueryWrapper<>();
+        queryWrapper0.eq(StringUtils.isNotEmpty(departId), "depart_id", departId)
+                .eq("fee_dict", feeDict)
+                .eq(StringUtils.isNotEmpty(feeType), "fee_type", feeType)
+                .ge(StringUtils.isNotEmpty(startTime), "fee_time", startTime)
+                .le(StringUtils.isNotEmpty(endTime), "fee_time", endTime);
+        if ("page".equals(type)) {
+            IPage<SafetyEnvironmentFee> safetyEnvironmentFeeIPage = safetyEnvironmentFeeService.page(new Page<>(pageNo, pageSize), queryWrapper0);
+            // 翻译
+            Map<String, String> sysDepartDictMap = businessService.dictMap("sys_depart", null);
+            Map<String, String> safetyEnvironmentProtectionFeeDictMap = businessService.dictMap("safety_environment_protection_fee", null);
+            Map<String, String> energyEnvironmentProtectionFeeDictMap = businessService.dictMap("energy_environment_protection_fee", null);
+            // 封装结果
+            IPage<Map<String, Object>> mapIPage = new Page<>(pageNo, pageSize);
+            mapIPage.setTotal(safetyEnvironmentFeeIPage.getTotal());
+            mapIPage.setRecords(safetyEnvironmentFeeIPage.getRecords().stream().map(item -> {
+                Map<String, Object> entityMap = BeanUtil.beanToMap(item);
+                entityMap.put("departName", sysDepartDictMap.get(item.getDepartId()));
+                // 安全环保费
+                if ("1".equals(feeDict)) {
+                    entityMap.put("feeType_dictText", safetyEnvironmentProtectionFeeDictMap.get(item.getFeeType()));
+                } else if ("2".equals(feeDict)) {
+                    // 节能环保费
+                    entityMap.put("feeType_dictText", energyEnvironmentProtectionFeeDictMap.get(item.getFeeType()));
+                }
+                return entityMap;
+            }).collect(Collectors.toList()));
+            result.setResult(mapIPage);
+        } else if ("statistics".equals(type)) {
+            queryWrapper0.select("sum(fee_value) as feeValueSum");
+            Map<String, Object> queryMap0 = safetyEnvironmentFeeService.getMap(queryWrapper0);
+            result.setResult(queryMap0);
+        }
+        return result;
+    }
+
+    /**
+     * <pre>
+     * 	添加
+     * </pre>
+     *
+     * @param safetyEnvironmentFee
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @AutoLog(value = "安全环保费用-添加")
+    @ApiOperation(value = "安全环保费用-添加", notes = "安全环保费用-添加")
+    @PostMapping(value = "/add")
+    public Result<SafetyEnvironmentFee> add(@RequestBody SafetyEnvironmentFee safetyEnvironmentFee) {
+        Result<SafetyEnvironmentFee> result = new Result<SafetyEnvironmentFee>();
+        try {
+            safetyEnvironmentFeeService.save(safetyEnvironmentFee);
+            result.success("添加成功！");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * <pre>
+     * 	 编辑
+     * </pre>
+     *
+     * @param safetyEnvironmentFee
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @AutoLog(value = "安全环保费用-编辑")
+    @ApiOperation(value = "安全环保费用-编辑", notes = "安全环保费用-编辑")
+    @PutMapping(value = "/edit")
+    public Result<SafetyEnvironmentFee> edit(@RequestBody SafetyEnvironmentFee safetyEnvironmentFee) {
+        Result<SafetyEnvironmentFee> result = new Result<SafetyEnvironmentFee>();
+        SafetyEnvironmentFee safetyEnvironmentFeeEntity = safetyEnvironmentFeeService.getById(safetyEnvironmentFee.getId());
+        if (safetyEnvironmentFeeEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = safetyEnvironmentFeeService.updateById(safetyEnvironmentFee);
+            //TODO 返回false说明什么？
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * <pre>
+     * 	 通过id删除
+     * </pre>
+     *
+     * @param id
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @AutoLog(value = "安全环保费用-通过id删除")
+    @ApiOperation(value = "安全环保费用-通过id删除", notes = "安全环保费用-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            safetyEnvironmentFeeService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * <pre>
+     * 	  批量删除
+     * </pre>
+     *
+     * @param ids
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @AutoLog(value = "安全环保费用-批量删除")
+    @ApiOperation(value = "安全环保费用-批量删除", notes = "安全环保费用-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<SafetyEnvironmentFee> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<SafetyEnvironmentFee> result = new Result<SafetyEnvironmentFee>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别！");
+        } else {
+            this.safetyEnvironmentFeeService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * <pre>
+     * 	 通过id查询
+     * </pre>
+     *
+     * @param id
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @AutoLog(value = "安全环保费用-通过id查询")
+    @ApiOperation(value = "安全环保费用-通过id查询", notes = "安全环保费用-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<SafetyEnvironmentFee> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<SafetyEnvironmentFee> result = new Result<SafetyEnvironmentFee>();
+        SafetyEnvironmentFee safetyEnvironmentFee = safetyEnvironmentFeeService.getById(id);
+        if (safetyEnvironmentFee == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(safetyEnvironmentFee);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * <pre>
+     * 	 导出excel
+     * </pre>
+     *
+     * @param request
+     * @param response
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<SafetyEnvironmentFee> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (ConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                SafetyEnvironmentFee safetyEnvironmentFee = JSON.parseObject(deString, SafetyEnvironmentFee.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(safetyEnvironmentFee, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<SafetyEnvironmentFee> pageList = safetyEnvironmentFeeService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "安全环保费用列表");
+        mv.addObject(NormalExcelConstants.CLASS, SafetyEnvironmentFee.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("安全环保费用列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * <pre>
+     * 	 通过excel导入数据
+     * </pre>
+     *
+     * @param request
+     * @param response
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();// 获取上传文件对象
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<SafetyEnvironmentFee> listSafetyEnvironmentFees = ExcelImportUtil.importExcel(file.getInputStream(), SafetyEnvironmentFee.class, params);
+                safetyEnvironmentFeeService.saveBatch(listSafetyEnvironmentFees);
+                return Result.ok("文件导入成功！数据行数:" + listSafetyEnvironmentFees.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败！");
+    }
+
+}

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

@@ -22,7 +22,7 @@
             emt.real_start_time AS realStartTime,
             emt.real_start_time AS realStartTime,
             emt.real_end_time AS realEndTime,
             emt.real_end_time AS realEndTime,
             emt.working_hours AS workingHours,
             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.picture_url AS pictureUrl,
             emt.equipment_id AS equipmentId,
             emt.equipment_id AS equipmentId,
             emt.results_enforcement AS resultsEnforcement,
             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.safe.mapper.DangerLevelManageShareMapper.selectPage".equals(sqlId)
                     || "com.skua.modules.edu.mapper.QuestionMapper.selectQuestionList".equals(sqlId)//试题列表
                     || "com.skua.modules.edu.mapper.QuestionMapper.selectQuestionList".equals(sqlId)//试题列表
                     || "com.skua.modules.edu.mapper.QuestionMapper.queryPageList".equals(sqlId)//试题分页
                     || "com.skua.modules.edu.mapper.QuestionMapper.queryPageList".equals(sqlId)//试题分页
+                    || "com.skua.modules.safe.mapper.SafetyEnvironmentFeeMapper.selectPage".equals(sqlId)//安全环保费
             ) {
             ) {
                 log.debug("************************------sqlId------**************************" + sqlId);
                 log.debug("************************------sqlId------**************************" + sqlId);
                 return invocation.proceed();
                 return invocation.proceed();