From 0714f23728e28e601ccd96f83f9bc75b26cc8421 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 16 六月 2023 21:34:28 +0800
Subject: [PATCH] 代码整合
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
index e363a31..169e728 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
@@ -131,9 +131,11 @@
MPJLambdaWrapper<CodeBasicSec> mpjLambdaWrapper = new MPJLambdaWrapper<>(CodeBasicSec.class, CodeTableNameEnum.PL_CODE_BASICSEC.getText())
.selectAll(CodeBasicSec.class)
.selectAs(CodeClassify::getName, CodeBasicSec::getReferCodeClassifyOidName)
- .leftJoin(CodeClassify.class,CodeTableNameEnum.PL_CODE_CLASSIFY.getText(), CodeClassify::getOid, CodeBasicSec::getReferCodeClassifyOid);
+ .leftJoin(CodeClassify.class, CodeTableNameEnum.PL_CODE_CLASSIFY.getText(), CodeClassify::getOid, CodeBasicSec::getReferCodeClassifyOid)
+ .leftJoin(CodeBasicSec.class,CodeTableNameEnum.PL_CODE_BASICSEC.getText()+1,CodeBasicSec::getOid,CodeBasicSec::getParentClassifySecOid
+ ,ext->ext.selectAs(CodeBasicSec::getName,CodeBasicSec::getParentClassifySecText));
// 娣诲姞where鏉′欢
- UBCSSqlKeyword.buildCondition(conditionMap,mpjLambdaWrapper);
+ UBCSSqlKeyword.buildConditionByAs(conditionMap,mpjLambdaWrapper,CodeTableNameEnum.PL_CODE_BASICSEC.getText());
IPage<CodeBasicSec> codeBasicSecIPage = codeBasicSecMapper.selectPage(UBCSCondition.getPage(query), mpjLambdaWrapper);
return CodeBasicSecWrapper.build().pageVO(codeBasicSecIPage);
}
@@ -508,20 +510,23 @@
}
List<CodeBasicSec> createList = new ArrayList<>();
List<CodeBasicSec> basicSecDOS = codeBasicSecMapper.selectBatchIds(oidList);
+ if(basicSecDOS.isEmpty()){
+ return R.fail("鍏嬮殕鐨勭爜娈典俊鎭笉瀛樺湪锛�");
+ }
basicSecDOS.forEach(sec -> {
CodeBasicSec newSecDO = new CodeBasicSec();
BeanUtilForVCI.copyPropertiesIgnoreCase(sec,newSecDO);
- newSecDO.setOid("");
- newSecDO.setNameOid("");
- newSecDO.setRevisionOid("");
+ newSecDO.setOid(VciBaseUtil.getPk());
+ newSecDO.setNameOid(VciBaseUtil.getPk());
+ newSecDO.setRevisionOid(VciBaseUtil.getPk());
newSecDO.setId(newSecDO.getId() + "_copy");
newSecDO.setName(newSecDO.getName() + "_copy");
newSecDO.setPkCodeRule(pkCodeRule);
createList.add(newSecDO);
});
- boolean b = saveBatch(createList);
+ boolean resBoolean = saveBatch(createList);
//codeBasicSecMapper.insertBatch(createList);
- return R.data(b,"鍏嬮殕鐮佹淇℃伅鎴愬姛");
+ return resBoolean ? R.data(resBoolean,"鍏嬮殕鐮佹淇℃伅鎴愬姛"):R.fail("鍏嬮殕鐮佹淇℃伅澶辫触锛�");
}
/**
--
Gitblit v1.9.3