From 870da9e03f8bf29e52af69cb96320af9c0f99397 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Sat, 12 Jul 2025 10:21:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/back/domain/vo/MaCodeVo.java     |  4 ++--
 .../clz/controller/BmTeamController.java      | 16 ++++++++++++++++
 .../MaterialLeaseInfoController.java          |  5 +++--
 .../com/bonus/material/clz/domain/BmTeam.java |  5 +++++
 .../material/clz/service/BmTeamService.java   |  7 +++++++
 .../clz/service/impl/BmTeamServiceImpl.java   | 10 ++++++++++
 .../service/impl/IwsTeamUserServiceImpl.java  |  4 ++--
 .../impl/MaterialLeaseInfoServiceImpl.java    |  3 +--
 .../impl/MaterialMachineServiceImpl.java      |  1 -
 .../material/common/mapper/SelectMapper.java  | 14 ++++++++++++++
 .../service/impl/SelectServiceImpl.java       | 12 +++++++++++-
 .../mapper/material/clz/BmTeamMapper.xml      |  4 +---
 .../material/clz/MaterialBackInfoMapper.xml   |  4 ++--
 .../material/clz/MaterialLeaseInfoMapper.xml  | 18 ------------------
 .../material/clz/MaterialMachineMapper.xml    |  4 ++--
 .../mapper/material/common/SelectMapper.xml   | 19 +++++++++++++++++++
 16 files changed, 95 insertions(+), 35 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/vo/MaCodeVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/vo/MaCodeVo.java
index 31825d6b..fa013c12 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/vo/MaCodeVo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/vo/MaCodeVo.java
@@ -92,8 +92,8 @@ public class MaCodeVo {
     @ApiModelProperty(value = "外观判断合格数量")
     private BigDecimal goodNum;
 
-    @ApiModelProperty(value = "出库人")
-    @Excel(name = "出库人")
+    @ApiModelProperty(value = "出库人员")
+    @Excel(name = "出库人员")
     private String outPerson;
 
     @ApiModelProperty(value = "出库时间")
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/BmTeamController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/BmTeamController.java
index b2e6cb60..df1da778 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/BmTeamController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/BmTeamController.java
@@ -48,6 +48,22 @@ public class BmTeamController extends BaseController {
         }
     }
 
