fix

virgo.api/src/main/java/com/bosshand/virgo/api/operate/model/OperateFlowData.java

@@ -29,6 +29,11 @@ public class OperateFlowData {
 
     private long deviceId;
 
+    /**
+     * DTO-设备信息
+     */
+    private OperateDevice operateDevice;
+
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date date;
 
@@ -136,6 +141,14 @@ public class OperateFlowData {
         this.deviceId = deviceId;
     }
 
+    public OperateDevice getOperateDevice() {
+        return operateDevice;
+    }
+
+    public void setOperateDevice(OperateDevice operateDevice) {
+        this.operateDevice = operateDevice;
+    }
+
     public Date getDate() {
         return date;
     }

virgo.api/src/main/resources/mapper/OperateFlowDataMapper.xml

@@ -24,10 +24,35 @@
         <result column="attachment" property="attachment" />
         <result column="flowType" property="flowType" />
         <result column="type" property="type" />
+        <collection property="operateDevice" ofType="com.bosshand.virgo.api.operate.model.OperateDevice" resultMap="com.bosshand.virgo.api.operate.dao.OperateDeviceDao.OperateDeviceResult" columnPrefix="d_"/>
     </resultMap>
 
     <sql id="query">
-        SELECT a.*, b.name as createdByUserName, b.portrait as createdByUserPortrait FROM operate_flow_data a left join mgr_user b on a.createdByUserId = b.id
+        SELECT a.*,
+               b.name as createdByUserName,
+               b.portrait as createdByUserPortrait,
+               c.id as d_id,
+               c.operateDeviceLevelId as d_operateDeviceLevelId,
+               c.projectId as d_projectId,
+               c.projectItemId as d_projectItemId,
+               c.projectItemTargetId as d_projectItemTargetId,
+               c.projectItemTargetRoomId as d_projectItemTargetRoomId,
+               c.name as d_name,
+               c.type as d_type,
+               c.designNumber as d_designNumber,
+               c.assetNumber as d_assetNumber,
+               c.deviceNumber as d_deviceNumber,
+               c.deviceBrand as d_deviceBrand,
+               c.deviceModel as d_deviceModel,
+               c.deviceSerialNumber as d_deviceSerialNumber,
+               c.attachment as d_attachment,
+               c.remark as d_remark,
+               c.document as d_document,
+               c.state as d_state
+        FROM operate_flow_data a
+        left join mgr_user b on a.createdByUserId = b.id
+        left join operate_device c on a.deviceId = c.id
+
     </sql>
 
     <select id="get" resultMap="operateFlowDataResult">