添加材料类型接口

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

@@ -0,0 +1,125 @@
+package com.xjrsoft.module.material.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.material.dto.AddMaterialTaskDto;
+import com.xjrsoft.module.material.dto.UpdateMaterialTaskDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.alibaba.excel.EasyExcel;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import org.springframework.http.ResponseEntity;
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+
+import com.xjrsoft.module.material.dto.MaterialTaskPageDto;
+import com.xjrsoft.module.material.entity.MaterialTask;
+import com.xjrsoft.module.material.service.IMaterialTaskService;
+import com.xjrsoft.module.material.vo.MaterialTaskPageVo;
+
+import com.xjrsoft.module.material.vo.MaterialTaskVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+* @title: 材料提交任务
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/material" + "/materialtask")
+@Api(value = "/material"  + "/materialtask",tags = "材料提交任务代码")
+@AllArgsConstructor
+public class MaterialTaskController {
+
+
+    private final IMaterialTaskService materialTaskService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="材料提交任务列表(分页)")
+    @SaCheckPermission("materialtask:detail")
+    public RT<PageOutput<MaterialTaskPageVo>> page(@Valid MaterialTaskPageDto dto){
+
+        LambdaQueryWrapper<MaterialTask> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(MaterialTask::getId)
+                .select(MaterialTask.class,x -> VoToColumnUtil.fieldsToColumns(MaterialTaskPageVo.class).contains(x.getProperty()));
+        IPage<MaterialTask> page = materialTaskService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<MaterialTaskPageVo> pageOutput = ConventPage.getPageOutput(page, MaterialTaskPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询材料提交任务信息")
+    @SaCheckPermission("materialtask:detail")
+    public RT<MaterialTaskVo> info(@RequestParam Long id){
+        MaterialTask materialTask = materialTaskService.getByIdDeep(id);
+        if (materialTask == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(materialTask, MaterialTaskVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增材料提交任务")
+    @SaCheckPermission("materialtask:add")
+    public RT<Boolean> add(@Valid @RequestBody AddMaterialTaskDto dto){
+        MaterialTask materialTask = BeanUtil.toBean(dto, MaterialTask.class);
+        boolean isSuccess = materialTaskService.add(materialTask);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改材料提交任务")
+    @SaCheckPermission("materialtask:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateMaterialTaskDto dto){
+
+        MaterialTask materialTask = BeanUtil.toBean(dto, MaterialTask.class);
+        return RT.ok(materialTaskService.update(materialTask));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除材料提交任务")
+    @SaCheckPermission("materialtask:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(materialTaskService.delete(ids));
+
+    }
+    @PostMapping("/import")
+    @ApiOperation(value = "导入")
+    public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
+        List<MaterialTaskPageVo> savedDataList = EasyExcel.read(file.getInputStream()).head(MaterialTaskPageVo.class).sheet().doReadSync();
+        Boolean result = materialTaskService.saveBatch(BeanUtil.copyToList(savedDataList, MaterialTask.class));
+        return RT.ok(result);
+    }
+
+    @GetMapping("/export")
+    @ApiOperation(value = "导出")
+    public ResponseEntity<byte[]> exportData(@Valid MaterialTaskPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
+        List<MaterialTaskPageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput<MaterialTaskPageVo>) page(dto).getData()).getList();
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        EasyExcel.write(bot, MaterialTaskPageVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList);
+
+        return RT.fileStream(bot.toByteArray(), "MaterialTask" + ExcelTypeEnum.XLSX.getValue());
+    }
+}

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

@@ -0,0 +1,185 @@
+package com.xjrsoft.module.material.controller;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.material.dto.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.alibaba.excel.EasyExcel;
+import com.xjrsoft.module.material.entity.MaterialTypeAssign;
+import com.xjrsoft.module.material.service.IMaterialTypeAssignService;
+import com.xjrsoft.module.material.vo.MaterialTypeAssignVo;
+import com.xjrsoft.module.organization.entity.Department;
+import com.xjrsoft.module.organization.entity.UserDeptRelation;
+import com.xjrsoft.module.student.entity.BaseStudentUser;
+import com.xjrsoft.module.teacher.entity.XjrUser;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import org.springframework.http.ResponseEntity;
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+
+import com.xjrsoft.module.material.entity.MaterialType;
+import com.xjrsoft.module.material.service.IMaterialTypeService;
+import com.xjrsoft.module.material.vo.MaterialTypePageVo;
+
+import com.xjrsoft.module.material.vo.MaterialTypeVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+* @title: 材料提交任务类型
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/material" + "/materialtype")
+@Api(value = "/material"  + "/materialtype",tags = "材料提交任务类型代码")
+@AllArgsConstructor
+public class MaterialTypeController {
+
+
+    private final IMaterialTypeService materialTypeService;
+
+    private final IMaterialTypeAssignService materialTypeAssignService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="材料提交任务类型列表(分页)")
+    @SaCheckPermission("materialtype:detail")
+    public RT<PageOutput<MaterialTypePageVo>> page(@Valid MaterialTypePageDto dto){
+
+        LambdaQueryWrapper<MaterialType> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(MaterialType::getId)
+                .select(MaterialType.class,x -> VoToColumnUtil.fieldsToColumns(MaterialTypePageVo.class).contains(x.getProperty()));
+        IPage<MaterialType> page = materialTypeService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<MaterialTypePageVo> pageOutput = ConventPage.getPageOutput(page, MaterialTypePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value="材料提交任务类型列表(权限)")
+    public RT<List<MaterialTypeVo>> list() {
+
+        List<MaterialTypeVo> pageOutput = materialTypeService.selectJoinList(MaterialTypeVo.class, new MPJLambdaWrapper<MaterialType>()
+                .disableSubLogicDel()
+                .eq(MaterialTypeAssign::getUserId, StpUtil.getLoginIdAsLong())
+                .select(MaterialType::getId)
+                .select(MaterialType.class,x -> VoToColumnUtil.fieldsToColumns(MaterialTypeVo.class).contains(x.getProperty()))
+                .innerJoin(MaterialTypeAssign.class, MaterialTypeAssign::getMaterialTypeId, MaterialType::getId)
+        );
+
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询材料提交任务类型信息")
+    @SaCheckPermission("materialtype:detail")
+    public RT<MaterialTypeVo> info(@RequestParam Long id){
+        MaterialType materialType = materialTypeService.getByIdDeep(id);
+        if (materialType == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(materialType, MaterialTypeVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增材料提交任务类型")
+    @SaCheckPermission("materialtype:add")
+    public RT<Boolean> add(@Valid @RequestBody AddMaterialTypeDto dto){
+        MaterialType materialType = BeanUtil.toBean(dto, MaterialType.class);
+        boolean isSuccess = materialTypeService.add(materialType);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改材料提交任务类型")
+    @SaCheckPermission("materialtype:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateMaterialTypeDto dto){
+
+        MaterialType materialType = BeanUtil.toBean(dto, MaterialType.class);
+        return RT.ok(materialTypeService.update(materialType));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除材料提交任务类型")
+    @SaCheckPermission("materialtype:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(materialTypeService.delete(ids));
+
+    }
+    @PostMapping("/import")
+    @ApiOperation(value = "导入")
+    public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
+        List<MaterialTypePageVo> savedDataList = EasyExcel.read(file.getInputStream()).head(MaterialTypePageVo.class).sheet().doReadSync();
+        Boolean result = materialTypeService.saveBatch(BeanUtil.copyToList(savedDataList, MaterialType.class));
+        return RT.ok(result);
+    }
+
+    @GetMapping("/export")
+    @ApiOperation(value = "导出")
+    public ResponseEntity<byte[]> exportData(@Valid MaterialTypePageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
+        List<MaterialTypePageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput<MaterialTypePageVo>) page(dto).getData()).getList();
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        EasyExcel.write(bot, MaterialTypePageVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList);
+
+        return RT.fileStream(bot.toByteArray(), "MaterialType" + ExcelTypeEnum.XLSX.getValue());
+    }
+
+    @GetMapping(value = "/assign/page")
+    @ApiOperation(value="材料提交任务类型权限列表(分页)")
+    @SaCheckPermission("materialtypeassign:detail")
+    public RT<PageOutput<MaterialTypeAssignVo>> assignPage(@Valid MaterialTypeAssignPageDto dto){
+
+        MPJLambdaWrapper<MaterialTypeAssign> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper
+                .disableSubLogicDel()
+                .eq(MaterialTypeAssign::getMaterialTypeId,dto.getMaterialTypeId())
+                .select(MaterialTypeAssign::getId)
+                .select(MaterialType.class,x -> VoToColumnUtil.fieldsToColumns(MaterialTypeAssignVo.class).contains(x.getProperty()))
+                .innerJoin(XjrUser.class,XjrUser::getId,MaterialTypeAssign::getUserId,ext->ext.selectAs(XjrUser::getUserName,MaterialTypeAssignVo::getUserName))
+                .leftJoin(UserDeptRelation.class,UserDeptRelation::getUserId,MaterialTypeAssign::getUserId)
+                .leftJoin(Department.class,Department::getId,UserDeptRelation::getDeptId,ext->ext.selectAs(Department::getName,MaterialTypeAssignVo::getDeptName))
+        ;
+
+        IPage<MaterialTypeAssign> page = materialTypeAssignService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<MaterialTypeAssignVo> pageOutput = ConventPage.getPageOutput(page, MaterialTypeAssignVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @PostMapping(value = "/assign/add")
+    @ApiOperation(value = "材料提交任务类型权限")
+    @SaCheckPermission("materialtypeassign:add")
+    public RT<Boolean> assignAdd(@Valid @RequestBody AddMaterialTypeAssignDto dto){
+        boolean isSuccess = materialTypeAssignService.add(dto);
+        return RT.ok(isSuccess);
+    }
+
+    @DeleteMapping(value = "/assign/delete")
+    @ApiOperation(value = "删除材料提交任务类型")
+    @SaCheckPermission("materialtypeassign:delete")
+    public RT<Boolean> assignDelete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(materialTypeAssignService.delete(ids));
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.xjrsoft.module.material.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+
+
+
+/**
+* @title: 材料提交任务附件
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+public class AddMaterialTaskAppendixDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 材料提交任务(material_task)
+    */
+    @ApiModelProperty("材料提交任务(material_task)")
+    private Long materialTaskId;
+    /**
+    * 文件ID(xjr_file)
+    */
+    @ApiModelProperty("文件ID(xjr_file)")
+    private Long fileId;
+
+}

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

@@ -0,0 +1,82 @@
+package com.xjrsoft.module.material.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+
+
+
+/**
+* @title: 材料提交任务分配
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+public class AddMaterialTaskAssignDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 材料提交任务(material_task)
+    */
+    @ApiModelProperty("材料提交任务(material_task)")
+    private Long materialTaskId;
+    /**
+    * 用户(xjr_user)
+    */
+    @ApiModelProperty("用户(xjr_user)")
+    private Long userId;
+    /**
+    * 用户类型 1=孝职工 2=学生
+    */
+    @ApiModelProperty("用户类型 1=孝职工 2=学生")
+    private Integer userType;
+    /**
+    * 学号/工号
+    */
+    @ApiModelProperty("学号/工号")
+    private String userNumber;
+    /**
+    * 状态 1=未提交 2=待审核 3=通过 4=重做
+    */
+    @ApiModelProperty("状态 1=未提交 2=待审核 3=通过 4=重做")
+    private Integer status;
+    /**
+    * 执行提交 1=未提交 2=按时提交 3=延迟提交
+    */
+    @ApiModelProperty("执行提交 1=未提交 2=按时提交 3=延迟提交")
+    private Integer executiveStatus;
+    /**
+    * 转办任务分配ID(material_task_assign)
+    */
+    @ApiModelProperty("转办任务分配ID(material_task_assign)")
+    private Long transferMaterialTaskId;
+    /**
+    * 转办给几人
+    */
+    @ApiModelProperty("转办给几人")
+    private Integer transferAssignPerson;
+    /**
+    * 转办已提交人数
+    */
+    @ApiModelProperty("转办已提交人数")
+    private Integer transferSubmitedPerson;
+    /**
+    * 是否发送消息 0=不发 1=发送
+    */
+    @ApiModelProperty("是否发送消息 0=不发 1=发送")
+    private Integer sendMessage;
+    /**
+    * 发送消息状态 0=未不发 1=已发送
+    */
+    @ApiModelProperty("发送消息状态 0=未不发 1=已发送")
+    private Integer sendMessageStatus;
+
+}

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

@@ -0,0 +1,84 @@
+package com.xjrsoft.module.material.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import com.xjrsoft.module.material.entity.MaterialTaskAssign;
+import com.xjrsoft.module.material.entity.MaterialTaskAppendix;
+
+
+
+/**
+* @title: 材料提交任务
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+public class AddMaterialTaskDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 材料提交任务类型(material_type)
+    */
+    @ApiModelProperty("材料提交任务类型(material_type)")
+    private Long materialTypeId;
+    /**
+    * 任务名称
+    */
+    @ApiModelProperty("任务名称")
+    private String name;
+    /**
+    * 状态 1=未开始 2=进行中 3=结束
+    */
+    @ApiModelProperty("状态 1=未开始 2=进行中 3=结束")
+    private Integer status;
+    /**
+    * 要求完成日期
+    */
+    @ApiModelProperty("要求完成日期")
+    private LocalDateTime requiredCompleteTime;
+    /**
+    * 要求
+    */
+    @ApiModelProperty("要求")
+    private String requirement;
+    /**
+    * 指派给几人
+    */
+    @ApiModelProperty("指派给几人")
+    private Integer assignPerson;
+    /**
+    * 已提交人数
+    */
+    @ApiModelProperty("已提交人数")
+    private Integer submitedPerson;
+    /**
+    * 按时提交
+    */
+    @ApiModelProperty("按时提交")
+    private Integer onTimePerson;
+    /**
+    * 延迟提交
+    */
+    @ApiModelProperty("延迟提交")
+    private Integer timeDelay;
+
+    /**
+    * materialTaskAssign
+    */
+    @ApiModelProperty("materialTaskAssign子表")
+    private List<AddMaterialTaskAssignDto> materialTaskAssignList;
+    /**
+    * materialTaskAppendix
+    */
+    @ApiModelProperty("materialTaskAppendix子表")
+    private List<AddMaterialTaskAppendixDto> materialTaskAppendixList;
+}

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

@@ -0,0 +1,38 @@
+package com.xjrsoft.module.material.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+
+
+
+/**
+* @title: 材料提交任务类型分配
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+public class AddMaterialTypeAssignDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 材料提交任务类型(material_type)
+    */
+    @ApiModelProperty("材料提交任务类型(material_type)")
+    private Long materialTypeId;
+
+    /**
+     * 用户列表
+     */
+    @ApiModelProperty("用户列表")
+    private  List<AddMaterialTypeAssignUserDto> userList;
+
+}

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

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.material.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AddMaterialTypeAssignUserDto {
+
+    /**
+     * 用户类型 1=孝职工 2=学生
+     */
+    @ApiModelProperty("用户类型 1=孝职工 2=学生")
+    private Integer userType;
+    /**
+     * 用户(xjr_user)
+     */
+    @ApiModelProperty("用户(xjr_user)")
+    private Long userId;
+    /**
+     * 学号/工号
+     */
+    @ApiModelProperty("学号/工号")
+    private String userNumber;
+}

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

@@ -0,0 +1,33 @@
+package com.xjrsoft.module.material.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import com.xjrsoft.module.material.entity.MaterialTypeAssign;
+
+
+
+/**
+* @title: 材料提交任务类型
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+public class AddMaterialTypeDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 任务名称
+    */
+    @ApiModelProperty("任务名称")
+    private String name;
+
+}

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

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.material.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+
+/**
+* @title: 材料提交任务分页查询入参
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class MaterialTaskPageDto extends PageInput {
+
+
+}

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

@@ -0,0 +1,14 @@
+package com.xjrsoft.module.material.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class MaterialTypeAssignPageDto extends PageInput {
+    /**
+     * 材料提交任务类型(material_type)
+     */
+    @ApiModelProperty("材料提交任务类型(material_type)")
+    private Long materialTypeId;
+}

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

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.material.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+
+/**
+* @title: 材料提交任务类型分页查询入参
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class MaterialTypePageDto extends PageInput {
+
+
+}

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

@@ -0,0 +1,33 @@
+package com.xjrsoft.module.material.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import com.xjrsoft.module.material.entity.MaterialTaskAssign;
+import com.xjrsoft.module.material.entity.MaterialTaskAppendix;
+
+
+
+/**
+* @title: 材料提交任务
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+public class UpdateMaterialTaskDto extends AddMaterialTaskDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

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

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.material.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import com.xjrsoft.module.material.entity.MaterialTypeAssign;
+
+
+
+/**
+* @title: 材料提交任务类型
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+public class UpdateMaterialTypeDto extends AddMaterialTypeDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/material/entity/MaterialTask.java

@@ -0,0 +1,136 @@
+package com.xjrsoft.module.material.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+
+
+/**
+* @title: 材料提交任务
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+@TableName("material_task")
+@ApiModel(value = "材料提交任务对象", description = "材料提交任务")
+public class MaterialTask implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 材料提交任务类型(material_type)
+    */
+    @ApiModelProperty("材料提交任务类型(material_type)")
+    private Long materialTypeId;
+    /**
+    * 任务名称
+    */
+    @ApiModelProperty("任务名称")
+    private String name;
+    /**
+    * 状态 1=未开始 2=进行中 3=结束
+    */
+    @ApiModelProperty("状态 1=未开始 2=进行中 3=结束")
+    private Integer status;
+    /**
+    * 要求完成日期
+    */
+    @ApiModelProperty("要求完成日期")
+    private LocalDateTime requiredCompleteTime;
+    /**
+    * 要求
+    */
+    @ApiModelProperty("要求")
+    private String requirement;
+    /**
+    * 指派给几人
+    */
+    @ApiModelProperty("指派给几人")
+    private Integer assignPerson;
+    /**
+    * 已提交人数
+    */
+    @ApiModelProperty("已提交人数")
+    private Integer submitedPerson;
+    /**
+    * 按时提交
+    */
+    @ApiModelProperty("按时提交")
+    private Integer onTimePerson;
+    /**
+    * 延迟提交
+    */
+    @ApiModelProperty("延迟提交")
+    private Integer timeDelay;
+
+    /**
+    * materialTaskAssign
+    */
+    @ApiModelProperty("materialTaskAssign子表")
+    @TableField(exist = false)
+    @EntityMapping(thisField = "id", joinField = "materialTaskId")
+    private List<MaterialTaskAssign> materialTaskAssignList;
+    /**
+    * materialTaskAppendix
+    */
+    @ApiModelProperty("materialTaskAppendix子表")
+    @TableField(exist = false)
+    @EntityMapping(thisField = "id", joinField = "materialTaskId")
+    private List<MaterialTaskAppendix> materialTaskAppendixList;
+
+}

src/main/java/com/xjrsoft/module/material/entity/MaterialTaskAppendix.java

@@ -0,0 +1,87 @@
+package com.xjrsoft.module.material.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+
+
+/**
+* @title: 材料提交任务附件
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+@TableName("material_task_appendix")
+@ApiModel(value = "材料提交任务附件对象", description = "材料提交任务附件")
+public class MaterialTaskAppendix implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 材料提交任务(material_task)
+    */
+    @ApiModelProperty("材料提交任务(material_task)")
+    private Long materialTaskId;
+    /**
+    * 文件ID(xjr_file)
+    */
+    @ApiModelProperty("文件ID(xjr_file)")
+    private Long fileId;
+
+
+}

src/main/java/com/xjrsoft/module/material/entity/MaterialTaskAssign.java

@@ -0,0 +1,132 @@
+package com.xjrsoft.module.material.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+
+
+/**
+* @title: 材料提交任务分配
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+@TableName("material_task_assign")
+@ApiModel(value = "材料提交任务分配对象", description = "材料提交任务分配")
+public class MaterialTaskAssign implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 材料提交任务(material_task)
+    */
+    @ApiModelProperty("材料提交任务(material_task)")
+    private Long materialTaskId;
+    /**
+    * 用户(xjr_user)
+    */
+    @ApiModelProperty("用户(xjr_user)")
+    private Long userId;
+    /**
+    * 用户类型 1=孝职工 2=学生
+    */
+    @ApiModelProperty("用户类型 1=孝职工 2=学生")
+    private Integer userType;
+    /**
+    * 学号/工号
+    */
+    @ApiModelProperty("学号/工号")
+    private String userNumber;
+    /**
+    * 状态 1=未提交 2=待审核 3=通过 4=重做
+    */
+    @ApiModelProperty("状态 1=未提交 2=待审核 3=通过 4=重做")
+    private Integer status;
+    /**
+    * 执行提交 1=未提交 2=按时提交 3=延迟提交
+    */
+    @ApiModelProperty("执行提交 1=未提交 2=按时提交 3=延迟提交")
+    private Integer executiveStatus;
+    /**
+    * 转办任务分配ID(material_task_assign)
+    */
+    @ApiModelProperty("转办任务分配ID(material_task_assign)")
+    private Long transferMaterialTaskId;
+    /**
+    * 转办给几人
+    */
+    @ApiModelProperty("转办给几人")
+    private Integer transferAssignPerson;
+    /**
+    * 转办已提交人数
+    */
+    @ApiModelProperty("转办已提交人数")
+    private Integer transferSubmitedPerson;
+    /**
+    * 是否发送消息 0=不发 1=发送
+    */
+    @ApiModelProperty("是否发送消息 0=不发 1=发送")
+    private Integer sendMessage;
+    /**
+    * 发送消息状态 0=未不发 1=已发送
+    */
+    @ApiModelProperty("发送消息状态 0=未不发 1=已发送")
+    private Integer sendMessageStatus;
+
+
+}

