FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' into FOTON

Browse Source
This commit is contained in:
zyd
2022-10-10 21:47:01 +08:00
parent af42065586 bd93dc1d44
commit 9793e7bb65
3 changed files with 62 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+44
View File
@@ -620,6 +620,50 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}
}
createStandAttrInfo(sarBussionessStandEO,true);
//此处需要增加根据技术体系更新菜单数据关联得操作，之前是在点编辑得时候处理，但是前端没有处理好
if(StringUtils.isNotBlank(sarBussionessStandEO.getSarStandAttrEOStr())){
String sarStandAttrEOStr = sarBussionessStandEO.getSarStandAttrEOStr();
Map<String,String> sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr);
if(sarStandAttrMap.containsKey("TXLBBUSS") && StringUtils.isNotBlank(sarStandAttrMap.get("TXLBBUSS"))){
QueryWrapper<SarBussStandMenu> menuQueryWrapper = new QueryWrapper<>();
menuQueryWrapper.eq("BUSS_STAND_ID",sarBussionessStandEO.getId());
// menuQueryWrapper.eq("MENU_ID",sarStandAttrMap.get("TXLBBUSS"));
menuQueryWrapper.eq("VALID_FLAG",0);
menuQueryWrapper.eq("TREE_TYPE","sarMs");
List<SarBussStandMenu> sarBussStandMenus = sarBussStandMenuEODao.selectList(menuQueryWrapper);
if(sarBussStandMenus !=null && !sarBussStandMenus.isEmpty()){
boolean upFlag = true;
List<String> delIds = new ArrayList<>();
for(SarBussStandMenu m: sarBussStandMenus){
if(StringUtils.equals(m.getMenuId(),sarStandAttrMap.get("TXLBBUSS"))){
upFlag= false;
}else{
delIds.add(m.getId());
}
}
if(upFlag){
SarBussStandMenu jsMenu = new SarBussStandMenu();
jsMenu.setMenuId(sarStandAttrMap.get("TXLBBUSS"));
jsMenu.setValidFlag(0);
jsMenu.setTreeType("sarMs");
jsMenu.setBussStandId(sarBussionessStandEO.getId());
jsMenu.setId(UUIDUtils.randomUUID(32));
sarBussStandMenuEODao.insert(jsMenu);
}
if(!delIds.isEmpty()){
sarBussStandMenuEODao.deleteBatchIds(delIds);
}
}else{
SarBussStandMenu jsMenu = new SarBussStandMenu();
jsMenu.setMenuId(sarStandAttrMap.get("TXLBBUSS"));
jsMenu.setValidFlag(0);
jsMenu.setTreeType("sarMs");
jsMenu.setBussStandId(sarBussionessStandEO.getId());
jsMenu.setId(UUIDUtils.randomUUID(32));
sarBussStandMenuEODao.insert(jsMenu);
}
}
}
//修改收藏分享编号名称
updateCollectAndShare(sarBussionessStandEO);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java
+3 -1
View File
@@ -113,7 +113,9 @@ public class SarModelTreeServiceImpl extends ServiceImpl<SarModelTreeDao, SarMod
@Transactional(rollbackFor = {RuntimeException.class,Exception.class})
@Override
public ResponseDto syncModelTreeDataToDB(String json){
logger.info("=========================接收模块单元数据===========================");
logger.info(json);
logger.info("=========================接收模块单元数据===========================");
String rootId = "10000";
String rootPID = "根节点";
doc/sql/20221010-补充表结构.sql
+15
View File
@@ -0,0 +1,15 @@
CREATE TABLE `sar_buss_stand_sn` (
`ID` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
`REVISE_STATUS` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '计划库制定状态 0 默认 buss1_1 技术标准 制定 buss2_1 产品标准 制定 ',
`STAND_SN` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企标顺序号',
`STAND_SORT` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企标类别',
`USE_STATUS` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'yes' COMMENT '企标编号使用状态 yes 已使用 no 未使用',
`VALID_FLAG` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '是否有效',
`MODIFY_TIME` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
`CREATION_TIME` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`TASK_ID` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
PRIMARY KEY (`ID`) USING BTREE,
INDEX `ID_index`(`ID`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '企业标准信息表-顺序号表' ROW_FORMAT = Dynamic;
SET FOREIGN_KEY_CHECKS = 1;