服务订单接口-列表条件筛选

src/main/java/com/mmc/oms/dao/mall/ServiceOrderTaskDao.java

@@ -22,5 +22,5 @@ public interface ServiceOrderTaskDao extends BaseMapper<ServiceOrderTaskDO> {
 
     Integer conditionCount(@Param("param") ServiceOrderTaskQO param, @Param("userAccountId") Integer userAccountId);
 
-    List<ServiceOrderTaskDO> queryPageByLimit(ServiceOrderTaskQO param, Integer userAccountId);
+    List<ServiceOrderTaskDO> queryPageByLimit(@Param("param") ServiceOrderTaskQO param, @Param("userAccountId") Integer userAccountId);
 }

src/main/java/com/mmc/oms/model/dto/mall/ServiceOrderTaskDTO.java

@@ -31,6 +31,9 @@ public class ServiceOrderTaskDTO implements Serializable {
 
     private static final long serialVersionUID = -178678654L;
 
+    @ApiModelProperty(value = "订单id")
+    private Integer id;
+
     @ApiModelProperty(value = "订单编号")
     private String orderNo;
 
@@ -52,6 +55,9 @@ public class ServiceOrderTaskDTO implements Serializable {
     @ApiModelProperty(value = "用户名称")
     private String userName;
 
+    @ApiModelProperty(value = "用户id")
+    private Integer userId;
+
     @ApiModelProperty(value = "服务项ID",example = "1")
     @NotNull(message = "新增服务-id不能为空", groups = {Create.class})
     private Integer inspectionId;

src/main/java/com/mmc/oms/model/qo/mall/ServiceOrderTaskQO.java

@@ -30,10 +30,21 @@ public class ServiceOrderTaskQO implements Serializable {
 
     private static final long serialVersionUID = -17878654L;
 
+    @ApiModelProperty(value = "订单名称或编号")
+    private String orderNameOrNo;
+
+    @ApiModelProperty(value = "用户id")
+    private String userId;
 
     @ApiModelProperty(value = "订单状态：0 待分配运营")
     private Integer orderStatus;
 
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
     @ApiModelProperty(value = "页码", required = true)
     @NotNull(
             message = "页码不能为空",

src/main/java/com/mmc/oms/service/mall/impl/ServiceOrderTaskServiceImpl.java

@@ -151,7 +151,9 @@ public class ServiceOrderTaskServiceImpl
     // 订单省市信息
     BeanCopyUtils.properties(provinceCityMap.get(item.getId()), orderTaskDTO);
     // 用户信息
-    BeanCopyUtils.properties(userMap.get(item.getUserAccountId()), orderTaskDTO);
+    UserAccountSimpleDTO userAccountSimpleDTO = userMap.get(item.getUserAccountId());
+    BeanCopyUtils.properties(userAccountSimpleDTO, orderTaskDTO);
+    orderTaskDTO.setUserId(userAccountSimpleDTO.getId());
     List<ServiceOrderTaskImageDO> imageDOList = imageMap.get(item.getId());
     List<String> images = null;
     if (CollectionUtils.isNotEmpty(imageDOList)) {
@@ -161,6 +163,7 @@ public class ServiceOrderTaskServiceImpl
               .collect(Collectors.toList());
     }
     orderTaskDTO.setImages(images);
+    orderTaskDTO.setId(item.getId());
     return orderTaskDTO;
   }
 

src/main/resources/mapper/mall/order/ServiceOrderTaskDao.xml

@@ -13,6 +13,18 @@
             <if test="userAccountId != null">
                 and user_account_id = #{userAccountId}
             </if>
+            <if test="param.orderNameOrNo != null and param.orderNameOrNo != ''">
+                and (order_no like CONCAT('%',#{param.orderNameOrNo},'%')
+            </if>
+            <if test="param.orderNameOrNo != null and param.orderNameOrNo != ''">
+                or order_name like CONCAT('%',#{param.orderNameOrNo},'%'))
+            </if>
+            <if test="param.startTime != null">
+                and created_time &gt;= #{param.startTime}
+            </if>
+            <if test="param.endTime != null">
+                and created_time &lt;= #{param.endTime}
+            </if>
         </where>
     </select>
 
@@ -29,6 +41,18 @@
             <if test="userAccountId != null">
                 and user_account_id = #{userAccountId}
             </if>
+            <if test="param.orderNameOrNo != null and param.orderNameOrNo != ''">
+                and (order_no like CONCAT('%',#{param.orderNameOrNo},'%')
+            </if>
+            <if test="param.orderNameOrNo != null and param.orderNameOrNo != ''">
+                or order_name like CONCAT('%',#{param.orderNameOrNo},'%'))
+            </if>
+            <if test="param.startTime != null">
+                and created_time &gt;= #{param.startTime}
+            </if>
+            <if test="param.endTime != null">
+                and created_time &lt;= #{param.endTime}
+            </if>
         </where>
         order by created_time desc
         limit #{param.pageNo}, #{param.pageSize}