From 549ecbf13b14a4deb74e42828abcd46ccb68a7c0 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 09 五月 2023 17:18:07 +0800
Subject: [PATCH] 前端代码提交
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java | 46 +++++++++++++++++++++-------------------------
1 files changed, 21 insertions(+), 25 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 f8f8a53..dd76b88 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
@@ -2,29 +2,24 @@
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.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.dto.CodeClassifyProcessTempDTO;
-import com.vci.ubcs.code.entity.CodeClassify;
import com.vci.ubcs.code.entity.CodeClassifyProcessTemp;
-import com.vci.ubcs.code.mapper.CodeClassifyMapper;
import com.vci.ubcs.code.mapper.CodeClassifyProcessTempMapper;
-import com.vci.ubcs.code.mapper.CodeClassifyTemplateAttrMapper;
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.web.pagemodel.DataGrid;
+import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import com.vci.ubcs.starter.web.util.BeanUtil;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.starter.web.wrapper.VciQueryWrapperForDO;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -86,7 +81,7 @@
IPage<CodeClassifyProcessTempVO> pageList = new Page<CodeClassifyProcessTempVO>();
//DataGrid<CodeClassifyProcessTempVO> dataGrid=new DataGrid<>();
if (!CollectionUtils.isEmpty(doList.getRecords())) {
- pageList.setRecords(codeClassifyProcessTempDO2VOs(doList.getRecords()));
+ pageList.setRecords(CodeClassifyProcessTempWrapper.build().listVO(doList.getRecords()));
//鍒嗛〉鍙傛暟杞埌pageVO瀵硅薄
pageList = PageDO2PageVO.pageDO2PageVO(doList,pageList);
}
@@ -139,8 +134,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
public CodeClassifyProcessTempVO addSave(CodeClassifyProcessTempDTO codeClassifyProcessTempDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyProcessTempDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄",codeClassifyProcessTempDTO.getProcessVersion(),"娴佺▼妯℃澘鐨勭増鏈彿",codeClassifyProcessTempDTO.getCodeprocessuse(),"妯℃澘娴佺▼鐨勭敤閫�");
- if (StringUtils.isBlank(codeClassifyProcessTempDTO.getCodeprocessuse())){
+ VciBaseUtil.alertNotNull(codeClassifyProcessTempDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄",codeClassifyProcessTempDTO.getProcessVersion(),"娴佺▼妯℃澘鐨勭増鏈彿",codeClassifyProcessTempDTO.getCodeProcessUse(),"妯℃澘娴佺▼鐨勭敤閫�");
+ if (StringUtils.isBlank(codeClassifyProcessTempDTO.getCodeProcessUse())){
throw new VciBaseException("妯℃澘娴佺▼鐢ㄩ�斾笉鑳戒负绌�");
}
Long count = countProcessTemplate(codeClassifyProcessTempDTO);
@@ -150,10 +145,11 @@
//灏咲TO杞崲涓篋O
CodeClassifyProcessTemp codeClassifyProcessTempDO = new CodeClassifyProcessTemp();
BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyProcessTempDTO,codeClassifyProcessTempDO);
+ codeClassifyProcessTempDO = DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyProcessTempDO,"codeclsflowtemp");
codeClassifyProcessTempMapper.insert(codeClassifyProcessTempDO);
//鍥犱负涓氬姟绫诲瀷鏈韩娌℃湁鎺у埗鐗堟湰锛屾墍鏈夊己鍒剁粰鐗堟湰revisionValue璁剧疆鍊硷紝骞冲彴涔熶細鍙樻垚绌恒�傘�傘�傘��
//鐗堟湰鍙蜂笉鑳戒娇鐢ㄩ粯璁ょ殑灞炴��
- return codeClassifyProcessTempDO2VO(codeClassifyProcessTempDO);
+ return CodeClassifyProcessTempWrapper.build().entityVO(codeClassifyProcessTempDO);
}
/**
@@ -169,8 +165,9 @@
//灏咲TO杞崲涓篋O
CodeClassifyProcessTemp codeClassifyProcessTempDO = selectByOid(codeClassifyProcessTempDTO.getOid());
revisionModelUtil.copyFromDTOIgnore(codeClassifyProcessTempDTO,codeClassifyProcessTempDO);
+ codeClassifyProcessTempDO = DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeClassifyProcessTempDO);
codeClassifyProcessTempMapper.updateById(codeClassifyProcessTempDO);
- return codeClassifyProcessTempDO2VO(codeClassifyProcessTempDO);
+ return CodeClassifyProcessTempWrapper.build().entityVO(codeClassifyProcessTempDO);
}
/**
@@ -185,7 +182,7 @@
VciBaseUtil.alertNotNull(codeClassifyProcessTempDTO,"鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎暟鎹璞�",codeClassifyProcessTempDTO.getOid(),"鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉跨殑涓婚敭");
CodeClassifyProcessTemp codeClassifyProcessTempDO = selectByOid(codeClassifyProcessTempDTO.getOid());
R baseResult = checkIsCanDeleteForDO(codeClassifyProcessTempDTO,codeClassifyProcessTempDO);
- if(!baseResult.isSuccess()) {
+ if(baseResult.isSuccess()) {
}else{
return baseResult;
}
@@ -202,7 +199,7 @@
*/
@Override
public CodeClassifyProcessTempVO getObjectByOid(String oid) throws VciBaseException{
- return codeClassifyProcessTempDO2VO(selectByOid(oid));
+ return CodeClassifyProcessTempWrapper.build().entityVO((selectByOid(oid)));
}
/**
@@ -215,7 +212,7 @@
public Collection<CodeClassifyProcessTempVO> listCodeClassifyProcessTempByOids(Collection<String> oidCollections) throws VciBaseException{
VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
List<CodeClassifyProcessTemp> codeClassifyProcessTempDOList = listCodeClassifyProcessTempDOByOidCollections(oidCollections);
- return codeClassifyProcessTempDO2VOs(codeClassifyProcessTempDOList);
+ return CodeClassifyProcessTempWrapper.build().listVO(codeClassifyProcessTempDOList);
}
/**
@@ -252,7 +249,7 @@
LambdaQueryWrapper<CodeClassifyProcessTemp> wrapper = Wrappers.<CodeClassifyProcessTemp>query()
.lambda().eq(CodeClassifyProcessTemp::getClassifyTemplateOid, codeTemplateOid)
.eq(CodeClassifyProcessTemp::getCodeProcessUse, processUse);
- return codeClassifyProcessTempDO2VOs(codeClassifyProcessTempMapper.selectList(wrapper));
+ return CodeClassifyProcessTempWrapper.build().listVO(codeClassifyProcessTempMapper.selectList(wrapper));
}
/**
@@ -263,7 +260,7 @@
@Override
public List<CodeClassifyProcessTempVO> selectByWrapper(LambdaQueryWrapper<CodeClassifyProcessTemp> queryWrapper) {
List<CodeClassifyProcessTemp> codeClassifyProcessTempDOList= codeClassifyProcessTempMapper.selectList(queryWrapper);
- return codeClassifyProcessTempDO2VOs(codeClassifyProcessTempDOList);
+ return CodeClassifyProcessTempWrapper.build().listVO(codeClassifyProcessTempDOList);
}
/**
@@ -295,7 +292,7 @@
private R checkIsCanDeleteForDO(CodeClassifyProcessTempDTO codeClassifyProcessTempDTO, CodeClassifyProcessTemp codeClassifyProcessTempDO) {
CodeClassifyProcessTemp tempDO = new CodeClassifyProcessTemp();
BeanUtil.convert(codeClassifyProcessTempDTO,tempDO);
- if (!checkTs(tempDO)) {
+ if (!checkTs(tempDO,codeClassifyProcessTempDO)) {
return R.fail(TS_NOT_PROCESS);
}
if(!checkIsLinked(codeClassifyProcessTempDO.getOid())) {
@@ -310,12 +307,11 @@
* @param tempDO
* @return
*/
- private boolean checkTs(CodeClassifyProcessTemp tempDO){
- LambdaQueryWrapper<CodeClassifyProcessTemp> wrapper = Wrappers.<CodeClassifyProcessTemp>query()
- .lambda().eq(CodeClassifyProcessTemp::getOid,tempDO.getOid()).select(CodeClassifyProcessTemp::getTs);
- long dbTs = codeClassifyProcessTempMapper.selectById(wrapper).getTs().getTime();
- long currentTs = tempDO.getTs().getTime();
- if(dbTs == currentTs){
+ private boolean checkTs(CodeClassifyProcessTemp tempDO, CodeClassifyProcessTemp codeClassifyProcessTempDO){
+ Date dbTs = codeClassifyProcessTempDO.getTs();
+ Date currentTs = tempDO.getTs();
+ int i = currentTs.compareTo(dbTs);
+ if(i==0){
return true;
}
return false;
@@ -357,7 +353,7 @@
throw new VciBaseException("妯℃澘娴佺▼鍚嶇О涓嶈兘涓虹┖");
}
LambdaQueryWrapper<CodeClassifyProcessTemp> wrapper = Wrappers.<CodeClassifyProcessTemp>query()
- .lambda().eq(CodeClassifyProcessTemp::getCodeProcessUse, codeClassifyProcessTempDTO.getCodeprocessuse())
+ .lambda().eq(CodeClassifyProcessTemp::getCodeProcessUse, codeClassifyProcessTempDTO.getCodeProcessUse())
.eq(CodeClassifyProcessTemp::getClassifyTemplateOid, codeClassifyProcessTempDTO.getClassifyTemplateOid())
.eq(CodeClassifyProcessTemp::getId, codeClassifyProcessTempDTO.getId());
Long count = codeClassifyProcessTempMapper.selectCount(wrapper);
--
Gitblit v1.9.3