评价结果接口

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

@@ -2,7 +2,6 @@ package com.xjrsoft.module.evaluate.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.module.evaluate.dto.AddEvaluateItemDto;
 import com.xjrsoft.module.evaluate.dto.MakeEvaluateItemDto;
@@ -60,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,53 @@
+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.EvaluateResultIndexPageDto;
+import com.xjrsoft.module.evaluate.service.IEvaluateResultService;
+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<EvaluateResultIndexPageVo>> detailPage(@Valid EvaluateResultIndexPageDto dto){
+        IPage<EvaluateResultIndexPageVo> page = evaluateResultService.getDetailPage(dto);
+        PageOutput<EvaluateResultIndexPageVo> pageOutput = ConventPage.getPageOutput(page, EvaluateResultIndexPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+}

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/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/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,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.EvaluateResult;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 评价结果
+* @Author szs
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Mapper
+public interface EvaluateResultMapper extends MPJBaseMapper<EvaluateResult> {
+
+}

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,20 @@
+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.EvaluateResultIndexPageDto;
+import com.xjrsoft.module.evaluate.entity.EvaluateResult;
+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<EvaluateResultIndexPageVo> getDetailPage(EvaluateResultIndexPageDto dto);
+}

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

@@ -58,6 +58,11 @@ public class EvaluateItemServiceImpl extends MPJBaseServiceImpl<EvaluateItemMapp
                 .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();
@@ -109,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");
@@ -123,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,62 @@
+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.BaseSemester;
+import com.xjrsoft.module.evaluate.dto.EvaluateResultIndexPageDto;
+import com.xjrsoft.module.evaluate.entity.EvaluateManage;
+import com.xjrsoft.module.evaluate.entity.EvaluateResult;
+import com.xjrsoft.module.evaluate.entity.EvaluateTemplate;
+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.EvaluateResultIndexPageVo;
+import com.xjrsoft.module.organization.entity.Department;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+* @title: 评价结果
+* @Author szs
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResultMapper, EvaluateResult> implements IEvaluateResultService {
+
+    private EvaluateManageMapper evaluateManageMapper;
+    @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<EvaluateResultIndexPageVo> getDetailPage(EvaluateResultIndexPageDto dto) {
+        return null;
+    }
+}

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;
+
+
+
+}