From 10c2ee4be4508c62b5980cc7059b1e8e95f7a3cc Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 04 七月 2023 17:22:11 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java | 82 +++++++++++++++++++++++-----------------
1 files changed, 47 insertions(+), 35 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
index ba39071..ba96f1b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
@@ -45,7 +45,6 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cglib.beans.BeanMap;
import org.springframework.context.annotation.Lazy;
@@ -87,10 +86,10 @@
@Autowired(required = false)
private CodeTempphaseServiceImpl codeTempphaseServiceImpl;
@Autowired(required = false)
- private CodeTempbuttonServiceImpl codeTempbuttonServiceImpl;
+ private CodeClassifyTemplateButtonServiceImpl codeTempbuttonServiceImpl;
@Autowired(required = false)
private ICodeClassifyProcessTempService codeClsflowtempServiceImpl;
-// @Autowired(required = false)
+ // @Autowired(required = false)
// private CodeClsflowtempMapper codeClsflowtempMapper;
@Autowired(required = false)
private CodeTemplatePhaseMapper codeTempphaseMapper;
@@ -494,34 +493,34 @@
// ClientBusinessObject clientBusinessObject_template_insert = null;
// try {
// clientBusinessObject_template_insert = clientBusinessObjectOperation.reviseBusinessObject(clientBusinessObject_template, "");
- codeCls_template_insert.setOid(VciBaseUtil.getPk());
- codeCls_template_insert.setRevisionOid(VciBaseUtil.getPk());
- codeCls_template_insert.setNameOid(codeCls_template.getNameOid());
- codeCls_template_insert.setBtmname(codeCls_template.getBtmname());
- codeCls_template_insert.setLastR(String.valueOf(1));
- codeCls_template_insert.setFirstR(String.valueOf(0));
- codeCls_template_insert.setFirstV(String.valueOf(1));
- codeCls_template_insert.setLastV(String.valueOf(1));
- codeCls_template_insert.setCreator(AuthUtil.getUser().getUserName());
- codeCls_template_insert.setCreateTime(new Date());
- codeCls_template_insert.setLastModifier(AuthUtil.getUser().getUserName());
- codeCls_template_insert.setLastModifyTime(new Date());
- codeCls_template_insert.setRevisionRule(codeCls_template.getRevisionRule());
- codeCls_template_insert.setVersionRule(codeCls_template.getVersionRule());
- Map rvObj = baseMapper.getNextRevision(codeCls_template.getNameOid());
- codeCls_template_insert.setRevisionSeq(Integer.parseInt(rvObj.get("REVISIONSEQ").toString()));
- codeCls_template_insert.setRevisionValue(rvObj.get("REVISIONVAL").toString());
+ codeCls_template_insert.setOid(VciBaseUtil.getPk());
+ codeCls_template_insert.setRevisionOid(VciBaseUtil.getPk());
+ codeCls_template_insert.setNameOid(codeCls_template.getNameOid());
+ codeCls_template_insert.setBtmname(codeCls_template.getBtmname());
+ codeCls_template_insert.setLastR(String.valueOf(1));
+ codeCls_template_insert.setFirstR(String.valueOf(0));
+ codeCls_template_insert.setFirstV(String.valueOf(1));
+ codeCls_template_insert.setLastV(String.valueOf(1));
+ codeCls_template_insert.setCreator(AuthUtil.getUser().getUserName());
+ codeCls_template_insert.setCreateTime(new Date());
+ codeCls_template_insert.setLastModifier(AuthUtil.getUser().getUserName());
+ codeCls_template_insert.setLastModifyTime(new Date());
+ codeCls_template_insert.setRevisionRule(codeCls_template.getRevisionRule());
+ codeCls_template_insert.setVersionRule(codeCls_template.getVersionRule());
+ Map rvObj = baseMapper.getNextRevision(codeCls_template.getNameOid());
+ codeCls_template_insert.setRevisionSeq(Integer.parseInt(rvObj.get("REVISIONSEQ").toString()));
+ codeCls_template_insert.setRevisionValue(rvObj.get("REVISIONVAL").toString());
// VersionValueObject versionObj = this.getVersionValue(item.verRuleName);
- codeCls_template_insert.setVersionSeq(Integer.parseInt(rvObj.get("VERSIONSEQ").toString()));
- codeCls_template_insert.setVersionValue(rvObj.get("VERSIONVAL").toString());
- codeCls_template_insert.setLctid(codeCls_template.getLctid());
- codeCls_template_insert.setLcStatus("Editing");
- codeCls_template_insert.setId(codeCls_template.getId());
- codeCls_template_insert.setName(codeCls_template.getName());
- codeCls_template_insert.setDescription(codeCls_template.getDescription());
- codeCls_template_insert.setOwner(AuthUtil.getUser().getUserName());
+ codeCls_template_insert.setVersionSeq(Integer.parseInt(rvObj.get("VERSIONSEQ").toString()));
+ codeCls_template_insert.setVersionValue(rvObj.get("VERSIONVAL").toString());
+ codeCls_template_insert.setLctid(codeCls_template.getLctid());
+ codeCls_template_insert.setLcStatus("Editing");
+ codeCls_template_insert.setId(codeCls_template.getId());
+ codeCls_template_insert.setName(codeCls_template.getName());
+ codeCls_template_insert.setDescription(codeCls_template.getDescription());
+ codeCls_template_insert.setOwner(AuthUtil.getUser().getUserName());
// codeCls_template_insert.setCheckinBy(userName);
- codeCls_template_insert.setCopyFromVersion(codeCls_template.getOid());
+ codeCls_template_insert.setCopyFromVersion(codeCls_template.getOid());
// }catch (VCIError e){
// e.printStackTrace();
// logger.error("===============>鍒嗙被妯℃澘-鍗囩増澶嶅埗鍑洪敊oid锛� "+templateOldOid+",mes"+e.error_message);
@@ -649,7 +648,10 @@
codeClassifyTemplateDO_old.setDescription(codeClassifyDTO.getDescription());//鎻忚堪
codeClassifyTemplateDO_old.setCodeClassifyOid(codeClassifyOid);//鍒嗙被oid
codeClassifyTemplateDO_old.setOid(newOid);
- List<CodeClassifyTemplate> codeClassifyTemplateDOList = new ArrayList<CodeClassifyTemplate>();
+ codeClassifyTemplateDO_old.setTs(new Date());
+ codeClassifyTemplateDO_old.setCreateTime(new Date());
+ codeClassifyTemplateDO_old.setLastModifyTime(new Date());
+ List<CodeClassifyTemplate> codeClassifyTemplateDOList = new ArrayList<>();
codeClassifyTemplateDOList.add(codeClassifyTemplateDO_old);
//澶嶅埗妯℃澘灞炴��
@@ -856,6 +858,7 @@
* @return 鏄剧ず瀵硅薄
* @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
+ @Override
public DataGrid<CodeClassifyTemplateVO> gridCodeClassifyTemplate(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException {
DataGrid<CodeClassifyTemplateVO> dataGrid=new DataGrid<CodeClassifyTemplateVO>();
//娌℃湁浼犲垎绫籭d锛屼笉鎵ц鏌ヨ閫昏緫锛岀洿鎺ヨ繑鍥�
@@ -875,9 +878,11 @@
CodeClassifyTemplate codeClstemplateQuery = new CodeClassifyTemplate();
// BeanUtil.toBean(map,codeClstempattrVO);
// BeanUtil
- BeanMap beanMap = BeanMap.create(codeClstemplateQuery);
+ CodeClassifyTemplateDTO codeClassifyTemplateDTO = new CodeClassifyTemplateDTO();
+ BeanMap beanMap = BeanMap.create(codeClassifyTemplateDTO);
beanMap.putAll(conditionMap);
// BeanUtils.copyProperties(codeClstemplateVO,codeClstemplateQuery);
+ BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateDTO,codeClstemplateQuery);
if (pageHelper == null) {
pageHelper = new PageHelper(-1);
}
@@ -915,6 +920,13 @@
@Override
public R<CodeClassifyTemplateVO> addSave(CodeClassifyTemplateDTO codeClassifyTemplateDTO) throws VciBaseException{
VciBaseUtil.alertNotNull(codeClassifyTemplateDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
+
+ QueryWrapper<CodeClassifyTemplate> wrapper = new QueryWrapper<>();
+ wrapper.eq("CODECLASSIFYOID",codeClassifyTemplateDTO.getCodeclassifyoid());
+ Long aLong = baseMapper.selectCount(wrapper);
+ if(aLong > 0){
+ return R.fail("璇ュ垎绫讳笅宸叉湁瀛愭ā鐗堬紝鏃犳硶鏂板锛屼粎鑳借繘琛屽崌鐗堟搷浣滐紒");
+ }
//灏咲TO杞崲涓篋O
CodeClassifyTemplate codeClassifyTemplateDO = new CodeClassifyTemplate();
BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateDTO,codeClassifyTemplateDO);
@@ -933,7 +945,7 @@
codeClassifyTemplateDO.setBtmTypeName(codeClassifyDO.getBtmTypeName());
codeClassifyTemplateDO.setLcStatus(FRAMEWORK_RELEASE_EDITING);
codeClassifyTemplateDO.setTs(new Date());
- codeClassifyTemplateDO.setOwner(AuthUtil.getUser().getUserName());
+ codeClassifyTemplateDO.setOwner(String.valueOf(AuthUtil.getUser().getUserId()));
codeClassifyTemplateDO.setLctid("codeClsTempLc");
codeClassifyTemplateDO.setVersionValue("1");
codeClassifyTemplateDO.setVersionSeq(1);
@@ -942,8 +954,8 @@
codeClassifyTemplateDO.setVersionRule("0");
codeClassifyTemplateDO.setRevisionRule("numberversionrule");
codeClassifyTemplateDO.setLastModifyTime(new Date());
- codeClassifyTemplateDO.setLastModifier(AuthUtil.getUser().getUserName());
- codeClassifyTemplateDO.setCreator(AuthUtil.getUser().getUserName());
+ codeClassifyTemplateDO.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
+ codeClassifyTemplateDO.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
codeClassifyTemplateDO.setCreateTime(new Date());
codeClassifyTemplateDO.setLastV("1");
codeClassifyTemplateDO.setLastR("1");
@@ -1039,7 +1051,7 @@
// condition.put("ts",codeClassifyTemplateDOCopyFromDTO.getTs());
CodeClassifyTemplate detail = baseMapper
.selectById(codeClassifyTemplateDOCopyFromDTO.getOid());
- // boolean tsBoolean = boService.checkTs(codeClassifyTemplateAttrDOListemplateDOCopyFromDTO);
+ // boolean tsBoolean = boService.checkTs(codeClassifyTemplateAttrDOListemplateDOCopyFromDTO);
if(detail.getTs().compareTo(codeClassifyTemplateDOCopyFromDTO.getTs()) != 0){//涓嶆槸鏈�鏂扮殑涓嶈鏀�
return R.fail("褰撳墠鏁版嵁涓嶆槸鏈�鏂帮紝璇峰埛鏂板悗鍐嶄慨鏀癸紒");
}
--
Gitblit v1.9.3