Pārlūkot izejas kodu

评价管理模块

dzx 1 gadu atpakaļ
vecāks
revīzija
45432532b0
24 mainītis faili ar 1452 papildinājumiem un 0 dzēšanām
  1. 73 0
      src/main/java/com/xjrsoft/module/base/entity/BaseClassroom.java
  2. 21 0
      src/main/java/com/xjrsoft/module/base/mapper/BaseClassroomMapper.java
  3. 105 0
      src/main/java/com/xjrsoft/module/evaluate/controller/EvaluateManageController.java
  4. 48 0
      src/main/java/com/xjrsoft/module/evaluate/dto/AddEvaluateExecuterDto.java
  5. 63 0
      src/main/java/com/xjrsoft/module/evaluate/dto/AddEvaluateManageDto.java
  6. 58 0
      src/main/java/com/xjrsoft/module/evaluate/dto/AddEvaluateObjectDto.java
  7. 26 0
      src/main/java/com/xjrsoft/module/evaluate/dto/EvaluateManagePageDto.java
  8. 34 0
      src/main/java/com/xjrsoft/module/evaluate/dto/UpdateEvaluateManageDto.java
  9. 98 0
      src/main/java/com/xjrsoft/module/evaluate/entity/EvaluateExecuter.java
  10. 130 0
      src/main/java/com/xjrsoft/module/evaluate/entity/EvaluateManage.java
  11. 108 0
      src/main/java/com/xjrsoft/module/evaluate/entity/EvaluateManageItem.java
  12. 108 0
      src/main/java/com/xjrsoft/module/evaluate/entity/EvaluateObject.java
  13. 17 0
      src/main/java/com/xjrsoft/module/evaluate/mapper/EvaluateExecuterMapper.java
  14. 23 0
      src/main/java/com/xjrsoft/module/evaluate/mapper/EvaluateManageItemMapper.java
  15. 26 0
      src/main/java/com/xjrsoft/module/evaluate/mapper/EvaluateManageMapper.java
  16. 17 0
      src/main/java/com/xjrsoft/module/evaluate/mapper/EvaluateObjectMapper.java
  17. 52 0
      src/main/java/com/xjrsoft/module/evaluate/service/IEvaluateManageService.java
  18. 162 0
      src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateManageServiceImpl.java
  19. 49 0
      src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateExecuterVo.java
  20. 59 0
      src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateManagePageVo.java
  21. 81 0
      src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateManageVo.java
  22. 59 0
      src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateObjectVo.java
  23. 12 0
      src/main/resources/mapper/base/BaseClassroom.xml
  24. 23 0
      src/main/resources/mapper/evaluate/EvaluateManageMapper.xml

+ 73 - 0
src/main/java/com/xjrsoft/module/base/entity/BaseClassroom.java

@@ -0,0 +1,73 @@
+package com.xjrsoft.module.base.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 班级表
+ * </p>
+ *
+ * @author baomidou
+ * @since 2023-09-02 04:52:58
+ */
+@Data
+@TableName("base_classroom")
+@ApiModel(value = "BaseClassroom", description = "教室表")
+public class BaseClassroom implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private Long id;
+
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+
+    @ApiModelProperty("教室名称")
+    private String name;
+
+    @ApiModelProperty("楼栋(base_office_build)")
+    private Long officeBuildId;
+
+    @ApiModelProperty("楼层")
+    private Integer floorNum;
+
+    @ApiModelProperty("教室用途(xjr_dictionary_item[purpose])")
+    private String purpose;
+
+    @ApiModelProperty("教室类型(xjr_dictionary_item[classroom_type])")
+    private String classroomType;
+
+    @ApiModelProperty("组织机构(xjr_department)")
+    private Long orgId;
+
+    @ApiModelProperty("面积(平米)")
+    private Double square;
+
+    @ApiModelProperty("容量(人数)")
+    private Double capacity;
+
+    @ApiModelProperty("状态(1:可用 0:停用)")
+    private Integer status;
+}

+ 21 - 0
src/main/java/com/xjrsoft/module/base/mapper/BaseClassroomMapper.java

