2026-01-12

1、物料未维护模版清单页面的分页优化
2、系统日志管理页面，同时查询site = '*'的数据
3、标签变动记录页面，所有页签列表增加“合约号码”字段

src/main/java/com/gaotao/modules/report/dao/PartTemplateStatusMapper.java

@@ -21,5 +21,17 @@ public interface PartTemplateStatusMapper {
      * @return site列表
      */
     List<String> getAccessSiteList(@Param("userName") String userName);
+
+    /**
+     * 快速查询物料总数（不需要复杂JOIN，只查询Part表）
+     */
+    int queryPartCount(@Param("site") String site,
+                       @Param("partNo") String partNo,
+                       @Param("partDesc") String partDesc,
+                       @Param("spec") String spec,
+                       @Param("iqcExempt") String iqcExempt,
+                       @Param("ipqcExempt") String ipqcExempt,
+                       @Param("fqcExempt") String fqcExempt,
+                       @Param("oqcExempt") String oqcExempt);
 }
 

src/main/java/com/gaotao/modules/report/service/impl/PartTemplateStatusServiceImpl.java

@@ -97,8 +97,20 @@ public class PartTemplateStatusServiceImpl implements PartTemplateStatusService
 //                totalCount = dataList.size();
 //            }
 
-            log.info("查询物料模版状态完成，共{}条数据", dataList.size());
-            return new PageUtils(dataList,  dataList.size(), limit, page);
+            // 使用快速SQL查询总数（只查询Part表，不需要复杂的JOIN操作）
+            int totalCount = partTemplateStatusMapper.queryPartCount(
+                query.getSite(),
+                query.getPartNo(),
+                query.getPartDesc(),
+                query.getSpec(),
+                query.getIqcExempt(),
+                query.getIpqcExempt(),
+                query.getFqcExempt(),
+                query.getOqcExempt()
+            );
+
+            log.info("查询物料模版状态完成，当前页{}条，总共{}条", dataList.size(), totalCount);
+            return new PageUtils(dataList, totalCount, limit, page);
 
         } catch (Exception e) {
             log.error("查询物料模版状态异常", e);

src/main/resources/mapper/report/PartTemplateStatusMapper.xml

@@ -7,5 +7,45 @@
         SELECT site FROM AccessSite WHERE userID = #{userName}
     </select>
 
+    <!-- 快速查询物料总数（不需要复杂的JOIN，只查询Part表） -->
+    <select id="queryPartCount" resultType="int">
+        SELECT COUNT(1)
+        FROM Part A
+        WHERE A.Site = #{site}
+        <if test="partNo != null and partNo != ''">
+            AND A.PartNo LIKE '%' + #{partNo} + '%'
+        </if>
+        <if test="partDesc != null and partDesc != ''">
+            AND A.PartDescription LIKE '%' + #{partDesc} + '%'
+        </if>
+        <if test="spec != null and spec != ''">
+            AND A.Spec LIKE '%' + #{spec} + '%'
+        </if>
+        <if test="iqcExempt != null and iqcExempt != ''">
+            <choose>
+                <when test="iqcExempt == '是'">AND A.iqc_exempt = 'Y'</when>
+                <when test="iqcExempt == '否'">AND (A.iqc_exempt IS NULL OR A.iqc_exempt != 'Y')</when>
+            </choose>
+        </if>
+        <if test="ipqcExempt != null and ipqcExempt != ''">
+            <choose>
+                <when test="ipqcExempt == '是'">AND A.ipqc_exempt = 'Y'</when>
+                <when test="ipqcExempt == '否'">AND (A.ipqc_exempt IS NULL OR A.ipqc_exempt != 'Y')</when>
+            </choose>
+        </if>
+        <if test="fqcExempt != null and fqcExempt != ''">
+            <choose>
+                <when test="fqcExempt == '是'">AND A.fqc_exempt = 'Y'</when>
+                <when test="fqcExempt == '否'">AND (A.fqc_exempt IS NULL OR A.fqc_exempt != 'Y')</when>
+            </choose>
+        </if>
+        <if test="oqcExempt != null and oqcExempt != ''">
+            <choose>
+                <when test="oqcExempt == '是'">AND A.oqc_exempt = 'Y'</when>
+                <when test="oqcExempt == '否'">AND (A.oqc_exempt IS NULL OR A.oqc_exempt != 'Y')</when>
+            </choose>
+        </if>
+    </select>
+
 </mapper>
 

src/main/resources/mapper/sys/SystemLogDao.xml

@@ -34,7 +34,7 @@
         FROM api_log as a
         left join api_Interface as b on a.interface_name = b.interface_name AND a.site = b.site and a.bu_no = b.bu_no
         <where>
-            a.site in (select site from AccessSite where userID = #{userName})
+            (a.site in (select site from AccessSite where userID = #{userName}) OR a.site = '*')
             and a.bu_no in (select bu_no from AccessBu where username = #{userName})
             and type &lt;&gt; 'Interface'
             <if test="interfaceName != null and interfaceName.trim() != ''">
@@ -87,7 +87,7 @@
         FROM api_log as a
         left join api_Interface as b on a.interface_name = b.interface_name AND a.site = b.site
         <where>
-            a.site in (select site from AccessSite where userID = #{userName})
+            (a.site in (select site from AccessSite where userID = #{userName}) OR a.site = '*')
             and a.bu_no in (select bu_no from AccessBu where username = #{userName})
             and type &lt;&gt; 'Interface'
             <if test="interfaceName != null and interfaceName.trim() != ''">

src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml

@@ -15,6 +15,7 @@
             a.order_line_no as orderLineNo,
             a.roll_no AS rollNo,
             a.roll_qty AS rollQty,
+            a.batch_no AS batchNo,
             a.part_no AS partNo,
             a.warehouse_id as warehouseId,
             b.WareHouseName as warehouseName,