评价管理添加字段

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

@@ -3,9 +3,11 @@ 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.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.evaluate.dto.AddEvaluateManageDto;
 import com.xjrsoft.module.evaluate.dto.EvaluateManageChangeStatusDto;
 import com.xjrsoft.module.evaluate.dto.EvaluateManagePageDto;
@@ -16,17 +18,11 @@ import com.xjrsoft.module.evaluate.service.IEvaluateManageService;
 import com.xjrsoft.module.evaluate.service.IEvaluateTemplateService;
 import com.xjrsoft.module.evaluate.vo.EvaluateManagePageVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateManageVo;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -60,14 +56,20 @@ public class EvaluateManageController {
     @ApiOperation(value="根据id查询评价管理信息")
     @SaCheckPermission("evaluatemanage:detail")
     public RT<EvaluateManageVo> info(@RequestParam Long id){
-        EvaluateManage evaluateManage = evaluateManageService.getByIdDeep(id);
-        if (evaluateManage == null) {
+        MPJLambdaWrapper<EvaluateManage> evaluateManageMPJLambdaWrapper = new MPJLambdaWrapper<>();
+        evaluateManageMPJLambdaWrapper
+                .selectAs(DictionaryDetail::getName, EvaluateManageVo::getCreateFrequencyCN)
+                .select(EvaluateManage.class, x -> VoToColumnUtil.fieldsToColumns(EvaluateManageVo.class).contains(x.getProperty()))
+                .eq(EvaluateManage::getId, id)
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, EvaluateManage::getCreateFrequency)
+                .disableSubLogicDel();
+        EvaluateManageVo evaluateManageVo = evaluateManageService.selectJoinOne(EvaluateManageVo.class, evaluateManageMPJLambdaWrapper);
+        if (evaluateManageVo == null) {
            return RT.error("找不到此数据！");
         }
-        EvaluateTemplate evaluateTemplate = evaluateTemplateService.getById(evaluateManage.getEvaluateTemplateId());
-        EvaluateManageVo manageVo = BeanUtil.toBean(evaluateManage, EvaluateManageVo.class);
-        manageVo.setEvaluateType(evaluateTemplate.getEvaluateType());
-        return RT.ok(manageVo);
+        EvaluateTemplate evaluateTemplate = evaluateTemplateService.getById(evaluateManageVo.getEvaluateTemplateId());
+        evaluateManageVo.setEvaluateType(evaluateTemplate.getEvaluateType());
+        return RT.ok(evaluateManageVo);
     }
 
     @PostMapping(value = "/change-status")

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

@@ -53,6 +53,16 @@ public class EvaluateWriteController {
         return RT.ok(pageOutput);
     }
 
+    @GetMapping(value = "/index-page")
+    @ApiOperation(value="评价管理首页列表(分页)")
+    @SaCheckPermission("evaluatemanage:detail")
+    public RT<PageOutput<EvaluateWritePageVo>> indexPage(@Valid EvaluateWritePageDto dto){
+        dto.setLoginUserId(StpUtil.getLoginIdAsLong());
+        Page<EvaluateWritePageVo> page = evaluateManageService.getMobileIndexPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        PageOutput<EvaluateWritePageVo> pageOutput = ConventPage.getPageOutput(page, EvaluateWritePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询评价项信息")
     @SaCheckPermission("evaluateitem:detail")

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

@@ -19,6 +19,6 @@ public class EvaluateWritePageDto extends PageInput {
     @ApiModelProperty("状态（1：已评分，0：未评分）")
     private Integer status;
 
-    @ApiModelProperty("登录者id（前端不传，后端传）")
+    @ApiModelProperty(value = "登录者id（前端不传，后端传）", hidden = true)
     private Long loginUserId;
 }

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

@@ -42,6 +42,8 @@ public interface EvaluateManageMapper extends MPJBaseMapper<EvaluateManage> {
      */
     Page<EvaluateWritePageVo> getMobilePage(Page<EvaluateWritePageDto> page, EvaluateWritePageDto dto);
 
+    Page<EvaluateWritePageVo> getMobileIndexPage(Page<EvaluateWritePageDto> page, EvaluateWritePageDto dto);
+
     EvaluateWriteVo getWriteInfo(Long id);
 
 

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

@@ -62,6 +62,8 @@ public interface IEvaluateManageService extends MPJBaseService<EvaluateManage> {
 
     Page<EvaluateWritePageVo> getMobilePage(Page<EvaluateWritePageDto> page, EvaluateWritePageDto dto);
 
+    Page<EvaluateWritePageVo> getMobileIndexPage(Page<EvaluateWritePageDto> page, EvaluateWritePageDto dto);
+
     EvaluateWriteVo getWriteInfo(Long id);
 
     //查询题目信息

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

@@ -149,6 +149,13 @@ public class EvaluateManageServiceImpl extends MPJBaseServiceImpl<EvaluateManage
         return mobilePage;
     }
 
+    public Page<EvaluateWritePageVo> getMobileIndexPage(Page<EvaluateWritePageDto> page, EvaluateWritePageDto dto) {
+        Page<EvaluateWritePageVo> mobilePage = evaluateManageMapper.getMobilePage(page, dto);
+
+
+        return mobilePage;
+    }
+
     @Override
     public EvaluateWriteVo getWriteInfo(Long id) {
         return evaluateManageMapper.getWriteInfo(id);

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

@@ -3,13 +3,8 @@ 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;
+import java.util.List;
 
 /**
 * @title: 评价管理表单出参
@@ -68,8 +63,21 @@ public class EvaluateManageVo {
     */
     @ApiModelProperty("状态（1：进行中，0，暂停）")
     private Integer status;
-
-
+    /**
+     * 是否自动生成（0:否，1:是）
+     */
+    @ApiModelProperty("是否自动生成（0:否，1:是）")
+    private Integer isAutoCreate;
+    /**
+     * 生成频率（xjr_dictionary_detail[create_frequency]）
+     */
+    @ApiModelProperty("生成频率（xjr_dictionary_detail[create_frequency]）")
+    private String createFrequency;
+    /**
+     * 生成频率（xjr_dictionary_detail[create_frequency]）
+     */
+    @ApiModelProperty("生成频率（xjr_dictionary_detail[create_frequency]）")
+    private String createFrequencyCN;
     /**
     * evaluateObject
     */