问题修改

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/domain/BackCsDeviceInfo.java

@@ -8,6 +8,7 @@ import java.util.Date;
 
 /**
  * 设备详情
+ *
  * @author ma_sh
  */
 @Data
@@ -88,4 +89,9 @@ public class BackCsDeviceInfo {
      * 创建人
      */
     private String createUser;
+
+
+    private String changeStatus;
+
+    private String changeUnit;
 }

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml

@@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         set status  = #{maStatus},
             in_num       = IFNULL(in_num, 0) - 1,
             available_num  = IFNULL(available_num, 0) + 1
-        WHERE code = #{devCode}
+        WHERE tool_code = #{devCode}
     </update>
 
     <update id="updateToolInfoNum">
@@ -102,10 +102,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="updateToolInfoRepair">
         UPDATE tool_ledger
-        set status  = #{maStatus},
-            in_num       = IFNULL(in_num, 0) - 1,
-            repair_num  = IFNULL(repair_num, 0) + 1
-        WHERE code = #{devCode}
+        set status     = #{maStatus},
+            in_num     = IFNULL(in_num, 0) - 1,
+            repair_num = IFNULL(repair_num, 0) + 1
+        WHERE tool_code = #{devCode}
     </update>
 
     <update id="updateToolInfoRepairNum">

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevInfoMapper.xml

@@ -321,16 +321,8 @@
         mdi.unit AS unit,
         mdq.next_check_time AS nextMaintenanceDate,
         mdi.max_working_hours AS maxServiceLifeYears,
-        ( SELECT COUNT(*) FROM cs_device_change_details WHERE dev_id = mdi.ma_id AND repair_time IS NOT NULL ) AS
-        repairCount,
-        (
-        SELECT
-        COUNT(*)
-        FROM
-        cs_device_change_details
-        WHERE
-        dev_id = mdi.ma_id
-        AND `status` IN ( 2, 3 )) AS usageCount,
+        0 AS repairCount,
+        0 AS usageCount,
         sc.name AS province
         from ma_dev_info mdi
         INNER JOIN ma_type_view mtv ON mtv.typeId = mdi.type_id