guoxiangbin
/
ocr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'feat/QxOcrFieldMg-20240412' (#110) from feat/QxOcrFieldMg-20240412 into test

Browse Source 
Reviewed-on: #110
pull/112/head
guanzheng 2 years ago
parent 49b671a8b3 e8e6c529e2
commit 3521375975
10 changed files with 84 additions and 35 deletions
Show Stats Download Patch File Download Diff File

21
htmlweb/web/backstage/oa/ocr/information/add.html
Unescape View File

@ -60,10 +60,10 @@
<div class="col-sm-9"> <div class="col-sm-9">
<div class="radio i-checks"> <div class="radio i-checks">
<label> <label>
<input type="radio" checked="" value="1" name="isrequired"> <i></i>启用 <input type="radio" checked="" value="1" name="isrequired"> <i></i>是
</label> </label>
<label> <label>
<input type="radio" value="0" name="isrequired"> <i></i>停用 <input type="radio" value="0" name="isrequired"> <i></i>否
</label> </label>
</div> </div>
</div> </div>
@ -129,6 +129,23 @@
</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="isEnable"> <i></i>启用
</label>
<label>
<input type="radio" value="0" name="isEnable"> <i></i>停用
</label>
</div>
</div>
</div>
</div>
</div>
<div class="row"> <div class="row">
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-5"> <div class="col-sm-offset-5">

40
htmlweb/web/backstage/oa/ocr/information/edit.html
Unescape View File

@ -61,10 +61,10 @@
<div class="col-sm-9"> <div class="col-sm-9">
<div class="radio i-checks"> <div class="radio i-checks">
<label> <label>
<input type="radio" checked="" value="1" name="isrequired"> <i></i>启用 <input type="radio" checked="" value="1" name="isrequired"> <i></i>是
</label> </label>
<label> <label>
<input type="radio" value="0" name="isrequired"> <i></i>停用 <input type="radio" value="0" name="isrequired"> <i></i>否
</label> </label>
</div> </div>
</div> </div>
@ -86,10 +86,10 @@
<div class="col-sm-9"> <div class="col-sm-9">
<div class="radio i-checks"> <div class="radio i-checks">
<label> <label>
<input type="radio" checked="" value="1" name="isHighlight" > <i></i>否 <input type="radio" checked="" value="1" name="isHighlight" > <i></i>是
</label> </label>
<label> <label>
<input type="radio" value="0" name="isHighlight" > <i></i>是 <input type="radio" value="0" name="isHighlight" > <i></i>否
</label> </label>
</div> </div>
</div> </div>
@ -104,10 +104,10 @@
<div class="col-sm-9"> <div class="col-sm-9">
<div class="radio i-checks"> <div class="radio i-checks">
<label> <label>
<input type="radio" checked="" value="1" name="isTap"> <i></i>否 <input type="radio" checked="" value="1" name="isTap"> <i></i>是
</label> </label>
<label> <label>
<input type="radio" value="0" name="isTap"> <i></i>是 <input type="radio" value="0" name="isTap"> <i></i>否
</label> </label>
</div> </div>
</div> </div>
@ -119,10 +119,10 @@
<div class="col-sm-9"> <div class="col-sm-9">
<div class="radio i-checks"> <div class="radio i-checks">
<label> <label>
<input type="radio" checked="" value="1" name="isHide"> <i></i>否 <input type="radio" checked="" value="1" name="isHide"> <i></i>是
</label> </label>
<label> <label>
<input type="radio" value="0" name="isHide"> <i></i>是 <input type="radio" value="0" name="isHide"> <i></i>否
</label> </label>
</div> </div>
</div> </div>
@ -130,6 +130,24 @@
</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="isEnable"> <i></i>启用
</label>
<label>
<input type="radio" value="0" name="isEnable"> <i></i>停用
</label>
</div>
</div>
</div>
</div>
</div>
<div class="row"> <div class="row">
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-5"> <div class="col-sm-offset-5">
@ -249,7 +267,11 @@
} else if (data.data.isrequired == 0) { } else if (data.data.isrequired == 0) {
$("input:radio[name='isrequired']").eq(1).attr('checked', true); $("input:radio[name='isrequired']").eq(1).attr('checked', true);
} }
if (data.data.isEnable == 1) {
$("input:radio[name='isEnable']").eq(0).attr('checked', true);
} else if (data.data.isEnable == 0) {
$("input:radio[name='isEnable']").eq(1).attr('checked', true);
}
}else{ }else{
parent.toastr.error("非法请求。"); parent.toastr.error("非法请求。");

6
htmlweb/web/backstage/oa/ocr/information/list.html
Unescape View File

@ -96,6 +96,7 @@
columns: [ columns: [
{checkbox: true}, {checkbox: true},
{ width:100,valign: "middle",field:'name',title:'字段名称',sortable:true}, { width:100,valign: "middle",field:'name',title:'字段名称',sortable:true},
{ width:150,valign: "middle",field:'fieldDesc',title:'字段描述',sortable:true},
{ width:150,valign: "middle",field:'reviewType',title:'字段类型',sortable:true, { width:150,valign: "middle",field:'reviewType',title:'字段类型',sortable:true,
formatter:function(value,oData,index) { formatter:function(value,oData,index) {
var listOperation = ""; var listOperation = "";
@ -114,11 +115,10 @@
return listOperation; return listOperation;
} }
}, },
{ width:150,valign: "middle",field:'fieldDesc',title:'字段描述',sortable:true}, { width:80,valign: "middle",field:'isEnable',title:'是否启用',sortable:true,
{ width:80,valign: "middle",field:'isrequired',title:'是否必选',sortable:true,
formatter:function(value,oData,index) { formatter:function(value,oData,index) {
return (oData.isrequired == '1'?'启用':'停用'); return (oData.isEnable == '1'?'启用':'停用');
} }
}, },
{ width:80,valign: "middle",field:'sort',title:'排序字段',sortable:true}, { width:80,valign: "middle",field:'sort',title:'排序字段',sortable:true},

25
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldController.java
Unescape View File

@ -52,27 +52,13 @@ public class OcrFieldController extends BaseController {
@Autowired @Autowired
private UserService userService; private UserService userService;
/**
* 自定义筛选字段列表查询
* @return
*/
@ApiOperation(value="根据评审类型查询字段列表", notes="根据评审类型查询字段列表")
@GetMapping(value = "/list")
public ResultVo<List<OcrFieldDto>> list(@RequestParam(name="reviewType") @ApiParam(value = "字段类型（终审:0，工单：1、一审二审:2、审核填报:3）", required = true) Integer reviewType) {
ResultVo<List<OcrFieldDto>> resultVo = new ResultVo<>();
List<OcrFieldDto> ocrFieldDtos = ocrFieldService.list(reviewType);
resultVo.setData(ocrFieldDtos);
resultVo.addOK("查询成功");
return resultVo;
}
/** /**
* 自定义筛选字段列表查询 * 自定义筛选字段列表查询
* @return * @return
*/ */
@ApiOperation(value="根据评审类型查询字段列表", notes="根据评审类型查询字段列表") @ApiOperation(value="根据评审类型查询字段列表", notes="根据评审类型查询字段列表")
@GetMapping(value = "/page") @GetMapping(value = "/page")
public ResultVo<IPage<OcrField>> page(@RequestParam(name="start", defaultValue="1") Integer start, public ResultVo<IPage<OcrField>> list(@RequestParam(name="start", defaultValue="1") Integer start,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest request) { HttpServletRequest request) {
@ -92,6 +78,15 @@ public class OcrFieldController extends BaseController {
return resultVo; return resultVo;
} }
@GetMapping(value = "/list")
public ResultVo<List<OcrFieldDto>> list(@RequestParam(name="reviewType") @ApiParam(value = "字段类型（终审:0，工单：1、一审二审:2、审核填报:3）", required = true) Integer reviewType) {
ResultVo<List<OcrFieldDto>> resultVo = new ResultVo<>();
List<OcrFieldDto> ocrFieldDtos = ocrFieldService.list(reviewType);
resultVo.setData(ocrFieldDtos);
resultVo.addOK("查询成功");
return resultVo;
}
/** /**
* 自定义筛选字段列表查询全部 * 自定义筛选字段列表查询全部
* @return * @return

4
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrField.java
Unescape View File

@ -92,6 +92,10 @@ public class OcrField implements BaseDto,java.io.Serializable {
@TableField(value="is_hide") @TableField(value="is_hide")
private Integer isHide; private Integer isHide;
@Schema(description = "是否启用,0:停用,1：启用")
@TableField(value="is_enable")
private Integer isEnable;
//保存当前登录用户的数据权限范围的搜索条件 //保存当前登录用户的数据权限范围的搜索条件
@TableField(exist = false) @TableField(exist = false)
@JsonIgnore @JsonIgnore

2
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrFieldDto.java
Unescape View File

@ -43,4 +43,6 @@ public class OcrFieldDto implements Serializable {
@Schema(description = "是否可隐藏,0:否,1：是") @Schema(description = "是否可隐藏,0:否,1：是")
private Integer isHide; private Integer isHide;
@Schema(description = "是否启用,0:停用,1：启用")
private Integer isEnable;
} }

10
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrFieldService.java
Unescape View File

@ -16,13 +16,15 @@ import java.util.List;
*/ */
public interface OcrFieldService extends BaseService<OcrField> { public interface OcrFieldService extends BaseService<OcrField> {
/**
* 自定义筛选字段列表查询
*/
IPage<OcrField> pageList(ParamterPage paramterPage, QueryWrapper<OcrField> queryWrapper);
List<OcrFieldDto> list(Integer reviewType); List<OcrFieldDto> list(Integer reviewType);
/**
* 自定义筛选字段列表查询
*/
IPage<OcrField> pageList(ParamterPage paramterPage, QueryWrapper<OcrField> queryWrapper);
/** /**
* 自定义筛选字段列表查询全部 * 自定义筛选字段列表查询全部
*/ */

6
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java
Unescape View File

@ -36,7 +36,6 @@ public class OcrFieldServiceImpl extends BaseServiceImpl<OcrFieldMybatisDao, Ocr
@Autowired @Autowired
private OcrFieldMybatisDao ocrFieldMybatisDao; private OcrFieldMybatisDao ocrFieldMybatisDao;
@Override @Override
public List<OcrFieldDto> list(Integer reviewType){ public List<OcrFieldDto> list(Integer reviewType){
List<OcrFieldDto> ocrFieldDtoList = new ArrayList<>(); List<OcrFieldDto> ocrFieldDtoList = new ArrayList<>();
@ -60,6 +59,7 @@ public class OcrFieldServiceImpl extends BaseServiceImpl<OcrFieldMybatisDao, Ocr
dto.setDel(ocrField.getDel()); dto.setDel(ocrField.getDel());
dto.setIsHighlight(ocrField.getIsHighlight()); dto.setIsHighlight(ocrField.getIsHighlight());
dto.setIsTap(ocrField.getIsTap()); dto.setIsTap(ocrField.getIsTap());
dto.setIsEnable(ocrField.getIsEnable());
ocrFieldDtoList.add(dto); ocrFieldDtoList.add(dto);
} }
} }
@ -98,6 +98,7 @@ public class OcrFieldServiceImpl extends BaseServiceImpl<OcrFieldMybatisDao, Ocr
dto.setFieldDesc(ocrField.getFieldDesc()); dto.setFieldDesc(ocrField.getFieldDesc());
dto.setIsrequired(ocrField.getIsrequired()); dto.setIsrequired(ocrField.getIsrequired());
dto.setDel(ocrField.getDel()); dto.setDel(ocrField.getDel());
dto.setIsEnable(ocrField.getIsEnable());
ocrFieldDtoList.add(dto); ocrFieldDtoList.add(dto);
} }
} }
@ -136,6 +137,7 @@ public class OcrFieldServiceImpl extends BaseServiceImpl<OcrFieldMybatisDao, Ocr
String name = ocrField.getName(); String name = ocrField.getName();
LambdaQueryWrapper<OcrField> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OcrField> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OcrField::getName, name); queryWrapper.eq(OcrField::getName, name);
queryWrapper.eq(OcrField::getDel, 0);
OcrField ocrFieldOne = this.getOne(queryWrapper); OcrField ocrFieldOne = this.getOne(queryWrapper);
if(Objects.nonNull(ocrFieldOne)&&!ocrFieldOne.getId().equals(ocrField.getId())){ if(Objects.nonNull(ocrFieldOne)&&!ocrFieldOne.getId().equals(ocrField.getId())){
return ResultVoUtil.error(ResultVo.ERROR,"字段名称已存在"); return ResultVoUtil.error(ResultVo.ERROR,"字段名称已存在");
@ -149,6 +151,8 @@ public class OcrFieldServiceImpl extends BaseServiceImpl<OcrFieldMybatisDao, Ocr
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
log.error(e.getMessage());
return ResultVoUtil.error(ResultVo.ERROR,"修改错误");
} }
return ResultVoUtil.success(); return ResultVoUtil.success();
} }

3
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrFieldVo.java
Unescape View File

@ -46,4 +46,7 @@ public class OcrFieldVo implements Serializable {
@Schema(description = "是否隐藏") @Schema(description = "是否隐藏")
private Integer isHide; private Integer isHide;
@Schema(description = "是否启用,0:停用,1：启用")
private Integer isEnable;
} }

2
runstart/src/main/java/cn/jyjz/xiaoyao/admin/LoginController.java
Unescape View File

@ -40,7 +40,7 @@ public class LoginController {
String protocol = request.getProtocol(); String protocol = request.getProtocol();
finalurl += "/backstage/backstageindex"; finalurl += "/backstage/backstageindex";
}else{ }else{
finalurl += "/backstage/backstageindex"; finalurl = "http://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath() + "/backstage/backstageindex";;
} }
return "redirect:" + finalurl; return "redirect:" + finalurl;

Write Preview
Loading…
Cancel
Save