src/main/java/com/xjrsoft/module/form/controller/FormExecuteController.java

@@ -251,7 +251,7 @@ public class FormExecuteController {
         List<Map<Integer, Object>> exportList = new ArrayList<>();
         if (!dto.getIsTemplate()) {
             // 构建导出数据格式
-            dto.setIsTrans(false);
+//            dto.setIsTrans(false);
 //            Boolean isPage = formReleaseConfig.getListConfig().getIsPage();
             List<Entity> dataList = formExecuteService.list(dto);
 //            if (isPage) {

src/main/java/com/xjrsoft/module/form/service/impl/FormExecuteServiceImpl.java

@@ -1603,7 +1603,6 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
 
         List<QueryConfig> queryConfigs = formReleaseConfig.getListConfig().getQueryConfigs();
 
-
         //如果有左侧树 需要把所选项目 where 条件加上
         if (formReleaseConfig.getListConfig().getIsLeftMenu()) {
             //如果已经包含此字段  就不添加了

src/main/java/com/xjrsoft/module/form/utils/FormDataTransUtil.java

@@ -142,7 +142,10 @@ public final class FormDataTransUtil {
                     || (StrUtil.equalsIgnoreCase(ComponentTypeConstant.INFO, type) && infoType.equals(0))) {
                 if (userMap == null) {
                     List<User> userList = redisUtil.get(GlobalConstant.USER_CACHE_KEY, new TypeReference<List<User>>() {});
-                    userMap = userList.stream().collect(Collectors.toMap(user -> user.getId().toString(), User::getName, (e1, e2) -> e1));
+                    userMap = userList.stream()
+                            .filter(user -> user.getId() != null)
+                            .filter(user -> user.getName() != null)
+                            .collect(Collectors.toMap(user -> user.getId().toString(), User::getName, (e1, e2) -> e1));
                 }
                 if (infoType == null) {
                     multiFieldMap.put(bindField, null);

src/main/java/com/xjrsoft/module/material/controller/MaterialTaskController.java

@@ -17,16 +17,7 @@ import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.app.dto.UpdateEnableMarkDto;
 import com.xjrsoft.module.form.dto.FormExecuteInfoDto;
 import com.xjrsoft.module.form.service.IFormExecuteService;
-import com.xjrsoft.module.material.dto.AddMaterialTaskAssignDto;
-import com.xjrsoft.module.material.dto.AddMaterialTaskDto;
-import com.xjrsoft.module.material.dto.MaterialTaskAssignAppendixDto;
-import com.xjrsoft.module.material.dto.MaterialTaskAssignApprovedDto;
-import com.xjrsoft.module.material.dto.MaterialTaskAssignListDto;
-import com.xjrsoft.module.material.dto.MaterialTaskAssignPageDto;
-import com.xjrsoft.module.material.dto.MaterialTaskPageDto;
-import com.xjrsoft.module.material.dto.MaterialTaskWaitPageDto;
-import com.xjrsoft.module.material.dto.UpdateMaterialTaskDto;
-import com.xjrsoft.module.material.dto.ViewContentDto;
+import com.xjrsoft.module.material.dto.*;
 import com.xjrsoft.module.material.entity.MaterialTask;
 import com.xjrsoft.module.material.entity.MaterialTaskAppendix;
 import com.xjrsoft.module.material.entity.MaterialTaskAssign;
@@ -275,4 +266,11 @@ public class MaterialTaskController {
             setId(dto.getId());
         }}));
     }
+
+    @GetMapping("/form-data-export-query")
+    @ApiOperation(value = "表单缴交数据条件导出")
+    public ResponseEntity<byte[]> formDataExportQuery(@Valid @RequestBody FormDataExportQueryDto dto) {
+        ByteArrayOutputStream bot = materialTaskService.formDataExportQuery(dto);
+        return RT.fileStream(bot.toByteArray(), "MaterialFormData" + ExcelTypeEnum.XLSX.getValue());
+    }
 }

src/main/java/com/xjrsoft/module/material/dto/FormDataExportQueryDto.java

@@ -0,0 +1,31 @@
+package com.xjrsoft.module.material.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+* @title: 材料提交任务类型分配
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+public class FormDataExportQueryDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 表单模板id
+     */
+    @ApiModelProperty("自定义表单 表单模板id")
+    private Long templateId;
+
+    /**
+     * 表单数据id
+     */
+    @ApiModelProperty("表单数据id")
+    private Long formDataId;
+}

