Merge branch 'master' of shine/esb into master

Hos-resource/src/main/java/com/yihu/ehr/datacollect/controller/DataCollectController.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -103,6 +104,22 @@ public class DataCollectController extends BaseController {
        }
    }
    @RequestMapping("compareServeTime")
    @ResponseBody
    public Result getJob(String time){
        try {
            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            if(df.parse(time).before(new Date())) {
                return Result.success("beforeServeTime");
            }
            else
                return Result.error("afterServeTime");
        }catch (Exception ex){
            return Result.error(ex.getMessage());
        }
    }
    /**
     * 根据适配方案获取数据集列表
     */

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/editorJobJs.jsp

@@ -5,6 +5,7 @@
<script>
    var editorJob={
        beforeServeTime:false,
        archiveUpload:"com.yihu.ehr.job.service.ArchiveUploadJob",
        $form:$("#div_form"),
        $listPlan:null,//适配方案列表
@@ -568,6 +569,15 @@
                    //档案上传接口值校验
                    if($('#jobContentClass').ligerComboBox("getValue")==me.archiveUpload)
                    {
                        if($("#repeatStartTime").ligerDateEditor("getValue")!="")
                        {
                            editorJob.compareServeTime($("#repeatStartTime").ligerDateEditor("getValue"));
                            if(editorJob.beforeServeTime==true) {
                                return false;
                            }
                            else
                                return true;
                        }
                        if(data.jobType == "0") {
                            if($("#repeatStartTime").ligerDateEditor("getValue")==""&&$("#repeatEndTime").ligerDateEditor("getValue")=="")
                            {
@@ -846,7 +856,33 @@
                    }
                }
            }
        }
        },
        compareServeTime:function(time){
            $.ajax({ //获取表的字段列表
                type: "POST",
                url : "${contextRoot}/datacollect/compareServeTime",
                dataType : "json",
                data:{time:time},
                cache:false,
                async:false,
                success :function(data){
                    if(data.successFlg) {
                        editorJob.beforeServeTime=true;
                        $.ligerDialog.error("采集时间不能小于当前时间！");
                    }
                    else{
                    }
                },
                error :function(data){
                    editorJob.beforeServeTime=true;
                    $.ligerDialog.error("Status:"+data.status +"(" +data.statusText+")");
                }
            });
        },
    }
    $(function () {