diff --git a/htmlweb/web/backstage/oa/ocr/information/add.html b/htmlweb/web/backstage/oa/ocr/information/add.html index fe96e06..86474ee 100644 --- a/htmlweb/web/backstage/oa/ocr/information/add.html +++ b/htmlweb/web/backstage/oa/ocr/information/add.html @@ -60,10 +60,10 @@
@@ -129,6 +129,23 @@ +
+
+
+ +
+
+ + +
+
+
+
+
diff --git a/htmlweb/web/backstage/oa/ocr/information/edit.html b/htmlweb/web/backstage/oa/ocr/information/edit.html index d04d572..e3aa721 100644 --- a/htmlweb/web/backstage/oa/ocr/information/edit.html +++ b/htmlweb/web/backstage/oa/ocr/information/edit.html @@ -61,10 +61,10 @@
@@ -86,10 +86,10 @@
@@ -104,10 +104,10 @@
@@ -119,10 +119,10 @@
@@ -130,6 +130,24 @@
+ +
+
+
+ +
+
+ + +
+
+
+
+
@@ -249,7 +267,11 @@ } else if (data.data.isrequired == 0) { $("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{ parent.toastr.error("非法请求。"); diff --git a/htmlweb/web/backstage/oa/ocr/information/list.html b/htmlweb/web/backstage/oa/ocr/information/list.html index f519dae..9b3c45e 100644 --- a/htmlweb/web/backstage/oa/ocr/information/list.html +++ b/htmlweb/web/backstage/oa/ocr/information/list.html @@ -96,6 +96,7 @@ columns: [ {checkbox: 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, formatter:function(value,oData,index) { var listOperation = ""; @@ -114,11 +115,10 @@ return listOperation; } }, - { width:150,valign: "middle",field:'fieldDesc',title:'字段描述',sortable:true}, - { width:80,valign: "middle",field:'isrequired',title:'是否必选',sortable:true, + { width:80,valign: "middle",field:'isEnable',title:'是否启用',sortable:true, formatter:function(value,oData,index) { - return (oData.isrequired == '1'?'启用':'停用'); + return (oData.isEnable == '1'?'启用':'停用'); } }, { width:80,valign: "middle",field:'sort',title:'排序字段',sortable:true}, diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldController.java index 14d22c4..d900537 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldController.java @@ -52,27 +52,13 @@ public class OcrFieldController extends BaseController { @Autowired private UserService userService; - /** - * 自定义筛选字段列表查询 - * @return - */ - @ApiOperation(value="根据评审类型查询字段列表", notes="根据评审类型查询字段列表") - @GetMapping(value = "/list") - public ResultVo> list(@RequestParam(name="reviewType") @ApiParam(value = "字段类型（终审:0，工单：1、一审二审:2、审核填报:3）", required = true) Integer reviewType) { - ResultVo> resultVo = new ResultVo<>(); - List ocrFieldDtos = ocrFieldService.list(reviewType); - resultVo.setData(ocrFieldDtos); - resultVo.addOK("查询成功"); - return resultVo; - } - /** * 自定义筛选字段列表查询 * @return */ @ApiOperation(value="根据评审类型查询字段列表", notes="根据评审类型查询字段列表") @GetMapping(value = "/page") - public ResultVo> page(@RequestParam(name="start", defaultValue="1") Integer start, + public ResultVo> list(@RequestParam(name="start", defaultValue="1") Integer start, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest request) { @@ -92,6 +78,15 @@ public class OcrFieldController extends BaseController { return resultVo; } + @GetMapping(value = "/list") + public ResultVo> list(@RequestParam(name="reviewType") @ApiParam(value = "字段类型（终审:0，工单：1、一审二审:2、审核填报:3）", required = true) Integer reviewType) { + ResultVo> resultVo = new ResultVo<>(); + List ocrFieldDtos = ocrFieldService.list(reviewType); + resultVo.setData(ocrFieldDtos); + resultVo.addOK("查询成功"); + return resultVo; + } + /** * 自定义筛选字段列表查询全部 * @return diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrField.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrField.java index 1011402..c243c7b 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrField.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrField.java @@ -92,6 +92,10 @@ public class OcrField implements BaseDto,java.io.Serializable { @TableField(value="is_hide") private Integer isHide; + @Schema(description = "是否启用,0:停用,1：启用") + @TableField(value="is_enable") + private Integer isEnable; + //保存当前登录用户的数据权限范围的搜索条件 @TableField(exist = false) @JsonIgnore diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrFieldDto.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrFieldDto.java index d9ac6b8..8ea84a7 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrFieldDto.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrFieldDto.java @@ -43,4 +43,6 @@ public class OcrFieldDto implements Serializable { @Schema(description = "是否可隐藏,0:否,1：是") private Integer isHide; + @Schema(description = "是否启用,0:停用,1：启用") + private Integer isEnable; } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrFieldService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrFieldService.java index 3f8a965..92608b4 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrFieldService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrFieldService.java @@ -16,13 +16,15 @@ import java.util.List; */ public interface OcrFieldService extends BaseService { - /** - * 自定义筛选字段列表查询 - */ - IPage pageList(ParamterPage paramterPage, QueryWrapper queryWrapper); List list(Integer reviewType); + + /** + * 自定义筛选字段列表查询 + */ + IPage pageList(ParamterPage paramterPage, QueryWrapper queryWrapper); + /** * 自定义筛选字段列表查询全部 */ diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java index d9c283e..da56bfc 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java @@ -36,7 +36,6 @@ public class OcrFieldServiceImpl extends BaseServiceImpl list(Integer reviewType){ List ocrFieldDtoList = new ArrayList<>(); @@ -60,6 +59,7 @@ public class OcrFieldServiceImpl extends BaseServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OcrField::getName, name); + queryWrapper.eq(OcrField::getDel, 0); OcrField ocrFieldOne = this.getOne(queryWrapper); if(Objects.nonNull(ocrFieldOne)&&!ocrFieldOne.getId().equals(ocrField.getId())){ return ResultVoUtil.error(ResultVo.ERROR,"字段名称已存在"); @@ -149,6 +151,8 @@ public class OcrFieldServiceImpl extends BaseServiceImpl