提交通过子订单id查询转发记录列表信息

src/main/java/com/ydtech/modules/esm/dao/InsOrderSetUserHisMapper.java

@@ -2,9 +2,12 @@ package com.ydtech.modules.esm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ydtech.modules.esm.model.po.InsOrderSetUserHis;
+import com.ydtech.modules.esm.model.vo.InsOrderSetUserHisVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  *  @version
  *  @author: hxl
@@ -21,4 +24,11 @@ public interface InsOrderSetUserHisMapper extends BaseMapper<InsOrderSetUserHis>
      *  @Description: 通过子订单id查询最新的历史记录数据
      */
     InsOrderSetUserHis getOneBySubOrderId(@Param("subOrderId") String subOrderId);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/5/11 9:16
+     *  @Description: 通过子订单id查询转发记录
+     */
+    List<InsOrderSetUserHisVo> findForwardingListBySubOrderId(@Param("subOrderId") String subOrderId);
 }

src/main/java/com/ydtech/modules/esm/model/vo/InsOrderSetUserHisVo.java

@@ -18,37 +18,42 @@ public class InsOrderSetUserHisVo {
     /***
      * 主键自增
      */
-    @ApiModelProperty("主键ID")
-    private Long id;
+    //@ApiModelProperty("主键ID")
+    //private Long id;
     /***
      * 订单号
      */
-    @ApiModelProperty(value = "订单号")
-    private  String orderno;
+    //@ApiModelProperty(value = "订单号")
+   // private  String orderno;
     /***
      * 报价单号
      */
-    @ApiModelProperty(value = "报价单号")
-    private String quoteno;
+    //@ApiModelProperty(value = "报价单号")
+   // private String quoteno;
+    /***
+     * 子订单id
+     */
+    @ApiModelProperty(value = "订单号")
+    private String subOrderId;
     /***
      * 原操作人
      */
-    @ApiModelProperty(value = "原操作人")
+    @ApiModelProperty(value = "转发人")
     private String oldOperatorId;
     /***
      * 现操作人
      */
-    @ApiModelProperty(value = "现操作人")
+    @ApiModelProperty(value = "接受人")
     private String newOperatorId;
     /***
      * 操作时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "操作时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "转发时间")
     private String createTime;
     /***
-     * 创建人
+     * 备注
      */
-    @ApiModelProperty(value = "创建人")
-    private String createId;
+    @ApiModelProperty(value = "转发信息")
+    private String remark;
 }

src/main/java/com/ydtech/modules/esm/service/InsOrderSetUserHisService.java

@@ -2,6 +2,9 @@ package com.ydtech.modules.esm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.esm.model.po.InsOrderSetUserHis;
+import com.ydtech.modules.esm.model.vo.InsOrderSetUserHisVo;
+
+import java.util.List;
 
 public interface InsOrderSetUserHisService extends IService<InsOrderSetUserHis> {
     /**
@@ -18,4 +21,11 @@ public interface InsOrderSetUserHisService extends IService<InsOrderSetUserHis>
      *  @Description: 通过子订单id和状态查询最新一条转发的数据
      */
     InsOrderSetUserHis getOneBySubOrderId(String subOrderId);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/5/11 9:15
+     *  @Description:  通过子订单id查询转发记录信息
+     */
+    List<InsOrderSetUserHisVo> findForwardingListBySubOrderId(String subOrderId);
 }

src/main/java/com/ydtech/modules/esm/service/impl/InsOrderSetUserHisServiceImpl.java

@@ -3,10 +3,13 @@ package com.ydtech.modules.esm.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.modules.esm.dao.InsOrderSetUserHisMapper;
 import com.ydtech.modules.esm.model.po.InsOrderSetUserHis;
+import com.ydtech.modules.esm.model.vo.InsOrderSetUserHisVo;
 import com.ydtech.modules.esm.service.InsOrderSetUserHisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  *  @version
  *  @author: hxl
@@ -44,4 +47,9 @@ public class InsOrderSetUserHisServiceImpl extends ServiceImpl<InsOrderSetUserHi
         return insOrderSetUserHisMapper.getOneBySubOrderId(subOrderId);
     }
 
