From 88923d1b22963cd7f7e82aafbc21eec250d2f628 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Fri, 11 Jul 2025 09:10:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=91=98=EF=BC=8C=E5=BA=93?=
 =?UTF-8?q?=E7=AE=A1=E5=91=98=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sgzb/app/service/impl/TmTaskServiceImpl.java    |  4 ++--
 .../java/com/bonus/sgzb/base/domain/RepairTask.java |  7 +++++++
 .../resources/mapper/base/MaintenanceGangMapper.xml |  3 +++
 .../src/main/resources/mapper/base/RepairMapper.xml | 13 +++++++------
 .../resources/mapper/base/WarehouseKeeperMapper.xml |  3 +++
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
index 999c5c8..a2d99fe 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
@@ -459,7 +459,7 @@ public class TmTaskServiceImpl implements TmTaskService {
     public List<TmTask> getLeaseAuditList(TmTask record) {
         Set<String> roles = SecurityUtils.getLoginUser().getRoles();
         List<TmTask> tmTaskList;
-        if (roles.contains(STRING_ADMIN)) {
+        if (roles.contains(STRING_ADMIN) || roles.contains("sysadmin")) {
             tmTaskList = tmTaskMapper.getAuditListByLeaseTmTask(record);
         } else {
             long username = SecurityUtils.getLoginUser().getUserid();
@@ -705,7 +705,7 @@ public class TmTaskServiceImpl implements TmTaskService {
     public List<TmTask> getLeaseOutListByUser(TmTask task) {
         Set<String> roles = SecurityUtils.getLoginUser().getRoles();
         List<TmTask> tmTaskList;
-        if (roles.contains(STRING_ADMIN)) {
+        if (roles.contains(STRING_ADMIN) || roles.contains("sysadmin")) {
             tmTaskList = tmTaskMapper.getLeaseOutList(task);
 
         } else {
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java
index 37db4fd..8bfc7fa 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java
@@ -138,6 +138,13 @@ public class RepairTask {
     @Excel(name = "已维修数量",sort = 4)
     private int repairFinishNum;
 
+    /**
+     * 待维修数量
+     */
+    @ApiModelProperty(value = "待维修数量")
+    @Excel(name = "已维修数量",sort = 5)
+    private int repairNotFinishNum;
+
     /**
      * 技术鉴定
      */
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaintenanceGangMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaintenanceGangMapper.xml
index 19d9db4..1328384 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaintenanceGangMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaintenanceGangMapper.xml
@@ -41,6 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="typeName != null and typeName != ''">
             AND mt2.type_name like concat('%', #{typeName}, '%')
         </if>
+        <if test="userName != null and userName != ''">
+            AND su.nick_name like concat('%', #{userName}, '%')
+        </if>
         ORDER BY su.user_id DESC, mt.type_id DESC
     </select>
 
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml
index 6f5fb1e..2fe213a 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml
@@ -265,6 +265,7 @@
         mt.type_name as typeName,
         sum(rd.repair_num) as repairNum,
         sum(rd.repaired_num + rd.scrap_num) as repairFinishNum,
+        sum(rd.repair_num) - sum(rd.repaired_num + rd.scrap_num) as repairNotFinishNum,
         GROUP_CONCAT(DISTINCT rd.repair_remark SEPARATOR ',') as repairRemark,
         mt.manage_type as manageType
         from
@@ -282,9 +283,9 @@
         <if test="userId != null and userId != ''">
             and mtr.user_id = #{userId}
         </if>
-        <if test="companyId != null and companyId != ''">
-            and rd.company_id = #{companyId}
-        </if>
+<!--        <if test="companyId != null and companyId != ''">-->
+<!--            and rd.company_id = #{companyId}-->
+<!--        </if>-->
         group by mt.type_id
         order by mt.type_id
     </select>
@@ -462,9 +463,9 @@
         <if test="userId != null and userId != ''">
             and mtr.user_id = #{userId}
         </if>
-        <if test="companyId != null and companyId != ''">
-            and rad.company_id = #{companyId}
-        </if>
+<!--        <if test="companyId != null and companyId != ''">-->
+<!--            and rad.company_id = #{companyId}-->
+<!--        </if>-->
         <if test="code !=null and  code != ''">
             AND mm.ma_code like concat('%',#{code},'%')
         </if>
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/WarehouseKeeperMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
index ce2c5db..3609960 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
@@ -36,6 +36,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="typeName != null and typeName != ''">
             AND mt2.type_name like concat('%', #{typeName}, '%')
         </if>
+        <if test="userName != null and userName != ''">
+            AND su.nick_name like concat('%', #{userName}, '%')
+        </if>
         ORDER BY su.user_id DESC, mt.type_id DESC
     </select>