From 72a44555f2b11c7175785a513a71b0371b591d01 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 29 一月 2026 09:38:02 +0800
Subject: [PATCH] 提交忽略文件
---
server/services/src/main/java/com/doumee/core/annotation/excel/ExcelPictureUtil.java | 22 ++++++----
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 36 ++++++-----------
server/services/src/main/java/com/doumee/dao/business/model/Category.java | 19 +++------
3 files changed, 33 insertions(+), 44 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/annotation/excel/ExcelPictureUtil.java b/server/services/src/main/java/com/doumee/core/annotation/excel/ExcelPictureUtil.java
index 08b073c..de3c552 100644
--- a/server/services/src/main/java/com/doumee/core/annotation/excel/ExcelPictureUtil.java
+++ b/server/services/src/main/java/com/doumee/core/annotation/excel/ExcelPictureUtil.java
@@ -32,14 +32,19 @@
public class ExcelPictureUtil {
public static Map<String, XSSFPictureData> getExcelPictures(InputStream is) {
- byte[] fileData = getFileStream(is);
- Map<String, XSSFPictureData> pictures = getPictures(fileData);
- pictures.forEach((id, xssfPictureData) -> {
- System.out.println("id锛�" + id);
- String fileName = xssfPictureData.getPackagePart().getPartName().getName();
- System.out.println("fileName锛�" + fileName);
- });
- return pictures;
+ try {
+ byte[] fileData = getFileStream(is);
+ Map<String, XSSFPictureData> pictures = getPictures(fileData);
+ pictures.forEach((id, xssfPictureData) -> {
+ System.out.println("id锛�" + id);
+ String fileName = xssfPictureData.getPackagePart().getPartName().getName();
+ System.out.println("fileName锛�" + fileName);
+ });
+ return pictures;
+ }catch (Exception e){
+ return null;
+ }
+
}
/**
@@ -289,7 +294,6 @@
// 鍒涘缓 ByteArrayOutputStream 鏉ユ殏瀛樻祦鏁版嵁
try {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- // 灏� inputStream 璇诲彇鍒� byteArrayOutputStream 涓�
byte[] buffer = new byte[1024];
int length;
while ((length = inputStream.read(buffer)) != -1) {
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Category.java b/server/services/src/main/java/com/doumee/dao/business/model/Category.java
index b2e5e00..9868a8d 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Category.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Category.java
@@ -1,16 +1,15 @@
package com.doumee.dao.business.model;
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
+import com.doumee.core.annotation.excel.ExcelColumn;
import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
import java.util.Date;
import java.util.List;
@@ -84,14 +83,10 @@
@ApiModelProperty(value = "鏈�鍚庢搷浣滀汉鍛橈紱", example = "1")
@TableField(exist = false)
private String updateUserName;
- @ApiModelProperty(value = "闄勪欢闆嗗悎", example = "1")
+ @ApiModelProperty(value = "鍟嗕笟鍖栧浘闆嗛檮浠堕泦鍚�", example = "1")
@TableField(exist = false)
private List<Multifile> fileList;
@ApiModelProperty(value = "鍥炬爣鍏ㄨ矾寰�")
@TableField(exist = false)
private String iconFull;
-
- @ApiModelProperty(value = "鍟嗕笟鍥炬帓琛屼俊鎭�")
- @TableField(exist = false)
- private List<Multifile> multifileList;
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 1f2d07d..1733407 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1,46 +1,34 @@
package com.doumee.service.business.impl;
-import com.doumee.core.annotation.excel.ExcelImporter;
-import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.exception.BusinessException;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.dao.business.ImportRecordMapper;
-import com.doumee.dao.business.dto.MemberImport;
+import com.doumee.core.utils.DateUtil;
+import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CasesMapper;
import com.doumee.dao.business.CategoryMapper;
+import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.MultifileMapper;
import com.doumee.dao.business.model.Cases;
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.Member;
-import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.model.Multifile;
import com.doumee.service.business.MemberService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.usermodel.CellType;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.multipart.MultipartFile;
-import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-import java.util.concurrent.TimeUnit;
import java.util.Objects;
/**
@@ -132,7 +120,6 @@
queryWrapper.selectAll(Member.class)
.select(" c1.NAME ", Member::getPromotionName)
.select(" c2.NAME ", Member::getLevelName)
- .select(" TIMESTAMPDIFF(YEAR, CONCAT(t.JOB_YEAR , '-01-01'), now()) ",Member::getWorkYears)
.leftJoin(" category c1 on t.POSITON = c1.id ")
.leftJoin(" category c2 on t.LEVEL_ID = c2.id ")
.apply(Objects.nonNull(model.getBustypeIds())," find_in_set( '["+model.getBustypeIds()+"]', t.BUSTYPE_IDS ) ")
@@ -181,6 +168,9 @@
|| !roleConfig.contains(model.getQueryUserRole())){
member.setFee(null);
}
+ if(member.getJobYear()!=null){
+ member.setWorkYears(DateUtil.getCurrentYear( ) - member.getJobYear()+1);
+ }
}
}
return PageData.from(memberIPage);
@@ -226,12 +216,12 @@
for (Cases cases:casesList) {
List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
.eq(Multifile::getObjId,cases.getId())
- .eq(Multifile::getObjType,Constants.OBJECT_TYPE_CASES)
+ .eq(Multifile::getObjType,Constants.ONE)
.eq(Multifile::getIsdeleted,Constants.ZERO)
.orderByDesc(Multifile::getId)
);
multifileList.forEach(multifile -> {
- multifile.setFileurlFull(StringUtils.isNotBlank(multifile.getFileurl())?(resourcePath + casePath + multifile.getFileurl()):"");
+ multifile.setUrl(StringUtils.isNotBlank(multifile.getFileurl())?(resourcePath + casePath + multifile.getFileurl()):"");
});
}
member.setCasesList(casesList);
--
Gitblit v1.9.3