派位

web/src/main/java/com/jpsoft/campus/modules/base/controller/ApportionController.java

@@ -361,41 +361,4 @@ public class ApportionController {
 
         return msgResult;
     }
-
-    @ApiOperation(value="统计：开始派位-小学")
-    @PostMapping("startApportionPrimary")
-    public MessageResult<Map> startApportionPrimary(String apportionId,@RequestAttribute String subject){
-        MessageResult<Map> msgResult = new MessageResult<>();
-        Map<String,Object> map = new HashMap<>();
-
-        try {
-            Map<String,Object> searchParams = new HashMap<>();
-            if (StringUtils.isNotEmpty(apportionId)) {
-                searchParams.put("apportionId",apportionId);
-            }
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("create_time","desc"));
-            Page<ApplicationPrimary> applicationPrimaryPage = applicationPrimaryService.pageSearch(searchParams,1,100000,false,sortList);
-            map.put("all",applicationPrimaryPage.size());
-
-            searchParams.put("winner",true);
-            applicationPrimaryPage = applicationPrimaryService.pageSearch(searchParams,1,100000,false,sortList);
-            map.put("winner",applicationPrimaryPage.size());
-
-            searchParams.put("winner",false);
-            applicationPrimaryPage = applicationPrimaryService.pageSearch(searchParams,1,100000,false,sortList);
-            map.put("loser",applicationPrimaryPage.size());
-
-            msgResult.setResult(true);
-            msgResult.setData(map);
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
 }

web/src/main/java/com/jpsoft/campus/modules/base/controller/ApportionDetailController.java

@@ -2,7 +2,9 @@ package com.jpsoft.campus.modules.base.controller;
 
 import com.github.pagehelper.Page;
 import com.jpsoft.campus.modules.base.dto.ApportionDetailDTO;
+import com.jpsoft.campus.modules.base.entity.ApplicationPrimary;
 import com.jpsoft.campus.modules.base.entity.ApportionDetail;
+import com.jpsoft.campus.modules.base.service.ApplicationPrimaryService;
 import com.jpsoft.campus.modules.base.service.ApportionDetailService;
 import com.jpsoft.campus.modules.common.dto.Sort;
 import com.jpsoft.campus.modules.common.dto.MessageResult;
@@ -27,6 +29,8 @@ public class ApportionDetailController {
 
     @Autowired
     private ApportionDetailService apportionDetailService;
+    @Autowired
+    private ApplicationPrimaryService applicationPrimaryService;
 
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
@@ -224,7 +228,7 @@ public class ApportionDetailController {
         return msgResult;
     }
 
-    @ApiOperation(value="列表")
+    @ApiOperation(value="派位详情列表")
     @RequestMapping(value = "pageListDTO",method = RequestMethod.POST)
     public MessageResult<Map> pageListDTO(
             String apportionId,
@@ -257,4 +261,41 @@ public class ApportionDetailController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="统计：派位详情列表")
+    @PostMapping("startApportionPrimary")
+    public MessageResult<Map> startApportionPrimary(String apportionId,@RequestAttribute String subject){
+        MessageResult<Map> msgResult = new MessageResult<>();
+        Map<String,Object> map = new HashMap<>();
+
+        try {
+            Map<String,Object> searchParams = new HashMap<>();
+            if (StringUtils.isNotEmpty(apportionId)) {
+                searchParams.put("apportionId",apportionId);
+            }
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("create_time","desc"));
+            Page<ApplicationPrimary> applicationPrimaryPage = applicationPrimaryService.pageSearch(searchParams,1,100000,false,sortList);
+            map.put("all",applicationPrimaryPage.size());
+
+            searchParams.put("winner",true);
+            applicationPrimaryPage = applicationPrimaryService.pageSearch(searchParams,1,100000,false,sortList);
+            map.put("winner",applicationPrimaryPage.size());
+
+            searchParams.put("winner",false);
+            applicationPrimaryPage = applicationPrimaryService.pageSearch(searchParams,1,100000,false,sortList);
+            map.put("loser",applicationPrimaryPage.size());
+
+            msgResult.setResult(true);
+            msgResult.setData(map);
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
 }