fix：[试验管理]表单bug

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormPreSearchForm.java

@@ -30,6 +30,17 @@ public class StudyFormPreSearchForm {
     /** 创建时间开始 */
     private String endDate;
 
+    /** 表单状态：1：填报中；3：已提交；5：已通过；7：未通过 ；9：待关闭；11：已关闭*/
+    private Integer bdzt;
+
+    public Integer getBdzt() {
+        return bdzt;
+    }
+
+    public void setBdzt(Integer bdzt) {
+        this.bdzt = bdzt;
+    }
+
     public Long getStudySubjectId() {
         return studySubjectId;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java

@@ -71,9 +71,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
         if (form.getUserId() != null && form.getUserId().longValue() > 0) {
             queryWrapper.eq("t.user_id", form.getUserId());
         }
-        if (form.getStudyId() != null && form.getStudyId().longValue() > 0) {
-            queryWrapper.eq("t.study_id", form.getStudyId());
-        }
+        queryWrapper.eq("t.study_id", form.getStudyId());
         if (form.getStudySubjectId() != null && form.getStudySubjectId().longValue() > 0) {
             queryWrapper.eq("t.study_subject_id", form.getStudySubjectId());
         }
@@ -602,7 +600,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
                 formDataEn.put("字段名", jsonObject.getString("fieldEn"));
                 formDataEn.put("填入值", jsonObject.getString("value"));
                 formDataEn.put("填写人", qmr.getNickName());
-                studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(form.getId(), JcgjlxEnum.xg.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
+                studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(form.getId(), JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
             }
             studyFormApplyJcgjService.saveBatch(studyFormApplyJcgjs);
         }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java

@@ -78,9 +78,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         if (form.getUserId() != null && form.getUserId().longValue() > 0) {
             queryWrapper.eq("t.user_id", form.getUserId());
         }
-        if (form.getStudyId() != null && form.getStudyId().longValue() > 0) {
-            queryWrapper.eq("t.study_id", form.getStudyId());
-        }
+        queryWrapper.eq("t.study_id", form.getStudyId());
         if (form.getStudySubjectId() != null && form.getStudySubjectId().longValue() > 0) {
             queryWrapper.eq("t.study_subject_id", form.getStudySubjectId());
         }
@@ -669,7 +667,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
                 formDataEn.put("字段名", jsonObject.getString("fieldEn"));
                 formDataEn.put("填入值", jsonObject.getString("value"));
                 formDataEn.put("填写人", qmr.getNickName());
-                studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.xg.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
+                studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
             }
             studyFormFillJcgjService.saveBatch(studyFormFillJcgjs);
         }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java

@@ -69,10 +69,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
         if (form.getUserId() != null && form.getUserId().longValue() > 0) {
             queryWrapper.eq("t.user_id", form.getUserId());
         }
-        if (form.getStudyId() != null && form.getStudyId().longValue() > 0) {
-            queryWrapper.eq("t.study_id", form.getStudyId());
-        }
-
+        queryWrapper.eq("t.study_id", form.getStudyId());
         if (StringUtils.isNoneBlank(form.getBdbh())) {
             queryWrapper.and(p -> p.like("t.`bdbh`", form.getBdbh()));
         }
@@ -411,7 +408,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
                 formDataEn.put("字段名", jsonObject.getString("fieldEn"));
                 formDataEn.put("填入值", jsonObject.getString("value"));
                 formDataEn.put("填写人", qmr.getNickName());
-                studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(form.getId(), JcgjlxEnum.xg.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
+                studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(form.getId(), JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
             }
             studyFormPlanJcgjService.saveBatch(studyFormPlanJcgjs);
         }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java

@@ -76,8 +76,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         if (form.getUserId() != null && form.getUserId().longValue() > 0) {
             queryWrapper.eq("t.user_id", form.getUserId());
         }
-        if (form.getStudyId() != null && form.getStudyId().longValue() > 0) {
-            queryWrapper.eq("t.study_id", form.getStudyId());
+        queryWrapper.eq("t.study_id", form.getStudyId());
+        if (form.getBdzt() != null && form.getBdzt().intValue() > 0) {
+            queryWrapper.eq("t.bdzt", form.getBdzt());
         }
         if (form.getStudySubjectId() != null && form.getStudySubjectId().longValue() > 0) {
             queryWrapper.eq("t.study_subject_id", form.getStudySubjectId());
@@ -526,7 +527,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
                 formDataEn.put("字段名", jsonObject.getString("fieldEn"));
                 formDataEn.put("填入值", jsonObject.getString("value"));
                 formDataEn.put("填写人", qmr.getNickName());
-                studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(form.getId(), JcgjlxEnum.xg.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
+                studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(form.getId(), JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
             }
             studyFormPreJcgjService.saveBatch(studyFormPreJcgjs);
         }