From c5badac7106d4ec7f419283b39b435a92f275fbd Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 30 十月 2023 09:10:18 +0800
Subject: [PATCH] 前端增加码段类型枚举类，实现修改码段类型时提供是否清空码值对话框功能
---
Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeFixedValueDTO.java | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 17 ++++-
Source/UBCS-WEB/src/views/code/code.vue | 23 ++++++-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeFixedValueService.java | 7 ++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java | 16 +++++
Source/UBCS-WEB/src/enumpack/CodeSecTypeEnum.js | 24 ++++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java | 13 ++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyValueService.java | 38 ++++++++++--
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java | 13 ++++
12 files changed, 139 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue
index b36a114..2896334 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue
@@ -84,7 +84,6 @@
echoReferConfig(content){
this.$emit('setReferConfigValue', content) // 瑙﹀彂update:data灏嗗瓙缁勪欢鍊间紶閫掔粰鐖剁粍浠�
},
-
},
}
</script>
diff --git a/Source/UBCS-WEB/src/enumpack/CodeSecTypeEnum.js b/Source/UBCS-WEB/src/enumpack/CodeSecTypeEnum.js
new file mode 100644
index 0000000..666790d
--- /dev/null
+++ b/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;
+
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 1d0c9dd..da43e4a 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/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;
- //涓篺orm缁戝畾鍊�
} else {
this.basicSecDialogTitle = "鏌ョ湅鐮佹淇℃伅";
this.showbtn = false;
this.basicSecOnlyRead = true;
}
//console.log(this.form);
+ //涓篺orm缁戝畾鍊�
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鐨勮〃鍗曟牎楠岃缃笉涓婃墍浠ラ噰鐢ㄥ垽鏂殑鏂瑰紡鏉ュ仛琛ㄥ崟妫�楠屾柟寮�*/
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java
index dc7c752..4e469cf 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java
+++ b/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 (){
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeFixedValueDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeFixedValueDTO.java
index 9053c09..8d3acc7 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeFixedValueDTO.java
+++ b/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;
+
/**
* 鐮佸�煎簭鍙�
*/
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
index bec9e06..10e6f75 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
+++ b/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);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java
index c808bc4..7ff557a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java
+++ b/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;
/**
* 鍒犻櫎鐮佹鍩虹淇℃伅
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyValueService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyValueService.java
index 00d59d5..b4a5052 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyValueService.java
+++ b/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鍜宼s灞炴��
* @return 鎵ц缁撴灉 success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
* @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
@@ -74,6 +80,7 @@
/**
* 鍒犻櫎鍒嗙被鐮佹鐨勭爜鍊�
+ *
* @param codeClassifyValueDTO 鍒嗙被鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
* @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,23 +116,26 @@
/**
* 鍙傜収鏍� 鍒嗙被鐮佹鐨勭爜鍊�
+ *
* @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
* @return 鍒嗙被鐮佹鐨勭爜鍊兼樉绀烘爲
* @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
- List<Tree> referTree(TreeQueryObject treeQueryObject) throws VciBaseException;
+ List<Tree> referTree(TreeQueryObject treeQueryObject) throws VciBaseException;
/**
* 鎵归噺娣诲姞鍒嗙被鐮佹鐨勭爜鍊硷紝濡傛灉淇濆瓨鐨勯泦鍚堜腑涓嶅瓨鍦ㄥ凡鍦ㄦ暟鎹簱涓殑鐮佸�煎垯鍒犻櫎銆備富瑕佹槸淇濆瓨鐮佸�肩殑搴忓彿
- * @param dtoList 鍒嗙被鐮佹鐨勭爜鍊煎垪琛�
+ *
+ * @param dtoList 鍒嗙被鐮佹鐨勭爜鍊煎垪琛�
* @param codeclassifysecoid 鍒嗙被鐮佹鐨勪富閿�
* @return 鎵ц缁撴灉
*/
- R batchSave4Order(List<CodeClassifyValueDTO> dtoList, String codeclassifysecoid)throws VciBaseException;
+ R batchSave4Order(List<CodeClassifyValueDTO> dtoList, String codeclassifysecoid) throws VciBaseException;
/**
* 浣跨敤鐮佹鐨勪富閿幏鍙栧垎绫荤殑鐮佸�煎唴瀹�
- * @param classifySecOid 鐮佹鐨勪富閿�
+ *
+ * @param classifySecOid 鐮佹鐨勪富閿�
* @param parentClassifyValueOid 涓婄骇鍒嗙被鐨勪富閿�
* @return 鍒嗙被鐮佸�肩殑鍐呭
*/
@@ -131,6 +143,7 @@
/**
* 鏍规嵁涓婚敭鑾峰彇鐮佸�煎瓧绗︿覆
+ *
* @param oid
* @return
*/
@@ -138,7 +151,8 @@
/**
* 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyValueDO 鏁版嵁瀵硅薄
+ *
+ * @param codeClassifyValueDO 鏁版嵁瀵硅薄
* @return 鏄剧ず瀵硅薄
* @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
@@ -146,11 +160,21 @@
/**
* 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
+ *
* @param codeClassifyValueDOs 鏁版嵁瀵硅薄鍒楄〃
* @return 鏄剧ず瀵硅薄
* @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- List<CodeClassifyValueVO> codeClassifyValueDO2VOs(Collection<CodeClassifyValue> codeClassifyValueDOs) throws VciBaseException;
+ List<CodeClassifyValueVO> codeClassifyValueDO2VOs(Collection<CodeClassifyValue> codeClassifyValueDOs) throws VciBaseException;
- }
+ /**
+ * 鏍规嵁codeClassifySecOid鍒犻櫎鐮佸��
+ *
+ * @param codeClassifySecOid
+ * @return
+ * @throws ServerException
+ */
+ Boolean deleteClassifyValueBySecOid(String codeClassifySecOid) throws ServerException;
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeFixedValueService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeFixedValueService.java
index e147304..1e1cc96 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeFixedValueService.java
+++ b/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);
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
index e8eb9d3..73162d8 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
@@ -361,10 +361,10 @@
*/
@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())){
+ if (!"success".equals(attrKv.getKey())){
throw new VciBaseException(attrKv.getValue() + "涓嶈兘涓虹┖");
}
//灏咲TO杞崲涓篋O
@@ -400,8 +400,7 @@
codeReferConfigService.insert(codeReferConfigVO);
}
}
-
-// revisionModelUtil.copyFromDTOIgnore(codeBasicSecDTO, codeBasicSecDO);//姝ゅ鐨勬嫹璐濅細鎶妑eferValueInfo鐨勫�肩粰瑕嗙洊鎺夛紝闇�瑕侀噸鏂拌祴鍊�
+ // revisionModelUtil.copyFromDTOIgnore(codeBasicSecDTO, codeBasicSecDO);//姝ゅ鐨勬嫹璐濅細鎶妑eferValueInfo鐨勫�肩粰瑕嗙洊鎺夛紝闇�瑕侀噸鏂拌祴鍊�
BaseModel tempModel = new BaseModel();
BeanUtilForVCI.copyPropertiesIgnoreCase(codeBasicSecDO, tempModel);
BeanUtil.copyProperties(codeBasicSecDTO, codeBasicSecDO,"referValueInfo");
@@ -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();
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java
index a586780..be7cad1 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java
+++ b/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;
@@ -43,7 +44,7 @@
import static com.vci.ubcs.code.constant.FrameWorkLangCodeConstant.DATA_OID_NOT_EXIST;
@Service
-public class CodeClassifyValueServiceImpl extends ServiceImpl<CodeClassifyValueMapper, CodeClassifyValue> implements ICodeClassifyValueService {
+public class CodeClassifyValueServiceImpl extends ServiceImpl<CodeClassifyValueMapper, CodeClassifyValue> implements ICodeClassifyValueService {
@Resource
private RevisionModelUtil revisionModelUtil;
@@ -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 鏄剧ず瀵硅薄
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java
index 47d537f..c26a219 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java
+++ b/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 鎵ц缁撴灉
--
Gitblit v1.9.3