lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcOverallEquipmentEfficiency.java
@@ -1,5 +1,6 @@ package org.jeecg.modules.mdc.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -38,6 +39,13 @@ @ApiModelProperty(value = "设备名称") private String equipmentName; /** * 车间名称 */ @Excel(name = "车间名称", width = 15) @ApiModelProperty(value = "车间名称") @TableField(exist = false) private String productionName; /** * 设备型号 */ @Excel(name = "设备型号", width = 15) lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java
@@ -12,6 +12,8 @@ import org.jeecg.modules.mdc.service.*; import org.jeecg.modules.mdc.util.DateUtils; import org.jeecg.modules.mdc.vo.MdcOverallEquipmentEfficiencyVo; import org.jeecg.modules.system.entity.MdcProduction; import org.jeecg.modules.system.service.IMdcProductionService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -58,6 +60,9 @@ @Resource private IProcessCountService processCountService; @Resource private IMdcProductionService mdcProductionService; /** * 计算设备综合效率OEE */ @@ -98,6 +103,8 @@ mdcOverallEquipmentEfficiency.setEquipmentName(mdcEquipment.getEquipmentName()); mdcOverallEquipmentEfficiency.setEquipmentModel(mdcEquipment.getEquipmentModel()); mdcOverallEquipmentEfficiency.setValidDate(validDate); // // mdcOverallEquipmentEfficiency.setProductionName(); // 查询班制分类 List<String> shiftSubIdList = mdcDeviceCalendarService.findShiftSort(equipmentId, validDate); @@ -287,6 +294,38 @@ if (StringUtils.isNotEmpty(mdcOverallEquipmentEfficiencyVo.getDriveType())) { mdcOverallEquipmentEfficiencyVo.setDriveTypeList(Arrays.asList(mdcOverallEquipmentEfficiencyVo.getDriveType().split(","))); } return this.baseMapper.pageList(page, mdcOverallEquipmentEfficiencyVo); IPage<MdcOverallEquipmentEfficiency> mdcOverallEquipmentEfficiencyIPage = this.baseMapper.pageList(page, mdcOverallEquipmentEfficiencyVo); // List<MdcOverallEquipmentEfficiency> list = mdcOverallEquipmentEfficiencyIPage.getRecords(); for (MdcOverallEquipmentEfficiency mdcOverallEquipmentEfficiency : mdcOverallEquipmentEfficiencyIPage.getRecords()) { mdcOverallEquipmentEfficiency.setProductionName(this.findProductionName(mdcOverallEquipmentEfficiency.getEquipmentId())); } return mdcOverallEquipmentEfficiencyIPage; } /** * 递归查询设备车间名称 * * @param equipmentId * @return */ private String findProductionName(String equipmentId) { MdcProduction mdcProduction = mdcProductionService.findProductionList(equipmentId); if ("2".equals(mdcProduction.getOrgType())) { return mdcProduction.getProductionName(); } else { return this.findProductionNameById(mdcProduction.getParentId()); } } private String findProductionNameById(String parentId) { MdcProduction mdcProduction = mdcProductionService.getById(parentId); if ("2".equals(mdcProduction.getOrgType())) { return mdcProduction.getProductionName(); } else { return this.findProductionNameById(parentId); } } } lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/MdcProductionMapper.java
@@ -29,6 +29,7 @@ /** * 根据用户id和车间id获取用户拥有的车间id * * @param userId * @param productionId * @return @@ -37,8 +38,11 @@ /** * 根据用户id查询用户工段权限 * * @param userId * @return */ String findThreeProductionId(@Param("userId") String userId); MdcProduction findProductionList(@Param("equipmentId") String equipmentId); } lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/MdcProductionMapper.xml
@@ -31,4 +31,15 @@ <select id="findThreeProductionId" resultType="java.lang.String"> SELECT TOP 1 t2.id id FROM mdc_user_production t1 LEFT JOIN mdc_production t2 ON t1.pro_id = t2.id WHERE t1.user_id = #{userId} AND t2.org_type = '3' </select> <select id="findProductionList" resultType="org.jeecg.modules.system.entity.MdcProduction"> SELECT t1.* FROM mdc_production t1 LEFT JOIN mdc_production_equipment t2 ON t1.id = t2.production_id LEFT JOIN mdc_equipment t3 ON t3.id = t2.equipment_id WHERE t3.equipment_id = #{equipmentId} </select> </mapper> lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java
@@ -83,4 +83,11 @@ * 根据用户id查询用户工段权限 */ String findThreeProductionId(String userId); /** * * @param equipmentId * @return */ MdcProduction findProductionList(String equipmentId); } lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java
@@ -243,6 +243,11 @@ return this.baseMapper.findThreeProductionId(userId); } @Override public MdcProduction findProductionList(String equipmentId) { return this.baseMapper.findProductionList(equipmentId); } /** * delete 方法调用 递归查找子集id */
