From 545cc3a93547af47080440010c03b70ed7baabdd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 25 六月 2024 18:22:08 +0800
Subject: [PATCH] 提交一把
---
server/company/pom.xml | 2 +-
server/platform/pom.xml | 2 +-
server/shop/pom.xml | 3 +--
server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 3 ++-
server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java | 27 +++++++++++++++------------
5 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/server/company/pom.xml b/server/company/pom.xml
index cc80143..23aaa4a 100644
--- a/server/company/pom.xml
+++ b/server/company/pom.xml
@@ -26,7 +26,7 @@
</dependencies>
<build>
- <finalName>company</finalName>
+ <finalName>yyb_web_api</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
diff --git a/server/platform/pom.xml b/server/platform/pom.xml
index fc02c10..8e438b6 100644
--- a/server/platform/pom.xml
+++ b/server/platform/pom.xml
@@ -22,7 +22,7 @@
</dependency>
</dependencies>
<build>
- <finalName>platform</finalName>
+ <finalName>yyb_admin_api</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
diff --git a/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
index ac47064..d0213e8 100644
--- a/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -211,7 +211,8 @@
if(StringUtils.isBlank(systemUser.getMobile()) || StringUtils.isBlank(systemUser.getCaptcha())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐭俊楠岃瘉鐮佷笉鑳戒负绌猴紒");
}
- if(!debugModel){
+ String phoneAtuh = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.COMPANY_PHONE_AUTH).getCode();
+ if(!debugModel && !StringUtils.equals(phoneAtuh,Constants.ONE+"")){
SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,systemUser.getMobile(),systemUser.getCaptcha());
}
}
diff --git a/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java b/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
index 6401da6..99f5f1e 100644
--- a/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
+++ b/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
@@ -1190,24 +1190,27 @@
}
Row header1 = sheet.createRow(1);
header1.createCell(0).setCellValue("鎶曚繚浜�");
- header1.createCell(1).setCellValue("琚繚闄╀汉");
- header1.createCell(2).setCellValue("");
- header1.createCell(3).setCellValue("淇濋櫓鏂规");
- header1.createCell(4).setCellValue("淇濋櫓鐢熸晥璧锋湡");
- header1.createCell(5).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
+ header1.createCell(1).setCellValue("");
+ header1.createCell(2).setCellValue("琚繚闄╀汉");
+ header1.createCell(3).setCellValue("");
+ header1.createCell(4).setCellValue("淇濋櫓鏂规");
+ header1.createCell(5).setCellValue("鐢宠鎻愪氦鏃ユ湡");
+// header1.createCell(5).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
for (int i = 0; i < 6; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(1 ,1,1,2));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,0,1));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,2,3));
Row header2 = sheet.createRow(2);
header2.createCell(0).setCellValue(insuranceApply.getShopName());
- header2.createCell(1).setCellValue(insuranceApply.getCompanyName());
- header2.createCell(2).setCellValue(insuranceApply.getInsureNum());
- header2.createCell(3).setCellValue(insuranceApply.getSolutionsName());
- header2.createCell(4).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(insuranceApply.getStartTime()));
- header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(insuranceApply.getEndTime()));
- sheet.addMergedRegion(new CellRangeAddress(2 ,2,1,2));
+ header2.createCell(1).setCellValue("");
+ header2.createCell(2).setCellValue(insuranceApply.getCompanyName());
+ header2.createCell(3).setCellValue("");
+ header2.createCell(4).setCellValue(insuranceApply.getSolutionsName());
+ header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(insuranceApply.getCreateDate()));
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,0,1));
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,2,3));
for (int i = 0; i < 6; i++) {
configDataCell(sxssfWorkbook,header2.getCell(i));
}
diff --git a/server/shop/pom.xml b/server/shop/pom.xml
index 5e2f480..435cdcf 100644
--- a/server/shop/pom.xml
+++ b/server/shop/pom.xml
@@ -23,13 +23,12 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
- <finalName>shop</finalName>
+ <finalName>yyb_shop_api</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
-
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
--
Gitblit v1.9.3