出库申请调整新增修改方法，两个提交接口

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

@@ -54,7 +54,6 @@ public class BusDeliveredApplyDto implements Dto {
     private static final long serialVersionUID = 2682848430658294059L;
     @ApiModelProperty(value = "出库申请sid")
     private String sid;
-
     @ApiModelProperty("合同编号")
     private String contractNo;
     @ApiModelProperty("客户名称")

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

@@ -59,6 +59,12 @@ public interface BusDeliveredApplyFeign {
     @ResponseBody
     public ResultBean<PagerVo<BusDeliveredApplyVo>> listPage(@RequestBody PagerQuery<BusDeliveredApplyQuery> pq);
 
+    /**
+     * 出库申请新增或修改
+     *
+     * @param dto 数据传输对象
+     * @return
+     */
     @ApiOperation("新增或修改")
     @PostMapping("/save")
     @ResponseBody
@@ -69,6 +75,28 @@ public interface BusDeliveredApplyFeign {
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
 
+    /**
+     * 提交
+     *
+     * @param dto
+     * @return
+     */
+    @ApiOperation("提交")
+    @PostMapping("/submit")
+    @ResponseBody
+    ResultBean submit(@RequestBody BusDeliveredApplyDto dto);
+
+    @ApiOperation("列表上的提交")
+    @PutMapping("/submitBySid")
+    @ResponseBody
+    ResultBean submitBySid(@RequestParam(value = "sid") String sid);
+
+    /**
+     * 编辑初始化/详情
+     *
+     * @param query 查询条件
+     * @return
+     */
     @ApiOperation("编辑初始化/详情")
     @GetMapping("/fetchDetailsBySid")
     @ResponseBody

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

@@ -62,6 +62,11 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign {
         return ResultBean.fireFail().setMsg("接口anrui-buscenter/busdeliveredapply/delBySids无法访问");
     }
 
+    @Override
+    public ResultBean submit(BusDeliveredApplyDto dto) {
+        return null;
+    }
+
     @Override
     public ResultBean<BusDeliveredApplyDetailVo> fetchDetailsBySid(BusDeliveredApplyDetailQuery query) {
         ResultBean rb = ResultBean.fireFail();

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

@@ -26,8 +26,8 @@
 package com.yxt.anrui.buscenter.api.busdeliveredapplydetails;
 
 
+import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageVo;
 import com.yxt.common.core.vo.Vo;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -56,8 +56,10 @@ public class BusDeliveredApplyDetailsVo implements Vo {
     private String vinNo;
     @ApiModelProperty("成交价")
     private String price;
-    @ApiModelProperty(value = "使用人信息sid", example = "无")
+    @ApiModelProperty(value = "使用人信息sid")
     private String useMessageSid;
+    @ApiModelProperty(value = "使用人信息")
+    private BusDeliveredUseMessageVo useMessage;
     @ApiModelProperty(value = "备注")
     private String remarks;
 

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

@@ -62,5 +62,7 @@ public class BusDeliveredUseMessage extends BaseEntity {
     private String idNo; // 证件号码
 	@ApiModelProperty("联系地址")
     private String address; // 联系地址
+    @ApiModelProperty(value = "出库申请sid")
+    private String applySid;
 
 }

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

@@ -31,9 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusDeliveredUseMessageDto.java <br/>
@@ -51,14 +48,10 @@ import java.util.List;
 @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)
-    private String sid;
     @ApiModelProperty(value = "合同编号", required = true)
     private String contractNo;
     @ApiModelProperty(value = "车架号", required = true)
-    private List<String> vinNoList = new ArrayList<>();
+    private String vinNo;
     @ApiModelProperty(value = "客户名称", required = true)
     private String name;
     @ApiModelProperty(value = "联系电话", required = true)

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

@@ -25,16 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.busdeliveredusemessage;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusDeliveredUseMessageFeign.java <br/>
@@ -61,18 +59,6 @@ public interface BusDeliveredUseMessageFeign {
     @ResponseBody
     public ResultBean<PagerVo<BusDeliveredUseMessageVo>> listPage(@RequestBody PagerQuery<BusDeliveredUseMessageQuery> pq);
 
-    /**
-     * 录入或修改使用人信息
-     *
-     * @param dto 数据传输对象
-     * @return
-     */
-    @ApiOperation("录入或修改使用人信息")
-    @PostMapping("/saveOrUpdate")
-    @ResponseBody
-    public ResultBean<List<BusDeliveredUseMessageVo>> saveOrUpdate(@RequestBody BusDeliveredUseMessageDto dto);
-
-
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody

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

@@ -54,11 +54,6 @@ public class BusDeliveredUseMessageFeignFallback implements BusDeliveredUseMessa
         return rb.setMsg("接口anrui-buscenter/busdeliveredusemessage/listPage无法访问");
     }
 
-    @Override
-    public ResultBean<List<BusDeliveredUseMessageVo>> saveOrUpdate(BusDeliveredUseMessageDto dto) {
-        return new ResultBean<List<BusDeliveredUseMessageVo>>().fail().setMsg("接口anrui-buscenter/busdeliveredusemessage/save无法访问");
-    }
-
 
     @Override
     public ResultBean delBySids(String[] sids) {

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

@@ -50,10 +50,18 @@ import lombok.Data;
 public class BusDeliveredUseMessageVo implements Vo {
 
     private static final long serialVersionUID = 84526335903837161L;
-    @ApiModelProperty(value = "使用人信息sid")
-    private String useMessageSid;
-    @ApiModelProperty("车架号")
+    @ApiModelProperty(value = "合同编号", required = true)
+    private String contractNo;
+    @ApiModelProperty(value = "车架号", required = true)
     private String vinNo;
+    @ApiModelProperty(value = "客户名称", required = true)
+    private String name;
+    @ApiModelProperty(value = "联系电话", required = true)
+    private String mobile;
+    @ApiModelProperty(value = "证件号码", required = true)
+    private String idNo;
+    @ApiModelProperty(value = "联系地址", required = true)
+    private String address;
 
 
 }

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

@@ -26,15 +26,16 @@
 package com.yxt.anrui.buscenter.biz.busdeliveredapply;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply;
+import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply;
-import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyVo;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -53,13 +54,15 @@ import java.util.List;
 @Mapper
 public interface BusDeliveredApplyMapper extends BaseMapper<BusDeliveredApply> {
 
-	//@Update("update bus_delivered_apply set name=#{msg} where id=#{id}")
-	//IPage<BusDeliveredApplyVo> voPage(IPage<BusDeliveredApply> page, @Param(Constants.WRAPPER) QueryWrapper<BusDeliveredApply> qw);
-	
-	IPage<BusDeliveredApplyVo> selectPageVo(IPage<BusDeliveredApply> page, @Param(Constants.WRAPPER) Wrapper<BusDeliveredApply> qw);
-	
-	List<BusDeliveredApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusDeliveredApply> qw);
-	
-	@Select("select * from bus_delivered_apply")
-	List<BusDeliveredApplyVo> selectListVo();
+    //@Update("update bus_delivered_apply set name=#{msg} where id=#{id}")
+    //IPage<BusDeliveredApplyVo> voPage(IPage<BusDeliveredApply> page, @Param(Constants.WRAPPER) QueryWrapper<BusDeliveredApply> qw);
+
+    IPage<BusDeliveredApplyVo> selectPageVo(IPage<BusDeliveredApply> page, @Param(Constants.WRAPPER) Wrapper<BusDeliveredApply> qw);
+
+    List<BusDeliveredApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusDeliveredApply> qw);
+
+    @Select("select * from bus_delivered_apply")
+    List<BusDeliveredApplyVo> selectListVo();
+
+    int updateStateBySid(@Param("state") int i, @Param("sid") String sid, @Param("today") Date today);
 }

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

@@ -1,13 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.buscenter.biz.busdeliveredapply.BusDeliveredApplyMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyVo">
-		SELECT * FROM bus_delivered_apply <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyVo">
-		SELECT * FROM bus_delivered_apply <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyVo">
+        SELECT *
+        FROM bus_delivered_apply
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyVo">
+        SELECT *
+        FROM bus_delivered_apply
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <update id="updateStateBySid">
+        update bus_delivered_apply
+        set state = #{state} and applyDate = #{today}
+        where sid = #{sid}
+    </update>
 </mapper>

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

@@ -32,7 +32,10 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -80,6 +83,16 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
         return rb.success();
     }
 
+    @Override
+    public ResultBean submit(BusDeliveredApplyDto dto) {
+        return busDeliveredApplyService.submit(dto);
+    }
+
+    @Override
+    public ResultBean submitBySid(String sid) {
+        return busDeliveredApplyService.submitBySid(sid);
+    }
+
     /**
      * 初始化/详情
      *

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

@@ -26,12 +26,16 @@
 package com.yxt.anrui.buscenter.biz.busdeliveredapply;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 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.api.busdeliveredusemessage.BusDeliveredUseMessage;
+import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageVo;
 import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService;
+import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessageService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -62,6 +66,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
 
     @Autowired
     private BusDeliveredApplyDetailsService busDeliveredApplyDetailsService;
+    @Autowired
+    private BusDeliveredUseMessageService busDeliveredUseMessageService;
 
     private QueryWrapper<BusDeliveredApply> createQueryWrapper(BusDeliveredApplyQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -91,6 +97,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 busDeliveredApplyDetailsService.saveList(dtoList, busDeliveredApply.getSid());
             }
             save(busDeliveredApply);
+            dtoSid = busDeliveredApply.getSid();
         } else {
             BusDeliveredApply busDeliveredApply = fetchBySid(dtoSid);
             if (busDeliveredApply == null) {
@@ -98,30 +105,13 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             }
             //删除
             busDeliveredApplyDetailsService.deleteByApplySid(dtoSid);
+            busDeliveredUseMessageService.deleteByApplySid(dtoSid);
             List<BusDeliveredApplyDetailsDto> dtoList = dto.getDetailsList();
             if (dtoList.size() > 0) {
                 busDeliveredApplyDetailsService.saveList(dtoList, busDeliveredApply.getSid());
             }
-
-
-        }
-        return rb.success();
-    }
-
-    public void insertByDto(BusDeliveredApplyDto dto) {
-        BusDeliveredApply entity = new BusDeliveredApply();
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.insert(entity);
-    }
-
-    public void updateByDto(BusDeliveredApplyDto dto) {
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
         }
-        BusDeliveredApply entity = fetchBySid(dtoSid);
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.updateById(entity);
+        return rb.success().setData(dtoSid);
     }
 
     /**
@@ -158,9 +148,39 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             BeanUtil.copyProperties(entity, vo);
             //根据出库申请单的sid查询需要出库的车辆信息
             List<BusDeliveredApplyDetailsVo> voList = busDeliveredApplyDetailsService.detailsList(sid);
+            for (int i = 0; i < voList.size(); i++) {
+                BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(voList.get(i).getUseMessageSid());
+                BusDeliveredUseMessageVo busDeliveredUseMessageVo = new BusDeliveredUseMessageVo();
+                BeanUtil.copyProperties(busDeliveredUseMessage, busDeliveredUseMessageVo);
+                voList.get(i).setUseMessage(busDeliveredUseMessageVo);
+            }
             vo.setListVo(voList);
 
         }
         return rb.success().setData(vo);
     }
+
+    public ResultBean submit(BusDeliveredApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        ResultBean resultBean = saveOrUpdateDto(dto);
+        if (resultBean.getSuccess()) {
+            String sid = resultBean.getData().toString();
+            //更新出库申请的状态为待审核。
+            //状态：1待提交，2待审核，3已通过，4未通过
+            baseMapper.updateStateBySid(2, sid, DateUtil.date());
+            return rb.success().setMsg("提交成功");
+        }
+        return rb.setMsg(resultBean.getMsg());
+    }
+
+    public ResultBean submitBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusDeliveredApply busDeliveredApply = fetchBySid(sid);
+        if (busDeliveredApply == null) {
+            return rb.setMsg("该出库申请不存在");
+        }
+        //状态：1待提交，2待审核，3已通过，4未通过
+        baseMapper.updateStateBySid(2, sid, DateUtil.date());
+        return rb.success().setMsg("提交成功");
+    }
 }

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

@@ -29,10 +29,13 @@ 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.busdeliveredapplydetails.*;
+import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessage;
+import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessageService;
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -52,6 +55,9 @@ import java.util.List;
  */
 @Service
 public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliveredApplyDetailsMapper, BusDeliveredApplyDetails> {
+    @Autowired
+    private BusDeliveredUseMessageService busDeliveredUseMessageService;
+
     private QueryWrapper<BusDeliveredApplyDetails> createQueryWrapper(BusDeliveredApplyDetailsQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -90,6 +96,13 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
             BusDeliveredApplyDetails busDeliveredApplyDetails = new BusDeliveredApplyDetails();
             BeanUtil.copyProperties(dtoList.get(i), busDeliveredApplyDetails, "sid");
             busDeliveredApplyDetails.setApplySid(sid);
+            if (dtoList.get(i).getUseMessage() != null) {
+                BusDeliveredUseMessage busDeliveredUseMessage = new BusDeliveredUseMessage();
+                BeanUtil.copyProperties(dtoList.get(i).getUseMessage(), busDeliveredUseMessage, "sid");
+                busDeliveredUseMessage.setApplySid(sid);
+                busDeliveredUseMessageService.save(busDeliveredUseMessage);
+                busDeliveredApplyDetails.setUseMessageSid(busDeliveredUseMessage.getSid());
+            }
             save(busDeliveredApplyDetails);
         }
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredusemessage/BusDeliveredUseMessageMapper.java

@@ -53,13 +53,21 @@ import java.util.List;
 @Mapper
 public interface BusDeliveredUseMessageMapper extends BaseMapper<BusDeliveredUseMessage> {
 
-	//@Update("update bus_delivered_use_message set name=#{msg} where id=#{id}")
-	//IPage<BusDeliveredUseMessageVo> voPage(IPage<BusDeliveredUseMessage> page, @Param(Constants.WRAPPER) QueryWrapper<BusDeliveredUseMessage> qw);
-	
-	IPage<BusDeliveredUseMessageVo> selectPageVo(IPage<BusDeliveredUseMessage> page, @Param(Constants.WRAPPER) Wrapper<BusDeliveredUseMessage> qw);
-	
-	List<BusDeliveredUseMessageVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusDeliveredUseMessage> qw);
-	
-	@Select("select * from bus_delivered_use_message")
-	List<BusDeliveredUseMessageVo> selectListVo();
+    //@Update("update bus_delivered_use_message set name=#{msg} where id=#{id}")
+    //IPage<BusDeliveredUseMessageVo> voPage(IPage<BusDeliveredUseMessage> page, @Param(Constants.WRAPPER) QueryWrapper<BusDeliveredUseMessage> qw);
+
+    IPage<BusDeliveredUseMessageVo> selectPageVo(IPage<BusDeliveredUseMessage> page, @Param(Constants.WRAPPER) Wrapper<BusDeliveredUseMessage> qw);
+
+    List<BusDeliveredUseMessageVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusDeliveredUseMessage> qw);
+
+    @Select("select * from bus_delivered_use_message")
+    List<BusDeliveredUseMessageVo> selectListVo();
+
+    /**
+     * 根据出库申请单sid批量删除使用人信息
+     *
+     * @param dtoSid 出库申请单sid
+     * @return
+     */
+    int deleteByApplySid(String dtoSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredusemessage/BusDeliveredUseMessageMapper.xml

@@ -1,13 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessageMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageVo">
-		SELECT * FROM bus_delivered_use_message <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageVo">
-		SELECT * FROM bus_delivered_use_message <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageVo">
+        SELECT *
+        FROM bus_delivered_use_message
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageVo">
+        SELECT *
+        FROM bus_delivered_use_message
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <delete id="deleteByApplySid">
+        delete
+        from bus_delivered_use_message
+        where applySid = #{dtoSid}
+    </delete>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredusemessage/BusDeliveredUseMessageRest.java

@@ -25,7 +25,10 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.busdeliveredusemessage;
 
-import com.yxt.anrui.buscenter.api.busdeliveredusemessage.*;
+import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageDetailsVo;
+import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageFeign;
+import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageQuery;
+import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -34,8 +37,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusDeliveredUseMessageFeignFallback.java <br/>
@@ -66,11 +67,6 @@ public class BusDeliveredUseMessageRest implements BusDeliveredUseMessageFeign {
         return rb.success().setData(pv);
     }
 
-    @Override
-    public ResultBean<List<BusDeliveredUseMessageVo>> saveOrUpdate(@RequestBody BusDeliveredUseMessageDto dto) {
-        return busDeliveredUseMessageService.saveOrUpdate(dto);
-    }
-
     @Override
     @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredusemessage/BusDeliveredUseMessageService.java

@@ -71,86 +71,7 @@ public class BusDeliveredUseMessageService extends MybatisBaseService<BusDeliver
         PagerVo<BusDeliveredUseMessageVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
-
-    /**
-     * 录入使用人信息
-     *
-     * @param dto
-     * @return
-     */
-    public ResultBean<List<BusDeliveredUseMessageVo>> saveOrUpdate(BusDeliveredUseMessageDto dto) {
-        ResultBean<List<BusDeliveredUseMessageVo>> rb = ResultBean.fireFail();
-        List<BusDeliveredUseMessageVo> list = new ArrayList<>();
-        if (StringUtils.isBlank(dto.getSid())) {
-            List<String> stringList = dto.getVinNoList();
-            if (stringList.size() == 0) {
-                return rb.setMsg("请选择需要录入使用人信息的车辆");
-            }
-            List<String> sidsList = Arrays.asList(dto.getSidList());
-            if (sidsList.size() == 0) {
-                //新增
-                list = saveUseMessage(dto);
-            } else {
-                //先删除掉使用人信息
-                delBySids(dto.getSidList());
-                list = saveUseMessage(dto);
-
-            }
-        } else {
-            BusDeliveredUseMessage useMessage = fetchBySid(dto.getSid());
-            if (useMessage == null) {
-                return rb.setMsg("该车辆的使用人信息不存在");
-            }
-            list = updateByDto(dto);
-        }
-        return rb.success().setData(list);
-    }
-
-    /**
-     * 录入使用人信息
-     *
-     * @param dto 数据传输对象
-     * @return
-     */
-    public List<BusDeliveredUseMessageVo> saveUseMessage(BusDeliveredUseMessageDto dto) {
-        List<BusDeliveredUseMessageVo> list = new ArrayList<>();
-        List<String> stringList = dto.getVinNoList();
-        for (int i = 0; i < stringList.size(); i++) {
-            BusDeliveredUseMessage useMessage = new BusDeliveredUseMessage();
-            //合同编号
-            useMessage.setContractNo(dto.getContractNo());
-            useMessage.setVinNo(stringList.get(i));
-            useMessage.setName(dto.getName());
-            useMessage.setMobile(dto.getMobile());
-            useMessage.setIdNo(dto.getIdNo());
-            useMessage.setAddress(dto.getAddress());
-            save(useMessage);
-            BusDeliveredUseMessageVo vo = new BusDeliveredUseMessageVo();
-            vo.setVinNo(stringList.get(i));
-            vo.setUseMessageSid(useMessage.getSid());
-            list.add(vo);
-        }
-        return list;
-    }
-
-    /**
-     * 修改使用人信息
-     *
-     * @param dto 数据传输对象
-     * @return
-     */
-    public List<BusDeliveredUseMessageVo> updateByDto(BusDeliveredUseMessageDto dto) {
-        List<BusDeliveredUseMessageVo> list = new ArrayList<>();
-        String dtoSid = dto.getSid();
-        BusDeliveredUseMessage entity = fetchBySid(dtoSid);
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.updateById(entity);
-        BusDeliveredUseMessageVo vo = new BusDeliveredUseMessageVo();
-        vo.setUseMessageSid(entity.getSid());
-        vo.setVinNo(entity.getVinNo());
-        list.add(vo);
-        return list;
-    }
+    
 
     public BusDeliveredUseMessageDetailsVo fetchDetailsVoBySid(String sid) {
         BusDeliveredUseMessage entity = fetchBySid(sid);
@@ -158,4 +79,8 @@ public class BusDeliveredUseMessageService extends MybatisBaseService<BusDeliver
         BeanUtil.copyProperties(entity, vo);
         return vo;
     }
+
+    public int deleteByApplySid(String dtoSid) {
+        return baseMapper.deleteByApplySid(dtoSid);
+    }
 }

doc/databases/bus-center_tables.sql

@@ -265,6 +265,7 @@ CREATE TABLE `bus_delivered_use_message`
     `mobile`      VARCHAR(64)          DEFAULT NULL COMMENT '联系电话',
     `idNo`        VARCHAR(64)          DEFAULT NULL COMMENT '证件号码',
     `address`     VARCHAR(200)         DEFAULT NULL COMMENT '联系地址',
+    `applySid`    VARCHAR(64)          DEFAULT NULL COMMENT '出库申请sid',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = INNODB