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

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

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.liteflow.node;
+
+import cn.hutool.core.convert.Convert;
+import com.xjrsoft.module.oa.service.IFileReceiveService;
+import com.xjrsoft.module.student.service.IBaseStudentAssessmentClassRelationService;
+import com.yomahub.liteflow.core.NodeComponent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 学生班级巡查考核流程结束处理
+ */
+@Component("wf_assessment_node")
+public class WfAssessmentNode extends NodeComponent {
+
+    @Autowired
+    private IBaseStudentAssessmentClassRelationService assessmentClassRelationService;
+
+    @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) {
+            // 数据处理
+            assessmentClassRelationService.dataCache(formId);
+        }
+    }
+}

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

@@ -6,6 +6,9 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.interfaces.MPJBaseJoin;
+import com.github.yulichang.toolkit.MPJWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.xjrsoft.common.page.ConventPage;
@@ -18,8 +21,10 @@ import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentProjectDto;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentProjectListDto;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentProject;
 import com.xjrsoft.module.student.entity.BaseStudentCadre;
+import com.xjrsoft.module.student.entity.BaseStudentUser;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentProjectService;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentProjectListVo;
 
@@ -50,16 +55,20 @@ public class BaseStudentAssessmentProjectController {
     private final IBaseStudentAssessmentProjectService baseStudentAssessmentProjectService;
 
     @GetMapping(value = "/page")
-    @ApiOperation(value="学生考核项目列表(分页)")
+    @ApiOperation(value = "学生考核项目列表(分页)")
     @SaCheckPermission("basestudentassessmentproject:detail")
-    public RT<PageOutput<BaseStudentAssessmentProjectPageVo>> page(@Valid BaseStudentAssessmentProjectPageDto dto){
+    public RT<PageOutput<BaseStudentAssessmentProjectPageVo>> page(@Valid BaseStudentAssessmentProjectPageDto dto) {
 
-        LambdaQueryWrapper<BaseStudentAssessmentProject> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
+        MPJBaseJoin<BaseStudentAssessmentProject> queryWrapper = MPJWrappers.<BaseStudentAssessmentProject>lambdaJoin()
+                .disableSubLogicDel()
                 .orderByDesc(BaseStudentAssessmentProject::getId)
                 .eq(ObjectUtil.isNotEmpty(dto.getBaseStudentAssessmentCategoryId()), BaseStudentAssessmentProject::getBaseStudentAssessmentCategoryId, dto.getBaseStudentAssessmentCategoryId())
-                .select(BaseStudentAssessmentProject.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentProjectPageVo.class).contains(x.getProperty()));
-        IPage<BaseStudentAssessmentProject> page = baseStudentAssessmentProjectService.page(ConventPage.getPage(dto), queryWrapper);
+                .select(BaseStudentAssessmentProject.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentProjectPageVo.class).contains(x.getProperty()))
+                .leftJoin(BaseStudentAssessmentCategory.class, BaseStudentAssessmentCategory::getId, BaseStudentAssessmentProject::getBaseStudentAssessmentCategoryId)
+                .select(BaseStudentAssessmentProject::getId)
+                .selectAs(BaseStudentAssessmentCategory::getName,BaseStudentAssessmentProjectPageVo::getBaseStudentAssessmentCategoryName);
+
+        IPage<BaseStudentAssessmentProjectPageVo> page = baseStudentAssessmentProjectService.selectJoinListPage(ConventPage.getPage(dto),BaseStudentAssessmentProjectPageVo.class,queryWrapper);
         PageOutput<BaseStudentAssessmentProjectPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentAssessmentProjectPageVo.class);
         return RT.ok(pageOutput);
     }

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

@@ -34,14 +34,14 @@ import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
-* @title: 学生考核类别
+* @title: 学生操行分考核类别
 * @Author fanxp
 * @Date: 2023-11-15
 * @Version 1.0
 */
 @RestController
 @RequestMapping("/student" + "/basestudentbehaviorcategory")
