From 9e9435a15d12e364d0a910434de0568e11bb273c Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期四, 03 八月 2023 17:08:05 +0800
Subject: [PATCH] 1、处理lastr","firstr","lastv","firstv"字段在数据创建时为整形问题。 2、处理属性分组设置了一个属性，且配置表单中不显示。那么页面的表单应该不显示此分组。
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
index c8869c3..c19a4ca 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
@@ -2,7 +2,7 @@
import com.alibaba.cloud.commons.lang.StringUtils;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -17,9 +17,7 @@
import com.vci.ubcs.code.mapper.CodeFixedValueMapper;
import com.vci.ubcs.code.service.*;
import com.vci.ubcs.code.vo.CodeReferConfigVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
+import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.code.wrapper.CodeBasicSecWrapper;
import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.enums.EnumEnum;
@@ -29,7 +27,6 @@
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.UBCSCondition;
import com.vci.ubcs.starter.util.UBCSSqlKeyword;
-import com.vci.ubcs.starter.web.enumpck.NewAppConstantEnum;
import com.vci.ubcs.starter.web.enumpck.OsCodeFillTypeEnum;
import com.vci.ubcs.starter.web.pagemodel.*;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
@@ -38,13 +35,10 @@
import com.vci.ubcs.system.entity.DictBiz;
import com.vci.ubcs.system.feign.IDictBizClient;
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;
import org.springblade.core.tool.utils.Func;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -308,7 +302,7 @@
List<TableColVO> uiTableFieldVOs = new ArrayList<>();
// 蹇�熸煡璇㈠垪
List<TableColVO> queryColumns = new ArrayList<>();
- if(!codeReferConfig.getCodeShowFieldConfigVOS().isEmpty()){
+ if(!CollectionUtils.isEmpty(codeReferConfig.getCodeShowFieldConfigVOS())){
codeReferConfig.getCodeShowFieldConfigVOS().stream().forEach(showField ->{
TableColVO tableColVO = new TableColVO();
BeanUtil.copy(showField,tableColVO);
@@ -329,7 +323,7 @@
HashMap<String, String> whereMap = new HashMap<>();
if(!codeReferConfig.getCodeSrchCondConfigVOS().isEmpty()){
codeReferConfig.getCodeSrchCondConfigVOS().stream().forEach(srch->{
- whereMap.put(srch.getFilterField()+"_"+srch.getFilterType(),srch.getFilterValue());
+ whereMap.put(srch.getFilterField()+srch.getFilterType(),srch.getFilterValue());
});
}
uiFormReferVO.setWhere(whereMap);
@@ -544,7 +538,7 @@
return null;
}
conditionMap.put("secType",(CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue()));
- return refDataGridCodeBasicSec(query.setAscs("ordernum"),conditionMap);
+ return refDataGridCodeBasicSec(query.setAscs("orderNum"),conditionMap);
}
/**
@@ -758,21 +752,21 @@
return codeBasicSecDO;
}
-
/**
* 浣跨敤瑙勫垯鐨勪富閿幏鍙栧搴旂殑鐮佹鍐呭
*
- * @param conditionMap 瑙勫垯鐨勫唴瀹�
+ * @param ruleOid 瑙勫垯鐨勫唴瀹�
* @return 鐮佹鐨勫唴瀹�
*/
@Override
- public List<CodeBasicSecVO> listCodeBasicSecByRuleOid(Map<String,Object> conditionMap)throws ServiceException {
- if(Func.isBlank(conditionMap.getOrDefault("pkCodeRule","").toString())){
+ public List<CodeBasicSecVO> listCodeBasicSecByRuleOid(String ruleOid)throws ServiceException {
+ if(StringUtils.isBlank(ruleOid)){
return new ArrayList<>();
}
- QueryWrapper<CodeBasicSec> wrapper = UBCSCondition.getQueryWrapper(conditionMap, CodeBasicSec.class);
- wrapper.orderByAsc("orderNum");
- List<CodeBasicSec> secDOList = baseMapper.selectList(wrapper);//.selectByCondition(conditionMap, pageHelper);
+ LambdaQueryWrapper<CodeBasicSec> wrapper = Wrappers.<CodeBasicSec>query().lambda()
+ .eq(CodeBasicSec::getPkCodeRule, ruleOid)
+ .orderByAsc(CodeBasicSec::getOrderNum);
+ List<CodeBasicSec> secDOList = baseMapper.selectList(wrapper);//
return codeBasicSecDO2VOs(secDOList,true);
}
@@ -861,7 +855,10 @@
CodeBasicSec codeBasicSec = codeBasicSecMapper.selectOne(Wrappers.<CodeBasicSec>query().lambda()
.eq(CodeBasicSec::getOid, codeBasicSecDO.getParentClassifySecOid())
.eq(CodeBasicSec::getSecType, codeBasicSecDO.getSecType()));
- codeBasicSecVO.setParentClassifySecText(codeBasicSec.getName());
+ if(Func.isNotEmpty(codeBasicSec)){
+ codeBasicSecVO.setParentClassifySecOid(codeBasicSec.getOid());
+ codeBasicSecVO.setParentClassifySecText(codeBasicSec.getName());
+ }
}
//濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
if (true) {
@@ -870,4 +867,5 @@
}
return codeBasicSecVO;
}
+
}
--
Gitblit v1.9.3