Browse Source

学生提交申请信息V2.0(删除了导出模块)

平常心 6 months ago
parent
commit
134a3aae5a
37 changed files with 40 additions and 2035 deletions
  1. 4 0
      yudao-module-as/yudao-module-as-biz/pom.xml
  2. 1 2
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/aidingstudentspersonmanage/AidingStudentsPersonManageController.java
  3. 2 0
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/aidingstudentspersonmanage/vo/AidingStudentPersonManageClassResultVO.java
  4. 0 16
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/exportWordManage/Constant/DifficultLevelConstant.java
  5. 0 24
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/exportWordManage/Constant/DifficultTypeConstant.java
  6. 0 15
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/exportWordManage/Constant/EmergenciesConstant.java
  7. 0 14
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/exportWordManage/Constant/FamilyNumberSizeConstant.java
  8. 0 25
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/exportWordManage/Constant/FamilySituationTypeConstant.java
  9. 0 18
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/exportWordManage/Constant/IncomeSourceConstant.java
  10. 0 80
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/exportWordManage/ExportWordManageController.java
  11. 0 28
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/exportWordManage/config/MinioConfig.java
  12. 0 250
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/exportWordManage/utils/FileUtil.java
  13. 0 58
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/exportWordManage/utils/ZipUtil.java
  14. 4 0
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/dataobject/aidingstudentspersonmanage/AidingStudentPersonManageEvaluationResultDO.java
  15. 0 132
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/dataobject/exportwordmanage/AsFamilyDifficultDO.java
  16. 0 35
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/dataobject/exportwordmanage/AsFamilyNumberOfFamilyDifficult.java
  17. 0 34
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/dataobject/exportwordmanage/AsFamilyNumberOfStipend.java
  18. 0 82
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/dataobject/exportwordmanage/AsStipend.java
  19. 0 14
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/mysql/exportwordmanage/AsFamilyNumberOfFamilyDifficultMapper.java
  20. 0 14
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/mysql/exportwordmanage/AsFamilyNumberOfStipendMapper.java
  21. 0 14
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/mysql/exportwordmanage/ExportFamilyDifficultWordManageMapper.java
  22. 0 14
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/mysql/exportwordmanage/ExportStipendWordManageMapper.java
  23. 29 22
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/aidingstudentspersonmanage/AidingStudentsPersonManageServiceImpl.java
  24. 0 12
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/exportwordmanage/AsFamilyNumberOfFamilyDifficultService.java
  25. 0 15
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/exportwordmanage/AsFamilyNumberOfFamilyDifficultServiceImpl.java
  26. 0 12
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/exportwordmanage/AsFamilyNumberOfStipendService.java
  27. 0 15
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/exportwordmanage/AsFamilyNumberOfStipendServiceImpl.java
  28. 0 31
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/exportwordmanage/ExportFamilyDifficultWordManageService.java
  29. 0 591
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/exportwordmanage/ExportFamilyDifficultWordManageServiceImpl.java
  30. 0 277
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/exportwordmanage/ExportStipendWordManageImpl.java
  31. 0 30
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/exportwordmanage/ExportStipendWordManageService.java
  32. 0 14
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/exportwordmanage/ISysFileService.java
  33. 0 99
      yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/exportwordmanage/SysFileServiceImpl.java
  34. 0 12
      yudao-module-as/yudao-module-as-biz/src/main/resources/mapper/exportwordmanage/AsFamilyNumberOfFamilyDifficultMapper.xml
  35. 0 12
      yudao-module-as/yudao-module-as-biz/src/main/resources/mapper/exportwordmanage/AsFamilyNumberOfStipendMapper.xml
  36. 0 12
      yudao-module-as/yudao-module-as-biz/src/main/resources/mapper/exportwordmanage/ExportFamilyDifficultWordManageMapper.xml
  37. 0 12
      yudao-module-as/yudao-module-as-biz/src/main/resources/mapper/exportwordmanage/ExportStipendWordManageMapper.xml

+ 4 - 0
yudao-module-as/yudao-module-as-biz/pom.xml

@@ -62,6 +62,10 @@
             <version>2.1.0-jdk8-snapshot</version>
             <scope>compile</scope>
         </dependency>
+
+
+
+
     </dependencies>
 
 </project>

+ 1 - 2
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/aidingstudentspersonmanage/AidingStudentsPersonManageController.java

@@ -121,7 +121,7 @@ public class AidingStudentsPersonManageController {
     }
 
     @GetMapping("/teacher-getstudentinfo")
