1:ocr_dict_init

pull/152/head
guanzheng 1 year ago
parent f9982088fe
commit 978bab01e6

@ -58,24 +58,6 @@
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label is-required">* 字典内容:</label>
<div class="col-sm-9">
<input name="content" id="content" class="form-control" placeholder="字典内容" class="form-control" type="text" maxlength='50' required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label is-required">* 是否启用:</label>
<div class="col-sm-9">
<input name="enabled" id="enabled" class="form-control" placeholder="是否启用" class="form-control" type="text" required>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">

@ -19,7 +19,7 @@
<input name='search_codeno' id='search_codeno' class='form-control' placeholder='编码'/>
</div>
<div class="form-group">
<input name='search_name' id='search_name' class='form-control' placeholder='数据名称'/>
<input name='search_name' id='search_name' class='form-control' placeholder='描述'/>
</div>
<div class="form-group">
@ -57,67 +57,28 @@
</div>
<div class="modal-body">
<div class="row">
<form name="Distionaryform" method="post" id="Distionaryform" class="form-horizontal" action="${ctx}/backstage/distionary/save">
<form name="Distionaryform" method="post" id="Distionaryform" class="form-horizontal" action="${ctx}/ocr/dictionary/save">
<input name="distionarytypeid" id="distionarytypeid" value="${distionarytypeid}" type="hidden">
<input name="distionatygroupid" id="distionatygroupid" value="${distionarygroupid}" type="hidden">
<input name="groupId" id="distionatygroupid" value="${distionarygroupid}" type="hidden">
<input name="id" id="id" type="hidden">
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label is-required">* 编码:</label>
<div class="col-sm-9">
<input name="codeno" id="codeno" class="form-control" placeholder="编码" class="form-control" type="text" maxlength='25' required>
<input name="value" id="value" class="form-control" placeholder="编码" class="form-control" type="text" maxlength='25' required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label is-required">* 数据名称:</label>
<label class="col-sm-3 control-label is-required">* 描述:</label>
<div class="col-sm-9">
<input name="name" id="name" class="form-control" placeholder="数据名称" class="form-control" type="text" maxlength='75' required>
<input name="lable" id="lable" class="form-control" placeholder="描述" class="form-control" type="text" maxlength='75' required>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label is-required">* 字典内容:</label>
<div class="col-sm-9">
<input name="content" id="content" class="form-control" placeholder="字典内容" class="form-control" type="text" maxlength='50' required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label is-required">* 是否启用:</label>
<div class="col-sm-9">
<div class="radio i-checks">
<label>
<input type="radio" checked="" value="1" name="enabled"> <i></i>启用
</label>
<label>
<input type="radio" value="0" name="enabled"> <i></i>禁用
</label>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label is-required">* 排序:</label>
<div class="col-sm-9">
<input name="sorting" id="sorting" class="form-control" number="true" placeholder="排序" class="form-control" type="text" required>
</div>
</div>
</div>
</div>
</form>
</div>
@ -159,7 +120,7 @@
radioClass: 'iradio_square-green',
});
_tableListDistionary = $('#Distionary_list').bootstrapTable({
url: '${ctx}/backstage/admin/distionary/list',
url: '${ctx}/ocr/dictionary/list',
pagination: true, //是否显示分页(*
pageNumber:1, //初始化加载第一页,默认第一页
pageSize: 10, //每页的记录行数(*
@ -170,8 +131,8 @@
},
queryParams: function queryParams(params) {
return {
sortorder: "asc",
sortname: "SORTING",
sortorder: "desc",
sortname: "ID",
pagesize: params.limit,
start: (params.offset / params.limit) + 1,
search_codeno:'{"value":"' + $("#search_codeno").val() + '","op":"equal","type":"string"}',
@ -186,21 +147,8 @@
{checkbox: true},
// { width:150,valign: "middle",field:'distionarytypeid',title:'数据字典分类主键',sortable:true},
// { width:150,valign: "middle",field:'distionatygroupid',title:'数据字典分组主键',sortable:true},
{ width:150,valign: "middle",field:'codeno',title:'编码',sortable:true},
{ width:150,valign: "middle",field:'name',title:'数据名称',sortable:true},
{ width:150,valign: "middle",field:'content',title:'字典内容',sortable:true},
{ width:150,valign: "middle",field:'enabled',title:'是否启用',sortable:true,
formatter:function(value,oData,index) {
var listOperation = "禁用";
if(oData.enabled == "0"){
listOperation = "禁用";
}else if(oData.enabled == "1"){
listOperation = "启用";
}
return listOperation;
}
},
{ width:150,valign: "middle",field:'sorting',title:'排序字段',sortable:true},
{ width:150,valign: "middle",field:'value',title:'编码',sortable:true},
{ width:150,valign: "middle",field:'lable',title:'描述',sortable:true},
{
width:200,
field: 'id',
@ -216,7 +164,7 @@
]
});
$("#Distionaryform").attr("action","${ctx}/backstage/admin/distionary/save");
$("#Distionaryform").attr("action","${ctx}/ocr/dictionary/save");
var distionaryForm1 = $('#Distionaryform');
var distionaryError1 = $('.alert-danger', distionaryForm1);
distionaryForm1.validate({
@ -293,26 +241,17 @@
});
}
function _distionaryAdd(){
$("#Distionaryform")[0].reset();
showDistionaryModel();
$("#Distionaryform")[0].reset();
}
function _distionaryUpdateData(jframeid,str){
parent.axgetXiaoyao('${ctx}/backstage/admin/distionary/getdata/' + str,null,false , function(data){
parent.axgetXiaoyao('${ctx}/ocr/dictionary/getdata/' + str,null,false , function(data){
if(data.code == "OK"){
$("#id").val(data.data.id);
$("#distionarytypeid").val(data.data.distionarytypeid);
$("#distionatygroupid").val(data.data.distionatygroupid);
$("#codeno").val(data.data.codeno);
$("#name").val(data.data.name);
$("#content").val(data.data.content);
$("#sorting").val(data.data.sorting);
if(data.data.enabled == 1){
$("input:radio[name='enabled']").eq(0).attr('checked',true);
}else if(data.data.enabled == 0){
$("input:radio[name='enabled']").eq(1).attr('checked',true);
}
$("#value").val(data.data.value);
$("#lable").val(data.data.lable);
showDistionaryModel();
}else{
parent.toastr.error("非法请求。");
@ -335,7 +274,7 @@
}
function t_delete(str){
parent.layer.closeAll('loading');
parent.axgetXiaoyao('${ctx}/backstage/admin/distionary/delmore' , {id:str},false, function(data){
parent.axgetXiaoyao('${ctx}/ocr/dictionary/delmore' , {id:str},false, function(data){
parent.layer.closeAll('loading');
if(data.code == "OK"){
swal(data.message, "您已经永久删除了这条信息。", "success");

@ -24,21 +24,17 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label is-required">* 编码:</label>
<label class="col-sm-3 control-label is-required">* 字典字段名:</label>
<div class="col-sm-9">
<input name="codeno" id="codeno" class="form-control" placeholder="编码" class="form-control" type="text" maxlength='25' required>
<input name="field" id="field" class="form-control" placeholder="字典字段名" class="form-control" type="text" maxlength='25' required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label is-required">* 数据字典分类:</label>
<label class="col-sm-3 control-label is-required">* 字典组描述:</label>
<div class="col-sm-9">
<select data-placeholder="数据字典分类..." name="distionarytypeid" id="distionarytypeid" class="form-control" style="width:350px;" tabindex="2" required>
</select>
<input name="label" id="label" class="form-control" placeholder="字典字段名" class="form-control" type="text" maxlength='25' required>
</div>
</div>
</div>
@ -46,61 +42,13 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label is-required">* 分组名称:</label>
<label class="col-sm-3 control-label is-required">* 备注:</label>
<div class="col-sm-9">
<input name="groupname" id="groupname" class="form-control" placeholder="分组名称" class="form-control" type="text" maxlength='75' required>
</div>
<input name="remark" id="remark" class="form-control" placeholder="分组名称" class="form-control" type="text" maxlength='75' required>
</div>
</div>
<!-- 1单选2多选3下拉" -->
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label is-required">* 使用方式:</label>
<div class="col-sm-9">
<div class="radio i-checks">
<label>
<input type="radio" checked="" value="1" name="usemode"> <i></i>单选
</label>
<label>
<input type="radio" value="2" name="usemode"> <i></i>多选
</label>
<label>
<input type="radio" value="3" name="usemode"> <i></i>下拉
</label>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label is-required">* 是否启用:</label>
<div class="col-sm-9">
<div class="radio i-checks">
<label>
<input type="radio" checked="" value="1" name="enabled"> <i></i>启用
</label>
<label>
<input type="radio" value="0" name="enabled"> <i></i>停用
</label>
</div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label is-required">* 排序字段:</label>
<div class="col-sm-9">
<input name="sorting" id="sorting" class="form-control" number="true" placeholder="排序字段" class="form-control" type="text" required>
</div>
</div>
</div>
</div>
<div class="row">
<div class="form-group">
<div class="col-sm-offset-5">
@ -143,7 +91,7 @@
});
changeDistionarytype("");
$("#Distionarygroupform").attr("action","${ctx}/backstage/admin/distionarygroup/save");
$("#Distionarygroupform").attr("action","${ctx}/ocr/dictionaryGroup/save");
var form1 = $('#Distionarygroupform');
var error1 = $('.alert-danger', form1);
form1.validate({

@ -26,47 +26,17 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label is-required">* 编码:</label>
<label class="col-sm-3 control-label is-required">* 字典字段名:</label>
<div class="col-sm-9">
<input name="codeno" id="codeno" class="form-control" placeholder="编码" class="form-control" type="text" maxlength='25' required>
<input name="field" id="field" class="form-control" placeholder="字典字段名" class="form-control" type="text" maxlength='25' required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label is-required">* 数据字典分类主键:</label>
<label class="col-sm-3 control-label is-required">* 字典组描述:</label>
<div class="col-sm-9">
<select data-placeholder="数据字典分类..." name="distionarytypeid" id="distionarytypeid" class="form-control" style="width:350px;" tabindex="2" required>
</select>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label is-required">* 分组名称:</label>
<div class="col-sm-9">
<input name="groupname" id="groupname" class="form-control" placeholder="分组名称" class="form-control" type="text" maxlength='75' required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label is-required">* 使用方式:</label>
<div class="col-sm-9">
<div class="radio i-checks">
<label>
<input type="radio" checked="" value="1" name="usemode"> <i></i>单选
</label>
<label>
<input type="radio" value="2" name="usemode"> <i></i>多选
</label>
<label>
<input type="radio" value="3" name="usemode"> <i></i>下拉
</label>
</div>
<input name="label" id="label" class="form-control" placeholder="字典字段名" class="form-control" type="text" maxlength='25' required>
</div>
</div>
</div>
@ -74,24 +44,9 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label is-required">* 是否启用:</label>
<div class="col-sm-9">
<div class="radio i-checks">
<label>
<input type="radio" value="1" name="enabled"> <i></i>启用
</label>
<label>
<input type="radio" value="0" name="enabled"> <i></i>停用
</label>
</div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label is-required">* 排序字段:</label>
<label class="col-sm-3 control-label is-required">* 备注:</label>
<div class="col-sm-9">
<input name="sorting" id="sorting" class="form-control" number="true" placeholder="排序字段" class="form-control" type="text" required>
<input name="remark" id="remark" class="form-control" placeholder="分组名称" class="form-control" type="text" maxlength='75' required>
</div>
</div>
</div>
@ -132,29 +87,13 @@
}
};
$(document).ready(function () {
parent.axgetXiaoyao('${ctx}/backstage/admin/distionarygroup/getdata/${id}',null,false , function(data){
parent.axgetXiaoyao('${ctx}/ocr/dictionaryGroup/getdata/${id}',null,false , function(data){
if(data.code == "OK"){
$("#id").val(data.data.id);
$("#codeno").val(data.data.codeno);
$("#groupname").val(data.data.groupname);
$("#usemode").val(data.data.usemode);
$("#sorting").val(data.data.sorting);
$("#field").val(data.data.field);
if(data.data.usemode == 1){
$("input:radio[name='usemode']").eq(0).attr('checked',true);
}else if(data.data.usemode == 2){
$("input:radio[name='usemode']").eq(1).attr('checked',true);
}else if(data.data.usemode == 3){
$("input:radio[name='usemode']").eq(2).attr('checked',true);
}
if(data.data.enabled == 1){
$("input:radio[name='enabled']").eq(0).attr('checked',true);
}else if(data.data.enabled == 0){
$("input:radio[name='enabled']").eq(1).attr('checked',true);
}
$("#label").val(data.data.label);
$("#remark").val(data.data.remark);
changeDistionarytype(data.data.distionarytypeid);
}else{
@ -165,7 +104,7 @@
checkboxClass: 'icheckbox_square-green',
radioClass: 'iradio_square-green',
});
$("#Distionarygroupform").attr("action","${ctx}/backstage/admin/distionarygroup/edit");
$("#Distionarygroupform").attr("action","${ctx}/ocr/dictionaryGroup/save");
var form1 = $('#Distionarygroupform');
var error1 = $('.alert-danger', form1);
form1.validate({

@ -14,23 +14,6 @@
<div class="wrapper wrapper-content animated fadeInRight">
<div class="col-sm-3">
<div class="ibox float-e-margins">
<div class="ibox-title">
<div class="pull-right tooltip-demo" id="_mybutton_other">
<button class="btn sbold btn-success" onclick="_addtType('26101')"> <i class="fa fa-plus"></i> 添加</button>
</div>
<h2>
字典分类
</h2>
</div>
<div class="ibox-content">
<table id="distionarytype_list" ></table>
</div>
</div>
</div>
<div class="col-sm-9">
<div class="ibox ">
@ -38,11 +21,11 @@
<div class="ibox-content">
<form id="searcheuser" class="form-inline">
<div class="form-group">
<input name='search_codeno' id='search_codeno' class='form-control' placeholder='编码'/>
<input name='search_codeno' id='search_codeno' class='form-control' placeholder='字典组名称'/>
</div>
<div class="form-group">
<input name='search_groupname' id='search_groupname' class='form-control' placeholder='分组名称'/>
<input name='search_groupname' id='search_groupname' class='form-control' placeholder='字典组描述'/>
</div>
<div class="form-group">
@ -216,39 +199,6 @@
radioClass: 'iradio_square-green',
});
_distionarytype_list = $("#distionarytype_list").bootstrapTable({
url: '${ctx}/backstage/admin/distionarytype/listall' ,
pagination: false, //是否显示分页(*
sidePagination: "server",
ajaxOptions:{
headers: {"logintoken": parent.getLoginToken()}
},
queryParams: function queryParams(params) {
return {
sortorder: params.order,
sortname: params.sort,
pagesize: params.limit
};
},
responseHandler:function(res){
return{"rows": res.data};
},
columns: [
{ width:150,valign: "middle",field:'codeno',title:'编码',sortable:true},
{ width:150,valign: "middle",field:'typename',title:'分类名称',sortable:true},
{
width:200,
field: 'id',
title: '操作',
formatter:function(value,oData,index) {
var listOperation = "<a href=\"javascript:_editType('26112','" + oData.id + "');\" class=\"btn btn-primary btn-xs\"><i class=\"fa fa-pencil\"></i>修改</a>&nbsp;";
listOperation = listOperation + "<a href=\"javascript:_deleteType('26112','" + oData.id + "');\" class=\"btn btn-danger btn-xs\"><i class=\"fa fa-close\"></i>删除</a>";
return listOperation;
}
}
]
});
parent.axgetXiaoyao("${ctx}/backstage/admin/user/toolsbarOperation?" + "resourceid=${resourceid}",null,true ,
@ -264,7 +214,7 @@
});
_tableListDistionarygroup = $('#Distionarygroup_list').bootstrapTable({
url: '${ctx}/backstage/admin/distionarygroup/list' ,
url: '${ctx}/ocr/dictionaryGroup/list' ,
pagination: true, //是否显示分页(*
pageNumber:1, //初始化加载第一页,默认第一页
pageSize: 10, //每页的记录行数(*
@ -275,8 +225,8 @@
},
queryParams: function queryParams(params) {
return {
sortorder: "asc,desc",
sortname: "SORTING,DISTIONARYTYPEID",
sortorder: "desc",
sortname: "ID",
pagesize: params.limit,
start: (params.offset / params.limit) + 1,
search_codeno:'{"value":"' + $("#search_codeno").val() + '","op":"equal","type":"string"}',
@ -288,33 +238,10 @@
},
columns: [
{checkbox: true},
{ width:150,valign: "middle",field:'codeno',title:'编码',sortable:true},
{ width:150,valign: "middle",field:'distionarytype.typename',title:'数据字典分类',sortable:false},
{ width:150,valign: "middle",field:'groupname',title:'分组名称',sortable:true},
{ width:150,valign: "middle",field:'usemode',title:'使用方式',sortable:false,
formatter:function(value,oData,index) {
var listOperation = "未知";
if(oData.usemode == "1"){
listOperation = "单选";
}else if(oData.usemode == "2"){
listOperation = "多选";
}else if(oData.usemode == "3"){
listOperation = "下拉";
}
return listOperation;
}
},
{ width:150,valign: "middle",field:'enabled',title:'是否启用',sortable:false,
formatter:function(value,oData,index) {
var listOperation = "禁用";
if(oData.enabled == "0"){
listOperation = "禁用";
}else if(oData.enabled == "1"){
listOperation = "启用";
}
return listOperation;
}
},
{ width:150,valign: "middle",field:'field',title:'字典组字段名',sortable:true},
{ width:150,valign: "middle",field:'label',title:'字典组描述',sortable:false},
{ width:150,valign: "middle",field:'remark',title:'备注',sortable:true},
{
width:200,
field: 'id',
@ -441,14 +368,14 @@
showTypeModel();
}
function _useradd(jframeid){
parent._xiaoyaoOpenMenuTab('${ctx}/backstage/admin/distionarygroupHtml/toSave',"添加字典分组",jframeid + '_add');
parent._xiaoyaoOpenMenuTab('${ctx}/backstage/admin/ocrDistionarygroupHtml/toSave',"添加字典分组",jframeid + '_add');
}
function viewManager(sourceid,distionarygroupid) {
parent._xiaoyaoOpenMenuTab('${ctx}/backstage/admin/distionaryHtml/toList?distionarygroupid=' + distionarygroupid + "#sourceid=" +sourceid,"详情管理",distionarygroupid + '_list_child');
parent._xiaoyaoOpenMenuTab('${ctx}/backstage/admin/ocrDistionaryHtml/toList?distionarygroupid=' + distionarygroupid + "#sourceid=" +sourceid,"详情管理",distionarygroupid + '_list_child');
}
function updateData(jframeid,str){
var url = '${ctx}/backstage/admin/distionarygroupHtml/toEdit/' + str ;
var url = '${ctx}/backstage/admin/ocrDistionarygroupHtml/toEdit/' + str ;
parent._xiaoyaoOpenMenuTab(url,"修改数据字典分组",jframeid + '_edit');
}
function _useredit(jframeid){
@ -466,7 +393,7 @@
}
function t_delete(str){
parent.layer.closeAll('loading');
parent.axgetXiaoyao('${ctx}/backstage/admin/distionarygroup/delmore' , {id:str},false, function(data){
parent.axgetXiaoyao('${ctx}/ocr/dictionaryGroup/delmore' , {id:str},false, function(data){
parent.layer.closeAll('loading');
if(data.code == "OK"){
swal(data.message, "您已经永久删除了这条信息。", "success");

@ -135,10 +135,10 @@ public class OcrDictionaryController extends BaseController {
@PostMapping("/save")
public ResultVo saveDistionarygroup(HttpServletResponse response,HttpServletRequest request,OcrDictionary tab) throws IOException{
OcrDictionary ocrDictionaryGroup = ocrDictionaryService.getOne(new LambdaQueryWrapper<OcrDictionary>().eq(OcrDictionary::getValue, tab.getValue()));
if(Objects.nonNull(ocrDictionaryGroup)){
if(Objects.nonNull(ocrDictionaryGroup)&&!ocrDictionaryGroup.getId().equals(tab.getId())){
return ResultVoUtil.error("字段名称重复");
}
this.ocrDictionaryService.save(tab);
this.ocrDictionaryService.saveOrUpdate(tab);
return ResultVoUtil.success();
}

@ -125,10 +125,10 @@ public class OcrDictionaryGropuController extends BaseController {
@PostMapping("/save")
public ResultVo saveDistionarygroup(HttpServletResponse response,HttpServletRequest request,OcrDictionaryGroup tab) throws IOException{
OcrDictionaryGroup ocrDictionaryGroup = ocrDictionaryGroupService.getOne(new LambdaQueryWrapper<OcrDictionaryGroup>().eq(OcrDictionaryGroup::getField, tab.getField()));
if(Objects.nonNull(ocrDictionaryGroup)){
if(Objects.nonNull(ocrDictionaryGroup)&&!ocrDictionaryGroup.getId().equals(tab.getId())){
return ResultVoUtil.error("字段名称重复");
}
this.ocrDictionaryGroupService.save(tab);
this.ocrDictionaryGroupService.saveOrUpdate(tab);
return ResultVoUtil.success();
}
@ -181,51 +181,6 @@ public class OcrDictionaryGropuController extends BaseController {
List<OcrDictionaryGroup> list = this.ocrDictionaryGroupService.list();
return ResultVoUtil.success(list);
}
/**
*
*mail.zhangyong@gmail.com
*2022-03-07 15:15:07
**/
@PostMapping("/save")
public ResultVo saveDistionarytype(HttpServletResponse response,HttpServletRequest request,OcrDictionaryGroup tab) throws IOException{
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
boolean isok = false;
if(null != tab.getId()){
isok = this.ocrDictionaryGroupService.updateById(tab);
}else {
isok = this.ocrDictionaryGroupService.save(tab);
}
return isok?ResultVoUtil.success():ResultVoUtil.error();
}
/**
*
*mail.zhangyong@gmail.com
*2022-03-07 15:15:07
**/
@GetMapping("/getdata/{id}")
@ResponseBody
public ResultVo getdateDistionarytype(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") Long id) throws IOException{
OcrDictionaryGroup dto = this.ocrDictionaryGroupService.selectDtoById(id);
if(null != dto){
return ResultVoUtil.success(dto);
}else{
return ResultVoUtil.error();
}
}
/**
*id1,2,3
*mail.zhangyong@gmail.com
*2022-03-07 15:15:07
**/
@GetMapping("/delmore")
@ResponseBody
public ResultVo delMoreDistionarytype(HttpServletResponse response,HttpServletRequest request) throws IOException{
String ids = request.getParameter("id");
this.ocrDictionaryGroupService.deleteByIdMore(ids);
return ResultVoUtil.success();
}
}

@ -41,17 +41,12 @@ public class OcrDistionaryHtmlController extends BaseController{
**/
@GetMapping("/toList")
public String toListDistionary(HttpServletResponse response,HttpServletRequest request){
String resourceid = request.getParameter("resourceid");
String distionarygroupid = request.getParameter("distionarygroupid");
Distionarygroup distionarygroup = distionarygroupService.selectDtoById(Long.parseLong(distionarygroupid));
request.setAttribute("resourceid",resourceid);
request.setAttribute("distionarygroupid",distionarygroupid);
request.setAttribute("distionarytypeid",distionarygroup.getDistionarytypeid().toString());
request.setAttribute("distionarytypeid","212");
return "/backstage/oa/ocr/distionary/list";
}

@ -52,7 +52,7 @@ public class OcrDistionarygroupHtmlController extends BaseController{
public String toSaveDistionarygroup(HttpServletResponse response,HttpServletRequest request){
String resourceid = request.getParameter("resourceid");
request.setAttribute("resourceid",resourceid);
return "/backstage/oa/ocr//distionarygroup/add";
return "/backstage/oa/ocr/distionarygroup/add";
}
/**
@ -65,7 +65,7 @@ public class OcrDistionarygroupHtmlController extends BaseController{
String resourceid = request.getParameter("resourceid");
request.setAttribute("resourceid",resourceid);
request.setAttribute("id", id);
return "/backstage/oa/ocr//distionarygroup/edit";
return "/backstage/oa/ocr/distionarygroup/edit";
}
}

@ -69,12 +69,10 @@ public class OcrDictionary implements BaseDto,java.io.Serializable{
@TableField(exist = false)
@JsonIgnore
private final Map<String,String> query = Stream.of(
new AbstractMap.SimpleEntry<>("listdept","deptid"),
new AbstractMap.SimpleEntry<>("ID","id"),
new AbstractMap.SimpleEntry<>("CODENO","codeno"),
new AbstractMap.SimpleEntry<>("DISTIONARYTYPEID","distionarytypeid"),
new AbstractMap.SimpleEntry<>("GROUPNAME","groupname"),
new AbstractMap.SimpleEntry<>("USEMODE","usemode")
new AbstractMap.SimpleEntry<>("DISTIONATYGROUPID","group_id"),
new AbstractMap.SimpleEntry<>("CODENO","value"),
new AbstractMap.SimpleEntry<>("NAME","lable")
)
.collect(Collectors.toMap(AbstractMap.SimpleEntry::getKey, AbstractMap.SimpleEntry::getValue));

@ -75,8 +75,8 @@ public class OcrDictionaryGroup implements BaseDto,java.io.Serializable {
private final Map<String,String> query = Stream.of(
new AbstractMap.SimpleEntry<>("listdept","deptid"),
new AbstractMap.SimpleEntry<>("ID","id"),
new AbstractMap.SimpleEntry<>("CODENO","codeno"),
new AbstractMap.SimpleEntry<>("DISTIONARYTYPEID","distionarytypeid")
new AbstractMap.SimpleEntry<>("CODENO","field"),
new AbstractMap.SimpleEntry<>("GROUPNAME","label")
)
.collect(Collectors.toMap(AbstractMap.SimpleEntry::getKey, AbstractMap.SimpleEntry::getValue));
@Override

Loading…
Cancel
Save