From 695e4a085727ef5017597dd1ab72a47d0e9883e6 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 30 五月 2023 19:19:55 +0800
Subject: [PATCH] 代码整合
---
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreClassifyServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreClassifyServiceImpl.java
similarity index 67%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreClassifyServiceImpl.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreClassifyServiceImpl.java
index c2ca759..5872185 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreClassifyServiceImpl.java
@@ -1,26 +1,29 @@
-package com.vci.ubcs.code.service.impl;
+package com.vci.ubcs.code.webservice.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vci.ubcs.code.entity.DockingPreClassify;
-import com.vci.ubcs.code.enumpack.FrameworkDataLCStatus;
-import com.vci.ubcs.code.mapper.DockingPreClassifyMapper;
-import com.vci.ubcs.code.service.IDockingPreClassifyService;
-import com.vci.ubcs.code.service.IDockingPreViewModelService;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreClassifyVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreViewModelVO;
-import com.vci.ubcs.code.wrapper.DockingPreClassifyWrapper;
+import com.vci.ubcs.code.webservice.mapper.DockingPreClassifyMapper;
+import com.vci.ubcs.code.webservice.service.IDockingPreApplyFormService;
+import com.vci.ubcs.code.webservice.service.IDockingPreAttrMappingService;
+import com.vci.ubcs.code.webservice.service.IDockingPreClassifyService;
+import com.vci.ubcs.code.webservice.service.IDockingPreViewModelService;
+import com.vci.ubcs.code.webservice.wrapper.DockingPreClassifyWrapper;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.revision.model.TreeWrapperOptions;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
+import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.web.pagemodel.Tree;
+import com.vci.ubcs.code.webservice.entity.DockingPreClassify;
+import com.vci.ubcs.code.webservice.vo.DockingPreClassifyVO;
+import com.vci.ubcs.code.webservice.vo.DockingPreViewModelVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.*;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
-import static com.vci.ubcs.code.constant.MdmBtmTypeConstant.CODE_CLASSIFY_OID_FIELD;
-import static com.vci.ubcs.code.service.impl.CodeClassifyServiceImpl.PARENT_FIELD_NAME;
/**
* 闆嗗洟鍒嗙被涓氬姟鏈嶅姟
@@ -30,6 +33,10 @@
@Service
@Slf4j
public class DockingPreClassifyServiceImpl extends ServiceImpl<DockingPreClassifyMapper, DockingPreClassify> implements IDockingPreClassifyService {
+ /**
+ * 涓婄骇鑺傜偣鐨勫睘鎬у悕绉�
+ */
+ public static final String PARENT_FIELD_NAME = "parentCodeClassifyOid";
/***
* 闆嗗洟鍒嗙被灞炴��
*/
@@ -41,6 +48,14 @@
*/
@Resource
private IDockingPreViewModelService dockingPreViewModelService;
+
+
+ /***
+ *闆嗗洟闆嗘垚閰嶇疆鏈嶅姟
+ */
+ @Resource
+ private IDockingPreAttrMappingService dockingPreAttrMappingService;
+
/**
* 瀵硅薄鐨勬搷浣�
@@ -61,16 +76,19 @@
List<DockingPreClassifyVO> dockingPreClassifyVOS= getCompanyGourpClassByParentId(treeQueryObject.getParentOid(),true);
List<Tree> tree= revisionModelUtil.doList2Trees(dockingPreClassifyVOS,treeWrapperOptions,(DockingPreClassifyVO s) ->{
//鍙互鍦ㄨ繖閲屽鐞嗘爲鑺傜偣鐨勬樉绀�
- return s.getId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s
- .getLcStatus()) ? (" 銆愬仠鐢ㄣ�� ") : "");
+ return s.getId() + " " + s.getName();//(FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s.getLcStatus()) ? (" 銆愬仠鐢ㄣ�� ") : "");
});
Iterator var6 = tree.listIterator();
while(var6.hasNext()){
Tree trees = (Tree) var6.next();
boolean checkHasChild=dockingPreClassifyMapper.checkHasChild(trees.getOid());
//濡傛灉涓庢潯浠朵紶杩囨潵鐨勫�煎尮閰嶇殑涓婂垯璁剧疆涓洪�変腑
- if(conditionMap.containsKey(CODE_CLASSIFY_OID_FIELD)){
- trees.setChecked(true);
+ if(conditionMap.containsKey(MdmBtmTypeConstant.CODE_CLASSIFY_OID_FIELD)){
+ String codeClassifyId=conditionMap.get(MdmBtmTypeConstant.CODE_CLASSIFY_OID_FIELD);
+ boolean checkHas=dockingPreAttrMappingService.checkHasConfigByTragetCodeclassifyId(codeClassifyId);
+ if(checkHas) {
+ trees.setChecked(true);
+ }
}
;
if(checkHasChild){
--
Gitblit v1.9.3