@@ -0,0 +1,21 @@
+package com.xjrsoft.module.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xjrsoft.module.base.entity.BaseClassroom;
+import com.xjrsoft.module.schedule.vo.ClassroomJianyuekbVo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 教室表 Mapper 接口
+ * </p>
+ *
+ * @author dzx
+ * @since 2024年1月12日
+ */
+@Mapper
+public interface BaseClassroomMapper extends BaseMapper<BaseClassroom> {
+    List<ClassroomJianyuekbVo> getJianyueList();
+}

+ 105 - 0
src/main/java/com/xjrsoft/module/evaluate/controller/EvaluateManageController.java

@@ -0,0 +1,105 @@
+package com.xjrsoft.module.evaluate.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.module.evaluate.dto.AddEvaluateManageDto;
+import com.xjrsoft.module.evaluate.dto.EvaluateManagePageDto;
+import com.xjrsoft.module.evaluate.dto.UpdateEvaluateManageDto;
+import com.xjrsoft.module.evaluate.entity.EvaluateManage;
+import com.xjrsoft.module.evaluate.service.IEvaluateManageService;
+import com.xjrsoft.module.evaluate.vo.EvaluateManagePageVo;
+import com.xjrsoft.module.evaluate.vo.EvaluateManageVo;
+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: 2024-01-16
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/evaluate" + "/evaluateManage")
+@Api(value = "/evaluate"  + "/evaluateManage",tags = "评价管理代码")
+@AllArgsConstructor
+public class EvaluateManageController {
+
+
+    private final IEvaluateManageService evaluateManageService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="评价管理列表(分页)")
+    @SaCheckPermission("evaluatemanage:detail")
+    public RT<PageOutput<EvaluateManagePageVo>> page(@Valid EvaluateManagePageDto dto){
+        Page<EvaluateManagePageVo> page = evaluateManageService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        PageOutput<EvaluateManagePageVo> pageOutput = ConventPage.getPageOutput(page, EvaluateManagePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询评价管理信息")
+    @SaCheckPermission("evaluatemanage:detail")
+    public RT<EvaluateManageVo> info(@RequestParam Long id){
+        EvaluateManage evaluateManage = evaluateManageService.getByIdDeep(id);
+        if (evaluateManage == null) {
+           return RT.error("找不到此数据!");
+        }
+        return RT.ok(BeanUtil.toBean(evaluateManage, EvaluateManageVo.class));
+    }
+
+    @PostMapping(value = "/release")
+    @ApiOperation(value="发布")
+    @SaCheckPermission("evaluatemanage:detail")
+    public RT<EvaluateManageVo> release(@RequestParam Long id){
+        EvaluateManage evaluateManage = evaluateManageService.getByIdDeep(id);
+        if (evaluateManage == null) {
+            return RT.error("找不到此数据!");
+        }
+        return RT.ok(BeanUtil.toBean(evaluateManage, EvaluateManageVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增评价管理")
+    @SaCheckPermission("evaluatemanage:add")
+    public RT<Boolean> add(@Valid @RequestBody AddEvaluateManageDto dto){
+        EvaluateManage evaluateManage = BeanUtil.toBean(dto, EvaluateManage.class);
+        boolean isSuccess = evaluateManageService.add(evaluateManage);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改评价管理")
+    @SaCheckPermission("evaluatemanage:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateEvaluateManageDto dto){
+
+        EvaluateManage evaluateManage = BeanUtil.toBean(dto, EvaluateManage.class);
+        return RT.ok(evaluateManageService.update(evaluateManage));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除评价管理")
+    @SaCheckPermission("evaluatemanage:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(evaluateManageService.delete(ids));
+
+    }
+
+}

+ 48 - 0
src/main/java/com/xjrsoft/module/evaluate/dto/AddEvaluateExecuterDto.java

@@ -0,0 +1,48 @@
+package com.xjrsoft.module.evaluate.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 评价执行人
+* @Author dzx
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+public class AddEvaluateExecuterDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 评价管理编号
+    */
+    @ApiModelProperty("评价管理编号")
+    private Long evaluateManageId;
+    /**
+    * 被评对象id
+    */
+    @ApiModelProperty("被评对象id")
+    private Long evaluateObjectId;
+    /**
+    * 参加评价的人id
+    */
+    @ApiModelProperty("参加评价的人id")
+    private Long userId;
+
+}

+ 63 - 0
src/main/java/com/xjrsoft/module/evaluate/dto/AddEvaluateManageDto.java

@@ -0,0 +1,63 @@
+package com.xjrsoft.module.evaluate.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+* @title: 评价管理
+* @Author dzx
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+public class AddEvaluateManageDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 评价模版编号
+    */
+    @ApiModelProperty("评价模版编号")
+    private Long evaluateTemplateId;
+    /**
+    * 学期id
+    */
+    @ApiModelProperty("学期id")
+    private Long baseSemesterId;
+    /**
+    * 题目分数(最小为0,只能整数)
+    */
+    @ApiModelProperty("发布部门id")
+    private Long orgId;
+    /**
+    * 评价名称
+    */
+    @ApiModelProperty("评价名称")
+    private String name;
+    /**
+    * 开始时间
+    */
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+    /**
+    * 结束时间
+    */
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+    /**
+    * 状态(1:进行中,0,暂停)
+    */
+    @ApiModelProperty("状态(-1:未发布,1:进行中,0,暂停)")
+    private Integer status;
+
+}

+ 58 - 0
src/main/java/com/xjrsoft/module/evaluate/dto/AddEvaluateObjectDto.java

@@ -0,0 +1,58 @@
+package com.xjrsoft.module.evaluate.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 被评价对象
+* @Author dzx
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+public class AddEvaluateObjectDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 评价管理编号
+    */
+    @ApiModelProperty("评价管理编号")
+    private Long evaluateManageId;
+    /**
+    * 年级id
+    */
+    @ApiModelProperty("年级id")
+    private Long baseGradeId;
+    /**
+    * 题目分数(最小为0,只能整数)
+    */
+    @ApiModelProperty("题目分数(最小为0,只能整数)")
+    private Long orgId;
+    /**
+    * 被评价对象id
+    */
+    @ApiModelProperty("被评价对象id")
+    private Long objectId;
+    /**
+    * 被评价对象类别(teacher:老师,class:班级,student:学生)
+    */
+    @ApiModelProperty("被评价对象类别(teacher:老师,class:班级,student:学生)")
+    private String objectType;
+
+}

+ 26 - 0
src/main/java/com/xjrsoft/module/evaluate/dto/EvaluateManagePageDto.java

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.evaluate.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: 2024-01-16
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class EvaluateManagePageDto extends PageInput {
+
+
+}

+ 34 - 0
src/main/java/com/xjrsoft/module/evaluate/dto/UpdateEvaluateManageDto.java

@@ -0,0 +1,34 @@
+package com.xjrsoft.module.evaluate.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.evaluate.entity.EvaluateObject;
+import com.xjrsoft.module.evaluate.entity.EvaluateExecuter;
+
+
+
+/**
+* @title: 评价管理
+* @Author dzx
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+public class UpdateEvaluateManageDto extends AddEvaluateManageDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

+ 98 - 0
src/main/java/com/xjrsoft/module/evaluate/entity/EvaluateExecuter.java

@@ -0,0 +1,98 @@
+package com.xjrsoft.module.evaluate.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 评价执行人
+* @Author dzx
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+@TableName("evaluate_executer")
+@ApiModel(value = "evaluate_executer", description = "评价执行人")
+public class EvaluateExecuter 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 Long evaluateManageId;
+    /**
+    * 被评对象id
+    */
+    @ApiModelProperty("被评对象id")
+    private Long evaluateObjectId;
+    /**
+    * 参加评价的人id
+    */
+    @ApiModelProperty("参加评价的人id")
+    private Long userId;
+
+
+}

+ 130 - 0
src/main/java/com/xjrsoft/module/evaluate/entity/EvaluateManage.java

@@ -0,0 +1,130 @@
+package com.xjrsoft.module.evaluate.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+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.util.Date;
+import java.util.List;
+
+
+/**
+* @title: 评价管理
+* @Author dzx
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+@TableName("evaluate_manage")
+@ApiModel(value = "evaluate_manage", description = "评价管理")
+public class EvaluateManage 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 Long evaluateTemplateId;
+    /**
+    * 学期id
+    */
+    @ApiModelProperty("学期id")
+    private Long baseSemesterId;
+    /**
+    * 发布部门id
+    */
+    @ApiModelProperty("发布部门id")
+    private Long orgId;
+    /**
+    * 评价名称
+    */
+    @ApiModelProperty("评价名称")
+    private String name;
+    /**
+    * 开始时间
+    */
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+    /**
+    * 结束时间
+    */
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+    /**
+    * 状态(1:进行中,0,暂停)
+    */
+    @ApiModelProperty("状态(-1:未发布,1:进行中,0,暂停)")
+    private Integer status;
+
+    /**
+    * evaluateObject
+    */
+    @ApiModelProperty("evaluateObject子表")
+    @TableField(exist = false)
+    @EntityMapping(thisField = "id", joinField = "evaluateManageId")
+    private List<EvaluateObject> evaluateObjectList;
+    /**
+    * evaluateExecuter
+    */
+    @ApiModelProperty("evaluateExecuter子表")
+    @TableField(exist = false)
+    @EntityMapping(thisField = "id", joinField = "evaluateManageId")
+    private List<EvaluateExecuter> evaluateExecuterList;
+
+}

+ 108 - 0
src/main/java/com/xjrsoft/module/evaluate/entity/EvaluateManageItem.java

@@ -0,0 +1,108 @@
+package com.xjrsoft.module.evaluate.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+* @title: 评价项
+* @Author dzx
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+@TableName("evaluate_manage_item")
+@ApiModel(value = "evaluate_manage_item", description = "评价管理题目")
+public class EvaluateManageItem 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 Long evaluateManageId;
+    /**
+    * 标题名称
+    */
+    @ApiModelProperty("标题名称")
+    private String topic;
+    /**
+    * 题目名称
+    */
+    @ApiModelProperty("题目名称")
+    private String problem;
+    /**
+    * 题目分数(最小为0,只能整数)
+    */
+    @ApiModelProperty("题目分数(最小为0,只能整数)")
+    private Integer score;
+    /**
+    * 输入框是否为空
+    */
+    @ApiModelProperty("输入框是否为空")
+    private Integer inputNotNull;
+
+    /**
+     * 评价项编号
+     */
+    @ApiModelProperty("评价项编号")
+    private Long evaluateItemId;
+}

