From bf74d819239bb136f72ddc92129ecdbabbc38fa7 Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期五, 04 八月 2023 18:44:16 +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/CodeClassifyServiceImpl.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 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 6f1dbdf..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
@@ -236,11 +236,13 @@
// .selectOne(Condition.getQueryWrapper(condition,CodeClassify.class));
if(detail == null){//涓嶆槸鏈�鏂扮殑涓嶈鏀�
throw new ServiceException("褰撳墠鏁版嵁涓嶆槸鏈�鏂帮紝璇峰埛鏂板悗鍐嶄慨鏀癸紒");
-// return R.fail("褰撳墠鏁版嵁涓嶆槸鏈�鏂帮紝璇峰埛鏂板悗鍐嶄慨鏀癸紒");
}
//鏍￠獙涓嬬骇鏄惁鏈夊紩鐢�
if(checkChildIsLinked(detail.getOid())){
return R.fail("dataCascadeLinkedNotDelete");
+ }
+ if(checkHasChild(detail.getOid())){
+ return R.fail("姝ゆ暟鎹湁涓嬬骇锛屾棤娉曡繘琛屽垹闄わ紒");
}
return R.status(!checkHasChild(detail.getOid()));
}
@@ -359,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