From 3cfe77db7df4961266321e5b78858e3dab382433 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 04 八月 2023 18:48:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index 1f12c5a..baaac38 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
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.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
@@ -139,6 +140,11 @@
if(codeClassifyList.size()!=0){
return R.fail("褰撳墠鍒嗙被涓嬩笉鍏佽鍒嗙被缂栧彿閲嶅锛岃妫�鏌ワ紒锛侊紒");
}
+ if(Func.isNotEmpty(codeClassifyEntity.getParentCodeClassifyOid())){
+ CodeClassify codeClassify = baseMapper.selectOne(Wrappers.<CodeClassify>query().lambda().eq(CodeClassify::getOid, codeClassifyEntity.getParentCodeClassifyOid()));
+ codeClassifyEntity.setBtmTypeId(codeClassify.getBtmTypeId());
+ codeClassifyEntity.setBtmTypeName(codeClassify.getBtmTypeName());
+ }
codeClassifyEntity.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
codeClassifyEntity.setCreateTime(new Date());
codeClassifyEntity.setTs(new Date());
@@ -230,13 +236,15 @@
// .selectOne(Condition.getQueryWrapper(condition,CodeClassify.class));
if(detail == null){//涓嶆槸鏈�鏂扮殑涓嶈鏀�
throw new ServiceException("褰撳墠鏁版嵁涓嶆槸鏈�鏂帮紝璇峰埛鏂板悗鍐嶄慨鏀癸紒");
-// return R.fail("褰撳墠鏁版嵁涓嶆槸鏈�鏂帮紝璇峰埛鏂板悗鍐嶄慨鏀癸紒");
}
//鏍￠獙涓嬬骇鏄惁鏈夊紩鐢�
if(checkChildIsLinked(detail.getOid())){
return R.fail("dataCascadeLinkedNotDelete");
}
- return R.data(checkHasChild(detail.getOid()));
+ if(checkHasChild(detail.getOid())){
+ return R.fail("姝ゆ暟鎹湁涓嬬骇锛屾棤娉曡繘琛屽垹闄わ紒");
+ }
+ return R.status(!checkHasChild(detail.getOid()));
}
/**
@@ -292,7 +300,7 @@
R result = checkIsCanDeleteForDO(codeClassify);
- //鍏堢畝绉版槸鍚︽湁鍏宠仈妯℃澘锛屾湁妯℃澘瑕佸厛鍒犻櫎
+ //鍏堟鏌ユ槸鍚︽湁鍏宠仈妯℃澘锛屾湁妯℃澘瑕佸厛鍒犻櫎
Map<String,Object> condition = new HashMap<>(2);
condition.put("codeClassifyOid",codeClassify.getOid());
List<CodeClassifyTemplate> codeClstemplateEntities = codeClassifyTemplateMapper.selectByMap(condition);
@@ -353,20 +361,32 @@
@Override
public R updateLcStatus(String oid, String lcStatus){
- //鏌ヨ淇敼鍓峵s
- CodeClassify codeClassify = codeClassifyMapper.selectById(oid);//涓昏鏄负浜嗘煡璇s
- codeClassify.setLcStatus(lcStatus);
- codeClassify.setTs(new Date());
- codeClassify.setLastModifyTime(new Date());
- codeClassify.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
+ List<CodeClassify> classifyList = codeClassifyMapper.selectStartWithCurrentOid(oid);
+ Date now = new Date();
+ String userId = String.valueOf(AuthUtil.getUserId());
+ classifyList = classifyList.stream().map(s -> {
+ s.setLcStatus(lcStatus);
+ s.setTs(now);
+ s.setLastModifier(userId);
+ s.setLastModifyTime(now);
+ return s;
+ }).collect(Collectors.toList());
+// //鏌ヨ淇敼鍓峵s
+// CodeClassify codeClassify = codeClassifyMapper.selectById(oid);//涓昏鏄负浜嗘煡璇s
+// codeClassify.setLcStatus(lcStatus);
+// codeClassify.setTs(new Date());
+// codeClassify.setLastModifyTime(new Date());
+// codeClassify.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
//鍚敤銆佸仠鐢�
// int u = codeClassifyMapper.updateLcStatus(oid,lcStatus);
- int count = codeClassifyMapper.updateById(codeClassify);
+// int count = codeClassifyMapper.updateById(codeClassify);
+ codeClassifyMapper.batchUpdateLcStatus(classifyList);
// //澶勭悊鏁版嵁闆嗘垚閫昏緫,鎴愬姛鍚庢墽琛岄泦鎴愮涓�姝�,鍒嗙被鏁版嵁鐗规畩澶勭悊銆�
// if(u!=0) {
// codeDuckingServiceI.insertCache1(lcStatus,lcStatus,DOCKING_DEFAULT_CLASSIFY, DOCKING_DEFAULT_CLASSIFYOID, oid, codeClassifyDO_old.getTs());
// }
- return R.data(SqlHelper.retBool(count));
+// return R.data(SqlHelper.retBool(count));
+ return R.success("");
}
/**
--
Gitblit v1.9.3