From 7913c611a65044de38e8e1cf0ceff160738a85ae Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Thu, 22 Jan 2026 20:22:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20[=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=20=E8=AF=95=E9=AA=8C=E6=A1=A3=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hxhq/business/controller/StudyDrugController.java | 2 ++ .../main/java/com/hxhq/business/controller/StudyNonTrialController.java | 2 ++ .../hxhq-system/src/main/java/com/hxhq/business/domain/Study.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyDrugController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyDrugController.java index b25d4da..be37bff 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyDrugController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyDrugController.java @@ -74,8 +74,10 @@ public class StudyDrugController extends BaseController List countList = studyService.queryFormCountList(idList); if(countList.size()>0){ info.setFormCount(countList.get(0).getFormCount()); + info.setFormFinishCount(countList.get(0).getFormFinishCount()); }else{ info.setFormCount(0); + info.setFormFinishCount(0); } return AjaxResult.success(info); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyNonTrialController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyNonTrialController.java index ed3948f..b9148c2 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyNonTrialController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyNonTrialController.java @@ -73,8 +73,10 @@ public class StudyNonTrialController extends BaseController List countList = studyService.queryFormCountList(idList); if(countList.size()>0){ info.setFormCount(countList.get(0).getFormCount()); + info.setFormFinishCount(countList.get(0).getFormFinishCount()); }else{ info.setFormCount(0); + info.setFormFinishCount(0); } return AjaxResult.success(info); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Study.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Study.java index b27f9d8..cb08f81 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Study.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Study.java @@ -1,6 +1,7 @@ package com.hxhq.business.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.hxhq.common.core.annotation.Compare; import com.hxhq.common.core.domain.MpBaseEntity; @@ -57,6 +58,7 @@ public class Study extends MpBaseEntity private String deptName; /** 归档申请时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date gdApplyTime; @Compare(name = "试验简述",nameEn = "Description")