From d1e3a87aad6f737394b33852d9496d673472ddbe Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期二, 16 五月 2023 18:19:17 +0800
Subject: [PATCH] 主要完成修改Class统一命名，与老平台命名一致，删除多余VOClass等。
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
index dd76b88..26b1d8d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
@@ -6,13 +6,13 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
import com.vci.ubcs.code.dto.CodeClassifyProcessTempDTO;
import com.vci.ubcs.code.entity.CodeClassifyProcessTemp;
import com.vci.ubcs.code.mapper.CodeClassifyProcessTempMapper;
import com.vci.ubcs.code.service.ICodeClassifyProcessTempService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyProcessTempVO;
import com.vci.ubcs.code.wrapper.CodeClassifyProcessTempWrapper;
-import com.vci.ubcs.common.utils.PageDO2PageVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
@@ -30,8 +30,8 @@
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
-import java.sql.Wrapper;
import java.util.*;
+import java.util.stream.Collectors;
import static com.vci.ubcs.code.constant.FrameWorkLangCodeConstant.*;
@@ -67,7 +67,7 @@
public IPage<CodeClassifyProcessTempVO> gridCodeClassifyProcessTemp(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException {
Query query = new Query();
if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
+ //pageHelper = new PageHelper(-1);
query.setSize(-1);
}else {
query.setSize(pageHelper.getLimit());
@@ -78,14 +78,12 @@
BeanMap beanMap = BeanMap.create(codeClassifyProcessTemp);
beanMap.putAll(conditionMap);
IPage<CodeClassifyProcessTemp> doList = codeClassifyProcessTempMapper.selectPage(Condition.getPage(query), Condition.getQueryWrapper(codeClassifyProcessTemp));
- IPage<CodeClassifyProcessTempVO> pageList = new Page<CodeClassifyProcessTempVO>();
+ IPage<CodeClassifyProcessTempVO> voList = new Page<>();
//DataGrid<CodeClassifyProcessTempVO> dataGrid=new DataGrid<>();
if (!CollectionUtils.isEmpty(doList.getRecords())) {
- pageList.setRecords(CodeClassifyProcessTempWrapper.build().listVO(doList.getRecords()));
- //鍒嗛〉鍙傛暟杞埌pageVO瀵硅薄
- pageList = PageDO2PageVO.pageDO2PageVO(doList,pageList);
+ voList = CodeClassifyProcessTempWrapper.build().pageVO(doList);
}
- return pageList;
+ return voList;
}
/**
@@ -145,7 +143,7 @@
//灏咲TO杞崲涓篋O
CodeClassifyProcessTemp codeClassifyProcessTempDO = new CodeClassifyProcessTemp();
BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyProcessTempDTO,codeClassifyProcessTempDO);
- codeClassifyProcessTempDO = DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyProcessTempDO,"codeclsflowtemp");
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyProcessTempDO, MdmBtmTypeConstant.CODE_CLASSIFY_PROCESS_TEMPLATE);
codeClassifyProcessTempMapper.insert(codeClassifyProcessTempDO);
//鍥犱负涓氬姟绫诲瀷鏈韩娌℃湁鎺у埗鐗堟湰锛屾墍鏈夊己鍒剁粰鐗堟湰revisionValue璁剧疆鍊硷紝骞冲彴涔熶細鍙樻垚绌恒�傘�傘�傘��
//鐗堟湰鍙蜂笉鑳戒娇鐢ㄩ粯璁ょ殑灞炴��
@@ -165,7 +163,7 @@
//灏咲TO杞崲涓篋O
CodeClassifyProcessTemp codeClassifyProcessTempDO = selectByOid(codeClassifyProcessTempDTO.getOid());
revisionModelUtil.copyFromDTOIgnore(codeClassifyProcessTempDTO,codeClassifyProcessTempDO);
- codeClassifyProcessTempDO = DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeClassifyProcessTempDO);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeClassifyProcessTempDO);
codeClassifyProcessTempMapper.updateById(codeClassifyProcessTempDO);
return CodeClassifyProcessTempWrapper.build().entityVO(codeClassifyProcessTempDO);
}
@@ -310,8 +308,7 @@
private boolean checkTs(CodeClassifyProcessTemp tempDO, CodeClassifyProcessTemp codeClassifyProcessTempDO){
Date dbTs = codeClassifyProcessTempDO.getTs();
Date currentTs = tempDO.getTs();
- int i = currentTs.compareTo(dbTs);
- if(i==0){
+ if(currentTs == null ? dbTs == null:currentTs.compareTo(dbTs)==0){
return true;
}
return false;
@@ -360,4 +357,25 @@
return count;
}
+ /**
+ * 妯℃澘鍒犻櫎鐨勬椂鍊欒Е鍙�
+ *
+ * @param classifyTemplateOid 妯℃澘鐨勪富閿�
+ * @return 鍙楀奖鍝嶇殑鍐呭
+ */
+ @Override
+ public int codeTemplateDeleteTrigger(String classifyTemplateOid) {
+ int updateCount = 0;
+ if(com.alibaba.nacos.api.utils.StringUtils.isBlank(classifyTemplateOid)){
+ Map<String,Object> conditionMap = new HashMap<>();
+ conditionMap.put("classifyTemplateOid",classifyTemplateOid);
+ List<CodeClassifyProcessTemp> codeClsflowtempEntities = baseMapper.selectByMap(conditionMap);
+ if(!CollectionUtils.isEmpty(codeClsflowtempEntities)){
+ updateCount += baseMapper.deleteBatchIds(codeClsflowtempEntities.stream()
+ .map(CodeClassifyProcessTemp::getOid).collect(Collectors.toList()));
+ }
+ }
+ return updateCount;
+ }
+
}
--
Gitblit v1.9.3