From ce567eb11cd0cdbd826214c355d1a8caff175dca Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 15 十一月 2023 14:25:22 +0800
Subject: [PATCH] bug列表：181（修复新增，修改，删除接口，新增时没设置默认值，导致在建分类时无法查询到，关键属性查重规则）183（历史数据导入模板下载，过滤掉模板中配置的默认属性）
---
Source/UBCS-WEB/src/views/code/code.vue | 3
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeKeyAttrRepeatService.java | 22 +++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 12 +
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmEngineConstant.java | 146 +++++++++++++++++++-
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 9 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 10
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 2
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/WebUtil.java | 2
Source/UBCS-WEB/src/components/Master/MasterTransfer.vue | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 4
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java | 5
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeKeyAttrRepeatController.java | 59 ++------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeKeyAttrRepeatServiceImpl.java | 70 +++++++++
Source/UBCS-WEB/src/components/BatchImport/index.vue | 6
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java | 3
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyDTO.java | 5
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java | 5
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java | 12 -
21 files changed, 292 insertions(+), 92 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index 1f156fe..0f7ca74 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -182,7 +182,7 @@
tipList: [
"1.鏍囬甯︿簲瑙掓槦鐨勮〃绀哄叧閿睘鎬э紝甯︽槦鍙疯〃绀哄繀杈撻」",
"2.浼佷笟缂栫爜锛岄泦鍥㈢爜鍜岀姸鎬侀兘闇�瑕佸鍏�",
- "3.姣忔浠呰兘鏈�澶氬鍏�10000鏉℃暟鎹紝濡傛灉鍑洪敊浼氳繑鍥為敊璇殑鏁版嵁鍜屽師鍥狅紝浣嗘槸姝ｇ‘鐨勬暟鎹細淇濆瓨",
+ "3.姣忔浠呰兘鏈�澶氬鍏�5000鏉℃暟鎹�(鍙�氳繃nacos杩涜閰嶇疆锛屾帹鑽�5000/娆″鍏�)锛屽鏋滃嚭閿欎細杩斿洖閿欒鐨勬暟鎹拰鍘熷洜锛屼絾鏄纭暟鎹彲浠ョ户缁繚瀛�",
"4.鍒嗙被鐨勮矾寰勯渶瑕佺敤#鍒嗛殧銆備粎濉啓褰撳墠閫夌殑鍒嗙被鏍戜笂鐨勪笅绾у垎绫荤殑璺緞锛屽鏋滃綋鍓嶅垎绫诲凡缁忔槸鍙跺瓙鑺傜偣锛屽垯涓嶅～鍐�",
],
action: "/api/ubcs-code/mdmEngineController/batchImportHistoryData",
@@ -290,12 +290,12 @@
},
onError(err) {
this.pageLoading.close();
- console.log('onError')
+ //console.log('onError')
},
uploadChange(file) {
if (file.status === "success" || file.status === "error") {
this.pageLoading.close();
- console.log('uploadChange')
+ //console.log('uploadChange')
}
},
},
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
index b7da7aa..8d3d9df 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
@@ -112,7 +112,7 @@
},
value: {
handler(newval, oldval) {
- console.log('value', newval)
+ //console.log('value', newval)
}
}
},
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 05af43c..29d0c62 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -2522,8 +2522,7 @@
this.releadDisabled = false;
});
}
- })
- .catch((error) => {
+ }).catch((error) => {
this.releadDisabled = false;
});
this.releadDisabled = false;
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 641a037..8f8ceed 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
@@ -69,6 +69,11 @@
*/
private String codeResembleRuleOidName;
+ /**
+ * 鏄惁鍙備笌鏍￠獙锛�0:鍙備笌;1:涓嶅弬涓�
+ */
+ private String isParticipateCheck;
+
public boolean getAblechildren() {
return ablechildren;
}
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 9ae7955..951a8d2 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
@@ -89,6 +89,11 @@
private String codeResembleRuleOid;
/**
+ * 鏄惁鍙備笌鏍￠獙锛�0:鍙備笌;1:涓嶅弬涓�
+ */
+ private String isParticipateCheck;
+
+ /**
* 鐩镐技椤规煡璇㈣鍒欏悕绉�
*/
@Transient(referColumn = "codeResembleRuleOid.name")
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 fe274b5..ae62cbc 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
@@ -63,6 +63,11 @@
private Integer dataLevel;
/**
+ * 鏄惁鍙備笌鏍￠獙锛�0:鍙備笌;1:涓嶅弬涓�
+ */
+ private String isParticipateCheck;
+
+ /**
* 灞傜骇鐨勮矾寰�
*/
private String path;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java
index 36562a7..e8923b1 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java
@@ -53,6 +53,7 @@
private String firstV;
private String creator;
+
@DateTimeFormat(
pattern = "yyyy-MM-dd HH:mm:ss"
)
@@ -62,6 +63,7 @@
private Date createTime;
private String lastModifier;
+
@DateTimeFormat(
pattern = "yyyy-MM-dd HH:mm:ss"
)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
index ab54355..4e0bb26 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
@@ -51,6 +51,7 @@
baseModel.setLastR("1");
baseModel.setLastV("1");
baseModel.setRevisionSeq(1);
+ // TODO:鐩墠鍙湁缂栫爜瑙勫垯涓湁鐢ㄥ埌锛屽悗鏈熼渶瑕佸幓鎺夎繖娈典唬鐮佺殑璇濓紝灏辨妸浠栧姞鍦ㄧ紪鐮佽鍒欐柊澧炰腑鍘�
if(Func.isBlank(baseModel.getOwner())){
// 璁剧疆鎵�鏈夎��
baseModel.setOwner(AuthUtil.getUserId().toString());
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/WebUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/WebUtil.java
index b26ae59..87456e4 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/WebUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/WebUtil.java
@@ -724,6 +724,7 @@
}
return listHasList;
}
+
/**
* 鏄惁榛樿鐨勫睘鎬�
* @param fieldNames 灞炴�х殑鍚嶅瓧
@@ -736,6 +737,5 @@
}
return false;
}
-
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmEngineConstant.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmEngineConstant.java
index da07ebe..ae75383 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmEngineConstant.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmEngineConstant.java
@@ -48,38 +48,162 @@
* 瀵嗙骇鐨勫瓧娈�
*/
public static final String SECRET_FIELD = "secretgrade";
+
/**
* 鍒涘缓鑰呭瓧娈�
*/
public static final String CODE_CREATOR = "creator";
+
/**
* 鏇存敼鑰呭瓧娈�
*/
public static final String CODE_EDITOR = "lastmodifier";
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ public static final String CODE_EDITOR_TIME = "lastmodifytime";
+
+ /**
+ * 鐗堟湰瑙勫垯
+ */
+ public static final String CODE_REVISION_RULE = "revisionrule";
+
+ /**
+ * 鐗堟湰姝ラ暱
+ */
+ public static final String CODE_REVISION_SEQ = "revisionseq";
+
+ /**
+ * 鐗堟湰瑙勫垯
+ */
+ public static final String CODE_VISION_RULE = "versionrule";
+
+ public static final String CODE_VISION_SEQ = "versionseq";
+
+ public static final String CODE_VISION_VLUE = "versionvalue";
+
+ public static final String CODE_LASTR = "lastr";
+
+ public static final String CODE_FIRSTR = "firstr";
+
+ public static final String CODE_LASTV = "lastv";
+
+ public static final String CODE_FIRSTV = "firstv";
+
+ /**
+ * 鐗堟湰瑙勫垯oid
+ */
+ public static final String CODE_REVISION_OID = "revisionoid";
+
+ /**
+ * 绉熸埛
+ */
+ public static final String CODE_TENANTID = "tenantid";
+
+ /**
+ * nameoid
+ */
+ public static final String CODE_NAME_OID = "nameOid";
+
+ /**
+ * 涓氬姟绫诲瀷鍚嶇О
+ */
+ public static final String CODE_BTMNAME = "btmname";
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ public static final String CODE_CREATE_TIME = "createtime";
+
+ /**
+ * 鏃堕棿鎴�
+ */
+ public static final String CODE_TS = "ts";
+
+ /**
+ * 鎵�鏈夎��
+ */
+ public static final String CODE_OWNER = "owner";
+
+ /**
+ * 鍗囩増
+ */
+ public static final String CODE_COPYFORMVERSION = "copyfromversion";
+
+ /**
+ * 涓婚敭
+ */
+ public static final String CODE_OID = "oid";
+
/**
* 榛樿鐨勫睘鎬у垪琛�
*/
public static final List DEFAULT_ATTR_LIST = new ArrayList(){{
add(CODE_FIELD);
- add(CODE_STATUS_FILED);
- add(CODE_GROUP_FIELD);
- add(CODE_CLASSIFY_OID_FIELD);
+ add(CODE_STATUS_FILED);
+ add(CODE_GROUP_FIELD);
+ add(CODE_CLASSIFY_OID_FIELD);
add(CODE_TEMPLATE_OID_FIELD);
add(CODE_FULL_PATH_FILED);
+ add(SECRET_FIELD);
+ add(CODE_CREATOR);
+ add(CODE_EDITOR);
+ add(CODE_EDITOR_TIME);
+ add(CODE_REVISION_RULE);
+ add(CODE_REVISION_SEQ);
+ add(CODE_REVISION_RULE);
+ add(CODE_VISION_RULE);
+ add(CODE_VISION_SEQ);
+ add(CODE_LASTR);
+ add(CODE_FIRSTR);
+ add(CODE_LASTV);
+ add(CODE_FIRSTV);
+ add(CODE_REVISION_OID);
+ add(CODE_TENANTID);
+ add(CODE_NAME_OID);
+ add(CODE_BTMNAME);
+ add(CODE_CREATE_TIME);
+ add(CODE_TS);
+ add(CODE_OWNER);
+ add(CODE_COPYFORMVERSION);
+ add(CODE_OID);
+ add(CODE_VISION_VLUE);
}};
/**
* 榛樿鐨勫睘鎬у垪琛�
*/
public static final List DEFAULT_SYNC_ATTR_LIST = new ArrayList(){{
- add(CODE_FIELD);
- add(CODE_STATUS_FILED);
- add(CODE_GROUP_FIELD);
- add(CODE_CLASSIFY_OID_FIELD);
- add(CODE_TEMPLATE_OID_FIELD);
- add(CODE_FULL_PATH_FILED);
- add(CODE_EDITOR);
- add(CODE_CREATOR);
+ add(CODE_FIELD);
+ add(CODE_STATUS_FILED);
+ add(CODE_GROUP_FIELD);
+ add(CODE_CLASSIFY_OID_FIELD);
+ add(CODE_TEMPLATE_OID_FIELD);
+ add(CODE_FULL_PATH_FILED);
+ add(SECRET_FIELD);
+ add(CODE_CREATOR);
+ add(CODE_EDITOR);
+ add(CODE_EDITOR_TIME);
+ add(CODE_REVISION_RULE);
+ add(CODE_REVISION_SEQ);
+ add(CODE_REVISION_RULE);
+ add(CODE_VISION_RULE);
+ add(CODE_VISION_SEQ);
+ add(CODE_LASTR);
+ add(CODE_FIRSTR);
+ add(CODE_LASTV);
+ add(CODE_FIRSTV);
+ add(CODE_REVISION_OID);
+ add(CODE_TENANTID);
+ add(CODE_NAME_OID);
+ add(CODE_BTMNAME);
+ add(CODE_CREATE_TIME);
+ add(CODE_TS);
+ add(CODE_OWNER);
+ add(CODE_COPYFORMVERSION);
+ add(CODE_OID);
+ add(CODE_VISION_VLUE);
}};
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeKeyAttrRepeatController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeKeyAttrRepeatController.java
index c675937..fc6cc7b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeKeyAttrRepeatController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeKeyAttrRepeatController.java
@@ -49,7 +49,7 @@
@Api(value = "鍏抽敭灞炴�ф煡閲嶈鍒�", tags = "鍏抽敭灞炴�ф煡閲嶈鍒欐帴鍙�")
public class CodeKeyAttrRepeatController extends BladeController {
- private final ICodeKeyAttrRepeatService plCodeKeyattrrepeatService;
+ private final ICodeKeyAttrRepeatService codeKeyattrrepeatService;
CodeKeyAttrRepeatMapper codeKeyattrrepeatMapper;
@@ -59,73 +59,47 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "璇︽儏", notes = "浼犲叆plCodeKeyattrrepeat")
- public R<CodeKeyAttrRepeatVO> detail(CodeKeyAttrRepeat plCodeKeyattrrepeat) {
- CodeKeyAttrRepeat detail = codeKeyattrrepeatMapper.selectOne(Condition.getQueryWrapper(plCodeKeyattrrepeat));
+ public R<CodeKeyAttrRepeatVO> detail(CodeKeyAttrRepeat codeKeyattrrepeat) {
+ CodeKeyAttrRepeat detail = codeKeyattrrepeatMapper.selectOne(Condition.getQueryWrapper(codeKeyattrrepeat));
return R.data(CodeKeyAttrRepeatWrapper.build().entityVO(detail));
}
+
/**
* 鍏抽敭灞炴�ф煡閲嶈鍒� 鍒嗛〉
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆plCodeKeyattrrepeat")
- public R<IPage<CodeKeyAttrRepeatVO>> list(CodeKeyAttrRepeat plCodeKeyattrrepeat, Query query) {
- IPage<CodeKeyAttrRepeat> pages = codeKeyattrrepeatMapper.selectPage(Condition.getPage(query), Condition.getQueryWrapper(plCodeKeyattrrepeat));
+ public R<IPage<CodeKeyAttrRepeatVO>> list(CodeKeyAttrRepeat codeKeyAttrRepeat, Query query) {
+ IPage<CodeKeyAttrRepeat> pages = codeKeyattrrepeatMapper.selectPage(Condition.getPage(query), Condition.getQueryWrapper(codeKeyAttrRepeat));
return R.data(CodeKeyAttrRepeatWrapper.build().pageVO(pages));
}
/**
- * 鍏抽敭灞炴�ф煡閲嶈鍒� 鑷畾涔夊垎椤�
- */
- @GetMapping("/page")
- @ApiOperationSupport(order = 3)
- @ApiOperation(value = "鍒嗛〉", notes = "浼犲叆plCodeKeyattrrepeat")
- public R<IPage<CodeKeyAttrRepeatVO>> page(CodeKeyAttrRepeatVO plCodeKeyattrrepeat, Query query) {
- IPage<CodeKeyAttrRepeatVO> pages = plCodeKeyattrrepeatService.selectPlCodeKeyattrrepeatPage(Condition.getPage(query), plCodeKeyattrrepeat);
- return R.data(pages);
- }
-
- /**
- * 鍏抽敭灞炴�ф煡閲嶈鍒� 鏂板
- */
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "鏂板", notes = "浼犲叆plCodeKeyattrrepeat")
- public R save(@Valid @RequestBody CodeKeyAttrRepeat plCodeKeyattrrepeat) {
- return R.status(SqlHelper.retBool(codeKeyattrrepeatMapper.insert(plCodeKeyattrrepeat)));
- }
-
- /**
- * 鍏抽敭灞炴�ф煡閲嶈鍒� 淇敼
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "淇敼", notes = "浼犲叆plCodeKeyattrrepeat")
- public R update(@Valid @RequestBody CodeKeyAttrRepeat plCodeKeyattrrepeat) {
- return R.status(SqlHelper.retBool(codeKeyattrrepeatMapper.updateById(plCodeKeyattrrepeat)));
- }
-
- /**
* 鍏抽敭灞炴�ф煡閲嶈鍒� 鏂板鎴栦慨鏀�
+ * @param codeKeyAttrRepeat
+ * @return
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
- @ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆plCodeKeyattrrepeat")
- public R submit(@Valid @RequestBody CodeKeyAttrRepeat plCodeKeyattrrepeat) {
- if(plCodeKeyattrrepeat.getOid() != null){
- return R.status(SqlHelper.retBool(codeKeyattrrepeatMapper.updateById(plCodeKeyattrrepeat)));
+ @ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆codeKeyattrrepeat")
+ public R submit(@Valid @RequestBody CodeKeyAttrRepeat codeKeyAttrRepeat) {
+ if(codeKeyAttrRepeat.getOid() != null){
+ return R.status(codeKeyattrrepeatService.update(codeKeyAttrRepeat));
}
- return R.status(SqlHelper.retBool(codeKeyattrrepeatMapper.insert(plCodeKeyattrrepeat)));
+ return R.status(codeKeyattrrepeatService.addSave(codeKeyAttrRepeat));
}
/**
* 鍏抽敭灞炴�ф煡閲嶈鍒� 鍒犻櫎
+ * @param ids
+ * @return
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "閫昏緫鍒犻櫎", notes = "浼犲叆ids")
public R remove(@ApiParam(value = "涓婚敭闆嗗悎", required = true) @RequestParam String ids) {
- return R.status(SqlHelper.retBool(codeKeyattrrepeatMapper.deleteBatchIds(Func.toLongList(ids))));
+ return R.status(codeKeyattrrepeatService.deleteByOids(ids));
}
/**
@@ -139,6 +113,5 @@
public R listCodeKeyAttrRepeatRuleByOids(@ApiParam(value = "涓婚敭闆嗗悎", required = true) @RequestParam String oids) {
return R.data(codeKeyattrrepeatMapper.selectBatchIds(Func.toLongList(oids)));
}
-
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
index 1cc49df..37533a7 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
@@ -35,6 +35,7 @@
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
+import java.rmi.ServerException;
import java.util.*;
@RestController
@@ -297,7 +298,6 @@
return R.success("鎿嶄綔鎴愬姛锛�");
}
-
/**
* 鐢宠缂栫爜淇濆瓨
* @param orderDTO 缂栫爜鐢宠鐩稿叧鐨勪俊鎭紝闇�瑕佹湁灞炴�у拰鐮佹鐩稿叧鐨勪俊鎭�
@@ -308,7 +308,6 @@
public R addSaveCode(@RequestBody CodeOrderDTO orderDTO) throws Exception {
return R.success(engineService.addSaveCode(orderDTO));
}
-
/**
* 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑瀹氫箟
@@ -390,7 +389,6 @@
//TODO鍚庣画鍙互瀹氫箟鏌ヨ妯℃澘鏉ユ煡璇�
return engineService.gridTableDataByClassifyOid(codeClassifyOid,templateOid,queryObject.getConditionMap(),queryObject.getPageHelper());
}
-
/***
* 鑾峰彇鍒嗙被瀵硅薄
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
index 8b842c9..6c03a06 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
@@ -90,8 +90,7 @@
* @param oid 鍒嗙被鐨勪富閿�
* @return 鏁版嵁闆嗗悎
*/
- List<CodeClassify> selectAllLevelChildHasPath(@Param("oid") String oid,@Param("fieldInPath")String fieldInPath);
-
+ List<CodeClassify> selectAllLevelChildHasPath(@Param("oid") String oid,@Param("fieldInPath")String fieldInPath,@Param("tenantId")String tenantId);
@MapKey("OID")
List<Map<String,Object>> selectAllLevelParentByOid(@Param("oid") String oid);
@@ -99,10 +98,8 @@
@MapKey("OID")
List<Map<String,Object>> selectAllLevelParents(@Param("oid") String oid);
-
@MapKey("OID")
List<Map<String,Object>> selectByFieldPath(@Param("fieldPath") String fieldPath);
-
/**
* 鏌ユ牴鎹甶d灞傜骇鑾峰彇瀵硅薄
@@ -114,7 +111,6 @@
List<CodeClassify> selectByFieldNamePath(@Param("fieldPath") String fieldPath,@Param("fieldName") String fieldName);
public List<CodeClassify> getIdPathToNamePathByParentId(@Param("parentId")String parentId);
-
CodeClassify selectByIdRel(@Param("oid") String oid);
/**
@@ -133,10 +129,12 @@
* @return
*/
List<CodeClassify> getRMLibByName(List<String> libNames,@Param("lcstatus")String lcstatus,@Param("tenantId") String tenantId);
+
/***
* 鏍规嵁鍒嗙被鎻忚堪澶囨敞鍜屽簱鑺傜偣鏌ヨ鍒嗙被淇℃伅
* @param desc
- * @param codeLibName
+ * @param lcstatus
+ * @param tenantId
* @return
*/
List<CodeClassify> getRMTypeByDesc(@Param("desc")String desc,@Param("lcstatus")String lcstatus,@Param("tenantId") String tenantId);
@@ -175,5 +173,5 @@
* @param oid
* @return
*/
- List<CodeClassify> selectAllClassifyByOid(@Param("oid") String oid,@Param("tenantId") String tenantId);
+ List<CodeClassify> selectAllClassifyByOid(@Param("oid") String oid,@Param("fieldInPath")String fieldInPath,@Param("tenantId") String tenantId);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
index 1b0a786..01d750c 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
@@ -291,8 +291,9 @@
/**
* 鏍规嵁鍒嗙被鎻忚堪澶囨敞鍜屽簱鑺傜偣鏌ヨ鍒嗙被淇℃伅
* @param oid
+ * @param fieldInPath
* @return
*/
- List<CodeClassifyVO> selectAllClassifyByOid(String oid);
+ List<CodeClassifyVO> selectAllClassifyByOid(String oid, String fieldInPath);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeKeyAttrRepeatService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeKeyAttrRepeatService.java
index c950e5a..340268e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeKeyAttrRepeatService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeKeyAttrRepeatService.java
@@ -77,4 +77,26 @@
* @return 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏄剧ず瀵硅薄
*/
CodeKeyAttrRepeatRuleVO getObjectByOid(String oid);
+
+ /**
+ * 淇敼鍏抽敭灞炴�ф煡閲嶈鍒�
+ * @param codeKeyattrrepeat
+ * @return
+ */
+ boolean addSave(CodeKeyAttrRepeat codeKeyattrrepeat);
+
+ /**
+ * 鏂板鍏抽敭灞炴�ф煡閲嶈鍒�
+ * @param codeKeyattrrepeat
+ * @return
+ */
+ boolean update(CodeKeyAttrRepeat codeKeyattrrepeat);
+
+ /**
+ * 鍒犻櫎鍏抽敭灞炴�ф煡閲嶈鍒�
+ * @param oids
+ * @return
+ */
+ boolean deleteByOids(String oids);
+
}
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 5cdc488..062e7ef 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
@@ -639,12 +639,13 @@
* @param oid
* @return
*/
- public List<CodeClassifyVO> selectAllClassifyByOid(String oid){
- List<CodeClassify> codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(oid,AuthUtil.getTenantId());
+ public List<CodeClassifyVO> selectAllClassifyByOid(String oid, String fieldInPath){
+ List<CodeClassify> codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(oid,AuthUtil.getTenantId(),fieldInPath);
List<CodeClassifyVO> voList = codeClassifyDO2VOs(codeClassifyList);
return voList;
}
+
/***
* 鏍规嵁鍒嗙被鎻忚堪澶囨敞鍜屽簱鑺傜偣鏌ヨ鍒嗙被淇℃伅
* @param desc
@@ -807,9 +808,8 @@
@Override
public List<CodeClassifyVO> listChildrenClassify(String codeClassifyOid, boolean allLevel, String fieldInPath, boolean enable) {
if(allLevel){
- List<CodeClassify> classifyDOS = codeClassifyMapper.selectAllLevelChildHasPath(codeClassifyOid,fieldInPath);
+ List<CodeClassify> classifyDOS = codeClassifyMapper.selectAllLevelChildHasPath(codeClassifyOid,fieldInPath,AuthUtil.getTenantId());
if(!CollectionUtils.isEmpty(classifyDOS)){
- // 杩欏効鐢╯tream鏈夌偣鎱�
classifyDOS = classifyDOS.parallelStream().filter(s->FRAMEWORK_DATA_ENABLED.equalsIgnoreCase(s.getLcStatus())).collect(Collectors.toList());
}
return codeClassifyDO2VOs(classifyDOS);
@@ -928,7 +928,7 @@
Map<String/**璺緞**/,String/**涓婚敭**/> oidPathMap = new HashMap<>();
//鎴戜滑闇�瑕佹煡璇㈡墍鏈夊凡缁忓瓨鍦ㄧ殑鍒嗙被锛屼富瑕佹槸璺緞锛岀敤鏉ュ垽鏂垎绫荤殑鏁版嵁
- List<CodeClassify> existClassifyDOs = codeClassifyMapper.selectAllLevelChildHasPath("",null);
+ List<CodeClassify> existClassifyDOs = codeClassifyMapper.selectAllLevelChildHasPath("",null,AuthUtil.getTenantId());
Map<String/**璺緞**/, CodeClassify/**宸茬粡瀛樺湪鐨勬暟鎹�**/> pathDOMap = Optional.ofNullable(existClassifyDOs).orElse(new ArrayList<>()).stream().collect(Collectors.toMap(s -> {
String path = s.getPath();
if(StringUtils.isNotBlank(path) && path.startsWith("#")){
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeKeyAttrRepeatServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeKeyAttrRepeatServiceImpl.java
index 760a3e1..6ea1ff0 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeKeyAttrRepeatServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeKeyAttrRepeatServiceImpl.java
@@ -17,6 +17,7 @@
package com.vci.ubcs.code.service.impl;
import com.alibaba.nacos.common.utils.StringUtils;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.entity.CodeKeyAttrRepeat;
import com.vci.ubcs.code.enumpack.FrameworkDataLCStatus;
@@ -26,16 +27,22 @@
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeKeyAttrRepeatRuleVO;
import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
+import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.Func;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.util.CollectionUtils;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -50,12 +57,12 @@
@Service
public class CodeKeyAttrRepeatServiceImpl implements ICodeKeyAttrRepeatService {
- @Autowired
- CodeKeyAttrRepeatMapper codeKeyattrrepeatMapper;
+ @Resource
+ CodeKeyAttrRepeatMapper codeKeyAttrRepeatMapper;
@Override
public IPage<CodeKeyAttrRepeatVO> selectPlCodeKeyattrrepeatPage(IPage<CodeKeyAttrRepeatVO> page, CodeKeyAttrRepeatVO plCodeKeyattrrepeat) {
- return page.setRecords(codeKeyattrrepeatMapper.selectPlCodeKeyattrrepeatPage(page, plCodeKeyattrrepeat));
+ return page.setRecords(codeKeyAttrRepeatMapper.selectPlCodeKeyattrrepeatPage(page, plCodeKeyattrrepeat));
}
/**
@@ -100,7 +107,7 @@
if(!CollectionUtils.isEmpty(oidCollections)){
Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
for(Collection<String> oids: oidCollectionsList){
- List<CodeKeyAttrRepeat> tempDOList = codeKeyattrrepeatMapper.selectBatchIds(oids);
+ List<CodeKeyAttrRepeat> tempDOList = codeKeyAttrRepeatMapper.selectBatchIds(oids);
if(!CollectionUtils.isEmpty(tempDOList)){
codeKeyAttrRepeatRuleDOList.addAll(tempDOList);
}
@@ -173,6 +180,58 @@
BeanUtils.copyProperties(codeKeyAttrRepeatRuleVO,codeKeyattrrepeatVO);
return codeKeyAttrRepeatRuleVO;
}
+
+ /**
+ * 淇敼鍏抽敭灞炴�ф煡閲嶈鍒�
+ * @param codeKeyattrrepeat
+ * @return
+ */
+ @Override
+ public boolean addSave(CodeKeyAttrRepeat codeKeyattrrepeat) {
+ // 璁剧疆榛樿鍊�
+ codeKeyattrrepeat.setCreator(AuthUtil.getUserAccount());
+ codeKeyattrrepeat.setCreatetime(new Date());
+ codeKeyattrrepeat.setLastmodifier(AuthUtil.getUserAccount());
+ codeKeyattrrepeat.setLastmodifytime(new Date());
+ codeKeyattrrepeat.setBtmname(MdmBtmTypeConstant.CODE_KEY_ATTR_REPEAT_RULE);
+ codeKeyattrrepeat.setFirstr("1");
+ codeKeyattrrepeat.setFirstv("1");
+ codeKeyattrrepeat.setLastr("1");
+ codeKeyattrrepeat.setLastv("1");
+ codeKeyattrrepeat.setLcstatus("Enabled");
+ codeKeyattrrepeat.setRevisionseq(1);
+ codeKeyattrrepeat.setRevisionoid(VciBaseUtil.getPk());
+ codeKeyattrrepeat.setRevisionvalue("1");
+ codeKeyattrrepeat.setRevisionrule("1");
+ codeKeyattrrepeat.setVersionseq(1);
+ codeKeyattrrepeat.setVersionrule("0");
+ codeKeyattrrepeat.setVersionvalue("1");
+ return SqlHelper.retBool(codeKeyAttrRepeatMapper.insert(codeKeyattrrepeat));
+ }
+
+ /**
+ * 鏂板鍏抽敭灞炴�ф煡閲嶈鍒�
+ * @param codeKeyattrrepeat
+ * @return
+ */
+ @Override
+ public boolean update(CodeKeyAttrRepeat codeKeyattrrepeat) {
+ // 璁剧疆榛樿鍊�
+ codeKeyattrrepeat.setLastmodifier(AuthUtil.getUserAccount());
+ codeKeyattrrepeat.setLastmodifytime(new Date());
+ return SqlHelper.retBool(codeKeyAttrRepeatMapper.updateById(codeKeyattrrepeat));
+ }
+
+ /**
+ * 鍒犻櫎鍏抽敭灞炴�ф煡閲嶈鍒�
+ * @param oids
+ * @return
+ */
+ @Override
+ public boolean deleteByOids(String oids) {
+ return SqlHelper.retBool(codeKeyAttrRepeatMapper.deleteById(oids));
+ }
+
/**
* 涓婚敭鏌ヨ鏁版嵁瀵硅薄
* @param oid 涓婚敭
@@ -182,11 +241,12 @@
private CodeKeyAttrRepeat selectByOid(String oid) {
VciBaseUtil.alertNotNull(oid,"涓婚敭");
- CodeKeyAttrRepeat codeKeyAttrRepeatRuleDO = codeKeyattrrepeatMapper.selectById(oid.trim());
+ CodeKeyAttrRepeat codeKeyAttrRepeatRuleDO = codeKeyAttrRepeatMapper.selectById(oid.trim());
// .selectByPrimaryKey(oid.trim());
if(codeKeyAttrRepeatRuleDO == null || StringUtils.isBlank(codeKeyAttrRepeatRuleDO.getOid())){
throw new VciBaseException(DATA_OID_NOT_EXIST);
}
return codeKeyAttrRepeatRuleDO;
}
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index a515f25..3d56800 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -995,7 +995,6 @@
}
}
-
/**
* 鍒濆鍖栦笟鍔＄被鍨�
* --鍒涘缓浜洪粯璁や负褰撳墠鐢ㄦ埛锛屽鏋滈渶瑕佷慨鏀癸紝鍙互鍦ㄨ幏鍙栧悗鑷澶勭悊
@@ -2774,6 +2773,7 @@
cbo.setName(orderDTO.getName());
//鏁版嵁鐨勬椂鍊欙紝缂栫爜鏄笉鍙樼殑
cbo.setCreateTime(cbo.getCreateTime());
+ cbo.setCreator(cbo.getCreator());
cbo.setLastModifyTime(cbo.getLastModifyTime());
cbo.setTenantId(AuthUtil.getTenantId());
oldCbo.setLastV("0");
@@ -4188,7 +4188,7 @@
toBo.setLastV(String.valueOf(1));
// 鏁版嵁鍗囩増涓嶉渶瑕侀噸鏂拌缃垱寤轰汉锛屽彧瀵规渶鍚庝慨鏀逛汉鍋氭洿鏂板氨鍙互浜�
//toBo.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
- toBo.setCreateTime(new Date());
+ toBo.setCreateTime(fromBo.getCreateTime());
// toBo.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
toBo.setLastModifier(String.valueOf(AuthUtil.getUser().getAccount()));
toBo.setLastModifyTime(new Date());
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index d33879a..65946d8 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -942,7 +942,7 @@
if (CollectionUtils.isEmpty(ruleOidMap.values())) {
throw new VciBaseException("瀵煎叆鐨勬暟鎹墍閫夋嫨鐨勫垎绫婚兘娌℃湁璁剧疆缂栫爜瑙勫垯");
}
- // TODO: 鏀圭敤oid鏌ヨ瑙勫垯鐨勶紝鍒敤id
+ // TODO: 璇ョ敤oid鏌ヨ瑙勫垯鐨勶紝鍒敤id
Map<String, CodeRuleVO> ruleVOMap = ruleService.listCodeRuleByOids(ruleOidMap.values()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
//鏍￠獙缂栫爜瑙勫垯鍜岀爜娈垫槸鍚︽纭�
Map<String, List<String>> ruleRowIndexMap = new ConcurrentHashMap<>();
@@ -1538,7 +1538,6 @@
total += commonsMapper.queryCountBySql(countSql);
}
}else{
-
total = commonsMapper.queryCountBySql(countSql);
}
List<String> selectFieldList = new ArrayList<>();
@@ -1966,7 +1965,6 @@
//閮借浆鎹㈠畬浜嗐�傞渶瑕佹壒閲忔鏌�
//濡傛灉鍑洪敊浜嗭紝鎴戜滑渚濈劧鎵ц鏈夋晥鐨勬暟鎹紝鏃犳晥鐨勬暟鎹啓鍥炲埌excel涓�
-
Map<String,String> errorKeyMap=new HashMap<>();
//1.鍒嗙被娉ㄥ叆
@@ -3149,6 +3147,7 @@
});
}
+
/**
* excel杞崲涓篶bo鐨勫璞�
* @param classifyFullInfo 鍒嗙被鐨勫叏閮ㄤ俊鎭�
@@ -3166,7 +3165,7 @@
ClientBusinessObject cbo=new ClientBusinessObject();
DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId());
rowData.getData().forEach((index,value)->{
- String field = fieldIndexMap.get(index);
+ String field = fieldIndexMap.get(index);
if (StringUtils.isBlank(field)) {
throw new VciBaseException("绗�" + (index + 1) + "鍒楃殑鏍囬鍦ㄧ郴缁熶腑涓嶅瓨鍦�");
}
@@ -3523,6 +3522,7 @@
});
}
}
+
/***
* 鏍￠獙鍒嗙被瀵瑰簲鐨勬ā鏉夸俊鎭�
* @param titleRowData
@@ -3606,6 +3606,7 @@
}
return codeClassifyTemplateVOList ;
}
+
/**
* 浠庡睘鎬т笂鑾峰彇鍙傜収鐨勫唴瀹�
* @param attrVO 灞炴�х殑淇℃伅
@@ -3874,7 +3875,7 @@
if(StringUtils.isBlank(classifyPath)){
classifyPath = "#current#";
}
- if ( !pathMap.containsKey(classifyPath)) {
+ if (!pathMap.containsKey(classifyPath)) {
String row_index = cbo.getAttributeValue(IMPORT_ROW_INDEX);
errorMap.put(row_index,errorMap.getOrDefault(row_index,"") + ";鍒嗙被璺緞涓嶅瓨鍦�");
} else {
@@ -4054,6 +4055,7 @@
}
}
}
+
private List<ClientBusinessObject> ChangeMapTOClientBusinessObjects(List<Map<String,String>> oldDataMap){
List<ClientBusinessObject> clientBusinessObjectList=new ArrayList<>();
oldDataMap.stream().forEach(dataMap->{
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index 7c4d378..e468dc1 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -1381,7 +1381,7 @@
TreeQueryObject treeQueryObject=new TreeQueryObject();
treeQueryObject.setParentOid(oid);
treeQueryObject.setQueryAllLevel(true);
- dataCodeClassifyVOList=classifyService.selectAllClassifyByOid(oid);//.selectCodeClassifyDOByTree(treeQueryObject);
+ dataCodeClassifyVOList=classifyService.selectAllClassifyByOid(oid,"oid");//.selectCodeClassifyDOByTree(treeQueryObject);
//dataCodeClassifyVOList.add(CodeClassifyWrapper.build().entityVO(currentCodeClassify[0]));
Map<String, CodeClassifyVO> oidCodeclassifyDOMap = dataCodeClassifyVOList.stream().filter(systeDataObject -> systeDataObject != null && StringUtils.isNotBlank(systeDataObject.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
index 229b39f..a604bf7 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
@@ -111,6 +111,7 @@
order by lastmodifytime asc
</select>
+ <!--codeclassify0.parentCodeClassifyOid = '${oid}'-->
<select id="selectAllLevelChildHasPath" resultMap="plCodeClassifyResultMap">
select codeclassify0.OWNER as owner,
codeclassify0.BTMTYPEID as btmtypeid,
@@ -155,10 +156,13 @@
on codeclassify0.codeResembleRuleOid = coderesembleruleoid.oid
START WITH
<if test="oid != null ">
- codeclassify0.parentCodeClassifyOid = '${oid}'
+ codeclassify0.parentCodeClassifyOid = #{oid}
</if>
<if test="oid == null ">
codeclassify0.parentCodeClassifyOid is null
+ </if>
+ <if test="tenantId != null and tenantId != ''">
+ and codeclassify0.tenant_id = #{tenantId}
</if>
CONNECT BY PRIOR codeclassify0.OID = codeclassify0.parentCodeClassifyOid
</select>
@@ -461,9 +465,10 @@
</if>
order by id asc
</select>
+
<!--鑾峰彇鎵�鏈変笅绾ц妭鐐�,涓嶈鍔ㄨ繖涓柟娉晄ql-->
<select id="selectAllClassifyByOid" resultMap="plCodeClassifyResultMap">
- select codeclassify0.OWNER as owner,
+ select codeclassify0.OWNER as owner,
codeclassify0.BTMTYPEID as btmtypeid,
codeclassify0.CREATOR as creator,
codeclassify0.CREATETIME as createtime,
--
Gitblit v1.9.3