From b40cd8c94978d43f9d13ba9ee93a4164b68a8165 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 05 十二月 2023 16:11:51 +0800
Subject: [PATCH] 赋默认值工具类修改，根据多线程流情况修改
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 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 1a3647e..f23efaf 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,19 +6,16 @@
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.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.core.JsonParser;
-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;
+import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import com.vci.ubcs.starter.web.util.BeanUtil;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
@@ -33,12 +30,11 @@
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
-import java.sql.Wrapper;
-import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
import static com.vci.ubcs.code.constant.FrameWorkLangCodeConstant.*;
-import static com.vci.ubcs.code.constant.MdmBtmTypeConstant.CODE_CLASSIFY_PROCESS_TEMPLATE;
+import static jodd.util.StringUtil.isBlank;
/**
* 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎湇鍔℃帴鍙�
@@ -83,12 +79,10 @@
BeanMap beanMap = BeanMap.create(codeClassifyProcessTemp);
beanMap.putAll(conditionMap);
IPage<CodeClassifyProcessTemp> doList = codeClassifyProcessTempMapper.selectPage(Condition.getPage(query), Condition.getQueryWrapper(codeClassifyProcessTemp));
- IPage<CodeClassifyProcessTempVO> voList = new Page<CodeClassifyProcessTempVO>();
+ IPage<CodeClassifyProcessTempVO> voList = new Page<>();
//DataGrid<CodeClassifyProcessTempVO> dataGrid=new DataGrid<>();
if (!CollectionUtils.isEmpty(doList.getRecords())) {
- voList.setRecords(CodeClassifyProcessTempWrapper.build().listVO(doList.getRecords()));
- //鍒嗛〉鍙傛暟杞埌pageVO瀵硅薄
- voList = PageDO2PageVO.pageDO2PageVO(doList,voList);
+ voList = CodeClassifyProcessTempWrapper.build().pageVO(doList);
}
return voList;
}
@@ -150,7 +144,7 @@
//灏咲TO杞崲涓篋O
CodeClassifyProcessTemp codeClassifyProcessTempDO = new CodeClassifyProcessTemp();
BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyProcessTempDTO,codeClassifyProcessTempDO);
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyProcessTempDO, MdmBtmTypeConstant.CODE_CLASSIFY_PROCESS_TEMPLATE);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyProcessTempDO, MdmBtmTypeConstant.CODE_CLASSIFY_PROCESS_TEMPLATE,null);
codeClassifyProcessTempMapper.insert(codeClassifyProcessTempDO);
//鍥犱负涓氬姟绫诲瀷鏈韩娌℃湁鎺у埗鐗堟湰锛屾墍鏈夊己鍒剁粰鐗堟湰revisionValue璁剧疆鍊硷紝骞冲彴涔熶細鍙樻垚绌恒�傘�傘�傘��
//鐗堟湰鍙蜂笉鑳戒娇鐢ㄩ粯璁ょ殑灞炴��
@@ -170,7 +164,7 @@
//灏咲TO杞崲涓篋O
CodeClassifyProcessTemp codeClassifyProcessTempDO = selectByOid(codeClassifyProcessTempDTO.getOid());
revisionModelUtil.copyFromDTOIgnore(codeClassifyProcessTempDTO,codeClassifyProcessTempDO);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeClassifyProcessTempDO);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeClassifyProcessTempDO,null);
codeClassifyProcessTempMapper.updateById(codeClassifyProcessTempDO);
return CodeClassifyProcessTempWrapper.build().entityVO(codeClassifyProcessTempDO);
}
@@ -331,6 +325,7 @@
return false;
}
+
/**
* 涓婚敭鏌ヨ鏁版嵁瀵硅薄
* @param oid 涓婚敭
@@ -364,4 +359,25 @@
return count;
}
+ /**
+ * 妯℃澘鍒犻櫎鐨勬椂鍊欒Е鍙�
+ *
+ * @param classifyTemplateOid 妯℃澘鐨勪富閿�
+ * @return 鍙楀奖鍝嶇殑鍐呭
+ */
+ @Override
+ public int codeTemplateDeleteTrigger(String classifyTemplateOid) {
+ int updateCount = 0;
+ if(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