From ee300eca8f8414604cd94aa29f2b80e7d32413f6 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 09 二月 2026 10:18:00 +0800
Subject: [PATCH] 提交
---
server/admin/pom.xml | 2 +-
.idea/compiler.xml | 2 ++
server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java | 16 +++++-----------
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 3a29174..191683e 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -14,6 +14,7 @@
</annotationProcessing>
<bytecodeTargetLevel>
<module name="admin" target="1.8" />
+ <module name="diandongche" target="1.8" />
<module name="dianjiang" target="1.8" />
<module name="services" target="1.8" />
<module name="web" target="1.8" />
@@ -22,6 +23,7 @@
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="admin" options="-parameters" />
+ <module name="diandongche" options="-parameters" />
<module name="dianjiang" options="-parameters" />
<module name="services" options="-parameters" />
<module name="web" options="-parameters" />
diff --git a/server/admin/pom.xml b/server/admin/pom.xml
index adf6033..69adc8b 100644
--- a/server/admin/pom.xml
+++ b/server/admin/pom.xml
@@ -51,8 +51,8 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
- <fork>true</fork>
<mainClass>com.doumee.DJAdminApplication</mainClass>
+ <fork>true</fork>
<layout>ZIP</layout>
<includeSystemScope>true</includeSystemScope>
</configuration>
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java
index 887bc64..ec2ac2a 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java
@@ -200,11 +200,11 @@
Map<String, XSSFPictureData> pics = ie.getExcelPictures();
if(type == 1) {
List<CasesImport> importList = (ie.getDataList(CasesImport.class,null));
- model.setCaseList(isvalidImpartCasesParam(loginUserInfo,pics,importList));
+ model.setCaseList(isvalidImpartCasesParam(loginUserInfo,importList));
model.setTotalNum(model.getCaseList().size());
}else{
List<MemberImport> importList = (ie.getDataList(MemberImport.class,null));
- model.setMemberList(isvalidImpartMemberParam(loginUserInfo,categoryList,pics,importList));
+ model.setMemberList(isvalidImpartMemberParam(loginUserInfo,categoryList,importList));
model.setTotalNum(model.getMemberList().size());
}
importRecordMapper.insert(model);
@@ -219,12 +219,9 @@
// redisTemplate.delete(Constants.RedisKeys.IMPORTING_RECORD);
}
}
- private List<Member> isvalidImpartMemberParam(LoginUserInfo user, List<Category> categoryList ,Map<String, XSSFPictureData> pics, List<MemberImport> memberList) {
+ private List<Member> isvalidImpartMemberParam(LoginUserInfo user, List<Category> categoryList , List<MemberImport> memberList) {
if(memberList ==null || memberList.size()==0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈鍙栧埌鏈夋晥鏁版嵁");
- }
- if(pics ==null || pics.size()==0){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈鍙栧埌浠讳綍鑱屼笟鐓у浘鐗囨暟鎹�");
}
List<Member> insertMember = new ArrayList<>();
List<Member> allList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
@@ -353,12 +350,9 @@
return insertMember;
}
- private List<Cases> isvalidImpartCasesParam(LoginUserInfo user, Map<String, XSSFPictureData> pics, List<CasesImport> casesImportList) {
+ private List<Cases> isvalidImpartCasesParam(LoginUserInfo user, List<CasesImport> casesImportList) {
if(casesImportList ==null || casesImportList.size()==0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈鍙栧埌鏈夋晥鏁版嵁");
- }
- if(pics ==null || pics.size()==0){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈鍙栧埌浠讳綍鑱屼笟鐓у浘鐗囨暟鎹�");
}
List<Cases> insertList = new ArrayList<>();
List<Member> allList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
@@ -405,7 +399,7 @@
param.getImageList().addAll(param.getImageList3()!=null?param.getImageList3():new ArrayList<>());
param.getImageList().addAll(param.getImageList4()!=null?param.getImageList4():new ArrayList<>());
param.getImageList().addAll(param.getImageList5()!=null?param.getImageList5():new ArrayList<>());
- /* if(param.getImageList() == null
+ /* if(param.getImageList() == null
||param.getImageList().size() == 0 ){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹紝 妗堜緥鍥句俊鎭笉鑳戒负绌�");
}*/
--
Gitblit v1.9.3