Pre(update)

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/qo/MyPreemptQO.java

+package com.mmc.csf.infomation.qo;
+
+import com.mmc.csf.release.model.group.Freeze;
+import com.mmc.csf.release.model.group.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author small
+ * @Date 2023/8/23 17:31
+ * @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MyPreemptQO {
+    @ApiModelProperty(value = "当前页", required = true, example = "1")
+    @NotNull(message = "当前页不能为空", groups = {Page.class, Freeze.class})
+    @Min(value = 1, groups = Page.class)
+    private Integer pageNo;
+
+    @ApiModelProperty(value = "页大小", required = true, example = "10")
+    @NotNull(message = "页大小不能为空", groups = {Page.class, Freeze.class})
+    @Min(value = 1, groups = Page.class)
+    private Integer pageSize;
+
+    @ApiModelProperty(hidden = true)
+    private Integer userAccountId;
+
+    public void buildCurrentPage() {
+        this.pageNo = (pageNo - 1) * pageSize;
+    }
+}

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/qo/MyPublishQO.java

+package com.mmc.csf.infomation.qo;
+
+import com.mmc.csf.release.model.group.Freeze;
+import com.mmc.csf.release.model.group.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author small
+ * @Date 2023/8/23 17:32
+ * @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MyPublishQO {
+    @ApiModelProperty(value = "当前页", required = true, example = "1")
+    @NotNull(message = "当前页不能为空", groups = {Page.class, Freeze.class})
+    @Min(value = 1, groups = Page.class)
+    private Integer pageNo;
+
+    @ApiModelProperty(value = "页大小", required = true, example = "10")
+    @NotNull(message = "页大小不能为空", groups = {Page.class, Freeze.class})
+    @Min(value = 1, groups = Page.class)
+    private Integer pageSize;
+
+
+    @ApiModelProperty(hidden = true)
+    private Integer userAccountId;
+
+    public void buildCurrentPage() {
+        this.pageNo = (pageNo - 1) * pageSize;
+    }
+}

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

@@ -3,6 +3,8 @@ package com.mmc.csf.release.controller;
 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;
+import com.mmc.csf.infomation.qo.MyPublishQO;
 import com.mmc.csf.infomation.vo.*;
 import com.mmc.csf.release.commit.NotRepeatSubmit;
 import com.mmc.csf.release.model.group.Insert;
