Merge branch 'dev_zhili' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_zhili

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -1734,16 +1734,23 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
      */
     @Override
     public PageData<DemandRecResultDTO> queryServiceList(ServiceListFormDTO formDTO) {
-        List<String> serverIds=new ArrayList<>();
+        List<String> serverIds = new ArrayList<>();
-        if("community_org".equals(formDTO.getType())){
+        if ("community_org".equals(formDTO.getType())) {
             serverIds.add(formDTO.getServerId());
-        }else if("volunteer".equals(formDTO.getType())){
+        } else if ("volunteer".equals(formDTO.getType())) {
             // 根据身份证号查询ic_resi_user.id+epmetUserId
-            //    todo
+            Result<List<String>> userIdRes = epmetUserOpenFeignClient.getAllUserIds(formDTO.getIdCard(), formDTO.getCustomerId());
+            if (!userIdRes.success()) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "根据身份证号查询用户id异常", EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getMsg());
             }
-        PageInfo<DemandRecResultDTO> pageInfo= PageHelper.startPage(formDTO.getPageNo(),
+            if (CollectionUtils.isNotEmpty(userIdRes.getData())) {
+                serverIds.addAll(userIdRes.getData());
+            }
+        }
+        formDTO.setServerIds(serverIds);
+        PageInfo<DemandRecResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(),
                 formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryServiceList(formDTO));
-        return new PageData<>(pageInfo.getList(),pageInfo.getTotal());
+        return new PageData<>(pageInfo.getList(), pageInfo.getTotal());
     }
 
 

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventCategoryAnalysisFormDTO.java

@@ -38,16 +38,16 @@ public class IcEventCategoryAnalysisFormDTO {
     /**
      * 查询起始时间 yyyy-MM-dd
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @NotNull(message = "查询时间为必填项", groups = {TotalPie.class,OrgTotalPie.class})
     private Date queryStartTime;
 
     /**
      * 查询截止时间 yyyy-MM-dd
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @NotNull(message = "查询时间为必填项", groups = {TotalPie.class,OrgTotalPie.class})
     private Date queryEndTime;
 

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventListFormDTO.java

@@ -23,6 +23,10 @@ public class IcEventListFormDTO implements Serializable {
      */
     @NotBlank(message = "事件ID不能为空", groups = Detail.class)
     private String icEventId;
+    /**
+     * 所属组织
+     */
+    private String agencyId;
     /**
      * 所属网格
      */

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java

@@ -237,7 +237,9 @@ public class IcEventController {
      * @Description 事件管理-详情
      **/
     @PostMapping("detail")
-    public Result<IcEventListResultDTO> detail(@RequestBody IcEventListFormDTO formDTO) {
+    public Result<IcEventListResultDTO> detail(@LoginUser TokenDto tokenDto, @RequestBody IcEventListFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(formDTO, IcEventListFormDTO.Detail.class);
         return new Result<IcEventListResultDTO>().ok(icEventService.detail(formDTO));
     }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -95,6 +95,14 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
 
     @Override
     public PageData<IcEventListResultDTO> list(IcEventListFormDTO formDTO) {
+        //获取当前工作人员缓存信息
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        if (null == staffInfo) {
+            throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getStaffId()));
+        }
+        formDTO.setAgencyId(staffInfo.getAgencyId());
+
+        //分页查询当前组织下网格内事件数据
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage());
         List<IcEventListResultDTO> list = baseDao.icEventList(formDTO);
         PageInfo<IcEventListResultDTO> pageInfo = new PageInfo<>(list);
@@ -883,7 +891,6 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                         resultDTO.setCategoryCode(ca.getCategoryCode());
                         resultDTO.setParentCategoryName(ca.getParentCategoryName());
                         resultDTO.setCategoryName(ca.getCategoryName());
-                        resultDTO.setCategoryName(ca.getParentCategoryName()+"-"+ca.getCategoryName());
                     }
                 }
             }
@@ -963,7 +970,9 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
             int start = (no - NumConstant.ONE) * size;
             ids = baseDao.getAutoEvaluationIds(customerId,start,size);
             // 批量更新
+            if (!CollectionUtils.isEmpty(ids)){
                 baseDao.updateAutoEvaluation(ids);
+            }
             no++;
         }while (ids.size() == size);
     }
@@ -1096,6 +1105,8 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         if (!CollectionUtils.isEmpty(attachmentEntityList)){
             icEventAttachmentService.insertBatch(attachmentEntityList);
         }
