From 288b669bef7b51790da31b0b334b417953f22222 Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Mon, 9 Dec 2024 15:23:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=8F=AF=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=97=B6=E5=8F=AA=E6=98=BE=E7=A4=BA=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspection/entity/InspectionStepInfo.java |   1 +
 .../impl/InspectionWorkNodeServiceImpl.java   |   3 +
 .../inspection/InspectionInfoMapper.xml       | 134 +++++++++++++-----
 3 files changed, 99 insertions(+), 39 deletions(-)

diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionStepInfo.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionStepInfo.java
index bafac7a6..01a127db 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionStepInfo.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionStepInfo.java
@@ -37,6 +37,7 @@ public class InspectionStepInfo extends Model<InspectionStepInfo> {
     //创建人id
     private Integer creator;
     //更新时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date updateTime;
     //更新人id
     private Integer updater;
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 83a3041b..c76fba88 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
@@ -28,6 +28,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -191,6 +192,8 @@ public class InspectionWorkNodeServiceImpl extends ServiceImpl<InspectionWorkNod
         // 插入步骤信息
         InspectionStepInfo inspectionStepInfo = new InspectionStepInfo();
         inspectionStepInfo.setInspectionInfoId(Integer.parseInt(String.valueOf(workNode.getInspectionInfoId())));
+        inspectionStepInfo.setUpdater(Integer.parseInt(String.valueOf(loginUser.getId())));
+        inspectionStepInfo.setUpdateTime(DateUtil.date());
 
         //根据projectId查询项目名称
         DlInspectionProject project = inspectionProjectService.getOne(new LambdaQueryWrapper<DlInspectionProject>()
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 40d93c5f..40357fca 100644
--- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml
+++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml
@@ -269,56 +269,112 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by  ins.start_time desc
     </select>
     <select id="selectByUser" resultType="cn.iocoder.yudao.module.inspection.entity.InspectionInfo">
-    SELECT
+        SELECT *
+        FROM (
+        SELECT
         ii.*,
         iwn.id AS workNodeId,
         iwn.status AS workNodeStatus,
         oi.order_no AS orderNo,
         oi.phonenumber AS buyPhone,
         ip.project_name AS projectName,
-        su.nickname AS leadManName
-    FROM
+        su.nickname AS leadManName,
+        ROW_NUMBER() OVER (PARTITION BY ii.id ORDER BY iwn.update_time DESC) as rn -- 根据需要调整排序逻辑
+        FROM
         inspection_info ii
-    LEFT JOIN
+        LEFT JOIN
         inspection_work_node iwn ON ii.id = iwn.inspection_info_id
-    LEFT JOIN
+        LEFT JOIN
         order_info oi ON ii.inspection_order_id = oi.id
-    LEFT JOIN
+        LEFT JOIN
         inspection_project ip ON iwn.project_id = ip.id
-    LEFT JOIN
+        LEFT JOIN
         system_users su ON ii.lead_man_id = su.id
         <where>
-        <!-- 车牌号模糊查询 -->
-        <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>
-</select>
+            <!-- 车牌号模糊查询 -->
+            <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>
+        ) AS subquery
+        WHERE rn = 1;
+        <!-- 之前的查询，修改为了一个工单只出现一条，不分项目 -->
+        <!--    SELECT-->
+        <!--        ii.*,-->
+        <!--        iwn.id AS workNodeId,-->
+        <!--        iwn.status AS workNodeStatus,-->
+        <!--        oi.order_no AS orderNo,-->
+        <!--        oi.phonenumber AS buyPhone,-->
+        <!--        ip.project_name AS projectName,-->
+        <!--        su.nickname AS leadManName-->
+        <!--    FROM-->
+        <!--        inspection_info ii-->
+        <!--    LEFT JOIN-->
+        <!--        inspection_work_node iwn ON ii.id = iwn.inspection_info_id-->
+        <!--    LEFT JOIN-->
+        <!--        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>-->
+        <!--        &lt;!&ndash; 车牌号模糊查询 &ndash;&gt;-->
+        <!--        <if test="inspectionInfo.carNum != null">-->
+        <!--            AND ii.car_num LIKE CONCAT('%', #{inspectionInfo.carNum}, '%')-->
+        <!--        </if>-->
+        <!--        &lt;!&ndash; 待接受 &ndash;&gt;-->
+        <!--        <if test="inspectionInfo.status == 1">-->
+        <!--            AND  &lt;!&ndash; 工单负责人或角色ID匹配 &ndash;&gt;-->
+        <!--            (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'-->
+        <!--            &#45;&#45; AND ii.now_order_num = iwn.order_num-->
+        <!--            ORDER BY ii.create_time DESC-->
+        <!--        </if>-->
+        <!--        &lt;!&ndash; 进行中 &ndash;&gt;-->
+        <!--        <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>-->
+        <!--        &lt;!&ndash; 已完成 &ndash;&gt;-->
+        <!--        <if test="inspectionInfo.status == 3">-->
+        <!--            AND iwn.status = '2'-->
+        <!--            AND iwn.deal_user_id = #{inspectionInfo.dealUserId}-->
+        <!--            ORDER BY iwn.update_time DESC-->
+        <!--        </if>-->
+        <!--    </where>-->
+    </select>
 
 </mapper>