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

src/main/java/com/xjrsoft/module/evaluate/controller/EvaluateItemController.java

@@ -59,12 +59,4 @@ public class EvaluateItemController {
         boolean isSuccess = evaluateItemService.addEvaluateItem(dto);
         return RT.ok(isSuccess);
     }
-
-    @PutMapping
-    @ApiOperation(value = "修改评价项")
-    @SaCheckPermission("evaluateitem:edit")
-    public RT<Boolean> update(@Valid @RequestBody List<AddEvaluateItemDto> dto){
-        return RT.ok(evaluateItemService.updateEvaluateItem(dto));
-
-    }
 }

src/main/java/com/xjrsoft/module/evaluate/controller/EvaluateResultController.java

@@ -0,0 +1,64 @@
+package com.xjrsoft.module.evaluate.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.EvaluateResultDetailPageDetailDto;
+import com.xjrsoft.module.evaluate.dto.EvaluateResultDetailPageDto;
+import com.xjrsoft.module.evaluate.dto.EvaluateResultIndexPageDto;
+import com.xjrsoft.module.evaluate.service.IEvaluateResultService;
+import com.xjrsoft.module.evaluate.vo.EvaluateResultDetailPageDetailVo;
+import com.xjrsoft.module.evaluate.vo.EvaluateResultDetailPageVo;
+import com.xjrsoft.module.evaluate.vo.EvaluateResultIndexPageVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+* @title: 评价结果
+* @Author szs
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/evaluate" + "/evaluateResult")
+@Api(value = "/evaluate"  + "/evaluateResult",tags = "评价结果代码")
+@AllArgsConstructor
+public class EvaluateResultController {
+
+
+    private final IEvaluateResultService evaluateResultService;
+
+    @GetMapping(value = "/index-page")
+    @ApiOperation(value="评价结果首页列表(分页)")
+    @SaCheckPermission("evaluateresult:detail")
+    public RT<PageOutput<EvaluateResultIndexPageVo>> indexPage(@Valid EvaluateResultIndexPageDto dto){
+        IPage<EvaluateResultIndexPageVo> page = evaluateResultService.getIndexPage(dto);
+        PageOutput<EvaluateResultIndexPageVo> pageOutput = ConventPage.getPageOutput(page, EvaluateResultIndexPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/detail-page")
+    @ApiOperation(value="评价结果详情查看列表(分页)")
+    @SaCheckPermission("evaluateresult:detail")
+    public RT<PageOutput<EvaluateResultDetailPageVo>> detailPage(@Valid EvaluateResultDetailPageDto dto){
+        IPage<EvaluateResultDetailPageVo> page = evaluateResultService.getDetailPage(dto);
+        PageOutput<EvaluateResultDetailPageVo> pageOutput = ConventPage.getPageOutput(page, EvaluateResultDetailPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/detail-page-detail")
+    @ApiOperation(value="评价结果详情查看列表的详情(分页)")
+    @SaCheckPermission("evaluateresult:detail")
+    public RT<EvaluateResultDetailPageDetailVo> detailPageDetail(@Valid EvaluateResultDetailPageDetailDto dto){
+        EvaluateResultDetailPageDetailVo evaluateResultDetailPageDetailVo = evaluateResultService.getDetailPageDetail(dto);
+        return RT.ok(evaluateResultDetailPageDetailVo);
+    }
+}

src/main/java/com/xjrsoft/module/evaluate/dto/AddEvaluateResultDto.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 szs
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+public class AddEvaluateResultDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 评价项编号
+    */
+    @ApiModelProperty("评价项编号")
+    private Long evaluateItemId;
+    /**
+    * 参评人编号
+    */
+    @ApiModelProperty("参评人编号")
+    private String userId;
+    /**
+    * 被评对象（teacher：老师，class：班级，student：学生）
+    */
+    @ApiModelProperty("被评对象（teacher：老师，class：班级，student：学生）")
+    private String evaluatedObject;
+    /**
+    * 被评对象编号
+    */
+    @ApiModelProperty("被评对象编号")
+    private Long evaluatedObjectId;
+    /**
+    * 评价分数
+    */
+    @ApiModelProperty("评价分数")
+    private Integer score;
+    /**
+    * 建议/意见
+    */
+    @ApiModelProperty("建议/意见")
+    private String opinion;
+
+}

src/main/java/com/xjrsoft/module/evaluate/dto/EvaluateResultDetailPageDetailDto.java

@@ -0,0 +1,34 @@
+package com.xjrsoft.module.evaluate.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 评价结果分页查询入参
+* @Author szs
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class EvaluateResultDetailPageDetailDto{
+    /**
+     * 评价管理主键编号
+     */
+    @ApiModelProperty(value = "评价管理主键编号",required = true)
+    private Long evaluateManageId;
+
+    /**
+     * 被评对象id
+     */
+    @ApiModelProperty(value = "被评对象id",required = true)
+    private Long evaluatedObjectId;
+
+    /**
+     * 参评人id
+     */
+    @ApiModelProperty(value = "参评人id",required = true)
+    private Long userId;
+}

src/main/java/com/xjrsoft/module/evaluate/dto/EvaluateResultDetailPageDto.java

@@ -0,0 +1,35 @@
+package com.xjrsoft.module.evaluate.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 评价结果分页查询入参
+* @Author szs
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class EvaluateResultDetailPageDto extends PageInput {
+    /**
+     * 评价管理主键编号
+     */
+    @ApiModelProperty(value = "评价管理主键编号",required = true)
+    private Long evaluateManageId;
+
+    /**
+     * 被评对象id
+     */
+    @ApiModelProperty("被评对象id")
+    private Long evaluatedObjectId;
+
+    /**
+     * 参评人id
+     */
+    @ApiModelProperty("参评人id")
+    private Long userId;
+}

src/main/java/com/xjrsoft/module/evaluate/dto/EvaluateResultIndexPageDto.java

@@ -0,0 +1,56 @@
+package com.xjrsoft.module.evaluate.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+
+/**
+* @title: 评价结果分页查询入参
+* @Author szs
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class EvaluateResultIndexPageDto extends PageInput {
+    /**
+     * 学期id
+     */
+    @ApiModelProperty("学期id")
+    private Long baseSemesterId;
+
+    /**
+     * 发布部门id
+     */
+    @ApiModelProperty("发布部门id")
+    private Long orgId;
+
+    /**
+     * 评价类型
+     */
+    @ApiModelProperty("评价类型")
+    private String evaluateType;
+
+    /**
+     * 评价名称
+     */
+    @ApiModelProperty("评价名称")
+    private String name;
+
+    /**
+     * 开始时间
+     */
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+
+}

src/main/java/com/xjrsoft/module/evaluate/dto/EvaluateResultPageDto.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 szs
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class EvaluateResultPageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/evaluate/dto/MakeEvaluateItemDto.java

@@ -18,6 +18,6 @@ public class MakeEvaluateItemDto{
     /**
      * 评价模版编号
      */
-    @ApiModelProperty("评价模版编号")
+    @ApiModelProperty(value = "评价模版编号",required = true)
     private Long evaluateTemplateId;
 }

src/main/java/com/xjrsoft/module/evaluate/dto/UpdateEvaluateResultDto.java

@@ -0,0 +1,32 @@
+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;
+
+
+
+/**
+* @title: 评价结果
+* @Author szs
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+public class UpdateEvaluateResultDto extends AddEvaluateResultDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/evaluate/entity/EvaluateResult.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 szs
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+@TableName("evaluate_result")
+@ApiModel(value = "evaluate_result", description = "评价结果")
+public class EvaluateResult 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 Long evaluateItemId;
+    /**
+    * 参评人编号
+    */
+    @ApiModelProperty("参评人编号")
+    private String userId;
+    /**
+    * 被评对象（teacher：老师，class：班级，student：学生）
+    */
+    @ApiModelProperty("被评对象（teacher：老师，class：班级，student：学生）")
+    private String evaluatedObject;
+    /**
+    * 被评对象编号
+    */
+    @ApiModelProperty("被评对象编号")
+    private Long evaluatedObjectId;
+    /**
+    * 评价分数
+    */
+    @ApiModelProperty("评价分数")
+    private Integer score;
+    /**
+    * 建议/意见
+    */
+    @ApiModelProperty("建议/意见")
+    private String opinion;
+
+
+}

src/main/java/com/xjrsoft/module/evaluate/mapper/EvaluateResultMapper.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.evaluate.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.evaluate.dto.EvaluateResultDetailPageDto;
+import com.xjrsoft.module.evaluate.entity.EvaluateResult;
+import com.xjrsoft.module.evaluate.vo.EvaluateResultDetailPageVo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 评价结果
+* @Author szs
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Mapper
+public interface EvaluateResultMapper extends MPJBaseMapper<EvaluateResult> {
+    IPage<EvaluateResultDetailPageVo> getDetailPage(IPage<EvaluateResultDetailPageDto> page, EvaluateResultDetailPageDto dto);
+}

src/main/java/com/xjrsoft/module/evaluate/service/IEvaluateItemService.java

@@ -31,11 +31,5 @@ public interface IEvaluateItemService extends MPJBaseService<EvaluateItem> {
      */
     Boolean addEvaluateItem(List<AddEvaluateItemDto> dto);
 
-    /**
-     * 修改评价项
-     * @param dto
-     * @return
-     */
-    Boolean updateEvaluateItem(List<AddEvaluateItemDto> dto);
 
 }

src/main/java/com/xjrsoft/module/evaluate/service/IEvaluateResultService.java

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.evaluate.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.evaluate.dto.EvaluateResultDetailPageDetailDto;
+import com.xjrsoft.module.evaluate.dto.EvaluateResultDetailPageDto;
+import com.xjrsoft.module.evaluate.dto.EvaluateResultIndexPageDto;
+import com.xjrsoft.module.evaluate.entity.EvaluateResult;
+import com.xjrsoft.module.evaluate.vo.EvaluateResultDetailPageDetailVo;
+import com.xjrsoft.module.evaluate.vo.EvaluateResultDetailPageVo;
+import com.xjrsoft.module.evaluate.vo.EvaluateResultIndexPageVo;
+
+/**
+* @title: 评价结果
+* @Author szs
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+
+public interface IEvaluateResultService extends MPJBaseService<EvaluateResult> {
+    IPage<EvaluateResultIndexPageVo> getIndexPage(EvaluateResultIndexPageDto dto);
+
+    IPage<EvaluateResultDetailPageVo> getDetailPage(EvaluateResultDetailPageDto dto);
+
+    EvaluateResultDetailPageDetailVo getDetailPageDetail(EvaluateResultDetailPageDetailDto dto);
+}

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateItemServiceImpl.java

@@ -1,18 +1,26 @@
 package com.xjrsoft.module.evaluate.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.evaluate.dto.AddEvaluateItemDto;
 import com.xjrsoft.module.evaluate.dto.MakeEvaluateItemDto;
 import com.xjrsoft.module.evaluate.entity.EvaluateItem;
+import com.xjrsoft.module.evaluate.entity.EvaluateTemplate;
 import com.xjrsoft.module.evaluate.mapper.EvaluateItemMapper;
+import com.xjrsoft.module.evaluate.mapper.EvaluateTemplateMapper;
 import com.xjrsoft.module.evaluate.service.IEvaluateItemService;
 import com.xjrsoft.module.evaluate.vo.EvaluateItemGroupByTopicVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateItemVo;
 import com.xjrsoft.module.evaluate.vo.MakeEvaluateItemVo;
+import com.xjrsoft.module.organization.entity.Department;
+import com.xjrsoft.module.organization.mapper.DepartmentMapper;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,10 +42,49 @@ import java.util.stream.Collectors;
 public class EvaluateItemServiceImpl extends MPJBaseServiceImpl<EvaluateItemMapper, EvaluateItem> implements IEvaluateItemService {
 
     private EvaluateItemMapper evaluateItemMapper;
+
+    private EvaluateTemplateMapper evaluateTemplateMapper;
+
+    private DepartmentMapper departmentMapper;
     @Override
-    public MakeEvaluateItemVo getMakeEvaluateItem(MakeEvaluateItemDto dto) {
-        MakeEvaluateItemVo makeEvaluateItemVo = new MakeEvaluateItemVo();
+    public MakeEvaluateItemVo getMakeEvaluateItem(MakeEvaluateItemDto dto){
         //获取模板基本信息
+        MPJLambdaWrapper<EvaluateTemplate> evaluateTemplateMPJLambdaWrapper = new MPJLambdaWrapper<>();
+        evaluateTemplateMPJLambdaWrapper
+                .select(EvaluateTemplate::getId)
+                .selectAs(DictionaryDetail::getName, MakeEvaluateItemVo::getEvaluateTypeCN)
+                .select(EvaluateTemplate.class, x -> VoToColumnUtil.fieldsToColumns(MakeEvaluateItemVo.class).contains(x.getProperty()))
+                .eq(EvaluateTemplate::getId, dto.getEvaluateTemplateId())
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, EvaluateTemplate::getEvaluateType);
+        MakeEvaluateItemVo makeEvaluateItemVo = evaluateTemplateMapper.selectJoinOne(MakeEvaluateItemVo.class,evaluateTemplateMPJLambdaWrapper);
+
+        //如何没有找到模板，返回null
+        if(makeEvaluateItemVo == null){
+            return makeEvaluateItemVo;
+        }
+
+        List<String> deptIdList = new ArrayList<>();
+        try {
+            ObjectMapper objectMapper = new ObjectMapper();
+            deptIdList = objectMapper.readValue(makeEvaluateItemVo.getDeptIds(), new TypeReference<List<String>>() {});
+        }catch (Exception e){
+        }
+        if(deptIdList != null && deptIdList.size() > 0){
+            LambdaQueryWrapper<Department> departmentLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            departmentLambdaQueryWrapper
+                    .in(Department::getId, deptIdList);
+            List<Department> departmentList = departmentMapper.selectList(departmentLambdaQueryWrapper);
+            StringBuilder deptStr = new StringBuilder();
+
+            for (int i = 0; i < departmentList.size(); i++) {
+                deptStr.append(departmentList.get(i).getName());
+                if(i < departmentList.size() - 1){
+                    deptStr.append("，");
+                }
+            }
+
+            makeEvaluateItemVo.setDeptIdsCN(deptStr.toString());
+        }
 
         //获取模板下的所有评价子项集合
         MPJLambdaWrapper<EvaluateItem> evaluateItemWrapper = new MPJLambdaWrapper<>();
@@ -67,6 +114,8 @@ public class EvaluateItemServiceImpl extends MPJBaseServiceImpl<EvaluateItemMapp
     @Override
     @Transactional
     public Boolean addEvaluateItem(List<AddEvaluateItemDto> dto) {
+        //先物理删除数据库中该模板下的所有评价项
+        evaluateItemMapper.physicalDeleteEvaluateItem(dto.get(0).getEvaluateTemplateId());
         //获取sortCode的最大数量
         QueryWrapper<EvaluateItem> queryWrapperSortcode = new QueryWrapper<>();
         queryWrapperSortcode.select("IFNULL(MAX(sort_code),0) as sortCode");
@@ -81,12 +130,4 @@ public class EvaluateItemServiceImpl extends MPJBaseServiceImpl<EvaluateItemMapp
         }
         return this.saveBatch(evaluateItemList);
     }
-
-    @Override
-    public Boolean updateEvaluateItem(List<AddEvaluateItemDto> dto) {
-        //先物理删除数据库中该模板下的所有评价项
-        evaluateItemMapper.physicalDeleteEvaluateItem(dto.get(0).getEvaluateTemplateId());
-        //添加新的评价项
-        return addEvaluateItem(dto);
-    }
 }

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateResultServiceImpl.java

@@ -0,0 +1,156 @@
+package com.xjrsoft.module.evaluate.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.base.entity.BaseClass;
+import com.xjrsoft.module.base.entity.BaseSemester;
+import com.xjrsoft.module.base.mapper.BaseClassMapper;
+import com.xjrsoft.module.evaluate.dto.EvaluateResultDetailPageDetailDto;
+import com.xjrsoft.module.evaluate.dto.EvaluateResultDetailPageDto;
+import com.xjrsoft.module.evaluate.dto.EvaluateResultIndexPageDto;
+import com.xjrsoft.module.evaluate.entity.*;
+import com.xjrsoft.module.evaluate.mapper.EvaluateManageItemMapper;
+import com.xjrsoft.module.evaluate.mapper.EvaluateManageMapper;
+import com.xjrsoft.module.evaluate.mapper.EvaluateResultMapper;
+import com.xjrsoft.module.evaluate.service.IEvaluateResultService;
+import com.xjrsoft.module.evaluate.vo.*;
+import com.xjrsoft.module.organization.entity.Department;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
+import com.xjrsoft.module.teacher.entity.XjrUser;
+import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+* @title: 评价结果
+* @Author szs
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResultMapper, EvaluateResult> implements IEvaluateResultService {
+
+    private EvaluateManageMapper evaluateManageMapper;
+
+    private XjrUserMapper xjrUserMapper;
+
+    private BaseClassMapper baseClassMapper;
+
+    private EvaluateResultMapper evaluateResultMapper;
+
+    private EvaluateManageItemMapper evaluateManageItemMapper;
+
+    @Override
+    public IPage<EvaluateResultIndexPageVo> getIndexPage(EvaluateResultIndexPageDto dto) {
+        MPJLambdaWrapper<EvaluateManage> evaluateManageMPJLambdaWrapper = new MPJLambdaWrapper<>();
+        evaluateManageMPJLambdaWrapper
+                .selectAs(EvaluateManage::getId, EvaluateResultIndexPageVo::getEvaluateManageId)
+                .selectAs(BaseSemester::getName, EvaluateResultIndexPageVo::getSemesterName)
+                .selectAs(Department::getName, EvaluateResultIndexPageVo::getOrgName)
+                .selectAs(DictionaryDetail::getName, EvaluateResultIndexPageVo::getEvaluateTypeCN)
+                .select(EvaluateManage.class, x -> VoToColumnUtil.fieldsToColumns(EvaluateResultIndexPageVo.class).contains(x.getProperty()))
+                .leftJoin(BaseSemester.class, BaseSemester::getId,  EvaluateManage::getBaseSemesterId)
+                .leftJoin(Department.class, Department::getId,  EvaluateManage::getOrgId)
+                .leftJoin(EvaluateTemplate.class, EvaluateTemplate::getId,  EvaluateManage::getEvaluateTemplateId)
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode,  EvaluateTemplate::getEvaluateType)
+                .eq((dto.getBaseSemesterId() != null && dto.getBaseSemesterId() > 0), EvaluateManage::getBaseSemesterId, dto.getBaseSemesterId())
+                .eq((dto.getOrgId() != null && dto.getOrgId() > 0), EvaluateManage::getOrgId, dto.getOrgId())
+                .eq((dto.getEvaluateType() != null && dto.getEvaluateType().equals("")), EvaluateTemplate::getEvaluateType, dto.getEvaluateType())
+                .like((dto.getName() != null && dto.getName().equals("")), EvaluateManage::getName, dto.getName())
+                .gt((dto.getStartTime() != null), EvaluateManage::getStartTime, dto.getStartTime())
+                .lt((dto.getEndTime() != null), EvaluateManage::getEndTime, dto.getEndTime())
+                .orderByDesc(EvaluateResult::getId);
+
+        IPage<EvaluateResultIndexPageVo> page = evaluateManageMapper.selectJoinPage(ConventPage.getPage(dto), EvaluateResultIndexPageVo.class, evaluateManageMPJLambdaWrapper);
+        return page;
+    }
+
+    @Override
+    public IPage<EvaluateResultDetailPageVo> getDetailPage(EvaluateResultDetailPageDto dto) {
+        IPage<EvaluateResultDetailPageVo> page = evaluateResultMapper.getDetailPage(ConventPage.getPage(dto), dto);
+        if(page.getRecords() != null && page.getRecords().size() > 0){
+            for (EvaluateResultDetailPageVo e : page.getRecords()) {
+                if(e.getObjectType().equals("teacher") || e.getObjectType().equals("student")){
+                    XjrUser user = xjrUserMapper.selectById(e.getObjectId());
+                    if (user != null){
+                        e.setObjectIdCN(user.getName());
+                    }
+                }
+                if(e.getObjectType().equals("class")){
+                    BaseClass baseClass = baseClassMapper.selectById(e.getObjectId());
+                    if(baseClass != null){
+                        e.setObjectIdCN(baseClass.getName());
+                    }
+                }
+            }
+        }
+        return page;
+    }
+
+    @Override
+    public EvaluateResultDetailPageDetailVo getDetailPageDetail(EvaluateResultDetailPageDetailDto dto) {
+        //根据评价管理编号获取当前评价管理相关信息
+        MPJLambdaWrapper<EvaluateManage> evaluateManageMPJLambdaWrapper = new MPJLambdaWrapper<>();
+        evaluateManageMPJLambdaWrapper
+                .selectAs(EvaluateManage::getName, EvaluateResultDetailPageDetailVo::getName)
+                .selectAs(EvaluateTemplate::getTotal, EvaluateResultDetailPageDetailVo::getTotal)
+                .leftJoin(EvaluateTemplate.class, EvaluateTemplate::getId, EvaluateManage::getEvaluateTemplateId)
+                .eq(EvaluateManage::getId, dto.getEvaluateManageId());
+        EvaluateResultDetailPageDetailVo evaluateResultDetailPageDetailVo = evaluateManageMapper.selectJoinOne(EvaluateResultDetailPageDetailVo.class, evaluateManageMPJLambdaWrapper);
+        if(evaluateResultDetailPageDetailVo == null){
+            return evaluateResultDetailPageDetailVo;
+        }
+
+        //根据评价管理主键编号，被评对象id，参评人id获取相关信息
+        MPJLambdaWrapper<EvaluateResult> evaluateResultMPJLambdaWrapper = new MPJLambdaWrapper<>();
+        evaluateResultMPJLambdaWrapper
+                .selectSum(EvaluateResult::getScore, EvaluateResultDetailPageDetailVo::getActulTotal)
+                .leftJoin(EvaluateObject.class, EvaluateObject::getId, EvaluateResult::getEvaluatedObjectId)
+                .leftJoin(XjrUser.class,XjrUser::getId,EvaluateObject::getObjectId,ext->ext
+                        .selectAs(XjrUser::getName,EvaluateResultDetailPageDetailVo::getObjectIdCN))
+                .leftJoin(XjrUser.class,XjrUser::getId,EvaluateResult::getUserId,ext->ext
+                        .selectAs(XjrUser::getName,EvaluateResultDetailPageDetailVo::getUserIdCN))
+                .eq(EvaluateObject::getEvaluateManageId, dto.getEvaluateManageId())
+                .eq(EvaluateObject::getId, dto.getEvaluatedObjectId())
+                .eq(EvaluateResult::getUserId, dto.getUserId());
+        EvaluateResultDetailPageDetailVo evaluateResult = evaluateManageMapper.selectJoinOne(EvaluateResultDetailPageDetailVo.class, evaluateManageMPJLambdaWrapper);
+        evaluateResultDetailPageDetailVo.setActulTotal(evaluateResult.getActulTotal());
+        evaluateResultDetailPageDetailVo.setObjectIdCN(evaluateResult.getObjectIdCN());
+        evaluateResultDetailPageDetailVo.setUserIdCN(evaluateResult.getUserIdCN());
+
+        //获取模板下的所有评价子项集合
+        MPJLambdaWrapper<EvaluateManageItem> evaluateManageItemMPJLambdaWrapper = new MPJLambdaWrapper<>();
+        evaluateManageItemMPJLambdaWrapper
+                .select(EvaluateManageItem::getId)
+                .selectAs(EvaluateResult::getScore, EvaluateManageItemVo::getActulScore)
+                .selectAs(EvaluateResult::getOpinion, EvaluateManageItemVo::getOpinion)
+                .select(EvaluateManageItem.class, x -> VoToColumnUtil.fieldsToColumns(EvaluateManageItemVo.class).contains(x.getProperty()))
+                .leftJoin(EvaluateResult.class, EvaluateResult::getEvaluateItemId, EvaluateManageItem::getEvaluateItemId)
+                .eq(EvaluateManageItem::getEvaluateManageId, dto.getEvaluateManageId());
+
+        List<EvaluateManageItemVo> evaluateManageItemVos = evaluateManageItemMapper.selectJoinList(EvaluateManageItemVo.class, evaluateManageItemMPJLambdaWrapper);
+
+        Map<String, List<EvaluateManageItemVo>> groupedEvaluateManageItemVo = evaluateManageItemVos.stream()
+                .collect(Collectors.groupingBy(EvaluateManageItemVo::getTopic));
+
+        List<EvaluateManageItemByTopicVo> evaluateManageItemByTopicVoArrayList = new ArrayList<>();
+        groupedEvaluateManageItemVo.forEach((topic, group) -> {
+            evaluateManageItemByTopicVoArrayList.add(new EvaluateManageItemByTopicVo(){{
+                setTopic(topic);
+                setEvaluateManageItemVoList(group);
+            }});
+        });
+        evaluateResultDetailPageDetailVo.setEvaluateManageItemByTopicVoList(evaluateManageItemByTopicVoArrayList);
+
+        return evaluateResultDetailPageDetailVo;
+    }
+}

src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateManageItemByTopicVo.java

@@ -0,0 +1,28 @@
+package com.xjrsoft.module.evaluate.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+* @title: 评价项表单根据标题名称分组出参
+* @Author szs
+* @Date: 2024-01-15
+* @Version 1.0
+*/
+@Data
+public class EvaluateManageItemByTopicVo {
+
+    /**
+    * 标题名称
+    */
+    @ApiModelProperty("标题名称")
+    private String topic;
+
+    /**
+     * 评价项表单集合
+     */
+    @ApiModelProperty("评价项表单集合")
+    private List<EvaluateManageItemVo> evaluateManageItemVoList;
+}

src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateManageItemVo.java

@@ -0,0 +1,66 @@
+package com.xjrsoft.module.evaluate.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 评价项表单出参
+* @Author szs
+* @Date: 2024-01-15
+* @Version 1.0
+*/
+@Data
+public class EvaluateManageItemVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 评价管理编号
+    */
+    @ApiModelProperty("评价管理编号")
+    private Long evaluateManageId;
+    /**
+    * 标题名称
+    */
+    @ApiModelProperty("标题名称")
+    private String topic;
+    /**
+    * 题目名称
+    */
+    @ApiModelProperty("题目名称")
+    private String problem;
+    /**
+    * 题目分数（最小为0，只能整数）
+    */
+    @ApiModelProperty("题目分数（最小为0，只能整数）")
+    private Integer score;
+    /**
+     * 实际分数（最小为0，只能整数）
+     */
+    @ApiModelProperty("实际分数（最小为0，只能整数）")
+    private Integer actulScore;
+    /**
+    * 输入框是否为空
+    */
+    @ApiModelProperty("输入框是否为空")
+    private Integer inputNotNull;
+    /**
+     * 评价项编号
+     */
+    @ApiModelProperty("评价项编号")
+    private Long evaluateItemId;
+    /**
+     * 建议/意见
+     */
+    @ApiModelProperty("建议/意见")
+    private String opinion;
+
+}

