From 1c7b74efc953f28c1c0ba59a9a1fe540b0d2af7e Mon Sep 17 00:00:00 2001
From: "liang.chao" <liang.chao@ustcinfo.com>
Date: Tue, 2 Apr 2024 13:57:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java    | 2 +-
 .../com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java   | 5 ++---
 .../sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
index de5a7849..f9f174e9 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
@@ -229,7 +229,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
         if (record.getOutNum() == null || record.getOutNum() < outNum) {
             record.setOutNum(0.00);
         }
-        //先判断(ma_type 设备规格表)中的库存够不够出库的
+        //判断(ma_type 设备规格表)中的库存够不够出库的
         MaType maType = leaseOutDetailsMapper.selectByTypeId(record);
         if (maType != null) {
             if (maType.getNum() == null || maType.getNum().compareTo(BigDecimal.valueOf(record.getOutNum())) < 0) {
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
index 734b83a0..73dd2a7c 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
@@ -196,10 +196,9 @@ public class TmTaskServiceImpl implements TmTaskService {
     public int updateLeaseTaskAuditInfoCq(TmTask record) {
         int result = 0;
         if (StringUtils.isNotNull(record)) {
-            // 内部审核
-            // 管理员登录时审核
+            // 先修改任务表
             result += tmTaskMapper.updateTmTaskAuditStatus(record);
-            // 分公司审核
+
             // 再审核领料任务信息表
             List<LeaseApplyInfo> leaseApplyInfoList = record.getLeaseApplyInfoList();
             if (CollUtil.isNotEmpty(leaseApplyInfoList)) {
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
index 5487ffd8..f098f09b 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -932,7 +932,7 @@
         and tt.task_status = #{taskStatus}
       </if>
       GROUP BY lai.id
-      ORDER BY tt.task_status,tt.create_time
+      ORDER BY tt.task_status,tt.create_time desc
   </select>
   <select id="getLeaseDetailByParentId" resultType="com.bonus.sgzb.app.domain.TmTask">
     SELECT
@@ -961,7 +961,7 @@
       and mtk.user_id = #{userId}
     </if>
     <if test="userName != null and userName != ''">
-      and su.user_name = #{userName}
+      and su.user_name like concat('%', #{userName}, '%')
     </if>
     <if test="typeId != null and typeId != ''">
       and lad.type_id = #{typeId}