src/main/java/com/xjrsoft/module/material/entity/MaterialType.java

@@ -0,0 +1,89 @@
+package com.xjrsoft.module.material.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+
+
+/**
+* @title: 材料提交任务类型
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+@TableName("material_type")
+@ApiModel(value = "材料提交任务类型对象", description = "材料提交任务类型")
+public class MaterialType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 任务名称
+    */
+    @ApiModelProperty("任务名称")
+    private String name;
+
+    /**
+    * materialTypeAssign
+    */
+    @ApiModelProperty("materialTypeAssign子表")
+    @TableField(exist = false)
+    @EntityMapping(thisField = "id", joinField = "materialTypeId")
+    private List<MaterialTypeAssign> materialTypeAssignList;
+
+}

src/main/java/com/xjrsoft/module/material/entity/MaterialTypeAssign.java

@@ -0,0 +1,97 @@
+package com.xjrsoft.module.material.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+
+
+/**
+* @title: 材料提交任务类型分配
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+@TableName("material_type_assign")
+@ApiModel(value = "材料提交任务类型分配对象", description = "材料提交任务类型分配")
+public class MaterialTypeAssign implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 材料提交任务类型(material_type)
+    */
+    @ApiModelProperty("材料提交任务类型(material_type)")
+    private Long materialTypeId;
+    /**
+    * 用户(xjr_user)
+    */
+    @ApiModelProperty("用户(xjr_user)")
+    private Long userId;
+    /**
+    * 用户类型 1=孝职工 2=学生
+    */
+    @ApiModelProperty("用户类型 1=孝职工 2=学生")
+    private Integer userType;
+    /**
+    * 学号/工号
+    */
+    @ApiModelProperty("学号/工号")
+    private String userNumber;
+
+
+}

