diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUserFieldController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUserFieldController.java index cf0b414..3874a32 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUserFieldController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUserFieldController.java @@ -35,9 +35,8 @@ public class OcrUserFieldController extends BaseController{ OcrUserField ocrUserField = new OcrUserField(); ocrUserField.setUserId(ocrUserFieldVo.getUserId()); ocrUserField.setReviewType(ocrUserFieldVo.getReviewType()); - ocrUserField.setUserField(ocrUserFieldVo.getUserField()); - ocrUserFieldService.saveData(ocrUserField); - // 调用服务层方法,并处理返回值 + ocrUserField.setUserFieldFixed(ocrUserFieldVo.getUserFieldFixed()); + ocrUserField.setUserFieldUnFixed(ocrUserFieldVo.getUserFieldUnFixed()); ResultVo result = ocrUserFieldService.saveData(ocrUserField); return result; }catch (Exception e) { diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrUserField.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrUserField.java index 8d022c7..d2172c7 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrUserField.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrUserField.java @@ -34,9 +34,13 @@ public class OcrUserField implements Serializable { @TableField(value="review_type") private Integer reviewType; - @Schema(description = "展示字段字符串") - @TableField(value="user_field") - private String userField; + @Schema(description = "展示字段字符串(固定列)") + @TableField(value="user_field_fixed") + private String userFieldFixed; + + @Schema(description = "展示字段字符串(非固定列)") + @TableField(value="user_field_unfixed") + private String userFieldUnFixed; @Schema(description = "创建人") @TableField(value="create_by") diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrUserFieldDto.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrUserFieldDto.java index 606a444..7a7a704 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrUserFieldDto.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrUserFieldDto.java @@ -1,5 +1,6 @@ package cn.jyjz.xiaoyao.ocr.dto; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; @@ -24,8 +25,11 @@ public class OcrUserFieldDto implements Serializable { @Schema(description = "评审类型(终审:0,工单:1、一审二审:2、审核填报:3)") private Integer reviewType; - @Schema(description = "展示字段字符串") - private String userField; + @Schema(description = "展示字段字符串(固定列)") + private String userFieldFixed; + + @Schema(description = "展示字段字符串(非固定列)") + private String userFieldUnFixed; } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUserFieldServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUserFieldServiceImpl.java index 133fdae..129227c 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUserFieldServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUserFieldServiceImpl.java @@ -37,7 +37,9 @@ public class OcrUserFieldServiceImpl extends BaseServiceImpl ocrFieldLambdaQueryWrapper = new LambdaQueryWrapper<>(); ocrFieldLambdaQueryWrapper.eq(OcrField::getIsrequired,2); ocrFieldLambdaQueryWrapper.eq(OcrField::getDel,0); @@ -86,7 +88,8 @@ public class OcrUserFieldServiceImpl extends BaseServiceImpl - + +