From cd415f25be13972e275b27985e7502fffa6de317 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 07 七月 2023 15:45:47 +0800
Subject: [PATCH] 1、解决升版、停用、启用等功能
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java | 4 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java | 94 +++++++++++-----------------------------------
2 files changed, 25 insertions(+), 73 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java
index 6972315..c3de44d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java
@@ -245,7 +245,7 @@
* @return
*/
@PostMapping( "/enableData")
- public R enable( CodeClassifyTemplateDTO codeClstemplateDTO) {
+ public R enable(@RequestBody CodeClassifyTemplateDTO codeClstemplateDTO) {
return plCodeClstemplateService.updateLcStatus(codeClstemplateDTO.getOid(), CodeClassifyTemplateLC.RELEASED.getValue());
}
@@ -255,7 +255,7 @@
* @return
*/
@PostMapping( "/disableData")
- public R disableData( CodeClassifyTemplateDTO codeClassifyDTO) {
+ public R disableData(@RequestBody CodeClassifyTemplateDTO codeClassifyDTO) {
return plCodeClstemplateService.updateLcStatus(codeClassifyDTO.getOid(),CodeClassifyTemplateLC.DISABLED.getValue());
}
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 ba96f1b..9b73f3e 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
@@ -487,30 +487,30 @@
}
//闇�瑕佹柊澧炵殑鍗囩骇妯℃澘
-// ClientBusinessObject clientBusinessObject_template = boService.selectCBOByOid(codeClassifyDTO.getOid(), "codeclstemplate");
CodeClassifyTemplate codeCls_template = baseMapper.selectById(templateOldOid);
CodeClassifyTemplate codeCls_template_insert = new CodeClassifyTemplate();
-// 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.setFirstR(String.valueOf(1));
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.setTs(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());
+ codeCls_template_insert.setBtmTypeId(codeCls_template.getBtmTypeId());
+ codeCls_template_insert.setBtmTypeName(codeCls_template.getBtmTypeName());
+ codeCls_template_insert.setCodeClassifyOid(codeCls_template.getCodeClassifyOid());
+ codeCls_template_insert.setCodeClassifyOidName(codeCls_template.getCodeClassifyOidName());
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());
@@ -519,35 +519,18 @@
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());
-// }catch (VCIError e){
-// e.printStackTrace();
-// logger.error("===============>鍒嗙被妯℃澘-鍗囩増澶嶅埗鍑洪敊oid锛� "+templateOldOid+",mes"+e.error_message);
-// return BaseResult.error("鍗囩増鍑洪敊");
-// }
int insertCount = baseMapper.insert(codeCls_template_insert);
-// CodeClstemplateEntity codeClassifyTemplateDO = new CodeClstemplateEntity();
-// BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyDTO,codeClassifyTemplateDO);
-// WebUtil.copyValueToObjectFromCbos(clientBusinessObject_template_insert,codeClassifyTemplateDO);
- //modify by weidy@2022-2-27
- //鍗囩増鍚庝笉鑳戒娇鐢╥nsert鏂规硶锛屽洜涓洪偅涓案杩滄槸鏂板涓�鏉℃暟鎹紝
- //涓婃柟鍏堜粠dto杞粰do锛岀劧鍚庢妸鍗囩増鐨勫垵濮嬪寲鐨勫睘鎬ф嫹璐濈粰do锛屾渶鍚庡啀浠巇o鎷疯礉鍒癱bo涓�
-// WebUtil.copyValueToCboFromObj(clientBusinessObject_template_insert,codeClassifyTemplateDO);
//鍗囩増杩囧悗鐨勬ā鏉縪id
String templateNewOid = codeCls_template_insert.getOid();
//闇�瑕佸鍒剁殑妯℃澘灞炴��
//鏌ヨ鑰佹ā鏉夸笅杈圭殑鎵�鏈夊睘鎬э紝璧嬪�兼柊妯℃澘oid
-// VciQueryWrapperForDO codeClassifyTemplateAttrQuery = new VciQueryWrapperForDO(CodeClassifyTemplateAttrDO.class);
-// codeClassifyTemplateAttrQuery.addQueryMap("classifyTemplateOid",templateOldOid);
Map<String,Object> condition = new HashMap<>(1);
condition.put("classifyTemplateOid",templateOldOid);
List<CodeClassifyTemplateAttr> codeClstempattrEntities = codeClstempattrMapper.selectByMap(condition);
-// List<CodeClassifyTemplateAttrDO> codeClassifyTemplateAttrDOList = codeClassifyTemplateAttrDaoI.selectByWrapper(codeClassifyTemplateAttrQuery);
for (CodeClassifyTemplateAttr codeClassifyTemplateAttrDO :codeClstempattrEntities){
-// String attrOid = VciBaseUtil.getPk();
- codeClassifyTemplateAttrDO.setOid(null);
+ codeClassifyTemplateAttrDO.setOid(VciBaseUtil.getPk());
codeClassifyTemplateAttrDO.setClassifyTemplateOid(templateNewOid);
codeClstempattrMapper.insert(codeClassifyTemplateAttrDO);
}
@@ -563,54 +546,23 @@
//澶嶅埗妯℃澘鎸夐挳
List<CodeClassifyTemplateButton> codeClassifyTemplateButtonDOList = copyTemplateButton(templateOldOid,templateNewOid);
- //涓�璧蜂繚瀛樻暟鎹�
-// WebUtil.setPersistence(false);//涓嶆墽琛屼繚瀛�
- //淇濆瓨妯℃澘鈥斺��
-// BatchCBO batchCBOTemplate = new BatchCBO();
- //batchCBO淇濆瓨鐨勬椂鍊欐病鏈夎兘澶熻嚜鍔╱pdate婧愭暟鎹殑isLastR
- //batchCBOTemplate.getCreateCbos().add(clientBusinessObject_template_insert);
- //浣跨敤saveRevisionBuisnessObject鍙互瑙ｅ喅杩欎釜闂锛岃繖閲屽厛鏆傛椂鎵ц涓ゆ淇濆瓨
-// try {
-// clientBusinessObjectOperation.saveRevisionBuinessObject(clientBusinessObject_template_insert);
-// } catch (VCIError vciError) {
-// throw new VciBaseException("鍗囩増淇濆瓨鍑洪敊浜�",new String[0],vciError);
-// }
- // end --modify by lihang @20220408
- //codeClassifyTemplateMapper.insert(codeClassifyTemplateDO);
- //淇濆瓨妯℃澘灞炴��
-// if(!CollectionUtils.isEmpty(codeClassifyTemplateAttrDOList)){
-// BatchCBO batchCBOTemplateAttr = codeClassifyTemplateAttrDaoI.batchInsert(codeClassifyTemplateAttrDOList);
-// batchCBOTemplate.copyFromOther(batchCBOTemplateAttr);
-// }
-//
-// //淇濆瓨妯℃澘娴佺▼
-// if(!CollectionUtils.isEmpty(codeClassifyProcessTempDOList)) {
-// BatchCBO batchCBOTemplateProcessAttr = codeClassifyProcessTempDaoI.batchInsert(codeClassifyProcessTempDOList);
-// batchCBOTemplate.copyFromOther(batchCBOTemplateProcessAttr);
-// }
-// //妯℃澘闃舵
-// if(!CollectionUtils.isEmpty(codeClassifyPhaseDOList)) {
-// BatchCBO batchCBOTemplatePhaseAttr = codeTemplatePhaseDaoI.batchInsert(codeClassifyPhaseDOList);
-// batchCBOTemplate.copyFromOther(batchCBOTemplatePhaseAttr);
-// }
-//
-// //妯℃澘闃舵灞炴��
-// if(!CollectionUtils.isEmpty(codePhaseAttrDOList)) {
-// BatchCBO batchCBOTemplatePhaseAttrAttr = codePhaseAttrDaoI.batchInsert(codePhaseAttrDOList);
-// batchCBOTemplate.copyFromOther(batchCBOTemplatePhaseAttrAttr);
-// }
-//
-// //妯℃澘鎸夐挳
-// if(!CollectionUtils.isEmpty(codeClassifyTemplateButtonDOList)) {
-// BatchCBO batchCBOTemplateButtonAttr = codeClassifyTemplateButtonDaoI.batchInsert(codeClassifyTemplateButtonDOList);
-// batchCBOTemplate.copyFromOther(batchCBOTemplateButtonAttr);
-// }
-//
-// WebUtil.setPersistence(true);//鎵ц淇濆瓨
-//
-// boService.persistenceBatch(batchCBOTemplate);//涓�璧锋墽琛屼繚瀛�
+ //淇濆瓨妯℃澘娴佺▼
+ if(!CollectionUtils.isEmpty(codeClassifyProcessTempDOList)) {
+ codeClsflowtempServiceImpl.saveBatch(codeClassifyProcessTempDOList);
+ }
+ //妯℃澘闃舵
+ if(!CollectionUtils.isEmpty(codeClassifyPhaseDOList)) {
+ codeTempphaseServiceImpl.saveBatch(codeClassifyPhaseDOList);
+ }
-// return BaseResult.success("鍗囩増鎴愬姛锛�");
+ //妯℃澘闃舵灞炴��
+ if(!CollectionUtils.isEmpty(codePhaseAttrDOList)) {
+ codePhaseattrServiceImpl.saveBatch(codePhaseAttrDOList);
+ }
+// //妯℃澘鎸夐挳
+ if(!CollectionUtils.isEmpty(codeClassifyTemplateButtonDOList)) {
+ codeTempbuttonServiceImpl.saveBatch(codeClassifyTemplateButtonDOList);
+ }
return R.success("鍗囩増鎴愬姛锛�");
}
--
Gitblit v1.9.3