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

# Conflicts:
#	src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

Makefile

@@ -2,7 +2,7 @@ merge:
 	git checkout master;git merge dev;git push;git checkout dev;
 
 create-tag:
-	git checkout master;git tag v1.1.6;git push origin --tags;git checkout dev;
+	git checkout master;git tag v1.1.8;git push origin --tags;git checkout dev;
 
 remove-tag:
 	git tag -d v1.0.1;git push origin :refs/tags/v1.0.1;

src/main/java/com/xjrsoft/module/liteflow/node/WfBehaviorNode.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.liteflow.node;
+
+import cn.hutool.core.convert.Convert;
+import com.xjrsoft.module.student.service.IBaseStudentAssessmentClassRelationService;
+import com.xjrsoft.module.student.service.IBaseStudentBehaviorClassRelationService;
+import com.yomahub.liteflow.core.NodeComponent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 学生操行考核流程结束处理
+ */
+@Component("wf_behavior_node")
+public class WfBehaviorNode extends NodeComponent {
+
+    @Autowired
+    private IBaseStudentBehaviorClassRelationService behaviorClassRelationService;
+
+    @Override
+    public void process() throws Exception {
+        // 获取表单中数据编号
+        Map<String, Object> params = this.getFirstContextBean();
+        Object value = util.getFormDatKey(params,"id");
+        Long formId = Convert.toLong(value);
+        if (formId != null) {
+            // 数据处理
+            behaviorClassRelationService.dataCache(formId);
+        }
+    }
+}

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

@@ -268,13 +268,16 @@ public class MaterialTaskController {
                 .eq(dto.getState() == 2, MaterialTaskAssign::getExecutiveStatus, 1)
                 .eq(dto.getState() == 3, MaterialTaskAssign::getStatus, 3)
                 .select(MaterialTaskAssign::getId)
+                .select(XjrUser::getName)
                 .select(MaterialTaskAssign.class, x -> VoToColumnUtil.fieldsToColumns(MaterialTaskAssignListVo.class).contains(x.getProperty()))
                 .innerJoin(XjrUser.class, XjrUser::getId, MaterialTaskAssign::getUserId, ext -> ext.selectAs(XjrUser::getUserName, MaterialTaskAssignListVo::getUserName))
                 .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, MaterialTypeAssign::getUserId)
                 .leftJoin(Department.class, Department::getId, UserDeptRelation::getDeptId, ext -> ext.selectAs(Department::getName, MaterialTaskAssignListVo::getDeptName))
-                .leftJoin(MaterialTaskAppendix.class, MaterialTaskAppendix::getMaterialTaskId, MaterialTaskAssign::getId)
-                .leftJoin(File.class, File::getId, MaterialTaskAppendix::getFileId)
-                .selectAs(File::getFolderId, MaterialTaskAssignListVo::getFolderId);
+                .select("(\n" +
+                        "SELECT id FROM xjr_file WHERE id IN (\n" +
+                        "SELECT file_id FROM material_task_appendix WHERE material_task_id = t.id\n" +
+                        ") ORDER BY create_date DESC LIMIT 1\n" +
+                        ") AS folderId ");
         List<MaterialTaskAssignListVo> pageOutput = materialTaskAssignService.selectJoinList(MaterialTaskAssignListVo.class, queryWrapper);
         return RT.ok(pageOutput);
     }

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

@@ -48,4 +48,9 @@ public class MaterialTaskAssignListVo {
      * 文件包
      */
     private String folderId;
+
+    /**
+     * 用户名字
+     */
+    private String name;
 }

src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -24,16 +24,53 @@ import com.xjrsoft.common.utils.RedisUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.config.CommonPropertiesConfig;
 import com.xjrsoft.module.base.service.IBaseClassService;
-import com.xjrsoft.module.organization.dto.*;
-import com.xjrsoft.module.organization.entity.*;
-import com.xjrsoft.module.organization.service.*;
+import com.xjrsoft.module.organization.dto.AddUserDto;
+import com.xjrsoft.module.organization.dto.BindOpenidDto;
+import com.xjrsoft.module.organization.dto.RegisterDto;
+import com.xjrsoft.module.organization.dto.ResetPasswordDto;
+import com.xjrsoft.module.organization.dto.UpdateInfoDto;
+import com.xjrsoft.module.organization.dto.UpdatePasswordDto;
+import com.xjrsoft.module.organization.dto.UpdateUserDto;
+import com.xjrsoft.module.organization.dto.UserPageDto;
+import com.xjrsoft.module.organization.dto.UserStudentAddDto;
+import com.xjrsoft.module.organization.dto.UserStudentBindDto;
+import com.xjrsoft.module.organization.dto.UserStudentDeleteDto;
+import com.xjrsoft.module.organization.entity.Department;
+import com.xjrsoft.module.organization.entity.Post;
+import com.xjrsoft.module.organization.entity.Role;
+import com.xjrsoft.module.organization.entity.User;
+import com.xjrsoft.module.organization.entity.UserDeptRelation;
+import com.xjrsoft.module.organization.entity.UserPostRelation;
+import com.xjrsoft.module.organization.entity.UserRoleRelation;
+import com.xjrsoft.module.organization.service.IDepartmentService;
+import com.xjrsoft.module.organization.service.IPostService;
+import com.xjrsoft.module.organization.service.IRoleService;
+import com.xjrsoft.module.organization.service.IUserDeptRelationService;
+import com.xjrsoft.module.organization.service.IUserPostRelationService;
+import com.xjrsoft.module.organization.service.IUserRoleRelationService;
+import com.xjrsoft.module.organization.service.IUserService;
+import com.xjrsoft.module.organization.service.IUserStudentService;
 import com.xjrsoft.module.organization.utils.OrganizationUtil;
