submit code

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/stmt/StmtController.java

@@ -7,7 +7,6 @@ import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.common.utils.util.BeanUtil;
 import cn.rankin.common.utils.util.ProvinceUtil;
-import cn.rankin.data.api.user.dto.CampusDTO;
 import cn.rankin.data.api.user.dto.CampusSearchDTO;
 import cn.rankin.data.api.user.vo.CampusVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,8 +21,49 @@ public class StmtController
     @Autowired
     private StmtService StmtService;
 
+    /**
+     * 查询已开通校区报表
+     * @param user the user info
+     * @param campusSearchDTO the campus search
+     * @return
+     */
     @RequestMapping(value = {"/campus/list", "/"}, method = RequestMethod.GET)
-    public APIResult<Page<CampusVo>> search(@NeedUser UserDetails user, CampusSearchDTO campusSearchDTO)
+    public APIResult<Page<CampusVo>> campusList(@NeedUser UserDetails user, CampusSearchDTO campusSearchDTO)
+    {
+        if (!user.isPlatForm())
+        {
+            String merchantId = user.getMerchantId();
+            campusSearchDTO.setMerchantId(merchantId);
+        }
+        APIResult<Page<CampusVo>> pageData = StmtService.search(BeanUtil.convertToMap(campusSearchDTO));
+
+        //设置省份
+        if (pageData != null)
+        {
+            List<CampusVo> list = pageData.getData().getList();
+            if (list != null && list.size() > 0)
+            {
+                for(int i = 0; i<list.size();i++)
+                {
+                    CampusVo vo =  list.get(i);
+                    String provinceCode =  vo.getProvinceCode();
+                    String provinceName = ProvinceUtil.get(provinceCode);
+                    vo.setProvinceName(provinceName);
+                }
+            }
+        }
+
+        return pageData;
+    }
+
+    /**
+     * 查询已开通校区报表
+     * @param user the user info
+     * @param campusSearchDTO the campus search
+     * @return
+     */
+    @RequestMapping(value = {"/campus/export", "/"}, method = RequestMethod.GET)
+    public APIResult<Page<CampusVo>> exportCampus(@NeedUser UserDetails user, CampusSearchDTO campusSearchDTO)
     {
         if (!user.isPlatForm())
         {