lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
@@ -31,6 +31,12 @@ <if test="vo.driveType != null and vo.driveType != '' "> AND t2.drive_type = #{ vo.driveType } </if> <if test="vo.deviceLevel != null and vo.deviceLevel != '' "> AND t2.device_level = #{vo.deviceLevel} </if> <if test="vo.deviceCategory != null and vo.deviceCategory != '' "> AND t2.device_category = #{vo.deviceCategory} </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=","> @@ -71,6 +77,12 @@ </if> <if test="vo.driveType != null and vo.driveType != '' "> AND t2.drive_type = #{ vo.driveType } </if> <if test="vo.deviceLevel != null and vo.deviceLevel != '' "> AND t2.device_level = #{vo.deviceLevel} </if> <if test="vo.deviceCategory != null and vo.deviceCategory != '' "> AND t2.device_category = #{vo.deviceCategory} </if> <if test="vo.equipmentIdList != null and vo.equipmentIdList.size() > 0 "> AND t2.equipment_id IN @@ -119,6 +131,12 @@ <if test="vo.driveType != null and vo.driveType != '' "> AND t2.drive_type = #{ vo.driveType } </if> <if test="vo.deviceLevel != null and vo.deviceLevel != '' "> AND t2.device_level = #{vo.deviceLevel} </if> <if test="vo.deviceCategory != null and vo.deviceCategory != '' "> AND t2.device_category = #{vo.deviceCategory} </if> </where> GROUP BY t2.equipment_id, lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
@@ -238,6 +238,12 @@ <if test="mdcEquipment.driveType != null and mdcEquipment.driveType != '' "> AND t1.drive_type = #{mdcEquipment.driveType} </if> <if test="mdcEquipment.deviceLevel != null and mdcEquipment.deviceLevel != '' "> AND t1.device_level = #{mdcEquipment.deviceLevel} </if> <if test="mdcEquipment.deviceCategory != null and mdcEquipment.deviceCategory != '' "> AND t1.device_category = #{mdcEquipment.deviceCategory} </if> <if test="mdcEquipment.productionIds != null and mdcEquipment.productionIds.size() > 0 "> AND t3.id IN <foreach collection="mdcEquipment.productionIds" index="index" item="id" open="(" separator="," close=")"> lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml
@@ -52,6 +52,12 @@ <if test="mdcOverallEquipmentEfficiency.driveType != null and mdcOverallEquipmentEfficiency.driveType != ''"> AND t2.drive_type = #{ mdcOverallEquipmentEfficiency.driveType } </if> <if test="mdcOverallEquipmentEfficiency.deviceLevel != null and mdcOverallEquipmentEfficiency.deviceLevel != ''"> AND t2.device_level = #{ mdcOverallEquipmentEfficiency.deviceLevel } </if> <if test="mdcOverallEquipmentEfficiency.deviceCategory != null and mdcOverallEquipmentEfficiency.deviceCategory != ''"> AND t2.device_category = #{ mdcOverallEquipmentEfficiency.deviceCategory } </if> </where> </select> </mapper> lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessCountMapper.xml
@@ -28,6 +28,12 @@ <if test="mdcProcessCountVo.driveType != null and mdcProcessCountVo.driveType != ''"> AND t2.drive_type = #{ mdcProcessCountVo.driveType } </if> <if test="mdcProcessCountVo.deviceLevel != null and mdcProcessCountVo.deviceLevel != ''"> AND t2.device_level = #{ mdcProcessCountVo.deviceLevel } </if> <if test="mdcProcessCountVo.deviceCategory != null and mdcProcessCountVo.deviceCategory != ''"> AND t2.device_category = #{ mdcProcessCountVo.deviceCategory } </if> <if test="mdcProcessCountVo.startTime != null and mdcProcessCountVo.startTime != '' and mdcProcessCountVo.endTime != '' and mdcProcessCountVo.endTime != null"> AND t1.the_date BETWEEN #{ mdcProcessCountVo.startTime } AND #{ mdcProcessCountVo.endTime } </if> lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportQueryVo.java
@@ -50,5 +50,13 @@ * 驱动类型 */ private String driveType; /** * 设备级别 */ private String deviceLevel; /** * 设备种类 */ private String deviceCategory; } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportShiftQueryVo.java
@@ -53,5 +53,13 @@ * 驱动类型 */ private String driveType; /** * 设备级别 */ private String deviceLevel; /** * 设备种类 */ private String deviceCategory; } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentVo.java
@@ -16,6 +16,8 @@ private String equipmentName; private String equipmentModel; private String equipmentType; private String deviceLevel; private String deviceCategory; private String driveType; private String productionName; private List<String> productionIds; lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcOverallEquipmentEfficiencyVo.java
@@ -49,10 +49,13 @@ * 驱动类型 */ private String driveType; /** * 设备级别 */ private String deviceLevel; /** * 设备种类 */ private String deviceCategory; } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcProcessCountVo.java
@@ -20,4 +20,12 @@ private String parentId; private String typeTree; private List<String> mdcSectionIds; /** * 设备级别 */ private String deviceLevel; /** * 设备种类 */ private String deviceCategory; }
