Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
69681c61 由 康伟
选项

kangwei: 设备月报-设备管理情况 

         设备月报-设备维修维护报表
1 个父辈 3aa0e6bb
全部展开
内嵌 并排
正在显示 14 个修改的文件 包含 451 行增加 和 12 行删除
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhRectificationInfoController.java
...@@ -347,7 +347,6 @@ public class AjhRectificationInfoController { ...@@ -347,7 +347,6 @@ public class AjhRectificationInfoController {
347 return result; 347 return result;
348 } 348 }
349 349
350
351 @ApiOperation(value="安全态势总览数据统计:统计教育+题库", notes="安全态势总览数据统计:统计教育+题库") 350 @ApiOperation(value="安全态势总览数据统计:统计教育+题库", notes="安全态势总览数据统计:统计教育+题库")
352 @RequestMapping(value = "/jyCensus", method = RequestMethod.GET) 351 @RequestMapping(value = "/jyCensus", method = RequestMethod.GET)
353 public Map<String,Object> jyCensus(@RequestParam(name="now",required=true) String now) { 352 public Map<String,Object> jyCensus(@RequestParam(name="now",required=true) String now) {
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/EquipmentRepairReportController.java 0 → 100644
1 package com.skua.modules.equipment.controller;
2
3 import com.baomidou.mybatisplus.core.metadata.IPage;
4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5 import com.skua.core.api.vo.Result;
6 import com.skua.core.aspect.annotation.AutoLog;
7 import com.skua.modules.equipment.service.IEquipmentMaintainTaskService;
8 import com.skua.modules.equipment.service.IEquipmentRepairService;
9 import com.skua.modules.equipment.vo.EquipmentMaintainTaskForm;
10 import com.skua.modules.equipment.vo.EquipmentRepairForm;
11 import io.swagger.annotations.Api;
12 import io.swagger.annotations.ApiOperation;
13 import lombok.extern.slf4j.Slf4j;
14 import org.springframework.beans.factory.annotation.Autowired;
15 import org.springframework.web.bind.annotation.GetMapping;
16 import org.springframework.web.bind.annotation.RequestMapping;
17 import org.springframework.web.bind.annotation.RequestParam;
18 import org.springframework.web.bind.annotation.RestController;
19 import javax.servlet.http.HttpServletRequest;
20
21 /**
22 * 维修维护报表
23 */
24 @Slf4j
25 @Api(tags = "设备管理/设备维修/维修维护报表")
26 @RestController
27 @RequestMapping("/equipment/equipmentRepairReport")
28 public class EquipmentRepairReportController {
29
30 @Autowired
31 private IEquipmentRepairService equipmentRepairService;
32
33 @Autowired
34 private IEquipmentMaintainTaskService maintainTaskService;
35
36 @AutoLog(value = "维修维护报表-维修工单列表")
37 @ApiOperation(value = "维修维护报表-维修工单列表", notes = "维修维护报表-维修工单列表")
38 @GetMapping(value = "/repairList")
39 public Result<IPage<EquipmentRepairForm>> repairList(EquipmentRepairForm equipmentRepairForm,
40 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
41 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
42 HttpServletRequest req ) throws Exception {
43 Result<IPage<EquipmentRepairForm>> result = new Result<IPage<EquipmentRepairForm>>();
44 Page<EquipmentRepairForm> page = new Page<EquipmentRepairForm>(pageNo, pageSize);
45
46 IPage<EquipmentRepairForm> pageList = equipmentRepairService.queryRepairFormByPage(page, equipmentRepairForm);
47 result.setSuccess(true);
48 result.setResult(pageList);
49 return result;
50 }
51
52 @AutoLog(value = "维修维护报表-维修工单列表")
53 @ApiOperation(value = "维修维护报表-维修工单列表", notes = "维修维护报表-维修工单列表")
54 @GetMapping(value = "/maintainTaskList")
55 public Result<IPage<EquipmentMaintainTaskForm>> maintainTaskList(EquipmentMaintainTaskForm maintainTaskForm,
56 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
57 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
58 HttpServletRequest req ) throws Exception {
59 Result<IPage<EquipmentMaintainTaskForm>> result = new Result<IPage<EquipmentMaintainTaskForm>>();
60 Page<EquipmentMaintainTaskForm> page = new Page<EquipmentMaintainTaskForm>(pageNo, pageSize);
61
62 IPage<EquipmentMaintainTaskForm> pageList = maintainTaskService.queryMaintainTaskFormByPage(page, maintainTaskForm);
63 result.setSuccess(true);
64 result.setResult(pageList);
65 return result;
66 }
67 }
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/EquipmentMaintainTaskMapper.java
...@@ -3,6 +3,8 @@ package com.skua.modules.equipment.mapper; ...@@ -3,6 +3,8 @@ package com.skua.modules.equipment.mapper;
3 import java.util.Date; 3 import java.util.Date;
4 import java.util.List; 4 import java.util.List;
5 5
6 import com.baomidou.mybatisplus.core.metadata.IPage;
7 import com.skua.modules.equipment.vo.*;
6 import org.apache.ibatis.annotations.Mapper; 8 import org.apache.ibatis.annotations.Mapper;
7 import org.apache.ibatis.annotations.Param; 9 import org.apache.ibatis.annotations.Param;
8 10
...@@ -11,10 +13,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -11,10 +13,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
11 import com.skua.modules.equipment.dto.EquipmentMaintainTaskDTO; 13 import com.skua.modules.equipment.dto.EquipmentMaintainTaskDTO;
12 import com.skua.modules.equipment.entity.EquipmentMaintainTask; 14 import com.skua.modules.equipment.entity.EquipmentMaintainTask;
13 import com.skua.modules.equipment.entity.EquipmentMaintainTaskResult; 15 import com.skua.modules.equipment.entity.EquipmentMaintainTaskResult;
14 import com.skua.modules.equipment.vo.EquipmentMaintainStandardVO;
15 import com.skua.modules.equipment.vo.EquipmentMaintainTaskCalendarVO;
16 import com.skua.modules.equipment.vo.EquipmentMaintainTaskVO;
17 import com.skua.modules.equipment.vo.EquipmentSparePartListVO;
18 16
19 @Mapper 17 @Mapper
20 public interface EquipmentMaintainTaskMapper extends BaseMapper<EquipmentMaintainTask> { 18 public interface EquipmentMaintainTaskMapper extends BaseMapper<EquipmentMaintainTask> {
...@@ -72,4 +70,10 @@ public interface EquipmentMaintainTaskMapper extends BaseMapper<EquipmentMaintai ...@@ -72,4 +70,10 @@ public interface EquipmentMaintainTaskMapper extends BaseMapper<EquipmentMaintai
72 */ 70 */
73 List<EquipmentMaintainTaskCalendarVO> getTaskCalendarList(EquipmentMaintainTaskDTO equipmentMaintainTaskDTO); 71 List<EquipmentMaintainTaskCalendarVO> getTaskCalendarList(EquipmentMaintainTaskDTO equipmentMaintainTaskDTO);
74 72
73 /**
74 * 维修维护报表-维修工单列表
75 * @param maintainTaskForm
76 * @return
77 */
78 List<EquipmentMaintainTaskForm> queryMaintainTaskFormByList(EquipmentMaintainTaskForm maintainTaskForm);
75 } 79 }
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/EquipmentRepairMapper.java
1 package com.skua.modules.equipment.mapper; 1 package com.skua.modules.equipment.mapper;
2 2
3 import com.baomidou.mybatisplus.core.mapper.BaseMapper; 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 import com.baomidou.mybatisplus.core.metadata.IPage;
4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 5 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5 import com.skua.modules.equipment.entity.EquipmentRepair; 6 import com.skua.modules.equipment.entity.EquipmentRepair;
7 import com.skua.modules.equipment.vo.EquipmentRepairForm;
6 import com.skua.modules.equipment.vo.EquipmentRepairVO; 8 import com.skua.modules.equipment.vo.EquipmentRepairVO;
7 9
8 import org.apache.ibatis.annotations.Param; 10 import org.apache.ibatis.annotations.Param;
...@@ -48,4 +50,10 @@ public interface EquipmentRepairMapper extends BaseMapper<EquipmentRepair> { ...@@ -48,4 +50,10 @@ public interface EquipmentRepairMapper extends BaseMapper<EquipmentRepair> {
48 */ 50 */
49 List<Map<String, Object>> queryStatistics(@Param(value = "equipmentRepairVO")EquipmentRepairVO equipmentRepairVO); 51 List<Map<String, Object>> queryStatistics(@Param(value = "equipmentRepairVO")EquipmentRepairVO equipmentRepairVO);
50 52
53 /**
54 * 维修维护报表-维修工单列表
55 * @param equipmentRepairForm
56 * @return
57 */
58 List<EquipmentRepairForm> queryRepairFormList( EquipmentRepairForm equipmentRepairForm);
51 } 59 }
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/xml/EquipmentMaintainTaskMapper.xml
...@@ -199,4 +199,39 @@ ...@@ -199,4 +199,39 @@
199 b.start_time 199 b.start_time
200 </select> 200 </select>
201 201
202 <!-- 维修维护报表-维修工单列表 -->
203 <select id="queryMaintainTaskFormByList" resultType="com.skua.modules.equipment.vo.EquipmentMaintainTaskForm">
204 select aaa.* from (
205 select t.depart_id, ei.equipment_name, ec.id 'equipment_category_id', ec.des 'equipment_category', emp.maintenance_type, di.item_text 'maintenance_type_name', t.maintain_plan_name , emp.start_time ,emp.end_time,u.realname 'maintenanceUser' , ems.maintenance_content
206 from equipment_maintain_task t
207 left join equipment_maintain_plan emp on t.plan_id = emp.id
208 left join sys_dict_item di on di.item_value = emp.maintenance_type
209 left join sys_user u on u.id = t.maintainer_id
210 LEFT JOIN equipment_maintain_plan_standard eps ON eps.plan_id = emp.id
211 LEFT JOIN equipment_maintain_standard ems ON ems.id = eps.standard_id
212 left join equipment_info ei on ei.id = t.equipment_id
213 left join equipment_category ec on ei.equipment_type = ec.id
214 )aaa
215 <where>
216 <if test="departId != null and departId !=''">
217 and aaa.depart_id = #{departId}
218 </if>
219 <if test="departIds != null and departIds !=''">
220 and aaa.depart_id in(${departIds})
221 </if>
222 <if test="equipmentCategoryId != null and equipmentCategoryId !=''">
223 and aaa.equipment_category_id = #{equipmentCategoryId}
224 </if>
225 <if test="maintenanceType != null and maintenanceType !=''">
226 and aaa.maintenance_type = #{maintenanceType}
227 </if>
228 <if test="startTime != null and startTime !=''">
229 and aaa.start_time &gt;= #{startTime}
230 </if>
231 <if test="endTime != null and endTime !=''">
232 and aaa.end_time &lt;= #{endTime}
233 </if>
234 </where>
235 </select>
236
202 </mapper> 237 </mapper>
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/xml/EquipmentRepairMapper.xml
...@@ -115,4 +115,68 @@ ...@@ -115,4 +115,68 @@
115 group by a.finish_flag 115 group by a.finish_flag
116 </select> 116 </select>
117 117
118
119
120 <!-- 维修维护报表-维修工单列表 -->
121 <select id="queryRepairFormList" resultType="com.skua.modules.equipment.vo.EquipmentMaintainTaskForm">
122 select aaa.* from (
123 select
124 ei.equipment_name , ec.des 'equipment_category', di.item_text 'maintenance_type',
125 ifnull(u.realname,'-') 'maintenance_user',
126 er.depart_id,er.repair_date,er.fault_reason,er.is_stop,er.reality_maintenance_start_time,er.reality_maintenance_end_time,
127 ifnull(er.fault_library_id,'-') 'repair_content'
128 from equipment_repair er
129 left join equipment_info ei on ei.id = er.info_id
130 left join equipment_category ec on ei.equipment_type = ec.id
131 left join sys_user u on er.maintenance_user = u.id
132 left join sys_dict_item di on di.item_value = er.maintenance_type
133 )aaa
134 <where>
135 <if test="departId != null and departId !=''">
136 and aaa.depart_id = #{departId}
137 </if>
138 <if test="departIds != null and departIds !=''">
139 and aaa.depart_id in(${departIds})
140 </if>
141 <!--<if test="param.startTime != null and param.startTime !=''">
142 and aaa.repair_date &gt;= #{param.startTime}
143 </if>
144 <if test="param.departIds != null and param.departIds !=''">
145 and aaa.repair_date &lt;= #{param.endTime}
146 </if>-->
147
148 <if test="finishFlag != null and finishFlag !=''">
149 and aaa.finish_flag = #{finishFlag}
150 </if>
151
152 <if test="repairDate != null and repairDate !=''">
153 and aaa.repair_date = #{repairDate}
154 </if>
155
156 <if test="realityMaintenanceEndTime != null and realityMaintenanceEndTime !=''">
157 and aaa.reality_maintenance_end_time = #{realityMaintenanceEndTime}
158 </if>
159 <if test="repairDate_begin != null and repairDate_begin !=''">
160 and aaa.repair_date &gt;= #{repairDate_begin}
161 </if>
162 <if test="repairDate_end != null and repairDate_end !=''">
163 and aaa.repair_date &lt;= #{repairDate_end}
164 </if>
165
166 <if test="realityMaintenanceEndTime_begin != null and realityMaintenanceEndTime_begin !=''">
167 and aaa.reality_maintenance_end_time &gt;= #{realityMaintenanceEndTime_begin}
168 </if>
169 <if test="realityMaintenanceEndTime_end != null and realityMaintenanceEndTime_end !=''">
170 and aaa.reality_maintenance_end_time &lt;= #{realityMaintenanceEndTime_end}
171 </if>
172
173 <if test="equipmentCategory != null and equipmentCategory !=''">
174 and aaa.equipment_category = #{equipmentCategory}
175 </if>
176 <if test="maintenanceType != null and maintenanceType !=''">
177 and aaa.maintenance_type = #{maintenanceType}
178 </if>
179 </where>
180 </select>
181
118 </mapper> 182 </mapper>
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/IEquipmentMaintainTaskService.java
...@@ -3,11 +3,13 @@ package com.skua.modules.equipment.service; ...@@ -3,11 +3,13 @@ package com.skua.modules.equipment.service;
3 import java.util.List; 3 import java.util.List;
4 import java.util.Map; 4 import java.util.Map;
5 5
6 import com.baomidou.mybatisplus.core.metadata.IPage;
6 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 7 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7 import com.baomidou.mybatisplus.extension.service.IService; 8 import com.baomidou.mybatisplus.extension.service.IService;
8 import com.skua.modules.equipment.dto.EquipmentMaintainTaskDTO; 9 import com.skua.modules.equipment.dto.EquipmentMaintainTaskDTO;
9 import com.skua.modules.equipment.entity.EquipmentMaintainTask; 10 import com.skua.modules.equipment.entity.EquipmentMaintainTask;
10 import com.skua.modules.equipment.vo.EquipmentMaintainTaskCalendarVO; 11 import com.skua.modules.equipment.vo.EquipmentMaintainTaskCalendarVO;
12 import com.skua.modules.equipment.vo.EquipmentMaintainTaskForm;
11 import com.skua.modules.equipment.vo.EquipmentMaintainTaskVO; 13 import com.skua.modules.equipment.vo.EquipmentMaintainTaskVO;
12 14
13 public interface IEquipmentMaintainTaskService extends IService<EquipmentMaintainTask> { 15 public interface IEquipmentMaintainTaskService extends IService<EquipmentMaintainTask> {
...@@ -41,4 +43,19 @@ public interface IEquipmentMaintainTaskService extends IService<EquipmentMaintai ...@@ -41,4 +43,19 @@ public interface IEquipmentMaintainTaskService extends IService<EquipmentMaintai
41 */ 43 */
42 boolean updateResultsEnforcement(String id); 44 boolean updateResultsEnforcement(String id);
43 45
46 /***
47 * 维修维护报表-维修工单列表
48 * @param page
49 * @param maintainTaskForm
50 * @return
51 */
52 IPage<EquipmentMaintainTaskForm> queryMaintainTaskFormByPage(Page<EquipmentMaintainTaskForm> page, EquipmentMaintainTaskForm maintainTaskForm);
53
54 /**
55 * 列表
56 * @param maintainTaskForm
57 * @return
58 */
59 List<EquipmentMaintainTaskForm> queryMaintainTaskFormByList( EquipmentMaintainTaskForm maintainTaskForm);
60
44 } 61 }
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/IEquipmentRepairService.java
1 package com.skua.modules.equipment.service; 1 package com.skua.modules.equipment.service;
2 2
3 import com.baomidou.mybatisplus.core.metadata.IPage;
3 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
4 import com.baomidou.mybatisplus.extension.service.IService; 5 import com.baomidou.mybatisplus.extension.service.IService;
5 import com.skua.core.api.vo.Result; 6 import com.skua.core.api.vo.Result;
6 import com.skua.modules.equipment.entity.EquipmentRepair; 7 import com.skua.modules.equipment.entity.EquipmentRepair;
8 import com.skua.modules.equipment.vo.EquipmentRepairForm;
7 import com.skua.modules.equipment.vo.EquipmentRepairVO; 9 import com.skua.modules.equipment.vo.EquipmentRepairVO;
8 10
9 import java.util.List; 11 import java.util.List;
...@@ -81,4 +83,13 @@ public interface IEquipmentRepairService extends IService<EquipmentRepair> { ...@@ -81,4 +83,13 @@ public interface IEquipmentRepairService extends IService<EquipmentRepair> {
81 */ 83 */
82 Map<String, Object> statistics(EquipmentRepairVO equipmentRepairVO); 84 Map<String, Object> statistics(EquipmentRepairVO equipmentRepairVO);
83 85
86 /**
87 * 维修维护报表-维修工单列表
88 * @param page
89 * @param equipmentRepairForm
90 * @return
91 */
92 IPage<EquipmentRepairForm> queryRepairFormByPage(Page<EquipmentRepairForm> page, EquipmentRepairForm equipmentRepairForm);
93
94 List<EquipmentRepairForm> queryRepairFormList( EquipmentRepairForm equipmentRepairForm);
84 } 95 }
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/impl/EquipmentMaintainTaskServiceImpl.java
...@@ -9,6 +9,8 @@ import java.util.Map; ...@@ -9,6 +9,8 @@ import java.util.Map;
9 import java.util.Set; 9 import java.util.Set;
10 import java.util.UUID; 10 import java.util.UUID;
11 11
12 import com.baomidou.mybatisplus.core.metadata.IPage;
13 import com.skua.modules.equipment.vo.*;
12 import org.apache.commons.collections.CollectionUtils; 14 import org.apache.commons.collections.CollectionUtils;
13 import org.apache.commons.lang.StringUtils; 15 import org.apache.commons.lang.StringUtils;
14 import org.springframework.beans.BeanUtils; 16 import org.springframework.beans.BeanUtils;
...@@ -37,13 +39,6 @@ import com.skua.modules.equipment.mapper.EquipmentMaintainTaskMapper; ...@@ -37,13 +39,6 @@ import com.skua.modules.equipment.mapper.EquipmentMaintainTaskMapper;
37 import com.skua.modules.equipment.mapper.EquipmentMaintainTaskSparepartMapper; 39 import com.skua.modules.equipment.mapper.EquipmentMaintainTaskSparepartMapper;
38 import com.skua.modules.equipment.service.IEquipmentMaintainTaskService; 40 import com.skua.modules.equipment.service.IEquipmentMaintainTaskService;
39 import com.skua.modules.equipment.util.UnitUtils; 41 import com.skua.modules.equipment.util.UnitUtils;
40 import com.skua.modules.equipment.vo.EquipmentMaintainPlanVO;
41 import com.skua.modules.equipment.vo.EquipmentMaintainStandardVO;
42 import com.skua.modules.equipment.vo.EquipmentMaintainTaskCalendarVO;
43 import com.skua.modules.equipment.vo.EquipmentMaintainTaskCheckVO;
44 import com.skua.modules.equipment.vo.EquipmentMaintainTaskVO;
45 import com.skua.modules.equipment.vo.EquipmentMaintenanceContentVO;
46 import com.skua.modules.equipment.vo.EquipmentSparePartListVO;
47 import com.skua.modules.supplies.service.IEquipmentSparepartSuppliesAdjustService; 42 import com.skua.modules.supplies.service.IEquipmentSparepartSuppliesAdjustService;
48 43
49 44
...@@ -363,6 +358,27 @@ public class EquipmentMaintainTaskServiceImpl extends ServiceImpl<EquipmentMaint ...@@ -363,6 +358,27 @@ public class EquipmentMaintainTaskServiceImpl extends ServiceImpl<EquipmentMaint
363 return taskCalendarMap; 358 return taskCalendarMap;
364 } 359 }
365 360
361 /***
362 * 维修维护报表-维修工单列表
363 * @param page
364 * @param maintainTaskForm
365 * @return
366 */
367 public IPage<EquipmentMaintainTaskForm> queryMaintainTaskFormByPage(Page<EquipmentMaintainTaskForm> page, EquipmentMaintainTaskForm maintainTaskForm){
368 List<EquipmentMaintainTaskForm> dataList = this.baseMapper.queryMaintainTaskFormByList(maintainTaskForm);
369 page.setRecords(dataList);
370 return page;
371 }
372 /**
373 * 列表
374 * @param maintainTaskForm
375 * @return
376 */
377 public List<EquipmentMaintainTaskForm> queryMaintainTaskFormByList( EquipmentMaintainTaskForm maintainTaskForm){
378 List<EquipmentMaintainTaskForm> dataList = this.baseMapper.queryMaintainTaskFormByList(maintainTaskForm);
379 return dataList;
380 }
381
366 @Override 382 @Override
367 public boolean updateResultsEnforcement(String id) { 383 public boolean updateResultsEnforcement(String id) {
368 baseMapper.updateResultsEnforcement(new Date(), 1, 2, id); 384 baseMapper.updateResultsEnforcement(new Date(), 1, 2, id);
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/impl/EquipmentRepairServiceImpl.java
1 package com.skua.modules.equipment.service.impl; 1 package com.skua.modules.equipment.service.impl;
2 2
3 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 3 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 import com.baomidou.mybatisplus.core.metadata.IPage;
4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 5 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 6 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6 import com.skua.core.api.vo.Result; 7 import com.skua.core.api.vo.Result;
...@@ -19,6 +20,7 @@ import com.skua.modules.equipment.service.IEquipmentDefectManagementService; ...@@ -19,6 +20,7 @@ import com.skua.modules.equipment.service.IEquipmentDefectManagementService;
19 import com.skua.modules.equipment.service.IEquipmentInfoService; 20 import com.skua.modules.equipment.service.IEquipmentInfoService;
20 import com.skua.modules.equipment.service.IEquipmentRepairChildService; 21 import com.skua.modules.equipment.service.IEquipmentRepairChildService;
21 import com.skua.modules.equipment.service.IEquipmentRepairService; 22 import com.skua.modules.equipment.service.IEquipmentRepairService;
23 import com.skua.modules.equipment.vo.EquipmentRepairForm;
22 import com.skua.modules.equipment.vo.EquipmentRepairVO; 24 import com.skua.modules.equipment.vo.EquipmentRepairVO;
23 import com.skua.modules.flow.business.service.FlowBusinessService; 25 import com.skua.modules.flow.business.service.FlowBusinessService;
24 import com.skua.modules.flow.business.service.IFlowService; 26 import com.skua.modules.flow.business.service.IFlowService;
...@@ -292,6 +294,22 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe ...@@ -292,6 +294,22 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
292 return pageList.setRecords(equipmentRepairVOS); 294 return pageList.setRecords(equipmentRepairVOS);
293 } 295 }
294 296
297 /**
298 * 维修维护报表-维修工单列表
299 * @param page
300 * @param equipmentRepairForm
301 * @return
302 */
303 public IPage<EquipmentRepairForm> queryRepairFormByPage(Page<EquipmentRepairForm> page, EquipmentRepairForm equipmentRepairForm){
304 List<EquipmentRepairForm> dataList = this.baseMapper.queryRepairFormList(equipmentRepairForm);
305 page.setRecords(dataList);
306 return page;
307 }
308 public List<EquipmentRepairForm> queryRepairFormList( EquipmentRepairForm equipmentRepairForm){
309 List<EquipmentRepairForm> dataList = this.baseMapper.queryRepairFormList(equipmentRepairForm);
310 return dataList;
311 }
312
295 @Override 313 @Override
296 public Map<String, Object> statistics(EquipmentRepairVO equipmentRepairVO) { 314 public Map<String, Object> statistics(EquipmentRepairVO equipmentRepairVO) {
297 Map<String,Object> statisticsMap = new HashMap<String,Object>(); 315 Map<String,Object> statisticsMap = new HashMap<String,Object>();
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/vo/EquipmentMaintainRepairReportVO.java 0 → 100644
1 package com.skua.modules.equipment.vo;
2
3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty;
5 import lombok.Data;
6 import lombok.EqualsAndHashCode;
7 import lombok.experimental.Accessors;
8
9 import java.util.List;
10
11 /**
12 * @auther kangwei
13 * @create 2025-03-08-15:24
14 */
15 @Data
16 @EqualsAndHashCode(callSuper = false)
17 @Accessors(chain = true)
18 @ApiModel(value="EquipmentMaintainRepairReportVO对象", description="设备维修维护报表")
19 public class EquipmentMaintainRepairReportVO {
20 @ApiModelProperty(value = "机构ID")
21 private java.lang.String departId;
22
23 @ApiModelProperty(value = "机构名称")
24 private java.lang.String departName;
25
26 @ApiModelProperty(value = "月度计划性维修维护内容")
27 private List<EquipmentMaintainTaskForm> maintainTaskFormList; //月度计划性维修维护内容
28
29
30 @ApiModelProperty(value = "设备报修维修工单")
31 private List<EquipmentRepairForm> equipmentRepairFormList; //设备报修维修工单
32
33
34 }
sk-module-equipment/src/main/java/com/skua/modules/equipment/vo/EquipmentMaintainTaskForm.java 0 → 100644
1 package com.skua.modules.equipment.vo;
2
3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty;
5 import lombok.Data;
6 import lombok.EqualsAndHashCode;
7 import lombok.experimental.Accessors;
8 import org.jeecgframework.poi.excel.annotation.Excel;
9
10 /**
11 * @auther kangwei
12 * @create 2025-03-07-17:56
13 */
14 /**
15 * 月度计划性维修维护内容
16 */
17 @Data
18 @ApiModel(value="equipment_repair对象", description="月度计划性维修维护内容")
19 public class EquipmentMaintainTaskForm {
20
21 @ApiModelProperty(value = "机构ID集合")
22 private java.lang.String departIds;
23
24 @ApiModelProperty(value = "机构ID")
25 private java.lang.String departId;
26
27 @ApiModelProperty(value = "机构名称")
28 private java.lang.String departName;
29
30 @Excel(name = "设备名称", width = 15)
31 @ApiModelProperty(value = "设备名称")
32 private String equipmentName;
33
34 @Excel(name = "设备分类编号", width = 15)
35 @ApiModelProperty(value = "设备分类编号")
36 private String equipmentCategoryId;
37
38 @Excel(name = "设备分类名称", width = 15)
39 @ApiModelProperty(value = "设备分类名称")
40 private String equipmentCategory;
41
42 @Excel(name = "维护保养类型", width = 15)
43 @ApiModelProperty(value = "维护保养类型")
44 private String maintenanceType;
45
46 @Excel(name = "设备分类名称", width = 15)
47 @ApiModelProperty(value = "设备分类名称")
48 private String maintenanceTypeName;
49
50 @Excel(name = "维护保养项目", width = 15)
51 @ApiModelProperty(value = "维护保养项目")
52 private String maintainPlanName;
53
54 @Excel(name = "维护保养内容", width = 15)
55 @ApiModelProperty(value = "维护保养内容")
56 private String maintenanceContent;
57
58 @Excel(name = "计划开始时间", width = 15)
59 @ApiModelProperty(value = "计划开始时间")
60 private String startTime;
61
62 @Excel(name = "计划结束时间", width = 15)
63 @ApiModelProperty(value = "计划结束时间")
64 private String endTime;
65
66 @Excel(name = "维修负责人", width = 15)
67 @ApiModelProperty(value = "维修负责人")
68 private java.lang.String maintenanceUser;
69
70 }
sk-module-equipment/src/main/java/com/skua/modules/equipment/vo/EquipmentRepairForm.java 0 → 100644
1 package com.skua.modules.equipment.vo;
2
3 import com.baomidou.mybatisplus.annotation.IdType;
4 import com.baomidou.mybatisplus.annotation.TableId;
5 import com.baomidou.mybatisplus.annotation.TableName;
6 import com.fasterxml.jackson.annotation.JsonFormat;
7 import com.skua.core.aspect.annotation.Dict;
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 org.jeecgframework.poi.excel.annotation.Excel;
14 import org.springframework.format.annotation.DateTimeFormat;
15
16 /**
17 * 设备报修维修
18 */
19 @Data
20 @EqualsAndHashCode(callSuper = false)
21 @Accessors(chain = true)
22 @ApiModel(value="equipment_repair对象", description="设备报修维修工单")
23 public class EquipmentRepairForm {
24
25 @ApiModelProperty(value = "机构ID集合")
26 private java.lang.String departIds;
27 @ApiModelProperty(value = "机构ID")
28 private java.lang.String departId;
29
30 @ApiModelProperty(value = "机构名称")
31 private java.lang.String departName;
32 /**设备id*/
33 @Excel(name = "设备id", width = 15)
34 @ApiModelProperty(value = "设备id")
35 private String infoId;
36
37 @Excel(name = "设备名称", width = 15)
38 @ApiModelProperty(value = "设备名称")
39 private String equipmentName;
40
41 @Excel(name = "设备分类名称", width = 15)
42 @ApiModelProperty(value = "设备分类名称")
43 private String equipmentCategory;
44
45 @Excel(name = "办结标记，yes办结", width = 15)
46 @ApiModelProperty(value = "办结标记，yes办结")
47 @Dict(dicCode = "equipment_repair_state")
48 private java.lang.String finishFlag;
49
50
51 @Excel(name = "维修方式", width = 15)
52 @ApiModelProperty(value = "维修方式")
53 private java.lang.String maintenanceType;
54
55 @Excel(name = "维修人", width = 15)
56 @ApiModelProperty(value = "维修人")
57 private java.lang.String maintenanceUser;
58
59 /**报修时间*/
60 @Excel(name = "故障时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
61 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
62 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
63 @ApiModelProperty(value = "故障时间")
64 private java.util.Date repairDate;
65
66 @ApiModelProperty(value = "搜索条件:故障时间-开始时间")
67 private String repairDate_begin;
68 @ApiModelProperty(value = "搜索条件:故障时间-结束时间")
69 private String repairDate_end;
70
71 /**故障原因*/
72 @Excel(name = "故障原因", width = 15)
73 @ApiModelProperty(value = "故障原因")
74 private java.lang.String faultReason;
75
76 @Excel(name = "维修内容", width = 15)
77 @ApiModelProperty(value = "维修内容")
78 private java.lang.String repairContent;
79
80
81 @Excel(name = "修复时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
82 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
83 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
84 @ApiModelProperty(value = "修复时间")
85 private java.util.Date realityMaintenanceEndTime;
86
87 @ApiModelProperty(value = "搜索条件:修复时间-开始时间")
88 private String realityMaintenanceEndTime_begin;
89 @ApiModelProperty(value = "搜索条件:修复时间-结束时间")
90 private String realityMaintenanceEndTime_end;
91
92 /**故障内容*/
93 @Excel(name = "故障内容", width = 15)
94 @ApiModelProperty(value = "故障内容")
95 private java.lang.String faultContent;
96 }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!