fix:[填报表单]优化

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

@@ -1077,6 +1077,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
                     Map<String, String> formData = new LinkedHashMap<>();
                     Map<String, String> formDataEn = new LinkedHashMap<>();
                     if (StringUtils.isNoneBlank(jsonObject.getString("oldValue"))) {
+                        formDataEn.put("文件地址", jsonObject.getString("url"));
                         //zh
                         formData.put("字段名", jsonObject.getString("fieldCn"));
                         formData.put("原值", jsonObject.getString("oldValue"));
@@ -1089,6 +1090,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
                         formDataEn.put("原因", jsonObject.getString("reason"));
                         studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(jsonObject.getDate("time"), studyFormFillOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
                     } else {
+                        formData.put("文件地址", jsonObject.getString("url"));
                         //zh
                         formData.put("字段名", jsonObject.getString("fieldCn"));
                         formData.put("填入值", jsonObject.getString("value"));

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

@@ -465,7 +465,7 @@ public class StudyFormFillUtil {
                 // 添加页眉文字
                 if (StringUtils.isNoneBlank(headerText)) {
                     float pageTextWidth1 = baseFont.getWidthPoint(headerText, footerFont.getSize());
-                    float startX1 = (document.getPageSize().getWidth() - pageTextWidth1) ;
+                    float startX1 = (document.getPageSize().getWidth() - pageTextWidth1) + 5 ;
 
                     PdfContentByte cb2 = writer.getDirectContent();
                     ColumnText.showTextAligned(cb2, Element.ALIGN_LEFT,

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

@@ -29,6 +29,7 @@ public class StudyFormUtil {
         mapLang.put("原值","Old Value");
         mapLang.put("新值","New Value");
         mapLang.put("原因","Reason");
+        mapLang.put("文件地址","Url");
         mapLang.put("生长情况","Growth Status");
         mapLang.put("新归属人","New Owner");
         mapLang.put("原归属人","Old Owner");