@@ -114,17 +116,18 @@ public class RequirementsController extends BaseController {
 
     @ApiOperation(value = "new——小程序-—服务订单--我的发布")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
-    @GetMapping("myPublish")
-    public ResultBody<RequirementsInfoVO> myPublish(HttpServletRequest request) {
-        return requirementsService.myPublish(this.getUserLoginInfoFromRedis(request).getUserAccountId());
+    @PostMapping("myPublish")
+    public ResultBody<RequirementsInfoVO> myPublish(HttpServletRequest request, @Validated(value = {Page.class}) @ApiParam(value = "我的发单", required = true) @RequestBody MyPublishQO param) {
+        return ResultBody.success(requirementsService.myPublish(this.getUserLoginInfoFromRedis(request).getUserAccountId(), param));
     }
 
 
     @ApiOperation(value = "new——小程序-—服务订单--我的抢单")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
-    @GetMapping("myPreempt")
-    public ResultBody<RequirementsInfoVO> myPreempt(HttpServletRequest request) {
-        return requirementsService.myPreempt(this.getUserLoginInfoFromRedis(request).getUserAccountId());
+    @PostMapping("myPreempt")
+    public ResultBody<RequirementsInfoVO> myPreempt(HttpServletRequest request,
+                                                    @Validated(value = {Page.class}) @ApiParam(value = "我的抢单", required = true) @RequestBody MyPreemptQO param) {
+        return ResultBody.success(requirementsService.myPreempt(this.getUserLoginInfoFromRedis(request).getUserAccountId(), param));
     }
 
     @ApiOperation(value = "new——小程序-—飞手端--抵达现场")

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

 package com.mmc.csf.release.dao;
 
 import com.mmc.csf.infomation.qo.IndustryCaseQO;
+import com.mmc.csf.infomation.qo.MyPreemptQO;
+import com.mmc.csf.infomation.qo.MyPublishQO;
 import com.mmc.csf.release.entity.requirements.*;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -105,9 +107,9 @@ public interface RequirementsDao {
 
     ServiceEvaluateDO evaluateDetails(Integer requirementsInfoId, Integer userAccountId);
 
-    List<RequirementsInfoDO> myPublish(Integer userAccountId);
+    List<RequirementsInfoDO> myPublish(MyPublishQO param);
 
-    List<RequirementsInfoDO> myPreempt(Integer userAccountId);
+    List<RequirementsInfoDO> myPreempt(MyPreemptQO param);
 
     RequirementsServiceDO droneFlyerCancel(Integer requirementsInfoId, Integer userAccountId);
 
@@ -120,5 +122,8 @@ public interface RequirementsDao {
 
     void updateInfo(Integer requirementsInfoId, Integer serviceFlowId);
 
-    void serviceOrder(Integer requirementsInfoId);
+
+    int myPublishcount(MyPublishQO param);
+
+    int myPreemptCount(MyPreemptQO param);
 }

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

 package com.mmc.csf.release.service;
 
+import com.mmc.csf.common.util.page.PageResult;
 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;
+import com.mmc.csf.infomation.qo.MyPublishQO;
 import com.mmc.csf.infomation.vo.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -67,7 +70,7 @@ public interface RequirementsService {
 
     ResultBody publishService(ServiceRequirementsVO serviceRequirementsVO, HttpServletRequest request);
 
-    ResultBody<RequirementsInfoVO> myPublish(Integer userAccountId);
+    PageResult myPublish(Integer userAccountId, MyPublishQO param);
 
     ResultBody<RequirementsInfoVO> grabTheOrder(GrabTheOrderVO grabTheOrderVO, HttpServletRequest request);
 
@@ -90,7 +93,7 @@ public interface RequirementsService {
 
     ResultBody publisherNumber(GetOrderNumberVO getOrderNumberVO, HttpServletRequest request);
 
-    ResultBody<RequirementsInfoVO> myPreempt(Integer userAccountId);
+    PageResult myPreempt(Integer userAccountId, MyPreemptQO param);
 
     ResultBody droneFlyerCancel(Integer requirementsInfoId, Integer userAccountId);
 

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

@@ -9,6 +9,8 @@ import com.mmc.csf.common.util.web.ResultEnum;
 import com.mmc.csf.config.IsNullConvertZeroUtil;
 import com.mmc.csf.infomation.dto.*;
 import com.mmc.csf.infomation.qo.IndustryCaseQO;
+import com.mmc.csf.infomation.qo.MyPreemptQO;
+import com.mmc.csf.infomation.qo.MyPublishQO;
 import com.mmc.csf.infomation.vo.*;
 import com.mmc.csf.release.dao.RequirementsDao;
 import com.mmc.csf.release.entity.requirements.*;
@@ -477,10 +479,15 @@ public class RequirementsServiceImpl implements RequirementsService {
     }
 
     @Override
-    public ResultBody<RequirementsInfoVO> myPreempt(Integer userAccountId) {
-        List<RequirementsInfoDO> requirementsInfoDOS = requirementsDao.myPreempt(userAccountId);
+    public PageResult myPreempt(Integer userAccountId, MyPreemptQO param) {
+        Integer pageNo = param.getPageNo();
+        param.buildCurrentPage();
+        param.setUserAccountId(userAccountId);
+        int count = requirementsDao.myPreemptCount(param);
+        List<RequirementsInfoDO> requirementsInfoDOS = requirementsDao.myPreempt(param);
         List<RequirementsInfoVO> collect = requirementsInfoDOS.stream().map(RequirementsInfoDO::buildRequirementsInfoVO).collect(Collectors.toList());
-        return ResultBody.success(collect);
+
+        return PageResult.buildPage(pageNo, param.getPageSize(), count, collect);
     }
 
     @Override
@@ -848,10 +855,14 @@ public class RequirementsServiceImpl implements RequirementsService {
 
 
     @Override
-    public ResultBody<RequirementsInfoVO> myPublish(Integer userAccountId) {
-        List<RequirementsInfoDO> requirementsInfoDOS = requirementsDao.myPublish(userAccountId);
+    public PageResult myPublish(Integer userAccountId, MyPublishQO param) {
+        Integer pageNo = param.getPageNo();
+        param.buildCurrentPage();
+        param.setUserAccountId(userAccountId);
+        int count = requirementsDao.myPublishcount(param);
+        List<RequirementsInfoDO> requirementsInfoDOS = requirementsDao.myPublish(param);
         List<RequirementsInfoVO> collect = requirementsInfoDOS.stream().map(RequirementsInfoDO::buildRequirementsInfoVO).collect(Collectors.toList());
-        return ResultBody.success(collect);
+        return PageResult.buildPage(pageNo, param.getPageSize(), count, collect);
 
     }
 

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

@@ -447,6 +447,18 @@
           and user_account_id = #{userAccountId}
     </select>
 
+    <select id="myPublishcount" resultType="java.lang.Integer">
+        SELECT count(*)
+        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
+        WHERE ri.user_account_id = #{userAccountId}
+
+    </select>
+
+
     <select id="myPublish" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
         SELECT ri.id,
                ri.task_title,
@@ -463,10 +475,10 @@
                ri.publish_phone,
                ri.publisher_number,
                ri.service_id,
-               ri.total_amount,
+               ra.total_amount,
                ri.insurance,
-               ri.order_level,
-               ri.order_amount,
+               ra.order_level,
+               ra.order_amount,
                sf.doing,
                sf.waiting,
                sf.user_port,
@@ -477,9 +489,21 @@
                  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
         WHERE ri.user_account_id = #{userAccountId}
         ORDER BY ri.order_level_amount desc,
                  ri.id desc
+            limit #{pageNo}, #{pageSize}
+    </select>
+
+    <select id="myPreemptCount" resultType="java.lang.Integer">
+        SELECT count(*)
+        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
+                 INNER JOIN requirements_service rs ON ri.id = rs.requirements_info_id
+        WHERE rs.pilot_certification_user_id = #{userAccountId}
     </select>
 
     <select id="myPreempt" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
@@ -498,7 +522,7 @@
                ri.publish_phone,
                ri.publisher_number,
                ri.service_id,
-               ri.total_amount,
+               ra.total_amount,
                ri.insurance,
                sf.doing,
                sf.waiting,
@@ -507,15 +531,17 @@
                sf.order_status,
                ri.publish,
                rs.preempt_total_amount,
-               ri.order_level,
-               ri.order_amount,
+               ra.order_level,
+               ra.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
                  INNER JOIN requirements_service rs ON ri.id = rs.requirements_info_id
         WHERE rs.pilot_certification_user_id = #{userAccountId}
         ORDER BY ri.order_level_amount desc,
-                 rs.id desc
+                 ra.id desc
+            limit #{pageNo}, #{pageSize}
     </select>
 
     <select id="droneFlyerCancel" resultType="com.mmc.csf.release.entity.requirements.RequirementsServiceDO">