+    @Override
+    public List<InsOrderSetUserHisVo> findForwardingListBySubOrderId(String subOrderId) {
+        return insOrderSetUserHisMapper.findForwardingListBySubOrderId(subOrderId);
+    }
+
 }

src/main/java/com/ydtech/modules/order/controller/OrderTaskPoolsController.java

@@ -12,10 +12,7 @@ import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.order.service.OrderTaskPoolsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -85,4 +82,10 @@ public class OrderTaskPoolsController {
     public HttpResult recover(@RequestBody TaskForwardingVo taskForwardingVo) {
         return orderTaskPoolsService.recover(taskForwardingVo,getUser());
     }
+
+    @GetMapping(value = "/findForwardingListBySubOrderId")
+    @ApiOperation(value = "通过子订单Id查询任务转发列表")
+    public HttpResult findForwardingListBySubOrderId(@RequestParam  String  subOrderId) {
+        return orderTaskPoolsService.findForwardingListBySubOrderId(subOrderId);
+    }
 }

src/main/java/com/ydtech/modules/order/service/OrderTaskPoolsService.java

@@ -46,4 +46,11 @@ public interface OrderTaskPoolsService {
      *  @Description: 子订单的转发
      */
     HttpResult forwardingSubOrders(TaskForwardingVo taskForwardingVo,SysUser sysUser);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/5/11 9:06
+     *  @Description:  通过子订单id查询任务转发列表
+     */
+    HttpResult findForwardingListBySubOrderId(String subOrderId);
 }

src/main/java/com/ydtech/modules/order/service/impl/OrderTaskPoolsServiceImpl.java

@@ -10,6 +10,7 @@ import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.po.InsOrderSetUserHis;
+import com.ydtech.modules.esm.model.vo.InsOrderSetUserHisVo;
 import com.ydtech.modules.esm.service.InsOrderSetUserHisService;
 import com.ydtech.modules.ins.model.InsTaskHistory;
 import com.ydtech.modules.ins.service.InsTaskHistoryService;
@@ -187,6 +188,8 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
         insAreaCompanyService.updateById(insAreaCompany);
         return HttpResult.ok("转发成功");
     }
+
+
     /**
      *  @version
      *  @author: hxl
@@ -228,4 +231,20 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
         insAreaCompanyService.updateById(insAreaCompany);
         return HttpResult.ok("收回成功");
     }
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/5/11 9:14
+     *  @Description:  通过子订单id查询转发记录
+     */
+    @Override
+    public HttpResult findForwardingListBySubOrderId(String subOrderId) {
+        if(StringUtils.isEmpty(subOrderId) ){
+            throw  new SystemException("参数错误，子订单号subOrderId不能为空！！");
+        }
+        List<InsOrderSetUserHisVo> list= insOrderSetUserHisService.findForwardingListBySubOrderId(subOrderId);
+        return HttpResult.ok(list);
+    }
+
 }

src/main/resources/mapper/modules/esm/InsOrderSetUserHisMapper.xml

@@ -4,7 +4,27 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ydtech.modules.esm.dao.InsOrderSetUserHisMapper">
 
+    <select id="getOneBySubOrderId"  resultType="com.ydtech.modules.esm.model.po.InsOrderSetUserHis">
+        SELECT
+            *
+        FROM
+            ins_order_set_user_his
+        WHERE
+            suborder_id = #{subOrderId}
+        ORDER BY
+            create_time DESC
+            LIMIT 1;
+    </select>
 
 
-
+    <select id="findForwardingListBySubOrderId"  resultType="com.ydtech.modules.esm.model.vo.InsOrderSetUserHisVo">
+        SELECT
+            *
+        FROM
+            ins_order_set_user_his
+        WHERE
+            suborder_id = #{subOrderId}
+        ORDER BY
+            create_time DESC
+    </select>
 </mapper>

src/main/resources/mapper/modules/ins/InsOrderSetUserHisMapper.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ydtech.modules.esm.dao.InsOrderSetUserHisMapper">
-
-
-   <select id="getOneBySubOrderId"  resultType="com.ydtech.modules.esm.model.po.InsOrderSetUserHis">
-       SELECT
-           *
-       FROM
-           ins_order_set_user_his
-       WHERE
-          suborder_id = #{subOrderId}
-       ORDER BY
-           create_time DESC
-           LIMIT 1;
-   </select>
-</mapper>