评价管理移动端

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

@@ -3,6 +3,7 @@ package com.xjrsoft.module.evaluate.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.model.result.RT;
@@ -60,17 +61,21 @@ public class EvaluateManageController {
     public RT<EvaluateManageVo> info(@RequestParam Long id){
         MPJLambdaWrapper<EvaluateManage> evaluateManageMPJLambdaWrapper = new MPJLambdaWrapper<>();
         evaluateManageMPJLambdaWrapper
-                .selectAs(DictionaryDetail::getName, EvaluateManageVo::getCreateFrequencyCN)
+                .select(EvaluateManage::getId)
+                .selectAs(EvaluateManage::getSortCode, EvaluateManageVo::getSortCode)
+                .selectAs(EvaluateTemplate::getEvaluateType, EvaluateManageVo::getEvaluateType)
                 .select(EvaluateManage.class, x -> VoToColumnUtil.fieldsToColumns(EvaluateManageVo.class).contains(x.getProperty()))
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, EvaluateManage::getCreateFrequency,ext->ext
+                        .selectAs(DictionaryDetail::getName,EvaluateManageVo::getCreateFrequencyCn))
+                .leftJoin(EvaluateTemplate.class, EvaluateTemplate::getId, EvaluateManage::getEvaluateTemplateId)
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, EvaluateTemplate::getEvaluateType,ext->ext
+                        .selectAs(DictionaryDetail::getName,EvaluateManageVo::getEvaluateTypeCn))
                 .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(evaluateManageVo.getEvaluateTemplateId());
-        evaluateManageVo.setEvaluateType(evaluateTemplate.getEvaluateType());
         return RT.ok(evaluateManageVo);
     }
 
@@ -101,6 +106,13 @@ public class EvaluateManageController {
         EvaluateManage evaluateManage = BeanUtil.toBean(dto, EvaluateManage.class);
         evaluateManage.setCreateDate(new Date());
         evaluateManage.setCreateUserId(StpUtil.getLoginIdAsLong());
+        //获取sortCode的最大数量
+        QueryWrapper<EvaluateManage> queryWrapperSortcode = new QueryWrapper<>();
+        queryWrapperSortcode.select("IFNULL(MAX(sort_code),0) as sortCode");
+        EvaluateManage e = evaluateManageService.getOne(queryWrapperSortcode);
+        int sortCode = e.getSortCode() + 1;
+        evaluateManage.setSortCode(sortCode);
+
         boolean isSuccess = evaluateManageService.add(evaluateManage);
         return RT.ok(isSuccess);
     }

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

@@ -38,7 +38,7 @@ public class EvaluateManagePageVo {
     * 评价类型-中文
     */
     @ApiModelProperty("评价类型-中文")
-    private String evaluateTypeCN;
+    private String evaluateTypeCn;
     /**
     * 评价名称
     */

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

@@ -48,6 +48,9 @@ public class EvaluateManageVo {
 
     @ApiModelProperty("评价类型")
     private String evaluateType;
+
+    @ApiModelProperty("评价类型")
+    private String evaluateTypeCn;
     /**
     * 开始时间
     */
@@ -77,7 +80,7 @@ public class EvaluateManageVo {
      * 生成频率（xjr_dictionary_detail[create_frequency]）
      */
     @ApiModelProperty("生成频率（xjr_dictionary_detail[create_frequency]）")
-    private String createFrequencyCN;
+    private String createFrequencyCn;
     /**
     * evaluateObject
     */

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

@@ -46,7 +46,7 @@
             t.id as evaluateManageId,
             t.name,
             t2.evaluate_type,
-            t4.name as evaluateTypeCN,
+            t4.name as evaluateTypeCn,
             (select
                  count(tb3.status)
              from evaluate_manage tb1