修改资源数据源bug

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

@@ -608,7 +608,7 @@ public class RsResourceController extends BaseController {
            rmd.setDefinition(request.getParameter("definition"));
            rmd.setNullable(Integer.valueOf(request.getParameter("inp_field_is_null")));
            rmd.setPrimaryKey(Integer.valueOf(request.getParameter("inp_field_is_PK")));
            rmd.setDataSupportType(Integer.valueOf(request.getParameter("inp_dataset_from")));
            rmd.setDataSupportType(2);
            rmd.setLogicDataSource(request.getParameter("logicDataSource"));
            rmd.setResourceId(request.getParameter("resourceId"));
            rmd.setName(request.getParameter("name"));
@@ -625,8 +625,18 @@ public class RsResourceController extends BaseController {
    public Result updateMetaData(HttpServletRequest request) {
        try {
            RsResourceMetadata rmd = new RsResourceMetadata();
            BeanUtils.populate(rmd, request.getParameterMap());
            rmd.setId(request.getParameter("id"));
            rmd.setCode(request.getParameter("columnCode"));
            rmd.setColumnName(request.getParameter("columnCode"));
            rmd.setColumnLength(request.getParameter("columnLength"));
            rmd.setColumnType(request.getParameter("columnType"));
            rmd.setDefinition(request.getParameter("definition"));
            rmd.setNullable(Integer.valueOf(request.getParameter("inp_field_is_null")));
            rmd.setPrimaryKey(Integer.valueOf(request.getParameter("inp_field_is_PK")));
            rmd.setDataSupportType(2);
            rmd.setLogicDataSource(request.getParameter("logicDataSource"));
            rmd.setResourceId(request.getParameter("resourceId"));
            rmd.setName(request.getParameter("name"));
            return resourceService.updateMetaData(rmd);
        } catch (Exception e) {
            e.printStackTrace();

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceFieldInfoDialog.jsp

@@ -38,14 +38,14 @@
        <label><span class="red">*&nbsp;</span>是否主键</label>
        <div class="u-checkbox-wrap m-form-control ">
            <input type="radio" value="1" name="inp_field_is_PK" name="primaryKey">是
            <input type="radio" checked value="0" name="inp_field_is_PK" name="primaryKey">否
            <input type="radio" value="1" name="inp_field_is_PK">是
            <input type="radio" checked value="0" name="inp_field_is_PK">否
        </div>
        <label style="width: 90px"><span class="red">*&nbsp;</span>是否能空</label>
        <div class="u-checkbox-wrap m-form-control ">
            <input type="radio" checked value="1" name="inp_field_is_null" name="nullable">是
            <input type="radio" value="0" name="inp_field_is_null" name="nullable">否
            <input type="radio" checked  value="1" name="inp_field_is_null" >是
            <input type="radio" value="0" name="inp_field_is_null">否
        </div>
    </div>
    <div class="m-form-group">
@@ -58,11 +58,12 @@
    </div>
    <div class="m-form-group">
        <label>数据来源</label>
        <!--
        <div class="u-checkbox-wrap m-form-control ">
            <input type="radio" checked value="1" name="inp_dataset_from">逻辑表
            <input type="radio" value="0" name="inp_dataset_from">事实表
        </div>
            <input type="radio" checked  value="2" name="inp_dataset_from">逻辑表
            <input type="radio" value="1" name="inp_dataset_from">事实表
        </div>-->
        <label id="inp_dataset_from" style="text-align:left">逻辑表</label>
    </div>
    <div id="centerTab1" style="display:none">
        <div style="margin-left: 70px;float: left">
@@ -80,7 +81,7 @@
            <div class="m-form-control">
                <textarea rows="10" class="l-textarea" style="width:350px;height: 200px"
                          name="logicDataSource"></textarea>
                          name="logicDataSource" id="logicDataSource"></textarea>
            </div>
        </div>
    </div>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceFieldInfoDialogJs.jsp

@@ -13,11 +13,13 @@
        $fieldIsPK: $('input[name="inp_field_is_PK"]', this.$form),//是否主键
        $fieldIsNull: $('input[name="inp_field_is_null"]', this.$form),//是否可为空
        $fieldRemark: $("#inp_field_remark"),//字段说明
        $datasetFrom: $('input[name="inp_dataset_from"]', this.$form),//是否可为空
        $datasetFrom:$("#inp_dataset_from"),
       // $datasetFrom: $('input[name="inp_dataset_from"]', this.$form),//是否可为空
        $leftDatagrid: $("#left_datagrid"),//左边的datagrid
        $rightDatagrid: $("#right_datagrid"),//右边的datagrid
        $centerTab1: $("#centerTab1"),//右边的datagrid
        $centerTab2: $("#centerTab2"),//右边的datagrid
        $logicDataSource:$("#logicDataSource"),
        $id: $("#inp_resource_id"),//资源数据源
@@ -39,6 +41,7 @@
                this.$fieldIsPK.attr("disabled", "false");
                this.$fieldIsNull.attr("disabled", "false");
                this.$fieldRemark.attr("disabled", "false");
              //  this.$datasetFrom.attr("disabled", "false");
                this.$btnSave.hide();
            }
        },
@@ -111,20 +114,21 @@
            this.$fieldCode.ligerTextBox({width: 240});
            this.$fieldLength.ligerSpinner({width: 240,type:'int',isNegative:false });
            this.$fieldType.ligerComboBox({dict: true, dictName: "RESOURCE_METADATA_TYPE"});
            this.$fieldIsPK.ligerRadio();
            this.$datasetFrom.ligerRadio();
            this.$fieldIsNull.ligerRadio();
            rsResourceFieldInfoDialog.$fieldIsPK.ligerRadio();
            rsResourceFieldInfoDialog.$fieldIsNull.ligerRadio();
            //this.$datasetFrom.ligerRadio();
            this.$fieldRemark.ligerTextBox({width: 240});
            var data={
                name: '${entity.name}',
                columnType: '${entity.columnType}',
                columnCode: '${entity.code}',
                columnLength: '${entity.columnLength}',
                primaryKey: '${entity.primaryKey}',
                inp_field_is_PK: '${entity.primaryKey}',
                id: '${entity.id}',
                nullable: '${entity.nullable}',
                inp_field_is_null: '${entity.nullable}',
                definition: '${entity.definition}',
                logicDataSource: '${entity.logicDataSource}'
                logicDataSource: '${entity.logicDataSource}',
                inp_dataset_from: '${entity.dataSupportType}'
            };
            $("#div_info_form").ligerAutoForm({
                data:data,
@@ -136,13 +140,14 @@
                }
            });
            rsResourceFieldInfoDialog.$datasetFrom.text('${entity.dataSupportType}'==1?"事实表":"逻辑表")
            /*
            if ("${entity.dataSupportType}" == "1") {
                rsResourceFieldInfoDialog.$centerTab2.hide();
                rsResourceFieldInfoDialog.$centerTab1.show();
            } else if ("${entity.dataSupportType}" == "2") {
                rsResourceFieldInfoDialog.$centerTab1.hide();
                rsResourceFieldInfoDialog.$centerTab2.show();
            }
            }*/
        },
        bindEvents: function () {
            this.$btnSave.click(function () {