Browse Source

录入和修改使用人信息

zhanglei
dimengzhe 3 years ago
parent
commit
1dea6337f3
  1. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java
  2. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java
  3. 35
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredusemessage/BusDeliveredUseMessageDto.java
  4. 17
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredusemessage/BusDeliveredUseMessageFeign.java
  5. 37
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredusemessage/BusDeliveredUseMessageFeignFallback.java
  6. 18
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredusemessage/BusDeliveredUseMessageVo.java
  7. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
  8. 62
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredusemessage/BusDeliveredUseMessageRest.java
  9. 159
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredusemessage/BusDeliveredUseMessageService.java
  10. 1
      doc/databases/bus-center_tables.sql

7
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java

@ -53,7 +53,12 @@ import org.springframework.web.bind.annotation.*;
path = "v1/busdelivered",
fallback = BusDeliveredFeignFallback.class)
public interface BusDeliveredFeign {
/**
* 待出库分页列表
*
* @param pq 查询条件
* @return
*/
@ApiOperation("待出库车辆分页列表")
@PostMapping("/listPage")
@ResponseBody

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java

@ -66,6 +66,10 @@ public class BusDeliveredVo implements Vo {
private String idNo;
@ApiModelProperty(value = "联系地址")
private String address;
@ApiModelProperty(value = "车型别名")
private String modelName;
@ApiModelProperty(value = "成交价")
private String price;
}

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

@ -27,11 +27,13 @@ package com.yxt.anrui.buscenter.api.busdeliveredusemessage;
import com.yxt.common.core.dto.Dto;
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/>
@ -48,20 +50,21 @@ import lombok.Data;
@Data
@ApiModel(value = "使用人信息 数据传输对象", description = "使用人信息 数据传输对象")
public class BusDeliveredUseMessageDto implements Dto {
private String sid; // sid
@ApiModelProperty("合同编号")
private String contractNo; // 合同编号
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("客户名称")
private String name; // 客户名称
@ApiModelProperty("联系电话")
private String mobile; // 联系电话
@ApiModelProperty("证件号码")
private String idNo; // 证件号码
@ApiModelProperty("联系地址")
private String address; // 联系地址
@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<>();
@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;
}

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

@ -61,16 +61,23 @@ public interface BusDeliveredUseMessageFeign {
@ResponseBody
public ResultBean<PagerVo<BusDeliveredUseMessageVo>> listPage(@RequestBody PagerQuery<BusDeliveredUseMessageQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
/**
* 录入或修改使用人信息
*
* @param dto 数据传输对象
* @return
*/
@ApiOperation("录入或修改使用人信息")
@PostMapping("/saveOrUpdate")
@ResponseBody
public ResultBean save(@RequestBody BusDeliveredUseMessageDto dto);
public ResultBean<List<BusDeliveredUseMessageVo>> saveOrUpdate(@RequestBody BusDeliveredUseMessageDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody

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

@ -48,25 +48,26 @@ import java.util.List;
@Component
public class BusDeliveredUseMessageFeignFallback implements BusDeliveredUseMessageFeign {
@Override
public ResultBean<PagerVo<BusDeliveredUseMessageVo>> listPage(PagerQuery<BusDeliveredUseMessageQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-buscenter/busdeliveredusemessage/listPage无法访问");
}
@Override
public ResultBean<PagerVo<BusDeliveredUseMessageVo>> listPage(PagerQuery<BusDeliveredUseMessageQuery> pq) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-buscenter/busdeliveredusemessage/listPage无法访问");
}
@Override
public ResultBean save(BusDeliveredUseMessageDto dto){
return ResultBean.fireFail().setMsg("接口anrui-buscenter/busdeliveredusemessage/save无法访问");
}
@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){
return ResultBean.fireFail().setMsg("接口anrui-buscenter/busdeliveredusemessage/delBySids无法访问");
}
@Override
public ResultBean<BusDeliveredUseMessageDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-buscenter/busdeliveredusemessage/fetchDetailsBySid无法访问");
}
@Override
public ResultBean delBySids(String[] sids) {
return ResultBean.fireFail().setMsg("接口anrui-buscenter/busdeliveredusemessage/delBySids无法访问");
}
@Override
public ResultBean<BusDeliveredUseMessageDetailsVo> fetchDetailsBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-buscenter/busdeliveredusemessage/fetchDetailsBySid无法访问");
}
}

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

@ -49,19 +49,11 @@ import lombok.Data;
@ApiModel(value = "使用人信息 视图数据对象", description = "使用人信息 视图数据对象")
public class BusDeliveredUseMessageVo implements Vo {
private String sid; // sid
private static final long serialVersionUID = 84526335903837161L;
@ApiModelProperty(value = "使用人信息sid")
private String useMessageSid;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("合同编号")
private String contractNo; // 合同编号
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("客户名称")
private String name; // 客户名称
@ApiModelProperty("联系电话")
private String mobile; // 联系电话
@ApiModelProperty("证件号码")
private String idNo; // 证件号码
@ApiModelProperty("联系地址")
private String address; // 联系地址
}

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

