Merge branch 'master' of shine/esb into master

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

@@ -156,6 +156,11 @@ public class DataCollectController extends BaseController {
            RsJobConfig obj = new RsJobConfig();
            BeanUtils.populate(obj, request.getParameterMap());
            obj.setValid("1");
            String time=request.getParameter("jobNextTime");
            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            if(df.parse(time).before(new Date())) {
                return Result.error("任务开始时间不能小于当前时间");
            }
            String cron = request.getParameter("cronExpression");
            String jobDataset = request.getParameter("jobDataset");
@@ -175,7 +180,11 @@ public class DataCollectController extends BaseController {
        try {
            RsJobConfig obj = new RsJobConfig();
            BeanUtils.populate(obj, request.getParameterMap());
            String time=request.getParameter("jobNextTime");
            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            if(df.parse(time).before(new Date())) {
                return Result.error("任务开始时间不能小于当前时间");
            }
            String cron = request.getParameter("cronExpression");
            String jobDataset = request.getParameter("jobDataset");
            return datacollect.updateJob(obj, cron, jobDataset);

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

@@ -569,15 +569,6 @@
                    //档案上传接口值校验
                    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")=="")
                            {
@@ -873,6 +864,7 @@
                    }
                    else{
                    }
                },
                error :function(data){