Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili

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

@@ -10,13 +10,13 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.form.PageFormDTO;
 import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
 import com.epmet.commons.tools.enums.EventEnum;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 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.IcUserDemandRecDTO;
 import com.epmet.dto.form.AutoEvaluateDemandFormDTO;
 import com.epmet.dto.form.IcDemandFormDTO;
 import com.epmet.dto.form.SystemMsgFormDTO;
@@ -282,4 +282,17 @@ public class ResiDemandController {
         return new Result<DemandRecId>().ok(icUserDemandRecService.saveOrUpdateDemand(dto));
     }
 
+    /**
+     * 根据服务方id查询，服务过的需求列表
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("service-list")
+    public Result<PageData<DemandRecResultDTO>> queryServiceList(@LoginUser TokenDto tokenDto, @RequestBody ServiceListFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<PageData<DemandRecResultDTO>>().ok(icUserDemandRecService.queryServiceList(formDTO));
+    }
+
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java

@@ -140,4 +140,6 @@ public interface IcUserDemandRecDao extends BaseDao<IcUserDemandRecEntity> {
      * @Date 2022/1/21 15:53
      */
     List<ServicePointDTO> getServicePoint(@Param("customerId")String customerId, @Param("serviceType")String serviceType);
+
+    List<DemandRecResultDTO> queryServiceList(ServiceListFormDTO formDTO);
 }

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

@@ -247,4 +247,11 @@ public interface IcUserDemandRecService extends BaseService<IcUserDemandRecEntit
      * @Date 2022/1/21 16:02
      */
     Map<String, Integer> getServicePoint(String customerId, String serviceType);
+
+    /**
+     * 根据服务方id查询，服务过的需求列表
+     * @param formDTO
+     * @return
+     */
+    PageData<DemandRecResultDTO> queryServiceList(ServiceListFormDTO formDTO);
 }

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

@@ -1704,5 +1704,20 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         }
         return list.stream().collect(Collectors.toMap(ServicePointDTO::getServerId, ServicePointDTO::getPoint));
     }
+
+    /**
+     * 根据服务方id查询，服务过的需求列表
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public PageData<DemandRecResultDTO> queryServiceList(ServiceListFormDTO formDTO) {
+        PageInfo<DemandRecResultDTO> pageInfo= PageHelper.startPage(formDTO.getPageNo(),
+                formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryServiceList(formDTO));
+        return new PageData<>(pageInfo.getList(),pageInfo.getTotal());
+    }
+
+
 }
 

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml

@@ -641,4 +641,20 @@
         GROUP BY
             b.SERVER_ID
     </select>
+
+
+    <select id="queryServiceList" parameterType="com.epmet.dto.form.ServiceListFormDTO" resultType="com.epmet.dto.result.demand.DemandRecResultDTO">
+        SELECT
+            r.ID as demandRecId,
+            r.CONTENT,
+            r.REPORT_TIME as reportTime
+        FROM
+            ic_user_demand_rec r
+            INNER JOIN ic_user_demand_service s ON ( r.id = s.DEMAND_REC_ID )
+        WHERE
+            r.CUSTOMER_ID = #{customerId}
+            AND r.STATUS = 'finished'
+            and s.SERVER_ID=#{serverId}
+            order by r.REPORT_TIME desc
+    </select>
 </mapper>

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

@@ -0,0 +1,23 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+@Data
+public class ServiceListFormDTO extends PageFormDTO implements Serializable {
+    @NotBlank(message = "type不能为空:志愿者：volunteer；社区自组织：community_org", groups = PageFormDTO.AddUserInternalGroup.class)
+    private String type;
+
+    /**
+     * 服务方id ,
+     * 可能是来源于多元主题分析里的社区自组织，也可能是来源于志愿者
+     */
+    @NotBlank(message = "serverId不能为空", groups = PageFormDTO.AddUserInternalGroup.class)
+    private String serverId;
+
+    private String customerId;
+}