fix：[试验管理]计划表单复核

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

@@ -573,7 +573,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
     public void updateZdgxjl(StudyFormUpdateForm form) {
         //更新勾选记录 todo
         StudyFormApply studyFormApplyOld = this.queryInfo(form.getId());
-        studyFormApplyOld.setZdxgjl(form.getZdgxjl());
+        studyFormApplyOld.setZdgxjl(form.getZdgxjl());
         this.updateById(studyFormApplyOld);
 //        baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl());
     }

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

@@ -633,7 +633,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
     public void updateZdgxjl(StudyFormUpdateForm form) {
         //更新勾选记录 todo
         StudyFormFill studyFormFillOld = this.queryInfo(form.getId());
-        studyFormFillOld.setZdxgjl(form.getZdgxjl());
+        studyFormFillOld.setZdgxjl(form.getZdgxjl());
         this.updateById(studyFormFillOld);
 //        baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl());
     }

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

@@ -401,7 +401,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
     public void updateZdgxjl(StudyFormUpdateForm form) {
         //更新勾选记录 todo
         StudyFormPlan studyFormPlanOld = this.queryInfo(form.getId());
-        studyFormPlanOld.setZdxgjl(form.getZdgxjl());
+        studyFormPlanOld.setZdgxjl(form.getZdgxjl());
         this.updateById(studyFormPlanOld);
 //        baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl());
     }

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

@@ -404,7 +404,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
     public void updateZdgxjl(StudyFormUpdateForm form) {
         //更新勾选记录 todo
         StudyFormPre studyFormPreOld = this.queryInfo(form.getId());
-        studyFormPreOld.setZdxgjl(form.getZdgxjl());
+        studyFormPreOld.setZdgxjl(form.getZdgxjl());
         this.updateById(studyFormPreOld);
 //        baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl());
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java

@@ -45,8 +45,8 @@ public class GyzjJcnrUtil {
         mapJcnr.put("入库量","Total Amount");
 
         mapJcnr.put("目的","目的");
-        mapJcnr.put("申请备注","申请备注");
-        mapJcnr.put("审核备注","审核备注");
+        mapJcnr.put("申请备注","Apply Comment");
+        mapJcnr.put("审核备注","Approve Comment");
         //endregion
 
         //region 稽查名称

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/StudyFormUtil.java

@@ -24,9 +24,8 @@ public class StudyFormUtil {
         mapJcnr.put("生长情况","Growth Status");
         mapJcnr.put("新归属人","New Owner");
         mapJcnr.put("原归属人","Old Owner");
-
-        mapJcnr.put("填入值","填入值");
-        mapJcnr.put("填写人","填写人");
+        mapJcnr.put("填入值","Input Data");
+        mapJcnr.put("填写人","Data Entry Person");
         mapJcnr.put("意见回复","意见回复");
         mapJcnr.put("复核意见","复核意见");
         //endregion
@@ -38,27 +37,28 @@ public class StudyFormUtil {
         mapQmyy.put("差","Bad");
         mapQmyy.put("修改","Edit");
 
-        mapQmyy.put("修改记录","修改记录");
-        mapQmyy.put("填写","填写");
+        mapQmyy.put("修改记录","Change Data");
+        mapQmyy.put("填写","Create Record");
         mapQmyy.put("意见回复","意见回复");
         mapQmyy.put("复核意见","复核意见");
         mapQmyy.put("免复核通过","免复核通过");
-        mapQmyy.put("复核拒绝","复核拒绝");
-        mapQmyy.put("复核通过","复核通过");
-        mapQmyy.put("填写并提交记录","填写并提交记录");
+        mapQmyy.put("复核拒绝","Verification Reject");
+        mapQmyy.put("复核通过","Verification Pass");
+        mapQmyy.put("填写并提交记录","Create and Submit Record");
         mapQmyy.put("废止拒绝","废止拒绝");
         mapQmyy.put("废止通过","废止通过");
         mapQmyy.put("申请废止","申请废止");
-        mapQmyy.put("开始现场复核","开始现场复核");
-        mapQmyy.put("结束现场复核","结束现场复核");
-        mapQmyy.put("申明协作","申明协作");
-        mapQmyy.put("已审阅","已审阅");
-        mapQmyy.put("审核通过","审核通过");
-        mapQmyy.put("补充说明","补充说明");
-        mapQmyy.put("审核拒绝","审核拒绝");
-        mapQmyy.put("制作保存预制表单","制作保存预制表单");
+        mapQmyy.put("开始现场复核","Start on-Site Verification");
+        mapQmyy.put("结束现场复核","End on-Site Verification");
+        mapQmyy.put("申明协作","Declaration of Collaboration");
+        mapQmyy.put("已审阅","Reviewed");
+        mapQmyy.put("审核通过","Approved");
+        mapQmyy.put("补充说明","Additional Remark");
+        mapQmyy.put("审核拒绝","Reject after Review");
+        mapQmyy.put("制作保存预制表单","Submit Record Preset");
         mapQmyy.put("制作提交预制表单","制作提交预制表单");
-        mapQmyy.put("创建记录","创建记录");
+        mapQmyy.put("创建记录","Create Record");
+        mapQmyy.put("填写并保存记录","Create and Save Record");
 
         //endregion