From 9f85ccad47ecd367f5c365fbb5d40ee98e083b0c Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 02 六月 2025 10:32:17 +0800
Subject: [PATCH] art: 字段转译 null 问题解决
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java | 101 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 90 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
index 3f89858..2014997 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
@@ -10,15 +10,21 @@
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.*;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.mapper.EamReportRepairMapper;
import org.jeecg.modules.eam.request.EamReportRepairQuery;
import org.jeecg.modules.eam.service.IEamEquipmentExtendService;
+import org.jeecg.modules.eam.service.IEamEquipmentFaultReasonService;
import org.jeecg.modules.eam.service.IEamReportRepairService;
+import org.jeecg.modules.eam.vo.EquipmentRepairListVO;
import org.jeecg.modules.eam.vo.EquipmentRepairStatistics;
+import org.jeecg.modules.eam.vo.EquipmentRepairStatusStatistics;
+import org.jeecg.modules.eam.vo.FaultTypeStatisticsVO;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -41,27 +47,75 @@
private IEamEquipmentExtendService eamEquipmentExtendService;
@Autowired
private IMdcProductionService mdcProductionService;
+ @Autowired
+ private IEamEquipmentFaultReasonService eamEquipmentFaultReasonService;
/**
* 鍒嗛〉鍒楄〃
*
* @param page
- * @param eamReportRepairQuery
+ * @param query
* @return
*/
@Override
- public IPage<EamReportRepair> pageList(Page<EamReportRepair> page, EamReportRepairQuery eamReportRepairQuery) {
+ public IPage<EamReportRepair> pageList(Page<EamReportRepair> page, EamReportRepairQuery query) {
+ QueryWrapper<EamReportRepair> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("wmo.del_flag", CommonConstant.DEL_FLAG_0);
//鐢ㄦ埛鏁版嵁鏉冮檺
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (sysUser == null) {
return page;
}
- List<String> equipmentIds = new ArrayList<>();
if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
//閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
- equipmentIds = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ } else {
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
+ queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
}
- return this.baseMapper.pageList(page, eamReportRepairQuery, sysUser.getId(), equipmentIds);
+ //鏌ヨ鏉′欢杩囨护
+ if (query != null) {
+ if (StringUtils.isNotBlank(query.getEquipmentId())) {
+ queryWrapper.eq("wmo.equipment_id", query.getEquipmentId());
+ }
+ if (StringUtils.isNotBlank(query.getEquipmentCode())) {
+ queryWrapper.like("e.equipment_code", query.getEquipmentCode());
+ }
+ if (StringUtils.isNotBlank(query.getEquipmentName())) {
+ queryWrapper.like("e.equipment_name", query.getEquipmentName());
+ }
+ if (StringUtils.isNotBlank(query.getBreakdownFlag())) {
+ queryWrapper.eq("wmo.breakdown_flag", query.getBreakdownFlag());
+ }
+ if (StringUtils.isNotBlank(query.getReportStatus())) {
+ queryWrapper.eq("wmo.report_status", query.getReportStatus());
+ }
+ if (StringUtils.isNotBlank(query.getFaultDescription())) {
+ queryWrapper.like("wmo.fault_description", query.getFaultDescription());
+ }
+ if(query.getStartTime() != null && query.getEndTime() != null) {
+ queryWrapper.between("wmo.fault_start_time", query.getStartTime(), query.getEndTime());
+ }
+ //鎺掑簭
+ if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) {
+ String column = query.getColumn();
+ if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
+ column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
+ }
+ if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(query.getOrder())) {
+ queryWrapper.orderByAsc("wmo." + oConvertUtils.camelToUnderline(column));
+ } else {
+ queryWrapper.orderByDesc("wmo." + oConvertUtils.camelToUnderline(column));
+ }
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+
+ return baseMapper.queryPageList(page, queryWrapper);
}
@Override
@@ -73,15 +127,20 @@
sb.append(detail.getItemCode()).append("銆�");
sb.append(detail.getExceptionDescription()).append(";");
});
+ EamEquipmentFaultReason reason = eamEquipmentFaultReasonService.selectByFaultCode(BusinessCodeConst.EFR20250009);
EamReportRepair entity = new EamReportRepair();
entity.setEquipmentId(equipmentId);
entity.setCreateBy(reportUser);
entity.setFaultStartTime(new Date());
entity.setBreakdownFlag(CommonConstant.DEFAULT_0);
entity.setDelFlag(CommonConstant.DEL_FLAG_0);
- entity.setFaultName("鍛ㄤ繚鎵ц鎶ヤ慨澶勭悊");
- entity.setFaultDescription(sb.toString());
- entity.setFaultType(CommonConstant.DEFAULT_1);
+ if(reason == null){
+ entity.setFaultName("鍛ㄤ繚鎵ц鎶ヤ慨澶勭悊");
+ entity.setFaultDescription(sb.toString());
+ }else {
+ entity.setFaultName(reason.getFaultName());
+ entity.setFaultType(reason.getFaultCategory());
+ }
entity.setReportStatus(ReportRepairEnum.WAIT_REPAIR.name());
this.baseMapper.insert(entity);
//鏇存柊璁惧缁翠慨鐘舵��
@@ -98,15 +157,20 @@
sb.append(detail.getItemCode()).append("銆�");
sb.append(detail.getExceptionDescription()).append(";");
});
+ EamEquipmentFaultReason reason = eamEquipmentFaultReasonService.selectByFaultCode(BusinessCodeConst.EFR20250010);
EamReportRepair entity = new EamReportRepair();
entity.setEquipmentId(equipmentId);
entity.setCreateBy(reportUser);
entity.setFaultStartTime(new Date());
entity.setBreakdownFlag(CommonConstant.DEFAULT_0);
entity.setDelFlag(CommonConstant.DEL_FLAG_0);
- entity.setFaultName("鐐规鎵ц鎶ヤ慨澶勭悊");
- entity.setFaultDescription(sb.toString());
- entity.setFaultType(CommonConstant.DEFAULT_1);
+ if(reason == null){
+ entity.setFaultName("鐐规鎵ц鎶ヤ慨澶勭悊");
+ entity.setFaultDescription(sb.toString());
+ }else {
+ entity.setFaultName(reason.getFaultName());
+ entity.setFaultType(reason.getFaultCategory());
+ }
entity.setReportStatus(ReportRepairEnum.WAIT_REPAIR.name());
this.baseMapper.insert(entity);
//鏇存柊璁惧缁翠慨鐘舵��
@@ -177,4 +241,19 @@
}
return list;
}
+
+ @Override
+ public EquipmentRepairStatusStatistics repairStatusStatistics() {
+ return this.baseMapper.repairStatusStatistics();
+ }
+
+ @Override
+ public List<EquipmentRepairListVO> repairList() {
+ return this.baseMapper.repairList();
+ }
+
+ @Override
+ public List<FaultTypeStatisticsVO> faultTypeStatistics(String start, String end) {
+ return this.baseMapper.faultTypeStatistics(start, end);
+ }
}
--
Gitblit v1.9.3