-import com.xjrsoft.module.organization.vo.*;
+import com.xjrsoft.module.organization.vo.UserDeptVo;
+import com.xjrsoft.module.organization.vo.UserInfoVo;
+import com.xjrsoft.module.organization.vo.UserListVo;
+import com.xjrsoft.module.organization.vo.UserPageVo;
+import com.xjrsoft.module.organization.vo.UserPostVo;
+import com.xjrsoft.module.organization.vo.UserRoleVo;
+import com.xjrsoft.module.organization.vo.UserStudentVo;
+import com.xjrsoft.module.organization.vo.UserVo;
 import com.xjrsoft.module.oss.factory.OssFactory;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
@@ -369,11 +406,22 @@ public class UserController {
             if (StrUtil.isNotBlank(user.getUnionId())) {
                 return R.error("该用户已经绑定微信！");
             }
+
+            long count = userService.count(Wrappers.<User>query().lambda().eq(User::getOpenId, dto.getOpenid()));
+            if(count > 0){
+                return R.error("该用户已经绑定微信！");
+            }
+
             User updateUser = new User();
             updateUser.setId(dto.getId());
 //            updateUser.setOpenId(dto.getOpenid());
             updateUser.setUnionId(dto.getOpenid());
             return R.ok(userService.updateById(updateUser));
+        }else{
+            long count = userService.count(Wrappers.<User>query().lambda().eq(User::getOpenId, dto.getOpenid()));
+            if(count > 0){
+                return R.error("该用户已经绑定微信！");
+            }
         }
         return R.error("该用户不存在！");
     }
