From b46cf401da847d7cca6269c6b2ffb04f6f72691a Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 14 五月 2023 03:57:37 +0800
Subject: [PATCH] 新增应用码段下的参照配置界面，以及代码整合
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java | 39 ++++++---------------------------------
1 files changed, 6 insertions(+), 33 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java
index e9e329e..0edf541 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java
@@ -1,13 +1,11 @@
package com.vci.ubcs.code.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
import com.vci.ubcs.code.dto.CodeFixedValueDTO;
-import com.vci.ubcs.code.entity.CodeClassifyProcessTemp;
import com.vci.ubcs.code.entity.CodeFixedValue;
import com.vci.ubcs.code.mapper.CodeFixedValueMapper;
import com.vci.ubcs.code.service.ICodeFixedValueService;
@@ -15,6 +13,7 @@
import com.vci.ubcs.code.wrapper.CodeFixedValueWrapper;
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.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.slf4j.Logger;
@@ -33,7 +32,8 @@
import java.util.*;
import java.util.stream.Collectors;
-import static com.vci.ubcs.code.constant.FrameWorkLangCodeConstant.*;
+import static com.vci.ubcs.code.constant.FrameWorkLangCodeConstant.DATA_LINKED_NOT_DELETE;
+import static com.vci.ubcs.code.constant.FrameWorkLangCodeConstant.DATA_OID_NOT_EXIST;
/**
* 鍥哄畾鐮佹鐨勭爜鍊兼湇鍔�
@@ -85,15 +85,7 @@
CodeFixedValue codeFixedValueDO = new CodeFixedValue();
BeanUtilForVCI.copyPropertiesIgnoreCase(codeFixedValueDTO,codeFixedValueDO);
//濉厖涓�浜涢粯璁ゅ��
- codeFixedValueDO.setOid(VciBaseUtil.getPk());
- codeFixedValueDO.setRevisionOid(VciBaseUtil.getPk());
- codeFixedValueDO.setNameOid(VciBaseUtil.getPk());
- codeFixedValueDO.setBtmname(MdmBtmTypeConstant.CODE_FIXED_VALUE);
- codeFixedValueDO.setCreateTime(new Date());
- codeFixedValueDO.setCreator(AuthUtil.getUserId().toString());
- codeFixedValueDO.setLastModifier(AuthUtil.getUserId().toString());
- codeFixedValueDO.setLastModifyTime(new Date());
- codeFixedValueDO.setTs(new Date());
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeFixedValueDO,MdmBtmTypeConstant.CODE_FIXED_VALUE);
Long count = this.codeFixedValueMapper.selectCount(Wrappers.<CodeFixedValue>query()
.lambda().eq(CodeFixedValue::getCodeFixedSecOid, codeFixedValueDO.getCodeFixedSecOid())
)+1L;
@@ -116,9 +108,7 @@
CodeFixedValue codeFixedValueDO = selectByOid(codeFixedValueDTO.getOid());
revisionModelUtil.copyFromDTOIgnore(codeFixedValueDTO,codeFixedValueDO);
//濉厖涓�浜涢粯璁ゅ��
- codeFixedValueDO.setLastModifier(AuthUtil.getUserId().toString());
- codeFixedValueDO.setLastModifyTime(new Date());
- codeFixedValueDO.setTs(new Date());
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeFixedValueDO);
boolean resBoolean = codeFixedValueMapper.updateById(codeFixedValueDO) > 0;
return resBoolean;
}
@@ -130,28 +120,12 @@
* @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
*/
private R checkIsCanDeleteForDO(CodeFixedValueDTO codeFixedValueDTO, CodeFixedValue codeFixedValueDO) {
- if(!checkTs(codeFixedValueDTO,codeFixedValueDO)) {
- return R.fail(TS_NOT_PROCESS);
- }
+ //boService.checkTs(codeFixedValueDTO);
if(!checkIsLinked(codeFixedValueDO.getOid())) {
return R.status(true);
}else{
return R.fail(DATA_LINKED_NOT_DELETE);
}
- }
-
- /**
- * 妫�鏌s
- * @param tempDO
- * @return
- */
- private boolean checkTs(CodeFixedValueDTO tempDO,CodeFixedValue codeFixedValueDO){
- Date dbTs = codeFixedValueDO.getTs();
- Date currentTs = tempDO.getTs();
- if(currentTs == null ? dbTs == null:currentTs.compareTo(dbTs)==0){
- return true;
- }
- return false;
}
/**
@@ -340,6 +314,5 @@
boolean resBoolean = codeFixedValueMapper.deleteBatchIds(doList.stream().map(CodeFixedValue::getOid).collect(Collectors.toList())) > 0;
return resBoolean;
}
-
}
--
Gitblit v1.9.3