From 974e61e0ad37d1f9a4a2e4ebaa3ffa563c26d36d Mon Sep 17 00:00:00 2001 From: DELL Date: Sun, 17 Mar 2024 18:15:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=88=97->>=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E7=94=A8=E6=88=B7=E5=8B=BE=E9=80=89=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=92=8C=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=8B=BE=E9=80=89=E5=AD=97=E6=AE=B5=E5=88=97=E8=A1=A8->>?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BA=E5=AE=9A=E5=88=97=E5=92=8C=E9=9D=9E?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=88=97=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaoyao/ocr/controller/OcrUserFieldController.java | 5 ++--- .../cn/jyjz/xiaoyao/ocr/dataobject/OcrUserField.java | 10 +++++++--- .../java/cn/jyjz/xiaoyao/ocr/dto/OcrUserFieldDto.java | 8 ++++++-- .../ocr/service/impl/OcrUserFieldServiceImpl.java | 7 +++++-- .../java/cn/jyjz/xiaoyao/ocr/vo/OcrUserFieldVo.java | 7 +++++-- .../main/resources/mapper/oa/OcrUserFieldMapper.xml | 3 ++- 6 files changed, 27 insertions(+), 13 deletions(-) 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 cf0b4149..3874a32e 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 8d022c79..d2172c76 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 606a4441..7a7a7040 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 133fdae6..129227cb 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 - + +