Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
4bf97960 由 张雷
选项

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

2 个父辈 e8716608 07f4477f
全部展开
内嵌 并排
正在显示 16 个修改的文件 包含 363 行增加 和 1 行删除
sk-module-biz/src/main/java/com/skua/modules/ajh/entity/AjhEduTrainingRecord.java 0 → 100644
1 package com.skua.modules.ajh.entity;
2
3 import java.io.Serializable;
4 import java.util.Date;
5
6 import com.baomidou.mybatisplus.annotation.IdType;
7 import com.baomidou.mybatisplus.annotation.TableId;
8 import com.baomidou.mybatisplus.annotation.TableName;
9 import com.baomidou.mybatisplus.annotation.TableField;
10 import com.skua.core.aspect.annotation.Dict;
11 import io.swagger.annotations.ApiModel;
12 import io.swagger.annotations.ApiModelProperty;
13 import lombok.Data;
14 import lombok.EqualsAndHashCode;
15 import lombok.experimental.Accessors;
16 import com.fasterxml.jackson.annotation.JsonFormat;
17 import org.springframework.format.annotation.DateTimeFormat;
18 import org.jeecgframework.poi.excel.annotation.Excel;
19
20 /**
21 * 培训记录补录
22 */
23 @Data
24 @TableName("ajh_edu_training_record")
25 @EqualsAndHashCode(callSuper = false)
26 @Accessors(chain = true)
27 @ApiModel(value = "ajh_edu_training_record对象", description = "培训记录补录")
28 public class AjhEduTrainingRecord {
29
30 /**
31 * 主键
32 */
33 @TableId(type = IdType.ID_WORKER_STR)
34 @ApiModelProperty(value = "主键")
35 private String id;
36 /**
37 * 培训时间
38 */
39 @Excel(name = "培训时间", width = 15)
40 @ApiModelProperty(value = "培训时间")
41 private String eduTraDate;
42 /**
43 * 培训类型
44 */
45 @Excel(name = "培训类型", width = 15)
46 @ApiModelProperty(value = "培训类型")
47 @Dict(dicCode = "edu_tra_lx")
48 private String eduTraLx;
49 /**
50 * 培训内容
51 */
52 @Excel(name = "培训内容", width = 15)
53 @ApiModelProperty(value = "培训内容")
54 private String eduTraContent;
55 /**
56 * 参与人数
57 */
58 @Excel(name = "参与人数", width = 15)
59 @ApiModelProperty(value = "参与人数")
60 private String joinCount;
61 /**
62 * 参与人员
63 */
64 @Excel(name = "参与人员", width = 15)
65 @ApiModelProperty(value = "参与人员")
66 private String joinUser;
67 /**
68 * 附件
69 */
70 @Excel(name = "附件", width = 15)
71 @ApiModelProperty(value = "附件")
72 private Object attachments;
73 /**
74 * 备注
75 */
76 @Excel(name = "备注", width = 15)
77 @ApiModelProperty(value = "备注")
78 private String remark;
79 /**
80 * 创建人
81 */
82 @Excel(name = "创建人", width = 15)
83 @ApiModelProperty(value = "创建人")
84 private String createBy;
85 /**
86 * 创建日期
87 */
88 @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
89 @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
90 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
91 @ApiModelProperty(value = "创建日期")
92 private Date createTime;
93 /**
94 * 更新人
95 */
96 @Excel(name = "更新人", width = 15)
97 @ApiModelProperty(value = "更新人")
98 private String updateBy;
99 /**
100 * 更新日期
101 */
102 @Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
103 @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
104 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
105 @ApiModelProperty(value = "更新日期")
106 private Date updateTime;
107 /**
108 * 排序字段
109 */
110 @Excel(name = "排序字段", width = 15)
111 @ApiModelProperty(value = "排序字段")
112 private Integer orderNum;
113 /**
114 * 删除状态(0正常;1已删除)
115 */
116 @Excel(name = "删除状态(0正常;1已删除)", width = 15)
117 @ApiModelProperty(value = "删除状态(0正常;1已删除)")
118 private String delFlag;
119 }
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/AjhEduTrainingRecordMapper.java 0 → 100644
1 package com.skua.modules.ajh.mapper;
2
3 import com.skua.modules.ajh.entity.AjhEduTrainingRecord;
4 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
6 /**
7 * 培训记录补录
8 */
9 public interface AjhEduTrainingRecordMapper extends BaseMapper<AjhEduTrainingRecord> {
10
11 }
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/xml/AjhEduTrainingRecordMapper.xml 0 → 100644
1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 <mapper namespace="com.skua.modules.ajh.mapper.AjhEduTrainingRecordMapper">
4
5 </mapper>
...\ No newline at end of file ...\ No newline at end of file
sk-module-biz/src/main/java/com/skua/modules/ajh/service/IAjhEduTrainingRecordService.java 0 → 100644
1 package com.skua.modules.ajh.service;
2
3 import com.skua.modules.ajh.entity.AjhEduTrainingRecord;
4 import com.baomidou.mybatisplus.extension.service.IService;
5
6 /**
7 * 培训记录补录
8 */
9 public interface IAjhEduTrainingRecordService extends IService<AjhEduTrainingRecord> {
10
11 }
sk-module-biz/src/main/java/com/skua/modules/ajh/service/impl/AjhEduTrainingRecordServiceImpl.java 0 → 100644
1 package com.skua.modules.ajh.service.impl;
2
3 import com.skua.modules.ajh.entity.AjhEduTrainingRecord;
4 import com.skua.modules.ajh.mapper.AjhEduTrainingRecordMapper;
5 import com.skua.modules.ajh.service.IAjhEduTrainingRecordService;
6 import org.springframework.stereotype.Service;
7
8 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
9
10 /**
11 * 培训记录补录
12 */
13 @Service
14 public class AjhEduTrainingRecordServiceImpl extends ServiceImpl<AjhEduTrainingRecordMapper, AjhEduTrainingRecord> implements IAjhEduTrainingRecordService {
15
16 }
sk-module-biz/src/main/java/com/skua/modules/safe/dto/SafetyEnvironmentFeeDTO.java 0 → 100644
1 package com.skua.modules.safe.dto;
2
3 import com.skua.modules.safe.entity.SafetyEnvironmentFee;
4 import lombok.Data;
5
6 /**
7 * @Author：sonin
8 * @Date：2025/4/7 11:12
9 */
10 @Data
11 public class SafetyEnvironmentFeeDTO extends SafetyEnvironmentFee {
12
13 private Long pageNo = 1L;
14
15 private Long pageSize = 10L;
16
17 private String startTime;
18
19 private String endTime;
20 }
sk-module-biz/src/main/java/com/skua/modules/safe/entity/SafetyEnvironmentFee.java 0 → 100644
1 package com.skua.modules.safe.entity;
2
3 import java.util.Date;
4
5 import com.baomidou.mybatisplus.annotation.IdType;
6 import com.baomidou.mybatisplus.annotation.TableId;
7 import com.baomidou.mybatisplus.annotation.TableName;
8 import io.swagger.annotations.ApiModel;
9 import io.swagger.annotations.ApiModelProperty;
10 import lombok.Data;
11 import lombok.EqualsAndHashCode;
12 import lombok.experimental.Accessors;
13 import com.fasterxml.jackson.annotation.JsonFormat;
14 import org.springframework.format.annotation.DateTimeFormat;
15 import org.jeecgframework.poi.excel.annotation.Excel;
16
17 /**
18 * 安全环保费用
19 */
20 @Data
21 @TableName("safety_environment_fee")
22 @EqualsAndHashCode(callSuper = false)
23 @Accessors(chain = true)
24 @ApiModel(value = "safety_environment_fee对象", description = "安全环保费用")
25 public class SafetyEnvironmentFee {
26
27 /**
28 * 主键
29 */
30 @TableId(type = IdType.ID_WORKER_STR)
31 @ApiModelProperty(value = "主键")
32 private String id;
33 /**
34 * 水厂
35 */
36 @Excel(name = "水厂", width = 15)
37 @ApiModelProperty(value = "水厂")
38 private String departId;
39 /**
40 * 费用字典（安全环保费：1、节能环保费：2）
41 */
42 @Excel(name = "费用字典（安全环保费：1、节能环保费：2）", width = 15)
43 @ApiModelProperty(value = "费用字典（安全环保费：1、节能环保费：2）")
44 private String feeDict;
45 /**
46 * 费用类别属性
47 */
48 @Excel(name = "费用类别属性", width = 15)
49 @ApiModelProperty(value = "费用类别属性")
50 private String feeType;
51 /**
52 * 费用名称
53 */
54 @Excel(name = "费用名称", width = 15)
55 @ApiModelProperty(value = "费用名称")
56 private String feeName;
57 /**
58 * 时间（日）
59 */
60 @Excel(name = "时间（日）", width = 15)
61 @ApiModelProperty(value = "时间（日）")
62 private String feeTime;
63 /**
64 * 费用（元）
65 */
66 @Excel(name = "费用（元）", width = 15)
67 @ApiModelProperty(value = "费用（元）")
68 private String feeValue;
69 /**
70 * 是否预算内（是、否）
71 */
72 @Excel(name = "是否预算内（是、否）", width = 15)
73 @ApiModelProperty(value = "是否预算内（是、否）")
74 private String budgetFlag;
75 /**
76 * 用途
77 */
78 @Excel(name = "用途", width = 15)
79 @ApiModelProperty(value = "用途")
80 private String feeUsage;
81 /**
82 * 使用部门
83 */
84 @Excel(name = "使用部门", width = 15)
85 @ApiModelProperty(value = "使用部门")
86 private String useDepartment;
87 /**
88 * 备注
89 */
90 @Excel(name = "备注", width = 15)
91 @ApiModelProperty(value = "备注")
92 private String remark;
93 /**
94 * 创建人
95 */
96 @Excel(name = "创建人", width = 15)
97 @ApiModelProperty(value = "创建人")
98 private String createBy;
99 /**
100 * 创建日期
101 */
102 @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
103 @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
104 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
105 @ApiModelProperty(value = "创建日期")
106 private Date createTime;
107 /**
108 * 更新人
109 */
110 @Excel(name = "更新人", width = 15)
111 @ApiModelProperty(value = "更新人")
112 private String updateBy;
113 /**
114 * 更新日期
115 */
116 @Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
117 @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
118 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
119 @ApiModelProperty(value = "更新日期")
120 private Date updateTime;
121 /**
122 * 排序字段
123 */
124 @Excel(name = "排序字段", width = 15)
125 @ApiModelProperty(value = "排序字段")
126 private Integer orderNum;
127 /**
128 * 删除状态(0正常;1已删除)
129 */
130 @Excel(name = "删除状态(0正常;1已删除)", width = 15)
131 @ApiModelProperty(value = "删除状态(0正常;1已删除)")
132 private String delFlag;
133 }
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/SafetyEnvironmentFeeMapper.java 0 → 100644
1 package com.skua.modules.safe.mapper;
2
3 import com.skua.modules.safe.entity.SafetyEnvironmentFee;
4 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
6 /**
7 * 安全环保费用
8 */
9 public interface SafetyEnvironmentFeeMapper extends BaseMapper<SafetyEnvironmentFee> {
10
11 }
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/xml/SafetyEnvironmentFeeMapper.xml 0 → 100644
1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 <mapper namespace="com.skua.modules.safe.mapper.SafetyEnvironmentFeeMapper">
4
5 </mapper>
...\ No newline at end of file ...\ No newline at end of file
sk-module-biz/src/main/java/com/skua/modules/safe/service/ISafetyEnvironmentFeeService.java 0 → 100644
1 package com.skua.modules.safe.service;
2
3 import com.skua.modules.safe.entity.SafetyEnvironmentFee;
4 import com.baomidou.mybatisplus.extension.service.IService;
5
6 /**
7 * 安全环保费用
8 */
9 public interface ISafetyEnvironmentFeeService extends IService<SafetyEnvironmentFee> {
10
11 }
sk-module-biz/src/main/java/com/skua/modules/safe/service/impl/SafetyEnvironmentFeeServiceImpl.java 0 → 100644
1 package com.skua.modules.safe.service.impl;
2
3 import com.skua.modules.safe.entity.SafetyEnvironmentFee;
4 import com.skua.modules.safe.mapper.SafetyEnvironmentFeeMapper;
5 import com.skua.modules.safe.service.ISafetyEnvironmentFeeService;
6 import org.springframework.stereotype.Service;
7
8 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
9
10 /**
11 * 安全环保费用
12 */
13 @Service
14 public class SafetyEnvironmentFeeServiceImpl extends ServiceImpl<SafetyEnvironmentFeeMapper, SafetyEnvironmentFee> implements ISafetyEnvironmentFeeService {
15
16 }
sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/EquipmentController.java
...@@ -571,6 +571,7 @@ public class EquipmentController { ...@@ -571,6 +571,7 @@ public class EquipmentController {
571 Map<String, String> maintenanceCycleUnitVal2KeyMap = key2ValueService.dictKey2Val("loop_unit", false); 571 Map<String, String> maintenanceCycleUnitVal2KeyMap = key2ValueService.dictKey2Val("loop_unit", false);
572 Map<String, String> installVal2KeyMap = key2ValueService.dictKey2Val("equipment-installWay", false); 572 Map<String, String> installVal2KeyMap = key2ValueService.dictKey2Val("equipment-installWay", false);
573 Map<String, String> healthVal2KeyMap = key2ValueService.dictKey2Val("equipment_health_status", false); 573 Map<String, String> healthVal2KeyMap = key2ValueService.dictKey2Val("equipment_health_status", false);
574 Map<String, String> sysStructDictMap = key2ValueService.dictKey2Val("sysStructDict", false);
574 // 封装结果 575 // 封装结果
575 Page<Map<String, Map<String, Object>>> resPage = new Page<>(equipmentDTO.getPageNo(), equipmentDTO.getPageSize()); 576 Page<Map<String, Map<String, Object>>> resPage = new Page<>(equipmentDTO.getPageNo(), equipmentDTO.getPageSize());
576 resPage.setTotal(mapPage.getTotal()); 577 resPage.setTotal(mapPage.getTotal());
...@@ -604,6 +605,8 @@ public class EquipmentController { ...@@ -604,6 +605,8 @@ public class EquipmentController {
604 resMap.get(keys[0]).put(keys[1] + "_dictText", installVal2KeyMap.get(ConvertUtils.getString(value))); 605 resMap.get(keys[0]).put(keys[1] + "_dictText", installVal2KeyMap.get(ConvertUtils.getString(value)));
605 } else if ("equipmentHealthStatus".equals(keys[1])) { 606 } else if ("equipmentHealthStatus".equals(keys[1])) {
606 resMap.get(keys[0]).put(keys[1] + "_dictText", healthVal2KeyMap.get(ConvertUtils.getString(value))); 607 resMap.get(keys[0]).put(keys[1] + "_dictText", healthVal2KeyMap.get(ConvertUtils.getString(value)));
608 } else if ("structures".equals(keys[1])) {
609 resMap.get(keys[0]).put(keys[1] + "_dictText", sysStructDictMap.get(ConvertUtils.getString(value)));
607 } 610 }
608 } 611 }
609 resPage.getRecords().add(resMap); 612 resPage.getRecords().add(resMap);
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/xml/EquipmentMaintainTaskMapper.xml
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 emt.real_start_time AS realStartTime, 22 emt.real_start_time AS realStartTime,
23 emt.real_end_time AS realEndTime, 23 emt.real_end_time AS realEndTime,
24 emt.working_hours AS workingHours, 24 emt.working_hours AS workingHours,
25 case when (emt.real_end_time &lt;= emt.end_time and emt.working_hours &lt;= emp.limit_duration) then 1 else 2 end AS complete_tag, 25 case when (emt.real_end_time &lt;= emt.end_time and CAST(emt.working_hours AS DECIMAL(10, 2)) &lt;= CAST(emp.limit_duration AS DECIMAL(10, 2))) then 1 else 2 end AS complete_tag,
26 emt.picture_url AS pictureUrl, 26 emt.picture_url AS pictureUrl,
27 emt.equipment_id AS equipmentId, 27 emt.equipment_id AS equipmentId,
28 emt.results_enforcement AS resultsEnforcement, 28 emt.results_enforcement AS resultsEnforcement,
......
sk-module-system/src/main/java/com/skua/config/mybatis/MybatisInterceptor.java
...@@ -170,6 +170,7 @@ public class MybatisInterceptor implements Interceptor { ...@@ -170,6 +170,7 @@ public class MybatisInterceptor implements Interceptor {
170 || "com.skua.modules.safe.mapper.DangerLevelManageShareMapper.selectPage".equals(sqlId) 170 || "com.skua.modules.safe.mapper.DangerLevelManageShareMapper.selectPage".equals(sqlId)
171 || "com.skua.modules.edu.mapper.QuestionMapper.selectQuestionList".equals(sqlId)//试题列表 171 || "com.skua.modules.edu.mapper.QuestionMapper.selectQuestionList".equals(sqlId)//试题列表
172 || "com.skua.modules.edu.mapper.QuestionMapper.queryPageList".equals(sqlId)//试题分页 172 || "com.skua.modules.edu.mapper.QuestionMapper.queryPageList".equals(sqlId)//试题分页
173 || "com.skua.modules.safe.mapper.SafetyEnvironmentFeeMapper.selectPage".equals(sqlId)//安全环保费
173 ) { 174 ) {
174 log.debug("************************------sqlId------**************************" + sqlId); 175 log.debug("************************------sqlId------**************************" + sqlId);
175 return invocation.proceed(); 176 return invocation.proceed();
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!