From d8d0fd16af2f88cc7623b01493338c1f53b64e74 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 16 十一月 2023 08:51:13 +0800
Subject: [PATCH] 提交代码
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/Tree.java | 12 ------------
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java | 2 +-
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java | 7 +------
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyDTO.java | 10 +++++++++-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 22 +++++++++++++++++++---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java | 2 +-
6 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyDTO.java
index 7c494a1..3390a5d 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyDTO.java
@@ -72,7 +72,7 @@
/**
* 鏄惁鍙備笌鏍￠獙锛�0:涓嶅弬涓�;1:鍙備笌
*/
- private String isParticipateCheck;
+ private Integer isParticipateCheck;
public boolean getAblechildren() {
return ablechildren;
@@ -212,6 +212,14 @@
this.codeResembleRuleOidName = codeResembleRuleOidName;
}
+ public Integer getIsParticipateCheck() {
+ return isParticipateCheck;
+ }
+
+ public void setIsParticipateCheck(Integer isParticipateCheck) {
+ this.isParticipateCheck = isParticipateCheck;
+ }
+
@Override
public String toString() {
return "CodeClassifyDTO{" +
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java
index ddb7865..f882c6a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java
@@ -91,7 +91,7 @@
/**
* 鏄惁鍙備笌鏍￠獙锛�0:涓嶅弬涓�;1:鍙備笌
*/
- private String isParticipateCheck;
+ private Integer isParticipateCheck;
/**
* 鐩镐技椤规煡璇㈣鍒欏悕绉�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java
index 72c48c6..e872c29 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java
@@ -65,7 +65,7 @@
/**
* 鏄惁鍙備笌鏍￠獙锛�0:涓嶅弬涓�;1:鍙備笌
*/
- private String isParticipateCheck;
+ private Integer isParticipateCheck;
/**
* 灞傜骇鐨勮矾寰�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java
index 41279d6..e5bf696 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java
@@ -60,14 +60,9 @@
tree.setName((String) VciBaseUtil.getValueFromField("name", doObject));
// TODO:涓氬姟鏁版嵁鎬绘暟缁熻鏆傛椂娌″畬鍠�
String total = (String) VciBaseUtil.getValueFromField("total", doObject);
- String isParticipateCheck = (String) VciBaseUtil.getValueFromField("isParticipateCheck", doObject);
+ Integer isParticipateCheck = (Integer) VciBaseUtil.getValueFromField("isParticipateCheck", doObject);
if(Func.isNotEmpty(total)){
tree.setCount("銆�"+total+"銆�");
- }
- if(Func.isNotEmpty(isParticipateCheck)){
- tree.setIsParticipateCheck(isParticipateCheck);
- }else {
- tree.setIsParticipateCheck("1");
}
if (f != null) {
tree.setText((String)f.apply(doObject));
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/Tree.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/Tree.java
index 2fb7bfa..abaeb25 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/Tree.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/Tree.java
@@ -25,10 +25,6 @@
private String parentId;
private String parentName;
private String parentBtmName;
- /**
- * 鏄惁鍙備笌鏍￠獙锛�0:涓嶅弬涓�;1:鍙備笌
- */
- private String isParticipateCheck;
private boolean expanded = false;
private String href;
private String index;
@@ -248,14 +244,6 @@
}
}
- }
-
- public void setIsParticipateCheck(String isParticipateCheck) {
- this.isParticipateCheck = isParticipateCheck;
- }
-
- public String getIsParticipateCheck() {
- return isParticipateCheck;
}
@Override
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 062e7ef..8d69451 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.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -61,6 +62,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
@@ -179,6 +181,7 @@
* @return 鎵ц缁撴灉
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R editSave(CodeClassify codeClassifyEntity) {
if(codeClassifyEntity == null || codeClassifyEntity.getOid() == null){
return R.fail("浼犲叆鏁版嵁涓嶈兘涓虹┖锛�");
@@ -196,15 +199,28 @@
codeClassifyEntity.setLastModifier(String.valueOf(AuthUtil.getUser().getAccount()));
codeClassifyEntity.setLastModifyTime(new Date());
codeClassifyEntity.setTs(new Date());
- int insertNumber = codeClassifyMapper.updateById(codeClassifyEntity);
+ int updateEntity = codeClassifyMapper.updateById(codeClassifyEntity);
+ // 濡傛灉涓嶆槸鍙跺瓙缁撶偣锛屽垯闇�瑕佷慨鏀瑰叾涓嬫墍鏈夌殑瀛愬垎绫伙紝鏄惁鍙備笌鍏抽敭灞炴�ф牎楠岀殑鍊�
+ String oid = codeClassifyEntity.getOid();
+ List<CodeClassify> codeClassifies = codeClassifyMapper.selectStartWithCurrentOid(oid);
+ int updateAttr = 0;
+ // 涓嶄负绌哄氨闇�瑕佽褰撳墠鍒嗙被涓嬫墍鏈夊瓙鍒嗙被鐨刬sParticipateCheck
+ if(!codeClassifies.isEmpty()){
+ List<String> oids = codeClassifies.stream().map(CodeClassify::getOid).collect(Collectors.toList());
+ updateAttr = codeClassifyMapper.update(
+ null,
+ Wrappers.<CodeClassify>update()
+ .lambda().eq(CodeClassify::getOid, oids)
+ .set(CodeClassify::getIsParticipateCheck, codeClassifyEntity.getIsParticipateCheck())
+ );
+ }
// //澶勭悊鏁版嵁闆嗘垚閫昏緫,鎴愬姛鍚庢墽琛岄泦鎴愮涓�姝�,鍒嗙被鏁版嵁鐗规畩澶勭悊銆傚彧鏈夊惎鐢ㄧ姸鎬佺殑鍒嗙被鎵嶆帹閫�
// if(FRAMEWORK_DATA_ENABLED.equals(codeClassifyDO.getLcStatus()));
// {
// codeDuckingServiceI.insertCache1(CACHE_TYPE_CLASSIFY_EDIT,FRAMEWORK_DATA_ENABLED,DOCKING_DEFAULT_CLASSIFY, DOCKING_DEFAULT_CLASSIFYOID, codeClassifyDO.getOid(), codeClassifyDTO.getTs());
// }
- return R.status(SqlHelper.retBool(insertNumber));
-// return BaseResult.success(codeClassifyDO2VO(codeClassifyDO));
+ return R.status(SqlHelper.retBool(updateAttr) & SqlHelper.retBool(updateEntity));
}
/**
--
Gitblit v1.9.3