禅道bug修改

src/main/webapp/WEB-INF/ehr/jsp/datacollect/editorJob.jsp

@@ -201,6 +201,12 @@
            <input type="text" data-type="select" id="jobDatasetKeytype">
        </div>
    </div>
    <div class="m-form-group">
        <label>轮询最大值：</label>
        <div class="m-form-control">
            <input type="text" id="jobDatasetKeyvalue" class="l-textbox">
        </div>
    </div>
    <div class="m-form-group">
        <label>过滤条件：</label>
        <div class="m-form-control">

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

@@ -5,7 +5,7 @@
<script>
    var editorJob={
        flowTempId:0,
        flowTempId:'${model.flowTempId}',
        flowArrays:[],
        beforeServeTime:false,
        archiveCollect:"0",
@@ -272,8 +272,9 @@
                var key = $("#jobDatasetKey").ligerComboBox("getValue");
                var dataType = $("#jobDatasetKeytype").ligerComboBox("getValue");
                var dataKey = $("#jobDatasetKeyvalue").val();
                var condition = $('#jobDatasetCondition').ligerCondition("getValue");
                me.callbackCondition(key,dataType,condition);
                me.callbackCondition(key,dataType,dataKey,condition);
            });
@@ -356,12 +357,14 @@
                    repeatStartTime:'${model.repeatStartTime}',
                    repeatEndTime:'${model.repeatEndTime}',
                    delayTime:'${model.delayTime}',
                    jobCron:'${model.jobCron}'
                    jobCron:'${model.jobCron}',
                };
                $('#txtId').val(model.id);
                $('#txtJobName').val(model.jobName);
                $('#txtJobInfo').val(model.jobInfo);
                $("#jobDatasetKeyvalue").val();
                $('input[name="jobContentType"]').ligerRadio('setValue',model.jobContentType);
                me.setJobContentType(model.jobContentType,model.jobContent);
@@ -435,7 +438,8 @@
                repeatStartTime: $("#repeatStartTime").ligerDateEditor('getValue'),
                repeatEndTime: $("#repeatEndTime").ligerDateEditor('getValue'),
                delayTime: $('#txtDelayTime').val(),
                jobCron:$('#txtCronExpression').val()
                jobCron:$('#txtCronExpression').val(),
                dataKey:$('#jobDatasetKeyvalue').val()
            };
            return model;
@@ -503,7 +507,7 @@
            var schemeId = $("#txtSchemeId").val();
            var schemeVersion = $("#txtSchemeVersion").val();
            var condition="",key="",type = "",datasetId=row.jobDatasetId;
            var condition="",key="",type = "",dataKey="",datasetId=row.jobDatasetId;
            if(row.jobDatasetKey!=undefined&&row.jobDatasetKey.length>0)
            {
                key = row.jobDatasetKey;
@@ -516,9 +520,13 @@
            {
                condition=row.jobDatasetCondition;
            }
            if(row.jobDatasetKeyvalue!=undefined&&row.jobDatasetKeyvalue.length>0){
                dataKey = row.jobDatasetKeyvalue;
            }
            $("#jobDatasetKey").ligerComboBox("setValue",key);
            $("#jobDatasetKeytype").ligerComboBox("setValue",type);
            $("#jobDatasetKeyvalue").val(dataKey);
            $.ajax({ //获取表的字段列表
                type: "POST",
@@ -551,12 +559,13 @@
        },
        //条件选择配置返回事件
        callbackCondition:function(key,type,condition){
        callbackCondition:function(key,type,dataKey,condition){
            var me= this;
            var rowIndex = me.rowIndex;
            me.$listDataset.updateRow(rowIndex,{
                jobDatasetKey:key,
                jobDatasetKeytype:type,
                jobDatasetKeyvalue:dataKey,
                jobDatasetCondition:condition
            });
            me.setCheckVal();
@@ -644,7 +653,7 @@
                }
                case 3:
                {
                    if($('input[name="jobContentType"]').ligerComboBox("getValue")!=me.crawlerFlowUpload) {//不是任务编排上传类
//                    if($('input[name="jobContentType"]').ligerComboBox("getValue")!=me.crawlerFlowUpload) {//不是任务编排上传类
                        var dataset = $("#txtJobDataset").val();
                        //数据集不能为空
                        if(dataset == null || dataset =="[]")
@@ -657,9 +666,8 @@
                            }
                        }
                        //判断是否设置轮询字段和字段类型   档案上传不校验 @modify by cyj
                        if($('input[name="jobContentType"]').ligerComboBox("getValue")!=me.archiveCollect) {
//                        if($('input[name="jobContentType"]').ligerComboBox("getValue")!=me.archiveCollect) {
                            var selected = me.$listDataset.getSelectedRows();
                            for(var i=0;i<selected.length;i++)
                            {
@@ -672,8 +680,8 @@
                                    return false;
                                }
                            }
                        }
                    }
//                        }
//                    }
                    return true;
                }
@@ -935,6 +943,15 @@
        },
    }
    //轮回最大值只能输入正整数
    $("#jobDatasetKeyvalue").on("keyup afterpaste",function(){
        if(this.value.length==1){
            this.value=this.value.replace(/[^1-9]/g,'')
        }else{
            this.value=this.value.replace(/\D/g,'')
        }
    })
    $(function () {
        editorJob.init();
    });

