Merge branch 'pre'

src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskClassStudentServiceImpl.java

@@ -180,6 +180,7 @@ public class BandingTaskClassStudentServiceImpl extends MPJBaseServiceImpl<Bandi
                         setGradeId(bandingTask.getGradeId());
                         setDeleteMark(DeleteMark.NODELETE.getCode());
                         setEnrollType(bandingTask.getEnrollType());
+                        setCreateDate(new Date());
                     }};
 
                     classService.save(baseClass);

src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskServiceImpl.java

@@ -593,6 +593,7 @@ public class BandingTaskServiceImpl extends MPJBaseServiceImpl<BandingTaskMapper
                     setOrgId(majorDeptMap.get(taskClass.getMajorSetId()));
                     setCode(gradeCode + String.format("%03d", finalMaxCode));
                     setMajorSetId(taskClass.getMajorSetId());
+                    setCreateDate(new Date());
                 }};
 
                 classService.save(baseClass);

src/main/java/com/xjrsoft/module/hikvision/util/DataUtil.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.hikvision.util;
 
-import cn.hutool.db.Entity;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -12,11 +11,9 @@ import com.xjrsoft.module.base.entity.BaseGrade;
 import com.xjrsoft.module.hikvision.mapper.HikvisionDataMapper;
 import com.xjrsoft.module.organization.entity.Department;
 import com.xjrsoft.module.personnel.entity.CarMessageApply;