-@Api(value = "/student"  + "/basestudentbehaviorcategory",tags = "学生考核类别代码")
+@Api(value = "/student"  + "/basestudentbehaviorcategory",tags = "学生操行分考核类别代码")
 @AllArgsConstructor
 public class BaseStudentBehaviorCategoryController {
 
@@ -49,7 +49,7 @@ public class BaseStudentBehaviorCategoryController {
     private final IBaseStudentBehaviorCategoryService baseStudentBehaviorCategoryService;
 
     @GetMapping(value = "/list")
-    @ApiOperation(value="学生考核类别列表(不分页)")
+    @ApiOperation(value="学生操行分考核类别列表(不分页)")
     @SaCheckPermission("basestudentbehaviorcategory:detail")
     public RT<List<BaseStudentBehaviorCategoryListVo>> list(@Valid BaseStudentBehaviorCategoryListDto dto){
 
@@ -64,7 +64,7 @@ public class BaseStudentBehaviorCategoryController {
     }
 
     @GetMapping(value = "/page")
-    @ApiOperation(value="学生考核类别列表(分页)")
+    @ApiOperation(value="学生操行分考核类别列表(分页)")
     @SaCheckPermission("basestudentbehaviorcategory:detail")
     public RT<PageOutput<BaseStudentBehaviorCategoryPageVo>> page(@Valid BaseStudentBehaviorCategoryPageDto dto){
 
@@ -78,7 +78,7 @@ public class BaseStudentBehaviorCategoryController {
     }
 
     @GetMapping(value = "/info")
-    @ApiOperation(value="根据id查询学生考核类别信息")
+    @ApiOperation(value="根据id查询学生操行分考核类别信息")
     @SaCheckPermission("basestudentbehaviorcategory:detail")
     public RT<BaseStudentBehaviorCategoryVo> info(@RequestParam Long id){
         BaseStudentBehaviorCategory baseStudentBehaviorCategory = baseStudentBehaviorCategoryService.getById(id);
@@ -90,7 +90,7 @@ public class BaseStudentBehaviorCategoryController {
 
 
     @PostMapping
-    @ApiOperation(value = "新增学生考核类别")
+    @ApiOperation(value = "新增学生操行分考核类别")
     @SaCheckPermission("basestudentbehaviorcategory:add")
     public RT<Boolean> add(@Valid @RequestBody AddBaseStudentBehaviorCategoryDto dto){
         BaseStudentBehaviorCategory baseStudentBehaviorCategory = BeanUtil.toBean(dto, BaseStudentBehaviorCategory.class);
@@ -99,7 +99,7 @@ public class BaseStudentBehaviorCategoryController {
     }
 
     @PutMapping
-    @ApiOperation(value = "修改学生考核类别")
+    @ApiOperation(value = "修改学生操行分考核类别")
     @SaCheckPermission("basestudentbehaviorcategory:edit")
     public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentBehaviorCategoryDto dto){
 
@@ -109,7 +109,7 @@ public class BaseStudentBehaviorCategoryController {
     }
 
     @DeleteMapping
-    @ApiOperation(value = "删除学生考核类别")
+    @ApiOperation(value = "删除学生操行分考核类别")
     @SaCheckPermission("basestudentbehaviorcategory:delete")
     public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
         return RT.ok(baseStudentBehaviorCategoryService.removeBatchByIds(ids));

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

@@ -107,7 +107,7 @@ public class BaseStudentPunishmentInfoController {
     @ApiOperation(value="根据id查询学生处分信息管理信息")
     @SaCheckPermission("basestudentpunishmentinfo:detail")
     public RT<BaseStudentPunishmentInfoVo> info(@RequestParam Long id){
-        BaseStudentPunishmentInfo baseStudentPunishmentInfo = baseStudentPunishmentInfoService.getByIdDeep(id);
+        BaseStudentPunishmentInfo baseStudentPunishmentInfo = baseStudentPunishmentInfoService.getById(id);
         if (baseStudentPunishmentInfo == null) {
            return RT.error("找不到此数据！");
         }

src/main/java/com/xjrsoft/module/student/dto/AddBaseStudentAssessmentClassRelationDto.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 fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentAssessmentClassRelationDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 班级编号id
+    */
+    @ApiModelProperty("班级编号id")
+    private Long classId;
+    /**
+    * 学生班级巡查考核id
+    */
+    @ApiModelProperty("学生班级巡查考核id")
+    private Long baseStudentAssessmentInspectionId;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 班主任姓名
+    */
+    @ApiModelProperty("班主任姓名")
+    private String teacherName;
+
+}

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

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.ListInput;
+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 fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentAssessmentClassRelationListDto extends ListInput {
+
+
+}

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

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 学生班级巡查考核-关联班级
+* @Author fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Data
+public class UpdateBaseStudentAssessmentClassRelationDto extends AddBaseStudentAssessmentClassRelationDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

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

@@ -0,0 +1,61 @@
+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 fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_assessment_class_relation")
+@ApiModel(value = "学生班级巡查考核-关联班级对象", description = "学生班级巡查考核-关联班级")
+public class BaseStudentAssessmentClassRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 班级编号id
+    */
+    @ApiModelProperty("班级编号id")
+    private Long classId;
+    /**
+    * 学生班级巡查考核id
+    */
+    @ApiModelProperty("学生班级巡查考核id")
+    private Long baseStudentAssessmentInspectionId;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 班主任姓名
+    */
+    @ApiModelProperty("班主任姓名")
+    private String teacherName;
+
+
+}

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

@@ -18,14 +18,14 @@ import java.util.Date;
 
 
 /**
-* @title: 学生考核类别
+* @title: 学生操行分考核类别
 * @Author fanxp
 * @Date: 2023-11-15
 * @Version 1.0
 */
 @Data
 @TableName("base_student_behavior_category")
-@ApiModel(value = "学生考核类别对象", description = "学生考核类别")
+@ApiModel(value = "学生操行分考核类别对象", description = "学生操行分考核类别")
 public class BaseStudentBehaviorCategory implements Serializable {
 
     private static final long serialVersionUID = 1L;

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentAssessmentClassRelationMapper.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.BaseStudentAssessmentClassRelation;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学生班级巡查考核-关联班级
+* @Author fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentAssessmentClassRelationMapper extends BaseMapper<BaseStudentAssessmentClassRelation> {
+
+}

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

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
 * @Version 1.0
 */
 @Mapper
-public interface BaseStudentAssessmentProjectMapper extends BaseMapper<BaseStudentAssessmentProject> {
+public interface BaseStudentAssessmentProjectMapper extends MPJBaseMapper<BaseStudentAssessmentProject> {
 
 }

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

@@ -0,0 +1,24 @@
+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.BaseStudentAssessmentClassRelation;
+import com.xjrsoft.module.student.entity.BaseStudentUser;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 学生班级巡查考核-关联班级
+* @Author fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+
+public interface IBaseStudentAssessmentClassRelationService extends IService<BaseStudentAssessmentClassRelation> {
+    /**
+     * 数据缓存
+     *
+     * @return
+     */
+    Boolean dataCache(Long dataId);
+}

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

@@ -13,5 +13,5 @@ import java.util.List;
 * @Version 1.0
 */
 
-public interface IBaseStudentAssessmentProjectService extends IService<BaseStudentAssessmentProject> {
+public interface IBaseStudentAssessmentProjectService extends MPJBaseService<BaseStudentAssessmentProject> {
 }

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

@@ -7,7 +7,7 @@ import lombok.Data;
 import java.util.List;
 
 /**
-* @title: 学生考核类别
+* @title: 学生操行分考核类别
 * @Author fanxp
 * @Date: 2023-11-15
 * @Version 1.0

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

@@ -0,0 +1,30 @@
+package com.xjrsoft.module.student.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentClassRelation;
+import com.xjrsoft.module.student.mapper.BaseStudentAssessmentClassRelationMapper;
+import com.xjrsoft.module.student.service.IBaseStudentAssessmentClassRelationService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 学生班级巡查考核-关联班级
+* @Author fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseStudentAssessmentClassRelationServiceImpl extends ServiceImpl<BaseStudentAssessmentClassRelationMapper, BaseStudentAssessmentClassRelation> implements IBaseStudentAssessmentClassRelationService {
+
+    @Override
+    public Boolean dataCache(Long dataId) {
+        return null;
+    }
+}

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

@@ -21,5 +21,5 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 */
 @Service
 @AllArgsConstructor
-public class BaseStudentAssessmentProjectServiceImpl extends ServiceImpl<BaseStudentAssessmentProjectMapper, BaseStudentAssessmentProject> implements IBaseStudentAssessmentProjectService {
+public class BaseStudentAssessmentProjectServiceImpl extends MPJBaseServiceImpl<BaseStudentAssessmentProjectMapper, BaseStudentAssessmentProject> implements IBaseStudentAssessmentProjectService {
 }

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

@@ -0,0 +1,49 @@
+package com.xjrsoft.module.student.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 学生班级巡查考核-关联班级列表列表入参
+* @Author fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Data
+public class BaseStudentAssessmentClassRelationListVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 班级编号id
+    */
+    @ApiModelProperty("班级编号id")
+    private Long classId;
+    /**
+    * 学生班级巡查考核id
+    */
+    @ApiModelProperty("学生班级巡查考核id")
+    private Long baseStudentAssessmentInspectionId;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 班主任姓名
+    */
+    @ApiModelProperty("班主任姓名")
+    private String teacherName;
+
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentClassRelationVo.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 fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Data
+public class BaseStudentAssessmentClassRelationVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 班级编号id
+    */
+    @ApiModelProperty("班级编号id")
+    private Long classId;
+    /**
+    * 学生班级巡查考核id
+    */
+    @ApiModelProperty("学生班级巡查考核id")
+    private Long baseStudentAssessmentInspectionId;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 班主任姓名
+    */
+    @ApiModelProperty("班主任姓名")
+    private String teacherName;
+
+
+
+}

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

@@ -65,6 +65,11 @@ public class BaseStudentAssessmentProjectPageVo {
     */
     @ApiModelProperty("学生考核类别(base_student_assessment_category)")
     private Long baseStudentAssessmentCategoryId;
+    /**
+     * 学生考核类别名称(base_student_assessment_category)
+     */
+    @ApiModelProperty("学生考核类别名称(base_student_assessment_category)")
+    private String baseStudentAssessmentCategoryName;
     /**
     * 名称
     */

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

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.student.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -38,11 +39,13 @@ public class BaseStudentPunishmentInfoVo {
     * 处分开始日期
     */
     @ApiModelProperty("处分开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date startTime;
     /**
     * 处分结束日期
     */
     @ApiModelProperty("处分结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
     /**
     * 是否公示(1:是 0:否)

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

@@ -149,7 +149,6 @@ CREATE TABLE base_student_assessment_base_score
     PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生考核基础分设置';
 
-
 -- ----------------------------
 -- 学生考核等级设置
 -- ----------------------------
@@ -191,7 +190,6 @@ CREATE TABLE base_student_assessment_category
     PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生考核类别';
 
-
 -- ----------------------------
 -- 学生考核项目
 -- ----------------------------
@@ -251,7 +249,7 @@ CREATE TABLE base_student_assessment_inspection
     `assessment_user_id` bigint not null COMMENT '考核用户ID(xjr_user)',
     `reason` VARCHAR(1000) COMMENT '原因',
     `file_id` bigint NULL DEFAULT NULL COMMENT '文件ID(xjr_file)',
-    `status` INT NOT NULL COMMENT '状态（1:结束 0:未结束）',
+    `status` INT NOT NULL default 0 COMMENT '状态（1:结束 0:未结束）',
     PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生班级巡查考核';
 
@@ -354,7 +352,7 @@ CREATE TABLE base_student_behavior_category
     `status` INT NULL DEFAULT 1 COMMENT '是否启用(1:是 0:否)',
     `remark` VARCHAR(1000) COMMENT '备注',
     PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生考核类别';
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生操行分考核类别';
 
 -- ----------------------------
 -- 学生操行分考核项目
@@ -417,7 +415,7 @@ CREATE TABLE base_student_behavior_manage
     `assessment_department_id` bigint NOT NULL COMMENT '考核机构(xjr_department)',
     `remark` VARCHAR(1000) COMMENT '备注',
     `file_id` bigint NULL DEFAULT NULL COMMENT '文件ID(xjr_file)',
-    `status` INT NOT NULL COMMENT '状态（1:结束 0:未结束）',
+    `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

@@ -659,4 +659,32 @@ public class FreeMarkerGeneratorTest {
         apiGeneratorService.generateCodes(params);
     }
 
+    /**
+     * 学生班级巡查考核-关联班级
+     */
+    @Test
+    public void gcBaseStudentAssessmentClassRelation() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("base_student_assessment_class_relation");//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("fanxp");//作者名称
+        params.setPackageName("student");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(false);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
 }