调试设备异常分页查询功能。

imcs-bt-be/imcs-business-biz/src/main/java/com/github/zuihou/business/productionresource/dao/EquStatusMapper.java

@@ -26,15 +26,16 @@ public interface EquStatusMapper extends SuperMapper<EquStatus>
 			"SELECT " +
 			" bes.id, bes.status, bes.message, bes.create_time," +
 			" itp.name, itp.code, itp.place_id, itp.compnay_id, itp.area_id," +
-			" bp.plc_name, cca.full_name AS area " +
+			" bp.plc_name, cca.full_name AS area, org.label AS company " +
 			"FROM bt_equ_status bes " +
 			"LEFT JOIN imcs_tenant_productionresource itp ON bes.equ_id = itp.id " +
 			"LEFT JOIN bt_place bp ON itp.place_id = bp.id " +
 			"LEFT JOIN c_common_area cca ON cca.code LIKE CONCAT(itp.area_id, '%') " +
+			"LEFT JOIN c_core_org org on itp.org_id = org.id " +
 			"WHERE 1 = 1 " +
 			" <if test=\"null != params.beginTime\"> AND bes.create_time &gt; = #{params.beginTime}</if> " +
 			" <if test=\"null != params.endTime\"> AND bes.create_time &lt; = #{params.endTime}</if> " +
-			//" <if test=\"null != params.company and '' != params.company\"> AND ? LIKE ?</if> " +
+			" <if test=\"null != params.company and '' != params.company\"> AND org.label LIKE '%${params.company}%'</if> " +
 			"ORDER BY bes.create_time DESC" +
 		"</script>"
 	)

imcs-bt-be/imcs-business-entity/src/main/java/com/github/zuihou/business/productionresource/entity/EquStatus.java

@@ -45,13 +45,33 @@ public class EquStatus extends SuperEntity<String>
     @NotBlank(message = "缺失message参数")
     private String message;
 
-    // TODO 补充分页查询映射属性列表
+    /**
+     * 设备名称
+     */
     @TableField(exist = false)
     private String name;
 
+    /**
+     * 编号
+     */
     @TableField(exist = false)
     private String code;
 
+    /**
+     * 位置
+     */
+    @TableField(exist = false)
+    private String area;
+
+    /**
+     * 场地
+     */
     @TableField(exist = false)
     private String plcName;
+
+    /**
+     * 所属企业
+     */
+    @TableField(exist = false)
+    private String company;
 }