+ 108 - 0
src/main/java/com/xjrsoft/module/evaluate/entity/EvaluateObject.java

@@ -0,0 +1,108 @@
+package com.xjrsoft.module.evaluate.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 被评价对象
+* @Author dzx
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+@TableName("evaluate_object")
+@ApiModel(value = "evaluate_object", description = "被评价对象")
+public class EvaluateObject 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 Long evaluateManageId;
+    /**
+    * 年级id
+    */
+    @ApiModelProperty("年级id")
+    private Long baseGradeId;
+    /**
+    * 题目分数(最小为0,只能整数)
+    */
+    @ApiModelProperty("题目分数(最小为0,只能整数)")
+    private Long orgId;
+    /**
+    * 被评价对象id
+    */
+    @ApiModelProperty("被评价对象id")
+    private Long objectId;
+    /**
+    * 被评价对象类别(teacher:老师,class:班级,student:学生)
+    */
+    @ApiModelProperty("被评价对象类别(teacher:老师,class:班级,student:学生)")
+    private String objectType;
+
+
+}

+ 17 - 0
src/main/java/com/xjrsoft/module/evaluate/mapper/EvaluateExecuterMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.evaluate.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.evaluate.entity.EvaluateExecuter;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 评价执行人
+* @Author dzx
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Mapper
+public interface EvaluateExecuterMapper extends MPJBaseMapper<EvaluateExecuter> {
+
+}