@@ -383,7 +431,7 @@ public class UserController {
     public  R unbindOpenid(@RequestParam Long id) {
         User updateUser = new User();
         updateUser.setId(id);
-//        updateUser.setOpenId("");
+        updateUser.setOpenId("");
         updateUser.setUnionId("");
         return R.ok(userService.updateById(updateUser));
     }

src/main/java/com/xjrsoft/module/organization/service/impl/UserServiceImpl.java

@@ -80,7 +80,7 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
         User user = BeanUtil.toBean(dto, User.class);
 
         //密码加密加盐存储到数据库
-        user.setPassword(SaSecureUtil.md5BySalt(dto.getPassword(), GlobalConstant.SECRET_KEY));
+        user.setPassword(BCrypt.hashpw(dto.getPassword(), BCrypt.gensalt()));
         save(user);
 
         List<UserDeptRelation> userDeptRelationList = new ArrayList<>();

src/main/java/com/xjrsoft/module/organization/vo/UserVo.java

@@ -39,10 +39,6 @@ public class UserVo implements Serializable {
      */
     private String nickName;
 
-    /**
-     * 密码
-     */
-    private String password;
 
     /**
      * 性别

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

@@ -86,7 +86,7 @@ public class BaseStudentPostController {
 
         IPage<BaseStudentPostPageVo> page = baseStudentPostService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentPostPageVo.class,
                 MPJWrappers.<BaseStudentPost>lambdaJoin()
-                .orderByDesc(BaseStudentPost::getSortCode)
+                        .orderByAsc(BaseStudentPost::getSortCode)
                 .selectAs(DictionaryDetail::getName, BaseStudentPostPageVo::getLevelCn)
                 .select(BaseStudentPost.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentPostPageVo.class).contains(x.getProperty()))
                 .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseStudentPost::getLevel)

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

@@ -0,0 +1,104 @@
+package com.xjrsoft.module.student.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.yulichang.toolkit.MPJWrappers;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.student.dto.AddBaseStudentScholarshipCategoryDto;
+import com.xjrsoft.module.student.dto.BaseStudentScholarshipCategoryPageDto;
+import com.xjrsoft.module.student.dto.UpdateBaseStudentScholarshipCategoryDto;
+import com.xjrsoft.module.student.entity.BaseStudentScholarshipCategory;
+import com.xjrsoft.module.student.service.IBaseStudentScholarshipCategoryService;
+import com.xjrsoft.module.student.vo.BaseStudentScholarshipCategoryPageVo;
+import com.xjrsoft.module.student.vo.BaseStudentScholarshipCategoryVo;
+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.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+* @title: 奖学金类别
+* @Author dzx
+* @Date: 2023-11-23
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/baseStudentScholarshipCategory")
+@Api(value = "/student"  + "/baseStudentScholarshipCategory",tags = "奖学金类别代码")
+@AllArgsConstructor
+public class BaseStudentScholarshipCategoryController {
+
+
+    private final IBaseStudentScholarshipCategoryService baseStudentScholarshipCategoryService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="奖学金类别列表(分页)")
+    @SaCheckPermission("basestudentscholarshipcategory:detail")
+    public RT<PageOutput<BaseStudentScholarshipCategoryPageVo>> page(@Valid BaseStudentScholarshipCategoryPageDto dto){
+        IPage<BaseStudentScholarshipCategoryPageVo> page = baseStudentScholarshipCategoryService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentScholarshipCategoryPageVo.class,
+                MPJWrappers.<BaseStudentScholarshipCategory>lambdaJoin()
+                        .select(BaseStudentScholarshipCategory::getId)
+                        .selectAs(DictionaryDetail::getName, BaseStudentScholarshipCategoryPageVo::getScholarshipSourceCn)
+                        .select(BaseStudentScholarshipCategory.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentScholarshipCategoryPageVo.class).contains(x.getProperty()))
+                        .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseStudentScholarshipCategory::getScholarshipSource)
+        );
+
+        PageOutput<BaseStudentScholarshipCategoryPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentScholarshipCategoryPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询奖学金类别信息")
+    @SaCheckPermission("basestudentscholarshipcategory:detail")
+    public RT<BaseStudentScholarshipCategoryVo> info(@RequestParam Long id){
+        BaseStudentScholarshipCategory baseStudentScholarshipCategory = baseStudentScholarshipCategoryService.getByIdDeep(id);
+        if (baseStudentScholarshipCategory == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(baseStudentScholarshipCategory, BaseStudentScholarshipCategoryVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增奖学金类别")
+    @SaCheckPermission("basestudentscholarshipcategory:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentScholarshipCategoryDto dto){
+        BaseStudentScholarshipCategory baseStudentScholarshipCategory = BeanUtil.toBean(dto, BaseStudentScholarshipCategory.class);
+        boolean isSuccess = baseStudentScholarshipCategoryService.add(baseStudentScholarshipCategory);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改奖学金类别")
+    @SaCheckPermission("basestudentscholarshipcategory:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentScholarshipCategoryDto dto){
+
+        BaseStudentScholarshipCategory baseStudentScholarshipCategory = BeanUtil.toBean(dto, BaseStudentScholarshipCategory.class);
+        return RT.ok(baseStudentScholarshipCategoryService.update(baseStudentScholarshipCategory));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除奖学金类别")
+    @SaCheckPermission("basestudentscholarshipcategory:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(baseStudentScholarshipCategoryService.delete(ids));
+
+    }
+
+}

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

@@ -7,12 +7,15 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.toolkit.MPJWrappers;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.model.result.R;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.TreeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseClass;
+import com.xjrsoft.module.base.service.IBaseClassService;
+import com.xjrsoft.module.base.service.IBaseGradeService;
 import com.xjrsoft.module.student.dto.AddBaseStudentUserDto;
 import com.xjrsoft.module.student.dto.BaseStudentUserPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentUserDto;
@@ -20,16 +23,23 @@ import com.xjrsoft.module.student.entity.BaseStudent;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.student.entity.BaseStudentUser;
 import com.xjrsoft.module.student.service.IStudentManagerService;
+import com.xjrsoft.module.student.vo.BaseStudentTreeVo;
 import com.xjrsoft.module.student.vo.BaseStudentUserPageVo;
 import com.xjrsoft.module.student.vo.BaseStudentUserVo;
-import com.xjrsoft.module.system.entity.DictionaryDetail;
-import com.xjrsoft.module.system.entity.Menu;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 
 @RestController
@@ -39,6 +49,8 @@ import java.util.List;
 public class StudentManagerController {
 
     private final IStudentManagerService studentManagerService;
+    private final IBaseGradeService baseGradeService;
+    private final IBaseClassService baseClassService;
 
 
     @GetMapping(value = "/page")
@@ -52,7 +64,7 @@ public class StudentManagerController {
                         .like(StrUtil.isNotBlank(dto.getMobile()), BaseStudentUser::getMobile, dto.getMobile())
                         .like(StrUtil.isNotBlank(dto.getName()), BaseStudentUser::getName, dto.getName())
                         .like(StrUtil.isNotBlank(dto.getEmail()), BaseStudentUser::getEmail, dto.getEmail())
-                        .eq(ObjectUtil.isNotNull(dto.getClassId()), BaseStudent::getId, dto.getClassId())
+                        .eq(ObjectUtil.isNotNull(dto.getClassId()), BaseClass::getId, dto.getClassId())
                         .in((ObjectUtil.isNotNull(dto.getTokenType()) && dto.getTokenType() == 1), BaseClass::getTeacherId, StpUtil.getLoginIdAsLong())
                         .orderByDesc(BaseStudentUser::getId)
                         .select(BaseStudentUser::getId)
@@ -73,6 +85,31 @@ public class StudentManagerController {
         return R.ok(pageOutput);
     }
 
+    @GetMapping(value = "/tree")
+    @ApiOperation(value = "学生年纪班级树")
+    @SaCheckPermission("studentmanager:detail")
+    public RT<List<BaseStudentTreeVo>> tree() {
+        List<BaseStudentTreeVo> voList = new ArrayList<>();
+        baseGradeService.list().forEach((node) -> {
+            voList.add(new BaseStudentTreeVo(){{
+                setId(node.getId());
+                setName(node.getName());
+            }});
+        });
+
+        baseClassService.list().forEach((node)->{
+            voList.add(new BaseStudentTreeVo(){{
+                setId(node.getId());
+                setName(node.getName());
+                setParentId(node.getGradeId());
+            }});
+        });
+
+        List<BaseStudentTreeVo> treeVoList = TreeUtil.build(voList);
+
+        return RT.ok(treeVoList);
+    }
+
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询学生信息")
     @SaCheckPermission("studentmanager:detail")

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

@@ -0,0 +1,69 @@
+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;
+import com.xjrsoft.module.student.entity.BaseStudentScholarshipLevel;
+
+
+
+/**
+* @title: 奖学金类别
+* @Author dzx
+* @Date: 2023-11-23
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentScholarshipCategoryDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 奖学金来源(xjr_dictionary_item[scholarship_source])
+    */
+    @ApiModelProperty("奖学金来源(xjr_dictionary_item[scholarship_source])")
+    private String scholarshipSource;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 总金额
+    */
+    @ApiModelProperty("总金额")
+    private Double totalAmount;
+    /**
+    * 奖学金等级 0=无等级
+    */
+    @ApiModelProperty("奖学金等级 0=无等级")
+    private Integer scholarshipLevel;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /**
+    * baseStudentScholarshipLevel
+    */
+    @ApiModelProperty("baseStudentScholarshipLevel子表")
+    private List<AddBaseStudentScholarshipLevelDto> baseStudentScholarshipLevelList;
+}

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

@@ -0,0 +1,48 @@
+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: 2023-11-23
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentScholarshipLevelDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 奖学金类别ID(base_student_scholarship_category)
+    */
+    @ApiModelProperty("奖学金类别ID(base_student_scholarship_category)")
+    private Long baseStudentScholarshipCategoryId;
+    /**
+    * 奖学金等级 0=无等级
+    */
+    @ApiModelProperty("奖学金等级 0=无等级")
+    private Integer level;
+    /**
+    * 金额
+    */
+    @ApiModelProperty("金额")
+    private Double amount;
+
+}

