init

htmlweb/web/backstage/oa/ocr/information/list.html

@@ -118,7 +118,7 @@
 							{ width:80,valign: "middle",field:'isrequired',title:'是否必选',sortable:true,
                 formatter:function(value,oData,index) {
 
-                  return (oData.data.isrequired == '1'?'启用':'停用');
+                  return (oData.isrequired === '1'?'启用':'停用');
                 }
 							},
 							{ width:80,valign: "middle",field:'sort',title:'排序字段',sortable:true},

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldController.java

@@ -24,6 +24,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import liquibase.pro.packaged.S;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -97,19 +98,7 @@ public class OcrFieldController extends BaseController {
 	 */
 	@ApiOperation(value="删除筛选字段", notes="删除筛选字段")
 	@GetMapping(value = "/delete")
-	public ResultVo delete(@RequestParam(name="id") @ApiParam(value = "字段ID", required = true) Long id) {
-
-		OcrFieldDto ocrFieldDto = ocrFieldService.delete(id);
-		if(ocrFieldDto != null){
-			return ResultVoUtil.success();
-		}
-		return ResultVoUtil.error("删除失败");
-	}
-
-
-	@ApiOperation(value="详情", notes="详情")
-	@GetMapping(value = "/getData/{id}")
-	public ResultVo getData(@PathVariable(name="id") @ApiParam(value = "字段ID", required = true) String ids) {
+	public ResultVo delete(@RequestParam(name="id") @ApiParam(value = "字段ID", required = true) String ids) {
 		List<OcrField> ocrFields = ocrFieldService.listByIds(Arrays.asList(ids.split(",")));
 		List<OcrField> newOcrField = ocrFields.stream().peek(s -> {
 			s.setUpdateTime(DateUtil.date().toSqlDate());
@@ -119,6 +108,13 @@ public class OcrFieldController extends BaseController {
 		return ResultVoUtil.success();
 	}
 
+
+	@ApiOperation(value="详情", notes="详情")
+	@GetMapping(value = "/getData/{id}")
+	public ResultVo getData(@PathVariable(name="id") @ApiParam(value = "字段ID", required = true) Long id) {
+		return ResultVoUtil.success(ocrFieldService.getById(id));
+	}
+
 	/**
 	 * 自定义筛选字段新增和修改
 	 * @return