+ 23 - 0
src/main/java/com/xjrsoft/module/evaluate/mapper/EvaluateManageItemMapper.java

@@ -0,0 +1,23 @@
+package com.xjrsoft.module.evaluate.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.evaluate.entity.EvaluateManageItem;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 评价项
+* @Author dzx
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Mapper
+public interface EvaluateManageItemMapper extends MPJBaseMapper<EvaluateManageItem> {
+
+    @Insert("INSERT INTO evaluate_manage_item(id,create_user_id,create_date,delete_mark,enabled_mark,sort_code," +
+            " evaluate_manage_id,topic,problem,score,input_not_null,evaluate_item_id) " +
+            " SELECT CONCAT(id,RIGHT(#{evaluateManageId}, 5)),#{createUserId},NOW(),0,1,sort_code," +
+            "#{evaluateManageId},topic,problem,score,input_not_null,id FROM evaluate_item" +
+            " WHERE delete_mark = 0 AND evaluate_template_id = #{evaluateTemplateId}")
+    Boolean cloneItems(Long evaluateTemplateId, Long evaluateManageId, Long createUserId);
+}

+ 26 - 0
src/main/java/com/xjrsoft/module/evaluate/mapper/EvaluateManageMapper.java

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.evaluate.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.evaluate.dto.EvaluateManagePageDto;
+import com.xjrsoft.module.evaluate.entity.EvaluateManage;
+import com.xjrsoft.module.evaluate.vo.EvaluateManagePageVo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 评价管理
+* @Author dzx
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Mapper
+public interface EvaluateManageMapper extends MPJBaseMapper<EvaluateManage> {
+
+    /**
+     * 分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<EvaluateManagePageVo> getPage(Page<EvaluateManagePageDto> page, EvaluateManagePageDto dto);
+}

+ 17 - 0
src/main/java/com/xjrsoft/module/evaluate/mapper/EvaluateObjectMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.evaluate.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.evaluate.entity.EvaluateObject;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 被评价对象
+* @Author dzx
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Mapper
+public interface EvaluateObjectMapper extends MPJBaseMapper<EvaluateObject> {
+
+}

+ 52 - 0
src/main/java/com/xjrsoft/module/evaluate/service/IEvaluateManageService.java

@@ -0,0 +1,52 @@
+package com.xjrsoft.module.evaluate.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.evaluate.dto.EvaluateManagePageDto;
+import com.xjrsoft.module.evaluate.entity.EvaluateManage;
+import com.xjrsoft.module.evaluate.vo.EvaluateManagePageVo;
+
+import java.util.List;
+
+/**
+* @title: 评价管理
+* @Author dzx
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+
+public interface IEvaluateManageService extends MPJBaseService<EvaluateManage> {
+    /**
+    * 新增
+    *
+    * @param evaluateManage
+    * @return
+    */
+    Boolean add(EvaluateManage evaluateManage);
+
+    /**
+    * 更新
+    *
+    * @param evaluateManage
+    * @return
+    */
+    Boolean update(EvaluateManage evaluateManage);
+
+    /**
+    * 删除
+    *
+    * @param ids
+    * @return
+    */
+    Boolean delete(List<Long> ids);
+
+    /**
+     * 分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<EvaluateManagePageVo> getPage(Page<EvaluateManagePageDto> page, EvaluateManagePageDto dto);
+
+    Boolean release(Long id);
+}

+ 162 - 0
src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateManageServiceImpl.java

@@ -0,0 +1,162 @@
+package com.xjrsoft.module.evaluate.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.common.exception.MyException;
+import com.xjrsoft.module.evaluate.dto.EvaluateManagePageDto;
+import com.xjrsoft.module.evaluate.entity.EvaluateExecuter;
+import com.xjrsoft.module.evaluate.entity.EvaluateItem;
+import com.xjrsoft.module.evaluate.entity.EvaluateManage;
+import com.xjrsoft.module.evaluate.entity.EvaluateManageItem;
+import com.xjrsoft.module.evaluate.entity.EvaluateObject;
+import com.xjrsoft.module.evaluate.mapper.EvaluateExecuterMapper;
+import com.xjrsoft.module.evaluate.mapper.EvaluateItemMapper;
+import com.xjrsoft.module.evaluate.mapper.EvaluateManageItemMapper;
+import com.xjrsoft.module.evaluate.mapper.EvaluateManageMapper;
+import com.xjrsoft.module.evaluate.mapper.EvaluateObjectMapper;
+import com.xjrsoft.module.evaluate.service.IEvaluateManageService;
+import com.xjrsoft.module.evaluate.vo.EvaluateManagePageVo;
+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: 2024-01-16
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class EvaluateManageServiceImpl extends MPJBaseServiceImpl<EvaluateManageMapper, EvaluateManage> implements IEvaluateManageService {
+    private final EvaluateManageMapper evaluateManageMapper;
+
+    private final EvaluateObjectMapper evaluateObjectMapper;
+    private final EvaluateExecuterMapper evaluateExecuterMapper;
+    private final EvaluateItemMapper evaluateItemMapper;
+    private final EvaluateManageItemMapper evaluateManageItemMapper;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean add(EvaluateManage evaluateManage) {
+        evaluateManage.setStatus(-1);
+        evaluateManageMapper.insert(evaluateManage);
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean update(EvaluateManage evaluateManage) {
+        evaluateManageMapper.updateById(evaluateManage);
+        //********************************* EvaluateObject  增删改  开始 *******************************************/
+        {
+            // 查出所有子级的id
+            List<EvaluateObject> evaluateObjectList = evaluateObjectMapper.selectList(Wrappers.lambdaQuery(EvaluateObject.class).eq(EvaluateObject::getEvaluateManageId, evaluateManage.getId()).select(EvaluateObject::getId));
+            List<Long> evaluateObjectIds = evaluateObjectList.stream().map(EvaluateObject::getId).collect(Collectors.toList());
+            //原有子表单 没有被删除的主键
+            List<Long> evaluateObjectOldIds = evaluateManage.getEvaluateObjectList().stream().map(EvaluateObject::getId).filter(Objects::nonNull).collect(Collectors.toList());
+            //找到需要删除的id
+            List<Long> evaluateObjectRemoveIds = evaluateObjectIds.stream().filter(item -> !evaluateObjectOldIds.contains(item)).collect(Collectors.toList());
+
+            for (EvaluateObject evaluateObject : evaluateManage.getEvaluateObjectList()) {
+                //如果不等于空则修改
+                if (evaluateObject.getId() != null) {
+                    evaluateObjectMapper.updateById(evaluateObject);
+                }
+                //如果等于空 则新增
+                else {
+                    //已经不存在的id 删除
+                    evaluateObject.setEvaluateManageId(evaluateManage.getId());
+                    evaluateObjectMapper.insert(evaluateObject);
+                }
+            }
+            //已经不存在的id 删除
+            if(evaluateObjectRemoveIds.size() > 0){
+                evaluateObjectMapper.deleteBatchIds(evaluateObjectRemoveIds);
+            }
+        }
+        //********************************* EvaluateObject  增删改  结束 *******************************************/
+
+        //********************************* EvaluateExecuter  增删改  开始 *******************************************/
+        {
+            // 查出所有子级的id
+            List<EvaluateExecuter> evaluateExecuterList = evaluateExecuterMapper.selectList(Wrappers.lambdaQuery(EvaluateExecuter.class).eq(EvaluateExecuter::getEvaluateManageId, evaluateManage.getId()).select(EvaluateExecuter::getId));
+            List<Long> evaluateExecuterIds = evaluateExecuterList.stream().map(EvaluateExecuter::getId).collect(Collectors.toList());
+            //原有子表单 没有被删除的主键
+            List<Long> evaluateExecuterOldIds = evaluateManage.getEvaluateExecuterList().stream().map(EvaluateExecuter::getId).filter(Objects::nonNull).collect(Collectors.toList());
+            //找到需要删除的id
+            List<Long> evaluateExecuterRemoveIds = evaluateExecuterIds.stream().filter(item -> !evaluateExecuterOldIds.contains(item)).collect(Collectors.toList());
+
+            for (EvaluateExecuter evaluateExecuter : evaluateManage.getEvaluateExecuterList()) {
+                //如果不等于空则修改
+                if (evaluateExecuter.getId() != null) {
+                    evaluateExecuterMapper.updateById(evaluateExecuter);
+                }
+                //如果等于空 则新增
+                else {
+                    //已经不存在的id 删除
+                    evaluateExecuter.setEvaluateManageId(evaluateManage.getId());
+                    evaluateExecuterMapper.insert(evaluateExecuter);
+                }
+            }
+            //已经不存在的id 删除
+            if(evaluateExecuterRemoveIds.size() > 0){
+                evaluateExecuterMapper.deleteBatchIds(evaluateExecuterRemoveIds);
+            }
+        }
+        //********************************* EvaluateExecuter  增删改  结束 *******************************************/
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(List<Long> ids) {
+        evaluateManageMapper.deleteBatchIds(ids);
+        evaluateObjectMapper.delete(Wrappers.lambdaQuery(EvaluateObject.class).in(EvaluateObject::getEvaluateManageId, ids));
+        evaluateExecuterMapper.delete(Wrappers.lambdaQuery(EvaluateExecuter.class).in(EvaluateExecuter::getEvaluateManageId, ids));
+
+        return true;
+    }
+
+    @Override
+    public Page<EvaluateManagePageVo> getPage(Page<EvaluateManagePageDto> page, EvaluateManagePageDto dto) {
+        return evaluateManageMapper.getPage(page, dto);
+    }
+
+    @Override
+    public Boolean release(Long id) {
+        EvaluateManage evaluateManage = evaluateManageMapper.selectById(id);
+        if(evaluateManage == null){
+            throw new MyException("未查询到数据,请检查传入的id是否正确");
+        }
+        evaluateManageItemMapper.cloneItems(evaluateManage.getEvaluateTemplateId(), evaluateManage.getId(), StpUtil.getLoginIdAsLong());
+
+//        //查询模板中的评价项
+//        List<EvaluateItem> evaluateItemList = evaluateItemMapper.selectList(
+//            new QueryWrapper<EvaluateItem>().lambda()
+//            .eq(EvaluateItem::getEvaluateTemplateId, evaluateManage.getEvaluateTemplateId())
+//        );
+//        //克隆一份,存到评价管理下面,可以采用sql语句
+//        for (EvaluateItem evaluateItem : evaluateItemList) {
+//            EvaluateManageItem manageItem = BeanUtil.toBean(evaluateItem, EvaluateManageItem.class);
+//            manageItem.setEvaluateManageId(evaluateManage.getId());
+//            manageItem.setEvaluateItemId(manageItem.getId());
+//            evaluateManageItemMapper.insert(manageItem);
+//        }
+        //将评价管理状态改为进行中
+        evaluateManage.setStatus(1);
+        evaluateManageMapper.insert(evaluateManage);
+        return true;
+    }
+}

