添加学生消费

src/main/java/com/xjrsoft/module/student/controller/StudentConsumeDateController.java

@@ -0,0 +1,110 @@
+package com.xjrsoft.module.student.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.github.yulichang.toolkit.MPJWrappers;
+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.asset.entity.WfAssetManage;
+import com.xjrsoft.module.student.dto.AddStudentConsumeDateDto;
+import com.xjrsoft.module.student.dto.UpdateStudentConsumeDateDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.student.dto.StudentConsumeDatePageDto;
+import com.xjrsoft.module.student.entity.BaseStudentScholarshipCategory;
+import com.xjrsoft.module.student.entity.StudentConsumeDate;
+import com.xjrsoft.module.student.service.IStudentConsumeDateService;
+import com.xjrsoft.module.student.vo.StudentConsumeDatePageVo;
+
+import com.xjrsoft.module.student.vo.StudentConsumeDateVo;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
+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 dzx
+* @Date: 2024-08-26
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/studentConsumeDate")
+@Api(value = "/student"  + "/studentConsumeDate",tags = "学生消费数据代码")
+@AllArgsConstructor
+public class StudentConsumeDateController {
+
+
+    private final IStudentConsumeDateService studentConsumeDateService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="学生消费数据列表(分页)")
+    @SaCheckPermission("studentconsumedate:detail")
+    public RT<PageOutput<StudentConsumeDatePageVo>> page(@Valid StudentConsumeDatePageDto dto) {
+
+        IPage<StudentConsumeDatePageVo> page = studentConsumeDateService.selectJoinListPage(ConventPage.getPage(dto), StudentConsumeDatePageVo.class,
+                MPJWrappers.<StudentConsumeDate>lambdaJoin()
+                        .orderByDesc(StudentConsumeDate::getId)
+                        .eq(ObjectUtil.isNotNull(dto.getConsumeType()), StudentConsumeDate::getConsumeType, dto.getConsumeType())
+                        .between(ObjectUtil.isNotNull(dto.getStartDate()) && ObjectUtil.isNotNull(dto.getEndDate()), StudentConsumeDate::getConsumeTime, dto.getStartDate(), dto.getEndDate())
+                        .select(StudentConsumeDate.class, x -> VoToColumnUtil.fieldsToColumns(StudentConsumeDatePageVo.class).contains(x.getProperty()))
+                        .select(StudentConsumeDate::getId)
+                        .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, StudentConsumeDate::getConsumeType, ext -> ext.selectAs(DictionaryDetail::getName, StudentConsumeDatePageVo::getConsumeTypeCn))
+        );
+        PageOutput<StudentConsumeDatePageVo> pageOutput = ConventPage.getPageOutput(page, StudentConsumeDatePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询学生消费数据信息")
+    @SaCheckPermission("studentconsumedate:detail")
+    public RT<StudentConsumeDateVo> info(@RequestParam Long id){
+        StudentConsumeDate studentConsumeDate = studentConsumeDateService.getById(id);
+        if (studentConsumeDate == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(studentConsumeDate, StudentConsumeDateVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增学生消费数据")
+    @SaCheckPermission("studentconsumedate:add")
+    public RT<Boolean> add(@Valid @RequestBody AddStudentConsumeDateDto dto){
+        StudentConsumeDate studentConsumeDate = BeanUtil.toBean(dto, StudentConsumeDate.class);
+        boolean isSuccess = studentConsumeDateService.save(studentConsumeDate);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改学生消费数据")
+    @SaCheckPermission("studentconsumedate:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateStudentConsumeDateDto dto){
+
+        StudentConsumeDate studentConsumeDate = BeanUtil.toBean(dto, StudentConsumeDate.class);
+        return RT.ok(studentConsumeDateService.updateById(studentConsumeDate));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除学生消费数据")
+    @SaCheckPermission("studentconsumedate:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(studentConsumeDateService.removeBatchByIds(ids));
+
+    }
+
+}

src/main/java/com/xjrsoft/module/student/dto/AddStudentConsumeDateDto.java

@@ -0,0 +1,93 @@
+package com.xjrsoft.module.student.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 java.util.Date;
+
+
+
+/**
+* @title: 学生消费数据
+* @Author dzx
+* @Date: 2024-08-26
+* @Version 1.0
+*/
+@Data
+public class AddStudentConsumeDateDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 班级id
+    */
+    @ApiModelProperty("班级id")
+    private Long classId;
+    /**
+    * 班级名称
+    */
+    @ApiModelProperty("班级名称")
+    private String className;
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Long studentId;
+    /**
+    * 学生姓名
+    */
+    @ApiModelProperty("学生姓名")
+    private String studentName;
+    /**
+    * 学生学号
+    */
+    @ApiModelProperty("学生学号")
+    private String studentUserName;
+    /**
+    * 消费时间
+    */
+    @ApiModelProperty("消费时间")
+    private Date consumeTime;
+    /**
+    * 消费金额
+    */
+    @ApiModelProperty("消费金额")
+    private BigDecimal consumeMoney;
+    /**
+    * 消费类型
+    */
+    @ApiModelProperty("消费类型")
+    private String consumeType;
+    /**
+    * 年级名称
+    */
+    @ApiModelProperty("年级名称")
+    private String gradeName;
+    /**
+    * 年级id
+    */
+    @ApiModelProperty("年级id")
+    private String gradeId;
+    /**
+    * 专业名称
+    */
+    @ApiModelProperty("专业名称")
+    private String majorName;
+    /**
+    * 专业id
+    */
+    @ApiModelProperty("专业id")
+    private String majorId;
+
+}

src/main/java/com/xjrsoft/module/student/dto/StudentConsumeDatePageDto.java

@@ -0,0 +1,45 @@
+package com.xjrsoft.module.student.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+import java.util.Date;
+
+
+/**
+* @title: 学生消费数据分页查询入参
+* @Author dzx
+* @Date: 2024-08-26
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class StudentConsumeDatePageDto extends PageInput {
+    /**
+     * 消费类型
+     */
+    @ApiModelProperty("消费类型")
+    private String consumeType;
+
+    /**
+     * 开始日期
+     */
+    @ApiModelProperty("开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDateTime startDate;
+
+    /**
+     * 结束日期
+     */
+    @ApiModelProperty("结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDateTime endDate;
+
+}

src/main/java/com/xjrsoft/module/student/dto/UpdateStudentConsumeDateDto.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.student.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 java.util.Date;
+
+
+
+/**
+* @title: 学生消费数据
+* @Author dzx
+* @Date: 2024-08-26
+* @Version 1.0
+*/
+@Data
+public class UpdateStudentConsumeDateDto extends AddStudentConsumeDateDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/student/entity/StudentConsumeDate.java

@@ -0,0 +1,143 @@
+package com.xjrsoft.module.student.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;
+import java.util.Date;
+
+
+/**
+* @title: 学生消费数据
+* @Author dzx
+* @Date: 2024-08-26
+* @Version 1.0
+*/
+@Data
+@TableName("student_consume_date")
+@ApiModel(value = "student_consume_date", description = "学生消费数据")
+public class StudentConsumeDate 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 Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 班级id
+    */
+    @ApiModelProperty("班级id")
+    private Long classId;
+    /**
+    * 班级名称
+    */
+    @ApiModelProperty("班级名称")
+    private String className;
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Long studentId;
+    /**
+    * 学生姓名
+    */
+    @ApiModelProperty("学生姓名")
+    private String studentName;
+    /**
+    * 学生学号
+    */
+    @ApiModelProperty("学生学号")
+    private String studentUserName;
+    /**
+    * 消费时间
+    */
+    @ApiModelProperty("消费时间")
+    private Date consumeTime;
+    /**
+    * 消费金额
+    */
+    @ApiModelProperty("消费金额")
+    private BigDecimal consumeMoney;
+    /**
+    * 消费类型
+    */
+    @ApiModelProperty("消费类型")
+    private String consumeType;
+    /**
+    * 年级名称
+    */
+    @ApiModelProperty("年级名称")
+    private String gradeName;
+    /**
+    * 年级id
+    */
+    @ApiModelProperty("年级id")
+    private String gradeId;
+    /**
+    * 专业名称
+    */
+    @ApiModelProperty("专业名称")
+    private String majorName;
+    /**
+    * 专业id
+    */
+    @ApiModelProperty("专业id")
+    private String majorId;
+
+
+}

src/main/java/com/xjrsoft/module/student/mapper/StudentConsumeDateMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.student.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.entity.StudentConsumeDate;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学生消费数据
+* @Author dzx
+* @Date: 2024-08-26
+* @Version 1.0
+*/
+@Mapper
+public interface StudentConsumeDateMapper extends MPJBaseMapper<StudentConsumeDate> {
+
+}

src/main/java/com/xjrsoft/module/student/service/IStudentConsumeDateService.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.student.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.entity.StudentConsumeDate;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 学生消费数据
+* @Author dzx
+* @Date: 2024-08-26
+* @Version 1.0
+*/
+
+public interface IStudentConsumeDateService extends MPJBaseService<StudentConsumeDate> {
+}

src/main/java/com/xjrsoft/module/student/service/impl/StudentConsumeDateServiceImpl.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.student.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.entity.StudentConsumeDate;
+import com.xjrsoft.module.student.mapper.StudentConsumeDateMapper;
+import com.xjrsoft.module.student.service.IStudentConsumeDateService;
+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 dzx
+* @Date: 2024-08-26
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class StudentConsumeDateServiceImpl extends MPJBaseServiceImpl<StudentConsumeDateMapper, StudentConsumeDate> implements IStudentConsumeDateService {
+}

src/main/java/com/xjrsoft/module/student/vo/StudentConsumeDatePageVo.java

@@ -0,0 +1,129 @@
+package com.xjrsoft.module.student.vo;
+
+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;
+import java.util.Date;
+
+/**
+* @title: 学生消费数据分页列表出参
+* @Author dzx
+* @Date: 2024-08-26
+* @Version 1.0
+*/
+@Data
+public class StudentConsumeDatePageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 班级id
+    */
+    @ApiModelProperty("班级id")
+    private Long classId;
+    /**
+    * 班级名称
+    */
+    @ApiModelProperty("班级名称")
+    private String className;
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Long studentId;
+    /**
+    * 学生姓名
+    */
+    @ApiModelProperty("学生姓名")
+    private String studentName;
+    /**
+    * 学生学号
+    */
+    @ApiModelProperty("学生学号")
+    private String studentUserName;
+    /**
+    * 消费时间
+    */
+    @ApiModelProperty("消费时间")
+    private Date consumeTime;
+    /**
+    * 消费金额
+    */
+    @ApiModelProperty("消费金额")
+    private BigDecimal consumeMoney;
+    /**
+    * 消费类型
+    */
+    @ApiModelProperty("消费类型")
+    private String consumeType;
+    /**
+    * 年级名称
+    */
+    @ApiModelProperty("年级名称")
+    private String gradeName;
+    /**
+    * 年级id
+    */
+    @ApiModelProperty("年级id")
+    private String gradeId;
+    /**
+    * 专业名称
+    */
+    @ApiModelProperty("专业名称")
+    private String majorName;
+    /**
+    * 专业id
+    */
+    @ApiModelProperty("专业id")
+    private String majorId;
+    /**
+     * 消费类型
+     */
+    @ApiModelProperty("消费类型")
+    private String consumeTypeCn;
+
+}

src/main/java/com/xjrsoft/module/student/vo/StudentConsumeDateVo.java

@@ -0,0 +1,94 @@
+package com.xjrsoft.module.student.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 java.util.Date;
+
+/**
+* @title: 学生消费数据表单出参
+* @Author dzx
+* @Date: 2024-08-26
+* @Version 1.0
+*/
+@Data
+public class StudentConsumeDateVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 班级id
+    */
+    @ApiModelProperty("班级id")
+    private Long classId;
+    /**
+    * 班级名称
+    */
+    @ApiModelProperty("班级名称")
+    private String className;
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Long studentId;
+    /**
+    * 学生姓名
+    */
+    @ApiModelProperty("学生姓名")
+    private String studentName;
+    /**
+    * 学生学号
+    */
+    @ApiModelProperty("学生学号")
+    private String studentUserName;
+    /**
+    * 消费时间
+    */
+    @ApiModelProperty("消费时间")
+    private Date consumeTime;
+    /**
+    * 消费金额
+    */
+    @ApiModelProperty("消费金额")
+    private BigDecimal consumeMoney;
+    /**
+    * 消费类型
+    */
+    @ApiModelProperty("消费类型")
+    private String consumeType;
+    /**
+    * 年级名称
+    */
+    @ApiModelProperty("年级名称")
+    private String gradeName;
+    /**
+    * 年级id
+    */
+    @ApiModelProperty("年级id")
+    private String gradeId;
+    /**
+    * 专业名称
+    */
+    @ApiModelProperty("专业名称")
+    private String majorName;
+    /**
+    * 专业id
+    */
+    @ApiModelProperty("专业id")
+    private String majorId;
+
+
+
+}

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

@@ -3692,4 +3692,29 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+    @Test
+    public void gcStudentConsumeDate() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("student_consume_date");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("dzx");//作者名称
+        params.setPackageName("student");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
 }