From fcc5194c1b671e76cb9054c9a14360139fe3be72 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期二, 16 九月 2025 22:23:50 +0800
Subject: [PATCH] 新增了代码
---
archiveManager/src/main/java/com/ruoyi/domain/ArchiveProjectName.java | 16 +
archiveManager/src/main/java/com/ruoyi/domain/vo/AnalysisResult.java | 6
archiveManager/src/main/java/com/ruoyi/service/impl/pdfGenerateService.java | 11 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchivePlaceNameController.java | 28 ++
archiveManager/src/main/java/com/ruoyi/service/impl/ArchivePlaceNameServiceImpl.java | 23 ++
archiveManager/src/main/java/com/ruoyi/domain/vo/RecordToUserCount.java | 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiverecordstouserController.java | 11 +
archiveManager/src/main/java/com/ruoyi/service/IArchiverecordstouserService.java | 3
archiveManager/src/main/java/com/ruoyi/service/IArchiveProjectNameService.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveProjectNameController.java | 25 +
archiveManager/src/main/java/com/ruoyi/mapper/ArchiveRecordsMapper.java | 2
archiveManager/src/main/java/com/ruoyi/service/IArchiveCategoryService.java | 3
archiveManager/src/main/java/com/ruoyi/service/IArchivePlaceNameService.java | 3
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 8
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java | 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java | 28 ++
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveProjectNameServiceImpl.java | 23 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java | 11 +
archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java | 70 +++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java | 105 +++++++++++
archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java | 3
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveCategoryServiceImpl.java | 22 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveCategoryController.java | 29 ++
archiveManager/src/main/java/com/ruoyi/mapper/ArchiverecordstouserMapper.java | 6
archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java | 27 +++
26 files changed, 434 insertions(+), 47 deletions(-)
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/ArchiveProjectName.java b/archiveManager/src/main/java/com/ruoyi/domain/ArchiveProjectName.java
index aad93ff..7ce8758 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/ArchiveProjectName.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/ArchiveProjectName.java
@@ -38,6 +38,22 @@
this.createTime = createTime;
}
+ public String getCompanyName() {
+ return companyName;
+ }
+
+ public void setCompanyName(String companyName) {
+ this.companyName = companyName;
+ }
+
+ public String getCreatePerson() {
+ return createPerson;
+ }
+
+ public void setCreatePerson(String createPerson) {
+ this.createPerson = createPerson;
+ }
+
public Date getCreateTime() {
return createTime;
}
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/vo/AnalysisResult.java b/archiveManager/src/main/java/com/ruoyi/domain/vo/AnalysisResult.java
index 0fd8c5a..8a6dbd9 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/vo/AnalysisResult.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/AnalysisResult.java
@@ -1,15 +1,19 @@
package com.ruoyi.domain.vo;
+import com.ruoyi.common.annotation.Excel;
import lombok.Data;
@Data
public class AnalysisResult {
-
+ @Excel(name = "椤圭洰鍚嶇О")
private String everyProjectName;
+ @Excel(name = "椤圭洰鍐呮鍗锋�绘暟")
private Long cnt ;
+ @Excel(name = "鏈畬鎴愭鍗锋暟")
private Long unfinished;
+ @Excel(name = "瀹屾垚妗堝嵎鏁�")
private Long finished;
}
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java
new file mode 100644
index 0000000..5edec76
--- /dev/null
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java
@@ -0,0 +1,70 @@
+package com.ruoyi.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.NumberFormatHandler;
+import lombok.Data;
+
+import java.util.Date;
+@Data
+public class DocumentMaterialFileSmallVo {
+
+
+
+
+ /** $column.columnComment */
+ @Excel(name = "缂栦换鑰�")
+ private String creator;
+
+ /** $column.columnComment */
+ @Excel(name = "鏂囦欢棰樺悕")
+ private String title;
+
+ /** $column.columnComment */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date date;
+
+ /** $column.columnComment */
+ @Excel(name = "椤靛彿", handler = NumberFormatHandler.class)
+ private Long pageNumber;
+
+
+ /** $column.columnComment */
+ @Excel(name = "鎵�澶勯樁娈�")
+ private String stage;
+
+ /** $column.columnComment */
+ @Excel(name = "鍏紑灞炴��")
+ private String publicity;
+
+ /** $column.columnComment */
+ @Excel(name = "鏄惁涓洪檮浠堕檮鍥�")
+ private String isAttachment;
+
+ /** $column.columnComment */
+// @Excel(name = "鏄惁涓洪檮鍥�")
+ private String isDiagram;
+
+ /** $column.columnComment */
+ @Excel(name = "淇濈鏈熼檺")
+ private String retentionPeriod;
+
+ /** $column.columnComment */
+ @Excel(name = "瀵嗙骇")
+ private String securityLevel;
+
+ /** $column.columnComment */
+ @Excel(name = "鏄惁娑夊瘑鍙婃晱鎰熶俊鎭�")
+ private String isSensitive;
+
+ /** $column.columnComment */
+ @Excel(name = "鏄惁娉ㄩ攢")
+ private String isCanceled;
+
+
+
+
+
+
+}
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/vo/RecordToUserCount.java b/archiveManager/src/main/java/com/ruoyi/domain/vo/RecordToUserCount.java
index fdb44a3..dff9b67 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/vo/RecordToUserCount.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/RecordToUserCount.java
@@ -1,14 +1,17 @@
package com.ruoyi.domain.vo;
+import com.ruoyi.common.annotation.Excel;
import lombok.Data;
@Data
public class RecordToUserCount {
private Long userId;
+ @Excel(name = "鐢ㄦ埛鍚嶇О")
private String userName;
+ @Excel(name = "琚垎閰嶆鍗锋�绘暟")
private Long cnt;
-
+ @Excel(name = "瀹屾垚妗堝嵎鏁�")
private Long swlr;
-
+ @Excel(name = "鏈畬鎴愭鍗锋暟")
private Long ylr;
}
diff --git a/archiveManager/src/main/java/com/ruoyi/mapper/ArchiveRecordsMapper.java b/archiveManager/src/main/java/com/ruoyi/mapper/ArchiveRecordsMapper.java
index e4a8772..24d108e 100644
--- a/archiveManager/src/main/java/com/ruoyi/mapper/ArchiveRecordsMapper.java
+++ b/archiveManager/src/main/java/com/ruoyi/mapper/ArchiveRecordsMapper.java
@@ -20,7 +20,7 @@
@Select({
"<script>",
- "SELECT distinct c.*,a.archive_records_id, if(a.user_id=#{userId}, TRUE, FALSE) as tst FROM archiverecordstouser a inner join sys_user b ON a.user_id = b.user_id right join archive_records c on c.record_id=a.archive_records_id ${ew.customSqlSegment} ",
+ "SELECT distinct c.*,a.archive_records_id, if(a.user_id=#{userId}, TRUE, FALSE) as tst,b.user_id FROM archiverecordstouser a inner join sys_user b ON a.user_id = b.user_id right join archive_records c on c.record_id=a.archive_records_id ${ew.customSqlSegment} ",
"<if test= \"userId !=1 \">",
"order by tst desc",
"</if>",
diff --git a/archiveManager/src/main/java/com/ruoyi/mapper/ArchiverecordstouserMapper.java b/archiveManager/src/main/java/com/ruoyi/mapper/ArchiverecordstouserMapper.java
index bef280b..065b21b 100644
--- a/archiveManager/src/main/java/com/ruoyi/mapper/ArchiverecordstouserMapper.java
+++ b/archiveManager/src/main/java/com/ruoyi/mapper/ArchiverecordstouserMapper.java
@@ -27,4 +27,10 @@
Page<RecordToUserCount> selectRecordToUserPage(Page<RecordToUserCount> page, @Param("ew") LambdaQueryWrapper<RecordToUserCount> queryWrapper);
+ @Select("select ad.user_id, user_name, count(*) as cnt, (select count(*) from archive_records as ar,archiverecordstouser as ats, sys_user as su where ar.record_id= ats.archive_records_id and ats.user_id=su.user_id and su.user_id=sy.user_id and\n" +
+ " record_status='鏈綍鍏�') as swlr,(select count(*) from archive_records as ar,archiverecordstouser as ats, sys_user as su where ar.record_id= ats.archive_records_id and ats.user_id=su.user_id and su.user_id=sy.user_id and\n" +
+ " record_status='褰曞叆瀹屾垚') as ylr from archiverecordstouser as ad, sys_user as sy,archive_records as ard where ad.user_id=sy.user_id and ard.record_id=ad.archive_records_id group by user_id, user_name\n" +
+ " ")
+ List<RecordToUserCount> selectRecordToUserAll();
+
}
\ No newline at end of file
diff --git a/archiveManager/src/main/java/com/ruoyi/service/IArchiveCategoryService.java b/archiveManager/src/main/java/com/ruoyi/service/IArchiveCategoryService.java
index 0b7125e..a87635f 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/IArchiveCategoryService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/IArchiveCategoryService.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.ArchiveCategory;
import com.ruoyi.domain.ArchiveRecords;
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -69,4 +70,6 @@
* @return 缁撴灉
*/
public int deleteArchiveCategoryById(Long id);
+
+ public AjaxResult importExcel(MultipartFile file);
}
diff --git a/archiveManager/src/main/java/com/ruoyi/service/IArchivePlaceNameService.java b/archiveManager/src/main/java/com/ruoyi/service/IArchivePlaceNameService.java
index 320656d..f22702b 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/IArchivePlaceNameService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/IArchivePlaceNameService.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.ArchiveCategory;
import com.ruoyi.domain.ArchivePlaceName;
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -66,4 +67,6 @@
* @return 缁撴灉
*/
public int deleteArchivePlaceNameById(Long id);
+
+ public AjaxResult importExcel(MultipartFile file);
}
diff --git a/archiveManager/src/main/java/com/ruoyi/service/IArchiveProjectNameService.java b/archiveManager/src/main/java/com/ruoyi/service/IArchiveProjectNameService.java
index 6659c4c..fce4fa6 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/IArchiveProjectNameService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/IArchiveProjectNameService.java
@@ -3,6 +3,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.ArchivePlaceName;
import com.ruoyi.domain.ArchiveProjectName;
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -57,4 +58,5 @@
* @return 缁撴灉
*/
public int deleteArchiveProjectNameById(Long id);
+ public AjaxResult importExcel(MultipartFile file);
}
diff --git a/archiveManager/src/main/java/com/ruoyi/service/IArchiverecordstouserService.java b/archiveManager/src/main/java/com/ruoyi/service/IArchiverecordstouserService.java
index bead0b4..7af6d4d 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/IArchiverecordstouserService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/IArchiverecordstouserService.java
@@ -78,4 +78,7 @@
public AjaxResult countStatistic(String username, int pageNum, int pageSize);
+
+
+ public List<RecordToUserCount> findAllRecordToUserCont();
}
diff --git a/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java b/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
index d6088c3..79e13f4 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
@@ -7,6 +7,7 @@
import com.ruoyi.domain.vo.DocumentMaterialsVo;
import com.ruoyi.domain.vo.DocumentMaterialsVoLarge;
import org.apache.ibatis.annotations.Param;
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -69,4 +70,6 @@
public List<DocumentMaterialFileStyle> findFileStyleInfo(@Param("recordId") int recordId);
+
+ public AjaxResult importExcel(MultipartFile file, String recordId);
}
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveCategoryServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveCategoryServiceImpl.java
index 13610b0..bac075b 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveCategoryServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveCategoryServiceImpl.java
@@ -16,6 +16,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ArchiveCategory;
import com.ruoyi.domain.ArchiveRecords;
@@ -27,6 +28,7 @@
import com.ruoyi.service.IDocumentMaterialsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
/**
@@ -177,5 +179,25 @@
return 0;
}
+ @Override
+ public AjaxResult importExcel(MultipartFile file) {
+ ExcelUtil<ArchiveCategory> util = new ExcelUtil<>(ArchiveCategory.class);
+ List<ArchiveCategory> dataList = null;
+ try {
+ dataList = util.importExcel(file.getInputStream());
+ } catch (Exception e) {
+ throw new RuntimeException("娌℃湁鎸夌収瑙勫垯瀵煎叆鏁版嵁");
+ }
+
+ assert dataList != null;
+
+ for (ArchiveCategory archiveCategory : dataList) {
+ // physcialService.mySave(physcial);
+ this.insertArchiveCategory(archiveCategory);
+ }
+
+ return AjaxResult.success();
+ }
+
}
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchivePlaceNameServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchivePlaceNameServiceImpl.java
index c19a644..4e243c5 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchivePlaceNameServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchivePlaceNameServiceImpl.java
@@ -15,6 +15,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ArchiveCategory;
import com.ruoyi.domain.ArchivePlaceName;
@@ -23,6 +24,8 @@
import org.springframework.stereotype.Service;
import com.ruoyi.mapper.ArchivePlaceNameMapper;
+import org.springframework.web.multipart.MultipartFile;
+
@Service
public class ArchivePlaceNameServiceImpl extends ServiceImpl<ArchivePlaceNameMapper, ArchivePlaceName> implements IArchivePlaceNameService {
private LambdaQueryWrapper<ArchivePlaceName> buildCondition(ArchivePlaceName archivePlaceName){
@@ -154,4 +157,24 @@
{
return 0;
}
+
+ @Override
+ public AjaxResult importExcel(MultipartFile file) {
+ ExcelUtil<ArchivePlaceName> util = new ExcelUtil<>(ArchivePlaceName.class);
+ List<ArchivePlaceName> dataList = null;
+ try {
+ dataList = util.importExcel(file.getInputStream());
+ } catch (Exception e) {
+ throw new RuntimeException("娌℃湁鎸夌収瑙勫垯瀵煎叆鏁版嵁");
+ }
+
+ assert dataList != null;
+
+ for (ArchivePlaceName archiveCategory : dataList) {
+ // physcialService.mySave(physcial);
+ this.insertArchivePlaceName(archiveCategory);
+ }
+
+ return AjaxResult.success();
+ }
}
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveProjectNameServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveProjectNameServiceImpl.java
index f45a3a7..678cc12 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveProjectNameServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveProjectNameServiceImpl.java
@@ -7,6 +7,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ArchiveCategory;
import com.ruoyi.domain.ArchivePlaceName;
import com.ruoyi.domain.ArchiveProjectName;
@@ -14,6 +15,7 @@
import com.ruoyi.mapper.ArchiveProjectNameMapper;
import com.ruoyi.service.IArchiveProjectNameService;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
import java.time.LocalDateTime;
import java.time.ZoneId;
@@ -52,7 +54,7 @@
// return markOwnData(familyId, fatherFaId, motherFaId, beanRecords);
HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
-
+ System.out.println(data);
return AjaxResult.success(data);
}
@@ -113,4 +115,23 @@
public int deleteArchiveProjectNameById(Long id) {
return 0;
}
+
+ @Override
+ public AjaxResult importExcel(MultipartFile file) {
+ ExcelUtil<ArchiveProjectName> util = new ExcelUtil<>(ArchiveProjectName.class);
+ List<ArchiveProjectName> dataList = null;
+ try {
+ dataList = util.importExcel(file.getInputStream());
+ } catch (Exception e) {
+ throw new RuntimeException("娌℃湁鎸夌収瑙勫垯瀵煎叆鏁版嵁");
+ }
+
+ assert dataList != null;
+
+ for (ArchiveProjectName archiveCategory : dataList) {
+ // physcialService.mySave(physcial);
+ this.insertArchiveProjectName(archiveCategory);
+ }
+
+ return AjaxResult.success(); }
}
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java
index f8ae642..fb5bef9 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java
@@ -130,7 +130,7 @@
@Override
public List<Archiverecordstouser> selectArchiverecordstouserList(Archiverecordstouser archiverecordstouser) {
- return null;
+ return this.list();
}
/**
@@ -239,4 +239,9 @@
return AjaxResult.success(data);
}
+
+ @Override
+ public List<RecordToUserCount> findAllRecordToUserCont() {
+ return this.baseMapper.selectRecordToUserAll();
+ }
}
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
index a0fd31e..8ed5789 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
@@ -7,7 +7,11 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.ArchiveCategory;
import com.ruoyi.domain.DocumentMaterials;
+import com.ruoyi.domain.vo.DocumentMaterialFileSmallVo;
import com.ruoyi.domain.vo.DocumentMaterialFileStyle;
import com.ruoyi.domain.vo.DocumentMaterialsVo;
import com.ruoyi.domain.vo.DocumentMaterialsVoLarge;
@@ -15,6 +19,7 @@
import com.ruoyi.service.IDocumentMaterialsService;
import com.ruoyi.util.ErrorcodeExceptionextends;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
import java.time.LocalDateTime;
import java.time.ZoneId;
@@ -192,4 +197,26 @@
public List<DocumentMaterialFileStyle> findFileStyleInfo(int recordId) {
return this.baseMapper.getFileStyleInfo(recordId);
}
+
+ @Override
+ public AjaxResult importExcel(MultipartFile file, String recordId) {
+ ExcelUtil<DocumentMaterialFileSmallVo> util = new ExcelUtil<>(DocumentMaterialFileSmallVo.class);
+ List<DocumentMaterialFileSmallVo> dataList = null;
+ try {
+ dataList = util.importExcel(file.getInputStream());
+ } catch (Exception e) {
+ throw new RuntimeException("娌℃湁鎸夌収瑙勫垯瀵煎叆鏁版嵁");
+ }
+
+ assert dataList != null;
+
+ for (DocumentMaterialFileSmallVo archiveCategory : dataList) {
+ // physcialService.mySave(physcial);
+ DocumentMaterials documentMaterials = new DocumentMaterials();
+ BeanUtils.copyProperties(archiveCategory, documentMaterials);
+ documentMaterials.setRecordId(Long.parseLong(recordId));
+ this.insertDocumentMaterials(documentMaterials);
+ }
+
+ return AjaxResult.success(); }
}
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/pdfGenerateService.java b/archiveManager/src/main/java/com/ruoyi/service/impl/pdfGenerateService.java
index e97a4cd..8c8e306 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/pdfGenerateService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/pdfGenerateService.java
@@ -421,6 +421,11 @@
// 鍒涘缓PDF鏂囨。
List<DocumentMaterialFileStyle> dmfs = documentMaterialsService.findFileStyleInfo(Math.toIntExact(id));
+ if(dmfs.isEmpty())
+ return;
+
+
+ System.out.println(dmfs);
PdfWriter.getInstance(document, new FileOutputStream("09-澶囪�冭〃"+".pdf"));
document.open();
// 璁剧疆涓枃瀛椾綋
@@ -437,9 +442,11 @@
Paragraph recordInfo = new Paragraph("鍗峰彿锛�" + volumeNumber, chineseFont);
recordInfo.setAlignment(Element.ALIGN_RIGHT);
document.add(recordInfo);
- int allCnt = dmfs.get(0).getCnt() + dmfs.get(1).getCnt() + dmfs.get(2).getCnt();
+ int pcc = dmfs.size()<=1?0: dmfs.get(1).getCnt();
+ int oth = dmfs.size()<=2?0: dmfs.get(2).getCnt();
+ int allCnt = dmfs.get(0).getCnt() + pcc + oth;
document.add(new Paragraph(" 鏈� 妗� 鍗� 鍏� 鏈� 鏂� 浠� 鏉� 鏂� " + allCnt + " 椤�"+"锛屽叾涓細鏂囧瓧鏉愭枡 " +
- dmfs.get(1).getCnt() + " 椤�"+"锛屽浘鏍锋潗鏂� " + dmfs.get(2).getCnt() + " 椤�"+"锛岀収鐗� " + dmfs.get(0).getCnt() + " 寮�", chineseFont));
+ pcc + " 椤�"+"锛屽浘鏍锋潗鏂� " + oth + " 椤�"+"锛岀収鐗� " + dmfs.get(0).getCnt() + " 寮�", chineseFont));
document.add(new Paragraph("璇存槑: ", chineseFont));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveCategoryController.java
index fe97bf5..8ef9dfc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveCategoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveCategoryController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.archive;
+import java.util.Collections;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
@@ -11,14 +12,7 @@
import com.ruoyi.service.IArchiveCategoryService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -26,6 +20,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
@@ -119,4 +114,22 @@
{
return toAjax(archiveCategoryService.deleteArchiveCategoryByIds(ids));
}
+
+
+ // @PreAuthorize("@ss.hasPermi('system:records:edit')")
+ @Log(title = "妗ｆ绫诲埆璁板綍瀵煎叆", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public AjaxResult importData(@RequestParam("file") MultipartFile file) throws Exception
+ {
+ System.out.println(file);
+ return archiveCategoryService.importExcel(file);
+ }
+
+ @PostMapping("/model")
+ public void getExportModel(HttpServletResponse response){
+ List<ArchiveCategory> list = Collections.singletonList(new ArchiveCategory());
+ ExcelUtil<ArchiveCategory> util = new ExcelUtil<>(ArchiveCategory.class);
+ util.exportExcel(response,list,"妗ｆ绫诲埆瀵煎叆妯℃澘");
+ }
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchivePlaceNameController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchivePlaceNameController.java
index fd69270..8932a97 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchivePlaceNameController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchivePlaceNameController.java
@@ -2,23 +2,18 @@
+import java.util.Collections;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.domain.ArchiveCategory;
import com.ruoyi.domain.ArchivePlaceName;
import com.ruoyi.service.IArchivePlaceNameService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -26,6 +21,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
@@ -111,4 +107,20 @@
{
return toAjax(archivePlaceNameService.deleteArchivePlaceNameByIds(ids));
}
+
+ @PostMapping("/model")
+ public void getExportModel(HttpServletResponse response){
+ List<ArchivePlaceName> list = Collections.singletonList(new ArchivePlaceName());
+ ExcelUtil<ArchivePlaceName> util = new ExcelUtil<>(ArchivePlaceName.class);
+ util.exportExcel(response,list,"鍦板尯淇℃伅瀵煎叆妯℃澘");
+ }
+
+ // @PreAuthorize("@ss.hasPermi('system:records:edit')")
+ @Log(title = "妗ｆ绫诲埆璁板綍瀵煎叆", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public AjaxResult importData(@RequestParam("file") MultipartFile file) throws Exception
+ {
+ System.out.println(file);
+ return archivePlaceNameService.importExcel(file);
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveProjectNameController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveProjectNameController.java
index bce72ca..7a40307 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveProjectNameController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveProjectNameController.java
@@ -2,6 +2,7 @@
+import java.util.Collections;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
@@ -12,14 +13,7 @@
import com.ruoyi.service.IArchiveProjectNameService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -27,6 +21,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
@@ -113,4 +108,18 @@
{
return toAjax(archiveProjectNameService.deleteArchiveProjectNameByIds(ids));
}
+ @PostMapping("/model")
+ public void getExportModel(HttpServletResponse response){
+ List<ArchiveProjectName> list = Collections.singletonList(new ArchiveProjectName());
+ ExcelUtil<ArchiveProjectName> util = new ExcelUtil<>(ArchiveProjectName.class);
+ util.exportExcel(response,list,"妗堝嵎椤圭洰瀵煎叆妯℃澘");
+ }
+
+ @Log(title = "妗ｆ绫诲埆璁板綍瀵煎叆", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public AjaxResult importData(@RequestParam("file") MultipartFile file) throws Exception
+ {
+ System.out.println(file);
+ return archiveProjectNameService.importExcel(file);
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java
index a8dcced..7741b33 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.domain.ArchiveRecords;
+import com.ruoyi.domain.vo.AnalysisResult;
import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.service.IArchiveRecordsService;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -52,7 +53,15 @@
return new AjaxResult(200, "鏌ヨ鎴愬姛", archiveRecordsService.statisticAya());
}
-
+ @PreAuthorize("@ss.hasPermi('system:records:export')")
+ @Log(title = "妗ｆ鍒嗘瀽缁撴灉瀵煎嚭", businessType = BusinessType.EXPORT)
+ @PostMapping("/exportAllStatis")
+ public void exportAllStatis(HttpServletResponse response)
+ {
+ List<AnalysisResult> list = archiveRecordsService.statisticAya();
+ ExcelUtil<AnalysisResult> util = new ExcelUtil<AnalysisResult>(AnalysisResult.class);
+ util.exportExcel(response, list, "妗ｆ鍒嗘瀽缁撴灉");
+ }
/**
* 鏌ヨ妗ｆ璁板綍鍒楄〃
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiverecordstouserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiverecordstouserController.java
index c5bf908..1dc200c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiverecordstouserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiverecordstouserController.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.domain.Archiverecordstouser;
+import com.ruoyi.domain.vo.RecordToUserCount;
import com.ruoyi.service.IArchiverecordstouserService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -88,7 +89,15 @@
return archiverecordstouserService.countStatistic(userName,pageNum, pageSize);
}
-
+ @PreAuthorize("@ss.hasPermi('system:archiverecordstouser:list')")
+ @PostMapping("/exportArToUser")
+ public void exportArToUser(HttpServletResponse response)
+ {
+ // archiverecordstouserService.countStatistic()
+ List<RecordToUserCount> list = archiverecordstouserService.findAllRecordToUserCont();
+ ExcelUtil<RecordToUserCount> util = new ExcelUtil<RecordToUserCount>(RecordToUserCount.class);
+ util.exportExcel(response, list, "瀵煎嚭缁熻淇℃伅");
+ }
/**
* 瀵煎嚭銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
index a38294e..1efe789 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
@@ -4,6 +4,7 @@
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
+import java.util.Collections;
import java.util.List;
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
@@ -16,7 +17,9 @@
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.domain.ArchiveCategory;
import com.ruoyi.domain.DocumentMaterials;
+import com.ruoyi.domain.vo.DocumentMaterialFileSmallVo;
import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.service.IDocumentMaterialsService;
import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
@@ -24,14 +27,7 @@
import org.apache.commons.imaging.Imaging;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -204,4 +200,20 @@
return AjaxResult.error(e.getMessage());
}
}
+
+
+ @Log(title = "妗ｆ璇︾粏淇℃伅璁板綍瀵煎叆", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public AjaxResult importData(@RequestParam("file") MultipartFile file, @RequestParam("recordId")String recordId) throws Exception
+ {
+ System.out.println(file);
+ return documentMaterialsService.importExcel(file, recordId);
+ }
+
+ @PostMapping("/model")
+ public void getExportModel(HttpServletResponse response){
+ List<DocumentMaterialFileSmallVo> list = Collections.singletonList(new DocumentMaterialFileSmallVo());
+ ExcelUtil<DocumentMaterialFileSmallVo> util = new ExcelUtil<>(DocumentMaterialFileSmallVo.class);
+ util.exportExcel(response,list,"妗ｆ璇︾粏淇℃伅瀵煎叆妯℃澘");
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java
index 3978688..7b7f477 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java
@@ -221,6 +221,111 @@
zos.write(buffer, 0, len);
}
}
+
+ //08-鍗峰唴鍗峰唴鐩綍鐨刾df
+ String pdf08Path= "08-鍗峰唴鐩綍.pdf";
+ List<DocumentMaterialsVo> list3 = dsvs;
+ if(list3.size()>0) {
+ pdfGenerateService.generateFileDirectoryPdf(pdf08Path, list3);
+ ZipEntry zipEntry3 = new ZipEntry(fna + adir +"/"+pdf08Path);
+ zos.putNextEntry(zipEntry3);
+
+ // 璇诲彇PDF鏂囦欢鍐呭骞跺啓鍏IP
+ try (FileInputStream fis = new FileInputStream(pdf08Path)) {
+ byte[] buffer = new byte[1024];
+ int len;
+ while ((len = fis.read(buffer)) > 0) {
+ zos.write(buffer, 0, len);
+ }
+ }
+ }
+ //09-澶囪�冭〃.pdf
+ String pdf09Path = "09-澶囪�冭〃.pdf";
+ pdfGenerateService.generateFileStyleInfo(pdf09Path, aIV.getRecordId(), ids[i]);
+ // 2. 鍘嬬缉PDF鍒癦IP鏂囦欢
+ // 娣诲姞PDF鏂囦欢鍒癦IP
+ ZipEntry zipEntry4 = new ZipEntry(fna + adir +"/"+pdf09Path);
+ zos.putNextEntry(zipEntry4);
+
+ // 璇诲彇PDF鏂囦欢鍐呭骞跺啓鍏IP
+ try (FileInputStream fis = new FileInputStream(pdf09Path)) {
+ byte[] buffer = new byte[1024];
+ int len;
+ while ((len = fis.read(buffer)) > 0) {
+ zos.write(buffer, 0, len);
+ }
+ }
+
+ //excel 鍗峰唴灏侀潰瀵煎嚭zip
+ ZipEntry entryiv = new ZipEntry(fna + adir +"/"+"鍗峰唴灏侀潰" + ".xls");
+
+ List<ArchiveInfoVo> arsi = new ArrayList<>();
+ arsi.add(aIV);
+
+ String recordId1 = aIV.getRecordId();
+ byte[] imgr1 = barcodeService.generateBarcodeImage(recordId1);
+ byte[] sedcode = pdfGenerateService.createQrCodeN(recordId1, 30, 30);
+ ExcelExp e3 = new ExcelExp("妗堝嵎灏侀潰鏁版嵁",arsi, ArchiveInfoVo.class);
+ ExcelExp e4 = new ExcelExp("妗堝嵎灏侀潰", arsi, recordId1, imgr1,sedcode, ArchiveInfoVo.class);
+ List<ExcelExp> mysheet1 = new ArrayList<ExcelExp>();
+ mysheet1.add(e3);
+ mysheet1.add(e4);
+ ByteOutputStream bos2 = new ByteOutputStream();
+ ExcelUtilManySheetSecond<List<ExcelExp>> util3 = new ExcelUtilManySheetSecond<List<ExcelExp>>(mysheet1);
+
+ util3.exportExcelManySheet(bos2, mysheet1);
+
+ // System.out.println(bos2);
+ zos.putNextEntry(entryiv);
+
+// ExcelUtil<ArchiveInfoVo> utilsv = new ExcelUtil<ArchiveInfoVo>(ArchiveInfoVo.class);
+//
+//
+// ByteOutputStream boss = new ByteOutputStream();
+// List<ArchiveInfoVo> aivs = new ArrayList<>();
+// aivs.add(aIV);
+// utilsv.byteOutputStreamExcel(boss, aivs,"Date List", "");
+ bos2.writeTo(zos);
+
+
+
+ //鍐欏叆鐢靛瓙鐩綍 xsxl
+
+ ZipEntry entry5 = new ZipEntry(fna + adir +"/"+"鐢靛瓙鏂囦欢鐩綍" + ".xls");
+ ExcelUtil<DocumentMaterialsVoLarge> util5 = new ExcelUtil<DocumentMaterialsVoLarge>(DocumentMaterialsVoLarge.class);
+
+ zos.putNextEntry(entry5);
+ ByteOutputStream bos5 = new ByteOutputStream();
+ util5.byteOutputStreamExcel(bos5, docs,"鐢靛瓙鏂囦欢鐩綍", "");
+ bos.writeTo(zos);
+
+ //鎷垮埌鍗峰唴鐩綍鐨別xcel
+ List<DocumentMaterialsVoSmall> list2 = dsvs.stream().map(res1 -> new DocumentMaterialsVoSmall(res1.getNum(), res1.getDocumentNumber(),res1.getCreator(),
+ res1.getTitle(), res1.getDate(), res1.getPageNumber(), res1.getRemarks())).collect(Collectors.toList());
+ if(!dsvs.isEmpty()) {
+ String recordId = dsvs.get(0).getRecordId();
+ byte[] imgr = barcodeService.generateBarcodeImage(recordId);
+ ExcelExp e1 = new ExcelExp("鍗峰唴鐩綍鏁版嵁", dsvs, DocumentMaterialsVo.class);
+ ExcelExp e2 = new ExcelExp("鍗峰唴鏁版嵁", list2, recordId, imgr, DocumentMaterialsVoSmall.class);
+ List<ExcelExp> mysheet = new ArrayList<ExcelExp>();
+ mysheet.add(e1);
+ mysheet.add(e2);
+ ExcelUtilManySheet<List<ExcelExp>> util2 = new ExcelUtilManySheet<List<ExcelExp>>(mysheet);
+ ZipEntry entr = new ZipEntry(fna + adir + "/" + "鍗峰唴鐩綍" + ".xls");
+ // ExcelUtil<DocumentMaterialsVo> util1 = new ExcelUtil<DocumentMaterialsVo>(DocumentMaterialsVo.class);
+ System.out.println(dsvs);
+ zos.putNextEntry(entr);
+ ByteOutputStream bos6 = new ByteOutputStream();
+
+ util2.exportExcelManySheet(bos6, mysheet);
+
+ // util1.byteOutputStreamExcel(bos1, dsvs,"Date List", "");
+ bos6.writeTo(zos);
+ }
+ //鎶奺xcel杞负pdf
+
+
+
byte[] buf = new byte[1024];
for (DocumentMaterialsVoLarge dc : docs) {
String filePath = dc.getUrl();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
index d2d6e8c..138b287 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
@@ -74,7 +74,7 @@
capStr = code = captchaProducer.createText();
image = captchaProducer.createImage(capStr);
}
-
+ System.out.println(code);
redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
// 杞崲娴佷俊鎭啓鍑�
FastByteArrayOutputStream os = new FastByteArrayOutputStream();
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index d133ee8..89e0307 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -74,10 +74,10 @@
private Date pwdUpdateDate;
/** 閮ㄩ棬瀵硅薄 */
- @Excels({
- @Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT),
- @Excel(name = "閮ㄩ棬璐熻矗浜�", targetAttr = "leader", type = Type.EXPORT)
- })
+// @Excels({
+// @Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT),
+// @Excel(name = "閮ㄩ棬璐熻矗浜�", targetAttr = "leader", type = Type.EXPORT)
+// })
private SysDept dept;
/** 瑙掕壊瀵硅薄 */
--
Gitblit v1.9.1