src/main/java/com/xjrsoft/module/student/dto/BaseStudentScholarshipCategoryPageDto.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 dzx
+* @Date: 2023-11-23
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentScholarshipCategoryPageDto extends PageInput {
+
+
+}

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

@@ -0,0 +1,33 @@
+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;
+import com.xjrsoft.module.student.entity.BaseStudentScholarshipLevel;
+
+
+
+/**
+* @title: 奖学金类别
+* @Author dzx
+* @Date: 2023-11-23
+* @Version 1.0
+*/
+@Data
+public class UpdateBaseStudentScholarshipCategoryDto extends AddBaseStudentScholarshipCategoryDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

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

@@ -0,0 +1,120 @@
+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: 2023-11-23
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_scholarship_category")
+@ApiModel(value = "base_student_scholarship_category", description = "奖学金类别")
+public class BaseStudentScholarshipCategory 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;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 奖学金来源(xjr_dictionary_item[scholarship_source])
+    */
+    @ApiModelProperty("奖学金来源(xjr_dictionary_item[scholarship_source])")
+    private String scholarshipSource;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 总金额
+    */
+    @ApiModelProperty("总金额")
+    private Double totalAmount;
+    /**
+    * 奖学金等级 0=无等级
+    */
+    @ApiModelProperty("奖学金等级 0=无等级")
+    private Integer scholarshipLevel;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /**
+    * baseStudentScholarshipLevel
+    */
+    @ApiModelProperty("baseStudentScholarshipLevel子表")
+    @TableField(exist = false)
+    @EntityMapping(thisField = "id", joinField = "baseStudentScholarshipCategoryId")
+    private List<BaseStudentScholarshipLevel> baseStudentScholarshipLevelList;
+
+}

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

@@ -0,0 +1,98 @@
+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: 2023-11-23
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_scholarship_level")
+@ApiModel(value = "base_student_scholarship_level", description = "奖学金级别")
+public class BaseStudentScholarshipLevel 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(base_student_scholarship_category)
+    */
+    @ApiModelProperty("奖学金类别ID(base_student_scholarship_category)")
+    private Long baseStudentScholarshipCategoryId;
+    /**
+    * 奖学金等级 0=无等级
+    */
+    @ApiModelProperty("奖学金等级 0=无等级")
+    private Integer level;
+    /**
+    * 金额
+    */
+    @ApiModelProperty("金额")
+    private Double amount;
+
+
+}

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

@@ -48,7 +48,7 @@ public interface BaseStudentPunishmentInfoMapper extends MPJBaseMapper<BaseStude
      */
     BaseStudentPunishmentInfoDetailVo getInfo(Long id);
     /**
-     * app分页查询
+     * app数据详情
      */
     BaseStudentPunishmentInfoMobileDetailVo getMobileInfo(Long id);
 }

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentScholarshipCategoryMapper.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.BaseStudentScholarshipCategory;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 奖学金类别
+* @Author dzx
+* @Date: 2023-11-23
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentScholarshipCategoryMapper extends MPJBaseMapper<BaseStudentScholarshipCategory> {
+
+}

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentScholarshipLevelMapper.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.BaseStudentScholarshipLevel;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 奖学金级别
+* @Author dzx
+* @Date: 2023-11-23
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentScholarshipLevelMapper extends MPJBaseMapper<BaseStudentScholarshipLevel> {
+
+}

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

@@ -5,7 +5,7 @@ import com.xjrsoft.module.student.entity.BaseStudentAssessmentClassRelation;
 import com.xjrsoft.module.student.entity.BaseStudentBehaviorClassRelation;
 
 /**
-* @title: 学生班级巡查考核-关联班级
+* @title: 学生操行-关联班级
 * @Author fanxp
 * @Date: 2023-11-16
 * @Version 1.0

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

@@ -0,0 +1,40 @@
+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.BaseStudentScholarshipCategory;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 奖学金类别
+* @Author dzx
+* @Date: 2023-11-23
+* @Version 1.0
+*/
+
+public interface IBaseStudentScholarshipCategoryService extends MPJBaseService<BaseStudentScholarshipCategory> {
+    /**
+    * 新增
+    *
+    * @param baseStudentScholarshipCategory
+    * @return
+    */
+    Boolean add(BaseStudentScholarshipCategory baseStudentScholarshipCategory);
+
+    /**
+    * 更新
+    *
+    * @param baseStudentScholarshipCategory
+    * @return
+    */
+    Boolean update(BaseStudentScholarshipCategory baseStudentScholarshipCategory);
+
+    /**
+    * 删除
+    *
+    * @param ids
+    * @return
+    */
+    Boolean delete(List<Long> ids);
+}

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

@@ -1,18 +1,14 @@
 package com.xjrsoft.module.student.service.impl;
 
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.toolkit.MPJWrappers;
-import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.student.entity.BaseStudentBehaviorClassRelation;
 import com.xjrsoft.module.student.entity.BaseStudentBehaviorManage;
 import com.xjrsoft.module.student.mapper.BaseStudentBehaviorClassRelationMapper;
 import com.xjrsoft.module.student.service.IBaseStudentBehaviorClassRelationService;
 import com.xjrsoft.module.student.service.IBaseStudentBehaviorManageService;