-    @Operation(summary = "获得学生家庭困难认定项目 学生 - 分页")
+    @Operation(summary = "获得学生家庭困难认定项目 学校获取学生 - 分页")
     @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:teacher-getstudentinfo')")
     public CommonResult<PageResult<AidingStudentPersonManageTeacherRespVO>> teachergetAidingStudentsPersonManagePage(@Valid @RequestBody AidingStudentPersonManageTeacherPageReqVO pageReqVO) {
         return success(aidingStudentsPersonManageService.teachergetAidingStudentsPersonManagePage(pageReqVO));
@@ -131,5 +131,4 @@ public class AidingStudentsPersonManageController {
 
 
 
-
 }

+ 2 - 0
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/aidingstudentspersonmanage/vo/AidingStudentPersonManageClassResultVO.java

@@ -15,6 +15,8 @@ import lombok.Data;
 public class AidingStudentPersonManageClassResultVO {
     // 班级
     private String className;
+    // 班主任名字(负责人)
+    private String teacherName;
     // 照片
     private String image;
     // 学院id

+ 0 - 16
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/exportWordManage/Constant/DifficultLevelConstant.java

@@ -1,16 +0,0 @@
-package cn.iocoder.yudao.module.as.controller.admin.exportWordManage.Constant;
-
-import lombok.Data;
-
-/**
- * 困难等级常量
- * @autor WoVoM
- * @data 2024/7/5 19:40
- * @@version 1.0
- */
-@Data
-public class DifficultLevelConstant {
-    public static final String ESPECIALLY_DIFFICULT = "特别困难";
-    public static final String COMPARATIVE_DIFFICULT = "比较困难";
-    public static final String GENERAL_DIFFICULT = "一般困难";
-}

+ 0 - 24
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/exportWordManage/Constant/DifficultTypeConstant.java

@@ -1,24 +0,0 @@
-package cn.iocoder.yudao.module.as.controller.admin.exportWordManage.Constant;
-
-/**
- * 困难类型,要跟模板的顺序保持一致!!!
- * @autor WoVoM
- * @data 2024/7/5 19:57
- * @@version 1.0
- */
-public class DifficultTypeConstant {
-    public static final String STUDENTS_FROM_POVERTY_STRICKEN_FAMILIES = "脱贫家庭学生";
-    public static final String POVERTY_ALLEVIATION_OF_UNSTABLE_HOUSEHOLDS = "脱贫不稳定户家庭";
-    public static final String MARGINAL_HOUSEHOLDS_ARE_VULNERABLE_TO_POVERTY = "边缘易致贫户";
-    public static final String HOUSEHOLDS_WITH_SUDDEN_AND_SERIOUS_DIFFICULTIES = "突发严重困难户";
-    public static final String LOW_RETENTION_FAMILY_STUDENTS = "低保家庭学生";
-    public static final String EXTREMELY_POOR_RELIEF_TO_SUPPORT_STUDENTS = "特困救助供养学生";
-    public static final String CHILDREN_WITH_DISABILITIES_OR_STUDENTS_WITH_DISABILITIES_WHOSE_FAMILIES_HAVE_FINANCIAL_DIFFICULTIES = "家庭经济困难残疾人子女或残疾学生";
-    public static final String ORPHANS_AND_INCLUDING_DE_FACTO_UNSUPPORTED_CHILDREN = "孤儿(含事实无人抚养儿童)";
-    public static final String CHILDREN_OF_MARTYRS = "烈士子女";
-    public static final String PREFERENTIAL_CARE_FOR_CHILDRENvOF_FAMILIES = "优抚家庭子女";
-    public static final String CHILDREN_OF_THOSE_WHO_SACRIFICED_THEIR_LIVES_IN_THE_LINE_OF_DUTY_AND_BRAVELY = "因公、见义勇为牺牲人员子女";
-    public static final String STUDENTS_FROM_WORKING_FAMILIES_WITH_DIFFICULTIES_IN_FILING = "建档困难职工家庭学生";
-    public static final String LOW_INCOME_TARGETS = "低收入对象";
-    public static final String OTHER_TYPES = "其他类型";
-}

+ 0 - 15
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/exportWordManage/Constant/EmergenciesConstant.java

@@ -1,15 +0,0 @@
-package cn.iocoder.yudao.module.as.controller.admin.exportWordManage.Constant;
-
-import org.checkerframework.checker.units.qual.A;
-
-/**
- * @autor WoVoM
- * @data 2024/7/6 17:02
- * @@version 1.0
- */
-public class EmergenciesConstant {
-    public static final String FAMILIESHAVE_SUFFERED_FROM_THE_PANDEMIC = "家庭遭受疫情";
-    public static final String FAMILIES_SUFFER_FROM_NATURAL_DISASTERS = "家庭遭受自然灾害";
-    public static final String THE_FAMILY_SUFFERS_FROM_SUDDEN_ACCIDENT = "家庭遭受突发意外事件";
-    public static final String FAMILIES_ARE_IN_DEBT = "家庭欠债";
-}

+ 0 - 14
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/exportWordManage/Constant/FamilyNumberSizeConstant.java

@@ -1,14 +0,0 @@
-package cn.iocoder.yudao.module.as.controller.admin.exportWordManage.Constant;
-
-/**
- * @autor WoVoM
- * @data 2024/7/5 19:43
- * @@version 1.0
- */
-public class FamilyNumberSizeConstant {
-    // 助学金表单最多填五个成员
-    public static final int NUMBER_MAX_SIZE = 5;
-
-    // 家庭经济困难表单最大人数
-    public static final int FAMILY_DIFFICULT_NUMBER_MAX_SIZE = 6;
-}

+ 0 - 25
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/exportWordManage/Constant/FamilySituationTypeConstant.java

@@ -1,25 +0,0 @@
-package cn.iocoder.yudao.module.as.controller.admin.exportWordManage.Constant;
-
-/**
- * @autor WoVoM
- * @data 2024/7/6 10:40
- * @@version 1.0
- */
-public class FamilySituationTypeConstant {
-    public static final String STUDENTS_FROM_POVERTY_STRICKEN_FAMILIES = "脱贫家庭学生";
-    public static final String FAMILIES_AND_STUDENTS_WHO_ARE_SUBJECT_TO_RISK_MONITORING_HAVE_NOT_BEEN_ELIMINATED = "未消除风险监测对象家庭学生";
-    public static final String ELIMINATED_RISK_MONITORING_TARGET_HOME_STUDENTS = "已消除风险监测对象家庭学生";
-    public static final String MINIMUM_LIVING_ALLOWANCE_FOR_STUDENTS_FROM_FAMILIES = "最低生活保障家庭学生";
-    public static final String EXTREMELY_POOR_RELIEF_TO_SUPPORT_STUDENTS = "特困救助供养学生";
-    public static final String STUDENTS_WITH_DISABILITIES_WHOSE_FAMILIES_ARE_IN_FINANCIAL_DIFFICULTY = "家庭经济困难残疾学生";
-    public static final String CHILDREN_OF_DISABLED_PERSONS_FROM_ECONOMICALLY_DISADVANTAGED_FAMILIES = "家庭经济困难残疾人子女";
-    public static final String ORPHAN = "孤儿";
-    public static final String NO_ONE_TO_SUPPORT_CHILDREN = "事实无人抚养儿童";
-    public static final String CHILDREN_OF_MARTYRS = "烈士子女";
-    public static final String PREFERENTIAL_CARE_FOR_CHILDREN_OF_FAMILIES = "优抚家庭子女";
-    public static final String CHILDREN_OF_THOSE_WHO_DIED_IN_THE_LINE_OF_DUTY = "因公牺牲人员子女";
-    public static final String CHILDREN_OF_THOSE_WHO_SACRIFICED_HEIR_LIVES_BRAVELY = "见义勇为牺牲人员子女";
-    public static final String STUDENTS_FROM_WORKING_FAMILIES_WITH_DIFFICULTIES_IN_FILING = "建档困难职工家庭学生";
-    public static final String LOW_INCOME_TARGETS = "低收入对象";
-    public static final String STUDENTS_FROM_OTHER_FINANCIALLY_DISADVANTAGED_FAMILIES = "其他家庭经济困难学生";
-}

+ 0 - 18
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/exportWordManage/Constant/IncomeSourceConstant.java

@@ -1,18 +0,0 @@
-package cn.iocoder.yudao.module.as.controller.admin.exportWordManage.Constant;
-
-/**
- * @autor WoVoM
- * @data 2024/7/6 16:57
- * @@version 1.0
- */
-public class IncomeSourceConstant {
-    public static final String PUBLIC_EMPLOYEES_OF_GOVERNMENT_AGENCIES_AND_PUBLIC_INSTITUTIONS = "机关事业单位公职人员";
-    public static final String CONTRACT_EMPLOYEES_OF_THE_UNIT_COMPANY = "单位公司合同制职工";
-    public static final String PRIVATE_OWNERS = "私营业主";
-    public static final String SOLE_PROPRIETORSHIP = "个体工商户";
-    public static final String MIGRANT_WORKERS = "务工";
-    public static final String FARM = "务农";
-    public static final String OTHER_INCOME = "其他收入";
-    public static final String NO_REGULAR_INCOME = "无固定收入";
-    public static final String NO_INCOME = "无收入";
-}

+ 0 - 80
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/exportWordManage/ExportWordManageController.java

@@ -1,80 +0,0 @@
-package cn.iocoder.yudao.module.as.controller.admin.exportWordManage;
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.as.service.exportwordmanage.ExportFamilyDifficultWordManageService;
-import cn.iocoder.yudao.module.as.service.exportwordmanage.ExportStipendWordManageService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import java.io.*;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-/**
- * @autor WoVoM
- * @data 2024/7/2 20:50
- * @@version 1.0
- */
-@Tag(name = "管理后台 - 家庭困难认定项目学院管理")
-@RestController
-@RequestMapping("/as/aiding-students-export-word")
-@Slf4j
-public class ExportWordManageController {
-
-    @Autowired
-    private ExportStipendWordManageService exportStipendWordManageService;
-
-    @Autowired
-    private ExportFamilyDifficultWordManageService exportFamilyDifficultWordManageService;
-
-    @GetMapping("/export-FamilyDifficultword")
-    @Operation(summary = "导出家庭困难认定项目管理 Word")
-    @PreAuthorize("@ss.hasPermission('as:aiding-students-manage:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public ResponseEntity<ByteArrayResource> exportFamilyDifficultWord(@RequestParam List<Integer> ids) throws IOException {
-        log.info("ids = {}", ids);
-        return exportFamilyDifficultWordManageService.getFamilyDifficultWordByIds(ids);
-    }
-
-    @GetMapping("/look-FamilyDifficultword")
-    @Operation(summary = "预览 家庭困难认定项目管理 PTF")
-    @PreAuthorize("@ss.hasPermission('as:aiding-students-manage:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public CommonResult<String> lookFamilyDifficultWord(@RequestParam Integer id) throws IOException {
-        log.info("ids = {}", id);
-        String url = exportFamilyDifficultWordManageService.getFamilyDifficultPDFById(id);
-        log.info("url = {}", url);
-        return success(url);
-    }
-
-
-    @GetMapping("/export-StipendWord")
-    @Operation(summary = "导出助学金申请项目管理 Word")
-    @PreAuthorize("@ss.hasPermission('as:aiding-students-manage:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public ResponseEntity<ByteArrayResource> exporStipendWord(@RequestParam List<Integer> ids) throws IOException {
-        log.info("要导出的IDS为{}",ids);
-        return exportStipendWordManageService.getStipendWordByIds(ids);
-    }
-
-    @GetMapping("/look-StipendPDF")
-    @Operation(summary = "预览 助学金项目管理 PTF")
-    @PreAuthorize("@ss.hasPermission('as:aiding-students-manage:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public CommonResult<String> StipendPDF(@RequestParam Integer id) throws IOException {
-        log.info("ids = {}", id);
-        String url = exportStipendWordManageService.getStipendPDFById(id);
-        log.info("url = {}", url);
-        return success(url);
-    }
-}

+ 0 - 28
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/exportWordManage/config/MinioConfig.java

@@ -1,28 +0,0 @@
-package cn.iocoder.yudao.module.as.controller.admin.exportWordManage.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- *  读取配置文件的内容赋值给属性
- */
-
-@Data
-@Component
-@ConfigurationProperties(prefix = "minio")
-public class MinioConfig {
-    private final static String HTTP = "http://";
-    //endPoint是一个URL,域名,IPv4或者IPv6地址
-    private String endpoint;
-    //TCP/IP端口号
-    private int port;
-    //accessKey类似于用户ID,用于唯一标识你的账户
-    private String accessKey;
-    //secretKey是你账户的密码
-    private String secretKey;
-    //如果是true,则用的是https而不是http,默认值是true
-    private Boolean secure;
-    //默认存储桶
-    private String bucketName;
-}

+ 0 - 250
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/exportWordManage/utils/FileUtil.java

@@ -1,250 +0,0 @@
-package cn.iocoder.yudao.module.as.controller.admin.exportWordManage.utils;
-import cn.afterturn.easypoi.word.WordExportUtil;
-import com.documents4j.api.DocumentType;
-import com.documents4j.job.LocalConverter;
-import freemarker.template.Configuration;
-import freemarker.template.Template;
-import freemarker.template.TemplateException;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.text.WordUtils;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.font.PDType0Font;
-import org.apache.pdfbox.pdmodel.font.PDType1Font;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.docx4j.Docx4J;
-import org.docx4j.convert.in.word2003xml.Word2003XmlConverter;
-import org.docx4j.openpackaging.exceptions.Docx4JException;
-import org.docx4j.openpackaging.packages.OpcPackage;
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart;
-import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.util.Assert;
-import org.springframework.web.multipart.MultipartFile;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.stream.StreamSource;
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.Map;
-
-/**
- * 处理文件工具
- * @autor WoVoM
- * @data 2024/7/5 9:35
- * @@version 1.0
- */
-public class FileUtil {
-    /**
-     * 文件分隔符
-     */
-    public static String FILE_DELIMITER = "/";
-
-    /**
-     * 导出一个word文档(doc版)
-     * @param templateFilePath
-     * @param dataMap
-     * @return
-     */
-    public static File exportWordDoc( String templateFilePath, Map<String, Object> dataMap) {
-        String templateFileName = templateFilePath.substring(templateFilePath.lastIndexOf(FILE_DELIMITER) + 1);
-        File tempFile = null;
-        OutputStreamWriter outputStreamWriter = null;
-        try {
-            String name = (String) dataMap.get("name");
-            String studentId = (String) dataMap.get("studentId");
-            tempFile = File.createTempFile(studentId + name, ".doc");
-            outputStreamWriter = new OutputStreamWriter(new FileOutputStream(tempFile), StandardCharsets.UTF_8);
-            Configuration configuration = new Configuration(Configuration.VERSION_2_3_28);
-            configuration.setDefaultEncoding(StandardCharsets.UTF_8.name());
-            InputStream templateFileInputStream = WordUtils.class.getClassLoader().getResourceAsStream(templateFilePath);
-            Assert.notNull(templateFileInputStream, String.format("Template file not found: %s", templateFilePath));
-            InputStreamReader inputStreamReader = new InputStreamReader(templateFileInputStream, StandardCharsets.UTF_8);
-            Template template = new Template(templateFileName, inputStreamReader, configuration);
-            template.process(dataMap, outputStreamWriter);
-        } catch (IOException | TemplateException e) {
-            throw new RuntimeException("Error exporting Word file", e);
-        } finally {
-            if (outputStreamWriter != null) {
-                try {
-                    outputStreamWriter.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return tempFile;
-    }
-
-    /**
-     * 根据模板导出Word(DOCX版)
-     * @param map
-     * @param modelFileName
-     */
-    public static File exportWordDocx( Map<String, Object> map, String modelFileName) throws Exception{
-        File tempFile = null;
-        try {
-            XWPFDocument word = WordExportUtil.exportWord07(
-                    FileUtil.class.getClassLoader().getResource(modelFileName).getPath(),
-                    map
-            );
-            // 创建临时文件
-            String person = (String) map.get("asName");
-            Object asSno = map.get("asSno");
-            /**
-             * 这里的文件名字不能太短--两个字肯定不行
-             */
-            tempFile = File.createTempFile(asSno + person, ".docx");
-            tempFile.deleteOnExit(); // 设置临时文件在退出时删除
-            // 将文档写入临时文件
-            OutputStream out = new FileOutputStream(tempFile);
-            word.write(out);
-            out.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return tempFile;
-    }
-
-
-    /**
-     * file转MultipartFile
-     * @param file file
-     * @return MultipartFile
-     */
-    public static MultipartFile fileToMultipartFile(File file) {
-        MultipartFile result = null;
-        if (null != file) {
-            try (FileInputStream input = new FileInputStream(file)) {
-                result = new MockMultipartFile(file.getName().concat("temp"), file.getName(), "text/plain", input);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return result;
-    }
-
-    /**
-     * word(DOCX版本) 转 pdf
-     * @param wordFile
-     * @return
-     */
-    public static File convertWordToPdf(File wordFile) throws Exception {
-        // 创建PDF输出的临时文件
-        File pdfTempFile = File.createTempFile("tempPDFDoc", ".pdf");
-        InputStream docxInputStream = Files.newInputStream(wordFile.toPath());
-        OutputStream outputStream = Files.newOutputStream(pdfTempFile.toPath());
-        LocalConverter.builder().build().convert(docxInputStream)
-                .as(DocumentType.DOCX)
-                .to(outputStream)
-                .as(DocumentType.PDF).execute();
-        outputStream.close();
-        docxInputStream.close();
-        return pdfTempFile;
-    }
-
-    /**
-     * 将xml文件转成pdf文件
-     * @param xmlFile
-     * @return
-     *//*
-    public static File converXmlToPdf(File xmlFile) throws Exception{
-        // 步骤 2:从 File 中解析 XML 内容
-        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
-        Document doc = dBuilder.parse(xmlFile);
-        doc.getDocumentElement().normalize();
-
-        // 步骤 3:创建 PDF 文档
-        PDDocument document = new PDDocument();
-        PDPage page = new PDPage(PDRectangle.A4);
-        document.addPage(page);
-        // 加载支持中文的字体
-
-        // 步骤 4:将 XML 内容写入 PDF
-        PDPageContentStream contentStream = new PDPageContentStream(document, page);
-        contentStream.setFont(PDType1Font.HELVETICA_BOLD, 12);
-        contentStream.beginText();
-        contentStream.newLineAtOffset(25, 700);
-
-        // 递归遍历 XML 文档并将内容写入 PDF
-        Element rootElement = doc.getDocumentElement();
-        processElement(rootElement, contentStream);
-        contentStream.endText();
-        contentStream.close();
-        // 步骤 5:保存 PDF 到临时文件
-        File tempFile = Files.createTempFile("tempPDF", ".pdf").toFile();
-        document.save(tempFile);
-        document.close();
-        return tempFile;
-    }*/
-
-    /**
-     * 转换执行方法,转换后和原始路径
-     */
-    public static File invoke(File tempFile){
-        if (tempFile.getName().endsWith(".doc")) {
-            File docxTempFile = null;
-            try {
-                // 创建一个临时文件来保存转换后的DOCX
-                docxTempFile = File.createTempFile("tempDocx", ".docx");
-                docxTempFile.deleteOnExit(); // 确保临时文件在程序退出时被删除
-                // 加载Word 2003 XML文件
-                InputStream inputStream = new FileInputStream(tempFile);
-                WordprocessingMLPackage wmlPackage = WordprocessingMLPackage.load(inputStream);
-                inputStream.close(); // 关闭输入流
-                // 保存转换后的WordprocessingMLPackage为DOCX格式
-                try (FileOutputStream docxOutputStream = new FileOutputStream(docxTempFile)) {
-                    wmlPackage.save(docxOutputStream);
-                }
-            } catch (IOException | Docx4JException e) {
-                System.out.println("转换失败: " + e.getMessage());
-                return null; // 转换失败时返回null
-            }
-            return docxTempFile; // 返回临时文件
-        } else {
-            // 如果不是.doc文件,直接返回原文件
-            return tempFile;
-        }
-    }
-
-    public class Constant {
-        public final static String DOC_SUF = ".doc";
-        public final static String DOCX_SUF = ".docx";
-        public final static String PDF_SUF = ".pdf";
-        public final static String CONVERT_SUF = "(\\.docx)|(\\.doc)";
-    }
-
-
-    // 递归处理 XML 元素并将内容写入 PDF
-    private static void processElement(Element element, PDPageContentStream contentStream) throws IOException {
-        String nodeName = element.getNodeName();
-        String nodeValue = sanitizeText(element.getTextContent());
-        contentStream.showText(nodeName + ": " + nodeValue);
-        contentStream.newLine();
-        // 递归处理子元素
-        NodeList children = element.getChildNodes();
-        for (int i = 0; i < children.getLength(); i++) {
-            Node child = children.item(i);
-            if (child instanceof Element) {
-                processElement((Element) child, contentStream);
-            }
-        }
-    }
-
-    // 清理文本,将不支持的字符替换为空字符串或其它字符
-    private static String sanitizeText(String text) {
-        // 在这里,我们简单地将换行符替换为空字符串
-        // 你可以根据需要替换为其它字符,例如空格 " "
-        return text.replace("\n", "").replace("\r", "");
-    }
-
-}

+ 0 - 58
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/exportWordManage/utils/ZipUtil.java

@@ -1,58 +0,0 @@
-package cn.iocoder.yudao.module.as.controller.admin.exportWordManage.utils;
-
-import java.io.*;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-/**
- * 处理压缩包工具栏
- * @autor WoVoM
- * @data 2024/7/5 9:39
- * @@version 1.0
- */
-public class ZipUtil {
-    /**
-     * 覆盖doc,每次只导出当前要导的
-     * @param zipFileName
-     * @param filesToAdd
-     * @throws IOException
-     */
-    public static void zipFiles(String zipFileName, File... filesToAdd) throws IOException {
-        byte[] buffer = new byte[1024];
-        try (FileOutputStream fos = new FileOutputStream(zipFileName);
-             ZipOutputStream zos = new ZipOutputStream(fos)) {
-            for (File file : filesToAdd) {
-                if (file.exists()) {
-                    ZipEntry ze = new ZipEntry(file.getName());
-                    zos.putNextEntry(ze);
-                    try (FileInputStream fis = new FileInputStream(file)) {
-                        int length;
-                        while ((length = fis.read(buffer)) > 0) {
-                            zos.write(buffer, 0, length);
-                        }
-                    }catch (IOException e) {
-                        e.printStackTrace(); // 打印堆栈跟踪信息
-                    }
-                    zos.closeEntry();
-                }
-            }
-        }
-    }
-
-    /**
-     * 读取文件字节流,以字节数组格式返回
-     * @param file
-     * @return
-     * @throws IOException
-     */
-    public static byte[] readBytes(File file) throws IOException {
-        FileInputStream fis = new FileInputStream(file);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        byte[] buf = new byte[1024];
-        for (int readNum; (readNum = fis.read(buf)) != -1; ) {
-            bos.write(buf, 0, readNum);
-        }
-        fis.close();
-        return bos.toByteArray();
-    }
-}

+ 4 - 0
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/dataobject/aidingstudentspersonmanage/AidingStudentPersonManageEvaluationResultDO.java

@@ -26,8 +26,12 @@ public class AidingStudentPersonManageEvaluationResultDO extends BaseDO {
     private Integer id;
     // 班级
     private String className;
+    // 班主任名字
+    private String teacherName;
     // 照片
     private String image;
+    // 状态(1已经评价,0未评价)
+    private Integer status;
     // 学院id
     private Integer collegeId;
     // 项目ID

+ 0 - 132
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/dataobject/exportwordmanage/AsFamilyDifficultDO.java

@@ -1,132 +0,0 @@
-package cn.iocoder.yudao.module.as.dal.dataobject.exportwordmanage;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-
-/**
- * @autor WoVoM
- * @data 2024/7/5 21:28
- * @@version 1.0
- */
-@TableName("as_family_difficult")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class AsFamilyDifficultDO extends BaseDO {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    // 序号自增
-    private Integer id;
-    // 学院名称
-    private String collegeName;
-    // 专业班级
-    private String professionalClass;
-    // 学号
-    private String studentId;
-    // 姓名
-    private String name;
-    // 性别
-    private String gender;
-    // 民族
-    private String national;
-    // 出生年月
-    private LocalDateTime birthday;
-    // 身份证
-    private String idCard;
-    // 家庭人口数量
-    private Integer familyPopulation;
-    // 家庭成员在学人数
-    private Integer familySchool;
-    // 赡养人数
-    private Integer dependents;
-    // 家庭成员失业人数
-    private Integer unemployedFamily;
-
-    // 家庭情况(复选框,其他表)
-    private String householdType;
-    // 其他家庭困难生情况说明
-    private String otherInfo;
-    // 户籍性质
-    private String registrationType;
-    // 户籍所在地
-    private String registrationLocation;
-    // 家长及联系电话
-    private String parentPhone;
-    // 家庭住房情况
-    private String housingSituation;
-    // 家庭有汽车情况(多选)
-    private String housingCar;
-    // 家庭现居住地址
-    private String addressNow;
-    // 家庭年收入
-    private String familyYearIncome;
-    // 人均年收入
-    private String oneYearIncome;
-
-    // 家庭经济主要收入来源(复选)
-    private String incomeSource;
-    // 其他收入的简要说明
-    private String otherPrief;
-    // 父母丧失劳动能力或劳动能力弱人数
-    private Integer parentsLaborCapacity;
-    // 需要赡养无脑袋能力家庭成员人数
-    private Integer laborCapacity;
-    // 其中长期患病或残疾人数
-    private Integer longIll;
-    // 家庭突出情况
-    private String familyEmergency;
-    // 家庭突出情况说明
-    private String emergencySituations;
-    // 其他情况
-    private String otherCircumstances;
-    // 班级评议小组意见(固定模板、1-3级)
-    private String classReviewGroupOpinion;
-    // 院系意见(固定模板、1-3级别)
-    private String departmentOpinion;
-    // 学校审核意见(固定模板、1-3级别)
-    private String schoolApprovalOpinion;
-    // 认定情况排序(待)
-    private Integer recognitionOrder;
-    // 经济困难认定等级
-    private Integer economicHardshipLevel;
-    // 申请理由
-    private String applicationReason;
-    // 助学金审核班级意见
-    private String classApprovalFinancial;
-    // 助学金审核院系意见
-    private String departmentApprovalFinancial;
-    // 助学金审核学校意见
-    private String schoolApprovalFinancial;
-    // 助学金等级
-    private Integer financialLevel;
-    // 状态值
-    private Integer status;
-    // 现居住省份
-    private String nowProvince;
-    // 现居住市
-    private String nowCity;
-    // 现居住县城
-    private String nowCounty;
-    // 现居住镇
-    private String nowTown;
-    // 现居住村
-    private String nowVillage;
-    // 现居住门牌号(不一定是存数字,村子的可能是小区,可能是XX村XX小区XX号)
-    private String nowHouseNumber;
-    // 学院id
-    private Integer collegeId;
-    // 学院项目id
-    private Integer manageId;
-    // 用户ID
-    private Integer userId;
-
-}

+ 0 - 35
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/dataobject/exportwordmanage/AsFamilyNumberOfFamilyDifficult.java

@@ -1,35 +0,0 @@
-package cn.iocoder.yudao.module.as.dal.dataobject.exportwordmanage;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-
-/**
- * @autor WoVoM
- * @data 2024/7/5 10:29
- * @@version 1.0
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class AsFamilyNumberOfFamilyDifficult extends BaseDO {
-    // 成员姓名
-    private String name;
-    // 与之有关系的学生学号
-    private String studentSno;
-    // 成员年龄
-    private Integer age;
-    // 成员关系
-    private String relationShip;
-    // 成员工作(学习)单位
-    private String workUnit;
-    // 职业
-    private String career;
-    // 年收入
-    private String annualIncome;
-    // 身体状况
-    private String health;
-}

+ 0 - 34
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/dataobject/exportwordmanage/AsFamilyNumberOfStipend.java

@@ -1,34 +0,0 @@
-package cn.iocoder.yudao.module.as.dal.dataobject.exportwordmanage;
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * @autor WoVoM
- * @data 2024/7/5 10:57
- * @@version 1.0
- */
-@Data
-public class AsFamilyNumberOfStipend {
-    // 与之有关系的学生学号
-    private String sno;
-    // 成员姓名
-    private String name;
-    // 成员年龄
-    private Integer age;
-    // 成员关系
-    private String relationShip;
-    // 成员工作(学习)单位
-    private String workUnit;
-    // 创建者
-    private String creator;
-    // 更新者
-    private String updater;
-    // 创建时间
-    private LocalDateTime createTime;
-    // 更新时间
-    private LocalDateTime updateTime;
-    // 是否删除
-    private Byte deleted;
-}

+ 0 - 82
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/dataobject/exportwordmanage/AsStipend.java

@@ -1,82 +0,0 @@
-package cn.iocoder.yudao.module.as.dal.dataobject.exportwordmanage;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * 助学金申请表
- * @autor WoVoM
- * @data 2024/7/5 9:58
- * @@version 1.0
- */
-@Data
-public class AsStipend {
-    private static final long serialVersionUID = 1L;
-    @TableId(value = "id", type = IdType.AUTO)
-    // 序号自增
-    private Integer id;
-    // 姓名
-    private String asName;
-    // 性别
-    private String asGender;
-    // 出生年月
-    private LocalDateTime asBirthday;
-    // 民族
-    private String asNation;
-    // 政治面貌
-    private String asPoliticalOutlook;
-    // 入学时间
-    private LocalDateTime asIntake;
-    // 学号
-    private String asSno;
-    // 所在年级
-    private String asGrade;
-    // 身份证
-    private String asIdCard;
-    //手机号
-    private String phone;
-    // 学院(系)
-    private String asCollege;
-    // 专业
-    private String asSpeciality;
-    // 班级
-    private String asClass;
-    // 照片
-    private String asImage;
-    // 前一学段获得过何种资助
-    private String asFinances;
-    // TODO 未确定
-    // 困难类型
-    private String asDifficultyType;
-    // 困难等级
-    private String asDifficultyLevel;
-    // 家庭人口总数
-    private Integer asFamilySize;
-    // 邮政编码
-    private String asPostalCode;
-    // 家庭月收入
-    private String asFamilyMonthIncome;
-    // 人均月收入(可以通过家庭月收入算出来)
-    private String asPersonMonthIncome;
-    // 收入来源
-    private String asSourceIncome;
-    // 家庭地址
-    private String asHomeAddress;
-
-    // 家庭成员(通过学号去获取)
-    // 通过VO设置吧
-
-    // 创建者
-    private String creator;
-    // 更新者
-    private String updater;
-    // 创建时间
-    private LocalDateTime createTime;
-    // 更新时间
-    private LocalDateTime updateTime;
-    // 是否删除
-    private Byte deleted;
-}

+ 0 - 14
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/mysql/exportwordmanage/AsFamilyNumberOfFamilyDifficultMapper.java

@@ -1,14 +0,0 @@
-package cn.iocoder.yudao.module.as.dal.mysql.exportwordmanage;
-
-import cn.iocoder.yudao.module.as.dal.dataobject.exportwordmanage.AsFamilyNumberOfFamilyDifficult;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @autor WoVoM
- * @data 2024/7/6 10:08
- * @@version 1.0
- */
-@Mapper
-public interface AsFamilyNumberOfFamilyDifficultMapper extends BaseMapper<AsFamilyNumberOfFamilyDifficult> {
-}

+ 0 - 14
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/mysql/exportwordmanage/AsFamilyNumberOfStipendMapper.java

@@ -1,14 +0,0 @@
-package cn.iocoder.yudao.module.as.dal.mysql.exportwordmanage;
-
-import cn.iocoder.yudao.module.as.dal.dataobject.exportwordmanage.AsFamilyNumberOfStipend;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @autor WoVoM
- * @data 2024/7/5 14:49
- * @@version 1.0
- */
-@Mapper
-public interface AsFamilyNumberOfStipendMapper extends BaseMapper<AsFamilyNumberOfStipend> {
-}

+ 0 - 14
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/mysql/exportwordmanage/ExportFamilyDifficultWordManageMapper.java

@@ -1,14 +0,0 @@
-package cn.iocoder.yudao.module.as.dal.mysql.exportwordmanage;
-
-import cn.iocoder.yudao.module.as.dal.dataobject.exportwordmanage.AsFamilyDifficultDO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @autor WoVoM
- * @data 2024/7/6 9:52
- * @@version 1.0
- */
-@Mapper
-public interface ExportFamilyDifficultWordManageMapper extends BaseMapper<AsFamilyDifficultDO> {
-}

+ 0 - 14
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/mysql/exportwordmanage/ExportStipendWordManageMapper.java

@@ -1,14 +0,0 @@
-package cn.iocoder.yudao.module.as.dal.mysql.exportwordmanage;
-
-import cn.iocoder.yudao.module.as.dal.dataobject.exportwordmanage.AsStipend;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @autor WoVoM
- * @data 2024/7/5 14:24
- * @@version 1.0
- */
-@Mapper
-public interface ExportStipendWordManageMapper extends BaseMapper<AsStipend> {
-}

+ 29 - 22
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/aidingstudentspersonmanage/AidingStudentsPersonManageServiceImpl.java

@@ -56,24 +56,29 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
      */
     @Override
     public AidingStudentsPersonManageUploadVO beforeuploadAidingStudentsManage() {
-        LoginUser loginUser = getLoginUser();
-        AidingStudentsPersonManageUploadVO result = new AidingStudentsPersonManageUploadVO();
-        // 获取当前登录的用户表
-        AdminUserDO one = admiUSerMapper.selectOne(new QueryWrapper<AdminUserDO>()
-                .eq("id", loginUser.getId()));
-        Map map = aidingStudentsPersonManageMapper.getByStudentId(one.getStudentId());
-        log.info("map = {}" , map);
-        // 部门名称
-        result.setClassName((String) map.get("SZBJMC"));
-        // 学号
-        result.setStudentSno(one.getStudentId());
-        // 入学年份
-        result.setEnrollmentYear((String) map.get("RXNY"));
-        // 身份证
-        result.setIdCard((String) map.get("SFZJH"));
-        // 户籍
-        result.setRegisteredResidence((String) map.get("JG"));
-        return result;
+        try {
+            LoginUser loginUser = getLoginUser();
+            AidingStudentsPersonManageUploadVO result = new AidingStudentsPersonManageUploadVO();
+            // 获取当前登录的用户表
+            AdminUserDO one = admiUSerMapper.selectOne(new QueryWrapper<AdminUserDO>()
+                    .eq("id", loginUser.getId()));
+            Map map = aidingStudentsPersonManageMapper.getByStudentId(one.getStudentId());
+            log.info("map = {}" , map);
+            // 部门名称
+            result.setClassName((String) map.get("SZBJMC"));
+            // 学号
+            result.setStudentSno(one.getStudentId());
+            // 入学年份
+            result.setEnrollmentYear((String) map.get("RXNY"));
+            // 身份证
+            result.setIdCard((String) map.get("SFZJH"));
+            // 户籍
+            result.setRegisteredResidence((String) map.get("JG"));
+            return result;
+        } catch (Exception exception) {
+            exception.printStackTrace();
+            return null;
+        }
     }
 
     /**
@@ -234,11 +239,12 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
      */
     @Override
     public void sortAidingStudentsManage(Long id, Integer sort, Integer difficultType) {
-        // TODO 没有校验这个修改的人是否有资格
         UpdateWrapper<AidingStudentsPersonManageDO> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id)
-                .set("sort", sort)
-                .set("difficult_type", difficultType);
+                .set("sort", sort);
+        if(difficultType != null){
+            updateWrapper.set("difficult_type", difficultType);
+        }
         aidingStudentsPersonManageMapper.update(null, updateWrapper);
     }
 
@@ -250,6 +256,7 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
     public void uploadResultAidingStudentsManage(AidingStudentPersonManageClassResultVO classuploadVO) {
         AidingStudentPersonManageEvaluationResultDO ado = new AidingStudentPersonManageEvaluationResultDO();
         org.springframework.beans.BeanUtils.copyProperties(classuploadVO,ado);
+        ado.setStatus(1);
         aidingStudentPersonManageEvaluationResultMapper.insert(ado);
     }
 
@@ -299,7 +306,7 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
             AidingStudentPersonManageTeacherRespVO vo = new AidingStudentPersonManageTeacherRespVO();
             vo = BeanUtils.toBean(aDo, AidingStudentPersonManageTeacherRespVO.class);
             String str = "";
-            //计算机类2023-1班
+            //计算机类2023-1班 应该都是这个格式,但是不确定
             String className = aDo.getClassName();
             for(int i = 0; i < className.length(); i++){
                 if(className.charAt(i) == '2'){

+ 0 - 12
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/exportwordmanage/AsFamilyNumberOfFamilyDifficultService.java

@@ -1,12 +0,0 @@
-package cn.iocoder.yudao.module.as.service.exportwordmanage;
-
-import cn.iocoder.yudao.module.as.dal.dataobject.exportwordmanage.AsFamilyNumberOfFamilyDifficult;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @autor WoVoM
- * @data 2024/7/6 10:07
- * @@version 1.0
- */
-public interface AsFamilyNumberOfFamilyDifficultService extends IService<AsFamilyNumberOfFamilyDifficult> {
-}

+ 0 - 15
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/exportwordmanage/AsFamilyNumberOfFamilyDifficultServiceImpl.java

@@ -1,15 +0,0 @@
-package cn.iocoder.yudao.module.as.service.exportwordmanage;
-
-import cn.iocoder.yudao.module.as.dal.dataobject.exportwordmanage.AsFamilyNumberOfFamilyDifficult;
-import cn.iocoder.yudao.module.as.dal.mysql.exportwordmanage.AsFamilyNumberOfFamilyDifficultMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * @autor WoVoM
- * @data 2024/7/6 10:07
- * @@version 1.0
- */
-@Service
-public class AsFamilyNumberOfFamilyDifficultServiceImpl extends ServiceImpl<AsFamilyNumberOfFamilyDifficultMapper, AsFamilyNumberOfFamilyDifficult> implements AsFamilyNumberOfFamilyDifficultService {
-}

+ 0 - 12
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/exportwordmanage/AsFamilyNumberOfStipendService.java

@@ -1,12 +0,0 @@
-package cn.iocoder.yudao.module.as.service.exportwordmanage;
-
-import cn.iocoder.yudao.module.as.dal.dataobject.exportwordmanage.AsFamilyNumberOfStipend;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @autor WoVoM
- * @data 2024/7/5 14:48
- * @@version 1.0
- */
-public interface AsFamilyNumberOfStipendService extends IService<AsFamilyNumberOfStipend> {
-}

+ 0 - 15
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/exportwordmanage/AsFamilyNumberOfStipendServiceImpl.java

@@ -1,15 +0,0 @@
-package cn.iocoder.yudao.module.as.service.exportwordmanage;
-
-import cn.iocoder.yudao.module.as.dal.dataobject.exportwordmanage.AsFamilyNumberOfStipend;
-import cn.iocoder.yudao.module.as.dal.mysql.exportwordmanage.AsFamilyNumberOfStipendMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * @autor WoVoM
- * @data 2024/7/5 14:48
- * @@version 1.0
- */
-@Service
-public class AsFamilyNumberOfStipendServiceImpl extends ServiceImpl<AsFamilyNumberOfStipendMapper, AsFamilyNumberOfStipend> implements AsFamilyNumberOfStipendService{
-}

+ 0 - 31
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/exportwordmanage/ExportFamilyDifficultWordManageService.java

@@ -1,31 +0,0 @@
-package cn.iocoder.yudao.module.as.service.exportwordmanage;
-
-import cn.iocoder.yudao.module.as.dal.dataobject.exportwordmanage.AsFamilyDifficultDO;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.http.ResponseEntity;
-
-import java.util.List;
-
-/**
- * @autor WoVoM
- * @data 2024/7/6 9:50
- * @@version 1.0
- */
-public interface ExportFamilyDifficultWordManageService extends IService<AsFamilyDifficultDO> {
-    /**
-     * 通过ids获取家庭经济困难认定表单的集合压缩包
-     * @param ids
-     * @return
-     */
-    ResponseEntity<ByteArrayResource> getFamilyDifficultWordByIds(List<Integer> ids);
-
-    /**
-     * 预览家庭经济困难认定表单PTF
-     * @param id
-     * @return
-     */
-    String getFamilyDifficultPDFById(Integer id);
-
-
-}

+ 0 - 591
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/exportwordmanage/ExportFamilyDifficultWordManageServiceImpl.java

@@ -1,591 +0,0 @@
-package cn.iocoder.yudao.module.as.service.exportwordmanage;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.as.controller.admin.exportWordManage.Constant.*;
-import cn.iocoder.yudao.module.as.controller.admin.exportWordManage.config.MinioConfig;
-import cn.iocoder.yudao.module.as.controller.admin.exportWordManage.utils.FileUtil;
-import cn.iocoder.yudao.module.as.controller.admin.exportWordManage.utils.ZipUtil;
-import cn.iocoder.yudao.module.as.dal.dataobject.exportwordmanage.AsFamilyDifficultDO;
-import cn.iocoder.yudao.module.as.dal.dataobject.exportwordmanage.AsFamilyNumberOfFamilyDifficult;
-import cn.iocoder.yudao.module.as.dal.mysql.exportwordmanage.AsFamilyNumberOfFamilyDifficultMapper;
-import cn.iocoder.yudao.module.as.dal.mysql.exportwordmanage.ExportFamilyDifficultWordManageMapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.minio.BucketExistsArgs;
-import io.minio.MakeBucketArgs;
-import io.minio.MinioClient;
-import io.minio.PutObjectArgs;
-import io.minio.errors.ErrorResponseException;
-import io.minio.errors.InvalidResponseException;
-import io.minio.errors.XmlParserException;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.math3.exception.InsufficientDataException;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-import org.apache.poi.xwpf.usermodel.XWPFRun;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.*;
-import java.lang.reflect.Field;
-import java.security.NoSuchAlgorithmException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-/**
- * @autor WoVoM
- * @data 2024/7/6 9:51
- * @@version 1.0
- */
-
-@Service
-@Slf4j
-public class ExportFamilyDifficultWordManageServiceImpl extends ServiceImpl<ExportFamilyDifficultWordManageMapper, AsFamilyDifficultDO> implements ExportFamilyDifficultWordManageService{
-
-
-    @Autowired
-    private ExportFamilyDifficultWordManageMapper exportFamilyDifficultWordManageMapper;
-
-    @Autowired
-    private AsFamilyNumberOfFamilyDifficultMapper asFamilyNumberOfFamilyDifficultMapper;
-
-    @Autowired
-    private SysFileServiceImpl sysFileService;
-
-    /**
-     * 通过ids获取家庭经济困难认定表单的集合压缩包
-     * @param ids
-     * @return
-     */
-    @Override
-    public ResponseEntity<ByteArrayResource> getFamilyDifficultWordByIds(List<Integer> ids) {
-        try {
-            List<File> docFiles = new ArrayList<>();
-            List<Map<String, Object>> dataList = fillInData(ids);
-            // 生成两个Word文档
-            String templateFilePath = "word/FamilyDifficult.ftl";
-            for (int i = 0; i < dataList.size(); i++) {
-                File doc = FileUtil.exportWordDoc(templateFilePath, dataList.get(i));
-                docFiles.add(doc);
-            }
-            // 打包压缩生成的文档
-            String zipFileName = "documents.zip";
-            ZipUtil.zipFiles(zipFileName, docFiles.toArray(new File[0]));
-            // 删除临时生成的文档文件
-            for (File doc : docFiles) {
-                doc.delete();
-            }
-            // 读取生成的ZIP文件并将其作为响应体返回给前端
-            File zipFile = new File(zipFileName);
-            ByteArrayResource resource = new ByteArrayResource(ZipUtil.readBytes(zipFile));
-            // 设置响应头
-            HttpHeaders headers = new HttpHeaders();
-            headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=FamilyDifficultTable.zip");
-            return ResponseEntity.ok()
-                    .headers(headers)
-                    .contentType(MediaType.parseMediaType("application/zip"))
-                    .contentLength(zipFile.length())
-                    .body(resource);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ResponseEntity.status(500).build(); // 返回服务器错误(等待更改)
-        }
-    }
-
-    // TODO 未完成
-    /**
-     * 预览家庭经济困难认定表单
-     * @param id
-     * @return
-     */
-    @Override
-    public String getFamilyDifficultPDFById(Integer id) {
-        log.info("进入预览家庭经济困难认定表单界面");
-        try {
-            List<Integer> ids = new ArrayList<>();
-            ids.add(id);
-            List<Map<String, Object>> dataList = fillInData(ids);
-            // 生成Word文档
-            String templateFilePath = "word/FamilyDifficult.ftl";
-            File doc = FileUtil.exportWordDoc(templateFilePath, dataList.get(0));
-            log.info("第一步:生成Word文档 完成");
-            // word转成ptf
-            try {
-                // word 转成 pdf
-                log.info("文件名称如下{}", doc.getName());
-                File pdfFile = null;
-                pdfFile = FileUtil.invoke(doc);
-                log.info("。。。。{}", pdfFile.getAbsoluteFile());
-                // 上传到 minio 中
-                String url = sysFileService.upload(FileUtil.fileToMultipartFile(pdfFile));
-                // 删除临时文件
-                doc.delete();
-                // 返回路径
-                log.info("url = {}", url);
-                    return url;
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    /**
-     * 获取并封装数据
-     * @param ids
-     * @return
-     */
-    private List<Map<String, Object>> fillInData(List<Integer> ids) {
-        List<Map<String, Object>> dataList = new ArrayList<>();
-        List<AsFamilyDifficultDO> asFamilyDifficultList = exportFamilyDifficultWordManageMapper.selectBatchIds(ids);
-        for (int i = 0; i < asFamilyDifficultList.size(); i++) {
-            AsFamilyDifficultDO asFamilyDifficultDO = asFamilyDifficultList.get(i);
-            log.info("第{}个学生信息如下{}", i + 1, asFamilyDifficultDO);
-            // 将家庭成员信息找出
-            // TODO 存在一个隐患,如果有两次的申请的话,成员数量翻倍
-            List<AsFamilyNumberOfFamilyDifficult> NumberList = asFamilyNumberOfFamilyDifficultMapper
-                    .selectList(new QueryWrapper<AsFamilyNumberOfFamilyDifficult>()
-                            .eq("student_sno", asFamilyDifficultDO.getStudentId()));
-
-            log.info("第{}个学生的家庭成员信息如下{}", i + 1, NumberList);
-            // 实体类转成map
-            Map<String, Object> map = new HashMap<>();
-            Class<?> clazz = asFamilyDifficultDO.getClass();
-            for (Field field : clazz.getDeclaredFields()) {
-                field.setAccessible(true); // 设置可访问私有字段
-                try {
-                    map.put(field.getName(), field.get(asFamilyDifficultDO)); // 将属性名和属性值放入Map
-                } catch (IllegalAccessException e) {
-                    e.printStackTrace();
-                }
-            }
-            //特殊处理
-            //时间
-            LocalDateTime asBirthday = asFamilyDifficultDO.getBirthday();
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM");
-            String formattedDate = asBirthday.format(formatter);
-            map.put("birthday", formattedDate);
-            log.info("时间处理正常");
-            //身份号
-            String asIdCard = asFamilyDifficultDO.getIdCard();
-            for (int j = 0; j < asIdCard.length(); j++) {
-                map.put("ic_" + j, asIdCard.charAt(j));
-            }
-            log.info("身份证处理正常");
-
-            // TODO 家庭情况(后面的勾选没做)
-            //实体类是一个String类型,假设困难类型以,隔开--->
-            //脱贫家庭学生(2014/2015年),脱贫不稳定户家庭
-            /**
-             * 有个很重要的前提:
-             * 常量的顺序,必须跟表格的顺序保持一致
-             */
-            String[] parts = asFamilyDifficultDO.getHouseholdType().split(",");
-            for (String part : parts) {
-                log.info("家庭情况如下:{}", part);
-            }
-            log.info("有{}种家庭情况", parts.length);
-            Class<FamilySituationTypeConstant> clazz2 = FamilySituationTypeConstant.class;
-            Field[] fields = clazz2.getDeclaredFields();
-            int index = 0;
-            for (Field field : fields) {
-                field.setAccessible(true);
-                if (field.getType() == String.class) {
-                    try {
-                        String value = (String) field.get(null);
-                        map.put("dt_" + index, "☐");
-                        for (int j = 0; j < parts.length; j++) {
-                            if (parts[j].contains(value)) {
-                                map.put("dt_" + index, "☑");
-                                // 特殊处理六类
-                                //1.脱贫家庭学生 (脱贫年度:2014年/2015年   2016年及以后)
-                                if (parts[j].contains("脱贫家庭学生")) {
-                                    if (parts[j].contains("2016年及以后")) {
-                                        map.put("ts_0", "☐");
-                                        map.put("ts_1", "☑");
-                                    } else if (parts[j].contains("2014/2015年")) {
-                                        map.put("ts_0", "☑");
-                                        map.put("ts_1", "☐");
-                                    } else {
-                                        map.put("ts_0", "☐");
-                                        map.put("ts_1", "☐");
-                                    }
-                                }
-                                //2.未消除风险监测对象家庭学生(脱贫不稳定家庭学生 边缘易致贫家庭学生 突发严重困难家庭学生)
-                                if (parts[j].contains("未消除风险监测对象家庭学生")) {
-                                    if (parts[j].contains("脱贫不稳定家庭学生")) {
-                                        map.put("ts_2", "☑");
-                                        map.put("ts_3", "☐");
-                                        map.put("ts_4", "☐");
-                                    } else if (parts[j].contains("边缘易致贫家庭学生")) {
-                                        map.put("ts_2", "☐");
-                                        map.put("ts_3", "☑");
-                                        map.put("ts_4", "☐");
-                                    } else if (parts[j].contains("突发严重困难家庭学生")) {
-                                        map.put("ts_2", "☐");
-                                        map.put("ts_3", "☐");
-                                        map.put("ts_4", "☑");
-                                    } else {
-                                        map.put("ts_2", "☐");
-                                        map.put("ts_3", "☐");
-                                        map.put("ts_4", "☐");
-                                    }
-                                }
-                                //3.已消除风险监测对象家庭学生(脱贫不稳定家庭学生 边缘易致贫家庭学生 突发严重困难家庭学生)
-                                if (parts[j].contains("已消除风险监测对象家庭学生")) {
-                                    if (parts[j].contains("脱贫不稳定家庭学生")) {
-                                        map.put("ts_5", "☑");
-                                        map.put("ts_6", "☐");
-                                        map.put("ts_7", "☐");
-                                    } else if (parts[j].contains("边缘易致贫家庭学生")) {
-                                        map.put("ts_5", "☐");
-                                        map.put("ts_6", "☑");
-                                        map.put("ts_7", "☐");
-                                    } else if (parts[j].contains("突发严重困难家庭学生")) {
-                                        map.put("ts_5", "☐");
-                                        map.put("ts_6", "☐");
-                                        map.put("ts_7", "☑");
-                                    } else {
-                                        map.put("ts_5", "☐");
-                                        map.put("ts_6", "☐");
-                                        map.put("ts_7", "☐");
-                                    }
-                                }
-                                //4.最低生活保障家庭学生(城市 农村)
-                                if (parts[j].contains("最低生活保障家庭学生")) {
-                                    if (parts[j].contains("城市")) {
-                                        map.put("ts_8", "☑");
-                                        map.put("ts_9", "☐");
-                                    } else if (parts[j].contains("农村")) {
-                                        map.put("ts_8", "☐");
-                                        map.put("ts_9", "☑");
-                                    } else {
-                                        map.put("ts_8", "☐");
-                                        map.put("ts_9", "☐");
-                                    }
-                                }
-                                //5.特困救助供养学生(城市 农村)
-                                if (parts[j].contains("特困救助供养学生")) {
-                                    if (parts[j].contains("城市")) {
-                                        map.put("ts_10", "☑");
-                                        map.put("ts_11", "☐");
-                                    } else if (parts[j].contains("农村")) {
-                                        map.put("ts_10", "☐");
-                                        map.put("ts_11", "☑");
-                                    } else {
-                                        map.put("ts_10", "☐");
-                                        map.put("ts_11", "☐");
-                                    }
-                                }
-                                //6.低收入对象(低保边缘家庭学生  支出型困难家庭学生)
-                                if (parts[j].contains("低收入对象")) {
-                                    if (parts[j].contains("低保边缘家庭学生")) {
-                                        map.put("ts_12", "☑");
-                                        map.put("ts_13", "☐");
-                                    } else if (parts[j].contains("支出型困难家庭学生")) {
-                                        map.put("ts_12", "☐");
-                                        map.put("ts_13", "☑");
-                                    } else {
-                                        map.put("ts_12", "☐");
-                                        map.put("ts_13", "☐");
-                                    }
-                                }
-                                break;
-                            }
-                        }
-                        index++;
-                    } catch (IllegalAccessException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-            log.info("家庭情况正常");
-
-            // TODO 户籍性质(魔法数字)
-            if (asFamilyDifficultDO.getRegistrationType().equals("城镇")) {
-                map.put("hj_0", "☑");
-                map.put("hj_1", "☐");
-            } else if (asFamilyDifficultDO.getRegistrationType().equals("农村")) {
-                map.put("hj_0", "☐");
-                map.put("hj_1", "☑");
-            } else {
-                map.put("hj_0", "☐");
-                map.put("hj_1", "☐");
-            }
-            log.info("户籍性质正常");
-
-            //TODO 户籍所在地(魔法数字)(如果有省,市,县的关键字的话,容易有BUG)
-            String registrationLocation = asFamilyDifficultDO.getRegistrationLocation();
-            String temp = "";
-            for (int j = 0; j < registrationLocation.length(); j++) {
-                if (registrationLocation.charAt(j) == '省') {
-                    map.put("p_name", temp);
-                    temp = "";
-                } else if (registrationLocation.charAt(j) == '市') {
-                    map.put("m_name", temp);
-                    temp = "";
-                } else if (registrationLocation.charAt(j) == '县') {
-                    map.put("c_name", temp);
-                    temp = "";
-                } else {
-                    temp += registrationLocation.charAt(j);
-                }
-            }
-            log.info("户籍所在地处理正常");
-
-            // TODO 住房情况(魔法数字)
-            String housingSituation = asFamilyDifficultDO.getHousingSituation();
-            if (housingSituation.equals("商品房")) {
-                map.put("zf_0", "☑");
-                map.put("zf_1", "☐");
-                map.put("zf_2", "☐");
-                map.put("zf_3", "☐");
-                map.put("zf_4", "☐");
-            } else if (housingSituation.equals("单位福利住房")) {
-                map.put("zf_0", "☐");
-                map.put("zf_1", "☑");
-                map.put("zf_2", "☐");
-                map.put("zf_3", "☐");
-                map.put("zf_4", "☐");
-            } else if (housingSituation.equals("自建房")) {
-                map.put("zf_0", "☐");
-                map.put("zf_1", "☐");
-                map.put("zf_2", "☑");
-                map.put("zf_3", "☐");
-                map.put("zf_4", "☐");
-
-            } else if (housingSituation.equals("租房、无房")) {
-                map.put("zf_0", "☐");
-                map.put("zf_1", "☐");
-                map.put("zf_2", "☐");
-                map.put("zf_3", "☑");
-                map.put("zf_4", "☐");
-            } else if (housingSituation.equals("其他")) {
-                map.put("zf_0", "☐");
-                map.put("zf_1", "☐");
-                map.put("zf_2", "☐");
-                map.put("zf_3", "☐");
-                map.put("zf_4", "☑");
-            } else {
-                map.put("zf_0", "☐");
-                map.put("zf_1", "☐");
-                map.put("zf_2", "☐");
-                map.put("zf_3", "☐");
-                map.put("zf_4", "☐");
-            }
-            log.info("住房处理正常");
-
-            // TODO 家中有汽车情况(魔法数字)
-            String housingCar = asFamilyDifficultDO.getHousingCar();
-            if (housingCar.equals("自用")) {
-                map.put("car_0", "☑");
-                map.put("car_1", "☐");
-                map.put("car_2", "☐");
-            } else if (housingCar.equals("经营用")) {
-                map.put("car_0", "☐");
-                map.put("car_1", "☑");
-                map.put("car_2", "☐");
-            } else if (housingCar.equals("无汽车")) {
-                map.put("car_0", "☐");
-                map.put("car_1", "☐");
-                map.put("car_2", "☑");
-            } else {
-                map.put("car_0", "☐");
-                map.put("car_1", "☐");
-                map.put("car_2", "☐");
-            }
-            log.info("家中汽车情况处理正常");
-
-
-            // 家庭成员情况
-            for (int j = 0; j < NumberList.size(); j++) {
-                AsFamilyNumberOfFamilyDifficult asFamilyNumberOfFamilyDifficult = NumberList.get(j);
-                map.put("name_" + j, asFamilyNumberOfFamilyDifficult.getName());
-                map.put("age_" + j, asFamilyNumberOfFamilyDifficult.getAge());
-                map.put("re_" + j, asFamilyNumberOfFamilyDifficult.getRelationShip());
-                map.put("work_" + j, asFamilyNumberOfFamilyDifficult.getWorkUnit());
-                map.put("c_" + j, asFamilyNumberOfFamilyDifficult.getCareer());
-                map.put("inc_" + j, asFamilyNumberOfFamilyDifficult.getAnnualIncome());
-                //健康状况的判断
-                if (asFamilyNumberOfFamilyDifficult.getHealth().equals("健康")) {
-                    map.put("jk_" + j, "√");
-                    map.put("cj_" + j, " ");
-                    map.put("zb_" + j, " ");
-                } else if (asFamilyNumberOfFamilyDifficult.getHealth().equals("残疾")) {
-                    map.put("jk_" + j, " ");
-                    map.put("cj_" + j, "√");
-                    map.put("zb_" + j, " ");
-                } else if (asFamilyNumberOfFamilyDifficult.getHealth().equals("患重大疾病")) {
-                    map.put("jk_" + j, " ");
-                    map.put("cj_" + j, " ");
-                    map.put("zb_" + j, "√");
-                } else {
-                    map.put("jk_" + j, " ");
-                    map.put("cj_" + j, " ");
-                    map.put("zb_" + j, " ");
-                }
-            }
-            //成员不够就补充空格
-            for (int j = NumberList.size(); j < FamilyNumberSizeConstant.FAMILY_DIFFICULT_NUMBER_MAX_SIZE; j++) {
-                map.put("name_" + j, " ");
-                map.put("age_" + j, " ");
-                map.put("re_" + j, " ");
-                map.put("work_" + j, " ");
-                map.put("c_" + j, " ");
-                map.put("inc_" + j, " ");
-                map.put("jk_" + j, " ");
-                map.put("cj_" + j, " ");
-                map.put("zb_" + j, " ");
-            }
-            log.info("家庭成员处理正常");
-            // TODO 家庭主要经济收入来源
-            String incomeSource = asFamilyDifficultDO.getIncomeSource();
-            String[] splits3 = incomeSource.split(",");
-            //按照定义顺序
-            Class<IncomeSourceConstant> clazz3 = IncomeSourceConstant.class;
-            Field[] fields3 = clazz3.getDeclaredFields();
-            int index3 = 0;
-            for (Field field : fields3) {
-                field.setAccessible(true);
-                if (field.getType() == String.class) {
-                    try {
-                        String value = (String) field.get(null);
-                        map.put("income_" + index3, "☐");
-                        for (int j = 0; j < splits3.length; j++) {
-                            if (value.equals(splits3[j])) {
-                                map.put("income_" + index3, "☑");
-                                break;
-                            }
-                        }
-                        index3++;
-                    } catch (IllegalAccessException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-            log.info("家庭主要经济处理正常");
-            // TODO 突发情况
-            String familyEmergency = asFamilyDifficultDO.getFamilyEmergency();
-            log.info("familyEmergency = {}", familyEmergency);
-            if (familyEmergency != null) {
-                String[] splits4 = familyEmergency.split(",");
-                //按照定义顺序
-                Class<EmergenciesConstant> clazz4 = EmergenciesConstant.class;
-                Field[] fields4 = clazz4.getDeclaredFields();
-                int index4 = 0;
-                for (Field field : fields4) {
-                    field.setAccessible(true);
-                    if (field.getType() == String.class) {
-                        try {
-                            String value = (String) field.get(null);
-                            map.put("oth_" + index4, "☐");
-                            for (int j = 0; j < splits4.length; j++) {
-                                if (value.equals(splits4[j])) {
-                                    map.put("oth_" + index4, "☑");
-                                    break;
-                                }
-                            }
-                            index4++;
-                        } catch (IllegalAccessException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-                log.info("突发情况正常");
-            }
-
-            //班级民主
-            if (asFamilyDifficultDO.getClassReviewGroupOpinion().equals(DifficultLevelConstant.ESPECIALLY_DIFFICULT)) {
-                map.put("cl_0", "☑");
-                map.put("cl_1", "☐");
-                map.put("cl_2", "☐");
-            } else if (asFamilyDifficultDO.getClassReviewGroupOpinion().equals(DifficultLevelConstant.COMPARATIVE_DIFFICULT)) {
-                map.put("cl_0", "☐");
-                map.put("cl_1", "☑");
-                map.put("cl_2", "☐");
-            } else if (asFamilyDifficultDO.getClassReviewGroupOpinion().equals(DifficultLevelConstant.GENERAL_DIFFICULT)) {
-                map.put("cl_0", "☐");
-                map.put("cl_1", "☐");
-                map.put("cl_2", "☑");
-            } else {
-                map.put("cl_0", "☐");
-                map.put("cl_1", "☐");
-                map.put("cl_2", "☐");
-            }
-            log.info("班级民主处理正常");
-
-            //学院
-            if (asFamilyDifficultDO.getDepartmentOpinion().equals(DifficultLevelConstant.ESPECIALLY_DIFFICULT)) {
-                map.put("dp_0", "☑");
-                map.put("dp_1", "☐");
-                map.put("dp_2", "☐");
-            } else if (asFamilyDifficultDO.getDepartmentOpinion().equals(DifficultLevelConstant.COMPARATIVE_DIFFICULT)) {
-                map.put("dp_0", "☐");
-                map.put("dp_1", "☑");
-                map.put("dp_2", "☐");
-            } else if (asFamilyDifficultDO.getDepartmentOpinion().equals(DifficultLevelConstant.GENERAL_DIFFICULT)) {
-                map.put("dp_0", "☐");
-                map.put("dp_1", "☐");
-                map.put("dp_2", "☑");
-            } else {
-                map.put("dp_0", "☐");
-                map.put("dp_1", "☐");
-                map.put("dp_2", "☐");
-            }
-            log.info("学院处理正常");
-
-            //学校
-            if (asFamilyDifficultDO.getSchoolApprovalOpinion().equals(DifficultLevelConstant.ESPECIALLY_DIFFICULT)) {
-                map.put("sc_0", "☑");
-                map.put("sc_1", "☐");
-                map.put("sc_2", "☐");
-            } else if (asFamilyDifficultDO.getSchoolApprovalOpinion().equals(DifficultLevelConstant.COMPARATIVE_DIFFICULT)) {
-                map.put("sc_0", "☐");
-                map.put("sc_1", "☑");
-                map.put("sc_2", "☐");
-            } else if (asFamilyDifficultDO.getSchoolApprovalOpinion().equals(DifficultLevelConstant.GENERAL_DIFFICULT)) {
-                map.put("sc_0", "☐");
-                map.put("sc_1", "☐");
-                map.put("sc_2", "☑");
-            } else {
-                map.put("sc_0", "☐");
-                map.put("sc_1", "☐");
-                map.put("sc_2", "☐");
-            }
-            log.info("学校处理正常");
-
-            // 最后的特殊处理:横线消失问题,补上对应长度的横线
-            //1.otherInfo = null
-            if (map.get("otherInfo") == null) {
-                map.put("otherInfo", "                                   ");
-            }
-            //2.otherPrief = null
-            if (map.get("otherPrief") == null) {
-                map.put("otherPrief", "                                          ");
-            }
-            //3.emergencySituations = null
-            if (map.get("emergencySituations") == null) {
-                map.put("emergencySituations", "                                                        ");
-            }
-            //4.otherCircumstances = null
-            if (map.get("otherCircumstances") == null) {
-                map.put("otherCircumstances", "                                                                              ");
-            }
-            log.info("第{}个学生的map信息如下{}", i + 1, map);
-            dataList.add(map);
-        }
-        return dataList;
-    }
-}

+ 0 - 277
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/exportwordmanage/ExportStipendWordManageImpl.java

@@ -1,277 +0,0 @@
-package cn.iocoder.yudao.module.as.service.exportwordmanage;
-
-import cn.afterturn.easypoi.entity.ImageEntity;
-import cn.iocoder.yudao.module.as.controller.admin.exportWordManage.Constant.DifficultLevelConstant;
-import cn.iocoder.yudao.module.as.controller.admin.exportWordManage.Constant.DifficultTypeConstant;
-import cn.iocoder.yudao.module.as.controller.admin.exportWordManage.Constant.FamilyNumberSizeConstant;
-import cn.iocoder.yudao.module.as.controller.admin.exportWordManage.utils.FileUtil;
-import cn.iocoder.yudao.module.as.controller.admin.exportWordManage.utils.ZipUtil;
-import cn.iocoder.yudao.module.as.dal.dataobject.exportwordmanage.AsFamilyNumberOfStipend;
-import cn.iocoder.yudao.module.as.dal.dataobject.exportwordmanage.AsStipend;
-import cn.iocoder.yudao.module.as.dal.mysql.exportwordmanage.AsFamilyNumberOfStipendMapper;
-import cn.iocoder.yudao.module.as.dal.mysql.exportwordmanage.ExportStipendWordManageMapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.io.File;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @autor WoVoM
- * @data 2024/7/5 14:16
- * @@version 1.0
- */
-@Service
-@Slf4j
-public class ExportStipendWordManageImpl extends ServiceImpl<ExportStipendWordManageMapper, AsStipend> implements ExportStipendWordManageService {
-
-    @Autowired
-    private ExportStipendWordManageMapper exportStipendWordManageMapper;
-
-    @Autowired
-    private AsFamilyNumberOfStipendMapper asFamilyNumberOfStipendMapper;
-
-    @Autowired
-    private ISysFileService sysFileService;
-
-
-    /**
-     * 根据ids导出助学金申请表
-     * @param ids
-     * @return
-     */
-    @Override
-    public ResponseEntity<ByteArrayResource> getStipendWordByIds(List<Integer> ids) {
-        /**
-         * 1.数据集合,根据ids将数据查出,并封装VO
-         */
-        List<File> docFiles = new ArrayList<>();
-        List<Map<String, Object>> dataList = fillDocxInData(ids);
-        /**
-         * 2.根据模板,生成一个个的WORD文档,并且合并成ZIP格式导出
-         */
-        for(int i = 0; i < dataList.size(); i++){
-            File file = null;
-            try {
-                file = FileUtil.exportWordDocx( dataList.get(i), "word/zx.docx");
-            } catch (Exception exception) {
-                exception.printStackTrace();
-            }
-            docFiles.add(file);
-        }
-        // 打包压缩生成的文档
-        String zipFileName = "documents.zip";
-        try {
-            ZipUtil.zipFiles(zipFileName, docFiles.toArray(new File[0]));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        // 删除临时生成的文档文件
-        for (File doc : docFiles) {
-            doc.delete();
-        }
-        // 读取生成的ZIP文件并将其作为响应体返回给前端
-        File zipFile = new File(zipFileName);
-        ByteArrayResource resource = null;
-        try {
-            resource = new ByteArrayResource(ZipUtil.readBytes(zipFile));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        // 设置响应头
-        HttpHeaders headers = new HttpHeaders();
-        headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=StipendTable.zip");
-        return ResponseEntity.ok()
-                .headers(headers)
-                .contentType(MediaType.parseMediaType("application/zip"))
-                .contentLength(zipFile.length())
-                .body(resource);
-    }
-
-    /**
-     * 预览助学金申请表单
-     * @param id
-     * @return
-     */
-    @Override
-    public String getStipendPDFById(Integer id) {
-        log.info("进入预览家庭经济困难认定表单界面");
-        try {
-            List<Integer> ids = new ArrayList<>();
-            ids.add(id);
-            List<Map<String, Object>> dataList = fillDocxInData(ids);
-            // 生成Word文档
-            File file = null;
-            try {
-                file = FileUtil.exportWordDocx( dataList.get(0), "word/zx.docx");
-            } catch (Exception exception) {
-                exception.printStackTrace();
-            }
-            // word转成ptf
-            try {
-                // word 转成 pdf
-                File pdfFile = FileUtil.convertWordToPdf(file);
-                // 上传到 minio 中
-                String url = sysFileService.upload(FileUtil.fileToMultipartFile(pdfFile));
-                //上传word能预览
-                //String url = sysFileService.upload(FileUtil.fileToMultipartFile(file));
-                // 删除临时文件
-                file.delete();
-                // 返回路径
-                log.info("url = {}", url);
-                return url;
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-
-
-    /**
-     * 填充数据
-     * @param ids
-     * @return
-     */
-    private List<Map<String, Object>> fillDocxInData(List<Integer> ids){
-        List<Map<String, Object>> dataList = new ArrayList<>();
-
-        List<AsStipend> asStipendsList = exportStipendWordManageMapper.selectBatchIds(ids);
-        for(int i = 0; i < asStipendsList.size(); i++) {
-            AsStipend asStipend = asStipendsList.get(i);
-            log.info("第{}个学生信息如下{}", i + 1, asStipend);
-            // 将家庭成员信息找出
-            // TODO 存在一个隐患,如果有两次的申请的话,成员数量翻倍
-            List<AsFamilyNumberOfStipend> NumberList = asFamilyNumberOfStipendMapper.selectList(new QueryWrapper<AsFamilyNumberOfStipend>()
-                    .eq("sno", asStipend.getAsSno()));
-            log.info("第{}个学生的家庭成员信息如下{}", i + 1, NumberList);
-            // 实体类转成map
-            Map<String, Object> map = new HashMap<>();
-            Class<?> clazz = asStipend.getClass();
-            for (Field field : clazz.getDeclaredFields()) {
-                field.setAccessible(true); // 设置可访问私有字段
-                try {
-                    map.put(field.getName(), field.get(asStipend)); // 将属性名和属性值放入Map
-                } catch (IllegalAccessException e) {
-                    e.printStackTrace();
-                }
-            }
-            //特殊处理
-            //时间
-            LocalDateTime asBirthday = asStipend.getAsBirthday();
-            LocalDateTime asIntake = asStipend.getAsIntake();
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM");
-            String formattedDate = asBirthday.format(formatter);
-            String format = asIntake.format(formatter);
-            map.put("asBirthday", formattedDate);
-            map.put("asIntake",format);
-
-            //图片
-            ImageEntity imageEntity = new ImageEntity();
-            imageEntity.setHeight(200);
-            imageEntity.setWidth(140);
-            imageEntity.setUrl(asStipend.getAsImage());
-            imageEntity.setType(ImageEntity.URL);
-            map.put("image", imageEntity);
-            //手机号
-            String phone = asStipend.getPhone();
-            for (int j = 0; j < phone.length(); j++) {
-                map.put("ph_" + j, phone.charAt(j));
-            }
-            //身份号
-            String asIdCard = asStipend.getAsIdCard();
-            for (int j = 0; j < asIdCard.length(); j++) {
-                map.put("ic_" + j, asIdCard.charAt(j));
-            }
-            // 家庭成员情况
-            for (int j = 0; j < NumberList.size(); j++) {
-                AsFamilyNumberOfStipend asFamilyNumberOfStipend = NumberList.get(j);
-                map.put("name_" + j, asFamilyNumberOfStipend.getName());
-                map.put("age_" + j, asFamilyNumberOfStipend.getAge());
-                map.put("re_" + j, asFamilyNumberOfStipend.getRelationShip());
-                map.put("work_" + j, asFamilyNumberOfStipend.getWorkUnit());
-            }
-            //成员不够就补充空格
-            for (int j = NumberList.size(); j < FamilyNumberSizeConstant.NUMBER_MAX_SIZE; j++) {
-                map.put("name_" + j, " ");
-                map.put("age_" + j, " ");
-                map.put("re_" + j, " ");
-                map.put("work_" + j, " ");
-            }
-            // 困难类型
-            if (asStipend.getAsDifficultyLevel().equals(DifficultLevelConstant.ESPECIALLY_DIFFICULT)) {
-                map.put("dl_0", "☑");
-                map.put("dl_1", "☐");
-                map.put("dl_2", "☐");
-            } else if (asStipend.getAsDifficultyLevel().equals(DifficultLevelConstant.COMPARATIVE_DIFFICULT)) {
-                map.put("dl_0", "☐");
-                map.put("dl_1", "☑");
-                map.put("dl_2", "☐");
-            } else if (asStipend.getAsDifficultyLevel().equals(DifficultLevelConstant.GENERAL_DIFFICULT)) {
-                map.put("dl_0", "☐");
-                map.put("dl_1", "☐");
-                map.put("dl_2", "☑");
-            } else {
-                map.put("dl_0", "☐");
-                map.put("dl_1", "☐");
-                map.put("dl_2", "☐");
-            }
-            //实体类是一个String类型,假设困难类型以,隔开--->脱贫家庭学生,脱贫不稳定户家庭
-            /**
-             * 有个很重要的前提:
-             * 常量的顺序,必须跟表格的顺序保持一致
-             */
-            String[] parts = asStipend.getAsDifficultyType().split(",");
-            for (String part : parts) {
-                log.info("困难类型如下:{}",part);
-            }
-            log.info("有{}种困难类型",parts.length);
-            // 反射遍历常量定义
-            //按照定义顺序
-            Class<DifficultTypeConstant> clazz2 = DifficultTypeConstant.class;
-            Field[] fields = clazz2.getDeclaredFields();
-            int index = 0;
-            for (Field field : fields) {
-                field.setAccessible(true);
-                if (field.getType() == String.class) {
-                    try {
-                        String value = (String) field.get(null);
-                        map.put("dt_" + index, "☐");
-                        for(int j = 0; j < parts.length; j++){
-                            if(value.equals(parts[j])){
-                                map.put("dt_" + index, "☑");
-                                break;
-                            }
-                        }
-                        index++;
-                    } catch (IllegalAccessException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-            log.info("第{}个学生的map信息如下{}", i + 1, map);
-            dataList.add(map);
-        }
-        return dataList;
-    }
-
-}

+ 0 - 30
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/exportwordmanage/ExportStipendWordManageService.java

@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.as.service.exportwordmanage;
-
-import cn.iocoder.yudao.module.as.dal.dataobject.exportwordmanage.AsStipend;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.http.ResponseEntity;
-
-import java.util.List;
-
-/**
- * @autor WoVoM
- * @data 2024/7/5 14:16
- * @@version 1.0
- */
-public interface ExportStipendWordManageService extends IService<AsStipend> {
-    /**
-     * 根据ids导出助学金申请表
-     * @param ids
-     * @return
-     */
-    ResponseEntity<ByteArrayResource> getStipendWordByIds(List<Integer> ids);
-
-
-    /**
-     * 根据id 预览助学金申请表pdf
-     * @param id
-     * @return
-     */
-    String getStipendPDFById(Integer id);
-}

+ 0 - 14
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/exportwordmanage/ISysFileService.java

@@ -1,14 +0,0 @@
-package cn.iocoder.yudao.module.as.service.exportwordmanage;
-
-import org.springframework.web.multipart.MultipartFile;
-
-public interface ISysFileService {
-
-	/**
-	 * 文件上传
-	 * @param file
-	 * @return
-	 */
-	String upload(MultipartFile file);
-
-}

+ 0 - 99
yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/exportwordmanage/SysFileServiceImpl.java

@@ -1,99 +0,0 @@
-package cn.iocoder.yudao.module.as.service.exportwordmanage;
-
-import cn.iocoder.yudao.module.as.controller.admin.exportWordManage.config.MinioConfig;
-import io.minio.BucketExistsArgs;
-import io.minio.MakeBucketArgs;
-import io.minio.MinioClient;
-import io.minio.PutObjectArgs;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.UUID;
-
-@Service
-@Slf4j
-public class SysFileServiceImpl implements ISysFileService{
-
-	@Autowired
-	MinioConfig minioConfig;
-
-	/**
-	 * 文件上传至Minio
-	 * 使用try catch finally进行上传
-	 * finally里进行资源的回收
-	 */
-	@Override
-	public String upload(MultipartFile file) {
-		log.info("第四步:准备上传minio");
-		InputStream inputStream = null;
-		//创建Minio的连接对象
-		MinioClient minioClient = getClient();
-		//获取存储桶
-		String bucketName = minioConfig.getBucketName();
-		try {
-			inputStream = file.getInputStream();
-			// 如果不存在,请设为 bucketName bucket
-			boolean found =
-					minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucketName).build());
-			if (!found) {
-				// 创建一个名为 bucketName 的新存储桶
-				minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucketName).build());
-			} else {
-				log.info("Bucket " +"["+bucketName+ "]"+" already exists.");
-			}
-			// 将给定的流作为存储桶中的对象上传
-			String oldFileName = file.getOriginalFilename();
-			log.info("原始文件名如下{}", oldFileName);
-			String objectName = new SimpleDateFormat("yyyy/MM/dd/").format(new Date()) +
-					UUID.randomUUID().toString().replaceAll("-", "") +
-					oldFileName.substring(oldFileName.lastIndexOf("."));
-			log.info("新文件名如下{}", objectName);
-			minioClient.putObject(
-					PutObjectArgs
-							.builder()
-							.bucket(bucketName)
-							.object(objectName)
-							.stream(inputStream, file.getSize(), -1)
-							.contentType(file.getContentType())
-							.build());
-			return "http://" +
-					minioConfig.getEndpoint() +
-					":" + minioConfig.getPort() +
-					"/" + minioConfig.getBucketName() +
-					"/" + objectName;
-		}catch(Exception e){
-			e.printStackTrace();
-			return null;
-		}finally {
-			//防止内存泄漏
-			if (inputStream != null) {
-				try {
-					inputStream.close(); // 关闭流
-				} catch (IOException e) {
-					log.debug("inputStream close IOException:" + e.getMessage());
-				}
-			}
-		}
-	}
-
-
-	/**
-	 * 提供一个获取Minio连接的方法
-	 * 获取Minio连接
-	 * @return
-	 */
-	private MinioClient getClient(){
-		MinioClient minioClient =
-				MinioClient.builder()
-						.endpoint("http://"+minioConfig.getEndpoint()+":"+ minioConfig.getPort())
-						.credentials(minioConfig.getAccessKey(),minioConfig.getSecretKey())
-						.build();
-		return minioClient;
-	}
-}

+ 0 - 12
yudao-module-as/yudao-module-as-biz/src/main/resources/mapper/exportwordmanage/AsFamilyNumberOfFamilyDifficultMapper.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.yudao.module.as.dal.mysql.exportwordmanage.AsFamilyNumberOfFamilyDifficultMapper">
-
-    <!--
-        一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。
-        无法满足的场景,例如说多表关联查询,才使用 XML 编写 SQL。
-        代码生成器暂时只生成 Mapper XML 文件本身,更多推荐 MybatisX 快速开发插件来生成查询。
-        文档可见:https://www.iocoder.cn/MyBatis/x-plugins/
-     -->
-
-</mapper>

+ 0 - 12
yudao-module-as/yudao-module-as-biz/src/main/resources/mapper/exportwordmanage/AsFamilyNumberOfStipendMapper.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.yudao.module.as.dal.mysql.exportwordmanage.AsFamilyNumberOfStipendMapper">
-
-    <!--
-        一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。
-        无法满足的场景,例如说多表关联查询,才使用 XML 编写 SQL。
-        代码生成器暂时只生成 Mapper XML 文件本身,更多推荐 MybatisX 快速开发插件来生成查询。
-        文档可见:https://www.iocoder.cn/MyBatis/x-plugins/
-     -->
-
-</mapper>

+ 0 - 12
yudao-module-as/yudao-module-as-biz/src/main/resources/mapper/exportwordmanage/ExportFamilyDifficultWordManageMapper.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.yudao.module.as.dal.mysql.exportwordmanage.ExportFamilyDifficultWordManageMapper">
-
-    <!--
-        一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。
-        无法满足的场景,例如说多表关联查询,才使用 XML 编写 SQL。
-        代码生成器暂时只生成 Mapper XML 文件本身,更多推荐 MybatisX 快速开发插件来生成查询。
-        文档可见:https://www.iocoder.cn/MyBatis/x-plugins/
-     -->
-
-</mapper>

+ 0 - 12
yudao-module-as/yudao-module-as-biz/src/main/resources/mapper/exportwordmanage/ExportStipendWordManageMapper.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.yudao.module.as.dal.mysql.exportwordmanage.ExportStipendWordManageMapper">
-
-    <!--
-        一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。
-        无法满足的场景,例如说多表关联查询,才使用 XML 编写 SQL。
-        代码生成器暂时只生成 Mapper XML 文件本身,更多推荐 MybatisX 快速开发插件来生成查询。
-        文档可见:https://www.iocoder.cn/MyBatis/x-plugins/
-     -->
-
-</mapper>