-import com.xjrsoft.module.system.entity.DictionaryDetail;
 import lombok.extern.slf4j.Slf4j;
 import lombok.var;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -52,23 +49,22 @@ public class DataUtil {
         Map<String, String> idCodeMap = new HashMap<>();
         for (Integer level : levelSet) {
             JsonArray dataArray = new JsonArray();
-            for (Map<String, Object> map : dataList) {
-                Department department = SqlRunnerAdapterUtil.convertMapToEntity(map, Department.class);
-                if(tableData != null && tableData.containsKey(department.getId().toString())){
+            for (Map<String, Object> department : dataList) {
+                if(tableData != null && tableData.containsKey(department.get("id").toString())){
                     continue;
                 }
-                if(department.getHierarchy().length() == level){
+                if(department.get("hierarchy").toString().length() == level){
                     JsonObject paramJson = new JsonObject();
-                    paramJson.addProperty("clientId", department.getCode());
-                    paramJson.addProperty("orgIndexCode", department.getId().toString());
-                    paramJson.addProperty("orgName", department.getName());
-                    paramJson.addProperty("parentIndexCode", department.getParentId().toString());
-                    if(department.getParentId() == 0){
+                    paramJson.addProperty("clientId", department.get("code").toString());
+                    paramJson.addProperty("orgIndexCode", department.get("id").toString());
+                    paramJson.addProperty("orgName", department.get("name").toString());
+                    paramJson.addProperty("parentIndexCode", department.get("parent_id").toString());
+                    if(Long.parseLong(department.get("parent_id").toString()) == 0){
                         paramJson.addProperty("parentIndexCode", "root000000");
                     }
-                    paramJson.addProperty("orgCode", department.getCode());
+                    paramJson.addProperty("orgCode", department.get("code").toString());
                     dataArray.add(paramJson);
-                    idCodeMap.put(department.getCode(), department.getId().toString());
+                    idCodeMap.put(department.get("code").toString(), department.get("id").toString());
                 }
             }
             String result = apiUtil.doPost(apiPath, dataArray.toString(), null, null);
@@ -95,7 +91,7 @@ public class DataUtil {
         Map<String, String> idMap = new HashMap<>();
         //1、查询字典，将走读住读、班级类型先推送过去
         String sql = "SELECT * FROM xjr_dictionary_detail WHERE delete_mark = 0 AND item_id = 2023000000000000030";
-        List<Map<String, Object>> detailList = SqlRunnerAdapter.db().selectList(sql, DictionaryDetail.class);
+        List<Map<String, Object>> detailList = SqlRunnerAdapter.db().selectList(sql);
 
         String apiPath = "/api/resource/v1/org/batch/add";
         JsonParser jsonParser = new JsonParser();
@@ -106,20 +102,19 @@ public class DataUtil {
 
         Set<String> stduyStatus = new HashSet<>();
 
-        for (Map<String, Object> map : detailList) {
-            DictionaryDetail dict = SqlRunnerAdapterUtil.convertMapToEntity(map, DictionaryDetail.class);
-            if(tableData != null && tableData.containsKey(dict.getId().toString())){
-                stduyStatus.add(dict.getId().toString());
+        for (Map<String, Object> dict : detailList) {
+            if(tableData != null && tableData.containsKey(dict.get("id").toString())){
+                stduyStatus.add(dict.get("id").toString());
                 continue;
             }
             JsonObject paramJson = new JsonObject();
             paramJson.addProperty("clientId", clientId);
-            paramJson.addProperty("orgIndexCode", dict.getCode());
-            paramJson.addProperty("orgName", dict.getName() + "学生");
+            paramJson.addProperty("orgIndexCode", dict.get("code").toString());
+            paramJson.addProperty("orgName", dict.get("name").toString() + "学生");
             paramJson.addProperty("parentIndexCode", "root000000");
-            paramJson.addProperty("orgCode", dict.getCode());
+            paramJson.addProperty("orgCode", dict.get("code").toString());
             dataArray.add(paramJson);
-            idCodeMap.put(clientId, dict.getCode());
+            idCodeMap.put(clientId, dict.get("code").toString());
             clientId ++;
         }
         String result = apiUtil.doPost(apiPath, dataArray.toString(), null, null);
@@ -136,24 +131,23 @@ public class DataUtil {
         }
         //推送班级类型
         sql = "SELECT * FROM xjr_dictionary_detail WHERE delete_mark = 0 AND item_id = 2023000000000000039";
-        detailList = SqlRunnerAdapter.db().selectList(sql, DictionaryDetail.class);
+        detailList = SqlRunnerAdapter.db().selectList(sql);
         dataArray = new JsonArray();
         Set<String> classTypeSet = new HashSet<>();
         for (String status : stduyStatus) {
-            for (Map<String, Object> map : detailList) {
-                DictionaryDetail dict = SqlRunnerAdapterUtil.convertMapToEntity(map, DictionaryDetail.class);
-                if(tableData != null && tableData.containsKey(dict.getCode())){
-                    classTypeSet.add(dict.getCode());
+            for (Map<String, Object> dict : detailList) {
+                if(tableData != null && tableData.containsKey(dict.get("code").toString())){
+                    classTypeSet.add(dict.get("code").toString());
                     continue;
                 }
                 JsonObject paramJson = new JsonObject();
                 paramJson.addProperty("clientId", clientId);
-                paramJson.addProperty("orgIndexCode", dict.getCode() + "-" + status);
-                paramJson.addProperty("orgName", dict.getName());
+                paramJson.addProperty("orgIndexCode", dict.get("code").toString() + "-" + status);
+                paramJson.addProperty("orgName", dict.get("name").toString());
                 paramJson.addProperty("parentIndexCode", status);
-                paramJson.addProperty("orgCode", dict.getCode());
+                paramJson.addProperty("orgCode", dict.get("code").toString());
                 dataArray.add(paramJson);
-                idCodeMap.put(clientId, dict.getCode() + "-" + status);
+                idCodeMap.put(clientId, dict.get("code").toString() + "-" + status);
                 clientId ++;
             }
         }
@@ -171,25 +165,24 @@ public class DataUtil {
         }
 
         //推送年级
-        sql = "SELECT * FROM base_grade WHERE delete_mark = 0 AND STATUS = 1";
+        sql = "SELECT * FROM base_grade WHERE delete_mark = 0 AND status = 1";
         List<Map<String, Object>> gradeList = SqlRunnerAdapter.db().selectList(sql, BaseGrade.class);
         Map<Long, String> gradeNameMap = new HashMap<>();
         dataArray = new JsonArray();
         for (String classType : classTypeSet) {
-            for (Map<String, Object> gradeMap : gradeList) {
-                BaseGrade baseGrade = SqlRunnerAdapterUtil.convertMapToEntity(gradeMap, BaseGrade.class);
-                gradeNameMap.put(baseGrade.getId(), baseGrade.getName().replaceAll("级", ""));
-                if(tableData != null && tableData.containsKey(baseGrade.getId().toString())){
+            for (Map<String, Object> baseGrade : gradeList) {
+                gradeNameMap.put(Long.parseLong(baseGrade.get("id").toString()), baseGrade.get("name").toString().replaceAll("级", ""));
+                if(tableData != null && tableData.containsKey(baseGrade.get("id").toString())){
                     continue;
                 }
                 JsonObject paramJson = new JsonObject();
                 paramJson.addProperty("clientId", clientId);
-                paramJson.addProperty("orgIndexCode", baseGrade.getName().replaceAll("级", "") + "-" + classType);
-                paramJson.addProperty("orgName", baseGrade.getName());
+                paramJson.addProperty("orgIndexCode", baseGrade.get("name").toString().replaceAll("级", "") + "-" + classType);
+                paramJson.addProperty("orgName", baseGrade.get("name").toString());
                 paramJson.addProperty("parentIndexCode", classType);
                 paramJson.addProperty("orgCode", clientId);
                 dataArray.add(paramJson);
-                idCodeMap.put(clientId, baseGrade.getName().replaceAll("级", "") + "-" + classType);
+                idCodeMap.put(clientId, baseGrade.get("name").toString().replaceAll("级", "") + "-" + classType);
                 clientId ++;
             }
         }
@@ -214,27 +207,26 @@ public class DataUtil {
         dataArray = new JsonArray();
         for (String grade : gradeSet) {
             String[] gradeGroup = grade.split("-");
-            for (Map<String, Object> baseClassMap : classList) {
-                BaseClass baseClass = SqlRunnerAdapterUtil.convertMapToEntity(baseClassMap, BaseClass.class);
-                if(tableData != null && tableData.containsKey(baseClass.getId().toString())){
+            for (Map<String, Object> baseClass : classList) {
+                if(tableData != null && tableData.containsKey(baseClass.get("id").toString())){
                     continue;
                 }
-                String gradeName = gradeNameMap.get(baseClass.getGradeId());
+                String gradeName = gradeNameMap.get(Long.parseLong(baseClass.get("grade_id").toString()));
                 if(!gradeGroup[0].equals(gradeName)){
                     continue;
                 }
 
-                if(!gradeGroup[1].equals(baseClass.getClassType())){
+                if(!gradeGroup[1].equals(baseClass.get("class_type").toString())){
                     continue;
                 }
                 JsonObject paramJson = new JsonObject();
                 paramJson.addProperty("clientId", clientId);
-                paramJson.addProperty("orgIndexCode", baseClass.getId() + "-" + grade);
-                paramJson.addProperty("orgName", baseClass.getName());
+                paramJson.addProperty("orgIndexCode", baseClass.get("grade_id").toString() + "-" + grade);
+                paramJson.addProperty("orgName", baseClass.get("name").toString());
                 paramJson.addProperty("parentIndexCode", grade);
                 paramJson.addProperty("orgCode", clientId);
                 dataArray.add(paramJson);
-                idCodeMap.put(clientId, baseClass.getId() + "-" + grade);
+                idCodeMap.put(clientId, baseClass.get("grade_id").toString() + "-" + grade);
                 clientId ++;
             }
         }

src/main/java/com/xjrsoft/module/job/HikvisionBaseDataTask.java

@@ -3,7 +3,6 @@ package com.xjrsoft.module.job;
 import cn.hutool.extra.spring.SpringUtil;
 import com.xjrsoft.common.mybatis.SqlRunnerAdapter;
 import com.xjrsoft.common.utils.SqlRunnerAdapterUtil;
-import com.xjrsoft.module.hikvision.entity.HikvisionData;
 import com.xjrsoft.module.hikvision.mapper.HikvisionDataMapper;
 import com.xjrsoft.module.hikvision.util.DataUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -41,14 +40,14 @@ public class HikvisionBaseDataTask {
         log.info("开始推送海康威视基础数据");
         try {
             String sql = "SELECT distinct table_name FROM hikvision_data WHERE 1 = 1";
-            List<Map<String, Object>> maps = SqlRunnerAdapter.db().selectList(sql, HikvisionData.class);
+            List<Map<String, Object>> maps = SqlRunnerAdapter.db().selectList(sql);
             Set<String> tables = new HashSet<>();
             for (Map<String, Object> map : maps) {
                 String[] strings = SqlRunnerAdapterUtil.convertMapToStringArray(map);
                 tables.add(strings[0]);
             }
             sql = "SELECT * FROM hikvision_data WHERE 0 = 0";
-            List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql, HikvisionData.class);
+            List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql);
             Map<String, Map<String, String>> dataMap = new HashMap<>();
             for (String table : tables) {
                 Map<String, String> tableData = new HashMap<>();
@@ -70,7 +69,7 @@ public class HikvisionBaseDataTask {
             try {
                 department = dataUtil.insertDepartment(tableName, dataMap.get(tableName));
             }catch (Exception e){
-                log.info("推送组织机构报错", e);
+                log.error("推送组织机构报错", e);
             }
             if(department.isEmpty() && dataMap.get(tableName) != null){
                 department = dataMap.get(tableName);
@@ -82,7 +81,7 @@ public class HikvisionBaseDataTask {
             try {
                 dataUtil.insertTeacher(tableName, dataMap.get(tableName), department);
             }catch (Exception e){
-                log.info("推送教职工报错", e);
+                log.error("推送教职工报错", e);
             }
 
             //推送车辆
@@ -91,7 +90,7 @@ public class HikvisionBaseDataTask {
             try {
                 dataUtil.insertCar(carTableName, baseCar, hikvisionDataMapper);
             }catch (Exception e){
-                log.info("同步车辆数据报错", e);
+                log.error("同步车辆数据报错", e);
             }
 
 
@@ -100,7 +99,7 @@ public class HikvisionBaseDataTask {
             try {
                 dataUtil.insertClass(tableName, baseClass);
             }catch (Exception e){
-                log.info("同步车辆数据报错", e);
+                log.error("同步班级数据报错", e);
             }
 
 

src/main/java/com/xjrsoft/module/job/JianyuekbBaseDataTask.java

@@ -41,7 +41,7 @@ public class JianyuekbBaseDataTask {
                 String[] strings = SqlRunnerAdapterUtil.convertMapToStringArray(queryMap);
                 tables.add(strings[0]);
             }
-            sql = "SELECT * FROM jianyue_data WHERE 0 = 0";
+            sql = "SELECT * FROM jianyue_data WHERE source_id IS NOT NULL AND jianyue_id != ''";
             List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql, JianyueData.class);
             Map<String, Map<String, String>> dataMap = new HashMap<>();
             for (String table : tables) {

src/main/java/com/xjrsoft/module/job/JianyuekbScheduleTask.java

@@ -79,7 +79,7 @@ public class JianyuekbScheduleTask {
         for (Map<String, Object> jianyueData : query) {
             tables.add(jianyueData.get("table_name").toString());
         }
-        sql = "SELECT * FROM jianyue_data WHERE 0 = 0";
+        sql = "SELECT * FROM jianyue_data WHERE source_id IS NOT NULL AND jianyue_id != ''";
         List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql);
         Map<String, Map<String, String>> dataMap = new HashMap<>();
         for (String table : tables) {

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

@@ -0,0 +1,111 @@
+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.getUserId()), StudentConsumeDate::getStudentId, dto.getUserId())
+                        .eq(StrUtil.isNotEmpty(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,49 @@
+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;
+    /**
+     * 学生id
+     */
+    @ApiModelProperty("学生id")
+    private Long userId;
+}

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/BaseStudentSchoolRollMapper.java

@@ -48,5 +48,8 @@ public interface BaseStudentSchoolRollMapper extends MPJBaseMapper<BaseStudentSc
     @Update("UPDATE base_student_school_roll SET class_id = #{classId} where user_id = #{userId}")
     Boolean updateStudentClass(Long classId, Long userId);
 
+
+    String getClassNameByUserId(@Param("userId") Long userId);
+
 }
 

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/IBaseStudentSchoolRollService.java

@@ -12,6 +12,7 @@ import com.xjrsoft.module.student.vo.BaseStudentInfoPageDataVo;
 import com.xjrsoft.module.student.vo.BaseStudentInfoPageVo;
 import com.xjrsoft.module.student.vo.BaseStudentSompleInfoVo;
 import com.xjrsoft.module.student.vo.MobileClassStatisticsVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -51,4 +52,6 @@ public interface IBaseStudentSchoolRollService extends MPJBaseService<BaseStuden
     Boolean updateStudentClass(Long classId, Long userId);
 
     List<BaseStudentSompleInfoVo> getInfosByParam(BaseStudentSimpleInfoDto dto);
+
+    String getClassNameByUserId(Long userId);
 }

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/BaseStudentSchoolRollServiceImpl.java

@@ -207,4 +207,8 @@ public class BaseStudentSchoolRollServiceImpl extends MPJBaseServiceImpl<BaseStu
         List<BaseStudentSompleInfoVo> userList = userMapper.getInfosByParam(dto);
         return userList;
     }
+
+    public String getClassNameByUserId(Long userId){
+        return baseStudentSchoolRollMapper.getClassNameByUserId(userId);
+    }
 }

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/service/impl/StudentLeaveServiceImpl.java

@@ -24,6 +24,7 @@ import com.xjrsoft.module.outint.vo.IdCountVo;
 import com.xjrsoft.module.student.dto.StudentLeavePageDto;
 import com.xjrsoft.module.student.entity.StudentLeave;
 import com.xjrsoft.module.student.mapper.StudentLeaveMapper;
+import com.xjrsoft.module.student.service.IBaseStudentSchoolRollService;
 import com.xjrsoft.module.student.service.IStudentLeaveService;
 import com.xjrsoft.module.student.vo.StudentLeavePageVo;
 import lombok.AllArgsConstructor;
@@ -49,6 +50,7 @@ public class StudentLeaveServiceImpl extends MPJBaseServiceImpl<StudentLeaveMapp
     private final HikvisionDataMapper hikvisionDataMapper;
     private final IUserService userService;
     private final IWeChatService weChatService;
+    private final IBaseStudentSchoolRollService rollService;
 
     @Override
     public Boolean hikvisionLeave(Long id) {
@@ -142,12 +144,13 @@ public class StudentLeaveServiceImpl extends MPJBaseServiceImpl<StudentLeaveMapp
                         .isNotNull(User::getOpenId)
         );
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
-        SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyy年MM月dd日 HH:mm");
         String endDate = studentLeave.getEndDate().format(formatter);
         String startDate = studentLeave.getStartDate().format(formatter);
 
         User student = userService.getById(studentLeave.getStudentUserId());
-        String wechatTemplate = "sHsmz7LRj7HLd7GSTS3r2jCLvK-4Wp19iGzEvYK8n_I";
+        String className = rollService.getClassNameByUserId(studentLeave.getStudentUserId());
+        String wechatTemplate = "sCZ8W7j9-y8gaFzQSZwObjwGTaf4-9vVnIg6A18LUeE";
         for (User user : list) {
             WeChatSendMessageDto weChatSendMessageDto = new WeChatSendMessageDto();
             weChatSendMessageDto.setUserId(user.getOpenId());
@@ -156,28 +159,29 @@ public class StudentLeaveServiceImpl extends MPJBaseServiceImpl<StudentLeaveMapp
 
             JSONObject data = new JSONObject();
             // 任务名称
-            data.put("thing8", new JSONObject() {{
-                put("value", "学生请假");
+            data.put("thing4", new JSONObject() {{
+                put("value", studentLeave.getReason());
             }});
             // 事项名称
-            data.put("thing2", new JSONObject() {{
-                put("value", "请假时间：" + startDate + "~" + endDate);
+            data.put("time1", new JSONObject() {{
+                put("value", startDate + "~" + endDate);
             }});
             // 申请人
-            data.put("thing6", new JSONObject() {{
+            data.put("short_thing3", new JSONObject() {{
                 put("value", student.getName());
             }});
             // 时间
-            data.put("time3", new JSONObject() {{
+            data.put("time5", new JSONObject() {{
                 put("value", sdf.format(studentLeave.getCreateDate()));
             }});
+            data.put("thing2", new JSONObject() {{
+                put("value", className);
+            }});
             weChatSendMessageDto.setContent(data);
             weChatService.sendTemplateMessage(weChatSendMessageDto);
         }
 
-
-
-        return null;
+        return true;
     }
 
     JsonArray selectResource(ApiUtil apiUtil){

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/main/resources/mapper/student/BaseStudentSchoolRollMapper.xml

@@ -193,4 +193,10 @@
         </if>
         group by t3.stduy_status,t2.gender
     </select>
+
+    <select id="getClassNameByUserId" resultType="java.lang.String">
+        SELECT t1.name FROM base_class t1
+        INNER JOIN base_student_school_roll ON t1.id = t2.class_id
+        WHERE t2.user_id = #{userId}
+    </select>
 </mapper>

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);
+    }
 }