+ 49 - 0
src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateExecuterVo.java

@@ -0,0 +1,49 @@
+package com.xjrsoft.module.evaluate.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 评价执行人表单出参
+* @Author dzx
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+public class EvaluateExecuterVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 评价管理编号
+    */
+    @ApiModelProperty("评价管理编号")
+    private Long evaluateManageId;
+    /**
+    * 被评对象id
+    */
+    @ApiModelProperty("被评对象id")
+    private Long evaluateObjectId;
+    /**
+    * 参加评价的人id
+    */
+    @ApiModelProperty("参加评价的人id")
+    private Long userId;
+
+
+
+}

+ 59 - 0
src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateManagePageVo.java

@@ -0,0 +1,59 @@
+package com.xjrsoft.module.evaluate.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 评价管理分页列表出参
+* @Author dzx
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+public class EvaluateManagePageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 学期名称
+    */
+    @ApiModelProperty("学期名称")
+    private String semesterName;
+    /**
+    * 发布部门
+    */
+    @ApiModelProperty("发布部门")
+    private String orgName;
+    /**
+    * 评价类型-中文
+    */
+    @ApiModelProperty("评价类型-中文")
+    private String evaluateTypeCn;
+    /**
+    * 评价名称
+    */
+    @ApiModelProperty("评价名称")
+    private String name;
+
+    /**
+    * 开始时间
+    */
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+    /**
+    * 结束时间
+    */
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+    /**
+    * 状态(1:进行中,0,暂停)
+    */
+    @ApiModelProperty("状态(1:进行中,0,暂停)")
+    private Integer status;
+
+}

