移动端答题功能

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

@@ -7,6 +7,7 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.module.evaluate.dto.EvaluateWritePageDto;
 import com.xjrsoft.module.evaluate.service.IEvaluateManageService;
+import com.xjrsoft.module.evaluate.vo.EvaluateManageItemVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateWritePageVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateWriteVo;
 import io.swagger.annotations.Api;
@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
 * @title: 评价项
@@ -54,5 +56,21 @@ public class EvaluateWriteController {
         return RT.ok(evaluateWriteVo);
     }
 
+    @GetMapping(value = "/item-list")
+    @ApiOperation(value="评价管理列表(分页)")
+    @SaCheckPermission("evaluatemanage:detail")
+    public RT<List<EvaluateManageItemVo>> itemList(@RequestParam Long id){
+        List<EvaluateManageItemVo> itemList = evaluateManageService.getItemList(id);
+        return RT.ok(itemList);
+    }
+
+    @GetMapping(value = "/result-list")
+    @ApiOperation(value="评价管理列表(分页)")
+    @SaCheckPermission("evaluatemanage:detail")
+    public RT<List<EvaluateManageItemVo>> resultList(@RequestParam Long id){
+        List<EvaluateManageItemVo> itemList = evaluateManageService.getResultList(id);
+        return RT.ok(itemList);
+    }
+
 
 }

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

@@ -5,10 +5,14 @@ import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.evaluate.dto.EvaluateManagePageDto;
 import com.xjrsoft.module.evaluate.dto.EvaluateWritePageDto;
 import com.xjrsoft.module.evaluate.entity.EvaluateManage;
+import com.xjrsoft.module.evaluate.vo.EvaluateManageItemVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateManagePageVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateWritePageVo;
+import com.xjrsoft.module.evaluate.vo.EvaluateWriteVo;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
 * @title: 评价管理
 * @Author dzx
@@ -34,4 +38,11 @@ public interface EvaluateManageMapper extends MPJBaseMapper<EvaluateManage> {
      * @return
      */
     Page<EvaluateWritePageVo> getMobilePage(Page<EvaluateWritePageDto> page, EvaluateWritePageDto dto);
+
+    EvaluateWriteVo getWriteInfo(Long id);
+
+
+    List<EvaluateManageItemVo> getItemList(Long id);
+
+    List<EvaluateManageItemVo> getResultList(Long id, Long userId);
 }

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

@@ -6,6 +6,7 @@ import com.xjrsoft.module.evaluate.dto.EvaluateManagePageDto;
 import com.xjrsoft.module.evaluate.dto.EvaluateWritePageDto;
 import com.xjrsoft.module.evaluate.entity.EvaluateManage;
 import com.xjrsoft.module.evaluate.entity.EvaluateObject;
+import com.xjrsoft.module.evaluate.vo.EvaluateManageItemVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateManagePageVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateWritePageVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateWriteVo;
@@ -64,4 +65,9 @@ public interface IEvaluateManageService extends MPJBaseService<EvaluateManage> {
 
     EvaluateWriteVo getWriteInfo(Long id);
 
+    //查询题目信息
+    List<EvaluateManageItemVo> getItemList(Long id);
+
+    List<EvaluateManageItemVo> getResultList(Long id);
+
 }

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

@@ -1,5 +1,6 @@
 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;
@@ -19,6 +20,7 @@ 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.EvaluateManageItemVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateManagePageVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateWritePageVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateWriteVo;
@@ -104,12 +106,22 @@ public class EvaluateManageServiceImpl extends MPJBaseServiceImpl<EvaluateManage
 
     @Override
     public Page<EvaluateWritePageVo> getMobilePage(Page<EvaluateWritePageDto> page, EvaluateWritePageDto dto) {
-        return null;
+        return evaluateManageMapper.getMobilePage(page, dto);
     }
 
     @Override
     public EvaluateWriteVo getWriteInfo(Long id) {
-        return null;
+        return evaluateManageMapper.getWriteInfo(id);
+    }
+
+    @Override
+    public List<EvaluateManageItemVo> getItemList(Long id) {
+        return evaluateManageMapper.getItemList(id);
+    }
+
+    @Override
+    public List<EvaluateManageItemVo> getResultList(Long id) {
+        return evaluateManageMapper.getResultList(id, StpUtil.getLoginIdAsLong());
     }
 
 }

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

@@ -50,7 +50,7 @@ public class EvaluateManageItemVo {
     /**
     * 输入框是否为空
     */
-    @ApiModelProperty("输入框是否为空")
+    @ApiModelProperty("输入框是否为空(1:是, 0:否)")
     private Integer inputNotNull;
     /**
      * 评价项编号

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

@@ -53,4 +53,16 @@
         where t1.delete_mark = 0
         and t1.status = #{id}
     </select>
+    <select id="getItemList" resultType="com.xjrsoft.module.evaluate.vo.EvaluateManageItemVo">
+        SELECT * FROM evaluate_manage_item WHERE delete_mark = 0 AND evaluate_manage_id = #{id} ORDER BY sort_code
+    </select>
+    <select id="getItemList" resultType="com.xjrsoft.module.evaluate.vo.EvaluateManageItemVo">
+        SELECT t1.id,t1.sort_code,t1.evaluate_manage_id,t1.topic,t1.problem,t1.score,t2.score AS actul_score,t2.opinion,t1.input_not_null FROM evaluate_manage_item t1
+        LEFT JOIN evaluate_result t2 ON t1.id = t2.evaluate_item_id
+        WHERE t1.delete_mark = 0
+        AND t2.delete_mark = 0
+        AND t1.evaluate_manage_id = #{id}
+        AND t2.user_id = #{userId}
+        ORDER BY t1.sort_code
+    </select>
 </mapper>