From 6a75c68a5dd596cfd9d977a98405ae91bb124fa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Mon, 18 Nov 2024 17:19:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AppSwiperController.java       |  2 +-
 .../InspectionEquInfoController.java          |  5 +++++
 .../controller/InspectionInfoController.java  |  4 ++++
 .../InspectionMallPartnersController.java     |  2 +-
 .../inspection/entity/InspectionInfo.java     |  2 ++
 .../service/IInspectionInfoService.java       |  7 +++++++
 .../impl/AppInspectionPartnerServiceImpl.java |  3 +++
 .../impl/InspectionInfoServiceImpl.java       | 11 ++++++++++
 .../impl/InspectionWorkNodeServiceImpl.java   |  2 +-
 .../inspection/vo/InspectionInfoVo.java       |  2 ++
 .../inspection/InspectionInfoMapper.xml       | 21 ++++++++++++-------
 .../main/resources/mapper/UserRoleMapper.xml  |  6 +++---
 12 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/controller/AppSwiperController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/controller/AppSwiperController.java
index c4c0152f..61b29578 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/controller/AppSwiperController.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/controller/AppSwiperController.java
@@ -141,7 +141,7 @@ public class AppSwiperController extends BaseController
     {
         LambdaQueryWrapper<ShopMallPartners> queryWrapper =new LambdaQueryWrapper<>();
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
-        queryWrapper.eq(ShopMallPartners::getUserId,user.getId()).eq(ShopMallPartners::getType,"jc").eq(ShopMallPartners::getIsBanned,"0");
+        queryWrapper.orderByAsc(ShopMallPartners::getPartnerId).eq(ShopMallPartners::getType,"jc").eq(ShopMallPartners::getIsBanned,"0").last("limit 1");
         ShopMallPartners partner = partnersService.getOne(queryWrapper);
         if (ObjectUtil.isEmpty(partner)){
             return error("信息有误");
diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java
index 39bfe0fc..3c428f50 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.inspection.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.inspection.service.AppInspectionPartnerService;
 import cn.iocoder.yudao.module.shop.entity.ShopMallPartners;
@@ -43,6 +44,10 @@ public class InspectionEquInfoController extends BaseController
     public CommonResult list(Integer pageNum,Integer pageSize,InspectionEquInfo inspectionEquInfo) throws Exception {
 
         Page page =new Page(pageNum,pageSize);
+        if (ObjectUtil.isNull(inspectionEquInfo.getPartnerId())) {
+            ShopMallPartners partners = partnerService.shopInfoByUserId();
+            inspectionEquInfo.setPartnerId(partners.getPartnerId());
+        }
         IPage<InspectionEquInfo> list = inspectionEquInfoService.selectInspectionEquInfoList(page,inspectionEquInfo);
         return success(list);
     }
diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java
index b275071d..a42fb464 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java
@@ -92,6 +92,10 @@ public class InspectionInfoController extends BaseController {
     public CommonResult edit(@RequestBody InspectionInfo inspectionInfo) throws Exception {
         return toAjax(inspectionInfoService.updateInspectionInfo(inspectionInfo));
     }
+    @PostMapping("/updateLeadMan")
+    public CommonResult updateLeadMan(@RequestBody InspectionInfo inspectionInfo){
+        return toAjax(inspectionInfoService.updateLeadMan(inspectionInfo));
+    }
 
 
     @PostMapping("/del")
diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMallPartnersController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMallPartnersController.java
index bb16d0e2..67e6885a 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMallPartnersController.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMallPartnersController.java
@@ -183,7 +183,7 @@ public class InspectionMallPartnersController extends BaseController {
         ShopMallPartners partner  = new ShopMallPartners();
         if (roles.contains("jcshop")){
             LambdaQueryWrapper<ShopMallPartners> queryWrapper =new LambdaQueryWrapper<>();
-            queryWrapper.eq(ShopMallPartners::getUserId,user.getId()).eq(ShopMallPartners::getType,"jc").eq(ShopMallPartners::getIsBanned,"0");
+            queryWrapper.orderByAsc(ShopMallPartners::getPartnerId).eq(ShopMallPartners::getType,"jc").eq(ShopMallPartners::getIsBanned,"0").last("limit 1");
             partner = shopMallPartnersService.getOne(queryWrapper);
             if (ObjectUtil.isEmpty(partner)){
                 return;
diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionInfo.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionInfo.java
index a7778deb..12c1ddf9 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionInfo.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionInfo.java
@@ -163,4 +163,6 @@ public class InspectionInfo extends TenantBaseDO
     private String selectType;
     @TableField(exist = false)
     private String projectName;
+    @TableField(exist = false)
+    private String leadManName;
 }
diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java
index ef2fb65e..948ad93e 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java
@@ -49,6 +49,13 @@ public interface IInspectionInfoService  extends IService<InspectionInfo>
      * @return 结果
      */
     public int updateInspectionInfo(InspectionInfo inspectionInfo) throws Exception;
+    /**
+     * 修改引车员
+     *
+     * @param inspectionInfo 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateLeadMan(InspectionInfo inspectionInfo);
 
     /**
      * 批量删除【请填写功能名称】
diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java
index 69bb9f37..07dc376f 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java
@@ -184,6 +184,8 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
         }else if (roles.contains("jcworker")){
             LambdaQueryWrapper<PartnerWorker> queryWrapperWork =new LambdaQueryWrapper<>();
             queryWrapperWork.eq(PartnerWorker::getUserId,user.getId());
+            queryWrapperWork.orderByAsc(PartnerWorker::getPartnerId);
+            queryWrapperWork.last("limit 1");
             PartnerWorker worker = partnerWorkerService.getOne(queryWrapperWork);
             if (ObjectUtil.isEmpty(worker)){
                 throw new Exception("信息有误");
@@ -1467,6 +1469,7 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
         if (ObjectUtil.isNotNull(info.getLeadManId())){
             AdminUserDO leadMan = adminUserService.getById(info.getLeadManId());
             res.setLeadManName(leadMan.getNickname());
+            res.setLeadManId(info.getLeadManId());
         }else {
             res.setLeadManName("");
         }
diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
index 98cb040f..69e3dc7a 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
@@ -332,6 +332,17 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
         return baseMapper.updateById(inspectionInfo);
     }
 
+    /**
+     * 修改引车员
+     *
+     * @param inspectionInfo 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int updateLeadMan(InspectionInfo inspectionInfo) {
+        return baseMapper.updateById(inspectionInfo);
+    }
+
     /**
      * 批量删除【请填写功能名称】
      *
diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java
index aa5ebb0d..8fe5e2e6 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java
@@ -196,7 +196,7 @@ public class InspectionWorkNodeServiceImpl extends ServiceImpl<InspectionWorkNod
                 .eq(DlInspectionProject::getId, workNode.getProjectId()));
         String stepTitle = "";
         if (ObjectUtil.isNotNull(project)) {
-            inspectionStepInfo.setTitle(project.getProjectName() + "项目检测完成");
+            inspectionStepInfo.setTitle(project.getProjectName());
         } else {
             inspectionStepInfo.setTitle("项目检测完成");
         }
diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/vo/InspectionInfoVo.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/vo/InspectionInfoVo.java
index 54ed0987..d56a29b0 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/vo/InspectionInfoVo.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/vo/InspectionInfoVo.java
@@ -88,4 +88,6 @@ public class InspectionInfoVo {
     private String leadManName;
     @TableField(exist = false)
     List<InspectionWorkNode> workNodes;
+    @TableField(exist = false)
+    private Long leadManId;
 }
diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml
index 44c4c981..ac6ee032 100644
--- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml
+++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml
@@ -275,7 +275,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         iwn.status AS workNodeStatus,
         oi.order_no AS orderNo,
         oi.phonenumber AS buyPhone,
-        ip.project_name AS projectName
+        ip.project_name AS projectName,
+        su.nickname AS leadManName
     FROM
         inspection_info ii
     LEFT JOIN
@@ -284,36 +285,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order_info oi ON ii.inspection_order_id = oi.id
     LEFT JOIN
         inspection_project ip ON iwn.project_id = ip.id
+    LEFT JOIN
+        system_users su ON ii.lead_man_id = su.id
         <where>
-        <!-- 工单负责人或角色ID匹配 -->
-        (ii.lead_man_id = #{inspectionInfo.leadManId}
-        OR iwn.role_id IN
-        <foreach collection="roleIds" item="roleId" open="(" separator="," close=")">
-            #{roleId}
-        </foreach>)
         <!-- 车牌号模糊查询 -->
         <if test="inspectionInfo.carNum != null">
             AND ii.car_num LIKE CONCAT('%', #{inspectionInfo.carNum}, '%')
         </if>
         <!-- 待接受 -->
         <if test="inspectionInfo.status == 1">
+            AND  <!-- 工单负责人或角色ID匹配 -->
+            (ii.lead_man_id = #{inspectionInfo.leadManId}
+            OR iwn.role_id IN
+            <foreach collection="roleIds" item="roleId" open="(" separator="," close=")">
+                #{roleId}
+            </foreach>)
             AND ii.status = '0'
             AND iwn.status = '0'
             -- AND ii.now_order_num = iwn.order_num
+            ORDER BY ii.create_time DESC
         </if>
         <!-- 进行中 -->
         <if test="inspectionInfo.status == 2">
             AND ii.status = '0'
             AND iwn.status = '1'
             AND iwn.deal_user_id = #{inspectionInfo.dealUserId}
+            ORDER BY iwn.update_time DESC
         </if>
         <!-- 已完成 -->
         <if test="inspectionInfo.status == 3">
             AND iwn.status = '2'
             AND iwn.deal_user_id = #{inspectionInfo.dealUserId}
+            ORDER BY iwn.update_time DESC
         </if>
     </where>
-    ORDER BY ii.create_time DESC
 </select>
 
 </mapper>
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml
index 7525388f..7e1c4ae1 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml
+++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml
@@ -21,9 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	<select id="selectListByRoleId" resultType="cn.iocoder.yudao.module.system.api.user.dto.UserDTO"
 			parameterType="cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RolePageReqVO">
-		select su.*
-		from system_user_role sr
-				 left join system_users su on sr.user_id = su.id
+		select distinct su.*
+		from system_users su
+		left join system_user_role sr on su.id = sr.user_id
 		left join system_role sr2 on sr.role_id = sr2.id
 		<where>
 			su.deleted = 0 and sr2.service_package_id = 'jiance'