+ 81 - 0
src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateManageVo.java

@@ -0,0 +1,81 @@
+package com.xjrsoft.module.evaluate.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.evaluate.entity.EvaluateObject;
+import com.xjrsoft.module.evaluate.entity.EvaluateExecuter;
+
+/**
+* @title: 评价管理表单出参
+* @Author dzx
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+public class EvaluateManageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 评价模版编号
+    */
+    @ApiModelProperty("评价模版编号")
+    private Long evaluateTemplateId;
+    /**
+    * 学期id
+    */
+    @ApiModelProperty("学期id")
+    private Long baseSemesterId;
+    /**
+    * 题目分数(最小为0,只能整数)
+    */
+    @ApiModelProperty("题目分数(最小为0,只能整数)")
+    private Long orgId;
+    /**
+    * 评价名称
+    */
+    @ApiModelProperty("评价名称")
+    private String name;
+    /**
+    * 开始时间
+    */
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+    /**
+    * 结束时间
+    */
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+    /**
+    * 状态(1:进行中,0,暂停)
+    */
+    @ApiModelProperty("状态(1:进行中,0,暂停)")
+    private Integer status;
+
+
+    /**
+    * evaluateObject
+    */
+    @ApiModelProperty("evaluateObject子表")
+    private List<EvaluateObjectVo> evaluateObjectList;
+    /**
+    * evaluateExecuter
+    */
+    @ApiModelProperty("evaluateExecuter子表")
+    private List<EvaluateExecuterVo> evaluateExecuterList;
+
+}

