lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyListDto.java
@@ -30,6 +30,10 @@ * 设备类型 */ private String equipmentType; /** * 设备型号 */ private String equipmentModel; /** * 利用率数据 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyShiftListDto.java
@@ -34,6 +34,10 @@ */ private String shiftSubName; /** * 设备型号 */ private String equipmentModel; /** * 利用率数据 */ private List<MdcEfficiencyShiftResultDto> dataList; lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquDepDto.java
@@ -36,4 +36,8 @@ * 设备类型 */ private String equipmentType; /** * 设备型号 */ private String equipmentModel; } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquProDto.java
@@ -37,5 +37,9 @@ * 设备类型 */ private String equipmentType; /** * 设备型号 */ private String equipmentModel; } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
@@ -167,4 +167,11 @@ @TableField(exist = false) @ApiModelProperty(value = "选择的产线id集合") private String selectedProduction; /** * 重要程度 */ @Dict(dicCode = "device_importance_level") @ApiModelProperty(value = "重要程度") private Integer deviceImportanceLevel; } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
@@ -37,6 +37,9 @@ <if test="vo.deviceCategory != null and vo.deviceCategory != '' "> AND t2.device_category = #{vo.deviceCategory} </if> <if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' "> AND t2.device_importance_level = #{vo.deviceImportanceLevel} </if> <if test="vo.equipmentIdList != null and vo.equipmentIdList.size() > 0 "> AND t2.equipment_id IN <foreach collection="vo.equipmentIdList" item="id" index="index" open="(" close=")" separator=","> @@ -83,6 +86,9 @@ </if> <if test="vo.deviceCategory != null and vo.deviceCategory != '' "> AND t2.device_category = #{vo.deviceCategory} </if> <if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' "> AND t2.device_importance_level = #{vo.deviceImportanceLevel} </if> <if test="vo.equipmentIdList != null and vo.equipmentIdList.size() > 0 "> AND t2.equipment_id IN @@ -137,6 +143,9 @@ <if test="vo.deviceCategory != null and vo.deviceCategory != '' "> AND t2.device_category = #{vo.deviceCategory} </if> <if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' "> AND t2.device_importance_level = #{vo.deviceImportanceLevel} </if> </where> GROUP BY t2.equipment_id, lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
@@ -132,7 +132,8 @@ sd.org_type, me.equipment_id, me.equipment_name, me.equipment_type me.equipment_type, me.equipment_model FROM mdc_equipment_depart med LEFT JOIN sys_depart sd ON med.dep_id = sd.id @@ -155,7 +156,8 @@ mp.org_type, me.equipment_id, me.equipment_name, me.equipment_type me.equipment_type, me.equipment_model FROM mdc_production_equipment mpe LEFT JOIN mdc_production mp ON mpe.production_id = mp.id lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml
@@ -73,6 +73,9 @@ #{ equipmentType } </foreach> </if> <if test="mdcOverallEquipmentEfficiency.deviceImportanceLevel != null and mdcOverallEquipmentEfficiency.deviceImportanceLevel != '' "> AND t2.device_importance_level = #{mdcOverallEquipmentEfficiency.deviceImportanceLevel} </if> </where> </select> </mapper> lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
@@ -123,6 +123,7 @@ mdcEfficiencyListDto.setEquipmentId(mdcEquDepDto.getEquipmentId()); mdcEfficiencyListDto.setEquipmentName(mdcEquDepDto.getEquipmentName()); mdcEfficiencyListDto.setEquipmentType(mdcEquDepDto.getEquipmentType()); mdcEfficiencyListDto.setEquipmentModel(mdcEquDepDto.getEquipmentModel()); switch (mdcEquDepDto.getOrgType()) { case "1": mdcEfficiencyListDto.setLevel1(mdcEquDepDto.getDepartName()); @@ -212,6 +213,7 @@ mdcEfficiencyListDto.setEquipmentId(mdcEquProDto.getEquipmentId()); mdcEfficiencyListDto.setEquipmentName(mdcEquProDto.getEquipmentName()); mdcEfficiencyListDto.setEquipmentType(mdcEquProDto.getEquipmentType()); mdcEfficiencyListDto.setEquipmentModel(mdcEquProDto.getEquipmentModel()); switch (mdcEquProDto.getOrgType()) { case "1": mdcEfficiencyListDto.setLevel1(mdcEquProDto.getProductionName()); @@ -471,6 +473,7 @@ mdcEfficiencyListDto.setEquipmentId(mdcEquDepDto.getEquipmentId()); mdcEfficiencyListDto.setEquipmentName(mdcEquDepDto.getEquipmentName()); mdcEfficiencyListDto.setEquipmentType(mdcEquDepDto.getEquipmentType()); mdcEfficiencyListDto.setEquipmentModel(mdcEquDepDto.getEquipmentModel()); switch (mdcEquDepDto.getOrgType()) { case "1": mdcEfficiencyListDto.setLevel1(mdcEquDepDto.getDepartName()); @@ -560,6 +563,7 @@ mdcEfficiencyListDto.setEquipmentId(mdcEquProDto.getEquipmentId()); mdcEfficiencyListDto.setEquipmentName(mdcEquProDto.getEquipmentName()); mdcEfficiencyListDto.setEquipmentType(mdcEquProDto.getEquipmentType()); mdcEfficiencyListDto.setEquipmentModel(mdcEquProDto.getEquipmentModel()); switch (mdcEquProDto.getOrgType()) { case "1": mdcEfficiencyListDto.setLevel1(mdcEquProDto.getProductionName()); @@ -841,6 +845,7 @@ mdcEfficiencyShiftListDto.setEquipmentId(mdcEquDepDto.getEquipmentId()); mdcEfficiencyShiftListDto.setEquipmentName(mdcEquDepDto.getEquipmentName()); mdcEfficiencyShiftListDto.setEquipmentType(mdcEquDepDto.getEquipmentType()); mdcEfficiencyShiftListDto.setEquipmentModel(mdcEquDepDto.getEquipmentModel()); mdcEfficiencyShiftListDto.setShiftSubName(shiftSubName); switch (mdcEquDepDto.getOrgType()) { case "1": @@ -952,6 +957,7 @@ mdcEfficiencyShiftListDto.setEquipmentId(mdcEquProDto.getEquipmentId()); mdcEfficiencyShiftListDto.setEquipmentName(mdcEquProDto.getEquipmentName()); mdcEfficiencyShiftListDto.setEquipmentType(mdcEquProDto.getEquipmentType()); mdcEfficiencyShiftListDto.setEquipmentModel(mdcEquProDto.getEquipmentModel()); mdcEfficiencyShiftListDto.setShiftSubName(shiftSubName); switch (mdcEquProDto.getOrgType()) { case "1": lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportQueryVo.java
@@ -58,5 +58,9 @@ * 设备种类 */ private String deviceCategory; /** * 重要程度 */ private Integer deviceImportanceLevel; } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportShiftQueryVo.java
@@ -61,5 +61,9 @@ * 设备种类 */ private String deviceCategory; /** * 重要程度 */ private Integer deviceImportanceLevel; } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcOverallEquipmentEfficiencyVo.java
@@ -70,4 +70,9 @@ private List<String> equipmentTypeList; /** * 重要程度 */ private Integer deviceImportanceLevel; }