src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateResultDetailPageDetailVo.java

@@ -0,0 +1,53 @@
+package com.xjrsoft.module.evaluate.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+* @title: 评价结果首页分页列表出参
+* @Author szs
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+public class EvaluateResultDetailPageDetailVo {
+
+    /**
+     * 评价名称
+     */
+    @ApiModelProperty("评价名称")
+    private String name;
+
+    /**
+     * 评价模板总分
+     */
+    @ApiModelProperty("评价模板总分")
+    private Integer total;
+
+    /**
+     * 实际得分
+     */
+    @ApiModelProperty("实际得分")
+    private Integer actulTotal;
+
+    /**
+     * 被评价人名字
+     */
+    @ApiModelProperty("被评人名字")
+    private String ObjectIdCN;
+
+    /**
+     * 参评人id
+     */
+    @ApiModelProperty("参评人id")
+    private String userIdCN;
+
+    /**
+     * 评价项表单根据标题名称分组出参
+     */
+    @ApiModelProperty(value = "评价项表单根据标题名称分组出参")
+    private List<EvaluateManageItemByTopicVo> evaluateManageItemByTopicVoList;
+
+}

src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateResultDetailPageVo.java

@@ -0,0 +1,61 @@
+package com.xjrsoft.module.evaluate.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 评价结果首页分页列表出参
+* @Author szs
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+public class EvaluateResultDetailPageVo {
+    /**
+     * 评价管理主键编号
+     */
+    @ApiModelProperty(value = "评价管理主键编号",required = true)
+    private Long evaluateManageId;
+
+    /**
+    * 被评价对象id
+    */
+    @ApiModelProperty("被评价对象id")
+    private Long evaluatedObjectId;
+
+    /**
+     * 被评价对象类型
+     */
+    @ApiModelProperty("被评价对象类型")
+    private String objectType;
+
+    /**
+     * 被评价人id
+     */
+    @ApiModelProperty("被评人id")
+    private Long ObjectId;
+
+    /**
+     * 被评价人名字
+     */
+    @ApiModelProperty("被评人名字")
+    private String ObjectIdCN;
+
+    /**
+     * 参评人id
+     */
+    @ApiModelProperty("参评人id")
+    private Long userId;
+
+    /**
+     * 参评人id
+     */
+    @ApiModelProperty("参评人id")
+    private String userIdCN;
+
+    /**
+     * 综合评分
+     */
+    @ApiModelProperty("综合评分")
+    private Integer comprehensiveScore;
+}

