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/CodeShowFieldConfigServiceImpl.java | 87 ++++++++++++++++++++++++++++++++-----------
1 files changed, 65 insertions(+), 22 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 72330a1..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,14 +1,33 @@
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;
+import org.springblade.core.mp.support.Query;
import org.springframework.stereotype.Service;
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;
+import java.util.List;
/**
* 寮曠敤鐮佹锛屽弬鐓ч厤缃晫闈紝鏄剧ず鐨勫睘鎬ч厤缃〃(CodeShowFieldConfigService)琛ㄦ湇鍔″疄鐜扮被
@@ -17,12 +36,18 @@
* @since 2023-05-19 17:58:56
*/
@Service("CodeShowFieldConfigService")
-public class CodeShowFieldConfigServiceImpl implements 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 涓婚敭
@@ -34,43 +59,52 @@
}
/**
- * 鍒嗛〉鏌ヨ
- *
- * @param codeShowFieldConfig 绛涢�夋潯浠�
- * @param pageRequest 鍒嗛〉瀵硅薄
- * @return 鏌ヨ缁撴灉
- */
- @Override
- public Page<CodeShowFieldConfig> queryByPage(CodeShowFieldConfig codeShowFieldConfig, PageRequest pageRequest) {
- long total = this.codeShowFieldConfigMapper.count(codeShowFieldConfig);
- return new PageImpl<>(this.codeShowFieldConfigMapper.queryAllByLimit(codeShowFieldConfig, pageRequest), pageRequest, total);
- }
-
- /**
+>>>>>>> Stashed changes
* 鏂板鏁版嵁
*
* @param codeShowFieldConfig 瀹炰緥瀵硅薄
* @return 瀹炰緥瀵硅薄
*/
@Override
- public CodeShowFieldConfig insert(CodeShowFieldConfig codeShowFieldConfig) {
- this.codeShowFieldConfigMapper.insert(codeShowFieldConfig);
- return codeShowFieldConfig;
+ public boolean insert(CodeShowFieldConfig codeShowFieldConfig) {
+ return this.codeShowFieldConfigMapper.insert(codeShowFieldConfig)>0;
}
- /**
+ @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);
+ return b;
+ }
+
+ /**
* 淇敼鏁版嵁
*
* @param codeShowFieldConfig 瀹炰緥瀵硅薄
* @return 瀹炰緥瀵硅薄
*/
@Override
- public CodeShowFieldConfig update(CodeShowFieldConfig codeShowFieldConfig) {
- this.codeShowFieldConfigMapper.update(codeShowFieldConfig);
- return this.queryById(codeShowFieldConfig.getOid());
+ @Transactional(rollbackFor = Exception.class)
+ public boolean update(CodeShowFieldConfig codeShowFieldConfig) {
+ return this.codeShowFieldConfigMapper.update(codeShowFieldConfig)>0;
}
+>>>>>>> Stashed changes
- /**
+ @Override
+ public boolean updateBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS) {
+ List<CodeShowFieldConfig> codeShowFieldConfigs = CodeShowFieldConfigWraper.build().listDO(codeShowFieldConfigVOS);
+ return this.saveOrUpdateBatch(codeShowFieldConfigs);
+ }
+
+ /**
* 閫氳繃涓婚敭鍒犻櫎鏁版嵁
*
* @param oid 涓婚敭
@@ -80,4 +114,13 @@
public boolean deleteById(String oid) {
return this.codeShowFieldConfigMapper.deleteById(oid) > 0;
}
+
+ @Override
+ public boolean deleteByReferConfigOid(String oid) {
+ LambdaQueryWrapper<CodeShowFieldConfig> lambdaQueryWrapper = Wrappers.<CodeShowFieldConfig>query()
+ .lambda()
+ .eq(CodeShowFieldConfig::getReferConfigOid, oid);
+ return this.codeShowFieldConfigMapper.delete(lambdaQueryWrapper) > 0;
+ }
+
}
--
Gitblit v1.9.3