Merge branch 'master' of http://8.149.142.40:3000/fjhx2012/jy_erp

jy-business/src/main/java/com/jy/business/payment/dao/PaymentRequestsDao.java

@@ -73,11 +73,20 @@ public class PaymentRequestsDao extends BaseDao<PaymentRequestsMapper, PaymentRe
     public PaymentRequestsVo getDetail(Long id) {
         PaymentRequestsTable pr = PaymentRequestsTable.pr;
 
+        // 部门
+        SysDeptTable sd = SysDeptTable.sd;
+        // 用户
+        SysUserTable su = SysUserTable.su;
+
         return sql(PaymentRequestsVo.class)
                 .select(
-                        pr.all
+                        pr.all,
+                        sd.name.as(PaymentRequestsVo::getDeptName),
+                        su.nickname.as(PaymentRequestsVo::getUserName)
                 )
                 .from(pr)
+                .leftJoin(sd).on(pr.deptId.eq(sd.id))
+                .leftJoin(su).on(pr.createUser.eq(su.id))
                 .where(
                         pr.id.eq(id)
                 )

jy-flow/src/main/java/com/jy/flow/controller/ExecuteController.java

@@ -36,6 +36,7 @@ import com.warm.flow.core.service.TaskService;
 import com.warm.flow.core.service.UserService;
 import com.warm.flow.core.utils.StreamUtils;
 import com.warm.flow.orm.entity.FlowHisTask;
+import com.warm.flow.orm.entity.FlowInstance;
 import com.warm.flow.orm.entity.FlowSkip;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -183,7 +184,7 @@ public class ExecuteController {
      */
     @GetMapping("/doneList/{instanceId}")
     public List<HisTask> doneList(@PathVariable("instanceId") Long instanceId) {
-        List<HisTask> vo = hisTaskService.orderById().desc().list(new FlowHisTask().setInstanceId(instanceId));
+        List<HisTask> vo = hisTaskService.list(new FlowHisTask().setInstanceId(instanceId));
         if (vo.isEmpty()) {
             return vo;
         }
@@ -202,6 +203,15 @@ public class ExecuteController {
     }
 
     /**
+     * 查询已办任务历史记录
+     */
+    @GetMapping("/doneListByBusinessId/{businessId}")
+    public List<HisTask> doneListByBusinessId(@PathVariable("businessId") String businessId) {
+        Instance instance = insService.getOne(new FlowInstance().setBusinessId(businessId));
+        return doneList(instance.getId());
+    }
+
+    /**
      * 查询跳转任意节点列表
      */
     @GetMapping("/anyNodeList/{instanceId}")

jy-ui/src/api/flow/execute.ts

@@ -11,6 +11,11 @@ export function getDoneListApi(id: string): Promise<PageType<StrAnyObj>> {
   return request.get(`/flow/execute/doneList/${id}`)
 }
 
+// 查询已办任务历史记录（根据业务id）
+export function doneListByBusinessId(id: string): Promise<PageType<StrAnyObj>> {
+  return request.get(`/flow/execute/doneListByBusinessId/${id}`)
+}
+
 // 办理
 export function handleApi(data: StrAnyObj): Promise<void> {
   return request.post(`/flow/execute/handle`, data)