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/CodeReferConfigServiceImpl.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 119 insertions(+), 0 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java
index d03683d..8e6dcf0 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java
@@ -3,6 +3,19 @@
import com.alibaba.cloud.commons.lang.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+<<<<<<< Updated upstream
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
+import com.vci.ubcs.code.dto.CodeReferConfigDTO;
+import com.vci.ubcs.code.entity.*;
+import com.vci.ubcs.code.mapper.CodeReferConfigMapper;
+import com.vci.ubcs.code.service.ICodeReferConfigService;
+import com.vci.ubcs.code.service.ICodeShowFieldConfigService;
+import com.vci.ubcs.code.service.ICodeSrchCondConfigService;
+=======
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -19,9 +32,15 @@
import com.vci.ubcs.code.service.CodeReferConfigService;
import com.vci.ubcs.code.service.CodeShowFieldConfigService;
import com.vci.ubcs.code.service.CodeSrchCondConfigService;
+>>>>>>> Stashed changes
import com.vci.ubcs.code.vo.CodeReferConfigVO;
import com.vci.ubcs.code.wrapper.CodeClassifyProcessTempWrapper;
import com.vci.ubcs.code.wrapper.CodeReferConfigWraper;
+<<<<<<< Updated upstream
+import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
+import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
+=======
import com.vci.ubcs.code.wrapper.CodeShowFieldConfigWraper;
import com.vci.ubcs.code.wrapper.CodeSrchCondConfigWraper;
import com.vci.ubcs.starter.exception.VciBaseException;
@@ -30,24 +49,34 @@
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
+>>>>>>> Stashed changes
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
+<<<<<<< Updated upstream
+import org.springblade.core.tool.utils.Func;
+import org.springframework.cglib.beans.BeanMap;
+import org.springframework.stereotype.Service;
+=======
import org.springframework.cglib.beans.BeanMap;
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.Date;
import java.util.List;
import java.util.Map;
+<<<<<<< Updated upstream
+=======
import java.util.Objects;
+>>>>>>> Stashed changes
import static com.vci.ubcs.code.constant.FrameWorkLangCodeConstant.TS_NOT_PROCESS;
@@ -58,16 +87,27 @@
* @since 2023-05-19 17:48:02
*/
@Service("CodeReferconfigService")
+<<<<<<< Updated upstream
+public class CodeReferConfigServiceImpl extends MPJBaseServiceImpl<CodeReferConfigMapper,CodeReferConfig> implements ICodeReferConfigService {
+=======
public class CodeReferConfigServiceImpl extends MPJBaseServiceImpl<CodeReferConfigMapper,CodeReferConfig> implements CodeReferConfigService {
+>>>>>>> Stashed changes
@Resource
private CodeReferConfigMapper codeReferconfigMapper;
@Resource
+<<<<<<< Updated upstream
+ private ICodeShowFieldConfigService ICodeShowFieldConfigService;
+
+ @Resource
+ private ICodeSrchCondConfigService ICodeSrchCondConfigService;
+=======
private CodeShowFieldConfigService codeShowFieldConfigService;
@Resource
private CodeSrchCondConfigService codeSrchCondConfigService;
+>>>>>>> Stashed changes
/**
* 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
@@ -81,12 +121,27 @@
return CodeReferConfigWraper.build().entityVO(codeReferConfig);
}
+<<<<<<< Updated upstream
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param bladeQueryObject 绛涢�夋潯浠�
+ * @return 鏌ヨ缁撴灉
+ */
+=======
+>>>>>>> Stashed changes
@Override
public IPage<CodeReferConfigVO> queryByJoinPage(BladeQueryObject bladeQueryObject) {
CodeReferConfig codeReferConfig = new CodeReferConfig();
// 鏍规嵁绉熸埛杩涜鍖哄垎瀵瑰簲鐨勫弬鐓ч厤缃�
Map<String, Object> conditionMap = bladeQueryObject.getConditionMap();
+<<<<<<< Updated upstream
+ // 鏌ヨ鎵�灞炵鎴蜂笅鐨勫拰寮�鍚叏灞�鐨勫弬鐓ч厤缃俊鎭�
conditionMap.put("tenantId",AuthUtil.getTenantId());
+ conditionMap.put("isOpenGlobal","true");
+=======
+ conditionMap.put("tenantId",AuthUtil.getTenantId());
+>>>>>>> Stashed changes
BeanMap beanMap = BeanMap.create(codeReferConfig);
beanMap.putAll(conditionMap);
// 娣诲姞榛樿鎺掑簭瀛楁,鏍规嵁鏃堕棿杩涜鎺掑簭
@@ -96,12 +151,15 @@
return CodeReferConfigWraper.build().pageVO(codeReferConfigs);
}
+<<<<<<< Updated upstream
+=======
/**
* 鍒嗛〉鏌ヨ
*
* @param codeReferConfigVO 绛涢�夋潯浠�
* @return 鏌ヨ缁撴灉
*/
+>>>>>>> Stashed changes
@Override
public List<CodeReferConfigVO> queryByList(CodeReferConfigVO codeReferConfigVO) {
codeReferConfigVO.setTenantId(AuthUtil.getTenantId());
@@ -126,6 +184,27 @@
if (StringUtils.isBlank(codeReferConfigVO.getReferType())){
throw new VciBaseException("鍙傜収閰嶇疆涓嶈兘涓虹┖");
}
+<<<<<<< Updated upstream
+ // Long count = countCodeReferConfig(codeReferConfigVO);
+ // if(count > 0){
+ // throw new VciBaseException("宸插瓨鍦ㄧ浉鍚岀殑鍙傜収閰嶇疆");
+ // }
+ CodeReferConfig codeReferConfig = CodeReferConfigWraper.build().entityDO(codeReferConfigVO);
+ codeReferConfig.setOid(VciBaseUtil.getPk().toUpperCase());
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeReferConfig, MdmBtmTypeConstant.CODE_REFER_CONFIG);
+ codeReferConfig.setTenantId(AuthUtil.getTenantId());
+ boolean resInsertReferConfig = this.codeReferconfigMapper.insert(codeReferConfig) > 0;
+ if (!resInsertReferConfig) {
+ return R.fail("鏂板鍙傜収閰嶇疆澶辫触锛�");
+ }
+ // 涓婚敭鍥炲～
+ if(Func.isNotEmpty(codeReferConfig.getCodeShowFieldConfigs())){
+ ICodeShowFieldConfigService.insertBatch(codeReferConfigVO.getCodeShowFieldConfigVOS(),codeReferConfig.getOid());
+ }
+ if(Func.isNotEmpty(codeReferConfig.getCodeSrchCondConfigs())){
+ ICodeSrchCondConfigService.insertBatch(codeReferConfigVO.getCodeSrchCondConfigVOS(),codeReferConfig.getOid());
+ }
+=======
Long count = countCodeReferConfig(codeReferConfigVO);
if(count > 0){
throw new VciBaseException("宸插瓨鍦ㄧ浉鍚岀殑鍙傜収閰嶇疆");
@@ -138,6 +217,7 @@
}
codeShowFieldConfigService.insertBatch(codeReferConfigVO.getCodeShowFieldConfigVOS());
codeSrchCondConfigService.insertBatch(codeReferConfigVO.getCodeSrchCondConfigVOS());
+>>>>>>> Stashed changes
return R.data(codeReferConfigVO);
}
@@ -148,12 +228,26 @@
*/
private Long countCodeReferConfig(CodeReferConfigVO codeReferConfigVO) {
String templateName = codeReferConfigVO.getName();
+<<<<<<< Updated upstream
+ String templateId = codeReferConfigVO.getId();
+ if (StringUtils.isBlank(templateName) && StringUtils.isBlank(templateId)){
+ throw new VciBaseException("鍙傜収閰嶇疆缂栧彿鍜屽悕绉颁笉鑳戒负绌�");
+ }
+ LambdaQueryWrapper<CodeReferConfig> wrapper = Wrappers.<CodeReferConfig>query()
+ .lambda().eq(CodeReferConfig::getId, codeReferConfigVO.getId())
+ .eq(CodeReferConfig::getTenantId, codeReferConfigVO.getTenantId())
+ .or(true)
+ .eq(CodeReferConfig::getIsOpenGlobal,"true") // 鏌ヨ寮�鍚叏灞�鐨勫弬鐓ч厤缃�
+ .eq(CodeReferConfig::getId,templateId)
+ .eq(CodeReferConfig::getName,templateName);
+=======
if (StringUtils.isBlank(templateName)){
throw new VciBaseException("鍙傜収閰嶇疆鍚嶇О涓嶈兘涓虹┖");
}
LambdaQueryWrapper<CodeReferConfig> wrapper = Wrappers.<CodeReferConfig>query()
.lambda().eq(CodeReferConfig::getId, codeReferConfigVO.getId())
.eq(CodeReferConfig::getTenantId, codeReferConfigVO.getTenantId());
+>>>>>>> Stashed changes
Long count = codeReferconfigMapper.selectCount(wrapper);
return count;
}
@@ -165,6 +259,20 @@
private MPJLambdaWrapper<CodeReferConfig> getMPJLambdaWrapper(){
MPJLambdaWrapper<CodeReferConfig> mpjLambdaWrapper = new MPJLambdaWrapper<>(CodeReferConfig.class)
.selectAll(CodeReferConfig.class)
+<<<<<<< Updated upstream
+ // .select(CodeShowFieldConfig::getField
+ // ,CodeShowFieldConfig::getTitle
+ // ,CodeShowFieldConfig::getFieldType
+ // ,CodeShowFieldConfig::getSort
+ // ,CodeShowFieldConfig::getAttrSortField
+ // ,CodeShowFieldConfig::getWidth
+ // ,CodeShowFieldConfig::getFixedPosition
+ // ,CodeShowFieldConfig::getTemplet)
+ // .select(
+ // CodeSrchCondConfig::getFilterType,
+ // CodeSrchCondConfig::getFilterField,
+ // CodeSrchCondConfig::getFilterValue)
+=======
// .select(CodeShowFieldConfig::getField
// ,CodeShowFieldConfig::getTitle
// ,CodeShowFieldConfig::getFieldType
@@ -177,6 +285,7 @@
// CodeSrchCondConfig::getFilterType,
// CodeSrchCondConfig::getFilterField,
// CodeSrchCondConfig::getFilterValue)
+>>>>>>> Stashed changes
.selectCollection(CodeShowFieldConfig.class, CodeReferConfig::getCodeShowFieldConfigs)
.selectCollection(CodeSrchCondConfig.class, CodeReferConfig::getCodeSrchCondConfigs)
.leftJoin(CodeShowFieldConfig.class, CodeShowFieldConfig::getReferConfigOid,CodeReferConfig::getOid)
@@ -197,8 +306,13 @@
if (!resUpdateReferConfig) {
return R.fail("鍙傜収閰嶇疆淇敼澶辫触锛�");
}
+<<<<<<< Updated upstream
+ this.ICodeShowFieldConfigService.updateBatch(codeReferConfigVO.getCodeShowFieldConfigVOS());
+ this.ICodeSrchCondConfigService.updateBatch(codeReferConfigVO.getCodeSrchCondConfigVOS());
+=======
this.codeShowFieldConfigService.updateBatch(codeReferConfigVO.getCodeShowFieldConfigVOS());
this.codeSrchCondConfigService.updateBatch(codeReferConfigVO.getCodeSrchCondConfigVOS());
+>>>>>>> Stashed changes
return R.data(codeReferConfigVO);
}
@@ -222,8 +336,13 @@
if (!resDeleteReferConfig) {
return R.fail("鍙傜収閰嶇疆鍒犻櫎澶辫触锛�");
}
+<<<<<<< Updated upstream
+ this.ICodeShowFieldConfigService.deleteByReferConfigOid(codeReferConfigDTO.getOid());
+ this.ICodeSrchCondConfigService.deleteByReferConfigOid(codeReferConfigDTO.getOid());
+=======
this.codeShowFieldConfigService.deleteByReferConfigOid(codeReferConfigDTO.getOid());
this.codeSrchCondConfigService.deleteByReferConfigOid(codeReferConfigDTO.getOid());
+>>>>>>> Stashed changes
return R.status(resDeleteReferConfig);
}
--
Gitblit v1.9.3