From 93e2df19d543dbf2cd806ab205efd20be9f71111 Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期二, 06 六月 2023 16:48:00 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java
index 31082d8..274b050 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java
@@ -1,18 +1,42 @@
package com.vci.ubcs.code.service.impl;
+<<<<<<< Updated upstream
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.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.code.entity.CodeShowFieldConfig;
+>>>>>>> Stashed changes
import com.vci.ubcs.code.entity.CodeSrchCondConfig;
+import com.vci.ubcs.code.mapper.CodeShowFieldConfigMapper;
import com.vci.ubcs.code.mapper.CodeSrchCondConfigMapper;
+<<<<<<< Updated upstream
import com.vci.ubcs.code.service.ICodeSrchCondConfigService;
import com.vci.ubcs.code.vo.CodeSrchCondConfigVO;
import com.vci.ubcs.code.wrapper.CodeSrchCondConfigWraper;
+=======
+import com.vci.ubcs.code.service.CodeSrchCondConfigService;
+import com.vci.ubcs.code.vo.CodeSrchCondConfigVO;
+import com.vci.ubcs.code.wrapper.CodeSrchCondConfigWraper;
+import org.apache.cxf.endpoint.ServerImpl;
+>>>>>>> Stashed changes
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+<<<<<<< Updated upstream
import java.util.List;
+=======
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+>>>>>>> Stashed changes
/**
* 寮曠敤鐮佹锛屽弬鐓ч厤缃晫闈紝鏌ヨ鏉′欢閰嶇疆琛�(CodeSrchCondConfigService)琛ㄦ湇鍔″疄鐜扮被
@@ -21,7 +45,11 @@
* @since 2023-05-19 17:58:56
*/
@Service("CodeSrchCondConfigService")
+<<<<<<< Updated upstream
public class CodeSrchCondConfigServiceImpl extends ServiceImpl<CodeSrchCondConfigMapper, CodeSrchCondConfig> implements ICodeSrchCondConfigService {
+=======
+public class CodeSrchCondConfigServiceImpl extends ServiceImpl<CodeSrchCondConfigMapper, CodeSrchCondConfig> implements CodeSrchCondConfigService {
+>>>>>>> Stashed changes
@Resource
private CodeSrchCondConfigMapper codeSrchcondconfigMapper;
@@ -38,11 +66,29 @@
}
@Override
+<<<<<<< Updated upstream
@Transactional(rollbackFor = Exception.class)
public boolean insertBatch(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS, String oid) {
List<CodeSrchCondConfig> codeSrchCondConfigs = CodeSrchCondConfigWraper.build().listDO(codeSrchCondConfigVOS,oid);
return this.saveOrUpdateBatch(codeSrchCondConfigs);
}
+=======
+ public boolean insertBatch(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS) {
+ List<CodeSrchCondConfig> codeSrchCondConfigs = CodeSrchCondConfigWraper.build().listDO(codeSrchCondConfigVOS);
+ return this.saveOrUpdateBatch(codeSrchCondConfigs);
+ }
+
+ /**
+ * 淇敼鏁版嵁
+ *
+ * @param codeSrchcondconfig 瀹炰緥瀵硅薄
+ * @return 瀹炰緥瀵硅薄
+ */
+ @Override
+ public boolean update(CodeSrchCondConfig codeSrchcondconfig) {
+ return this.codeSrchcondconfigMapper.update(codeSrchcondconfig)>0;
+ }
+>>>>>>> Stashed changes
@Override
public boolean updateBatch(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS) {
--
Gitblit v1.9.3