需求

mall-server-api/src/main/java/com/gree/mall/manager/bean/worker/SettlementPgOrderVO.java

@@ -8,6 +8,7 @@ import org.springframework.data.elasticsearch.annotations.FieldType;
 import org.springframework.stereotype.Service;
 
 import javax.validation.constraints.NotBlank;
+import java.util.Date;
 
 @ApiModel
 @Data
@@ -41,8 +42,27 @@ public class SettlementPgOrderVO {
     @ApiModelProperty(value = "师傅电话")
     private String workerMobile;
 
+    @ApiModelProperty(value = "工单类型")
+    private String orderSmallTypeText;
 
+    @ApiModelProperty(value = "总工单数（单）")
+    private Integer zgds;
 
+    @ApiModelProperty(value = "设备总台数（台）")
+    private Integer sbzts;
 
+    @ApiModelProperty(value = "电子支付工单数量（台）")
+    private Integer dzzfs;
 
+    @ApiModelProperty(value = "电子支付设备总台数（台）")
+    private Integer dzzfsbts;
+
+    @ApiModelProperty(value = "电子支付总金额（台）")
+    private Integer dzzfzje;
+
+    @ApiModelProperty(value = "电子支付平均费用（元/台）")
+    private Integer dzzfpjfy;
+
+    @ApiModelProperty(value = "电子支付总平均费用（元/台）")
+    private Integer dzzfzpjfy;
 }

mall-server-api/src/main/java/com/gree/mall/manager/controller/websit/SettlementOrderNewController.java

@@ -11,6 +11,7 @@ import com.gree.mall.manager.bean.websit.WorkerSettlementVO;
 import com.gree.mall.manager.bean.worker.SettlementPgOrderVO;
 import com.gree.mall.manager.helper.ResponseHelper;
 import com.gree.mall.manager.logic.websit.SettlementOrderLogic;
+import com.gree.mall.manager.zfire.bean.WorkerParamBean;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
 import io.swagger.annotations.Api;
@@ -98,19 +99,19 @@ public class SettlementOrderNewController {
     @PostMapping("/list/pgOrder")
     @ApiOperation(value = "辅材报表列表")
     public ResponseHelper<IPage<SettlementPgOrderVO>> pgOrder(
-            @RequestBody ZfireParamBean zfireParamBean
+            @RequestBody WorkerParamBean workerParamBean
     ) {
-        IPage<SettlementPgOrderVO> page = settlementOrderLogic.pgOrder(zfireParamBean);
+        IPage<SettlementPgOrderVO> page = settlementOrderLogic.pgOrder(workerParamBean);
         return ResponseHelper.success(page, new TypeReference<SettlementPgOrderVO>() {});
     }
 
     @PostMapping("/pgOrderExport")
     @ApiOperation(value = "辅材报表导出")
-    public void pgOrderExport(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
+    public void pgOrderExport(@RequestBody WorkerParamBean workerParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
         //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(workerParamBean);
         //2.查询要导出的内容
-        IPage<SettlementPgOrderVO> page = settlementOrderLogic.pgOrder(zfireParamBean);
+        IPage<SettlementPgOrderVO> page = settlementOrderLogic.pgOrder(workerParamBean);
         //3.导出
         FieldUtils.exportData(page.getRecords(), zfireParam.getExportFields(), request, response);
     }

mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/SettlementOrderLogic.java

@@ -37,6 +37,7 @@ import com.gree.mall.manager.logic.material.stock.WorkerStockLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.utils.StringUtil;
+import com.gree.mall.manager.zfire.bean.WorkerParamBean;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
 import lombok.extern.log4j.Log4j;
@@ -796,7 +797,7 @@ public class SettlementOrderLogic {
         settlementOrderManualItemService.saveBatch(settlementOrderItems);
     }
 
-    public IPage<SettlementPgOrderVO> pgOrder(ZfireParamBean zfireParamBean) {
+    public IPage<SettlementPgOrderVO> pgOrder(WorkerParamBean zfireParamBean) {
 
         return new Page<>();
     }

mall-server-api/src/main/java/com/gree/mall/manager/zfire/bean/WorkerParamBean.java

@@ -16,4 +16,10 @@ public class WorkerParamBean extends ZfireParamBean {
 
     @ApiModelProperty(value = "主要工程师")
     private String maserWorkerId;
+
+    @ApiModelProperty(value = "结束开始时间")
+    private String overTime;
+
+    @ApiModelProperty(value = "结束end时间")
+    private String overEndTime;
 }