区域化党建单位满意度

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/FinishResultDTO.java

@@ -0,0 +1,15 @@
+package com.epmet.dto.result.demand;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 完成需求时，是否需要计算  区域化党建单位的满意度
+ *
+ */
+@Data
+public class FinishResultDTO implements Serializable {
+    private Boolean sendCalStatisfaction;
+    private String partyUnitId;
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java

@@ -17,16 +17,21 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.rocketmq.messages.CalPartyUnitSatisfactionFormDTO;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.constant.SystemMessageType;
 import com.epmet.constant.UserDemandConstant;
+import com.epmet.dto.form.SystemMsgFormDTO;
 import com.epmet.dto.form.demand.*;
 import com.epmet.dto.result.demand.DemandRecResultDTO;
+import com.epmet.dto.result.demand.FinishResultDTO;
 import com.epmet.dto.result.demand.IcResiUserReportDemandRes;
 import com.epmet.dto.result.demand.OptionDTO;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,7 +64,8 @@ public class IcUserDemandRecController {
     private IcCommunitySelfOrganizationService icCommunitySelfOrganizationService;
     @Autowired
     private IcPartyUnitService icPartyUnitService;
-
+    @Autowired
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
     /**
      * 根据服务方类型查询  下拉框
@@ -178,7 +184,16 @@ public class IcUserDemandRecController {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(formDTO,FinishStaffFromDTO.AddUserShowGroup.class,FinishStaffFromDTO.AddUserInternalGroup.class);
-        icUserDemandRecService.finish(formDTO);
+        FinishResultDTO finishResultDTO=icUserDemandRecService.finish(formDTO);
+        if(finishResultDTO.getSendCalStatisfaction()){
+            CalPartyUnitSatisfactionFormDTO mqMsg = new CalPartyUnitSatisfactionFormDTO();
+            mqMsg.setCustomerId(formDTO.getCustomerId());
+            mqMsg.setPartyUnitId(finishResultDTO.getPartyUnitId());
+            SystemMsgFormDTO form = new SystemMsgFormDTO();
+            form.setMessageType(SystemMessageType.CAL_PARTY_UNIT_SATISFACTION);
+            form.setContent(mqMsg);
+            epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
+        }
         return new Result();
     }
 

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

@@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcUserDemandRecDTO;
 import com.epmet.dto.form.demand.*;
 import com.epmet.dto.result.demand.DemandRecResultDTO;
+import com.epmet.dto.result.demand.FinishResultDTO;
 import com.epmet.dto.result.demand.IcResiUserReportDemandRes;
 import com.epmet.dto.result.demand.ServiceStatDTO;
 import com.epmet.entity.IcUserDemandRecEntity;
@@ -128,7 +129,7 @@ public interface IcUserDemandRecService extends BaseService<IcUserDemandRecEntit
      * 完成并评价
      * @param formDTO
      */
-    void finish(FinishStaffFromDTO formDTO);
+    FinishResultDTO finish(FinishStaffFromDTO formDTO);
 
     /**
      * 数据分析-个人档案，居民需求列表table

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

@@ -20,7 +20,6 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.rocketmq.messages.CalPartyUnitSatisfactionFormDTO;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
@@ -33,7 +32,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.constant.SystemMessageType;
 import com.epmet.constant.UserDemandConstant;
 import com.epmet.dao.IcUserDemandOperateLogDao;
 import com.epmet.dao.IcUserDemandRecDao;
@@ -42,16 +40,15 @@ import com.epmet.dao.IcUserDemandServiceDao;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.IcUserDemandRecDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
-import com.epmet.dto.form.SystemMsgFormDTO;
 import com.epmet.dto.form.demand.*;
 import com.epmet.dto.result.AllGridsByUserIdResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.dto.result.demand.DemandRecResultDTO;
+import com.epmet.dto.result.demand.FinishResultDTO;
 import com.epmet.dto.result.demand.IcResiUserReportDemandRes;
 import com.epmet.dto.result.demand.ServiceStatDTO;
 import com.epmet.entity.*;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
-import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.IcResiDemandDictService;
@@ -91,8 +88,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
     @Autowired
     private EpmetAdminOpenFeignClient adminOpenFeignClient;
-    @Autowired
-    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+
 
     @Override
     public PageData<IcUserDemandRecDTO> page(Map<String, Object> params) {
@@ -414,7 +410,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void finish(FinishStaffFromDTO formDTO) {
+    public FinishResultDTO finish(FinishStaffFromDTO formDTO) {
         IcUserDemandRecEntity entity = baseDao.selectById(formDTO.getDemandRecId());
         if (null == entity) {
             throw new RenException(EpmetErrorCode.DEMAND_NOT_EXITS.getCode(), EpmetErrorCode.DEMAND_NOT_EXITS.getMsg());
@@ -462,18 +458,15 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         satisfactionEntity.setEvaluateTime(logEntity.getOperateTime());
         satisfactionEntity.setScore(formDTO.getScore());
         demandSatisfactionDao.insert(satisfactionEntity);
+        FinishResultDTO finishResultDTO=new FinishResultDTO();
+        finishResultDTO.setPartyUnitId(serviceEntity.getServerId());
+        finishResultDTO.setSendCalStatisfaction(false);
         //5、如果服务方区域化党建单位，需求重新计算当前这个单位的满意度。
-
         //如果服务方是区域化党建单位，需要实时去计算他的群众满意度=服务过的需求的评价分数相加➗ 需求的总个数。
         if(UserDemandConstant.PARTY_UNIT.equals(serviceEntity.getServiceType())){
-            CalPartyUnitSatisfactionFormDTO mqMsg = new CalPartyUnitSatisfactionFormDTO();
-            mqMsg.setCustomerId(formDTO.getCustomerId());
-            mqMsg.setPartyUnitId(serviceEntity.getServerId());
-            SystemMsgFormDTO form = new SystemMsgFormDTO();
-            form.setMessageType(SystemMessageType.CAL_PARTY_UNIT_SATISFACTION);
-            form.setContent(mqMsg);
-            epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
+            finishResultDTO.setSendCalStatisfaction(true);
         }
+        return finishResultDTO;
     }
 
     /**