修改手机端重点区域查询接口（带分页，筛选）

src/main/java/com/sooka/sponest/data/commandcenter/controller/CommandCenterController.java

@@ -152,25 +152,6 @@ public class CommandCenterController extends BaseController {
         return AjaxResult.success(commandCenterService.getImportAreaList(commandCenterBO));
     }
 
-    /**
-     * 重点区域
-     * @param CenterdataTForestImportarea
-     * @return
-     */
-    @ApiOperation(value = "重点区域", notes = "重点区域")
-    @GetMapping("/getImportAreaListByParams")
-    public AjaxResult getImportAreaListByParams(CenterdataTForestImportarea importarea) {
-        startPage();
-        List<CenterdataTForestImportarea> result = commandCenterService.getImportAreaListByParams(importarea);
-        Map<String, Object> areaTypeList = DictUtils.getDictCacheToMap("area_type");
-        Map<String, Object> projectLevelLists = DictUtils.getDictCacheToMap("centerdata_project_level");
-        for (CenterdataTForestImportarea hashMap : result) {
-            hashMap.setProjectTypeLabel(areaTypeList.get(hashMap.getProjectType()).toString());
-            hashMap.setProjectLevelLabel(null ==projectLevelLists.get(hashMap.getProjectLevel())? null:projectLevelLists.get(hashMap.getProjectLevel()).toString());
-        }
-        return AjaxResult.success(result);
-    }
-
     @ApiOperation(value = "重点区域", notes = "重点区域")
     @GetMapping("/getImportAreaListOne")
     @ApiImplicitParams(value = {

src/main/java/com/sooka/sponest/data/commandcenter/domian/CommandCenterBO.java

@@ -22,8 +22,6 @@ public class CommandCenterBO extends BaseBusinessEntity {
     private String keyWord;
     private Integer pageNum;
     private Integer pageSize;
-    private String areaName;
-    private String areaType;
 
 
     //所属辖区

src/main/java/com/sooka/sponest/data/commandcenter/service/ICommandCenterService.java

@@ -57,8 +57,6 @@ public interface ICommandCenterService {
     // 资源落点
     List<Map<String, Object>> resourcePoint(AgricultureViewBO agricultureViewBO);
 
-    // 统计重点工程/重点区域数量
+    // 统计各开发区工程数量
     Map<String, Object> getKeyProjectsByDeptId(CommandCenterBO commandCenterBO);
-
-    List<CenterdataTForestImportarea> getImportAreaListByParams(CenterdataTForestImportarea importarea);
 }

src/main/java/com/sooka/sponest/data/commandcenter/service/impl/ICommandCenterServiceImpl.java

@@ -325,7 +325,9 @@ public class ICommandCenterServiceImpl extends BaseServiceImpl implements IComma
     public List<Map<String, Object>> fourLengthOver(CommandCenterBO commandCenterBO) {
         setSookaDataBase(commandCenterBO);
         List<Map<String, Object>> resultList = getForestLeader(commandCenterBO);
-        if (resultList != null) return resultList;
+        if (resultList != null) {
+            return resultList;
+        }
         // 获取河长、路长、田长 2，3，6
         List<Map<String, Object>> leaderList = commandCenterMapper.getLeaderList(commandCenterBO);
         // 获取所有网格
@@ -543,14 +545,6 @@ public class ICommandCenterServiceImpl extends BaseServiceImpl implements IComma
         return pointList;
     }
 
-
-    @Override
-    @DataScopeMutiDept(deptAlias = "d")
-    public List<CenterdataTForestImportarea> getImportAreaListByParams(CenterdataTForestImportarea importarea) {
-        setSookaDataBase(importarea);
-        return centerdataTForestImportareaMapper.selectCenterdataTForestImportareaList(importarea);
-    }
-
     @DataScopeMutiDept(deptAlias = "d")
     @Override
     public Map<String, Object> getKeyProjectsByDeptId(CommandCenterBO commandCenterBO) {

src/main/resources/mapper/commandcenter/CommandCentreMapper.xml

@@ -238,6 +238,9 @@
             <if test="params.projectLevel != null and params.projectLevel != ''">
                 AND a.project_level = #{params.projectLevel}
             </if>
+            <if test="params.projectType != null and params.projectType != ''">
+                AND a.project_type = #{params.projectType}
+            </if>
         </where>
     </select>