+ 59 - 0
src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateObjectVo.java

@@ -0,0 +1,59 @@
+package com.xjrsoft.module.evaluate.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 被评价对象表单出参
+* @Author dzx
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+public class EvaluateObjectVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 评价管理编号
+    */
+    @ApiModelProperty("评价管理编号")
+    private Long evaluateManageId;
+    /**
+    * 年级id
+    */
+    @ApiModelProperty("年级id")
+    private Long baseGradeId;
+    /**
+    * 题目分数(最小为0,只能整数)
+    */
+    @ApiModelProperty("题目分数(最小为0,只能整数)")
+    private Long orgId;
+    /**
+    * 被评价对象id
+    */
+    @ApiModelProperty("被评价对象id")
+    private Long objectId;
+    /**
+    * 被评价对象类别(teacher:老师,class:班级,student:学生)
+    */
+    @ApiModelProperty("被评价对象类别(teacher:老师,class:班级,student:学生)")
+    private String objectType;
+
+
+
+}

+ 12 - 0
src/main/resources/mapper/base/BaseClassroom.xml

@@ -0,0 +1,12 @@
+<?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.base.mapper.BaseClassroomMapper">
+    <select id="getJianyueList" resultType="com.xjrsoft.module.schedule.vo.ClassroomJianyuekbVo">
+        SELECT t1.name, t1.capacity AS people_count,t2.address AS location, t1.floor_num AS floor, t1.id AS extendId FROM base_classroom t1
+        INNER JOIN base_office_build t2 ON t1.office_build_id = t2.id
+        WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
+    </select>
+
+</mapper>