-import com.xjrsoft.module.teacher.entity.XjrUser;
-import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -37,6 +33,14 @@ public class BaseStudentBehaviorClassRelationServiceImpl extends ServiceImpl<Bas
         List<String> classIdList = StrUtil.split(behaviorManage.getClassIds(), ",");
 
         for (String classId : classIdList) {
+            List<BaseStudentBehaviorClassRelation> list = baseStudentBehaviorClassRelationMapper.selectList(
+                    Wrappers.lambdaQuery(BaseStudentBehaviorClassRelation.class)
+                            .eq(BaseStudentBehaviorClassRelation::getClassId, classId)
+                            .eq(BaseStudentBehaviorClassRelation::getBaseStudentBehaviorManageId, dataId)
+            );
+            if(!list.isEmpty() && list.size() > 0){
+                continue;
+            }
             BaseStudentBehaviorClassRelation classRelation = new BaseStudentBehaviorClassRelation();
             Long classIdAsLong = Convert.toLong(classId);
             classRelation.setClassId(classIdAsLong);

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

@@ -0,0 +1,88 @@
+package com.xjrsoft.module.student.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.entity.BaseStudentScholarshipCategory;
+import com.xjrsoft.module.student.entity.BaseStudentScholarshipLevel;
+import com.xjrsoft.module.student.mapper.BaseStudentScholarshipCategoryMapper;
+import com.xjrsoft.module.student.mapper.BaseStudentScholarshipLevelMapper;
+import com.xjrsoft.module.student.service.IBaseStudentScholarshipCategoryService;
+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;
+
+/**
+* @title: 奖学金类别
+* @Author dzx
+* @Date: 2023-11-23
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseStudentScholarshipCategoryServiceImpl extends MPJBaseServiceImpl<BaseStudentScholarshipCategoryMapper, BaseStudentScholarshipCategory> implements IBaseStudentScholarshipCategoryService {
+    private final BaseStudentScholarshipCategoryMapper baseStudentScholarshipCategoryBaseStudentScholarshipCategoryMapper;
+
+    private final BaseStudentScholarshipLevelMapper baseStudentScholarshipCategoryBaseStudentScholarshipLevelMapper;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean add(BaseStudentScholarshipCategory baseStudentScholarshipCategory) {
+        baseStudentScholarshipCategoryBaseStudentScholarshipCategoryMapper.insert(baseStudentScholarshipCategory);
+        for (BaseStudentScholarshipLevel baseStudentScholarshipLevel : baseStudentScholarshipCategory.getBaseStudentScholarshipLevelList()) {
+            baseStudentScholarshipLevel.setBaseStudentScholarshipCategoryId(baseStudentScholarshipCategory.getId());
+            baseStudentScholarshipCategoryBaseStudentScholarshipLevelMapper.insert(baseStudentScholarshipLevel);
+        }
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean update(BaseStudentScholarshipCategory baseStudentScholarshipCategory) {
+        baseStudentScholarshipCategoryBaseStudentScholarshipCategoryMapper.updateById(baseStudentScholarshipCategory);
+        //********************************* BaseStudentScholarshipLevel  增删改  开始 *******************************************/
+        {
+            // 查出所有子级的id
+            List<BaseStudentScholarshipLevel> baseStudentScholarshipLevelList = baseStudentScholarshipCategoryBaseStudentScholarshipLevelMapper.selectList(Wrappers.lambdaQuery(BaseStudentScholarshipLevel.class).eq(BaseStudentScholarshipLevel::getBaseStudentScholarshipCategoryId, baseStudentScholarshipCategory.getId()).select(BaseStudentScholarshipLevel::getId));
+            List<Long> baseStudentScholarshipLevelIds = baseStudentScholarshipLevelList.stream().map(BaseStudentScholarshipLevel::getId).collect(Collectors.toList());
+            //原有子表单 没有被删除的主键
+            List<Long> baseStudentScholarshipLevelOldIds = baseStudentScholarshipCategory.getBaseStudentScholarshipLevelList().stream().map(BaseStudentScholarshipLevel::getId).filter(Objects::nonNull).collect(Collectors.toList());
+            //找到需要删除的id
+            List<Long> baseStudentScholarshipLevelRemoveIds = baseStudentScholarshipLevelIds.stream().filter(item -> !baseStudentScholarshipLevelOldIds.contains(item)).collect(Collectors.toList());
+
+            for (BaseStudentScholarshipLevel baseStudentScholarshipLevel : baseStudentScholarshipCategory.getBaseStudentScholarshipLevelList()) {
+                //如果不等于空则修改
+                if (baseStudentScholarshipLevel.getId() != null) {
+                    baseStudentScholarshipCategoryBaseStudentScholarshipLevelMapper.updateById(baseStudentScholarshipLevel);
+                }
+                //如果等于空 则新增
+                else {
+                    //已经不存在的id 删除
+                    baseStudentScholarshipLevel.setBaseStudentScholarshipCategoryId(baseStudentScholarshipCategory.getId());
+                    baseStudentScholarshipCategoryBaseStudentScholarshipLevelMapper.insert(baseStudentScholarshipLevel);
+                }
+            }
+            //已经不存在的id 删除
+            if(baseStudentScholarshipLevelRemoveIds.size() > 0){
+                baseStudentScholarshipCategoryBaseStudentScholarshipLevelMapper.deleteBatchIds(baseStudentScholarshipLevelRemoveIds);
+            }
+        }
+        //********************************* BaseStudentScholarshipLevel  增删改  结束 *******************************************/
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(List<Long> ids) {
+        baseStudentScholarshipCategoryBaseStudentScholarshipCategoryMapper.deleteBatchIds(ids);
+        baseStudentScholarshipCategoryBaseStudentScholarshipLevelMapper.delete(Wrappers.lambdaQuery(BaseStudentScholarshipLevel.class).in(BaseStudentScholarshipLevel::getBaseStudentScholarshipCategoryId, ids));
+
+        return true;
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 奖学金类别分页列表出参
+* @Author dzx
+* @Date: 2023-11-23
+* @Version 1.0
+*/
+@Data
+public class BaseStudentScholarshipCategoryPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 奖学金来源(xjr_dictionary_item[scholarship_source])
+    */
+    @ApiModelProperty("奖学金来源(xjr_dictionary_item[scholarship_source])")
+    private String scholarshipSource;
+    /**
+     * 奖学金来源-中文
+     */
+    @ApiModelProperty("奖学金来源-中文")
+    private String scholarshipSourceCn;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 总金额
+    */
+    @ApiModelProperty("总金额")
+    private Double totalAmount;
+    /**
+    * 奖学金等级 0=无等级
+    */
+    @ApiModelProperty("奖学金等级 0=无等级")
+    private Integer scholarshipLevel;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,70 @@
+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;
+import com.xjrsoft.module.student.entity.BaseStudentScholarshipLevel;
+
+/**
+* @title: 奖学金类别表单出参
+* @Author dzx
+* @Date: 2023-11-23
+* @Version 1.0
+*/
+@Data
+public class BaseStudentScholarshipCategoryVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 奖学金来源(xjr_dictionary_item[scholarship_source])
+    */
+    @ApiModelProperty("奖学金来源(xjr_dictionary_item[scholarship_source])")
+    private String scholarshipSource;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 总金额
+    */
+    @ApiModelProperty("总金额")
+    private Double totalAmount;
+    /**
+    * 奖学金等级 0=无等级
+    */
+    @ApiModelProperty("奖学金等级 0=无等级")
+    private Integer scholarshipLevel;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+    /**
+    * baseStudentScholarshipLevel
+    */
+    @ApiModelProperty("baseStudentScholarshipLevel子表")
+    private List<BaseStudentScholarshipLevelVo> baseStudentScholarshipLevelList;
+
+}

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

@@ -0,0 +1,49 @@
+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: 2023-11-23
+* @Version 1.0
+*/
+@Data
+public class BaseStudentScholarshipLevelVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 奖学金类别ID(base_student_scholarship_category)
+    */
+    @ApiModelProperty("奖学金类别ID(base_student_scholarship_category)")
+    private Long baseStudentScholarshipCategoryId;
+    /**
+    * 奖学金等级 0=无等级
+    */
+    @ApiModelProperty("奖学金等级 0=无等级")
+    private Integer level;
+    /**
+    * 金额
+    */
+    @ApiModelProperty("金额")
+    private Double amount;
+
+
+
+}

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

