From 08579b06f15bb894f0ac5b2e2bed658e8becb995 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Mon, 2 Feb 2026 11:41:38 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E6=A8=A1=E6=9D=BF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86]=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/StudyFormFillController.java        | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java
index 4764c25..0b65eec 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java
@@ -1,9 +1,13 @@
 package com.hxhq.business.controller;
 
+import java.util.HashMap;
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.*;
 import com.hxhq.business.dto.study.StudyFormFillListDto;
+import com.hxhq.business.enums.zykgl.JcgjlxEnum;
 import com.hxhq.business.form.study.StudyFormFillGcForm;
 import com.hxhq.business.form.study.StudyFormFillShfzForm;
 import com.hxhq.business.form.study.StudyFormFillSearchForm;
@@ -82,6 +86,34 @@ public class StudyFormFillController extends BaseController {
     }
 
     /**
+     * 稽查轨迹，签名信息导出列表
+     */
+    @GetMapping("/jcgjqmxxList")
+    @RequiresPermissions(value = {"business:studyFormFill:xq", "business:nonTrialFormFill:xq", "business:drugFormFill:xq"}, logical = Logical.OR)
+    public AjaxResult jcgjqmxxList(Integer jcgjlx,Long id) {
+        HashMap<String,Object> map=new HashMap<String,Object>();
+        //稽查轨迹
+        QueryWrapper<StudyFormFillJcgj> studyFormFillJcgjQueryWrapper = Wrappers.query();
+        studyFormFillJcgjQueryWrapper.eq("form_id",id);
+        if(jcgjlx!=null&&jcgjlx.intValue()>0){
+            Integer jcgjlxExport=999;
+            if(jcgjlx.intValue()==jcgjlxExport){
+                studyFormFillJcgjQueryWrapper.notIn("jcgjlx", JcgjlxEnum.xg.getValue());
+            }else{
+                studyFormFillJcgjQueryWrapper.eq("jcgjlx",jcgjlx);
+            }
+        }
+        studyFormFillJcgjQueryWrapper.orderByDesc("create_time");
+        map.put("jcgj",studyFormFillJcgjService.list(studyFormFillJcgjQueryWrapper));
+        //签名信息
+        QueryWrapper<StudyFormFillQmxx> studyFormFillQmxxQueryWrapper = Wrappers.query();
+        studyFormFillQmxxQueryWrapper.eq("form_id",id);
+        studyFormFillQmxxQueryWrapper.orderByDesc("create_time");
+        map.put("qmxx",studyFormFillQmxxService.list(studyFormFillQmxxQueryWrapper));
+        return AjaxResult.success(map);
+    }
+
+    /**
      * 详细
      */
     @GetMapping(value = "/info")