Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/asset/mapper/WfAssetManageMapper.java

@@ -1,14 +1,11 @@
 package com.xjrsoft.module.asset.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.asset.dto.WfAssetManagePageDto;
 import com.xjrsoft.module.asset.entity.WfAssetManage;
 import com.xjrsoft.module.asset.vo.WfAssetManagePageVo;
-import com.xjrsoft.module.textbook.dto.TextbookPageDto;
-import com.xjrsoft.module.textbook.vo.TextbookPageVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -20,6 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface WfAssetManageMapper extends MPJBaseMapper<WfAssetManage> {
 
-    IPage<WfAssetManagePageVo> getPage(Page<TextbookPageDto> page, WfAssetManagePageDto dto);
-    Page<TextbookPageVo> getPage(Page<TextbookPageDto> page, TextbookPageDto dto);
+    IPage<WfAssetManagePageVo> getPage(IPage<WfAssetManagePageDto> page, WfAssetManagePageDto dto);
 }

src/main/java/com/xjrsoft/module/asset/service/impl/WfAssetManageServiceImpl.java

@@ -33,14 +33,7 @@ public class WfAssetManageServiceImpl extends MPJBaseServiceImpl<WfAssetManageMa
     private final WfAssetManageMapper wfAssetManageMapper;
     @Override
     public IPage<WfAssetManagePageVo> getPage(WfAssetManagePageDto dto) {
-        /*MPJLambdaWrapper<WfAssetManage> wfAssetManageMPJLambdaWrapper = new MPJLambdaWrapper<>();
-        wfAssetManageMPJLambdaWrapper
-
-                .select(WfAssetManage.class,x -> VoToColumnUtil.fieldsToColumns(WfAssetManagePageVo.class).contains(x.getProperty()))
-
-                .orderByDesc(WfAssetManage::getId)
-        ;
-        this.selectJoinListPage(ConventPage.getPage(dto))*/
-        return null;
+        IPage<WfAssetManagePageVo> page = wfAssetManageMapper.getPage(ConventPage.getPage(dto), dto);
+        return page;
     }
 }

src/main/java/com/xjrsoft/module/asset/vo/WfAssetManagePageVo.java

