소스 검색

客户数据匹配导出修改

anderx 1 년 전
부모
커밋
6fae76b35b

+ 1 - 1
src/main/java/com/goafanti/common/utils/excel/NewExcelUtil.java

@@ -283,7 +283,7 @@ public class NewExcelUtil<T> {
 					CellRangeAddress region = new CellRangeAddress(0, 0, 0, fields.size()-1);
 					sheet.addMergedRegion(region);
 					cell.setCellStyle(styles.get("total"));
-					if (StringUtils.isNotNull(screen)){
+					if (StringUtils.isNotEmpty(screen)){
 						log.debug(screen);
 						Row r = sheet.createRow(++line);
 						Cell c = r.createCell(0);

+ 2 - 2
src/main/java/com/goafanti/customer/bo/InputExcelUser.java

@@ -4,7 +4,7 @@ import com.goafanti.common.utils.excel.Excel;
 
 public class InputExcelUser {
 
-    @Excel(name = "企业名称")
+    @Excel(name = "企业名称",width = 32)
     private String name;
 
     @Excel(name = "类型",readConverterExp = "0=无,1=已存在")
@@ -12,7 +12,7 @@ public class InputExcelUser {
 
     @Excel(name = "状态",readConverterExp = "0=私有,1=公共,2=签单")
     private Integer status;
-    @Excel(name = "营销员")
+    @Excel(name = "营销员",width = 32)
     private String aname;
 
     public Integer getType() {

+ 5 - 5
src/main/resources/props/config_local.properties

@@ -4,13 +4,13 @@ jdbc.driverClassName=com.mysql.jdbc.Driver
 static.host=//uat.jishutao.com/1.3.17
 #static.host=//172.16.1.187/1.3.17
 
-#jdbc.url=jdbc\:mysql://localhost:3306/aft20240430?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc\:mysql://localhost:3306/aft20240430?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.username=root
-#jdbc.password=123456
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 jdbc.username=root
-jdbc.password=aftdev
+jdbc.password=123456
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20