src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/configurationJs.jsp

@@ -115,7 +115,7 @@
            if(cfgModel==1)
              return;
            cfgModel = 1;
            $("#btn_add_relation").show();
//            $("#btn_add_relation").show();
            $("#isDataSet").val("0");//该input框为0时,代表此时显示数据集
            retrieve.setTitle();
            entryRetrieve.setTitle();
@@ -894,10 +894,7 @@
          var url="";//AdapterDatasetController
          var obj="";//为了获取进度条
          var isDataSet = $("#isDataSet").val();
          if(isDataSet=="0"){//字典
            obj=self.$zidianZdsp
            url="${contextRoot}/adapterCenter/isStrategyDic"
          }else{//数据集
          if(isDataSet!="0"){//数据集
            obj=self.$shujujiZdsp
            url="${contextRoot}/adapterCenter/isStrategy"
          }
@@ -929,10 +926,7 @@
          var btnObj//自动匹配的按钮
          var url//链接
          var isDataSet = $("#isDataSet").val();
          if(isDataSet=="0"){//字典
            obj=$("#zidian .boxleft");
            url="${contextRoot}/adapterCenter/strategyDic"
          }else{//数据集
          if(isDataSet!="0"){//数据集
            obj=$("#shujuji .boxleft");
            url="${contextRoot}/adapterCenter/strategy"
          }
@@ -955,9 +949,7 @@
          var url=""//进度
          var isDataSet = $("#isDataSet").val();
          var version = $("#version").val();
          if(isDataSet=="0"){//字典
            url="${contextRoot}/adapterCenter/getStrategyDicSize"
          }else{//数据集
          if(isDataSet!="0"){//数据集
            url="${contextRoot}/adapterCenter/getStrategySize"
          }
          var timeIng =setInterval(function(){
@@ -980,9 +972,7 @@
                    if(jdu!=1){
                      var jduBFB=parseInt(jdu*100)
                      if(isNaN(jduBFB)){
                        $("#btn_aoto_adpat span").html("匹配中...");
                      }else{
                      if(!isNaN(jduBFB)){
                        $("#btn_aoto_adpat span").html("已匹配"+jduBFB+"%")
                      }
@@ -1003,9 +993,7 @@
          var self=this;
          var url="";
          var isDataSet = $("#isDataSet").val()
          if(isDataSet=="0"){//字典
            url="${contextRoot}/adapterCenter/endStrategyDic"
          }else{//数据集
          if(isDataSet!="0"){//数据集
            url="${contextRoot}/adapterCenter/endStrategy"
          }
          $.ajax({
@@ -1029,9 +1017,6 @@
          if(isDataSet=="0"){//字典
            obj=self.$zidianZdsp
            url="${contextRoot}/adapterCenter/isStrategyDic"
          }else{//数据集
            obj=self.$shujujiZdsp
            url="${contextRoot}/adapterCenter/isStrategy"
          }
          var isCanPlay= setInterval(function(){//判断 是否可以开始匹配了
            $.ajax({
@@ -1064,9 +1049,6 @@
          if(isDataSet=="0"){//字典
            obj=$("#zidian .boxleft");
            url="${contextRoot}/adapterCenter/strategyDic"
          }else{//数据集
            obj=$("#shujuji .boxleft");
            url="${contextRoot}/adapterCenter/strategy"
          }
          $("#btn_aoto_adpat_dic span").html("匹配中...");
          $.ajax({
@@ -1089,8 +1071,6 @@
          var version = $("#version").val();
          if(isDataSet=="0"){//字典
            url="${contextRoot}/adapterCenter/getStrategyDicSize"
          }else{//数据集
            url="${contextRoot}/adapterCenter/getStrategySize"
          }
          var timeIng =setInterval(function(){
            var ver =
@@ -1106,15 +1086,13 @@
                          if(res.data.all==0){//如果判断被除数不能为0  如果为0 直接清空
                            $("#btn_aoto_adpat_dic span").html("匹配完成");
                            clearInterval(timeIng);
                            self.ppeiEnd()//结束匹配
                            self.ppeiEndDic()//结束匹配
                          }else{
                            var jdu=  res.data.adapt/res.data.all//进度
                            if(jdu!=1){
                              var jduBFB=parseInt(jdu*100)
                              if(isNaN(jduBFB)){
                                $("#btn_aoto_adpat_dic span").html("匹配中...");
                              }else{
                              if(!isNaN(jduBFB)){
                                $("#btn_aoto_adpat_dic span").html("已匹配"+jduBFB+"%")
                              }
                            }else{
@@ -1136,8 +1114,6 @@
          var isDataSet = $("#isDataSet").val()
          if(isDataSet=="0"){//字典
            url="${contextRoot}/adapterCenter/endStrategyDic"
          }else{//数据集
            url="${contextRoot}/adapterCenter/endStrategy"
          }
          $.ajax({
            type:"POST",
@@ -1149,7 +1125,7 @@
            }
          })
        },//结束匹配
        /**########数据集 END#########**/
        /**########字典 END#########**/
        uniqueArray:function(a){ /* 判断适配方案id、平台字典id、平台字典项id、应用字典项id是否重复*/
          var temp = new Array();
          for(var i = 0; i < a.length; i ++){