From 4eb538236362fd940f74d8b3e7bcb0bd63ce80f6 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 05 十二月 2023 13:51:41 +0800
Subject: [PATCH] 用户管理修改界面限制账号修改，导出分页bug修改
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
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 615a8db..d867d06 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
@@ -199,9 +199,9 @@
private SaveLogUtil saveLogUtil;
/**
- * 瀵煎嚭鐨勫崄涓囨潯
+ * 瀹㈡埛鐜板満excel涓鸿�佺増鏈紝瀵煎嚭鐨勬�绘暟闄愬埗涓�65535
*/
- public static final int EXPORT_LIMIT = 100000;
+ public static final int EXPORT_LIMIT = 65535;
/**
* 鎵归噺鐢宠锛氶�夊彇閫変腑鍒嗙被涓嬬殑鎵�鏈夋ā鏉垮叧閿睘鎬э紝鐩镐技灞炴�э紝蹇呭～灞炴�э紝鍐欏叆execl涓�
@@ -382,7 +382,7 @@
CodeClassifyVO codeClassifyVO = classifyService.getObjectByOid(codeClassifyOid);
//鑾峰彇鐮佹瀹藉害
- //String secWidth = getCodeSegmentWidth(codeClassifyVO.getOid());
+ String secWidth = getCodeSegmentWidth(codeClassifyVO.getOid());
if(isHistory){
templateVOList= templateService.childTemplates(codeClassifyOid);
@@ -612,6 +612,7 @@
ExcelUtil.writeDataToFile(excelName,eo);
return excelName;
}
+
/**
* 鑾峰彇鐮佹瀹藉害
* @param codeClassifyOid
@@ -1274,6 +1275,7 @@
throw e;
}
}
+
/**
* 瀵煎叆鎵归噺缂栬緫鏁版嵁
*
@@ -1837,10 +1839,10 @@
tableName = VciBaseUtil.getTableName(btmTypeId);
}
- String countSql = "select count(*) from " + tableName +" where 1=1" +
+ String countSql = "select count(*) from (select * FROM " + tableName +" where 1=1" +
" and lastr = '1'" +
" and lastv='1'" +
- " and codeclsfpath like '%" + exportAttrDTO.getCodeClassifyOid() + "%'";
+ " and codeclsfpath like '%" + exportAttrDTO.getCodeClassifyOid() + "%' {}";
//鍏堟煡璇㈡�绘暟
int total = 0;
@@ -1854,8 +1856,7 @@
thisPage.setSort(exportAttrDTO.getSort());
thisPage.setOrder(exportAttrDTO.getOrder());
thisPage.addDefaultDesc("createTime");
-
- total += commonsMapper.queryCountBySql(countSql);
+ total += commonsMapper.queryCountBySql(StringUtil.format(countSql," limit " + exportAttrDTO.getLimit() +" offset "+ i +")subquery;"));
}
}else{
total = commonsMapper.queryCountBySql(countSql);
--
Gitblit v1.9.3