Merge branch 'master' of huangzhanpeng/esb_huangzhanpeng into master

Hos-resource/src/main/java/com/yihu/ehr/datacollect/service/DatacollectService.java

@@ -338,34 +338,37 @@ public class DatacollectService implements IDatacollectService {
                //增量采集
                String maxKey = "0";
                String keyValue = ds.getJobDatasetKeyvalue();
                if(key!=null && key.length()>0 &&(keyValue!=null&&!keyValue.equals("null")))
                if(key!=null && key.length()>0)
                {
                    maxKey = key;
                    if(keytype.toUpperCase().equals("DATE")) //时间类型
                    {
                        Date keyDate = new Date();
                        if(keyvalue!=null && keyvalue.length()>0) {
                            //字符串转时间
                            keyDate = DateConvert.toDate(keyvalue);
                            //根据数据库类型获取时间sql
                            strWhere += " and "+ key + ">'"+getDateSqlByDBType(dbType,keyDate)+"'";
                            strWhere += " order by "+ key;
                        }
                        //根据数据库类型获取时间sql
                        strWhere += " and "+ key + ">'"+getDateSqlByDBType(dbType,keyDate)+"'";
                        strWhere += " order by "+ key;
                    }
                    else if(keytype.toUpperCase().equals("VARCHAR")) //字符串类型
                    {
                        maxKey = getToNumberSqlByDBType(dbType,key);
                        if(keyvalue!=null && keyvalue.length()>0) {
                            strWhere += " and "+ maxKey + ">'" + keyvalue + "'";
                            strWhere += " order by "+ maxKey;
                        }
                        strWhere += " order by "+ maxKey;
                    }
                    else{
                        if(keyvalue!=null && keyvalue.length()>0) {
                            strWhere += " and "+ key + ">'" + keyvalue + "'";
                            strWhere += " order by "+ key;
                        }
                        strWhere += " order by "+ key;
                    }
                }
                strSql += strWhere;
                //总条数和最大值查询
@@ -560,7 +563,7 @@ public class DatacollectService implements IDatacollectService {
                    //增量采集
                    String maxKey = "0";
                    String keyValue = ds.getJobDatasetKeyvalue();
                    if (key != null && key.length() > 0 && (keyValue != null && !keyValue.equals("null"))) {
                    if (key != null && key.length() > 0) {
                        maxKey = key;
                        if (keytype.toUpperCase().equals("DATE")) //时间类型
                        {
@@ -568,22 +571,23 @@ public class DatacollectService implements IDatacollectService {
                            if (keyvalue != null && keyvalue.length() > 0) {
                                //字符串转时间
                                keyDate = DateConvert.toDate(keyvalue);
                                //根据数据库类型获取时间sql
                                strWhere += " and " + key + ">'" + getDateSqlByDBType(dbType, keyDate) + "'";
                                strWhere += " order by " + key;
                            }
                            //根据数据库类型获取时间sql
                            strWhere += " and " + key + ">'" + getDateSqlByDBType(dbType, keyDate) + "'";
                            strWhere += " order by " + key;
                        } else if (keytype.toUpperCase().equals("VARCHAR")) //字符串类型
                        {
                            maxKey = getToNumberSqlByDBType(dbType, key);
                            if (keyvalue != null && keyvalue.length() > 0) {
                                strWhere += " and " + maxKey + ">'" + keyvalue + "'";
                                strWhere += " order by " + maxKey;
                            }
                            strWhere += " order by " + maxKey;
                        } else {
                            if (keyvalue != null && keyvalue.length() > 0) {
                                strWhere += " and " + key + ">'" + keyvalue + "'";
                                strWhere += " order by " + key;
                            }
                            strWhere += " order by " + key;
                        }
                    }
                    strSql += strWhere;

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/common/index.jsp

@@ -33,7 +33,7 @@
    <div position="top">
        <div class="m-index-top">
            <div style="float: right;padding-right: 8px">
                <div class="m-index-top-name">欢迎您，${userName}</div>
                <div class="m-index-top-name">欢迎您! ${userName}</div>
                <div style="height:40px;">
                    <div id="btnIndexLogout"></div>
                    <div id="btnIndexPassword"></div>

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

@@ -617,13 +617,25 @@
                            $.ligerDialog.error("请选择数据集！");
                            return false;
                        }
                    }
                    //判断是否设置轮询字段和字段类型
                    var selected = me.$listDataset.getSelectedRows();
                    for(var i=0;i<selected.length;i++)
                    {
                        if(selected[i].jobDatasetKey!= undefined && selected[i].jobDatasetKey.length>0 && selected[i].jobDatasetKeytype!= undefined && selected[i].jobDatasetKeytype.length>0)
                        {
                        }
                        else{
                            return true;
                            $.ligerDialog.error(selected[i].jobDatasetName+"未设置轮询字段！");
                            return false;
                        }
                    }
                    else{
                        return true;
                    }
                    return true;
                }
                default :
                    return true;