From 680ff92daa3f41b9818218ea05f4863c587c05e1 Mon Sep 17 00:00:00 2001
From: yanhuiqing <yanhuiqing2008@163.com>
Date: Mon, 22 Dec 2025 20:05:52 +0800
Subject: [PATCH] 工单 我的已办的查询修改

---
 urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java  |   3 ++-
 2 files changed, 123 insertions(+), 1 deletion(-)

diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java
index daaca51..aeeef4e 100644
--- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java
+++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java
@@ -31,6 +31,127 @@ import java.util.List;
  */
 @Mapper
 public interface MainInfoExtMapper extends BaseMapperX<MainInfoDO> {
+
+    @Select({
+            "<script>",
+            " SELECT ",
+            "res.* ",
+            " FROM (",
+            "SELECT",
+            "    m.*,",
+            "    t.ID_ AS task_id,",
+            /*"t.NAME_ AS task_name,",
+            "t.task_def_key_ AS task_key,",*/
+            "    '' AS task_name,",
+            "    '' AS task_key,",
+            "    pd.NAME_ AS process_definition_name,",
+            "    t.START_TIME_,",
+            "    t.END_TIME_,",
+            "    pd.KEY_,",
+            "    ROW_NUMBER() OVER (",
+            "      PARTITION BY m.order_no",
+            "      ORDER BY t.START_TIME_ DESC, t.ID_ DESC",
+            "    ) AS rn ",
+            "FROM act_hi_taskinst t",
+            "LEFT JOIN act_re_procdef pd ON t.PROC_DEF_ID_ = pd.ID_",
+            "LEFT JOIN workorder_main_info m ON t.PROC_INST_ID_ = m.process_instance_id AND m.deleted = 0",
+            "WHERE 1=1",
+            "  AND t.END_TIME_ IS NOT NULL",
+            "  <if test='query.userId != null'>",
+            "    AND t.ASSIGNEE_ = #{query.userId}",
+            "  </if>",
+            "  <if test='query.key != null'>",
+            "    AND pd.KEY_ = #{query.key}",
+            "  </if>",
+            "  <if test='query.startTime != null'>",
+            "    <![CDATA[ AND t.START_TIME_ >= #{query.startTime} ]]>",
+            "  </if>",
+            "  <if test='query.endTime != null'>",
+            "    <![CDATA[ AND t.END_TIME_ <= #{query.endTime} ]]>",
+            "  </if>",
+            "  <if test='query.busiLine != null'>",
+            "    AND m.busi_line = #{query.busiLine}",
+            "  </if>",
+            "  <if test=\"query.orderNo != null and query.orderNo != ''\">",
+            "    AND m.order_no LIKE CONCAT('%', #{query.orderNo}, '%')",
+            "  </if>",
+            "  <if test=\"query.orderName != null and query.orderName != ''\">",
+            "    AND m.order_name LIKE CONCAT('%', #{query.orderName}, '%')",
+            "  </if>",
+            "  <if test=\"query.remark != null and query.remark != ''\">",
+            "    AND m.remark LIKE CONCAT('%', #{query.remark}, '%')",
+            "  </if>",
+            "  <if test=\"query.roadName != null and query.roadName != ''\">",
+            "    AND m.road_name LIKE CONCAT('%', #{query.roadName}, '%')",
+            "  </if>",
+            "  <if test=\"query.streetName != null and query.streetName != ''\">",
+            "    AND m.street_name = #{query.streetName}",
+            "    <!-- 若需模糊匹配，改为：AND m.street_name LIKE CONCAT('%', #{query.streetName}, '%') -->",
+            "  </if>",
+            "  <if test='query.curingLevelId != null'>",
+            "    AND m.curing_level_id = #{query.curingLevelId}",
+            "  </if>",
+            "  <if test='query.taskId != null'>",
+            "    AND t.ID_ = #{query.taskId}",
+            "  </if>",
+            "  ) res ",
+            "  WHERE res.rn = 1 ",
+            "  ORDER BY res.END_TIME_ desc",
+            "</script>"
+    })
+    @Results({
+            @Result(column = "id", property = "id"),
+            @Result(column = "busi_line", property = "busiLine"),
+            @Result(column = "order_no", property = "orderNo"),
+            @Result(column = "order_name", property = "orderName"),
+            @Result(column = "source_id", property = "sourceId"),
+            @Result(column = "source_name", property = "sourceName"),
+            @Result(column = "road_id", property = "roadId"),
+            @Result(column = "road_name", property = "roadName"),
+            @Result(column = "street_id", property = "streetId"),
+            @Result(column = "street_name", property = "streetName"),
+            @Result(column = "curing_level_id", property = "curingLevelId"),
+            @Result(column = "curing_level_name", property = "curingLevelName"),
+            @Result(column = "commit_date", property = "commitDate"),
+            @Result(column = "finish_date", property = "finishDate"),
+            @Result(column = "pressing_type", property = "pressingType"),
+            @Result(column = "user_id", property = "userId"),
+            @Result(column = "user_name", property = "userName"),
+            @Result(column = "company_id", property = "companyId"),
+            @Result(column = "lat_lon_type", property = "latLonType"),
+            @Result(column = "lat", property = "lat"),
+            @Result(column = "lon", property = "lon"),
+            @Result(column = "lon_lat_address", property = "lonLatAddress"),
+            @Result(column = "third_work_no", property = "thirdWorkNo"),
+            @Result(column = "third_push_state", property = "thirdPushState"),
+            @Result(column = "buz_status", property = "buzStatus"),
+            @Result(column = "status", property = "status"),
+            @Result(column = "process_instance_id", property = "processInstanceId"),
+            @Result(column = "remark", property = "remark"),
+            @Result(column = "handle_result", property = "handleResult"),
+            @Result(column = "creator", property = "creator"),
+            @Result(column = "create_time", property = "createTime"),
+            @Result(column = "updater", property = "updater"),
+            @Result(column = "update_time", property = "updateTime"),
+            @Result(column = "deleted", property = "deleted"),
+
+            @Result(column = "task_id", property = "taskId"),
+            @Result(column = "task_name", property = "taskName"),
+            @Result(column = "task_key", property = "taskKey"),
+            @Result(column = "process_definition_name", property = "processDefinitionName"),
+            @Result(column = "START_TIME_", property = "startTime"),
+            @Result(column = "END_TIME_", property = "endTime"),
+            @Result(column = "KEY_", property = "key_")
+    })
+    IPage<MainInfoExtDO> selectDoneExtUniquePage(IPage<MainInfoExtDO> page, @Param("query") MainInfoHasTaskPageReqVO reqVO);
+
+    default PageResult<MainInfoExtDO> selectWorkOrderDoneUniquePage(PageParam pageParam, @Param("query") MainInfoHasTaskPageReqVO reqVO) {
+        IPage<MainInfoExtDO> mpPage = MyBatisUtils.buildPage(pageParam);
+        mpPage = selectDoneExtUniquePage(mpPage, reqVO);
+        return new PageResult<>(mpPage.getRecords(), mpPage.getTotal());
+    }
+
+    //--------------------------------------------------------------------------------------------------
     @Select({
             "<script>",
             "SELECT",
diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
index c6b23bc..5937e25 100644
--- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
+++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
@@ -444,7 +444,8 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         taskBuzReqVO.setUserId(SecurityFrameworkUtils.getLoginUserId());
         //TODO 先写死
         //taskBuzReqVO.setKey(BpmCommonConstant.BPM_GARDEN_INSPECT_WO);
-        PageResult<MainInfoExtDO> pageResult = workOrderExtMapper.selectWorkOrderDonePage(pageVO,taskBuzReqVO);
+        //已办改为获取最新一条数据
+        PageResult<MainInfoExtDO> pageResult = workOrderExtMapper.selectWorkOrderDoneUniquePage(pageVO,taskBuzReqVO);
         return AppGardenTaskConvert.INSTANCE.buildBuziTaskPage(pageResult,attachmentMapper);
     }
 
--
libgit2 0.21.4