src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateResultIndexPageVo.java

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

src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateResultPageVo.java

@@ -0,0 +1,51 @@
+package com.xjrsoft.module.evaluate.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 评价结果分页列表出参
+* @Author szs
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+public class EvaluateResultPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 评价项编号
+    */
+    @ApiModelProperty("评价项编号")
+    private Long evaluateItemId;
+    /**
+    * 参评人编号
+    */
+    @ApiModelProperty("参评人编号")
+    private String userId;
+    /**
+    * 被评对象（teacher：老师，class：班级，student：学生）
+    */
+    @ApiModelProperty("被评对象（teacher：老师，class：班级，student：学生）")
+    private String evaluatedObject;
+    /**
+    * 被评对象编号
+    */
+    @ApiModelProperty("被评对象编号")
+    private Long evaluatedObjectId;
+    /**
+    * 评价分数
+    */
+    @ApiModelProperty("评价分数")
+    private Integer score;
+    /**
+    * 建议/意见
+    */
+    @ApiModelProperty("建议/意见")
+    private String opinion;
+
+}

src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateResultVo.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 szs
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+public class EvaluateResultVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 评价项编号
+    */
+    @ApiModelProperty("评价项编号")
+    private Long evaluateItemId;
+    /**
+    * 参评人编号
+    */
+    @ApiModelProperty("参评人编号")
+    private String userId;
+    /**
+    * 被评对象（teacher：老师，class：班级，student：学生）
+    */
+    @ApiModelProperty("被评对象（teacher：老师，class：班级，student：学生）")
+    private String evaluatedObject;
+    /**
+    * 被评对象编号
+    */
+    @ApiModelProperty("被评对象编号")
+    private Long evaluatedObjectId;
+    /**
+    * 评价分数
+    */
+    @ApiModelProperty("评价分数")
+    private Integer score;
+    /**
+    * 建议/意见
+    */
+    @ApiModelProperty("建议/意见")
+    private String opinion;
+
+
+
+}