+    /**
+     * 根据身份证号查询班组信息
+     * @param tbTeam
+     * @return
+     */
+    @ApiOperation(value = "根据身份证号查询班组信息")
+    @GetMapping("/getListByIdCard")
+    public AjaxResult getListByIdCard(BmTeam tbTeam) {
+        try {
+            return bmTeamService.getListByIdCard(tbTeam);
+        } catch (Exception e) {
+            log.error("查询班组数据失败", e);
+            return AjaxResult.error("班组数据查询失败");
+        }
+    }
+
     @ApiOperation(value = "分页查询班组信息")
     @GetMapping("/getTeamList")
     public AjaxResult getTeamList(BmTeam tbTeam) {
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialLeaseInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialLeaseInfoController.java
index f27a283a..88947af9 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialLeaseInfoController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialLeaseInfoController.java
@@ -271,9 +271,10 @@ public class MaterialLeaseInfoController extends BaseController {
     @GetMapping("/getLeaseInfoDetails")
     public AjaxResult getLeaseInfoDetails(LeaseTotalInfo info) {
         info.setIsExport(1);
-        startPage();
+        Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
+        Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
         List<LeaseTotalInfo> list = materialLeaseInfoService.getLeaseInfoDetails(info);
-        return AjaxResult.success(getDataTable(list));
+        return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
     }
 
     /**
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/BmTeam.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/BmTeam.java
index 87216422..301ba823 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/BmTeam.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/BmTeam.java
@@ -124,4 +124,9 @@ public class BmTeam {
      * 班组id
      */
     private String bzId;
+
+    /**
+     * 班组长身份证号
+     */
+    private String teamLeaderIdCard;
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/BmTeamService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/BmTeamService.java
index 629033c8..4363cb08 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/BmTeamService.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/BmTeamService.java
@@ -52,4 +52,11 @@ public interface BmTeamService {
      * @return
      */
     AjaxResult getTeamList(BmTeam tbTeam);
+
+    /**
+     * 根据身份证号查询班组信息
+     * @param tbTeam
+     * @return
+     */
+    AjaxResult getListByIdCard(BmTeam tbTeam);
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/BmTeamServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/BmTeamServiceImpl.java
index e42e4012..2a736eab 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/BmTeamServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/BmTeamServiceImpl.java
@@ -147,6 +147,16 @@ public class BmTeamServiceImpl implements BmTeamService {
         return AjaxResult.success(bmTeamMapper.getTeamList(tbTeam));
     }
 
+    /**
+     * 根据身份证查询班组信息
+     * @param tbTeam
+     * @return
+     */
+    @Override
+    public AjaxResult getListByIdCard(BmTeam tbTeam) {
+        return AjaxResult.success(bmTeamMapper.queryByPage(tbTeam));
+    }
+
     /**
      * 手机号校验方法抽取
      * @param tbTeam
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/IwsTeamUserServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/IwsTeamUserServiceImpl.java
index 3ead6169..5c924d94 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/IwsTeamUserServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/IwsTeamUserServiceImpl.java
@@ -48,8 +48,8 @@ public class IwsTeamUserServiceImpl implements IwsTeamUserService {
         if (iwsTeamUserVo == null) {
             return null;
         }
-        if (StringUtils.isBlank(iwsTeamUserVo.getTeamLeaderIdCard())) {
-            iwsTeamUserVo.setTeamLeaderIdCard(SecurityUtils.getLoginUser().getUsername());
+        if (StringUtils.isBlank(iwsTeamUserVo.getIdCard())) {
+            iwsTeamUserVo.setIdCard(SecurityUtils.getLoginUser().getUsername());
         }
         return iwsTeamUserVo;
     }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java
index 68cb61c6..7bfbbc77 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java
@@ -463,8 +463,7 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService {
                     for (MaterialLeaseApplyDetails detail : outDetailsList) {
                         List<MaterialLeaseMaCodeDto> maCodeVoList = materialLeaseInfoMapper.getCodeList(id, detail.getTypeId());
                         if (!CollectionUtils.isEmpty(maCodeVoList)) {
-                            maCodeVoList.forEach(maCodeVo -> maCodeVo.setTypeName(maCodeVo.getMaterialModel()));
-                            detail.setMaCodeVoList(maCodeVoList);
+                            detail.setMaCodeList(maCodeVoList);
                         }
                     }
                 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java
index e3733b68..dc20c6d9 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java
@@ -16,7 +16,6 @@ import com.bonus.material.clz.mapper.BmTeamMapper;
 import com.bonus.material.clz.mapper.MaterialMachineMapper;
 import com.bonus.material.clz.service.MaterialMachineService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.client.utils.DateUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java
index 7516c1c9..d4d6ba02 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java
@@ -236,4 +236,18 @@ public interface SelectMapper {
     List<String> getUserNameList(MaterialLeaseApplyInfo i8ProjectInfo);
 
     List<BmProject> getProjectListByClz(BmProject bmProject);
+
+    /**
+     * 根据用户名查询项目部信息
+     * @param username
+     * @return
+     */
+    String getDepartId(String username);
+
+    /**
+     * 根据项目部id查询工程信息
+     * @param departId
+     * @return
+     */
+    List<String> getProjectId(String departId);
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java
index c7bda057..109e5c21 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java
@@ -184,10 +184,20 @@ public class SelectServiceImpl implements SelectService {
      */
     @Override
     public AjaxResult getProjectInfo(BmProject bmProject) {
+        String username = SecurityUtils.getLoginUser().getUsername();
+        // 根据用户名查询项目部信息
+        String departId = mapper.getDepartId(username);
+        // 根据项目部id查询工程信息
+        List<String> projectIdList = mapper.getProjectId(departId);
         List<BmProject> list = new ArrayList<>();
         if (bmProject.getIsApp() != null && bmProject.getIsApp()) {
             list = mapper.getProjectInfo(bmProject);
-            list.removeIf(Objects::isNull);
+            if (CollectionUtils.isNotEmpty(list)) {
+                if (CollectionUtils.isNotEmpty(projectIdList)) {
+                    // 找出list中projectId与projectIdList中相同的数据
+                    list = list.stream().filter(info -> projectIdList.contains(info.getProjectId())).collect(Collectors.toList());
+                }
+            }
         }
         return AjaxResult.success(list);
     }
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/BmTeamMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/BmTeamMapper.xml
index d46d7625..db535fd2 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/BmTeamMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/BmTeamMapper.xml
@@ -42,7 +42,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null">status = #{status},</if>
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="idCard != null">bzz_idcard = #{idCard},</if>
-            <if test="bzId != null and bzId != ''">bz_id = #{bzId},</if>
             update_time = NOW()
         </set>
         WHERE unit_id = #{id}
@@ -93,8 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectByName" resultType="com.bonus.material.clz.domain.BmTeam">
         select unit_id as id, unit_name as teamName, link_man as relName,
         telphone as relPhone, create_time as createTime, create_by as createUser,
-        update_time as updateTime, update_by as updateUser, del_flag as delFlag,
-        bz_id as bzId
+        update_time as updateTime, update_by as updateUser, del_flag as delFlag
         from bm_unit
         where del_flag = 0 and status = '0'
         <if test="teamName != null and teamName != ''">
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml
index 5eec2cae..e20d630f 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml
@@ -239,10 +239,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id AND mt2.del_flag = '0'
         WHERE
         1=1
-        <if test="teamId != null">
+        <if test="teamId != null and teamId != ''">
             and bt.id = #{teamId}
         </if>
-        <if test="proId != null">
+        <if test="proId != null and proId != ''">
             and bp.pro_id = #{proId}
         </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml
index e4b80d30..d250865c 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml
@@ -362,17 +362,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskId != null "> and lai.task_id = #{taskId}</if>
             <if test="leasePerson != null  and leasePerson != ''"> and lai.lease_person = #{leasePerson}</if>
             <if test="phone != null  and phone != ''"> and lai.phone = #{phone}</if>
-            <if test="type != null  and type != ''"> and lai.type = #{type}</if>
-            <if test="companyAuditBy != null "> and lai.company_audit_by = #{companyAuditBy}</if>
-            <if test="companyAuditTime != null "> and lai.company_audit_time = #{companyAuditTime}</if>
-            <if test="companyAuditRemark != null  and companyAuditRemark != ''"> and lai.company_audit_remark = #{companyAuditRemark}</if>
-            <if test="deptAuditBy != null "> and lai.dept_audit_by = #{deptAuditBy}</if>
-            <if test="deptAuditTime != null "> and lai.dept_audit_time = #{deptAuditTime}</if>
-            <if test="deptAuditRemark != null  and deptAuditRemark != ''"> and lai.dept_audit_remark = #{deptAuditRemark}</if>
-            <if test="directAuditBy != null "> and lai.direct_audit_by = #{directAuditBy}</if>
-            <if test="directAuditTime != null "> and lai.direct_audit_time = #{directAuditTime}</if>
-            <if test="directAuditRemark != null  and directAuditRemark != ''"> and lai.direct_audit_remark = #{directAuditRemark}</if>
-            <if test="companyId != null "> and lai.company_id = #{companyId}</if>
             <if test="statusList != null  and statusList.size() > 0">
                 and tt.task_status in
                 <foreach item="item" collection="statusList" open="(" separator="," close=")">
@@ -382,10 +371,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 <![CDATA[ AND DATE_FORMAT( lai.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
             </if>
-            <if test="directId != null "> and lai.direct_id = #{directId}</if>
             <if test="leaseType != null  and leaseType != ''"> and lai.lease_type = #{leaseType}</if>
-            <if test="estimateLeaseTime != null "> and lai.estimate_lease_time = #{estimateLeaseTime}</if>
-            <if test="costBearingParty != null  and costBearingParty != ''"> and lai.cost_bearing_party = #{costBearingParty}</if>
             and lai.lease_style = '1'
             <if test="idCard != null and idCard != ''">
                 AND bt.bzz_idcard = #{idCard}
@@ -483,11 +469,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 OR mt2.type_name LIKE CONCAT('%', #{keyword}, '%'))
             </if>
             <if test="typeId != null "> and lad.type_id = #{typeId}</if>
-            <if test="preNum != null "> and lad.pre_num = #{preNum}</if>
-            <if test="auditNum != null "> and lad.audit_num = #{auditNum}</if>
-            <if test="alNum != null "> and lad.al_num = #{alNum}</if>
             <if test="status != null  and status != ''"> and lad.status = #{status}</if>
-            <if test="companyId != null "> and lad.company_id = #{companyId}</if>
         </where>
     </select>
 
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
index d9631e25..406d3f4d 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
@@ -235,10 +235,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
         sai.end_time IS NULL
         AND sai.back_id IS NULL
-        <if test="teamId != null">
+        <if test="teamId != null and teamId != ''">
             AND bt.unit_id = #{teamId}
         </if>
-        <if test="teamName != null">
+        <if test="teamName != null and teamName != ''">
             AND bt.unit_name LIKE concat('%',#{teamName},'%')
         </if>
         <if test="keyWord != null and keyWord != ''">
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
index 5a59bef4..e3f8b872 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
@@ -557,4 +557,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             WHERE del_flag = '0'
         </if>
     </select>
+
+    <select id="getDepartId" resultType="java.lang.String">
+        SELECT
+            depart_id
+        FROM `sbd_audit`.sg_project_post_personnel
+        WHERE post_id = '3de0eb390f3611efa1940242ac130004'
+          AND cno = #{username}
+    </select>
+
+    <select id="getProjectId" resultType="java.lang.String">
+        SELECT
+            id
+        FROM
+            `data_center`.dx_fb_son
+        WHERE project_status = '在建'
+          <if test="departId != null and departId != ''">
+            AND project_dept_id = #{departId}
+          </if>
+    </select>
 </mapper>