fix:[模板管理]优化

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

@@ -1085,8 +1085,6 @@ public class StudyFormFillServiceImpl extends ServiceImpl
                         formData.put("新值", jsonObject.getString("value"));
                         formData.put("原因", jsonObject.getString("reason"));
                         //en
-                        formDataEn.put("oldUrl", jsonObject.getString("oldUrl"));
-                        formDataEn.put("url", jsonObject.getString("url"));
                         formDataEn.put("字段名", jsonObject.getString("fieldEn"));
                         formDataEn.put("原值", jsonObject.getString("oldValue"));
                         formDataEn.put("新值", jsonObject.getString("value"));
@@ -1100,8 +1098,6 @@ public class StudyFormFillServiceImpl extends ServiceImpl
                         formData.put("填入值", jsonObject.getString("value"));
                         formData.put("填写人", qmr.getNickName());
                         //en
-                        formDataEn.put("oldUrl", jsonObject.getString("oldUrl"));
-                        formDataEn.put("url", jsonObject.getString("url"));
                         formDataEn.put("字段名", jsonObject.getString("fieldEn"));
                         formDataEn.put("填入值", jsonObject.getString("value"));
                         formDataEn.put("填写人", qmr.getNickName());

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

@@ -278,8 +278,10 @@ public class StudyFormFillUtil {
                     for (JsonNode node : jsonArray) {
                         if (node.get("name") != null) {
                             String name = node.get("name").asText();
-                            String value = node.get("value") != null ? node.get("value").asText() : "";
-                            result.add(name + "：" + value);
+                            if(!name.equals("url")&&!name.equals("oldUrl")){
+                                String value = node.get("value") != null ? node.get("value").asText() : "";
+                                result.add(name + "：" + value);
+                            }
                         }
                     }
                 }
@@ -291,8 +293,10 @@ public class StudyFormFillUtil {
                     for (JsonNode node : jsonArray) {
                         if (node.get("name") != null) {
                             String name = node.get("name").asText();
-                            String value = node.get("value") != null ? node.get("value").asText() : "";
-                            result.add(name + "：" + value);
+                            if(!name.equals("url")&&!name.equals("oldUrl")){
+                                String value = node.get("value") != null ? node.get("value").asText() : "";
+                                result.add(name + "：" + value);
+                            }
                         }
                     }
                 }
@@ -430,7 +434,7 @@ public class StudyFormFillUtil {
                 // 计算起始位置
                 float totalTextWidth = pageTextWidth + totalWidth +
                         baseFont.getWidthPoint(language.equals("zh")? " 页":" page", footerFont.getSize());
-                float startX = (document.getPageSize().getWidth() - totalTextWidth) ;
+                float startX = (document.getPageSize().getWidth() - totalTextWidth)+(language.equals("zh")?Float.parseFloat("0.0"):Float.parseFloat("10.0")) ;
 
                 // 写入当前页信息
                 ColumnText.showTextAligned(cb, Element.ALIGN_LEFT,

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

@@ -29,7 +29,6 @@ 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");