diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormApplyController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormApplyController.java index df5bb57..95a5bd4 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormApplyController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormApplyController.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.StudyFormApplyListDto; +import com.hxhq.business.enums.zykgl.JcgjlxEnum; import com.hxhq.business.form.study.StudyFormApplyGcForm; import com.hxhq.business.form.study.StudyFormApplyShfzForm; import com.hxhq.business.form.study.StudyFormApplySearchForm; @@ -94,6 +98,35 @@ public class StudyFormApplyController extends BaseController { } /** + * 稽查轨迹,签名信息导出列表 + */ + @GetMapping("/jcgjqmxxList") + @RequiresPermissions(value = {"business:studyFormApply:xq", "business:nonTrialFormApply:xq", "business:drugFormApply:xq"}, logical = Logical.OR) + public AjaxResult jcgjqmxxList(Integer jcgjlx,Long id) { + HashMap map=new HashMap(); + //稽查轨迹 + QueryWrapper studyFormApplyJcgjQueryWrapper = Wrappers.query(); + studyFormApplyJcgjQueryWrapper.eq("form_id",id); + if(jcgjlx!=null&&jcgjlx.intValue()>0){ + Integer jcgjlxExport=999; + if(jcgjlx.intValue()==jcgjlxExport){ + studyFormApplyJcgjQueryWrapper.notIn("jcgjlx", JcgjlxEnum.xg.getValue()); + }else{ + studyFormApplyJcgjQueryWrapper.eq("jcgjlx",jcgjlx); + } + } + studyFormApplyJcgjQueryWrapper.orderByDesc("create_time"); + map.put("jcgj",studyFormApplyJcgjService.list(studyFormApplyJcgjQueryWrapper)); + //签名信息 + QueryWrapper studyFormApplyQmxxQueryWrapper = Wrappers.query(); + studyFormApplyQmxxQueryWrapper.eq("form_id",id); + studyFormApplyQmxxQueryWrapper.orderByDesc("create_time"); + map.put("qmxx",studyFormApplyQmxxService.list(studyFormApplyQmxxQueryWrapper)); + return AjaxResult.success(map); + } + + + /** * 详细 */ @GetMapping(value = "/info") diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPlanController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPlanController.java index a17001c..9b1e186 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPlanController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPlanController.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.StudyFormPlanListDto; +import com.hxhq.business.enums.zykgl.JcgjlxEnum; import com.hxhq.business.form.study.StudyFormPlanSearchForm; import com.hxhq.business.form.study.StudyFormUpdateForm; import com.hxhq.business.service.IStudyFormPlanJcgjService; @@ -81,6 +85,34 @@ public class StudyFormPlanController extends BaseController } /** + * 稽查轨迹,签名信息导出列表 + */ + @GetMapping("/jcgjqmxxList") + @RequiresPermissions(value = {"business:studyFormPlan:xq", "business:nonTrialFormPlan:xq", "business:drugFormPlan:xq"}, logical = Logical.OR) + public AjaxResult jcgjqmxxList(Integer jcgjlx,Long id) { + HashMap map=new HashMap(); + //稽查轨迹 + QueryWrapper studyFormPlanJcgjQueryWrapper = Wrappers.query(); + studyFormPlanJcgjQueryWrapper.eq("form_id",id); + if(jcgjlx!=null&&jcgjlx.intValue()>0){ + Integer jcgjlxExport=999; + if(jcgjlx.intValue()==jcgjlxExport){ + studyFormPlanJcgjQueryWrapper.notIn("jcgjlx", JcgjlxEnum.xg.getValue()); + }else{ + studyFormPlanJcgjQueryWrapper.eq("jcgjlx",jcgjlx); + } + } + studyFormPlanJcgjQueryWrapper.orderByDesc("create_time"); + map.put("jcgj",studyFormPlanJcgjService.list(studyFormPlanJcgjQueryWrapper)); + //签名信息 + QueryWrapper studyFormPlanQmxxQueryWrapper = Wrappers.query(); + studyFormPlanQmxxQueryWrapper.eq("form_id",id); + studyFormPlanQmxxQueryWrapper.orderByDesc("create_time"); + map.put("qmxx",studyFormPlanQmxxService.list(studyFormPlanQmxxQueryWrapper)); + return AjaxResult.success(map); + } + + /** * 详细 */ @GetMapping(value = "/info")