Merge branch 'master' of huangzhanpeng/esb_huangzhanpeng into master

Hos-Framework/src/main/java/com/yihu/ehr/framework/model/TreeResult.java

@@ -5,7 +5,7 @@ import java.io.Serializable;
/**
 * Created by chenweida on 2015/12/17.
 */
public class TreeResult extends Result implements Serializable {
public class TreeResult implements Serializable {
    String id;//节点IP
    String pid;//父节点IP
    String text;//显示的名字

Hos-resource/src/main/java/com/yihu/ehr/standard/controller/SchemeVersionController.java

@@ -3,6 +3,7 @@ package com.yihu.ehr.standard.controller;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.framework.model.DictionaryResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.model.TreeResult;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.ehr.standard.service.adapter.AdapterSchemeVersionService;
import io.swagger.annotations.Api;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
@RestController("SchemeVersionController")
@RequestMapping("/adapterCenter")
@@ -103,6 +105,16 @@ public class SchemeVersionController extends BaseController {
        }
    }
    @RequestMapping("getVersionTree")
    @ResponseBody
    public List<TreeResult> getVersionTree() {
        try {
            return adapterSchemeVersion.getVersionTree();
        } catch (Exception ex) {
            return null;
        }
    }
    /**
     * 获取基础版本列表
     * @param schemeId

Hos-resource/src/main/java/com/yihu/ehr/standard/service/adapter/AdapterSchemeVersionService.java

@@ -475,5 +475,39 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
        return data;
    }
    /**
     * 树型数据
     * @return
     * @throws Exception
     */
    public List<TreeResult> getVersionTree() throws Exception {
        String SchemeSql = "from AdapterSchemeModel";
        List<AdapterSchemeModel>std=(List<AdapterSchemeModel>)super.hibernateTemplate.find(SchemeSql);
        List<TreeResult> results=new ArrayList<>();
        for(int i=0;i<std.size();i++){
            TreeResult re=new TreeResult();
            //re.setPid("0");
            re.setText(std.get(i).getName());
            re.setId(String.valueOf(std.get(i).getId()));
            results.add(re);
            String sql = "from AdapterSchemeVersionModel ";
            sql+="where schemeId="+std.get(i).getId();
            List<AdapterSchemeVersionModel>stdModel=(List<AdapterSchemeVersionModel>)super.hibernateTemplate.find(sql);
            for(int j=0;j<stdModel.size();j++)
            {
                TreeResult tmpTree=new TreeResult();
                tmpTree.setId(String.valueOf(stdModel.get(j).getId()));
                tmpTree.setText(stdModel.get(j).getName());
                tmpTree.setPid(String.valueOf(std.get(i).getId()));
                results.add(tmpTree);
            }
        }
        return results;
    }
}

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/org/editorOrganization.jsp

@@ -76,7 +76,7 @@
    <div class="m-form-group">
        <label>全流程适配版本：</label>
        <div class="m-form-control">
            <input type="text" class="l-textbox" id="qlcAdapterVersion" name="qlcAdapterVersion"/>
            <input type="text" id="qlcAdapterVersion" name="qlcAdapterVersion"/>
        </div>
    </div>
    <!-- 隐藏字段 -->

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/org/editorOrganizationJs.jsp

@@ -19,8 +19,7 @@
                valueField: 'id',
                textField: 'text',
                tree: {
                    url:'/adapterCenter/getVersion',
                    //dataParmName: 'detailModelList',
                    url:'/adapterCenter/getVersionTree',
                    textFieldName:"text",
                    idFieldName:"id",
                    parentIDFieldName:"pid",

Hos-resource/src/main/webapp/develop/lib/ligerui/custom/ligerOverwrite.js

@@ -241,6 +241,23 @@
                return "";
            }
        },
        /****** 下拉树宽度BUG修复 add by hzp at 20160602***********************/
        bulidContent: function ()
        {
            var g = this, p = this.options;
            this.clearContent();
            if (g.select)
            {
                g.setSelect();
            }
            else if (p.tree)
            {
                /*******/
                p.tree.width=g.inputText.width();
                /*******/
                g.setTree(p.tree);
            }
        }
    });
@@ -506,7 +523,8 @@
        checkbox:false,
        parentIcon:false,
        childIcon:false,
        treeLine:false
        treeLine:false,
        nodeWidth:180
    });
    $.extend($.ligerui.controls.Tree.prototype, {
        _upadteTreeWidth: function ()