代码提交

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppProjectMapper.xml

@@ -31,9 +31,11 @@
     <if test="temp!=null and temp.projectId != null and temp.projectId !=''">
       AND a.id  = #{temp.projectId}
     </if>
-    <if test="temp!=null and temp.engineeringId != null and temp.engineeringId !=''">
-      AND b.pid = #{temp.engineeringId}
-    </if>
+    AND b.pid in
+    <foreach collection='temp.engineeringIds' item='item' index="index" open='(' separator=',' close=')'>
+      #{item}
+    </foreach>
+
       <if test="temp!=null and temp.endTime != null and temp.endTime !=''">
           AND a.create_time &lt;= #{temp.endTime}"
       </if>

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml

@@ -39,7 +39,8 @@
         c.id equipmentId,
         c.name equipmentName,
         c.create_time createTime,
-        c.run_status
+        c.run_status,
+        c.mac mac
         FROM
         (select * from cs_ledger where LEVEL = 0 ) a,
         (select * from cs_ledger where LEVEL = 1 ) b,