From 25c68c95e9d0f77e988ef0bd4130fef6358f5efe Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 30 一月 2026 15:58:16 +0800
Subject: [PATCH] 提交忽略文件
---
server/services/src/main/java/com/doumee/service/business/impl/CasesServiceImpl.java | 2 +
server/services/src/main/java/com/doumee/dao/business/model/Cases.java | 3 +
admin/src/views/business/cases.vue | 10 +++-
admin/public/template/casees.xlsx | 0
admin/src/views/business/importRecord.vue | 1
server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java | 48 ++++++++++++------------
admin/src/components/business/OperaCasesWindow.vue | 2
server/services/src/main/java/com/doumee/dao/business/dto/CasesImport.java | 17 ++++----
8 files changed, 47 insertions(+), 36 deletions(-)
diff --git a/admin/public/template/casees.xlsx b/admin/public/template/casees.xlsx
index 38aaf8c..fdee30d 100644
--- a/admin/public/template/casees.xlsx
+++ b/admin/public/template/casees.xlsx
Binary files differ
diff --git a/admin/src/components/business/OperaCasesWindow.vue b/admin/src/components/business/OperaCasesWindow.vue
index 37fa7a3..a2d5568 100644
--- a/admin/src/components/business/OperaCasesWindow.vue
+++ b/admin/src/components/business/OperaCasesWindow.vue
@@ -16,7 +16,7 @@
v-for="item in memberList"
:key="item.id"
:value="item.id"
- :label="item.name"
+ :label="item.name+' 銆�'+item.code+'銆�'"
></el-option>
</el-select>
</el-form-item>
diff --git a/admin/src/views/business/cases.vue b/admin/src/views/business/cases.vue
index c66a554..ec782ec 100644
--- a/admin/src/views/business/cases.vue
+++ b/admin/src/views/business/cases.vue
@@ -18,7 +18,7 @@
v-for="item in memberList"
:key="item.id"
:value="item.id"
- :label="item.name"
+ :label="item.name+' 銆�'+item.code+'銆�'"
></el-option>
</el-select>
</el-form-item>
@@ -66,10 +66,14 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="memberName" label="鑰佸笀" min-width="120px"></el-table-column>
+ <el-table-column prop="memberName" label="鑰佸笀" min-width="220px">
+ <template slot-scope="{row}">
+ <span class="orange" style="margin-right: 10px"> {{row.memberCode}}</span> <span>{{row.memberName||''}}</span>
+ </template>
+ </el-table-column>
<el-table-column prop="startDate" label="寮�濮嬫棩鏈�" min-width="140px"></el-table-column>
<el-table-column prop="endDate" label="缁撴潫鏃ユ湡" min-width="140px"></el-table-column>
- <el-table-column prop="detail" label="妗堜緥鎻忚堪" min-width="230px" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="detail" label="妗堜緥鎻忚堪" min-width="230px" ></el-table-column>
<el-table-column prop="updateUserName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
<el-table-column prop="updateTime" label="鏈�杩戞搷浣滄椂闂�" min-width="150px"></el-table-column>
<el-table-column label="鐘舵��" fixed="right">
diff --git a/admin/src/views/business/importRecord.vue b/admin/src/views/business/importRecord.vue
index 2cd48c9..607b20f 100644
--- a/admin/src/views/business/importRecord.vue
+++ b/admin/src/views/business/importRecord.vue
@@ -71,6 +71,7 @@
<el-table-column prop="doneNum" label="鎴愬姛褰曞叆鏁伴噺" min-width="100px"></el-table-column>
<el-table-column prop="errorNum" label="褰曞叆澶辫触鏁伴噺" min-width="100px"></el-table-column>
<el-table-column prop="updateUserName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="createTime" label="瀵煎叆鏃堕棿" min-width="150px"></el-table-column>
<el-table-column prop="updateTime" label="鏈�杩戞搷浣滄椂闂�" min-width="150px"></el-table-column>
</el-table>
<pagination
diff --git a/server/services/src/main/java/com/doumee/dao/business/dto/CasesImport.java b/server/services/src/main/java/com/doumee/dao/business/dto/CasesImport.java
index dea4720..d74f2dd 100644
--- a/server/services/src/main/java/com/doumee/dao/business/dto/CasesImport.java
+++ b/server/services/src/main/java/com/doumee/dao/business/dto/CasesImport.java
@@ -28,20 +28,21 @@
@ExcelColumn(name="鏈嶅姟鑰佸笀" , value = "memberCode" ,index = 4)
private String memberCode;
+ @ExcelColumn(name="鏈嶅姟鑰佸笀濮撳悕" , value = "memberName" ,index = 5)
+ private String memberName;
- @ExcelColumn(name="妗堜緥璇存槑" , value = "detail",index = 5)
+ @ExcelColumn(name="妗堜緥璇存槑" , value = "detail",index = 6)
private String detail;
-
- @ExcelColumn(name="妗堜緥鍥�1" , value = "imageList",fieldType = XSSFPictureData.class,index = 5)
+ @ExcelColumn(name="妗堜緥鍥�1" , value = "imageList",fieldType = XSSFPictureData.class,index = 7)
private List<XSSFPictureData> imageList;
- @ExcelColumn(name="妗堜緥鍥�2" , value = "imageList1",fieldType = XSSFPictureData.class,index = 6)
+ @ExcelColumn(name="妗堜緥鍥�2" , value = "imageList1",fieldType = XSSFPictureData.class,index = 8)
private List<XSSFPictureData> imageList1;
- @ExcelColumn(name="妗堜緥鍥�3" , value = "imageList2",fieldType = XSSFPictureData.class,index = 7)
+ @ExcelColumn(name="妗堜緥鍥�3" , value = "imageList2",fieldType = XSSFPictureData.class,index = 9)
private List<XSSFPictureData> imageList2;
- @ExcelColumn(name="妗堜緥鍥�4" , value = "imageList3",fieldType = XSSFPictureData.class,index = 8)
+ @ExcelColumn(name="妗堜緥鍥�4" , value = "imageList3",fieldType = XSSFPictureData.class,index = 10)
private List<XSSFPictureData> imageList3;
- @ExcelColumn(name="妗堜緥鍥�5" , value = "imageList4",fieldType = XSSFPictureData.class,index = 9)
+ @ExcelColumn(name="妗堜緥鍥�5" , value = "imageList4",fieldType = XSSFPictureData.class,index = 11)
private List<XSSFPictureData> imageList4;
- @ExcelColumn(name="妗堜緥鍥�6" , value = "imageList5",fieldType = XSSFPictureData.class,index = 10)
+ @ExcelColumn(name="妗堜緥鍥�6" , value = "imageList5",fieldType = XSSFPictureData.class,index = 12)
private List<XSSFPictureData> imageList5;
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Cases.java b/server/services/src/main/java/com/doumee/dao/business/model/Cases.java
index 9ca98ab..dbc8cf4 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Cases.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Cases.java
@@ -86,6 +86,9 @@
@ApiModelProperty(value = "鑰佸笀濮撳悕", example = "1")
@TableField(exist = false)
private String memberName ;
+ @ApiModelProperty(value = "鑰佸笀宸ュ彿", example = "1")
+ @TableField(exist = false)
+ private String memberCode ;
@ApiModelProperty(value = "鍥鹃泦闄勪欢闆嗗悎", example = "1")
@TableField(exist = false)
private List<Multifile> fileList;
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/CasesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/CasesServiceImpl.java
index e19661f..ab90547 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/CasesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/CasesServiceImpl.java
@@ -177,8 +177,10 @@
public PageData<Cases> findPage(PageWrap<Cases> pageWrap) {
IPage<Cases> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Cases> queryWrapper = new MPJLambdaWrapper<>();
+ pageWrap.getModel().setDeleted(Constants.ZERO);
queryWrapper.selectAll(Cases.class)
.selectAs(Member::getName,Cases::getMemberName)
+ .selectAs(Member::getCode,Cases::getMemberCode)
.selectAs(SystemUser::getRealname, Member::getUpdateUserName)
.leftJoin(SystemUser.class,SystemUser::getId,Cases::getUpdateUser)
.leftJoin(Member.class,Member::getId,Cases::getMemberId);
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 4305d5c..fb3a329 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
@@ -370,9 +370,7 @@
int index = 1;
for(CasesImport param :casesImportList){
index ++;
- if( ( param.getImageList() == null
- ||param.getImageList().size() == 0 )
- &&StringUtils.isBlank(param.getName())
+ if( StringUtils.isBlank(param.getName())
&&StringUtils.isBlank(param.getMemberCode())
&&StringUtils.isBlank(param.getStartDate())
&&StringUtils.isBlank(param.getEndDate())
@@ -406,10 +404,10 @@
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+"琛屾暟鎹紝 妗堜緥鍥句俊鎭笉鑳戒负绌�");
- }
+ }*/
if(cases.getStartDate()==null){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹紝 寮�濮嬫棩鏈熻鍙栧け璐�");
}
@@ -572,27 +570,29 @@
@Transactional
private int dealCasesInsert( TyyZosUtil obs,Cases param,String folder,String nowDate,String bucketName) {
int success = casesMapper.insert(param);
- List<Multifile> multifileList = new ArrayList<>();
- for(byte[] d : param.getImgdataList()){
- String fileName = UUID.randomUUID() + ".png";
- String tempFileName = nowDate + "/" + fileName;
- String key = folder + tempFileName;// 鏂囦欢鍚�
- if (obs.uploadInputstreamObjectNoShutdown(new ByteArrayInputStream(d ) ,bucketName, key)) {
- Multifile s = new Multifile();
- s.setIsdeleted(Constants.ZERO);
- s.setCreator(param.getCreateUser());
- s.setCreateDate(param.getCreateTime());
- s.setObjId(param.getId());
- s.setType(Constants.ZERO);
- s.setFileurl(tempFileName);
- s.setObjType(Constants.ONE);
- multifileList.add(s);
- param.setImgurl(tempFileName);//璇佷欢鐓у湴鍧�
- }else{
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"鍥鹃泦涓婁紶澶辫触锛�");
+ if(param.getImgdataList()!=null && param.getImgdataList().size()>0){
+ List<Multifile> multifileList = new ArrayList<>();
+ for(byte[] d : param.getImgdataList()){
+ String fileName = UUID.randomUUID() + ".png";
+ String tempFileName = nowDate + "/" + fileName;
+ String key = folder + tempFileName;// 鏂囦欢鍚�
+ if (obs.uploadInputstreamObjectNoShutdown(new ByteArrayInputStream(d ) ,bucketName, key)) {
+ Multifile s = new Multifile();
+ s.setIsdeleted(Constants.ZERO);
+ s.setCreator(param.getCreateUser());
+ s.setCreateDate(param.getCreateTime());
+ s.setObjId(param.getId());
+ s.setType(Constants.ZERO);
+ s.setFileurl(tempFileName);
+ s.setObjType(Constants.ONE);
+ multifileList.add(s);
+ param.setImgurl(tempFileName);//璇佷欢鐓у湴鍧�
+ }else{
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"鍥鹃泦涓婁紶澶辫触锛�");
+ }
}
+ multifileMapper.insert(multifileList);
}
- multifileMapper.insert(multifileList);
return success;
}
--
Gitblit v1.9.3