@ -14,7 +14,9 @@
<!--认款状态-->
case bd.type
when 1 then '已交款'
when 2 then '未交款' end as type
when 2 then '未交款' end as type,
bd.modelName,
bd.price
FROM bus_delivered bd
${ew.customSqlSegment}
</select>

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

@ -34,6 +34,8 @@ 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/>
@ -52,42 +54,38 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping("v1/busdeliveredusemessage")
public class BusDeliveredUseMessageRest implements BusDeliveredUseMessageFeign {
@Autowired
private BusDeliveredUseMessageService busDeliveredUseMessageService;
@Autowired
private BusDeliveredUseMessageService busDeliveredUseMessageService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<BusDeliveredUseMessageVo>> listPage(@RequestBody PagerQuery<BusDeliveredUseMessageQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<BusDeliveredUseMessageVo> pv = busDeliveredUseMessageService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<BusDeliveredUseMessageVo>> listPage(@RequestBody PagerQuery<BusDeliveredUseMessageQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<BusDeliveredUseMessageVo> pv = busDeliveredUseMessageService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody BusDeliveredUseMessageDto dto){
ResultBean rb = ResultBean.fireFail();
busDeliveredUseMessageService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
public ResultBean<List<BusDeliveredUseMessageVo>> saveOrUpdate(@RequestBody BusDeliveredUseMessageDto dto) {
return busDeliveredUseMessageService.saveOrUpdate(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
busDeliveredUseMessageService.delBySids(sids);
return rb.success();
}
public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail();
busDeliveredUseMessageService.delBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<BusDeliveredUseMessageDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
BusDeliveredUseMessageDetailsVo vo = busDeliveredUseMessageService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
public ResultBean<BusDeliveredUseMessageDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
BusDeliveredUseMessageDetailsVo vo = busDeliveredUseMessageService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

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

@ -28,21 +28,17 @@ package com.yxt.anrui.buscenter.biz.busdeliveredusemessage;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
import com.yxt.anrui.buscenter.api.busdeliveredusemessage.*;
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.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessage;
import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageQuery;
import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageVo;
import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageDetailsVo;
import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageDto;
import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageFeign;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@ -60,51 +56,106 @@ import java.util.List;
*/
@Service
public class BusDeliveredUseMessageService extends MybatisBaseService<BusDeliveredUseMessageMapper, BusDeliveredUseMessage> {
private QueryWrapper<BusDeliveredUseMessage> createQueryWrapper(BusDeliveredUseMessageQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BusDeliveredUseMessage> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<BusDeliveredUseMessageVo> listPageVo(PagerQuery<BusDeliveredUseMessageQuery> pq) {
BusDeliveredUseMessageQuery query = pq.getParams();
QueryWrapper<BusDeliveredUseMessage> qw = createQueryWrapper(query);
IPage<BusDeliveredUseMessage> page = PagerUtil.queryToPage(pq);
IPage<BusDeliveredUseMessageVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BusDeliveredUseMessageVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(BusDeliveredUseMessageDto dto){
private QueryWrapper<BusDeliveredUseMessage> createQueryWrapper(BusDeliveredUseMessageQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BusDeliveredUseMessage> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<BusDeliveredUseMessageVo> listPageVo(PagerQuery<BusDeliveredUseMessageQuery> pq) {
BusDeliveredUseMessageQuery query = pq.getParams();
QueryWrapper<BusDeliveredUseMessage> qw = createQueryWrapper(query);
IPage<BusDeliveredUseMessage> page = PagerUtil.queryToPage(pq);
IPage<BusDeliveredUseMessageVo> pagging = baseMapper.selectPageVo(page, qw);
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();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(BusDeliveredUseMessageDto dto){
BusDeliveredUseMessage entity = new BusDeliveredUseMessage();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(BusDeliveredUseMessageDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
BusDeliveredUseMessage entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public BusDeliveredUseMessageDetailsVo fetchDetailsVoBySid(String sid){
BusDeliveredUseMessage entity = fetchBySid(sid);
BusDeliveredUseMessageDetailsVo vo = new BusDeliveredUseMessageDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
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);
BusDeliveredUseMessageDetailsVo vo = new BusDeliveredUseMessageDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}

1
doc/databases/bus-center_tables.sql

@ -189,6 +189,7 @@ CREATE TABLE `bus_delivered`
`mobile` VARCHAR(64) DEFAULT NULL COMMENT '联系电话',
`idNo` VARCHAR(64) DEFAULT NULL COMMENT '证件号码',
`address` VARCHAR(64) DEFAULT NULL COMMENT '联系地址',
`price` VARCHAR(200) DEFAULT NULL COMMENT '成交价',
PRIMARY KEY (`id`),
KEY `id` (`id`)
) ENGINE = INNODB

Loading…
Cancel
Save