From a6065ec2896253691dea79625bb070bbe9b64926 Mon Sep 17 00:00:00 2001
From: "1539530615@qq.com" <1539530615@qq.com>
Date: Mon, 11 Mar 2024 17:35:30 +0800
Subject: [PATCH] =?UTF-8?q?=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

---
 .../resources/mapper/app/PurchaseInputMapper.xml |  2 +-
 .../resources/mapper/base/BmUnitInfoMapper.xml   | 10 +++++-----
 .../resources/mapper/base/MaLabelBindMapper.xml  |  6 +++---
 .../mapper/base/MaMachineTypeMapper.xml          |  6 +++---
 .../resources/mapper/base/MaPropInfoMapper.xml   |  2 +-
 .../mapper/base/MaintenanceGangMapper.xml        |  9 ++++-----
 .../main/resources/mapper/base/RepairMapper.xml  | 16 ++++++++--------
 .../mapper/base/WarehouseKeeperMapper.xml        |  6 +++---
 .../controller/SltAgreementInfoController.java   |  6 ++----
 .../material/mapper/SltAgreementInfoMapper.java  |  2 +-
 .../impl/SltAgreementInfoServiceImpl.java        | 13 +++++++++++++
 .../mapper/material/BackRecordMapper.xml         |  4 ++--
 .../mapper/material/LeaseRecordMapper.xml        |  4 ++--
 .../mapper/material/PurchaseCheckInfoMapper.xml  |  4 ++--
 .../mapper/material/RepairAuditDetailsMapper.xml |  8 ++++----
 .../mapper/material/ScrapApplyDetailsMapper.xml  |  4 ++--
 .../mapper/material/SltAgreementInfoMapper.xml   |  5 +++++
 .../resources/mapper/system/SelectMapper.xml     |  4 ++--
 18 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/PurchaseInputMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/PurchaseInputMapper.xml
index 5cd9ab47..78dcd88d 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/PurchaseInputMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/PurchaseInputMapper.xml
@@ -114,7 +114,7 @@
 
     <select id="selectPutInListList" resultType="com.bonus.sgzb.app.domain.PurchaseCheckInfo">
     select pci.id,pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_by, pci.create_time, pci.update_by,
-    pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,tk.task_status taskStatus,su.user_name purchaserName,
+    pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,tk.task_status taskStatus,su.nick_name purchaserName,
     tk.create_by
     from purchase_check_info pci
     left join tm_task tk on pci.task_id = tk.task_id
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmUnitInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmUnitInfoMapper.xml
index 666ec6f9..668930f8 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmUnitInfoMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmUnitInfoMapper.xml
@@ -22,11 +22,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName"    column="dept_name"    />
         <result property="typeName"    column="name"    />
         <result property="userId"    column="user_id"    />
-        <result property="userName"    column="user_name"    />
+        <result property="userName"    column="nick_name"    />
     </resultMap>
     <resultMap type="com.bonus.sgzb.system.api.domain.SysUser" id="UsersResult">
         <id     property="userId"      column="user_id"    />
-        <result property="userName"    column="user_name"    />
+        <result property="userName"    column="nick_name"    />
     </resultMap>
     <sql id="bmUnitInfo">
         select unit_id, unit_name, status, type_id, link_man, telphone, dept_id, del_flag, create_by, create_time,
@@ -93,19 +93,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
     <select id="getUserAll"  resultMap="UsersResult">
-        select user_id id,user_name name
+        select user_id id,nick_name name
         from sys_user
         where
         <if test="userId != null and userId != ''">
             user_id = #{userId}
         </if>
         <if test="userName != null and userName != ''">