@@ -0,0 +1,29 @@
+package com.xjrsoft.module.student.vo;
+
+import com.xjrsoft.common.model.tree.ITreeNode;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class BaseStudentTreeVo implements ITreeNode<BaseStudentTreeVo,Long>, Serializable {
+
+
+    @ApiModelProperty("id")
+    private Long id;
+
+
+    @ApiModelProperty("name")
+    private String name;
+
+
+    @ApiModelProperty("disabled")
+    private Long parentId;
+
+
+    @ApiModelProperty("children")
+    private List<BaseStudentTreeVo> children;
+
+}

src/main/java/com/xjrsoft/module/system/controller/MenuController.java

@@ -95,8 +95,8 @@ public class MenuController {
 
     @GetMapping("/serve")
     @ApiOperation(value = "获取菜单服务")
-    public RT<List<MenuServeVo>> menuServe() {
-        List<MenuServeVo> list = menuService.getAuthMenuServe();
+    public RT<List<MenuServeVo>> menuServe(@Valid MenuTreeDto dto) {
+        List<MenuServeVo> list = menuService.getAuthMenuServe(dto);
 
         return RT.ok(list);
     }
@@ -156,9 +156,9 @@ public class MenuController {
     @ApiOperation(value = "新增菜单")
     @Transactional(rollbackFor = Exception.class)
     public R add(@Valid @RequestBody AddMenuDto dto) {
-        long count = menuService.count(Wrappers.<Menu>query().lambda().eq(Menu::getName, dto.getName()).or().eq(Menu::getCode, dto.getCode()));
+        long count = menuService.count(Wrappers.<Menu>query().lambda().eq(Menu::getCode, dto.getCode()));
         if (count > 0) {
-            return R.error("菜单名或者菜单编码已经存在！");
+            return R.error("菜单编码已经存在！");
         }
         Menu menu = BeanUtil.toBean(dto, Menu.class);
 

src/main/java/com/xjrsoft/module/system/service/IMenuService.java

@@ -23,7 +23,7 @@ public interface IMenuService extends MPJBaseService<Menu> {
 
     List<MenuVo> getAuthMenuList(MenuTreeDto dto);
 
-    List<MenuServeVo> getAuthMenuServe();
+    List<MenuServeVo> getAuthMenuServe(MenuTreeDto dto);
 
     List<MenuServeVo> getRoleMenuServe(RoleMenuServeListDto dto);
 

src/main/java/com/xjrsoft/module/system/service/impl/LoginServiceImpl.java

@@ -1,8 +1,7 @@
 package com.xjrsoft.module.system.service.impl;
 
-import cn.dev33.satoken.secure.BCrypt;
 import cn.dev33.satoken.context.SaHolder;
-import cn.dev33.satoken.secure.SaSecureUtil;
+import cn.dev33.satoken.secure.BCrypt;
 import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.temp.SaTempUtil;
@@ -12,21 +11,30 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.enums.EnabledMark;
 import com.xjrsoft.common.enums.RoleEnum;
 import com.xjrsoft.common.exception.MyException;
-import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.utils.FixedArithmeticCaptcha;
 import com.xjrsoft.common.utils.RSAUtil;
 import com.xjrsoft.common.utils.RedisUtil;
 import com.xjrsoft.common.utils.WeChatUtil;
 import com.xjrsoft.config.CommonPropertiesConfig;
 import com.xjrsoft.config.LicenseConfig;
-import com.xjrsoft.module.organization.entity.*;
+import com.xjrsoft.module.organization.entity.Department;
+import com.xjrsoft.module.organization.entity.Post;
+import com.xjrsoft.module.organization.entity.User;
+import com.xjrsoft.module.organization.entity.UserDeptRelation;
+import com.xjrsoft.module.organization.entity.UserPostRelation;
+import com.xjrsoft.module.organization.entity.UserRoleRelation;
 import com.xjrsoft.module.organization.mapper.UserRoleRelationMapper;
-import com.xjrsoft.module.organization.service.*;
+import com.xjrsoft.module.organization.service.IDepartmentService;
+import com.xjrsoft.module.organization.service.IPostService;
+import com.xjrsoft.module.organization.service.IUserDeptRelationService;
+import com.xjrsoft.module.organization.service.IUserPostRelationService;
+import com.xjrsoft.module.organization.service.IUserService;
 import com.xjrsoft.module.system.dto.CreateTokenDto;
 import com.xjrsoft.module.system.dto.LoginByCodeDto;
 import com.xjrsoft.module.system.dto.LoginCaptchaDto;
@@ -37,12 +45,9 @@ import com.xjrsoft.module.system.vo.ImgCaptchaVo;
 import com.xjrsoft.module.system.vo.LoginByCodeVo;
 import com.xjrsoft.module.system.vo.LoginVo;
 import lombok.AllArgsConstructor;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -149,7 +154,7 @@ public class LoginServiceImpl implements ILoginService {
             throw new MyException("无法获取Uid"+ids[0]+"-"+ids[1]);
         }
         List<User> userList = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getUnionId, ids[1]));
-        if (userList == null || userList.size() == 0) throw new MyException("code无效");
+        if (userList == null || userList.isEmpty()) throw new MyException("code无效");
         User user = userList.get(0);
         user.setOpenId(ids[0]);
         userService.updateById(user);

src/main/java/com/xjrsoft/module/system/service/impl/MenuServiceImpl.java

@@ -63,8 +63,8 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
      * 查询用户菜单服务
      */
     @Override
-    public List<MenuServeVo> getAuthMenuServe() {
-        List<MenuVo> menuVos = getAuthMenuList(new MenuTreeDto());
+    public List<MenuServeVo> getAuthMenuServe(MenuTreeDto dto) {
+        List<MenuVo> menuVos = getAuthMenuList(dto);
         return getSubMenu(menuVos);
     }
 

src/main/java/com/xjrsoft/module/teacher/controller/TeacherbaseManagerController.java

@@ -9,6 +9,7 @@ import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.organization.entity.UserDeptRelation;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.system.service.IDictionarydetailService;
 import com.xjrsoft.module.teacher.dto.AddXjrUserDto;
@@ -55,13 +56,15 @@ public class TeacherbaseManagerController {
                 .like(StrUtil.isNotBlank(dto.getMobile()),XjrUser::getMobile,dto.getMobile())
                 .like(StrUtil.isNotBlank(dto.getName()),XjrUser::getName,dto.getName())
                 .like(StrUtil.isNotBlank(dto.getEmail()),XjrUser::getEmail,dto.getEmail())
-                    .orderByDesc(XjrUser::getId)
+                .eq(UserDeptRelation::getDeptId, dto.getOrgId())
+                .orderByDesc(XjrUser::getId)
                 .select(XjrUser::getId)
                 .select(XjrUser.class,x -> VoToColumnUtil.fieldsToColumns(XjrUserPageVo.class).contains(x.getProperty()))
                 .innerJoin(BaseTeacher.class,BaseTeacher::getUserId,XjrUser::getId)
                 .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,BaseTeacher::getJobState,ext->ext.selectAs(DictionaryDetail::getName, XjrUserPageVo::getJobState))
                 .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,XjrUser::getCredentialType,ext->ext.selectAs(DictionaryDetail::getName, XjrUserPageVo::getCredentialType))
                 .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,BaseTeacher::getEmployWay,ext->ext.selectAs(DictionaryDetail::getName, XjrUserPageVo::getEmployWay))
+                .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, XjrUser::getId)
                 .selectAsClass(BaseTeacher.class, XjrUserPageVo.class);
 
         IPage<XjrUser> page = teacherbaseManagerService.page(ConventPage.getPage(dto), queryWrapper);

src/main/java/com/xjrsoft/module/teacher/dto/XjrUserPageDto.java

@@ -37,4 +37,10 @@ public class XjrUserPageDto extends PageInput {
     @ApiModelProperty("邮箱")
     private String email;
 
+    /**
+     * 机构id
+     */
+    @ApiModelProperty("机构id")
+    private Long orgId;
+
 }

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

@@ -88,8 +88,9 @@ CREATE TABLE base_student_punishment_info
     `is_publicity` INT NULL DEFAULT 1 COMMENT '是否公示(1:是 0:否)',
     `push_message_object` INT NULL DEFAULT NULL COMMENT '发送处分(1:班主任 2:学生 3:家长)',
     `reason` VARCHAR(500) NULL DEFAULT NULL COMMENT '处分原因',
-    `class_id` VARCHAR(1000) NULL DEFAULT NULL COMMENT '班级id',
+    `class_id` BIGINT NULL DEFAULT NULL COMMENT '班级id',
     `file_id` BIGINT NULL DEFAULT NULL COMMENT '附件文件id',
+    `status` INT NOT NULL default 0 COMMENT '状态（1:结束 0:未结束）',
     PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生处分信息管理';
 
@@ -113,19 +114,17 @@ CREATE TABLE base_punishment_student_relation
     PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生处分信息-关联学生';
 
-ALTER TABLE `tl`.`base_punishment_student_relation`   
+ALTER TABLE `base_punishment_student_relation`
   ADD COLUMN `adjust_type` INT NULL   COMMENT '调整类型 1:升级 2:降级 3:撤销' AFTER `major`,
   ADD COLUMN `adjust_date` DATE NULL   COMMENT '调整日期' AFTER `adjust_type`,
   ADD COLUMN `adjust_reason` VARCHAR(500) NULL   COMMENT '调整原因' AFTER `adjust_date`;
 
-ALTER TABLE `tl`.`base_punishment_student_relation`
+ALTER TABLE `base_punishment_student_relation`
   CHANGE `class` `className` VARCHAR(50) CHARSET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL   COMMENT '所在班级';
 
-ALTER TABLE `tl`.`base_punishment_student_relation`
+ALTER TABLE `base_punishment_student_relation`
   ADD COLUMN `modify_user_id` INT NULL   COMMENT '修改人' AFTER `adjust_date`,
   ADD COLUMN `modify_date` datetime NULL   COMMENT '修改时间' AFTER `modify_user_id`;
-ALTER TABLE `tl`.`base_student_punishment_info`
-  CHANGE `class_id` `class_id` BIGINT NULL   COMMENT '班级id';
 
 --------------------------------------------------------------------学生考核--------------------------------------------------------------------
 

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

@@ -1,5 +1,5 @@
 
---------------------------------------------------------------------奖学金管理--------------------------------------------------------------------
+-- ------------------------------------------------------------------奖学金管理--------------------------------------------------------------------
 -- ----------------------------
 -- 奖学金类别
 -- ----------------------------
@@ -42,7 +42,40 @@ CREATE TABLE base_student_scholarship_level
     `score` double NOT NULL DEFAULT 0 COMMENT '金额',
     PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '奖学金级别';
---------------------------------------------------------------------奖学金管理--------------------------------------------------------------------
+
+-- ----------------------------
+-- 奖学金申请
+-- ----------------------------
+DROP TABLE IF EXISTS base_student_scholarship_applicant;
+CREATE TABLE base_student_scholarship_applicant
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` datetime NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` datetime NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `base_student_scholarship_category_id` bigint NULL DEFAULT NULL COMMENT '奖学金类别ID(base_student_scholarship_category)',
+    `applicant_user_id` BIGINT NULL DEFAULT NULL COMMENT '申请人',
+    `semester_name` VARCHAR(200) NULL DEFAULT NULL COMMENT '学期名称',
+    `grade_name` VARCHAR(200) NULL DEFAULT NULL COMMENT '入学名称',
+    `class_name` VARCHAR(200) NULL DEFAULT NULL COMMENT '班级名称',
+    `name` VARCHAR(200) NULL DEFAULT NULL COMMENT '姓名',
+    `student_id` VARCHAR(200) NULL DEFAULT NULL COMMENT '学号',
+    `gender_name` VARCHAR(200) NULL DEFAULT NULL COMMENT '性别',
+    `enroll_type_cn` VARCHAR(200) NULL DEFAULT NULL COMMENT '招生类型名称',
+    `major_name` VARCHAR(200) NULL DEFAULT NULL COMMENT '在读专业',
+    `award_date` date NULL DEFAULT NULL COMMENT '获奖日期',
+    `bank_type` VARCHAR(20) NULL DEFAULT NULL COMMENT '收款银行(xjr_dictionary_item[bank_type])',
+    `bank_no` VARCHAR(200) NULL DEFAULT NULL COMMENT '银行卡号',
+    `file_id` bigint NULL DEFAULT NULL COMMENT '文件ID(xjr_file)',
+    `status` INT NOT NULL default 0 COMMENT '状态（1:结束 0:未结束）',
+    `release_status` INT NOT NULL default 0 COMMENT '发放状态（1:已发放 0:未发放）',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '奖学金申请';
+-- ------------------------------------------------------------------奖学金管理--------------------------------------------------------------------
 
 
 

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

@@ -1,43 +1,17 @@
 package com.xjrsoft.xjrsoftboot;
 
-import cn.dev33.satoken.secure.SaSecureUtil;
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.ds.simple.SimpleDataSource;
-import cn.hutool.db.meta.Column;
-import cn.hutool.db.meta.MetaUtil;
-import cn.hutool.db.meta.Table;
-import cn.hutool.http.HttpUtil;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.xjrsoft.XjrSoftApplication;
 import com.xjrsoft.common.constant.GlobalConstant;
-import com.xjrsoft.common.utils.DatasourceUtil;
-import com.xjrsoft.common.utils.JdbcToJavaUtil;
-import com.xjrsoft.module.generator.constant.EntityConstant;
 import com.xjrsoft.module.generator.dto.ApiGenerateCodesDto;
-import com.xjrsoft.module.generator.entity.FieldConfig;
-import com.xjrsoft.module.generator.entity.GeneratorConfig;
 import com.xjrsoft.module.generator.entity.TableConfig;
 import com.xjrsoft.module.generator.service.IApiGeneratorService;
 import com.xjrsoft.module.generator.service.impl.ApiGeneratorServiceImpl;
-import freemarker.template.Template;
-import freemarker.template.TemplateException;
-import lombok.AllArgsConstructor;
 import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.ui.freemarker.FreeMarkerTemplateUtils;
-import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
 
 import javax.sql.DataSource;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.List;
 
 public class FreeMarkerGeneratorTest {
 
@@ -735,6 +709,44 @@ public class FreeMarkerGeneratorTest {
         apiGeneratorService.generateCodes(params);
     }
 
+    /**
+     * 奖学金类型维护
+     */
+    @Test
+    public void gcBaseStudentScholarshipCategory() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("base_student_scholarship_category");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        mainTable = new TableConfig();
+        mainTable.setTableName("base_student_scholarship_level");//init_sql中的表名
+        mainTable.setIsMain(false);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        mainTable.setRelationField("base_student_scholarship_category_id");//设置外键
+        mainTable.setRelationTableField(GlobalConstant.DEFAULT_PK);//设置外键
+        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);
+    }
+
     @Test
     public void gcBasestudentScholarshipApplicant() throws IOException {
         List<TableConfig> tableConfigs = new ArrayList<>();