feat: [档案管理] 试验档案

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyDrugController.java

@@ -74,8 +74,10 @@ public class StudyDrugController extends BaseController
         List<StudyListDto> 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);
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyNonTrialController.java

@@ -73,8 +73,10 @@ public class StudyNonTrialController extends BaseController
         List<StudyListDto> 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);
     }

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")