-            AND user_name like concat('%', #{userName}, '%')
+            AND nick_name like concat('%', #{userName}, '%')
         </if>
     </select>
     <select id="selectTypeList" parameterType="com.bonus.sgzb.base.domain.BmUnitInfo" resultMap="BmUnitInfoResult">
         SELECT a.unit_id, a.unit_name, a.status, a.type_id, a.link_man, a.telphone, a.dept_id, a.del_flag, a.create_by,
-        a.create_time, a.update_by, a.update_time, a.remark, a.company_id, b.dept_name, c.name, be.user_id, cf.user_name
+        a.create_time, a.update_by, a.update_time, a.remark, a.company_id, b.dept_name, c.name, be.user_id, cf.nick_name 
         FROM bm_unit_info a
         LEFT JOIN sys_dept b ON a.dept_id = b.dept_id
         LEFT JOIN sys_dic c ON a.type_id = c.id
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
index 0786ba5c..6176acfc 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
@@ -18,7 +18,7 @@
         <result property="isBind"    column="is_bind"    />
         <result property="name"    column="name"    />
         <result property="bindTime"    column="bind_time"    />
-        <result property="userName"    column="user_name"    />
+        <result property="userName"    column="nick_name"    />
         <result property="id"    column="id"    />
     </resultMap>
 
@@ -35,7 +35,7 @@
     <select id="selectMaLabelBindList" parameterType="com.bonus.sgzb.base.vo.MaLabelBindVO" resultMap="MaLabelBindVOResult">
         SELECT b.label_id,a.id,b.is_bind,b.label_code,a.bind_time,b.label_type,mt.type_id,mt.type_name,
         mt2.type_id as modelId , mt2.type_name as modelName,mt3.type_name as wpName,
-        mt4.type_name as kindName ,a.status,a.binder,dic.name,ma.ma_code,user.user_name
+        mt4.type_name as kindName ,a.status,a.binder,dic.name,ma.ma_code,user.nick_name
         FROM ma_machine_label b
         left join ma_label_bind a on a.ma_id = b.ma_id
         LEFT JOIN ma_type mt ON a.type_id = mt.type_id
@@ -73,7 +73,7 @@
     <select id="selecthistoryList" parameterType="com.bonus.sgzb.base.vo.MaLabelBindVO" resultMap="MaLabelBindVOResult">
         SELECT b.label_id,a.id,b.is_bind,b.label_code,a.bind_time,b.label_type,mt.type_id,mt.type_name,
         mt2.type_id as modelId , mt2.type_name as modelName,mt3.type_name as wpName,
-        mt4.type_name as kindName ,a.status,a.binder,dic.name,ma.ma_code,user.user_name
+        mt4.type_name as kindName ,a.status,a.binder,dic.name,ma.ma_code,user.nick_name
         FROM ma_machine_label b
         left join ma_label_bind a on a.ma_id = b.ma_id
         LEFT JOIN ma_type mt  ON a.type_id = mt.type_id
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
index c421527a..dae1bac1 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
@@ -176,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                m.lease_price,m.eff_time, m.rent_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load,
                m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
                mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
-               su.user_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time,
+               su.nick_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time,
                m.remark, m.company_id ,m.type_id id , m.type_name label
         from ma_type m
         left join ma_prop_set mps on m.type_id = mps.type_id
@@ -277,7 +277,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                m.lease_price, m.eff_time, m.rent_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load,
                m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
                mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
-               su.user_name keeperUserName, mtr.user_id repairUserId, su1.user_name repairUserName, mpi.prop_name,
+               su.nick_name keeperUserName, mtr.user_id repairUserId, su1.nick_name repairUserName, mpi.prop_name,
                m.del_flag, m.create_by, m.create_time,
                m.remark, m.company_id
         from ma_type m
@@ -333,7 +333,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         m.lease_price,m.rent_price, m.eff_time, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load,
         m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
         mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
-        su.user_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time,
+        su.nick_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time,
         m.remark, m.company_id
         from ma_type m
         left join ma_prop_set mps on m.type_id = mps.type_id
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml
index f7c43b8a..aae364b2 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml
@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         m.pay_price,
         m.remark,
         e.prop_name,
-        us.user_name as keeperUserName,
+        us.nick_name as keeperUserName,
         mtf.file_name photoName,
         mtf.file_url photoUrl,
         mtf2.file_name documentName,
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaintenanceGangMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaintenanceGangMapper.xml
index 2bc77e91..310d9543 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaintenanceGangMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaintenanceGangMapper.xml
@@ -23,10 +23,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getMaintenanceGangInfoAll" resultType="com.bonus.sgzb.base.domain.MaintenanceGang">
         SELECT mt.type_id as modelId ,mt.type_name as modelName,
-               mt2.type_id, mt2.type_name  ,
+               mt2.type_id, mt2.type_name,
                mt3.type_id as typeId,mt3.type_name as typeName,
                mt3.type_id as kindId,mt4.type_name as kindName,
-               su.user_id as userId, su.user_name as userName
+               su.user_id as userId, su.nick_name as userName
         FROM ma_type mt
             LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
             LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
@@ -34,7 +34,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN ma_type_repair mtk ON mtk.type_id = mt.type_id
             LEFT JOIN sys_user su ON su.user_id = mtk.user_id
         WHERE mt.`level` = '4' AND mt.`del_flag` = '0'
-
         <if test="typeName != null and typeName != ''">
             AND mt3.type_name like concat('%', #{typeName}, '%')
         </if>
@@ -42,12 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getMaUserList" resultType="com.bonus.sgzb.base.domain.MaintenanceGang">
-        SELECT su.user_id as userId, su.user_name as userName FROM `sys_user` su
+        SELECT su.user_id as userId, su.nick_name as userName FROM `sys_user` su
         LEFT JOIN sys_user_role sur  ON su.user_id = sur.user_id
         LEFT JOIN sys_role sr ON sr.role_id = sur.role_id
         WHERE sr.role_id = '102' AND su.del_flag = '0'
         <if test="userName != null and userName != ''">
-            AND su.user_name like concat('%', #{userName}, '%')
+            AND su.nick_name like concat('%', #{userName}, '%')
         </if>
         ORDER BY su.user_id DESC
     </select>
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml
index 00c6b4fb..048103a5 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml
@@ -74,7 +74,7 @@
         tt.CODE AS repairCode,
         bui.unit_name AS backUnit,
         bpi.lot_name AS backPro,
-        su.user_name AS createName,
+        su.nick_name AS createName,
         tt.create_time AS createTime,
         bai.CODE AS backCode,
         sd.name AS repairStatus,
@@ -95,7 +95,7 @@
         left join sys_dic sd on sd.id = tt.task_status
         where 1=1
         <if test="keyword != null and keyword != ''">
-            AND (locate(#{keyword}, su.user_name) > 0
+            AND (locate(#{keyword}, su.nick_name) > 0
                 or locate(#{keyword}, tt.CODE) > 0)
         </if>
         <if test="backUnit != null and backUnit != ''">
@@ -116,7 +116,7 @@
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             AND tt.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
         </if>
-        GROUP BY rd.task_id,bui.unit_name,bpi.lot_name,bai.code,su.user_name
+        GROUP BY rd.task_id,bui.unit_name,bpi.lot_name,bai.code,su.nick_name
         order by tt.create_time desc
     </select>
 
@@ -126,7 +126,7 @@
             tt.CODE AS repairCode,
             bui.unit_name AS backUnit,
             bpi.lot_name AS backPro,
-            su.user_name AS createName,
+            su.nick_name AS createName,
             tt.create_time AS createTime,
             bai.CODE AS backCode,
             sd.NAME AS repairStatus,
@@ -139,7 +139,7 @@
             rd.repaired_num AS repairedNum,
             rd.scrap_num AS scrapNum,
             case rd.status when '0' then '未完成' when '1' then '已完成' else '' end as status,
-            su2.user_name as repairer,
+            su2.nick_name as repairer,
             rd.update_time as updateTime
         FROM
             repair_apply_details rd
@@ -157,7 +157,7 @@
                 LEFT JOIN ma_machine mm ON mm.ma_id = rd.ma_id
         where 1=1
         <if test="keyword != null and keyword != ''">
-            AND (locate(#{keyword}, su.user_name) > 0
+            AND (locate(#{keyword}, su.nick_name) > 0
             or locate(#{keyword}, tt.CODE) > 0)
         </if>
         <if test="backUnit != null and backUnit != ''">
@@ -193,7 +193,7 @@
                rad.repaired_num as repairedNum,
                rad.scrap_num as scrapNum,
                rad.status as status,
-               su.user_name as repairer,
+               su.nick_name as repairer,
                rad.update_time as updateTime,
                rad.type_id as typeId
         from repair_apply_details rad
@@ -204,7 +204,7 @@
         where rad.task_id = #{taskId} and rad.company_id = #{companyId}
         <if test="keyword != null and keyword != ''">
             AND (locate(#{keyword}, mm.ma_code) > 0
-            or locate(#{keyword}, su.user_name) > 0
+            or locate(#{keyword}, su.nick_name) > 0
             or locate(#{keyword}, mt2.type_name) > 0
             or locate(#{keyword}, mt.type_name) > 0)
         </if>
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
index 8a42026a..8a4a8426 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                mt2.type_id, mt2.type_name  ,
                mt3.type_id as typeId,mt3.type_name as typeName,
                mt3.type_id as kindId,mt4.type_name as kindName,
-               su.user_id as userId, su.user_name as userName
+               su.user_id as userId, su.nick_name as userName
         FROM ma_type mt
             LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
             LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
@@ -42,12 +42,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getMaUserList" resultType="com.bonus.sgzb.base.domain.WarehouseKeeper">
-        SELECT su.user_id as userId, su.user_name as userName FROM `sys_user` su
+        SELECT su.user_id as userId, su.nick_name as userName FROM `sys_user` su
         LEFT JOIN sys_user_role sur  ON su.user_id = sur.user_id
         LEFT JOIN sys_role sr ON sr.role_id = sur.role_id
         WHERE sr.role_id = '101' AND su.del_flag = '0'
         <if test="userName != null and userName != ''">
-            AND su.user_name like concat('%', #{userName}, '%')
+            AND su.nick_name like concat('%', #{userName}, '%')
         </if>
         ORDER BY su.user_id DESC
     </select>
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java
index 07840eb0..5003db01 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java
@@ -39,8 +39,7 @@ public class SltAgreementInfoController extends BaseController {
      */
     @ApiOperation(value = "根据条件获取协议结算列表")
     @GetMapping("/getSltAgreementInfo")
-    public TableDataInfo getSltAgreementInfo(AgreementInfo bean)
-    {
+    public TableDataInfo getSltAgreementInfo(AgreementInfo bean) {
         startPage();
         List<AgreementInfo> list = new ArrayList<>();
         if (bean.getUnitId() == null && bean.getProjectId() == null && bean.getSltStatus()== null){
@@ -56,8 +55,7 @@ public class SltAgreementInfoController extends BaseController {
      */
     @ApiOperation(value = "根据协议获取结算清单")
     @PostMapping("/getSltInfo")
-    public AjaxResult getSltInfo(@RequestBody List<AgreementInfo> list)
-    {
+    public AjaxResult getSltInfo(@RequestBody List<AgreementInfo> list) {
         SltInfoVo bean = service.getSltInfo(list);
         return AjaxResult.success(bean);
     }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java
index aafeb321..598e2a8c 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java
@@ -49,5 +49,5 @@ public interface SltAgreementInfoMapper {
 
     int updateApply(SltAgreementApply apply);
 
-
+    int updateMaStatus(SltAgreementInfo agreementInfo);
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java
index db631717..0f976181 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java
@@ -87,6 +87,19 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
         int i = mapper.updateRelation(apply);
         int j = 0;
         if (i > 0){
+            List<SltAgreementRelation> relations = mapper.getRelations(apply);
+            List<AgreementInfo> infos = new ArrayList<>();
+            for (SltAgreementRelation bean : relations){
+                AgreementInfo info = new AgreementInfo();
+                info.setAgreementId(Long.valueOf(bean.getAgreementId()));
+                infos.add(info);
+            }
+            List<SltAgreementInfo> loseList = getLoseList(infos);
+            for (SltAgreementInfo agreementInfo : loseList){
+                if (agreementInfo.getMaId() != null && agreementInfo.getMaId().isEmpty()){
+                    mapper.updateMaStatus(agreementInfo);
+                }
+            }
             j = mapper.updateApply(apply);
         }else {
             throw new ServiceException("结算审核失败");
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml
index 78901d13..8478a475 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml
@@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             baif.`code`,
             mm.ma_code AS maCode,
             bcd.back_num AS backNum,
-            su.user_name AS backPerson,
+            su.nick_name AS backPerson,
             bcd.create_time AS createTime,
             bpl.lot_name AS proName,
             bui.unit_name AS unitName
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="keyWord != null and keyWord != ''">
             and (baif.`code` like concat('%',#{keyWord},'%') or
             mm.ma_code like concat('%',#{keyWord},'%') or
-            su.user_name like concat('%',#{keyWord},'%'))
+            su.nick_name like concat('%',#{keyWord},'%'))
         </if>
         <if test="typeName != null and typeName != ''">
             and mt2.type_name like concat('%',#{typeName},'%')
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/LeaseRecordMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/LeaseRecordMapper.xml
index 13b90c6f..42b78a64 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/LeaseRecordMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/LeaseRecordMapper.xml
@@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                mm.ma_code         as maCode,
                mt.unit_name       as unit,
                lod.out_num        as preNum,
-               su.user_name       as leasePerson,
+               su.nick_name       as leasePerson,
                lod.create_time    as createTime,
                bpl.lot_name       as proName,
                bui.unit_name      as unitName
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and (bai.agreement_code like concat('%',#{keyWord},'%') or
             mm.ma_code like concat('%',#{keyWord},'%') or
             mt.unit_name like concat('%',#{keyWord},'%') or
-            su.user_name like concat('%',#{keyWord},'%'))
+            su.nick_name like concat('%',#{keyWord},'%'))
         </if>
         <if test="typeName != null and typeName != ''">
             and mt2.type_name like concat('%',#{typeName},'%')
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
index 04e8f45a..e55a11e2 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectPurchaseCheckInfoList" parameterType="com.bonus.sgzb.material.domain.PurchaseCheckInfo" resultMap="PurchaseCheckInfoResult">
         select pci.id,pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_by, pci.create_time,
         pci.update_by,
-        pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,su.user_name
+        pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,su.nick_name
         purchaserName,tk.task_status taskStatus
         from purchase_check_info pci
         left join tm_task tk on pci.task_id = tk.task_id
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where task_type = 23
         <if test="keyWord != null  and keyWord != ''">
             and (tk.code like concat('%',#{keyWord},'%') or
-            su.user_name like concat('%',#{keyWord},'%')
+            su.nick_name like concat('%',#{keyWord},'%')
             )
         </if>
         <if test="purchaseTime != null  and purchaseTime != ''">and pci.purchase_time = #{purchaseTime}</if>
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml
index 38bbb808..31a456b4 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml
@@ -243,7 +243,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         dic.NAME taskStatusName,
         bui.unit_name unitName,
         bpl.lot_name projectName,
-        su.user_name createBy,
+        su.nick_name createBy,
         tk.create_time createTime,
         tk.remark,
         tk.CODE repairNum
@@ -269,7 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
         tk.task_type = 45
         <if test="keyword != null and keyword != ''">
-            AND (locate(#{keyword}, su.user_name) > 0
+            AND (locate(#{keyword}, su.nick_name) > 0
             or locate(#{keyword}, tk.CODE) > 0
             or locate(#{keyword}, bui.unit_name) > 0
             or locate(#{keyword}, bpl.lot_name) > 0)
@@ -303,7 +303,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             dic.NAME taskStatusName,
             bui.unit_name unitName,
             bpl.lot_name projectName,
-            su.user_name createBy,
+            su.nick_name createBy,
             tk.create_time createTime,
             tk.remark,
             tk.CODE repairNum,
@@ -336,7 +336,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             tk.task_type = 45
         <if test="keyword != null and keyword != ''">
-            AND (locate(#{keyword}, su.user_name) > 0
+            AND (locate(#{keyword}, su.nick_name) > 0
             or locate(#{keyword}, tk.CODE) > 0
             or locate(#{keyword}, bui.unit_name) > 0
             or locate(#{keyword}, bpl.lot_name) > 0)
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml
index 65456940..08e000cc 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         dic.NAME taskStatusName,
         bui.unit_name unitName,
         bpl.lot_name projectName,
-        su.user_name createBy,
+        su.nick_name createBy,
         tk.create_time createTime,
         tk.remark,
         tk1.CODE repairNum,
@@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             dic.NAME taskStatusName,
             bui.unit_name unitName,
             bpl.lot_name projectName,
-            su.user_name createBy,
+            su.nick_name createBy,
             tk.create_time createTime,
             tk.remark,
             tk1.CODE repairNum,
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
index d31e4ee4..6baab781 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
@@ -80,6 +80,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             remark = #{remark}
         where id = #{id}
     </update>
+    <update id="updateMaStatus">
+        update ma_machine
+        set ma_status = '103'
+        where ma_id = #{maId}
+    </update>
     <select id="getSltAgreementInfo" resultType="com.bonus.sgzb.material.domain.AgreementInfo">
         SELECT bai.agreement_id, bai.agreement_code , contract_code,file_url ,file_name,sign_time,
         bui.unit_id,bui.unit_name , bp.lot_id as projectId , bp.lot_name as projectName,
diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
index 7be9ed64..996269f8 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
@@ -169,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!--用户/维修员/库管员/采购员-下拉选-->
     <select id="getUserByRoleIdCbxSelect" resultType="com.bonus.sgzb.system.domain.SelectVo">
             SELECT su.user_id AS id,
-                   su.user_name AS `name`
+                   su.nick_name AS `name`
             FROM sys_role sr
             LEFT JOIN sys_user_role sur ON sr.role_id = sur.role_id
             LEFT JOIN sys_user su ON sur.user_id = su.user_id AND su.del_flag = '0'
@@ -185,7 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     UNION ALL
         SELECT su.user_id AS id,
                su.dept_id AS parentId,
-               su.user_name AS label
+               su.nick_name AS label
         FROM sys_role sr
         LEFT JOIN sys_user_role sur ON sr.role_id = sur.role_id
         LEFT JOIN sys_user su ON sur.user_id = su.user_id AND su.del_flag = '0'