增加默认值

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/AlertFormVo.java

@@ -24,6 +24,9 @@ public class AlertFormVo{
     @ApiModelProperty(value = "表单类型")
     private String type;
 
+    @ApiModelProperty(value = "表单默认值")
+    private Object defaultValue;
+    
     @ApiModelProperty(value = "表单值")
     private Items data;
 
@@ -34,7 +37,7 @@ public class AlertFormVo{
 		super();
 	}
 	public AlertFormVo(String key, String label, String type, Items data, AlertFormValue formItemDescr) {
-		super();
+		super();		
 		this.key = key;
 		this.label = label;
 		this.type = type;

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertFormServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -43,9 +44,12 @@ public class AlertFormServiceImpl extends BaseService<AlertFromDto,AlertForm,Ale
 		List<AlertFormVo> listfrom = new ArrayList<AlertFormVo>();
 		// 组装数据
 		for (AlertForm alertFrom : alertFormValue) {
-			if(alertFrom.getFieldType().equals("string")||alertFrom.getFieldType().equals("date")||alertFrom.getFieldType().equals("textarea")) {				
+			if(alertFrom.getFieldType().equals("string")||alertFrom.getFieldType().equals("inputDateTime")||alertFrom.getFieldType().equals("textarea")) {	
 				AlertFormVo vo = new AlertFormVo(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), null,
 						new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.getBlock(), alertFrom.getAlertTypeCode()));
+				if(alertFrom.getFieldType().equals("inputDateTime")) {
+					vo.setDefaultValue(new Date());
+				}
 				listfrom.add(vo);				
 			}else {
 				// 查询数据项