src/main/java/com/xjrsoft/module/material/service/IMaterialTaskService.java

@@ -2,12 +2,14 @@ package com.xjrsoft.module.material.service;
 
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.material.dto.AddMaterialTaskDto;
+import com.xjrsoft.module.material.dto.FormDataExportQueryDto;
 import com.xjrsoft.module.material.dto.MaterialTaskAssignAppendixDto;
 import com.xjrsoft.module.material.dto.MaterialTaskAssignListDto;
 import com.xjrsoft.module.material.entity.MaterialTask;
 import com.xjrsoft.module.material.vo.MaterialTaskAssignListVo;
 import com.xjrsoft.module.material.vo.MaterialTaskVo;
 
+import java.io.ByteArrayOutputStream;
 import java.util.List;
 
 /**
@@ -54,4 +56,6 @@ public interface IMaterialTaskService extends MPJBaseService<MaterialTask> {
     void sendMessage(Long materialTaskId);
 
     List<MaterialTaskAssignListVo> assignList(MaterialTaskAssignListDto dto);
+
+    ByteArrayOutputStream formDataExportQuery(FormDataExportQueryDto dto);
 }

src/main/java/com/xjrsoft/module/material/service/impl/MaterialTaskServiceImpl.java

@@ -1,7 +1,9 @@
 package com.xjrsoft.module.material.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -11,17 +13,20 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.enums.DeleteMark;
 import com.xjrsoft.common.enums.MaterialCategoryEnum;
+import com.xjrsoft.common.exception.MyException;
+import com.xjrsoft.common.model.generator.ComponentConfig;
 import com.xjrsoft.common.utils.RedisUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.config.CommonPropertiesConfig;
 import com.xjrsoft.module.concat.service.IXjrUserService;
 import com.xjrsoft.module.form.dto.FormExecuteAddOrUpdateDto;
+import com.xjrsoft.module.form.entity.FormDesignConfig;
+import com.xjrsoft.module.form.entity.FormTemplate;
+import com.xjrsoft.module.form.mapper.FormTemplateMapper;
 import com.xjrsoft.module.form.service.IFormExecuteService;
-import com.xjrsoft.module.material.dto.AddMaterialTaskAppendixDto;
-import com.xjrsoft.module.material.dto.AddMaterialTaskDto;
-import com.xjrsoft.module.material.dto.MaterialAssignUserDto;
-import com.xjrsoft.module.material.dto.MaterialTaskAssignAppendixDto;
-import com.xjrsoft.module.material.dto.MaterialTaskAssignListDto;
+import com.xjrsoft.module.generator.constant.ComponentTypeConstant;
+import com.xjrsoft.module.generator.entity.TableConfig;
+import com.xjrsoft.module.generator.utils.GeneratorUtil;
+import com.xjrsoft.module.material.dto.*;
 import com.xjrsoft.module.material.entity.MaterialTask;
 import com.xjrsoft.module.material.entity.MaterialTaskAppendix;
 import com.xjrsoft.module.material.entity.MaterialTaskAssign;
@@ -51,6 +56,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.ByteArrayOutputStream;
 import java.time.LocalDate;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -75,6 +81,8 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
     private final IXjrUserService xjrUserService;
     private final IFormExecuteService formExecuteService;
 
+    private final FormTemplateMapper formTemplateMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long add(AddMaterialTaskDto dto) {
@@ -433,7 +441,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
                 .distinct()
                 .select(MaterialTaskAssign::getId)
                 .selectAs(MaterialTaskAppendix::getFileId, MaterialTaskAssignListVo::getFolderId)
-                .selectAs(MaterialTaskAppendix::getFileId, MaterialTaskAssignListVo::getFormReleaseId)
+                .selectAs(MaterialTaskAppendix::getFileId, MaterialTaskAssignListVo::getFormDataId)
                 .selectAs(MaterialTask::getMaterialCategory, MaterialTaskAssignListVo::getMaterialCategory)
                 .select(XjrUser.class, x -> VoToColumnUtil.fieldsToColumns(MaterialTaskAssignListVo.class).contains(x.getProperty()))
                 .select(MaterialTaskAssign.class, x -> VoToColumnUtil.fieldsToColumns(MaterialTaskAssignListVo.class).contains(x.getProperty()))
@@ -449,6 +457,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
                 .eq(Department::getDeleteMark, DeleteMark.NODELETE.getCode())
                 .eq(MaterialTask::getDeleteMark, DeleteMark.NODELETE.getCode())
                 .eq(MaterialTaskAssign::getDeleteMark, DeleteMark.NODELETE.getCode())
+                .eq(MaterialTaskAppendix::getDeleteMark, DeleteMark.NODELETE.getCode())
 //                .select("(\n" +
 //                        "SELECT id FROM xjr_file WHERE id IN (\n" +
 //                        "SELECT file_id FROM material_task_appendix WHERE material_task_id = t.id\n" +
@@ -465,7 +474,43 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
         return pageOutput;
     }
 
-    private boolean sendMessageUtil(MaterialTask materialTask ) {
+    @Override
+    public ByteArrayOutputStream formDataExportQuery(FormDataExportQueryDto dto) {
+        //自定义表单数据
+        FormTemplate template = formTemplateMapper.selectById(dto.getTemplateId());
+
+        String formJson = template.getFormJson();
+        //自定义表单配置
+        FormDesignConfig formDesignConfig = JSONUtil.toBean(formJson, FormDesignConfig.class);
+        //表关系配置
+        List<TableConfig> tableConfigs = formDesignConfig.getTableConfigs();
+        //主表
+        Optional<TableConfig> mainTable = tableConfigs.stream().filter(TableConfig::getIsMain).findFirst();
+
+        if (mainTable.isPresent()) {
+            TableConfig tableConfig = mainTable.get();
+            String tableName = tableConfig.getTableName();
+
+            Map<String, List<ComponentConfig>> formComponentListMap = GeneratorUtil.buildFormComponentList(formDesignConfig.getFormJson().getList());
+            List<String> fieldsList = new ArrayList<>();
+            for (ComponentConfig config : formComponentListMap.get(tableName)) {
+                String type = config.getType();
+                if (StrUtil.equalsIgnoreCase(type, ComponentTypeConstant.TIME_RANGE) || StrUtil.equalsIgnoreCase(type, ComponentTypeConstant.DATE_RANGE)) {
+                    fieldsList.add(config.getBindStartTime());
+                    fieldsList.add(config.getBindEndTime());
+                } else {
+                    fieldsList.add(config.getBindField());
+                }
+            }
+
+            //return getFormData(tableName, fieldsList, formDesignConfig, dto.getId());
+        } else {
+            throw new MyException("主表不存在");
+        }
+        return null;
+    }
+
+    private void sendMessageUtil(MaterialTask materialTask ) {
         IUserService userService = SpringUtil.getBean(IUserService.class);
         RedisUtil redisUtil = SpringUtil.getBean(RedisUtil.class);
         List<User> userList = redisUtil.get(GlobalConstant.USER_CACHE_KEY, new TypeReference<List<User>>() {
@@ -477,7 +522,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
         }
 
         if(materialTask.getCreateUserId() == null){
-            return false;
+            return;
         }
 
         User createUser = userList.stream().filter(u -> materialTask.getCreateUserId().equals(u.getId())).findFirst().orElse(new User());
@@ -507,6 +552,5 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
             weChatSendMessageDto.setContent(data);
             weChatService.sendTemplateMessage(weChatSendMessageDto);
         };
-        return true;
     }
 }

src/main/java/com/xjrsoft/module/material/vo/MaterialTaskAssignListVo.java

@@ -70,22 +70,11 @@ public class MaterialTaskAssignListVo {
      */
     @ApiModelProperty("文件模板")
     private List<File> files;
