From dfb9b1cc0b412334d0ab7891caac061a8243a0cb Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期二, 06 六月 2023 17:03:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java
index dca1922..f779e61 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java
@@ -1,11 +1,20 @@
package com.vci.ubcs.code.service.impl;
+<<<<<<< Updated upstream
+=======
import com.baomidou.mybatisplus.core.conditions.Wrapper;
+>>>>>>> Stashed changes
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.entity.CodeShowFieldConfig;
import com.vci.ubcs.code.mapper.CodeShowFieldConfigMapper;
+<<<<<<< Updated upstream
+import com.vci.ubcs.code.service.ICodeShowFieldConfigService;
+import com.vci.ubcs.code.vo.CodeShowFieldConfigVO;
+import com.vci.ubcs.code.wrapper.CodeShowFieldConfigWraper;
+import org.springframework.stereotype.Service;
+=======
import com.vci.ubcs.code.service.CodeShowFieldConfigService;
import com.vci.ubcs.code.vo.CodeShowFieldConfigVO;
import com.vci.ubcs.code.wrapper.CodeShowFieldConfigWraper;
@@ -14,6 +23,7 @@
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
+>>>>>>> Stashed changes
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@@ -26,12 +36,18 @@
* @since 2023-05-19 17:58:56
*/
@Service("CodeShowFieldConfigService")
+<<<<<<< Updated upstream
+public class CodeShowFieldConfigServiceImpl extends ServiceImpl<CodeShowFieldConfigMapper,CodeShowFieldConfig> implements ICodeShowFieldConfigService {
+=======
public class CodeShowFieldConfigServiceImpl extends ServiceImpl<CodeShowFieldConfigMapper,CodeShowFieldConfig> implements CodeShowFieldConfigService {
+>>>>>>> Stashed changes
@Resource
private CodeShowFieldConfigMapper codeShowFieldConfigMapper;
/**
+<<<<<<< Updated upstream
+=======
* 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
*
* @param oid 涓婚敭
@@ -43,6 +59,7 @@
}
/**
+>>>>>>> Stashed changes
* 鏂板鏁版嵁
*
* @param codeShowFieldConfig 瀹炰緥瀵硅薄
@@ -55,6 +72,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
+<<<<<<< Updated upstream
+ public boolean insertBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS, String oid) {
+ List<CodeShowFieldConfig> codeShowFieldConfigs = CodeShowFieldConfigWraper.build().listDO(codeShowFieldConfigVOS,oid);
+ boolean b = this.saveOrUpdateBatch(codeShowFieldConfigs);
+ return b;
+ }
+=======
public boolean insertBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS) {
List<CodeShowFieldConfig> codeShowFieldConfigs = CodeShowFieldConfigWraper.build().listDO(codeShowFieldConfigVOS);
boolean b = this.saveOrUpdateBatch(codeShowFieldConfigs);
@@ -72,6 +96,7 @@
public boolean update(CodeShowFieldConfig codeShowFieldConfig) {
return this.codeShowFieldConfigMapper.update(codeShowFieldConfig)>0;
}
+>>>>>>> Stashed changes
@Override
public boolean updateBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS) {
--
Gitblit v1.9.3