From dc41a85c4eadeae567973157f64c549d414f49ec Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期一, 05 六月 2023 18:09:43 +0800
Subject: [PATCH] 配置文件修改
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java | 56 +++++++++++++++++++++++++++++---------------------------
1 files changed, 29 insertions(+), 27 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 b34a1a7..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,28 +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.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
+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)琛ㄦ湇鍔″疄鐜扮被
@@ -31,34 +45,14 @@
* @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;
-
- /**
- * 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
- * codeSrchcondconfig
- * @param oid 涓婚敭
- * @return 瀹炰緥瀵硅薄
- */
- @Override
- public CodeSrchCondConfig queryById(String oid) {
- return this.codeSrchcondconfigMapper.queryById(oid);
- }
-
- /**
- * 鍒嗛〉鏌ヨ
- *
- * @param codeSrchcondconfig 绛涢�夋潯浠�
- * @param pageRequest 鍒嗛〉瀵硅薄
- * @return 鏌ヨ缁撴灉
- */
- @Override
- public Page<CodeSrchCondConfig> queryByPage(CodeSrchCondConfig codeSrchcondconfig, PageRequest pageRequest) {
- long total = this.codeSrchcondconfigMapper.count(codeSrchcondconfig);
- return new PageImpl<>(this.codeSrchcondconfigMapper.queryAllByLimit(codeSrchcondconfig, pageRequest), pageRequest, total);
- }
/**
* 鏂板鏁版嵁
@@ -72,6 +66,13 @@
}
@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);
@@ -87,6 +88,7 @@
public boolean update(CodeSrchCondConfig codeSrchcondconfig) {
return this.codeSrchcondconfigMapper.update(codeSrchcondconfig)>0;
}
+>>>>>>> Stashed changes
@Override
public boolean updateBatch(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS) {
--
Gitblit v1.9.3