Merge remote-tracking branch 'origin/master'

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

@@ -55,7 +55,7 @@ public class BusDeliveredApplyDetailVo implements Vo {
     @ApiModelProperty("合同编号")
     private String contractNo;
     @ApiModelProperty("申请日期")
-    private String applyDateStart;
+    private String applyDate;
     @ApiModelProperty("客户名称")
     private String name;
     @ApiModelProperty("车型别名")

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

@@ -26,14 +26,14 @@
 package com.yxt.anrui.buscenter.api.busdeliveredapply;
 
 
+import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsDto;
 import com.yxt.common.core.dto.Dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusDeliveredApplyDto.java <br/>
@@ -51,19 +51,19 @@ import lombok.Data;
 @ApiModel(value = "出库申请 数据传输对象", description = "出库申请 数据传输对象")
 public class BusDeliveredApplyDto implements Dto {
 
-    private String sid; // sid
+    private static final long serialVersionUID = 2682848430658294059L;
+    @ApiModelProperty(value = "出库申请sid")
+    private String sid;
 
-	@ApiModelProperty("合同编号")
-    private String contractNo; // 合同编号
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-	@ApiModelProperty("申请日期")
-    private Date applyDateStart; // 申请日期
-    private Date applyDateEnd; // 申请日期
-	@ApiModelProperty("客户名称")
-    private String name; // 客户名称
-	@ApiModelProperty("车型别名")
-    private String modelName; // 车型别名
-	@ApiModelProperty("是否是终端:1是，0不是")
-    private Integer isTerminal; // 是否是终端:1是，0不是
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("客户名称")
+    private String name;
+    @ApiModelProperty("车型别名")
+    private String modelName;
+    @ApiModelProperty("是否是终端:1是，0不是")
+    private Integer isTerminal;
+    @ApiModelProperty(value = "出库申请的车辆信息")
+    private List<BusDeliveredApplyDetailsDto> detailsList;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsDto.java

@@ -26,8 +26,8 @@
 package com.yxt.anrui.buscenter.api.busdeliveredapplydetails;
 
 
+import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageDto;
 import com.yxt.common.core.dto.Dto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -49,15 +49,14 @@ import lombok.Data;
 @ApiModel(value = "出库车辆关联表 数据传输对象", description = "出库车辆关联表 数据传输对象")
 public class BusDeliveredApplyDetailsDto implements Dto {
 
-    private String sid; // sid
-
-	@ApiModelProperty("出库申请sid")
-    private String applySid; // 出库申请sid
-	@ApiModelProperty("车架号")
-    private String vinNo; // 车架号
-	@ApiModelProperty("成交价")
-    private String price; // 成交价
-	@ApiModelProperty("使用人信息sid")
-    private String useMessageSid; // 使用人信息sid
+    private static final long serialVersionUID = 2067369170796332433L;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("成交价")
+    private String price;
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+    @ApiModelProperty(value = "使用人信息")
+    private BusDeliveredUseMessageDto useMessage;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredusemessage/BusDeliveredUseMessageDto.java

@@ -50,6 +50,7 @@ import java.util.List;
 @Data
 @ApiModel(value = "使用人信息 数据传输对象", description = "使用人信息 数据传输对象")
 public class BusDeliveredUseMessageDto implements Dto {
+    private static final long serialVersionUID = -3694212592224004682L;
     @ApiModelProperty(value = "使用人信息sid:录入信息时传参", required = false)
     private String[] sidList = {};
     @ApiModelProperty(value = "使用人sid:修改信息时传参", required = false)

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

@@ -68,9 +68,7 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
     @ApiOperation("新增或修改")
     @PostMapping("/save")
     public ResultBean save(@RequestBody BusDeliveredApplyDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-        busDeliveredApplyService.saveOrUpdateDto(dto);
-        return rb.success();
+        return busDeliveredApplyService.saveOrUpdateDto(dto);
     }
 
     @Override

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

@@ -29,6 +29,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.*;
+import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsDto;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsVo;
 import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -78,13 +79,33 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         return p;
     }
 
-    public void saveOrUpdateDto(BusDeliveredApplyDto dto) {
+    public ResultBean saveOrUpdateDto(BusDeliveredApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return;
+            //新增
+            BusDeliveredApply busDeliveredApply = new BusDeliveredApply();
+            BeanUtil.copyProperties(dto, busDeliveredApply, "sid");
+            List<BusDeliveredApplyDetailsDto> dtoList = dto.getDetailsList();
+            if (dtoList.size() > 0) {
+                busDeliveredApplyDetailsService.saveList(dtoList, busDeliveredApply.getSid());
+            }
+            save(busDeliveredApply);
+        } else {
+            BusDeliveredApply busDeliveredApply = fetchBySid(dtoSid);
+            if (busDeliveredApply == null) {
+                return rb.setMsg("该申请不存在");
+            }
+            //删除
+            busDeliveredApplyDetailsService.deleteByApplySid(dtoSid);
+            List<BusDeliveredApplyDetailsDto> dtoList = dto.getDetailsList();
+            if (dtoList.size() > 0) {
+                busDeliveredApplyDetailsService.saveList(dtoList, busDeliveredApply.getSid());
+            }
+
+
         }
-        this.updateByDto(dto);
+        return rb.success();
     }
 
     public void insertByDto(BusDeliveredApplyDto dto) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java

@@ -70,4 +70,12 @@ public interface BusDeliveredApplyDetailsMapper extends BaseMapper<BusDeliveredA
      * @return 该申请单关联的车辆信息集合
      */
     List<BusDeliveredApplyDetailsVo> detailsList(String sid);
+
+    /**
+     * 根据出库申请删除车辆关联信息
+     *
+     * @param dtoSid 出库申请sid
+     * @return
+     */
+    int deleteByApplySid(String dtoSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml

@@ -35,4 +35,10 @@
         from bus_delivered_apply_details ba
         where applySid = #{sid}
     </select>
+
+    <delete id="deleteByApplySid">
+        delete
+        from bus_delivered_apply_details
+        where applySid = #{dtoSid}
+    </delete>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java

@@ -33,7 +33,6 @@ import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.vo.PagerVo;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -69,31 +68,6 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
         return p;
     }
 
-    public void saveOrUpdateDto(BusDeliveredApplyDetailsDto dto) {
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return;
-        }
-        this.updateByDto(dto);
-    }
-
-    public void insertByDto(BusDeliveredApplyDetailsDto dto) {
-        BusDeliveredApplyDetails entity = new BusDeliveredApplyDetails();
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.insert(entity);
-    }
-
-    public void updateByDto(BusDeliveredApplyDetailsDto dto) {
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        }
-        BusDeliveredApplyDetails entity = fetchBySid(dtoSid);
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.updateById(entity);
-    }
-
     public BusDeliveredApplyDetailsDetailsVo fetchDetailsVoBySid(String sid) {
         BusDeliveredApplyDetails entity = fetchBySid(sid);
         BusDeliveredApplyDetailsDetailsVo vo = new BusDeliveredApplyDetailsDetailsVo();
@@ -110,4 +84,23 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
     public List<BusDeliveredApplyDetailsVo> detailsList(String sid) {
         return baseMapper.detailsList(sid);
     }
+
+    public void saveList(List<BusDeliveredApplyDetailsDto> dtoList, String sid) {
+        for (int i = 0; i < dtoList.size(); i++) {
+            BusDeliveredApplyDetails busDeliveredApplyDetails = new BusDeliveredApplyDetails();
+            BeanUtil.copyProperties(dtoList.get(i), busDeliveredApplyDetails, "sid");
+            busDeliveredApplyDetails.setApplySid(sid);
+            save(busDeliveredApplyDetails);
+        }
+    }
+
+    /**
+     * 根据出库申请sid删除车辆关联的信息
+     *
+     * @param dtoSid 出库申请sid
+     * @return
+     */
+    public int deleteByApplySid(String dtoSid) {
+        return baseMapper.deleteByApplySid(dtoSid);
+    }
 }