From e1a2b770a3b9bf440ddccf4518c436e55bdaecda Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 06 六月 2023 17:02:37 +0800
Subject: [PATCH] 高级查询相关内容提交

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java |   53 -----------------------------------------------------
 1 files changed, 0 insertions(+), 53 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 f779e61..577f289 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,29 +1,14 @@
 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;
@@ -36,30 +21,12 @@
  * @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 涓婚敭
-     * @return 瀹炰緥瀵硅薄
-     */
-    @Override
-    public CodeShowFieldConfig queryById(String oid) {
-        return this.codeShowFieldConfigMapper.queryById(oid);
-    }
-
-    /**
->>>>>>> Stashed changes
      * 鏂板鏁版嵁
      *
      * @param codeShowFieldConfig 瀹炰緥瀵硅薄
@@ -72,31 +39,11 @@
 
 	@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
-	@Transactional(rollbackFor = Exception.class)
-    public boolean update(CodeShowFieldConfig codeShowFieldConfig) {
-        return this.codeShowFieldConfigMapper.update(codeShowFieldConfig)>0;
-    }
->>>>>>> Stashed changes
 
 	@Override
 	public boolean updateBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS) {

--
Gitblit v1.9.3