Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue
@@ -84,7 +84,6 @@ echoReferConfig(content){ this.$emit('setReferConfigValue', content) // 触åupdate:dataå°åç»ä»¶å¼ä¼ éç»ç¶ç»ä»¶ }, }, } </script> Source/UBCS-WEB/src/enumpack/CodeSecTypeEnum.js
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,24 @@ // å®ä¹æä¸¾ç±» const CodeSecTypeEnum = { STATUS: { codefixedsec: 'åºå®ç 段', codevariablesec: 'å¯åç æ®µ', codedatesec: 'æ¥æç æ®µ', codeclassifysec: 'åç±»ç æ®µ', codeattrsec: '屿§ç 段', codeserialsec: 'æµæ°´ç 段', codelevelsec: 'å±çº§ç 段', coderefersec: 'å¼ç¨ç 段', }, getTextByValue(key) { const status = CodeSecTypeEnum.STATUS; for (let prop in status) { if (status.hasOwnProperty(prop) && prop === key) { return status[prop]; } } } }; export default CodeSecTypeEnum; Source/UBCS-WEB/src/views/code/code.vue
@@ -1303,6 +1303,7 @@ import { mapGetters } from "vuex"; import { getByRoleUserList } from "@/api/system/user"; import func from "@/util/func"; import secTypeEnum from '@/enumpack/CodeSecTypeEnum'; export default { data() { @@ -2665,13 +2666,13 @@ this.basicSecDialogTitle = "ä¿®æ¹ç 段信æ¯"; this.showbtn = true; this.basicSecOnlyRead = false; //为formç»å®å¼ } else { this.basicSecDialogTitle = "æ¥çç æ®µä¿¡æ¯"; this.showbtn = false; this.basicSecOnlyRead = true; } //console.log(this.form); //为formç»å®å¼ this.changeSectypeFormItems(condition == "add" ? null : row); this.addBasicCodeSettingBox = true; }, @@ -2717,8 +2718,23 @@ // let referValueInfo = JSON.parse(this.form.referValueInfo); // referValueInfo.referType = this.form.referBtmId; } editSave(this.form).then( let oldBasicSec = this.selectionBasicList.at(-1); let secType = this.form.secType; Vue.set(this.form, 'isClearValue', false); if((oldBasicSec.secType == "codefixedsec" || oldBasicSec.secType === "codeclassifysec") && oldBasicSec.secType != secType){ await this.$confirm("ç æ®µç±»åç±ã"+oldBasicSec.secTypeText+"ãï¼ä¿®æ¹ä¸º"+"ã"+secTypeEnum.getTextByValue(secType)+"ãï¼è¯·é®æ¯å¦éè¦æ¸ ç©ºå ³èçç å¼ï¼", "æç¤º", { distinguishCancelAndClose: true, closeOnClickModal: false, confirmButtonText: "æ¸ ç©ºç å¼", cancelButtonText: "ä¿çç å¼", }).then(() => { // æ¸ ç©ºç å¼ this.form.isClearValue = true; }).catch(action => { this.form.isClearValue = false; }); } await editSave(this.form).then( () => { this.$message({ type: "success", @@ -2733,6 +2749,7 @@ } ); } // åæ¶ä¿åæé®å è½½ææ this.isLoadingSecCodeAddBtn = false; }, /** å 为elementuiçè¡¨åæ ¡éªè®¾ç½®ä¸ä¸æä»¥éç¨å¤æçæ¹å¼æ¥åè¡¨åæ£éªæ¹å¼*/ Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java
@@ -238,6 +238,19 @@ private String oidArr; /** * ä¿®æ¹ç æ®µç±»åæ¶æ¯å¦æ¸ 空ç å¼ */ private Boolean isClearValue; public Boolean getIsClearValue() { return isClearValue; } public void setIsClearValue(Boolean clearValue) { isClearValue = clearValue; } /** * è·å ç æ®µç±»å */ public String getSecType (){ Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeFixedValueDTO.java
@@ -25,6 +25,7 @@ * åºå®ç æ®µä¸»é®æ¾ç¤ºææ¬ */ private String codefixedsecoidName; /** * ç å¼åºå· */ Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
@@ -88,7 +88,7 @@ @PutMapping("/editSave") @ApiOperationSupport(order = 4) @ApiOperation(value = "ä¿®æ¹ ç æ®µåºç¡ä¿¡æ¯", notes = "codeBasicSecDTO") public R editSave(@RequestBody CodeBasicSecDTO codeBasicSecDTO){ public R editSave(@RequestBody CodeBasicSecDTO codeBasicSecDTO) throws ServerException{ boolean resBoolean; try { resBoolean = codeBasicSecService.editSave(codeBasicSecDTO); Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java
@@ -67,7 +67,7 @@ * @return æ§è¡ç»æ * @throws VciBaseException åæ°ä¸ºç©ºï¼å¯ä¸é¡¹ï¼å¿ è¾é¡¹ä¸éè¿æ¶ä¼æåºå¼å¸¸ */ boolean editSave(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException; boolean editSave(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException, ServerException; /** * å é¤ç 段åºç¡ä¿¡æ¯ Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyValueService.java
@@ -13,6 +13,7 @@ import org.springblade.core.tool.api.R; import java.rmi.ServerException; import java.util.Collection; import java.util.List; @@ -26,6 +27,7 @@ /** * å éåç±»ç å¼ * * @param codeClassifyValues * @return */ @@ -33,6 +35,7 @@ /** * æ¥è¯¢åç±»ç æ®µçç å¼ æ * * @param treeQueryObject æ æ¥è¯¢å¯¹è±¡ * @return åç±»ç æ®µçç å¼ æ¾ç¤ºæ * @throws VciBaseException æ¥è¯¢æ¡ä»¶ä¸ç¬¦åè¦æ±çæ¶å伿åºå¼å¸¸ @@ -41,6 +44,7 @@ /** * å¢å åç±»ç æ®µçç å¼ * * @param codeClassifyValueDTO åç±»ç æ®µçç 弿°æ®ä¼ è¾å¯¹è±¡ * @return æ§è¡ç»æ * @throws VciBaseException åæ°ä¸ºç©ºï¼å¯ä¸é¡¹ï¼å¿ è¾é¡¹ä¸éè¿æ¶ä¼æåºå¼å¸¸ @@ -49,6 +53,7 @@ /** * ä¿®æ¹åç±»ç æ®µçç å¼ * * @param codeClassifyValueDTO åç±»ç æ®µçç 弿°æ®ä¼ è¾å¯¹è±¡ * @return æ§è¡ç»æ * @throws VciBaseException åæ°ä¸ºç©ºï¼å¯ä¸é¡¹ï¼å¿ è¾é¡¹ä¸éè¿æ¶ä¼æåºå¼å¸¸ @@ -57,6 +62,7 @@ /** * æ£æ¥ åç±»ç æ®µçç 弿¯å¦å é¤ * * @param codeClassifyValueDTO åç±»ç æ®µçç 弿°æ®ä¼ è¾å¯¹è±¡ï¼å¿ é¡»è¦æoidåts屿§ * @return æ§è¡ç»æ success为true为å¯ä»¥å é¤ï¼falseè¡¨ç¤ºææ°æ®å¼ç¨ï¼obj为true表示æä¸çº§ * @throws VciBaseException åæ°ä¸ºç©ºï¼è¢«å¼ç¨æ¶æåºå¼å¸¸ @@ -74,6 +80,7 @@ /** * å é¤åç±»ç æ®µçç å¼ * * @param codeClassifyValueDTO åç±»ç æ®µçç 弿°æ®ä¼ è¾å¯¹è±¡ï¼oidåtséè¦ä¼ è¾ * @return å é¤ç»æåé¦ï¼ï¼successï¼æåï¼failï¼å¤±è´¥ * @throws VciBaseException åæ°ä¸ºç©ºï¼è¢«å¼ç¨æ¶æåºå¼å¸¸ @@ -91,6 +98,7 @@ /** * 主é®è·ååç±»ç æ®µçç å¼ * * @param oid ä¸»é® * @return åç±»ç æ®µçç 弿¾ç¤ºå¯¹è±¡ * @throws VciBaseException åæ°ä¸ºç©ºï¼æ°æ®ä¸å卿¶ä¼æåºå¼å¸¸ @@ -99,6 +107,7 @@ /** * 䏻鮿¹éè·ååç±»ç æ®µçç å¼ * * @param oidCollections 主é®éåï¼ä½æ¯åæ§è½å½±åï¼å»ºè®®ä¸æ¬¡æ¥è¯¢ä¸è¶ è¿10000个 * @return åç±»ç æ®µçç 弿¾ç¤ºå¯¹è±¡ * @throws VciBaseException æ¥è¯¢åºç°å¼å¸¸æ¶ä¼æåº @@ -107,6 +116,7 @@ /** * åç §æ åç±»ç æ®µçç å¼ * * @param treeQueryObject æ å½¢æ¥è¯¢å¯¹è±¡ * @return åç±»ç æ®µçç 弿¾ç¤ºæ * @throws VciBaseException æ¥è¯¢æ¡ä»¶åå页åºéçæ¶å伿åºå¼å¸¸ @@ -115,6 +125,7 @@ /** * æ¹éæ·»å åç±»ç æ®µçç å¼ï¼å¦æä¿åçéåä¸ä¸åå¨å·²å¨æ°æ®åºä¸çç å¼åå é¤ãä¸»è¦æ¯ä¿åç å¼çåºå· * * @param dtoList åç±»ç æ®µçç å¼å表 * @param codeclassifysecoid åç±»ç æ®µçä¸»é® * @return æ§è¡ç»æ @@ -123,6 +134,7 @@ /** * 使ç¨ç 段ç主é®è·ååç±»çç å¼å 容 * * @param classifySecOid ç æ®µçä¸»é® * @param parentClassifyValueOid ä¸çº§åç±»çä¸»é® * @return åç±»ç å¼çå 容 @@ -131,6 +143,7 @@ /** * æ ¹æ®ä¸»é®è·åç å¼å符串 * * @param oid * @return */ @@ -138,6 +151,7 @@ /** * æ°æ®å¯¹è±¡è½¬æ¢ä¸ºæ¾ç¤ºå¯¹è±¡ * * @param codeClassifyValueDO æ°æ®å¯¹è±¡ * @return æ¾ç¤ºå¯¹è±¡ * @throws VciBaseException æ·è´å±æ§åºéçæ¶å伿åºå¼å¸¸ @@ -146,11 +160,21 @@ /** * æ¹éæ°æ®å¯¹è±¡è½¬æ¢ä¸ºæ¾ç¤ºå¯¹è±¡ * * @param codeClassifyValueDOs æ°æ®å¯¹è±¡å表 * @return æ¾ç¤ºå¯¹è±¡ * @throws VciBaseException åæ°ä¸ºç©ºæè ä¸åå¨çæ¶å伿åºå¼å¸¸ */ List<CodeClassifyValueVO> codeClassifyValueDO2VOs(Collection<CodeClassifyValue> codeClassifyValueDOs) throws VciBaseException; /** * æ ¹æ®codeClassifySecOidå é¤ç å¼ * * @param codeClassifySecOid * @return * @throws ServerException */ Boolean deleteClassifyValueBySecOid(String codeClassifySecOid) throws ServerException; } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeFixedValueService.java
@@ -107,4 +107,11 @@ */ List<CodeFixedValue> listFixedValueByCodeFixedSecOid(List<String> codeFixedSecOids); /** * æ ¹æ®å ³èåºå®ç 段主é®å é¤ç å¼ * @param codeFixedSecOid * @return */ Boolean deleteFixedValueBySecOid(String codeFixedSecOid); } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
@@ -361,7 +361,7 @@ */ @Override @Transactional(rollbackFor = Exception.class) public boolean editSave(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException { public boolean editSave(CodeBasicSecDTO codeBasicSecDTO) throws ServerException { VciBaseUtil.alertNotNull(codeBasicSecDTO, "éè¦æ·»å çæ°æ®å¯¹è±¡"); KeyValue attrKv = checkAttrNullableBySecType(codeBasicSecDTO); if (! "success".equals(attrKv.getKey())){ @@ -400,7 +400,6 @@ codeReferConfigService.insert(codeReferConfigVO); } } // revisionModelUtil.copyFromDTOIgnore(codeBasicSecDTO, codeBasicSecDO);//æ¤å¤çæ·è´ä¼æreferValueInfoçå¼ç»è¦çæï¼éè¦éæ°èµå¼ BaseModel tempModel = new BaseModel(); BeanUtilForVCI.copyPropertiesIgnoreCase(codeBasicSecDO, tempModel); @@ -411,6 +410,16 @@ codeBasicSecDO.setDescription(VciBaseUtil.getStringValueFromObject(VciBaseUtil.getValueFromField("description", codeBasicSecDTO))); resBoolean = codeBasicSecMapper.updateById(codeBasicSecDO)>0; // ä»åç±»ç æ®µæåºå®ç 段æ¹ä¸ºå ¶ä»ç 段æ¶ï¼å¤æç¨æ·æ¯å¦éæ©äºæ¸ 空ç å¼ if(codeBasicSecDTO.getIsClearValue()){ // åç±»ç 弿¸ 空 if(codeBasicSecDTO.getSecType().equals(CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue())){ codeClassifyValueService.deleteClassifyValueBySecOid(codeBasicSecDTO.getOid()); }else { //åºå®ç 弿¸ 空 fixedValueService.deleteFixedValueBySecOid(codeBasicSecDTO.getOid()); } } //SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo(); if(StringUtils.isNotBlank(codeBasicSecDO.getCodeFillSeparator())){ DictBiz dictBiz = new DictBiz(); Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java
@@ -35,6 +35,7 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.rmi.ServerException; import java.util.*; import java.util.stream.Collectors; @@ -458,6 +459,19 @@ } /** * æ ¹æ®codeClassifySecOidå é¤ç å¼ * @param codeClassifySecOid * @return * @throws ServerException */ @Override public Boolean deleteClassifyValueBySecOid(String codeClassifySecOid) throws ServerException { LambdaQueryWrapper<CodeClassifyValue> wrapper = Wrappers.<CodeClassifyValue>query() .lambda().eq(CodeClassifyValue::getCodeClassifySecOid, codeClassifySecOid); return codeClassifyValueMapper.delete(wrapper) > 0; } /** * æ°æ®å¯¹è±¡è½¬æ¢ä¸ºæ¾ç¤ºå¯¹è±¡ * @param codeClassifyValueDO æ°æ®å¯¹è±¡ * @return æ¾ç¤ºå¯¹è±¡ Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java
@@ -1,5 +1,6 @@ package com.vci.ubcs.code.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -92,6 +93,18 @@ } /** * æ ¹æ®å ³èåºå®ç 段主é®å é¤ç å¼ * @param codeFixedSecOid * @return */ @Override public Boolean deleteFixedValueBySecOid(String codeFixedSecOid) { LambdaQueryWrapper<CodeFixedValue> wrapper = Wrappers.<CodeFixedValue>query() .lambda().eq(CodeFixedValue::getCodeFixedSecOid, codeFixedSecOid); return codeFixedValueMapper.delete(wrapper)>0; } /** * å¢å åºå®ç 段çç å¼ * @param codeFixedValueDTO åºå®ç 段çç 弿°æ®ä¼ è¾å¯¹è±¡ * @return æ§è¡ç»æ