From 3cf3656f3d69a6021226c794e5d9e69d091f48c3 Mon Sep 17 00:00:00 2001 From: yangman <15045099937@qq.com> Date: 星期二, 04 七月 2023 11:21:28 +0800 Subject: [PATCH] 修改扭矩配置管理3 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java | 37 ++++++++++++++++++++++++++++++++++++- 1 files changed, 36 insertions(+), 1 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java index 513872c..324ab6b 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java @@ -9,13 +9,16 @@ import org.apache.poi.util.StringUtil; import org.jeecg.modules.mdc.entity.MdcTorqueConfig; import org.jeecg.modules.mdc.mapper.MdcTorqueConfigMapper; +import org.jeecg.modules.mdc.service.IMdcEquipmentService; import org.jeecg.modules.mdc.service.IMdcTorqueConfigService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -26,6 +29,8 @@ @Service public class MdcTorqueConfigServiceImpl extends ServiceImpl<MdcTorqueConfigMapper, MdcTorqueConfig> implements IMdcTorqueConfigService{ + @Autowired + private IMdcEquipmentService mdcEquipmentService; @Override public MdcTorqueConfig queryById(String id) { @@ -57,5 +62,35 @@ return this.baseMapper.findSpindleRunningCurve(torqueValue,equipmentId); } - + @Override + public IPage<MdcTorqueConfig> pageList(String userId, Page page, HttpServletRequest req, MdcTorqueConfig mdcTorqueConfig) { + List<String> equipmentIds=new ArrayList<>(); + if (StringUtils.isNotEmpty(mdcTorqueConfig.getParentId())&&StringUtils.isEmpty(mdcTorqueConfig.getEquipmentId())){ + if ("2".equals(mdcTorqueConfig.getTypeTree())){ + //閮ㄩ棬灞傜骇 + equipmentIds=mdcEquipmentService.getEquipmentIdsByDepart(userId,mdcTorqueConfig.getParentId()); + }else { + //浜х嚎灞傜骇 + equipmentIds=mdcEquipmentService.getEquipmentIdsProduction(userId,mdcTorqueConfig.getParentId()); + } + }else if (StringUtils.isNotEmpty(mdcTorqueConfig.getEquipmentId())){ + //鍗曞彴璁惧淇℃伅 + mdcTorqueConfig.setMdcSectionIds(Collections.singletonList(mdcTorqueConfig.getEquipmentId())); + }else { + //鏌ヨ鐢ㄦ埛鎵�鎷ユ湁鐨勬墍鏈夎澶囦俊鎭� + if ("2".equals(mdcTorqueConfig.getTypeTree())){ + //閮ㄩ棬灞傜骇 + equipmentIds=mdcEquipmentService.getEquipmentIdsByDepart(userId,null); + }else { + equipmentIds=mdcEquipmentService.getEquipmentIdsProduction(userId,null); + } + } + if (mdcTorqueConfig.getMdcSectionIds()==null||mdcTorqueConfig.getMdcSectionIds().isEmpty()){ + mdcTorqueConfig.setMdcSectionIds(equipmentIds); + } + if (mdcTorqueConfig.getMdcSectionIds()==null||mdcTorqueConfig.getMdcSectionIds().isEmpty()){ + return null; + } + return this.baseMapper.pageList(page,mdcTorqueConfig); + } } -- Gitblit v1.9.3