+ 23 - 0
src/main/resources/mapper/evaluate/EvaluateManageMapper.xml

@@ -0,0 +1,23 @@
+<?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.evaluate.mapper.EvaluateManageMapper">
+    <select id="getPage" parameterType="com.xjrsoft.module.evaluate.dto.EvaluateManagePageDto" resultType="com.xjrsoft.module.evaluate.vo.EvaluateManagePageVo">
+        SELECT t1.id,t2.name AS semester_name,t4.name AS org_name,t5.name AS evaluate_type_cn,t1.name,t1.start_time,t1.end_time,t1.status FROM evaluate_manage t1
+        LEFT JOIN base_semester t2 ON t2.id = t1.base_semester_id
+        LEFT JOIN evaluate_template t3 ON t3.id = t1.evaluate_template_id
+        LEFT JOIN xjr_department t4 ON t4.id = t1.org_id
+        LEFT JOIN xjr_dictionary_detail t5 ON t5.code = t3.evaluate_type AND t5.item_id = 1746831039385366530
+        WHERE t1.delete_mark = 0
+        ORDER BY t1.create_date DESC
+    </select>
+    <select id="getList" parameterType="com.xjrsoft.module.room.dto.RoomPageDto" resultType="com.xjrsoft.module.room.vo.RoomExcelVo">
+    </select>
+    <select id="getMaxSortCode" resultType="java.lang.Integer">
+        SELECT IFNULL(MAX(sort_code),1) FROM room WHERE delete_mark = 0
+    </select>
+
+    <select id="getRoomClassCount" resultType="com.xjrsoft.module.room.vo.RoomClassCountVo">
+    </select>
+</mapper>