+        // 站内信发送给社区每个工作人员
+
     }
 
     public void disposeAttachment(List<FileCommonDTO> list,List<IcEventAttachmentEntity> attachmentEntityList,String id,String customerId,String userId){

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml

@@ -178,6 +178,9 @@
         <if test="gridId != null and gridId != '' ">
             AND ie.grid_id = #{gridId}
         </if>
+        <if test="agencyId != null and agencyId != '' ">
+            AND ie.agency_id = #{agencyId}
+        </if>
         <if test="sourceType != null and sourceType != '' ">
             AND ie.source_type = #{sourceType}
         </if>
@@ -199,7 +202,7 @@
         <if test="status != null and status != '' ">
             AND ie.`status` = #{status}
         </if>
-        order by ie.latest_operated_time desc
+        order by ie.created_time desc, ie.latest_operated_time desc
     </select>
 
     <select id="listEventsByPCategoryInOrg" resultType="com.epmet.dto.result.IcEventResultDTO">

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -764,4 +764,13 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping("/epmetuser/icresiuser/getByResiIdCard/{idcard}")
     Result<IcResiUserDTO> getByResiIdCard(@PathVariable("idcard") String idCard);
+
+    /**
+     * 根据身份证号查询ic_resi_user.id+居民端用户id
+     *
+     * @param idCard
+     * @return
+     */
+    @PostMapping("/epmetuser/icresiuser/getAllUserIds")
+    Result<List<String>> getAllUserIds(@RequestParam("idcard") String idCard, @RequestParam("customerId") String customerId);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -557,4 +557,16 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<IcResiUserDTO> getByResiIdCard(String idCard) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getByResiIdCard", idCard);
     }
+
+    /**
+     * 根据身份证号查询ic_resi_user.id+居民端用户id
+     *
+     * @param idCard
+     * @param customerId
+     * @return
+     */
+    @Override
+    public Result<List<String>> getAllUserIds(String idCard, String customerId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getAllUserIds", idCard,customerId);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -52,7 +52,6 @@ import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.entity.IcResiUserEntity;
 import com.epmet.enums.IcResiUserTableEnum;
 import com.epmet.excel.PartyMemberAgeExportExcel;
 import com.epmet.excel.PartyMemberEducationExportExcel;
@@ -1062,4 +1061,16 @@ public class IcResiUserController implements ResultDataResolver {
         IcResiUserDTO resi = icResiUserService.getByResiId(idCard);
         return new Result<IcResiUserDTO>().ok(resi);
     }
+
+    /**
+     * 根据身份证号查询ic_resi_user.id+居民端用户id
+     *
+     * @param idCard
+     * @return
+     */
+    @PostMapping("getAllUserIds")
+    public Result<List<String>> getAllUserIds(@RequestParam("idcard") String idCard, @RequestParam("customerId") String customerId) {
+        List<String> list = icResiUserService.getAllUserIds(idCard, customerId);
+        return new Result<List<String>>().ok(list);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -309,4 +309,6 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      * @return
      */
     List<HouseIcResiUserResultDTO> getResiUserGroupHomeId(RentTenantDataFormDTO formDTO);
+
+    List<String> getAllUserIds(@Param("idCard") String idCard, @Param("customerId")String customerId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -338,4 +338,6 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
     IcResiUserBriefDTO findFamilyMemByIdCard(String idCard);
 
     IcResiUserDTO getByResiId(String idCard);
+
+    List<String> getAllUserIds(String idCard, String customerId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -1948,4 +1948,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     public IcResiUserDTO getByResiId(String idCard) {
         return baseDao.getResiUserByIdCard(idCard, EpmetRequestHolder.getHeader(AppClientConstant.CUSTOMER_ID));
     }
+
+    @Override
+    public List<String> getAllUserIds(String idCard, String customerId) {
+        return baseDao.getAllUserIds(idCard, customerId);
+    }
 }

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -978,4 +978,23 @@
         </if>
     </select>
 
+    <select id="getAllUserIds"  parameterType="map" resultType="java.lang.String">
+        SELECT
+            I.ID
+        FROM
+            ic_resi_user i
+        WHERE
+            i.DEL_FLAG = '0'
+            AND i.CUSTOMER_ID = #{customerId}
+            AND i.ID_CARD = #{idCard}
+        UNION
+        SELECT
+            ubi.USER_ID
+        FROM
+            user_base_info ubi
+        WHERE
+            ubi.DEL_FLAG = '0'
+            AND ubi.CUSTOMER_ID = #{customerId}
+            AND ubi.ID_NUM = #{idCard}
+    </select>
 </mapper>