From ffbe56adb587d25164daaf5e0b0649d7e4fab4cf Mon Sep 17 00:00:00 2001
From: "1539530615@qq.com" <1539530615@qq.com>
Date: Tue, 23 Jan 2024 09:20:54 +0800
Subject: [PATCH] =?UTF-8?q?app=E6=8C=89=E9=92=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/app/AppMenuMapper.xml      | 3 ++-
 .../service/impl/RepairAuditDetailsServiceImpl.java      | 9 ---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/AppMenuMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/AppMenuMapper.xml
index ff9e814d..51e3475a 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/AppMenuMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/AppMenuMapper.xml
@@ -27,7 +27,8 @@
     <select id="getMenuById" resultType="com.bonus.sgzb.app.domain.AppMenu">
         select amu.id,
                amu.menu_id as menuId,
-               am.icon_name as iconName
+               am.icon_name as iconName,
+               am.icon_mark as iconMark
         from app_menu_user amu
         left join app_menu am on am.id = amu.menu_id
         where user_id = #{userId}
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
index 33ed78bd..cddf54a1 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
@@ -182,8 +182,6 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
                     taskStatus = 53;
                     taskType = 50;
                     long inputTaskId =  genTask(taskCode,taskType,taskStatus,tmTaskAgreement,companyId);
-
-
                     for (RepairAuditDetails inputDetails : repairInputList) {
                         Long typeId = inputDetails.getTypeId();
                         Long maId = inputDetails.getMaId();
@@ -207,7 +205,6 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
                     }
                 }
                 if(scrapNumList != null && scrapNumList.size() > 0){
-
                     companyId = scrapNumList.get(0).getCompanyId();
                     taskCode = purchaseCodeRule("BF",57);
                     taskStatus = 58;
@@ -216,14 +213,10 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
                     for (RepairAuditDetails scrapDetails : scrapNumList) {
                         Long typeId = scrapDetails.getTypeId();
                         Long maId = scrapDetails.getMaId();
-                        BigDecimal repairNum = scrapDetails.getRepairedNum();
                         BigDecimal b = new BigDecimal(0);
-
-
                         // 创建报废任务
                         BigDecimal scrapNum = scrapDetails.getScrapNum();
                         if (scrapNum.compareTo(b) > 0) {
-
                             // 添加退料任务
                             ScrapApplyDetails scrapApplyDetails = new ScrapApplyDetails();
                             scrapApplyDetails.setTaskId(scrapTaskId);
@@ -236,12 +229,10 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
                             scrapApplyDetails.setCreateById(SecurityUtils.getUserId());
                             scrapApplyDetails.setCreateTime(new Date());
                             scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails);
-
                         }
                     }
 
                 }
-
                 // 修饰审核通过时改修任务为已通过审核
                 task1.setTaskStatus(47);
                 task1.setUpdateTime(new Date());