‘linchangsheng’ 4 months ago
parent
commit
92b3f01a7a

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

@@ -1,5 +1,6 @@
 package com.gree.mall.manager.bean.worker;
 
+import com.gree.mall.manager.annotation.ZfireField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -45,24 +46,31 @@ public class SettlementPgOrderVO {
     @ApiModelProperty(value = "工单类型")
     private String orderSmallTypeText;
 
+    @ZfireField(isQuery = false)
     @ApiModelProperty(value = "总工单数(单)")
     private Integer zgds;
 
+    @ZfireField(isQuery = false)
     @ApiModelProperty(value = "设备总台数(台)")
     private Integer sbzts;
 
+    @ZfireField(isQuery = false)
     @ApiModelProperty(value = "电子支付工单数量(台)")
     private Integer dzzfs;
 
+    @ZfireField(isQuery = false)
     @ApiModelProperty(value = "电子支付设备总台数(台)")
     private Integer dzzfsbts;
 
+    @ZfireField(isQuery = false)
     @ApiModelProperty(value = "电子支付总金额(台)")
     private Integer dzzfzje;
 
+    @ZfireField(isQuery = false)
     @ApiModelProperty(value = "电子支付平均费用(元/台)")
     private Integer dzzfpjfy;
 
+    @ZfireField(isQuery = false)
     @ApiModelProperty(value = "电子支付总平均费用(元/台)")
     private Integer dzzfzpjfy;
 }

+ 0 - 2
mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/PolicyOrderLogic.java

@@ -192,8 +192,6 @@ public class PolicyOrderLogic {
             SysDictCompany sysDictCompany = sysDictCompanyService.lambdaQuery().eq(SysDictCompany::getDictValue, row.get(0))
                     .eq(SysDictCompany::getDictType,"INSURE_STEAD_UNIT").one();
 
-            if (policyOrder == null)
-                throw new RemoteServiceException((String) row.get(1)+"网点下工程师未找到"+(String) row.get(6));
 
 
             if (policyOrder != null) {

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

@@ -798,6 +798,17 @@ public class SettlementOrderLogic {
     }
 
     public IPage<SettlementPgOrderVO> pgOrder(WorkerParamBean zfireParamBean) {
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+
+/*        //1.组装查询条件
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean, SettlementPgOrderVO.class, adminUser);
+        IPage<SettlementPgOrderVO> settlementOrderLogicVOIPage = websitSalesRetCMapper.pgOrderList(new Page(zfireParamBean.getPageNum(),
+                        zfireParamBean.getPageSize(),zfireParamBean.getOverTime(),zfireParamBean.getOverEndTime()),
+                zfireParam
+                , companyWechatIds);
+
+        return settlementOrderLogicVOIPage;*/
 
         return new Page<>();
     }