update:
This commit is contained in:
		@@ -90,7 +90,8 @@ public class ScreenController extends BaseController {
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
        return successful(kilnInfoList);
 | 
					        return successful(kilnInfoList);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					    @PostMapping(value = "getEleList")
 | 
				
			||||||
 | 
					    @ApiOperation(value = "获取加工炉最近十条加工任务电能消耗信息")
 | 
				
			||||||
    public R countEleByKiln(@Validated @RequestBody IdParam idParam) {
 | 
					    public R countEleByKiln(@Validated @RequestBody IdParam idParam) {
 | 
				
			||||||
        return eleService.list(idParam.getId());
 | 
					        return eleService.list(idParam.getId());
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -28,7 +28,7 @@ public class CountEleVo {
 | 
				
			|||||||
     * 消耗值
 | 
					     * 消耗值
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
    @ApiModelProperty(value = "消耗值", example = "0.0")
 | 
					    @ApiModelProperty(value = "消耗值", example = "0.0")
 | 
				
			||||||
    private Float value;
 | 
					    private Float totalBat;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * 名称
 | 
					     * 名称
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,28 +11,33 @@
 | 
				
			|||||||
    <resultMap id="BaseResultMap" type="com.mt.wms.empty.vo.CountEleVo">
 | 
					    <resultMap id="BaseResultMap" type="com.mt.wms.empty.vo.CountEleVo">
 | 
				
			||||||
        <id column="task_id" property="taskId"/>
 | 
					        <id column="task_id" property="taskId"/>
 | 
				
			||||||
        <result column="create_time" property="createTime"/>
 | 
					        <result column="create_time" property="createTime"/>
 | 
				
			||||||
        <result column="total_bat" property="value"/>
 | 
					        <result column="total_bat" property="totalBat"/>
 | 
				
			||||||
    </resultMap>
 | 
					    </resultMap>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <!-- 根据角色查询菜单,角色已分配的菜单标记为选中状态 -->
 | 
					    <!-- 根据角色查询菜单,角色已分配的菜单标记为选中状态 -->
 | 
				
			||||||
    <select id="list"
 | 
					    <select id="list"
 | 
				
			||||||
            resultType="com.mt.wms.empty.vo.CountEleVo">
 | 
					            resultType="com.mt.wms.empty.vo.CountEleVo">
 | 
				
			||||||
        SELECT menu.id        AS id,
 | 
					        select
 | 
				
			||||||
               menu.parent_id AS parentId,
 | 
					        tpev .task_id ,
 | 
				
			||||||
               menu.code      AS code,
 | 
					        tpev.total_bat,
 | 
				
			||||||
               menu.name      AS name,
 | 
					        tpev .create_time ,
 | 
				
			||||||
               menu.category  AS category,
 | 
					        tpev .kiln_id
 | 
				
			||||||
               menu.type      AS type,
 | 
					        from
 | 
				
			||||||
               menu.order_num AS orderNum,
 | 
					        t_par_ele_value tpev
 | 
				
			||||||
               roleMenu.id    AS checked
 | 
					        inner join(
 | 
				
			||||||
        FROM t_sys_menu AS menu
 | 
					        select
 | 
				
			||||||
                 LEFT JOIN t_sys_role_menu AS roleMenu ON menu.id = roleMenu.menu_id
 | 
					        max(total_bat) as total_bat ,
 | 
				
			||||||
            AND roleMenu.role_id = #{roleId}
 | 
					        task_id
 | 
				
			||||||
            AND roleMenu.valid = 1
 | 
					        from
 | 
				
			||||||
        WHERE menu.valid = 1
 | 
					        t_par_ele_value tpev2
 | 
				
			||||||
          AND menu.enabled = 1
 | 
					        group by
 | 
				
			||||||
          AND menu.category = #{category}
 | 
					        task_id
 | 
				
			||||||
        ORDER BY menu.order_num
 | 
					        )tpev3 on
 | 
				
			||||||
 | 
					        tpev .task_id = tpev3.task_id
 | 
				
			||||||
 | 
					        and tpev .total_bat = tpev3.total_bat
 | 
				
			||||||
 | 
					        where tpev .kiln_id =#{kilnId}
 | 
				
			||||||
 | 
					        order by tpev .create_time desc
 | 
				
			||||||
 | 
					        limit 10
 | 
				
			||||||
    </select>
 | 
					    </select>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user