根据父订单id查询子订单信息

release-service/src/main/java/com/mmc/csf/release/controller/RequirementsController.java

@@ -13,6 +13,7 @@ import com.mmc.csf.release.model.group.Page;
 import com.mmc.csf.release.model.group.Update;
 import com.mmc.csf.release.service.RequirementsService;
 import io.swagger.annotations.*;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -358,5 +359,11 @@ public class RequirementsController extends BaseController {
         return requirementsService.deleteRequire(requirementsInfoId, this.getUserLoginInfoFromRedis(request).getUserAccountId());
     }
 
+    @ApiOperation(value = "小程序—获取子订单详细信息")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("selectRequireSonInfo")
+    public ResultBody<RequirementsInfoVO> selectRequireSonInfo(HttpServletRequest request, @Validated(value = {Page.class}) @ApiParam(value = "查询所有子订单信息", required = true) @RequestBody MyPublishQO param){
+        return ResultBody.success(requirementsService.selectRequireSonInfo(this.getUserLoginInfoFromRedis(request).getUserAccountId(), param));
+    }
 
 }

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

 package com.mmc.csf.release.dao;
 
+import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.infomation.dto.*;
 import com.mmc.csf.infomation.qo.IndustryCaseQO;
 import com.mmc.csf.infomation.qo.MyPreemptQO;
@@ -223,7 +224,7 @@ public interface RequirementsDao {
     /**
      * 根据父订单获取子订单中没被抢的id
      * @param fatherRequireId 父订单id
-     * @return {@link Integer}
+     * @return {@link Integer} 没被抢的子订单id 只返回一个
      */
     Integer getRequirementsSonInfoId(Integer fatherRequireId);
 
@@ -243,4 +244,12 @@ public interface RequirementsDao {
      * @return {@link Integer}1 就是已经抢到这个订单了 0 就是没抢过
      */
     Integer selectBooleanByFatherIdAndUserId(Integer fatherRequireId,Integer userId);
+
+
+    /**
+     * 根据父订单id 查找所有子订单信息
+     * @param param 父订单id
+     * @return {@link List}<{@link RequirementsInfoDO}>
+     */
+    List<RequirementsInfoDO> selectRequireSonInfo(MyPublishQO param);
 }

release-service/src/main/java/com/mmc/csf/release/service/RequirementsService.java

@@ -126,4 +126,13 @@ public interface RequirementsService {
     ResultBody flyHandAgree(FlyHandAgreeVO agreeVO, HttpServletRequest request);
 
     ServiceRequirementsDO getRepertory(GrabTheOrderVO grabTheOrderVO, HttpServletRequest request);
+
+
+    /**
+     * 根据父订单的id找到所有子订单信息
+     * @param userAccountId 发单人的id
+     * @param param 条件 父id在里面
+     * @return {@link PageResult}
+     */
+    PageResult selectRequireSonInfo(Integer userAccountId, MyPublishQO param);
 }

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

@@ -3123,6 +3123,25 @@ public class RequirementsServiceImpl implements RequirementsService {
         return ResultBody.success(serviceEvaluateDTO);
     }
 
+    @Override
+    public PageResult selectRequireSonInfo(Integer userAccountId, MyPublishQO param) {
+        Integer pageNo = param.getPageNo();
+        param.buildCurrentPage();
+        param.setUserAccountId(userAccountId);
+        int count = requirementsDao.myPublishcount(param);
+        List<RequirementsInfoDO> requirementsInfoDOS = requirementsDao.selectRequireSonInfo(param);
+        List<RequirementsInfoVO> collect = requirementsInfoDOS.stream().map(RequirementsInfoDO::buildRequirementsInfoVO).collect(Collectors.toList());
+        List<IndustryTypeDTO> industryTypeDTOS = listIndustry();
+        for (RequirementsInfoVO requirementsInfoVO : collect) {
+            for (IndustryTypeDTO industryTypeDTO : industryTypeDTOS) {
+                if (requirementsInfoVO.getServiceId() != null && requirementsInfoVO.getServiceId().equals(industryTypeDTO.getId())) {
+                    requirementsInfoVO.setServiceName(industryTypeDTO.getTypeName());
+                }
+            }
+        }
+        return PageResult.buildPage(pageNo, param.getPageSize(), count, collect);
+    }
+
 
     public UserAccountSimpleDTO feignGetUserSimpleInfo(Integer userAccountId, HttpServletRequest request) {
         String token = request.getHeader("token");

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

@@ -516,6 +516,8 @@
                ri.publish_phone,
                ri.publisher_number,
                ri.service_id,
+               ri.repertory,
+               ri.require_num,
                ra.total_amount,
                ri.insurance,
                sf.doing,
@@ -775,6 +777,7 @@
         sf.flyer_port,
         sf.order_status,
         ri.publish,
+        ri.require_num,
         rau.update_order_amount
         FROM
         requirements_info ri
@@ -783,6 +786,7 @@
         LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
         LEFT JOIN requirements_amount_update rau ON rau.requirements_info_id = ri.id
         WHERE ri.user_account_id = #{userAccountId} and ri.is_deleted!=1
+        and father_require_id = 0
         <if test=" requirementsInfoId != null  ">
             and ri.id=#{requirementsInfoId}
         </if>
@@ -1587,6 +1591,47 @@
                          where ri.father_require_id =#{fatherRequireId}
         and rs.pilot_certification_user_id = #{userId}
     </select>
+    <select id="selectRequireSonInfo" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
+        SELECT
+        ri.id,
+        ri.task_title,
+        ri.task_start_time,
+        ri.task_end_time,
+        ri.task_address,
+        ri.longitude,
+        ri.latitude,
+        ri.require_url,
+        ri.require_description,
+        ri.requirement_type_id,
+        ri.user_account_id,
+        rt.type_name AS requirementTypeName,
+        ri.publish_phone,
+        ri.publisher_number,
+        ri.service_id,
+        ra.total_amount,
+        ri.insurance,
+        ra.order_level,
+        ra.order_amount,
+        sf.doing,
+        sf.waiting,
+        sf.user_port,
+        sf.flyer_port,
+        sf.order_status,
+        ri.publish,
+        rau.update_order_amount
+        FROM
+        requirements_info ri
+        LEFT JOIN requirements_type rt ON rt.id = ri.requirement_type_id
+        LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
+        LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
+        LEFT JOIN requirements_amount_update rau ON rau.requirements_info_id = ri.id
+        WHERE ri.user_account_id = #{userAccountId} and ri.is_deleted!=1
+        <if test=" requirementsInfoId != null  ">
+            and ri.father_require_id=#{requirementsInfoId}
+        </if>
+        ORDER BY ri.id desc
+        limit #{pageNo}, #{pageSize}
+    </select>
 
     <update id="updateRequirementsInfoRepertory">
         update requirements_info set repertory = #{fatherRepertory}