-    /**
-     * 表单发布
-     */
-    @ApiModelProperty("表单发布")
-    private Long formReleaseId;
-    /**
-     * 表单发布
-     */
-    @ApiModelProperty("表单发布")
-    private String formReleaseIdCn;
     /**
      * 表单数据id
      */
     @ApiModelProperty("表单数据id")
     private Long formDataId;
-
     /**
      * 用户名字
      */

src/main/resources/sqlScript/20240708_sql.sql

@@ -0,0 +1,179 @@
+-- 教研培训
+DROP TABLE IF EXISTS `wf_teacher_training`;
+CREATE TABLE `wf_teacher_training`
+(
+    id               bigint       not null comment '主键编号'
+        primary key,
+    create_user_id   bigint       null comment '创建人',
+    create_date      datetime     null comment '创建时间',
+    modify_user_id   bigint       null comment '修改人',
+    modify_date      datetime     null comment '修改时间',
+    delete_mark      int          not null comment '删除标记',
+    enabled_mark     int          not null comment '有效标志',
+    sort_code        int          null comment '序号',
+    training_name    varchar(256) null comment '培训活动名称',
+    training_topic   text         null comment '培训活动主题',
+    person_in_charge varchar(256) null comment '培训负责人',
+    start_time       datetime     null comment '培训开始时间',
+    end_time         datetime     null comment '培训结束时间',
+    training_address varchar(512) null comment '培训地点',
+    `remark`         VARCHAR(1000)         DEFAULT NULL COMMENT '备注',
+    `status`         INT          NOT NULL DEFAULT '0' COMMENT '状态（1:结束 0:未结束）'
+)
+    comment 'wf_teacher_training';
+
+-- 教研培训参与培训人员
+DROP TABLE IF EXISTS `wf_teacher_training_participant`;
+CREATE TABLE `wf_teacher_training_participant`
+(
+    id                     bigint       not null comment '主键编号'
+        primary key,
+    create_user_id         bigint       null comment '创建人',
+    create_date            datetime     null comment '创建时间',
+    modify_user_id         bigint       null comment '修改人',
+    modify_date            datetime     null comment '修改时间',
+    delete_mark            int          not null comment '删除标记',
+    enabled_mark           int          not null comment '有效标志',
+    sort_code              int          null comment '序号',
+    wf_teacher_training_id bigint       null comment '教研培训主键id（wf_teacher_training）',
+    participant_id         bigint       null comment '参与培训人id',
+    participant_username   varchar(256) null comment '参与培训人oa',
+    participant_name       varchar(256) null comment '参与培训人姓名'
+)
+    comment '教研培训参与培训人员';
+
+-- 校内实训基地数据项
+DROP TABLE IF EXISTS `school_training_base`;
+CREATE TABLE school_training_base
+(
+    id                     bigint        not null comment '主键编号'
+        primary key,
+    create_user_id         bigint        null comment '创建人',
+    create_date            datetime      null comment '创建时间',
+    modify_user_id         bigint        null comment '修改人',
+    modify_date            datetime      null comment '修改时间',
+    delete_mark            int           not null comment '删除标记',
+    enabled_mark           int           not null comment '有效标志',
+    sort_code              int           null comment '序号',
+    training_base_name     VARCHAR(255)  NOT NULL COMMENT '实训基地名称',
+    training_base_number   VARCHAR(255)  null DEFAULT '0' COMMENT '实训基地编号',
+    training_rooms_number  INT           NOT NULL COMMENT '实训室数，数字标识，例：22',
+    training_project_total INT           NOT NULL COMMENT '实训项目总数，数字标识，例：33',
+    base_category          VARCHAR(255)  NOT NULL COMMENT '基地类别代码（SXJDLBDM）',
+    approve_date           date          NOT NULL COMMENT '批准日期，格式：YYYYMMDD，如：2006-04-12',
+    setup_year             VARCHAR(10)   NOT NULL COMMENT '成立年度，格式：YYYY，如：2006',
+    base_major_id          bigint        null DEFAULT null COMMENT '面向专业',
+    base_major_name        VARCHAR(256)  null DEFAULT '' COMMENT '专业名字',
+    support_department     VARCHAR(255)  null DEFAULT '' COMMENT '被列为实训基地项目支持部门',
+    build_area             DOUBLE(10, 2) null DEFAULT 0 COMMENT '建筑面积',
+    instrument_total       INT           null DEFAULT 0 COMMENT '仪器设备总数，数字标识，例：33',
+    station_number         INT           null DEFAULT 0 COMMENT '实践教学工位数，数字标识，例：33',
+    manager_number_allied  INT           null DEFAULT 0 COMMENT '管理人员数（专职）',
+    manager_number_part    INT           null DEFAULT 0 COMMENT '管理人员数（兼职）'
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+    COMMENT ='校内实训基地数据表';
+
+-- 学生证书表
+DROP TABLE IF EXISTS `student_cert_table`;
+CREATE TABLE student_cert_table
+(
+    id                 bigint       not null comment '主键编号'
+        primary key,
+    create_user_id     bigint       null comment '创建人',
+    create_date        datetime     null comment '创建时间',
+    modify_user_id     bigint       null comment '修改人',
+    modify_date        datetime     null comment '修改时间',
+    delete_mark        int          not null comment '删除标记',
+    enabled_mark       int          not null comment '有效标志',
+    sort_code          int          null comment '序号',
+    student_id         varchar(64)  NOT NULL COMMENT '学号',
+    student_name       varchar(64)  not null comment '学生姓名',
+    student_gender     varchar(32)  NOT NULL COMMENT '性别',
+    class_name         varchar(64)  not null comment '学生班级',
+    teacher_id         bigint       NOT NULL COMMENT '教师id',
+    teacher_name       varchar(64)  NOT NULL COMMENT '教师姓名',
+    cert_name          varchar(255) NOT NULL COMMENT '证书名称',
+    cert_id            varchar(128) NOT NULL COMMENT '证书编号',
+    cert_grade         varchar(64)  NOT NULL COMMENT '证书等级',
+    cert_organizations varchar(255) NOT NULL COMMENT '证书发放机构',
+    cert_date          date         NOT NULL COMMENT '证书发放日期',
+    cert_electronic    varchar(64)  NOT NULL COMMENT '是否支持电子证书(0：否，1：是)',
+    remark             varchar(255) DEFAULT NULL COMMENT '备注',
+    file_id            longtext     NOT NULL COMMENT '附件',
+    status             int          NOT NULL COMMENT '状态（1:结束 0:未结束）'
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='学生证书表';
+
+-- 合作企业表
+DROP TABLE IF EXISTS `company_coop`;
+CREATE TABLE `company_coop`
+(
+    id                 bigint       not null comment '主键编号'
+        primary key,
+    create_user_id     bigint       null comment '创建人',
+    create_date        datetime     null comment '创建时间',
+    modify_user_id     bigint       null comment '修改人',
+    modify_date        datetime     null comment '修改时间',
+    delete_mark        int          not null comment '删除标记',
+    enabled_mark       int          not null comment '有效标志',
+    sort_code          int          null comment '序号',
+    `company_name`     varchar(255) NOT NULL COMMENT '企业名称',
+    `company_type`     varchar(64)  NOT NULL COMMENT '企业性质(企业性质字典编号)',
+    `company_size`     varchar(64)  NOT NULL COMMENT '企业规模（企业规模字典标号）',
+    `company_person`   varchar(255) NOT NULL COMMENT '法人代表',
+    `company_position` varchar(255) NOT NULL COMMENT '企业地址',
+    `contact`          varchar(255) NOT NULL COMMENT '联系人',
+    `phone`            varchar(32)  NOT NULL COMMENT '联系电话',
+    `partner_type`     varchar(64)  NOT NULL COMMENT '合作状态（状态类型字典编号）',
+    `sector`           varchar(64)  NOT NULL COMMENT '所属行业(行业类型字典编号)',
+    `industry`         varchar(64)  NOT NULL COMMENT '所属产业（产业类型字典编号）',
+    `company_email`    varchar(255) NULL DEFAULT NULL COMMENT '企业邮箱',
+    `contact_email`    varchar(255) NULL DEFAULT NULL COMMENT '联系人邮箱',
+    `company_fax`      varchar(255) NULL DEFAULT NULL COMMENT '企业传真',
+    `company_register` varchar(255) NULL DEFAULT NULL COMMENT '企业注册号',
+    `company_website`  varchar(512) NULL DEFAULT NULL COMMENT '企业网址'
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='合作企业表';
+
+-- 奖助学金申请表
+DROP TABLE IF EXISTS `scholarship_bursary_applications`;
+CREATE TABLE `scholarship_bursary_applications`
+(
+    `id`                                   bigint       NOT NULL COMMENT '主键编号',
+    `create_user_id`                       bigint       NULL DEFAULT NULL COMMENT '创建人',
+    `create_date`                          datetime     NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id`                       bigint       NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date`                          datetime     NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark`                          int          NOT NULL COMMENT '删除标记',
+    `enabled_mark`                         int          NOT NULL COMMENT '有效标志',
+    `sort_code`                            int          NULL DEFAULT NULL COMMENT '序号',
+    `class_name`                           varchar(256) NOT NULL COMMENT '班级',
+    `student_name`                         varchar(64)  not null comment '学生姓名',
+    `student_gender`                       varchar(32)  NOT NULL COMMENT '学生性别',
+    `identification_number`                varchar(64)  NOT NULL COMMENT '身份证号',
+    `base_semester`                        varchar(256) NOT NULL COMMENT '学期',
+    `base_student_scholarship_category_id` varchar(256) NOT NULL COMMENT '申请奖助学金名称',
+    `base_student_scholarship_category`    varchar(256) NOT NULL COMMENT '申请奖助学金名称',
+    `personal_circumstances`               longtext     NOT NULL COMMENT '描述个人情况',
+    `application_reason`                   longtext     NOT NULL COMMENT '阐述申请理由',
+    `bank_name`                            varchar(256) NOT NULL COMMENT '收款银行名称',
+    `bank_card_number`                     varchar(256) NOT NULL COMMENT '银行卡号',
+    `bank_account_name`                    varchar(256) NOT NULL COMMENT '账户名称',
+    `file_id`                              longtext     NULL COMMENT '佐证材料',
+    `status`                               int          NULL DEFAULT 0 COMMENT '状态（1:结束 0:未结束）',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='奖助学金申请表';
+
+
+
+
+
+
+
+
+
+
+
+

src/main/resources/sqlScript/20240711_sql.sql

@@ -0,0 +1,118 @@
+-- 校外实训基地数据项
+DROP TABLE IF EXISTS `outside_training_base`;
+CREATE TABLE outside_training_base
+(
+    id                   bigint       not null comment '主键编号' primary key,
+    create_user_id       bigint       null comment '创建人',
+    create_date          datetime     null comment '创建时间',
+    modify_user_id       bigint       null comment '修改人',
+    modify_date          datetime     null comment '修改时间',
+    delete_mark          int          not null comment '删除标记',
+    enabled_mark         int          not null comment '有效标志',
+    sort_code            int          null comment '序号',
+    training_base_name   VARCHAR(255) NOT NULL comment '实训基地名称',
+    training_base_number VARCHAR(255) null comment '实训基地编号',
+    company_coop_id      bigint       NOT NULL comment '所属合作企业(company_coop)',
+    company_coop_name    varchar(300) NOT NULL comment '所属合作企业',
+    establish_date       date         NOT NULL comment '基地成立年月，格式：YYYYMMDD，如：2006-04-12',
+    team_status          VARCHAR(255) NOT NULL comment '合作状态',
+    protocol_state       varchar(128) null comment '合作协议签署状态',
+    team_began_date      date         null comment '合作开始时间',
+    team_end_date        date         null comment '合作结束时间'
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+    COMMENT ='校外实训基地数据表';
+
+-- 实训室维护数据表
+DROP TABLE IF EXISTS `training_protuct`;
+CREATE TABLE `training_protuct`
+(
+    id                          bigint       not null comment '主键编号' primary key,
+    create_user_id              bigint       null comment '创建人',
+    create_date                 datetime     null comment '创建时间',
+    modify_user_id              bigint       null comment '修改人',
+    modify_date                 datetime     null comment '修改时间',
+    delete_mark                 int          not null comment '删除标记',
+    enabled_mark                int          not null comment '有效标志',
+    sort_code                   int          null comment '序号',
+    `training_room_name`        varchar(255) NOT NULL COMMENT '实训室名称',
+    `training_number`           varchar(32)  NOT NULL COMMENT '实训室号',
+    `department_id`             bigint       NOT NULL COMMENT '所属机构(xjr_department)',
+    `department_name`           varchar(255) NOT NULL COMMENT '所属机构',
+    `school_training_base_id`   bigint       NOT NULL COMMENT '所属实训基地id(school_training_base)',
+    `school_training_base_name` varchar(255) NOT NULL COMMENT '所属实训基地',
+    `training_createdate`       date         NOT NULL COMMENT '实验室建立日期',
+    `contact_id`                bigint       NOT NULL COMMENT '负责人(xjr_user)',
+    `contact_name`              varchar(255) NOT NULL COMMENT '负责人',
+    `works_number`              int          NOT NULL COMMENT '工位数',
+    `room_number`               varchar(255) NOT NULL COMMENT '房间号',
+    `room_name`                 varchar(255) NOT NULL COMMENT '房间名称',
+    `company_coop_id`           bigint       NULL COMMENT '实训室合作企业id(company_coop)',
+    `company_coop_name`         varchar(255) NULL COMMENT '实验室合作企业'
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+    COMMENT ='实训室维护数据表';
+
+-- 实训项目维护
+DROP TABLE IF EXISTS `training_project_safe`;
+create table training_project_safe
+(
+    id                     bigint       not null comment '主键编号'
+        primary key,
+    create_user_id         bigint       null comment '创建人',
+    create_date            datetime     null comment '创建时间',
+    modify_user_id         bigint       null comment '修改人',
+    modify_date            datetime     null comment '修改时间',
+    delete_mark            int          not null comment '删除标记',
+    enabled_mark           int          not null comment '有效标志',
+    sort_code              int          null comment '序号',
+    training_name          varchar(255) not null comment '实训项目名称',
+    training_code          varchar(255) not null comment '实训项目编号',
+    base_major_id          bigint       not null comment '归口专业id(base_major)',
+    base_major_name        varchar(255) not null comment '归口专业名称',
+    dummy_pro              varchar(25)  not null comment '是否虚拟仿真实训项目',
+    skill_request          varchar(255) comment '技能要求',
+    assorted_resource_name varchar(512) comment '配套实训资源名称',
+    model_count            int comment '模块数量',
+    assess_manner          varchar(255) comment '考核方式',
+    out_service            varchar(25)  not null comment '是否对外服务',
+    student_class_count    int comment '学生实训课时数',
+    study_year             varchar(255) not null comment '学年（度）',
+    base_semester_id       bigint not null comment '学期id(base_semester)',
+    base_semester_name     varchar(255) not null comment '学期名称',
+    training_address       varchar(255) comment '实训地点',
+    training_protuct_id    bigint comment '校内实训室id',
+    training_protuct_name  varchar(255) comment '校内实训室'
+) comment '实训项目维护';
+
+DROP TABLE IF EXISTS `practical_tt_records`;
+CREATE TABLE `practical_tt_records`
+(
+    `id`                                bigint       NOT NULL COMMENT '主键编号',
+    `create_user_id`                    bigint       NULL DEFAULT NULL COMMENT '创建人',
+    `create_date`                       datetime     NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id`                    bigint       NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date`                       datetime     NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark`                       int          NOT NULL COMMENT '删除标记',
+    `enabled_mark`                      int          NOT NULL COMMENT '有效标志',
+    `sort_code`                         int          NULL DEFAULT NULL COMMENT '序号',
+    `student_name`                      varchar(255) NOT NULL COMMENT '学生姓名',
+    `student_id`                        bigint       NULL DEFAULT NULL COMMENT '学号',
+    `name_project`                      varchar(255) NOT NULL COMMENT '实训项目名称',
+    base_major_id                       bigint       not null comment '所属专业id(base_major)',
+    base_major_name                     varchar(255) not null comment '所属专业名称',
+    `supporting_training_software_name` varchar(255) NOT NULL COMMENT '配套实训软件名称',
+    `use_date`                          date         NOT NULL COMMENT '使用日期',
+    `duration_training`                 double       NOT NULL COMMENT '学生实训时长',
+    `evaluation_results`                varchar(255) NOT NULL COMMENT '实训结果综合评价',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='实训教学过程';
+
+
+
+
+
+
+
+

src/test/java/com/xjrsoft/module/student/service/impl/BaseStudentAssessmentInspectionServiceImplTest.java

@@ -1,13 +1,9 @@
 package com.xjrsoft.module.student.service.impl;
 
-import com.aliyun.dingtalkchengfeng_1_0.models.CfOrgResp;
-import com.xjrsoft.module.room.service.IWfRoomApplicantService;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentInspectionService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-
-import static org.junit.jupiter.api.Assertions.*;
 @SpringBootTest
 class BaseStudentAssessmentInspectionServiceImplTest {
     @Autowired