src/main/java/com/xjrsoft/module/material/mapper/MaterialTaskAppendixMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.material.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.material.entity.MaterialTaskAppendix;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 材料提交任务附件
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Mapper
+public interface MaterialTaskAppendixMapper extends MPJBaseMapper<MaterialTaskAppendix> {
+
+}

src/main/java/com/xjrsoft/module/material/mapper/MaterialTaskAssignMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.material.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.material.entity.MaterialTaskAssign;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 材料提交任务分配
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Mapper
+public interface MaterialTaskAssignMapper extends MPJBaseMapper<MaterialTaskAssign> {
+
+}

src/main/java/com/xjrsoft/module/material/mapper/MaterialTaskMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.material.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.material.entity.MaterialTask;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 材料提交任务
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Mapper
+public interface MaterialTaskMapper extends MPJBaseMapper<MaterialTask> {
+
+}

src/main/java/com/xjrsoft/module/material/mapper/MaterialTypeAssignMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.material.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.material.entity.MaterialTypeAssign;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 材料提交任务类型分配
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Mapper
+public interface MaterialTypeAssignMapper extends MPJBaseMapper<MaterialTypeAssign> {
+
+}

src/main/java/com/xjrsoft/module/material/mapper/MaterialTypeMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.material.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.material.entity.MaterialType;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 材料提交任务类型
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Mapper
+public interface MaterialTypeMapper extends MPJBaseMapper<MaterialType> {
+
+}

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

