修改出库申请列表和出库申请详情，出库申请初始化接口

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyInfoVo.java

@@ -15,11 +15,9 @@ public class AppDeliveredApplyInfoVo implements Vo {
     private static final long serialVersionUID = 1516492882330414001L;
 
     @ApiModelProperty("合同id")
-    @JsonProperty("contractId")
     private String contractNo;
 
     @ApiModelProperty("车型")
-    @JsonProperty("model")
     private String modelName;
 
     @ApiModelProperty("手机号")
@@ -27,14 +25,15 @@ public class AppDeliveredApplyInfoVo implements Vo {
 
     @ApiModelProperty("申请日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @JsonProperty("date")
     private Date applyDate;
 
+    @ApiModelProperty("申请人")
+    private String applyName;
+
     @ApiModelProperty("是否为终端客户")
     private String terminalValue;
 
     @ApiModelProperty("是否为终端客户")
-    @JsonProperty("terminalKey")
     private String isTerminal;
 
     @ApiModelProperty("备注")
@@ -44,7 +43,6 @@ public class AppDeliveredApplyInfoVo implements Vo {
     private List<AppCarListVo> carList;
 
     @ApiModelProperty("用户sid")
-    @JsonProperty("userSid")
     private String createBySid;
 
     @ApiModelProperty("流程实列id")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyPageVo.java

@@ -29,4 +29,7 @@ public class AppDeliveredApplyPageVo implements Vo {
     @ApiModelProperty("是否显示办理按钮(提交后不显示)")
     private boolean showUpdata;
 
+    @ApiModelProperty("是否显示删除按钮(提交后不显示)")
+    private boolean showDelete;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java

@@ -186,12 +186,6 @@ public interface BusDeliveredApplyFeign {
     @ResponseBody
     public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@PathVariable("sid") String sid);
 
-    @ApiOperation("手机端-出库申请 详情")
-    @GetMapping("/getRetrievalDetail/{contractSid}")
-    @ResponseBody
-    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalDetail(@PathVariable("contractSid") String contractSid);
-
-
     @ApiOperation("手机端-保存 出库申请")
     @PostMapping("/saveRetrievalApplyInfo")
     @ResponseBody

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java

@@ -145,11 +145,6 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign {
         return null;
     }
 
-    @Override
-    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalDetail(String contractSid) {
-        return null;
-    }
-
     @Override
     public ResultBean saveRetrievalApplyInfo(AppDeliveredApplyDto appDeliveredApplyDto) {
         return null;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml

@@ -36,7 +36,8 @@
     <select id="getRetrievalNotList"
             resultType="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
         SELECT *
-        FROM bus_delivered
+        FROM bus_delivered bd
+        group by bd.contractNo
         <where>
             ${ew.sqlSegment}
         </where>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml

@@ -38,6 +38,7 @@
         SELECT bd.sid,
         if(length(bd.nodeState) > 0, nodeState, '待提交') as contractState,
         if(length(bd.nodeState) > 0, false, true) as showUpdata,
+        if(length(bd.nodeState) > 0, false, true) as showDelete,
         bd.contractNo as contractId,
         bd.applyName,
         bd.name as customerName,

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java

@@ -215,13 +215,6 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
         return rb.success().setData(retrievalApplyInfo.getData());
     }
 
-    @Override
-    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalDetail(String contractSid) {
-        ResultBean rb = ResultBean.fireFail();
-        ResultBean<AppDeliveredApplyInfoVo> appDeliveredApplyInfoVo = busDeliveredApplyService.getRetrievalDetail(contractSid);
-        return rb.success().setData(appDeliveredApplyInfoVo.getData());
-    }
-
     @Override
     public ResultBean saveRetrievalApplyInfo(AppDeliveredApplyDto appDeliveredApplyDto) {
         return busDeliveredApplyService.saveRetrievalApplyInfo(appDeliveredApplyDto);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -756,7 +756,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         BusDeliveredApply busDeliveredApply = fetchBySid(sid);
         BeanUtil.copyProperties(busDeliveredApply, vo);
 
-        if (vo.getIsTerminal().equals(1)) {
+        if (vo.getIsTerminal().equals("1")) {
+            //根据出库申请单的sid查询需要出库的车辆信息
             List<AppCarListVo> voList = busDeliveredApplyDetailsService.appDetailsList(sid);
             voList.removeAll(Collections.singleton(null));
             if (!voList.isEmpty()) {
@@ -772,7 +773,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             }
             vo.setCarList(voList);
 
-        } else if (vo.getIsTerminal().equals(0)) {
+        } else if (vo.getIsTerminal().equals("0")) {
             //根据出库申请单的sid查询需要出库的车辆信息
             List<AppCarListVo> voList = busDeliveredApplyDetailsService.appDetailsList(sid);
             for (int i = 0; i < voList.size(); i++) {
@@ -789,42 +790,42 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         return rb.success().setData(vo);
     }
 
-    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalDetail(String contractSid) {
-        ResultBean<AppDeliveredApplyInfoVo> rb = ResultBean.fireFail();
-        AppDeliveredApplyInfoVo vo = new AppDeliveredApplyInfoVo();
-        BusDeliveredApply busDeliveredApply = fetchBySid(contractSid);
-        BeanUtils.copyProperties(busDeliveredApply,vo);
-
-        if (vo.getIsTerminal().equals(1)) {
-            List<AppCarListVo> voList = busDeliveredApplyDetailsService.appDetailsList(contractSid);
-            voList.removeAll(Collections.singleton(null));
-            if (!voList.isEmpty()) {
-                for (AppCarListVo v : voList) {
-                    CrmCustomerTempVo data = crmCustomerTempFeign.selByMobile(vo.getMobile()).getData();
-                    AppUseInfoVo appUseInfoVo = new AppUseInfoVo();
-                    appUseInfoVo.setMobile(data.getMobile());
-                    appUseInfoVo.setCustomer(data.getName());
-                    appUseInfoVo.setAddress(data.getAddress());
-                    appUseInfoVo.setIdNumber(data.getIDNumber());
-                    v.setUseInfo(appUseInfoVo);
-                }
-            }
-            vo.setCarList(voList);
-
-        } else if (vo.getIsTerminal().equals(0)) {
-            //根据出库申请单的sid查询需要出库的车辆信息
-            List<AppCarListVo> voList = busDeliveredApplyDetailsService.appDetailsList(contractSid);
-            for (int i = 0; i < voList.size(); i++) {
-                BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(voList.get(i).getUseMessageSid());
-                AppUseInfoVo appUseInfoVo = new AppUseInfoVo();
-                appUseInfoVo.setMobile(busDeliveredUseMessage.getMobile());
-                appUseInfoVo.setCustomer(busDeliveredUseMessage.getName());
-                appUseInfoVo.setAddress(busDeliveredUseMessage.getAddress());
-                appUseInfoVo.setIdNumber(busDeliveredUseMessage.getIdNo());
-                voList.get(i).setUseInfo(appUseInfoVo);
-            }
-            vo.setCarList(voList);
-        }
-        return rb.success().setData(vo);
-    }
+//    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalDetail(String contractSid) {
+//        ResultBean<AppDeliveredApplyInfoVo> rb = ResultBean.fireFail();
+//        AppDeliveredApplyInfoVo vo = new AppDeliveredApplyInfoVo();
+//        BusDeliveredApply busDeliveredApply = fetchBySid(contractSid);
+//        BeanUtils.copyProperties(busDeliveredApply,vo);
+//
+//        if (vo.getIsTerminal().equals(1)) {
+//            List<AppCarListVo> voList = busDeliveredApplyDetailsService.appDetailsList(contractSid);
+//            voList.removeAll(Collections.singleton(null));
+//            if (!voList.isEmpty()) {
+//                for (AppCarListVo v : voList) {
+//                    CrmCustomerTempVo data = crmCustomerTempFeign.selByMobile(vo.getMobile()).getData();
+//                    AppUseInfoVo appUseInfoVo = new AppUseInfoVo();
+//                    appUseInfoVo.setMobile(data.getMobile());
+//                    appUseInfoVo.setCustomer(data.getName());
+//                    appUseInfoVo.setAddress(data.getAddress());
+//                    appUseInfoVo.setIdNumber(data.getIDNumber());
+//                    v.setUseInfo(appUseInfoVo);
+//                }
+//            }
+//            vo.setCarList(voList);
+//
+//        } else if (vo.getIsTerminal().equals(0)) {
+//            //根据出库申请单的sid查询需要出库的车辆信息
+//            List<AppCarListVo> voList = busDeliveredApplyDetailsService.appDetailsList(contractSid);
+//            for (int i = 0; i < voList.size(); i++) {
+//                BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(voList.get(i).getUseMessageSid());
+//                AppUseInfoVo appUseInfoVo = new AppUseInfoVo();
+//                appUseInfoVo.setMobile(busDeliveredUseMessage.getMobile());
+//                appUseInfoVo.setCustomer(busDeliveredUseMessage.getName());
+//                appUseInfoVo.setAddress(busDeliveredUseMessage.getAddress());
+//                appUseInfoVo.setIdNumber(busDeliveredUseMessage.getIdNo());
+//                voList.get(i).setUseInfo(appUseInfoVo);
+//            }
+//            vo.setCarList(voList);
+//        }
+//        return rb.success().setData(vo);
+//    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java

@@ -100,4 +100,9 @@ public interface AppBusDeliveredApplyFeign {
     @GetMapping("/getRetrievalCarVin/{sid}")
     @ResponseBody
     public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(@PathVariable("sid") String sid);
+
+    @ApiOperation("删除 出库申请记录")
+    @DeleteMapping("/deleteRetrievalInfo/{sid}")
+    @ResponseBody
+    public ResultBean deleteRetrievalInfo(@PathVariable("sid") String sid);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java

@@ -85,4 +85,9 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe
     public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean deleteRetrievalInfo(String sid) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDetailsVo.java

@@ -1,10 +1,13 @@
 package com.yxt.anrui.terminal.api.autoservice.retrieval;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.query.Query;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -13,19 +16,24 @@ public class DeliveredApplyDetailsVo implements Vo {
 
 
     @ApiModelProperty("合同id")
-    private String contractId;
+    @JsonProperty("contractId")
+    private String contractNo;
 
     @ApiModelProperty("车型")
-    private String model;
+    @JsonProperty("model")
+    private String modelName;
 
     @ApiModelProperty("申请日期")
-    private String date;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonProperty("date")
+    private Date applyDate;
 
     @ApiModelProperty("是否为终端客户")
     private String terminalValue;
 
     @ApiModelProperty("是否为终端客户")
-    private String terminalKey;
+    @JsonProperty("terminalKey")
+    private String isTerminal;
 
     @ApiModelProperty("备注")
     private String remarks;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyInfoVo.java

@@ -1,10 +1,13 @@
 package com.yxt.anrui.terminal.api.autoservice.retrieval;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -12,19 +15,24 @@ public class DeliveredApplyInfoVo implements Vo {
     private static final long serialVersionUID = 3238349626312645201L;
 
     @ApiModelProperty("合同id")
-    private String contractId;
+    @JsonProperty("contractId")
+    private String contractNo;
 
     @ApiModelProperty("车型")
-    private String model;
+    @JsonProperty("model")
+    private String modelName;
 
     @ApiModelProperty("申请日期")
-    private String date;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonProperty("date")
+    private Date applyDate;
 
     @ApiModelProperty("是否为终端客户")
     private String terminalValue;
 
     @ApiModelProperty("是否为终端客户")
-    private String terminalKey;
+    @JsonProperty("terminalKey")
+    private String isTerminal;
 
     @ApiModelProperty("备注")
     private String remarks;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java

@@ -94,4 +94,9 @@ public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign {
     public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(String sid) {
         return appBusDeliveredApplyService.getRetrievalCarVin(sid);
     }
+
+    @Override
+    public ResultBean deleteRetrievalInfo(String sid) {
+        return appBusDeliveredApplyService.deleteRetrievalInfo(sid);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

@@ -136,4 +136,11 @@ public class AppBusDeliveredApplyService {
         BeanUtil.copyProperties(appDeliveredApplyInfoVo, vo);
         return rb.success().setData(vo);
     }
+
+    public ResultBean deleteRetrievalInfo(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        String[] sids = {sid};
+        ResultBean resultBean = busDeliveredApplyFeign.delBySids(sids);
+        return resultBean;
+    }
 }