修改小程序大厅展示订单

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

@@ -355,4 +355,11 @@ public interface RequirementsDao {
     Integer selectServiceFlowIdFromAgreePilot(Integer requireId,Integer userAccountId);
 
     RequirementsServicePilotInfoDO selectPilotInfoByRequireId(Integer requireId);
+
+    /**
+     * 根据流程id查询订单所处状态
+     * @param serviceFlowId
+     * @return {@link String}
+     */
+    String selectOrderStatusByServiceFlowId(Integer serviceFlowId);
 }

release-service/src/main/java/com/mmc/csf/release/entity/requirements/RequirementsInfoDO.java

@@ -211,6 +211,7 @@ public class RequirementsInfoDO implements Serializable {
                 .updateOrderAmount(this.updateOrderAmount)
                 .reason(this.reason)
                 .url(this.url)
+                .orderStatus(this.orderStatus)
                 .afterModificationReason(this.afterModificationReason)
                 .afterModificationUrl(this.afterModificationUrl)
                 .pilotCertificationUserId(this.pilotCertificationUserId)

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

@@ -197,7 +197,10 @@ public class RequirementsServiceImpl implements RequirementsService {
 
         //远程调用服务一级分类
         //  List<IndustryTypeDTO> industryTypeDTOS = listIndustry();
-        List<RequirementsInfoVO> collect = requirementsInfoDOS.stream().map(RequirementsInfoDO::buildRequirementsInfoVO).collect(Collectors.toList());
+        List<RequirementsInfoVO> collect = requirementsInfoDOS.stream().map(requirementsInfoDO -> {
+            requirementsInfoDO.setOrderStatus(requirementsDao.selectOrderStatusByServiceFlowId(requirementsInfoDO.getServiceFlowId()));
+            return requirementsInfoDO;
+        }).map(RequirementsInfoDO::buildRequirementsInfoVO).collect(Collectors.toList());
        /* for (RequirementsInfoVO requirementsInfoVO : collect) {
             for (IndustryTypeDTO industryTypeDTO : industryTypeDTOS) {
                 if (requirementsInfoVO.getServiceId() != null && requirementsInfoVO.getServiceId().equals(industryTypeDTO.getId())) {
@@ -205,6 +208,7 @@ public class RequirementsServiceImpl implements RequirementsService {
                 }
             }
         }*/
+
         return ResultBody.success(collect);
     }
 

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

@@ -1818,6 +1818,9 @@
             ,ra.order_amount DESC
         </if>
     </select>
+    <select id="selectOrderStatusByServiceFlowId" resultType="java.lang.String">
+        select order_status from service_flow where id = #{serviceFlowId}
+    </select>
 
     <delete id="deleteRequirementsServiceInfo">
         delete from requirements_service  where requirements_info_id = #{requireId} and pilot_certification_user_id = #{userAccountId}