后台只展示总订单

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/ServiceOrderFormDTO.java

@@ -11,6 +11,7 @@ import lombok.NoArgsConstructor;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @Author small
@@ -68,4 +69,7 @@ public class ServiceOrderFormDTO {
 
     @ApiModelProperty(value = "父订单id")
     private Integer fatherRequireId;
+
+    @ApiModelProperty(value = "子订单详情")
+    private List<ServiceOrderFormDTO> childrenRequire;
 }

release-service/src/main/java/com/mmc/csf/release/dao/BackRequirementsDao.java

@@ -16,6 +16,7 @@ import java.util.List;
 public interface BackRequirementsDao {
     List<ServiceOrderFormDO> serviceOrderFormList(ServiceOrderQO param);
 
+    List<ServiceOrderFormDO> getSonFromFatherRequireId(Integer id);
     int countService(ServiceOrderQO param);
 
     ServiceOrderFormDetailsDO serviceOrderFormDetails(Integer requirementsInfoId);

release-service/src/main/java/com/mmc/csf/release/service/impl/BackRequirementsServiceImpl.java

@@ -10,10 +10,7 @@ import com.mmc.csf.release.auth.dto.LoginSuccessDTO;
 import com.mmc.csf.release.dao.BackRequirementsDao;
 import com.mmc.csf.release.dao.OrderAmountDetailDao;
 import com.mmc.csf.release.dao.RequirementsDao;
-import com.mmc.csf.release.entity.requirements.OrderAmountDetailDO;
-import com.mmc.csf.release.entity.requirements.RequirementsAmountUpdateDO;
-import com.mmc.csf.release.entity.requirements.ServiceOrderFormDO;
-import com.mmc.csf.release.entity.requirements.ServiceOrderFormDetailsDO;
+import com.mmc.csf.release.entity.requirements.*;
 import com.mmc.csf.release.enums.ServiceIdEnum;
 import com.mmc.csf.release.feign.UserAppApi;
 import com.mmc.csf.release.service.BackRequirementsService;
@@ -66,7 +63,15 @@ public class BackRequirementsServiceImpl implements BackRequirementsService {
         Integer pageNo = param.getPageNo();
         param.buildCurrentPage();
         List<ServiceOrderFormDO> serviceOrderFormDOS = backRequirementsDao.serviceOrderFormList(param);
-        List<ServiceOrderFormDTO> collect = serviceOrderFormDOS.stream().map(ServiceOrderFormDO::buildServiceOrderForm).collect(Collectors.toList());
+        List<ServiceOrderFormDTO> collect = serviceOrderFormDOS.stream().map(ServiceOrderFormDO::buildServiceOrderForm)
+                .map(serviceOrderFormDTO -> {
+                    Integer id = serviceOrderFormDTO.getId();
+                    List<ServiceOrderFormDO> listSon = backRequirementsDao.getSonFromFatherRequireId(id);
+                    List<ServiceOrderFormDTO> childrenList = listSon.stream().map(ServiceOrderFormDO::buildServiceOrderForm).collect(Collectors.toList());
+                    serviceOrderFormDTO.setChildrenRequire(childrenList);
+                    return serviceOrderFormDTO;
+                })
+                .collect(Collectors.toList());
         return PageResult.buildPage(pageNo, param.getPageSize(), count, collect);
     }
 

release-service/src/main/resources/mapper/requirements/BackRequirementsDao.xml

@@ -76,7 +76,7 @@
         LEFT JOIN requirements_service rs ON rs.requirements_info_id = ri.id
         LEFT JOIN service_flow sf ON ri.service_flow_id = sf.id
         WHERE
-        ri.publish =1
+        ri.publish =1 and ri.father_require_id = 0
         <bind name="isPilotUserIdListEmpty" value="pilotUserIdList != null and !pilotUserIdList.isEmpty()" />
         <if test="isPilotUserIdListEmpty">
             AND ri.user_account_id IN
@@ -159,5 +159,33 @@
                 LEFT JOIN customer_service_intervention csi ON csi.requirements_info_id = ri.id
         WHERE ri.id = #{requirementsInfoId} and (rs.service_flow_id != 11 or rs.service_flow_id is null)
     </select>
+    <select id="getSonFromFatherRequireId"
+            resultType="com.mmc.csf.release.entity.requirements.ServiceOrderFormDO">
+        SELECT
+        ri.id,
+        ri.create_time,
+        ri.father_require_id,
+        ri.update_time,
+        ri.publisher_number,
+        ri.publish_phone,
+        ri.order_attribute,
+        ra.order_earnings,
+        ra.order_level,
+        rs.preempt_phone,
+        ri.service_flow_id,
+        sf.doing,
+        ri.service_id,
+        ri.service_name,
+        sf.order_status,
+        sf.waiting
+        FROM
+        requirements_info ri
+        LEFT JOIN requirements_amount ra ON ri.id = ra.requirements_info_id
+        LEFT JOIN requirements_service rs ON rs.requirements_info_id = ri.id
+        LEFT JOIN service_flow sf ON ri.service_flow_id = sf.id
+        WHERE
+        ri.publish =1 and ri.father_require_id = #{id}
+
+    </select>
 
 </mapper>

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -1626,6 +1626,7 @@
         ORDER BY ri.id desc
         limit #{pageNo}, #{pageSize}
     </select>
+
     <select id="selectFatherRequireIdBySonId" resultType="java.lang.Integer">
         select father_require_id from requirements_info
         where id = #{requireInfoId}