@@ -64,7 +64,7 @@ public class WfAssetManagePageVo {
      * 所属部门[xjr_department]
      */
     @ApiModelProperty("所属部门[xjr_department]")
-    private Long deptIdCn;
+    private String deptIdCn;
     /**
     * 使用人id[xjr_user]
     */
@@ -74,7 +74,7 @@ public class WfAssetManagePageVo {
      * 使用人id[xjr_user]
      */
     @ApiModelProperty("使用人id[xjr_user]")
-    private Long userIdCn;
+    private String userIdCn;
     /**
     * 金额
     */

src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -7,7 +7,6 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.xjrsoft.common.enums.DeleteMark;
@@ -25,7 +24,7 @@ import com.xjrsoft.module.schedule.util.ScheduleUtil;
 import com.xjrsoft.module.schedule.vo.CourseListVo;
 import com.xjrsoft.module.schedule.vo.CourseTableVo;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
-import com.xjrsoft.module.student.service.impl.IBaseStudentSchoolRollService;
+import com.xjrsoft.module.student.service.IBaseStudentSchoolRollService;
 import com.xjrsoft.module.teacher.entity.BaseTeacher;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.teacher.service.IBaseTeacherService;

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

@@ -8,7 +8,7 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.module.student.dto.BaseStudentInfoPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentInfoDto;
-import com.xjrsoft.module.student.service.impl.IBaseStudentSchoolRollService;
+import com.xjrsoft.module.student.service.IBaseStudentSchoolRollService;
 import com.xjrsoft.module.student.vo.BaseStudentInfoDetailVo;
 import com.xjrsoft.module.student.vo.BaseStudentInfoPageDataVo;
 import com.xjrsoft.module.student.vo.BaseStudentInfoPageVo;

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

@@ -0,0 +1,128 @@
+package com.xjrsoft.module.student.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.student.dto.AddPbCseFeeobjupdateDto;
+import com.xjrsoft.module.student.dto.UpdatePbCseFeeobjupdateDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.alibaba.excel.EasyExcel;
+import com.xjrsoft.module.student.vo.EnrollmentStatisticsInfoVo;
+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.student.dto.PbCseFeeobjupdatePageDto;
+import com.xjrsoft.module.student.entity.PbCseFeeobjupdate;
+import com.xjrsoft.module.student.service.IPbCseFeeobjupdateService;
+import com.xjrsoft.module.student.vo.PbCseFeeobjupdatePageVo;
+
+import com.xjrsoft.module.student.vo.PbCseFeeobjupdateVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+* @title: 
+* @Author szs
+* @Date: 2024-03-29
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/pbCseFeeobjupdate")
+@Api(value = "/student"  + "/pbCseFeeobjupdate",tags = "攀宝学生信息")
+@AllArgsConstructor
+public class PbCseFeeobjupdateController {
+
+
+    private final IPbCseFeeobjupdateService pbCseFeeobjupdateService;
+
+    @GetMapping(value = "/enrollment-statistics")
+    @ApiOperation(value="招生统计")
+    @SaCheckPermission("pbcsefeeobjupdate:detail")
+    public RT<EnrollmentStatisticsInfoVo> getEnrollmentStatisticsInfo(){
+        EnrollmentStatisticsInfoVo enrollmentStatisticsInfoVo = pbCseFeeobjupdateService.getEnrollmentStatisticsInfo();
+        return RT.ok(enrollmentStatisticsInfoVo);
+    }
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="列表(分页)")
+    @SaCheckPermission("pbcsefeeobjupdate:detail")
+    public RT<PageOutput<PbCseFeeobjupdatePageVo>> page(@Valid PbCseFeeobjupdatePageDto dto){
+
+        LambdaQueryWrapper<PbCseFeeobjupdate> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    //.orderByDesc(PbCseFeeobjupdate::getId)
+                .select(PbCseFeeobjupdate.class,x -> VoToColumnUtil.fieldsToColumns(PbCseFeeobjupdatePageVo.class).contains(x.getProperty()));
+        IPage<PbCseFeeobjupdate> page = pbCseFeeobjupdateService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<PbCseFeeobjupdatePageVo> pageOutput = ConventPage.getPageOutput(page, PbCseFeeobjupdatePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询信息")
+    @SaCheckPermission("pbcsefeeobjupdate:detail")
+    public RT<PbCseFeeobjupdateVo> info(@RequestParam Long id){
+        PbCseFeeobjupdate pbCseFeeobjupdate = pbCseFeeobjupdateService.getById(id);
+        if (pbCseFeeobjupdate == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(pbCseFeeobjupdate, PbCseFeeobjupdateVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增")
+    @SaCheckPermission("pbcsefeeobjupdate:add")
+    public RT<Boolean> add(@Valid @RequestBody AddPbCseFeeobjupdateDto dto){
+        PbCseFeeobjupdate pbCseFeeobjupdate = BeanUtil.toBean(dto, PbCseFeeobjupdate.class);
+        boolean isSuccess = pbCseFeeobjupdateService.save(pbCseFeeobjupdate);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改")
+    @SaCheckPermission("pbcsefeeobjupdate:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdatePbCseFeeobjupdateDto dto){
+
+        PbCseFeeobjupdate pbCseFeeobjupdate = BeanUtil.toBean(dto, PbCseFeeobjupdate.class);
+        return RT.ok(pbCseFeeobjupdateService.updateById(pbCseFeeobjupdate));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除")
+    @SaCheckPermission("pbcsefeeobjupdate:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(pbCseFeeobjupdateService.removeBatchByIds(ids));
+
+    }
+    @PostMapping("/import")
+    @ApiOperation(value = "导入")
+    public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
+        List<PbCseFeeobjupdatePageVo> savedDataList = EasyExcel.read(file.getInputStream()).head(PbCseFeeobjupdatePageVo.class).sheet().doReadSync();
+        Boolean result = pbCseFeeobjupdateService.saveBatch(BeanUtil.copyToList(savedDataList, PbCseFeeobjupdate.class));
+        return RT.ok(result);
+    }
+
+    @GetMapping("/export")
+    @ApiOperation(value = "导出")
+    public ResponseEntity<byte[]> exportData(@Valid PbCseFeeobjupdatePageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
+        List<PbCseFeeobjupdatePageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput<PbCseFeeobjupdatePageVo>) page(dto).getData()).getList();
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        EasyExcel.write(bot, PbCseFeeobjupdatePageVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList);
+
+        return RT.fileStream(bot.toByteArray(), "PbCseFeeobjupdate" + ExcelTypeEnum.XLSX.getValue());
+    }
+}

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

@@ -0,0 +1,188 @@
+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 szs
+* @Date: 2024-03-29
+* @Version 1.0
+*/
+@Data
+public class AddPbCseFeeobjupdateDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pkfeeobj;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String studentcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String feeobjname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String personalid;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String nationality;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String birthday;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String deptcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String deptname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String speccode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String specname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String classcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String classname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String ratetypename;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String sex;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String state;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String enteryear;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String leaveyear;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String telephone;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String jzlxdh;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String zytjspec;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String sg;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String tz;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String recruiters;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String graduations;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String remarks;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String userdef3;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String resourcename;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String quartername;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String address;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String cratetime;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String updatetime;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long rn;
+
+}

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

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.student.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;
+import java.util.Date;
+
+
+/**
+* @title: 分页查询入参
+* @Author szs
+* @Date: 2024-03-29
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class PbCseFeeobjupdatePageDto extends PageInput {
+
+
+}

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

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.student.dto;
+
+import lombok.Data;
+
+
+/**
+* @title: 
+* @Author szs
+* @Date: 2024-03-29
+* @Version 1.0
+*/
+@Data
+public class UpdatePbCseFeeobjupdateDto extends AddPbCseFeeobjupdateDto {
+
+    private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,190 @@
+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 szs
+* @Date: 2024-03-29
+* @Version 1.0
+*/
+@Data
+@TableName("pb_cse_feeobjupdate")
+@ApiModel(value = "pb_cse_feeobjupdate", description = "")
+public class PbCseFeeobjupdate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("学生主键")
+    private String pkfeeobj;
+    /**
+    * 
+    */
+    @ApiModelProperty("学号")
+    private String studentcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("姓名")
+    private String feeobjname;
+    /**
+    * 
+    */
+    @ApiModelProperty("身份证号")
+    private String personalid;
+    /**
+    * 
+    */
+    @ApiModelProperty("民族")
+    private String nationality;
+    /**
+    * 
+    */
+    @ApiModelProperty("出生年月")
+    private String birthday;
+    /**
+    * 
+    */
+    @ApiModelProperty("所属院系编码")
+    private String deptcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("所属院系名称")
+    private String deptname;
+    /**
+    * 
+    */
+    @ApiModelProperty("所属专业代码")
+    private String speccode;
+    /**
+    * 
+    */
+    @ApiModelProperty("所属专业名称")
+    private String specname;
+    /**
+    * 
+    */
+    @ApiModelProperty("所属班级代码")
+    private String classcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("所属班级名称")
+    private String classname;
+    /**
+    * 
+    */
+    @ApiModelProperty("学制")
+    private String ratetypename;
+    /**
+    * 
+    */
+    @ApiModelProperty("性别")
+    private String sex;
+    /**
+    * 
+    */
+    @ApiModelProperty("在校状态")
+    private String state;
+    /**
+    * 
+    */
+    @ApiModelProperty("入校年度")
+    private String enteryear;
+    /**
+    * 
+    */
+    @ApiModelProperty("离校年度")
+    private String leaveyear;
+    /**
+    * 
+    */
+    @ApiModelProperty("学生联系电话")
+    private String telephone;
+    /**
+    * 
+    */
+    @ApiModelProperty("家长联系电话")
+    private String jzlxdh;
+    /**
+    * 
+    */
+    @ApiModelProperty("志愿调剂专业")
+    private String zytjspec;
+    /**
+    * 
+    */
+    @ApiModelProperty("身高")
+    private String sg;
+    /**
+    * 
+    */
+    @ApiModelProperty("体重")
+    private String tz;
+    /**
+    * 
+    */
+    @ApiModelProperty("招生老师")
+    private String recruiters;
+    /**
+    * 
+    */
+    @ApiModelProperty("毕业学校")
+    private String graduations;
+    /**
+    * 
+    */
+    @ApiModelProperty("备注")
+    private String remarks;
+    /**
+    * 
+    */
+    @ApiModelProperty("资助类型")
+    private String resourcename;
+    /**
+    * 
+    */
+    @ApiModelProperty("住宿类型")
+    private String quartername;
+    /**
+    * 
+    */
+    @ApiModelProperty("地址")
+    private String address;
+    /**
+    * 
+    */
+    @ApiModelProperty("创建时间")
+    private String cratetime;
+    /**
+    * 
+    */
+    @ApiModelProperty("更新时间")
+    private String updatetime;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long rn;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.student.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.entity.PbCseFeeobjupdate;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 
+* @Author szs
+* @Date: 2024-03-29
+* @Version 1.0
+*/
+@Mapper
+public interface PbCseFeeobjupdateMapper extends MPJBaseMapper<PbCseFeeobjupdate> {
+
+}

src/main/java/com/xjrsoft/module/student/service/impl/IBaseStudentSchoolRollService.java → src/main/java/com/xjrsoft/module/student/service/IBaseStudentSchoolRollService.java

@@ -1,4 +1,4 @@
-package com.xjrsoft.module.student.service.impl;
+package com.xjrsoft.module.student.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseService;

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

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.student.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.entity.PbCseFeeobjupdate;
+import com.xjrsoft.module.student.vo.EnrollmentStatisticsInfoVo;
+
+/**
+* @title: 
+* @Author szs
+* @Date: 2024-03-29
+* @Version 1.0
+*/
+
+public interface IPbCseFeeobjupdateService extends MPJBaseService<PbCseFeeobjupdate> {
+    EnrollmentStatisticsInfoVo getEnrollmentStatisticsInfo();
+}

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

@@ -14,6 +14,7 @@ import com.xjrsoft.module.student.dto.BaseStudentInfoPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentInfoDto;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.student.mapper.BaseStudentSchoolRollMapper;
+import com.xjrsoft.module.student.service.IBaseStudentSchoolRollService;
 import com.xjrsoft.module.student.vo.BaseStudentInfoCategoryVo;
 import com.xjrsoft.module.student.vo.BaseStudentInfoDetailVo;
 import com.xjrsoft.module.student.vo.BaseStudentInfoPageDataVo;

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

@@ -0,0 +1,99 @@
+package com.xjrsoft.module.student.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.xjrsoft.module.student.entity.PbCseFeeobjupdate;
+import com.xjrsoft.module.student.entity.PbVXssfdetail;
+import com.xjrsoft.module.student.mapper.PbCseFeeobjupdateMapper;
+import com.xjrsoft.module.student.service.IPbCseFeeobjupdateService;
+import com.xjrsoft.module.student.vo.EnrollmentStatisticsInfoKeyValue;
+import com.xjrsoft.module.student.vo.EnrollmentStatisticsInfoVo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+* @title: 
+* @Author szs
+* @Date: 2024-03-29
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobjupdateMapper, PbCseFeeobjupdate> implements IPbCseFeeobjupdateService {
+    @Override
+    public EnrollmentStatisticsInfoVo getEnrollmentStatisticsInfo() {
+        EnrollmentStatisticsInfoVo result = new EnrollmentStatisticsInfoVo();
+
+        //获取所有学生的信息
+        LambdaQueryWrapper<PbCseFeeobjupdate> pbCseFeeobjupdateLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        pbCseFeeobjupdateLambdaQueryWrapper
+                .eq(PbCseFeeobjupdate::getEnteryear, "2024");
+
+        List<PbCseFeeobjupdate> pbCseFeeobjupdateList = this.list(pbCseFeeobjupdateLambdaQueryWrapper);
+
+        if(pbCseFeeobjupdateList != null && !pbCseFeeobjupdateList.isEmpty()){
+            Map<String, Long> professionalHeadCount = pbCseFeeobjupdateList.stream().collect(Collectors.groupingBy(PbCseFeeobjupdate::getSpecname, Collectors.counting()));
+            if(!professionalHeadCount.isEmpty()){
+                professionalHeadCount = professionalHeadCount.entrySet().stream()
+                        .sorted(Map.Entry.<String, Long>comparingByValue().reversed())
+                        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,
+                                (e1, e2) -> e1, LinkedHashMap::new));
+            }
+            List<EnrollmentStatisticsInfoKeyValue> professionalHeadCountRes = new ArrayList<>();
+            for (Map.Entry<String, Long> entry : professionalHeadCount.entrySet()) {
+                professionalHeadCountRes.add(new EnrollmentStatisticsInfoKeyValue(entry.getKey(), entry.getValue()));
+            }
+
+            Map<String, Long> studentSource = pbCseFeeobjupdateList.stream().collect(Collectors.groupingBy(PbCseFeeobjupdate::getResourcename, Collectors.counting()));
+            List<EnrollmentStatisticsInfoKeyValue> studentSourceRes = new ArrayList<>();
+            for (Map.Entry<String, Long> entry : studentSource.entrySet()) {
+                studentSourceRes.add(new EnrollmentStatisticsInfoKeyValue(entry.getKey(), entry.getValue()));
+            }
+
+            Map<String, Long> accommodationType = pbCseFeeobjupdateList.stream().collect(Collectors.groupingBy(PbCseFeeobjupdate::getQuartername, Collectors.counting()));
+            List<EnrollmentStatisticsInfoKeyValue> accommodationTypeRes = new ArrayList<>();
+            for (Map.Entry<String, Long> entry : accommodationType.entrySet()) {
+                accommodationTypeRes.add(new EnrollmentStatisticsInfoKeyValue(entry.getKey(), entry.getValue()));
+            }
+
+            Map<String, Long> gender = pbCseFeeobjupdateList.stream().collect(Collectors.groupingBy(PbCseFeeobjupdate::getSex, Collectors.counting()));
+            List<EnrollmentStatisticsInfoKeyValue> genderRes = new ArrayList<>();
+            for (Map.Entry<String, Long> entry : gender.entrySet()) {
+                genderRes.add(new EnrollmentStatisticsInfoKeyValue(entry.getKey(), entry.getValue()));
+            }
+
+            result.setRegistrationPopulation(pbCseFeeobjupdateList.size());
+            result.setProfessionalHeadCount(professionalHeadCountRes);
+            result.setStudentSource(studentSourceRes);
+            result.setAccommodationType(accommodationTypeRes);
+            result.setGender(genderRes);
+        }
+
+        //获取所有学生的收费明细
+        MPJLambdaWrapper<PbCseFeeobjupdate> feeobjupdateXssfdetailMPJLambdaWrapper = new MPJLambdaWrapper<>();
+        feeobjupdateXssfdetailMPJLambdaWrapper
+                .selectCount(PbVXssfdetail::getPersonalid, EnrollmentStatisticsInfoVo::getPayers)
+                .selectSum(PbVXssfdetail::getMny, EnrollmentStatisticsInfoVo::getRecordedAmountOfMoney)
+                .leftJoin(PbVXssfdetail.class, PbVXssfdetail::getPersonalid, PbCseFeeobjupdate::getPersonalid)
+                .eq(PbCseFeeobjupdate::getEnteryear, "2024")
+        ;
+        EnrollmentStatisticsInfoVo enrollmentStatisticsInfoVo = this.selectJoinOne(EnrollmentStatisticsInfoVo.class, feeobjupdateXssfdetailMPJLambdaWrapper);
+
+        if(enrollmentStatisticsInfoVo != null){
+            result.setPayers(enrollmentStatisticsInfoVo.getPayers());
+            if(enrollmentStatisticsInfoVo.getRecordedAmountOfMoney() != null){
+                result.setRecordedAmountOfMoney(enrollmentStatisticsInfoVo.getRecordedAmountOfMoney().setScale(2, RoundingMode.DOWN));
+            }
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class EnrollmentStatisticsInfoKeyValue {
+    /**
+     *
+     */
+    @ApiModelProperty("")
+    private String key;
+    /**
+     *
+     */
+    @ApiModelProperty("")
+    private Long value;
+
+    public EnrollmentStatisticsInfoKeyValue() {
+    }
+
+    public EnrollmentStatisticsInfoKeyValue(String key, Long value) {
+        this.key = key;
+        this.value = value;
+    }
+}

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

@@ -0,0 +1,47 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class EnrollmentStatisticsInfoVo {
+    /**
+     * 报名人数
+     */
+    @ApiModelProperty("报名人数")
+    private Integer registrationPopulation;
+    /**
+     * 缴费人数
+     */
+    @ApiModelProperty("缴费人数")
+    private Integer payers;
+    /**
+     * 入账金额
+     */
+    @ApiModelProperty("入账金额")
+    private BigDecimal recordedAmountOfMoney;
+    /**
+     * 专业人数
+     */
+    @ApiModelProperty("专业人数")
+    private List<EnrollmentStatisticsInfoKeyValue> professionalHeadCount;
+    /**
+     * 学生来源
+     */
+    @ApiModelProperty("学生来源")
+    private List<EnrollmentStatisticsInfoKeyValue> studentSource;
+    /**
+     * 住宿类型
+     */
+    @ApiModelProperty("住宿类型")
+    private List<EnrollmentStatisticsInfoKeyValue> accommodationType;
+    /**
+     * 性别
+     */
+    @ApiModelProperty("性别")
+    private List<EnrollmentStatisticsInfoKeyValue> gender;
+}

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

@@ -0,0 +1,251 @@
+package com.xjrsoft.module.student.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;
+import java.util.Date;
+
+/**
+* @title: 分页列表出参
+* @Author szs
+* @Date: 2024-03-29
+* @Version 1.0
+*/
+@Data
+public class PbCseFeeobjupdatePageVo {
+
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String pkfeeobj;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String studentcode;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String feeobjname;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String personalid;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String nationality;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String birthday;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String deptcode;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String deptname;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String speccode;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String specname;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String classcode;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String classname;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String ratetypename;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String sex;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String state;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String enteryear;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String leaveyear;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String telephone;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String jzlxdh;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String zytjspec;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String sg;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String tz;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String recruiters;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String graduations;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String remarks;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String userdef3;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String resourcename;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String quartername;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String address;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String cratetime;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String updatetime;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private Long rn;
+
+}

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

@@ -0,0 +1,184 @@
+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 szs
+* @Date: 2024-03-29
+* @Version 1.0
+*/
+@Data
+public class PbCseFeeobjupdateVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pkfeeobj;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String studentcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String feeobjname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String personalid;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String nationality;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String birthday;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String deptcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String deptname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String speccode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String specname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String classcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String classname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String ratetypename;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String sex;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String state;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String enteryear;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String leaveyear;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String telephone;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String jzlxdh;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String zytjspec;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String sg;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String tz;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String recruiters;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String graduations;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String remarks;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String userdef3;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String resourcename;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String quartername;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String address;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String cratetime;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String updatetime;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long rn;
+
+
+
+}

src/main/resources/mapper/asset/WfAssetManageMapper.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xjrsoft.module.asset.mapper.WfAssetManageMapper">
+    <select id="getPage" parameterType="com.xjrsoft.module.asset.dto.WfAssetManagePageDto"
+            resultType="com.xjrsoft.module.asset.vo.WfAssetManagePageVo">
+        select
+            t.*,
+            t1.name as assetTypeCn,
+            t2.name as assetCategoryCn,
+            t3.name as assetSpeciesCn,
+            t4.name as deptIdCn,
+            t5.name as userIdCn
+        from wf_asset_manage t
+                 left join xjr_dictionary_detail t1 on t1.code = t.asset_type and t1.item_id = '1773620475495190530'
+                 left join xjr_dictionary_detail t2 on t2.code = t.asset_category and t2.item_id = '1773620610862157826'
+                 left join xjr_dictionary_detail t3 on t3.code = t.asset_species and t3.item_id = '1773620783726202882'
+                 left join xjr_department t4 on t4.id = t.dept_id
+                 left join xjr_user t5 on t5.id = t.user_id
+        where t.status = 1
+        <if test="dto.assetType != null and dto.assetType != ''">
+            and t.asset_type = #{dto.assetType}
+        </if>
+        <if test="dto.assetCategory != null and dto.assetCategory != ''">
+            and t.asset_category = #{dto.assetCategory}
+        </if>
+        <if test="dto.assetSpecies != null and dto.assetSpecies != ''">
+            and t.asset_species = #{dto.assetSpecies}
+        </if>
+        <if test="dto.name != null and dto.name != ''">
+            and t.name = #{dto.name}
+        </if>
+        <if test="dto.deptId != null and dto.deptId != ''">
+            and t.dept_id = #{dto.deptId}
+        </if>
+        <if test="dto.userId != null and dto.userId != ''">
+            and t1.user_id = #{dto.userId}
+        </if>
+    </select>
+</mapper>

src/test/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImplTest.java

@@ -0,0 +1,23 @@
+package com.xjrsoft.module.workflow.service.impl;
+
+import org.camunda.bpm.engine.RuntimeService;
+import org.camunda.bpm.engine.TaskService;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class WorkflowExecuteServiceImplTest {
+
+    @Autowired
+    private TaskService taskService;
+
+    @Autowired
+    private RuntimeService runtimeService;
+
+    @Test
+    public void testDeleteTask(){
+        //taskService.deleteTask("8abd7148-e58b-11ee-a00e-0242c8000007");
+        runtimeService.deleteProcessInstance("8a8990df-e58b-11ee-a00e-0242c8000007", "该流程已经停止");
+    }
+}

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

@@ -2461,6 +2461,37 @@ public class FreeMarkerGeneratorTest {
 
     }
 
+    /**
+     * 攀宝学生档案信息表
+     *
+     * @throws IOException
+     */
+    @Test
+    public void gcPbCseFeeobjupdate() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("pb_cse_feeobjupdate");//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("szs");//作者名称
+        params.setPackageName("student");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(true);//是否生成导入接口
+        params.setExport(true);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+
+    }
+
     /**
      * 考核
      *