From deba19bf6b73448c9f7a0ee1ef85d5ee99b50bb4 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 20 七月 2023 14:44:03 +0800
Subject: [PATCH] 提交代码
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 13 ++++++++++---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeExportAttrDTO.java | 6 +++---
Source/UBCS/service-start.sh | 8 ++++----
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS/service-start.sh b/Source/UBCS/service-start.sh
index 14e2797..2b0acee 100644
--- a/Source/UBCS/service-start.sh
+++ b/Source/UBCS/service-start.sh
@@ -6,8 +6,8 @@
mvn clean package
#鍚姩admin鏈嶅姟
- docker build -f ./ubcs-ops/ubcs-admin/Dockerfile -t vci-ubcs/ubcs-admin .
- docker run -d -p 36002:36002 --name ubcs-admin vci-ubcs/ubcs-admin:latest
+# docker build -f ./ubcs-ops/ubcs-admin/Dockerfile -t vci-ubcs/ubcs-admin .
+# docker run -d -p 36002:36002 --name ubcs-admin vci-ubcs/ubcs-admin:latest
#鍚姩auth鏈嶅姟
docker build -f ./ubcs-auth/Dockerfile -t vci-ubcs/ubcs-auth .
@@ -46,8 +46,8 @@
docker run -d -p 36007:36007 --name ubcs-resource vci-ubcs/ubcs-resource:latest
#鍚姩swagger鏈嶅姟
- docker build -f ./ubcs-ops/ubcs-swagger/Dockerfile -t vci-ubcs/ubcs-swagger .
- docker run -d -p 36008:36008 --name ubcs-swagger vci-ubcs/ubcs-swagger:latest
+# docker build -f ./ubcs-ops/ubcs-swagger/Dockerfile -t vci-ubcs/ubcs-swagger .
+# docker run -d -p 36008:36008 --name ubcs-swagger vci-ubcs/ubcs-swagger:latest
#鍚姩system鏈嶅姟
docker build -f ./ubcs-service/ubcs-system/Dockerfile -t vci-ubcs/ubcs-system .
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeExportAttrDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeExportAttrDTO.java
index 8f8ff61..4dd340d 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeExportAttrDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeExportAttrDTO.java
@@ -46,7 +46,7 @@
/**
* 鏌ヨ鏉′欢
*/
- private Map<String,String> conditionMap;
+ private Map<String,Object> conditionMap;
/**
* 鍒嗙被鐨勪富閿�
@@ -101,11 +101,11 @@
this.order = order;
}
- public Map<String, String> getConditionMap() {
+ public Map<String, Object> getConditionMap() {
return conditionMap;
}
- public void setConditionMap(Map<String, String> conditionMap) {
+ public void setConditionMap(Map<String, Object> conditionMap) {
this.conditionMap = conditionMap;
}
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 1a3e472..7e0986d 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
@@ -34,6 +34,7 @@
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.LocalFileUtil;
+import com.vci.ubcs.starter.util.UBCSSqlKeyword;
import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
import com.vci.ubcs.starter.web.enumpck.BooleanEnum;
import com.vci.ubcs.starter.web.enumpck.UserSecretEnum;
@@ -1473,7 +1474,7 @@
CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(exportAttrDTO.getCodeClassifyOid());
//鍏堟煡璇㈡暟鎹�
String btmTypeId = classifyFullInfo.getTopClassifyVO().getBtmTypeId();
- Map<String, String> conditionMap = exportAttrDTO.getConditionMap();
+ Map<String, Object> conditionMap = exportAttrDTO.getConditionMap();
if(conditionMap == null){
conditionMap = new HashMap<>();
}
@@ -1489,6 +1490,7 @@
conditionMap.put("codeclsfpath","*" + exportAttrDTO.getCodeClassifyOid() + "*");
conditionMap.put("lastr", "1");
conditionMap.put("lastv", "1");
+ UBCSSqlKeyword.buildSqlwhere(conditionMap);
//鍏堟煡璇㈡�绘暟
int total = 0;
if(exportAttrDTO.getEndPage()!=null && exportAttrDTO.getEndPage()>0
@@ -1502,10 +1504,11 @@
thisPage.setOrder(exportAttrDTO.getOrder());
thisPage.addDefaultDesc("createTime");
- //total += boService.queryCount(btmTypeId, conditionMap);
+ total += boService.queryCount(btmTypeId, conditionMap);
}
}else{
- //total=boService.queryCount(btmTypeId, conditionMap);
+
+ total=boService.queryCount(btmTypeId, conditionMap);
}
List<String> selectFieldList = new ArrayList<>();
if(!CollectionUtils.isEmpty(exportAttrDTO.getAttrIdIndexMap())){
@@ -1578,6 +1581,9 @@
LocalFileUtil.deleteTempFile(file,true);
return zipFileName;
}
+
+ private
+
/**
* 鏌ヨ鏁版嵁骞跺鍑哄埌excel
@@ -4289,4 +4295,5 @@
}
}
}
+
}
--
Gitblit v1.9.3