修改动态表单在页面回显时的bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FormValue.java

@@ -30,11 +30,25 @@ public class FormValue implements Serializable{
     private String value;
     @ApiModelProperty(value = "是否一行显示")
     private boolean block;
+    
+    @ApiModelProperty(value = "value 所对应的字符名称")
+    private String valueName;
+    
+    
   
     public FormValue() {
     }
 
 
+	public FormValue(String key, String label, String type, String value,boolean block,String valueName) {
+		super();
+		this.key = key;
+		this.label = label;
+		this.type = type;
+		this.value = value;
+		this.block = block;
+		this.valueName =valueName;
+	}
 	public FormValue(String key, String label, String type, String value,boolean block) {
 		super();
 		this.key = key;

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -365,15 +365,17 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         List<DynamicFormInstanceDto> list = alertFormValueServiceImpl.listByCalledId(id);
         List<FormValue> formValue = new ArrayList<>();
         for (DynamicFormInstanceDto alertFormValue : list) {
-            if (alertFormValue.getFieldValueLabel() != null) {
+        	  /*修改为动态表单返回的数据参数量 2021-09-08 陈浩 开始 */
+//            if (alertFormValue.getFieldValueLabel() != null) {
+//                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
+//                        alertFormValue.getFieldType(), alertFormValue.getFieldValueLabel(), alertFormValue.getBlock());
+//                formValue.add(value);
+//            } else {
+        	  /*修改为动态表单返回的数据参数量 2021-09-08 陈浩 结束 */
                 FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
-                        alertFormValue.getFieldType(), alertFormValue.getFieldValueLabel(), alertFormValue.getBlock());
+                        alertFormValue.getFieldType(), alertFormValue.getFieldValue(), alertFormValue.getBlock(),alertFormValue.getFieldValueLabel());
                 formValue.add(value);
-            } else {
-                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
-                        alertFormValue.getFieldType(), alertFormValue.getFieldValue(), alertFormValue.getBlock());
-                formValue.add(value);
-            }
+//            }
         }
         return formValue;
         /*BUG2580 返回值为code值 修改为类型名称 2021-08-31 陈召 结束 */
@@ -385,7 +387,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         List<FormValue> formValue = new ArrayList<>();
         for (DynamicFormInstanceDto alertFormValue : list) {
             FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
-                    alertFormValue.getFieldType(), alertFormValue.getFieldValue(), alertFormValue.getBlock());
+                    alertFormValue.getFieldType(), alertFormValue.getFieldValue(), alertFormValue.getBlock(),alertFormValue.getFieldValueLabel());//陈浩 添加getFieldValueLabel的属性值 2021-09-08
             formValue.add(value);
         }
         return formValue;