动态列->>保存用户勾选字段列表和查询用户勾选字段列表->>增加固定列和非固定列字段

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());
+			ocrUserField.setUserFieldFixed(ocrUserFieldVo.getUserFieldFixed());
-			ocrUserFieldService.saveData(ocrUserField);
+			ocrUserField.setUserFieldUnFixed(ocrUserFieldVo.getUserFieldUnFixed());
-			// 调用服务层方法，并处理返回值
 			ResultVo result = ocrUserFieldService.saveData(ocrUserField);
 			return result;
 		}catch (Exception e) {

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 = "展示字段字符串")
+    @Schema(description = "展示字段字符串(固定列)")
-    @TableField(value="user_field")
+    @TableField(value="user_field_fixed")
-    private String userField;
+    private String userFieldFixed;
+
+    @Schema(description = "展示字段字符串(非固定列)")
+    @TableField(value="user_field_unfixed")
+    private String userFieldUnFixed;
 
     @Schema(description = "创建人")
     @TableField(value="create_by")

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 = "展示字段字符串")
+    @Schema(description = "展示字段字符串(固定列)")
-    private String userField;
+    private String userFieldFixed;
+
+    @Schema(description = "展示字段字符串(非固定列)")
+    private String userFieldUnFixed;
 }
 
 

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<OcrUserFieldMybatis
 	@Override
 	public ResultVo saveData(OcrUserField ocrUserField){
 		try {
-			String fields = ocrUserField.getUserField();
+			String userFieldFixed = ocrUserField.getUserFieldFixed();
+			String userFieldUnFixed = ocrUserField.getUserFieldUnFixed();
+			String fields = userFieldFixed.concat(",").concat(userFieldUnFixed);
 			LambdaQueryWrapper<OcrField> ocrFieldLambdaQueryWrapper = new LambdaQueryWrapper<>();
 			ocrFieldLambdaQueryWrapper.eq(OcrField::getIsrequired,2);
 			ocrFieldLambdaQueryWrapper.eq(OcrField::getDel,0);
@@ -86,7 +88,8 @@ public class OcrUserFieldServiceImpl extends BaseServiceImpl<OcrUserFieldMybatis
 				dto.setId(ocrUserFieldOne.getId());
 				dto.setUserId(ocrUserFieldOne.getUserId());
 				dto.setReviewType(ocrUserFieldOne.getReviewType());
-				dto.setUserField(ocrUserFieldOne.getUserField());
+				dto.setUserFieldFixed(ocrUserFieldOne.getUserFieldFixed());
+				dto.setUserFieldUnFixed(ocrUserFieldOne.getUserFieldUnFixed());
 			}
 		} catch (BeansException e) {
 			e.printStackTrace();

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrUserFieldVo.java

@@ -22,8 +22,11 @@ public class OcrUserFieldVo implements Serializable {
     @Schema(description = "评审类型（终审:0，工单：1、一审二审:2、审核填报:3）",required = true)
     private Integer reviewType;
 
-    @Schema(description = "展示字段字符串",required = true)
+    @Schema(description = "展示字段字符串(固定列)")
-    private String userField;
+    private String userFieldFixed;
+
+    @Schema(description = "展示字段字符串(非固定列)")
+    private String userFieldUnFixed;
 
 }
 

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrUserFieldMapper.xml

@@ -5,7 +5,8 @@
 		<id column="id" property="id"/>
 		<result column="user_id" property="userId" />
 		<result column="review_type" property="reviewType"/>
-		<result column="user_field" property="userField"/>
+		<result column="user_field_fixed" property="userFieldFixed"/>
+		<result column="user_field_unfixed" property="userFieldUnFixed"/>
 		<result column="create_by" property="createBy" />
 		<result column="create_time" property="createTime"/>
 		<result column="update_by" property="updateBy"/>