@@ -0,0 +1,40 @@
+package com.xjrsoft.module.material.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.material.entity.MaterialTask;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 材料提交任务
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+
+public interface IMaterialTaskService extends MPJBaseService<MaterialTask> {
+    /**
+    * 新增
+    *
+    * @param materialTask
+    * @return
+    */
+    Boolean add(MaterialTask materialTask);
+
+    /**
+    * 更新
+    *
+    * @param materialTask
+    * @return
+    */
+    Boolean update(MaterialTask materialTask);
+
+    /**
+    * 删除
+    *
+    * @param ids
+    * @return
+    */
+    Boolean delete(List<Long> ids);
+}

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

@@ -0,0 +1,12 @@
+package com.xjrsoft.module.material.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.material.dto.AddMaterialTypeAssignDto;
+import com.xjrsoft.module.material.entity.MaterialTypeAssign;
+
+import java.util.List;
+
+public interface IMaterialTypeAssignService extends MPJBaseService<MaterialTypeAssign> {
+    Boolean add(AddMaterialTypeAssignDto addMaterialTypeAssignDto);
+    Boolean delete(List<Long> ids);
+}

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

@@ -0,0 +1,40 @@
+package com.xjrsoft.module.material.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.material.entity.MaterialType;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 材料提交任务类型
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+
+public interface IMaterialTypeService extends MPJBaseService<MaterialType> {
+    /**
+    * 新增
+    *
+    * @param materialType
+    * @return
+    */
+    Boolean add(MaterialType materialType);
+
+    /**
+    * 更新
+    *
+    * @param materialType
+    * @return
+    */
+    Boolean update(MaterialType materialType);
+
+    /**
+    * 删除
+    *
+    * @param ids
+    * @return
+    */
+    Boolean delete(List<Long> ids);
+}

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

