From 58f63d0e061123b15f780d294272d8a461f183db Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 23 七月 2025 17:41:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportProductHazardsServiceImpl.java | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 169 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportProductHazardsServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportProductHazardsServiceImpl.java
new file mode 100644
index 0000000..2d0e9f1
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportProductHazardsServiceImpl.java
@@ -0,0 +1,169 @@
+package org.jeecg.modules.eam.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+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.dto.EamReportProductHazardsDto;
+import org.jeecg.modules.eam.entity.EamReportProductHazards;
+import org.jeecg.modules.eam.entity.EamReportRepair;
+import org.jeecg.modules.eam.mapper.EamReportProductHazardsMapper;
+import org.jeecg.modules.eam.request.EamReportProductHazardsQuery;
+import org.jeecg.modules.eam.service.IEamReportProductHazardsService;
+import org.jeecg.modules.eam.service.IEamReportRepairService;
+import org.jeecg.modules.system.entity.BaseFactory;
+import org.jeecg.modules.system.entity.BaseFactoryUser;
+import org.jeecg.modules.system.service.IBaseFactoryService;
+import org.jeecg.modules.system.service.IBaseFactoryUserService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @Description: 浜у搧瀹夊叏闅愭偅纭
+ * @Author: jeecg-boot
+ * @Date: 2025-07-17
+ * @Version: V1.0
+ */
+@Service("IEamReportProductHazardsService")
+public class EamReportProductHazardsServiceImpl extends ServiceImpl<EamReportProductHazardsMapper, EamReportProductHazards> implements IEamReportProductHazardsService {
+
+ @Autowired
+ private IBaseFactoryUserService baseFactoryUserService;
+ @Autowired
+ private IBaseFactoryService baseFactoryService;
+ @Autowired
+ @Lazy
+ private IEamReportRepairService iEamReportRepairService;
+
+ /**
+ * 鍒嗛〉鍒楄〃
+ * @param page
+ * @param eamReportProductHazardsQuery
+ * @return
+ */
+ @Override
+ public IPage<EamReportProductHazardsQuery> pageList(Page<EamReportProductHazardsQuery> page, EamReportProductHazardsQuery eamReportProductHazardsQuery){
+ QueryWrapper<EamReportProductHazardsQuery> queryWrapper = new QueryWrapper<>();
+ //鐢ㄦ埛鏁版嵁鏉冮檺
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ return page;
+ }
+ if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) {
+ //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+ List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ } else {
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹腑蹇冭繃婊よ澶�
+ List<BaseFactoryUser> baseFactoryUserList = baseFactoryUserService.
+ list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId, sysUser.getId()));
+ if (!CollectionUtils.isEmpty(baseFactoryUserList)) {
+ Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
+ Set<String> factoryCode = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
+ queryWrapper.in("e.factory_org_code", factoryCode);
+ } else {
+ return page;
+ }
+ }
+ //鏌ヨ鏉′欢杩囨护
+ if (eamReportProductHazardsQuery != null) {
+ if (StringUtils.isNotBlank(eamReportProductHazardsQuery.getEquipmentId())) {
+ queryWrapper.eq("erph.equipment_id", eamReportProductHazardsQuery.getEquipmentId());
+ }
+ if (StringUtils.isNotBlank(eamReportProductHazardsQuery.getEquipmentCode())) {
+ queryWrapper.like("e.equipment_code", eamReportProductHazardsQuery.getEquipmentCode());
+ }
+ if (StringUtils.isNotBlank(eamReportProductHazardsQuery.getEquipmentName())) {
+ queryWrapper.like("e.equipment_name", eamReportProductHazardsQuery.getEquipmentName());
+ }
+ //鎺掑簭
+ if (StringUtils.isNotBlank(eamReportProductHazardsQuery.getColumn()) && StringUtils.isNotBlank(eamReportProductHazardsQuery.getOrder())) {
+ String column = eamReportProductHazardsQuery.getColumn();
+ if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
+ column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
+ }
+ if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(eamReportProductHazardsQuery.getOrder())) {
+ queryWrapper.orderByAsc("erph." + oConvertUtils.camelToUnderline(column));
+ } else {
+ queryWrapper.orderByDesc("erph." + oConvertUtils.camelToUnderline(column));
+ }
+ } else {
+ queryWrapper.orderByDesc("erph.create_time");
+ }
+ } else {
+ queryWrapper.orderByDesc("erph.create_time");
+ }
+ return baseMapper.queryPageList(page, queryWrapper);
+ }
+
+ /**
+ * 鎿嶄綔宸ュ～鎶�
+ * @param eamReportProductHazardsDto
+ * @return
+ */
+ @Override
+ public boolean report(EamReportProductHazardsDto eamReportProductHazardsDto){
+ EamReportProductHazards eamReportProductHazards=this.getById(eamReportProductHazardsDto.getId());
+ if (eamReportProductHazards==null){
+ return false;
+ }
+ BeanUtils.copyProperties(eamReportProductHazardsDto,eamReportProductHazards);
+ this.updateById(eamReportProductHazards);
+ return true;
+ }
+
+ /**
+ * 鎿嶄綔宸ユ彁浜�-鍙戣捣娴佺▼
+ * @param id
+ * @return
+ */
+ @Override
+ public Result<?> submit(String id){
+ return null;
+ }
+
+ /**
+ * 鍒犻櫎
+ * @param id
+ * @return
+ */
+ @Override
+ public boolean cancelled(String id){
+ //鍙屾帶鏁呴殰鎶ヤ慨,浣滃簾鍚庢晠闅滀繚淇暟鎹悓姝ヤ慨鏀�
+ EamReportProductHazards eamReportProductHazards=this.getById(id);
+ if (eamReportProductHazards==null){
+ return false;
+ }
+ EamReportRepair eamReportRepair=iEamReportRepairService.getById(eamReportProductHazards.getReportId());
+ if (eamReportRepair==null) {
+ return false;
+ }
+ UpdateWrapper<EamReportRepair> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("id",eamReportRepair.getId());
+ updateWrapper.set("is_processed","2");
+ updateWrapper.set("batch_number",null);
+ updateWrapper.set("processing_part",null);
+ updateWrapper.set("quantity",null);
+ iEamReportRepairService.update(updateWrapper);
+ this.removeById(id);
+ return true;
+ }
+}
--
Gitblit v1.9.3