src/main/java/com/xjrsoft/module/evaluate/vo/MakeEvaluateItemVo.java

@@ -29,6 +29,16 @@ public class MakeEvaluateItemVo {
     */
     @ApiModelProperty("评价类型")
     private String evaluateTypeCN;
+    /**
+     * 使用部门ids
+     */
+    @ApiModelProperty("使用部门ids")
+    private String deptIds;
+    /**
+     * 使用部门ids
+     */
+    @ApiModelProperty("使用部门ids")
+    private String deptIdsCN;
     /**
     * 评价总分
     */

src/main/resources/mapper/evaluate/EvaluateResultMapper.xml

@@ -0,0 +1,21 @@
+<?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.EvaluateResultMapper">
+    <select id="getDetailPage" parameterType="com.xjrsoft.module.evaluate.dto.EvaluateResultDetailPageDto" resultType="com.xjrsoft.module.evaluate.vo.EvaluateResultDetailPageVo">
+        select
+            t1.evaluate_manage_id,
+            t1.object_type,
+            t1.object_id,
+            t.evaluated_object_id,
+            t.user_id,
+            t2.name as userIdCN,
+            sum(t.score) as comprehensiveScore
+        from evaluate_result t
+                 left join evaluate_object t1 on t1.id = t.evaluated_object
+                 left join xjr_user t2 on t2.id = t.user_id
+        where t1.evaluate_manage_id = #{dto.evaluateManageId}
+        group by t.evaluated_object_id,t.user_id
+    </select>
+</mapper>

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

@@ -2017,4 +2017,36 @@ public class FreeMarkerGeneratorTest {
         apiGeneratorService.generateCodes(params);
 
     }
+
+    /**
+     * 评价结果
+     * @throws IOException
+     */
+    @Test
+    public void gcEvaluateResult() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("evaluate_result");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("szs");//作者名称
+        params.setPackageName("evaluate");//包名
+        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);
+
+    }
+
+
 }