Merge remote-tracking branch 'origin/develop' into develop

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

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

@@ -0,0 +1,68 @@
+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;
+import java.util.Date;
+
+@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;
+
+    @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

@@ -8,8 +8,10 @@ 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.WorkerParamBean;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
 import io.swagger.annotations.Api;
@@ -93,5 +95,26 @@ public class SettlementOrderNewController {
 
 
 
+    @ZfireList
+    @PostMapping("/list/pgOrder")
+    @ApiOperation(value = "辅材报表列表")
+    public ResponseHelper<IPage<SettlementPgOrderVO>> pgOrder(
+            @RequestBody WorkerParamBean workerParamBean
+    ) {
+        IPage<SettlementPgOrderVO> page = settlementOrderLogic.pgOrder(workerParamBean);
+        return ResponseHelper.success(page, new TypeReference<SettlementPgOrderVO>() {});
+    }
+
+    @PostMapping("/pgOrderExport")
+    @ApiOperation(value = "辅材报表导出")
+    public void pgOrderExport(@RequestBody WorkerParamBean workerParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
+        //1.组装查询条件
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(workerParamBean);
+        //2.查询要导出的内容
+        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

@@ -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;
@@ -36,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;
@@ -795,6 +797,11 @@ public class SettlementOrderLogic {
         settlementOrderManualItemService.saveBatch(settlementOrderItems);
     }
 
+    public IPage<SettlementPgOrderVO> pgOrder(WorkerParamBean zfireParamBean) {
+
+        return new Page<>();
+    }
+
 /*
 
     private void addSettlementOrder(WorkerOrder workerOrder, List<WorkerOrderItem> workerOrderItems) {

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseEsLogic.java

@@ -273,7 +273,8 @@ public class OrderBaseEsLogic {
             indexOperations1.create();
             Document document = indexOperations1.createMapping();
             indexOperations1.putMapping(document);
-        }
+        }*/
+        /*
         List<PgOrderBase> list = pgOrderBaseService.lambdaQuery().list();*/
 
        // List<OrderBaseEsDate> orderBaseEsDates = BeanUtil.copyToList(list, OrderBaseEsDate.class);
@@ -422,7 +423,7 @@ public class OrderBaseEsLogic {
                 .withQuery(queryBuilder)
                 .withPageable(PageRequest.of(1, 1))
                 .addAggregation(this.getAggs(AggregationBuilders.filter("YCD", QueryBuilders.boolQuery()
-                        .must(QueryBuilders.termQuery("is_exception","1"))
+                        .must(QueryBuilders.termQuery("is_exception",true))
                         .mustNot(QueryBuilders.termsQuery("order_status", "YWG", "YWGO", "YJS")))))
                 .build();
         SearchHits responseYCD = elasticsearchRestTemplate.search(searchQueryYCD, OrderBaseEs.class);

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

@@ -17,6 +17,12 @@ public class WorkerParamBean extends ZfireParamBean {
     @ApiModelProperty(value = "主要工程师")
     private String maserWorkerId;
 
+    @ApiModelProperty(value = "结束开始时间")
+    private String overTime;
+
+    @ApiModelProperty(value = "结束end时间")
+    private String overEndTime;
+
     @ApiModelProperty(value = "是否忽略网点权限")
     private Boolean ignoreWebsitRole;
 }