民警群接口，PC新增民警业务修改。

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/dao/GroupDao.java

@@ -129,16 +129,6 @@ public interface GroupDao extends BaseDao<GroupEntity> {
      * @author zhangyuan
      * @since 2019/11/12 9:35
      */
-    List<GroupListDTO> selectListOfGroupByDeptIds(List<DeptLevelAndLeaderDTO> list);
-
-    /**
-     * 获取社区下所有社群
-     *
-     * @return java.util.List<com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO>
-     * @params [deptId]
-     * @author zhangyuan
-     * @since 2019/11/12 9:35
-     */
     List<DeptLevelAndLeaderDTO> selectListOfGroupByDeptId(@Param("deptId") String deptId);
 
     /**

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/controller/PoliceController.java

@@ -65,8 +65,7 @@ public class PoliceController {
     public Result save(@RequestBody PoliceDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        policeService.save(dto);
+        return policeService.save(dto);
-        return new Result();
     }
 
     @PutMapping

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/service/impl/PoliceServiceImpl.java

@@ -31,7 +31,6 @@ import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.constant.GroupConstant;
 import com.elink.esua.epdc.dto.enums.GroupStateEnum;
-import com.elink.esua.epdc.dto.group.GroupListDTO;
 import com.elink.esua.epdc.modules.feign.AdminFeignClient;
 import com.elink.esua.epdc.modules.group.dao.GroupDao;
 import com.elink.esua.epdc.modules.group.entity.GroupEntity;
@@ -106,7 +105,11 @@ public class PoliceServiceImpl extends BaseServiceImpl<PoliceDao, PoliceEntity>
         PoliceEntity entity = ConvertUtils.sourceToTarget(dto, PoliceEntity.class);
         // 先查询该社区下有没有网格群，没有就同时创建民警和群，有就表示已经创建过。
         List<DeptLevelAndLeaderDTO> deptList = adminFeignClient.listChildDeptLevelById(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, entity.getDeptId()).getData();
-        List<GroupListDTO> groupList = groupDao.selectListOfGroupByDeptIds(deptList);
+        // 社区下没有网格
+        if (deptList.size() == 0 || dto.getDeptId() == null) {
+            return new Result().error("新增失败");
+        }
+        List<DeptLevelAndLeaderDTO> groupList = groupDao.selectListOfGroupByDeptId(entity.getDeptId() + "");
         if (groupList.size() == 0) {
             ParentAndAllDeptDTO parentAndAllDeptDTO = getParentAndAllDeptDTO(dto.getDeptId() + "");
 
@@ -129,7 +132,7 @@ public class PoliceServiceImpl extends BaseServiceImpl<PoliceDao, PoliceEntity>
                 groupEntity.setReferenceBusinessId(entity.getId());
                 groupEntity.setState(GroupStateEnum.GROUP_STATE_EXAMINATION_PASSED.getValue());
                 groupEntity.setGroupAvatar(GroupConstant.PROPERTY_GROUP_AVATAR);
-                groupEntity.setGroupName(entity.getDeptName() + "警民群");
+                groupEntity.setGroupName(dept.getDeptName() + "警民群");
                 groupEntity.setGroupCategory(GroupConstant.POLICE_GROUP_CATEGORY);
                 groupEntity.setGrid(dept.getDeptName());
                 groupEntity.setGridId(dept.getDeptId());
@@ -137,7 +140,7 @@ public class PoliceServiceImpl extends BaseServiceImpl<PoliceDao, PoliceEntity>
             });
             return new Result();
         } else {
-            return new Result().error();
+            return new Result().error("新增失败,社区内已有民警");
         }
     }
 

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/AppPropertyProjectController.java

@@ -19,11 +19,14 @@ package com.elink.esua.epdc.modules.project.controller;
 
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
+import com.elink.esua.epdc.dto.police.result.PoliceResultDTO;
 import com.elink.esua.epdc.dto.project.form.ProjectDetailFormDTO;
 import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO;
 import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO;
 import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO;
 import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO;
+import com.elink.esua.epdc.modules.police.service.PoliceService;
 import com.elink.esua.epdc.modules.project.service.PropertyProjectScoreService;
 import com.elink.esua.epdc.modules.project.service.PropertyProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,11 +51,14 @@ public class AppPropertyProjectController {
     @Autowired
     private PropertyProjectScoreService propertyProjectScoreService;
 
+    @Autowired
+    private PoliceService policeService;
+
     /**
      * 项目列表
      *
      * @return
-     * @params [id]
+     * @params [formDto]
      * @author zhangyuan
      * @since 2020/5/13 15:37
      */
@@ -65,8 +71,8 @@ public class AppPropertyProjectController {
     /**
      * 项目详情
      *
-     * @return
+     * @return com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO
-     * @params [id]
+     * @params [formDto]
      * @author zhangyuan
      * @since 2020/5/13 15:37
      */
@@ -79,8 +85,8 @@ public class AppPropertyProjectController {
     /**
      * 项目详情V2
      *
-     * @return
+     * @return com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO
-     * @params [id]
+     * @params [formDto]
      * @author zhangyuan
      * @since 2020/5/13 15:37
      */
@@ -93,8 +99,8 @@ public class AppPropertyProjectController {
     /**
      * 打分详情
      *
-     * @return
+     * @return Result
-     * @params [id]
+     * @params [formDto]
      * @author zhangyuan
      * @since 2020/5/13 15:37
      */
@@ -103,4 +109,18 @@ public class AppPropertyProjectController {
         propertyProjectScoreService.score(formDto);
         return new Result();
     }
+
+    /**
+     * 获取社区内民警及警民群数据
+     *
+     * @return com.elink.esua.epdc.dto.police.result.PoliceResultDTO
+     * @params [formDto]
+     * @author zhangyuan
+     * @since 2020/5/13 15:37
+     */
+    @GetMapping("getDeptPolice")
+    public Result<PoliceResultDTO> getDeptPolice(@RequestBody PoliceFormDTO formDto) {
+//        propertyProjectScoreService.score(formDto);
+        return new Result();
+    }
 }

epdc-cloud-property/src/main/resources/mapper/group/GroupDao.xml

@@ -311,31 +311,20 @@ ORDER BY
             epdc_group
         WHERE
             DEL_FLAG = '0'
+            AND GROUP_CATEGORY = '3'
             AND STATE IN ( 10, 15, 20 )
             AND GRID_ID = #{deptId}
     </select>
 
-    <select id="selectListOfGroupByDeptIds" resultType="com.elink.esua.epdc.dto.group.GroupListDTO">
-        SELECT
-        ID AS groupId,
-        GROUP_NAME AS groupName
-        FROM
-        epdc_group
-        WHERE
-        DEL_FLAG = '0'
-        AND STATE IN ( 10, 15 )
-        AND GRID_ID IN
-        <foreach collection="deptList" item="dept" open="(" separator="," close=")">#{dept.groupId}</foreach>
-    </select>
-
     <select id="selectListOfGroupByDeptId" resultType="com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO">
         SELECT
-        DEPT_ID,
+        GRID_ID AS deptId,
-	    DEPT_NAME
+	    GRID AS deptName
         FROM
         epdc_group
         WHERE
         DEL_FLAG = '0'
+        AND GROUP_CATEGORY = '3'
         AND STATE IN ( 10, 15 )
         AND PARENT_DEPT_IDS LIKE CONCAT( '%', #{deptId} )
     </select>