Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
@@ -919,7 +919,7 @@ }, // 监听父组件传的窗口显示隐藏的值 isShowReferConfigForm (){ if(this.isShowReferConfigForm){ if(this.isShowReferConfigForm && this.codeShowFieldConfigVOS.length <= 0){ this.onloadAttrData(); } } Source/UBCS/service-stop.sh
@@ -2,7 +2,7 @@ stop(){ #定义容器和镜像的名称 imagesName=vci-ubcs/ubcs- imagesName=vci-ubcs/ubcs-auth #定义服务名称 containerName=ubcs-auth #如果存在，就关闭并且删除该容器 @@ -17,17 +17,6 @@ imagesName=vci-ubcs/ubcs-admin containerName=ubcs-admin if [[ -n $(docker ps -q -f "name=$containerName") ]];then echo $containerName" is up,we will stop and remove it !!!" docker stop $containerName docker rm $containerName docker rmi $imagesName else echo $containerName" is not up!!!" fi imagesName=vci-ubcs/ubcs-auth containerName=ubcs-auth if [[ -n $(docker ps -q -f "name=$containerName") ]];then echo $containerName" is up,we will stop and remove it !!!" docker stop $containerName @@ -70,16 +59,16 @@ echo $containerName" is not up!!!" fi imagesName=vci-ubcs/ubcs-develop containerName=ubcs-develop if [[ -n $(docker ps -q -f "name=$containerName") ]];then echo $containerName" is up,we will stop and remove it !!!" docker stop $containerName docker rm $containerName docker rmi $imagesName else echo $containerName" is not up!!!" fi # imagesName=vci-ubcs/ubcs-develop # containerName=ubcs-develop # if [[ -n $(docker ps -q -f "name=$containerName") ]];then # echo $containerName" is up,we will stop and remove it !!!" # docker stop $containerName # docker rm $containerName # docker rmi $imagesName # else # echo $containerName" is not up!!!" # fi imagesName=vci-ubcs/ubcs-jobadmin containerName=ubcs-jobadmin @@ -125,16 +114,16 @@ echo $containerName" is not up!!!" fi imagesName=vci-ubcs/ubcs-swagger containerName=ubcs-swagger if [[ -n $(docker ps -q -f "name=$containerName") ]];then echo $containerName" is up,we will stop and remove it !!!" docker stop $containerName docker rm $containerName docker rmi $imagesName else echo $containerName" is not up!!!" fi # imagesName=vci-ubcs/ubcs-swagger # containerName=ubcs-swagger # if [[ -n $(docker ps -q -f "name=$containerName") ]];then # echo $containerName" is up,we will stop and remove it !!!" # docker stop $containerName # docker rm $containerName # docker rmi $imagesName # else # echo $containerName" is not up!!!" # fi imagesName=vci-ubcs/ubcs-system containerName=ubcs-system Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java
@@ -34,6 +34,8 @@ import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springframework.util.CollectionUtils; @@ -42,6 +44,7 @@ import javax.validation.Valid; import java.util.Collection; import java.util.List; import java.util.Map; /** * 编码库定义-模板属性 控制器 @@ -140,7 +143,12 @@ if(baseQueryObject == null){ baseQueryObject = new BaseQueryObject(); } return CodeClstempattrService.gridCodeClassifyTemplateAttr(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper()); String tenantId = AuthUtil.getTenantId().toString(); Map<String, String> conditionMap = baseQueryObject.getConditionMap(); if(Func.isNotEmpty(tenantId)){ conditionMap.put("TENANT_ID",tenantId); } return CodeClstempattrService.gridCodeClassifyTemplateAttr(conditionMap,baseQueryObject.getPageHelper()); } /** Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java
@@ -229,6 +229,7 @@ public List<Tree> referTree(TreeQueryObject treeQueryObject) { return plCodeClstemplateService.referTree(treeQueryObject); } /** * 增加 分类模板对象 * @param codeClassifyTemplateDTO 分类模板对象数据传输对象 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
@@ -32,19 +32,12 @@ */ List<CodeClassify> selectByWrapper(Wrapper wrapper); /** * 使用查询封装器来查询 * @param wrapper 查询封装器 * @return 数据对象 */ List<String> select1(Wrapper wrapper); /** * 自定义分页 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO; @@ -139,6 +140,11 @@ if(codeClassifyList.size()!=0){ return R.fail("当前分类下不允许分类编号重复，请检查！！！"); } if(Func.isNotEmpty(codeClassifyEntity.getParentCodeClassifyOid())){ CodeClassify codeClassify = baseMapper.selectOne(Wrappers.<CodeClassify>query().lambda().eq(CodeClassify::getOid, codeClassifyEntity.getParentCodeClassifyOid())); codeClassifyEntity.setBtmTypeId(codeClassify.getBtmTypeId()); codeClassifyEntity.setBtmTypeName(codeClassify.getBtmTypeName()); } codeClassifyEntity.setCreator(String.valueOf(AuthUtil.getUser().getUserId())); codeClassifyEntity.setCreateTime(new Date()); codeClassifyEntity.setTs(new Date()); @@ -236,7 +242,7 @@ if(checkChildIsLinked(detail.getOid())){ return R.fail("dataCascadeLinkedNotDelete"); } return R.data(checkHasChild(detail.getOid())); return R.status(!checkHasChild(detail.getOid())); } /** @@ -292,7 +298,7 @@ R result = checkIsCanDeleteForDO(codeClassify); //先简称是否有关联模板，有模板要先删除 //先检查是否有关联模板，有模板要先删除 Map<String,Object> condition = new HashMap<>(2); condition.put("codeClassifyOid",codeClassify.getOid()); List<CodeClassifyTemplate> codeClstemplateEntities = codeClassifyTemplateMapper.selectByMap(condition); Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
@@ -41,6 +41,7 @@ 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.Func; import org.springframework.beans.BeanUtils; @@ -455,7 +456,10 @@ if(!CollectionUtils.isEmpty(oids)){ this.removeBatchByIds(oids); } String tenantId = AuthUtil.getTenantId().toString(); codeClassifyTemplateAttrDOInsert.parallelStream().forEach(item->{ item.setTenantId(tenantId); }); //再新增 if(!CollectionUtils.isEmpty(codeClassifyTemplateAttrDOInsert)){ this.saveBatch(codeClassifyTemplateAttrDOInsert); @@ -736,6 +740,7 @@ // queryWrapper.addQueryMap("CLASSIFYTEMPLATEOID",templateAttrOid); Map<String,Object> condition = new HashMap<>(1); condition.put("CLASSIFYTEMPLATEOID",templateAttrOid); List<CodeClassifyTemplateAttr> codeClassifyTemplateAttrDOList = baseMapper.selectByMap(condition); List<String> btmIds = new ArrayList<String>(); @@ -745,7 +750,6 @@ //过滤掉已经存在的属性 List<BtmTypeAttributeVO> boAttrss = new ArrayList<BtmTypeAttributeVO>(); for (BtmTypeAttributeVO osBtmTypeAttributeVO:btmTypeVOR.getData().getAttributes()){ if(!btmIds.contains(osBtmTypeAttributeVO.getId())){ //看看是不是有模糊查询 @@ -761,6 +765,8 @@ } } } // 按照id升序排序 boAttrss = boAttrss.stream().sorted(Comparator.comparing(BtmTypeAttributeVO::getId)).collect(Collectors.toList()); dataGrid.setData(boAttrss); dataGrid.setTotal(boAttrss.size()); return dataGrid; Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
@@ -898,11 +898,11 @@ //所有分类都没有业务类型，返回提示 if(codeClassifyDOList.size()==0){ return R.fail("添加模板添加失败,分类和上级分类都没有关联业务类型！"); return R.fail(DATA_OID_NOT_EXIST); } //设置btmtypeid和name CodeClassify codeClassifyDO = codeClassifyDOList.get(0); CodeClassify codeClassifyDO = codeClassifyDOList.stream().filter(s -> StringUtils.isNotBlank(s.getBtmTypeId())).findFirst().get(); codeClassifyTemplateDO.setBtmTypeId(codeClassifyDO.getBtmTypeId()); codeClassifyTemplateDO.setNameOid(VciBaseUtil.getPk()); codeClassifyTemplateDO.setBtmTypeName(codeClassifyDO.getBtmTypeName());
