解决时间显示问题

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/OrderDetailsWapper.java

@@ -49,6 +49,11 @@ public class OrderDetailsWapper {
      */
     private String productName;
 
+    /**
+     * 产品id
+     */
+    private Long productId;
+
     /**
      * 订单编号
      */

diagbotman-service/src/main/java/com/diagbot/facade/OrderDetailsFacade.java

@@ -3,6 +3,7 @@ package com.diagbot.facade;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.OrderDetialsDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.OpenedProducts;
@@ -30,7 +31,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -151,16 +151,18 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
                     "获取用户和机构信息失败");
         }
         Map<Long, UserOrgDTO> dataMap = mapRespDTO.data;
+        List<UserAndProdutDTO> openedProductTime =openedProductsFacade.getInformationAvailableByUserIds(list1);
         for(OrderDetialsDTO bean : list) {
             UserOrgDTO uo = dataMap.get(bean.getUserId());
             if(uo != null) {
                 BeanUtil.copyProperties(uo,bean);
             }
-            if(bean.getAuditStatus()==AuditStatusEnum.Adopt.getKey()){
-                Collection<OpenedProducts> openedProductTime =openedProductsFacade.listByIds(list1);
-                for (OpenedProducts openedProducts:openedProductTime) {
-                    bean.setStartTime(openedProducts.getStartTime());
-                    bean.setEndTime(openedProducts.getEndTime());
+            if(bean.getAuditStatus() == AuditStatusEnum.Adopt.getKey()){
+                for (UserAndProdutDTO openedProducts:openedProductTime) {
+                    if(bean.getUserId().intValue() == openedProducts.getUserId().intValue() && bean.getProductId().intValue() == openedProducts.getProductId().intValue()){
+                        bean.setStartTime(openedProducts.getStartTime());
+                        bean.setEndTime(openedProducts.getEndTime());
+                    }
                 }
             }
         }

diagbotman-service/src/main/resources/mapper/OrderDetailsMapper.xml

@@ -40,7 +40,7 @@
     </resultMap>
     <select id="seleAllOrderDetials" resultMap="BaseResultWrapper">
         SELECT
-        a.id,a.user_id,a.audit_status,a.`status`,a.reject_type,a.reject_reason , b.time order_time,c.`name` product_name,a.order_num
+        a.id,a.user_id,a.audit_status,a.`status`,a.reject_type,a.reject_reason , b.time order_time,c.`name` product_name,a.order_num ,c.id product_id
         FROM
         diag_order_details a
         LEFT JOIN diag_product_order b ON a.order_num = b.num