需求

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

@@ -0,0 +1,48 @@
+package com.gree.mall.manager.bean.worker;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+import org.springframework.stereotype.Service;
+
+import javax.validation.constraints.NotBlank;
+
+@ApiModel
+@Data
+public class SettlementPgOrderVO {
+
+    @ApiModelProperty(value = "所属公司 （S9219801广州，S9219807佛山）")
+    private String belongCompany;
+
+    @ApiModelProperty(value = "所属公司编号")
+    private String belongCompanyCode;
+
+
+    @ApiModelProperty(value = "网点编号")
+    private String websitId;
+
+    @ApiModelProperty(value = "网点名称")
+    private String websitName;
+
+    @ApiModelProperty(value = "网点联系人")
+    private String linkName;
+
+    @ApiModelProperty(value = "网点联系人电话")
+    private String linkMobile;
+
+    @ApiModelProperty("师傅编号")
+    private String workerId;
+
+    @ApiModelProperty("师傅名称")
+    private String workerName;
+
+    @ApiModelProperty(value = "师傅电话")
+    private String workerMobile;
+
+
+
+
+
+}

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

@@ -8,6 +8,7 @@ import com.gree.mall.manager.bean.websit.SettlementOrderDetail;
 import com.gree.mall.manager.bean.websit.SettlementOrderLogicVO;
 import com.gree.mall.manager.bean.websit.WorkerSettlementLineVO;
 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.ZfireParamBean;
@@ -93,5 +94,26 @@ public class SettlementOrderNewController {
 
 
 
+    @ZfireList
+    @PostMapping("/list/pgOrder")
+    @ApiOperation(value = "辅材报表列表")
+    public ResponseHelper<IPage<SettlementPgOrderVO>> pgOrder(
+            @RequestBody ZfireParamBean zfireParamBean
+    ) {
+        IPage<SettlementPgOrderVO> page = settlementOrderLogic.pgOrder(zfireParamBean);
+        return ResponseHelper.success(page, new TypeReference<SettlementPgOrderVO>() {});
+    }
+
+    @PostMapping("/pgOrderExport")
+    @ApiOperation(value = "辅材报表导出")
+    public void pgOrderExport(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
+        //1.组装查询条件
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        //2.查询要导出的内容
+        IPage<SettlementPgOrderVO> page = settlementOrderLogic.pgOrder(zfireParamBean);
+        //3.导出
+        FieldUtils.exportData(page.getRecords(), zfireParam.getExportFields(), request, response);
+    }
+
 
 }

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

@@ -21,6 +21,7 @@ import com.gree.mall.manager.bean.websit.SettlementOrderDetail;
 import com.gree.mall.manager.bean.websit.SettlementOrderLogicVO;
 import com.gree.mall.manager.bean.websit.WorkerSettlementLineVO;
 import com.gree.mall.manager.bean.websit.WorkerSettlementVO;
+import com.gree.mall.manager.bean.worker.SettlementPgOrderVO;
 import com.gree.mall.manager.commonmapper.MaterialGoodsStockCMapper;
 import com.gree.mall.manager.commonmapper.MaterialMapper;
 import com.gree.mall.manager.commonmapper.WebsitSalesRetCMapper;
@@ -795,6 +796,11 @@ public class SettlementOrderLogic {
         settlementOrderManualItemService.saveBatch(settlementOrderItems);
     }
 
+    public IPage<SettlementPgOrderVO> pgOrder(ZfireParamBean zfireParamBean) {
+
+        return new Page<>();
+    }
+
 /*
 
     private void addSettlementOrder(WorkerOrder workerOrder, List<WorkerOrderItem> workerOrderItems) {