@@ -0,0 +1,125 @@
+package com.xjrsoft.module.material.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.material.entity.MaterialTaskAssign;
+import com.xjrsoft.module.material.mapper.MaterialTaskAssignMapper;
+import com.xjrsoft.module.material.entity.MaterialTaskAppendix;
+import com.xjrsoft.module.material.mapper.MaterialTaskAppendixMapper;
+import com.xjrsoft.module.material.entity.MaterialTask;
+import com.xjrsoft.module.material.mapper.MaterialTaskMapper;
+import com.xjrsoft.module.material.service.IMaterialTaskService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 材料提交任务
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapper, MaterialTask> implements IMaterialTaskService {
+    private final MaterialTaskMapper materialTaskMaterialTaskMapper;
+
+    private final MaterialTaskAssignMapper materialTaskMaterialTaskAssignMapper;
+    private final MaterialTaskAppendixMapper materialTaskMaterialTaskAppendixMapper;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean add(MaterialTask materialTask) {
+        materialTaskMaterialTaskMapper.insert(materialTask);
+        for (MaterialTaskAssign materialTaskAssign : materialTask.getMaterialTaskAssignList()) {
+            materialTaskAssign.setMaterialTaskId(materialTask.getId());
+            materialTaskMaterialTaskAssignMapper.insert(materialTaskAssign);
+        }
+        for (MaterialTaskAppendix materialTaskAppendix : materialTask.getMaterialTaskAppendixList()) {
+            materialTaskAppendix.setMaterialTaskId(materialTask.getId());
+            materialTaskMaterialTaskAppendixMapper.insert(materialTaskAppendix);
+        }
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean update(MaterialTask materialTask) {
+        materialTaskMaterialTaskMapper.updateById(materialTask);
+        //********************************* MaterialTaskAssign  增删改  开始 *******************************************/
+        {
+            // 查出所有子级的id
+            List<MaterialTaskAssign> materialTaskAssignList = materialTaskMaterialTaskAssignMapper.selectList(Wrappers.lambdaQuery(MaterialTaskAssign.class).eq(MaterialTaskAssign::getMaterialTaskId, materialTask.getId()).select(MaterialTaskAssign::getId));
+            List<Long> materialTaskAssignIds = materialTaskAssignList.stream().map(MaterialTaskAssign::getId).collect(Collectors.toList());
+            //原有子表单 没有被删除的主键
+            List<Long> materialTaskAssignOldIds = materialTask.getMaterialTaskAssignList().stream().map(MaterialTaskAssign::getId).filter(Objects::nonNull).collect(Collectors.toList());
+            //找到需要删除的id
+            List<Long> materialTaskAssignRemoveIds = materialTaskAssignIds.stream().filter(item -> !materialTaskAssignOldIds.contains(item)).collect(Collectors.toList());
+
+            for (MaterialTaskAssign materialTaskAssign : materialTask.getMaterialTaskAssignList()) {
+                //如果不等于空则修改
+                if (materialTaskAssign.getId() != null) {
+                    materialTaskMaterialTaskAssignMapper.updateById(materialTaskAssign);
+                }
+                //如果等于空 则新增
+                else {
+                    //已经不存在的id 删除
+                    materialTaskAssign.setMaterialTaskId(materialTask.getId());
+                    materialTaskMaterialTaskAssignMapper.insert(materialTaskAssign);
+                }
+            }
+            //已经不存在的id 删除
+            if(materialTaskAssignRemoveIds.size() > 0){
+                materialTaskMaterialTaskAssignMapper.deleteBatchIds(materialTaskAssignRemoveIds);
+            }
+        }
+        //********************************* MaterialTaskAssign  增删改  结束 *******************************************/
+
+        //********************************* MaterialTaskAppendix  增删改  开始 *******************************************/
+        {
+            // 查出所有子级的id
+            List<MaterialTaskAppendix> materialTaskAppendixList = materialTaskMaterialTaskAppendixMapper.selectList(Wrappers.lambdaQuery(MaterialTaskAppendix.class).eq(MaterialTaskAppendix::getMaterialTaskId, materialTask.getId()).select(MaterialTaskAppendix::getId));
+            List<Long> materialTaskAppendixIds = materialTaskAppendixList.stream().map(MaterialTaskAppendix::getId).collect(Collectors.toList());
+            //原有子表单 没有被删除的主键
+            List<Long> materialTaskAppendixOldIds = materialTask.getMaterialTaskAppendixList().stream().map(MaterialTaskAppendix::getId).filter(Objects::nonNull).collect(Collectors.toList());
+            //找到需要删除的id
+            List<Long> materialTaskAppendixRemoveIds = materialTaskAppendixIds.stream().filter(item -> !materialTaskAppendixOldIds.contains(item)).collect(Collectors.toList());
+
+            for (MaterialTaskAppendix materialTaskAppendix : materialTask.getMaterialTaskAppendixList()) {
+                //如果不等于空则修改
+                if (materialTaskAppendix.getId() != null) {
+                    materialTaskMaterialTaskAppendixMapper.updateById(materialTaskAppendix);
+                }
+                //如果等于空 则新增
+                else {
+                    //已经不存在的id 删除
+                    materialTaskAppendix.setMaterialTaskId(materialTask.getId());
+                    materialTaskMaterialTaskAppendixMapper.insert(materialTaskAppendix);
+                }
+            }
+            //已经不存在的id 删除
+            if(materialTaskAppendixRemoveIds.size() > 0){
+                materialTaskMaterialTaskAppendixMapper.deleteBatchIds(materialTaskAppendixRemoveIds);
+            }
+        }
+        //********************************* MaterialTaskAppendix  增删改  结束 *******************************************/
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(List<Long> ids) {
+        materialTaskMaterialTaskMapper.deleteBatchIds(ids);
+        materialTaskMaterialTaskAssignMapper.delete(Wrappers.lambdaQuery(MaterialTaskAssign.class).in(MaterialTaskAssign::getMaterialTaskId, ids));
+        materialTaskMaterialTaskAppendixMapper.delete(Wrappers.lambdaQuery(MaterialTaskAppendix.class).in(MaterialTaskAppendix::getMaterialTaskId, ids));
+
+        return true;
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.xjrsoft.module.material.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.material.dto.AddMaterialTypeAssignDto;
+import com.xjrsoft.module.material.dto.AddMaterialTypeAssignUserDto;
+import com.xjrsoft.module.material.entity.MaterialTypeAssign;
+import com.xjrsoft.module.material.mapper.MaterialTypeAssignMapper;
+import com.xjrsoft.module.material.service.IMaterialTypeAssignService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@Service
+@AllArgsConstructor
+public class MaterialTypeAssignServiceImpl extends MPJBaseServiceImpl<MaterialTypeAssignMapper, MaterialTypeAssign> implements IMaterialTypeAssignService {
+    private final MaterialTypeAssignMapper materialTypeMaterialTypeAssignMapper;
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean add(AddMaterialTypeAssignDto addMaterialTypeAssignDto) {
+
+        if (addMaterialTypeAssignDto.getUserList() != null && addMaterialTypeAssignDto.getUserList().size() > 0) {
+            List<MaterialTypeAssign> materialTypeAssignList = materialTypeMaterialTypeAssignMapper.selectList(Wrappers.<MaterialTypeAssign>query().lambda()
+                    .eq(MaterialTypeAssign::getMaterialTypeId, addMaterialTypeAssignDto.getMaterialTypeId()));
+            for (AddMaterialTypeAssignUserDto addMaterialTypeAssignUserDto : addMaterialTypeAssignDto.getUserList()) {
+                Optional<MaterialTypeAssign> materialTypeAssignAny = materialTypeAssignList.stream().filter(item -> item.getUserId() == addMaterialTypeAssignUserDto.getUserId()).findAny();
+                if (!materialTypeAssignAny.isPresent()) {
+                    MaterialTypeAssign materialTypeAssign = new MaterialTypeAssign();
+                    materialTypeAssign.setMaterialTypeId(addMaterialTypeAssignDto.getMaterialTypeId());
+                    materialTypeAssign.setUserId(addMaterialTypeAssignUserDto.getUserId());
+                    materialTypeAssign.setUserType(addMaterialTypeAssignUserDto.getUserType());
+                    materialTypeAssign.setUserNumber(addMaterialTypeAssignUserDto.getUserNumber());
+                    materialTypeMaterialTypeAssignMapper.insert(materialTypeAssign);
+                }
+            }
+        }
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(List<Long> ids) {
+        materialTypeMaterialTypeAssignMapper.deleteBatchIds(ids);
+        return true;
+    }
+}

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

@@ -0,0 +1,88 @@
+package com.xjrsoft.module.material.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.material.entity.MaterialTypeAssign;
+import com.xjrsoft.module.material.mapper.MaterialTypeAssignMapper;
+import com.xjrsoft.module.material.entity.MaterialType;
+import com.xjrsoft.module.material.mapper.MaterialTypeMapper;
+import com.xjrsoft.module.material.service.IMaterialTypeService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 材料提交任务类型
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class MaterialTypeServiceImpl extends MPJBaseServiceImpl<MaterialTypeMapper, MaterialType> implements IMaterialTypeService {
+    private final MaterialTypeMapper materialTypeMaterialTypeMapper;
+
+    private final MaterialTypeAssignMapper materialTypeMaterialTypeAssignMapper;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean add(MaterialType materialType) {
+        materialTypeMaterialTypeMapper.insert(materialType);
+//        for (MaterialTypeAssign materialTypeAssign : materialType.getMaterialTypeAssignList()) {
+//            materialTypeAssign.setMaterialTypeId(materialType.getId());
+//            materialTypeMaterialTypeAssignMapper.insert(materialTypeAssign);
+//        }
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean update(MaterialType materialType) {
+        materialTypeMaterialTypeMapper.updateById(materialType);
+        //********************************* MaterialTypeAssign  增删改  开始 *******************************************/
+//        {
+            // 查出所有子级的id
+//            List<MaterialTypeAssign> materialTypeAssignList = materialTypeMaterialTypeAssignMapper.selectList(Wrappers.lambdaQuery(MaterialTypeAssign.class).eq(MaterialTypeAssign::getMaterialTypeId, materialType.getId()).select(MaterialTypeAssign::getId));
+//            List<Long> materialTypeAssignIds = materialTypeAssignList.stream().map(MaterialTypeAssign::getId).collect(Collectors.toList());
+//            //原有子表单 没有被删除的主键
+//            List<Long> materialTypeAssignOldIds = materialType.getMaterialTypeAssignList().stream().map(MaterialTypeAssign::getId).filter(Objects::nonNull).collect(Collectors.toList());
+//            //找到需要删除的id
+//            List<Long> materialTypeAssignRemoveIds = materialTypeAssignIds.stream().filter(item -> !materialTypeAssignOldIds.contains(item)).collect(Collectors.toList());
+//
+//            for (MaterialTypeAssign materialTypeAssign : materialType.getMaterialTypeAssignList()) {
+//                //如果不等于空则修改
+//                if (materialTypeAssign.getId() != null) {
+//                    materialTypeMaterialTypeAssignMapper.updateById(materialTypeAssign);
+//                }
+//                //如果等于空 则新增
+//                else {
+//                    //已经不存在的id 删除
+//                    materialTypeAssign.setMaterialTypeId(materialType.getId());
+//                    materialTypeMaterialTypeAssignMapper.insert(materialTypeAssign);
+//                }
+//            }
+//            //已经不存在的id 删除
+//            if(materialTypeAssignRemoveIds.size() > 0){
+//                materialTypeMaterialTypeAssignMapper.deleteBatchIds(materialTypeAssignRemoveIds);
+//            }
+//        }
+        //********************************* MaterialTypeAssign  增删改  结束 *******************************************/
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(List<Long> ids) {
+        materialTypeMaterialTypeMapper.deleteBatchIds(ids);
+        materialTypeMaterialTypeAssignMapper.delete(Wrappers.lambdaQuery(MaterialTypeAssign.class).in(MaterialTypeAssign::getMaterialTypeId, ids));
+
+        return true;
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.xjrsoft.module.material.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+* @title: 材料提交任务附件表单出参
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+public class MaterialTaskAppendixVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 材料提交任务(material_task)
+    */
+    @ApiModelProperty("材料提交任务(material_task)")
+    private Long materialTaskId;
+    /**
+    * 文件ID(xjr_file)
+    */
+    @ApiModelProperty("文件ID(xjr_file)")
+    private Long fileId;
+
+
+
+}

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

@@ -0,0 +1,83 @@
+package com.xjrsoft.module.material.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+* @title: 材料提交任务分配表单出参
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+public class MaterialTaskAssignVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 材料提交任务(material_task)
+    */
+    @ApiModelProperty("材料提交任务(material_task)")
+    private Long materialTaskId;
+    /**
+    * 用户(xjr_user)
+    */
+    @ApiModelProperty("用户(xjr_user)")
+    private Long userId;
+    /**
+    * 用户类型 1=孝职工 2=学生
+    */
+    @ApiModelProperty("用户类型 1=孝职工 2=学生")
+    private Integer userType;
+    /**
+    * 学号/工号
+    */
+    @ApiModelProperty("学号/工号")
+    private String userNumber;
+    /**
+    * 状态 1=未提交 2=待审核 3=通过 4=重做
+    */
+    @ApiModelProperty("状态 1=未提交 2=待审核 3=通过 4=重做")
+    private Integer status;
+    /**
+    * 执行提交 1=未提交 2=按时提交 3=延迟提交
+    */
+    @ApiModelProperty("执行提交 1=未提交 2=按时提交 3=延迟提交")
+    private Integer executiveStatus;
+    /**
+    * 转办任务分配ID(material_task_assign)
+    */
+    @ApiModelProperty("转办任务分配ID(material_task_assign)")
+    private Long transferMaterialTaskId;
+    /**
+    * 转办给几人
+    */
+    @ApiModelProperty("转办给几人")
+    private Integer transferAssignPerson;
+    /**
+    * 转办已提交人数
+    */
+    @ApiModelProperty("转办已提交人数")
+    private Integer transferSubmitedPerson;
+    /**
+    * 是否发送消息 0=不发 1=发送
+    */
+    @ApiModelProperty("是否发送消息 0=不发 1=发送")
+    private Integer sendMessage;
+    /**
+    * 发送消息状态 0=未不发 1=已发送
+    */
+    @ApiModelProperty("发送消息状态 0=未不发 1=已发送")
+    private Integer sendMessageStatus;
+
+
+
+}

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

@@ -0,0 +1,138 @@
+package com.xjrsoft.module.material.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+/**
+* @title: 材料提交任务分页列表出参
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+public class MaterialTaskPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("主键编号")
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建人")
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建时间")
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createDate;
+    /**
+    * 修改人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("修改人")
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("修改时间")
+    @ApiModelProperty("修改时间")
+    private LocalDateTime modifyDate;
+    /**
+    * 删除标记
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("删除标记")
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("有效标志")
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 材料提交任务类型(material_type)
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("材料提交任务类型(material_type)")
+    @ApiModelProperty("材料提交任务类型(material_type)")
+    private Long materialTypeId;
+    /**
+    * 任务名称
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("任务名称")
+    @ApiModelProperty("任务名称")
+    private String name;
+    /**
+    * 状态 1=未开始 2=进行中 3=结束
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("状态 1=未开始 2=进行中 3=结束")
+    @ApiModelProperty("状态 1=未开始 2=进行中 3=结束")
+    private Integer status;
+    /**
+    * 要求完成日期
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("要求完成日期")
+    @ApiModelProperty("要求完成日期")
+    private LocalDateTime requiredCompleteTime;
+    /**
+    * 要求
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("要求")
+    @ApiModelProperty("要求")
+    private String requirement;
+    /**
+    * 指派给几人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("指派给几人")
+    @ApiModelProperty("指派给几人")
+    private Integer assignPerson;
+    /**
+    * 已提交人数
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("已提交人数")
+    @ApiModelProperty("已提交人数")
+    private Integer submitedPerson;
+    /**
+    * 按时提交
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("按时提交")
+    @ApiModelProperty("按时提交")
+    private Integer onTimePerson;
+    /**
+    * 延迟提交
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("延迟提交")
+    @ApiModelProperty("延迟提交")
+    private Integer timeDelay;
+
+}

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

@@ -0,0 +1,85 @@
+package com.xjrsoft.module.material.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import com.xjrsoft.module.material.entity.MaterialTaskAssign;
+import com.xjrsoft.module.material.entity.MaterialTaskAppendix;
+
+/**
+* @title: 材料提交任务表单出参
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+public class MaterialTaskVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 材料提交任务类型(material_type)
+    */
+    @ApiModelProperty("材料提交任务类型(material_type)")
+    private Long materialTypeId;
+    /**
+    * 任务名称
+    */
+    @ApiModelProperty("任务名称")
+    private String name;
+    /**
+    * 状态 1=未开始 2=进行中 3=结束
+    */
+    @ApiModelProperty("状态 1=未开始 2=进行中 3=结束")
+    private Integer status;
+    /**
+    * 要求完成日期
+    */
+    @ApiModelProperty("要求完成日期")
+    private LocalDateTime requiredCompleteTime;
+    /**
+    * 要求
+    */
+    @ApiModelProperty("要求")
+    private String requirement;
+    /**
+    * 指派给几人
+    */
+    @ApiModelProperty("指派给几人")
+    private Integer assignPerson;
+    /**
+    * 已提交人数
+    */
+    @ApiModelProperty("已提交人数")
+    private Integer submitedPerson;
+    /**
+    * 按时提交
+    */
+    @ApiModelProperty("按时提交")
+    private Integer onTimePerson;
+    /**
+    * 延迟提交
+    */
+    @ApiModelProperty("延迟提交")
+    private Integer timeDelay;
+
+
+    /**
+    * materialTaskAssign
+    */
+    @ApiModelProperty("materialTaskAssign子表")
+    private List<MaterialTaskAssignVo> materialTaskAssignList;
+    /**
+    * materialTaskAppendix
+    */
+    @ApiModelProperty("materialTaskAppendix子表")
+    private List<MaterialTaskAppendixVo> materialTaskAppendixList;
+
+}

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

@@ -0,0 +1,58 @@
+package com.xjrsoft.module.material.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+* @title: 材料提交任务类型分配表单出参
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+public class MaterialTypeAssignVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 材料提交任务类型(material_type)
+    */
+    @ApiModelProperty("材料提交任务类型(material_type)")
+    private Long materialTypeId;
+    /**
+    * 用户(xjr_user)
+    */
+    @ApiModelProperty("用户(xjr_user)")
+    private Long userId;
+    /**
+    * 用户类型 1=孝职工 2=学生
+    */
+    @ApiModelProperty("用户类型 1=孝职工 2=学生")
+    private Integer userType;
+    /**
+    * 学号/工号
+    */
+    @ApiModelProperty("学号/工号")
+    private String userNumber;
+
+    /**
+     * 用户名称
+     */
+    @ApiModelProperty("用户名称")
+    private String userName;
+
+    /**
+     * 部门
+     */
+    @ApiModelProperty("部门")
+    private String deptName;
+
+}

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

@@ -0,0 +1,82 @@
+package com.xjrsoft.module.material.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+/**
+* @title: 材料提交任务类型分页列表出参
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+public class MaterialTypePageVo {
+
+    /**
+    * 主键编号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("主键编号")
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建人")
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建时间")
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createDate;
+    /**
+    * 修改人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("修改人")
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("修改时间")
+    @ApiModelProperty("修改时间")
+    private LocalDateTime modifyDate;
+    /**
+    * 删除标记
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("删除标记")
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("有效标志")
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 任务名称
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("任务名称")
+    @ApiModelProperty("任务名称")
+    private String name;
+
+}

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

@@ -0,0 +1,39 @@
+package com.xjrsoft.module.material.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import com.xjrsoft.module.material.entity.MaterialTypeAssign;
+
+/**
+* @title: 材料提交任务类型表单出参
+* @Author baicai
+* @Date: 2023-10-31
+* @Version 1.0
+*/
+@Data
+public class MaterialTypeVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 任务名称
+    */
+    @ApiModelProperty("任务名称")
+    private String name;
+
+
+    /**
+    * materialTypeAssign
+    */
+    @ApiModelProperty("materialTypeAssign子表")
+    private List<MaterialTypeAssignVo> materialTypeAssignList;
+
+}

src/main/resources/sqlScript/init_sql.sql

@@ -939,4 +939,111 @@ create table oauth_client_details
     primary key (`id`)
 ) engine=innodb default charset=utf8mb4 COLLATE = utf8mb4_0900_ai_ci comment 'oauth用户列表';
 
+-- ----------------------------
+-- 材料提交任务类型
+-- ----------------------------
+drop table if exists material_type;
+create table material_type
+(
+    id bigint not null comment '主键编号' ,
+    `create_user_id` bigint NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` date NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` bigint NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` date NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` int NOT NULL COMMENT '删除标记',
+    `enabled_mark` int NOT NULL COMMENT '有效标志',
+    `name` varchar(100) NULL DEFAULT NULL COMMENT '任务名称',
+    primary key (`id`)
+) engine=innodb default charset=utf8mb4 COLLATE = utf8mb4_0900_ai_ci comment '材料提交任务类型';
+
+-- ----------------------------
+-- 材料提交任务类型分配
+-- ----------------------------
+drop table if exists material_type_assign;
+create table material_type_assign
+(
+    id bigint not null comment '主键编号' ,
+    `create_user_id` bigint NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` date NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` bigint NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` date NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` int NOT NULL COMMENT '删除标记',
+    `enabled_mark` int NOT NULL COMMENT '有效标志',
+    `material_type_id` bigint NULL DEFAULT NULL COMMENT '材料提交任务类型(material_type)',
+    user_id bigint not null comment '用户(xjr_user)',
+    user_type int not null comment '用户类型 1=孝职工 2=学生',
+    `user_number` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '学号/工号',
+    primary key (`id`)
+) engine=innodb default charset=utf8mb4 COLLATE = utf8mb4_0900_ai_ci comment '材料提交任务类型分配';
+
+-- ----------------------------
+-- 材料提交任务
+-- ----------------------------
+drop table if exists material_task;
+create table material_task
+(
+    id bigint not null comment '主键编号' ,
+    `create_user_id` bigint NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` date NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` bigint NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` date NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` int NOT NULL COMMENT '删除标记',
+    `enabled_mark` int NOT NULL COMMENT '有效标志',
+    `material_type_id` bigint NULL DEFAULT NULL COMMENT '材料提交任务类型(material_type)',
+    `name` varchar(100) NULL DEFAULT NULL COMMENT '任务名称',
+    status int not null default 1 comment '状态 1=未开始 2=进行中 3=结束',
+    required_complete_time date null default null COMMENT '要求完成日期',
+    `requirement` text NULL DEFAULT NULL COMMENT '要求',
+    assign_person int null default 0 comment '指派给几人',
+    submited_person int null default 0 comment '已提交人数',
+    on_time_person int null default 0 comment '按时提交',
+    time_delay int null default 0 comment '延迟提交',
+    primary key (`id`)
+) engine=innodb default charset=utf8mb4 COLLATE = utf8mb4_0900_ai_ci comment '材料提交任务';
+
+-- ----------------------------
+-- 材料提交任务分配
+-- ----------------------------
+drop table if exists material_task_assign;
+create table material_task_assign
+(
+    id bigint not null comment '主键编号' ,
+    `create_user_id` bigint NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` date NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` bigint NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` date NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` int NOT NULL COMMENT '删除标记',
+    `enabled_mark` int NOT NULL COMMENT '有效标志',
+    `material_task_id` bigint NULL DEFAULT NULL COMMENT '材料提交任务(material_task)',
+    user_id bigint not null comment '用户(xjr_user)',
+    user_type int not null comment '用户类型 1=孝职工 2=学生',
+    `user_number` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '学号/工号',
+    status int not null default 1 comment '状态 1=未提交 2=待审核 3=通过 4=重做',
+    executive_status int not null default 1 comment '执行提交 1=未提交 2=按时提交 3=延迟提交',
+    transfer_material_task_id bigint NULL DEFAULT NULL COMMENT '转办任务分配ID(material_task_assign)',
+    transfer_assign_person int null default 0 comment '转办给几人',
+    transfer_submited_person int null default 0 comment '转办已提交人数',
+    send_message int null default 0 comment '是否发送消息 0=不发 1=发送',
+    send_message_status int null default 0 comment '发送消息状态 0=未不发 1=已发送',
+    primary key (`id`)
+) engine=innodb default charset=utf8mb4 COLLATE = utf8mb4_0900_ai_ci comment '材料提交任务分配';
+
+-- ----------------------------
+-- 材料提交任务附件
+-- ----------------------------
+drop table if exists material_task_appendix;
+create table material_task_appendix
+(
+    id bigint not null comment '主键编号' ,
+    `create_user_id` bigint NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` date NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` bigint NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` date NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` int NOT NULL COMMENT '删除标记',
+    `enabled_mark` int NOT NULL COMMENT '有效标志',
+    `material_task_id` bigint NULL DEFAULT NULL COMMENT '材料提交任务(material_task)',
+    `file_id` bigint NULL DEFAULT NULL COMMENT '文件ID(xjr_file)',
+    primary key (`id`)
+) engine=innodb default charset=utf8mb4 COLLATE = utf8mb4_0900_ai_ci comment '材料提交任务附件';
+
 SET FOREIGN_KEY_CHECKS = 1;

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -130,6 +130,89 @@ public class FreeMarkerGeneratorTest {
         params.setDs(ds);
 
 
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
+    @Test
+    public void gcMaterialType() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("material_type");
+        mainTable.setIsMain(true);
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);
+
+        TableConfig childTable1 = new TableConfig();
+        childTable1.setTableName("material_type_assign");
+        childTable1.setIsMain(false);
+        childTable1.setPkField(GlobalConstant.DEFAULT_PK);
+        childTable1.setPkType(GlobalConstant.DEFAULT_PK_TYPE);
+        childTable1.setRelationField("material_type_id");
+        childTable1.setRelationTableField(GlobalConstant.DEFAULT_PK);
+
+        tableConfigs.add(mainTable);
+        tableConfigs.add(childTable1);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("baicai");
+        params.setPackageName("material");
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);
+        params.setImport(true);
+        params.setExport(true);
+        params.setOutMainDir(false);
+        params.setDs(ds);
+
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
+
+    @Test
+    public void gcMaterialTask() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("material_task");
+        mainTable.setIsMain(true);
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);
+
+        TableConfig childTable1 = new TableConfig();
+        childTable1.setTableName("material_task_assign");
+        childTable1.setIsMain(false);
+        childTable1.setPkField(GlobalConstant.DEFAULT_PK);
+        childTable1.setPkType(GlobalConstant.DEFAULT_PK_TYPE);
+        childTable1.setRelationField("material_task_id");
+        childTable1.setRelationTableField(GlobalConstant.DEFAULT_PK);
+
+
+        TableConfig childTable2 = new TableConfig();
+        childTable2.setTableName("material_task_appendix");
+        childTable2.setIsMain(false);
+        childTable2.setPkField(GlobalConstant.DEFAULT_PK);
+        childTable2.setPkType(GlobalConstant.DEFAULT_PK_TYPE);
+        childTable2.setRelationField("material_task_id");
+        childTable2.setRelationTableField(GlobalConstant.DEFAULT_PK);
+
+        tableConfigs.add(mainTable);
+        tableConfigs.add(childTable1);
+        tableConfigs.add(childTable2);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("baicai");
+        params.setPackageName("material");
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);
+        params.setImport(true);
+        params.setExport(true);
+        params.setOutMainDir(false);
+        params.setDs(ds);
+
+
         IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
 
         apiGeneratorService.generateCodes(params);