Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

src/main/java/com/lz/modules/performance/controller/AssessManagerController.java

@@ -45,8 +45,8 @@ public class AssessManagerController {
     @PostMapping("assess/manager/detail")
     @ApiResponses({@ApiResponse(code = 200,message = "成功",response = AssessManagerDetailRes.class)})
     public R assessDetail(@RequestBody AssessDetailReq req){
-        assessManagerService.assessDetail(req);
-        return R.ok();
+        PageUtils pageUtils = assessManagerService.assessDetail(req);
+        return R.ok().put("data",pageUtils);
 
     }
 

src/main/java/com/lz/modules/performance/service/AssessManagerService.java

@@ -15,5 +15,5 @@ public interface AssessManagerService {
     PageUtils assessList(AssessListReq req);
 
 
-    void assessDetail(AssessDetailReq req);
+    PageUtils assessDetail(AssessDetailReq req);
 }

src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java

@@ -72,17 +72,10 @@ public class AssessManagerServiceImpl implements AssessManagerService {
     }
 
     @Override
-    public void assessDetail(AssessDetailReq req) {
+    public PageUtils assessDetail(AssessDetailReq req) {
         PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect(
                 page ->  resultRecordMapper.selectAssessListByStartId(page,null)
         );
-
-        List<ResultRecord> list = pageUtils.getList();
-        if(CollectionUtils.isEmpty(list)){
-            return;
-        }
-
-        List<AssessManagerDetailRes> data = new ArrayList<>();
-
+        return pageUtils;
     }
 }

src/main/resources/mapper/app/ResultRecordMapper.xml

@@ -1,6 +1,6 @@
 <?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.lz.modules.app.dao.ResultRecordMapper">
+<mapper namespace="com.lz.modules.sys.dao.app.ResultRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lz.modules.sys.entity.app.ResultRecord">