From 0503632c55fe32f358b8b9b7afeedf37faf4f495 Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期四, 15 六月 2023 16:43:46 +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/CodeRuleServiceImpl.java | 55 +++++++++++++++++++++++++------------------------------
1 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
index 31d235c..1a35355 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
@@ -17,10 +17,14 @@
package com.vci.ubcs.code.service.impl;
import com.alibaba.cloud.commons.lang.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
import com.vci.ubcs.code.dto.CodeBasicSecDTO;
import com.vci.ubcs.code.dto.CodeRuleDTO;
import com.vci.ubcs.code.entity.*;
@@ -38,10 +42,16 @@
import com.vci.ubcs.code.wrapper.CodeRuleWrapper;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
+import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
+import com.vci.ubcs.starter.util.UBCSCondition;
+import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.KeyValue;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.starter.web.util.WebUtil;
+import org.springblade.core.log.exception.ServiceException;
+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;
@@ -94,15 +104,17 @@
@Resource
private RevisionModelUtil revisionModelUtil;
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @param conidtionMap
+ * @return
+ */
@Override
- public IPage<CodeRuleVO> gridCodeRule(IPage<CodeRuleVO> page, CodeRuleVO codeRule) {
- //瀵圭敓鍛藉懆鏈熺殑鏋氫妇杩涜杞崲
- if(!StringUtils.isEmpty(codeRule.getLcStatusText())){
- codeRule.setLcStatus(CodeRuleLC.getValueByText(codeRule.getLcStatusText()));
- }
- List<CodeRule> codeRulePage = codeRuleMapper.selectCodeRulePage(page, codeRule);
+ public IPage<CodeRuleVO> gridCodeRule(Query query, Map<String,Object> conidtionMap) {
+ IPage<CodeRule> codeRuleIPage = this.codeRuleMapper.selectPage(Condition.getPage(query), UBCSCondition.getQueryWrapper(conidtionMap, CodeRule.class));
//do杞瑅o鍚屾椂setLcStatusText鐢熷懡鍛ㄦ湡鍊硷紝骞跺寘瑁呮垚鍒嗛〉瀵硅薄杩斿洖
- return page.setRecords(CodeRuleWrapper.build().listVO(codeRulePage));
+ return CodeRuleWrapper.build().pageVO(codeRuleIPage);
}
/**
@@ -118,26 +130,9 @@
//灏咲TO杞崲涓篋O
CodeRule codeRule = Objects.requireNonNull(BeanUtil.copy(codeRuleDTO, CodeRule.class));
String userId = AuthUtil.getUserId().toString();
- codeRule.setOid(VciBaseUtil.getPk());
-
- codeRule.setRevisionOid(VciBaseUtil.getPk());
- codeRule.setNameOid(VciBaseUtil.getPk());
- codeRule.setBtmname("coderule");
- codeRule.setLastR("1");
- codeRule.setLastV("1");
- codeRule.setFirstR("1");
- codeRule.setFirstV("1");
- codeRule.setCreator(userId);
- codeRule.setCreateTime(new Date());
- codeRule.setLastModifier("1");
- codeRule.setLastModifyTime(new Date());
- codeRule.setVersionRule("0");
- codeRule.setVersionSeq(1);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRule, MdmBtmTypeConstant.CODE_RULE);
codeRule.setLctid(CODE_RULE_LC);
codeRule.setLcStatus(FRAMEWORK_RELEASE_EDITING);
- codeRule.setOwner("1");
- codeRule.setCreator(userId);
- codeRule.setLastModifier(userId);
return codeRuleMapper.insert(codeRule)>0;
}
@@ -171,6 +166,7 @@
//灏咲TO杞崲涓篋O
CodeRule codeRule = selectByOid(codeRuleDTO.getOid());
revisionModelUtil.copyFromDTOIgnore(codeRuleDTO, codeRule);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeRule);
return codeRuleMapper.updateById(codeRule)>0;
}
@@ -292,7 +288,7 @@
*/
@Override
public Collection<CodeClassifyVO> listUseRangeInCodeClassify(String oid) {
- List<CodeClassify> codeClassifies = codeClassifyServcie.selectByWrapper(Wrappers.<CodeClassify>query().eq("codeRuleOid", oid));
+ List<CodeClassify> codeClassifies = codeClassifyServcie.selectByWrapper(Wrappers.<CodeClassify>query().lambda().eq(CodeClassify::getCodeRuleOid, oid));
return CodeClassifyWrapper.build().listVO(codeClassifies);
}
@@ -346,14 +342,13 @@
/**
* 鍙傜収涓绘暟鎹紪鐮佽鍒欏垪琛�
*
- * @param codeRule 鏌ヨ鏉′欢
- * @param page 鍒嗛〉鍜屾帓搴�
+ * @param bladeQueryObject 鏌ヨ鏉′欢
* @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
* @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
@Override
- public IPage<CodeRuleVO> refDataGridCodeRule(IPage<CodeRuleVO> page, CodeRuleVO codeRule) throws VciBaseException {
- return gridCodeRule(page, codeRule);
+ public IPage<CodeRuleVO> refDataGridCodeRule(BladeQueryObject bladeQueryObject) throws VciBaseException {
+ return gridCodeRule(bladeQueryObject.getQuery(), bladeQueryObject.getConditionMap());
}
/**
--
Gitblit v1.9.3