修改移动端优惠包交接分页列表

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverQuery.java

@@ -15,11 +15,8 @@ public class AppBusDiscountpackageHandoverQuery implements Query {
     private String orgPath; // 分公司sid
     @ApiModelProperty("当前登录用户sid")
     private String userSid; //
-//    @ApiModelProperty("待接收销售专员用户sid")
-//    private String recUserSid; // 待接收销售专员用户sid
     @ApiModelProperty("1待准备 2待交接 3已交接")
     private String type; // 1待准备 2待交接 3已交接
-    @ApiModelProperty("1待准备 2待交接 3已交接")
+    private String name; //
-    private String names; // 1待准备 2待交接 3已交接
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java

@@ -21,7 +21,7 @@ public class AppBusDiscountpackageHandoverVo implements Vo {
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid; // 销售订单sid
     @ApiModelProperty("交接状态 1待准备，2待交接，3已交接")
-    private Integer type; // 交接状态
+    private String nodeState; // 交接状态
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty("创建日期")
     private Date createDate; // 合同编号
@@ -33,13 +33,13 @@ public class AppBusDiscountpackageHandoverVo implements Vo {
     private String model; // 车型名称
     @ApiModelProperty("车辆台数")
     private String carNum; // 车辆台数
-    @ApiModelProperty("接收人姓名")
+    @ApiModelProperty("优惠包数量")
-    private String recName; // 接收人姓名
+    private String discountNum; // 优惠包数量
-    @ApiModelProperty("接收人电话")
+    @ApiModelProperty("优惠包总价值")
-    private String recPhone; // 接收人电话
+    private String price; // 接收人电话
-    @ApiModelProperty("待交接显示")
+    @ApiModelProperty("办理显示")
-    private Boolean showHandleBtn; // 待交接显示
+    private Boolean showHandleBtn; // 办理显示
-    @ApiModelProperty("已交接显示")
+    @ApiModelProperty("上传显示")
-    private Boolean showDownloadBtn; // 已交接显示
+    private Boolean showUploadBtn; // 上传显示
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml

@@ -23,18 +23,27 @@
 
     <select id="selectAppPageVo"
             resultType="com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo">
-        select distinct
+        SELECT DISTINCT
         sid,
-        `state` as `type`,
+        createTime AS createDate,
-        createTime as createDate,
+        contractNo AS contractId,
-        contractNo as contractId,
         customerName,
-        vehModel as model,
+        vehModel AS model,
-        vehCount as carNum,
+        vehCount AS carNum,
         recName,
         recPhone,
-        recTime
+        recTime,
-        FROM bus_discountpackage_handover
+        CASE
+        `state`
+        WHEN 1 THEN
+        '待准备'
+        WHEN 2 THEN
+        '待交接'
+        WHEN 3 THEN
+        '已交接'
+        END AS nodeState
+        FROM
+        bus_discountpackage_handover
         <where>${ew.sqlSegment}</where>
     </select>
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java

@@ -18,6 +18,7 @@ import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService;
 import com.yxt.anrui.buscenter.biz.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListService;
 import com.yxt.anrui.portal.api.sysrole.SysRoleFeign;
 import com.yxt.anrui.portal.api.sysrole.SysRoleVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -34,6 +35,7 @@ import org.springframework.stereotype.Service;
 import java.io.File;
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -58,6 +60,8 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
     private DocPdfComponent docPdfComponent;
     @Autowired
     private CommonContractFeign commonContractFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
 
     /**
      * 筛选条件
@@ -493,22 +497,23 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
 
     private QueryWrapper<BusDiscountpackageHandover> appCreateQueryWrapper(AppBusDiscountpackageHandoverQuery query) {
         QueryWrapper<BusDiscountpackageHandover> qw = new QueryWrapper<>();
-        qw.eq("useOrgSid", query.getOrgPath());
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+        qw.eq("useOrgSid", useOrgSid);
         qw.eq("isDelete", 0);
         if (StringUtils.isNotBlank(query.getUserSid())) {
             qw.eq("recUserSid", query.getUserSid());
         }
         if (StringUtils.isNotBlank(query.getType())) {
-            if (query.getType().equals("3")) {
+            if (query.getType().equals("2")) {
-                qw.eq("state", query.getType());
+                qw.eq("state", 3);
-            } else {
+            } else if (query.getType().equals("1")) {
                 qw.ne("state", 3);
             }
         }
-        if (StringUtils.isNotBlank(query.getNames())) {
+        if (StringUtils.isNotBlank(query.getName())) {
-            qw.and(wrapper -> wrapper.like("contractNo", query.getNames()).or().like("customerName", query.getNames())
+            qw.and(wrapper -> wrapper.like("contractNo", query.getName()).or().like("customerName", query.getName()));
-            .or().like("recName",query.getNames()));
         }
+        qw.orderByDesc("createTime");
         return qw;
     }
 
@@ -525,11 +530,10 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
         IPage<BusDiscountpackageHandover> page = PagerUtil.queryToPage(pq);
         IPage<AppBusDiscountpackageHandoverVo> pagging = baseMapper.selectAppPageVo(page, qw);
         List<AppBusDiscountpackageHandoverVo> records = pagging.getRecords();
-        if (null != records) {
+        if (null != records && records.size() > 0) {
             for (AppBusDiscountpackageHandoverVo record : records) {
                 if (null != record) {
                     if (StringUtils.isNotBlank(record.getContractId())) {
-
                         CommonContract data = commonContractFeign.selectByNo(record.getContractId()).getData();
                         if (null != data) {
                             if (StringUtils.isNotBlank(data.getBusSid())) {
@@ -537,13 +541,37 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
                             }
                         }
                     }
-                    if (null != record.getType()) {
+                    if (("待交接".equals(record.getNodeState()))) {
-                        if (record.getType() == 1 || record.getType() == 2) {
+                        record.setShowHandleBtn(true);
-                            record.setShowHandleBtn(true);
+                    } else {
-                        } else if (record.getType() == 3) {
+                        record.setShowHandleBtn(false);
-                            record.setShowDownloadBtn(true);
+                    }
+                    if (("已交接".equals(record.getNodeState()))) {
+                        //查询有没有上传的图片
+                        List<BuscenterFile> buscenterFiles = buscenterFileService.selectByLinkSid(record.getSid(), BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType());
+                        if (buscenterFiles.size() > 0) {
+                            record.setShowUploadBtn(false);
+                        } else {
+                            record.setShowUploadBtn(true);
+                        }
+                    }
+                    record.setShowUploadBtn(false);
+                }
+                List<BusDiscountpackageHandoverList> listByMainSid = busDiscountpackageHandoverListService.findListByMainSid(record.getSid());
+                if (listByMainSid.size() > 0) {
+                    BigDecimal price = new BigDecimal(0);
+                    int discountNum = 0;
+                    for (BusDiscountpackageHandoverList handoverList : listByMainSid) {
+                        if (null != handoverList) {
+                            //优惠包数量
+                            String number = handoverList.getNumber();
+                            discountNum = discountNum + Integer.valueOf(number);
+                            BigDecimal totalPrice = handoverList.getTotalPrice();
+                            price = price.add(totalPrice);
                         }
                     }
+                    record.setDiscountNum(String.valueOf(discountNum));
+                    record.setPrice(String.valueOf(price));
                 }
             }
         }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversQuery.java

@@ -19,7 +19,7 @@ public class AppBusDiscountpackageHandoversQuery implements Query {
     @ApiModelProperty("1待准备 2待交接 3已交接")
     private String type; // 1待准备 2待交接 3已交接
     @ApiModelProperty("合同编号/客户名称/待接收人")
-    private String names;
+    private String name;
 
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java

@@ -21,7 +21,7 @@ public class AppBusDiscountpackageHandoversVo implements Vo {
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid; // 销售订单sid
     @ApiModelProperty("交接状态 1待准备，2待交接，3已交接")
-    private Integer type; // 交接状态
+    private String nodeSate; // 交接状态
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty("创建日期")
     private Date createDate; // 合同编号