Skip to content

张雷 / skboot-zhongye

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

feat(equipment): 添加设备维修流程列表查询功能 

- 在 EquipmentRepairController 中添加 getListByEquip 接口
- 在 IEquipmentRepairService 和 EquipmentRepairServiceImpl 中实现 getListByEquip 方法
- 在 EquipmentRepairMapper 中添加 getListByEquip 查询接口- 在 EquipmentRepairMapper.xml 中编写 getListByEquip 查询语句
- 优化 EquipmentMaintainTaskMapper接口和 XML 文件，添加新的查询方法
1 个父辈 bb42072a
内嵌 并排
正在显示 9 个修改的文件 包含 178 行增加 和 2 行删除
sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/EquipmentRepairController.java
...@@ -71,6 +71,18 @@ public class EquipmentRepairController { ...@@ -71,6 +71,18 @@ public class EquipmentRepairController {
71 result.setSuccess(true); 71 result.setSuccess(true);
72 return result; 72 return result;
73 } 73 }
74
75 @AutoLog(value = "设备维修流程列表查询")
76 @ApiOperation(value = "设备维修流程列表查询", notes = "设备维修流程列表查询")
77 @GetMapping(value = "/getListByEquip")
78 public Result<List<EquipmentRepairVO>> getListByEquip(String equipId) {
79 Result<List<EquipmentRepairVO>> result = new Result<List<EquipmentRepairVO>>();
80 List<EquipmentRepairVO> list = equipmentRepairService.getListByEquip(equipId);
81 result.setResult(list);
82 result.setSuccess(true);
83 return result;
84 }
85
74 /** 86 /**
75 * <pre> 87 * <pre>
76 * 设备流程状态统计 88 * 设备流程状态统计
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/EquipmentMaintainTaskMapper.java
...@@ -83,4 +83,6 @@ public interface EquipmentMaintainTaskMapper extends BaseMapper<EquipmentMaintai ...@@ -83,4 +83,6 @@ public interface EquipmentMaintainTaskMapper extends BaseMapper<EquipmentMaintai
83 @Param("param") EquipmentMaintainTaskForm maintainTaskForm); 83 @Param("param") EquipmentMaintainTaskForm maintainTaskForm);
84 84
85 List<Map<String, Object>> getList(@Param("startTime") String startTime, @Param("endTime") String endTime); 85 List<Map<String, Object>> getList(@Param("startTime") String startTime, @Param("endTime") String endTime);
86
87 List<EquipmentMaintainTaskVO> queryPageList(Page<EquipmentMaintainTaskVO> pageList, @Param("equipmentMaintainTask") EquipmentMaintainTaskDTO equipmentMaintainTask);
86 } 88 }
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/EquipmentRepairMapper.java
...@@ -58,4 +58,6 @@ public interface EquipmentRepairMapper extends BaseMapper<EquipmentRepair> { ...@@ -58,4 +58,6 @@ public interface EquipmentRepairMapper extends BaseMapper<EquipmentRepair> {
58 * @return 58 * @return
59 */ 59 */
60 List<EquipmentRepairForm> queryRepairFormList( EquipmentRepairForm equipmentRepairForm); 60 List<EquipmentRepairForm> queryRepairFormList( EquipmentRepairForm equipmentRepairForm);
61
62 List<EquipmentRepairVO> getListByEquip(@Param(value = "equipId") String equipId);
61 } 63 }
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/xml/EquipmentMaintainTaskMapper.xml
...@@ -289,5 +289,102 @@ ...@@ -289,5 +289,102 @@
289 AND DATE_FORMAT(t.start_time,'%Y-%m-%d %H:%i:%s') &gt;= #{startTime} 289 AND DATE_FORMAT(t.start_time,'%Y-%m-%d %H:%i:%s') &gt;= #{startTime}
290 AND DATE_FORMAT(t.start_time,'%Y-%m-%d %H:%i:%s') &lt;= #{endTime} 290 AND DATE_FORMAT(t.start_time,'%Y-%m-%d %H:%i:%s') &lt;= #{endTime}
291 </select> 291 </select>
292 <select id="queryPageList" parameterType="com.skua.modules.equipment.dto.EquipmentMaintainTaskDTO"
293 resultType="com.skua.modules.equipment.vo.EquipmentMaintainTaskVO">
294 SELECT
295 ei.equipment_name as equipmentName,
296 emt.id AS id ,
297 emt.downtime AS downtime,
298 emt.end_time AS endTime,
299 emt.start_time AS startTime,
300 emt.depart_id,
301 (select depart_name from sys_depart where id = emt.depart_id) AS depart_name,
302 emt.maintain_plan_name AS maintainPlanName,
303 emt.maintain_mode AS maintainMode,
304 emt.maintain_level AS maintainLevel,
305 emt.maintainer_id AS maintainerId,
306 (select realname from sys_user where id = emt.maintainer_id) AS maintainerName,
307 emt.maintain_time AS maintainTime,
308 emt.plan_id AS planId,
309 emt.maintenance_cost AS maintenanceCost,
310 emt.real_start_time AS realStartTime,
311 emt.real_end_time AS realEndTime,
312 emt.working_hours AS workingHours,
313 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,
314 emt.picture_url AS pictureUrl,
315 emt.equipment_id AS equipmentId,
316 emt.results_enforcement AS resultsEnforcement,
317 emp.plan_cost AS planCost,
318 emp.plan_accepter_id AS planAccepterId,
319 emp.plan_arranger_id,
320 emt.device_administrator_id AS deviceAdministratorId,
321 emp.maintenance_type,
322 emp.cycle AS cycle,
323 emp.cycle_unit AS cycleUnit
324 FROM
325 equipment_maintain_task emt
326 LEFT JOIN equipment_maintain_plan emp ON emp.id=emt.plan_id
327 LEFT JOIN equipment_info ei ON ei.id=emt.equipment_id
328 <where>
329 emt.del_flag=0
330 <if test="equipmentMaintainTask.planArrangerId !=null and equipmentMaintainTask.planArrangerId!='' and equipmentMaintainTask.getType==0">
331 AND (emt.maintainer_id = #{equipmentMaintainTask.planArrangerId} or (emp.plan_accepter_id= #{equipmentMaintainTask.planArrangerId}))
332 AND results_enforcement!='4'
333 </if>
334 <if test="equipmentMaintainTask.getType==1 and equipmentMaintainTask.planArrangerId !=null and equipmentMaintainTask.planArrangerId!=''">
335 AND emt.maintainer_id = #{equipmentMaintainTask.planArrangerId}
336 </if>
337 <if test="equipmentMaintainTask.equipmentId !=null and equipmentMaintainTask.equipmentId !=''">
338 and emt.equipment_id=#{equipmentMaintainTask.equipmentId}
339 </if>
340 <if test="equipmentMaintainTask.equipmentName !=null and equipmentMaintainTask.equipmentName !=''">
341 and ei.equipment_name like concat('%',#{equipmentMaintainTask.equipmentName},'%')
342 </if>
343 <if test="equipmentMaintainTask.planId !=null and equipmentMaintainTask.planId !=''">
344 and emt.plan_id=#{equipmentMaintainTask.planId}
345 </if>
346 <if test="equipmentMaintainTask.departId !=null and equipmentMaintainTask.departId !=''">
347 and emt.depart_id in
348 <foreach item="item" index="index" collection="equipmentMaintainTask.departId.split(',')" open="("
349 separator="," close=")">
350 '${item}'
351 </foreach>
352 </if>
353 <if test="equipmentMaintainTask.maintainPlanName !=null and equipmentMaintainTask.maintainPlanName !=''">
354 and emt.maintain_plan_name like concat('%',#{equipmentMaintainTask.maintainPlanName},'%')
355 </if>
356 <if test="equipmentMaintainTask.maintainMode !=null and equipmentMaintainTask.maintainMode !=''">
357 and emt.maintain_mode=#{equipmentMaintainTask.maintainMode}
358 </if>
359 <if test="equipmentMaintainTask.maintainLevel !=null and equipmentMaintainTask.maintainLevel !=''">
360 and emt.maintain_level like concat('%',#{equipmentMaintainTask.maintainLevel},'%')
361 </if>
362 <if test="equipmentMaintainTask.maintainerId !=null and equipmentMaintainTask.maintainerId !=''">
363 and emt.maintainer_id=#{equipmentMaintainTask.maintainerId}
364 </if>
365 <if test="equipmentMaintainTask.maintenanceType !=null and equipmentMaintainTask.maintenanceType !=''">
366 and emp.maintenance_type = #{equipmentMaintainTask.maintenanceType}
367 </if>
368 <if test="equipmentMaintainTask.taskStartTime !=null and equipmentMaintainTask.taskStartTime !=''">
369 and emt.real_end_time BETWEEN #{equipmentMaintainTask.taskStartTime} and
370 #{equipmentMaintainTask.taskEndTime}
371 </if>
372 <if test="equipmentMaintainTask.resultsEnforcement !=null and equipmentMaintainTask.resultsEnforcement !=''">
373 and emt.results_enforcement=#{equipmentMaintainTask.resultsEnforcement}
374 </if>
375 <if test="equipmentMaintainTask.maintainTime !=null ">
376 and #{equipmentMaintainTask.maintainTime}>= emt.maintain_time
377 </if>
378 <!-- 按时完成 -->
379 <if test="equipmentMaintainTask.completeTag ==1">
380 and (emt.real_end_time &lt;= emt.end_time and emt.working_hours &lt;= emp.limit_duration)
381 </if>
382 <!-- 延期完成 -->
383 <if test="equipmentMaintainTask.completeTag ==2">
384 and emt.working_hours &gt; emp.limit_duration
385 </if>
386 </where>
387 order BY emt.depart_id asc,ei.equipment_name asc,emt.start_time desc
388 </select>
292 389
293 </mapper> 390 </mapper>
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/xml/EquipmentRepairMapper.xml
...@@ -26,6 +26,24 @@ ...@@ -26,6 +26,24 @@
26 AND positions = 'manager' 26 AND positions = 'manager'
27 </select> 27 </select>
28 28
29 <select id="getListByEquip" resultType="com.skua.modules.equipment.vo.EquipmentRepairVO">
30 SELECT
31 b.depart_name,
32 c.equipment_name,
33 c.equipment_code,
34 c.install_Position,
35 c.equipment_type,
36 a.*
37 FROM
38 equipment_repair a
39 LEFT JOIN sys_depart b ON a.depart_id = b.id
40 LEFT JOIN equipment_info c ON a.info_id = c.id
41 WHERE
42 a.info_id = #{equipId}
43 and a.fault_type != 'yys'
44 order by a.depart_id desc , c.equipment_name asc ,c.structures
45 </select>
46
29 <select id="queryCustomPageList" parameterType="com.skua.modules.equipment.vo.EquipmentRepairVO" resultType="com.skua.modules.equipment.vo.EquipmentRepairVO"> 47 <select id="queryCustomPageList" parameterType="com.skua.modules.equipment.vo.EquipmentRepairVO" resultType="com.skua.modules.equipment.vo.EquipmentRepairVO">
30 SELECT 48 SELECT
31 b.depart_name, 49 b.depart_name,
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/IEquipmentRepairService.java
...@@ -92,4 +92,6 @@ public interface IEquipmentRepairService extends IService<EquipmentRepair> { ...@@ -92,4 +92,6 @@ public interface IEquipmentRepairService extends IService<EquipmentRepair> {
92 IPage<EquipmentRepairForm> queryRepairFormByPage(Page<EquipmentRepairForm> page, EquipmentRepairForm equipmentRepairForm); 92 IPage<EquipmentRepairForm> queryRepairFormByPage(Page<EquipmentRepairForm> page, EquipmentRepairForm equipmentRepairForm);
93 93
94 List<EquipmentRepairForm> queryRepairFormList( EquipmentRepairForm equipmentRepairForm); 94 List<EquipmentRepairForm> queryRepairFormList( EquipmentRepairForm equipmentRepairForm);
95
96 List<EquipmentRepairVO> getListByEquip(String equipId);
95 } 97 }
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/impl/EquipmentMaintainTaskServiceImpl.java
...@@ -149,21 +149,25 @@ public class EquipmentMaintainTaskServiceImpl extends ServiceImpl<EquipmentMaint ...@@ -149,21 +149,25 @@ public class EquipmentMaintainTaskServiceImpl extends ServiceImpl<EquipmentMaint
149 149
150 @Override 150 @Override
151 public Page<EquipmentMaintainTaskVO> queryCustomPageList(Page<EquipmentMaintainTaskVO> pageList, EquipmentMaintainTaskDTO equipmentMaintainTask) { 151 public Page<EquipmentMaintainTaskVO> queryCustomPageList(Page<EquipmentMaintainTaskVO> pageList, EquipmentMaintainTaskDTO equipmentMaintainTask) {
152 List<EquipmentMaintainTaskVO> equipmentMaintainTasks = new ArrayList<>();
152 // 查询前先改变当前时间之前的任务改变状态为进行中 153 // 查询前先改变当前时间之前的任务改变状态为进行中
153 //baseMapper.updateResultsEnforcement(new Date(), 1, 2, ""); 154 //baseMapper.updateResultsEnforcement(new Date(), 1, 2, "");
154 String userCode = BaseContextHandler.getUserId(); 155 String userCode = BaseContextHandler.getUserId();
155 if (null != equipmentMaintainTask.getType() && equipmentMaintainTask.getType() == 0) { 156 if (null != equipmentMaintainTask.getType() && equipmentMaintainTask.getType() == 0) {
156 //type=0表示保养任务查询，type=1表示保养记录查询 157 //type=0表示保养任务查询，type=1表示保养记录查询
157 equipmentMaintainTask.setPlanArrangerId(userCode); 158 equipmentMaintainTask.setPlanArrangerId(userCode);
159 equipmentMaintainTasks = baseMapper.queryCustomPageList(pageList, equipmentMaintainTask);
158 }else{ 160 }else{
159 if (null == equipmentMaintainTask.getType()) { 161 if (null == equipmentMaintainTask.getType()) {
160 if(ConvertUtils.isEmpty(equipmentMaintainTask.getDepartId())){ 162 if(ConvertUtils.isEmpty(equipmentMaintainTask.getDepartId())){
161 equipmentMaintainTask.setDepartId(BaseContextHandler.getDeparts()); 163 equipmentMaintainTask.setDepartId(BaseContextHandler.getDeparts());
162 } 164 }
163 equipmentMaintainTask.setResultsEnforcement(1); 165 equipmentMaintainTask.setResultsEnforcement(1);
166 equipmentMaintainTasks = baseMapper.queryPageList(pageList, equipmentMaintainTask);
167 }else{
168 equipmentMaintainTasks = baseMapper.queryCustomPageList(pageList, equipmentMaintainTask);
164 } 169 }
165 } 170 }
166 List<EquipmentMaintainTaskVO> equipmentMaintainTasks = baseMapper.queryCustomPageList(pageList, equipmentMaintainTask);
167 equipmentMaintainTasks.forEach(e -> { 171 equipmentMaintainTasks.forEach(e -> {
168 e.setCycleUnit(UnitUtils.getCycleUnitName(e.getCycleUnit())); 172 e.setCycleUnit(UnitUtils.getCycleUnitName(e.getCycleUnit()));
169 //状态<=2的时候，执行人 具有操作权限，其他人查看权限 173 //状态<=2的时候，执行人 具有操作权限，其他人查看权限
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/impl/EquipmentRepairServiceImpl.java
...@@ -114,6 +114,7 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe ...@@ -114,6 +114,7 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
114 return flowProcessFormFieldInfoVOs; 114 return flowProcessFormFieldInfoVOs;
115 } 115 }
116 116
117 @Override
117 public List<Map<String, Object>> getUserByPositions(String userId) { 118 public List<Map<String, Object>> getUserByPositions(String userId) {
118 return this.baseMapper.getUserByPositions(userId); 119 return this.baseMapper.getUserByPositions(userId);
119 } 120 }
...@@ -301,18 +302,56 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe ...@@ -301,18 +302,56 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
301 * @param equipmentRepairForm 302 * @param equipmentRepairForm
302 * @return 303 * @return
303 */ 304 */
305 @Override
304 public IPage<EquipmentRepairForm> queryRepairFormByPage(Page<EquipmentRepairForm> page, EquipmentRepairForm equipmentRepairForm){ 306 public IPage<EquipmentRepairForm> queryRepairFormByPage(Page<EquipmentRepairForm> page, EquipmentRepairForm equipmentRepairForm){
305 307
306 List<EquipmentRepairForm> dataList = this.baseMapper.queryRepairFormByPage(page,equipmentRepairForm); 308 List<EquipmentRepairForm> dataList = this.baseMapper.queryRepairFormByPage(page,equipmentRepairForm);
307 page.setRecords(dataList); 309 page.setRecords(dataList);
308 return page; 310 return page;
309 } 311 }
312
313 @Override
310 public List<EquipmentRepairForm> queryRepairFormList( EquipmentRepairForm equipmentRepairForm){ 314 public List<EquipmentRepairForm> queryRepairFormList( EquipmentRepairForm equipmentRepairForm){
311 List<EquipmentRepairForm> dataList = this.baseMapper.queryRepairFormList(equipmentRepairForm); 315 List<EquipmentRepairForm> dataList = this.baseMapper.queryRepairFormList(equipmentRepairForm);
312 return dataList; 316 return dataList;
313 } 317 }
314 318
315 @Override 319 @Override
320 public List<EquipmentRepairVO> getListByEquip(String equipId) {
321 List<EquipmentRepairVO> list = equipmentRepairMapper.getListByEquip(equipId);
322 //获取流程实例id集合
323 Set<String> processInstanceIdSet = new HashSet<String>();
324 //查询备品备件接口，填充到VO对象中
325 if(list!=null) {
326 list.forEach(vo ->{
327 String id = vo.getId();
328 vo.setEquipmentRepairChildList(equipmentRepairChildService.getSparepartListByRepairId(id));
329 processInstanceIdSet.add(vo.getProcessInstanceId());
330 });
331 }
332 //添加流程关键信息
333 Map<String, Map<String, String>> processInstanceMap = new HashMap<String, Map<String, String>>();
334 if(processInstanceIdSet!=null&&processInstanceIdSet.size()>0) {
335 processInstanceMap = flowBusinessService.getProcessState(processInstanceIdSet);
336 }
337 if(list!=null) {
338 for(EquipmentRepairVO vo : list) {
339 String processInstanceId = vo.getProcessInstanceId();
340 Map<String, String> processInfoMap = processInstanceMap.getOrDefault(processInstanceId,new HashMap<>());
341 BladeFlow flow = vo.getFlow();
342 flow.setBusinessId(vo.getId());
343 flow.setTaskDefinitionKey(processInfoMap.get("taskDefinitionKey"));
344 flow.setProcessDefinitionKey(processInfoMap.get("processDefinitionKey"));
345 flow.setProcessDefinitionId(processInfoMap.get("processDefinitionId"));
346 flow.setProcessDefinitionName(processInfoMap.get("processDefinitionName"));
347 flow.setProcessInstanceId(processInstanceId);
348 vo.setFlow(flow);
349 }
350 }
351 return list;
352 }
353
354 @Override
316 public Map<String, Object> statistics(EquipmentRepairVO equipmentRepairVO) { 355 public Map<String, Object> statistics(EquipmentRepairVO equipmentRepairVO) {
317 Map<String,Object> statisticsMap = new HashMap<String,Object>(); 356 Map<String,Object> statisticsMap = new HashMap<String,Object>();
318 //初始化 357 //初始化
......
sk-module-flow/pom.xml
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 <dependency> 14 <dependency>
15 <groupId>com.kingtroldata</groupId> 15 <groupId>com.kingtroldata</groupId>
16 <artifactId>flow</artifactId> 16 <artifactId>flow</artifactId>
17 <version>2.0.3</version> 17 <version>2.0.9</version>
18 </dependency> 18 </dependency>
19 </dependencies> 19 </dependencies>
20 </project> 20 </project>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!