修改bug

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/isolationpoint/vo/BindingPointVO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import java.util.List;
 
 /**
- * 隔离点对象 is_isolation_point
+ * 隔离点对象 isc_isolation_point
  *
  * @author cgj
  * @date 2024-10-18

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/isolationpoint/vo/PointDetailVO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 隔离点对象 is_isolation_point
+ * 隔离点对象 isc_isolation_point
  *
  * @author cgj
  * @date 2024-10-18

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/lotostation/vo/PointsMapVO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * 工作区域对象 is_workarea
+ * 工作区域对象 isc_workarea
  *
  * @author cgj
  * @date 2024-10-18

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/materials/vo/MaterialBindingVO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import java.util.List;
 
 /**
- * 物资对象 is_materials
+ * 物资对象 isc_materials
  *
  * @author cgj
  * @date 2024-11-08

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/materials/vo/PropertyVO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * 物资对象 is_materials
+ * 物资对象 isc_materials
  *
  * @author cgj
  * @date 2024-11-08

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/materialscheckrecord/vo/CheckRecordParamVO.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import java.util.List;
 
 /**
- * 物资检查记录对象 is_materials_check_record
+ * 物资检查记录对象 isc_materials_check_record
  *
  * @author cgj
  * @date 2025-01-14

yudao-module-iscs/src/main/resources/mapper/BlacklistMapper.xml

@@ -35,7 +35,7 @@
         FROM
         system_users u
         <where>
-            u.id NOT IN (SELECT b.user_id FROM isc_blacklist b)
+            u.id NOT IN (SELECT b.user_id FROM sys_blacklist b)
             and u.deleted = 0
             <if test="vo.nickName != null and vo.nickName.trim != ''">
                 and (u.username like concat('%',#{dto.nickName},'%') or u.nickname like

yudao-module-iscs/src/main/resources/mapper/KeyMapper.xml

@@ -15,7 +15,7 @@
         h.hardware_name
         FROM
         isc_key k
-        LEFT JOIN is_hardware h ON k.hardware_id = h.id
+        LEFT JOIN isc_hardware h ON k.hardware_id = h.id
         <where>
             <if test="vo.keyCode != null and vo.keyCode.trim != ''">
                 and k.key_code like concat('%',#{vo.keyCode},'%')

yudao-module-iscs/src/main/resources/mapper/MaterialsChangeRecordMapper.xml

@@ -22,7 +22,7 @@
         m.materials_name as new_materials_name,
         m2.materials_name as old_materials_name
         FROM
-        is_materials_change_record c
+        isc_materials_change_record c
         LEFT JOIN isc_materials m ON m.id = c.new_materials_id
         LEFT JOIN isc_materials m2 ON m2.id = c.old_materials_id
         LEFT JOIN isc_materials_cabinet mc ON mc.id = m.materials_cabinet_id

yudao-module-iscs/src/main/resources/mapper/StatisticsMapper.xml

@@ -3,7 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.iocoder.yudao.module.iscs.dal.mysql.statistics.StatisticsMapper">
-<cache/>
+<!--<cache/>-->
     <select id="getCabinetStatistics" resultType="cn.iocoder.yudao.module.iscs.controller.admin.statistics.vo.CabinetStatisticsVO">
         SELECT
             c.id as cabinet_id,
@@ -25,7 +25,7 @@
                     </if>
                 </where>
                 GROUP BY o.cabinet_id ) op ON op.cabinet_id = c.id
-                LEFT JOIN (SELECT e.loan_from_id, count( e.misplace_id ) AS openex_count FROM sys_exception_misplace e
+                LEFT JOIN (SELECT e.loan_from_id, count( e.id ) AS openex_count FROM sys_exception_misplace e
                 <where>
                     e.exception_type = '1'
                     <if test="startTime != null and startTime.trim != ''">
@@ -36,7 +36,7 @@
                     </if>
                 </where>
                 GROUP BY e.loan_from_id ) ex ON ex.loan_from_id = c.id
-                LEFT JOIN (SELECT e.loan_from_id, count( e.misplace_id ) AS loanex_count FROM sys_exception_misplace e
+                LEFT JOIN (SELECT e.loan_from_id, count( e.id ) AS loanex_count FROM sys_exception_misplace e
                 <where>
                     e.exception_type = '0'
                     <if test="startTime != null and startTime.trim != ''">
@@ -61,7 +61,7 @@
         FROM
         isc_materials_type t
         LEFT JOIN ( SELECT m.materials_type_id, count( m.id ) AS all_count FROM isc_materials m WHERE m.materials_cabinet_id is not null GROUP BY m.materials_type_id ) a ON a.materials_type_id = t.id
-        LEFT JOIN (SELECT m.materials_type_id, count( m.id ) AS will_expire_count FROM isc_materials m WHERE m.materials_cabinet_id is not null and DATE_ADD( NOW(), INTERVAL 30 DAY ) &gt; m.expiration_date AND NOW() &lt; m.expiration_date GROUP BY m.materials_type_id) b ON b.materials_type_id = t.materials_type_id
+        LEFT JOIN (SELECT m.materials_type_id, count( m.id ) AS will_expire_count FROM isc_materials m WHERE m.materials_cabinet_id is not null and DATE_ADD( NOW(), INTERVAL 30 DAY ) &gt; m.expiration_date AND NOW() &lt; m.expiration_date GROUP BY m.materials_type_id) b ON b.materials_type_id = t.id
         LEFT JOIN (SELECT m.materials_type_id, count( m.id ) AS expired_count FROM isc_materials m WHERE m.materials_cabinet_id is not null and m.STATUS = '2' GROUP BY m.materials_type_id ) c ON c.materials_type_id = t.id
         LEFT JOIN (SELECT m.materials_type_id, count( m.id ) AS bad_count FROM isc_materials m WHERE m.materials_cabinet_id is not null and m.STATUS = '1' GROUP BY m.materials_type_id) d ON d.materials_type_id = t.id
         order by t.id asc
@@ -172,9 +172,9 @@
 
                 LEFT JOIN (
                 SELECT ma.materials_type_id, count( m.old_materials_id ) AS bad_count FROM
-                    is_materials_change_record m
-                        LEFT JOIN is_materials ma on ma.materials_id = m.old_materials_id
-                        LEFT JOIN is_materials_check_record mc on mc.id = m.check_record_id
+                    isc_materials_change_record m
+                        LEFT JOIN isc_materials ma on ma.id = m.old_materials_id
+                        LEFT JOIN isc_materials_check_record mc on mc.id = m.check_record_id
                     <where>
                         mc.reason = '1'
                         <if test="startTime != null and startTime.trim != ''">